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

client_Hale

2018-10-26 45a6f4aaaf13119215f4cc2f20f5e8300ba13e00

 System/FairyAu/FairyFeastModel.cs

@@ -10,10 +10,13 @@
        public uint selectPlayer { get; private set; }

        public bool allowTransmit { get; private set; }



        public bool nearNpc { get; private set; }



        public event Action selectTransmit;



        public event Action transmitStateUpdate;

        DungeonModel dungeonModel { get { return ModelCenter.Instance.GetModel<DungeonModel>(); } }

        FairyModel fairyModel { get { return ModelCenter.Instance.GetModel<FairyModel>(); } }



        public override void Init()

        {

@@ -23,6 +26,8 @@
            StageManager.Instance.onStageLoadFinish += OnStageLoadFinish;

            dungeonModel.updateMissionEvent += UpdateMissionEvent;

            PrepareHandler.Instance.OnPrepareEndSuccess += OnPrepareEndSuccess;

            GA_NpcCollect.OnArrive += OnArriveNpc;

            GA_NpcCollect.OnLeave += OnLeaveNpc;

        }



        public override void UnInit()

@@ -32,6 +37,8 @@
            StageManager.Instance.onStageLoadFinish -= OnStageLoadFinish;

            dungeonModel.updateMissionEvent -= UpdateMissionEvent;

            PrepareHandler.Instance.OnPrepareEndSuccess -= OnPrepareEndSuccess;

            GA_NpcCollect.OnArrive -= OnArriveNpc;

            GA_NpcCollect.OnLeave -= OnLeaveNpc;

        }



        public void OnBeforePlayerDataInitialize()

@@ -47,6 +54,7 @@
        private void OnStageLoadFinish()

        {

            selectPlayer = 0;

            nearNpc = false;

            if (transmitClock != null)

            {

                transmitClock.Stop();

@@ -94,6 +102,24 @@
            }

        }



        private void OnArriveNpc(uint arg0, int _npcId)

        {

            if (_npcId == fairyModel.fairyFeastDeskNpc)

            {

                nearNpc = true;

                SecondEvent();

            }

        }



        private void OnLeaveNpc(uint arg0, int _npcId)

        {

            if (_npcId == fairyModel.fairyFeastDeskNpc)

            {

                nearNpc = false;

                SecondEvent();

            }

        }



        float transmitDistance = 2f;

        public int transmitCostSeconds { get; private set; }

        void ParseConfig()

@@ -111,7 +137,7 @@
        {

            var hero = PlayerDatas.Instance.hero;

            if (hero == null || hero.IsCollecting()

                || hero.IsCollect() || hero.IsDaZuo())

                || hero.IsCollect() || hero.IsDaZuo() || nearNpc)

            {

                return false;

            }