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

yyl

2026-02-09 5a4e34c8a85737c0fa5b5775122da31155cbaef3

 Main/System/Main/MainWin.cs

@@ -31,6 +31,9 @@
    [SerializeField] Text hammerText;
    [SerializeField] Text multiFightText;

    [SerializeField] Transform gameTip; //10连
    [SerializeField] Transform mgTip;

    bool isForcePlayFightUIAnim = true; //强制播放战斗锤子框动画

    public static event Action TabChangeEvent;
@@ -38,7 +41,7 @@
    {
        base.InitComponent();
        avatarCell.redpoint.redpointId = MainRedDot.PhantasmPavilionRepoint;
        avatarCell.button.SetListener(() =>
        avatarCell.SetListener(() =>
        {
            UIManager.Instance.OpenWindow<PlayerProfileWin>();
        });
@@ -58,8 +61,17 @@
        RenameManager.Instance.OnUpdateRenameResultEvent += OnUpdateRenameResultEvent;
        UIManager.Instance.OnCloseWindow += OnCloseWindow;
        GlobalTimeEvent.Instance.MSEvent += OnMSEvent;
        RedpointCenter.Instance.redpointValueChangeEvent += OnRedpointValueChangeEvent;
        var xbInfo = HappyXBModel.Instance.GetXBInfoByType((int)HappXBTitle.HeroCallAdvanced);
        gameTip.SetActive(false);
        if (xbInfo != null && xbInfo.treasureCount < GeneralDefine.herocall10TipLimit)
        {
            GlobalTimeEvent.Instance.fiveSecondEvent += OnFiveSecondEvent;
        }
        EventBroadcast.Instance.AddListener<string>(EventName.BATTLE_START, OnBattleStart);
        base.OnPreOpen();

        mgTip.SetActive(false);
        // 刷新UI
        Display();
    }
@@ -71,6 +83,9 @@
        RenameManager.Instance.OnUpdateRenameResultEvent -= OnUpdateRenameResultEvent;
        UIManager.Instance.OnCloseWindow -= OnCloseWindow;
        GlobalTimeEvent.Instance.MSEvent -= OnMSEvent;
        GlobalTimeEvent.Instance.fiveSecondEvent -= OnFiveSecondEvent;
        EventBroadcast.Instance.RemoveListener<string>(EventName.BATTLE_START, OnBattleStart);
        RedpointCenter.Instance.redpointValueChangeEvent -= OnRedpointValueChangeEvent;

        base.OnPreClose();
        isForcePlayFightUIAnim = true;
@@ -79,6 +94,34 @@
    private void OnUpdateRenameResultEvent()
    {
        Display();
    }

    void OnRedpointValueChangeEvent(int id)
    {
        if (id == (MainRedDot.RedPoint_Mingge * 10 + 4))
        {
            mgTip.SetActive(MinggeManager.Instance.redpointAuto.state != RedPointState.None);
        }
    }


    //用于10连提示，没有10连会取消时间事件委托
    void OnFiveSecondEvent()
    {
        if (HappyXBModel.Instance.bestXB10Red.state != RedPointState.None)
        {
            gameTip.SetActive(true);
        }
        else
        {
            gameTip.SetActive(false);
            var xbInfo = HappyXBModel.Instance.GetXBInfoByType((int)HappXBTitle.HeroCallAdvanced);
            if (xbInfo != null && xbInfo.treasureCount >= GeneralDefine.herocall10TipLimit)
            {
                GlobalTimeEvent.Instance.fiveSecondEvent -= OnFiveSecondEvent;
            }
        }

    }

    void DisplayTopBar()
@@ -91,6 +134,10 @@
        if (_ui.name == "AutoFightWin")
        {
            multiFightText.text = Language.Get("MultiFight", AutoFightModel.Instance.fightCost);
        }
        if (_ui.name == "MinggeWin")
        {
            mgTip.SetActive(false);
        }
    }

@@ -271,6 +318,13 @@
                currentSubUI = UIManager.Instance.OpenWindow<AffairBaseWin>();
                break;
            case 2:
                if (gameTip.gameObject.activeSelf)
                {
                    if (!NewBieCenter.Instance.inGuiding)
                    {
                        HappyXBModel.Instance.startTenCallGuide = true;
                    }
                }
                currentSubUI = UIManager.Instance.OpenWindow<HeroBaseWin>(0);
                break;
            // case 3:
@@ -345,7 +399,24 @@
        }
    }

    void OnBattleStart(string guid)
    {
        if (string.IsNullOrEmpty(guid))
        {
            var tmpHero = TeamManager.Instance.GetTeam(BattlePreSetType.Story).GetNextServerHero("");
            if (tmpHero != null)
            {
                AutoFightModel.Instance.fightingHeroSkinID = tmpHero.SkinID;
            }
            else
            {
                Debug.LogError("没有找到下一个攻击武将");
                return;
            }

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

    void RefreshFightIng(bool isfighting = false)
    {
@@ -357,7 +428,7 @@
            cdTween.SetStartState();
            cdTween.Play(() =>
            {
                var tmpHero = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid);
                var tmpHero = TeamManager.Instance.GetTeam(BattlePreSetType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid);
                if (tmpHero != null)
                {
                    AutoFightModel.Instance.fightingHeroSkinID = tmpHero.SkinID;
@@ -378,7 +449,7 @@

        if (AutoFightModel.Instance.fightingHeroSkinID == 0)
        {
            var tmpHero = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid);
            var tmpHero = TeamManager.Instance.GetTeam(BattlePreSetType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid);
            if (tmpHero != null)
            {
                AutoFightModel.Instance.fightingHeroSkinID = tmpHero.SkinID;