Merge branch 'master' into h5version

yyl

2026-05-11 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96

 Main/System/Main/MainWin.cs

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections;
using System.Collections.Generic;
using Cysharp.Threading.Tasks;
@@ -42,10 +42,13 @@
    {
        base.InitComponent();
        InGameDownLoad.Instance.OnPlayerLoginOk().Forget();
        avatarCell.redpoint.redpointId = MainRedDot.PhantasmPavilionRepoint;
        avatarCell.SetListener(() =>
        avatarCell.SetOnLoaded(() =>
        {
            UIManager.Instance.OpenWindow<PlayerProfileWin>();
            avatarCell.redpoint.redpointId = MainRedDot.PhantasmPavilionRepoint;
            avatarCell.SetListener(() =>
            {
                UIManager.Instance.OpenWindowAsync<PlayerProfileWin>().Forget();
            });
        });
    }

@@ -76,6 +79,11 @@
        mgTip.SetActive(false);
        // 刷新UI
        Display();

        var temp = Debug.unityLogger.logEnabled;
        Debug.unityLogger.logEnabled = true;
        Debug.LogError("MainWin OnPreOpen 了 特殊标识");
        Debug.unityLogger.logEnabled = temp;
    }

    protected override void OnPreClose()
@@ -190,12 +198,12 @@
        // 从玩家数据中获取信息并更新UI
        avatarCell.InitUI(AvatarHelper.GetAvatarModel((int)PlayerDatas.Instance.baseData.PlayerID,
                                                        PlayerDatas.Instance.baseData.face,
                                                        PlayerDatas.Instance.baseData.facePic));
                                                        PlayerDatas.Instance.baseData.facePic)).Forget();

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

        officialRankText.InitUI(PlayerDatas.Instance.baseData.realmLevel, PlayerDatas.Instance.baseData.TitleID);
        officialRankText.InitUI(PlayerDatas.Instance.baseData.realmLevel, PlayerDatas.Instance.baseData.TitleID).Forget();
    }

    void PlayerDataRefresh(PlayerDataType type)
@@ -206,19 +214,19 @@
                powerText.text = UIHelper.ReplaceLargeArtNum(PlayerDatas.Instance.baseData.FightPower);
                break;
            case PlayerDataType.RealmLevel:
                officialRankText.InitUI(PlayerDatas.Instance.baseData.realmLevel, PlayerDatas.Instance.baseData.TitleID);
                officialRankText.InitUI(PlayerDatas.Instance.baseData.realmLevel, PlayerDatas.Instance.baseData.TitleID).Forget();
                break;
            case PlayerDataType.Face:
            case PlayerDataType.FacePic:
                avatarCell.InitUI(AvatarHelper.GetAvatarModel((int)PlayerDatas.Instance.baseData.PlayerID,
                 avatarCell.InitUI(AvatarHelper.GetAvatarModel((int)PlayerDatas.Instance.baseData.PlayerID,
                                                                PlayerDatas.Instance.baseData.face,
                                                                PlayerDatas.Instance.baseData.facePic));
                                                                PlayerDatas.Instance.baseData.facePic)).Forget();
                break;
            case PlayerDataType.default26:
                hammerText.text = UIHelper.GetMoneyCnt(41).ToString();
                break;
            case PlayerDataType.ExAttr3:
                officialRankText.InitUI(PlayerDatas.Instance.baseData.realmLevel, PlayerDatas.Instance.baseData.TitleID);
                officialRankText.InitUI(PlayerDatas.Instance.baseData.realmLevel, PlayerDatas.Instance.baseData.TitleID).Forget();
                break;
        }

@@ -252,7 +260,7 @@
        else if (index == 4 && !PlayerDatas.Instance.fairyData.HasFairy)
        {
            //未加入公会不切换标签，打开申请界面
            UIManager.Instance.OpenWindow<GuildJoinWin>();
            UIManager.Instance.OpenWindowAsync<GuildJoinWin>().Forget();
            return;
        }

@@ -265,7 +273,7 @@
        if (index == 3)
        {
            //挑战特殊显示逻辑
            UIManager.Instance.OpenWindow<ChallengeTabWin>();
            UIManager.Instance.OpenWindowAsync<ChallengeTabWin>().Forget();
            return;
        }

@@ -294,7 +302,7 @@
    /// <summary>
    /// 根据标签索引打开对应的子界面
    /// </summary>
    protected override void OpenSubUIByTabIndex()
    protected override async void OpenSubUIByTabIndex()
    {

        Debug.Log("打开子界面 : " + functionOrder);
@@ -306,7 +314,7 @@
                // 打开主页界面
                if (!UIManager.Instance.IsOpened<BattleWin>())
                {
                    BattleWin battleWin = UIManager.Instance.OpenWindow<BattleWin>();
                    BattleWin battleWin = await UIManager.Instance.OpenWindowAsync<BattleWin>();
                    battleWin.SetBattleField(BattleManager.Instance.storyBattleField);
                }
                else
@@ -314,10 +322,10 @@
                    BattleWin battleWin = UIManager.Instance.GetUI<BattleWin>();
                    battleWin.SetBattleField(BattleManager.Instance.storyBattleField);
                }
                currentSubUI = UIManager.Instance.OpenWindow<HomeWin>();
                currentSubUI = await UIManager.Instance.OpenWindowAsync<HomeWin>();
                break;
            case 1:
                currentSubUI = UIManager.Instance.OpenWindow<AffairBaseWin>();
                currentSubUI = await UIManager.Instance.OpenWindowAsync<AffairBaseWin>();
                break;
            case 2:
                if (gameTip.gameObject.activeSelf)
@@ -327,14 +335,14 @@
                        HappyXBModel.Instance.startTenCallGuide = true;
                    }
                }
                currentSubUI = UIManager.Instance.OpenWindow<HeroBaseWin>(0);
                currentSubUI = await UIManager.Instance.OpenWindowAsync<HeroBaseWin>(0);
                break;
            // case 3:
            //     挑战界面不跳转
            //     Debug.Log("打开挑战界面");
            //     break;
            case 4:
                currentSubUI = UIManager.Instance.OpenWindow<GuildBaseWin>();
                currentSubUI = await UIManager.Instance.OpenWindowAsync<GuildBaseWin>();
                break;
            default:
                Debug.LogWarning("未知的标签索引: " + functionOrder);
@@ -418,6 +426,8 @@

            fightHeroImg.SetOrgSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon, "HeroHead");
        }


    }

    void RefreshFightIng(bool isfighting = false)
@@ -470,7 +480,7 @@
    {
        if (nextCantAttackMask.localScale == Vector3.one)
        {
            if (BattleManager.Instance.storyBattleField.IsCanRequestFight())
            if (BattleManager.Instance.storyBattleField != null && BattleManager.Instance.storyBattleField.IsCanRequestFight())
            {
                nextCantAttackMask.localScale = Vector3.zero;
            }