| System/DailyQuest/DailyQuestBehaviour.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/DailyQuest/DailyQuestModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Dungeon/DungeonModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/SystemSetting/SetPrivateModel.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 | |
| System/Team/TeamTargetJoinLimitWin.cs | ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 |
System/DailyQuest/DailyQuestBehaviour.cs
@@ -197,8 +197,7 @@ m_Locked.gameObject.SetActive(state == DailyQuestModel.DailyQuestState.Locked); m_UnLockCondition.gameObject.SetActive(state == DailyQuestModel.DailyQuestState.Locked); m_Supplementary.gameObject.SetActive(state == DailyQuestModel.DailyQuestState.ServerForbid || state == DailyQuestModel.DailyQuestState.OutTime); m_Supplementary.gameObject.SetActive(state == DailyQuestModel.DailyQuestState.OutTime); m_PracticePoint.gameObject.SetActive(state == DailyQuestModel.DailyQuestState.Normal || state == DailyQuestModel.DailyQuestState.CanBuyTimes); m_AssistPoint.gameObject.SetActive(state == DailyQuestModel.DailyQuestState.Completed); @@ -209,24 +208,6 @@ { case DailyQuestModel.DailyQuestState.Locked: m_UnLockCondition.text = DailyQuestModel.GetDailyQuestUnLockDescription(data.id); break; case DailyQuestModel.DailyQuestState.ServerForbid: DailyQuestOpenTime openTime1; if (model.TryGetOpenTime(data.id, out openTime1)) { if (openTime1.openServerWeek > 0) { m_Supplementary.text = Language.Get("DailyQuest_ThatWeek", openTime1.openServerWeek); } else { m_Supplementary.text = Language.Get("DailyQuest_Day", openTime1.openServerDay); } } else { m_Supplementary.text = ""; } break; case DailyQuestModel.DailyQuestState.OutTime: DailyQuestOpenTime openTime2; System/DailyQuest/DailyQuestModel.cs
@@ -744,9 +744,9 @@ return 1; } var dayOfWeek = (int)DateTime.Now.DayOfWeek; var isActiveDay1 = openTime1.always || openTime1.openTimes.ContainsKey(dayOfWeek); var isActiveDay2 = openTime2.always || openTime2.openTimes.ContainsKey(dayOfWeek); var dayOfWeek = (int)TimeUtility.ServerNow.DayOfWeek; var isActiveDay1 = openTime1.always || openTime1.GetHourMinuteByWeek(dayOfWeek) != null; var isActiveDay2 = openTime2.always || openTime2.GetHourMinuteByWeek(dayOfWeek) != null; if (isActiveDay1 && !isActiveDay2) { @@ -823,12 +823,6 @@ DailyQuestOpenTime openTime; if (TryGetOpenTime(_dailyQuestId, out openTime)) { var validServerTime = openTime.IsValidServerOpenTime(); if (!validServerTime) { return DailyQuestState.ServerForbid; } var inOpenTime = openTime.InOpenTime(); if (!inOpenTime) { @@ -1029,7 +1023,6 @@ public enum DailyQuestState { Locked = 0, ServerForbid = 1, OutTime = 2, Normal = 3, CanBuyTimes = 5, System/Dungeon/DungeonModel.cs
@@ -41,54 +41,65 @@ List<Item> sweepResultItems = new List<Item>(); int m_SweepDungeonTypeBuf = 0; public int sweepDungeonTypeBuf { public int sweepDungeonTypeBuf { get { return m_SweepDungeonTypeBuf; } } Dungeon m_SelectedTrialDungeon; public Dungeon selectedTrialDungeon { public Dungeon selectedTrialDungeon { get { return m_SelectedTrialDungeon; } set { m_SelectedTrialDungeon = value; } } Dungeon m_CurrentDungeon; public Dungeon currentDungeon { public Dungeon currentDungeon { get { return m_CurrentDungeon; } set { m_CurrentDungeon = value; } } int m_DungeonGrade = 0; public int dungeonGrade { public int dungeonGrade { get { return m_DungeonGrade; } } DungeonMissionData m_Mission; public DungeonMissionData mission { public DungeonMissionData mission { get { return m_Mission; } } DungeonResult m_DungeonResult; public DungeonResult dungeonResult { public DungeonResult dungeonResult { get { return m_DungeonResult; } set { m_DungeonResult = value; } } public int dungeonCoinInspireCount { public int dungeonCoinInspireCount { get; private set; } public int dungeonJadeInspireCount { public int dungeonJadeInspireCount { get; private set; } public int dungeonInspireUper { public int dungeonInspireUper { get; private set; } Dungeon m_SelectedKylinDungeon; public Dungeon selectedKylinDungeon { public Dungeon selectedKylinDungeon { get { return m_SelectedKylinDungeon; } set { set { if (m_SelectedKylinDungeon != value) { m_SelectedKylinDungeon = value; @@ -109,9 +120,11 @@ public bool gradeTween = true; DungeonFightStage m_DungeonFightStage = DungeonFightStage.None; public DungeonFightStage dungeonFightStage { public DungeonFightStage dungeonFightStage { get { return m_DungeonFightStage; } set { set { if (m_DungeonFightStage != value) { m_DungeonFightStage = value; @@ -1334,7 +1347,9 @@ if (!dungeonOpenTimes.ContainsKey(config.DataMapID)) { dungeonOpenTimes[config.DataMapID] = new DailyQuestOpenTime(config.DataMapID, DungeonStateTimeConfig.DungeonStateCanEnterFB(config.DataMapID)); var openTime = dungeonOpenTimes[config.DataMapID] = new DailyQuestOpenTime(config.DataMapID); openTime.ParseDungeonNormalOpenTimes(DungeonStateTimeConfig.DungeonStateCanEnterFB(config.DataMapID)); //还有定制日期 } }
@@ -73,13 +73,17 @@ { DailyQuestOpenTime dailyQuestOpenTime; dailyModel.TryGetOpenTime(dailyId, out dailyQuestOpenTime); foreach (var weekday in dailyQuestOpenTime.openTimes.Keys) for (int i = 0; i < 7; i++) { List<HourMinute> hourMinutelist = dailyQuestOpenTime.openTimes[weekday]; for (int i = 0; i < hourMinutelist.Count; i++) var hourMinutelist = dailyQuestOpenTime.GetHourMinuteByWeek(i); if (hourMinutelist != null) { string key = StringUtility.Contact(dailyId,weekday,hourMinutelist[i].hourBegin); for (int j = 0; j < hourMinutelist.Count; j++) { var key = StringUtility.Contact(dailyId, i, hourMinutelist[i].hourBegin); keylist.Add(key); } } } } @@ -219,11 +223,14 @@ pushKey = new List<string>(); DailyQuestOpenTime dailyQuestOpenTime; dailyModel.TryGetOpenTime(dailyId, out dailyQuestOpenTime); foreach (var weekday in dailyQuestOpenTime.openTimes.Keys) for (int weekDay = 0; weekDay < 7; weekDay++) { int day = weekday > 0 ? weekday : 7; var hourMinutelist = dailyQuestOpenTime.GetHourMinuteByWeek(weekDay); if (hourMinutelist != null) { int day = weekDay > 0 ? weekDay : 7; int curDay = (int)TimeUtility.ServerNow.DayOfWeek > 0 ? (int)TimeUtility.ServerNow.DayOfWeek : 7; List <HourMinute> hourMinutelist = dailyQuestOpenTime.openTimes[weekday]; int remainDay = day - curDay; if (remainDay < 0) { @@ -247,12 +254,15 @@ int remainSecond = remainDay * 24 * 60 * 60 + remainHour * 60 * 60 + remainMinute * 60; if (remainSecond > 120) { string key = StringUtility.Contact(dailyId,weekday,hourMinutelist[i].hourBegin); string key = StringUtility.Contact(dailyId, weekDay, hourMinutelist[i].hourBegin); pushKey.Add(key); pushDelaySecond.Add(remainSecond); } } } } return pushDelaySecond; } @@ -437,11 +447,15 @@ week = dailyQuestOpenTime.ToOpenTimeString(); title = config.Title; time = ""; foreach (var weekday in dailyQuestOpenTime.openTimes.Keys) for (int i = 0; i < 7; i++) { List<HourMinute> hourMinutelist = dailyQuestOpenTime.openTimes[weekday]; var hourMinutelist = dailyQuestOpenTime.GetHourMinuteByWeek(i); if (hourMinutelist != null) { time = StringUtility.Contact(hourMinutelist[0].hourBegin > 9 ? hourMinutelist[0].hourBegin.ToString() : "0" + hourMinutelist[0].hourBegin, ":", hourMinutelist[0].minuteBegin > 9 ? hourMinutelist[0].minuteBegin.ToString() : "0" + hourMinutelist[0].minuteBegin); break; } } } @@ -536,9 +550,9 @@ DailyQuestOpenTime openTime; dailyModel.TryGetOpenTime(dailyId, out openTime); var dayOfWeek = (int)TimeUtility.ServerNow.DayOfWeek; if (openTime.openTimes.ContainsKey(dayOfWeek)) var hourMinutes = openTime.GetHourMinuteByWeek(dayOfWeek); if (hourMinutes != null) { var hourMinutes = openTime.openTimes[dayOfWeek]; for (int i = 0; i < hourMinutes.Count; i++) { var minutes = TimeUtility.ServerNow.Hour * 60 + TimeUtility.ServerNow.Minute; System/Team/TeamTargetJoinLimitWin.cs
@@ -278,10 +278,10 @@ } else { var week = DateTime.Now.DayOfWeek; if (openTime.openTimes.ContainsKey((int)week)) var week = (int)TimeUtility.ServerNow.DayOfWeek; var durations = openTime.GetHourMinuteByWeek(week); if (durations != null) { var durations = openTime.openTimes[(int)week]; var stringArray = new string[durations.Count]; for (int i = 0; i < durations.Count; i++) {
