From e1d58144a3ab13ba4737d03a2e94f057fb8e631e Mon Sep 17 00:00:00 2001 From: milimoe Date: Sat, 21 Sep 2024 01:30:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20ItemSet=EF=BC=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=20SkillSet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Api/Utility/ActionQueue.cs | 6 +- Entity/Character/Character.cs | 12 +-- Library/Constant/ConstantSet.cs | 127 +++++++++++++++++++++++++++++++- 3 files changed, 135 insertions(+), 10 deletions(-) diff --git a/Api/Utility/ActionQueue.cs b/Api/Utility/ActionQueue.cs index f58a174..9764f25 100644 --- a/Api/Utility/ActionQueue.cs +++ b/Api/Utility/ActionQueue.cs @@ -1295,7 +1295,7 @@ namespace Milimoe.FunGame.Core.Api.Utility if (character.Equip(item)) { EquipItemToSlot type = character.EquipSlot.GetEquipItemToSlot(item); - WriteLine($"[ {character} ] 装备了 [ {item.Name} ]。" + (type != EquipItemToSlot.None ? $"（{ItemSet.GetEquipSlotTypeName(type)} 栏位）" : "")); + WriteLine($"[ {character} ] 装备了 [ {item.Name} ]。" + (type != EquipItemToSlot.None ? $"（{ItemSet.GetEquipItemToSlotTypeName(type)} 栏位）" : "")); } } @@ -1303,7 +1303,7 @@ namespace Milimoe.FunGame.Core.Api.Utility { if (character.Equip(item, type)) { - WriteLine($"[ {character} ] 装备了 [ {item.Name} ]。（{ItemSet.GetEquipSlotTypeName(type)} 栏位）"); + WriteLine($"[ {character} ] 装备了 [ {item.Name} ]。（{ItemSet.GetEquipItemToSlotTypeName(type)} 栏位）"); } } @@ -1312,7 +1312,7 @@ namespace Milimoe.FunGame.Core.Api.Utility Item? item = character.UnEquip(type); if (item != null) { - WriteLine($"[ {character} ] 取消装备了 [ {item.Name} ]。（{ItemSet.GetEquipSlotTypeName(type)} 栏位）"); + WriteLine($"[ {character} ] 取消装备了 [ {item.Name} ]。（{ItemSet.GetEquipItemToSlotTypeName(type)} 栏位）"); } } } diff --git a/Entity/Character/Character.cs b/Entity/Character/Character.cs index 282e00a..a61bde1 100644 --- a/Entity/Character/Character.cs +++ b/Entity/Character/Character.cs @@ -1113,32 +1113,32 @@ namespace Milimoe.FunGame.Core.Entity builder.AppendLine("== 装备栏 =="); if (EquipSlot.MagicCardPack != null) { - builder.AppendLine(ItemSet.GetEquipSlotTypeName(EquipItemToSlot.MagicCardPack) + "：" + EquipSlot.MagicCardPack.Name); + builder.AppendLine(ItemSet.GetEquipItemToSlotTypeName(EquipItemToSlot.MagicCardPack) + "：" + EquipSlot.MagicCardPack.Name); builder.AppendLine(EquipSlot.MagicCardPack.Description); } if (EquipSlot.Weapon != null) { - builder.AppendLine(ItemSet.GetEquipSlotTypeName(EquipItemToSlot.Weapon) + "：" + EquipSlot.Weapon.Name); + builder.AppendLine(ItemSet.GetEquipItemToSlotTypeName(EquipItemToSlot.Weapon) + "：" + EquipSlot.Weapon.Name); builder.AppendLine(EquipSlot.Weapon.Description); } if (EquipSlot.Armor != null) { - builder.AppendLine(ItemSet.GetEquipSlotTypeName(EquipItemToSlot.Armor) + "：" + EquipSlot.Armor.Name); + builder.AppendLine(ItemSet.GetEquipItemToSlotTypeName(EquipItemToSlot.Armor) + "：" + EquipSlot.Armor.Name); builder.AppendLine(EquipSlot.Armor.Description); } if (EquipSlot.Shoes != null) { - builder.AppendLine(ItemSet.GetEquipSlotTypeName(EquipItemToSlot.Shoes) + "：" + EquipSlot.Shoes.Name); + builder.AppendLine(ItemSet.GetEquipItemToSlotTypeName(EquipItemToSlot.Shoes) + "：" + EquipSlot.Shoes.Name); builder.AppendLine(EquipSlot.Shoes.Description); } if (EquipSlot.Accessory1 != null) { - builder.AppendLine(ItemSet.GetEquipSlotTypeName(EquipItemToSlot.Accessory1) + "：" + EquipSlot.Accessory1.Name); + builder.AppendLine(ItemSet.GetEquipItemToSlotTypeName(EquipItemToSlot.Accessory1) + "：" + EquipSlot.Accessory1.Name); builder.AppendLine(EquipSlot.Accessory1.Description); } if (EquipSlot.Accessory2 != null) { - builder.AppendLine(ItemSet.GetEquipSlotTypeName(EquipItemToSlot.Accessory2) + "：" + EquipSlot.Accessory2.Name); + builder.AppendLine(ItemSet.GetEquipItemToSlotTypeName(EquipItemToSlot.Accessory2) + "：" + EquipSlot.Accessory2.Name); builder.AppendLine(EquipSlot.Accessory2.Description); } } diff --git a/Library/Constant/ConstantSet.cs b/Library/Constant/ConstantSet.cs index 3025b4f..f0abee3 100644 --- a/Library/Constant/ConstantSet.cs +++ b/Library/Constant/ConstantSet.cs @@ -371,6 +371,7 @@ namespace Milimoe.FunGame.Core.Library.Constant ItemType.Shoes => "鞋子", ItemType.Accessory => "饰品", ItemType.Consumable => "消耗品", + ItemType.MagicCard => "魔法卡", ItemType.Collectible => "收藏品", ItemType.SpecialItem => "特殊物品", ItemType.QuestItem => "任务物品", @@ -380,7 +381,90 @@ namespace Milimoe.FunGame.Core.Library.Constant }; } - public static string GetEquipSlotTypeName(EquipItemToSlot type) + public static ItemType GetItemTypeFromName(string name) + { + return name switch + { + "魔法卡包" => ItemType.MagicCardPack, + "武器" => ItemType.Weapon, + "防具" => ItemType.Armor, + "鞋子" => ItemType.Shoes, + "饰品" => ItemType.Accessory, + "消耗品" => ItemType.Consumable, + "魔法卡" => ItemType.MagicCard, + "收藏品" => ItemType.Collectible, + "特殊物品" => ItemType.SpecialItem, + "任务物品" => ItemType.QuestItem, + "礼包" => ItemType.GiftBox, + _ => ItemType.Others, + }; + } + + public static string GetWeaponTypeName(WeaponType type) + { + return type switch + { + WeaponType.OneHandedSword => "单手剑", + WeaponType.TwoHandedSword => "双手重剑", + WeaponType.Bow => "弓", + WeaponType.Pistol => "手枪", + WeaponType.Rifle => "步枪", + WeaponType.DualDaggers => "双持短刀", + WeaponType.Talisman => "法器", + WeaponType.Staff => "法杖", + WeaponType.Polearm => "长柄", + WeaponType.Gauntlet => "拳套", + WeaponType.HiddenWeapon => "暗器", + _ => "" + }; + } + + public static WeaponType GetWeaponTypeFromName(string name) + { + return name switch + { + "单手剑" => WeaponType.OneHandedSword, + "双手重剑" => WeaponType.TwoHandedSword, + "弓" => WeaponType.Bow, + "手枪" => WeaponType.Pistol, + "步枪" => WeaponType.Rifle, + "双持短刀" => WeaponType.DualDaggers, + "法器" => WeaponType.Talisman, + "法杖" => WeaponType.Staff, + "长柄" => WeaponType.Polearm, + "拳套" => WeaponType.Gauntlet, + "暗器" => WeaponType.HiddenWeapon, + _ => WeaponType.None + }; + } + + public static string GetEquipSlotTypeName(EquipSlotType type) + { + return type switch + { + EquipSlotType.MagicCardPack => "魔法卡包", + EquipSlotType.Weapon => "武器", + EquipSlotType.Armor => "防具", + EquipSlotType.Shoes => "鞋子", + EquipSlotType.Accessory => "饰品", + _ => "" + }; + } + + public static EquipSlotType GetEquipSlotTypeFromName(string name) + { + return name switch + { + "魔法卡包" => EquipSlotType.MagicCardPack, + "武器" => EquipSlotType.Weapon, + "防具" => EquipSlotType.Armor, + "鞋子" => EquipSlotType.Shoes, + "饰品" => EquipSlotType.Accessory, + _ => EquipSlotType.None + }; + } + + public static string GetEquipItemToSlotTypeName(EquipItemToSlot type) { return type switch { @@ -393,5 +477,46 @@ namespace Milimoe.FunGame.Core.Library.Constant _ => "" }; } + + public static EquipItemToSlot GetEquipItemToSlotTypeFromName(string name) + { + return name switch + { + "魔法卡包" => EquipItemToSlot.MagicCardPack, + "武器" => EquipItemToSlot.Weapon, + "防具" => EquipItemToSlot.Armor, + "鞋子" => EquipItemToSlot.Shoes, + "饰品1" => EquipItemToSlot.Accessory1, + "饰品2" => EquipItemToSlot.Accessory2, + _ => EquipItemToSlot.None + }; + } + } + + public class SkillSet + { + public static string GetSkillTypeName(SkillType type) + { + return type switch + { + SkillType.Magic => "魔法", + SkillType.Skill => "战技", + SkillType.SuperSkill => "爆发技", + SkillType.Item => "物品", + _ => "被动" + }; + } + + public static SkillType GetSkillTypeFromName(string name) + { + return name switch + { + "魔法" => SkillType.Magic, + "战技" => SkillType.Skill, + "爆发技" => SkillType.SuperSkill, + "物品" => SkillType.Item, + _ => SkillType.Passive, + }; + } } }