fix error caused by guild mission end

moonheart · Jan 15, 2024 · 5af9809 · 5af9809
1 parent f873e07
commit 5af9809
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 11 deletions.
diff --git a/MementoMori.Ortega/Share/Master/Table/GuildMissionTable.cs b/MementoMori.Ortega/Share/Master/Table/GuildMissionTable.cs
@@ -1,18 +1,22 @@
 using MementoMori.Ortega.Share.Master.Data;
+using MementoMori.Ortega.Share.Utils;
 
 namespace MementoMori.Ortega.Share.Master.Table
 {
 	public class GuildMissionTable : TableBase<GuildMissionMB>
 	{
-		public GuildMissionMB GetCurrentGuildMissionMB(OrtegaTimeManager timeManager)
-		{
-			// int num = 0;
-			// bool flag;
-			// if (!flag)
-			// {
-			// 	num++;
-			// }
-			throw new NullReferenceException();
-		}
+		public GuildMissionMB GetCurrentGuildMissionMB(DateTime serverNow)
+        {
+            foreach (var guildMissionMb in this._datas)
+            {
+                var startTime = guildMissionMb.StartTime.ToDateTime();
+                var endTime = guildMissionMb.EndTime.ToDateTime();
+                if (startTime <= serverNow && serverNow <= endTime)
+                {
+                    return guildMissionMb;
+                }
+            }
+            return null;
+        }
 	}
 }
diff --git a/MementoMori/MementoMoriFuncs.Ops.cs b/MementoMori/MementoMoriFuncs.Ops.cs
@@ -1780,7 +1780,11 @@ public async Task GetMissionInfo()
         var response1 = await GetResponse<GetGuildIdRequest, GetGuildIdResponse>(new GetGuildIdRequest());
         if (response1.GuildId > 0)
         {
-            missionGroupTypes.Add(MissionGroupType.Guild);
+            var currentGuildMissionMb = GuildMissionTable.GetCurrentGuildMissionMB(TimeManager.ServerNow);
+            if (currentGuildMissionMb != null)
+            {
+                missionGroupTypes.Add(MissionGroupType.Guild);
+            }
         }
         var panelMission = Mypage.MypageInfo.MypageIconInfos.FirstOrDefault(d => d.TransferDetailInfo.TransferSpotType == TransferSpotType.PanelMission);
         if (panelMission != null) missionGroupTypes.Add(MissionGroupType.Panel);