From 6cf28a802753f4816debe54fca5cbe5dbf4450c0 Mon Sep 17 00:00:00 2001 From: milimoe Date: Wed, 24 Dec 2025 00:59:10 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=A6=96=E6=AC=A1=E4=B8=8D?= =?UTF-8?q?=E5=88=9B=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OshimaServers/Service/FunGameService.cs | 10 +++++++--- OshimaWebAPI/Controllers/ActivityController.cs | 4 ++-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/OshimaServers/Service/FunGameService.cs b/OshimaServers/Service/FunGameService.cs index 85d35d2..73ffaf2 100644 --- a/OshimaServers/Service/FunGameService.cs +++ b/OshimaServers/Service/FunGameService.cs @@ -2456,13 +2456,17 @@ namespace Oshima.FunGame.OshimaServers.Service lock (Activities) { Activities.Clear(); + bool update = false; foreach (Activity activity in activities.Values) { activity.UpdateState(); Activities.Add(activity); - if (user != null) AddEventActivity(user.Id, activity, userActivities); + if (user != null) + { + AddEventActivity(activity, userActivities); + update = true; + } } - bool update = false; if (ActivitiesCharacterCache.Count > 0) { List willRemove = []; @@ -4929,7 +4933,7 @@ namespace Oshima.FunGame.OshimaServers.Service return builder.ToString().Trim(); } - public static void AddEventActivity(long uid, Activity activity, EntityModuleConfig userActivities) + public static void AddEventActivity(Activity activity, EntityModuleConfig userActivities) { if (activity.Id == 7 && activity.Status == ActivityState.InProgress) { diff --git a/OshimaWebAPI/Controllers/ActivityController.cs b/OshimaWebAPI/Controllers/ActivityController.cs index cd73a79..765cf55 100644 --- a/OshimaWebAPI/Controllers/ActivityController.cs +++ b/OshimaWebAPI/Controllers/ActivityController.cs @@ -214,7 +214,7 @@ namespace Oshima.FunGame.WebAPI.Controllers { EntityModuleConfig userActivities = new("activities", uid.ToString()); userActivities.LoadConfig(); - FunGameService.AddEventActivity(uid, activity, userActivities); + FunGameService.AddEventActivity(activity, userActivities); userActivities.SaveConfig(); return Ok($"{activity}"); } @@ -241,7 +241,7 @@ namespace Oshima.FunGame.WebAPI.Controllers { EntityModuleConfig userActivities = new("activities", uid.ToString()); userActivities.LoadConfig(); - FunGameService.AddEventActivity(uid, activity, userActivities); + FunGameService.AddEventActivity(activity, userActivities); userActivities.SaveConfig(); } }