From 86b86a19e2fcee25db14837cf2cec343a017a6ea Mon Sep 17 00:00:00 2001 From: milimoe Date: Mon, 19 Jan 2026 01:34:30 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=93=B6=E9=A2=88=E5=92=8C?= =?UTF-8?q?=E6=95=88=E8=83=BD=EF=BC=9B=E4=BF=AE=E5=A4=8D=E8=A3=85=E5=A4=87?= =?UTF-8?q?=E4=B8=BB=E5=8A=A8=E6=8A=80=E8=83=BD=E6=97=A0=E6=B3=95=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OshimaModules/Skills/Neptune/海王星的野望.cs | 2 +- OshimaModules/Skills/Neptune/深海之戟.cs | 2 +- OshimaModules/Skills/TheGodK/概念之骰.cs | 2 +- OshimaModules/Skills/TheGodK/神之因果.cs | 2 +- OshimaModules/Skills/被动/征服者.cs | 4 ++-- OshimaModules/Skills/魔法/冰狱冥嚎.cs | 1 + OshimaModules/Skills/魔法/冰霜攻击.cs | 3 ++- OshimaModules/Skills/魔法/凝胶稠絮.cs | 1 + OshimaModules/Skills/魔法/地狱之门.cs | 1 + OshimaModules/Skills/魔法/导力停止.cs | 1 + OshimaModules/Skills/魔法/岩石之息.cs | 1 + OshimaModules/Skills/魔法/弧形日珥.cs | 1 + OshimaModules/Skills/魔法/心灵之霞.cs | 1 + OshimaModules/Skills/魔法/暗物质.cs | 1 + OshimaModules/Skills/魔法/次元上升.cs | 1 + OshimaModules/Skills/魔法/死亡咆哮.cs | 1 + OshimaModules/Skills/魔法/水之矢.cs | 1 + OshimaModules/Skills/魔法/水蓝轰炸.cs | 1 + OshimaModules/Skills/魔法/混沌烙印.cs | 1 + OshimaModules/Skills/魔法/火之矢.cs | 1 + OshimaModules/Skills/魔法/火山咆哮.cs | 1 + OshimaModules/Skills/魔法/灾难冲击波.cs | 1 + OshimaModules/Skills/魔法/石之锤.cs | 1 + OshimaModules/Skills/魔法/破碎虚空.cs | 1 + OshimaModules/Skills/魔法/等离子之波.cs | 1 + OshimaModules/Skills/魔法/苍白地狱.cs | 1 + OshimaModules/Skills/魔法/虚弱领域.cs | 1 + OshimaModules/Skills/魔法/钻石星尘.cs | 1 + OshimaModules/Skills/魔法/银色荆棘.cs | 1 + OshimaModules/Skills/魔法/风之轮.cs | 1 + OshimaModules/Skills/魔法/鬼魅之痛.cs | 1 + 31 files changed, 33 insertions(+), 7 deletions(-) diff --git a/OshimaModules/Skills/Neptune/海王星的野望.cs b/OshimaModules/Skills/Neptune/海王星的野望.cs index d29c101..41e6bc0 100644 --- a/OshimaModules/Skills/Neptune/海王星的野望.cs +++ b/OshimaModules/Skills/Neptune/海王星的野望.cs @@ -135,7 +135,7 @@ namespace Oshima.FunGame.OshimaModules.Skills damage *= 分裂伤害系数; foreach (Character target in targets) { - DamageToEnemy(character, target, damageType, magicType, damage, new() + DamageToEnemy(character, target, damageType, magicType, damage, new(character) { CalculateCritical = false, CalculateReduction = true, diff --git a/OshimaModules/Skills/Neptune/深海之戟.cs b/OshimaModules/Skills/Neptune/深海之戟.cs index 1062efa..ec5ca9a 100644 --- a/OshimaModules/Skills/Neptune/深海之戟.cs +++ b/OshimaModules/Skills/Neptune/深海之戟.cs @@ -80,7 +80,7 @@ namespace Oshima.FunGame.OshimaModules.Skills double 分裂伤害 = actualDamage * 分裂百分比; foreach (Character target in targets) { - DamageToEnemy(character, target, damageType, magicType, 分裂伤害, new() + DamageToEnemy(character, target, damageType, magicType, 分裂伤害, new(character) { CalculateCritical = false, CalculateReduction = true, diff --git a/OshimaModules/Skills/TheGodK/概念之骰.cs b/OshimaModules/Skills/TheGodK/概念之骰.cs index 9e7543a..b2b1985 100644 --- a/OshimaModules/Skills/TheGodK/概念之骰.cs +++ b/OshimaModules/Skills/TheGodK/概念之骰.cs @@ -79,7 +79,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override void AfterDeathCalculation(Character death, bool hasMaster, Character? killer, Dictionary continuousKilling, Dictionary earnedMoney, Character[] assists) { - if (Skill.Character != null && death != Skill.Character && (killer == Skill.Character || assists.Contains(Skill.Character)) && Skill is 概念之骰 skill) + if (Skill.Character != null && death != Skill.Character && !hasMaster && (killer == Skill.Character || assists.Contains(Skill.Character)) && Skill is 概念之骰 skill) { WriteLine($"[ {Skill.Character} ] 进行概念投掷:“此乃,神之概念。”"); bool result = false; diff --git a/OshimaModules/Skills/TheGodK/神之因果.cs b/OshimaModules/Skills/TheGodK/神之因果.cs index 4629750..0e95f94 100644 --- a/OshimaModules/Skills/TheGodK/神之因果.cs +++ b/OshimaModules/Skills/TheGodK/神之因果.cs @@ -75,7 +75,7 @@ namespace Oshima.FunGame.OshimaModules.Skills double damage = 因果伤害值 * 2 / enemies.Count; foreach (Character enemy in enemies) { - DamageToEnemy(character, enemy, DamageType.True, MagicType, damage, new() + DamageToEnemy(character, enemy, DamageType.True, MagicType, damage, new(character) { CalculateShield = false, IgnoreImmune = true, diff --git a/OshimaModules/Skills/被动/征服者.cs b/OshimaModules/Skills/被动/征服者.cs index 9697be2..a134d72 100644 --- a/OshimaModules/Skills/被动/征服者.cs +++ b/OshimaModules/Skills/被动/征服者.cs @@ -48,7 +48,7 @@ namespace Oshima.FunGame.OshimaModules.Skills 是否是满层伤害 = true; 是否是叠加伤害 = true; WriteLine($"[ {character} ] 发动了征服者的满层效果!"); - DamageToEnemy(character, enemy, DamageType.True, magicType, 满层伤害, new() + DamageToEnemy(character, enemy, DamageType.True, magicType, 满层伤害, new(character) { TriggerEffects = false }); @@ -82,7 +82,7 @@ namespace Oshima.FunGame.OshimaModules.Skills { 是否是叠加伤害 = true; WriteLine($"[ {character} ] 发动了征服者!"); - DamageToEnemy(character, enemy, DamageType.True, magicType, 真实伤害 * 层数, new() + DamageToEnemy(character, enemy, DamageType.True, magicType, 真实伤害 * 层数, new(character) { TriggerEffects = false }); diff --git a/OshimaModules/Skills/魔法/冰狱冥嚎.cs b/OshimaModules/Skills/魔法/冰狱冥嚎.cs index 82d352a..f6b8bd9 100644 --- a/OshimaModules/Skills/魔法/冰狱冥嚎.cs +++ b/OshimaModules/Skills/魔法/冰狱冥嚎.cs @@ -14,6 +14,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override double CastTime => 10; public override double HardnessTime { get; set; } = 5; public override int CanSelectTargetCount => 3; + public override double MagicBottleneck => 20 + 22 * (Level - 1); public 冰狱冥嚎(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/冰霜攻击.cs b/OshimaModules/Skills/魔法/冰霜攻击.cs index 0870b53..0f98c9c 100644 --- a/OshimaModules/Skills/魔法/冰霜攻击.cs +++ b/OshimaModules/Skills/魔法/冰霜攻击.cs @@ -11,8 +11,9 @@ namespace Oshima.FunGame.OshimaModules.Skills public override string Description => Effects.Count > 0 ? Effects.First().Description : ""; public override double MPCost => Level > 0 ? 50 + (50 * (Level - 1)) : 50; public override double CD => 25; - public override double CastTime => 8; + public override double CastTime => 5; public override double HardnessTime { get; set; } = 3; + public override double MagicBottleneck => 20 + 22 * (Level - 1); public 冰霜攻击(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/凝胶稠絮.cs b/OshimaModules/Skills/魔法/凝胶稠絮.cs index 33c5fe6..629f29e 100644 --- a/OshimaModules/Skills/魔法/凝胶稠絮.cs +++ b/OshimaModules/Skills/魔法/凝胶稠絮.cs @@ -16,6 +16,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override double CastTime => 11; public override double HardnessTime { get; set; } = 4; public override int CanSelectTargetCount => 1; + public override double MagicBottleneck => 15 + 16 * (Level - 1); public 凝胶稠絮(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/地狱之门.cs b/OshimaModules/Skills/魔法/地狱之门.cs index 23c3f62..aa6494f 100644 --- a/OshimaModules/Skills/魔法/地狱之门.cs +++ b/OshimaModules/Skills/魔法/地狱之门.cs @@ -33,6 +33,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override bool IsNonDirectional => true; public override SkillRangeType SkillRangeType => SkillRangeType.Sector; public override int CanSelectTargetRange => 4; + public override double MagicBottleneck => 15 + 20 * (Level - 1); public 地狱之门(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/导力停止.cs b/OshimaModules/Skills/魔法/导力停止.cs index 5848ce0..0d8d6d6 100644 --- a/OshimaModules/Skills/魔法/导力停止.cs +++ b/OshimaModules/Skills/魔法/导力停止.cs @@ -16,6 +16,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override double CastTime => Level > 0 ? 3 + (0.5 * (Level - 1)) : 3; public override double HardnessTime { get; set; } = 8; public override bool SelectAllEnemies => true; + public override double MagicBottleneck => 28 + 24 * (Level - 1); public 导力停止(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/岩石之息.cs b/OshimaModules/Skills/魔法/岩石之息.cs index 1f702c0..dbdac78 100644 --- a/OshimaModules/Skills/魔法/岩石之息.cs +++ b/OshimaModules/Skills/魔法/岩石之息.cs @@ -17,6 +17,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override bool IsNonDirectional => true; public override SkillRangeType SkillRangeType => SkillRangeType.LinePass; public override int CanSelectTargetRange => 2; + public override double MagicBottleneck => 12 + 13 * (Level - 1); public 岩石之息(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/弧形日珥.cs b/OshimaModules/Skills/魔法/弧形日珥.cs index 7af585c..d0686fc 100644 --- a/OshimaModules/Skills/魔法/弧形日珥.cs +++ b/OshimaModules/Skills/魔法/弧形日珥.cs @@ -14,6 +14,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override double CastTime => 8; public override double HardnessTime { get; set; } = 6; public override int CanSelectTargetCount => 3; + public override double MagicBottleneck => 12 + 13 * (Level - 1); public 弧形日珥(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/心灵之霞.cs b/OshimaModules/Skills/魔法/心灵之霞.cs index d95ddfc..0ac5132 100644 --- a/OshimaModules/Skills/魔法/心灵之霞.cs +++ b/OshimaModules/Skills/魔法/心灵之霞.cs @@ -13,6 +13,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override double CD => 30; public override double CastTime => 6; public override double HardnessTime { get; set; } = 3; + public override double MagicBottleneck => 25 + 22 * (Level - 1); public 心灵之霞(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/暗物质.cs b/OshimaModules/Skills/魔法/暗物质.cs index 2998b2d..254e7b0 100644 --- a/OshimaModules/Skills/魔法/暗物质.cs +++ b/OshimaModules/Skills/魔法/暗物质.cs @@ -13,6 +13,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override double CD => 40; public override double CastTime => 10; public override double HardnessTime { get; set; } = 4; + public override double MagicBottleneck => 16 + 17 * (Level - 1); public 暗物质(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/次元上升.cs b/OshimaModules/Skills/魔法/次元上升.cs index b04bd93..cacfc44 100644 --- a/OshimaModules/Skills/魔法/次元上升.cs +++ b/OshimaModules/Skills/魔法/次元上升.cs @@ -15,6 +15,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override double CD => Level > 0 ? 35 - (1.5 * (Level - 1)) : 35; public override double CastTime => 12; public override double HardnessTime { get; set; } = 5; + public override double MagicBottleneck => 15 + 21 * (Level - 1); public 次元上升(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/死亡咆哮.cs b/OshimaModules/Skills/魔法/死亡咆哮.cs index 1ec6f44..e3bf59d 100644 --- a/OshimaModules/Skills/魔法/死亡咆哮.cs +++ b/OshimaModules/Skills/魔法/死亡咆哮.cs @@ -30,6 +30,7 @@ namespace Oshima.FunGame.OshimaModules.Skills }; } } + public override double MagicBottleneck => 20 + 24 * (Level - 1); public 死亡咆哮(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/水之矢.cs b/OshimaModules/Skills/魔法/水之矢.cs index 967649a..2122cc3 100644 --- a/OshimaModules/Skills/魔法/水之矢.cs +++ b/OshimaModules/Skills/魔法/水之矢.cs @@ -13,6 +13,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override double CD => 20; public override double CastTime => 6; public override double HardnessTime { get; set; } = 3; + public override double MagicBottleneck => 16 + 17 * (Level - 1); public 水之矢(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/水蓝轰炸.cs b/OshimaModules/Skills/魔法/水蓝轰炸.cs index 5344bae..63b20fb 100644 --- a/OshimaModules/Skills/魔法/水蓝轰炸.cs +++ b/OshimaModules/Skills/魔法/水蓝轰炸.cs @@ -17,6 +17,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override bool IsNonDirectional => true; public override SkillRangeType SkillRangeType => SkillRangeType.Circle; public override int CanSelectTargetRange => 3; + public override double MagicBottleneck => 16 + 17 * (Level - 1); public 水蓝轰炸(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/混沌烙印.cs b/OshimaModules/Skills/魔法/混沌烙印.cs index 7ec2f16..b781320 100644 --- a/OshimaModules/Skills/魔法/混沌烙印.cs +++ b/OshimaModules/Skills/魔法/混沌烙印.cs @@ -16,6 +16,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override double CastTime => 4; public override double HardnessTime { get; set; } = 5; public override int CanSelectTargetCount => 1; + public override double MagicBottleneck => 15 + 15 * (Level - 1); public 混沌烙印(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/火之矢.cs b/OshimaModules/Skills/魔法/火之矢.cs index 0441fa0..80c7858 100644 --- a/OshimaModules/Skills/魔法/火之矢.cs +++ b/OshimaModules/Skills/魔法/火之矢.cs @@ -13,6 +13,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override double CD => 20; public override double CastTime => 6; public override double HardnessTime { get; set; } = 3; + public override double MagicBottleneck => 16 + 17 * (Level - 1); public 火之矢(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/火山咆哮.cs b/OshimaModules/Skills/魔法/火山咆哮.cs index 9dff5aa..bec05e3 100644 --- a/OshimaModules/Skills/魔法/火山咆哮.cs +++ b/OshimaModules/Skills/魔法/火山咆哮.cs @@ -17,6 +17,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override bool IsNonDirectional => true; public override SkillRangeType SkillRangeType => SkillRangeType.Circle; public override int CanSelectTargetRange => 3; + public override double MagicBottleneck => 16 + 17 * (Level - 1); public 火山咆哮(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/灾难冲击波.cs b/OshimaModules/Skills/魔法/灾难冲击波.cs index a80fe1f..cf650f3 100644 --- a/OshimaModules/Skills/魔法/灾难冲击波.cs +++ b/OshimaModules/Skills/魔法/灾难冲击波.cs @@ -33,6 +33,7 @@ namespace Oshima.FunGame.OshimaModules.Skills }; } } + public override double MagicBottleneck => 15 + 20 * (Level - 1); public 灾难冲击波(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/石之锤.cs b/OshimaModules/Skills/魔法/石之锤.cs index 397f644..f437c17 100644 --- a/OshimaModules/Skills/魔法/石之锤.cs +++ b/OshimaModules/Skills/魔法/石之锤.cs @@ -13,6 +13,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override double CD => 22; public override double CastTime => 6; public override double HardnessTime { get; set; } = 4; + public override double MagicBottleneck => 12 + 13 * (Level - 1); public 石之锤(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/破碎虚空.cs b/OshimaModules/Skills/魔法/破碎虚空.cs index 9c84332..3479118 100644 --- a/OshimaModules/Skills/魔法/破碎虚空.cs +++ b/OshimaModules/Skills/魔法/破碎虚空.cs @@ -14,6 +14,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override double CastTime => 10; public override double HardnessTime { get; set; } = 6; public override int CanSelectTargetCount => 3; + public override double MagicBottleneck => 16 + 17 * (Level - 1); public 破碎虚空(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/等离子之波.cs b/OshimaModules/Skills/魔法/等离子之波.cs index 62f6627..3cb1c6b 100644 --- a/OshimaModules/Skills/魔法/等离子之波.cs +++ b/OshimaModules/Skills/魔法/等离子之波.cs @@ -30,6 +30,7 @@ namespace Oshima.FunGame.OshimaModules.Skills }; } } + public override double MagicBottleneck => 20 + 22 * (Level - 1); public 等离子之波(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/苍白地狱.cs b/OshimaModules/Skills/魔法/苍白地狱.cs index 5e6ea9e..889d3d7 100644 --- a/OshimaModules/Skills/魔法/苍白地狱.cs +++ b/OshimaModules/Skills/魔法/苍白地狱.cs @@ -14,6 +14,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override double CastTime => 9; public override double HardnessTime { get; set; } = 3; public override int CanSelectTargetCount => 3; + public override double MagicBottleneck => 15 + 22 * (Level - 1); public 苍白地狱(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/虚弱领域.cs b/OshimaModules/Skills/魔法/虚弱领域.cs index e11ac26..ec6189f 100644 --- a/OshimaModules/Skills/魔法/虚弱领域.cs +++ b/OshimaModules/Skills/魔法/虚弱领域.cs @@ -16,6 +16,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override double CastTime => 8; public override double HardnessTime { get; set; } = 3; public override bool SelectAllEnemies => true; + public override double MagicBottleneck => 15 + 15 * (Level - 1); public 虚弱领域(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/钻石星尘.cs b/OshimaModules/Skills/魔法/钻石星尘.cs index 4017cb5..e585305 100644 --- a/OshimaModules/Skills/魔法/钻石星尘.cs +++ b/OshimaModules/Skills/魔法/钻石星尘.cs @@ -29,6 +29,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override bool IsNonDirectional => true; public override SkillRangeType SkillRangeType => SkillRangeType.Circle; public override int CanSelectTargetRange => 2; + public override double MagicBottleneck => 35 + 24 * (Level - 1); public 钻石星尘(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/银色荆棘.cs b/OshimaModules/Skills/魔法/银色荆棘.cs index f702165..0ff2c26 100644 --- a/OshimaModules/Skills/魔法/银色荆棘.cs +++ b/OshimaModules/Skills/魔法/银色荆棘.cs @@ -31,6 +31,7 @@ namespace Oshima.FunGame.OshimaModules.Skills }; } } + public override double MagicBottleneck => 20 + 24 * (Level - 1); public 银色荆棘(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/风之轮.cs b/OshimaModules/Skills/魔法/风之轮.cs index 7e878d6..6644ba0 100644 --- a/OshimaModules/Skills/魔法/风之轮.cs +++ b/OshimaModules/Skills/魔法/风之轮.cs @@ -13,6 +13,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override double CD => 30; public override double CastTime => 10; public override double HardnessTime { get; set; } = 4; + public override double MagicBottleneck => 12 + 13 * (Level - 1); public 风之轮(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/鬼魅之痛.cs b/OshimaModules/Skills/魔法/鬼魅之痛.cs index 70bb283..18cf3b3 100644 --- a/OshimaModules/Skills/魔法/鬼魅之痛.cs +++ b/OshimaModules/Skills/魔法/鬼魅之痛.cs @@ -30,6 +30,7 @@ namespace Oshima.FunGame.OshimaModules.Skills }; } } + public override double MagicBottleneck => 20 + 24 * (Level - 1); public 鬼魅之痛(Character? character = null) : base(SkillType.Magic, character) {