diff --git a/OshimaMaps/OshimaMaps.csproj b/OshimaMaps/OshimaMaps.csproj
index b9104ae..d583dd3 100644
--- a/OshimaMaps/OshimaMaps.csproj
+++ b/OshimaMaps/OshimaMaps.csproj
@@ -10,6 +10,14 @@
Oshima.FunGame.$(MSBuildProjectName.Replace(" ", "_"))
+
+ 1701;1702;IDE0130
+
+
+
+ 1701;1702;IDE0130
+
+
diff --git a/OshimaModes/OshimaModes.csproj b/OshimaModes/OshimaModes.csproj
index a705b33..761ec56 100644
--- a/OshimaModes/OshimaModes.csproj
+++ b/OshimaModes/OshimaModes.csproj
@@ -12,6 +12,14 @@
True
+
+ 1701;1702;IDE0130
+
+
+
+ 1701;1702;IDE0130
+
+
diff --git a/OshimaModules/Effects/ItemEffects/冷却缩减加成.cs b/OshimaModules/ItemEffects/冷却缩减加成.cs
similarity index 96%
rename from OshimaModules/Effects/ItemEffects/冷却缩减加成.cs
rename to OshimaModules/ItemEffects/冷却缩减加成.cs
index a995ad5..9e86e57 100644
--- a/OshimaModules/Effects/ItemEffects/冷却缩减加成.cs
+++ b/OshimaModules/ItemEffects/冷却缩减加成.cs
@@ -1,7 +1,7 @@
using Milimoe.FunGame.Core.Entity;
using Milimoe.FunGame.Core.Library.Constant;
-namespace Oshima.FunGame.OshimaModules.Effects
+namespace Oshima.FunGame.OshimaModules.ItemEffects
{
public class 冷却缩减加成 : Effect
{
diff --git a/OshimaModules/Effects/ItemEffects/技能硬直时间减少.cs b/OshimaModules/ItemEffects/技能硬直时间减少.cs
similarity index 97%
rename from OshimaModules/Effects/ItemEffects/技能硬直时间减少.cs
rename to OshimaModules/ItemEffects/技能硬直时间减少.cs
index ee7dc6c..ffd88b7 100644
--- a/OshimaModules/Effects/ItemEffects/技能硬直时间减少.cs
+++ b/OshimaModules/ItemEffects/技能硬直时间减少.cs
@@ -2,7 +2,7 @@
using Milimoe.FunGame.Core.Entity;
using Milimoe.FunGame.Core.Library.Constant;
-namespace Oshima.FunGame.OshimaModules.Effects
+namespace Oshima.FunGame.OshimaModules.ItemEffects
{
public class 技能硬直时间减少 : Effect
{
diff --git a/OshimaModules/Effects/ItemEffects/攻击力加成.cs b/OshimaModules/ItemEffects/攻击力加成.cs
similarity index 95%
rename from OshimaModules/Effects/ItemEffects/攻击力加成.cs
rename to OshimaModules/ItemEffects/攻击力加成.cs
index 30a7368..ae0a690 100644
--- a/OshimaModules/Effects/ItemEffects/攻击力加成.cs
+++ b/OshimaModules/ItemEffects/攻击力加成.cs
@@ -1,7 +1,7 @@
using Milimoe.FunGame.Core.Entity;
using Milimoe.FunGame.Core.Library.Constant;
-namespace Oshima.FunGame.OshimaModules.Effects
+namespace Oshima.FunGame.OshimaModules.ItemEffects
{
public class 攻击力加成 : Effect
{
diff --git a/OshimaModules/Effects/ItemEffects/普攻硬直时间减少.cs b/OshimaModules/ItemEffects/普攻硬直时间减少.cs
similarity index 96%
rename from OshimaModules/Effects/ItemEffects/普攻硬直时间减少.cs
rename to OshimaModules/ItemEffects/普攻硬直时间减少.cs
index 71c5f5b..0e86e3c 100644
--- a/OshimaModules/Effects/ItemEffects/普攻硬直时间减少.cs
+++ b/OshimaModules/ItemEffects/普攻硬直时间减少.cs
@@ -2,7 +2,7 @@
using Milimoe.FunGame.Core.Entity;
using Milimoe.FunGame.Core.Library.Constant;
-namespace Oshima.FunGame.OshimaModules.Effects
+namespace Oshima.FunGame.OshimaModules.ItemEffects
{
public class 普攻硬直时间减少 : Effect
{
diff --git a/OshimaModules/Effects/ItemEffects/物理护甲加成.cs b/OshimaModules/ItemEffects/物理护甲加成.cs
similarity index 95%
rename from OshimaModules/Effects/ItemEffects/物理护甲加成.cs
rename to OshimaModules/ItemEffects/物理护甲加成.cs
index 7d7f25f..8cf5ffd 100644
--- a/OshimaModules/Effects/ItemEffects/物理护甲加成.cs
+++ b/OshimaModules/ItemEffects/物理护甲加成.cs
@@ -1,7 +1,7 @@
using Milimoe.FunGame.Core.Entity;
using Milimoe.FunGame.Core.Library.Constant;
-namespace Oshima.FunGame.OshimaModules.Effects
+namespace Oshima.FunGame.OshimaModules.ItemEffects
{
public class 物理护甲加成 : Effect
{
diff --git a/OshimaModules/Items/Accessory/攻击之爪.cs b/OshimaModules/Items/Accessory/攻击之爪.cs
index 9fb7fe7..e9abe22 100644
--- a/OshimaModules/Items/Accessory/攻击之爪.cs
+++ b/OshimaModules/Items/Accessory/攻击之爪.cs
@@ -1,6 +1,6 @@
using Milimoe.FunGame.Core.Entity;
using Milimoe.FunGame.Core.Library.Constant;
-using Oshima.FunGame.OshimaModules.Effects;
+using Oshima.FunGame.OshimaModules.ItemEffects;
using Oshima.FunGame.OshimaModules.Skills;
namespace Oshima.FunGame.OshimaModules.Items
diff --git a/OshimaModules/Items/Weapon/独奏弓.cs b/OshimaModules/Items/Weapon/独奏弓.cs
index 1d7e983..f628e1c 100644
--- a/OshimaModules/Items/Weapon/独奏弓.cs
+++ b/OshimaModules/Items/Weapon/独奏弓.cs
@@ -1,10 +1,10 @@
using Milimoe.FunGame.Core.Entity;
using Milimoe.FunGame.Core.Library.Constant;
-using Oshima.FunGame.OshimaModules.Effects;
+using Oshima.FunGame.OshimaModules.ItemEffects;
namespace Oshima.FunGame.OshimaModules.Items
{
- [Obsolete]
+ [Obsolete("测试物品请勿使用")]
public class 独奏弓 : Item
{
public override long Id => 11999;
diff --git a/OshimaModules/OshimaModules.csproj b/OshimaModules/OshimaModules.csproj
index 2feee25..7acd7e9 100644
--- a/OshimaModules/OshimaModules.csproj
+++ b/OshimaModules/OshimaModules.csproj
@@ -14,12 +14,12 @@
embedded
- 1701;1702;CS8981;IDE1006
+ 1701;1702;CS8981;IDE1006;IDE0130
embedded
- 1701;1702;CS8981;IDE1006
+ 1701;1702;CS8981;IDE1006;IDE0130
diff --git a/OshimaModules/Skills/Oshima/力量爆发.cs b/OshimaModules/Skills/Oshima/力量爆发.cs
index d7c04d7..ce03047 100644
--- a/OshimaModules/Skills/Oshima/力量爆发.cs
+++ b/OshimaModules/Skills/Oshima/力量爆发.cs
@@ -23,12 +23,13 @@ namespace Oshima.FunGame.OshimaModules.Skills
{
public override long Id => Skill.Id;
public override string Name => "力量爆发";
- public override string Description => $"获得 150% 力量 [ {攻击力加成} ] 的攻击力加成,持续 {Duration} 时间。";
+ public override string Description => $"获得 150% 力量 [ {攻击力加成} ] 的攻击力加成,但每次攻击都会损失 9% 当前生命值 [ {当前生命值} ],持续 {Duration} 时间。";
public override bool TargetSelf => true;
public override bool Durative => true;
public override double Duration => 10 + 1 * (Level - 1);
private double 攻击力加成 => Calculation.Round2Digits(Skill.Character?.STR * 1.5 ?? 0);
+ private double 当前生命值 => Calculation.Round2Digits(Skill.Character?.HP * 0.09 ?? 0);
private double 实际攻击力加成 = 0;
public override void OnEffectGained(Character character)
@@ -44,6 +45,16 @@ namespace Oshima.FunGame.OshimaModules.Skills
character.ExATK2 -= 实际攻击力加成;
}
+ public override void AfterDamageCalculation(Character character, Character enemy, double damage, bool isNormalAttack, bool isMagicDamage, MagicType magicType, DamageResult damageResult)
+ {
+ if (character == Skill.Character && isNormalAttack)
+ {
+ double 生命值减少 = 当前生命值;
+ character.HP -= 生命值减少;
+ WriteLine($"[ {character} ] 由于自身力量过于强大而被反噬,损失了 [ {生命值减少} ] 点生命值!");
+ }
+ }
+
public override void OnSkillCasted(Character caster, List enemys, List teammates, Dictionary others)
{
RemainDuration = Duration;
diff --git a/OshimaServers/OshimaServers.csproj b/OshimaServers/OshimaServers.csproj
index 0ccb7f1..3ed18ec 100644
--- a/OshimaServers/OshimaServers.csproj
+++ b/OshimaServers/OshimaServers.csproj
@@ -9,6 +9,14 @@
Oshima.FunGame.$(MSBuildProjectName.Replace(" ", "_"))
+
+ 1701;1702;IDE0130
+
+
+
+ 1701;1702;IDE0130
+
+