From e40a10bd898832f73103ab05af009718a4be667c Mon Sep 17 00:00:00 2001
From: client_Hale <339726288@qq.com>
Date: 星期二, 25 九月 2018 20:23:09 +0800
Subject: [PATCH] 2022 前期战斗引导翻滚时,提前点击会卡引导;

---
 Fight/Actor/AI/AI_BossDSX.cs |   43 ++++++++++++++++++++++++-------------------
 1 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/Fight/Actor/AI/AI_BossDSX.cs b/Fight/Actor/AI/AI_BossDSX.cs
index 47bd814..5dbccc5 100644
--- a/Fight/Actor/AI/AI_BossDSX.cs
+++ b/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);
+                    
+                    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);
-                // };
+                    Transform _temp1 = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/JoyStick");
+                    _temp1.gameObject.SetActive(true);
+                };
+
                 WindowCenter.Instance.Open<NewGuideWin>();
 
                 HeroBehaviour.OnUserClickSkill += OnCastSkill;

--
Gitblit v1.8.0