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

client_linchunjie

2019-04-19 79457ed9f96d8b2b1e097a8e8940d09bb20385aa

 System/MainInterfacePanel/TaskBoxBGMWin.cs

@@ -101,7 +101,6 @@
                    }

                }

            }

            MainInterfaceWin.IsOpenMaininterface += IsOpenMaininterface;

        }



        protected override void OnAfterOpen()

@@ -121,7 +120,6 @@


        protected override void OnAfterClose()

        {

            MainInterfaceWin.IsOpenMaininterface -= IsOpenMaininterface;

        }



        private void IsOpenMaininterface()

@@ -329,28 +327,24 @@


        protected override void LateUpdate()

        {

            // base.LateUpdate();

            GetMainSelfMotionLaupdate();

            if (!WindowCenter.Instance.IsOpen<TaskBoxBGMWin>())

            {

                return;

            }

            GA_Hero _hero = PlayerDatas.Instance.hero;

            if (_hero == null)

            {

                return;

            }

            if (_hero.LockTarget == null)

            {

                return;

            }

            float _chkDistSqrt = MathUtility.DistanceSqrtXZ(_hero.Pos, _hero.LockTarget.Pos);

            if (_chkDistSqrt > Mathf.Pow(GeneralDefine.FarawayNpcDist, 2))

            base.LateUpdate();

            if (WindowCenter.Instance.IsOpen("MainInterfaceWin"))

            {

                WindowCenter.Instance.Close<TaskBoxBGMWin>();

                WindowCenter.Instance.Open<MainInterfaceWin>();

            }



                _hero.LockTarget = null;

            GetMainSelfMotionLaupdate();



            var hero = PlayerDatas.Instance.hero;

            if (hero != null && hero.LockTarget != null)

            {

                var checkDistSqrt = MathUtility.DistanceSqrtXZ(hero.Pos, hero.LockTarget.Pos);

                if (checkDistSqrt > Mathf.Pow(GeneralDefine.FarawayNpcDist, 2))

                {

                    WindowCenter.Instance.Close<TaskBoxBGMWin>();

                    WindowCenter.Instance.Open<MainInterfaceWin>();

                    hero.LockTarget = null;

                }

            }

        }