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

client_Wu Xijin

2018-10-26 9a555beef9ebc4bd140482d01a806023c12a6c50

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

 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)


 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;

            }


 System/Vip/VipInvest/WheelOfFortuneWin.cs

@@ -275,7 +275,7 @@
                    Str = Language.Get("Num_CHS_1");

                    return Str;

                case 2:

                    Str = Language.Get("Num_CHS_2");

                    Str = Language.Get("Turntable5");

                    return Str;

                case 3:

                    Str = Language.Get("Num_CHS_3");