2022 前期战斗引导翻滚时，提前点击会卡引导;

client_Hale

2018-09-25 e40a10bd898832f73103ab05af009718a4be667c

2022 前期战斗引导翻滚时，提前点击会卡引导;

2021 前期战斗师兄分身异常出现不消失

 Fight/Actor/AI/AI_BossDSX.cs

@@ -337,7 +337,7 @@
            if (m_TimeCount > 0.75f)

            {

                PlayerDatas.Instance.hero.Behaviour.StopKillUntilDieAI();



                skillContainer.blinkSkill.GetComponent<SkillButton>().enabled = false;

                skillContainer.blinkSkill.transform.localScale = Vector3.one;



                Transform _temp = skillContainer.blinkSkill.transform.Find("Img_BackGround");

@@ -345,6 +345,8 @@


                _temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/JoyStick");

                _temp.gameObject.SetActive(false);



                


                m_Step = 12;

                m_TimeCount = 0;

@@ -356,6 +358,7 @@
            if (m_TimeCount > 0.4f)

            {

                Time.timeScale = 0;

                skillContainer.blinkSkill.GetComponent<SkillButton>().enabled = true;

                GA_Hero.s_MapSwitching = true;

                NewGuideModel _model = ModelCenter.Instance.GetModel<NewGuideModel>();

                _model.showMask = true;

@@ -365,26 +368,28 @@
                _model.direction = 2;

                _model.pressedClose = false;

                _model.clickClosed = true;

                _model.onClose = null;

                // () =>

                // {

                //     Time.timeScale = 1;

                //     GA_Hero.s_MapSwitching = false;

                //     if (PreFightMission.Instance.m_HuaShouEffect)

                //     {

                //         EffectMgr.Instance.RecyleUIEffect(1050, PreFightMission.Instance.m_HuaShouEffect.gameObject);

                //         PreFightMission.Instance.m_HuaShouEffect = null;

                //     }

                _model.onClose = () =>

                {

                    Time.timeScale = 1;

                    GA_Hero.s_MapSwitching = false;

                    if (PreFightMission.Instance.m_HuaShouEffect)

                    {

                        EffectMgr.Instance.RecyleUIEffect(1050, PreFightMission.Instance.m_HuaShouEffect.gameObject);

                        PreFightMission.Instance.m_HuaShouEffect = null;

                    }



                //     if (m_UIEffect)

                //     {

                //         EffectMgr.Instance.RecyleUIEffect(m_UIEffect.effect, m_UIEffect.gameObject);

                //         m_UIEffect = null;

                //     }

                    PlayerDatas.Instance.hero.CastSkill(190);



                //     Transform _temp1 = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/JoyStick");

                //     _temp1.gameObject.SetActive(true);

                // };

                    if (m_UIEffect)

                    {

                        EffectMgr.Instance.RecyleUIEffect(m_UIEffect.effect, m_UIEffect.gameObject);

                        m_UIEffect = null;

                    }



                    Transform _temp1 = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/JoyStick");

                    _temp1.gameObject.SetActive(true);

                };



                WindowCenter.Instance.Open<NewGuideWin>();



                HeroBehaviour.OnUserClickSkill += OnCastSkill;


 Fight/GameActor/GActorFight.cs

@@ -236,7 +236,8 @@
        }



        if (NextAction == GAStaticDefine.Act_Dead

         || m_BeatCurve == null)

         || m_BeatCurve == null

         || ActorInfo.serverDie)

        {

            m_Beating = false;

            return;