improve reconnecting (#1)

Assets/SibylSystem/Ocgcore/Ocgcore.cs

@@ -1303,6 +1303,7 @@ public class Ocgcore : ServantWithCardDescription
                 logicalClearChain();
                 surrended = false;
                 Program.I().room.duelEnded = false;
+                Program.I().room.joinWithReconnect = false;
                 turns = 0;
                 deckReserved = false;
                 keys.Insert(0, currentMessageIndex);
@@ -1367,7 +1368,7 @@ public class Ocgcore : ServantWithCardDescription
                 gameField.currentPhase = GameField.ph.dp;
                 result = duelResult.disLink;
                 deckReserved = false;
-                isFirst = true;
+                //isFirst = true;
                 gameInfo.swaped = false;
                 logicalClearChain();
                 surrended = false;
@@ -3442,10 +3443,10 @@ public class Ocgcore : ServantWithCardDescription
                 if (finishable)
                 {
                     gameInfo.addHashedButton("sendSelected", 0, superButtonType.yes, InterString.Get("完成选择@ui"));
-                }
+                }
                 realizeCardsForSelect();
                 cardsSelected.Clear();
-                if (ES_selectHint != "")
+                if (ES_selectHint != "")
                     ES_selectUnselectHint = ES_selectHint;
                 if (ES_selectUnselectHint != "")
                 {
@@ -8817,8 +8818,9 @@ public class Ocgcore : ServantWithCardDescription
 
     public Dictionary<int, int> sideReference = new Dictionary<int, int>();
 
-    void onDuelResultConfirmed()
+    public void onDuelResultConfirmed()
     {
+        Program.I().room.joinWithReconnect = false;
 
         if (Program.I().room.duelEnded == true || surrended || TcpHelper.tcpClient == null || TcpHelper.tcpClient.Connected == false)
         {

Assets/SibylSystem/Room/Room.cs

@@ -496,6 +496,7 @@ public class Room : WindowServantSP
 
         Program.I().ocgcore.returnServant = Program.I().selectServer;
         needSide = false;
+        joinWithReconnect = true;
         if (Program.I().deckManager.isShowed)
         {
             Program.I().deckManager.hide();
@@ -572,12 +573,16 @@ public class Room : WindowServantSP
 
     public bool needSide = false;
 
+    public bool joinWithReconnect = false;
+
     public void StocMessage_ChangeSide(BinaryReader r)
     {
         Program.I().ocgcore.surrended = false;
         Program.I().ocgcore.returnServant = Program.I().deckManager;
         needSide = true;
-        
+        if(Program.I().ocgcore.condition != Ocgcore.Condition.duel || joinWithReconnect) { //Change side when reconnect
+            Program.I().ocgcore.onDuelResultConfirmed();
+        }
     }
 
     GameObject handres = null;