Oshima-Studios/OshimaGameModule
3
1
Fork 0
mirror of https://github.com/oshima-studios/OshimaGameModule.git synced 2025-04-23 20:39:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

完善任务系统 (#3)

Browse Source
This commit is contained in:
yeziuku 2024-12-31 20:08:11 +08:00 committed by GitHub
parent f66dd7bc85
commit a98c7b457c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 424 additions and 434 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

760
OshimaCore/Controllers/FunGameController.cs
View File

File diff suppressed because it is too large Load Diff

10
OshimaCore/OshimaWebAPI.cs
View File

@ -1,4 +1,4 @@
using Milimoe.FunGame.Core.Api.Utility;
using Milimoe.FunGame.Core.Api.Utility;
using Milimoe.FunGame.Core.Entity;
using Milimoe.FunGame.Core.Library.Common.Addon;
using Oshima.Core.Configs;
@ -92,10 +92,10 @@ namespace Oshima.Core.WebAPI
foreach (string filePath in filePaths)
{
string fileName = Path.GetFileNameWithoutExtension(filePath);
PluginConfig pc = new("quests", fileName);
pc.Clear();
FunGameService.CheckQuestList(pc);
pc.SaveConfig();
EntityModuleConfig<Quest> quests = new("quests", fileName);
quests.Clear();
FunGameService.CheckQuestList(quests);
quests.SaveConfig();
}
Controller.WriteLine("刷新每日任务");
}

46
OshimaCore/Utils/FunGameService.cs
View File

@ -1,4 +1,4 @@
using System.Text;
using System.Text;
using Milimoe.FunGame.Core.Api.Utility;
using Milimoe.FunGame.Core.Entity;
using Milimoe.FunGame.Core.Library.Constant;
@ -554,17 +554,23 @@ namespace Oshima.Core.Utils
}
// 任务结算
PluginConfig pc2 = new("quests", user.Id.ToString());
pc2.LoadConfig();
if (pc2.Count > 0)
{
List<Quest> quests = pc2.Get<List<Quest>>("list") ?? [];
EntityModuleConfig<Quest> quests = new("quests", user.Id.ToString());
quests.LoadConfig();
if (quests.Count > 0)
{
IEnumerable<Quest> finishQuests = quests.Where(q => q.Status == 2);
IEnumerable<Quest> workingQuests = quests.Values.Where(q => q.Status == 1);
foreach (Quest quest in workingQuests)
{
if (quest.StartTime.HasValue && quest.StartTime.Value.AddMinutes(quest.EstimatedMinutes) <= DateTime.Now)
{
quest.Status = 2;
}
}
IEnumerable<Quest> finishQuests = quests.Values.Where(q => q.Status == 2);
foreach (Quest quest in finishQuests)
{
quest.Status = 3;
quest.SettleTime = DateTime.Now;
foreach (string name in quest.Awards.Keys)
{
if (name == General.GameplayEquilibriumConstant.InGameCurrency)
@ -573,7 +579,7 @@ namespace Oshima.Core.Utils
}
else if (name == General.GameplayEquilibriumConstant.InGameMaterial)
{
user.Inventory.Credits += quest.Awards[name];
user.Inventory.Materials += quest.Awards[name];
}
else if (AllItems.FirstOrDefault(i => i.Name == name) is Item item)
{
@ -584,9 +590,7 @@ namespace Oshima.Core.Utils
}
}
}
pc2.Add("list", quests);
pc2.SaveConfig();
}
quests.SaveConfig();
}
return user;
@ -1777,17 +1781,17 @@ namespace Oshima.Core.Utils
}
}
public static string CheckQuestList(PluginConfig pc)
public static string CheckQuestList(EntityModuleConfig<Quest> quests)
{
if (pc.Count == 0)
if (quests.Count == 0)
{
// 生成任务，任务名和奖励物品的数组
List<Quest> quests = [];
// 生成任务
for (int i = 0; i < 6; i++)
{
int minutes = Random.Shared.Next(10, 41);
Dictionary<string, int> items = [];
items[General.GameplayEquilibriumConstant.InGameCurrency] = 1500;
items[General.GameplayEquilibriumConstant.InGameMaterial] = 5;
items[General.GameplayEquilibriumConstant.InGameCurrency] = minutes * 50;
items[General.GameplayEquilibriumConstant.InGameMaterial] = minutes / 10 * 2;
int index = Random.Shared.Next(AllItems.Count);
Item item = AllItems[index];
items.Add(item.Name, 1);
@ -1804,20 +1808,18 @@ namespace Oshima.Core.Utils
string name = QuestList.Keys.OrderBy(o => Random.Shared.Next()).First();
Quest quest = new()
{
Id = quests.Count > 0 ? quests.Max(q => q.Id) + 1 : 1,
Id = quests.Count > 0 ? quests.Values.Max(q => q.Id) + 1 : 1,
Name = name,
Description = QuestList[name],
EstimatedMinutes = Random.Shared.Next(10, 41),
EstimatedMinutes = minutes,
Awards = items
};
quests.Add(quest);
quests.Add(quest.GetIdName(), quest);
}
pc.Add("list", quests);
return string.Join("\r\n", quests);
}
else
{
List<Quest> quests = pc.Get<List<Quest>>("list") ?? [];
if (quests.Count > 0)
{
return string.Join("\r\n", quests);