From ff032a0d727eee13399e29391e1437bea912337c Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期六, 06 十二月 2025 16:42:46 +0800
Subject: [PATCH] 121 【武将】武将系统 - 生效武将版本,同步属性计算,更改新筛选模式

---
 Main/System/HeroUI/HeroPosWin.cs |   21 ++++++++++-----------
 1 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/Main/System/HeroUI/HeroPosWin.cs b/Main/System/HeroUI/HeroPosWin.cs
index 16beb3c..e0e80c8 100644
--- a/Main/System/HeroUI/HeroPosWin.cs
+++ b/Main/System/HeroUI/HeroPosWin.cs
@@ -28,7 +28,8 @@
     [SerializeField] Transform heroListEmpty;
     [SerializeField] Toggle showConnTipToggleBtn;
 
-    [SerializeField] HeroSelectBehaviour fiterManager;  //姝﹀皢绛涢��
+    [SerializeField] Transform heroSelectBehaviour;
+    HeroSelectBehaviour fiterManager;  //姝﹀皢绛涢��
 
     [SerializeField] Button oneKeyOnBtn;     //涓�閿笂闃�
     [SerializeField] Button saveBtn;        //淇濆瓨闃靛瀷
@@ -105,20 +106,19 @@
         });
 
         m_IsToggleOn = LocalSave.GetBool("ShowConn" + PlayerDatas.Instance.baseData.PlayerID, false);
+        fiterManager = HeroSelectBehaviour.Create(heroSelectBehaviour);
     }
 
 
     protected override void OnPreOpen()
     {
-        HeroUIManager.Instance.selectTeamPosJob = 0;
-        HeroUIManager.Instance.selectTeamPosCountry = 0;
         HeroUIManager.Instance.SortHeroOnTeamList();
         heroListScroller.OnRefreshCell += OnRefreshCell;
         HeroUIManager.Instance.OnTeamPosChangeEvent += TeamChangeEvent;
         TeamManager.Instance.OnTeamChange += OnTeamChange;
         ShowFuncBtn();
         SelectTiltleBtn();
-        CreateScroller();
+        // CreateScroller();
         Display();
     }
 
@@ -163,7 +163,7 @@
 
         showConnTipToggleBtn.isOn = isToggleOn;
 
-        fiterManager.Display(0, HeroUIManager.Instance.selectTeamPosJob, HeroUIManager.Instance.selectTeamPosCountry, SelectJobCountry);
+        fiterManager.Display(0, SelectJobCountry);
 
 
         fightPowerText.text = UIHelper.ReplaceLargeArtNum(FightPowerManager.Instance.GetTeamFightPower(HeroUIManager.Instance.selectTeamType, true));
@@ -189,10 +189,10 @@
         CancelCurrentTask();
     }
 
-    void SelectJobCountry(int job, int country)
+    /// 鍥炶皟鍙傛暟锛� 鑱屼笟锛屽浗瀹讹紝浼ゅ绫诲瀷锛�6澶ф垬鏂楀睘鎬э紝鐗规畩灞炴��
+    void SelectJobCountry(List<int> selects)
     {
-        HeroUIManager.Instance.selectTeamPosJob = job;
-        HeroUIManager.Instance.selectTeamPosCountry = country;
+        HeroUIManager.Instance.selectListTeamPos = selects;
         HeroUIManager.Instance.SortHeroOnTeamList();
         CreateScroller();
         RefreshEmptyTip();
@@ -245,7 +245,7 @@
                 var hero = HeroManager.Instance.GetHero(team.tempHeroes[i].guid);
                 if (hero != null)
                 {
-                    valuePer += hero.GetOnBattleAddPer();
+                    valuePer += hero.GetAddPer();
                 }
             }
 
@@ -510,8 +510,7 @@
         {
             return;
         }
-        HeroUIManager.Instance.selectTeamPosJob = 0;
-        HeroUIManager.Instance.selectTeamPosCountry = 0;
+
         HeroUIManager.Instance.selectTeamType = type;
         HeroUIManager.Instance.SortHeroOnTeamList();
         Display();

--
Gitblit v1.8.0