From ac0a926ad0e5dc2d8635b7c1a7991c042b4a5f38 Mon Sep 17 00:00:00 2001 From: milimoe Date: Fri, 9 Jan 2026 01:05:08 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=96=B0=E8=A7=92=E8=89=B2?= =?UTF-8?q?=EF=BC=9B=E4=BF=AE=E5=A4=8D=E4=B8=80=E4=BA=9BBUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OshimaModules/Characters/Ryuko.cs | 4 +- OshimaModules/Effects/EffectID.cs | 5 +- .../Effects/PassiveEffects/持续回复.cs | 98 +++++++++ OshimaModules/Effects/PassiveEffects/标记.cs | 27 +++ .../PassiveEffects/海王星的野望标记.cs | 25 +++ .../Effects/PassiveEffects/禁止治疗.cs | 49 +++++ OshimaModules/Effects/PassiveEffects/迟滞.cs | 7 +- .../Effects/SkillEffects/施加概率负面.cs | 5 + OshimaModules/Items/Consumable/复苏药.cs | 1 + OshimaModules/Modules/CharacterModule.cs | 3 + OshimaModules/Modules/SkillModule.cs | 6 + OshimaModules/OshimaModules.csproj | 1 - OshimaModules/Skills/Neptune/海王星的野望.cs | 147 +++++++++++++ OshimaModules/Skills/Neptune/深海之戟.cs | 31 ++- OshimaModules/Skills/Ryuko/能量复苏.cs | 41 ++++ OshimaModules/Skills/Ryuko/自我抉择.cs | 203 ++++++++++++++++++ OshimaModules/Skills/SkillExtension.cs | 7 +- OshimaModules/Skills/XReouni/八卦阵.cs | 49 +++-- OshimaModules/Skills/XReouni/归元环.cs | 3 +- OshimaModules/Skills/XinYin/心灵之火.cs | 2 +- OshimaModules/Skills/战技/双连击.cs | 4 +- OshimaModules/Skills/被动/征服者.cs | 10 +- OshimaModules/Skills/魔法/圣灵术.cs | 1 + OshimaModules/Skills/魔法/复苏术.cs | 1 + OshimaServers/FastAutoServer.cs | 2 +- OshimaServers/Model/Cooperative.cs | 2 +- OshimaServers/Service/FunGameActionQueue.cs | 6 +- OshimaServers/Service/FunGameService.cs | 66 +++++- OshimaServers/Service/FunGameSimulation.cs | 35 +-- OshimaWebAPI/Controllers/FunGameController.cs | 89 ++++---- 30 files changed, 808 insertions(+), 122 deletions(-) create mode 100644 OshimaModules/Effects/PassiveEffects/持续回复.cs create mode 100644 OshimaModules/Effects/PassiveEffects/标记.cs create mode 100644 OshimaModules/Effects/PassiveEffects/海王星的野望标记.cs create mode 100644 OshimaModules/Effects/PassiveEffects/禁止治疗.cs create mode 100644 OshimaModules/Skills/Neptune/海王星的野望.cs create mode 100644 OshimaModules/Skills/Ryuko/能量复苏.cs create mode 100644 OshimaModules/Skills/Ryuko/自我抉择.cs diff --git a/OshimaModules/Characters/Ryuko.cs b/OshimaModules/Characters/Ryuko.cs index 9311960..c201461 100644 --- a/OshimaModules/Characters/Ryuko.cs +++ b/OshimaModules/Characters/Ryuko.cs @@ -16,9 +16,9 @@ namespace Oshima.FunGame.OshimaModules.Characters InitialHP = 100; InitialMP = 45; InitialSTR = 11; - STRGrowth = 1.3; + STRGrowth = 0.8; InitialAGI = 15; - AGIGrowth = 1.4; + AGIGrowth = 1.9; InitialINT = 4; INTGrowth = 0.3; InitialSPD = 300; diff --git a/OshimaModules/Effects/EffectID.cs b/OshimaModules/Effects/EffectID.cs index c2322fe..e0939cb 100644 --- a/OshimaModules/Effects/EffectID.cs +++ b/OshimaModules/Effects/EffectID.cs @@ -266,6 +266,9 @@ 持续性强驱散 = 4126, 累积之压标记 = 4127, 易损 = 4128, - 电刑标记 = 4129 + 电刑标记 = 4129, + 海王星的野望标记 = 4130, + 持续回复 = 4131, + 禁止治疗 = 4132 } } diff --git a/OshimaModules/Effects/PassiveEffects/持续回复.cs b/OshimaModules/Effects/PassiveEffects/持续回复.cs new file mode 100644 index 0000000..46ad3ef --- /dev/null +++ b/OshimaModules/Effects/PassiveEffects/持续回复.cs @@ -0,0 +1,98 @@ +using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Library.Constant; +using Oshima.FunGame.OshimaModules.Effects.OpenEffects; + +namespace Oshima.FunGame.OshimaModules.Effects.PassiveEffects +{ + public class 持续回复 : Effect + { + public override long Id => (long)PassiveEffectID.持续回复; + public override string Name => "持续回复"; + public override string Description => $"此角色处于持续回复状态，每{GameplayEquilibriumConstant.InGameTime}回复 {(_isPercentage ? $"{_durationHealPercent * 100:0.##}% [ {Heal:0.##} ]" : Heal.ToString("0.##"))} 点当前生命值。来自：[ {Source} ] 的 [ {Skill.Name} ]"; + public override EffectType EffectType => EffectType.HealOverTime; + public override bool IsDebuff => false; + public override Character Source => _sourceCharacter; + public override bool Durative => _durative; + public override double Duration => _duration; + public override int DurationTurn => _durationTurn; + + private readonly Character _targetCharacter; + private readonly Character _sourceCharacter; + private readonly bool _durative; + private readonly double _duration; + private readonly int _durationTurn; + private readonly bool _isPercentage; + private readonly double _durationHeal; + private readonly double _durationHealPercent; + private double Heal => _isPercentage ? _targetCharacter.HP * _durationHealPercent : _durationHeal; + + public 持续回复(Skill skill, Character targetCharacter, Character sourceCharacter, bool durative = false, double duration = 0, int durationTurn = 1, + bool isPercentage = true, double durationHeal = 100, double durationHealPercent = 0.02) : base(skill) + { + GamingQueue = skill.GamingQueue; + _targetCharacter = targetCharacter; + _sourceCharacter = sourceCharacter; + _durative = durative; + _duration = duration; + _durationTurn = durationTurn; + _isPercentage = isPercentage; + _durationHeal = durationHeal; + _durationHealPercent = durationHealPercent; + } + + private double GetHeal(double hp, double elapsed) + { + if (hp <= 0) + { + return 0; + } + double heal = _isPercentage ? hp * _durationHealPercent : _durationHeal; + return heal * elapsed; + } + + public override void OnTimeElapsed(Character character, double elapsed) + { + if (character == _targetCharacter && character.HP > 0) + { + double hp = character.HP; + double heal = GetHeal(hp, elapsed); + if (elapsed > 1) + { + heal = 0; + int loop = 0; + int elapsedSecond = (int)elapsed; + for (; loop < elapsedSecond; loop++) + { + double current = GetHeal(hp, 1); + heal += current; + hp -= current; + elapsed--; + } + if (elapsed > 0) + { + heal += GetHeal(hp, elapsed); + } + } + HealToTarget(Source, character, heal, triggerEffects: false); + } + } + + public override void OnEffectGained(Character character) + { + if (_durative && RemainDuration == 0) + { + RemainDuration = Duration; + } + else if (RemainDurationTurn == 0) + { + RemainDurationTurn = DurationTurn; + } + AddEffectTypeToCharacter(character, [EffectType.HealOverTime]); + } + + public override void OnEffectLost(Character character) + { + RemoveEffectTypesFromCharacter(character); + } + } +} diff --git a/OshimaModules/Effects/PassiveEffects/标记.cs b/OshimaModules/Effects/PassiveEffects/标记.cs new file mode 100644 index 0000000..5897433 --- /dev/null +++ b/OshimaModules/Effects/PassiveEffects/标记.cs @@ -0,0 +1,27 @@ +using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Library.Constant; +using Oshima.FunGame.OshimaModules.Effects.OpenEffects; + +namespace Oshima.FunGame.OshimaModules.Effects.PassiveEffects +{ + public class 标记 : Effect + { + public override long Id => (long)PassiveEffectID.标记; + public override string Name => $"{_name}标记"; + public override string Description => $"此角色持有{Name}。{OtherDescription}来自：[ {Source} ]"; + public override EffectType EffectType => EffectType.Mark; + public override bool IsDebuff => true; + public override Character Source => _sourceCharacter; + public string OtherDescription { get; set; } = ""; + + private readonly string _name; + private readonly Character _sourceCharacter; + + public 标记(Skill skill, string name, Character sourceCharacter) : base(skill) + { + GamingQueue = skill.GamingQueue; + _name = name; + _sourceCharacter = sourceCharacter; + } + } +} diff --git a/OshimaModules/Effects/PassiveEffects/海王星的野望标记.cs b/OshimaModules/Effects/PassiveEffects/海王星的野望标记.cs new file mode 100644 index 0000000..3ab6c7f --- /dev/null +++ b/OshimaModules/Effects/PassiveEffects/海王星的野望标记.cs @@ -0,0 +1,25 @@ +using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Library.Constant; +using Oshima.FunGame.OshimaModules.Effects.OpenEffects; + +namespace Oshima.FunGame.OshimaModules.Effects.PassiveEffects +{ + public class 海王星的野望标记 : Effect + { + public override long Id => (long)PassiveEffectID.海王星的野望标记; + public override string Name => "海王星的野望标记"; + public override string Description => $"此角色持有海王星的野望标记。来自：[ {Source} ]"; + public override EffectType EffectType => EffectType.Mark; + public override bool IsDebuff => true; + public override Character Source => _sourceCharacter; + public override DispelledType DispelledType => DispelledType.CannotBeDispelled; + + private readonly Character _sourceCharacter; + + public 海王星的野望标记(Skill skill, Character sourceCharacter) : base(skill) + { + GamingQueue = skill.GamingQueue; + _sourceCharacter = sourceCharacter; + } + } +} diff --git a/OshimaModules/Effects/PassiveEffects/禁止治疗.cs b/OshimaModules/Effects/PassiveEffects/禁止治疗.cs new file mode 100644 index 0000000..82f94fc --- /dev/null +++ b/OshimaModules/Effects/PassiveEffects/禁止治疗.cs @@ -0,0 +1,49 @@ +using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Library.Constant; +using Oshima.FunGame.OshimaModules.Effects.OpenEffects; + +namespace Oshima.FunGame.OshimaModules.Effects.PassiveEffects +{ + public class 禁止治疗 : Effect + { + public override long Id => (long)PassiveEffectID.禁止治疗; + public override string Name => "禁止治疗"; + public override string Description => $"此角色已被禁止治疗。来自：[ {Source} ] 的 [ {Skill.Name} ]"; + public override EffectType EffectType => EffectType.GrievousWound; + public override Character Source => _sourceCharacter; + public override bool Durative => _durative; + public override double Duration => _duration; + public override int DurationTurn => _durationTurn; + + private readonly Character _sourceCharacter; + private readonly bool _durative; + private readonly double _duration; + private readonly int _durationTurn; + + public 禁止治疗(Skill skill, Character sourceCharacter, bool durative = false, double duration = 0, int durationTurn = 1) : base(skill) + { + GamingQueue = skill.GamingQueue; + _sourceCharacter = sourceCharacter; + _durative = durative; + _duration = duration; + _durationTurn = durationTurn; + } + + public override bool BeforeApplyRecoveryAtTimeLapsing(Character character, ref double hr, ref double mr) + { + return true; + } + + public override void OnEffectGained(Character character) + { + if (_durative && RemainDuration == 0) + { + RemainDuration = Duration; + } + else if (RemainDurationTurn == 0) + { + RemainDurationTurn = DurationTurn; + } + } + } +} diff --git a/OshimaModules/Effects/PassiveEffects/迟滞.cs b/OshimaModules/Effects/PassiveEffects/迟滞.cs index b4b50ad..7f8d04f 100644 --- a/OshimaModules/Effects/PassiveEffects/迟滞.cs +++ b/OshimaModules/Effects/PassiveEffects/迟滞.cs @@ -1,4 +1,5 @@ using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Interface.Entity; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.OpenEffects; @@ -54,7 +55,6 @@ namespace Oshima.FunGame.OshimaModules.Effects.PassiveEffects { RemainDurationTurn = DurationTurn; } - GamingQueue?.ChangeCharacterHardnessTime(character, _hardnessReductionPercent, true, false); AddEffectTypeToCharacter(character, [EffectType.Slow]); } @@ -62,5 +62,10 @@ namespace Oshima.FunGame.OshimaModules.Effects.PassiveEffects { RemoveEffectTypesFromCharacter(character); } + + public void ApplyChange(Character character) + { + GamingQueue?.ChangeCharacterHardnessTime(character, _hardnessReductionPercent, true, false); + } } } diff --git a/OshimaModules/Effects/SkillEffects/施加概率负面.cs b/OshimaModules/Effects/SkillEffects/施加概率负面.cs index 04a8bd6..726550f3 100644 --- a/OshimaModules/Effects/SkillEffects/施加概率负面.cs +++ b/OshimaModules/Effects/SkillEffects/施加概率负面.cs @@ -1,4 +1,5 @@ using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Interface.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.PassiveEffects; @@ -154,6 +155,10 @@ namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects target.Effects.Add(e); e.OnEffectGained(target); GamingQueue?.LastRound.AddApplyEffects(target, e.EffectType); + if (e is 迟滞 cz) + { + cz.ApplyChange(target); + } } } } diff --git a/OshimaModules/Items/Consumable/复苏药.cs b/OshimaModules/Items/Consumable/复苏药.cs index 61278ed..8c26216 100644 --- a/OshimaModules/Items/Consumable/复苏药.cs +++ b/OshimaModules/Items/Consumable/复苏药.cs @@ -148,6 +148,7 @@ namespace Oshima.FunGame.OshimaModules.Items public override bool CanSelectTeammate => _canSelectTeammate; public override bool CanSelectEnemy => _canSelectEnemy; public override int CanSelectTargetCount => _canSelectCount; + public override bool AllowSelectDead => true; private readonly bool _canSelectAllTeammates; private readonly bool _canSelectAllEnemies; diff --git a/OshimaModules/Modules/CharacterModule.cs b/OshimaModules/Modules/CharacterModule.cs index 11747da..1cf86db 100644 --- a/OshimaModules/Modules/CharacterModule.cs +++ b/OshimaModules/Modules/CharacterModule.cs @@ -47,6 +47,9 @@ namespace Oshima.FunGame.OshimaModules 10 => new ColdBlue(), 11 => new dddovo(), 12 => new Quduoduo(), + 14 => new XReouni(), + 15 => new Neptune(), + 17 => new Ryuko(), _ => null, }; }; diff --git a/OshimaModules/Modules/SkillModule.cs b/OshimaModules/Modules/SkillModule.cs index bd1b659..af58d96 100644 --- a/OshimaModules/Modules/SkillModule.cs +++ b/OshimaModules/Modules/SkillModule.cs @@ -128,6 +128,9 @@ namespace Oshima.FunGame.OshimaModules (long)SuperSkillID.嗜血本能 => new 嗜血本能(), (long)SuperSkillID.平衡强化 => new 平衡强化(), (long)SuperSkillID.血之狂欢 => new 血之狂欢(), + (long)SuperSkillID.归元环 => new 归元环(), + (long)SuperSkillID.海王星的野望 => new 海王星的野望(), + (long)SuperSkillID.自我抉择 => new 自我抉择(), (long)PassiveID.META马 => new META马(), (long)PassiveID.心灵之火 => new 心灵之火(), (long)PassiveID.魔法震荡 => new 魔法震荡(), @@ -140,6 +143,9 @@ namespace Oshima.FunGame.OshimaModules (long)PassiveID.累积之压 => new 累积之压(), (long)PassiveID.敏捷之刃 => new 敏捷之刃(), (long)PassiveID.弱者猎手 => new 弱者猎手(), + (long)PassiveID.八卦阵 => new 八卦阵(), + (long)PassiveID.深海之戟 => new 深海之戟(), + (long)PassiveID.能量复苏 => new 能量复苏(), (long)PassiveID.征服者 => new 征服者(), (long)PassiveID.致命节奏 => new 致命节奏(), (long)PassiveID.强攻 => new 强攻(), diff --git a/OshimaModules/OshimaModules.csproj b/OshimaModules/OshimaModules.csproj index c113ba2..681b1bc 100644 --- a/OshimaModules/OshimaModules.csproj +++ b/OshimaModules/OshimaModules.csproj @@ -36,7 +36,6 @@ - diff --git a/OshimaModules/Skills/Neptune/海王星的野望.cs b/OshimaModules/Skills/Neptune/海王星的野望.cs new file mode 100644 index 0000000..453b4fe --- /dev/null +++ b/OshimaModules/Skills/Neptune/海王星的野望.cs @@ -0,0 +1,147 @@ +using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Library.Common.Addon; +using Milimoe.FunGame.Core.Library.Constant; +using Oshima.FunGame.OshimaModules.Effects.PassiveEffects; + +namespace Oshima.FunGame.OshimaModules.Skills +{ + public class 海王星的野望 : Skill + { + public override long Id => (long)SuperSkillID.海王星的野望; + public override string Name => "海王星的野望"; + public override string Description => Effects.Count > 0 ? Effects.First().Description : ""; + public override string DispelDescription => Effects.Count > 0 ? Effects.First().DispelDescription : ""; + public override double EPCost => 100; + public override double CD => 60; + public override double HardnessTime { get; set; } = 10; + public override bool CanSelectSelf => false; + public override bool CanSelectEnemy => true; + public override bool CanSelectTeammate => false; + public override int CanSelectTargetCount => 2; + public override bool IsNonDirectional => true; + public override int CanSelectTargetRange => 3; + + public 海王星的野望(Character? character = null) : base(SkillType.SuperSkill, character) + { + Effects.Add(new 海王星的野望特效(this)); + } + } + + public class 海王星的野望特效(Skill skill) : Effect(skill) + { + public override long Id => Skill.Id; + public override string Name => Skill.Name; + public override string Description => $"标记{Skill.TargetDescription()}，持续 {持续时间:0.##} {GameplayEquilibriumConstant.InGameTime}。立即对标记目标造成 {直接伤害:0.##} 点{CharacterSet.GetDamageTypeName(DamageType.Magical, MagicType)}。" + + $"在持续时间内{爆炸伤害描述}在此期间，你的力量提升 60% [ {力量提升:0.##} ]，并且 [ {nameof(深海之戟)} ] 改变为相同机制。无视免疫。"; + public override bool Durative => true; + public override double Duration => 持续时间; + public override DispelledType DispelledType => DispelledType.CannotBeDispelled; + public override MagicType MagicType => Skill.Character?.MagicType ?? MagicType.None; + public override ImmuneType IgnoreImmune => ImmuneType.All; + + public string 爆炸伤害描述 => $"对受到标记的目标造成伤害，有 {概率 * 100:0.##}% 概率产生爆炸，爆炸将产生 {分裂伤害系数 * 100:0.##}% 分裂伤害。分裂伤害为全图索敌，会优先分裂至两个在持续时间内对你造成伤害最多的敌人，若没有符合条件的敌人或敌人数量不足，则将分裂至至多两个随机的敌人。"; + public double 直接伤害 => 180 + 240 * (Skill.Level - 1); + public double 持续时间 => 25 + 2 * (Skill.Level - 1); + public double 概率 => 0.3 + 0.08 * (Skill.Level - 1); + public double 分裂伤害系数 => 0.4 + 0.07 * (Skill.Level - 1); + public double 力量提升 => 0.6 * (Skill.Character?.BaseSTR ?? 0); + public Dictionary 敌人伤害统计 { get; set; } = []; + + private double 实际力量提升 = 0; + + public override void OnEffectGained(Character character) + { + 实际力量提升 = 力量提升; + character.ExSTR += 实际力量提升; + if (character.Effects.Where(e => e is 深海之戟特效).FirstOrDefault() is 深海之戟特效 e) + { + e.野望 = this; + } + } + + public override void OnEffectLost(Character character) + { + character.ExSTR -= 实际力量提升; + if (character.Effects.Where(e => e is 深海之戟特效).FirstOrDefault() is 深海之戟特效 e) + { + e.野望 = null; + } + } + + public override void AfterDamageCalculation(Character character, Character enemy, double damage, double actualDamage, bool isNormalAttack, DamageType damageType, MagicType magicType, DamageResult damageResult) + { + if (enemy == Skill.Character) + { + if (!敌人伤害统计.TryAdd(character, actualDamage)) + { + 敌人伤害统计[character] += actualDamage; + } + } + + if (character == Skill.Character && (damageResult == DamageResult.Normal || damageResult == DamageResult.Critical) && enemy.Effects.FirstOrDefault(e => e is 海王星的野望标记) is 海王星的野望标记 e) + { + if (Random.Shared.NextDouble() < 概率) + { + 分裂伤害(character, enemy, actualDamage, damageType, magicType); + } + } + } + + public override void OnSkillCasted(Character caster, List targets, List grids, Dictionary others) + { + 实际力量提升 = 0; + RemainDuration = Duration; + if (!caster.Effects.Contains(this)) + { + caster.Effects.Add(this); + OnEffectGained(caster); + } + foreach (Character target in targets) + { + DamageToEnemy(caster, target, DamageType.Magical, MagicType, 直接伤害); + } + // 造成伤害之后再一起上标记，否则会立即触发标记特效 + foreach (Character target in targets) + { + Effect e = new 海王星的野望标记(Skill, caster) + { + Durative = true, + Duration = 持续时间, + RemainDuration = Duration + }; + target.Effects.Add(e); + e.OnEffectGained(target); + AddEffectTypeToCharacter(target, [e.EffectType]); + } + RecordCharacterApplyEffects(caster, EffectType.DamageBoost); + } + + public void 分裂伤害(Character character, Character enemy, double damage, DamageType damageType, MagicType magicType) + { + List targets = []; + targets.AddRange(敌人伤害统计.Where(w => w.Key != character && w.Key != enemy && w.Key.HP > 0).OrderByDescending(o => o.Value).Select(s => s.Key).Take(2)); + if (targets.Count < 2) + { + int count = 2 - targets.Count; + // 获取所有敌人 + List allEnemys = []; + if (GamingQueue != null) + { + allEnemys = [.. GamingQueue.GetEnemies(character).Where(c => c != character && c != enemy && !targets.Contains(c) && c.HP > 0)]; + targets.AddRange(allEnemys.OrderBy(o => Random.Shared.Next()).Take(count)); + } + } + damage *= 分裂伤害系数; + foreach (Character target in targets) + { + DamageToEnemy(character, target, damageType, magicType, damage, new() + { + CalculateCritical = false, + CalculateReduction = true, + TriggerEffects = false, + IgnoreImmune = true + }); + } + } + } +} diff --git a/OshimaModules/Skills/Neptune/深海之戟.cs b/OshimaModules/Skills/Neptune/深海之戟.cs index bd594e0..062e1c4 100644 --- a/OshimaModules/Skills/Neptune/深海之戟.cs +++ b/OshimaModules/Skills/Neptune/深海之戟.cs @@ -1,7 +1,7 @@ -using System; -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; +using Oshima.FunGame.OshimaModules.Effects.PassiveEffects; namespace Oshima.FunGame.OshimaModules.Skills { @@ -11,7 +11,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override string Name => "深海之戟"; public override string Description => Effects.Count > 0 ? Effects.First().Description : ""; public override string ExemptionDescription => Effects.Count > 0 ? Effects.First().ExemptionDescription : ""; - public override int CanSelectTargetRange => 3; + public override int CanSelectTargetRange => 5; public 深海之戟(Character? character = null) : base(SkillType.Passive, character) { @@ -33,7 +33,11 @@ namespace Oshima.FunGame.OshimaModules.Skills get { string str = $"分裂伤害：{分裂百分比 * 100:0.##}%。无视免疫。"; - if (GamingQueue?.Map != null) + if (野望 != null) + { + return $"技能机制受 [ {nameof(海王星的野望)} ] 影响而改变：{野望.爆炸伤害描述}{str}"; + } + else if (GamingQueue?.Map != null) { return $"普通攻击暴击时会自动产生分裂伤害至其附近半径为 {Skill.CanSelectTargetRange} 格的菱形区域内的敌人，但最多只会对两个敌人造成分裂伤害。{str}"; } @@ -45,13 +49,18 @@ namespace Oshima.FunGame.OshimaModules.Skills } public override ImmuneType IgnoreImmune => ImmuneType.All; - public double 分裂百分比 => 0.3 + (Skill.Character?.Level ?? 0) / 100; + public double 分裂百分比 => Math.Min(0.75, 0.3 + (Skill.Character?.Level ?? 0 + 0.00) / 100); + public 海王星的野望特效? 野望 { get; set; } = null; public override void AfterDamageCalculation(Character character, Character enemy, double damage, double actualDamage, bool isNormalAttack, DamageType damageType, MagicType magicType, DamageResult damageResult) { - if (character == Skill.Character && isNormalAttack && damageResult == DamageResult.Critical && GamingQueue != null) + if (野望 != null && enemy.Effects.FirstOrDefault(e => e is 海王星的野望标记) is 海王星的野望标记 e) { - List allEnemys = [.. GamingQueue.AllCharacters.Where(c => c != character && c != enemy && c.HP > 0 && !GamingQueue.IsTeammate(character, c))]; + 野望.分裂伤害(character, enemy, actualDamage, damageType, magicType); + } + else if (character == Skill.Character && isNormalAttack && damageResult == DamageResult.Critical && GamingQueue != null) + { + List allEnemys = [.. GamingQueue.GetEnemies(character).Where(c => c != character && c != enemy && c.HP > 0)]; List targets = []; if (GamingQueue?.Map is GameMap map) { @@ -71,7 +80,13 @@ namespace Oshima.FunGame.OshimaModules.Skills double 分裂伤害 = actualDamage * 分裂百分比; foreach (Character target in targets) { - DamageToEnemy(character, target, damageType, magicType, 分裂伤害, false, true); + DamageToEnemy(character, target, damageType, magicType, 分裂伤害, new() + { + CalculateCritical = false, + CalculateReduction = true, + TriggerEffects = false, + IgnoreImmune = true + }); } } } diff --git a/OshimaModules/Skills/Ryuko/能量复苏.cs b/OshimaModules/Skills/Ryuko/能量复苏.cs new file mode 100644 index 0000000..11d3939 --- /dev/null +++ b/OshimaModules/Skills/Ryuko/能量复苏.cs @@ -0,0 +1,41 @@ +using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Library.Constant; + +namespace Oshima.FunGame.OshimaModules.Skills +{ + public class 能量复苏 : Skill + { + public override long Id => (long)PassiveID.能量复苏; + public override string Name => "能量复苏"; + public override string Description => Effects.Count > 0 ? Effects.First().Description : ""; + + public 能量复苏(Character? character = null) : base(SkillType.Passive, character) + { + Effects.Add(new 能量复苏特效(this)); + } + + public override IEnumerable AddPassiveEffectToCharacter() + { + return Effects; + } + } + + public class 能量复苏特效(Skill skill) : Effect(skill) + { + public override long Id => Skill.Id; + public override string Name => Skill.Name; + public override string Description => $"处于正常态和吟唱态时，每秒回复 {回复系数 * 100:0.##}% 最大生命值 [ {Skill.Character?.MaxHP * 回复系数:0.##} ] 并获得 {能量获取:0.##} 点能量。"; + + public double 回复系数 { get; set; } = 0.02; + public double 能量获取 { get; set; } = 1; + + public override void OnTimeElapsed(Character character, double elapsed) + { + if (character.CharacterState == CharacterState.Actionable || character.CharacterState == CharacterState.Casting || character.CharacterState == CharacterState.PreCastSuperSkill) + { + character.HP += (Skill.Character?.MaxHP ?? 0) * 回复系数 * elapsed; + character.EP += 能量获取 * elapsed; + } + } + } +} diff --git a/OshimaModules/Skills/Ryuko/自我抉择.cs b/OshimaModules/Skills/Ryuko/自我抉择.cs new file mode 100644 index 0000000..733ab46 --- /dev/null +++ b/OshimaModules/Skills/Ryuko/自我抉择.cs @@ -0,0 +1,203 @@ +using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Interface.Entity; +using Milimoe.FunGame.Core.Library.Common.Addon; +using Milimoe.FunGame.Core.Library.Constant; +using Oshima.FunGame.OshimaModules.Effects.PassiveEffects; + +namespace Oshima.FunGame.OshimaModules.Skills +{ + public class 自我抉择 : Skill + { + public override long Id => (long)SuperSkillID.自我抉择; + public override string Name => "自我抉择"; + public override string Description => Effects.Count > 0 ? ((自我抉择特效)Effects.First()).通用描述 : ""; + public override string DispelDescription => Effects.Count > 0 ? Effects.First().DispelDescription : ""; + public override string ExemptionDescription => Effects.Count > 0 ? Effects.First().ExemptionDescription : ""; + public override double EPCost => 100; + public override double CD => 60; + public override double HardnessTime { get; set; } = 2; + public override bool CanSelectSelf => true; + public override bool CanSelectEnemy => false; + + public 自我抉择(Character? character = null) : base(SkillType.SuperSkill, character) + { + Effects.Add(new 自我抉择特效(this)); + } + } + + public class 自我抉择特效 : Effect + { + public override long Id => Skill.Id; + public override string Name => Skill.Name; + public override string Description { get; set; } = ""; + public override bool Durative => true; + public override DispelledType DispelledType => DispelledType.CannotBeDispelled; + public override string DispelDescription => $"被驱散性：所有回复/禁止回复不可驱散，攻击力加成不可驱散，嘲讽需强驱散"; + public override PrimaryAttribute ExemptionType => PrimaryAttribute.AGI; + public override bool ExemptDuration => false; + + public string 通用描述 => $"你可以选择获得哪一种力量：\r\n{熵核描述}\r\n{守护描述}"; + private string 熵核描述 => $"【熵核】加速生命回复，每{GameplayEquilibriumConstant.InGameTime}额外回复 {熵核额外回复 * 100:0.##}% 当前生命值 [ {Skill.Character?.HP * 熵核额外回复:0.##} ]，攻击力提升 {熵核攻击力提升 * 100:0.##}% [ {Skill.Character?.BaseATK * 熵核攻击力提升:0.##} ]，但是受到的伤害提升 {熵核受到伤害提升 * 100:0.##}%。" + + $"对敌人造成伤害会使其在 {熵核影响敌人时间:0.##} {GameplayEquilibriumConstant.InGameTime}内无法获得自然的生命和魔法回复，施加此状态时，只有目标的敏捷高于你的角色才能进行豁免检定。持续 {熵核持续时间:0.##} {GameplayEquilibriumConstant.InGameTime}。"; + private static double 熵核额外回复 => 0.04; + private double 熵核攻击力提升 => 0.2 + 0.1 * (Skill.Level - 1); + private double 熵核受到伤害提升 => 0.15 + 0.05 * (Skill.Level - 1); + private static double 熵核影响敌人时间 => 10; + private double 熵核持续时间 => 15 + 2 * (Skill.Level - 1); + private string 守护描述 => $"【守护】极致地加速生命回复，每{GameplayEquilibriumConstant.InGameTime}额外回复 {守护额外回复 * 100:0.##}% 当前生命值 [ {Skill.Character?.HP * 守护额外回复:0.##} ]，为全体友方角色提供每{GameplayEquilibriumConstant.InGameTime}额外 {守护友方回复 * 100:0.##}% 当前生命值的生命回复，并嘲讽全体敌方角色，被嘲讽的角色仅能将你作为攻击目标。" + + $"施加嘲讽状态时，只有目标的敏捷高于你的角色才能进行豁免检定。持续 {守护持续时间:0.##} {GameplayEquilibriumConstant.InGameTime}。"; + private double 守护额外回复 => 0.08 + 0.006 * (Skill.Level - 1); + private double 守护友方回复 => 0.01 + 0.01 * (Skill.Level - 1); + private double 守护持续时间 => 15 + 1 * (Skill.Level - 1); + private bool 选择熵核 { get; set; } = false; + + private double 实际攻击力提升 = 0; + private bool 实际选择熵核 = false; + + public 自我抉择特效(Skill skill) : base(skill) + { + Description = 通用描述; + } + + public override void OnEffectGained(Character character) + { + if (实际选择熵核) + { + 实际攻击力提升 = 熵核攻击力提升; + character.ExATKPercentage += 实际攻击力提升; + WriteLine($"[ {character} ] 的攻击力提升了 {实际攻击力提升 * 100:0.##}% [ {character.BaseATK * 实际攻击力提升:0.##} ] ！"); + } + } + + public override void OnEffectLost(Character character) + { + if (实际选择熵核) + { + character.ExATKPercentage -= 实际攻击力提升; + } + } + + public override double AlterActualDamageAfterCalculation(Character character, Character enemy, double damage, bool isNormalAttack, DamageType damageType, MagicType magicType, DamageResult damageResult, ref bool isEvaded, Dictionary totalDamageBonus) + { + if (实际选择熵核 && enemy == Skill.Character && (damageResult == DamageResult.Normal || damageResult == DamageResult.Critical)) + { + double bouns = -(damage * 熵核受到伤害提升); + WriteLine($"[ {enemy} ] 触发了自我抉择，额外受到 {Math.Abs(bouns):0.##} 伤害！"); + return bouns; + } + return 0; + } + + public override void AfterDamageCalculation(Character character, Character enemy, double damage, double actualDamage, bool isNormalAttack, DamageType damageType, MagicType magicType, DamageResult damageResult) + { + if (实际选择熵核 && character == Skill.Character && (damageResult == DamageResult.Normal || damageResult == DamageResult.Critical) && !CheckSkilledImmune(character, enemy, Skill)) + { + Effect e = new 禁止治疗(Skill, character, true, 熵核影响敌人时间, 0) + { + ExemptionType = PrimaryAttribute.AGI, + ExemptDuration = false, + DispelledType = DispelledType + }; + if (enemy.AGI <= character.AGI || (enemy.AGI > character.AGI && !CheckExemption(character, enemy, e))) + { + WriteLine($"[ {character} ] 对 [ {enemy} ] 施加了禁止治疗！！持续时间：{熵核影响敌人时间:0.##} {GameplayEquilibriumConstant.InGameTime}！"); + enemy.Effects.Add(e); + e.OnEffectGained(enemy); + GamingQueue?.LastRound.AddApplyEffects(enemy, e.EffectType); + } + } + } + + public override void OnCharacterInquiry(Character character, string topic, Dictionary args, Dictionary response) + { + if (topic == nameof(自我抉择)) + { + if (response.TryGetValue("result", out object? value) && value is bool choose) + { + 选择熵核 = choose; + } + else + { + 选择熵核 = Random.Shared.Next() % 2 == 0; + } + } + } + + public override void OnSkillCasted(Character caster, List targets, List grids, Dictionary others) + { + if (caster.Effects.Contains(this)) + { + OnEffectLost(caster); + caster.Effects.Remove(this); + } + caster.Effects.Add(this); + 实际攻击力提升 = 0; + Dictionary response = Inquiry(caster, nameof(自我抉择), new() + { + { "熵核", 熵核描述 }, + { "守护", 守护描述 }, + }); + 实际选择熵核 = 选择熵核; + Duration = 实际选择熵核 ? 熵核持续时间 : 守护持续时间; + RemainDuration = Duration; + OnEffectGained(caster); + if (实际选择熵核) + { + Description = $"作出抉择：{熵核描述}"; + Effect effect = new 持续回复(Skill, caster, caster, true, Duration, 0, true, 0, 熵核额外回复) + { + DispelledType = DispelledType + }; + WriteLine($"[ {caster} ] 获得了持续生命回复！持续时间：{Duration:0.##} {GameplayEquilibriumConstant.InGameTime}！"); + caster.Effects.Add(effect); + effect.OnEffectGained(caster); + GamingQueue?.LastRound.AddApplyEffects(caster, effect.EffectType); + } + else + { + Description = $"作出抉择：{守护描述}"; + Effect effect = new 持续回复(Skill, caster, caster, true, Duration, 0, true, 0, 守护额外回复) + { + DispelledType = DispelledType + }; + WriteLine($"[ {caster} ] 获得了持续生命回复！持续时间：{Duration:0.##} {GameplayEquilibriumConstant.InGameTime}！"); + caster.Effects.Add(effect); + effect.OnEffectGained(caster); + GamingQueue?.LastRound.AddApplyEffects(caster, effect.EffectType); + List allEnemys = []; + List allTeammates = []; + if (GamingQueue != null) + { + allEnemys = [.. GamingQueue.GetEnemies(caster).Where(c => c != caster && c.HP > 0)]; + allTeammates = [.. GamingQueue.GetTeammates(caster).Where(c => c != caster && c.HP > 0)]; + } + foreach (Character enemy in allEnemys) + { + Effect e = new 愤怒(Skill, caster, caster, true, Duration, 0) + { + DispelledType = DispelledType.CannotBeDispelled + }; + if (enemy.AGI <= caster.AGI || (enemy.AGI > caster.AGI && !CheckExemption(caster, enemy, e))) + { + WriteLine($"[ {caster} ] 嘲讽了 [ {enemy} ]，[ {enemy} ] 愤怒了！！持续时间：{Duration:0.##} {GameplayEquilibriumConstant.InGameTime}！"); + enemy.Effects.Add(e); + e.OnEffectGained(enemy); + GamingQueue?.LastRound.AddApplyEffects(enemy, e.EffectType); + } + } + foreach (Character teammate in allTeammates) + { + Effect e = new 持续回复(Skill, caster, caster, true, Duration, 0, true, 0, 守护友方回复) + { + DispelledType = DispelledType + }; + WriteLine($"[ {caster} ] 对 [ {teammate} ] 施加了持续生命回复！持续时间：{Duration:0.##} {GameplayEquilibriumConstant.InGameTime}！"); + teammate.Effects.Add(e); + e.OnEffectGained(teammate); + GamingQueue?.LastRound.AddApplyEffects(teammate, e.EffectType); + } + } + GamingQueue?.LastRound.AddApplyEffects(caster, EffectType.Focusing, EffectType.HealOverTime); + } + } +} diff --git a/OshimaModules/Skills/SkillExtension.cs b/OshimaModules/Skills/SkillExtension.cs index 959e034..5fd3137 100644 --- a/OshimaModules/Skills/SkillExtension.cs +++ b/OshimaModules/Skills/SkillExtension.cs @@ -1,5 +1,4 @@ -using System.Text; -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills @@ -8,7 +7,7 @@ namespace Oshima.FunGame.OshimaModules.Skills { public static string TargetDescription(this Skill skill) { - if (skill.IsNonDirectional) + if (skill.IsNonDirectional && skill.GamingQueue?.Map != null) { return skill.RangeTargetDescription(); } @@ -40,7 +39,7 @@ namespace Oshima.FunGame.OshimaModules.Skills str = $"{(skill.CanSelectTargetCount > 1 ? $"至多 {skill.CanSelectTargetCount} 个" : "")}目标"; } - if (skill.CanSelectTargetRange > 0) + if (skill.CanSelectTargetRange > 0 && skill.GamingQueue?.Map != null) { str += $"以及以{(skill.CanSelectTargetCount > 1 ? "这些" : "该")}目标为中心，半径为 {skill.CanSelectTargetRange} 格的菱形区域中的等同阵营角色"; } diff --git a/OshimaModules/Skills/XReouni/八卦阵.cs b/OshimaModules/Skills/XReouni/八卦阵.cs index d607812..0c43886 100644 --- a/OshimaModules/Skills/XReouni/八卦阵.cs +++ b/OshimaModules/Skills/XReouni/八卦阵.cs @@ -24,7 +24,7 @@ namespace Oshima.FunGame.OshimaModules.Skills { public override long Id => Skill.Id; public override string Name => Skill.Name; - public override string Description => $"每次造成伤害或受到伤害时，投掷 1d10，结果为偶数时，造成的伤害提升 {伤害提升 * 100:0.##}%，受到伤害减少 {伤害减少 * 100:0.##}%；反之不产生任何效果。"; + public override string Description => $"每次造成伤害或受到伤害时，进行投掷检定，结果为偶数时，造成的伤害提升 {伤害提升 * 100:0.##}%，受到伤害减少 {伤害减少 * 100:0.##}%；反之不产生任何效果。"; public bool 归元 { get; set; } = false; public double 伤害提升 { get; set; } = 1; @@ -33,32 +33,37 @@ namespace Oshima.FunGame.OshimaModules.Skills public override double AlterActualDamageAfterCalculation(Character character, Character enemy, double damage, bool isNormalAttack, DamageType damageType, MagicType magicType, DamageResult damageResult, ref bool isEvaded, Dictionary totalDamageBonus) { double bouns = 0; - if (damage > 0 && (归元 || (!归元 && Random.Shared.Next(10) % 2 == 0))) + if (character == Skill.Character) { - Character c = character; - if (character == Skill.Character) + bool result = 归元 || (!归元 && Random.Shared.Next(10) % 2 == 0); + WriteLine($"[ {character} ] 的八卦阵投掷结果为：{(result ? "偶数" : "奇数")}。"); + if (damage > 0 && result) { - bouns = damage * 伤害提升; - WriteLine($"[ {character} ] 发动了八卦阵！伤害提升了 {bouns:0.##} 点！"); - } - else if (enemy == Skill.Character) - { - c = enemy; - bouns = -(damage * 伤害减少); - WriteLine($"[ {character} ] 发动了八卦阵！伤害减少了 {bouns:0.##} 点！"); - } - if (归元) - { - WriteLine($"[ {character} ] 发动了归元环！冷却时间减少了 {归元环特效.冷却时间减少:0.##} {GameplayEquilibriumConstant.InGameTime}！"); - foreach (Skill s in c.Skills) + Character c = character; + if (character == Skill.Character) { - if (s.CurrentCD >= 归元环特效.冷却时间阈值) + bouns = damage * 伤害提升; + WriteLine($"[ {character} ] 发动了八卦阵！伤害提升了 {Math.Abs(bouns):0.##} 点！"); + } + else if (enemy == Skill.Character) + { + c = enemy; + bouns = -(damage * 伤害减少); + WriteLine($"[ {character} ] 发动了八卦阵！伤害减少了 {Math.Abs(bouns):0.##} 点！"); + } + if (归元) + { + WriteLine($"[ {character} ] 发动了归元环！冷却时间减少了 {归元环特效.冷却时间减少:0.##} {GameplayEquilibriumConstant.InGameTime}！"); + foreach (Skill s in c.Skills) { - s.CurrentCD -= 归元环特效.冷却时间减少; - if (s.CurrentCD < 0) + if (s.CurrentCD >= 归元环特效.冷却时间阈值) { - s.CurrentCD = 0; - s.Enable = true; + s.CurrentCD -= 归元环特效.冷却时间减少; + if (s.CurrentCD < 0) + { + s.CurrentCD = 0; + s.Enable = true; + } } } } diff --git a/OshimaModules/Skills/XReouni/归元环.cs b/OshimaModules/Skills/XReouni/归元环.cs index 652460c..9639a91 100644 --- a/OshimaModules/Skills/XReouni/归元环.cs +++ b/OshimaModules/Skills/XReouni/归元环.cs @@ -1,7 +1,6 @@ using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; -using Milimoe.FunGame.Core.Model; namespace Oshima.FunGame.OshimaModules.Skills { @@ -13,7 +12,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override string DispelDescription => Effects.Count > 0 ? Effects.First().DispelDescription : ""; public override double EPCost => 100; public override double CD => 60; - public override double HardnessTime { get; set; } = 10; + public override double HardnessTime { get; set; } = 8; public override bool CanSelectSelf => true; public override bool CanSelectEnemy => false; diff --git a/OshimaModules/Skills/XinYin/心灵之火.cs b/OshimaModules/Skills/XinYin/心灵之火.cs index 524365b..e7c484e 100644 --- a/OshimaModules/Skills/XinYin/心灵之火.cs +++ b/OshimaModules/Skills/XinYin/心灵之火.cs @@ -47,7 +47,7 @@ namespace Oshima.FunGame.OshimaModules.Skills WriteLine($"[ {character} ] 发动了心灵之火！额外进行一次普通攻击！"); 冷却时间 = 基础冷却时间; 是否是嵌套普通攻击 = true; - character.NormalAttack.Attack(GamingQueue, character, true, enemy); + character.NormalAttack.Attack(GamingQueue, character, null, enemy); } if (character == Skill.Character && 是否是嵌套普通攻击) diff --git a/OshimaModules/Skills/战技/双连击.cs b/OshimaModules/Skills/战技/双连击.cs index 8f2d4ae..cd4af20 100644 --- a/OshimaModules/Skills/战技/双连击.cs +++ b/OshimaModules/Skills/战技/双连击.cs @@ -46,10 +46,10 @@ namespace Oshima.FunGame.OshimaModules.Skills checkQuota = dp.CheckActionTypeQuota(CharacterActionType.NormalAttack); dp.AddActionType(CharacterActionType.NormalAttack, false); } - caster.NormalAttack.Attack(GamingQueue, caster, true, targets); + caster.NormalAttack.Attack(GamingQueue, caster, null, targets); if (checkQuota) { - caster.NormalAttack.Attack(GamingQueue, caster, true, targets); + caster.NormalAttack.Attack(GamingQueue, caster, null, targets); } } } diff --git a/OshimaModules/Skills/被动/征服者.cs b/OshimaModules/Skills/被动/征服者.cs index 1120d25..9697be2 100644 --- a/OshimaModules/Skills/被动/征服者.cs +++ b/OshimaModules/Skills/被动/征服者.cs @@ -48,7 +48,10 @@ namespace Oshima.FunGame.OshimaModules.Skills 是否是满层伤害 = true; 是否是叠加伤害 = true; WriteLine($"[ {character} ] 发动了征服者的满层效果！"); - DamageToEnemy(character, enemy, DamageType.True, magicType, 满层伤害); + DamageToEnemy(character, enemy, DamageType.True, magicType, 满层伤害, new() + { + TriggerEffects = false + }); ClearExPrimaryAttribute(character); 层数 = 0; 允许叠层 = false; @@ -79,7 +82,10 @@ namespace Oshima.FunGame.OshimaModules.Skills { 是否是叠加伤害 = true; WriteLine($"[ {character} ] 发动了征服者！"); - DamageToEnemy(character, enemy, DamageType.True, magicType, 真实伤害 * 层数); + DamageToEnemy(character, enemy, DamageType.True, magicType, 真实伤害 * 层数, new() + { + TriggerEffects = false + }); } } } diff --git a/OshimaModules/Skills/魔法/圣灵术.cs b/OshimaModules/Skills/魔法/圣灵术.cs index a455e3f..70acfad 100644 --- a/OshimaModules/Skills/魔法/圣灵术.cs +++ b/OshimaModules/Skills/魔法/圣灵术.cs @@ -18,6 +18,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override bool CanSelectEnemy => false; public override bool CanSelectTeammate => true; public override bool SelectAllTeammates => true; + public override bool AllowSelectDead => true; public 圣灵术(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaModules/Skills/魔法/复苏术.cs b/OshimaModules/Skills/魔法/复苏术.cs index 4b31350..26c64b9 100644 --- a/OshimaModules/Skills/魔法/复苏术.cs +++ b/OshimaModules/Skills/魔法/复苏术.cs @@ -18,6 +18,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public override bool CanSelectEnemy => false; public override bool CanSelectTeammate => true; public override int CanSelectTargetCount => 1; + public override bool AllowSelectDead => true; public 复苏术(Character? character = null) : base(SkillType.Magic, character) { diff --git a/OshimaServers/FastAutoServer.cs b/OshimaServers/FastAutoServer.cs index e16e776..1a4b059 100644 --- a/OshimaServers/FastAutoServer.cs +++ b/OshimaServers/FastAutoServer.cs @@ -250,7 +250,7 @@ namespace Oshima.FunGame.OshimaServers StringBuilder builder = new(); CharacterStatistics stats = actionQueue.CharacterStatistics[character]; builder.AppendLine($"{count++}. [ {character.ToStringWithLevel()} ] （{stats.Kills} / {stats.Assists}）"); - builder.AppendLine($"存活时长：{stats.LiveTime} / 存活回合数：{stats.LiveRound} / 行动回合数：{stats.ActionTurn}"); + builder.AppendLine($"存活时长：{stats.LiveTime} / 存活回合数：{stats.LiveRound} / 行动回合数：{stats.ActionTurn} / 总计决策数：{stats.TurnDecisions} / 总计决策点：{stats.UseDecisionPoints}"); builder.AppendLine($"总计伤害：{stats.TotalDamage} / 总计物理伤害：{stats.TotalPhysicalDamage} / 总计魔法伤害：{stats.TotalMagicDamage}"); builder.AppendLine($"总承受伤害：{stats.TotalTakenDamage} / 总承受物理伤害：{stats.TotalTakenPhysicalDamage} / 总承受魔法伤害：{stats.TotalTakenMagicDamage}"); builder.Append($"每秒伤害：{stats.DamagePerSecond} / 每回合伤害：{stats.DamagePerTurn}"); diff --git a/OshimaServers/Model/Cooperative.cs b/OshimaServers/Model/Cooperative.cs index 3d0e274..98b41e5 100644 --- a/OshimaServers/Model/Cooperative.cs +++ b/OshimaServers/Model/Cooperative.cs @@ -193,7 +193,7 @@ namespace Oshima.FunGame.OshimaServers.Model CharacterStatistics stats = actionQueue.GamingQueue.CharacterStatistics[character]; builder.AppendLine($"{index + ". "}[ {character.ToStringWithLevel()} ]"); builder.AppendLine($"技术得分：{stats.Rating:0.0#} / 击杀数：{stats.Kills} / 助攻数：{stats.Assists} / 死亡数：{stats.Deaths}"); - builder.AppendLine($"存活时长：{stats.LiveTime:0.##} / 存活回合数：{stats.LiveRound} / 行动回合数：{stats.ActionTurn}"); + builder.AppendLine($"存活时长：{stats.LiveTime:0.##} / 存活回合数：{stats.LiveRound} / 行动回合数：{stats.ActionTurn} / 总计决策数：{stats.TurnDecisions} / 总计决策点：{stats.UseDecisionPoints}"); builder.AppendLine($"控制时长：{stats.ControlTime:0.##} / 总计治疗：{stats.TotalHeal:0.##} / 护盾抵消：{stats.TotalShield:0.##}"); builder.AppendLine($"总计伤害：{stats.TotalDamage:0.##} / 总计物理伤害：{stats.TotalPhysicalDamage:0.##} / 总计魔法伤害：{stats.TotalMagicDamage:0.##}"); builder.AppendLine($"总承受伤害：{stats.TotalTakenDamage:0.##} / 总承受物理伤害：{stats.TotalTakenPhysicalDamage:0.##} / 总承受魔法伤害：{stats.TotalTakenMagicDamage:0.##}"); diff --git a/OshimaServers/Service/FunGameActionQueue.cs b/OshimaServers/Service/FunGameActionQueue.cs index f288471..57ab7e5 100644 --- a/OshimaServers/Service/FunGameActionQueue.cs +++ b/OshimaServers/Service/FunGameActionQueue.cs @@ -173,7 +173,7 @@ namespace Oshima.FunGame.OshimaServers.Service stats.MVPs++; mvpBuilder.AppendLine($"[ {mvp.ToStringWithLevel()} ]"); mvpBuilder.AppendLine($"技术得分：{stats.Rating:0.0#} / 击杀数：{stats.Kills} / 助攻数：{stats.Assists}{(actionQueue.MaxRespawnTimes != 0 ? " / 死亡数：" + stats.Deaths : "")}"); - mvpBuilder.AppendLine($"存活时长：{stats.LiveTime:0.##} / 存活回合数：{stats.LiveRound} / 行动回合数：{stats.ActionTurn}"); + mvpBuilder.AppendLine($"存活时长：{stats.LiveTime:0.##} / 存活回合数：{stats.LiveRound} / 行动回合数：{stats.ActionTurn} / 总计决策数：{stats.TurnDecisions} / 总计决策点：{stats.UseDecisionPoints}"); mvpBuilder.AppendLine($"控制时长：{stats.ControlTime:0.##} / 总计治疗：{stats.TotalHeal:0.##} / 护盾抵消：{stats.TotalShield:0.##}"); mvpBuilder.AppendLine($"总计伤害：{stats.TotalDamage:0.##} / 总计物理伤害：{stats.TotalPhysicalDamage:0.##} / 总计魔法伤害：{stats.TotalMagicDamage:0.##}"); mvpBuilder.AppendLine($"总承受伤害：{stats.TotalTakenDamage:0.##} / 总承受物理伤害：{stats.TotalTakenPhysicalDamage:0.##} / 总承受魔法伤害：{stats.TotalTakenMagicDamage:0.##}"); @@ -191,7 +191,7 @@ namespace Oshima.FunGame.OshimaServers.Service CharacterStatistics stats = actionQueue.CharacterStatistics[character]; builder.AppendLine($"{count + ". "}[ {character.ToStringWithLevel()} ]"); builder.AppendLine($"技术得分：{stats.Rating:0.0#} / 击杀数：{stats.Kills} / 助攻数：{stats.Assists}{(actionQueue.MaxRespawnTimes != 0 ? " / 死亡数：" + stats.Deaths : "")}"); - builder.AppendLine($"存活时长：{stats.LiveTime:0.##} / 存活回合数：{stats.LiveRound} / 行动回合数：{stats.ActionTurn}"); + builder.AppendLine($"存活时长：{stats.LiveTime:0.##} / 存活回合数：{stats.LiveRound} / 行动回合数：{stats.ActionTurn} / 总计决策数：{stats.TurnDecisions} / 总计决策点：{stats.UseDecisionPoints}"); builder.AppendLine($"控制时长：{stats.ControlTime:0.##} / 总计治疗：{stats.TotalHeal:0.##} / 护盾抵消：{stats.TotalShield:0.##}"); builder.AppendLine($"总计伤害：{stats.TotalDamage:0.##} / 总计物理伤害：{stats.TotalPhysicalDamage:0.##} / 总计魔法伤害：{stats.TotalMagicDamage:0.##}"); builder.AppendLine($"总承受伤害：{stats.TotalTakenDamage:0.##} / 总承受物理伤害：{stats.TotalTakenPhysicalDamage:0.##} / 总承受魔法伤害：{stats.TotalTakenMagicDamage:0.##}"); @@ -387,7 +387,7 @@ namespace Oshima.FunGame.OshimaServers.Service mvpBuilder.AppendLine($"=== 本场比赛最佳角色 ==="); mvpBuilder.AppendLine($"{(team != null ? "[ " + team.Name + " ] " : "")}[ {mvp.ToStringWithLevel()} ]"); mvpBuilder.AppendLine($"技术得分：{stats.Rating:0.0#} / 击杀数：{stats.Kills} / 助攻数：{stats.Assists}{(actionQueue.MaxRespawnTimes != 0 ? " / 死亡数：" + stats.Deaths : "")}"); - mvpBuilder.AppendLine($"存活时长：{stats.LiveTime:0.##} / 存活回合数：{stats.LiveRound} / 行动回合数：{stats.ActionTurn}"); + mvpBuilder.AppendLine($"存活时长：{stats.LiveTime:0.##} / 存活回合数：{stats.LiveRound} / 行动回合数：{stats.ActionTurn} / 总计决策数：{stats.TurnDecisions} / 总计决策点：{stats.UseDecisionPoints}"); mvpBuilder.AppendLine($"控制时长：{stats.ControlTime:0.##} / 总计治疗：{stats.TotalHeal:0.##} / 护盾抵消：{stats.TotalShield:0.##}"); mvpBuilder.AppendLine($"总计伤害：{stats.TotalDamage:0.##} / 总计物理伤害：{stats.TotalPhysicalDamage:0.##} / 总计魔法伤害：{stats.TotalMagicDamage:0.##}"); mvpBuilder.AppendLine($"总承受伤害：{stats.TotalTakenDamage:0.##} / 总承受物理伤害：{stats.TotalTakenPhysicalDamage:0.##} / 总承受魔法伤害：{stats.TotalTakenMagicDamage:0.##}"); diff --git a/OshimaServers/Service/FunGameService.cs b/OshimaServers/Service/FunGameService.cs index bd74969..0d997fc 100644 --- a/OshimaServers/Service/FunGameService.cs +++ b/OshimaServers/Service/FunGameService.cs @@ -45,13 +45,18 @@ namespace Oshima.FunGame.OshimaServers.Service FunGameConstant.Characters.Add(new ColdBlue()); FunGameConstant.Characters.Add(new dddovo()); FunGameConstant.Characters.Add(new Quduoduo()); + FunGameConstant.Characters.Add(new XReouni()); + FunGameConstant.Characters.Add(new Neptune()); + FunGameConstant.Characters.Add(new Ryuko()); FunGameConstant.Skills.AddRange([new 疾风步(), new 助威(), new 挑拨(), new 绞丝棍(), new 金刚击(), new 旋风轮(), new 双连击(), new 绝影(), new 胧(), new 魔眼(), new 天堂之吻(), new 回复弹(), new 养命功(), new 镜花水月(), new 剑风闪(), new 疾走(), new 闪现()]); - FunGameConstant.SuperSkills.AddRange([new 嗜血本能(), new 平衡强化(), new 绝对领域(), new 精准打击(), new 三重叠加(), new 变幻之心(), new 力量爆发(), new 能量毁灭(), new 血之狂欢(), new 迅捷之势(), new 天赐之力(), new 魔法涌流()]); + FunGameConstant.SuperSkills.AddRange([new 嗜血本能(), new 平衡强化(), new 绝对领域(), new 精准打击(), new 三重叠加(), new 变幻之心(), new 力量爆发(), new 能量毁灭(), new 血之狂欢(), + new 迅捷之势(), new 天赐之力(), new 魔法涌流(), new 归元环(), new 海王星的野望(), new 自我抉择()]); - FunGameConstant.PassiveSkills.AddRange([new META马(), new 心灵之火(), new 魔法震荡(), new 灵能反射(), new 智慧与力量(), new 致命打击(), new 毁灭之势(), new 枯竭打击(), new 破釜沉舟(), new 累积之压(), new 敏捷之刃(), new 弱者猎手()]); + FunGameConstant.PassiveSkills.AddRange([new META马(), new 心灵之火(), new 魔法震荡(), new 灵能反射(), new 智慧与力量(), new 致命打击(), new 毁灭之势(), new 枯竭打击(), new 破釜沉舟(), + new 累积之压(), new 敏捷之刃(), new 弱者猎手(), new 八卦阵(), new 深海之戟(), new 能量复苏()]); FunGameConstant.CommonPassiveSkills.AddRange([new 征服者(), new 致命节奏(), new 强攻(), new 电刑(), new 黑暗收割()]); @@ -1230,6 +1235,51 @@ namespace Oshima.FunGame.OshimaServers.Service }; character.Skills.Add(血之狂欢); } + + if (id == 14) + { + Skill 八卦阵 = new 八卦阵(character) + { + Level = passiveLevel + }; + character.Skills.Add(八卦阵); + + Skill 归元环 = new 归元环(character) + { + Level = superLevel + }; + character.Skills.Add(归元环); + } + + if (id == 15) + { + Skill 深海之戟 = new 深海之戟(character) + { + Level = passiveLevel + }; + character.Skills.Add(深海之戟); + + Skill 海王星的野望 = new 海王星的野望(character) + { + Level = superLevel + }; + character.Skills.Add(海王星的野望); + } + + if (id == 17) + { + Skill 能量复苏 = new 能量复苏(character) + { + Level = passiveLevel + }; + character.Skills.Add(能量复苏); + + Skill 自我抉择 = new 自我抉择(character) + { + Level = superLevel + }; + character.Skills.Add(自我抉择); + } } public static bool UseItem(Item item, int times, User user, IEnumerable targets, out string msg) @@ -1793,7 +1843,7 @@ namespace Oshima.FunGame.OshimaServers.Service } else { - baseScore = baseScore * 0.7 + 0.4 * (stats.Kills / (stats.Kills + stats.Deaths + 0.01)); + baseScore = baseScore * 0.9 + 0.6 * (stats.Kills / (stats.Kills + stats.Deaths + 0.01)); } // 伤害贡献 @@ -1819,16 +1869,12 @@ namespace Oshima.FunGame.OshimaServers.Service { if (stats.Assists > team.Score) stats.Assists = team.Score; teamContribution = (stats.Kills + stats.Assists) / (team.Score + 0.01); - if (team.IsWinner) - { - teamContribution += 0.15; - } } // 权重设置 - double k = stats.Deaths > 0 ? 0.2 : 0.075; // 伤害贡献权重 - double l = stats.Deaths > 0 ? 0.2 : 0.05; // 存活时间权重 - double t = stats.Deaths > 0 ? 0.2 : 0.075; // 参团率权重 + double k = stats.Deaths == 0 ? 0.2 : 0.075; // 伤害贡献权重 + double l = stats.Deaths == 0 ? 0.2 : 0.05; // 存活时间权重 + double t = stats.Deaths == 0 ? 0.2 : 0.075; // 参团率权重 // 计算最终评分 double rating = baseScore + k * damageContribution + l * liveTimeContribution + t * teamContribution; diff --git a/OshimaServers/Service/FunGameSimulation.cs b/OshimaServers/Service/FunGameSimulation.cs index 6ed37d9..06d8709 100644 --- a/OshimaServers/Service/FunGameSimulation.cs +++ b/OshimaServers/Service/FunGameSimulation.cs @@ -88,32 +88,15 @@ namespace Oshima.FunGame.OshimaServers.Service // M = 5, W = 0, P1 = 0, P3 = 2 // M = 5, W = 1, P1 = 0, P3 = 0 - List list = [.. FunGameConstant.Characters]; + List list = [.. FunGameConstant.Characters.Select(c => c.Copy())]; - if (list.Count > 11) + if (list.Count > 10) { if (PrintOut) Console.WriteLine(); if (PrintOut) Console.WriteLine("Start!!!"); if (PrintOut) Console.WriteLine(); - Character character1 = list[0].Copy(); - Character character2 = list[1].Copy(); - Character character3 = list[2].Copy(); - Character character4 = list[3].Copy(); - Character character5 = list[4].Copy(); - Character character6 = list[5].Copy(); - Character character7 = list[6].Copy(); - Character character8 = list[7].Copy(); - Character character9 = list[8].Copy(); - Character character10 = list[9].Copy(); - Character character11 = list[10].Copy(); - Character character12 = list[11].Copy(); - - List characters = [ - character1, character2, character3, character4, - character5, character6, character7, character8, - character9, character10, character11, character12 - ]; + List characters = [.. list.OrderBy(o => Random.Shared.Next()).Take(10)]; int clevel = 10; int slevel = 2; @@ -410,7 +393,7 @@ namespace Oshima.FunGame.OshimaServers.Service double timeLapse = actionQueue.TimeLapse(); totalTime = actionQueue.TotalTime; nextDropTime -= timeLapse; - Thread.Sleep(1); + //Thread.Sleep(1); if (roundMsg != "") { @@ -483,7 +466,7 @@ namespace Oshima.FunGame.OshimaServers.Service stats.MVPs++; mvpBuilder.AppendLine($"{(tgq != null ? "[ " + tgq.GetTeamFromEliminated(mvp)?.Name + " ] " : "")}[ {mvp.ToStringWithLevel()} ]"); mvpBuilder.AppendLine($"技术得分：{stats.Rating:0.0#} / 击杀数：{stats.Kills} / 助攻数：{stats.Assists}{(actionQueue.MaxRespawnTimes != 0 ? " / 死亡数：" + stats.Deaths : "")}"); - mvpBuilder.AppendLine($"存活时长：{stats.LiveTime:0.##} / 存活回合数：{stats.LiveRound} / 行动回合数：{stats.ActionTurn}"); + mvpBuilder.AppendLine($"存活时长：{stats.LiveTime:0.##} / 存活回合数：{stats.LiveRound} / 行动回合数：{stats.ActionTurn} / 总计决策数：{stats.TurnDecisions} / 总计决策点：{stats.UseDecisionPoints}"); mvpBuilder.AppendLine($"控制时长：{stats.ControlTime:0.##} / 总计治疗：{stats.TotalHeal:0.##} / 护盾抵消：{stats.TotalShield:0.##}"); mvpBuilder.AppendLine($"总计伤害：{stats.TotalDamage:0.##} / 总计物理伤害：{stats.TotalPhysicalDamage:0.##} / 总计魔法伤害：{stats.TotalMagicDamage:0.##}"); mvpBuilder.AppendLine($"总承受伤害：{stats.TotalTakenDamage:0.##} / 总承受物理伤害：{stats.TotalTakenPhysicalDamage:0.##} / 总承受魔法伤害：{stats.TotalTakenMagicDamage:0.##}"); @@ -546,7 +529,7 @@ namespace Oshima.FunGame.OshimaServers.Service CharacterStatistics stats = tgq.CharacterStatistics[character]; builder.AppendLine($"{(isWeb ? count + "." : ("[ " + tgq.GetTeamFromEliminated(character)?.Name + " ]" ?? ""))} [ {character.ToStringWithLevel()} ]"); builder.AppendLine($"技术得分：{stats.Rating:0.0#} / 击杀数：{stats.Kills} / 助攻数：{stats.Assists}{(tgq.MaxRespawnTimes != 0 ? " / 死亡数：" + stats.Deaths : "")}"); - builder.AppendLine($"存活时长：{stats.LiveTime:0.##} / 存活回合数：{stats.LiveRound} / 行动回合数：{stats.ActionTurn}"); + builder.AppendLine($"存活时长：{stats.LiveTime:0.##} / 存活回合数：{stats.LiveRound} / 行动回合数：{stats.ActionTurn} / 总计决策数：{stats.TurnDecisions} / 总计决策点：{stats.UseDecisionPoints}"); builder.AppendLine($"控制时长：{stats.ControlTime:0.##} / 总计治疗：{stats.TotalHeal:0.##} / 护盾抵消：{stats.TotalShield:0.##}"); builder.AppendLine($"总计伤害：{stats.TotalDamage:0.##} / 总计物理伤害：{stats.TotalPhysicalDamage:0.##} / 总计魔法伤害：{stats.TotalMagicDamage:0.##}"); builder.AppendLine($"总承受伤害：{stats.TotalTakenDamage:0.##} / 总承受物理伤害：{stats.TotalTakenPhysicalDamage:0.##} / 总承受魔法伤害：{stats.TotalTakenMagicDamage:0.##}"); @@ -579,7 +562,7 @@ namespace Oshima.FunGame.OshimaServers.Service CharacterStatistics stats = actionQueue.CharacterStatistics[character]; builder.AppendLine($"{(isWeb ? count + ". " : "")}[ {character.ToStringWithLevel()} ]"); builder.AppendLine($"技术得分：{stats.Rating:0.0#} / 击杀数：{stats.Kills} / 助攻数：{stats.Assists}{(actionQueue.MaxRespawnTimes != 0 ? " / 死亡数：" + stats.Deaths : "")}"); - builder.AppendLine($"存活时长：{stats.LiveTime:0.##} / 存活回合数：{stats.LiveRound} / 行动回合数：{stats.ActionTurn}"); + builder.AppendLine($"存活时长：{stats.LiveTime:0.##} / 存活回合数：{stats.LiveRound} / 行动回合数：{stats.ActionTurn} / 总计决策数：{stats.TurnDecisions} / 总计决策点：{stats.UseDecisionPoints}"); builder.AppendLine($"控制时长：{stats.ControlTime:0.##} / 总计治疗：{stats.TotalHeal:0.##} / 护盾抵消：{stats.TotalShield:0.##}"); builder.AppendLine($"总计伤害：{stats.TotalDamage:0.##} / 总计物理伤害：{stats.TotalPhysicalDamage:0.##} / 总计魔法伤害：{stats.TotalMagicDamage:0.##}"); builder.AppendLine($"总承受伤害：{stats.TotalTakenDamage:0.##} / 总承受物理伤害：{stats.TotalTakenPhysicalDamage:0.##} / 总承受魔法伤害：{stats.TotalTakenMagicDamage:0.##}"); @@ -1160,6 +1143,8 @@ namespace Oshima.FunGame.OshimaServers.Service totalStats.Top3s += stats.Top3s; totalStats.Loses += stats.Loses; totalStats.MVPs += stats.MVPs; + totalStats.UseDecisionPoints += stats.UseDecisionPoints; + totalStats.TurnDecisions += stats.TurnDecisions; if (totalStats.Plays != 0) { totalStats.AvgDamage = Calculation.Round2Digits(totalStats.TotalDamage / totalStats.Plays); @@ -1179,6 +1164,8 @@ namespace Oshima.FunGame.OshimaServers.Service totalStats.AvgEarnedMoney = totalStats.TotalEarnedMoney / totalStats.Plays; totalStats.Winrate = Calculation.Round4Digits(Convert.ToDouble(totalStats.Wins) / Convert.ToDouble(totalStats.Plays)); totalStats.Top3rate = Calculation.Round4Digits(Convert.ToDouble(totalStats.Top3s) / Convert.ToDouble(totalStats.Plays)); + totalStats.AvgUseDecisionPoints = totalStats.UseDecisionPoints / totalStats.Plays; + totalStats.AvgTurnDecisions = totalStats.TurnDecisions / totalStats.Plays; } if (totalStats.LiveRound != 0) totalStats.DamagePerRound = Calculation.Round2Digits(totalStats.TotalDamage / totalStats.LiveRound); if (totalStats.ActionTurn != 0) totalStats.DamagePerTurn = Calculation.Round2Digits(totalStats.TotalDamage / totalStats.ActionTurn); diff --git a/OshimaWebAPI/Controllers/FunGameController.cs b/OshimaWebAPI/Controllers/FunGameController.cs index 8decbe8..e9bbf32 100644 --- a/OshimaWebAPI/Controllers/FunGameController.cs +++ b/OshimaWebAPI/Controllers/FunGameController.cs @@ -78,6 +78,8 @@ namespace Oshima.FunGame.WebAPI.Controllers builder.AppendLine($"每回合伤害：{stats.DamagePerRound:0.##}"); builder.AppendLine($"每行动回合伤害：{stats.DamagePerTurn:0.##}"); builder.AppendLine($"每秒伤害：{stats.DamagePerSecond:0.##}"); + builder.AppendLine($"总计回合决策数：{stats.TurnDecisions:0.##} / 场均：{stats.AvgTurnDecisions:0.##}"); + builder.AppendLine($"总计使用决策点：{stats.UseDecisionPoints:0.##} / 场均：{stats.AvgUseDecisionPoints:0.##}"); builder.AppendLine($"总计击杀数：{stats.Kills}" + (stats.Plays != 0 ? $" / 场均：{(double)stats.Kills / stats.Plays:0.##}" : "")); builder.AppendLine($"总计死亡数：{stats.Deaths}" + (stats.Plays != 0 ? $" / 场均：{(double)stats.Deaths / stats.Plays:0.##}" : "")); builder.AppendLine($"击杀死亡比：{(stats.Deaths == 0 ? stats.Kills : ((double)stats.Kills / stats.Deaths)):0.##}"); @@ -137,6 +139,8 @@ namespace Oshima.FunGame.WebAPI.Controllers builder.AppendLine($"每回合伤害：{stats.DamagePerRound:0.##}"); builder.AppendLine($"每行动回合伤害：{stats.DamagePerTurn:0.##}"); builder.AppendLine($"每秒伤害：{stats.DamagePerSecond:0.##}"); + builder.AppendLine($"总计回合决策数：{stats.TurnDecisions:0.##} / 场均：{stats.AvgTurnDecisions:0.##}"); + builder.AppendLine($"总计使用决策点：{stats.UseDecisionPoints:0.##} / 场均：{stats.AvgUseDecisionPoints:0.##}"); builder.AppendLine($"总计击杀数：{stats.Kills}" + (stats.Plays != 0 ? $" / 场均：{(double)stats.Kills / stats.Plays:0.##}" : "")); builder.AppendLine($"总计死亡数：{stats.Deaths}" + (stats.Plays != 0 ? $" / 场均：{(double)stats.Deaths / stats.Plays:0.##}" : "")); builder.AppendLine($"击杀死亡比：{(stats.Deaths == 0 ? stats.Kills : ((double)stats.Kills / stats.Deaths)):0.##}"); @@ -4557,52 +4561,63 @@ namespace Oshima.FunGame.WebAPI.Controllers } [HttpPost("signin")] - public string SignIn([FromQuery] long? uid = null) + public string SignIn([FromQuery] long uid = 0) { - long userid = uid ?? Convert.ToInt64("10" + Verification.CreateVerifyCode(VerifyCodeType.NumberVerifyCode, 11)); - - PluginConfig pc = FunGameService.GetUserConfig(userid, out _); - - if (pc.Count > 0) + try { - User user = FunGameService.GetUser(pc); - bool sign = false; - int days = 0; - DateTime lastTime = DateTime.MinValue; - DateTime newLastTime = DateTime.Now; - if (pc.TryGetValue("signed", out object? value) && value is bool temp && temp) - { - sign = true; - } - if (pc.TryGetValue("days", out value) && int.TryParse(value.ToString(), out int temp2)) - { - days = temp2; - } + PluginConfig pc = FunGameService.GetUserConfig(uid, out _); - if (pc.TryGetValue("lastTime", out value) && DateTime.TryParse(value.ToString(), out lastTime) && (newLastTime.Date - lastTime.Date).TotalDays > 1) + if (pc.Count > 0) { - days = 0; - } + string msg = ""; + User user = FunGameService.GetUser(pc); + bool sign = false; + int days = 0; + DateTime lastTime = DateTime.MinValue; + DateTime newLastTime = DateTime.Now; + if (pc.TryGetValue("signed", out object? value) && value is bool temp && temp) + { + sign = true; + } + if (pc.TryGetValue("days", out value) && int.TryParse(value.ToString(), out int temp2)) + { + days = temp2; + } - if (sign) + if (pc.TryGetValue("lastTime", out value) && DateTime.TryParse(value.ToString(), out lastTime) && (newLastTime.Date - lastTime.Date).TotalDays > 1) + { + days = 0; + } + + if (sign) + { + msg = $"你今天已经签过到了哦！" + + (lastTime != DateTime.MinValue ? $"\r\n你上一次签到时间：{lastTime.ToString(General.GeneralDateTimeFormatChinese)}，连续签到：{days} 天。" : ""); + } + else + { + msg = FunGameService.GetSignInResult(user, days); + pc.Add("signed", true); + pc.Add("days", days + 1); + pc.Add("lastTime", newLastTime); + } + + FunGameService.SetUserConfigButNotRelease(uid, pc, user); + return msg + "\r\n提示：发送【帮助】来获取更多玩法指令！"; + } + else { - FunGameService.ReleaseUserSemaphoreSlim(userid); - return $"你今天已经签过到了哦！" + - (lastTime != DateTime.MinValue ? $"\r\n你上一次签到时间：{lastTime.ToString(General.GeneralDateTimeFormatChinese)}，连续签到：{days} 天。" : ""); + return noSaved; } - - string msg = FunGameService.GetSignInResult(user, days); - pc.Add("user", user); - pc.Add("signed", true); - pc.Add("days", days + 1); - pc.Add("lastTime", newLastTime); - FunGameService.SetUserConfigAndReleaseSemaphoreSlim(userid, pc, user); - return msg + "\r\n提示：发送【帮助】来获取更多玩法指令！"; } - else + catch (Exception e) { - FunGameService.ReleaseUserSemaphoreSlim(userid); - return noSaved; + if (Logger.IsEnabled(Microsoft.Extensions.Logging.LogLevel.Error)) Logger.LogError(e, "Error: {e}", e); + return busy; + } + finally + { + FunGameService.ReleaseUserSemaphoreSlim(uid); } }