| Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Core/NetworkPackage/DTCFile/ServerPack/H08_Event/DTC0820_tagMissionDict.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/BlastFurnace/DanDrugRecycleTip.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/PlayerTaskDatas.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/TaskListTip.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Mount/PlayerMountDatas.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Pet/PlayerPetDatas.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Store/BagStoreWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Store/RuneStoreWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Store/StoreModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Store/StoreWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Store/UnionStoreWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| Utility/LanguageVerify.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
Core/GameEngine/Model/Player/Fairy/PlayerFairyData.cs
@@ -311,7 +311,7 @@ fairy = null; mine = null; ChatCtrl.Inst.ClearChatInfo(ChatInfoType.Fairy); PlayerPrefs.DeleteKey(m_storeModel.UNIONSTORESAVE_KEY); } #endregion
@@ -27,12 +27,9 @@ { taskmodel.TaskRefreshes((int)vNetData.MissionID, vNetData.DictKeyLen, vNetData.DictKey, (int)vNetData.DictValue);//任务字典 taskmodel.Task0820(vNetData); taskmodel.GetTaskGetOnNow((int)vNetData.MissionID, vNetData.DictKey); PreFightMission.Instance.HandleNewPlayerMission(vNetData); } } } System/BlastFurnace/DanDrugRecycleTip.cs
@@ -37,7 +37,7 @@ blastFurnace.RefreshSelectRecycleAct += RefreshRecycleGetMoney; danDrugCtrl.OnRefreshCell += RefreshRecycleDan; shopCtrl.OnRefreshCell += RefreshShopCell; m_storeModel.RefreshBuyShopLimitEvent = CreateShopCell; m_storeModel.RefreshBuyShopLimitEvent += CreateShopCell; m_storeModel.RefreshTCBPlayerDataEvent += RefreshRecycleScore; blastFurnace.RefreshMakeItemAnswerAct += OnGetRecycleResult; m_storeModel.storeFuncType = StoreFunc.DanDrugStore; @@ -53,6 +53,7 @@ blastFurnace.RefreshSelectRecycleAct -= RefreshRecycleGetMoney; blastFurnace.RefreshMakeItemAnswerAct -= OnGetRecycleResult; playerPack.RefreshItemCountAct -= RefreshItemCnt; m_storeModel.RefreshBuyShopLimitEvent -= CreateShopCell; recycleBtn.RemoveAllListeners(); GlobalTimeEvent.Instance.secondEvent -= RefreshResetTime; } System/MainInterfacePanel/PlayerTaskDatas.cs
@@ -121,7 +121,7 @@ public int currentMission { get; private set; } public int currentMissionState { get; private set; } public int GetNowTaskID { get; set; } public int GetNowTaskID { get; set; }//获取当前选中条的任务ID private bool AutomaticityBool = false;//控制是否自动进行自动任务 private int retainTaskID = 0; @@ -183,8 +183,12 @@ public void OnPlayerLoginOk() { GlobalTimeEvent.Instance.secondEvent -= secondEvent; GlobalTimeEvent.Instance.secondEvent += secondEvent; AutomaticityBool = true; } private void onStageLoadFinish()//地图切换时调用 { @@ -848,9 +852,14 @@ { if (MainTaskDic.ContainsKey(_MissionId) && MainCardLevelChange != null && _DictValue == 0) { if (IsGetOnBool) { GetNowTaskID = _MissionId; } MainCardLevelChange(_MissionId); } } } else @@ -864,9 +873,16 @@ { CardLevelChange(_MissionId); } if (MainTaskDic.ContainsKey(_MissionId) && MainCardLevelChange != null) { MainCardLevelChange(_MissionId); if (MainTaskDic.ContainsKey(_MissionId)) { if (IsGetOnBool) { GetNowTaskID = _MissionId; } if (MainCardLevelChange != null) { MainCardLevelChange(_MissionId); } } } } @@ -986,15 +1002,6 @@ } } } //if (_NpcID == allMissionDict[key].LightList.NpcId) //{ // if (allMissionDict[key].LightList.StateLight > Light) // { // Light = allMissionDict[key].LightList.StateLight; // } //} } return Light; @@ -1013,7 +1020,6 @@ return; } } } if (FairyAuDic.Count != 0) { @@ -1027,8 +1033,6 @@ } } } } public void DailyBountyMove()//日常赏金任务 { @@ -1043,7 +1047,6 @@ return; } } } if (BountyDic.Count != 0) { @@ -1057,7 +1060,6 @@ } } } } @@ -1080,7 +1082,6 @@ } } } } private int Autotasking(int taskID) @@ -1144,7 +1145,6 @@ return; } } } else if (FairyAuDic.ContainsKey(_taskID))//仙盟任务 { @@ -1248,7 +1248,6 @@ { break; } if (MapTransferUtility.Instance.MapTransferDoType != MapTransferUtility.E_MapTransferDoType.None) { break; @@ -1371,7 +1370,6 @@ GA_NpcFunc.SetNpcFuncVisible(Npcid, true); } } } } @@ -1493,7 +1491,6 @@ { return -1; } } public int GetQuestState(int _taskId) @@ -1507,5 +1504,34 @@ return -1; } } //--------主要用于记录任务列表选中条的智能性 （-_-||） public int GetOnTaskId = 0; public bool IsGetOnBool = false; private int NeedTime = 10; private DateTime dateTimeA; public void GetTaskGetOnNow(int TaskID, string DictKey)//记录下信息字典的ID { string key1Str = "on_kill_" + TaskID; string key2Str = "get_byid_" + TaskID; if (TaskID > 1 && (key1Str== DictKey || key2Str== DictKey)) { GetOnTaskId = TaskID; dateTimeA =DateTime.Now; } } private void secondEvent() { TimeSpan timeS =DateTime.Now- dateTimeA; int timeSend = timeS.Seconds; if (timeSend >= NeedTime) { IsGetOnBool = true; GetOnTaskId = GetNowTaskID;//获取当前选中的ID } else { IsGetOnBool = false; } } } System/MainInterfacePanel/TaskListTip.cs
@@ -198,31 +198,9 @@ private void MainCardLevelChange(int _id) { TaskScheduling(); bool IsDefault = true; var State = taskmodel.GetTaskStatus(_id); if (State == PlayerTaskDatas.TaskStatus.CardLevel) { IsDefault = false; } if (IsDefault) { foreach (var key in taskmodel.MainTaskDic.Keys) { if (taskmodel.MainTaskDic[key].MissionState != 3) { taskmodel.GetNowTaskID = key; } } } else { if (_list.Count > 0) { taskmodel.GetNowTaskID = _list[0]; } } TaskScheduling(); TheTaskToGenerate(); TaskJump(_id); } private void SetLength() @@ -350,11 +328,13 @@ void OnTaskToDelete(int _IdTask)//任务的删除 { var inDungeon = IsDungeon(); TaskScheduling(); if (WindowCenter.Instance.CheckOpen<MainInterfaceWin>() && !inDungeon) { LodingDelTask(_IdTask); TheTaskToGenerate();//任务列表需要重新排列重新刷新赋值 // LodingDelTask(_IdTask); } TaskScheduling(); } @@ -442,9 +422,20 @@ return mapConfig != null && mapConfig.MapFBType != 0; } private void TaskJump() private void TaskJump(int TaskID=0) { int type = _list.IndexOf(taskmodel.GetNowTaskID); int type = 0; if (TaskID == 0) { type= _list.IndexOf(taskmodel.GetNowTaskID); } else { if (_list.Contains(TaskID)) { type = _list.IndexOf(TaskID); } } if (_list.Count <= 2 || type <= 0) { m_ScrollRect.verticalNormalizedPosition = 1; System/Mount/PlayerMountDatas.cs
@@ -113,20 +113,20 @@ } } private float time = 0f; private DateTime dateTimeA; private void secondEvent() { if (!Wait) { time+= Time.deltaTime; if (time >= 1.5f) TimeSpan timeS = DateTime.Now - dateTimeA; if (timeS.Seconds >= 2f) { Wait = true; } } else { time = 0f; dateTimeA = DateTime.Now; } }
@@ -135,20 +135,20 @@ PlayerLoginOkData(); } } private float time = 0f; private DateTime dateTimeA; private void secondEvent() { if (!Wait) { time += Time.deltaTime; if (time >= 1.5f) TimeSpan timeS = DateTime.Now - dateTimeA; if (timeS.Seconds>= 2f) { Wait = true; } } else { time = 0f; dateTimeA = DateTime.Now; } }
@@ -58,7 +58,7 @@ m_storeModel.storeFuncType = StoreFunc.BagStore; InitModel(); OnFrenshMoneyInfo(); m_storeModel.RefreshBuyShopLimitEvent = InitModel; m_storeModel.RefreshBuyShopLimitEvent += InitModel; PlayerDatas.Instance.RefreshPlayerInfoEvent += OnFrenshMoneyInfo; } @@ -69,7 +69,7 @@ protected override void OnPreClose() { m_storeModel.RefreshBuyShopLimitEvent -= InitModel; } protected override void OnAfterClose() System/Store/RuneStoreWin.cs
@@ -57,7 +57,7 @@ protected override void OnPreOpen() { m_storeModel.RefreshBuyShopLimitEvent = InitModel; m_storeModel.RefreshBuyShopLimitEvent += InitModel; model.OnRefreshRuneChip += OnFrenshMoneyInfo; _tagFuncModel = Config.Instance.Get<FuncConfigConfig>("RuneShop"); m_storeModel.storeFuncType = StoreFunc.RuneStore; @@ -75,7 +75,8 @@ } protected override void OnAfterClose() { { m_storeModel.RefreshBuyShopLimitEvent -= InitModel; runemodel.OnRefreshRuneChip -= OnFrenshMoneyInfo; } #endregion System/Store/StoreModel.cs
@@ -52,6 +52,11 @@ public void OnBeforePlayerDataInitialize() { FuncOpen.Instance.OnFuncStateChangeEvent -= FuncStateChange; PlayerDatas.Instance.fairyData.OnRefreshFairyMine -= RefreshServerHour; PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= RefreshFamilyLv; RefreshTCBPlayerDataEvent -= RefreshPlayerLv; TimeMgr.Instance.OnHourEvent -= RefreshServerHour; shopItemlimitDict.Clear(); tagTowerModel = null; storeFuncType = StoreFunc.WeekStore; @@ -62,21 +67,19 @@ public void OnAfterPlayerDataInitialize() { UNIONSTORESAVE_KEY = StringUtility.Contact(PlayerDatas.Instance.baseData.PlayerID, LocalSaveStoreType.UnionStore); DebugEx.Log("UNIONSTORESAVE_KEY:" + UNIONSTORESAVE_KEY); StoreEffectRecord_Key = StringUtility.Contact(PlayerDatas.Instance.baseData.PlayerID, "StoreEffectRecord"); } public void OnPlayerLoginOk() { PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= RefreshFamilyLv; PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += RefreshFamilyLv; PlayerDatas.Instance.fairyData.OnRefreshFairyMine -= RefreshServerHour; PlayerDatas.Instance.fairyData.OnRefreshFairyMine += RefreshServerHour; FuncOpen.Instance.OnFuncStateChangeEvent -= FuncStateChange; FuncOpen.Instance.OnFuncStateChangeEvent += FuncStateChange; RefreshTCBPlayerDataEvent -= RefreshPlayerLv; RefreshTCBPlayerDataEvent += RefreshPlayerLv; TimeMgr.Instance.OnHourEvent -= RefreshServerHour; TimeMgr.Instance.OnHourEvent += RefreshServerHour; shoplist = null; CheckWeekStoreIsShopBuy(out shoplist); ControllerRedPoint(); @@ -228,9 +231,13 @@ private void RefreshServerHour() { ControllerRedPoint(); if(!PlayerDatas.Instance.fairyData.HasFairy) { PlayerPrefs.DeleteKey(UNIONSTORESAVE_KEY); } } public Action RefreshBuyShopLimitEvent; public event Action RefreshBuyShopLimitEvent; public StoreFunc storeFuncType = StoreFunc.WeekStore; private Dictionary<uint, BuyShopItemLimit> shopItemlimitDict = new Dictionary<uint, BuyShopItemLimit>(); System/Store/StoreWin.cs
@@ -98,7 +98,7 @@ { shopId = 0; m_storeModel.RefreshTCBPlayerDataEvent += OnRefreshPlayerInfo; m_storeModel.RefreshBuyShopLimitEvent = OnCreate; m_storeModel.RefreshBuyShopLimitEvent += OnCreate; RefreshCoins(); RefreshResetTime(); } @@ -141,6 +141,7 @@ protected override void OnPreClose() { m_storeModel.shoplist.Clear(); m_storeModel.RefreshBuyShopLimitEvent -= OnCreate; GlobalTimeEvent.Instance.secondEvent -= RefreshResetTime; m_storeModel.RefreshTCBPlayerDataEvent -= OnRefreshPlayerInfo;
@@ -71,7 +71,7 @@ m_storeModel.storeFuncType = StoreFunc.ToolStore; m_storeModel.RefreshTCBPlayerDataEvent += OnRefreshPlayerInfo; PlayerDatas.Instance.fairyData.OnRefreshFairyInfo += CreateCell; m_storeModel.RefreshBuyShopLimitEvent = CreateCell; m_storeModel.RefreshBuyShopLimitEvent += CreateCell; CreateCell(); RefreshUI(); } @@ -96,6 +96,7 @@ protected override void OnPreClose() { m_storeModel.RefreshBuyShopLimitEvent -= CreateCell; m_storeModel.RefreshTCBPlayerDataEvent -= OnRefreshPlayerInfo; PlayerDatas.Instance.fairyData.OnRefreshFairyInfo -= CreateCell; } @@ -157,7 +158,11 @@ private void CreateCell() { shopId = 0; _unionLv = PlayerDatas.Instance.fairyData.fairy.FamilyLV; _unionLv = 0; if(PlayerDatas.Instance.fairyData.HasFairy) { _unionLv = PlayerDatas.Instance.fairyData.fairy.FamilyLV; } base.CreateShopItemCell(_shopCtrl,2); }
@@ -57,6 +57,7 @@ HttpRequest.Instance.RequestHttpPost(VerifyPlayerNameUrl, tables, HttpRequest.defaultHttpContentType, 3, (bool ok, string result) => { DebugEx.Log(result); if (ok) { var response = LitJson.JsonMapper.ToObject<VerifyResponse>(result); @@ -120,6 +121,7 @@ HttpRequest.Instance.RequestHttpPost(VerifyFairyUrl, tables, HttpRequest.defaultHttpContentType, 3, (bool ok, string result) => { DebugEx.Log(result); if (ok) { var response = LitJson.JsonMapper.ToObject<VerifyResponse>(result); @@ -185,6 +187,7 @@ HttpRequest.Instance.RequestHttpPost(VerifyChatUrl, tables, HttpRequest.defaultHttpContentType, 3, (bool ok, string result) => { DebugEx.Log(result); if (ok) { var response = LitJson.JsonMapper.ToObject<VerifyResponse>(result);
