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

client_Wu Xijin

2019-01-16 160e4e33c706dce7002603b4f81af590fd09f320

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

 Core/GameEngine/DataToCtl/PackageRegedit.cs

@@ -430,7 +430,6 @@
        Register(typeof(HAA1A_tagMCActWishingWellPlayerInfo), typeof(DTCAA1A_tagMCActWishingWellPlayerInfo));

        Register(typeof(HAA1B_tagMCActWishingDragResult), typeof(DTCAA1B_tagMCActWishingDragResult));

        Register(typeof(HB204_tagMCIceLodeInfo), typeof(DTCB204_tagMCIceLodeInfo));

        Register(typeof(HB204_tagMCIceLodeInfo), typeof(DTCB204_tagMCIceLodeInfo));

        Register(typeof(HA806_tagMCMysticalShopTimeInfo), typeof(DTCA806_tagMCMysticalShopTimeInfo));

        Register(typeof(HAA0A_tagMCWeekPartyInfo), typeof(DTCAA0A_tagMCWeekPartyInfo));

        Register(typeof(HAA0B_tagMCWeekPartyPlayerInfo), typeof(DTCAA0B_tagMCWeekPartyPlayerInfo));


 System/CrossServerOneVsOne/CrossServerOneVsOneModel.cs

@@ -37,6 +37,8 @@
        StoreModel storeModel { get { return ModelCenter.Instance.GetModel<StoreModel>(); } }

        public string LocalSaveThirdTypeKey = string.Empty;

        private int recordDataMapId;

        private int loadSecond;



        public override void Init()

        {

            IsMatching = false;

@@ -46,6 +48,7 @@


        public void OnBeforePlayerDataInitialize()

        {

            loadSecond = 0;

            StageManager.Instance.onStageLoadFinish -= OnLoadMapFinish;

            storeModel.RefreshBuyShopLimitEvent -= UpdateBuyShop;

            TimeUtility.OnServerOpenDayRefresh -= UpdateServerOpenDay;

@@ -53,6 +56,7 @@
            CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdatePlayerInfo;

            CrossServerOneVsOnePKSeason.Instance.updateSelfSeasonEvent -= UpdateSeason;

            TimeMgr.Instance.OnMinuteEvent -= UpdateMinute;

            GlobalTimeEvent.Instance.secondEvent -= UpdateSecond;

            dungeonModel.updateMissionEvent -= UpdateFBHelp;

            rewardModel.CrossRealmPKAwardStateUpdate -= UpdateDayAwardState;

            CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent -= UpdateDayAwardState;

@@ -81,10 +85,10 @@
            CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent += UpdatePlayerInfo;

            CrossServerOneVsOnePKSeason.Instance.updateSelfSeasonEvent += UpdateSeason;

            TimeMgr.Instance.OnMinuteEvent += UpdateMinute;

            GlobalTimeEvent.Instance.secondEvent += UpdateSecond;

            rewardModel.CrossRealmPKAwardStateUpdate += UpdateDayAwardState;

            CrossServerOneVsOnePlayerInfo.Instance.UpdatePlayerInfoEvent += UpdateDayAwardState;

            dungeonModel.updateMissionEvent += UpdateFBHelp;

            recordDataMapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);

            UpdateServerOpenDay();

            UpdateDayAwardState();

            if(IsMatching && CrossServerOneVsOnePKSeason.Instance.InOpenTime())

@@ -110,6 +114,17 @@
            oneVsOneHistoryDict.Clear();

        }



        private void UpdateSecond()

        {

            loadSecond += 1;

            if(loadSecond >= 5)

            {

                recordDataMapId = dungeonModel.GetDataMapIdByMapId(PlayerDatas.Instance.baseData.MapID);

                GlobalTimeEvent.Instance.secondEvent -= UpdateSecond;

                loadSecond = 0;

                DebugEx.Log("UpdateSecond....." + recordDataMapId);

            }

        }



        private void OnLoadMapFinish()

        {