diff --git a/OshimaCore/OshimaWebAPI.cs b/OshimaCore/OshimaWebAPI.cs index 0a69a83..c05a522 100644 --- a/OshimaCore/OshimaWebAPI.cs +++ b/OshimaCore/OshimaWebAPI.cs @@ -116,7 +116,7 @@ namespace Oshima.Core.WebAPI } } }); - Task taskCache = Task.Factory.StartNew(async () => + Milimoe.FunGame.Core.Api.Utility.TaskScheduler.Shared.AddRecurringTask("刷新存档缓存", TimeSpan.FromSeconds(20), () => { string directoryPath = $@"{AppDomain.CurrentDomain.BaseDirectory}configs/saved"; if (Directory.Exists(directoryPath)) @@ -135,8 +135,7 @@ namespace Oshima.Core.WebAPI } Controller.WriteLine("读取 FunGame 存档缓存"); } - await Task.Delay(3000 * 60 * 10); - }); + }, true); } } } diff --git a/OshimaCore/Utils/FunGameService.cs b/OshimaCore/Utils/FunGameService.cs index bf22c50..866f1ce 100644 --- a/OshimaCore/Utils/FunGameService.cs +++ b/OshimaCore/Utils/FunGameService.cs @@ -36,7 +36,7 @@ namespace Oshima.Core.Utils Dictionary exItems = Factory.GetGameModuleInstances(OshimaGameModuleConstant.General, OshimaGameModuleConstant.Item); Equipment.AddRange(exItems.Values.Where(i => (int)i.ItemType >= 0 && (int)i.ItemType < 5)); - Equipment.AddRange([new 攻击之爪10(), new 攻击之爪20(), new 攻击之爪35(), new 攻击之爪50()]); + Equipment.AddRange([new 攻击之爪5(), new 攻击之爪15(), new 攻击之爪25(), new 攻击之爪35()]); Items.AddRange(exItems.Values.Where(i => (int)i.ItemType > 4)); @@ -428,14 +428,14 @@ namespace Oshima.Core.Utils foreach (Character inventoryCharacter in characters) { - Character realCharacter = CharacterBuilder.Build(inventoryCharacter, false); + Character realCharacter = CharacterBuilder.Build(inventoryCharacter, false, Items, Skills); realCharacter.User = user; user.Inventory.Characters.Add(realCharacter); } foreach (Item inventoryItem in items) { - Item realItem = inventoryItem.Copy(true, true); + Item realItem = inventoryItem.Copy(true, true, true, Items, Skills); if (realItem.IsEquipment) { IEnumerable has = user.Inventory.Characters.Where(character => diff --git a/OshimaModules/Items/Accessory/攻击之爪.cs b/OshimaModules/Items/Accessory/攻击之爪.cs index 8b2fa14..6c7e389 100644 --- a/OshimaModules/Items/Accessory/攻击之爪.cs +++ b/OshimaModules/Items/Accessory/攻击之爪.cs @@ -5,29 +5,42 @@ using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Items { - public class 攻击之爪10 : Item + public class 攻击之爪5 : Item { - public override long Id => (long)AccessoryID.攻击之爪10; - public override string Name => "攻击之爪 +10"; + public override long Id => (long)AccessoryID.攻击之爪5; + public override string Name => "攻击之爪 +5"; public override string Description => Skills.Passives.Count > 0 ? Skills.Passives.First().Description : ""; public override QualityType QualityType => QualityType.White; - public 攻击之爪10(Character? character = null) : base(ItemType.Accessory) + public 攻击之爪5(Character? character = null) : base(ItemType.Accessory) { - Skills.Passives.Add(new 攻击之爪技能(character, this, 10)); + Skills.Passives.Add(new 攻击之爪技能(character, this, 5)); } } - public class 攻击之爪20 : Item + public class 攻击之爪15 : Item { - public override long Id => (long)AccessoryID.攻击之爪20; - public override string Name => "攻击之爪 +20"; + public override long Id => (long)AccessoryID.攻击之爪15; + public override string Name => "攻击之爪 +15"; public override string Description => Skills.Passives.Count > 0 ? Skills.Passives.First().Description : ""; public override QualityType QualityType => QualityType.Green; - public 攻击之爪20(Character? character = null) : base(ItemType.Accessory) + public 攻击之爪15(Character? character = null) : base(ItemType.Accessory) { - Skills.Passives.Add(new 攻击之爪技能(character, this, 20)); + Skills.Passives.Add(new 攻击之爪技能(character, this, 15)); + } + } + + public class 攻击之爪25 : Item + { + public override long Id => (long)AccessoryID.攻击之爪25; + public override string Name => "攻击之爪 +25"; + public override string Description => Skills.Passives.Count > 0 ? Skills.Passives.First().Description : ""; + public override QualityType QualityType => QualityType.Blue; + + public 攻击之爪25(Character? character = null) : base(ItemType.Accessory) + { + Skills.Passives.Add(new 攻击之爪技能(character, this, 25)); } } @@ -36,26 +49,13 @@ namespace Oshima.FunGame.OshimaModules.Items public override long Id => (long)AccessoryID.攻击之爪35; public override string Name => "攻击之爪 +35"; public override string Description => Skills.Passives.Count > 0 ? Skills.Passives.First().Description : ""; - public override QualityType QualityType => QualityType.Blue; + public override QualityType QualityType => QualityType.Purple; public 攻击之爪35(Character? character = null) : base(ItemType.Accessory) { Skills.Passives.Add(new 攻击之爪技能(character, this, 35)); } } - - public class 攻击之爪50 : Item - { - public override long Id => (long)AccessoryID.攻击之爪50; - public override string Name => "攻击之爪 +50"; - public override string Description => Skills.Passives.Count > 0 ? Skills.Passives.First().Description : ""; - public override QualityType QualityType => QualityType.Purple; - - public 攻击之爪50(Character? character = null) : base(ItemType.Accessory) - { - Skills.Passives.Add(new 攻击之爪技能(character, this, 50)); - } - } public class 攻击之爪技能 : Skill { diff --git a/OshimaModules/Items/ItemID.cs b/OshimaModules/Items/ItemID.cs index 8e8246d..4382b04 100644 --- a/OshimaModules/Items/ItemID.cs +++ b/OshimaModules/Items/ItemID.cs @@ -2,9 +2,9 @@ { public enum AccessoryID : long { - 攻击之爪10 = 14001, - 攻击之爪20 = 14002, - 攻击之爪35 = 14003, - 攻击之爪50 = 14004, + 攻击之爪5 = 14001, + 攻击之爪15 = 14002, + 攻击之爪25 = 14003, + 攻击之爪35 = 14004, } } diff --git a/OshimaModules/Modules/ItemModule.cs b/OshimaModules/Modules/ItemModule.cs index 5b0d473..96f5025 100644 --- a/OshimaModules/Modules/ItemModule.cs +++ b/OshimaModules/Modules/ItemModule.cs @@ -25,10 +25,10 @@ namespace Oshima.FunGame.OshimaModules { return id switch { - (long)AccessoryID.攻击之爪10 => new 攻击之爪10(), - (long)AccessoryID.攻击之爪20 => new 攻击之爪20(), + (long)AccessoryID.攻击之爪5 => new 攻击之爪5(), + (long)AccessoryID.攻击之爪15 => new 攻击之爪15(), + (long)AccessoryID.攻击之爪25 => new 攻击之爪25(), (long)AccessoryID.攻击之爪35 => new 攻击之爪35(), - (long)AccessoryID.攻击之爪50 => new 攻击之爪50(), _ => null, }; }; diff --git a/OshimaModules/Skills/魔法/暗物质.cs b/OshimaModules/Skills/魔法/暗物质.cs index b71e37e..234ef3b 100644 --- a/OshimaModules/Skills/魔法/暗物质.cs +++ b/OshimaModules/Skills/魔法/暗物质.cs @@ -16,7 +16,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public 暗物质(Character? character = null) : base(SkillType.Magic, character) { - Effects.Add(new 基于攻击力的伤害_无基础伤害(this, 1.4, 0.28, true)); + Effects.Add(new 基于攻击力的伤害_无基础伤害(this, 1.3, 0.28, true)); } } } diff --git a/OshimaModules/Skills/魔法/次元上升.cs b/OshimaModules/Skills/魔法/次元上升.cs index d3e4ed6..e527d11 100644 --- a/OshimaModules/Skills/魔法/次元上升.cs +++ b/OshimaModules/Skills/魔法/次元上升.cs @@ -16,8 +16,8 @@ namespace Oshima.FunGame.OshimaModules.Skills public 次元上升(Character? character = null) : base(SkillType.Magic, character) { + Effects.Add(new 基于攻击力的伤害_带基础伤害(this, 40, 40, 0.3, 0.25)); Effects.Add(new 造成眩晕(this, true, 15, 0)); - Effects.Add(new 基于攻击力的伤害_带基础伤害(this, 40, 40, 0.5, 0.3)); } } } diff --git a/OshimaModules/configs/oshima-studios/oshima.fungame.items.json b/OshimaModules/configs/oshima-studios/oshima.fungame.items.json index e04ee66..0f76d24 100644 --- a/OshimaModules/configs/oshima-studios/oshima.fungame.items.json +++ b/OshimaModules/configs/oshima-studios/oshima.fungame.items.json @@ -688,7 +688,7 @@ "圣洁之盾": { "Id": 12503, "Name": "圣洁之盾", - "Description": "增加 10% 物理伤害减免。", + "Description": "增加 12% 物理伤害减免。", "BackgroundStory": "传说中由圣光祝福的盾牌,能够抵挡邪恶的力量。", "ItemType": 2, "WeaponType": 0, @@ -703,7 +703,7 @@ "Effects": [ { "Id": 8019, - "expdr": 0.10 + "expdr": 0.12 } ] } @@ -743,7 +743,7 @@ "炼狱战铠": { "Id": 12505, "Name": "炼狱战铠", - "Description": "增加角色 40 点物理护甲,增加角色 10 点每时间生命回复。", + "Description": "增加角色 40 点物理护甲,增加角色 5 点每时间生命回复。", "BackgroundStory": "在无尽战火中锻造而成,具有极高的防御力。", "ItemType": 2, "WeaponType": 0, @@ -762,7 +762,7 @@ }, { "Id": 8021, - "exhr": 10 + "exhr": 5 } ] } @@ -1025,7 +1025,7 @@ "辉煌光环": { "Id": 14504, "Name": "辉煌光环", - "Description": "增加角色 80 点最大魔法值和 5 点每时间魔法回复。", + "Description": "增加角色 80 点最大魔法值和 2 点每时间魔法回复。", "BackgroundStory": "流光溢彩的光环。", "ItemType": 4, "WeaponType": 0, @@ -1044,7 +1044,7 @@ }, { "Id": 8022, - "exmr": 5 + "exmr": 2 } ] } @@ -1145,7 +1145,7 @@ "精灵之戒": { "Id": 14508, "Name": "精灵之戒", - "Description": "增加角色 10 每时间魔法回复,并增加角色 8 点智力。", + "Description": "增加角色 5 每时间魔法回复,并增加角色 8 点智力。", "BackgroundStory": "这枚戒指由精灵制成,能够帮助法师更快地恢复法力。", "ItemType": 4, "WeaponType": 0, @@ -1160,7 +1160,7 @@ "Effects": [ { "Id": 8022, - "exmr": 10 + "exmr": 5 }, { "Id": 8005, @@ -1203,7 +1203,7 @@ "YukiのCalfSocks": { "Id": 14510, "Name": "YukiのCalfSocks", - "Description": "增加角色 10% 暴击率和 20% 暴击伤害。", + "Description": "增加角色 15% 暴击率和 30% 暴击伤害。", "BackgroundStory": "小雪的小腿袜,拥有神秘的力量,令人神往。", "ItemType": 4, "WeaponType": 0, @@ -1218,11 +1218,11 @@ "Effects": [ { "Id": 8014, - "excr": 0.1 + "excr": 0.15 }, { "Id": 8015, - "excrd": 0.2 + "excrd": 0.3 } ] } @@ -1232,7 +1232,7 @@ "诺尔希的现代汉语字典": { "Id": 14511, "Name": "诺尔希的现代汉语字典", - "Description": "增加角色 15% 攻击力和 8% 物理护甲。", + "Description": "增加角色 25% 攻击力和 160% 物理护甲。", "BackgroundStory": "懂又不懂。", "ItemType": 4, "WeaponType": 0, @@ -1247,11 +1247,11 @@ "Effects": [ { "Id": 8024, - "exdef": 0.08 + "exdef": 1.6 }, { "Id": 8023, - "exatk": 0.15 + "exatk": 0.25 } ] } @@ -1286,7 +1286,7 @@ "路人哥的cos服": { "Id": 14513, "Name": "路人哥的cos服", - "Description": "增加角色 10% 攻击力,增加角色 10% 魔法抗性,但是会减少 8% 物理伤害减免。", + "Description": "增加角色 15% 攻击力,增加角色 10% 魔法抗性,但是会减少 8% 物理伤害减免。", "BackgroundStory": "一套神秘的服饰,据说穿上后会引发未知的力量变化。", "ItemType": 4, "WeaponType": 0, @@ -1301,7 +1301,7 @@ "Effects": [ { "Id": 8023, - "exatk": 0.1 + "exatk": 0.15 }, { "Id": 8020, @@ -1320,7 +1320,7 @@ "白月光的玉佩": { "Id": 14514, "Name": "白月光的玉佩", - "Description": "增加角色 15% 魔法抗性,8 点每时间魔法回复和 15% 冷却缩减。", + "Description": "增加角色 15% 魔法抗性,4 点每时间魔法回复和 15% 冷却缩减。", "BackgroundStory": "据说每个总裁都有一个救命恩人,还有一个冒充救命恩人的人。", "ItemType": 4, "WeaponType": 0, @@ -1340,7 +1340,7 @@ }, { "Id": 8022, - "exmr": 8 + "exmr": 4 }, { "Id": 8011,