代码清理优化

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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;
 

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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
 {

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;
 

OshimaModules/Modules/CharacterModule.cs

@@ -35,7 +35,7 @@ namespace Oshima.FunGame.OshimaModules
 
         }
 
-        protected override Factory.EntityFactoryDelegate<Character> EntityFactory()
+        protected override Factory.EntityFactoryDelegate<Character> CharacterFactory()
         {
             return (id, name, args) =>
             {

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;
 

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;

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

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;
 

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

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;
 

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;
 

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;

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;
 

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;
 

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;
 

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

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;

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;
 

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

OshimaModules/Skills/SkillExtension.cs

@@ -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;
-        }
-    }
-}

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

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;
 

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.PhysicalPenetration += 实际的物理穿透提升;
-            character.ExEvadeRate += 闪避率提升;
+            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.PhysicalPenetration -= 实际的物理穿透提升;
-            character.ExEvadeRate -= 闪避率提升;
+            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<Character> targets, List<Grid> grids, Dictionary<string, object> others)
         {
+            实际的攻击力提升 = 0;
+            实际的物理穿透提升 = 0;
+            实际的闪避率提升 = 0;
             RemainDuration = Duration;
             if (!caster.Effects.Contains(this))
             {

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;

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

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

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;

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

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;

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;

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;

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;

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;

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;

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;

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
 {

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;
 

OshimaWebAPI/OshimaWebAPI.cs

@@ -228,6 +228,26 @@ namespace Oshima.FunGame.WebAPI
                 builder.Services.Configure<BotConfig>(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<IServiceScopeFactory>();
+                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<IServiceScopeFactory>();
-                if (_serviceScopeFactory != null) Controller.WriteLine("获取到：IServiceScopeFactory");
-            }
-        }
-
         private string CustomBearerTokenAuthenticator(string token)
         {
             if (GeneralSettings.TokenList.Contains(token))