From e18e6f74e211bfb65747cac364f942b41620645c Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 14 十一月 2025 18:18:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Main/MainWin.cs | 12 ++++++++++++
1 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/Main/System/Main/MainWin.cs b/Main/System/Main/MainWin.cs
index 5e187a7..25c339a 100644
--- a/Main/System/Main/MainWin.cs
+++ b/Main/System/Main/MainWin.cs
@@ -28,6 +28,7 @@
[SerializeField] UIEffectPlayer openCloseAnim;
[SerializeField] FillTween cdTween;
[SerializeField] Text hammerText;
+ [SerializeField] Text multiFightText;
bool isForcePlayFightUIAnim = true; //寮哄埗鎾斁鎴樻枟閿ゅ瓙妗嗗姩鐢�
@@ -54,6 +55,7 @@
PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefresh;
AutoFightModel.Instance.OnFightEvent += OnSkillCast;
RenameManager.Instance.OnUpdateRenameResultEvent += OnUpdateRenameResultEvent;
+ UIManager.Instance.OnCloseWindow += OnCloseWindow;
base.OnPreOpen();
// 鍒锋柊UI
@@ -65,6 +67,7 @@
PlayerDatas.Instance.playerDataRefreshEvent -= PlayerDataRefresh;
AutoFightModel.Instance.OnFightEvent -= OnSkillCast;
RenameManager.Instance.OnUpdateRenameResultEvent -= OnUpdateRenameResultEvent;
+ UIManager.Instance.OnCloseWindow -= OnCloseWindow;
base.OnPreClose();
isForcePlayFightUIAnim = true;
}
@@ -79,6 +82,13 @@
topBar.SetActive(functionOrder == 0 || functionOrder == 2);
}
+ void OnCloseWindow(UIBase _ui)
+ {
+ if (_ui.name == "AutoFightWin")
+ {
+ multiFightText.text = Language.Get("MultiFight", AutoFightModel.Instance.fightCost);
+ }
+ }
//鎴樻枟鎸夐挳鍔ㄧ敾
void ClickAnimation(int index)
@@ -293,6 +303,7 @@
fightOtherWinBG.SetActive(false);
fightOtherWinWarnImg.SetActive(false);
fightBG.SetActive(true);
+ multiFightText.text = Language.Get("MultiFight", AutoFightModel.Instance.fightCost);
if (BattleManager.Instance.storyBattleField != null &&
@@ -313,6 +324,7 @@
{
//闈炰富鍩庣晫闈�
fightOtherWinBG.SetActive(true);
+ multiFightText.text = "";
fightBG.SetActive(false);
if (BattleManager.Instance.storyBattleField != null &&
BattleManager.Instance.storyBattleField.GetBattleMode() == BattleMode.Stop)
--
Gitblit v1.8.0