Skip to content

M
MDPro3
Commit 0fd6be1f authored by SherryChaos's avatar SherryChaos
Browse files
Options

PopupDuelSelectCard returnAction bug fix

parent f155bde6
Expand all Show whitespace changes
Inline Side-by-side
Showing with 37 additions and 11 deletions
Assets/Fonts/SourceHanSansSC-Medium SDF.asset
View file @ 0fd6be1f
This diff is collapsed.
Assets/Scripts/MDPro3/UI/Popup/PopupDuelSelectCard.cs
View file @ 0fd6be1f
...@@ -126,6 +126,10 @@ namespace MDPro3.UI ...@@ -126,6 +126,10 @@ namespace MDPro3.UI
{ {
base.Show(); base.Show();
Program.I().currentServant.returnAction = OnCancel; Program.I().currentServant.returnAction = OnCancel;
if (!exitable)
Program.I().currentServant.returnAction = FieldView;
if (Program.I().ocgcore.currentMessage == GameMessage.ConfirmCards)
Program.I().currentServant.returnAction = OnFinish;
} }
void Refresh() void Refresh()
...@@ -373,7 +377,6 @@ namespace MDPro3.UI ...@@ -373,7 +377,6 @@ namespace MDPro3.UI
public override void OnCancel() public override void OnCancel()
{ {
//Debug.Log("OnCancel: " + core.currentMessage);
base.OnCancel(); base.OnCancel();
if (!exitable) if (!exitable)
return; return;
......
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