| System/ClientVersion/VersionConfig.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/ClientVersion/VersionUtility.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/FairylandCeremony/FairylandCeremonyWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/FriendSystem/MailAllModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/TaskListTip.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/MainInterfacePanel/TopRightTip.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Strengthening/GodBeastSlidingList.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Tip/ItemConfirmWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/WindowJump/WindowJumpMgr.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/WorldMap/MapModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
System/ClientVersion/VersionConfig.cs
@@ -95,12 +95,6 @@ [SerializeField] string m_BanHao; public string banHao { get { return m_BanHao; } } [SerializeField] string m_AuditOutTime; public string auditOutTime { get { return m_AuditOutTime; } set { m_AuditOutTime = value; } } public void Read(string _data) { var dataStrings = _data.Split('\t'); @@ -183,7 +177,6 @@ _to.m_ClientPackageFlag = _from.m_ClientPackageFlag; _to.m_LogoPosition = _from.m_LogoPosition; _to.m_BanHao = _from.m_BanHao; _to.m_AuditOutTime = _from.m_AuditOutTime; } /// <summary> System/ClientVersion/VersionUtility.cs
@@ -285,9 +285,18 @@ try { if (DateTime.TryParse(VersionConfig.Get().auditOutTime, out dateTime)) var textAsset = Resources.Load<UnityEngine.TextAsset>("Config/AuditTime"); var content = string.Empty; if (textAsset != null) { return DateTime.Now < dateTime; if (DateTime.TryParse(content, out dateTime)) { return DateTime.Now < dateTime; } else { return false; } } else { System/FairylandCeremony/FairylandCeremonyWin.cs
@@ -15,6 +15,8 @@ [SerializeField] Button rightBtn; [SerializeField] Button closeBtn; FairylandCeremonyModel ceremonyModel { get { return ModelCenter.Instance.GetModel<FairylandCeremonyModel>(); } } protected override void BindController() { @@ -38,6 +40,17 @@ protected override void OnActived() { base.OnActived(); if(!WindowJumpMgr.Instance.IsJumpState && functionOrder == 0) { if(ceremonyModel.rechargeRedp.state == RedPointState.Simple) { functionOrder = rechargeFunc.order; } else if(ceremonyModel.peopleRedp.state == RedPointState.Simple) { functionOrder = peopleToHiFunc.order; } } funcBtnGroup.TriggerByOrder(functionOrder); }
@@ -63,20 +63,28 @@ } AwardExchangeModel exchangeModel { get { return ModelCenter.Instance.GetModel<AwardExchangeModel>(); } } bool isLogin = true; public MailAllModel() { DTC0102_tagCDBPlayer.beforePlayerDataInitializeEvent += BeforePlayerDataInit; DTC0403_tagPlayerLoginLoadOK.playerLoginOkEvent += OnPlayerLoginOk; } private void BeforePlayerDataInit() { isLogin = true; funcType = MailFuncType.Mail; mailModelDict.Clear(); timeOrderMailInfo.Clear(); mailTitleStr = ""; mailContentstr = ""; mailSendPersonStr = ""; } private void OnPlayerLoginOk() { isLogin = false; } public MailFuncType funcType = MailFuncType.Mail; @@ -171,6 +179,16 @@ { exchangeModel.SetAwardExchangeModel(info.Items); } if(!isLogin) { if (info.Count > 0 || info.Gold > 0 || info.GoldPaper > 0 || info.Silver > 0) { SoundPlayer.Instance.PlayUIAudio(740); } } } } addMailCnt = mailModelDict.Count - preMailCnt; System/MainInterfacePanel/TaskListTip.cs
@@ -141,20 +141,6 @@ { } private void TaskIdUpdate(int taskId) { int leng = Content.childCount; for (int i = 0; i < leng; i++) { GameObject childObj = Content.GetChild(i).gameObject; TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>(); if (childObj.activeSelf && childObjTaskType.TaskID == taskId) { childObj.GetComponent<FlyingShoesTask>().FlyingShoes_Task(taskId); } } } private void CardLevelChangeEvent(int taskID)//卡级状态改变 { if (taskmodel.allMissionDict.ContainsKey(taskID) && taskmodel.allMissionDict[taskID].Type == 3) @@ -215,86 +201,70 @@ } void TaskToAdd(int MissionID, int MissionState, int DiscriptionIndex)//添加任务 { TaskScheduling(); var inDungeon = IsDungeon(); TaskScheduling(); if (WindowCenter.Instance.IsOpen<MainInterfaceWin>() && !inDungeon) { if (MissionState != 0) { if (MissionState != 0 && MissionID!=1 && _list.Contains(MissionID)) { TaskAddAndDelete(MissionID); TaskJump(MissionID); return; } } TaskJump(MissionID); } void LodingDelTask(int TaskID) { int LengChild = Content.childCount; for (int i = 0; i < LengChild; i++) { TaskType taskType = Content.GetChild(i).GetComponent<TaskType>(); FlyingShoesTask flyingShoesTask = Content.GetChild(i).GetComponent<FlyingShoesTask>(); if (taskType.TaskID == TaskID && taskType.gameObject.activeSelf) { taskType.gameObject.SetActive(false); if (TaskID != taskmodel.GetNowTaskID && flyingShoesTask.ImgSelected.activeSelf) { flyingShoesTask.ImgSelected.SetActive(false); } flyingShoesTask.UIEffect.Play(); } } SetLength(); } private void TaskAddAndDelete(int TaskID) { for (int i = 0; i < Content.childCount; i++) { GameObject childObj = Content.GetChild(i).gameObject; TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>(); if (i < _list.Count) { if (!childObj.activeSelf) { childObj.SetActive(true); } childObjTaskType.TaskID = _list[i]; childObjTaskType.IsGameObjectName(_list[i]); childObjTaskType.IsMysteriousTask(); childObj.GetComponent<FlyingShoesTask>().FlyingShoes_Task(_list[i]); } else { childObjTaskType.ClearTaskName(); if (childObj.activeSelf) { childObj.SetActive(false); } } } //for (int i = 0; i < Content.childCount; i++) //{ // GameObject childObj = Content.GetChild(i).gameObject; // TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>(); // if (i < _list.Count) // { // if (!childObj.activeSelf) // GameObject obj = Content.GetChild(i).gameObject; // TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>(); // if (childObjTaskType.TaskID == TaskID) // { // childObj.SetActive(true); // return; // } // childObjTaskType.TaskID = _list[i]; // childObjTaskType.IsGameObjectName(_list[i]); // childObjTaskType.IsMysteriousTask(); // childObj.GetComponent<FlyingShoesTask>().FlyingShoes_Task(_list[i]); // } // else // { // childObjTaskType.ClearTaskName(); // if (childObj.activeSelf) // if (childObjTaskType.TaskID == 0) // { // childObj.SetActive(false); // obj.SetActive(true); // childObjTaskType.TaskID = TaskID; // childObjTaskType.IsGameObjectName(TaskID); // childObjTaskType.IsMysteriousTask(); // obj.GetComponent<FlyingShoesTask>().FlyingShoes_Task(TaskID); // } // } //} for (int i = 0; i < Content.childCount; i++) { if (i < _list.Count) { GameObject obj = Content.GetChild(i).gameObject; TaskType childObjTaskType = Content.GetChild(i).gameObject.GetComponent<TaskType>(); if (childObjTaskType.TaskID == TaskID) { return; } if (childObjTaskType.TaskID == 0) { obj.SetActive(true); childObjTaskType.TaskID = TaskID; childObjTaskType.IsGameObjectName(TaskID); childObjTaskType.IsMysteriousTask(); obj.GetComponent<FlyingShoesTask>().FlyingShoes_Task(TaskID); } } } ChangeSort();//关于任务变更排序 SetLength(); } @@ -348,22 +318,39 @@ taskType.TaskID = 0; taskType.ClearTaskName(); obj.SetActive(false); obj.transform.SetAsLastSibling(); obj.transform.SetAsLastSibling(); return; } } } private void ChangeSort()//关于任务变更排序 { for (int i = 0; i < Content.childCount; i++) for (int i = 0; i < _list.Count; i++) { GameObject obj = Content.GetChild(i).gameObject; TaskType taskType = obj.GetComponent<TaskType>(); if (taskType.TaskID != 0 && _list.Contains(taskType.TaskID)) for (int j = 0; j < Content.childCount; j++) { int Inedx = _list.IndexOf(taskType.TaskID); obj.transform.SetSiblingIndex(Inedx); GameObject obj = Content.GetChild(j).gameObject; TaskType taskType = obj.GetComponent<TaskType>(); if (taskType.TaskID != 0 && taskType.TaskID == _list[i]) { int Inedx = _list.IndexOf(taskType.TaskID); obj.transform.SetSiblingIndex(Inedx); } } } //for (int i = 0; i < Content.childCount; i++) //{ // GameObject obj = Content.GetChild(i).gameObject; // TaskType taskType = obj.GetComponent<TaskType>(); // if (taskType.TaskID != 0 && _list.Contains(taskType.TaskID)) // { // int Inedx = _list.IndexOf(taskType.TaskID); // obj.transform.SetSiblingIndex(Inedx); // } //} }
@@ -27,10 +27,8 @@ private void OpenMapWin() { var mapResConfig = DTCA127_tagMCStartChangeMap.GetMapResourcesConfig(); var config = Config.Instance.Get<MapConfig>(PlayerDatas.Instance.baseData.MapID); if (string.IsNullOrEmpty(mapResConfig.BigMap) || PlayerDatas.Instance.baseData.MapID == FairyLeagueModel.FAIRY_LEAGUE_DUNGEON) var canOpen = ModelCenter.Instance.GetModel<MapModel>().CanOpenLocalMapWin(PlayerDatas.Instance.baseData.MapID); if (!canOpen) { SysNotifyMgr.Instance.ShowTip("MapInfo1"); } System/Strengthening/GodBeastSlidingList.cs
@@ -411,7 +411,7 @@ if (godBeastModel.Absorption_Dic.ContainsKey(godBeastBagClass.Index)) { GodBeastChildNodes.ChoosenImg.SetActive(true); if (itemModel.EquipPlace <= 0) if (itemModel.EquipPlace <= 0 && itemModel.itemInfo.ItemCount>1) { GodBeastChildNodes.NumberNow.gameObject.SetActive(true); GodBeastChildNodes.NumberNow.text = godBeastModel.Absorption_Dic[godBeastBagClass.Index].ToString(); @@ -434,9 +434,26 @@ } else//选中的物品为水晶 { godBeastModel.Crystal_ItemModel = itemModel; godBeastModel.ItemInde = godBeastBagClass.Index; WindowCenter.Instance.Open<CrystalSelectionWin>(); if (itemModel.itemInfo.ItemCount <= 1) { if (godBeastModel.Absorption_Dic.ContainsKey(godBeastBagClass.Index)) { godBeastModel.Absorption_Dic.Remove(godBeastBagClass.Index); } else { godBeastModel.Absorption_Dic.Add(godBeastBagClass.Index, 1); } m_ScrollerController.m_Scorller.RefreshActiveCellViews();//刷新可见 } else { godBeastModel.Crystal_ItemModel = itemModel; godBeastModel.ItemInde = godBeastBagClass.Index; WindowCenter.Instance.Open<CrystalSelectionWin>(); } } godBeastModel.AbsorbEventUpdate(); }); System/Tip/ItemConfirmWin.cs
@@ -77,7 +77,21 @@ private void ShowItemGetPath() { ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(ConfirmCancel.generalItemId); ItemConfig itemConfig = Config.Instance.Get<ItemConfig>(ConfirmCancel.generalItemId); if(itemConfig != null) { if(itemConfig.GetWay != null && itemConfig.GetWay.Length > 0) { ModelCenter.Instance.GetModel<GetItemPathModel>().SetChinItemModel(ConfirmCancel.generalItemId); } else { ItemAttrData attrData = new ItemAttrData(ConfirmCancel.generalItemId); var tipsModel = ModelCenter.Instance.GetModel<ItemTipsModel>(); tipsModel.SetItemTipsModel(attrData); } } } }
@@ -46,7 +46,7 @@ TrialDungeonModel trialDungeonModel { get { return ModelCenter.Instance.GetModel<TrialDungeonModel>(); } } ImpactRankModel rankModel { get { return ModelCenter.Instance.GetModel<ImpactRankModel>(); } } ComposeWinModel composeModel { get { return ModelCenter.Instance.GetModel<ComposeWinModel>(); } } MapModel mapModel { get { return ModelCenter.Instance.GetModel<MapModel>(); } } public bool IsJumpState { get; private set; } public int jumpPhase { get; private set;} public int jumpType { get; private set; } @@ -131,6 +131,13 @@ return; } break; case JumpUIType.BigMap: if(!mapModel.CanOpenLocalMapWin(PlayerDatas.Instance.baseData.MapID)) { SysNotifyMgr.Instance.ShowTip("MapInfo1"); return; } break; case JumpUIType.TreasureFindHostFunc1: case JumpUIType.TreasureFindHostFunc2: case JumpUIType.TreasureFindHostFunc3: System/WorldMap/MapModel.cs
@@ -293,6 +293,21 @@ return null; } public bool CanOpenLocalMapWin(int mapId) { var mapResConfig = DTCA127_tagMCStartChangeMap.GetMapResourcesConfig(); var config = Config.Instance.Get<MapConfig>(mapId); if (string.IsNullOrEmpty(mapResConfig.BigMap) || mapId == FairyLeagueModel.FAIRY_LEAGUE_DUNGEON) { return false; } else { return true; } } public int GetRecommendHangPoint(int _mapId) { var eventPoints = new List<int>(GetMapEventPoints(_mapId));
