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

client_Hale

2018-10-26 45a6f4aaaf13119215f4cc2f20f5e8300ba13e00

 System/FairyAu/FairyFeastBehaviour.cs

@@ -16,6 +16,8 @@


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



        FairyFeastModel fairyFeastModel { get { return ModelCenter.Instance.GetModel<FairyFeastModel>(); } }



        private void Awake()

        {

            m_GotoFeast.onClick.AddListener(OnGotoFeast);

@@ -28,6 +30,7 @@
            dungeonModel.updateMissionEvent += UpdateMissionEvent;

            GA_NpcCollect.OnArrive += OnArriveCollectNPC;

            GA_NpcCollect.OnLeave += OnLeaveCollectNpc;

            fairyFeastModel.selectTransmit += SelectTransmit;

            Display();

        }



@@ -37,6 +40,12 @@
            dungeonModel.updateMissionEvent -= UpdateMissionEvent;

            GA_NpcCollect.OnArrive -= OnArriveCollectNPC;

            GA_NpcCollect.OnLeave -= OnLeaveCollectNpc;

            fairyFeastModel.selectTransmit -= SelectTransmit;

        }



        private void SelectTransmit()

        {

            Display();

        }



        private void PlayerDataRefreshInfoEvent(PlayerDataRefresh refreshType)

@@ -60,7 +69,7 @@
        {

            var mapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);

            var collected = dungeonModel.mission.hasCollect;

            m_GotoFeast.gameObject.SetActive(mapId == 31230 && collected != 1 && !nearNpc);

            m_GotoFeast.gameObject.SetActive(mapId == 31230 && collected != 1 && !nearNpc && !fairyFeastModel.allowTransmit);

        }



        private void OnArriveCollectNPC(uint arg0, int _npcId)