Commit e589390d authored by SherryChaos's avatar SherryChaos

fix selectUnselect hint bug

parent 15bccc0f
...@@ -4399,10 +4399,15 @@ namespace MDPro3 ...@@ -4399,10 +4399,15 @@ namespace MDPro3
allOnfield = false; allOnfield = false;
break; break;
} }
if (!string.IsNullOrEmpty(ES_selectHint))
ES_selectUnselectHint = ES_selectHint;
if (string.IsNullOrEmpty(ES_selectUnselectHint))
ES_selectUnselectHint = InterString.Get("请选择卡片");
if (allOnfield) if (allOnfield)
FieldSelect(ES_selectHint, cardsInSelection, 1, 1, cancelable, finishable); FieldSelect(ES_selectUnselectHint, cardsInSelection, 1, 1, cancelable, finishable);
else else
ShowPopupSelectCard(ES_selectHint, cardsInSelection, 1, 1, cancelable, finishable); ShowPopupSelectCard(ES_selectUnselectHint, cardsInSelection, 1, 1, cancelable, finishable);
break; break;
case GameMessage.SelectSum: case GameMessage.SelectSum:
if (InIgnoranceReplay()) break; if (InIgnoranceReplay()) break;
...@@ -5518,7 +5523,7 @@ namespace MDPro3 ...@@ -5518,7 +5523,7 @@ namespace MDPro3
{ {
foreach (var place in places) foreach (var place in places)
place.InitializeSelectCardInThisZone(cards); place.InitializeSelectCardInThisZone(cards);
fieldHint = hint; fieldHint = string.IsNullOrEmpty(hint) ? InterString.Get("请选择卡片") : hint;
fieldMin = min; fieldMin = min;
fieldMax = max; fieldMax = max;
fieldExitable = exitable; fieldExitable = exitable;
...@@ -5749,13 +5754,10 @@ namespace MDPro3 ...@@ -5749,13 +5754,10 @@ namespace MDPro3
}; };
} }
string lastHint = string.Empty;
public void ShowPopupSelectCard(string hint, List<GameCard> cards, int min, int max, bool exitable, bool sendable) public void ShowPopupSelectCard(string hint, List<GameCard> cards, int min, int max, bool exitable, bool sendable)
{ {
if (string.IsNullOrEmpty(hint)) if (string.IsNullOrEmpty(hint))
hint = lastHint; hint = InterString.Get("请选择卡片");
else
lastHint = hint;
var handler = Addressables.InstantiateAsync("PopupDuelSelectCard"); var handler = Addressables.InstantiateAsync("PopupDuelSelectCard");
handler.Completed += (result) => handler.Completed += (result) =>
{ {
......
...@@ -328,14 +328,13 @@ namespace MDPro3.UI ...@@ -328,14 +328,13 @@ namespace MDPro3.UI
break; break;
case GameMessage.AnnounceCard: case GameMessage.AnnounceCard:
foreach (var mono in monos) foreach (var mono in monos)
{
if (mono.selected) if (mono.selected)
{ {
binaryMaster = new BinaryMaster(); binaryMaster = new BinaryMaster();
binaryMaster.writer.Write(mono.card.GetData().Id); binaryMaster.writer.Write(mono.card.GetData().Id);
Program.I().ocgcore.SendReturn(binaryMaster.Get()); Program.I().ocgcore.SendReturn(binaryMaster.Get());
} }
} Program.I().ocgcore.ClearAnnounceCards();
break; break;
case GameMessage.SortCard: case GameMessage.SortCard:
case GameMessage.SortChain: case GameMessage.SortChain:
......
...@@ -134,7 +134,7 @@ PlayerSettings: ...@@ -134,7 +134,7 @@ PlayerSettings:
16:10: 1 16:10: 1
16:9: 1 16:9: 1
Others: 1 Others: 1
bundleVersion: 1.0.7 bundleVersion: 1.0.8
preloadedAssets: [] preloadedAssets: []
metroInputSource: 0 metroInputSource: 0
wsaTransparentSwapchain: 0 wsaTransparentSwapchain: 0
...@@ -529,7 +529,7 @@ PlayerSettings: ...@@ -529,7 +529,7 @@ PlayerSettings:
m_APIs: 0b000000 m_APIs: 0b000000
m_Automatic: 1 m_Automatic: 1
- m_BuildTarget: WindowsStandaloneSupport - m_BuildTarget: WindowsStandaloneSupport
m_APIs: 0200000012000000150000000b000000 m_APIs: 0b000000020000001200000015000000
m_Automatic: 0 m_Automatic: 0
m_BuildTargetVRSettings: m_BuildTargetVRSettings:
- m_BuildTarget: Standalone - m_BuildTarget: Standalone
......
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