From e720efce7c9f50a3fef7dd82e850e08543e8ac41 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期三, 10 十二月 2025 15:35:41 +0800
Subject: [PATCH] 125 战斗 修复主线BOSS跨章节多次请求主线战斗的问题
---
Main/System/Battle/BattleField/BattleField.cs | 2 +-
Main/System/Main/AutoFightModel.cs | 9 ++-------
Main/System/Battle/BattleField/StoryBossBattleField.cs | 2 --
Main/System/MainLevel/MainBossEnterWin.cs | 2 +-
4 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/Main/System/Battle/BattleField/BattleField.cs b/Main/System/Battle/BattleField/BattleField.cs
index 4fa22d1..88a7499 100644
--- a/Main/System/Battle/BattleField/BattleField.cs
+++ b/Main/System/Battle/BattleField/BattleField.cs
@@ -674,7 +674,7 @@
battleEffectMgr.HaveRest();
battleTweenMgr.HaveRest();
recordPlayer.HaveRest();
- battleObjMgr.HaveRest(BattleCamp.Blue);
+ battleObjMgr.HaveRest(BattleCamp.Red);
battleObjMgr.DestroyTeam(BattleCamp.Blue);
BattleManager.Instance.ClearStoryQueue();
SetBattleStartState();
diff --git a/Main/System/Battle/BattleField/StoryBossBattleField.cs b/Main/System/Battle/BattleField/StoryBossBattleField.cs
index 24cf725..efd3f12 100644
--- a/Main/System/Battle/BattleField/StoryBossBattleField.cs
+++ b/Main/System/Battle/BattleField/StoryBossBattleField.cs
@@ -80,8 +80,6 @@
base.OnSettlement(turnFightStateData);
BattleManager.Instance.MainFightRequest(2);
- BattleManager.Instance.MainFightRequest(4);
- AutoFightModel.Instance.ApplyAutoFightToSettings();
}
public override void WhaleFall()
diff --git a/Main/System/Main/AutoFightModel.cs b/Main/System/Main/AutoFightModel.cs
index f21dd38..0cf11c9 100644
--- a/Main/System/Main/AutoFightModel.cs
+++ b/Main/System/Main/AutoFightModel.cs
@@ -141,17 +141,12 @@
if (storyBattleField != null && storyBattleField.GetBattleMode() != BattleMode.Stop)
{
//鎴樻枟涓敼鍙樻ā寮�
- ApplyAutoFightToSettings();
+ isAutoAttack = isAutoAttackSet;
+ storyBattleField.AutoSetBattleMode();
}
QuickSetting.Instance.SendPackage();
ChangeAutoEvent?.Invoke();
- }
-
- public void ApplyAutoFightToSettings()
- {
- isAutoAttack = isAutoAttackSet;
- BattleManager.Instance.storyBattleField?.AutoSetBattleMode();
}
diff --git a/Main/System/MainLevel/MainBossEnterWin.cs b/Main/System/MainLevel/MainBossEnterWin.cs
index fabe473..627c9b2 100644
--- a/Main/System/MainLevel/MainBossEnterWin.cs
+++ b/Main/System/MainLevel/MainBossEnterWin.cs
@@ -146,7 +146,7 @@
BattleManager.Instance.SendTurnFight(2);
BattleManager.Instance.storyBattleField.CleanBattle();
AutoFightModel.Instance.isPause = true;
- AutoFightModel.Instance.isAutoAttack = false;
+ // AutoFightModel.Instance.isAutoAttack = false;
}
CloseWindow();
}
--
Gitblit v1.8.0