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

yyl

2025-08-29 bb463ef0b13236738a1da9cd04f57def3e7e2c7c

 Main/System/Main/MainWin.cs

@@ -8,7 +8,8 @@
/// </summary>
public class MainWin : FunctionsBaseWin
{
        //头像区
    //头像区
    [SerializeField] GameObject topBar;
    [SerializeField] AvatarCell avatarCell;
    [SerializeField] Text playerNameText;
    [SerializeField] Text powerText;
@@ -46,6 +47,33 @@
    }


    protected override void SelectBottomTab(int index)
    {
        if (index == 3)
        {
            //挑战特殊显示逻辑
            return;
        }

        topBar.SetActive(index == 0 || index == 2);
        // 如果点击当前已选中的标签，不做处理
        if (functionOrder == index && currentSubUI != null)
        {
            return;
        }

        // 更新当前选中的标签索引
        functionOrder = index;

        // 关闭当前打开的子界面
        CloseCurrentSubUI();

        // 根据选中的标签打开对应的界面
        OpenSubUIByTabIndex();
    }



    /// <summary>
    /// 更新玩家信息
    /// </summary>
@@ -57,7 +85,7 @@
                                                        PlayerDatas.Instance.baseData.facePic));

        playerNameText.text = PlayerDatas.Instance.baseData.PlayerName;
        powerText.text = UIHelper.ReplaceLargeArtNum(PlayerDatas.Instance.baseData.FightPoint);
        powerText.text = UIHelper.ReplaceLargeArtNum(PlayerDatas.Instance.baseData.FightPower);

        officialRankText.InitUI(PlayerDatas.Instance.baseData.realmLevel, PlayerDatas.Instance.baseData.TitleID);
    }
@@ -67,7 +95,7 @@
        switch (type)
        {
            case PlayerDataType.FightPower:
                powerText.text = UIHelper.ReplaceLargeArtNum(PlayerDatas.Instance.baseData.FightPoint);
                powerText.text = UIHelper.ReplaceLargeArtNum(PlayerDatas.Instance.baseData.FightPower);
                break;
            case PlayerDataType.RealmLevel:
                officialRankText.InitUI(PlayerDatas.Instance.baseData.realmLevel, PlayerDatas.Instance.baseData.TitleID);
@@ -104,7 +132,12 @@
        {
            if (currentSubUI != null && currentSubUI.name == "HomeWin")
            {
                Debug.Log("点击主界面按钮");
                //打开主界面的情况下再点击按钮，执行攻击逻辑
                if (AutoFightModel.Instance.isAutoAttackSet)
                {
                    AutoFightModel.Instance.isAutoAttack = true;
                }
                StoryBattleField storyBattleField = BattleManager.Instance.storyBattleField;
                if (storyBattleField != null)
                {
@@ -143,20 +176,19 @@
                Debug.Log("打开主城界面");
                break;
            case 1:
                currentSubUI = UIManager.Instance.OpenWindow<RolePackWin>();
                currentSubUI = UIManager.Instance.OpenWindow<AffairBaseWin>();
                Debug.Log("打开内政界面");
                break;
            case 2:
                currentSubUI = UIManager.Instance.OpenWindow<HeroBaseWin>(0);
                Debug.Log("打开武将界面");
                break;
            case 3:
                // currentSubUI = UIManager.Instance.OpenUI<QuestUI>();
                Debug.Log("打开挑战界面");
                break;
            // case 3:
            //     // currentSubUI = UIManager.Instance.OpenUI<QuestUI>();
            //     Debug.Log("打开挑战界面");
            //     break;
            case 4:
                //currentSubUI = UIManager.Instance.OpenWindow<PlaceWin>();
                Debug.Log("打开公会界面");
                currentSubUI = UIManager.Instance.OpenWindow<GuildBaseWin>();
                break;
            default:
                Debug.LogWarning("未知的标签索引: " + functionOrder);