From 4bdc3ae80fcb873d6ff46cfc1cf6c37d54633cdb Mon Sep 17 00:00:00 2001 From: milimoe Date: Thu, 5 Feb 2026 01:33:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=B8=85=E7=90=86=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OshimaModules/Effects/ItemEffects/GetEP.cs | 4 +- OshimaModules/Effects/ItemEffects/GetEXP.cs | 4 +- .../Effects/ItemEffects/RecoverHP.cs | 4 +- .../Effects/ItemEffects/RecoverHP2.cs | 4 +- .../Effects/ItemEffects/RecoverMP.cs | 4 +- .../Effects/ItemEffects/RecoverMP2.cs | 4 +- OshimaModules/Effects/PassiveEffects/迟滞.cs | 1 - .../Effects/SkillEffects/吸取生命值.cs | 1 - .../Effects/SkillEffects/吸取能量值.cs | 1 - .../Effects/SkillEffects/吸取魔法值.cs | 1 - .../Effects/SkillEffects/基于属性的伤害.cs | 4 +- .../基于攻击力的伤害_带基础伤害.cs | 4 +- .../基于攻击力的伤害_无基础伤害.cs | 4 +- .../SkillEffects/基于核心属性的伤害.cs | 4 +- .../Effects/SkillEffects/增加混合护盾值.cs | 4 +- .../SkillEffects/增加物理护盾_护盾值型.cs | 4 +- .../SkillEffects/增加物理护盾_特效持续型.cs | 4 +- .../SkillEffects/增加魔法护盾_护盾值型.cs | 4 +- .../SkillEffects/增加魔法护盾_特效持续型.cs | 4 +- .../Effects/SkillEffects/弱驱散特效.cs | 4 +- .../Effects/SkillEffects/强驱散特效.cs | 4 +- .../Effects/SkillEffects/打断施法.cs | 4 +- .../Effects/SkillEffects/提升友方行动速度.cs | 4 +- .../Effects/SkillEffects/施加免疫.cs | 4 +- .../Effects/SkillEffects/施加持续性弱驱散.cs | 4 +- .../Effects/SkillEffects/施加持续性强驱散.cs | 4 +- .../Effects/SkillEffects/施加概率增益.cs | 2 - .../Effects/SkillEffects/施加概率负面.cs | 1 - .../Effects/SkillEffects/百分比回复生命值.cs | 4 +- .../Effects/SkillEffects/纯数值伤害.cs | 4 +- .../Effects/SkillEffects/纯数值回复生命值.cs | 4 +- .../Effects/SkillEffects/造成封技.cs | 4 +- .../Effects/SkillEffects/造成眩晕.cs | 4 +- .../Effects/SkillEffects/造成虚弱.cs | 4 +- .../Effects/SkillEffects/降低敌方行动速度.cs | 4 +- .../Items/Accessory/糖糖一周年纪念饰品.cs | 4 +- .../Items/Armor/糖糖一周年纪念防具.cs | 2 +- OshimaModules/Items/GiftBox/礼包.cs | 3 +- OshimaModules/Modules/CharacterModule.cs | 2 +- OshimaModules/Skills/CHAOS/全军出击.cs | 3 +- OshimaModules/Skills/CHAOS/雇佣兵团.cs | 3 +- OshimaModules/Skills/MagicalGirl/少女绮想.cs | 3 +- OshimaModules/Skills/MagicalGirl/绝对领域.cs | 3 +- OshimaModules/Skills/Mayor/零式崩解.cs | 3 +- OshimaModules/Skills/Mayor/零式灭杀.cs | 3 +- OshimaModules/Skills/NanGanyu/三相灵枢.cs | 3 +- OshimaModules/Skills/Neptune/海王星的野望.cs | 3 +- OshimaModules/Skills/Oshima/熵灭极诣.cs | 3 +- OshimaModules/Skills/QWQAQW/破釜沉舟.cs | 3 +- OshimaModules/Skills/QingXiang/残香凋零.cs | 3 +- OshimaModules/Skills/Ryuko/不息之流.cs | 3 +- OshimaModules/Skills/Ryuko/宿命之潮.cs | 3 +- OshimaModules/Skills/ShiYu/开宫.cs | 3 +- OshimaModules/Skills/ShiYu/放监.cs | 4 +- OshimaModules/Skills/SkillExtension.cs | 122 ------------------ OshimaModules/Skills/TheGodK/概念之骰.cs | 3 +- OshimaModules/Skills/TheGodK/神之因果.cs | 3 +- OshimaModules/Skills/XinYin/千羽瞬华.cs | 19 ++- OshimaModules/Skills/Yang/咒怨洪流.cs | 3 +- OshimaModules/Skills/dddovo/银隼之赐.cs | 3 +- OshimaModules/Skills/战技/回复弹.cs | 1 - OshimaModules/Skills/战技/金刚击.cs | 2 +- OshimaModules/Skills/战技/闪现.cs | 1 - OshimaModules/Skills/被动/黑暗收割.cs | 3 +- OshimaModules/Skills/魔法/时间减速复.cs | 3 +- OshimaModules/Skills/魔法/时间减速改.cs | 3 +- OshimaModules/Skills/魔法/时间加速复.cs | 3 +- OshimaModules/Skills/魔法/时间加速改.cs | 3 +- OshimaModules/Skills/魔法/根源屏障.cs | 3 +- OshimaModules/Skills/魔法/灾难冲击波.cs | 3 +- OshimaModules/Skills/魔法/银色荆棘.cs | 3 +- OshimaServers/AnonymousServer.cs | 2 - OshimaServers/Service/FunGameService.cs | 2 +- .../Controllers/ActivityController.cs | 2 - OshimaWebAPI/Controllers/FunGameController.cs | 2 +- OshimaWebAPI/OshimaWebAPI.cs | 40 +++--- 76 files changed, 154 insertions(+), 255 deletions(-) delete mode 100644 OshimaModules/Skills/SkillExtension.cs diff --git a/OshimaModules/Effects/ItemEffects/GetEP.cs b/OshimaModules/Effects/ItemEffects/GetEP.cs index 63b49b3..08c90e2 100644 --- a/OshimaModules/Effects/ItemEffects/GetEP.cs +++ b/OshimaModules/Effects/ItemEffects/GetEP.cs @@ -1,8 +1,8 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.OpenEffects; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.ItemEffects { diff --git a/OshimaModules/Effects/ItemEffects/GetEXP.cs b/OshimaModules/Effects/ItemEffects/GetEXP.cs index 4f2496e..c65396b 100644 --- a/OshimaModules/Effects/ItemEffects/GetEXP.cs +++ b/OshimaModules/Effects/ItemEffects/GetEXP.cs @@ -1,8 +1,8 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.OpenEffects; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.ItemEffects { diff --git a/OshimaModules/Effects/ItemEffects/RecoverHP.cs b/OshimaModules/Effects/ItemEffects/RecoverHP.cs index f212a9a..b4a2e1d 100644 --- a/OshimaModules/Effects/ItemEffects/RecoverHP.cs +++ b/OshimaModules/Effects/ItemEffects/RecoverHP.cs @@ -1,8 +1,8 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.OpenEffects; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.ItemEffects { diff --git a/OshimaModules/Effects/ItemEffects/RecoverHP2.cs b/OshimaModules/Effects/ItemEffects/RecoverHP2.cs index e4d0882..06c194c 100644 --- a/OshimaModules/Effects/ItemEffects/RecoverHP2.cs +++ b/OshimaModules/Effects/ItemEffects/RecoverHP2.cs @@ -1,8 +1,8 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.OpenEffects; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.ItemEffects { diff --git a/OshimaModules/Effects/ItemEffects/RecoverMP.cs b/OshimaModules/Effects/ItemEffects/RecoverMP.cs index dc206cb..5658bc2 100644 --- a/OshimaModules/Effects/ItemEffects/RecoverMP.cs +++ b/OshimaModules/Effects/ItemEffects/RecoverMP.cs @@ -1,8 +1,8 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.OpenEffects; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.ItemEffects { diff --git a/OshimaModules/Effects/ItemEffects/RecoverMP2.cs b/OshimaModules/Effects/ItemEffects/RecoverMP2.cs index 22c8e8a..fa4bc17 100644 --- a/OshimaModules/Effects/ItemEffects/RecoverMP2.cs +++ b/OshimaModules/Effects/ItemEffects/RecoverMP2.cs @@ -1,8 +1,8 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.OpenEffects; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.ItemEffects { diff --git a/OshimaModules/Effects/PassiveEffects/迟滞.cs b/OshimaModules/Effects/PassiveEffects/迟滞.cs index 88ce36b..e4316fa 100644 --- a/OshimaModules/Effects/PassiveEffects/迟滞.cs +++ b/OshimaModules/Effects/PassiveEffects/迟滞.cs @@ -1,5 +1,4 @@ using Milimoe.FunGame.Core.Entity; -using Milimoe.FunGame.Core.Interface.Entity; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.OpenEffects; diff --git a/OshimaModules/Effects/SkillEffects/吸取生命值.cs b/OshimaModules/Effects/SkillEffects/吸取生命值.cs index b2b0117..ca8620b 100644 --- a/OshimaModules/Effects/SkillEffects/吸取生命值.cs +++ b/OshimaModules/Effects/SkillEffects/吸取生命值.cs @@ -1,7 +1,6 @@ using Milimoe.FunGame.Core.Api.Utility; using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/吸取能量值.cs b/OshimaModules/Effects/SkillEffects/吸取能量值.cs index d3e7276..32f0b5b 100644 --- a/OshimaModules/Effects/SkillEffects/吸取能量值.cs +++ b/OshimaModules/Effects/SkillEffects/吸取能量值.cs @@ -1,7 +1,6 @@ using Milimoe.FunGame.Core.Api.Utility; using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/吸取魔法值.cs b/OshimaModules/Effects/SkillEffects/吸取魔法值.cs index 4b90d65..f71de8c 100644 --- a/OshimaModules/Effects/SkillEffects/吸取魔法值.cs +++ b/OshimaModules/Effects/SkillEffects/吸取魔法值.cs @@ -1,7 +1,6 @@ using Milimoe.FunGame.Core.Api.Utility; using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/基于属性的伤害.cs b/OshimaModules/Effects/SkillEffects/基于属性的伤害.cs index f1871fd..ff49206 100644 --- a/OshimaModules/Effects/SkillEffects/基于属性的伤害.cs +++ b/OshimaModules/Effects/SkillEffects/基于属性的伤害.cs @@ -1,7 +1,7 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/基于攻击力的伤害_带基础伤害.cs b/OshimaModules/Effects/SkillEffects/基于攻击力的伤害_带基础伤害.cs index 8dc6f44..aeab06f 100644 --- a/OshimaModules/Effects/SkillEffects/基于攻击力的伤害_带基础伤害.cs +++ b/OshimaModules/Effects/SkillEffects/基于攻击力的伤害_带基础伤害.cs @@ -1,7 +1,7 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/基于攻击力的伤害_无基础伤害.cs b/OshimaModules/Effects/SkillEffects/基于攻击力的伤害_无基础伤害.cs index f8444e8..cbf41a1 100644 --- a/OshimaModules/Effects/SkillEffects/基于攻击力的伤害_无基础伤害.cs +++ b/OshimaModules/Effects/SkillEffects/基于攻击力的伤害_无基础伤害.cs @@ -1,7 +1,7 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/基于核心属性的伤害.cs b/OshimaModules/Effects/SkillEffects/基于核心属性的伤害.cs index 0ced85f..7e71acc 100644 --- a/OshimaModules/Effects/SkillEffects/基于核心属性的伤害.cs +++ b/OshimaModules/Effects/SkillEffects/基于核心属性的伤害.cs @@ -1,7 +1,7 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/增加混合护盾值.cs b/OshimaModules/Effects/SkillEffects/增加混合护盾值.cs index 7fab1d5..b8ff225 100644 --- a/OshimaModules/Effects/SkillEffects/增加混合护盾值.cs +++ b/OshimaModules/Effects/SkillEffects/增加混合护盾值.cs @@ -1,7 +1,7 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/增加物理护盾_护盾值型.cs b/OshimaModules/Effects/SkillEffects/增加物理护盾_护盾值型.cs index c27111c..dbfab03 100644 --- a/OshimaModules/Effects/SkillEffects/增加物理护盾_护盾值型.cs +++ b/OshimaModules/Effects/SkillEffects/增加物理护盾_护盾值型.cs @@ -1,7 +1,7 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/增加物理护盾_特效持续型.cs b/OshimaModules/Effects/SkillEffects/增加物理护盾_特效持续型.cs index 02dc396..6b6486b 100644 --- a/OshimaModules/Effects/SkillEffects/增加物理护盾_特效持续型.cs +++ b/OshimaModules/Effects/SkillEffects/增加物理护盾_特效持续型.cs @@ -1,8 +1,8 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.PassiveEffects; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/增加魔法护盾_护盾值型.cs b/OshimaModules/Effects/SkillEffects/增加魔法护盾_护盾值型.cs index 39c8c96..b882d18 100644 --- a/OshimaModules/Effects/SkillEffects/增加魔法护盾_护盾值型.cs +++ b/OshimaModules/Effects/SkillEffects/增加魔法护盾_护盾值型.cs @@ -1,7 +1,7 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/增加魔法护盾_特效持续型.cs b/OshimaModules/Effects/SkillEffects/增加魔法护盾_特效持续型.cs index d671c41..9c163b0 100644 --- a/OshimaModules/Effects/SkillEffects/增加魔法护盾_特效持续型.cs +++ b/OshimaModules/Effects/SkillEffects/增加魔法护盾_特效持续型.cs @@ -1,8 +1,8 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.PassiveEffects; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/弱驱散特效.cs b/OshimaModules/Effects/SkillEffects/弱驱散特效.cs index 679399e..0752c30 100644 --- a/OshimaModules/Effects/SkillEffects/弱驱散特效.cs +++ b/OshimaModules/Effects/SkillEffects/弱驱散特效.cs @@ -1,7 +1,7 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/强驱散特效.cs b/OshimaModules/Effects/SkillEffects/强驱散特效.cs index 023e725..16df340 100644 --- a/OshimaModules/Effects/SkillEffects/强驱散特效.cs +++ b/OshimaModules/Effects/SkillEffects/强驱散特效.cs @@ -1,7 +1,7 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/打断施法.cs b/OshimaModules/Effects/SkillEffects/打断施法.cs index 3e7c16f..f8aa343 100644 --- a/OshimaModules/Effects/SkillEffects/打断施法.cs +++ b/OshimaModules/Effects/SkillEffects/打断施法.cs @@ -1,7 +1,7 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/提升友方行动速度.cs b/OshimaModules/Effects/SkillEffects/提升友方行动速度.cs index f43b8e2..8995494 100644 --- a/OshimaModules/Effects/SkillEffects/提升友方行动速度.cs +++ b/OshimaModules/Effects/SkillEffects/提升友方行动速度.cs @@ -1,8 +1,8 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.OpenEffects; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/施加免疫.cs b/OshimaModules/Effects/SkillEffects/施加免疫.cs index 1613325..10b7aa6 100644 --- a/OshimaModules/Effects/SkillEffects/施加免疫.cs +++ b/OshimaModules/Effects/SkillEffects/施加免疫.cs @@ -1,8 +1,8 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.PassiveEffects; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/施加持续性弱驱散.cs b/OshimaModules/Effects/SkillEffects/施加持续性弱驱散.cs index 26604a6..4c8bc76 100644 --- a/OshimaModules/Effects/SkillEffects/施加持续性弱驱散.cs +++ b/OshimaModules/Effects/SkillEffects/施加持续性弱驱散.cs @@ -1,8 +1,8 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.PassiveEffects; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/施加持续性强驱散.cs b/OshimaModules/Effects/SkillEffects/施加持续性强驱散.cs index 7e0d464..8a36f6e 100644 --- a/OshimaModules/Effects/SkillEffects/施加持续性强驱散.cs +++ b/OshimaModules/Effects/SkillEffects/施加持续性强驱散.cs @@ -1,8 +1,8 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.PassiveEffects; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/施加概率增益.cs b/OshimaModules/Effects/SkillEffects/施加概率增益.cs index 5533658..e0c990c 100644 --- a/OshimaModules/Effects/SkillEffects/施加概率增益.cs +++ b/OshimaModules/Effects/SkillEffects/施加概率增益.cs @@ -2,9 +2,7 @@ using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; -using Milimoe.FunGame.Core.Model; using Oshima.FunGame.OshimaModules.Effects.PassiveEffects; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/施加概率负面.cs b/OshimaModules/Effects/SkillEffects/施加概率负面.cs index 22f9fe3..92e2ec7 100644 --- a/OshimaModules/Effects/SkillEffects/施加概率负面.cs +++ b/OshimaModules/Effects/SkillEffects/施加概率负面.cs @@ -4,7 +4,6 @@ using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Milimoe.FunGame.Core.Model; using Oshima.FunGame.OshimaModules.Effects.PassiveEffects; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/百分比回复生命值.cs b/OshimaModules/Effects/SkillEffects/百分比回复生命值.cs index ef8c62c..ee299a4 100644 --- a/OshimaModules/Effects/SkillEffects/百分比回复生命值.cs +++ b/OshimaModules/Effects/SkillEffects/百分比回复生命值.cs @@ -1,6 +1,6 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/纯数值伤害.cs b/OshimaModules/Effects/SkillEffects/纯数值伤害.cs index 35b75ba..e5f4686 100644 --- a/OshimaModules/Effects/SkillEffects/纯数值伤害.cs +++ b/OshimaModules/Effects/SkillEffects/纯数值伤害.cs @@ -1,7 +1,7 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/纯数值回复生命值.cs b/OshimaModules/Effects/SkillEffects/纯数值回复生命值.cs index 0d3a4ac..b41f4ff 100644 --- a/OshimaModules/Effects/SkillEffects/纯数值回复生命值.cs +++ b/OshimaModules/Effects/SkillEffects/纯数值回复生命值.cs @@ -1,6 +1,6 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/造成封技.cs b/OshimaModules/Effects/SkillEffects/造成封技.cs index 71ea8fe..23a8177 100644 --- a/OshimaModules/Effects/SkillEffects/造成封技.cs +++ b/OshimaModules/Effects/SkillEffects/造成封技.cs @@ -1,8 +1,8 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.PassiveEffects; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/造成眩晕.cs b/OshimaModules/Effects/SkillEffects/造成眩晕.cs index 7c00548..afde483 100644 --- a/OshimaModules/Effects/SkillEffects/造成眩晕.cs +++ b/OshimaModules/Effects/SkillEffects/造成眩晕.cs @@ -1,8 +1,8 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.PassiveEffects; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/造成虚弱.cs b/OshimaModules/Effects/SkillEffects/造成虚弱.cs index e753fce..f64f0ac 100644 --- a/OshimaModules/Effects/SkillEffects/造成虚弱.cs +++ b/OshimaModules/Effects/SkillEffects/造成虚弱.cs @@ -1,8 +1,8 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.PassiveEffects; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Effects/SkillEffects/降低敌方行动速度.cs b/OshimaModules/Effects/SkillEffects/降低敌方行动速度.cs index 9f38c36..f2a3c3c 100644 --- a/OshimaModules/Effects/SkillEffects/降低敌方行动速度.cs +++ b/OshimaModules/Effects/SkillEffects/降低敌方行动速度.cs @@ -1,8 +1,8 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.OpenEffects; -using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Effects.SkillEffects { diff --git a/OshimaModules/Items/Accessory/糖糖一周年纪念饰品.cs b/OshimaModules/Items/Accessory/糖糖一周年纪念饰品.cs index d20f3b8..415e271 100644 --- a/OshimaModules/Items/Accessory/糖糖一周年纪念饰品.cs +++ b/OshimaModules/Items/Accessory/糖糖一周年纪念饰品.cs @@ -5,7 +5,7 @@ using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Items { - public class 糖糖一周年纪念饰品1: Item + public class 糖糖一周年纪念饰品1 : Item { public override long Id => (long)AccessoryID.糖糖一周年纪念饰品1; public override string Name => "回忆糖纸"; @@ -49,7 +49,7 @@ namespace Oshima.FunGame.OshimaModules.Items } } - public class 糖糖一周年纪念饰品2: Item + public class 糖糖一周年纪念饰品2 : Item { public override long Id => (long)AccessoryID.糖糖一周年纪念饰品2; public override string Name => "蜂糖蜜酿"; diff --git a/OshimaModules/Items/Armor/糖糖一周年纪念防具.cs b/OshimaModules/Items/Armor/糖糖一周年纪念防具.cs index cac2b53..ca29fee 100644 --- a/OshimaModules/Items/Armor/糖糖一周年纪念防具.cs +++ b/OshimaModules/Items/Armor/糖糖一周年纪念防具.cs @@ -5,7 +5,7 @@ using Oshima.FunGame.OshimaModules.Skills; namespace Oshima.FunGame.OshimaModules.Items { - public class 糖糖一周年纪念防具: Item + public class 糖糖一周年纪念防具 : Item { public override long Id => (long)ArmorID.糖糖一周年纪念防具; public override string Name => "糖之誓约"; diff --git a/OshimaModules/Items/GiftBox/礼包.cs b/OshimaModules/Items/GiftBox/礼包.cs index dda3789..7060fcd 100644 --- a/OshimaModules/Items/GiftBox/礼包.cs +++ b/OshimaModules/Items/GiftBox/礼包.cs @@ -1,5 +1,4 @@ -using Milimoe.FunGame.Core.Api.Utility; -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Skills; diff --git a/OshimaModules/Modules/CharacterModule.cs b/OshimaModules/Modules/CharacterModule.cs index f9b1cdd..345762c 100644 --- a/OshimaModules/Modules/CharacterModule.cs +++ b/OshimaModules/Modules/CharacterModule.cs @@ -35,7 +35,7 @@ namespace Oshima.FunGame.OshimaModules } - protected override Factory.EntityFactoryDelegate EntityFactory() + protected override Factory.EntityFactoryDelegate CharacterFactory() { return (id, name, args) => { diff --git a/OshimaModules/Skills/CHAOS/全军出击.cs b/OshimaModules/Skills/CHAOS/全军出击.cs index f9dfba3..6965947 100644 --- a/OshimaModules/Skills/CHAOS/全军出击.cs +++ b/OshimaModules/Skills/CHAOS/全军出击.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; diff --git a/OshimaModules/Skills/CHAOS/雇佣兵团.cs b/OshimaModules/Skills/CHAOS/雇佣兵团.cs index f73c42d..3578dac 100644 --- a/OshimaModules/Skills/CHAOS/雇佣兵团.cs +++ b/OshimaModules/Skills/CHAOS/雇佣兵团.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Models; diff --git a/OshimaModules/Skills/MagicalGirl/少女绮想.cs b/OshimaModules/Skills/MagicalGirl/少女绮想.cs index 265287e..21a61e7 100644 --- a/OshimaModules/Skills/MagicalGirl/少女绮想.cs +++ b/OshimaModules/Skills/MagicalGirl/少女绮想.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills diff --git a/OshimaModules/Skills/MagicalGirl/绝对领域.cs b/OshimaModules/Skills/MagicalGirl/绝对领域.cs index bcd7e79..82e0b8b 100644 --- a/OshimaModules/Skills/MagicalGirl/绝对领域.cs +++ b/OshimaModules/Skills/MagicalGirl/绝对领域.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; diff --git a/OshimaModules/Skills/Mayor/零式崩解.cs b/OshimaModules/Skills/Mayor/零式崩解.cs index bd36674..549d968 100644 --- a/OshimaModules/Skills/Mayor/零式崩解.cs +++ b/OshimaModules/Skills/Mayor/零式崩解.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills diff --git a/OshimaModules/Skills/Mayor/零式灭杀.cs b/OshimaModules/Skills/Mayor/零式灭杀.cs index 35dc7b3..903ecd6 100644 --- a/OshimaModules/Skills/Mayor/零式灭杀.cs +++ b/OshimaModules/Skills/Mayor/零式灭杀.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; diff --git a/OshimaModules/Skills/NanGanyu/三相灵枢.cs b/OshimaModules/Skills/NanGanyu/三相灵枢.cs index e1a256a..a28d2cd 100644 --- a/OshimaModules/Skills/NanGanyu/三相灵枢.cs +++ b/OshimaModules/Skills/NanGanyu/三相灵枢.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; diff --git a/OshimaModules/Skills/Neptune/海王星的野望.cs b/OshimaModules/Skills/Neptune/海王星的野望.cs index cdb1b62..6ac5e1e 100644 --- a/OshimaModules/Skills/Neptune/海王星的野望.cs +++ b/OshimaModules/Skills/Neptune/海王星的野望.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.PassiveEffects; diff --git a/OshimaModules/Skills/Oshima/熵灭极诣.cs b/OshimaModules/Skills/Oshima/熵灭极诣.cs index 46efef3..2e964d0 100644 --- a/OshimaModules/Skills/Oshima/熵灭极诣.cs +++ b/OshimaModules/Skills/Oshima/熵灭极诣.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; diff --git a/OshimaModules/Skills/QWQAQW/破釜沉舟.cs b/OshimaModules/Skills/QWQAQW/破釜沉舟.cs index 20ec17f..ee2e82b 100644 --- a/OshimaModules/Skills/QWQAQW/破釜沉舟.cs +++ b/OshimaModules/Skills/QWQAQW/破釜沉舟.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.OpenEffects; diff --git a/OshimaModules/Skills/QingXiang/残香凋零.cs b/OshimaModules/Skills/QingXiang/残香凋零.cs index 94388c7..41131ac 100644 --- a/OshimaModules/Skills/QingXiang/残香凋零.cs +++ b/OshimaModules/Skills/QingXiang/残香凋零.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; diff --git a/OshimaModules/Skills/Ryuko/不息之流.cs b/OshimaModules/Skills/Ryuko/不息之流.cs index 2bbefbf..0429bf1 100644 --- a/OshimaModules/Skills/Ryuko/不息之流.cs +++ b/OshimaModules/Skills/Ryuko/不息之流.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills diff --git a/OshimaModules/Skills/Ryuko/宿命之潮.cs b/OshimaModules/Skills/Ryuko/宿命之潮.cs index 52a892c..31e6b68 100644 --- a/OshimaModules/Skills/Ryuko/宿命之潮.cs +++ b/OshimaModules/Skills/Ryuko/宿命之潮.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Milimoe.FunGame.Core.Model; diff --git a/OshimaModules/Skills/ShiYu/开宫.cs b/OshimaModules/Skills/ShiYu/开宫.cs index 58c19ad..26dbd15 100644 --- a/OshimaModules/Skills/ShiYu/开宫.cs +++ b/OshimaModules/Skills/ShiYu/开宫.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.PassiveEffects; diff --git a/OshimaModules/Skills/ShiYu/放监.cs b/OshimaModules/Skills/ShiYu/放监.cs index 0a3cde1..ff7f70d 100644 --- a/OshimaModules/Skills/ShiYu/放监.cs +++ b/OshimaModules/Skills/ShiYu/放监.cs @@ -1,7 +1,7 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; -using Milimoe.FunGame.Core.Model; using Oshima.FunGame.OshimaModules.Effects.PassiveEffects; namespace Oshima.FunGame.OshimaModules.Skills diff --git a/OshimaModules/Skills/SkillExtension.cs b/OshimaModules/Skills/SkillExtension.cs deleted file mode 100644 index 5d84219..0000000 --- a/OshimaModules/Skills/SkillExtension.cs +++ /dev/null @@ -1,122 +0,0 @@ -using Milimoe.FunGame.Core.Entity; -using Milimoe.FunGame.Core.Library.Constant; - -namespace Oshima.FunGame.OshimaModules.Skills -{ - public static class SkillExtension - { - public static string SkillOwner(this Skill skill, Character? character = null) - { - if (character is null && skill.Character is not null) - { - character = skill.Character; - } - if (character is null) - { - return "你"; - } - return character.NickName != "" ? character.NickName : character.GetName(); - } - - public static string TargetDescription(this Skill skill) - { - if (skill.IsNonDirectional && skill.GamingQueue?.Map != null) - { - return skill.RangeTargetDescription(); - } - - string str; - - if (skill.SelectAllTeammates) - { - str = "友方全体角色"; - } - else if (skill.SelectAllEnemies) - { - str = "敌方全体角色"; - } - else if (skill.CanSelectTeammate && !skill.CanSelectEnemy) - { - str = $"目标{(skill.CanSelectTargetCount > 1 ? $"至多 {skill.CanSelectTargetCount} 个" : "")}友方角色{(!skill.CanSelectSelf ? "（不可选择自身）" : "")}"; - } - else if (!skill.CanSelectTeammate && skill.CanSelectEnemy) - { - str = $"目标{(skill.CanSelectTargetCount > 1 ? $"至多 {skill.CanSelectTargetCount} 个" : "")}敌方角色"; - } - else if (!skill.CanSelectTeammate && !skill.CanSelectEnemy && skill.CanSelectSelf) - { - str = $"自身"; - } - else - { - str = $"{(skill.CanSelectTargetCount > 1 ? $"至多 {skill.CanSelectTargetCount} 个" : "")}目标"; - } - - if (skill.CanSelectTargetRange > 0 && skill.GamingQueue?.Map != null) - { - str += $"以及以{(skill.CanSelectTargetCount > 1 ? "这些" : "该")}目标为中心，半径为 {skill.CanSelectTargetRange} 格的菱形区域中的等同阵营角色"; - } - - return str; - } - - public static string RangeTargetDescription(this Skill skill) - { - string str = ""; - - int range = skill.CanSelectTargetRange; - if (range <= 0) - { - str = "目标地点"; - } - else - { - switch (skill.SkillRangeType) - { - case SkillRangeType.Diamond: - str = $"目标半径为 {skill.CanSelectTargetRange} 格的菱形区域"; - break; - case SkillRangeType.Circle: - str = $"目标半径为 {skill.CanSelectTargetRange} 格的圆形区域"; - break; - case SkillRangeType.Square: - str = $"目标边长为 {skill.CanSelectTargetRange * 2 + 1} 格的正方形区域"; - break; - case SkillRangeType.Line: - str = $"自身与目标地点之间的、宽度为 {skill.CanSelectTargetRange} 格的直线区域"; - break; - case SkillRangeType.LinePass: - str = $"自身与目标地点之间的、宽度为 {skill.CanSelectTargetRange} 格的直线区域以及贯穿该目标地点直至地图边缘的等宽直线区域"; - break; - case SkillRangeType.Sector: - str = $"目标最大半径为 {skill.CanSelectTargetRange} 格的扇形区域"; - break; - default: - break; - } - } - - if (skill.SelectIncludeCharacterGrid) - { - if (skill.CanSelectTeammate && !skill.CanSelectEnemy) - { - str = $"{str}中的所有友方角色{(!skill.CanSelectSelf ? "（包括自身）" : "")}"; - } - else if (!skill.CanSelectTeammate && skill.CanSelectEnemy) - { - str = $"{str}中的所有敌方角色"; - } - else - { - str = $"{str}中的所有角色"; - } - } - else - { - str = "一个不包含被角色占据的"; - } - - return str; - } - } -} diff --git a/OshimaModules/Skills/TheGodK/概念之骰.cs b/OshimaModules/Skills/TheGodK/概念之骰.cs index 6db4005..59cd5bd 100644 --- a/OshimaModules/Skills/TheGodK/概念之骰.cs +++ b/OshimaModules/Skills/TheGodK/概念之骰.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills diff --git a/OshimaModules/Skills/TheGodK/神之因果.cs b/OshimaModules/Skills/TheGodK/神之因果.cs index 62209f9..f65cf8b 100644 --- a/OshimaModules/Skills/TheGodK/神之因果.cs +++ b/OshimaModules/Skills/TheGodK/神之因果.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; diff --git a/OshimaModules/Skills/XinYin/千羽瞬华.cs b/OshimaModules/Skills/XinYin/千羽瞬华.cs index 98dde23..bb8f30e 100644 --- a/OshimaModules/Skills/XinYin/千羽瞬华.cs +++ b/OshimaModules/Skills/XinYin/千羽瞬华.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Milimoe.FunGame.Core.Model; @@ -38,14 +39,19 @@ namespace Oshima.FunGame.OshimaModules.Skills private double 攻击力提升 => 攻击力提升系数 * Skill.Character?.BaseATK ?? 0; private double 物理穿透提升 => Skill.Level > 0 ? 0.1 + 0.03 * (Skill.Level - 1) : 0.1; private double 闪避率提升 => Skill.Level > 0 ? 0.1 + 0.02 * (Skill.Level - 1) : 0.1; + private double 实际的攻击力提升 = 0; + private double 实际的物理穿透提升 = 0; + private double 实际的闪避率提升 = 0; public override void OnEffectGained(Character character) { 实际的攻击力提升 = 攻击力提升; + 实际的物理穿透提升 = 物理穿透提升; + 实际的闪避率提升 = 闪避率提升; character.ExATK2 += 实际的攻击力提升; - character.PhysicalPenetration += 物理穿透提升; - character.ExEvadeRate += 闪避率提升; + character.PhysicalPenetration += 实际的物理穿透提升; + character.ExEvadeRate += 实际的闪避率提升; if (character.Effects.Where(e => e is 心灵之弦特效).FirstOrDefault() is 心灵之弦特效 e) { e.基础冷却时间 = 3; @@ -56,8 +62,8 @@ namespace Oshima.FunGame.OshimaModules.Skills public override void OnEffectLost(Character character) { character.ExATK2 -= 实际的攻击力提升; - character.PhysicalPenetration -= 物理穿透提升; - character.ExEvadeRate -= 闪避率提升; + character.PhysicalPenetration -= 实际的物理穿透提升; + character.ExEvadeRate -= 实际的闪避率提升; if (character.Effects.Where(e => e is 心灵之弦特效).FirstOrDefault() is 心灵之弦特效 e) { e.基础冷却时间 = 10; @@ -86,6 +92,9 @@ namespace Oshima.FunGame.OshimaModules.Skills public override void OnSkillCasted(Character caster, List targets, List grids, Dictionary others) { + 实际的攻击力提升 = 0; + 实际的物理穿透提升 = 0; + 实际的闪避率提升 = 0; RemainDuration = Duration; if (!caster.Effects.Contains(this)) { diff --git a/OshimaModules/Skills/Yang/咒怨洪流.cs b/OshimaModules/Skills/Yang/咒怨洪流.cs index 3ca1f2e..884d3e9 100644 --- a/OshimaModules/Skills/Yang/咒怨洪流.cs +++ b/OshimaModules/Skills/Yang/咒怨洪流.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Interface.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; diff --git a/OshimaModules/Skills/dddovo/银隼之赐.cs b/OshimaModules/Skills/dddovo/银隼之赐.cs index 7c1602b..cb0b66b 100644 --- a/OshimaModules/Skills/dddovo/银隼之赐.cs +++ b/OshimaModules/Skills/dddovo/银隼之赐.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills diff --git a/OshimaModules/Skills/战技/回复弹.cs b/OshimaModules/Skills/战技/回复弹.cs index 4b59eb2..51cdd4d 100644 --- a/OshimaModules/Skills/战技/回复弹.cs +++ b/OshimaModules/Skills/战技/回复弹.cs @@ -1,6 +1,5 @@ using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; -using Oshima.FunGame.OshimaModules.Effects.OpenEffects; using Oshima.FunGame.OshimaModules.Effects.SkillEffects; namespace Oshima.FunGame.OshimaModules.Skills diff --git a/OshimaModules/Skills/战技/金刚击.cs b/OshimaModules/Skills/战技/金刚击.cs index 9214ef2..60c37c1 100644 --- a/OshimaModules/Skills/战技/金刚击.cs +++ b/OshimaModules/Skills/战技/金刚击.cs @@ -17,7 +17,7 @@ namespace Oshima.FunGame.OshimaModules.Skills public 金刚击(Character? character = null) : base(SkillType.Skill, character) { - Effects.Add(new 基于攻击力的伤害_带基础伤害(this, 65, 65, 0.09,0.04, DamageType.Physical)); + Effects.Add(new 基于攻击力的伤害_带基础伤害(this, 65, 65, 0.09, 0.04, DamageType.Physical)); Effects.Add(new 打断施法(this)); } } diff --git a/OshimaModules/Skills/战技/闪现.cs b/OshimaModules/Skills/战技/闪现.cs index 5455744..5f2e7dc 100644 --- a/OshimaModules/Skills/战技/闪现.cs +++ b/OshimaModules/Skills/战技/闪现.cs @@ -1,5 +1,4 @@ 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 Milimoe.FunGame.Core.Model; diff --git a/OshimaModules/Skills/被动/黑暗收割.cs b/OshimaModules/Skills/被动/黑暗收割.cs index ca8b272..5a71297 100644 --- a/OshimaModules/Skills/被动/黑暗收割.cs +++ b/OshimaModules/Skills/被动/黑暗收割.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Constant; namespace Oshima.FunGame.OshimaModules.Skills diff --git a/OshimaModules/Skills/魔法/时间减速复.cs b/OshimaModules/Skills/魔法/时间减速复.cs index bcb21d1..f27eb6c 100644 --- a/OshimaModules/Skills/魔法/时间减速复.cs +++ b/OshimaModules/Skills/魔法/时间减速复.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.OpenEffects; diff --git a/OshimaModules/Skills/魔法/时间减速改.cs b/OshimaModules/Skills/魔法/时间减速改.cs index 427c95b..73a2540 100644 --- a/OshimaModules/Skills/魔法/时间减速改.cs +++ b/OshimaModules/Skills/魔法/时间减速改.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.OpenEffects; diff --git a/OshimaModules/Skills/魔法/时间加速复.cs b/OshimaModules/Skills/魔法/时间加速复.cs index f55e88e..74e8e8b 100644 --- a/OshimaModules/Skills/魔法/时间加速复.cs +++ b/OshimaModules/Skills/魔法/时间加速复.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.OpenEffects; diff --git a/OshimaModules/Skills/魔法/时间加速改.cs b/OshimaModules/Skills/魔法/时间加速改.cs index 8dbc6e9..d7e53ed 100644 --- a/OshimaModules/Skills/魔法/时间加速改.cs +++ b/OshimaModules/Skills/魔法/时间加速改.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.OpenEffects; diff --git a/OshimaModules/Skills/魔法/根源屏障.cs b/OshimaModules/Skills/魔法/根源屏障.cs index b4f2d03..540fd6b 100644 --- a/OshimaModules/Skills/魔法/根源屏障.cs +++ b/OshimaModules/Skills/魔法/根源屏障.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.SkillEffects; diff --git a/OshimaModules/Skills/魔法/灾难冲击波.cs b/OshimaModules/Skills/魔法/灾难冲击波.cs index b3e95e1..3192563 100644 --- a/OshimaModules/Skills/魔法/灾难冲击波.cs +++ b/OshimaModules/Skills/魔法/灾难冲击波.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.OpenEffects; diff --git a/OshimaModules/Skills/魔法/银色荆棘.cs b/OshimaModules/Skills/魔法/银色荆棘.cs index 54255cf..f70ed7d 100644 --- a/OshimaModules/Skills/魔法/银色荆棘.cs +++ b/OshimaModules/Skills/魔法/银色荆棘.cs @@ -1,4 +1,5 @@ -using Milimoe.FunGame.Core.Entity; +using Milimoe.FunGame.Core.Api.Utility; +using Milimoe.FunGame.Core.Entity; using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.FunGame.OshimaModules.Effects.PassiveEffects; diff --git a/OshimaServers/AnonymousServer.cs b/OshimaServers/AnonymousServer.cs index 194fcc9..22fcb2b 100644 --- a/OshimaServers/AnonymousServer.cs +++ b/OshimaServers/AnonymousServer.cs @@ -5,9 +5,7 @@ using Milimoe.FunGame.Core.Library.Common.Addon; using Milimoe.FunGame.Core.Library.Constant; using Oshima.Core.Configs; using Oshima.Core.Constant; -using Oshima.FunGame.OshimaModules.Models; using Oshima.FunGame.OshimaServers.Service; -using TaskScheduler = Milimoe.FunGame.Core.Api.Utility.TaskScheduler; namespace Oshima.FunGame.OshimaServers { diff --git a/OshimaServers/Service/FunGameService.cs b/OshimaServers/Service/FunGameService.cs index de16a17..998f7fb 100644 --- a/OshimaServers/Service/FunGameService.cs +++ b/OshimaServers/Service/FunGameService.cs @@ -5053,7 +5053,7 @@ namespace Oshima.FunGame.OshimaServers.Service } foreach (Activity activity in userActivities.Values) { - if (SettleQuest(user, activity.Quests, activity)) + if (SettleQuest(user, activity.Quests, activity)) { updateQuest = true; } diff --git a/OshimaWebAPI/Controllers/ActivityController.cs b/OshimaWebAPI/Controllers/ActivityController.cs index 765cf55..e92c3fa 100644 --- a/OshimaWebAPI/Controllers/ActivityController.cs +++ b/OshimaWebAPI/Controllers/ActivityController.cs @@ -3,8 +3,6 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using Milimoe.FunGame.Core.Api.Utility; using Milimoe.FunGame.Core.Entity; -using Milimoe.FunGame.Core.Library.Constant; -using Oshima.FunGame.OshimaModules.Items; using Oshima.FunGame.OshimaModules.Models; using Oshima.FunGame.OshimaServers.Service; diff --git a/OshimaWebAPI/Controllers/FunGameController.cs b/OshimaWebAPI/Controllers/FunGameController.cs index 6a83bf6..69c7070 100644 --- a/OshimaWebAPI/Controllers/FunGameController.cs +++ b/OshimaWebAPI/Controllers/FunGameController.cs @@ -212,7 +212,7 @@ namespace Oshima.FunGame.WebAPI.Controllers names = [.. FunGameSimulation.TeamCharacterStatistics.OrderByDescending(kv => kv.Value.Plays == 0 ? kv.Value.FirstKills : (double)kv.Value.FirstKills / kv.Value.Plays).Select(kv => kv.Key.GetName())]; builder.AppendLine($"总计首杀数：{stats.FirstKills}" + (stats.Plays != 0 ? $" / 首杀率：{(double)stats.FirstKills / stats.Plays * 100:0.##}%" : "") + $"（#{names.IndexOf(character.GetName()) + 1}）"); names = [.. FunGameSimulation.TeamCharacterStatistics.OrderByDescending(kv => kv.Value.Plays == 0 ? kv.Value.FirstDeaths : (double)kv.Value.FirstDeaths / kv.Value.Plays).Select(kv => kv.Key.GetName())]; - builder.AppendLine($"总计首死数：{stats.FirstDeaths}" + (stats.Plays != 0 ? $" / 首死率：{(double)stats.FirstDeaths / stats.Plays * 100:0.##}%" : "")+ $"（#{names.IndexOf(character.GetName()) + 1}）"); + builder.AppendLine($"总计首死数：{stats.FirstDeaths}" + (stats.Plays != 0 ? $" / 首死率：{(double)stats.FirstDeaths / stats.Plays * 100:0.##}%" : "") + $"（#{names.IndexOf(character.GetName()) + 1}）"); names = [.. FunGameSimulation.TeamCharacterStatistics.OrderByDescending(kv => kv.Value.Plays).Select(kv => kv.Key.GetName())]; builder.AppendLine($"总计参赛数：{stats.Plays}（#{names.IndexOf(character.GetName()) + 1}）"); names = [.. FunGameSimulation.TeamCharacterStatistics.OrderByDescending(kv => kv.Value.Wins).Select(kv => kv.Key.GetName())]; diff --git a/OshimaWebAPI/OshimaWebAPI.cs b/OshimaWebAPI/OshimaWebAPI.cs index 204c93c..40ee78d 100644 --- a/OshimaWebAPI/OshimaWebAPI.cs +++ b/OshimaWebAPI/OshimaWebAPI.cs @@ -228,6 +228,26 @@ namespace Oshima.FunGame.WebAPI builder.Services.Configure(builder.Configuration.GetSection("Bot")); } WebAPIAuthenticator.WebAPICustomBearerTokenAuthenticator += CustomBearerTokenAuthenticator; + } + + public void OnBeforeUnload() + { + TaskScheduler.Shared.RemoveTask("重置每日运势"); + TaskScheduler.Shared.RemoveTask("上九"); + TaskScheduler.Shared.RemoveTask("下三"); + TaskScheduler.Shared.RemoveTask("刷新存档缓存"); + TaskScheduler.Shared.RemoveTask("刷新每日任务"); + TaskScheduler.Shared.RemoveTask("刷新boss"); + TaskScheduler.Shared.RemoveTask("刷新活动缓存"); + } + + public override void OnWebAPIStarted(params object[] objs) + { + if (objs.Length > 0 && objs[0] is WebApplication app) + { + _serviceScopeFactory = app.Services.GetRequiredService(); + if (_serviceScopeFactory != null) Controller.WriteLine("获取到：IServiceScopeFactory"); + } FunGameConstant.InitFunGame(); FunGameSimulation.InitFunGameSimulation(); FunGameService.RefreshNotice(); @@ -299,26 +319,6 @@ namespace Oshima.FunGame.WebAPI }, true); } - public void OnBeforeUnload() - { - TaskScheduler.Shared.RemoveTask("重置每日运势"); - TaskScheduler.Shared.RemoveTask("上九"); - TaskScheduler.Shared.RemoveTask("下三"); - TaskScheduler.Shared.RemoveTask("刷新存档缓存"); - TaskScheduler.Shared.RemoveTask("刷新每日任务"); - TaskScheduler.Shared.RemoveTask("刷新boss"); - TaskScheduler.Shared.RemoveTask("刷新活动缓存"); - } - - public override void OnWebAPIStarted(params object[] objs) - { - if (objs.Length > 0 && objs[0] is WebApplication app) - { - _serviceScopeFactory = app.Services.GetRequiredService(); - if (_serviceScopeFactory != null) Controller.WriteLine("获取到：IServiceScopeFactory"); - } - } - private string CustomBearerTokenAuthenticator(string token) { if (GeneralSettings.TokenList.Contains(token))