From a11398257b98ae3cf977e22700c98735afec96ef Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 04 九月 2025 23:55:14 +0800
Subject: [PATCH] 0312 优化自动战斗
---
Main/System/Main/AutoFightModel.cs | 3 +++
Main/System/ItemTip/OwnItemCell.cs | 2 +-
Main/System/Setting/QuickSetting.cs | 13 ++++++++++++-
Main/System/ItemTip/OwnMoneyCell.cs | 2 +-
Main/System/Battle/BattleField/StoryBattleField.cs | 3 ++-
5 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/Main/System/Battle/BattleField/StoryBattleField.cs b/Main/System/Battle/BattleField/StoryBattleField.cs
index 3cb2bfe..e265fc8 100644
--- a/Main/System/Battle/BattleField/StoryBattleField.cs
+++ b/Main/System/Battle/BattleField/StoryBattleField.cs
@@ -138,7 +138,8 @@
protected override void OnSettlement(JsonData turnFightStateData)
{
- RequestFight();
+ base.OnSettlement(turnFightStateData);
+ BattleManager.Instance.MainFightRequest(4);
}
diff --git a/Main/System/ItemTip/OwnItemCell.cs b/Main/System/ItemTip/OwnItemCell.cs
index cf84db2..1afcef7 100644
--- a/Main/System/ItemTip/OwnItemCell.cs
+++ b/Main/System/ItemTip/OwnItemCell.cs
@@ -46,7 +46,7 @@
{
if (itemID == 0)
{
- Debug.LogError("itemID == 0");
+ // Debug.LogError("itemID == 0");
return;
}
numText.text = UIHelper.ReplaceLargeNum(PackManager.Instance.GetItemCountByID(PackType.Item, itemID));
diff --git a/Main/System/ItemTip/OwnMoneyCell.cs b/Main/System/ItemTip/OwnMoneyCell.cs
index 93264d7..afd95cc 100644
--- a/Main/System/ItemTip/OwnMoneyCell.cs
+++ b/Main/System/ItemTip/OwnMoneyCell.cs
@@ -61,7 +61,7 @@
{
if (moneyType == 0)
{
- Debug.LogError("moneyType == 0");
+ // Debug.LogError("moneyType == 0");
return;
}
numText.text = UIHelper.ReplaceLargeNum(UIHelper.GetMoneyCnt(moneyType));
diff --git a/Main/System/Main/AutoFightModel.cs b/Main/System/Main/AutoFightModel.cs
index c0e1741..a2c62b2 100644
--- a/Main/System/Main/AutoFightModel.cs
+++ b/Main/System/Main/AutoFightModel.cs
@@ -91,6 +91,7 @@
ParseConfig();
DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += BeforePlayerInit;
BattleManager.Instance.onBattleFieldCreate += OnCreateBattleField;
+
EventBroadcast.Instance.AddListener<string, SkillConfig, TeamHero>(EventName.BATTLE_CAST_SKILL, OnSkillCast);
}
@@ -99,6 +100,7 @@
{
BattleManager.Instance.onBattleFieldCreate -= OnCreateBattleField;
DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent -= BeforePlayerInit;
+
}
@@ -131,6 +133,7 @@
if (storyBattleField != null && storyBattleField.GetBattleMode() != BattleMode.Stop)
{
//鎴樻枟涓敼鍙樻ā寮�
+ isAutoAttack = isAutoAttackSet;
storyBattleField.AutoSetBattleMode();
}
diff --git a/Main/System/Setting/QuickSetting.cs b/Main/System/Setting/QuickSetting.cs
index 2a8972a..99e836e 100644
--- a/Main/System/Setting/QuickSetting.cs
+++ b/Main/System/Setting/QuickSetting.cs
@@ -11,7 +11,7 @@
public class QuickSetting : Singleton<QuickSetting>
{
public QuickSetting()
- {
+ {
//鑷姩鎴樻枟 鍑犲�嶆秷鑰� 鍑犲�嶉�熷害 鏄惁楂樻垬鍔涘仠姝� 鏄惁寮�鍚嚜鍔ㄦ垬鏂�
quickSettingDic.Add(QuickSettingType.AutoFight_Cost, new QuickSettingRange(QuickSettingType.AutoFight_Cost, 0, 1));
quickSettingDic.Add(QuickSettingType.AutoFight_Speed, new QuickSettingRange(QuickSettingType.AutoFight_Speed, 1, 1));
@@ -19,6 +19,7 @@
quickSettingDic.Add(QuickSettingType.AutoFight_Open, new QuickSettingRange(QuickSettingType.AutoFight_Open, 3, 1));
setting = new string(UCharacter, 100);
DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += BeforePlayerDataInitializeEvent;
+ DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent += OnPlayerLoginOk;
}
public Dictionary<QuickSettingType, QuickSettingRange> quickSettingDic = new Dictionary<QuickSettingType, QuickSettingRange>();
@@ -139,6 +140,16 @@
PlayerDatas.Instance.baseData.Setting = setting;
}
+ private void OnPlayerLoginOk()
+ {
+ //鍒濆璁剧疆
+ if (PlayerDatas.Instance.baseData.LV == 1 && !AutoFightModel.Instance.isStopFightByBetterEquip)
+ {
+ AutoFightModel.Instance.isStopFightByBetterEquip = true;
+ AutoFightModel.Instance.SaveAutoFightSetting();
+ }
+ }
+
}
public enum QuickSettingType
--
Gitblit v1.8.0