From b31fb31bbbe84447b5a38271342eceb624a6bc1e Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 24 十月 2025 15:00:58 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Battle/StoryBossBattleWin.cs | 4 ++--
Main/System/Battle/BoneFieldBattleWin.cs | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/Main/System/Battle/BoneFieldBattleWin.cs b/Main/System/Battle/BoneFieldBattleWin.cs
index a3445c0..bbf8790 100644
--- a/Main/System/Battle/BoneFieldBattleWin.cs
+++ b/Main/System/Battle/BoneFieldBattleWin.cs
@@ -91,7 +91,7 @@
EventBroadcast.Instance.RemoveListener<BattleDmgInfo>(EventName.BATTLE_DAMAGE_TAKEN, OnDamageTaken);
EventBroadcast.Instance.RemoveListener<string, SkillConfig, TeamHero>(EventName.BATTLE_CAST_SKILL, OnCastSkill);
UIManager.Instance.CloseWindow<BattleHUDWin>();
-
+ BattleManager.Instance.storyBattleField.IsPause = false;
bool isOpenBattleChangeTab = IsOpenBattleChangeTab();
if (isOpenBattleChangeTab)
{
diff --git a/Main/System/Battle/StoryBossBattleWin.cs b/Main/System/Battle/StoryBossBattleWin.cs
index c821d4e..1352eef 100644
--- a/Main/System/Battle/StoryBossBattleWin.cs
+++ b/Main/System/Battle/StoryBossBattleWin.cs
@@ -92,7 +92,7 @@
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;
UIManager.Instance.CloseWindow<MainWin>();
}
@@ -106,7 +106,7 @@
EventBroadcast.Instance.RemoveListener<string, SkillConfig, TeamHero>(EventName.BATTLE_CAST_SKILL, OnCastSkill);
UIManager.Instance.CloseWindow<BattleHUDWin>();
-
+ BattleManager.Instance.storyBattleField.IsPause = false;
if (!UIManager.Instance.IsOpened<MainWin>())
UIManager.Instance.OpenWindow<MainWin>();
--
Gitblit v1.8.0