fix bugs

Assets/Scripts/MDPro3/Servants/OcgCore.cs

@@ -1194,6 +1194,7 @@ namespace MDPro3
 
         public List<GameCard> materialCards = new List<GameCard>();
         public List<GameCard> cardsInChain = new List<GameCard>();
+        public List<int> codesInChain = new List<int>();
         public List<GameCard> cardsBeTarget = new List<GameCard>();
         public List<GameCard> cardsInSelection = new List<GameCard>();
         public List<GameCard> cardsMustBeSelected = new List<GameCard>();
@@ -1236,6 +1237,7 @@ namespace MDPro3
             lastHandOffset = 0;
             materialCards.Clear();
             cardsInChain.Clear();
+            codesInChain.Clear();
             cardsBeTarget.Clear();
             cardsInSelection.Clear();
             cardsMustBeSelected.Clear();
@@ -2256,6 +2258,7 @@ namespace MDPro3
                         card.SetCode(code);
                         card.AnimationActivate();
                         cardsInChain.Add(card);
+                        codesInChain.Add(code);
                         Sleep(100);
                         ES_hint = InterString.Get("「[?]」被发动时", card.GetData().Name);
                     }
@@ -2285,6 +2288,9 @@ namespace MDPro3
                     {
                         card = cardsInChain[id - 1];
                         card.ResolveChain(id);
+                        if (card.GetData().Id != codesInChain[id - 1])
+                            //Hand Shuffle
+                            break;
                         if (card.disabled || card.negated)
                             break;
 
@@ -2577,6 +2583,7 @@ namespace MDPro3
                     }
                     cardsBeTarget.Clear();
                     cardsInChain.Clear();
+                    codesInChain.Clear();
                     materialCards.Clear();
                     break;
                 case GameMessage.ChainNegated:

Assets/Scripts/MDPro3/UI/Handler/PlaceSelector.cs

@@ -155,19 +155,43 @@ namespace MDPro3.UI
                 highlight.SetActive(false);
         }
 
+
+
         void OnClick()
         {
             if (selecting)
             {
                 AudioManager.PlaySE("SE_DUEL_SELECT");
-                selected = true;
-                var response = new byte[3];
-                response[0] = Program.I().ocgcore.isFirst ? (byte)p.controller : (byte)(1 - p.controller);
-                response[1] = (byte)p.location;
-                response[2] = (byte)p.sequence;
-                var binaryMaster = new BinaryMaster();
-                binaryMaster.writer.Write(response);
-                Program.I().ocgcore.SendReturn(binaryMaster.Get());
+                if (!selected)
+                {
+                    selected = true;
+                    select.SetActive(false);
+                    selectPush.SetActive(false);
+                    selectPush.SetActive(true);
+                }
+                else
+                {
+                    selected = false;
+                    select.SetActive(true);
+                }
+                var selectedCount = 0;
+                foreach(var place in Program.I().ocgcore.places)
+                    if(place.selected)
+                        selectedCount++;
+                if (selectedCount == Program.I().ocgcore.ES_min)
+                {
+                    var binaryMaster = new BinaryMaster();
+                    foreach (var place in Program.I().ocgcore.places)
+                        if (place.selected)
+                        {
+                            var response = new byte[3];
+                            response[0] = Program.I().ocgcore.isFirst ? (byte)place.p.controller : (byte)(1 - place.p.controller);
+                            response[1] = (byte)place.p.location;
+                            response[2] = (byte)place.p.sequence;
+                            binaryMaster.writer.Write(response);
+                        }
+                    Program.I().ocgcore.SendReturn(binaryMaster.Get());
+                }
             }
             else if (cardSelecting)
             {