Commit 27edbc11 authored by nanahira's avatar nanahira

fix reconnect

parent f64ddda2
...@@ -1366,7 +1366,7 @@ public class Ocgcore : ServantWithCardDescription ...@@ -1366,7 +1366,7 @@ public class Ocgcore : ServantWithCardDescription
gameField.currentPhase = GameField.ph.dp; gameField.currentPhase = GameField.ph.dp;
result = duelResult.disLink; result = duelResult.disLink;
deckReserved = false; deckReserved = false;
isFirst = true; //isFirst = true;
gameInfo.swaped = false; gameInfo.swaped = false;
logicalClearChain(); logicalClearChain();
surrended = false; surrended = false;
...@@ -8816,7 +8816,7 @@ public class Ocgcore : ServantWithCardDescription ...@@ -8816,7 +8816,7 @@ public class Ocgcore : ServantWithCardDescription
public Dictionary<int, int> sideReference = new Dictionary<int, int>(); public Dictionary<int, int> sideReference = new Dictionary<int, int>();
void onDuelResultConfirmed() public void onDuelResultConfirmed()
{ {
if (Program.I().room.duelEnded == true || surrended || TcpHelper.tcpClient == null || TcpHelper.tcpClient.Connected == false) if (Program.I().room.duelEnded == true || surrended || TcpHelper.tcpClient == null || TcpHelper.tcpClient.Connected == false)
......
...@@ -386,7 +386,9 @@ public class Room : WindowServantSP ...@@ -386,7 +386,9 @@ public class Room : WindowServantSP
Program.I().ocgcore.surrended = false; Program.I().ocgcore.surrended = false;
Program.I().ocgcore.returnServant = Program.I().deckManager; Program.I().ocgcore.returnServant = Program.I().deckManager;
needSide = true; needSide = true;
if(Program.I().ocgcore.condition != Ocgcore.Condition.duel) { //Change side when reconnect
Program.I().ocgcore.onDuelResultConfirmed();
}
} }
GameObject handres = null; GameObject handres = null;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment