From 0fc013dc8d4d503ac5312512f805c7350f4f68f7 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期五, 24 十月 2025 17:46:00 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts

---
 Main/System/ChallengeTab/ChallengeTabWin.cs    |    2 --
 Main/System/Battle/BoneFieldBattleWin.cs       |    4 ++--
 Main/System/ChallengeTab/ChallengeTabButton.cs |    6 ++++++
 Main/System/Battle/ArenaBattleWin.cs           |    7 ++-----
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/Main/System/Battle/ArenaBattleWin.cs b/Main/System/Battle/ArenaBattleWin.cs
index cd0b4d7..4fdeba4 100644
--- a/Main/System/Battle/ArenaBattleWin.cs
+++ b/Main/System/Battle/ArenaBattleWin.cs
@@ -70,15 +70,13 @@
     protected override void OnPreOpen()
     {
         base.OnPreOpen();
-        // SetBattleField(BattleManager.Instance.storyBattleField);
         MainWin.TabChangeEvent += OnTabChangeEvent;
         BattleManager.Instance.onBattleFieldCreate += OnCreateBattleField;
         EventBroadcast.Instance.AddListener<BattleDmgInfo>(EventName.BATTLE_DAMAGE_TAKEN, OnDamageTaken);
         EventBroadcast.Instance.AddListener<string, JsonData>(EventName.BATTLE_END, OnBattleEnd);
-
         BattleManager.Instance.storyBattleField.IsPause = true;
         bool isOpenBattleChangeTab = IsOpenBattleChangeTab();
-        transButtons.localPosition = new Vector3(0, isOpenBattleChangeTab ? 200 : 0, 0);
+        transButtons.localPosition = new Vector3(0, isOpenBattleChangeTab ? 130 : 0, 0);
         if (isOpenBattleChangeTab)
         {
             UIManager.Instance.GetUI<MainWin>()?.CloseSubUI();
@@ -149,7 +147,7 @@
             battleRootNode.transform.SetParent(Launch.Instance.transform);
             battleRootNode.transform.localPosition = new Vector3(-10000, -10000, 0);
         }
-        
+
         if (battleField != null)
         {
             battleField.OnRoundChange -= OnRoundChange;
@@ -320,5 +318,4 @@
     {
         return FuncOpen.Instance.IsFuncOpen(ArenaManager.Instance.BattleChangeTabFuncId);
     }
-
 }
diff --git a/Main/System/Battle/BoneFieldBattleWin.cs b/Main/System/Battle/BoneFieldBattleWin.cs
index bbf8790..0e55903 100644
--- a/Main/System/Battle/BoneFieldBattleWin.cs
+++ b/Main/System/Battle/BoneFieldBattleWin.cs
@@ -63,14 +63,13 @@
     protected override void OnPreOpen()
     {
         base.OnPreOpen();
-        // SetBattleField(BattleManager.Instance.storyBattleField);
         MainWin.TabChangeEvent += OnTabChangeEvent;
         BattleManager.Instance.onBattleFieldCreate += OnCreateBattleField;
         EventBroadcast.Instance.AddListener<BattleDmgInfo>(EventName.BATTLE_DAMAGE_TAKEN, OnDamageTaken);
         EventBroadcast.Instance.AddListener<string, SkillConfig, TeamHero>(EventName.BATTLE_CAST_SKILL, OnCastSkill);
         BattleManager.Instance.storyBattleField.IsPause = true;
         bool isOpenBattleChangeTab = IsOpenBattleChangeTab();
-        transButtons.localPosition = new Vector3(0, isOpenBattleChangeTab ? 200 : 0, 0);
+        transButtons.localPosition = new Vector3(0, isOpenBattleChangeTab ? 130 : 0, 0);
         if (isOpenBattleChangeTab)
         {
             UIManager.Instance.GetUI<MainWin>()?.CloseSubUI();
@@ -345,4 +344,5 @@
     {
         return FuncOpen.Instance.IsFuncOpen(ArenaManager.Instance.BattleChangeTabFuncId);
     }
+
 }
diff --git a/Main/System/ChallengeTab/ChallengeTabButton.cs b/Main/System/ChallengeTab/ChallengeTabButton.cs
index 0d31545..38ac43f 100644
--- a/Main/System/ChallengeTab/ChallengeTabButton.cs
+++ b/Main/System/ChallengeTab/ChallengeTabButton.cs
@@ -16,6 +16,12 @@
     {
         btnTab.SetListener(() =>
         {
+            UIManager.Instance.CloseWindow<ChallengeTabWin>();
+            string activeBattleName = BattleManager.Instance.GetActiveBattleName();
+            if (activeBattleName != "" && activeBattleName != "StoryBattleField")
+            {
+                UIManager.Instance.GetUI<MainWin>().ClickFunc(0);
+            }
             action?.Invoke();
         });
     }
diff --git a/Main/System/ChallengeTab/ChallengeTabWin.cs b/Main/System/ChallengeTab/ChallengeTabWin.cs
index 5bf2086..278206f 100644
--- a/Main/System/ChallengeTab/ChallengeTabWin.cs
+++ b/Main/System/ChallengeTab/ChallengeTabWin.cs
@@ -87,7 +87,6 @@
         string lockInfo = !isLock ? Language.Get("Challenge02") : string.Empty;
         btnArena.Display(index, redpointId, isLock, countInfo, lockInfo, () =>
         {
-            UIManager.Instance.CloseWindow<ChallengeTabWin>();
             if (!FuncOpen.Instance.IsFuncOpen(funcId, true))
                 return;
             BattleField arenaBattle = BattleManager.Instance.GetBattleFieldByMapID(3);
@@ -123,7 +122,6 @@
         string lockInfo = !isLock ? Language.Get("Challenge02") : string.Empty;
         btnBoneField.Display(index, redpointId, isLock, countInfo, lockInfo, () =>
         {
-            UIManager.Instance.CloseWindow<ChallengeTabWin>();
             if (!FuncOpen.Instance.IsFuncOpen(funcId, true))
                 return;
             BattleField battleField = BattleManager.Instance.GetBattleFieldByMapID(30010);

--
Gitblit v1.8.0