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

yyl

2025-11-20 9e89e605d5429babb4b33df2e47ea86dff9d2ba7

 Main/System/HeroUI/HeroBaseWin.cs

@@ -24,12 +24,6 @@
    }


    protected override void OnPreOpen()
    {
        base.OnPreOpen();
        tabButtons[functionOrder].SelectBtn(true);
    }

    protected override void OnPreClose()
    {
        base.OnPreClose();
@@ -48,13 +42,13 @@
        Debug.Log("打开子界面 : " + functionOrder);
        // 主城 内政 武将 挑战 公会
        //根据索引打开不同的界面
         switch (functionOrder)
        switch (functionOrder)
        {
            case 0:
                currentSubUI = UIManager.Instance.OpenWindow<HeroListWin>();
                break;
            case 1:
                //currentSubUI = UIManager.Instance.OpenWindow<HeroCollectionsWin>();
                currentSubUI = UIManager.Instance.OpenWindow<HeroCollectionWin>();
                break;
            case 2:
                break;