From 4145075707a34f925235d74306788b186328eac3 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期二, 21 十月 2025 15:56:25 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/System/Battle/BattleManager.cs |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)

diff --git a/Main/System/Battle/BattleManager.cs b/Main/System/Battle/BattleManager.cs
index 58a9b27..732c309 100644
--- a/Main/System/Battle/BattleManager.cs
+++ b/Main/System/Battle/BattleManager.cs
@@ -24,6 +24,10 @@
         }
     }
 
+    public int fightGuideID;
+    public int fightGuideMainLevelLimit;
+    public int fightGuideNoClickSeconds;
+
     public Action<string, BattleField> onBattleFieldCreate;
 
     public Action<string, BattleField> onBattleFieldDestroy;
@@ -45,6 +49,11 @@
     {
         var config = FuncConfigConfig.Get("AutoGuaji");
         speedGear = JsonMapper.ToObject<float[]>(config.Numerical4);
+
+        config = FuncConfigConfig.Get("FightGuide");
+        fightGuideID = int.Parse(config.Numerical1);
+        fightGuideMainLevelLimit = int.Parse(config.Numerical2);
+        fightGuideNoClickSeconds = int.Parse(config.Numerical3);
     }
 
 
@@ -576,4 +585,24 @@
 
         return null;
     }
+
+    /// <summary>
+    /// 妫�鏌ユ槸鍚︽湁闈炰富绾挎垬鏂楋紙濡傜珵鎶�鍦恒�佺櫧楠ㄧ瓑锛夋鍦ㄨ繘琛�
+    /// </summary>
+    /// <returns>濡傛灉鏈変换浣曢潪涓荤嚎鎴樻枟涓旀湭缁撴潫锛屽垯杩斿洖true</returns>
+    public bool IsOtherBattleInProgress()
+    {
+        foreach (var kvp in battleFields)
+        {
+            BattleField battleField = kvp.Value;
+            // 妫�鏌ユ垬鍦烘槸鍚︽湁鏁堜笖灏氭湭缁撴潫
+            if (battleField == null || battleField.IsBattleFinish)
+                continue;
+            // MapID 1 (StoryBattleField) 鍜� 2 (StoryBossBattleField) 閮芥槸涓荤嚎
+            if (battleField.MapID == 1 || battleField.MapID == 2)
+                continue;
+            return true;
+        }
+        return false;
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0