From b1f98c42a6b859b35c26e0722efb38a6e9c215be Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 22 十月 2025 11:25:33 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/ChallengeTab/ChallengeTabWin.cs | 16 ++++++++++------
1 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/Main/System/ChallengeTab/ChallengeTabWin.cs b/Main/System/ChallengeTab/ChallengeTabWin.cs
index 968824d..bc04981 100644
--- a/Main/System/ChallengeTab/ChallengeTabWin.cs
+++ b/Main/System/ChallengeTab/ChallengeTabWin.cs
@@ -5,7 +5,7 @@
{
[SerializeField] ChallengeTabButton btnBoneField;
[SerializeField] ChallengeTabButton btnArena;
- public static Action OnCloseChallengeTabWin;
+
protected override void InitComponent()
{
base.InitComponent();
@@ -28,7 +28,7 @@
TimeMgr.Instance.OnDayEvent -= OnDayEvent;
FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
PlayerDatas.Instance.playerDataRefreshEvent += PlayerDataRefresh;
- OnCloseChallengeTabWin?.Invoke();
+ UIManager.Instance.GetUI<MainWin>()?.RestoreFuncBtn();
}
private void OnDayEvent()
{
@@ -93,12 +93,16 @@
BattleField arenaBattle = BattleManager.Instance.GetBattleFieldByMapID(3);
if (arenaBattle != null)
{
- ArenaBattleWin fsBattleWin = UIManager.Instance.GetUI<ArenaBattleWin>();
- if (null == fsBattleWin)
+ ArenaBattleWin battleWin;
+ if (!UIManager.Instance.IsOpened<ArenaBattleWin>())
{
- fsBattleWin = UIManager.Instance.OpenWindow<ArenaBattleWin>();
+ battleWin = UIManager.Instance.OpenWindow<ArenaBattleWin>();
}
- fsBattleWin.SetBattleField(arenaBattle);
+ else
+ {
+ battleWin = UIManager.Instance.GetUI<ArenaBattleWin>();
+ }
+ battleWin.SetBattleField(arenaBattle);
}
else
{
--
Gitblit v1.8.0