diff --git a/OshimaCore/Configs/OSMCore.cs b/OshimaCore/Configs/OSMCore.cs index aa1edef..5def975 100644 --- a/OshimaCore/Configs/OSMCore.cs +++ b/OshimaCore/Configs/OSMCore.cs @@ -6,7 +6,7 @@ namespace Oshima.Core.Configs public class OSMCore { public const string version = "v1.0"; - public const string version2 = "Beta4"; + public const string version2 = "Beta5"; public static string Info => $"OSM Core {version} {version2}\r\nAuthor: Milimoe\r\nBuilt on {GetBuiltTime(Assembly.GetExecutingAssembly().Location)}\r\nSee: https://github.com/milimoe"; diff --git a/OshimaCore/Controllers/FunGameController.cs b/OshimaCore/Controllers/FunGameController.cs index 7f1e444..e78a6fe 100644 --- a/OshimaCore/Controllers/FunGameController.cs +++ b/OshimaCore/Controllers/FunGameController.cs @@ -3,7 +3,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using Milimoe.FunGame.Core.Api.Utility; using Milimoe.FunGame.Core.Entity; -using Oshima.Core.Configs; using Oshima.Core.Models; using Oshima.Core.Utils; diff --git a/OshimaCore/Controllers/QQController.cs b/OshimaCore/Controllers/QQController.cs index a1e0d2b..33a058c 100644 --- a/OshimaCore/Controllers/QQController.cs +++ b/OshimaCore/Controllers/QQController.cs @@ -13,11 +13,11 @@ namespace Oshima.Core.Controllers private readonly ILogger _logger = logger; [HttpPost("bind")] - public string Post([FromBody] BindQQ b) + public string Bind([FromBody] BindQQ b) { - if (QQOpenID.QQAndOpenID.Values.Any(qq => qq == b.QQ)) + if (b.Openid.Trim() == "" || b.QQ <= 0) { - return NetworkUtility.JsonSerialize($"此QQ已被其他人绑定，如果你是此QQ的主人，请联系客服处理。"); + return NetworkUtility.JsonSerialize("请输入正确的OpenID和QQ！"); } if (QQOpenID.QQAndOpenID.TryGetValue(b.Openid, out long bindqq) && bindqq != 0) @@ -25,6 +25,11 @@ namespace Oshima.Core.Controllers return NetworkUtility.JsonSerialize($"你已经绑定过：{bindqq}，如绑定错误请联系客服处理。"); } + if (QQOpenID.QQAndOpenID.Values.Any(qq => qq == b.QQ && b.Openid != b.Openid)) + { + return NetworkUtility.JsonSerialize($"此QQ {b.QQ} 已被其他人绑定，如果你是此QQ的主人，请联系客服处理。"); + } + if (QQOpenID.QQAndOpenID.TryAdd(b.Openid, b.QQ)) { QQOpenID.SaveConfig(); @@ -34,7 +39,18 @@ namespace Oshima.Core.Controllers return NetworkUtility.JsonSerialize($"绑定失败，请稍后再试！如持续绑定失败请联系客服处理。"); } - return NetworkUtility.JsonSerialize("绑定成功！"); + return NetworkUtility.JsonSerialize("绑定成功！如果需要解除绑定，请发送【解绑+QQ号】（如：解绑123456789）！"); + } + + [HttpPost("unbind")] + public string Unbind([FromBody] BindQQ b) + { + if (QQOpenID.QQAndOpenID.TryGetValue(b.Openid, out long bindqq) && bindqq == b.QQ && QQOpenID.QQAndOpenID.Remove(b.Openid)) + { + return NetworkUtility.JsonSerialize($"解绑成功！"); + } + + return NetworkUtility.JsonSerialize("解绑失败！没有查到绑定的信息或者此账号已被其他人绑定，如果你是此QQ的主人，请联系客服处理。"); } } } diff --git a/OshimaCore/Controllers/UserDailyController.cs b/OshimaCore/Controllers/UserDailyController.cs index 5c8088e..02f97b9 100644 --- a/OshimaCore/Controllers/UserDailyController.cs +++ b/OshimaCore/Controllers/UserDailyController.cs @@ -24,7 +24,7 @@ namespace Oshima.Core.Controllers { return UserDailyUtil.ViewUserDaily(user_id); } - + [HttpPost("open/{open_id}", Name = "GetOpenUserDaily")] public UserDaily Open(string open_id) { diff --git a/OshimaCore/Utils/FunGameUtil.cs b/OshimaCore/Utils/FunGameUtil.cs index c73b1be..97d1550 100644 --- a/OshimaCore/Utils/FunGameUtil.cs +++ b/OshimaCore/Utils/FunGameUtil.cs @@ -320,7 +320,7 @@ namespace Oshima.Core.Utils Dictionary 浠栦滑鐨勮閲忕櫨鍒嗘瘮 = []; foreach (Character c in characters) { - 浠栦滑鐨勮閲忕櫨鍒嗘瘮.TryAdd(c, Calculation.Round4Digits(c.HP / c.MaxHP)); + 浠栦滑鐨勮閲忕櫨鍒嗘瘮.TryAdd(c, c.HP / c.MaxHP); } double max = 浠栦滑鐨勮閲忕櫨鍒嗘瘮.Values.Max(); Character winner = 浠栦滑鐨勮閲忕櫨鍒嗘瘮.Keys.Where(c => 浠栦滑鐨勮閲忕櫨鍒嗘瘮[c] == max).First(); @@ -378,7 +378,7 @@ namespace Oshima.Core.Utils if (PrintOut) { Console.WriteLine("--- End ---"); - Console.WriteLine("鎬绘父鎴忔椂闀匡細" + Calculation.Round2Digits(totalTime)); + Console.WriteLine($"鎬绘父鎴忔椂闀匡細{totalTime:0.##}"); Console.WriteLine(""); } diff --git a/OshimaModules/Controllers/Controller.cs b/OshimaModules/Controllers/Controller.cs deleted file mode 100644 index e904f28..0000000 --- a/OshimaModules/Controllers/Controller.cs +++ /dev/null @@ -1,7 +0,0 @@ -锘縩amespace Oshima.FunGame.OshimaModules.Controllers -{ - public class Controller - { - - } -} diff --git a/OshimaModules/ItemEffects/鎶鑳界‖鐩存椂闂村噺灏.cs b/OshimaModules/ItemEffects/鎶鑳界‖鐩存椂闂村噺灏.cs index ffd88b7..7a58a45 100644 --- a/OshimaModules/ItemEffects/鎶鑳界‖鐩存椂闂村噺灏.cs +++ b/OshimaModules/ItemEffects/鎶鑳界‖鐩存椂闂村噺灏.cs @@ -1,5 +1,4 @@ -锘縰sing Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Entity; +锘縰sing Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.ItemEffects @@ -8,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.ItemEffects { public override long Id => Skill.Id; public override string Name => Skill.Name; - public override string Description => $"鍑忓皯瑙掕壊鐨勬墍鏈変富鍔ㄦ妧鑳 {瀹為檯纭洿鏃堕棿鍑忓皯} 纭洿鏃堕棿銆" + (!TargetSelf ? $"鏉ヨ嚜锛歔 {Source} ]" + (Item != null ? $" 鐨 [ {Item.Name} ]" : "") : ""); + public override string Description => $"鍑忓皯瑙掕壊鐨勬墍鏈変富鍔ㄦ妧鑳 {瀹為檯纭洿鏃堕棿鍑忓皯:0.##} 纭洿鏃堕棿銆" + (!TargetSelf ? $"鏉ヨ嚜锛歔 {Source} ]" + (Item != null ? $" 鐨 [ {Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; public override bool TargetSelf => true; @@ -19,12 +18,12 @@ namespace Oshima.FunGame.OshimaModules.ItemEffects { foreach (Skill s in character.Skills) { - s.HardnessTime = Calculation.Round2Digits(s.HardnessTime - 瀹為檯纭洿鏃堕棿鍑忓皯); + s.HardnessTime -= 瀹為檯纭洿鏃堕棿鍑忓皯; } foreach (Skill? s in character.Items.Select(i => i.Skills.Active)) { if (s != null) - s.HardnessTime = Calculation.Round2Digits(s.HardnessTime - 瀹為檯纭洿鏃堕棿鍑忓皯); + s.HardnessTime -= 瀹為檯纭洿鏃堕棿鍑忓皯; } } @@ -32,12 +31,12 @@ namespace Oshima.FunGame.OshimaModules.ItemEffects { foreach (Skill s in character.Skills) { - s.HardnessTime = Calculation.Round2Digits(s.HardnessTime + 瀹為檯纭洿鏃堕棿鍑忓皯); + s.HardnessTime += 瀹為檯纭洿鏃堕棿鍑忓皯; } foreach (Skill? s in character.Items.Select(i => i.Skills.Active)) { if (s != null) - s.HardnessTime = Calculation.Round2Digits(s.HardnessTime + 瀹為檯纭洿鏃堕棿鍑忓皯); + s.HardnessTime += 瀹為檯纭洿鏃堕棿鍑忓皯; } } diff --git a/OshimaModules/ItemEffects/鏀诲嚮鍔涘姞鎴.cs b/OshimaModules/ItemEffects/鏀诲嚮鍔涘姞鎴.cs index ae0a690..25a9323 100644 --- a/OshimaModules/ItemEffects/鏀诲嚮鍔涘姞鎴.cs +++ b/OshimaModules/ItemEffects/鏀诲嚮鍔涘姞鎴.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.ItemEffects { public override long Id => Skill.Id; public override string Name => Skill.Name; - public override string Description => $"澧炲姞瑙掕壊 {瀹為檯鏀诲嚮鍔涘姞鎴恾 鐐规敾鍑诲姏銆" + (!TargetSelf ? $"鏉ヨ嚜锛歔 {Source} ]" + (Item != null ? $" 鐨 [ {Item.Name} ]" : "") : ""); + public override string Description => $"澧炲姞瑙掕壊 {瀹為檯鏀诲嚮鍔涘姞鎴:0.##} 鐐规敾鍑诲姏銆" + (!TargetSelf ? $"鏉ヨ嚜锛歔 {Source} ]" + (Item != null ? $" 鐨 [ {Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; public override bool TargetSelf => true; diff --git a/OshimaModules/ItemEffects/鏅敾纭洿鏃堕棿鍑忓皯.cs b/OshimaModules/ItemEffects/鏅敾纭洿鏃堕棿鍑忓皯.cs index 0e86e3c..ae327b4 100644 --- a/OshimaModules/ItemEffects/鏅敾纭洿鏃堕棿鍑忓皯.cs +++ b/OshimaModules/ItemEffects/鏅敾纭洿鏃堕棿鍑忓皯.cs @@ -1,5 +1,4 @@ -锘縰sing Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Entity; +锘縰sing Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.ItemEffects @@ -8,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.ItemEffects { public override long Id => Skill.Id; public override string Name => Skill.Name; - public override string Description => $"鍑忓皯瑙掕壊鐨勬櫘閫氭敾鍑 {瀹為檯纭洿鏃堕棿鍑忓皯} 纭洿鏃堕棿銆" + (!TargetSelf ? $"鏉ヨ嚜锛歔 {Source} ]" + (Item != null ? $" 鐨 [ {Item.Name} ]" : "") : ""); + public override string Description => $"鍑忓皯瑙掕壊鐨勬櫘閫氭敾鍑 {瀹為檯纭洿鏃堕棿鍑忓皯:0.##} 纭洿鏃堕棿銆" + (!TargetSelf ? $"鏉ヨ嚜锛歔 {Source} ]" + (Item != null ? $" 鐨 [ {Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; public override bool TargetSelf => true; @@ -17,12 +16,12 @@ namespace Oshima.FunGame.OshimaModules.ItemEffects public override void OnEffectGained(Character character) { - character.NormalAttack.HardnessTime = Calculation.Round2Digits(character.NormalAttack.HardnessTime - 瀹為檯纭洿鏃堕棿鍑忓皯); ; + character.NormalAttack.HardnessTime -= 瀹為檯纭洿鏃堕棿鍑忓皯; } public override void OnEffectLost(Character character) { - character.NormalAttack.HardnessTime = Calculation.Round2Digits(character.NormalAttack.HardnessTime + 瀹為檯纭洿鏃堕棿鍑忓皯); ; + character.NormalAttack.HardnessTime += 瀹為檯纭洿鏃堕棿鍑忓皯; } public 鏅敾纭洿鏃堕棿鍑忓皯(Skill skill, Character? source, Item? item, double reduce) : base(skill) diff --git a/OshimaModules/ItemEffects/鐗╃悊鎶ょ敳鍔犳垚.cs b/OshimaModules/ItemEffects/鐗╃悊鎶ょ敳鍔犳垚.cs index 8cf5ffd..41009b2 100644 --- a/OshimaModules/ItemEffects/鐗╃悊鎶ょ敳鍔犳垚.cs +++ b/OshimaModules/ItemEffects/鐗╃悊鎶ょ敳鍔犳垚.cs @@ -7,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.ItemEffects { public override long Id => Skill.Id; public override string Name => Skill.Name; - public override string Description => $"澧炲姞瑙掕壊 {瀹為檯鐗╃悊鎶ょ敳鍔犳垚} 鐐圭墿鐞嗘姢鐢层" + (!TargetSelf ? $"鏉ヨ嚜锛歔 {Source} ]" + (Item != null ? $" 鐨 [ {Item.Name} ]" : "") : ""); + public override string Description => $"澧炲姞瑙掕壊 {瀹為檯鐗╃悊鎶ょ敳鍔犳垚:0.##} 鐐圭墿鐞嗘姢鐢层" + (!TargetSelf ? $"鏉ヨ嚜锛歔 {Source} ]" + (Item != null ? $" 鐨 [ {Item.Name} ]" : "") : ""); public override EffectType EffectType => EffectType.Item; public override bool TargetSelf => true; diff --git a/OshimaModules/Items/Weapon/鐙寮.cs b/OshimaModules/Items/Weapon/鐙寮.cs index f628e1c..3581561 100644 --- a/OshimaModules/Items/Weapon/鐙寮.cs +++ b/OshimaModules/Items/Weapon/鐙寮.cs @@ -22,7 +22,7 @@ namespace Oshima.FunGame.OshimaModules.Items { public override long Id => 5999; public override string Name => "鐙寮"; - public override string Description => $"澧炲姞瑙掕壊 {鏀诲嚮鍔涘姞鎴恾 鐐规敾鍑诲姏锛屽噺灏戞櫘閫氭敾鍑 {纭洿鏃堕棿鍑忓皯} 纭洿鏃堕棿銆"; + public override string Description => $"澧炲姞瑙掕壊 {鏀诲嚮鍔涘姞鎴:0.##} 鐐规敾鍑诲姏锛屽噺灏戞櫘閫氭敾鍑 {纭洿鏃堕棿鍑忓皯:0.##} 纭洿鏃堕棿銆"; private readonly double 鏀诲嚮鍔涘姞鎴 = 80; private readonly double 纭洿鏃堕棿鍑忓皯 = 2; diff --git a/OshimaModules/Skills/ColdBlue/鍡滆鏈兘.cs b/OshimaModules/Skills/ColdBlue/鍡滆鏈兘.cs index 8430930..57b7d37 100644 --- a/OshimaModules/Skills/ColdBlue/鍡滆鏈兘.cs +++ b/OshimaModules/Skills/ColdBlue/鍡滆鏈兘.cs @@ -1,5 +1,4 @@ -锘縰sing Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Entity; +锘縰sing Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects; @@ -30,7 +29,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override double Duration => 30; public HashSet 瑙掕壊鏈夌鍥涘眰 { get; } = []; - private double 鍚歌 => Calculation.Round4Digits(0.03 * Level); + private double 鍚歌 => 0.03 * Level; public override void AfterDamageCalculation(Character character, Character enemy, double damage, bool isNormalAttack, bool isMagicDamage, MagicType magicType, DamageResult damageResult) { @@ -45,9 +44,9 @@ namespace Oshima.FunGame.OshimaModules.Skills { 灞傛暟 = 4; } - double 瀹為檯鍚歌 = Calculation.Round2Digits(鍚歌 * 灞傛暟 * damage); + double 瀹為檯鍚歌 = 鍚歌 * 灞傛暟 * damage; character.HP += 瀹為檯鍚歌; - WriteLine($"[ {character} ] 鍥炲浜 {瀹為檯鍚歌} 鐐圭敓鍛藉硷紒"); + WriteLine($"[ {character} ] 鍥炲浜 {瀹為檯鍚歌:0.##} 鐐圭敓鍛藉硷紒"); } } diff --git a/OshimaModules/Skills/ColdBlue/绱Н涔嬪帇.cs b/OshimaModules/Skills/ColdBlue/绱Н涔嬪帇.cs index fd27601..23d5c08 100644 --- a/OshimaModules/Skills/ColdBlue/绱Н涔嬪帇.cs +++ b/OshimaModules/Skills/ColdBlue/绱Н涔嬪帇.cs @@ -1,5 +1,4 @@ -锘縰sing Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Entity; +锘縰sing Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects; @@ -57,7 +56,7 @@ namespace Oshima.FunGame.OshimaModules.Skills { // 绉婚櫎鏍囪 enemy.Effects.Remove(e); - double 棰濆浼ゅ = Calculation.Round2Digits(enemy.MaxHP * 绯绘暟); + double 棰濆浼ゅ = enemy.MaxHP * 绯绘暟; WriteLine($"[ {character} ] 鍙戝姩浜嗙疮绉箣鍘嬶紒灏嗗 [ {enemy} ] 閫犳垚鐪╂檿鍜岄澶栦激瀹筹紒"); // 鐪╂檿 IEnumerable effects3 = enemy.Effects.Where(e => e is 鐪╂檿 && e.Skill == Skill); diff --git a/OshimaModules/Skills/MagicalGirl/姣佺伃涔嬪娍.cs b/OshimaModules/Skills/MagicalGirl/姣佺伃涔嬪娍.cs index bd306df..db9c2f4 100644 --- a/OshimaModules/Skills/MagicalGirl/姣佺伃涔嬪娍.cs +++ b/OshimaModules/Skills/MagicalGirl/姣佺伃涔嬪娍.cs @@ -1,5 +1,4 @@ -锘縰sing Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Entity; +锘縰sing Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills @@ -42,9 +41,9 @@ namespace Oshima.FunGame.OshimaModules.Skills if (character == Skill.Character) { - double 瀹為檯浼ゅ鎻愬崌 = Calculation.Round2Digits(damage * 绱浼ゅ); - damage = Calculation.Round2Digits(damage + 瀹為檯浼ゅ鎻愬崌); - if (瀹為檯浼ゅ鎻愬崌 > 0) WriteLine($"[ {character} ] 鐨勪激瀹虫彁鍗囦簡 {瀹為檯浼ゅ鎻愬崌} 鐐癸紒"); + double 瀹為檯浼ゅ鎻愬崌 = damage * 绱浼ゅ; + damage += 瀹為檯浼ゅ鎻愬崌; + if (瀹為檯浼ゅ鎻愬崌 > 0) WriteLine($"[ {character} ] 鐨勪激瀹虫彁鍗囦簡 {瀹為檯浼ゅ鎻愬崌:0.##} 鐐癸紒"); } } return false; @@ -52,7 +51,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override void OnTimeElapsed(Character character, double eapsed) { - 绱浼ゅ = Calculation.Round4Digits(绱浼ゅ + 浼ゅ鎻愬崌 * eapsed); + 绱浼ゅ += 浼ゅ鎻愬崌 * eapsed; WriteLine($"[ {character} ] 鐨 [ {Name} ] 鏁堟灉澧炲姞浜嗭紝褰撳墠鎬绘彁鍗囷細{绱浼ゅ * 100:0.##}%銆"); } } diff --git a/OshimaModules/Skills/MagicalGirl/缁濆棰嗗煙.cs b/OshimaModules/Skills/MagicalGirl/缁濆棰嗗煙.cs index 4803f36..f14423e 100644 --- a/OshimaModules/Skills/MagicalGirl/缁濆棰嗗煙.cs +++ b/OshimaModules/Skills/MagicalGirl/缁濆棰嗗煙.cs @@ -1,5 +1,4 @@ -锘縰sing Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Entity; +锘縰sing Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills @@ -23,13 +22,13 @@ namespace Oshima.FunGame.OshimaModules.Skills { public override long Id => Skill.Id; public override string Name => Skill.Name; - public override string Description => $"{Duration} 鏃堕棿鍐呮棤娉曞彈鍒颁换浣曚激瀹筹紝涓旀晱鎹锋彁鍗 {绯绘暟 * 100:0.##}% [ {鏁忔嵎鎻愬崌} ]銆傛鎶鑳戒細娑堣楄嚦灏 100 鐐硅兘閲忋"; + public override string Description => $"{Duration:0.##} 鏃堕棿鍐呮棤娉曞彈鍒颁换浣曚激瀹筹紝涓旀晱鎹锋彁鍗 {绯绘暟 * 100:0.##}% [ {鏁忔嵎鎻愬崌:0.##} ]銆傛鎶鑳戒細娑堣楄嚦灏 100 鐐硅兘閲忋"; public override bool TargetSelf => true; public override bool Durative => true; - public override double Duration => Calculation.Round2Digits(16 + 閲婃斁鏃剁殑鑳介噺鍊 * 0.03); + public override double Duration => 16 + 閲婃斁鏃剁殑鑳介噺鍊 * 0.03; - private double 绯绘暟 => Calculation.Round4Digits(0.3 + 0.03 * (Level - 1)); - private double 鏁忔嵎鎻愬崌 => Calculation.Round2Digits(绯绘暟 * Skill.Character?.BaseAGI ?? 0); + private double 绯绘暟 => 0.3 + 0.03 * (Level - 1); + private double 鏁忔嵎鎻愬崌 => 绯绘暟 * Skill.Character?.BaseAGI ?? 0; private double 瀹為檯鏁忔嵎鎻愬崌 = 0; private double 閲婃斁鏃剁殑鑳介噺鍊 = 0; @@ -37,7 +36,7 @@ namespace Oshima.FunGame.OshimaModules.Skills { 瀹為檯鏁忔嵎鎻愬崌 = 鏁忔嵎鎻愬崌; character.ExAGI += 瀹為檯鏁忔嵎鎻愬崌; - WriteLine($"[ {character} ] 鐨勬晱鎹锋彁鍗囦簡 {绯绘暟 * 100:0.##}% [ {瀹為檯鏁忔嵎鎻愬崌} ] 锛"); + WriteLine($"[ {character} ] 鐨勬晱鎹锋彁鍗囦簡 {绯绘暟 * 100:0.##}% [ {瀹為檯鏁忔嵎鎻愬崌:0.##} ] 锛"); } public override void OnEffectLost(Character character) diff --git a/OshimaModules/Skills/Mayor/绮惧噯鎵撳嚮.cs b/OshimaModules/Skills/Mayor/绮惧噯鎵撳嚮.cs index ec086af..76cd52b 100644 --- a/OshimaModules/Skills/Mayor/绮惧噯鎵撳嚮.cs +++ b/OshimaModules/Skills/Mayor/绮惧噯鎵撳嚮.cs @@ -1,5 +1,4 @@ -锘縰sing Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Entity; +锘縰sing Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills @@ -28,8 +27,8 @@ namespace Oshima.FunGame.OshimaModules.Skills public override bool Durative => true; public override double Duration => 30; - private double 鏆村嚮鐜囨彁鍗 => Calculation.Round4Digits(0.2 + 0.03 * (Level - 1)); - private double 鏆村嚮浼ゅ鎻愬崌 => Calculation.Round4Digits(0.8 + 0.04 * (Level - 1)); + private double 鏆村嚮鐜囨彁鍗 => 0.2 + 0.03 * (Level - 1); + private double 鏆村嚮浼ゅ鎻愬崌 => 0.8 + 0.04 * (Level - 1); private double 瀹為檯鏆村嚮鐜囨彁鍗 = 0; private double 瀹為檯鏆村嚮浼ゅ鎻愬崌 = 0; diff --git a/OshimaModules/Skills/NanGanyu/鐏佃兘鍙嶅皠.cs b/OshimaModules/Skills/NanGanyu/鐏佃兘鍙嶅皠.cs index e6f2e38..eecb192 100644 --- a/OshimaModules/Skills/NanGanyu/鐏佃兘鍙嶅皠.cs +++ b/OshimaModules/Skills/NanGanyu/鐏佃兘鍙嶅皠.cs @@ -1,5 +1,4 @@ -锘縰sing Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Entity; +锘縰sing Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills @@ -25,19 +24,13 @@ namespace Oshima.FunGame.OshimaModules.Skills { public override long Id => Skill.Id; public override string Name => Skill.Name; - public override string Description => $"姣忛噴鏀 {瑙﹀彂纭洿娆℃暟} 娆￠瓟娉曟墠浼氳Е鍙戠‖鐩存椂闂达紝涓旈瓟娉曞懡涓椂鍩轰簬 25% 鏅哄姏 [ {鑾峰緱棰濆鑳介噺鍊紏 ] 鑾峰緱棰濆鑳介噺鍊笺"; + public override string Description => $"姣忛噴鏀 {瑙﹀彂纭洿娆℃暟:0.##} 娆￠瓟娉曟墠浼氳Е鍙戠‖鐩存椂闂达紝涓旈瓟娉曞懡涓椂鍩轰簬 25% 鏅哄姏 [ {鑾峰緱棰濆鑳介噺鍊:0.##} ] 鑾峰緱棰濆鑳介噺鍊笺"; public override bool TargetSelf => true; public bool 鏄惁鏀寔鏅敾 { get; set; } = false; public int 瑙﹀彂纭洿娆℃暟 { get; set; } = 2; public int 閲婃斁娆℃暟 { get; set; } = 0; - public double 鑾峰緱棰濆鑳介噺鍊 - { - get - { - return Calculation.Round2Digits(0.25 * Skill.Character?.INT ?? 0); - } - } + public double 鑾峰緱棰濆鑳介噺鍊 => 0.25 * Skill.Character?.INT ?? 0; public override void AfterDamageCalculation(Character character, Character enemy, double damage, bool isNormalAttack, bool isMagicDamage, MagicType magicType, DamageResult damageResult) { @@ -45,13 +38,13 @@ namespace Oshima.FunGame.OshimaModules.Skills { double 瀹為檯鑾峰緱鑳介噺鍊 = 鑾峰緱棰濆鑳介噺鍊; character.EP += 瀹為檯鑾峰緱鑳介噺鍊; - WriteLine("[ " + character + " ] 鍙戝姩浜嗙伒鑳藉弽灏勶紒棰濆鑾峰緱浜 " + 瀹為檯鑾峰緱鑳介噺鍊 + " 鑳介噺锛"); + WriteLine($"[ {character} ] 鍙戝姩浜嗙伒鑳藉弽灏勶紒棰濆鑾峰緱浜 {瀹為檯鑾峰緱鑳介噺鍊:0.##} 鑳介噺锛"); IEnumerable effects = character.Effects.Where(e => e is 涓夐噸鍙犲姞鐗规晥); if (effects.Any() && effects.First() is 涓夐噸鍙犲姞鐗规晥 e) { - double 鑾峰緱鐨勯瓟娉曞 = Calculation.Round2Digits(瀹為檯鑾峰緱鑳介噺鍊 * 10); + double 鑾峰緱鐨勯瓟娉曞 = 瀹為檯鑾峰緱鑳介噺鍊 * 10; character.MP += 鑾峰緱鐨勯瓟娉曞; - WriteLine("[ " + character + " ] 鍙戝姩浜嗕笁閲嶅彔鍔狅紒鍥炲浜 " + 鑾峰緱鐨勯瓟娉曞 + " 榄旀硶鍊硷紒"); + WriteLine($"[ {character} ] 鍙戝姩浜嗕笁閲嶅彔鍔狅紒鍥炲浜 {鑾峰緱鐨勯瓟娉曞:0.##} 榄旀硶鍊硷紒"); } } } diff --git a/OshimaModules/Skills/NiuNan/鍙樺够涔嬪績.cs b/OshimaModules/Skills/NiuNan/鍙樺够涔嬪績.cs index 90ad765..eaed6c6 100644 --- a/OshimaModules/Skills/NiuNan/鍙樺够涔嬪績.cs +++ b/OshimaModules/Skills/NiuNan/鍙樺够涔嬪績.cs @@ -1,5 +1,4 @@ -锘縰sing Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Entity; +锘縰sing Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills @@ -26,8 +25,8 @@ namespace Oshima.FunGame.OshimaModules.Skills public override string Description => $"妫鏌 [ 鏅烘収涓庡姏閲 ] 鐨勬ā寮忋傚湪鍔涢噺妯″紡涓嬶紝绔嬪嵆鍥炲 {鐢熷懡鍊煎洖澶 * 100:0.##}% 鐢熷懡鍊硷紱鏅哄姏妯″紡涓嬶紝涓嬩竴娆￠瓟娉曚激瀹虫彁鍗 {浼ゅ鎻愬崌 * 100:0.##}%銆"; public override bool TargetSelf => true; - private double 鐢熷懡鍊煎洖澶 => Calculation.Round4Digits(0.25 + 0.03 * (Level - 1)); - private double 浼ゅ鎻愬崌 => Calculation.Round4Digits(0.55 + 0.25 * (Level - 1)); + private double 鐢熷懡鍊煎洖澶 => 0.25 + 0.03 * (Level - 1); + private double 浼ゅ鎻愬崌 => 0.55 + 0.25 * (Level - 1); public override void OnEffectGained(Character character) { @@ -44,9 +43,9 @@ namespace Oshima.FunGame.OshimaModules.Skills if (character == Skill.Character && isMagicDamage) { double 瀹為檯浼ゅ鎻愬崌鐧惧垎姣 = 浼ゅ鎻愬崌; - double 瀹為檯浼ゅ鎻愬崌 = Calculation.Round2Digits(damage * 瀹為檯浼ゅ鎻愬崌鐧惧垎姣); - damage = Calculation.Round2Digits(damage + 瀹為檯浼ゅ鎻愬崌); - WriteLine("[ " + character + " ] 鍙戝姩浜嗗彉骞讳箣蹇冿紒浼ゅ鎻愬崌浜 " + 瀹為檯浼ゅ鎻愬崌 + " 鐐癸紒"); + double 瀹為檯浼ゅ鎻愬崌 = damage * 瀹為檯浼ゅ鎻愬崌鐧惧垎姣; + damage += 瀹為檯浼ゅ鎻愬崌; + WriteLine($"[ {character} ] 鍙戝姩浜嗗彉骞讳箣蹇冿紒浼ゅ鎻愬崌浜 {瀹為檯浼ゅ鎻愬崌:0.##} 鐐癸紒"); character.Effects.Remove(this); OnEffectLost(character); } @@ -59,9 +58,9 @@ namespace Oshima.FunGame.OshimaModules.Skills { if (caster.PrimaryAttribute == PrimaryAttribute.STR) { - double 鍥炲鐨勭敓鍛 = Calculation.Round2Digits(鐢熷懡鍊煎洖澶 * caster.MaxHP); + double 鍥炲鐨勭敓鍛 = 鐢熷懡鍊煎洖澶 * caster.MaxHP; caster.HP += 鍥炲鐨勭敓鍛; - WriteLine("[ " + caster + " ] 鍥炲浜 " + 鍥炲鐨勭敓鍛 + " 鐐圭敓鍛藉硷紒"); + WriteLine($"[ {caster} ] 鍥炲浜 {鍥炲鐨勭敓鍛:0.##} 鐐圭敓鍛藉硷紒"); } else if (caster.PrimaryAttribute == PrimaryAttribute.INT) { diff --git a/OshimaModules/Skills/Oshima/META椹.cs b/OshimaModules/Skills/Oshima/META椹.cs index 5b9f80f..4674c3c 100644 --- a/OshimaModules/Skills/Oshima/META椹.cs +++ b/OshimaModules/Skills/Oshima/META椹.cs @@ -1,5 +1,4 @@ -锘縰sing Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Entity; +锘縰sing Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills @@ -25,14 +24,14 @@ namespace Oshima.FunGame.OshimaModules.Skills { public override long Id => Skill.Id; public override string Name => Skill.Name; - public override string Description => $"META椹笓灞炶鍔細鍔涢噺+5锛屽姏閲忔垚闀+0.5锛涘湪鍙楀埌浼ゅ鏃讹紝鑾峰緱鐨勮兘閲忔彁鍗50%锛屾瘡鍥炲悎寮濮嬭繕鑳借幏寰楅澶栫殑 [ {EP} ] 鑳介噺鍊笺"; + public override string Description => $"META椹笓灞炶鍔細鍔涢噺+5锛屽姏閲忔垚闀+0.5锛涘湪鍙楀埌浼ゅ鏃讹紝鑾峰緱鐨勮兘閲忔彁鍗50%锛屾瘡鍥炲悎寮濮嬭繕鑳借幏寰楅澶栫殑 [ {EP:0.##} ] 鑳介噺鍊笺"; public override bool TargetSelf => true; public static double EP => 10; public override void AlterEPAfterGetDamage(Character character, ref double baseEP) { - baseEP = Calculation.Round2Digits(baseEP * 1.5); - if (Skill.Character != null) WriteLine("[ " + Skill.Character + " ] 鍙戝姩浜哅ETA椹笓灞炶鍔紒鏈鑾峰緱浜 " + baseEP + " 鑳介噺锛"); + baseEP *= 1.5; + if (Skill.Character != null) WriteLine($"[ {Skill.Character} ] 鍙戝姩浜哅ETA椹笓灞炶鍔紒鏈鑾峰緱浜 {baseEP:0.##} 鑳介噺锛"); } public override void OnTurnStart(Character character) @@ -40,7 +39,7 @@ namespace Oshima.FunGame.OshimaModules.Skills if (character.EP < 200) { character.EP += EP; - WriteLine("[ " + character + " ] 鍙戝姩浜哅ETA椹笓灞炶鍔紒鏈鑾峰緱浜 " + EP + " 鑳介噺锛"); + WriteLine($"[ {character} ] 鍙戝姩浜哅ETA椹笓灞炶鍔紒鏈鑾峰緱浜 {EP:0.##} 鑳介噺锛"); } } } diff --git a/OshimaModules/Skills/Oshima/鍔涢噺鐖嗗彂.cs b/OshimaModules/Skills/Oshima/鍔涢噺鐖嗗彂.cs index ce03047..278bde0 100644 --- a/OshimaModules/Skills/Oshima/鍔涢噺鐖嗗彂.cs +++ b/OshimaModules/Skills/Oshima/鍔涢噺鐖嗗彂.cs @@ -1,5 +1,4 @@ -锘縰sing Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Entity; +锘縰sing Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills @@ -23,20 +22,20 @@ namespace Oshima.FunGame.OshimaModules.Skills { public override long Id => Skill.Id; public override string Name => "鍔涢噺鐖嗗彂"; - public override string Description => $"鑾峰緱 150% 鍔涢噺 [ {鏀诲嚮鍔涘姞鎴恾 ] 鐨勬敾鍑诲姏鍔犳垚锛屼絾姣忔鏀诲嚮閮戒細鎹熷け 9% 褰撳墠鐢熷懡鍊 [ {褰撳墠鐢熷懡鍊紏 ]锛屾寔缁 {Duration} 鏃堕棿銆"; + public override string Description => $"鑾峰緱 150% 鍔涢噺 [ {鏀诲嚮鍔涘姞鎴:0.##} ] 鐨勬敾鍑诲姏鍔犳垚锛屼絾姣忔鏀诲嚮閮戒細鎹熷け 9% 褰撳墠鐢熷懡鍊 [ {褰撳墠鐢熷懡鍊:0.##} ]锛屾寔缁 {Duration:0.##} 鏃堕棿銆"; public override bool TargetSelf => true; public override bool Durative => true; public override double Duration => 10 + 1 * (Level - 1); - private double 鏀诲嚮鍔涘姞鎴 => Calculation.Round2Digits(Skill.Character?.STR * 1.5 ?? 0); - private double 褰撳墠鐢熷懡鍊 => Calculation.Round2Digits(Skill.Character?.HP * 0.09 ?? 0); + private double 鏀诲嚮鍔涘姞鎴 => Skill.Character?.STR * 1.5 ?? 0; + private double 褰撳墠鐢熷懡鍊 => Skill.Character?.HP * 0.09 ?? 0; private double 瀹為檯鏀诲嚮鍔涘姞鎴 = 0; public override void OnEffectGained(Character character) { 瀹為檯鏀诲嚮鍔涘姞鎴 = 鏀诲嚮鍔涘姞鎴; character.ExATK2 += 瀹為檯鏀诲嚮鍔涘姞鎴; - WriteLine($"[ {character} ] 鐨勬敾鍑诲姏澧炲姞浜 [ {瀹為檯鏀诲嚮鍔涘姞鎴恾 ] 锛"); + WriteLine($"[ {character} ] 鐨勬敾鍑诲姏澧炲姞浜 [ {瀹為檯鏀诲嚮鍔涘姞鎴:0.##} ] 锛"); } public override void OnEffectLost(Character character) @@ -51,7 +50,7 @@ namespace Oshima.FunGame.OshimaModules.Skills { double 鐢熷懡鍊煎噺灏 = 褰撳墠鐢熷懡鍊; character.HP -= 鐢熷懡鍊煎噺灏; - WriteLine($"[ {character} ] 鐢变簬鑷韩鍔涢噺杩囦簬寮哄ぇ鑰岃鍙嶅櫖锛屾崯澶变簡 [ {鐢熷懡鍊煎噺灏憓 ] 鐐圭敓鍛藉硷紒"); + WriteLine($"[ {character} ] 鐢变簬鑷韩鍔涢噺杩囦簬寮哄ぇ鑰岃鍙嶅櫖锛屾崯澶变簡 [ {鐢熷懡鍊煎噺灏:0.##} ] 鐐圭敓鍛藉硷紒"); } } diff --git a/OshimaModules/Skills/QWQAQW/鐜荤拑澶х偖.cs b/OshimaModules/Skills/QWQAQW/鐜荤拑澶х偖.cs index 7ad5875..c855ad6 100644 --- a/OshimaModules/Skills/QWQAQW/鐜荤拑澶х偖.cs +++ b/OshimaModules/Skills/QWQAQW/鐜荤拑澶х偖.cs @@ -1,5 +1,4 @@ -锘縰sing Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Entity; +锘縰sing Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills @@ -26,7 +25,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override long Id => Skill.Id; public override string Name => Skill.Name; public override string Description => $"鐢熷懡鍊奸珮浜 30% 鏃讹紝鍙楀埌棰濆鐨 [ {楂樹簬30棰濆浼ゅ涓嬮檺}~{楂樹簬30棰濆浼ゅ涓婇檺}% ] 浼ゅ锛屼絾鏄幏寰 [ 绱鎵鍙椾激瀹崇殑 {楂樹簬30鐨勫姞鎴愪笅闄恾~{楂樹簬30鐨勫姞鎴愪笂闄恾% ] 浼ゅ鍔犳垚锛涚敓鍛藉间綆浜庣瓑浜 30% 鏃讹紝涓嶄細鍙楀埌棰濆鐨勪激瀹筹紝浠呰兘鑾峰緱 [ 绱鍙楀埌鐨勪激瀹 {浣庝簬30鐨勫姞鎴愪笅闄恾~{浣庝簬30鐨勫姞鎴愪笂闄恾% ] 浼ゅ鍔犳垚銆" + - $"鍦ㄦ病鏈夊彈鍒颁换浣曚激瀹崇殑鏃跺欙紝灏嗚幏寰 {甯歌浼ゅ鍔犳垚 * 100:0.##}% 浼ゅ鍔犳垚銆" + (绱鍙楀埌鐨勪激瀹 > 0 ? $"锛堝綋鍓嶇疮璁″彈鍒颁激瀹筹細{绱鍙楀埌鐨勪激瀹硙锛" : ""); + $"鍦ㄦ病鏈夊彈鍒颁换浣曚激瀹崇殑鏃跺欙紝灏嗚幏寰 {甯歌浼ゅ鍔犳垚 * 100:0.##}% 浼ゅ鍔犳垚銆" + (绱鍙楀埌鐨勪激瀹 > 0 ? $"锛堝綋鍓嶇疮璁″彈鍒颁激瀹筹細{绱鍙楀埌鐨勪激瀹:0.##}锛" : ""); public override bool TargetSelf => true; private double 绱鍙楀埌鐨勪激瀹 = 0; @@ -34,8 +33,8 @@ namespace Oshima.FunGame.OshimaModules.Skills private double 鍙楀埌浼ゅ涔嬪墠鐨凥P = 0; private double 杩欐鍙楀埌鐨勯澶栦激瀹 = 0; private readonly double 甯歌浼ゅ鍔犳垚 = 0.35; - private readonly int 楂樹簬30棰濆浼ゅ涓婇檺 = 40; - private readonly int 楂樹簬30棰濆浼ゅ涓嬮檺 = 20; + private readonly int 楂樹簬30棰濆浼ゅ涓婇檺 = 30; + private readonly int 楂樹簬30棰濆浼ゅ涓嬮檺 = 15; private readonly int 楂樹簬30鐨勫姞鎴愪笂闄 = 100; private readonly int 楂樹簬30鐨勫姞鎴愪笅闄 = 80; private readonly int 浣庝簬30鐨勫姞鎴愪笂闄 = 60; @@ -49,15 +48,15 @@ namespace Oshima.FunGame.OshimaModules.Skills { if (character.HP > character.MaxHP * 0.3) { - 绯绘暟 = Calculation.Round4Digits(1.0 + ((new Random().Next(楂樹簬30鐨勫姞鎴愪笅闄, 楂樹簬30鐨勫姞鎴愪笂闄) + 0.0) / 100)); + 绯绘暟 = 1.0 + ((Random.Shared.Next(楂樹簬30鐨勫姞鎴愪笅闄, 楂樹簬30鐨勫姞鎴愪笂闄) + 0.0) / 100); } else { - 绯绘暟 = Calculation.Round4Digits(1.0 + ((new Random().Next(浣庝簬30鐨勫姞鎴愪笅闄, 浣庝簬30鐨勫姞鎴愪笂闄) + 0.0) / 100)); + 绯绘暟 = 1.0 + ((Random.Shared.Next(浣庝簬30鐨勫姞鎴愪笅闄, 浣庝簬30鐨勫姞鎴愪笂闄) + 0.0) / 100); } - return Calculation.Round2Digits(绯绘暟 * 绱鍙楀埌鐨勪激瀹); + return 绯绘暟 * 绱鍙楀埌鐨勪激瀹; } - return Calculation.Round2Digits(绯绘暟 * damage); + return 绯绘暟 * damage; } public override void AlterExpectedDamageBeforeCalculation(Character character, Character enemy, ref double damage, bool isNormalAttack, bool isMagicDamage, MagicType magicType) @@ -65,8 +64,8 @@ namespace Oshima.FunGame.OshimaModules.Skills if (character == Skill.Character) { 杩欐鐨勪激瀹冲姞鎴 = 浼ゅ鍔犳垚(damage); - damage = Calculation.Round2Digits(damage + 杩欐鐨勪激瀹冲姞鎴); - WriteLine($"[ {character} ] 鍙戝姩浜嗙幓鐠冨ぇ鐐紝鑾峰緱浜 {杩欐鐨勪激瀹冲姞鎴恾 鐐逛激瀹冲姞鎴愶紒"); + damage += 杩欐鐨勪激瀹冲姞鎴; + WriteLine($"[ {character} ] 鍙戝姩浜嗙幓鐠冨ぇ鐐紝鑾峰緱浜 {杩欐鐨勪激瀹冲姞鎴:0.##} 鐐逛激瀹冲姞鎴愶紒"); 绱鍙楀埌鐨勪激瀹 = 0; } @@ -76,10 +75,10 @@ namespace Oshima.FunGame.OshimaModules.Skills if (enemy.HP > enemy.MaxHP * 0.3) { // 棰濆鍙楀埌浼ゅ - double 绯绘暟 = Calculation.Round4Digits((new Random().Next(楂樹簬30棰濆浼ゅ涓嬮檺, 楂樹簬30棰濆浼ゅ涓婇檺) + 0.0) / 100); - 杩欐鍙楀埌鐨勯澶栦激瀹 = Calculation.Round2Digits(damage * 绯绘暟); - damage = Calculation.Round2Digits(damage + 杩欐鍙楀埌鐨勯澶栦激瀹); - WriteLine($"[ {enemy} ] 鐨勭幓鐠冨ぇ鐐Е鍙戯紝灏嗛澶栧彈鍒 {杩欐鍙楀埌鐨勯澶栦激瀹硙 鐐逛激瀹筹紒"); + double 绯绘暟 = (Random.Shared.Next(楂樹簬30棰濆浼ゅ涓嬮檺, 楂樹簬30棰濆浼ゅ涓婇檺) + 0.0) / 100; + 杩欐鍙楀埌鐨勯澶栦激瀹 = damage * 绯绘暟; + damage += 杩欐鍙楀埌鐨勯澶栦激瀹; + WriteLine($"[ {enemy} ] 鐨勭幓鐠冨ぇ鐐Е鍙戯紝灏嗛澶栧彈鍒 {杩欐鍙楀埌鐨勯澶栦激瀹:0.##} 鐐逛激瀹筹紒"); } else 杩欐鍙楀埌鐨勯澶栦激瀹 = 0; } @@ -89,7 +88,7 @@ namespace Oshima.FunGame.OshimaModules.Skills { if (enemy == Skill.Character && damageResult != DamageResult.Evaded) { - 绱鍙楀埌鐨勪激瀹 = Calculation.Round2Digits(绱鍙楀埌鐨勪激瀹 + damage); + 绱鍙楀埌鐨勪激瀹 += damage; if (enemy.HP < 0 && 鍙楀埌浼ゅ涔嬪墠鐨凥P - damage + 杩欐鍙楀埌鐨勯澶栦激瀹 > 0) { enemy.HP = 10; diff --git a/OshimaModules/Skills/QWQAQW/杩呮嵎涔嬪娍.cs b/OshimaModules/Skills/QWQAQW/杩呮嵎涔嬪娍.cs index 19f4544..df63d83 100644 --- a/OshimaModules/Skills/QWQAQW/杩呮嵎涔嬪娍.cs +++ b/OshimaModules/Skills/QWQAQW/杩呮嵎涔嬪娍.cs @@ -1,5 +1,4 @@ -锘縰sing Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Entity; +锘縰sing Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills @@ -23,13 +22,13 @@ namespace Oshima.FunGame.OshimaModules.Skills { public override long Id => Skill.Id; public override string Name => Skill.Name; - public override string Description => $"{Duration} 鏃堕棿鍐咃紝鏅氭敾鍑昏浆涓洪瓟娉曚激瀹筹紝涓旂‖鐩存椂闂村噺灏50%锛屽苟鍩轰簬 {鏅哄姏绯绘暟 * 100:0.##}% 鏅哄姏 [{鏅哄姏鍔犳垚}] 寮哄寲鏅氭敾鍑讳激瀹炽"; + public override string Description => $"{Duration:0.##} 鏃堕棿鍐咃紝鏅氭敾鍑昏浆涓洪瓟娉曚激瀹筹紝涓旂‖鐩存椂闂村噺灏50%锛屽苟鍩轰簬 {鏅哄姏绯绘暟 * 100:0.##}% 鏅哄姏 [ {鏅哄姏鍔犳垚:0.##} ] 寮哄寲鏅氭敾鍑讳激瀹炽"; public override bool TargetSelf => true; public override bool Durative => true; public override double Duration => 40; - private double 鏅哄姏绯绘暟 => Calculation.Round4Digits(1.4 + 0.4 * (Level - 1)); - private double 鏅哄姏鍔犳垚 => Calculation.Round2Digits(鏅哄姏绯绘暟 * Skill.Character?.INT ?? 0); + private double 鏅哄姏绯绘暟 => 1.4 + 0.4 * (Level - 1); + private double 鏅哄姏鍔犳垚 => 鏅哄姏绯绘暟 * Skill.Character?.INT ?? 0; public override void OnEffectGained(Character character) { @@ -45,13 +44,13 @@ namespace Oshima.FunGame.OshimaModules.Skills { if (character == Skill.Character && isNormalAttack) { - damage = Calculation.Round2Digits(damage + 鏅哄姏鍔犳垚); + damage += 鏅哄姏鍔犳垚; } } public override void AlterHardnessTimeAfterNormalAttack(Character character, ref double baseHardnessTime, ref bool isCheckProtected) { - baseHardnessTime = Calculation.Round2Digits(baseHardnessTime * 0.5); + baseHardnessTime *= 0.5; } public override void OnSkillCasted(Character caster, List enemys, List teammates, Dictionary others) diff --git a/OshimaModules/Skills/QingXiang/鏋鎵撳嚮.cs b/OshimaModules/Skills/QingXiang/鏋鎵撳嚮.cs index 708a7aa..00c316b 100644 --- a/OshimaModules/Skills/QingXiang/鏋鎵撳嚮.cs +++ b/OshimaModules/Skills/QingXiang/鏋鎵撳嚮.cs @@ -1,5 +1,4 @@ -锘縰sing Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Entity; +锘縰sing Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills @@ -35,13 +34,13 @@ namespace Oshima.FunGame.OshimaModules.Skills if (character == Skill.Character && damageResult != DamageResult.Evaded && !鏄惁鏄祵濂椾激瀹) { // 鍑忓皯鑳介噺 - double EP = new Random().Next(10, 25); + double EP = Random.Shared.Next(10, 25); enemy.EP -= EP; - WriteLine($"[ {character} ] 鍙戝姩浜嗘灟绔墦鍑伙紒[ {enemy} ] 鐨勮兘閲忓艰鍑忓皯浜 {EP} 鐐癸紒鐜版湁鑳介噺锛歿enemy.EP}銆"); + WriteLine($"[ {character} ] 鍙戝姩浜嗘灟绔墦鍑伙紒[ {enemy} ] 鐨勮兘閲忓艰鍑忓皯浜 {EP:0.##} 鐐癸紒鐜版湁鑳介噺锛歿enemy.EP:0.##}銆"); // 棰濆浼ゅ if (enemy.EP >= 0 && enemy.EP < 50 || enemy.EP >= 100 && enemy.EP < 150) { - double 棰濆浼ゅ = Calculation.Round2Digits(damage * 0.3); + double 棰濆浼ゅ = damage * 0.3; WriteLine($"[ {character} ] 鍙戝姩浜嗘灟绔墦鍑伙紒灏嗛犳垚棰濆浼ゅ锛"); 鏄惁鏄祵濂椾激瀹 = true; DamageToEnemy(character, enemy, isMagicDamage, magicType, 棰濆浼ゅ); diff --git a/OshimaModules/Skills/QingXiang/鑳介噺姣佺伃.cs b/OshimaModules/Skills/QingXiang/鑳介噺姣佺伃.cs index bf026f5..832b047 100644 --- a/OshimaModules/Skills/QingXiang/鑳介噺姣佺伃.cs +++ b/OshimaModules/Skills/QingXiang/鑳介噺姣佺伃.cs @@ -1,5 +1,4 @@ -锘縰sing Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Entity; +锘縰sing Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills @@ -24,13 +23,13 @@ namespace Oshima.FunGame.OshimaModules.Skills public override long Id => Skill.Id; public override string Name => Skill.Name; public override string Description => $"瀵规墍鏈夎鑹查犳垚 " + - $"{鑳介噺绯绘暟 * 100:0.##}% 鍏剁幇鏈夎兘閲忓 + {鏅哄姏绯绘暟 * 100:0.##}% 鏅哄姏 [ {鏅哄姏浼ゅ} ] 鐨勯瓟娉曚激瀹炽"; + $"{鑳介噺绯绘暟 * 100:0.##}% 鍏剁幇鏈夎兘閲忓 + {鏅哄姏绯绘暟 * 100:0.##}% 鏅哄姏 [ {鏅哄姏浼ゅ:0.##} ] 鐨勯瓟娉曚激瀹炽"; public override bool TargetSelf => false; public override double TargetRange => 999; - private double 鏅哄姏绯绘暟 => Calculation.Round4Digits(0.55 * Level); - private double 鏅哄姏浼ゅ => Calculation.Round2Digits(鏅哄姏绯绘暟 * Skill.Character?.INT ?? 0); - private double 鑳介噺绯绘暟 => Calculation.Round4Digits(0.75 * Level); + private double 鏅哄姏绯绘暟 => 0.55 * Level; + private double 鏅哄姏浼ゅ => 鏅哄姏绯绘暟 * Skill.Character?.INT ?? 0; + private double 鑳介噺绯绘暟 => 0.75 * Level; public override void OnSkillCasted(Character caster, List enemys, List teammates, Dictionary others) { @@ -38,7 +37,7 @@ namespace Oshima.FunGame.OshimaModules.Skills { WriteLine($"[ {caster} ] 姝ｅ湪姣佺伃 [ {c} ] 鐨勮兘閲忥紒锛"); double ep = c.EP; - DamageToEnemy(caster, c, true, MagicType, Calculation.Round2Digits(ep * 鑳介噺绯绘暟 + 鏅哄姏浼ゅ)); + DamageToEnemy(caster, c, true, MagicType, ep * 鑳介噺绯绘暟 + 鏅哄姏浼ゅ); } } } diff --git a/OshimaModules/Skills/QuDuoduo/寮辫呯寧鎵.cs b/OshimaModules/Skills/QuDuoduo/寮辫呯寧鎵.cs index 12585cc..a98bcd7 100644 --- a/OshimaModules/Skills/QuDuoduo/寮辫呯寧鎵.cs +++ b/OshimaModules/Skills/QuDuoduo/寮辫呯寧鎵.cs @@ -1,5 +1,4 @@ -锘縰sing Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Entity; +锘縰sing Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills @@ -32,14 +31,14 @@ namespace Oshima.FunGame.OshimaModules.Skills { if (character == Skill.Character && (enemy.HP / enemy.MaxHP) <= (character.HP / character.MaxHP)) { - double 棰濆浼ゅ = Calculation.Round2Digits(damage * 0.5); - damage = Calculation.Round2Digits(damage + 棰濆浼ゅ); + double 棰濆浼ゅ = damage * 0.5; + damage += 棰濆浼ゅ; } } public override bool AlterEnemyListBeforeAction(Character character, List enemys, List teammates, List skills, Dictionary continuousKilling, Dictionary earnedMoney) { - IEnumerable list = [.. enemys.OrderBy(e => Calculation.Round4Digits(e.HP / e.MaxHP))]; + IEnumerable list = [.. enemys.OrderBy(e => e.HP / e.MaxHP)]; if (list.Any()) { enemys.Clear(); diff --git a/OshimaModules/Skills/QuDuoduo/琛涔嬬媯娆.cs b/OshimaModules/Skills/QuDuoduo/琛涔嬬媯娆.cs index 4543b92..a9eca39 100644 --- a/OshimaModules/Skills/QuDuoduo/琛涔嬬媯娆.cs +++ b/OshimaModules/Skills/QuDuoduo/琛涔嬬媯娆.cs @@ -1,5 +1,4 @@ -锘縰sing Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Entity; +锘縰sing Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills @@ -23,7 +22,7 @@ namespace Oshima.FunGame.OshimaModules.Skills { public override long Id => Skill.Id; public override string Name => Skill.Name; - public override string Description => $"鑾峰緱 40% 鍚歌锛屾寔缁 {Duration} 鏃堕棿銆"; + public override string Description => $"鑾峰緱 40% 鍚歌锛屾寔缁 {Duration:0.##} 鏃堕棿銆"; public override bool TargetSelf => true; public override bool Durative => true; public override double Duration => 30; @@ -32,9 +31,9 @@ namespace Oshima.FunGame.OshimaModules.Skills { if (character == Skill.Character && damageResult != DamageResult.Evaded && character.HP < character.MaxHP) { - double 瀹為檯鍚歌 = Calculation.Round2Digits(0.4 * damage); + double 瀹為檯鍚歌 = 0.4 * damage; character.HP += 瀹為檯鍚歌; - WriteLine($"[ {character} ] 鍥炲浜 {瀹為檯鍚歌} 鐐圭敓鍛藉硷紒"); + WriteLine($"[ {character} ] 鍥炲浜 {瀹為檯鍚歌:0.##} 鐐圭敓鍛藉硷紒"); } } diff --git a/OshimaModules/Skills/XinYin/澶╄祼涔嬪姏.cs b/OshimaModules/Skills/XinYin/澶╄祼涔嬪姏.cs index bcb59b3..f753c87 100644 --- a/OshimaModules/Skills/XinYin/澶╄祼涔嬪姏.cs +++ b/OshimaModules/Skills/XinYin/澶╄祼涔嬪姏.cs @@ -1,5 +1,4 @@ -锘縰sing Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Entity; +锘縰sing Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills @@ -23,15 +22,15 @@ namespace Oshima.FunGame.OshimaModules.Skills { public override long Id => Skill.Id; public override string Name => Skill.Name; - public override string Description => $"{Duration} 鏃堕棿鍐咃紝澧炲姞 40% 鏀诲嚮鍔 [ {鏀诲嚮鍔涙彁鍗噠 ]銆30% 鐗╃悊绌块忓拰 25% 闂伩鐜囷紙涓嶅彲鍙犲姞锛夛紝鏅氭敾鍑荤‖鐩存椂闂撮澶栧噺灏 20%锛屽熀浜 {绯绘暟 * 100:0.##}% 鏁忔嵎 [ {浼ゅ鍔犳垚} ] 寮哄寲鏅氭敾鍑荤殑浼ゅ銆傚湪鎸佺画鏃堕棿鍐咃紝銆愬績鐏典箣鐏戠殑鍐峰嵈鏃堕棿闄嶄綆鑷 3 鏃堕棿銆"; + public override string Description => $"{Duration:0.##} 鏃堕棿鍐咃紝澧炲姞 40% 鏀诲嚮鍔 [ {鏀诲嚮鍔涙彁鍗:0.##} ]銆30% 鐗╃悊绌块忓拰 25% 闂伩鐜囷紙涓嶅彲鍙犲姞锛夛紝鏅氭敾鍑荤‖鐩存椂闂撮澶栧噺灏 20%锛屽熀浜 {绯绘暟 * 100:0.##}% 鏁忔嵎 [ {浼ゅ鍔犳垚:0.##} ] 寮哄寲鏅氭敾鍑荤殑浼ゅ銆傚湪鎸佺画鏃堕棿鍐咃紝銆愬績鐏典箣鐏戠殑鍐峰嵈鏃堕棿闄嶄綆鑷 3 鏃堕棿銆"; public override bool TargetSelf => false; public override int TargetCount => 1; public override bool Durative => true; public override double Duration => 40; - private double 绯绘暟 => Calculation.Round4Digits(1.2 * (1 + 0.6 * (Skill.Level - 1))); - private double 浼ゅ鍔犳垚 => Calculation.Round2Digits(绯绘暟 * Skill.Character?.AGI ?? 0); - private double 鏀诲嚮鍔涙彁鍗 => Calculation.Round2Digits(0.4 * Skill.Character?.BaseATK ?? 0); + private double 绯绘暟 => 1.2 * (1 + 0.6 * (Skill.Level - 1)); + private double 浼ゅ鍔犳垚 => 绯绘暟 * Skill.Character?.AGI ?? 0; + private double 鏀诲嚮鍔涙彁鍗 => 0.4 * Skill.Character?.BaseATK ?? 0; private double 瀹為檯鐨勬敾鍑诲姏鎻愬崌 = 0; public override void OnEffectGained(Character character) @@ -68,13 +67,13 @@ namespace Oshima.FunGame.OshimaModules.Skills { if (character == Skill.Character && isNormalAttack) { - damage = Calculation.Round2Digits(damage + 浼ゅ鍔犳垚); + damage += 浼ゅ鍔犳垚; } } public override void AlterHardnessTimeAfterNormalAttack(Character character, ref double baseHardnessTime, ref bool isCheckProtected) { - baseHardnessTime = Calculation.Round2Digits(baseHardnessTime * 0.8); + baseHardnessTime *= 0.8; } public override void OnSkillCasted(Character caster, List enemys, List teammates, Dictionary others) diff --git a/OshimaModules/Skills/XinYin/蹇冪伒涔嬬伀.cs b/OshimaModules/Skills/XinYin/蹇冪伒涔嬬伀.cs index 4701d4e..830a925 100644 --- a/OshimaModules/Skills/XinYin/蹇冪伒涔嬬伀.cs +++ b/OshimaModules/Skills/XinYin/蹇冪伒涔嬬伀.cs @@ -1,5 +1,4 @@ -锘縰sing Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Entity; +锘縰sing Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills @@ -53,7 +52,7 @@ namespace Oshima.FunGame.OshimaModules.Skills { if (鍐峰嵈鏃堕棿 > 0) { - 鍐峰嵈鏃堕棿 = Calculation.Round2Digits(鍐峰嵈鏃堕棿 - elapsed); + 鍐峰嵈鏃堕棿 -= elapsed; if (鍐峰嵈鏃堕棿 <= 0) { 鍐峰嵈鏃堕棿 = 0; @@ -63,7 +62,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override void AlterHardnessTimeAfterNormalAttack(Character character, ref double baseHardnessTime, ref bool isCheckProtected) { - baseHardnessTime = Calculation.Round2Digits(baseHardnessTime * 0.8); + baseHardnessTime *= 0.8; } } } diff --git a/OshimaModules/Skills/Yang/榄旀硶娑屾祦.cs b/OshimaModules/Skills/Yang/榄旀硶娑屾祦.cs index e63fbe9..ccdcb63 100644 --- a/OshimaModules/Skills/Yang/榄旀硶娑屾祦.cs +++ b/OshimaModules/Skills/Yang/榄旀硶娑屾祦.cs @@ -1,5 +1,4 @@ -锘縰sing Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Entity; +锘縰sing Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills @@ -23,12 +22,12 @@ namespace Oshima.FunGame.OshimaModules.Skills { public override long Id => Skill.Id; public override string Name => "榄旀硶娑屾祦"; - public override string Description => $"{Duration} 鏃堕棿鍐咃紝澧炲姞鎵鏈変激瀹崇殑 {鍑忎激姣斾緥 * 100:0.##}% 浼ゅ鍑忓厤锛屽苟灏嗘櫘閫氭敾鍑昏浆涓洪瓟娉曚激瀹筹紝鍙彔鍔犻瓟娉曢渿鑽＄殑鏁堟灉銆"; + public override string Description => $"{Duration:0.##} 鏃堕棿鍐咃紝澧炲姞鎵鏈変激瀹崇殑 {鍑忎激姣斾緥 * 100:0.##}% 浼ゅ鍑忓厤锛屽苟灏嗘櫘閫氭敾鍑昏浆涓洪瓟娉曚激瀹筹紝鍙彔鍔犻瓟娉曢渿鑽＄殑鏁堟灉銆"; public override bool TargetSelf => true; public override bool Durative => true; public override double Duration => 25; - private double 鍑忎激姣斾緥 => Calculation.Round2Digits(0.1 + 0.02 * (Level - 1)); + private double 鍑忎激姣斾緥 => 0.1 + 0.02 * (Level - 1); private double 瀹為檯姣斾緥 = 0; public override void OnEffectGained(Character character) @@ -46,7 +45,7 @@ namespace Oshima.FunGame.OshimaModules.Skills { if (enemy == Skill.Character) { - damage = Calculation.Round2Digits(damage * (1 - 瀹為檯姣斾緥)); + damage *= 1 - 瀹為檯姣斾緥; } return false; } diff --git a/OshimaModules/Skills/dddovo/骞宠　寮哄寲.cs b/OshimaModules/Skills/dddovo/骞宠　寮哄寲.cs index 928c309..286871a 100644 --- a/OshimaModules/Skills/dddovo/骞宠　寮哄寲.cs +++ b/OshimaModules/Skills/dddovo/骞宠　寮哄寲.cs @@ -22,7 +22,7 @@ namespace Oshima.FunGame.OshimaModules.Skills { public override long Id => Skill.Id; public override string Name => Skill.Name; - public override string Description => $"鏁忔嵎鎻愰珮 20%锛岀劧鍚庡皢鐩墠鐨勫姏閲忚ˉ鍏呭埌涓庢晱鎹锋寔骞筹紝鎸佺画 {Duration} 鏃堕棿銆"; + public override string Description => $"鏁忔嵎鎻愰珮 20%锛岀劧鍚庡皢鐩墠鐨勫姏閲忚ˉ鍏呭埌涓庢晱鎹锋寔骞筹紝鎸佺画 {Duration:0.##} 鏃堕棿銆"; public override bool TargetSelf => true; public override bool Durative => true; public override double Duration => 30; diff --git a/OshimaModules/Skills/dddovo/鏁忔嵎涔嬪垉.cs b/OshimaModules/Skills/dddovo/鏁忔嵎涔嬪垉.cs index e492cb5..3379b7a 100644 --- a/OshimaModules/Skills/dddovo/鏁忔嵎涔嬪垉.cs +++ b/OshimaModules/Skills/dddovo/鏁忔嵎涔嬪垉.cs @@ -1,5 +1,4 @@ -锘縰sing Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Entity; +锘縰sing Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills @@ -28,7 +27,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override string Description => $"姣忔鏅氭敾鍑婚兘灏嗛檮甯﹀熀浜 {鏁忔嵎绯绘暟 * 100:0.##}% 鏁忔嵎 [ {鏁忔嵎浼ゅ} ] 鐨勯瓟娉曚激瀹炽"; public override bool TargetSelf => true; - private double 鏁忔嵎浼ゅ => Calculation.Round2Digits(鏁忔嵎绯绘暟 * Skill.Character?.AGI ?? 0); + private double 鏁忔嵎浼ゅ => 鏁忔嵎绯绘暟 * Skill.Character?.AGI ?? 0; private readonly double 鏁忔嵎绯绘暟 = 2.5; private bool 鏄惁鏄祵濂椾激瀹 = false; diff --git a/OshimaModules/Skills/鎴樻妧/鐤鹃姝.cs b/OshimaModules/Skills/鎴樻妧/鐤鹃姝.cs index cd7b7bd..361091a 100644 --- a/OshimaModules/Skills/鎴樻妧/鐤鹃姝.cs +++ b/OshimaModules/Skills/鎴樻妧/鐤鹃姝.cs @@ -1,5 +1,4 @@ -锘縰sing Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Entity; +锘縰sing Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills @@ -23,13 +22,13 @@ namespace Oshima.FunGame.OshimaModules.Skills { public override long Id => Skill.Id; public override string Name => Skill.Name; - public override string Description => $"杩涘叆涓嶅彲閫変腑鐘舵侊紝鑾峰緱 100 琛屽姩閫熷害锛屾彁楂 8% 鏆村嚮鐜囷紝鎸佺画 {Duration} 鏃堕棿銆傜牬闅愪竴鍑伙細鍦ㄦ寔缁椂闂村唴锛岄娆￠犳垚浼ゅ浼氶檮鍔 {绯绘暟 * 100:0.##}% 鏁忔嵎 [ {浼ゅ鍔犳垚} ] 鐨勫己鍖栦激瀹筹紝骞惰В闄や笉鍙変腑鐘舵併"; + public override string Description => $"杩涘叆涓嶅彲閫変腑鐘舵侊紝鑾峰緱 100 琛屽姩閫熷害锛屾彁楂 8% 鏆村嚮鐜囷紝鎸佺画 {Duration:0.##} 鏃堕棿銆傜牬闅愪竴鍑伙細鍦ㄦ寔缁椂闂村唴锛岄娆￠犳垚浼ゅ浼氶檮鍔 {绯绘暟 * 100:0.##}% 鏁忔嵎 [ {浼ゅ鍔犳垚:0.##} ] 鐨勫己鍖栦激瀹筹紝骞惰В闄や笉鍙変腑鐘舵併"; public override bool TargetSelf => true; public override bool Durative => true; public override double Duration => 12 + (1 * (Level - 1)); - private double 绯绘暟 => Calculation.Round4Digits(0.5 + 0.5 * (Skill.Level - 1)); - private double 浼ゅ鍔犳垚 => Calculation.Round2Digits(绯绘暟 * Skill.Character?.AGI ?? 0); + private double 绯绘暟 => 0.5 + 0.5 * (Skill.Level - 1); + private double 浼ゅ鍔犳垚 => 绯绘暟 * Skill.Character?.AGI ?? 0; private bool 棣栨浼ゅ { get; set; } = true; private bool 鐮撮殣涓鍑 { get; set; } = false; @@ -64,8 +63,8 @@ namespace Oshima.FunGame.OshimaModules.Skills character.CharacterEffectTypes.Remove(this); character.UpdateCharacterState(); double d = 浼ゅ鍔犳垚; - damage = Calculation.Round2Digits(damage + d); - WriteLine($"[ {character} ] 瑙﹀彂浜嗙柧椋庢鐮撮殣涓鍑伙紝鑾峰緱浜 [ {d} ] 鐐逛激瀹冲姞鎴愶紒"); + damage += d; + WriteLine($"[ {character} ] 瑙﹀彂浜嗙柧椋庢鐮撮殣涓鍑伙紝鑾峰緱浜 [ {d:0.##} ] 鐐逛激瀹冲姞鎴愶紒"); } return false; } diff --git a/OshimaModules/Skills/榄旀硶/鍐伴湝鏀诲嚮.cs b/OshimaModules/Skills/榄旀硶/鍐伴湝鏀诲嚮.cs index 15ae845..ea1317b 100644 --- a/OshimaModules/Skills/榄旀硶/鍐伴湝鏀诲嚮.cs +++ b/OshimaModules/Skills/榄旀硶/鍐伴湝鏀诲嚮.cs @@ -1,5 +1,4 @@ -锘縰sing Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Entity; +锘縰sing Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills @@ -24,7 +23,7 @@ namespace Oshima.FunGame.OshimaModules.Skills { public override long Id => Skill.Id; public override string Name => Skill.Name; - public override string Description => $"瀵圭洰鏍囨晫浜洪犳垚 {Calculation.Round2Digits(90 + 60 * (Skill.Level - 1))} + {Calculation.Round2Digits((1.2 + 1.8 * (Skill.Level - 1)) * 100)}% 鏅哄姏 [ {Damage} ] 鐐箋CharacterSet.GetMagicDamageName(MagicType)}銆"; + public override string Description => $"瀵圭洰鏍囨晫浜洪犳垚 {90 + 60 * (Skill.Level - 1):0.##} + {(1.2 + 1.8 * (Skill.Level - 1)) * 100:0.##}% 鏅哄姏 [ {Damage:0.##} ] 鐐箋CharacterSet.GetMagicDamageName(MagicType)}銆"; public override bool TargetSelf => false; public override int TargetCount => 1; @@ -35,7 +34,7 @@ namespace Oshima.FunGame.OshimaModules.Skills double d = 0; if (Skill.Character != null) { - d = Calculation.Round2Digits(90 + 60 * (Skill.Level - 1) + (1.2 + 1.8 * (Skill.Level - 1)) * Skill.Character.INT); + d = 90 + 60 * (Skill.Level - 1) + (1.2 + 1.8 * (Skill.Level - 1)) * Skill.Character.INT; } return d; }