diff --git a/OshimaCore/Controllers/FunGameController.cs b/OshimaCore/Controllers/FunGameController.cs index a28f1b5..200fe04 100644 --- a/OshimaCore/Controllers/FunGameController.cs +++ b/OshimaCore/Controllers/FunGameController.cs @@ -66,9 +66,9 @@ namespace Oshima.Core.Controllers builder.AppendLine($"前三率:{stats.Top3rates * 100:0.##}%"); names = [.. FunGameSimulation.CharacterStatistics.OrderByDescending(kv => kv.Value.Rating).Select(kv => kv.Key.GetName())]; - builder.AppendLine($"技术得分:{stats.Rating:0.##}(#{names.IndexOf(character.GetName()) + 1})"); + builder.AppendLine($"技术得分:{stats.Rating:0.0#}(#{names.IndexOf(character.GetName()) + 1})"); - builder.AppendLine($"上次排名:{stats.LastRank} / 场均名次:{stats.AvgRank}"); + builder.AppendLine($"上次排名:{stats.LastRank} / 场均名次:{stats.AvgRank:0.##}"); return NetworkUtility.JsonSerialize(builder.ToString()); } @@ -115,7 +115,7 @@ namespace Oshima.Core.Controllers List names = [.. FunGameSimulation.TeamCharacterStatistics.OrderByDescending(kv => kv.Value.Winrates).Select(kv => kv.Key.GetName())]; builder.AppendLine($"胜率:{stats.Winrates * 100:0.##}%(#{names.IndexOf(character.GetName()) + 1})"); names = [.. FunGameSimulation.TeamCharacterStatistics.OrderByDescending(kv => kv.Value.Rating).Select(kv => kv.Key.GetName())]; - builder.AppendLine($"技术得分:{stats.Rating:0.##}(#{names.IndexOf(character.GetName()) + 1})"); + builder.AppendLine($"技术得分:{stats.Rating:0.0#}(#{names.IndexOf(character.GetName()) + 1})"); return NetworkUtility.JsonSerialize(builder.ToString()); } @@ -139,7 +139,7 @@ namespace Oshima.Core.Controllers builder.AppendLine($"总计参赛数:{stats.Plays}"); builder.AppendLine($"总计冠军数:{stats.Wins}"); builder.AppendLine($"胜率:{stats.Winrates * 100:0.##}%"); - builder.AppendLine($"技术得分:{stats.Rating:0.##}"); + builder.AppendLine($"技术得分:{stats.Rating:0.0#}"); strings.Add(builder.ToString()); } return NetworkUtility.JsonSerialize(strings); @@ -157,8 +157,8 @@ namespace Oshima.Core.Controllers builder.AppendLine($"总计冠军数:{stats.Wins}"); builder.AppendLine($"胜率:{stats.Winrates * 100:0.##}%"); builder.AppendLine($"前三率:{stats.Top3rates * 100:0.##}%"); - builder.AppendLine($"技术得分:{stats.Rating:0.##}"); - builder.AppendLine($"上次排名:{stats.LastRank} / 场均名次:{stats.AvgRank}"); + builder.AppendLine($"技术得分:{stats.Rating:0.0#}"); + builder.AppendLine($"上次排名:{stats.LastRank} / 场均名次:{stats.AvgRank:0.##}"); strings.Add(builder.ToString()); } return NetworkUtility.JsonSerialize(strings); @@ -181,7 +181,7 @@ namespace Oshima.Core.Controllers builder.AppendLine($"总计参赛数:{stats.Plays}"); builder.AppendLine($"总计冠军数:{stats.Wins}"); builder.AppendLine($"胜率:{stats.Winrates * 100:0.##}%"); - builder.AppendLine($"技术得分:{stats.Rating:0.##}"); + builder.AppendLine($"技术得分:{stats.Rating:0.0#}"); strings.Add(builder.ToString()); } return NetworkUtility.JsonSerialize(strings); @@ -199,8 +199,8 @@ namespace Oshima.Core.Controllers builder.AppendLine($"总计冠军数:{stats.Wins}"); builder.AppendLine($"胜率:{stats.Winrates * 100:0.##}%"); builder.AppendLine($"前三率:{stats.Top3rates * 100:0.##}%"); - builder.AppendLine($"技术得分:{stats.Rating:0.##}"); - builder.AppendLine($"上次排名:{stats.LastRank} / 场均名次:{stats.AvgRank}"); + builder.AppendLine($"技术得分:{stats.Rating:0.0#}"); + builder.AppendLine($"上次排名:{stats.LastRank} / 场均名次:{stats.AvgRank:0.##}"); strings.Add(builder.ToString()); } return NetworkUtility.JsonSerialize(strings); diff --git a/OshimaModules/Skills/榄旀硶/鍐伴湝鏀诲嚮.cs b/OshimaModules/Skills/榄旀硶/鍐伴湝鏀诲嚮.cs index 1714de6..8f9f262 100644 --- a/OshimaModules/Skills/榄旀硶/鍐伴湝鏀诲嚮.cs +++ b/OshimaModules/Skills/榄旀硶/鍐伴湝鏀诲嚮.cs @@ -23,12 +23,13 @@ namespace Oshima.FunGame.OshimaModules.Skills { public override long Id => Skill.Id; public override string Name => Skill.Name; - public override string Description => $"瀵圭洰鏍囨晫浜洪犳垚 {鍩虹浼ゅ:0.##} + {绯绘暟 * 100:0.##}% 鏅哄姏 [ {Damage:0.##} ] 鐐箋CharacterSet.GetMagicDamageName(MagicType)}銆"; + public override string Description => $"瀵圭洰鏍囨晫浜洪犳垚 {鍩虹浼ゅ:0.##} + {绯绘暟 * 100:0.##}% 鏅哄姏 {(Skill.Level == 0 ? $"(+{绛夌骇绯绘暟 * 100:0.##}%/Lv)" : "")} [ {Damage:0.##} ] 鐐箋CharacterSet.GetMagicDamageName(MagicType)}銆"; public override bool TargetSelf => false; public override int TargetCount => 1; - private double 鍩虹浼ゅ => 90 + 60 * (Skill.Level - 1); - private double 绯绘暟 => 0.35 + 0.4 * (Skill.Level - 1); + private static double 绛夌骇绯绘暟 => 0.4; + private double 鍩虹浼ゅ => Skill.Level != 0 ? 90 + 60 * (Skill.Level - 1) : 90; + private double 绯绘暟 => Skill.Level != 0 ? 0.35 + 绛夌骇绯绘暟 * (Skill.Level - 1) : 0.35; private double Damage => 鍩虹浼ゅ + 绯绘暟 * Skill.Character?.INT ?? 0; public override void OnSkillCasted(Character caster, List targets, Dictionary others) diff --git a/OshimaModules/Skills/榄旀硶/蹇冪伒涔嬮湠.cs b/OshimaModules/Skills/榄旀硶/蹇冪伒涔嬮湠.cs index a5a3594..c755d59 100644 --- a/OshimaModules/Skills/榄旀硶/蹇冪伒涔嬮湠.cs +++ b/OshimaModules/Skills/榄旀硶/蹇冪伒涔嬮湠.cs @@ -23,13 +23,14 @@ namespace Oshima.FunGame.OshimaModules.Skills { public override long Id => Skill.Id; public override string Name => Skill.Name; - public override string Description => $"瀵圭洰鏍囨晫浜洪犳垚 {鍩虹浼ゅ:0.##} + {鏅哄姏绯绘暟 * 100:0.##}% 鏅哄姏 [ {Damage:0.##} ] 鐐箋CharacterSet.GetMagicDamageName(MagicType)}銆"; + public override string Description => $"瀵圭洰鏍囨晫浜洪犳垚 {鍩虹浼ゅ:0.##} + {绯绘暟 * 100:0.##}% 鏅哄姏 {(Skill.Level == 0 ? $"(+{绛夌骇绯绘暟 * 100:0.##}%/Lv)" : "")} [ {Damage:0.##} ] 鐐箋CharacterSet.GetMagicDamageName(MagicType)}銆"; public override bool TargetSelf => false; public override int TargetCount => 1; - private double 鍩虹浼ゅ => 90 + 60 * (Skill.Level - 1); - private double 鏅哄姏绯绘暟 => (0.5 + 0.6 * (Skill.Level - 1)); - private double Damage => 鍩虹浼ゅ + 鏅哄姏绯绘暟 * Skill.Character?.INT ?? 0; + private static double 绛夌骇绯绘暟 => 0.6; + private double 鍩虹浼ゅ => Skill.Level != 0 ? 90 + 60 * (Skill.Level - 1) : 90; + private double 绯绘暟 => Skill.Level != 0 ? 0.5 + 绛夌骇绯绘暟 * (Skill.Level - 1) : 0.5; + private double Damage => 鍩虹浼ゅ + 绯绘暟 * Skill.Character?.INT ?? 0; public override void OnSkillCasted(Character caster, List targets, Dictionary others) { diff --git a/OshimaModules/Skills/榄旀硶/鏆楃墿璐.cs b/OshimaModules/Skills/榄旀硶/鏆楃墿璐.cs index 011bba2..98ae78f 100644 --- a/OshimaModules/Skills/榄旀硶/鏆楃墿璐.cs +++ b/OshimaModules/Skills/榄旀硶/鏆楃墿璐.cs @@ -23,13 +23,14 @@ namespace Oshima.FunGame.OshimaModules.Skills { public override long Id => Skill.Id; public override string Name => Skill.Name; - public override string Description => $"瀵圭洰鏍囨晫浜洪犳垚 {鍩虹浼ゅ:0.##} + {鏅哄姏绯绘暟 * 100:0.##}% 鏅哄姏 [ {Damage:0.##} ] 鐐箋CharacterSet.GetMagicDamageName(MagicType)}銆"; + public override string Description => $"瀵圭洰鏍囨晫浜洪犳垚 {鍩虹浼ゅ:0.##} + {绯绘暟 * 100:0.##}% 鏅哄姏 {(Skill.Level == 0 ? $"(+{绛夌骇绯绘暟 * 100:0.##}%/Lv)" : "")} [ {Damage:0.##} ] 鐐箋CharacterSet.GetMagicDamageName(MagicType)}銆"; public override bool TargetSelf => false; public override int TargetCount => 1; - private double 鍩虹浼ゅ => 90 + 60 * (Skill.Level - 1); - private double 鏅哄姏绯绘暟 => (0.5 + 0.6 * (Skill.Level - 1)); - private double Damage => 鍩虹浼ゅ + 鏅哄姏绯绘暟 * Skill.Character?.INT ?? 0; + private static double 绛夌骇绯绘暟 => 0.6; + private double 鍩虹浼ゅ => Skill.Level != 0 ? 90 + 60 * (Skill.Level - 1) : 90; + private double 绯绘暟 => Skill.Level != 0 ? 0.5 + 绛夌骇绯绘暟 * (Skill.Level - 1) : 0.5; + private double Damage => 鍩虹浼ゅ + 绯绘暟 * Skill.Character?.INT ?? 0; public override void OnSkillCasted(Character caster, List targets, Dictionary others) { diff --git a/OshimaModules/Skills/榄旀硶/娆″厓涓婂崌.cs b/OshimaModules/Skills/榄旀硶/娆″厓涓婂崌.cs index ae7ea78..947f50d 100644 --- a/OshimaModules/Skills/榄旀硶/娆″厓涓婂崌.cs +++ b/OshimaModules/Skills/榄旀硶/娆″厓涓婂崌.cs @@ -23,13 +23,14 @@ namespace Oshima.FunGame.OshimaModules.Skills { public override long Id => Skill.Id; public override string Name => Skill.Name; - public override string Description => $"瀵圭洰鏍囨晫浜洪犳垚 {鍩虹浼ゅ:0.##} + {鏅哄姏绯绘暟 * 100:0.##}% 鏅哄姏 [ {Damage:0.##} ] 鐐箋CharacterSet.GetMagicDamageName(MagicType)}銆"; + public override string Description => $"瀵圭洰鏍囨晫浜洪犳垚 {鍩虹浼ゅ:0.##} + {绯绘暟 * 100:0.##}% 鏅哄姏 {(Skill.Level == 0 ? $"(+{绛夌骇绯绘暟 * 100:0.##}%/Lv)" : "")} [ {Damage:0.##} ] 鐐箋CharacterSet.GetMagicDamageName(MagicType)}銆"; public override bool TargetSelf => false; public override int TargetCount => 1; - private double 鍩虹浼ゅ => 90 + 60 * (Skill.Level - 1); - private double 鏅哄姏绯绘暟 => (0.5 + 0.6 * (Skill.Level - 1)); - private double Damage => 鍩虹浼ゅ + 鏅哄姏绯绘暟 * Skill.Character?.INT ?? 0; + private static double 绛夌骇绯绘暟 => 0.6; + private double 鍩虹浼ゅ => Skill.Level != 0 ? 90 + 60 * (Skill.Level - 1) : 90; + private double 绯绘暟 => Skill.Level != 0 ? 0.5 + 绛夌骇绯绘暟 * (Skill.Level - 1) : 0.5; + private double Damage => 鍩虹浼ゅ + 绯绘暟 * Skill.Character?.INT ?? 0; public override void OnSkillCasted(Character caster, List targets, Dictionary others) { diff --git a/OshimaModules/Skills/榄旀硶/姘翠箣鐭.cs b/OshimaModules/Skills/榄旀硶/姘翠箣鐭.cs index f07cebd..bc88d76 100644 --- a/OshimaModules/Skills/榄旀硶/姘翠箣鐭.cs +++ b/OshimaModules/Skills/榄旀硶/姘翠箣鐭.cs @@ -23,12 +23,13 @@ namespace Oshima.FunGame.OshimaModules.Skills { public override long Id => Skill.Id; public override string Name => Skill.Name; - public override string Description => $"瀵圭洰鏍囨晫浜洪犳垚 {鍩虹浼ゅ:0.##} + {绯绘暟 * 100:0.##}% {CharacterSet.GetPrimaryAttributeName(Skill.Character?.PrimaryAttribute ?? PrimaryAttribute.INT)} [ {Damage:0.##} ] 鐐箋CharacterSet.GetMagicDamageName(MagicType)}銆"; + public override string Description => $"瀵圭洰鏍囨晫浜洪犳垚 {鍩虹浼ゅ:0.##} + {绯绘暟 * 100:0.##}% {CharacterSet.GetPrimaryAttributeName(Skill.Character?.PrimaryAttribute ?? PrimaryAttribute.INT)} {(Skill.Level == 0 ? $"(+{绛夌骇绯绘暟 * 100:0.##}%/Lv)" : "")} [ {Damage:0.##} ] 鐐箋CharacterSet.GetMagicDamageName(MagicType)}銆"; public override bool TargetSelf => false; public override int TargetCount => 1; - private double 鍩虹浼ゅ => 85 + 65 * (Skill.Level - 1); - private double 绯绘暟 => 0.35 + 0.45 * (Skill.Level - 1); + private static double 绛夌骇绯绘暟 => 0.45; + private double 鍩虹浼ゅ => Skill.Level != 0 ? 85 + 65 * (Skill.Level - 1) : 85; + private double 绯绘暟 => Skill.Level != 0 ? 0.35 + 绛夌骇绯绘暟 * (Skill.Level - 1) : 0.35; private double Damage => 鍩虹浼ゅ + 绯绘暟 * Skill.Character?.PrimaryAttributeValue ?? 0; public override void OnSkillCasted(Character caster, List targets, Dictionary others) diff --git a/OshimaModules/Skills/榄旀硶/鐏箣鐭.cs b/OshimaModules/Skills/榄旀硶/鐏箣鐭.cs index f80c3cf..66815c3 100644 --- a/OshimaModules/Skills/榄旀硶/鐏箣鐭.cs +++ b/OshimaModules/Skills/榄旀硶/鐏箣鐭.cs @@ -23,12 +23,13 @@ namespace Oshima.FunGame.OshimaModules.Skills { public override long Id => Skill.Id; public override string Name => Skill.Name; - public override string Description => $"瀵圭洰鏍囨晫浜洪犳垚 {鍩虹浼ゅ:0.##} + {绯绘暟 * 100:0.##}% {CharacterSet.GetPrimaryAttributeName(Skill.Character?.PrimaryAttribute ?? PrimaryAttribute.INT)} [ {Damage:0.##} ] 鐐箋CharacterSet.GetMagicDamageName(MagicType)}銆"; + public override string Description => $"瀵圭洰鏍囨晫浜洪犳垚 {鍩虹浼ゅ:0.##} + {绯绘暟 * 100:0.##}% {CharacterSet.GetPrimaryAttributeName(Skill.Character?.PrimaryAttribute ?? PrimaryAttribute.INT)} {(Skill.Level == 0 ? $"(+{绛夌骇绯绘暟 * 100:0.##}%/Lv)" : "")} [ {Damage:0.##} ] 鐐箋CharacterSet.GetMagicDamageName(MagicType)}銆"; public override bool TargetSelf => false; public override int TargetCount => 1; - private double 鍩虹浼ゅ => 80 + 65 * (Skill.Level - 1); - private double 绯绘暟 => 0.45 + 0.35 * (Skill.Level - 1); + private static double 绛夌骇绯绘暟 => 0.35; + private double 鍩虹浼ゅ => Skill.Level != 0 ? 80 + 65 * (Skill.Level - 1) : 80; + private double 绯绘暟 => Skill.Level != 0 ? 0.45 + 绛夌骇绯绘暟 * (Skill.Level - 1) : 0.45; private double Damage => 鍩虹浼ゅ + 绯绘暟 * Skill.Character?.PrimaryAttributeValue ?? 0; public override void OnSkillCasted(Character caster, List targets, Dictionary others) diff --git a/OshimaModules/Skills/榄旀硶/鐭充箣閿.cs b/OshimaModules/Skills/榄旀硶/鐭充箣閿.cs index 220a9b3..c34e78c 100644 --- a/OshimaModules/Skills/榄旀硶/鐭充箣閿.cs +++ b/OshimaModules/Skills/榄旀硶/鐭充箣閿.cs @@ -23,12 +23,13 @@ namespace Oshima.FunGame.OshimaModules.Skills { public override long Id => Skill.Id; public override string Name => Skill.Name; - public override string Description => $"瀵圭洰鏍囨晫浜洪犳垚 {鍩虹浼ゅ:0.##} + {绯绘暟 * 100:0.##}% 鍔涢噺 [ {Damage:0.##} ] 鐐箋CharacterSet.GetMagicDamageName(MagicType)}銆"; + public override string Description => $"瀵圭洰鏍囨晫浜洪犳垚 {鍩虹浼ゅ:0.##} + {绯绘暟 * 100:0.##}% 鍔涢噺 {(Skill.Level == 0 ? $"(+{绛夌骇绯绘暟 * 100:0.##}%/Lv)" : "")} [ {Damage:0.##} ] 鐐箋CharacterSet.GetMagicDamageName(MagicType)}銆"; public override bool TargetSelf => false; public override int TargetCount => 1; - private double 鍩虹浼ゅ => 100 + 50 * (Skill.Level - 1); - private double 绯绘暟 => 0.7 + 0.4 * (Skill.Level - 1); + private static double 绛夌骇绯绘暟 => 0.4; + private double 鍩虹浼ゅ => Skill.Level != 0 ? 100 + 50 * (Skill.Level - 1) : 100; + private double 绯绘暟 => Skill.Level != 0 ? 0.7 + 绛夌骇绯绘暟 * (Skill.Level - 1) : 0.7; private double Damage => 鍩虹浼ゅ + 绯绘暟 * Skill.Character?.STR ?? 0; public override void OnSkillCasted(Character caster, List targets, Dictionary others) diff --git a/OshimaModules/Skills/榄旀硶/椋庝箣杞.cs b/OshimaModules/Skills/榄旀硶/椋庝箣杞.cs index 1396e66..71c346a 100644 --- a/OshimaModules/Skills/榄旀硶/椋庝箣杞.cs +++ b/OshimaModules/Skills/榄旀硶/椋庝箣杞.cs @@ -23,12 +23,13 @@ namespace Oshima.FunGame.OshimaModules.Skills { public override long Id => Skill.Id; public override string Name => Skill.Name; - public override string Description => $"瀵圭洰鏍囨晫浜洪犳垚 {鍩虹浼ゅ:0.##} + {绯绘暟 * 100:0.##}% 鏁忔嵎 [ {Damage:0.##} ] 鐐箋CharacterSet.GetMagicDamageName(MagicType)}銆"; + public override string Description => $"瀵圭洰鏍囨晫浜洪犳垚 {鍩虹浼ゅ:0.##} + {绯绘暟 * 100:0.##}% 鏁忔嵎 {(Skill.Level == 0 ? $"(+{绛夌骇绯绘暟 * 100:0.##}%/Lv)" : "")} [ {Damage:0.##} ] 鐐箋CharacterSet.GetMagicDamageName(MagicType)}銆"; public override bool TargetSelf => false; public override int TargetCount => 1; - private double 鍩虹浼ゅ => 120 + 80 * (Skill.Level - 1); - private double 绯绘暟 => 0.4 + 0.4 * (Skill.Level - 1); + private static double 绛夌骇绯绘暟 => 0.4; + private double 鍩虹浼ゅ => Skill.Level != 0 ? 120 + 80 * (Skill.Level - 1) : 120; + private double 绯绘暟 => Skill.Level != 0 ? 0.4 + 绛夌骇绯绘暟 * (Skill.Level - 1) : 0.4; private double Damage => 鍩虹浼ゅ + 绯绘暟 * Skill.Character?.AGI ?? 0; public override void OnSkillCasted(Character caster, List targets, Dictionary others)