Commit 5165fc04 authored by nanahira's avatar nanahira Committed by mercury233

improve reconnecting (#1)

parent a1cebbd1
......@@ -1302,6 +1302,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);
......@@ -1366,7 +1367,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;
......@@ -3441,10 +3442,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 != "")
{
......@@ -8816,8 +8817,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)
{
......
......@@ -308,6 +308,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();
......@@ -384,12 +385,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;
......
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