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

yyl

2025-09-18 871594462e82d6bc1341918d39e11ab036d59563

 Main/System/Main/MainWin.cs

@@ -22,6 +22,7 @@
    [SerializeField] Image restImg; //休息状态
    [SerializeField] GameObject fightGo; //战斗状态
    [SerializeField] Image fightHeroImg; //战斗显示英雄
    [SerializeField] ScaleTween fightHeroScale; //战斗显示英雄缩放
    [SerializeField] UIEffectPlayer fightEffect;
    [SerializeField] FillTween cdTween;

@@ -262,20 +263,22 @@
    {
        if (isfighting)
        {
            // fightEffect.playDelayTime = 50;
            fightEffect.Play();
            cdTween.SetStartState();
            cdTween.Play(()=>
            { 
            cdTween.Play(() =>
            {
                AutoFightModel.Instance.fightingHeroSkinID = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid).SkinID;
                fightHeroImg.SetSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon);
                fightHeroImg.SetOrgSprite(HeroSkinConfig.Get(AutoFightModel.Instance.fightingHeroSkinID).SquareIcon, "HeroHead");
            });
            fightHeroScale.SetStartState();
            fightHeroScale.Play();
        }
        else
        {
            fightEffect.Stop();
            cdTween.Stop();
            cdTween.SetEndState();
            fightHeroScale.Stop();
        }

        if (AutoFightModel.Instance.fightingHeroSkinID == 0)
@@ -283,7 +286,7 @@
            AutoFightModel.Instance.fightingHeroSkinID = TeamManager.Instance.GetTeam(TeamType.Story).GetNextServerHero(AutoFightModel.Instance.heroGuid).SkinID;
        }

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

    void OnSkillCast(bool isfighting)