From d613ac4b9deae55e86dfef5f5b971f8314029ddb Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期一, 26 一月 2026 15:53:15 +0800
Subject: [PATCH] 422 子 【内政】命格系统 / 【内政】命格系统-客户端
---
Main/System/HeroUI/HeroPosWin.cs | 100 +++++++++-----------------------------------------
1 files changed, 18 insertions(+), 82 deletions(-)
diff --git a/Main/System/HeroUI/HeroPosWin.cs b/Main/System/HeroUI/HeroPosWin.cs
index e0c3eb5..1f8054f 100644
--- a/Main/System/HeroUI/HeroPosWin.cs
+++ b/Main/System/HeroUI/HeroPosWin.cs
@@ -20,9 +20,6 @@
[SerializeField] List<Image> scenePosImgs; //鍦烘櫙甯冮樀浣嶇疆
[SerializeField] HeroScenePosCell[] sceneHero;
- [SerializeField] GroupButtonEx attackTeamBtn;
- [SerializeField] GroupButtonEx defendTeamBtn;
-
[SerializeField] Text fightPowerText; //鐢卞鎴风鑷繁棰勭畻鐨勬垬鍔�
[SerializeField] ScrollerController heroListScroller;
[SerializeField] Transform heroListEmpty;
@@ -34,8 +31,6 @@
[SerializeField] Button oneKeyOnBtn; //涓�閿笂闃�
[SerializeField] Button saveBtn; //淇濆瓨闃靛瀷
[SerializeField] Button backBtn; //閫�鍑虹晫闈�
- [SerializeField] GroupButtonEx jjcBtn; //绔炴妧鍦�
- // [SerializeField] GroupButtonEx tttBtn; //閫氬ぉ濉�
[SerializeField] GroupButtonEx mainFBBtn; //涓荤嚎鍓湰
//缇佺粖
@@ -43,8 +38,10 @@
[SerializeField] HeroHeadBaseCell flyHead;
[SerializeField] CanvasGroup flyAlphaTween;
-
[SerializeField] ButtonEx lineupRecommendBtn; //闃靛鎺ㄨ崘
+
+ [SerializeField] Transform caseesObj;
+ FuncPresetChooseCells presetChooseCells;
Sequence sequence;
CancellationTokenSource _cts;
@@ -66,20 +63,6 @@
protected override void InitComponent()
{
-
- mainFBBtn.AddListener(() =>
- {
- SelectTeamFunc(TeamManager.Instance.GetMainTeamID());
- });
-
- jjcBtn.AddListener(() =>
- {
- SelectTeamFunc(TeamManager.Instance.GetTeamID((int)BattlePreSetType.Arena));
- });
- // tttBtn.AddListener(() =>
- // {
- // SelectTeamFunc(TeamType.Tower);
- // });
showConnTipToggleBtn.AddListener((value) =>
{
@@ -107,6 +90,11 @@
m_IsToggleOn = LocalSave.GetBool("ShowConn" + PlayerDatas.Instance.baseData.PlayerID, false);
fiterManager = HeroSelectBehaviour.Create(heroSelectBehaviour);
+
+ var presetObj = UIUtility.CreateWidget("FuncPresetChooseCells", "FuncPresetChooseCells");
+ presetObj.transform.SetParentEx(caseesObj, Vector3.zero, Quaternion.identity, Vector3.one);
+ presetChooseCells = presetObj.GetComponent<FuncPresetChooseCells>();
+ presetChooseCells.ChangeAlignment(TextAnchor.MiddleCenter);
}
@@ -117,9 +105,8 @@
HeroUIManager.Instance.OnTeamPosChangeEvent += TeamChangeEvent;
TeamManager.Instance.OnTeamChange += OnTeamChange;
FuncOpen.Instance.OnFuncStateChangeEvent += OnFuncStateChangeEvent;
- ShowFuncBtn();
+ FuncPresetManager.Instance.OnFuncPresetUseDataEvent += OnFuncPresetUseDataEvent;
SelectTiltleBtn();
- // CreateScroller();
Display();
DisplayLineupRecommend();
}
@@ -131,6 +118,7 @@
HeroUIManager.Instance.OnTeamPosChangeEvent -= TeamChangeEvent;
TeamManager.Instance.OnTeamChange -= OnTeamChange;
FuncOpen.Instance.OnFuncStateChangeEvent -= OnFuncStateChangeEvent;
+ FuncPresetManager.Instance.OnFuncPresetUseDataEvent -= OnFuncPresetUseDataEvent;
TeamManager.Instance.GetTeam(HeroUIManager.Instance.selectTeamType).RestoreTeam();
}
@@ -147,44 +135,32 @@
lineupRecommendBtn.SetActive(isOpen);
}
- void ShowFuncBtn()
- {
- jjcBtn.SetActive(FuncOpen.Instance.IsFuncOpen(ArenaManager.Instance.DeployTroopsFuncId));
- }
-
void SelectTiltleBtn()
{
- if (functionOrder == 0)
- {
- mainFBBtn.SelectBtn();
- }
- else if (functionOrder == 1)
- {
- jjcBtn.SelectBtn();
- }
+ //鏂规鍙樻洿 鍙湁涓绘垬
+ mainFBBtn.SelectBtn();
+ }
+ void OnFuncPresetUseDataEvent()
+ {
+ Display();
}
public void Display()
{
- OnBattleTeamAttrPer();
RefreshOnTeamCountry();
RefreshOnTeamBtn();
RefreshTeamHero();
RefreshFlyHead();
RefreshConn();
-
RefreshEmptyTip();
showConnTipToggleBtn.isOn = isToggleOn;
-
fiterManager.Display(0, SelectJobCountry);
-
-
fightPowerText.text = UIHelper.ReplaceLargeArtNum(FightPowerManager.Instance.GetTeamFightPower(HeroUIManager.Instance.selectTeamType, true));
-
+ presetChooseCells.Display((int)BattlePreSetType.Story, (int)FuncPresetType.Team);
}
void RefreshFlyHead()
@@ -247,33 +223,7 @@
heroListScroller.Restart();
}
- //涓婇樀鍔犳垚
- void OnBattleTeamAttrPer()
- {
- var valuePer = 0;
- var team = TeamManager.Instance.GetTeam(HeroUIManager.Instance.selectTeamType);
- if (team != null)
- {
- for (int i = 0; i < team.tempHeroes.Length; i++)
- {
- if (team.tempHeroes[i] == null)
- continue;
- var hero = HeroManager.Instance.GetHero(team.tempHeroes[i].guid);
- if (hero != null)
- {
- valuePer += hero.GetAddPer();
- }
- }
-
- }
- // //涓婇樀灞炴��
- // for (int i = 0; i < attrOnList.Length; i++)
- // {
- // string format = valuePer == 0 ? "{0}+{1}" : "{0}+" + UIHelper.AppendColor(TextColType.Green, "{1}", false);
- // attrOnList[i].text = PlayerPropertyConfig.GetFullDescription(PlayerPropertyConfig.basePerAttrs[i], valuePer, format);
- // }
- }
-
+
//涓婇樀姝﹀皢鍥藉鍏夌幆婵�娲�
void RefreshOnTeamCountry(bool playEffect = false)
{
@@ -374,7 +324,6 @@
RefreshPosScale();
heroListScroller.m_Scorller.RefreshActiveCellViews();
RefreshOnTeamCountry(true);
- OnBattleTeamAttrPer();
//琛ㄧ幇椋炲叆锛岃繛缁偣鍑讳笉鍚屽ご鍍忚Е鍙戠殑璇濆垯閲嶇疆
if (flyFrom > -1)
@@ -499,19 +448,6 @@
{
var team = TeamManager.Instance.GetTeam(HeroUIManager.Instance.selectTeamType);
team.SaveTeam();
- }
-
- void SelectTeamFunc(int type)
- {
- if (HeroUIManager.Instance.selectTeamType == type)
- {
- return;
- }
-
- HeroUIManager.Instance.selectTeamType = type;
- HeroUIManager.Instance.SortHeroOnTeamList();
- Display();
- heroListScroller.m_Scorller.RefreshActiveCellViews();
}
protected void OnTeamChange(int teamType)
--
Gitblit v1.8.0