From 35b127fdcfb7e0c55babcce20d158795eb6ac590 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 15 十二月 2025 11:36:30 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts
---
Main/System/Battle/BattleManager.cs | 2 +-
Main/System/Battle/BaseBattleWin.cs | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Main/System/Battle/BaseBattleWin.cs b/Main/System/Battle/BaseBattleWin.cs
index c8f3ac3..c8e3f4a 100644
--- a/Main/System/Battle/BaseBattleWin.cs
+++ b/Main/System/Battle/BaseBattleWin.cs
@@ -65,7 +65,7 @@
if (BattleManager.Instance.storyBattleField != null)
BattleManager.Instance.storyBattleField.IsPause = false;
- battleField?.SetFocus(false);
+ // battleField?.SetFocus(false);
if (battleField != null)
{
diff --git a/Main/System/Battle/BattleManager.cs b/Main/System/Battle/BattleManager.cs
index 2bc46a9..6be3a7a 100644
--- a/Main/System/Battle/BattleManager.cs
+++ b/Main/System/Battle/BattleManager.cs
@@ -707,7 +707,7 @@
if (bf == null)
continue;
- if (bf == battleField)
+ if (bf.guid == battleField.guid)
{
bf.SetFocus(true);
}
--
Gitblit v1.8.0