From 89343a7a0909e5244a3b69c4db1294de4536243b Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期一, 15 十二月 2025 18:15:22 +0800
Subject: [PATCH] 262 幻境阁系统-客户端 新增仅适用武将解锁的头像和形象的红点移除规则

---
 Main/System/Main/MainWin.cs |   45 +++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/Main/System/Main/MainWin.cs b/Main/System/Main/MainWin.cs
index 598f84b..cad55b9 100644
--- a/Main/System/Main/MainWin.cs
+++ b/Main/System/Main/MainWin.cs
@@ -27,6 +27,7 @@
     [SerializeField] UIEffectPlayer fightEffect;
     [SerializeField] UIEffectPlayer openCloseAnim;
     [SerializeField] FillTween cdTween;
+    [SerializeField] Transform nextCantAttackMask;
     [SerializeField] Text hammerText;
     [SerializeField] Text multiFightText;
 
@@ -56,6 +57,8 @@
         AutoFightModel.Instance.OnFightEvent += OnSkillCast;
         RenameManager.Instance.OnUpdateRenameResultEvent += OnUpdateRenameResultEvent;
         UIManager.Instance.OnCloseWindow += OnCloseWindow;
+        GlobalTimeEvent.Instance.MSEvent += OnMSEvent;
+        EventBroadcast.Instance.AddListener<string>(EventName.BATTLE_START, OnBattleStart);
         base.OnPreOpen();
 
         // 鍒锋柊UI
@@ -68,6 +71,9 @@
         AutoFightModel.Instance.OnFightEvent -= OnSkillCast;
         RenameManager.Instance.OnUpdateRenameResultEvent -= OnUpdateRenameResultEvent;
         UIManager.Instance.OnCloseWindow -= OnCloseWindow;
+        GlobalTimeEvent.Instance.MSEvent -= OnMSEvent;
+        EventBroadcast.Instance.RemoveListener<string>(EventName.BATTLE_START, OnBattleStart);
+
         base.OnPreClose();
         isForcePlayFightUIAnim = true;
     }
@@ -191,6 +197,7 @@
         {
             if (currentSubUI != null && currentSubUI.name == "HomeWin")
             {
+                fightEffect.Play();
                 //鎵嬪姩鑷姩涓�璧峰鐞�
                 AutoFightModel.Instance.StartFight();
             }
@@ -340,13 +347,32 @@
         }
     }
 
+    void OnBattleStart(string guid)
+    {
+        if (string.IsNullOrEmpty(guid))
+        {
+            var tmpHero = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero("");
+            if (tmpHero != null)
+            {
+                AutoFightModel.Instance.fightingHeroSkinID = tmpHero.SkinID;
+            }
+            else
+            {
+                Debug.LogError("娌℃湁鎵惧埌涓嬩竴涓敾鍑绘灏�");
+                return;
+            }
 
+            fightHeroImg.SetOrgSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon, "HeroHead");
+        }
+    }
 
     void RefreshFightIng(bool isfighting = false)
     {
         if (isfighting)
         {
-            fightEffect.Play();
+            if (!fightEffect.isPlaying)
+                fightEffect.Play();
+            nextCantAttackMask.localScale = Vector3.zero;
             cdTween.SetStartState();
             cdTween.Play(() =>
             {
@@ -355,6 +381,7 @@
                 {
                     AutoFightModel.Instance.fightingHeroSkinID = tmpHero.SkinID;
                     fightHeroImg.SetOrgSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon, "HeroHead");
+                    nextCantAttackMask.localScale = Vector3.one;
                 }
             });
             fightHeroScale.SetStartState();
@@ -383,6 +410,17 @@
         }
 
         fightHeroImg.SetOrgSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon, "HeroHead");
+    }
+
+    void OnMSEvent()
+    {
+        if (nextCantAttackMask.localScale == Vector3.one)
+        {
+            if (BattleManager.Instance.storyBattleField.IsCanRequestFight())
+            {
+                nextCantAttackMask.localScale = Vector3.zero;
+            }
+        }
     }
 
     void OnSkillCast(bool isfighting)
@@ -451,15 +489,18 @@
         {
             if (currentSubUI != null && currentSubUI.IsActive())
             {
-                // RestoreFuncBtn 閫犳垚
+                //鐐瑰嚮鎸戞垬鏍囩鍙堝叧闂椂锛屼細瑙﹀彂 RestoreFuncBtn 閫犳垚
                 return;
             }
         }
 
         if (functionOrder != -1)
         {
+            //涓诲姩鐐瑰嚮鍔熻兘鏍忕殑鎯呭喌
             lastWinOrder = functionOrder;
         }
+
+        //lastWinOrder 鏄粯璁ゆ仮澶嶄娇鐢�
         if (lastWinOrder == -1)
         {
             lastWinOrder = 0;

--
Gitblit v1.8.0