Merge branch 'master' of http://192.168.0.87:10010/r/snxxz_scripts

client_linchunjie

2018-09-06 520a55769c8a533659be0c1d53dcc8548024e496

 Fight/Actor/AI/AI_BossDSX.cs

@@ -295,6 +295,32 @@
        GA_Hero.s_MapSwitching = false;

    }



    private void OnCastSkill(int id)

    {

        Debug.LogFormat("DSX_AI: skillID: {0}", id);

        HeroBehaviour.OnUserClickSkill -= OnCastSkill;



        if (id == 190)

        {

            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;

            }



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

            _temp1.gameObject.SetActive(true);

        }

    }



    protected override void OutOfSleepUpdate()

    {

        base.OutOfSleepUpdate();

@@ -314,10 +340,10 @@
                _temp = WindowCenter.Instance.uiRoot.baseCanvas.Find("MainInterfaceWin/JoyStick");

                _temp.gameObject.SetActive(false);



                HeroBehaviour.OnUserClickSkill += OnCastSkill;



                m_Step = 12;

                m_TimeCount = 0;





            }

        }

        else if (m_Step == 12)

@@ -335,27 +361,7 @@
                _model.direction = 2;

                _model.pressedClose = false;

                _model.clickClosed = true;

                _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;

                    }



                    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);

                };

                _model.onClose = null;

                WindowCenter.Instance.Open<NewGuideWin>();



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