Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

yyl

2026-01-21 69fdc58cb97714f856df268f08451f2ba7e5ecf2

 Main/System/HeroUI/HeroPosWin.cs

@@ -66,23 +66,15 @@

    protected override void InitComponent()
    {
        attackTeamBtn.AddListener(() =>
        {
            SelectTeamFunc((TeamType)HeroUIManager.Instance.GetSelectTeamTypeByAttackType(0));
        });
        defendTeamBtn.AddListener(() =>
        {
            SelectTeamFunc((TeamType)HeroUIManager.Instance.GetSelectTeamTypeByAttackType(1));
        });

        mainFBBtn.AddListener(() =>
        {
            SelectTeamFunc(TeamType.Story);
            SelectTeamFunc(TeamManager.Instance.GetMainTeamID());
        });

        jjcBtn.AddListener(() =>
        {
            SelectTeamFunc(TeamType.Arena);
            SelectTeamFunc(TeamManager.Instance.GetTeamID((int)BattlePreSetType.Arena));
        });
        // tttBtn.AddListener(() =>
        // {
@@ -320,25 +312,6 @@
    //管理布阵入口按钮：如竞技场是否根据功能显隐，通天塔和主线只有进攻方布阵默认不显示
    void RefreshOnTeamBtn()
    {
        if (HeroUIManager.Instance.selectTeamType == TeamType.Arena ||
            HeroUIManager.Instance.selectTeamType == TeamType.ArenaDefense)
        {
            attackTeamBtn.SetActive(true);
            defendTeamBtn.SetActive(true);
            if (HeroUIManager.Instance.selectTeamType == TeamType.Arena)
            {
                attackTeamBtn.SelectBtn(true);
            }
            else
            {
                defendTeamBtn.SelectBtn(true);
            }
        }
        else
        {
            attackTeamBtn.SetActive(false);
            defendTeamBtn.SetActive(false);
        }

    }

@@ -528,7 +501,7 @@
        team.SaveTeam();
    }

    void SelectTeamFunc(TeamType type)
    void SelectTeamFunc(int type)
    {
        if (HeroUIManager.Instance.selectTeamType == type)
        {
@@ -541,7 +514,7 @@
        heroListScroller.m_Scorller.RefreshActiveCellViews();
    }

    protected void OnTeamChange(TeamType teamType)
    protected void OnTeamChange(int teamType)
    {
        if (HeroUIManager.Instance.selectTeamType == teamType)
        {