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

添加礼包；角色重随添加其他属性；修改了物品序号的显示逻辑；社团成员添加分页显示；添加地区

Browse Source
This commit is contained in:
milimoe 2025-02-04 23:26:18 +08:00
parent af1ee22e1e
commit d68a4c86ae
Signed by: milimoe
GPG Key ID: 05D280912DA6C69E
14 changed files with 1611 additions and 642 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
OshimaModules/Characters/CustomCharacter.cs
View File

@ -1,4 +1,5 @@
using Milimoe.FunGame.Core.Api.Utility;
using System;
using Milimoe.FunGame.Core.Api.Utility;
using Milimoe.FunGame.Core.Entity;
using Milimoe.FunGame.Core.Library.Constant;
@ -47,5 +48,29 @@ namespace Oshima.FunGame.OshimaModules.Characters
InitialHR = Random.Shared.Next(1, 6);
InitialMR = Random.Shared.Next(1, 6);
}
public void SetPrimaryAttribute(PrimaryAttribute? value = null)
{
if (value != null && value.HasValue)
{
PrimaryAttribute = value.Value;
}
else
{
double max = Math.Max(Math.Max(STR, AGI), INT);
if (max == STR)
{
PrimaryAttribute = PrimaryAttribute.STR;
}
else if (max == AGI)
{
PrimaryAttribute = PrimaryAttribute.AGI;
}
else if (max == INT)
{
PrimaryAttribute = PrimaryAttribute.INT;
}
}
}
}
}

7
OshimaModules/Characters/Organisms.cs Normal file
View File

@ -0,0 +1,7 @@
namespace Oshima.FunGame.OshimaModules.Characters
{
public class Organisms
{
}
}

12
OshimaModules/Items/Consumable/回复药.cs
View File

@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Items
{
public class 回复药
{
public interface HPBook
public interface HPRecovery
{
public double HP { get; set; }
}
@ -27,7 +27,7 @@ namespace Oshima.FunGame.OshimaModules.Items
{
item.Skills.Active.OnSkillCasted([character]);
string msg = $"对角色 [ {character} ] 使用 [ {item.Name} ] 成功！";
if (item is HPBook hpBook)
if (item is HPRecovery hpBook)
{
msg += $"回复了 {hpBook.HP} 点生命值！";
}
@ -60,7 +60,7 @@ namespace Oshima.FunGame.OshimaModules.Items
if (key != "" && args.TryGetValue(key, out value) && value is int count && targets.Length > 0)
{
string truemsg = $"对角色 [ {targets[0]} ] 使用 {count} 个 [ {item.Name} ] 成功！";
if (item is HPBook expBook)
if (item is HPRecovery expBook)
{
truemsg += $"回复了 {expBook.HP * count} 点生命值！";
}
@ -70,7 +70,7 @@ namespace Oshima.FunGame.OshimaModules.Items
}
}
public class 小回复药 : Item, 回复药.HPBook
public class 小回复药 : Item, 回复药.HPRecovery
{
public override long Id => (long)ConsumableID.小回复药;
public override string Name => "小回复药";
@ -90,7 +90,7 @@ namespace Oshima.FunGame.OshimaModules.Items
}
}
public class 中回复药 : Item, 回复药.HPBook
public class 中回复药 : Item, 回复药.HPRecovery
{
public override long Id => (long)ConsumableID.中回复药;
public override string Name => "中回复药";
@ -110,7 +110,7 @@ namespace Oshima.FunGame.OshimaModules.Items
}
}
public class 大回复药 : Item, 回复药.HPBook
public class 大回复药 : Item, 回复药.HPRecovery
{
public override long Id => (long)ConsumableID.大回复药;
public override string Name => "大回复药";

12
OshimaModules/Items/Consumable/能量饮料.cs
View File

@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Items
{
public class 能量饮料
{
public interface EPBook
public interface EPAdd
{
public double EP { get; set; }
}
@ -27,7 +27,7 @@ namespace Oshima.FunGame.OshimaModules.Items
{
item.Skills.Active.OnSkillCasted([character]);
string msg = $"对角色 [ {character} ] 使用 [ {item.Name} ] 成功！";
if (item is EPBook hpBook)
if (item is EPAdd hpBook)
{
msg += $"获得了 {hpBook.EP} 点能量值！";
}
@ -60,7 +60,7 @@ namespace Oshima.FunGame.OshimaModules.Items
if (key != "" && args.TryGetValue(key, out value) && value is int count && targets.Length > 0)
{
string truemsg = $"对角色 [ {targets[0]} ] 使用 {count} 个 [ {item.Name} ] 成功！";
if (item is EPBook expBook)
if (item is EPAdd expBook)
{
truemsg += $"获得了 {expBook.EP * count} 点能量值！";
}
@ -70,7 +70,7 @@ namespace Oshima.FunGame.OshimaModules.Items
}
}
public class 能量饮料1 : Item, 能量饮料.EPBook
public class 能量饮料1 : Item, 能量饮料.EPAdd
{
public override long Id => (long)ConsumableID.能量饮料1;
public override string Name => "能量饮料";
@ -90,7 +90,7 @@ namespace Oshima.FunGame.OshimaModules.Items
}
}
public class 能量饮料2 : Item, 能量饮料.EPBook
public class 能量饮料2 : Item, 能量饮料.EPAdd
{
public override long Id => (long)ConsumableID.能量饮料2;
public override string Name => "能量饮料 Pro";
@ -110,7 +110,7 @@ namespace Oshima.FunGame.OshimaModules.Items
}
}
public class 能量饮料3 : Item, 能量饮料.EPBook
public class 能量饮料3 : Item, 能量饮料.EPAdd
{
public override long Id => (long)ConsumableID.能量饮料3;
public override string Name => "能量饮料 Pro Max";

12
OshimaModules/Items/Consumable/魔力填充剂.cs
View File

@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Items
{
public class 魔力填充剂
{
public interface MPBook
public interface MPRecovery
{
public double MP { get; set; }
}
@ -27,7 +27,7 @@ namespace Oshima.FunGame.OshimaModules.Items
{
item.Skills.Active.OnSkillCasted([character]);
string msg = $"对角色 [ {character} ] 使用 [ {item.Name} ] 成功！";
if (item is MPBook hpBook)
if (item is MPRecovery hpBook)
{
msg += $"回复了 {hpBook.MP} 点魔法值！";
}
@ -60,7 +60,7 @@ namespace Oshima.FunGame.OshimaModules.Items
if (key != "" && args.TryGetValue(key, out value) && value is int count && targets.Length > 0)
{
string truemsg = $"对角色 [ {targets[0]} ] 使用 {count} 个 [ {item.Name} ] 成功！";
if (item is MPBook expBook)
if (item is MPRecovery expBook)
{
truemsg += $"回复了 {expBook.MP * count} 点魔法值！";
}
@ -70,7 +70,7 @@ namespace Oshima.FunGame.OshimaModules.Items
}
}
public class 魔力填充剂1 : Item, 魔力填充剂.MPBook
public class 魔力填充剂1 : Item, 魔力填充剂.MPRecovery
{
public override long Id => (long)ConsumableID.魔力填充剂1;
public override string Name => "魔力填充剂Ⅰ型";
@ -90,7 +90,7 @@ namespace Oshima.FunGame.OshimaModules.Items
}
}
public class 魔力填充剂2 : Item, 魔力填充剂.MPBook
public class 魔力填充剂2 : Item, 魔力填充剂.MPRecovery
{
public override long Id => (long)ConsumableID.魔力填充剂2;
public override string Name => "魔力填充剂Ⅱ型";
@ -110,7 +110,7 @@ namespace Oshima.FunGame.OshimaModules.Items
}
}
public class 魔力填充剂3 : Item, 魔力填充剂.MPBook
public class 魔力填充剂3 : Item, 魔力填充剂.MPRecovery
{
public override long Id => (long)ConsumableID.魔力填充剂3;
public override string Name => "魔力填充剂Ⅲ型";

155
OshimaModules/Items/GiftBox/礼包.cs Normal file
View File

@ -0,0 +1,155 @@
using Milimoe.FunGame.Core.Entity;
using Milimoe.FunGame.Core.Library.Constant;
using Oshima.FunGame.OshimaModules.Skills;
namespace Oshima.FunGame.OshimaModules.Items
{
public class 礼包
{
public interface GiftBox
{
public Dictionary<string, int> Gifts { get; set; }
}
public static void Init(Item item, Dictionary<string, int> gifts, int remainUseTimes = 1)
{
if (item is GiftBox box)
{
box.Gifts = gifts;
}
item.Skills.Active = new 礼包技能(item);
item.RemainUseTimes = remainUseTimes;
item.IsInGameItem = false;
item.IsReduceTimesAfterUse = true;
item.IsRemoveAfterUse = true;
}
public static bool OnItemUsed(Item item, Dictionary<string, object> args)
{
string msg = "";
if (item is GiftBox box)
{
}
args["msg"] = msg;
return msg.Trim() != "";
}
}
public class 年夜饭 : Item, 礼包.GiftBox
{
public override long Id => (long)GiftBoxID.年夜饭;
public override string Name => "年夜饭";
public override string Description => Skills.Active?.Description ?? "";
public override QualityType QualityType => QualityType.White;
public Dictionary<string, int> Gifts { get; set; } = [];
public 年夜饭(User? user = null, int remainUseTimes = 1) : base(ItemType.GiftBox)
{
User = user;
礼包.Init(this, new()
{
{ General.GameplayEquilibriumConstant.InGameCurrency, 100000 },
{ General.GameplayEquilibriumConstant.InGameMaterial, 2000 },
{ new 技能卷轴().Name, 20 },
{ new 升华之印().Name, 20 },
{ new 流光之印().Name, 10 },
{ new 大经验书().Name, 20 },
{ new 大回复药().Name, 5 },
{ new 魔力填充剂3().Name, 5 },
{ new 能量饮料3().Name, 5 }
}, remainUseTimes);
}
protected override bool OnItemUsed(Dictionary<string, object> args)
{
return 礼包.OnItemUsed(this, args);
}
}
public class 蛇年大吉 : Item, 礼包.GiftBox
{
public override long Id => (long)GiftBoxID.蛇年大吉;
public override string Name => "蛇年大吉";
public override string Description => Skills.Active?.Description ?? "";
public override QualityType QualityType => QualityType.White;
public Dictionary<string, int> Gifts { get; set; } = [];
public 蛇年大吉(User? user = null, int remainUseTimes = 1) : base(ItemType.GiftBox)
{
User = user;
礼包.Init(this, new()
{
{ General.GameplayEquilibriumConstant.InGameCurrency, 88888 },
{ General.GameplayEquilibriumConstant.InGameMaterial, 888 },
{ new 技能卷轴().Name, 20 },
{ new 智慧之果().Name, 10 },
{ new 奥术符文().Name, 5 },
{ new 混沌之核().Name, 3 },
{ new 升华之印().Name, 20 },
{ new 流光之印().Name, 10 },
{ new 永恒之印().Name, 3 },
{ new 大经验书().Name, 20 }
}, remainUseTimes);
}
protected override bool OnItemUsed(Dictionary<string, object> args)
{
return 礼包.OnItemUsed(this, args);
}
}
public class 新春快乐 : Item, 礼包.GiftBox
{
public override long Id => (long)GiftBoxID.新春快乐;
public override string Name => "新春快乐";
public override string Description => Skills.Active?.Description ?? "";
public override QualityType QualityType => QualityType.White;
public Dictionary<string, int> Gifts { get; set; } = [];
public 新春快乐(User? user = null, int remainUseTimes = 1) : base(ItemType.GiftBox)
{
User = user;
礼包.Init(this, new()
{
{ General.GameplayEquilibriumConstant.InGameCurrency, 100000 },
{ General.GameplayEquilibriumConstant.InGameMaterial, 2000 },
{ new 技能卷轴().Name, 20 },
{ new 升华之印().Name, 20 },
{ new 流光之印().Name, 10 },
{ new 大经验书().Name, 20 },
{ new 大回复药().Name, 5 },
{ new 魔力填充剂3().Name, 5 },
{ new 能量饮料3().Name, 5 }
}, remainUseTimes);
}
protected override bool OnItemUsed(Dictionary<string, object> args)
{
return 礼包.OnItemUsed(this, args);
}
}
public class 礼包技能 : Skill
{
public override long Id => (long)ItemActiveID.礼包;
public override string Name => "礼包";
public override string Description
{
get
{
if (Item is 礼包.GiftBox box && box.Gifts.Count > 0)
{
return "打开后可立即获得：" + string.Join("，", box.Gifts.Select(kv => $"{kv.Key} * {kv.Value}"));
}
return "";
}
}
public 礼包技能(Item? item = null) : base(SkillType.Item)
{
Level = 1;
Item = item;
}
}
}

7
OshimaModules/Items/ItemID.cs
View File

@ -34,4 +34,11 @@
奥术符文 = 18006,
混沌之核 = 18007,
}
public enum GiftBoxID : long
{
年夜饭 = 20001,
蛇年大吉 = 20002,
新春快乐 = 20003
}
}

3
OshimaModules/Modules/ItemModule.cs
View File

@ -49,6 +49,9 @@ namespace Oshima.FunGame.OshimaModules
(long)ConsumableID.能量饮料1 => new 能量饮料1(),
(long)ConsumableID.能量饮料2 => new 能量饮料2(),
(long)ConsumableID.能量饮料3 => new 能量饮料3(),
(long)GiftBoxID.年夜饭 => new 年夜饭(),
(long)GiftBoxID.蛇年大吉 => new 蛇年大吉(),
(long)GiftBoxID.新春快乐 => new 新春快乐(),
_ => null,
};
};

1
OshimaModules/Modules/SkillModule.cs
View File

@ -70,6 +70,7 @@ namespace Oshima.FunGame.OshimaModules
(long)PassiveID.弱者猎手 => new 弱者猎手(),
(long)ItemPassiveID.攻击之爪 => new 攻击之爪技能(),
(long)ItemActiveID.经验书 => new 经验书技能(),
(long)ItemActiveID.礼包 => new 礼包技能(),
_ => null
};
};

3
OshimaModules/Skills/SkillID.cs
View File

@ -107,6 +107,7 @@
经验书 = 6001,
回复药 = 6002,
魔力填充剂 = 6003,
能量饮料 = 6004
能量饮料 = 6004,
礼包 = 6005
}
}

1184
OshimaServers/Service/FunGameConstant.cs
View File

File diff suppressed because it is too large Load Diff

205
OshimaServers/Service/FunGameService.cs
View File

@ -47,7 +47,7 @@ namespace Oshima.FunGame.OshimaServers.Service
FunGameConstant.Items.AddRange(exItems.Values.Where(i => (int)i.ItemType > 4));
FunGameConstant.Items.AddRange([new 小经验书(), new 中经验书(), new 大经验书(), new 升华之印(), new 流光之印(), new 永恒之印(), new 技能卷轴(), new 智慧之果(), new 奥术符文(), new 混沌之核(),
new 小回复药(), new 中回复药(), new 大回复药(), new 魔力填充剂1(), new 魔力填充剂2(), new 魔力填充剂3(), new 能量饮料1(), new 能量饮料2(), new 能量饮料3()]);
new 小回复药(), new 中回复药(), new 大回复药(), new 魔力填充剂1(), new 魔力填充剂2(), new 魔力填充剂3(), new 能量饮料1(), new 能量饮料2(), new 能量饮料3(), new 年夜饭(), new 蛇年大吉(), new 新春快乐()]);
FunGameConstant.AllItems.AddRange(FunGameConstant.Equipment);
FunGameConstant.AllItems.AddRange(FunGameConstant.Items);
@ -1052,6 +1052,53 @@ namespace Oshima.FunGame.OshimaServers.Service
public static bool UseItemCustom(Item item, User user, IEnumerable<Character> targets, out string msg)
{
msg = "";
if (item.ItemType == ItemType.GiftBox)
{
if (item is 礼包.GiftBox box && box.Gifts.Count > 0)
{
foreach (string name in box.Gifts.Keys)
{
if (name == General.GameplayEquilibriumConstant.InGameCurrency)
{
user.Inventory.Credits += box.Gifts[name];
}
if (name == General.GameplayEquilibriumConstant.InGameMaterial)
{
user.Inventory.Materials += box.Gifts[name];
}
if (FunGameConstant.AllItems.FirstOrDefault(i => i.Name == name) is Item currentItem)
{
for (int i = 0; i < box.Gifts[name]; i++)
{
Item newItem = currentItem.Copy();
SetSellAndTradeTime(newItem);
newItem.User = user;
user.Inventory.Items.Add(newItem);
}
}
}
msg = "打开礼包成功！获得了以下物品：\r\n" + string.Join("，", box.Gifts.Select(kv => $"{kv.Key} * {kv.Value}"));
if (item.Name == nameof(年夜饭))
{
msg += "\r\n" + "热腾腾的除夕年夜饭，祝您阖家团圆，年味浓浓！";
}
else if (item.Name == nameof(蛇年大吉))
{
msg += "\r\n" + "金蛇送福，好运连连！！";
}
else if (item.Name == nameof(新春快乐))
{
msg += "\r\n" + "新春纳福，喜乐安康！！";
}
item.RemainUseTimes--;
if (item.RemainUseTimes < 0) item.RemainUseTimes = 0;
if (item.RemainUseTimes == 0)
{
user.Inventory.Items.Remove(item);
}
return true;
}
}
switch (item.Name)
{
default:
@ -1213,7 +1260,7 @@ namespace Oshima.FunGame.OshimaServers.Service
{
int nowIndex = Bosses.Count > 0 ? Bosses.Keys.Max() + 1 : 1;
string bossName = GenerateRandomChineseUserName();
Character boss = new CustomCharacter(nowIndex, bossName, "", bossName);
CustomCharacter boss = new(nowIndex, bossName, "", bossName);
int cutRate = Random.Shared.Next(3) switch
{
0 => 1,
@ -1324,6 +1371,7 @@ namespace Oshima.FunGame.OshimaServers.Service
boss.Skills.Add(super);
boss.Recovery();
boss.SetPrimaryAttribute();
Bosses[nowIndex] = boss;
}
@ -1428,41 +1476,110 @@ namespace Oshima.FunGame.OshimaServers.Service
// 生成任务
for (int i = 0; i < 6; i++)
{
int minutes = Random.Shared.Next(10, 41);
Dictionary<string, int> items = [];
items[General.GameplayEquilibriumConstant.InGameCurrency] = minutes * 20;
items[General.GameplayEquilibriumConstant.InGameMaterial] = minutes / 8 * 1;
int index = Random.Shared.Next(FunGameConstant.AllItems.Count);
Item item = FunGameConstant.AllItems[index];
items.Add(item.Name, 1);
while (true)
QuestType type = (QuestType)Random.Shared.Next(3);
long id = quests.Count > 0 ? quests.Values.Max(q => q.Id) + 1 : 1;
Quest quest;
if (type == QuestType.Continuous)
{
int index2 = Random.Shared.Next(FunGameConstant.AllItems.Count);
if (index2 != index)
string name = FunGameConstant.ContinuousQuestList.Keys.OrderBy(o => Random.Shared.Next()).First();
int minutes = Random.Shared.Next(10, 41);
HashSet<Item> items = [];
Dictionary<string, int> itemsCount = [];
int index = Random.Shared.Next(FunGameConstant.AllItems.Count);
Item item = FunGameConstant.AllItems[index];
items.Add(item);
itemsCount[item.Name] = 1;
index = Random.Shared.Next(FunGameConstant.AllItems.Count);
Item item2 = FunGameConstant.AllItems[index];
items.Add(item2);
if (!itemsCount.TryAdd(item2.Name, 1))
{
Item item2 = FunGameConstant.AllItems[index2];
items.Add(item2.Name, 1);
break;
itemsCount[item2.Name]++;
}
quest = new()
{
Id = id,
Name = name,
Description = FunGameConstant.ContinuousQuestList[name],
QuestType = QuestType.Continuous,
EstimatedMinutes = minutes,
CreditsAward = minutes * 20,
MaterialsAward = minutes / 8 * 1,
Awards = items,
AwardsCount = itemsCount
};
}
string name = FunGameConstant.QuestList.Keys.OrderBy(o => Random.Shared.Next()).First();
Quest quest = new()
else if (type == QuestType.Immediate)
{
Id = quests.Count > 0 ? quests.Values.Max(q => q.Id) + 1 : 1,
Name = name,
Description = FunGameConstant.QuestList[name],
EstimatedMinutes = minutes,
Awards = items
};
string name = FunGameConstant.ImmediateQuestList.Keys.OrderBy(o => Random.Shared.Next()).First();
int difficulty = Random.Shared.Next(3, 11);
HashSet<Item> items = [];
Dictionary<string, int> itemsCount = [];
int index = Random.Shared.Next(FunGameConstant.AllItems.Count);
Item item = FunGameConstant.AllItems[index];
items.Add(item);
itemsCount[item.Name] = 1;
index = Random.Shared.Next(FunGameConstant.AllItems.Count);
Item item2 = FunGameConstant.AllItems[index];
items.Add(item2);
if (!itemsCount.TryAdd(item2.Name, 1))
{
itemsCount[item2.Name]++;
}
quest = new()
{
Id = id,
Name = name,
Description = FunGameConstant.ImmediateQuestList[name],
QuestType = QuestType.Immediate,
CreditsAward = difficulty * 80,
MaterialsAward = difficulty / 2 * 1,
Awards = items,
AwardsCount = itemsCount
};
}
else
{
string name = FunGameConstant.ProgressiveQuestList.Keys.OrderBy(o => Random.Shared.Next()).First();
int maxProgress = Random.Shared.Next(3, 11);
HashSet<Item> items = [];
Dictionary<string, int> itemsCount = [];
int index = Random.Shared.Next(FunGameConstant.AllItems.Count);
Item item = FunGameConstant.AllItems[index];
items.Add(item);
itemsCount[item.Name] = 1;
index = Random.Shared.Next(FunGameConstant.AllItems.Count);
Item item2 = FunGameConstant.AllItems[index];
items.Add(item2);
if (!itemsCount.TryAdd(item2.Name, 1))
{
itemsCount[item2.Name]++;
}
quest = new()
{
Id = id,
Name = name,
Description = string.Format(FunGameConstant.ProgressiveQuestList[name], maxProgress),
QuestType = QuestType.Progressive,
Progress = 0,
MaxProgress = maxProgress,
CreditsAward = maxProgress * 80,
MaterialsAward = maxProgress / 2 * 1,
Awards = items,
AwardsCount = itemsCount
};
}
quests.Add(quest.GetIdName(), quest);
}
return "☆--- 今日任务列表 ---☆\r\n" + string.Join("\r\n", quests.Values.Select(q => q.ToString())) + "\r\n温馨提示：请务必在次日 4:00 前完成任务结算，未结算的任务都会被取消！";
return "☆--- 今日任务列表 ---☆\r\n" + string.Join("\r\n", quests.Values.Select(q => q.ToString())) + "\r\n温馨提示：使用【做任务+任务序号】指令来进行任务。\r\n请务必在次日 4:00 前完成任务结算，未结算的任务都会被取消！";
}
else
{
if (quests.Count > 0)
{
return "☆--- 今日任务列表 ---☆\r\n" + string.Join("\r\n", quests.Values.Select(q => q.ToString())) + "\r\n温馨提示：请务必在次日 4:00 前完成任务结算，未结算的任务都会被取消！";
return "☆--- 今日任务列表 ---☆\r\n" + string.Join("\r\n", quests.Values.Select(q => q.ToString())) + "\r\n温馨提示：使用【做任务+任务序号】指令来进行任务。\r\n请务必在次日 4:00 前完成任务结算，未结算的任务都会被取消！";
}
else
{
@ -1488,26 +1605,32 @@ namespace Oshima.FunGame.OshimaServers.Service
{
quest.Status = QuestState.Settled;
quest.SettleTime = DateTime.Now;
foreach (string name in quest.Awards.Keys)
if (quest.CreditsAward > 0)
{
if (name == General.GameplayEquilibriumConstant.InGameCurrency)
user.Inventory.Credits += quest.CreditsAward;
}
if (quest.MaterialsAward > 0)
{
user.Inventory.Materials += quest.MaterialsAward;
}
foreach (Item item in quest.Awards)
{
if (quest.AwardsCount.TryGetValue(item.Name, out int qty))
{
user.Inventory.Credits += quest.Awards[name];
}
else if (name == General.GameplayEquilibriumConstant.InGameMaterial)
{
user.Inventory.Materials += quest.Awards[name];
}
else if (FunGameConstant.AllItems.FirstOrDefault(i => i.Name == name) is Item item)
{
Item newItem = item.Copy();
newItem.User = user;
SetSellAndTradeTime(newItem);
user.Inventory.Items.Add(newItem);
for (int i = 0; i < qty; i++)
{
if (FunGameConstant.AllItems.FirstOrDefault(i => i.Name == item.Name) != null)
{
Item newItem = item.Copy();
newItem.User = user;
SetSellAndTradeTime(newItem);
user.Inventory.Items.Add(newItem);
}
}
}
}
TaskUtility.NewTask(async () => await AnonymousServer.PushMessageToClients(user.AutoKey, $"FunGame Web API 推送：你的任务【{quest.Name}】已结算，" +
$"获得奖励：【{string.Join("，", quest.Awards.Select(kv => kv.Key + " * " + kv.Value))}】!"));
$"获得奖励：【{quest.AwardsString}】!"));
result = true;
}
return result;
@ -1531,7 +1654,7 @@ namespace Oshima.FunGame.OshimaServers.Service
double price = Random.Shared.Next(min, max);
if (price == 0)
{
price = (Random.Shared.NextDouble() + 0.1) * Random.Shared.Next(1000, 10000) * Random.Shared.Next((int)item.QualityType + 2, 6 + ((int)item.QualityType));
price = (Random.Shared.NextDouble() + 0.1) * Random.Shared.Next(1000, 5000) * Random.Shared.Next((int)item.QualityType + 2, 6 + ((int)item.QualityType));
}
item.Price = Calculation.Round2Digits(price);
daily.AddItem(item, Random.Shared.Next(1, 3));

520
OshimaWebAPI/Controllers/FunGameController.cs
View File

@ -505,28 +505,29 @@ namespace Oshima.FunGame.WebAPI.Controllers
[HttpPost("restoresaved")]
public string RestoreSaved([FromQuery] long? uid = null)
{
long userid = uid ?? Convert.ToInt64("10" + Verification.CreateVerifyCode(VerifyCodeType.NumberVerifyCode, 11));
//long userid = uid ?? Convert.ToInt64("10" + Verification.CreateVerifyCode(VerifyCodeType.NumberVerifyCode, 11));
PluginConfig pc = new("saved", userid.ToString());
pc.LoadConfig();
//PluginConfig pc = new("saved", userid.ToString());
//pc.LoadConfig();
if (pc.Count > 0)
{
User user = FunGameService.GetUser(pc);
user.Inventory.Credits = 5000;
user.Inventory.Materials = 0;
user.Inventory.Characters.Clear();
user.Inventory.Items.Clear();
user.Inventory.Characters.Add(new CustomCharacter(FunGameConstant.CustomCharacterId, user.Username));
user.LastTime = DateTime.Now;
pc.Add("user", user);
pc.SaveConfig();
return NetworkUtility.JsonSerialize($"你的存档已还原成功。");
}
else
{
return NetworkUtility.JsonSerialize(noSaved);
}
//if (pc.Count > 0)
//{
// User user = FunGameService.GetUser(pc);
// user.Inventory.Credits = 5000;
// user.Inventory.Materials = 0;
// user.Inventory.Characters.Clear();
// user.Inventory.Items.Clear();
// user.Inventory.Characters.Add(new CustomCharacter(FunGameConstant.CustomCharacterId, user.Username));
// user.LastTime = DateTime.Now;
// pc.Add("user", user);
// pc.SaveConfig();
// return NetworkUtility.JsonSerialize($"你的存档已还原成功。");
//}
//else
//{
// return NetworkUtility.JsonSerialize(noSaved);
//}
return NetworkUtility.JsonSerialize($"此功能维护中。");
}
[HttpPost("showsaved")]
@ -543,6 +544,7 @@ namespace Oshima.FunGame.WebAPI.Controllers
StringBuilder builder = new();
builder.AppendLine($"☆★☆ {user.Username}的存档信息 ☆★☆");
builder.AppendLine($"UID：{user.Id}");
builder.AppendLine($"{General.GameplayEquilibriumConstant.InGameCurrency}：{user.Inventory.Credits:0.00}");
builder.AppendLine($"{General.GameplayEquilibriumConstant.InGameMaterial}：{user.Inventory.Materials:0.00}");
builder.AppendLine($"角色数量：{user.Inventory.Characters.Count}");
@ -650,12 +652,18 @@ namespace Oshima.FunGame.WebAPI.Controllers
if (user.Inventory.Characters.FirstOrDefault(c => c.Id == FunGameConstant.CustomCharacterId) is Character character)
{
PrimaryAttribute oldPA = character.PrimaryAttribute;
double oldHP = character.InitialHP;
double oldMP = character.InitialMP;
double oldATK = character.InitialATK;
double oldSTR = character.InitialSTR;
double oldAGI = character.InitialAGI;
double oldINT = character.InitialINT;
double oldSTRG = character.STRGrowth;
double oldAGIG = character.AGIGrowth;
double oldINTG = character.INTGrowth;
double oldSPD = character.InitialSPD;
double oldHR = character.InitialHR;
double oldMR = character.InitialMR;
Character? newCustom = emc.Count > 0 ? emc.Get("newCustom") : null;
if (isConfirm)
@ -663,12 +671,18 @@ namespace Oshima.FunGame.WebAPI.Controllers
if (newCustom != null)
{
character.PrimaryAttribute = newCustom.PrimaryAttribute;
character.InitialHP = newCustom.InitialHP;
character.InitialMP = newCustom.InitialMP;
character.InitialATK = newCustom.InitialATK;
character.InitialSTR = newCustom.InitialSTR;
character.InitialAGI = newCustom.InitialAGI;
character.InitialINT = newCustom.InitialINT;
character.STRGrowth = newCustom.STRGrowth;
character.AGIGrowth = newCustom.AGIGrowth;
character.INTGrowth = newCustom.INTGrowth;
character.InitialSPD = newCustom.InitialSPD;
character.InitialHR = newCustom.InitialHR;
character.InitialMR = newCustom.InitialMR;
user.LastTime = DateTime.Now;
pc.Add("user", user);
pc.SaveConfig();
@ -676,9 +690,15 @@ namespace Oshima.FunGame.WebAPI.Controllers
emc.SaveConfig();
return NetworkUtility.JsonSerialize($"你已完成重随属性确认，新的自建角色属性如下：\r\n" +
$"核心属性：{CharacterSet.GetPrimaryAttributeName(oldPA)} => {CharacterSet.GetPrimaryAttributeName(character.PrimaryAttribute)}\r\n" +
$"初始生命：{oldHP} => {character.InitialHP}\r\n" +
$"初始魔法：{oldMP} => {character.InitialMP}\r\n" +
$"初始攻击：{oldATK} => {character.InitialATK}\r\n" +
$"初始力量：{oldSTR}（+{oldSTRG}/Lv）=> {character.InitialSTR}（+{character.STRGrowth}/Lv）\r\n" +
$"初始敏捷：{oldAGI}（+{oldAGIG}/Lv）=> {character.InitialAGI}（+{character.AGIGrowth}/Lv）\r\n" +
$"初始智力：{oldINT}（+{oldINTG}/Lv）=> {character.InitialINT}（+{character.INTGrowth}/Lv）");
$"初始智力：{oldINT}（+{oldINTG}/Lv）=> {character.InitialINT}（+{character.INTGrowth}/Lv）\r\n" +
$"初始速度：{oldSPD} => {character.InitialSPD}\r\n" +
$"生命回复：{oldHR} => {character.InitialHR}\r\n" +
$"魔法回复：{oldMR} => {character.InitialMR}\r\n");
}
else
{
@ -699,6 +719,10 @@ namespace Oshima.FunGame.WebAPI.Controllers
return NetworkUtility.JsonSerialize($"你的{General.GameplayEquilibriumConstant.InGameMaterial}不足 {reduce} 呢，无法重随自建角色属性！");
}
newCustom = new CustomCharacter(FunGameConstant.CustomCharacterId, "");
if (newCustom is CustomCharacter temp)
{
temp.SetPrimaryAttribute();
}
user.LastTime = DateTime.Now;
pc.Add("user", user);
pc.SaveConfig();
@ -706,18 +730,30 @@ namespace Oshima.FunGame.WebAPI.Controllers
emc.SaveConfig();
return NetworkUtility.JsonSerialize($"消耗 {reduce} {General.GameplayEquilibriumConstant.InGameMaterial}，获取到重随属性预览如下：\r\n" +
$"核心属性：{CharacterSet.GetPrimaryAttributeName(oldPA)} => {CharacterSet.GetPrimaryAttributeName(newCustom.PrimaryAttribute)}\r\n" +
$"初始生命：{oldHP} => {newCustom.InitialHP}\r\n" +
$"初始魔法：{oldMP} => {newCustom.InitialMP}\r\n" +
$"初始攻击：{oldATK} => {newCustom.InitialATK}\r\n" +
$"初始力量：{oldSTR}（+{oldSTRG}/Lv）=> {newCustom.InitialSTR}（+{newCustom.STRGrowth}/Lv）\r\n" +
$"初始敏捷：{oldAGI}（+{oldAGIG}/Lv）=> {newCustom.InitialAGI}（+{newCustom.AGIGrowth}/Lv）\r\n" +
$"初始智力：{oldINT}（+{oldINTG}/Lv）=> {newCustom.InitialINT}（+{newCustom.INTGrowth}/Lv）\r\n" +
$"初始速度：{oldSPD} => {newCustom.InitialSPD}\r\n" +
$"生命回复：{oldHR} => {newCustom.InitialHR}\r\n" +
$"魔法回复：{oldMR} => {newCustom.InitialMR}\r\n" +
$"请发送【确认角色重随】来确认更新，或者发送【取消角色重随】来取消操作。");
}
else if (newCustom.Id == FunGameConstant.CustomCharacterId)
{
return NetworkUtility.JsonSerialize($"你已经有一个待确认的重随属性如下：\r\n" +
$"核心属性：{CharacterSet.GetPrimaryAttributeName(oldPA)} => {CharacterSet.GetPrimaryAttributeName(newCustom.PrimaryAttribute)}\r\n" +
$"初始生命：{oldHP} => {newCustom.InitialHP}\r\n" +
$"初始魔法：{oldMP} => {newCustom.InitialMP}\r\n" +
$"初始攻击：{oldATK} => {newCustom.InitialATK}\r\n" +
$"初始力量：{oldSTR}（+{oldSTRG}/Lv）=> {newCustom.InitialSTR}（+{newCustom.STRGrowth}/Lv）\r\n" +
$"初始敏捷：{oldAGI}（+{oldAGIG}/Lv）=> {newCustom.InitialAGI}（+{newCustom.AGIGrowth}/Lv）\r\n" +
$"初始智力：{oldINT}（+{oldINTG}/Lv）=> {newCustom.InitialINT}（+{newCustom.INTGrowth}/Lv）\r\n"+
$"初始智力：{oldINT}（+{oldINTG}/Lv）=> {newCustom.InitialINT}（+{newCustom.INTGrowth}/Lv）\r\n" +
$"初始速度：{oldSPD} => {newCustom.InitialSPD}\r\n" +
$"生命回复：{oldHR} => {newCustom.InitialHR}\r\n" +
$"魔法回复：{oldMR} => {newCustom.InitialMR}\r\n" +
$"请发送【确认角色重随】来确认更新，或者发送【取消角色重随】来取消操作。");
}
else
@ -806,19 +842,19 @@ namespace Oshima.FunGame.WebAPI.Controllers
List<Character> characters = [.. user.Inventory.Characters];
List<Item> items = [.. user.Inventory.Items];
int total = characters.Count + items.Count;
int maxPage = (int)Math.Ceiling((double)total / 10);
int maxPage = (int)Math.Ceiling((double)total / FunGameConstant.ItemsPerPage2);
if (maxPage < 1) maxPage = 1;
if (showPage <= maxPage)
{
List<object> inventory = [.. characters, .. items];
Dictionary<int, object> dict = inventory.Select((obj, index) => new { Index = index + 1, Value = obj }).ToDictionary(k => k.Index, v => v.Value);
List<int> seq = [.. FunGameService.GetPage(dict.Keys, showPage, 10)];
List<int> seq = [.. FunGameService.GetPage(dict.Keys, showPage, FunGameConstant.ItemsPerPage2)];
bool showCharacter = true;
bool showItem = true;
int characterCount = 0;
int itemCount = 0;
int prevSequence = dict.Take((showPage - 1) * 10).Count();
int prevSequence = dict.Take((showPage - 1) * FunGameConstant.ItemsPerPage2).Count();
foreach (int index in seq)
{
@ -917,11 +953,11 @@ namespace Oshima.FunGame.WebAPI.Controllers
}
}
int maxPage = (int)Math.Ceiling((double)itemCategory.Count / 10);
int maxPage = (int)Math.Ceiling((double)itemCategory.Count / FunGameConstant.ItemsPerPage1);
if (maxPage < 1) maxPage = 1;
if (showPage <= maxPage)
{
List<string> keys = [.. FunGameService.GetPage(itemCategory.Keys, showPage, 10)];
List<string> keys = [.. FunGameService.GetPage(itemCategory.Keys, showPage, FunGameConstant.ItemsPerPage1)];
int itemCount = 0;
list.Add("======= 物品 =======");
foreach (string key in keys)
@ -936,10 +972,31 @@ namespace Oshima.FunGame.WebAPI.Controllers
{
itemsIndex = string.Join("，", objs.Take(10).Select(i => items.IndexOf(i) + 1)) + "，...";
}
IEnumerable<Item> itemsEquipable = objs.Where(i => i.IsEquipment && i.Character is null);
string itemsEquipableIndex = string.Join("，", itemsEquipable.Select(i => items.IndexOf(i) + 1));
if (itemsEquipable.Count() > 10)
{
itemsEquipableIndex = string.Join("，", itemsEquipable.Take(10).Select(i => items.IndexOf(i) + 1)) + "，...";
}
IEnumerable<Item> itemsSellable = objs.Where(i => i.IsSellable);
string itemsSellableIndex = string.Join("，", itemsSellable.Select(i => items.IndexOf(i) + 1));
if (itemsSellable.Count() > 10)
{
itemsSellableIndex = string.Join("，", itemsSellable.Take(10).Select(i => items.IndexOf(i) + 1)) + "，...";
}
IEnumerable<Item> itemsTradable = objs.Where(i => i.IsTradable);
string itemsTradableIndex = string.Join("，", itemsTradable.Select(i => items.IndexOf(i) + 1));
if (itemsTradable.Count() > 10)
{
itemsTradableIndex = string.Join("，", itemsTradable.Take(10).Select(i => items.IndexOf(i) + 1)) + "，...";
}
str += $"物品序号：{itemsIndex}\r\n";
str += $"拥有数量：{objs.Count}（" + (first.IsEquipment ? $"可装备数量：{objs.Count(i => i.Character is null)}，" : "") +
if (itemsEquipableIndex != "") str += $"可装备序号：{itemsEquipableIndex}\r\n";
if (itemsSellableIndex != "") str += $"可出售序号：{itemsSellableIndex}\r\n";
if (itemsTradableIndex != "") str += $"可交易序号：{itemsTradableIndex}\r\n";
str += $"拥有数量：{objs.Count}（" + (first.IsEquipment ? $"可装备数量：{itemsEquipable.Count()}，" : "") +
(FunGameConstant.ItemCanUsed.Contains(first.ItemType) ? $"可使用数量：{objs.Count(i => i.RemainUseTimes > 0)}，" : "") +
$"可出售数量：{objs.Count(i => i.IsSellable)}，可交易数量：{objs.Count(i => i.IsTradable)}）";
$"可出售数量：{itemsSellable.Count()}，可交易数量：{itemsTradable.Count()}）";
list.Add(str);
}
list.Add($"页数：{showPage} / {maxPage}");
@ -1002,11 +1059,11 @@ namespace Oshima.FunGame.WebAPI.Controllers
}
}
int maxPage = (int)Math.Ceiling((double)itemCategory.Count / 10);
int maxPage = (int)Math.Ceiling((double)itemCategory.Count / FunGameConstant.ItemsPerPage1);
if (maxPage < 1) maxPage = 1;
if (showPage <= maxPage)
{
List<string> keys = [.. FunGameService.GetPage(itemCategory.Keys, showPage, 10)];
List<string> keys = [.. FunGameService.GetPage(itemCategory.Keys, showPage, FunGameConstant.ItemsPerPage1)];
int itemCount = 0;
list.Add($"======= {ItemSet.GetItemTypeName((ItemType)itemtype)} =======");
foreach (string key in keys)
@ -1021,10 +1078,31 @@ namespace Oshima.FunGame.WebAPI.Controllers
{
itemsIndex = string.Join("，", objs.Take(10).Select(i => items.IndexOf(i) + 1)) + "，...";
}
IEnumerable<Item> itemsEquipable = objs.Where(i => i.IsEquipment && i.Character is null);
string itemsEquipableIndex = string.Join("，", itemsEquipable.Select(i => items.IndexOf(i) + 1));
if (itemsEquipable.Count() > 10)
{
itemsEquipableIndex = string.Join("，", itemsEquipable.Take(10).Select(i => items.IndexOf(i) + 1)) + "，...";
}
IEnumerable<Item> itemsSellable = objs.Where(i => i.IsSellable);
string itemsSellableIndex = string.Join("，", itemsSellable.Select(i => items.IndexOf(i) + 1));
if (itemsSellable.Count() > 10)
{
itemsSellableIndex = string.Join("，", itemsSellable.Take(10).Select(i => items.IndexOf(i) + 1)) + "，...";
}
IEnumerable<Item> itemsTradable = objs.Where(i => i.IsTradable);
string itemsTradableIndex = string.Join("，", itemsTradable.Select(i => items.IndexOf(i) + 1));
if (itemsTradable.Count() > 10)
{
itemsTradableIndex = string.Join("，", itemsTradable.Take(10).Select(i => items.IndexOf(i) + 1)) + "，...";
}
str += $"物品序号：{itemsIndex}\r\n";
str += $"拥有数量：{objs.Count}（" + (first.IsEquipment ? $"可装备数量：{objs.Count(i => i.Character is null)}，" : "") +
if (itemsEquipableIndex != "") str += $"可装备序号：{itemsEquipableIndex}\r\n";
if (itemsSellableIndex != "") str += $"可出售序号：{itemsSellableIndex}\r\n";
if (itemsTradableIndex != "") str += $"可交易序号：{itemsTradableIndex}\r\n";
str += $"拥有数量：{objs.Count}（" + (first.IsEquipment ? $"可装备数量：{itemsEquipable.Count()}，" : "") +
(FunGameConstant.ItemCanUsed.Contains(first.ItemType) ? $"可使用数量：{objs.Count(i => i.RemainUseTimes > 0)}，" : "") +
$"可出售数量：{objs.Count(i => i.IsSellable)}，可交易数量：{objs.Count(i => i.IsTradable)}）";
$"可出售数量：{itemsSellable.Count()}，可交易数量：{itemsTradable.Count()}）";
list.Add(str);
}
list.Add($"页数：{showPage} / {maxPage}");
@ -1060,17 +1138,17 @@ namespace Oshima.FunGame.WebAPI.Controllers
list.Add($"{General.GameplayEquilibriumConstant.InGameMaterial}：{user.Inventory.Materials:0.00}");
List<Character> characters = [.. user.Inventory.Characters];
int total = characters.Count;
int maxPage = (int)Math.Ceiling((double)total / 6);
int maxPage = (int)Math.Ceiling((double)total / 15);
if (maxPage < 1) maxPage = 1;
if (showPage <= maxPage)
{
List<object> inventory = [.. characters];
Dictionary<int, object> dict = inventory.Select((obj, index) => new { Index = index + 1, Value = obj }).ToDictionary(k => k.Index, v => v.Value);
List<int> seq = [.. FunGameService.GetPage(dict.Keys, showPage, 6)];
List<int> seq = [.. FunGameService.GetPage(dict.Keys, showPage, 15)];
bool showCharacter = true;
int characterCount = 0;
int prevSequence = dict.Take((showPage - 1) * 6).Count();
int prevSequence = dict.Take((showPage - 1) * 15).Count();
foreach (int index in seq)
{
@ -1525,6 +1603,117 @@ namespace Oshima.FunGame.WebAPI.Controllers
}
}
[HttpPost("showiteminfoname")]
public string GetItemInfoFromInventory_Name([FromQuery] long? uid = null, [FromQuery] string? name = null, [FromQuery] int? page = null)
{
try
{
long userid = uid ?? Convert.ToInt64("10" + Verification.CreateVerifyCode(VerifyCodeType.NumberVerifyCode, 11));
string itemName = name ?? "";
int showPage = page ?? 1;
if (showPage <= 0) showPage = 1;
PluginConfig pc = new("saved", userid.ToString());
pc.LoadConfig();
if (pc.Count > 0)
{
User user = FunGameService.GetUser(pc);
var objs = user.Inventory.Items.Select((item, index) => new { item, index })
.Where(obj => obj.item.Name == itemName);
Dictionary<int, Item> items = [];
if (objs.Any())
{
items = objs.ToDictionary(d => d.index + 1, d => d.item);
}
else
{
return NetworkUtility.JsonSerialize($"你库存中没有任何名为【{itemName}】的物品！");
}
int total = items.Count;
int maxPage = (int)Math.Ceiling((double)total / 100);
if (maxPage < 1) maxPage = 1;
if (showPage <= maxPage)
{
IEnumerable<int> showItems = FunGameService.GetPage(items.Keys, showPage, 100);
if (showItems.Any())
{
int itemIndex = showItems.First();
Item item = items[itemIndex];
string str = $"☆--- [ {item.Name} ] ---☆\r\n";
str += ItemSet.GetQualityTypeName(item.QualityType) + " " +
(item.WeaponType == WeaponType.None ? ItemSet.GetItemTypeName(item.ItemType) : ItemSet.GetItemTypeName(item.ItemType) + "-" + ItemSet.GetWeaponTypeName(item.WeaponType));
str += $"\r\n物品描述：{item.Description}\r\n";
string itemsIndex = string.Join("，", items.Keys);
var itemsEquipabled = items.Where(kv => kv.Value.Character != null);
var itemsEquipable = items.Where(kv => kv.Value.Character is null);
string itemsEquipabledIndex = "";
string itemsEquipableIndex = "";
if (item.IsEquipment)
{
itemsEquipabledIndex = string.Join("，", itemsEquipabled.Select(kv => kv.Key));
itemsEquipableIndex = string.Join("，", itemsEquipable.Select(kv => kv.Key));
}
var itemsCanUsed = items.Where(kv => kv.Value.RemainUseTimes > 0);
string itemsCanUsedIndex = "";
if (FunGameConstant.ItemCanUsed.Contains(item.ItemType))
{
itemsCanUsedIndex = string.Join("，", itemsCanUsed.Select(kv => kv.Key));
}
var itemsSellable = items.Where(kv => kv.Value.IsSellable);
string itemsSellableIndex = string.Join("，", itemsSellable.Select(kv => kv.Key));
var itemsTradable = items.Where(kv => kv.Value.IsTradable);
string itemsTradableIndex = string.Join("，", itemsTradable.Select(kv => kv.Key));
str += $"物品序号：{itemsIndex}\r\n";
if (itemsEquipabledIndex != "") str += $"已装备序号：{itemsEquipabledIndex}\r\n";
if (itemsEquipableIndex != "") str += $"可装备序号：{itemsEquipableIndex}\r\n";
if (itemsCanUsedIndex != "") str += $"可使用序号：{itemsCanUsedIndex}\r\n";
if (itemsSellableIndex != "") str += $"可出售序号：{itemsSellableIndex}\r\n";
if (itemsTradableIndex != "") str += $"可交易序号：{itemsTradableIndex}\r\n";
str += $"拥有数量：{items.Count}（";
if (item.IsEquipment)
{
str += $"已装备数量：{itemsEquipabled.Count()}，可装备数量：{itemsEquipable.Count()}，";
}
if (FunGameConstant.ItemCanUsed.Contains(item.ItemType))
{
str += $"可使用数量：{itemsCanUsed.Count()}，";
}
str += $"可出售数量：{itemsSellable.Count()}，可交易数量：{itemsTradable.Count()}）\r\n";
str += $"页数：{showPage} / {maxPage}";
return NetworkUtility.JsonSerialize(str.Trim());
}
else
{
return NetworkUtility.JsonSerialize($"你库存中没有任何名为【{itemName}】的物品！");
}
}
else
{
return NetworkUtility.JsonSerialize($"没有这么多页！当前总页数为 {maxPage}，但你请求的是第 {showPage} 页。");
}
}
else
{
return NetworkUtility.JsonSerialize(noSaved);
}
}
catch (Exception e)
{
return NetworkUtility.JsonSerialize(e.ToString());
}
}
[HttpPost("equipitem")]
public string EquipItem([FromQuery] long? uid = null, [FromQuery] int? c = null, [FromQuery] int? i = null)
{
@ -1780,7 +1969,7 @@ namespace Oshima.FunGame.WebAPI.Controllers
character.Recovery(EP: 200);
}
Team team1 = new($"{user1.Username}的小队", squad1);
Team team2 = new($"{user2.Username}的小队", squad2);
Team team2 = new($"{user2.Username}的小队" + (userid == enemyid ? "2" : ""), squad2);
return FunGameActionQueue.NewAndStartTeamGame([team1, team2], 0, 0, false, false, false, false, showAllRound);
}
else
@ -2963,7 +3152,7 @@ namespace Oshima.FunGame.WebAPI.Controllers
}
else if (key == "角色突破进度")
{
if (character.LevelBreak < needCount)
if (character.LevelBreak + 1 < needCount)
{
return NetworkUtility.JsonSerialize($"角色 [ {character} ] 等级突破进度不足 {needCount} 等阶，无法{isStudy}此技能！");
}
@ -3135,7 +3324,7 @@ namespace Oshima.FunGame.WebAPI.Controllers
}
else if (key == "角色突破进度")
{
if (character.LevelBreak < needCount)
if (character.LevelBreak + 1 < needCount)
{
return NetworkUtility.JsonSerialize($"角色 [ {character} ] 等级突破进度不足 {needCount} 等阶，无法升级此技能！");
}
@ -3640,60 +3829,76 @@ namespace Oshima.FunGame.WebAPI.Controllers
}
[HttpPost("acceptquest")]
public string AcceptQuest([FromQuery] long? uid = null, [FromQuery] int? id = null)
public List<string> AcceptQuest([FromQuery] long? uid = null, [FromQuery] int? id = null)
{
long userid = uid ?? Convert.ToInt64("10" + Verification.CreateVerifyCode(VerifyCodeType.NumberVerifyCode, 11));
int questid = id ?? 0;
PluginConfig pc = new("saved", userid.ToString());
pc.LoadConfig();
List<string> msgs = [];
if (pc.Count > 0)
{
User user = FunGameService.GetUser(pc);
string msg = "";
EntityModuleConfig<Quest> quests = new("quests", userid.ToString());
quests.LoadConfig();
if (quests.Count > 0)
if (quests.Count > 0 && quests.Values.FirstOrDefault(q => q.Id == questid) is Quest quest)
{
if (quests.Values.FirstOrDefault(q => q.Status == QuestState.InProgress) is Quest quest)
if (quest.Status == QuestState.InProgress)
{
msg = $"你正在进行任务【{quest.Name}】，无法开始新任务！\r\n{quest}";
msgs.Add($"你正在进行任务【{quest.Name}】，无法开始新任务！\r\n{quest}");
}
else if (quests.Values.FirstOrDefault(q => q.Id == questid) is Quest quest2)
else if (quest.Status == QuestState.Completed)
{
if (quest2.Status != 0)
{
msg = $"这个任务正在进行中，或已经完成，不能重复做任务！";
}
else
{
quest2.StartTime = DateTime.Now;
quest2.Status = QuestState.InProgress;
quests.SaveConfig();
msg = $"开始任务【{quest2.Name}】成功！任务信息如下：\r\n{quest2}\r\n预计完成时间：{DateTime.Now.AddMinutes(quest2.EstimatedMinutes).ToString(General.GeneralDateTimeFormatChinese)}";
}
msgs.Add($"任务【{quest.Name}】已经完成了！\r\n{quest}");
}
else if (quest.Status == QuestState.Settled)
{
msgs.Add($"任务【{quest.Name}】已经结算并发放奖励了哦！\r\n{quest}");
}
else
{
msg = $"没有找到序号为 {questid} 的任务！";
quest.StartTime = DateTime.Now;
quest.Status = QuestState.InProgress;
if (quest.QuestType == QuestType.Continuous)
{
// 持续性任务会在持续时间结束后自动完成并结算
msgs.Add($"开始任务【{quest.Name}】成功！任务信息如下：\r\n{quest}\r\n预计完成时间：{DateTime.Now.AddMinutes(quest.EstimatedMinutes).ToString(General.GeneralDateTimeFormatChinese)}");
}
else if (quest.QuestType == QuestType.Immediate)
{
msgs.Add($"开始任务【{quest.Name}】成功！任务信息如下：\r\n{quest}");
// TODO：实现任务逻辑
quest.Status = QuestState.Completed;
msgs.Add("在任务过程中，你碰巧遇到了米莉，任务直接完成了！");
}
else
{
msgs.Add($"开始任务【{quest.Name}】成功！任务信息如下：\r\n{quest}");
// TODO：进度条任务需要完成任务的指标，实现任务逻辑
quest.Progress = quest.MaxProgress;
quest.Status = QuestState.Completed;
msgs.Add("在任务过程中，你碰巧遇到了米莉，任务直接完成了！");
}
quests.SaveConfig();
}
}
else
{
msg = "任务列表为空，请等待刷新！";
msgs.Add($"没有找到序号为 {questid} 的任务！请使用【任务列表】指令来检查你的任务列表！");
}
user.LastTime = DateTime.Now;
pc.Add("user", user);
pc.SaveConfig();
return NetworkUtility.JsonSerialize(msg);
return msgs;
}
else
{
return NetworkUtility.JsonSerialize(noSaved);
return [noSaved];
}
}
@ -4048,11 +4253,16 @@ namespace Oshima.FunGame.WebAPI.Controllers
builer.AppendLine($"管理员数量：{club.Admins.Count}");
builer.AppendLine($"申请人数量：{club.Applicants.Count}");
builer.AppendLine($"社团基金：{club.ClubPoins}");
if (club.Master?.Id == userid)
{
builer.AppendLine("你是此社团的社长");
}
if (club.Admins.ContainsKey(userid))
{
builer.AppendLine("你是此社团的管理员");
}
}
builer.AppendLine($"社团描述：{club.Description}");
msg = builer.ToString().Trim();
}
else
@ -4069,10 +4279,12 @@ namespace Oshima.FunGame.WebAPI.Controllers
}
[HttpPost("showclubmemberlist")]
public string ShowClubMemberList([FromQuery] long? uid = null, [FromQuery] int? type = null)
public string ShowClubMemberList([FromQuery] long? uid = null, [FromQuery] int? type = null, [FromQuery] int? page = null)
{
long userid = uid ?? Convert.ToInt64("10" + Verification.CreateVerifyCode(VerifyCodeType.NumberVerifyCode, 11));
int showType = type ?? 0;
int showPage = page ?? 1;
if (showPage <= 0) showPage = 1;
PluginConfig pc = new("saved", userid.ToString());
pc.LoadConfig();
@ -4099,21 +4311,34 @@ namespace Oshima.FunGame.WebAPI.Controllers
case 1:
builer.AppendLine($"☆--- 社团 [ {club.Name} ] 管理员列表 ---☆");
count = 1;
List<long> admins = [.. club.Admins.Keys];
List<long> admins = [];
if (club.Master != null && club.Master.Id != 0)
{
admins.Add(club.Master.Id);
}
foreach (long uid2 in admins)
admins.AddRange(club.Admins.Keys);
int maxPage = (int)Math.Ceiling((double)admins.Count / FunGameConstant.ItemsPerPage2);
if (maxPage < 1) maxPage = 1;
if (showPage <= maxPage)
{
if (FunGameConstant.UserIdAndUsername.TryGetValue(uid2, out User? user2) && user2 != null)
admins = [.. FunGameService.GetPage(admins, showPage, FunGameConstant.ItemsPerPage2)];
foreach (long uid2 in admins)
{
builer.AppendLine($"{count}.");
builer.AppendLine($"UID：{user2.Id}");
builer.AppendLine($"玩家昵称：{user2.Username}");
builer.AppendLine($"加入时间：{club.MemberJoinTime[user2.Id].ToString(General.GeneralDateTimeFormatChinese)}");
if (FunGameConstant.UserIdAndUsername.TryGetValue(uid2, out User? user2) && user2 != null)
{
builer.AppendLine($"{count}.");
builer.AppendLine($"UID：{user2.Id}");
builer.AppendLine($"玩家昵称：{user2.Username}");
builer.AppendLine($"加入时间：{club.MemberJoinTime[user2.Id].ToString(General.GeneralDateTimeFormatChinese)}");
}
count++;
}
count++;
builer.AppendLine($"页数：{showPage} / {maxPage}");
}
else
{
NetworkUtility.JsonSerialize($"没有这么多页！当前总页数为 {maxPage}，但你请求的是第 {showPage} 页。");
}
break;
case 2:
@ -4121,16 +4346,27 @@ namespace Oshima.FunGame.WebAPI.Controllers
{
builer.AppendLine($"☆--- 社团 [ {club.Name} ] 申请人列表 ---☆");
count = 1;
foreach (long uid2 in club.Applicants.Keys)
maxPage = (int)Math.Ceiling((double)club.Applicants.Count / FunGameConstant.ItemsPerPage2);
if (maxPage < 1) maxPage = 1;
if (showPage <= maxPage)
{
if (FunGameConstant.UserIdAndUsername.TryGetValue(uid2, out User? user2) && user2 != null)
IEnumerable<long> applicants = FunGameService.GetPage(club.Applicants.Keys, showPage, FunGameConstant.ItemsPerPage2);
foreach (long uid2 in applicants)
{
builer.AppendLine($"{count}.");
builer.AppendLine($"UID：{user2.Id}");
builer.AppendLine($"玩家昵称：{user2.Username}");
builer.AppendLine($"申请时间：{club.ApplicationTime[user2.Id].ToString(General.GeneralDateTimeFormatChinese)}");
if (FunGameConstant.UserIdAndUsername.TryGetValue(uid2, out User? user2) && user2 != null)
{
builer.AppendLine($"{count}.");
builer.AppendLine($"UID：{user2.Id}");
builer.AppendLine($"玩家昵称：{user2.Username}");
builer.AppendLine($"申请时间：{club.ApplicationTime[user2.Id].ToString(General.GeneralDateTimeFormatChinese)}");
}
count++;
}
count++;
builer.AppendLine($"页数：{showPage} / {maxPage}");
}
else
{
NetworkUtility.JsonSerialize($"没有这么多页！当前总页数为 {maxPage}，但你请求的是第 {showPage} 页。");
}
}
else
@ -4142,26 +4378,37 @@ namespace Oshima.FunGame.WebAPI.Controllers
default:
builer.AppendLine($"☆--- 社团 [ {club.Name} ] 成员列表 ---☆");
count = 1;
foreach (long uid2 in club.Members.Keys)
maxPage = (int)Math.Ceiling((double)club.Members.Count / FunGameConstant.ItemsPerPage2);
if (maxPage < 1) maxPage = 1;
if (showPage <= maxPage)
{
if (FunGameConstant.UserIdAndUsername.TryGetValue(uid2, out User? user2) && user2 != null)
IEnumerable<long> members = FunGameService.GetPage(club.Members.Keys, showPage, FunGameConstant.ItemsPerPage2);
foreach (long uid2 in members)
{
builer.AppendLine($"{count}.");
builer.AppendLine($"UID：{user2.Id}");
builer.AppendLine($"玩家昵称：{user2.Username}");
string userType = "社员";
if (club.Master?.Id == user2.Id)
if (FunGameConstant.UserIdAndUsername.TryGetValue(uid2, out User? user2) && user2 != null)
{
userType = "社长";
builer.AppendLine($"{count}.");
builer.AppendLine($"UID：{user2.Id}");
builer.AppendLine($"玩家昵称：{user2.Username}");
string userType = "社员";
if (club.Master?.Id == user2.Id)
{
userType = "社长";
}
else if (club.Admins.ContainsKey(user2.Id))
{
userType = "管理员";
}
builer.AppendLine($"社团身份：{userType}");
builer.AppendLine($"加入时间：{club.MemberJoinTime[user2.Id].ToString(General.GeneralDateTimeFormatChinese)}");
}
else if (club.Admins.ContainsKey(user2.Id))
{
userType = "管理员";
}
builer.AppendLine($"社团身份：{userType}");
builer.AppendLine($"加入时间：{club.MemberJoinTime[user2.Id].ToString(General.GeneralDateTimeFormatChinese)}");
count++;
}
count++;
builer.AppendLine($"页数：{showPage} / {maxPage}");
}
else
{
NetworkUtility.JsonSerialize($"没有这么多页！当前总页数为 {maxPage}，但你请求的是第 {showPage} 页。");
}
break;
}
@ -4772,6 +5019,95 @@ namespace Oshima.FunGame.WebAPI.Controllers
}
}
[HttpPost("creategiftbox")]
public string CreateGiftBox([FromQuery] long? uid = null, [FromQuery] string? name = null)
{
long userid = uid ?? Convert.ToInt64("10" + Verification.CreateVerifyCode(VerifyCodeType.NumberVerifyCode, 11));
string itemName = name ?? "";
PluginConfig pc = new("saved", userid.ToString());
pc.LoadConfig();
if (pc.Count > 0)
{
User user = FunGameService.GetUser(pc);
if (FunGameConstant.AllItems.FirstOrDefault(i => i.Name == itemName) is Item item)
{
PluginConfig pc2 = new("giftbox", "giftbox");
pc2.LoadConfig();
List<long> list = [];
if (pc2.TryGetValue(itemName, out object? value) && value is List<long> tempList)
{
list = new(tempList);
}
if (list.Contains(user.Id))
{
return NetworkUtility.JsonSerialize($"你已经领取过这个礼包【{itemName}】啦，不能重复领取哦！");
}
Item newItem = item.Copy();
newItem.IsSellable = false;
newItem.IsTradable = false;
newItem.User = user;
user.Inventory.Items.Add(newItem);
string msg = $"恭喜你获得礼包【{itemName}】一份！";
list.Add(user.Id);
pc2.Add(itemName, list);
pc2.SaveConfig();
user.LastTime = DateTime.Now;
pc.Add("user", user);
pc.SaveConfig();
return NetworkUtility.JsonSerialize(msg);
}
else
{
return NetworkUtility.JsonSerialize("没有找到这个礼包，可能已经过期。");
}
}
else
{
return NetworkUtility.JsonSerialize(noSaved);
}
}
[HttpGet("getregion")]
public List<string> GetRegion([FromQuery] int? index = null)
{
List<string> regions = [];
if (index != null)
{
if (FunGameConstant.Regions.FirstOrDefault(kv => kv.Id == index) is Region region)
{
regions.Add(region.ToString());
}
else
{
regions.Add($"找不到指定编号的地区！");
}
}
else if (FunGameConstant.Regions.Count > 0)
{
regions.Add($"世界地图：");
for (int i = 0; i < FunGameConstant.Regions.Count; i++)
{
Region region = FunGameConstant.Regions[i];
regions.Add($"{region.Id}. {region.Name}");
}
regions.Add($"提示：使用【查地区+序号】指令来查看指定地区的信息。");
}
else
{
regions.Add($"世界地图遇到了问题，暂时无法显示……");
}
return regions;
}
[HttpGet("reload")]
public string Relaod([FromQuery] long? master = null)
{

105
OshimaWebAPI/Services/RainBOTService.cs
View File

@ -27,12 +27,13 @@ namespace Oshima.FunGame.WebAPI.Services
Statics.RunningPlugin?.Controller.WriteLine(title, Milimoe.FunGame.Core.Library.Constant.LogLevel.Debug);
if (msg is ThirdPartyMessage third)
{
third.Result = content;
third.Result = "\r\n" + content.Trim();
third.IsCompleted = true;
return;
}
if (msg.IsGroup)
{
content = "\r\n" + content.Trim();
await Service.SendGroupMessageAsync(msg.OpenId, content, msgType, media, msg.Id, msgSeq);
}
else
@ -189,7 +190,7 @@ namespace Oshima.FunGame.WebAPI.Services
{
await SendAsync(e, "饭给木", @"《饭给木》游戏指令列表（第 5 / 7 页）
43：任务列表：查看今日任务列表
44：开始任务 <任务序号>
44：开始任务/做任务 <任务序号>
45、任务信息：查看进行中任务的详细信息
46、任务结算：对进行中的任务进行结算
47、我的状态：查看主战角色状态
@ -924,15 +925,17 @@ namespace Oshima.FunGame.WebAPI.Services
return result;
}
if (e.Detail.StartsWith("开始任务", StringComparison.CurrentCultureIgnoreCase))
if (e.Detail.StartsWith("开始任务", StringComparison.CurrentCultureIgnoreCase) || e.Detail.StartsWith("做任务", StringComparison.CurrentCultureIgnoreCase))
{
string detail = e.Detail.Replace("开始任务", "").Trim();
string detail = e.Detail.Replace("开始任务", "").Replace("做任务", "").Trim();
if (int.TryParse(detail, out int index))
{
string msg = NetworkUtility.JsonDeserialize<string>(Controller.AcceptQuest(uid, index)) ?? "";
if (msg != "")
List<string> msgs = Controller.AcceptQuest(uid, index);
int count = 1;
foreach (string msg in msgs)
{
await SendAsync(e, "开始任务", msg);
await SendAsync(e, "开始任务", msg, msgSeq: count++);
await Task.Delay(2000);
}
}
return result;
@ -941,14 +944,21 @@ namespace Oshima.FunGame.WebAPI.Services
if (e.Detail.StartsWith("我的物品", StringComparison.CurrentCultureIgnoreCase))
{
string detail = e.Detail.Replace("我的物品", "").Trim();
string msg;
if (int.TryParse(detail, out int index))
{
string msg = NetworkUtility.JsonDeserialize<string>(Controller.GetItemInfoFromInventory(uid, index)) ?? "";
msg = NetworkUtility.JsonDeserialize<string>(Controller.GetItemInfoFromInventory(uid, index)) ?? "";
if (msg != "")
{
await SendAsync(e, "查库存物品", msg);
return result;
}
}
msg = NetworkUtility.JsonDeserialize<string>(Controller.GetItemInfoFromInventory_Name(uid, detail)) ?? "";
if (msg != "")
{
await SendAsync(e, "查库存物品", msg);
}
return result;
}
@ -1757,32 +1767,68 @@ namespace Oshima.FunGame.WebAPI.Services
return result;
}
if (e.Detail == "查看社团成员")
if (e.Detail.StartsWith("查看社团成员"))
{
string msg = NetworkUtility.JsonDeserialize<string>(Controller.ShowClubMemberList(uid, 0)) ?? "";
if (msg != "")
string detail = e.Detail.Replace("查看社团成员", "").Trim();
if (int.TryParse(detail, out int page) && page > 0)
{
await SendAsync(e, "社团", "\r\n" + msg);
string msg = NetworkUtility.JsonDeserialize<string>(Controller.ShowClubMemberList(uid, 0, page)) ?? "";
if (msg != "")
{
await SendAsync(e, "社团", "\r\n" + msg);
}
}
else
{
string msg = NetworkUtility.JsonDeserialize<string>(Controller.ShowClubMemberList(uid, 0, 1)) ?? "";
if (msg != "")
{
await SendAsync(e, "社团", "\r\n" + msg);
}
}
return result;
}
if (e.Detail == "查看社团管理")
if (e.Detail.StartsWith("查看社团管理"))
{
string msg = NetworkUtility.JsonDeserialize<string>(Controller.ShowClubMemberList(uid, 1)) ?? "";
if (msg != "")
string detail = e.Detail.Replace("查看社团管理", "").Trim();
if (int.TryParse(detail, out int page) && page > 0)
{
await SendAsync(e, "社团", "\r\n" + msg);
string msg = NetworkUtility.JsonDeserialize<string>(Controller.ShowClubMemberList(uid, 1, page)) ?? "";
if (msg != "")
{
await SendAsync(e, "社团", "\r\n" + msg);
}
}
else
{
string msg = NetworkUtility.JsonDeserialize<string>(Controller.ShowClubMemberList(uid, 1, 1)) ?? "";
if (msg != "")
{
await SendAsync(e, "社团", "\r\n" + msg);
}
}
return result;
}
if (e.Detail == "查看申请人列表")
if (e.Detail.StartsWith("查看申请人列表"))
{
string msg = NetworkUtility.JsonDeserialize<string>(Controller.ShowClubMemberList(uid, 2)) ?? "";
if (msg != "")
string detail = e.Detail.Replace("查看申请人列表", "").Trim();
if (int.TryParse(detail, out int page) && page > 0)
{
await SendAsync(e, "社团", "\r\n" + msg);
string msg = NetworkUtility.JsonDeserialize<string>(Controller.ShowClubMemberList(uid, 2, page)) ?? "";
if (msg != "")
{
await SendAsync(e, "社团", "\r\n" + msg);
}
}
else
{
string msg = NetworkUtility.JsonDeserialize<string>(Controller.ShowClubMemberList(uid, 2, 1)) ?? "";
if (msg != "")
{
await SendAsync(e, "社团", "\r\n" + msg);
}
}
return result;
}
@ -1917,6 +1963,25 @@ namespace Oshima.FunGame.WebAPI.Services
return result;
}
if (e.Detail.StartsWith("查地区", StringComparison.CurrentCultureIgnoreCase) || e.Detail.StartsWith("查询地区", StringComparison.CurrentCultureIgnoreCase))
{
string detail = e.Detail.Replace("查地区", "").Replace("查询地区", "").Trim();
List<string> msgs = [];
if (int.TryParse(detail, out int cid))
{
msgs = Controller.GetRegion(cid);
}
else
{
msgs = Controller.GetRegion();
}
if (msgs.Count > 0)
{
await SendAsync(e, "查地区", string.Join("\r\n", msgs));
}
return result;
}
if (uid == GeneralSettings.Master && e.Detail.StartsWith("重载FunGame", StringComparison.CurrentCultureIgnoreCase))
{
string msg = NetworkUtility.JsonDeserialize<string>(Controller.Relaod(uid)) ?? "";