From 3b2a6bb9047cfce9f501593b3669a9c1af6c5df4 Mon Sep 17 00:00:00 2001
From: lcy <1459594991@qq.com>
Date: 星期三, 05 十一月 2025 17:40:23 +0800
Subject: [PATCH] 130 战斗修改回合样式

---
 Main/System/Main/HomeWin.cs |   61 ++++++++++++++++++++----------
 1 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/Main/System/Main/HomeWin.cs b/Main/System/Main/HomeWin.cs
index e3d2826..fdac2ad 100644
--- a/Main/System/Main/HomeWin.cs
+++ b/Main/System/Main/HomeWin.cs
@@ -52,8 +52,10 @@
     [SerializeField] Text blessLVText;
     [SerializeField] Button mailBtn;
 
-    //鍏朵粬鍔熻兘鍏ュ彛
-    [SerializeField] Button monthCardBtn;
+    //鍙充晶鍔熻兘
+    [SerializeField] Button funcColBtn;
+    [SerializeField] RightFuncInHome rightFuncInHome;
+
     [SerializeField] Button FirstChargeBtn;
 
     /// <summary>
@@ -72,7 +74,7 @@
 
         autoBtn.AddListener(() =>
         {
-            if (!FuncOpen.Instance.IsFuncOpen(108, true))
+            if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.AutoFight, true))
             {
                 return;
             }
@@ -80,10 +82,7 @@
         });
 
 
-        monthCardBtn.AddListener(() =>
-        {
-            InvestModel.Instance.BuyInvest(InvestModel.monthCardType);
-        });
+
 
         FirstChargeBtn.AddListener(() =>
         {
@@ -92,6 +91,10 @@
 
         blessLVBtn.AddListener(() =>
         {
+            if (!FuncOpen.Instance.IsFuncOpen((int)FuncOpenEnum.BlessLV, true))
+            {
+                return;
+            }
             UIManager.Instance.OpenWindow<BlessLVWin>();
         });
 
@@ -108,6 +111,10 @@
         });
 
         restBtn.AddListener(GotoRest);
+        funcColBtn.AddListener(()=>
+        {
+            rightFuncInHome.ShowFuncCol(true);
+        });
     }
 
 
@@ -124,6 +131,7 @@
         DisplayLevel();
         DisplayRestState();
 
+        funcColBtn.SetActive(FuncOpen.Instance.IsFuncOpen(GeneralDefine.mainRightFuncOpenFuncID));
     }
 
     protected override void OnPreOpen()
@@ -138,6 +146,7 @@
         FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChange;
         FirstChargeManager.Instance.OnUpdateFirstChargeInfo += OnUpdateFirstChargeInfo;
         GlobalTimeEvent.Instance.secondEvent += OnSecondEvent;
+        HeroUIManager.Instance.OnUnLockHeroCountEvent += OnUnLockHeroCountEvent;
         Display();
         DisplayFirstChargeBtn();
 
@@ -159,6 +168,7 @@
         FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChange;
         FirstChargeManager.Instance.OnUpdateFirstChargeInfo -= OnUpdateFirstChargeInfo;
         GlobalTimeEvent.Instance.secondEvent -= OnSecondEvent;
+        HeroUIManager.Instance.OnUnLockHeroCountEvent -= OnUnLockHeroCountEvent;
 
         //  鍏抽棴鐨勬椂鍊欐妸鎴樻枟鐣岄潰涔熺粰鍏充簡 铏界劧鏄湪澶栭潰寮�鐨�
         UIManager.Instance.CloseWindow<BattleWin>();
@@ -166,14 +176,14 @@
 
     private void OnClickEnterBoss()
     {
-        BattleField battleField = BattleManager.Instance.GetBattleFieldByMapID(2); //BOSS鎴樻枟
+        // BattleField battleField = BattleManager.Instance.GetBattleFieldByMapID(2); //BOSS鎴樻枟
 
-        if (null != battleField)
-        {
-            FullScreenBattleWin fsBattleWin = UIManager.Instance.OpenWindow<FullScreenBattleWin>();
-            fsBattleWin.SetBattleField(battleField);
-            return;
-        }
+        // if (null != battleField)
+        // {
+        //     StoryBossBattleWin fsBattleWin = UIManager.Instance.OpenWindow<StoryBossBattleWin>();
+        //     fsBattleWin.SetBattleField(battleField);
+        //     return;
+        // }
 
         UIManager.Instance.OpenWindow<MainBossEnterWin>();
     }
@@ -206,7 +216,7 @@
 
     void RefreshRecharge()
     {
-        monthCardBtn.SetActive(!InvestModel.Instance.IsInvested(InvestModel.monthCardType));
+        //monthCardBtn.SetActive(!InvestModel.Instance.IsInvested(InvestModel.monthCardType));
     }
 
 
@@ -286,20 +296,20 @@
             getReward.DataEx = (uint)TaskManager.Instance.mainTask.TaskID;
             GameNetSystem.Instance.SendInfo(getReward);
         }
-        else
-        {
-            //鏍规嵁浠诲姟绫诲瀷寮曞
-        }
+        
+        TaskManager.Instance.ClickTask();
     }
 
     void DisplayCard(TeamType teamType)
     {
         if (teamType != TeamType.Story)
             return;
+        var team = TeamManager.Instance.GetTeam(teamType);
+        var heros = team.GetHerosOnTeam();
         //鏄剧ず鍗＄墝
         for (int i = 0; i < heroFightingCardCells.Length; i++)
         {
-            heroFightingCardCells[i].Display(i);
+            heroFightingCardCells[i].Display(i, heros);
         }
     }
 
@@ -341,7 +351,7 @@
         //銆愭櫘閫氥�戝叧鍗″悕瀛�1-6
         levelName.text = Language.Get("mainui7", chapterConfig.Level, chapterConfig.ChapterName, chapterID, levelNum);
 
-        bool canChallengeBoss = AutoFightModel.Instance.CanChallengeBoss();
+        bool canChallengeBoss = MainLevelManager.Instance.CanChallengeBoss();
         //BOSS
         if (canChallengeBoss)
         {
@@ -419,6 +429,10 @@
         {
             DisplayFirstChargeBtn();
         }
+        else if (funcId == GeneralDefine.mainRightFuncOpenFuncID)
+        {
+            funcColBtn.SetActive(FuncOpen.Instance.IsFuncOpen(GeneralDefine.mainRightFuncOpenFuncID));
+        }
     }
 
     private void OnUpdateFirstChargeInfo()
@@ -430,4 +444,9 @@
     {
         DisplayFirstChargeBtn();
     }
+
+    void OnUnLockHeroCountEvent()
+    {
+        DisplayCard(TeamType.Story);
+    }
 }
\ No newline at end of file

--
Gitblit v1.8.0