From ac93e899d5c6331e89ccae552ecbb502a9652d01 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期二, 27 一月 2026 18:49:43 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts
---
Main/System/Main/HomeWin.cs | 18 +++++-------------
1 files changed, 5 insertions(+), 13 deletions(-)
diff --git a/Main/System/Main/HomeWin.cs b/Main/System/Main/HomeWin.cs
index 91d98ff..734d192 100644
--- a/Main/System/Main/HomeWin.cs
+++ b/Main/System/Main/HomeWin.cs
@@ -250,6 +250,7 @@
TaskManager.Instance.OnTaskUpdate += UpdateTask;
BlessLVManager.Instance.OnBlessLVUpdateEvent += ShowBlessLV;
AutoFightModel.Instance.ChangeAutoEvent += DisplayAutoFight;
+ AutoFightModel.Instance.AutoAttackEvent += OnAutoAttackEvent;
AutoFightModel.Instance.OnFightEvent += ChangeMode;
TeamManager.Instance.OnTeamChange += DisplayCard;
UIManager.Instance.OnCloseWindow += OnCloseWindow;
@@ -266,7 +267,6 @@
TimeMgr.Instance.OnDayEvent += OnDayEvent;
ChatManager.Instance.OnUpdateTalkEvent += OnUpdateTalkEvent;
UIManager.Instance.OnOpenWindow += OnOpenWindow;
- AutoFightModel.Instance.OnAutoChallengeBossEvent += OnAutoChallengeBossEvent;
TryPlayAutoFightBoss();
Display();
DisplayFirstChargeBtn();
@@ -285,6 +285,7 @@
TaskManager.Instance.OnTaskUpdate -= UpdateTask;
BlessLVManager.Instance.OnBlessLVUpdateEvent -= ShowBlessLV;
AutoFightModel.Instance.ChangeAutoEvent -= DisplayAutoFight;
+ AutoFightModel.Instance.AutoAttackEvent -= OnAutoAttackEvent;
AutoFightModel.Instance.OnFightEvent -= ChangeMode;
TeamManager.Instance.OnTeamChange -= DisplayCard;
UIManager.Instance.OnCloseWindow -= OnCloseWindow;
@@ -301,22 +302,13 @@
TimeMgr.Instance.OnDayEvent -= OnDayEvent;
ChatManager.Instance.OnUpdateTalkEvent -= OnUpdateTalkEvent;
UIManager.Instance.OnOpenWindow -= OnOpenWindow;
- AutoFightModel.Instance.OnAutoChallengeBossEvent += OnAutoChallengeBossEvent;
-
// 鍏抽棴鐨勬椂鍊欐妸鎴樻枟鐣岄潰涔熺粰鍏充簡 铏界劧鏄湪澶栭潰寮�鐨�
UIManager.Instance.CloseWindow<BattleWin>();
}
- private void OnAutoChallengeBossEvent(bool isStart)
+ private void OnAutoAttackEvent()
{
- if (isStart)
- {
- autoFightBossUIEffectPlayer.Play();
- }
- else
- {
- autoFightBossUIEffectPlayer.Stop();
- }
+ TryPlayAutoFightBoss();
}
private void OnOpenWindow(UIBase win)
@@ -527,7 +519,7 @@
void TryPlayAutoFightBoss()
{
autoFightBossUIEffectPlayer.Stop();
- if (AutoFightModel.Instance.isAutoAttackSet && AutoFightModel.Instance.isAutoChallengeBoss)
+ if (AutoFightModel.Instance.isAutoAttackSet && AutoFightModel.Instance.isAutoAttack && AutoFightModel.Instance.isAutoChallengeBoss)
{
autoFightBossUIEffectPlayer.Play();
}
--
Gitblit v1.8.0