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

client_linchunjie

2019-04-19 79457ed9f96d8b2b1e097a8e8940d09bb20385aa

 System/MainInterfacePanel/DefaultDialogueBoxWin.cs

@@ -37,7 +37,6 @@


        protected override void OnPreOpen()

        {

            MainInterfaceWin.IsOpenMaininterface += IsOpenMaininterface;

            _AllMissionDict = taskmodel.allMissionDict;

            _NPCID = taskmodel.NPCid;

            var npcConfig = NPCConfig.Get(_NPCID);

@@ -57,7 +56,6 @@


        protected override void OnPreClose()

        {

            MainInterfaceWin.IsOpenMaininterface -= IsOpenMaininterface;

        }



        private void IsOpenMaininterface()

@@ -69,30 +67,23 @@
        {

            base.LateUpdate();



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

            {

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

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

            {

                WindowCenter.Instance.Close<DefaultDialogueBoxWin>();

                WindowCenter.Instance.Open<MainInterfaceWin>();



                _hero.LockTarget = null;

            }



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

                    WindowCenter.Instance.Open<MainInterfaceWin>();

                    hero.LockTarget = null;

                }

            }



        }



        protected override void OnAfterClose()