Commit 863cea17 authored by nanahira's avatar nanahira

Merge branch 'patch-575' into 'master'

skip HINTMSG_FIELD_FIRST

See merge request !5
parents 6cfab698 8d23a47c
Pipeline #27491 canceled with stages
in 55 seconds
...@@ -102,6 +102,8 @@ public class Ocgcore : ServantWithCardDescription ...@@ -102,6 +102,8 @@ public class Ocgcore : ServantWithCardDescription
private string ES_selectUnselectHint = ""; private string ES_selectUnselectHint = "";
private bool ES_selectCardFromFieldFirstFlag = false;
private int ES_sortSum; private int ES_sortSum;
private string ES_turnString = ""; private string ES_turnString = "";
...@@ -2554,6 +2556,7 @@ public class Ocgcore : ServantWithCardDescription ...@@ -2554,6 +2556,7 @@ public class Ocgcore : ServantWithCardDescription
data = (data >> 16) | (data << 16); data = (data >> 16) | (data << 16);
RMSshow_none(InterString.Get("区域选择:[?]", GameStringHelper.zone(data))); RMSshow_none(InterString.Get("区域选择:[?]", GameStringHelper.zone(data)));
} }
ES_selectCardFromFieldFirstFlag = (type == 3 && data == 575);
break; break;
case GameMessage.MissedEffect: case GameMessage.MissedEffect:
...@@ -3024,7 +3027,14 @@ public class Ocgcore : ServantWithCardDescription ...@@ -3024,7 +3027,14 @@ public class Ocgcore : ServantWithCardDescription
allCardsInSelectMessage.Add(card); allCardsInSelectMessage.Add(card);
} }
} }
if(ES_selectCardFromFieldFirstFlag && cancalable)
{
ES_selectCardFromFieldFirstFlag = false;
binaryMaster = new BinaryMaster();
binaryMaster.writer.Write(-1);
sendReturn(binaryMaster.get());
break;
}
if (cancalable) if (cancalable)
gameInfo.addHashedButton("cancleSelected", -1, superButtonType.no, InterString.Get("取消选择@ui")); gameInfo.addHashedButton("cancleSelected", -1, superButtonType.no, InterString.Get("取消选择@ui"));
realizeCardsForSelect(); realizeCardsForSelect();
......
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