| System/DailyQuest/DailyQuestModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/DailyQuest/DailyQuestWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Dogz/DogzActiveWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/DogzDungeon/DogzDungeonModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/SystemSetting/ActivityPushCell.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/SystemSetting/SetPrivateModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
System/DailyQuest/DailyQuestModel.cs
@@ -146,6 +146,11 @@ UpdateRedpoints(); } public List<int> GetDailyQuests() { return new List<int>(dailyQuests.Keys); } public List<int> GetDailyQuests(DailyQuestCategory _category) { var quests = new List<int>(); @@ -499,11 +504,6 @@ private void OnFairyLeagueBattle() { UpdateDailyActionRedpoint((int)DailyQuestType.FairyLeague); } public Dictionary<int, DailyQuestData> GetDailyQuestlist() { return dailyQuests; } public void UpdateRedpoints() System/DailyQuest/DailyQuestWin.cs
@@ -85,8 +85,8 @@ if (guidingDailyQuestId != 0) { var preferTimeLimit = false; var dailyQuests = model.GetDailyQuestlist(); foreach (var quest in dailyQuests.Keys) var dailyQuests = model.GetDailyQuests(); foreach (var quest in dailyQuests) { var dailyQuestState = model.GetQuestState(quest); DailyQuestOpenTime openTime; System/Dogz/DogzActiveWin.cs
@@ -27,6 +27,9 @@ [SerializeField] Button m_CallBackBtn; [SerializeField] RedpointBehaviour assistBtnRedBehav; [SerializeField] Text m_CallBackBtnTxt; [SerializeField] UIEffect alreadyAssistEffect; [SerializeField] UIEffect assistEffect; [SerializeField] UIEffect assistTextEffect; DogzModel m_Model; DogzModel model { @@ -67,8 +70,6 @@ model.UpdateSelectDogzEvent += UpdateSelectDogzEvent; model.UpdateAssistDogzEvent += UpdateDogzAssistCnt; model.RefreshDogzEquipAct += RefreshDogzEquipEvent; } protected override void OnAfterOpen() @@ -159,6 +160,24 @@ var _dogzCfg = Config.Instance.Get<DogzConfig>(model.presentSelectDogz); m_DogzHeadIcon.SetSprite(_dogzCfg.HeadIcon); m_DogzHeadIcon.SetNativeSize(); var _dogzEquips = model.GetDogzEquips(model.presentSelectDogz); alreadyAssistEffect.Stop(); if (_dogzEquips != null && _dogzEquips.Count == 5) { m_DogzHeadIcon.material = MaterialUtility.GetUIDefaultGraphicMaterial(); if(model.TryGetAssistDogzState(model.presentSelectDogz)) { if(!alreadyAssistEffect.IsPlaying) { alreadyAssistEffect.Play(); } } } else { m_DogzHeadIcon.material = MaterialUtility.GetDefaultSpriteGrayMaterial(); } for (int i = 0; i < m_DogzEquips.Count; i++) { ItemModel _data; @@ -234,13 +253,16 @@ } } } private void UpdateDogzAssistCnt() { m_Controller.m_Scorller.RefreshActiveCellViews(); m_DogzAssistCnt.text = Language.Get("TreasurePrivilege_Dogz_1", StringUtility.Contact(model.GetAssistDogzCount(), "/", model.DogzAssistDefaultCnt)); UpdateDogzBtn(); UpdateDogzProperty(); UpdateDogzEquip(); } private void UpdateDogzBtn() { var _dogzEquips = model.GetDogzEquips(model.presentSelectDogz); @@ -275,6 +297,8 @@ { if(model.GetAssistDogzCount() < model.DogzAssistDefaultCnt) { assistEffect.Play(); assistTextEffect.Play(); model.SendChangeDogzAssist(1); } else System/DogzDungeon/DogzDungeonModel.cs
@@ -13,14 +13,11 @@ public const int DATA_MAPID = 21110; int m_SelectedBoss = 0; public int selectedBoss { get { public int selectedBoss { get { return this.m_SelectedBoss; } set { set { if (this.m_SelectedBoss != value) { this.m_SelectedBoss = value; @@ -33,11 +30,9 @@ } int m_WearyValue = 0; public int wearyValue { public int wearyValue { get { return m_WearyValue; } set { set { if (m_WearyValue != value) { m_WearyValue = value; @@ -50,11 +45,9 @@ } int m_BigBoxCollectCount = 0; public int bigBoxCollectCount { public int bigBoxCollectCount { get { return m_BigBoxCollectCount; } set { set { if (m_BigBoxCollectCount != value) { m_BigBoxCollectCount = value; @@ -67,8 +60,7 @@ } int m_SmallBoxCollectCount = 0; public int smallBoxCollectCount { public int smallBoxCollectCount { get { return m_SmallBoxCollectCount; } set { m_SmallBoxCollectCount = value; } } @@ -272,18 +264,39 @@ public void UpdateBoxOrEliteRefreshTime(HA904_tagGCDogzNPCRefreshTime _refreshTimes) { var containBox = false; var boxRefreshSecond = 0; var containElite = false; var eliteRefreshSecond = 0; for (int i = 0; i < _refreshTimes.InfoList.Length; i++) { var info = _refreshTimes.InfoList[i]; if (bigBoxNpcId == info.NPCID || smallBoxNpcId == info.NPCID) { dogzDungeonBox.UpdateBoxRefreshTime((int)info.RefreshSecond); RequestBoxSurplusInfo(); containBox = true; boxRefreshSecond = (int)info.RefreshSecond; } if (eliteMonsters.Contains((int)info.NPCID)) { dogzDungeonElite.UpdateEliteRefreshTime((int)info.RefreshSecond); containElite = true; eliteRefreshSecond = (int)info.RefreshSecond; } } if (WindowCenter.Instance.CheckOpen("DogzDungeonWin")) { if (containBox) { dogzDungeonBox.UpdateBoxRefreshTime(boxRefreshSecond); RequestBoxSurplusInfo(); } if (containElite) { dogzDungeonElite.UpdateEliteRefreshTime(eliteRefreshSecond); RequestEliteSurplusInfo(); } } @@ -344,10 +357,8 @@ public class DogzDungeonElite { public Dictionary<int, int> eliteCounts = new Dictionary<int, int>(); public int eliteSurplus { get { public int eliteSurplus { get { var count = 0; foreach (var eliteCount in eliteCounts.Values) { @@ -392,10 +403,8 @@ public class DogzDungeonBossData { public int id { get; private set; } public bool isUnLocked { get { public bool isUnLocked { get { var config = Config.Instance.Get<NPCConfig>(id); return PlayerDatas.Instance.baseData.LV >= config.NPCLV; } System/SystemSetting/ActivityPushCell.cs
@@ -12,20 +12,22 @@ [SerializeField] GameObject bgObj; SetPrivateModel privateModel { get { return ModelCenter.Instance.GetModel<SetPrivateModel>(); } } DailyQuestModel dailyQuestModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } } public void SetModel(int dailyId) { string title = ""; string weekDay = ""; string openTime = ""; privateModel.GetDailyInfoById(dailyId,out title,out weekDay,out openTime); privateModel.GetDailyInfoById(dailyId, out title, out weekDay, out openTime); nameText.text = title; weekDayText.text = weekDay; timeText.text = openTime; int index = privateModel.GetSwitchIndexById(dailyId); pushBtn.SetInit(index,privateModel.GetSwitchStateByIndex(index)); pushBtn.switchBtn.RemoveAllListeners(); pushBtn.switchBtn.AddListener(() => var quests = dailyQuestModel.GetDailyQuests(DailyQuestModel.DailyQuestCategory.TimeLimit); int index = privateModel.GetSwitchIndexById(dailyId, quests); pushBtn.SetInit(index, privateModel.GetSwitchStateByIndex(index)); pushBtn.switchBtn.SetListener(() => { if (pushBtn.onObj.activeInHierarchy) { @@ -41,14 +43,7 @@ } }); if(this.index % 2 == 0) { bgObj.SetActive(true); } else { bgObj.SetActive(false); } bgObj.SetActive(this.index % 2 == 0); } } } System/SystemSetting/SetPrivateModel.cs
@@ -9,11 +9,7 @@ { public class SetPrivateModel : Model, IBeforePlayerDataInitialize, IAfterPlayerDataInitialize, IPlayerLoginOk { DailyQuestModel m_dailyModel; DailyQuestModel dailyModel { get { return m_dailyModel ?? (m_dailyModel = ModelCenter.Instance.GetModel<DailyQuestModel>()); } } DailyQuestModel dailyModel { get { return ModelCenter.Instance.GetModel<DailyQuestModel>(); } } VipModel vipModel { get { return ModelCenter.Instance.GetModel<VipModel>(); } } public List<int> hangUpPushlist = new List<int>(); @@ -146,7 +142,7 @@ List<int> dailyIdlist = GetOpenDailyIdlist(true); for (int i = 0; i < dailyIdlist.Count; i++) { bool isOpen = GetSwitchStateByIndex(GetSwitchIndexById(dailyIdlist[i])); bool isOpen = GetSwitchStateByIndex(GetSwitchIndexById(dailyIdlist[i], dailyIdlist)); if (isOpen) { List<JsonData> pushNotifylist = GetPushJsonData(dailyIdlist[i]); @@ -459,9 +455,8 @@ } } public int GetSwitchIndexById(int id) public int GetSwitchIndexById(int id, List<int> quests) { var quests = dailyModel.GetDailyQuests(DailyQuestModel.DailyQuestCategory.TimeLimit); for (int i = 0; i < quests.Count; i++) { if (quests[i] == id) @@ -513,15 +508,17 @@ private void RefreshDailyQuest() { foreach (var dailyQuest in dailyModel.GetDailyQuestlist().Values) var quests = dailyModel.GetDailyQuests(DailyQuestModel.DailyQuestCategory.TimeLimit); foreach (var dailyQuest in dailyModel.GetDailyQuests()) { var isUnLocked = TestDailyQuestUnLock(dailyQuest.id); var isUnLocked = TestDailyQuestUnLock(dailyQuest); if (isUnLocked) { ModelCenter.Instance.GetModel<SetPrivateModel>().CheckActivityOpenTime(dailyQuest.id); CheckActivityOpenTime(dailyQuest, quests); } } } public bool TestDailyQuestUnLock(int _dailyQuestId) { switch ((DailyQuestType)_dailyQuestId) @@ -541,9 +538,11 @@ } public void CheckActivityOpenTime(int dailyId) public void CheckActivityOpenTime(int dailyId, List<int> quests) { bool isOpen = GetSwitchStateByIndex(GetSwitchIndexById(dailyId)); bool isOpen = GetSwitchStateByIndex(GetSwitchIndexById(dailyId, quests)); if (!isOpen) return;
