From f07401af3c9541041b8e5a31505d2cb07ac20595 Mon Sep 17 00:00:00 2001 From: milimoe Date: Sun, 10 Nov 2024 16:36:31 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E7=89=B9=E6=95=88=E7=9A=84?= =?UTF-8?q?=E5=8F=82=E6=95=B0=E5=BA=94=E8=AF=A5=E5=A4=A7=E4=BA=8E0?= =?UTF-8?q?=EF=BC=9B=E5=B0=8F=E4=BA=8E=E7=9A=840=E7=9A=84=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E8=A7=86=E4=B8=BA=E5=87=8F=E5=B0=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OshimaCore/Controllers/FunGameController.cs | 12 +++++++ OshimaCore/Utils/FunGameUtil.cs | 12 +++++++ OshimaModules/Effects/ItemEffects/GetEP.cs | 2 +- .../Effects/ItemEffects/RecoverHP.cs | 2 +- .../Effects/ItemEffects/RecoverHP2.cs | 2 +- .../Effects/ItemEffects/RecoverMP.cs | 2 +- .../Effects/ItemEffects/RecoverMP2.cs | 2 +- .../OpenEffects/AccelerationCoefficient.cs | 2 +- OshimaModules/Effects/OpenEffects/ExAGI.cs | 2 +- OshimaModules/Effects/OpenEffects/ExAGI2.cs | 2 +- OshimaModules/Effects/OpenEffects/ExATK.cs | 2 +- OshimaModules/Effects/OpenEffects/ExATK2.cs | 2 +- .../OpenEffects/ExActionCoefficient.cs | 2 +- OshimaModules/Effects/OpenEffects/ExCDR.cs | 2 +- .../Effects/OpenEffects/ExCritDMG.cs | 2 +- .../Effects/OpenEffects/ExCritRate.cs | 2 +- OshimaModules/Effects/OpenEffects/ExDEF.cs | 2 +- OshimaModules/Effects/OpenEffects/ExDEF2.cs | 2 +- .../Effects/OpenEffects/ExEvadeRate.cs | 2 +- OshimaModules/Effects/OpenEffects/ExHR.cs | 2 +- OshimaModules/Effects/OpenEffects/ExINT.cs | 2 +- OshimaModules/Effects/OpenEffects/ExINT2.cs | 2 +- OshimaModules/Effects/OpenEffects/ExMDF.cs | 2 +- OshimaModules/Effects/OpenEffects/ExMR.cs | 2 +- OshimaModules/Effects/OpenEffects/ExMaxHP.cs | 2 +- OshimaModules/Effects/OpenEffects/ExMaxHP2.cs | 2 +- OshimaModules/Effects/OpenEffects/ExMaxMP.cs | 2 +- OshimaModules/Effects/OpenEffects/ExMaxMP2.cs | 2 +- OshimaModules/Effects/OpenEffects/ExPDR.cs | 2 +- OshimaModules/Effects/OpenEffects/ExSPD.cs | 2 +- OshimaModules/Effects/OpenEffects/ExSTR.cs | 2 +- OshimaModules/Effects/OpenEffects/ExSTR2.cs | 2 +- .../Effects/OpenEffects/MagicalPenetration.cs | 2 +- .../OpenEffects/NormalAttackHardTimeReduce.cs | 2 +- .../NormalAttackHardTimeReduce2.cs | 2 +- .../OpenEffects/PhysicalPenetration.cs | 2 +- .../OpenEffects/SkillHardTimeReduce.cs | 2 +- .../OpenEffects/SkillHardTimeReduce2.cs | 2 +- OshimaModules/OshimaModules.csproj | 6 ++++ .../oshima-studios/oshima.fungame.items.json | 34 +++++++++++++++++++ 40 files changed, 100 insertions(+), 36 deletions(-) rename {configs => OshimaModules/configs}/oshima-studios/oshima.fungame.items.json (97%) diff --git a/OshimaCore/Controllers/FunGameController.cs b/OshimaCore/Controllers/FunGameController.cs index 2165e16..86519b4 100644 --- a/OshimaCore/Controllers/FunGameController.cs +++ b/OshimaCore/Controllers/FunGameController.cs @@ -4,6 +4,7 @@ using Microsoft.Extensions.Logging; using Milimoe.FunGame.Core.Api.Utility; using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; +using Oshima.Core.Configs; using Oshima.Core.Models; using Oshima.Core.Utils; using Oshima.FunGame.OshimaModules.Skills; @@ -451,6 +452,17 @@ namespace Oshima.Core.Controllers } return NetworkUtility.JsonSerialize(""); } + + [HttpGet("reload")] + public string Relaod([FromQuery] long? master = null) + { + if (master != null && master == GeneralSettings.Master) + { + FunGameSimulation.Reload(); + return NetworkUtility.JsonSerialize("FunGame已重新加载。"); + } + return NetworkUtility.JsonSerialize("提供的参数不正确。"); + } [HttpPost("post")] public string PostName([FromBody] string name) diff --git a/OshimaCore/Utils/FunGameUtil.cs b/OshimaCore/Utils/FunGameUtil.cs index cfd58b1..885382c 100644 --- a/OshimaCore/Utils/FunGameUtil.cs +++ b/OshimaCore/Utils/FunGameUtil.cs @@ -815,6 +815,18 @@ namespace Oshima.Core.Utils Magics.AddRange([new 鍐伴湝鏀诲嚮(), new 鐏箣鐭(), new 姘翠箣鐭(), new 椋庝箣杞(), new 鐭充箣閿(), new 蹇冪伒涔嬮湠(), new 娆″厓涓婂崌(), new 鏆楃墿璐(), new 鍥炲鏈(), new 娌绘剤鏈()]); } + + public static void Reload() + { + Characters.Clear(); + CharacterStatistics.Clear(); + TeamCharacterStatistics.Clear(); + Items.Clear(); + Skills.Clear(); + Magics.Clear(); + + InitCharacter(); + } public static Dictionary> RoundRewards { diff --git a/OshimaModules/Effects/ItemEffects/GetEP.cs b/OshimaModules/Effects/ItemEffects/GetEP.cs index 255ec6b..cc416ec 100644 --- a/OshimaModules/Effects/ItemEffects/GetEP.cs +++ b/OshimaModules/Effects/ItemEffects/GetEP.cs @@ -20,7 +20,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.ItemEffects if (Values.Count > 0) { string key = Values.Keys.FirstOrDefault(s => s.Equals("ep", StringComparison.CurrentCultureIgnoreCase)) ?? ""; - if (key.Length > 0 && double.TryParse(Values[key].ToString(), out double ep)) + if (key.Length > 0 && double.TryParse(Values[key].ToString(), out double ep) && ep > 0) { 瀹為檯鑾峰緱 = ep; } diff --git a/OshimaModules/Effects/ItemEffects/RecoverHP.cs b/OshimaModules/Effects/ItemEffects/RecoverHP.cs index a6785a5..7ddb163 100644 --- a/OshimaModules/Effects/ItemEffects/RecoverHP.cs +++ b/OshimaModules/Effects/ItemEffects/RecoverHP.cs @@ -20,7 +20,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.ItemEffects if (Values.Count > 0) { string key = Values.Keys.FirstOrDefault(s => s.Equals("hp", StringComparison.CurrentCultureIgnoreCase)) ?? ""; - if (key.Length > 0 && double.TryParse(Values[key].ToString(), out double hp)) + if (key.Length > 0 && double.TryParse(Values[key].ToString(), out double hp) && hp > 0) { 瀹為檯鍥炲 = hp; } diff --git a/OshimaModules/Effects/ItemEffects/RecoverHP2.cs b/OshimaModules/Effects/ItemEffects/RecoverHP2.cs index 572a4bb..d7fa725 100644 --- a/OshimaModules/Effects/ItemEffects/RecoverHP2.cs +++ b/OshimaModules/Effects/ItemEffects/RecoverHP2.cs @@ -21,7 +21,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.ItemEffects if (Values.Count > 0) { string key = Values.Keys.FirstOrDefault(s => s.Equals("hp", StringComparison.CurrentCultureIgnoreCase)) ?? ""; - if (key.Length > 0 && double.TryParse(Values[key].ToString(), out double hp)) + if (key.Length > 0 && double.TryParse(Values[key].ToString(), out double hp) && hp > 0) { 鍥炲姣斾緥 = hp; } diff --git a/OshimaModules/Effects/ItemEffects/RecoverMP.cs b/OshimaModules/Effects/ItemEffects/RecoverMP.cs index 778a04e..6423bfa 100644 --- a/OshimaModules/Effects/ItemEffects/RecoverMP.cs +++ b/OshimaModules/Effects/ItemEffects/RecoverMP.cs @@ -20,7 +20,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.ItemEffects if (Values.Count > 0) { string key = Values.Keys.FirstOrDefault(s => s.Equals("mp", StringComparison.CurrentCultureIgnoreCase)) ?? ""; - if (key.Length > 0 && double.TryParse(Values[key].ToString(), out double mp)) + if (key.Length > 0 && double.TryParse(Values[key].ToString(), out double mp) && mp > 0) { 瀹為檯鍥炲 = mp; } diff --git a/OshimaModules/Effects/ItemEffects/RecoverMP2.cs b/OshimaModules/Effects/ItemEffects/RecoverMP2.cs index b0fbab6..1e406b1 100644 --- a/OshimaModules/Effects/ItemEffects/RecoverMP2.cs +++ b/OshimaModules/Effects/ItemEffects/RecoverMP2.cs @@ -21,7 +21,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.ItemEffects if (Values.Count > 0) { string key = Values.Keys.FirstOrDefault(s => s.Equals("mp", StringComparison.CurrentCultureIgnoreCase)) ?? ""; - if (key.Length > 0 && double.TryParse(Values[key].ToString(), out double mp)) + if (key.Length > 0 && double.TryParse(Values[key].ToString(), out double mp) && mp > 0) { 鍥炲姣斾緥 = mp; } diff --git a/OshimaModules/Effects/OpenEffects/AccelerationCoefficient.cs b/OshimaModules/Effects/OpenEffects/AccelerationCoefficient.cs index c8c3cbd..3acf860 100644 --- a/OshimaModules/Effects/OpenEffects/AccelerationCoefficient.cs +++ b/OshimaModules/Effects/OpenEffects/AccelerationCoefficient.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.AccelerationCoefficient; public override string Name => "鍔犻熺郴鏁板姞鎴"; - public override string Description => $"澧炲姞瑙掕壊 {瀹為檯鍔犳垚 * 100:0.##}% 鍔犻熺郴鏁般" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(瀹為檯鍔犳垚) * 100:0.##}% 鍔犻熺郴鏁般" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 瀹為檯鍔犳垚 = 0; diff --git a/OshimaModules/Effects/OpenEffects/ExAGI.cs b/OshimaModules/Effects/OpenEffects/ExAGI.cs index a898310..e969c85 100644 --- a/OshimaModules/Effects/OpenEffects/ExAGI.cs +++ b/OshimaModules/Effects/OpenEffects/ExAGI.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.ExAGI; public override string Name => "鏁忔嵎鍔犳垚"; - public override string Description => $"澧炲姞瑙掕壊 {瀹為檯鍔犳垚:0.##} 鐐规晱鎹枫" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(瀹為檯鍔犳垚):0.##} 鐐规晱鎹枫" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 瀹為檯鍔犳垚 = 0; diff --git a/OshimaModules/Effects/OpenEffects/ExAGI2.cs b/OshimaModules/Effects/OpenEffects/ExAGI2.cs index 36e1566..43db8b0 100644 --- a/OshimaModules/Effects/OpenEffects/ExAGI2.cs +++ b/OshimaModules/Effects/OpenEffects/ExAGI2.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.ExAGI2; public override string Name => "鏁忔嵎鍔犳垚"; - public override string Description => $"澧炲姞瑙掕壊 {鍔犳垚姣斾緥 * 100:0.##}% [ {瀹為檯鍔犳垚:0.##} ] 鐐规晱鎹枫" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(鍔犳垚姣斾緥) * 100:0.##}% [ {Math.Abs(瀹為檯鍔犳垚):0.##} ] 鐐规晱鎹枫" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 鍔犳垚姣斾緥 = 0; diff --git a/OshimaModules/Effects/OpenEffects/ExATK.cs b/OshimaModules/Effects/OpenEffects/ExATK.cs index 7e16cde..6fd6adc 100644 --- a/OshimaModules/Effects/OpenEffects/ExATK.cs +++ b/OshimaModules/Effects/OpenEffects/ExATK.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.ExATK; public override string Name => "鏀诲嚮鍔涘姞鎴"; - public override string Description => $"澧炲姞瑙掕壊 {瀹為檯鍔犳垚:0.##} 鐐规敾鍑诲姏銆" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(瀹為檯鍔犳垚):0.##} 鐐规敾鍑诲姏銆" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 瀹為檯鍔犳垚 = 0; diff --git a/OshimaModules/Effects/OpenEffects/ExATK2.cs b/OshimaModules/Effects/OpenEffects/ExATK2.cs index 25a6a08..08ad5b9 100644 --- a/OshimaModules/Effects/OpenEffects/ExATK2.cs +++ b/OshimaModules/Effects/OpenEffects/ExATK2.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.ExATK2; public override string Name => "鏀诲嚮鍔涘姞鎴"; - public override string Description => $"澧炲姞瑙掕壊 {鍔犳垚姣斾緥 * 100:0.##}% [ {瀹為檯鍔犳垚:0.##} ] 鐐规敾鍑诲姏銆" + (Source != null && Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(鍔犳垚姣斾緥) * 100:0.##}% [ {Math.Abs(瀹為檯鍔犳垚):0.##} ] 鐐规敾鍑诲姏銆" + (Source != null && Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 鍔犳垚姣斾緥 = 0; diff --git a/OshimaModules/Effects/OpenEffects/ExActionCoefficient.cs b/OshimaModules/Effects/OpenEffects/ExActionCoefficient.cs index ebeb4c8..766fdbc 100644 --- a/OshimaModules/Effects/OpenEffects/ExActionCoefficient.cs +++ b/OshimaModules/Effects/OpenEffects/ExActionCoefficient.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.ExActionCoefficient; public override string Name => "琛屽姩绯绘暟鍔犳垚"; - public override string Description => $"澧炲姞瑙掕壊 {瀹為檯鍔犳垚 * 100:0.##}% 琛屽姩绯绘暟銆" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(瀹為檯鍔犳垚) * 100:0.##}% 琛屽姩绯绘暟銆" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 瀹為檯鍔犳垚 = 0; diff --git a/OshimaModules/Effects/OpenEffects/ExCDR.cs b/OshimaModules/Effects/OpenEffects/ExCDR.cs index ddc9cab..0377e0d 100644 --- a/OshimaModules/Effects/OpenEffects/ExCDR.cs +++ b/OshimaModules/Effects/OpenEffects/ExCDR.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.ExCDR; public override string Name => "鍐峰嵈缂╁噺鍔犳垚"; - public override string Description => $"澧炲姞瑙掕壊 {瀹為檯鍔犳垚 * 100:0.##}% 鍐峰嵈缂╁噺銆" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(瀹為檯鍔犳垚) * 100:0.##}% 鍐峰嵈缂╁噺銆" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 瀹為檯鍔犳垚 = 0; diff --git a/OshimaModules/Effects/OpenEffects/ExCritDMG.cs b/OshimaModules/Effects/OpenEffects/ExCritDMG.cs index c1b8a4f..76ba7f2 100644 --- a/OshimaModules/Effects/OpenEffects/ExCritDMG.cs +++ b/OshimaModules/Effects/OpenEffects/ExCritDMG.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.ExCritDMG; public override string Name => "鏆村嚮浼ゅ鍔犳垚"; - public override string Description => $"澧炲姞瑙掕壊 {瀹為檯鍔犳垚 * 100:0.##}% 鏆村嚮浼ゅ銆" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(瀹為檯鍔犳垚) * 100:0.##}% 鏆村嚮浼ゅ銆" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 瀹為檯鍔犳垚 = 0; diff --git a/OshimaModules/Effects/OpenEffects/ExCritRate.cs b/OshimaModules/Effects/OpenEffects/ExCritRate.cs index 2521382..e539163 100644 --- a/OshimaModules/Effects/OpenEffects/ExCritRate.cs +++ b/OshimaModules/Effects/OpenEffects/ExCritRate.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.ExCritRate; public override string Name => "鏆村嚮鐜囧姞鎴"; - public override string Description => $"澧炲姞瑙掕壊 {瀹為檯鍔犳垚 * 100:0.##}% 鏆村嚮鐜囥" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(瀹為檯鍔犳垚) * 100:0.##}% 鏆村嚮鐜囥" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 瀹為檯鍔犳垚 = 0; diff --git a/OshimaModules/Effects/OpenEffects/ExDEF.cs b/OshimaModules/Effects/OpenEffects/ExDEF.cs index 3cfdf8a..6897c8f 100644 --- a/OshimaModules/Effects/OpenEffects/ExDEF.cs +++ b/OshimaModules/Effects/OpenEffects/ExDEF.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.ExDEF; public override string Name => "鐗╃悊鎶ょ敳鍔犳垚"; - public override string Description => $"澧炲姞瑙掕壊 {瀹為檯鍔犳垚:0.##} 鐐圭墿鐞嗘姢鐢层" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(瀹為檯鍔犳垚):0.##} 鐐圭墿鐞嗘姢鐢层" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 瀹為檯鍔犳垚 = 0; diff --git a/OshimaModules/Effects/OpenEffects/ExDEF2.cs b/OshimaModules/Effects/OpenEffects/ExDEF2.cs index 968ab5d..c9e21b1 100644 --- a/OshimaModules/Effects/OpenEffects/ExDEF2.cs +++ b/OshimaModules/Effects/OpenEffects/ExDEF2.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.ExDEF2; public override string Name => "鐗╃悊鎶ょ敳鍔犳垚"; - public override string Description => $"澧炲姞瑙掕壊 {鍔犳垚姣斾緥 * 100:0.##}% [ {瀹為檯鍔犳垚:0.##} ] 鐐圭墿鐞嗘姢鐢层" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(鍔犳垚姣斾緥) * 100:0.##}% [ {瀹為檯鍔犳垚:0.##} ] 鐐圭墿鐞嗘姢鐢层" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 鍔犳垚姣斾緥 = 0; diff --git a/OshimaModules/Effects/OpenEffects/ExEvadeRate.cs b/OshimaModules/Effects/OpenEffects/ExEvadeRate.cs index b9dce60..665a66a 100644 --- a/OshimaModules/Effects/OpenEffects/ExEvadeRate.cs +++ b/OshimaModules/Effects/OpenEffects/ExEvadeRate.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.ExEvadeRate; public override string Name => "闂伩鐜囧姞鎴"; - public override string Description => $"澧炲姞瑙掕壊 {瀹為檯鍔犳垚 * 100:0.##}% 闂伩鐜囥" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(瀹為檯鍔犳垚) * 100:0.##}% 闂伩鐜囥" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 瀹為檯鍔犳垚 = 0; diff --git a/OshimaModules/Effects/OpenEffects/ExHR.cs b/OshimaModules/Effects/OpenEffects/ExHR.cs index 2a63fbc..36546bd 100644 --- a/OshimaModules/Effects/OpenEffects/ExHR.cs +++ b/OshimaModules/Effects/OpenEffects/ExHR.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.ExHR; public override string Name => "鐢熷懡鍥炲鍔犳垚"; - public override string Description => $"澧炲姞瑙掕壊 {瀹為檯鍔犳垚:0.##} 鐐圭敓鍛藉洖澶嶃" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(瀹為檯鍔犳垚):0.##} 鐐圭敓鍛藉洖澶嶃" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 瀹為檯鍔犳垚 = 0; diff --git a/OshimaModules/Effects/OpenEffects/ExINT.cs b/OshimaModules/Effects/OpenEffects/ExINT.cs index 90d3182..34eda46 100644 --- a/OshimaModules/Effects/OpenEffects/ExINT.cs +++ b/OshimaModules/Effects/OpenEffects/ExINT.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.ExINT; public override string Name => "鏅哄姏鍔犳垚"; - public override string Description => $"澧炲姞瑙掕壊 {瀹為檯鍔犳垚:0.##} 鐐规櫤鍔涖" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(瀹為檯鍔犳垚):0.##} 鐐规櫤鍔涖" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 瀹為檯鍔犳垚 = 0; diff --git a/OshimaModules/Effects/OpenEffects/ExINT2.cs b/OshimaModules/Effects/OpenEffects/ExINT2.cs index cf2e86a..a7f8e34 100644 --- a/OshimaModules/Effects/OpenEffects/ExINT2.cs +++ b/OshimaModules/Effects/OpenEffects/ExINT2.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.ExINT2; public override string Name => "鏅哄姏鍔犳垚"; - public override string Description => $"澧炲姞瑙掕壊 {鍔犳垚姣斾緥 * 100:0.##}% [ {瀹為檯鍔犳垚:0.##} ] 鐐规櫤鍔涖" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(鍔犳垚姣斾緥) * 100:0.##}% [ {Math.Abs(瀹為檯鍔犳垚):0.##} ] 鐐规櫤鍔涖" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 鍔犳垚姣斾緥 = 0; diff --git a/OshimaModules/Effects/OpenEffects/ExMDF.cs b/OshimaModules/Effects/OpenEffects/ExMDF.cs index a3724ba..0c3a124 100644 --- a/OshimaModules/Effects/OpenEffects/ExMDF.cs +++ b/OshimaModules/Effects/OpenEffects/ExMDF.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.ExMDF; public override string Name => "榄旀硶鎶楁у姞鎴"; - public override string Description => $"澧炲姞瑙掕壊 {瀹為檯鍔犳垚 * 100:0.##}% {CharacterSet.GetMagicResistanceName(榄旀硶绫诲瀷)}銆" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(瀹為檯鍔犳垚) * 100:0.##}% {CharacterSet.GetMagicResistanceName(榄旀硶绫诲瀷)}銆" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 瀹為檯鍔犳垚 = 0; diff --git a/OshimaModules/Effects/OpenEffects/ExMR.cs b/OshimaModules/Effects/OpenEffects/ExMR.cs index a9a11fd..1bc8f8c 100644 --- a/OshimaModules/Effects/OpenEffects/ExMR.cs +++ b/OshimaModules/Effects/OpenEffects/ExMR.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.ExMR; public override string Name => "榄旀硶鍥炲鍔犳垚"; - public override string Description => $"澧炲姞瑙掕壊 {瀹為檯鍔犳垚:0.##} 鐐归瓟娉曞洖澶嶃" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(瀹為檯鍔犳垚):0.##} 鐐归瓟娉曞洖澶嶃" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 瀹為檯鍔犳垚 = 0; diff --git a/OshimaModules/Effects/OpenEffects/ExMaxHP.cs b/OshimaModules/Effects/OpenEffects/ExMaxHP.cs index a45f79f..a1763ba 100644 --- a/OshimaModules/Effects/OpenEffects/ExMaxHP.cs +++ b/OshimaModules/Effects/OpenEffects/ExMaxHP.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.ExMaxHP; public override string Name => "鏈澶х敓鍛藉煎姞鎴"; - public override string Description => $"澧炲姞瑙掕壊 {瀹為檯鍔犳垚:0.##} 鐐规渶澶х敓鍛藉笺" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(瀹為檯鍔犳垚):0.##} 鐐规渶澶х敓鍛藉笺" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 瀹為檯鍔犳垚 = 0; diff --git a/OshimaModules/Effects/OpenEffects/ExMaxHP2.cs b/OshimaModules/Effects/OpenEffects/ExMaxHP2.cs index c2bca87..608310d 100644 --- a/OshimaModules/Effects/OpenEffects/ExMaxHP2.cs +++ b/OshimaModules/Effects/OpenEffects/ExMaxHP2.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.ExMaxHP2; public override string Name => "鏈澶х敓鍛藉煎姞鎴"; - public override string Description => $"澧炲姞瑙掕壊 {鍔犳垚姣斾緥 * 100:0.##}% [ {瀹為檯鍔犳垚:0.##} ] 鐐规渶澶х敓鍛藉笺" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(鍔犳垚姣斾緥) * 100:0.##}% [ {Math.Abs(瀹為檯鍔犳垚):0.##} ] 鐐规渶澶х敓鍛藉笺" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 鍔犳垚姣斾緥 = 0; diff --git a/OshimaModules/Effects/OpenEffects/ExMaxMP.cs b/OshimaModules/Effects/OpenEffects/ExMaxMP.cs index 04a0945..66a5edb 100644 --- a/OshimaModules/Effects/OpenEffects/ExMaxMP.cs +++ b/OshimaModules/Effects/OpenEffects/ExMaxMP.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.ExMaxMP; public override string Name => "鏈澶ч瓟娉曞煎姞鎴"; - public override string Description => $"澧炲姞瑙掕壊 {瀹為檯鍔犳垚:0.##} 鐐规渶澶ч瓟娉曞笺" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(瀹為檯鍔犳垚):0.##} 鐐规渶澶ч瓟娉曞笺" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 瀹為檯鍔犳垚 = 0; diff --git a/OshimaModules/Effects/OpenEffects/ExMaxMP2.cs b/OshimaModules/Effects/OpenEffects/ExMaxMP2.cs index c4d78d9..66f509d 100644 --- a/OshimaModules/Effects/OpenEffects/ExMaxMP2.cs +++ b/OshimaModules/Effects/OpenEffects/ExMaxMP2.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.ExMaxMP2; public override string Name => "鏈澶ч瓟娉曞煎姞鎴"; - public override string Description => $"澧炲姞瑙掕壊 {鍔犳垚姣斾緥 * 100:0.##}% [ {瀹為檯鍔犳垚:0.##} ] 鐐规渶澶ч瓟娉曞笺" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(鍔犳垚姣斾緥) * 100:0.##}% [ {Math.Abs(瀹為檯鍔犳垚):0.##} ] 鐐规渶澶ч瓟娉曞笺" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 鍔犳垚姣斾緥 = 0; diff --git a/OshimaModules/Effects/OpenEffects/ExPDR.cs b/OshimaModules/Effects/OpenEffects/ExPDR.cs index fd51210..72a5fbb 100644 --- a/OshimaModules/Effects/OpenEffects/ExPDR.cs +++ b/OshimaModules/Effects/OpenEffects/ExPDR.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.ExPDR; public override string Name => "鐗╃悊浼ゅ鍑忓厤鍔犳垚"; - public override string Description => $"澧炲姞瑙掕壊 {瀹為檯鍔犳垚 * 100:0.##}% 鐗╃悊浼ゅ鍑忓厤銆" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(瀹為檯鍔犳垚) * 100:0.##}% 鐗╃悊浼ゅ鍑忓厤銆" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 瀹為檯鍔犳垚 = 0; diff --git a/OshimaModules/Effects/OpenEffects/ExSPD.cs b/OshimaModules/Effects/OpenEffects/ExSPD.cs index 9a9c7b6..4785668 100644 --- a/OshimaModules/Effects/OpenEffects/ExSPD.cs +++ b/OshimaModules/Effects/OpenEffects/ExSPD.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.ExSPD; public override string Name => "琛屽姩閫熷害鍔犳垚"; - public override string Description => $"澧炲姞瑙掕壊 {瀹為檯鍔犳垚:0.##} 鐐硅鍔ㄩ熷害銆" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(瀹為檯鍔犳垚):0.##} 鐐硅鍔ㄩ熷害銆" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 瀹為檯鍔犳垚 = 0; diff --git a/OshimaModules/Effects/OpenEffects/ExSTR.cs b/OshimaModules/Effects/OpenEffects/ExSTR.cs index ce92eb6..3eb2715 100644 --- a/OshimaModules/Effects/OpenEffects/ExSTR.cs +++ b/OshimaModules/Effects/OpenEffects/ExSTR.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.ExSTR; public override string Name => "鍔涢噺鍔犳垚"; - public override string Description => $"澧炲姞瑙掕壊 {瀹為檯鍔犳垚:0.##} 鐐瑰姏閲忋" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(瀹為檯鍔犳垚):0.##} 鐐瑰姏閲忋" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 瀹為檯鍔犳垚 = 0; diff --git a/OshimaModules/Effects/OpenEffects/ExSTR2.cs b/OshimaModules/Effects/OpenEffects/ExSTR2.cs index ef5dd92..f1e4433 100644 --- a/OshimaModules/Effects/OpenEffects/ExSTR2.cs +++ b/OshimaModules/Effects/OpenEffects/ExSTR2.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.ExSTR2; public override string Name => "鍔涢噺鍔犳垚"; - public override string Description => $"澧炲姞瑙掕壊 {鍔犳垚姣斾緥 * 100:0.##}% [ {瀹為檯鍔犳垚:0.##} ] 鐐瑰姏閲忋" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(鍔犳垚姣斾緥) * 100:0.##}% [ {Math.Abs(瀹為檯鍔犳垚):0.##} ] 鐐瑰姏閲忋" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 鍔犳垚姣斾緥 = 0; diff --git a/OshimaModules/Effects/OpenEffects/MagicalPenetration.cs b/OshimaModules/Effects/OpenEffects/MagicalPenetration.cs index f310bf3..77d99c7 100644 --- a/OshimaModules/Effects/OpenEffects/MagicalPenetration.cs +++ b/OshimaModules/Effects/OpenEffects/MagicalPenetration.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.MagicalPenetration; public override string Name => "榄旀硶绌块忓姞鎴"; - public override string Description => $"澧炲姞瑙掕壊 {瀹為檯鍔犳垚 * 100:0.##}% 榄旀硶绌块忋" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(瀹為檯鍔犳垚) * 100:0.##}% 榄旀硶绌块忋" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 瀹為檯鍔犳垚 = 0; diff --git a/OshimaModules/Effects/OpenEffects/NormalAttackHardTimeReduce.cs b/OshimaModules/Effects/OpenEffects/NormalAttackHardTimeReduce.cs index f213524..6a30fc7 100644 --- a/OshimaModules/Effects/OpenEffects/NormalAttackHardTimeReduce.cs +++ b/OshimaModules/Effects/OpenEffects/NormalAttackHardTimeReduce.cs @@ -29,7 +29,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects if (Values.Count > 0) { string key = Values.Keys.FirstOrDefault(s => s.Equals("nahtr", StringComparison.CurrentCultureIgnoreCase)) ?? ""; - if (key.Length > 0 && double.TryParse(Values[key].ToString(), out double nahtr)) + if (key.Length > 0 && double.TryParse(Values[key].ToString(), out double nahtr) && nahtr > 0) { 瀹為檯纭洿鏃堕棿鍑忓皯 = nahtr; } diff --git a/OshimaModules/Effects/OpenEffects/NormalAttackHardTimeReduce2.cs b/OshimaModules/Effects/OpenEffects/NormalAttackHardTimeReduce2.cs index c1481bb..265eaaa 100644 --- a/OshimaModules/Effects/OpenEffects/NormalAttackHardTimeReduce2.cs +++ b/OshimaModules/Effects/OpenEffects/NormalAttackHardTimeReduce2.cs @@ -29,7 +29,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects if (Values.Count > 0) { string key = Values.Keys.FirstOrDefault(s => s.Equals("nahtr", StringComparison.CurrentCultureIgnoreCase)) ?? ""; - if (key.Length > 0 && double.TryParse(Values[key].ToString(), out double nahtr)) + if (key.Length > 0 && double.TryParse(Values[key].ToString(), out double nahtr) && nahtr > 0) { 鍑忓皯姣斾緥 = nahtr; } diff --git a/OshimaModules/Effects/OpenEffects/PhysicalPenetration.cs b/OshimaModules/Effects/OpenEffects/PhysicalPenetration.cs index 5b22a3c..a6a4b2d 100644 --- a/OshimaModules/Effects/OpenEffects/PhysicalPenetration.cs +++ b/OshimaModules/Effects/OpenEffects/PhysicalPenetration.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects { public override long Id => (long)EffectID.PhysicalPenetration; public override string Name => "鐗╃悊绌块忓姞鎴"; - public override string Description => $"澧炲姞瑙掕壊 {瀹為檯鍔犳垚 * 100:0.##}% 鐗╃悊绌块忋" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); + public override string Description => $"{(瀹為檯鍔犳垚 >= 0 ? "澧炲姞" : "鍑忓皯")}瑙掕壊 {Math.Abs(瀹為檯鍔犳垚) * 100:0.##}% 鐗╃悊绌块忋" + (Source != null && Skill.Character != Source ? $"鏉ヨ嚜锛歔 {Source} ]" + (Skill.Item != null ? $" 鐨 [ {Skill.Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; private readonly double 瀹為檯鍔犳垚 = 0; diff --git a/OshimaModules/Effects/OpenEffects/SkillHardTimeReduce.cs b/OshimaModules/Effects/OpenEffects/SkillHardTimeReduce.cs index ab07136..b8b3928 100644 --- a/OshimaModules/Effects/OpenEffects/SkillHardTimeReduce.cs +++ b/OshimaModules/Effects/OpenEffects/SkillHardTimeReduce.cs @@ -45,7 +45,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects if (Values.Count > 0) { string key = Values.Keys.FirstOrDefault(s => s.Equals("shtr", StringComparison.CurrentCultureIgnoreCase)) ?? ""; - if (key.Length > 0 && double.TryParse(Values[key].ToString(), out double shtr)) + if (key.Length > 0 && double.TryParse(Values[key].ToString(), out double shtr) && shtr > 0) { 瀹為檯纭洿鏃堕棿鍑忓皯 = shtr; } diff --git a/OshimaModules/Effects/OpenEffects/SkillHardTimeReduce2.cs b/OshimaModules/Effects/OpenEffects/SkillHardTimeReduce2.cs index 62bd61c..2371d3b 100644 --- a/OshimaModules/Effects/OpenEffects/SkillHardTimeReduce2.cs +++ b/OshimaModules/Effects/OpenEffects/SkillHardTimeReduce2.cs @@ -45,7 +45,7 @@ namespace Oshima.FunGame.OshimaModules.Effects.OpenEffects if (Values.Count > 0) { string key = Values.Keys.FirstOrDefault(s => s.Equals("shtr", StringComparison.CurrentCultureIgnoreCase)) ?? ""; - if (key.Length > 0 && double.TryParse(Values[key].ToString(), out double shtr)) + if (key.Length > 0 && double.TryParse(Values[key].ToString(), out double shtr) && shtr > 0) { 鍑忓皯姣斾緥 = shtr; } diff --git a/OshimaModules/OshimaModules.csproj b/OshimaModules/OshimaModules.csproj index 7acd7e9..6273e18 100644 --- a/OshimaModules/OshimaModules.csproj +++ b/OshimaModules/OshimaModules.csproj @@ -27,5 +27,11 @@ ..\..\FunGame.Core\bin\Debug\net8.0\FunGame.Core.dll + + + + PreserveNewest + + diff --git a/configs/oshima-studios/oshima.fungame.items.json b/OshimaModules/configs/oshima-studios/oshima.fungame.items.json similarity index 97% rename from configs/oshima-studios/oshima.fungame.items.json rename to OshimaModules/configs/oshima-studios/oshima.fungame.items.json index 486bc4d..eb20782 100644 --- a/configs/oshima-studios/oshima.fungame.items.json +++ b/OshimaModules/configs/oshima-studios/oshima.fungame.items.json @@ -1282,5 +1282,39 @@ } ] } + }, + "璺汉鍝ョ殑cos鏈": { + "Id": 14513, + "Name": "璺汉鍝ョ殑cos鏈", + "Description": "澧炲姞 10% 鏀诲嚮鍔涳紝澧炲姞 15% 榄旀硶鎶楁э紝浣嗘槸浼氬噺灏 8% 鐗╃悊浼ゅ鍑忓厤銆", + "BackgroundStory": "涓濂楃绉樼殑鏈嶉グ锛屾嵁璇寸┛涓婂悗浼氬紩鍙戞湭鐭ョ殑鍔涢噺鍙樺寲銆", + "ItemType": 4, + "WeaponType": 0, + "QualityType": 3, + "Skills": { + "Active": null, + "Passives": [ + { + "Id": 7313, + "Name": "璺汉鍝ョ殑cos鏈", + "SkillType": 3, + "Effects": [ + { + "Id": 8023, + "exatk": 0.1 + }, + { + "Id": 8020, + "mdftype": 0, + "mdfvalue": 0.15 + }, + { + "Id": 8019, + "expdr": -0.08 + } + ] + } + ] + } } } \ No newline at end of file