From 2585a9ffbb5bb1fbe71fa9c245ad37a74afcea66 Mon Sep 17 00:00:00 2001
From: aozhiwei <aozhiwe@kingsome.cn>
Date: Sun, 11 Sep 2022 10:41:45 +0800
Subject: [PATCH] 1

---
 README.md                 | 31 -------------------------------
 server/gameserver/skill.h | 20 ++++++++++----------
 2 files changed, 10 insertions(+), 41 deletions(-)

diff --git a/README.md b/README.md
index f24a054a..e69de29b 100644
--- a/README.md
+++ b/README.md
@@ -1,31 +0,0 @@
-* 击杀情况
-
-1、自杀（击按钮）
-2、自杀（主动离开）
-3、子弹击杀
-4、毒圈
-5、爆炸
-6、buff
-
-* 战斗公式
-
-涉及的配置表：
-player
-equip
-paramater
-
-定义：
-abiltiy: 描述玩家游戏过程所有的属性加成，共有两种：加百分比、加绝对值
-
-当子弹命中目标时：
-
-
-target：
-基础防御=player.def
-最终防御=基础防御 * (1 + ability.防御百分比加成) + ability.防御绝对值加成
-
-bullet：
-基础攻击=equip.atk
-最终攻击=基础攻击 * (1 + ability.攻击百分比加成) + ability.攻击绝对值加成
-
-玩家最终收到的伤害=bullet.最终攻击 * （1 - target.最终防御/paramater.K）
diff --git a/server/gameserver/skill.h b/server/gameserver/skill.h
index 09333e00..6949ce27 100644
--- a/server/gameserver/skill.h
+++ b/server/gameserver/skill.h
@@ -19,16 +19,16 @@ enum SkillMinorType
 enum MagicType_e
 {
    MAGIC_NONE = 0,
-   MAGIC_AXXF = 1,
-   MAGIC_SJYDHX = 2,
-   MAGIC_HLYZ = 3,
-   MAGIC_YMCZ = 4,
-   MAGIC_LDFY = 5,
-   MAGIC_HJHX = 6,
-   MAGIC_FG = 7,
-   MAGIC_WLFB = 8,
-   MAGIC_YLZ = 9,
-   MAGIC_YS = 10,
+   MAGIC_AXXF = 1, //20101 爱心香风
+   MAGIC_SJYDHX = 2, //20701 瞬间移动回血
+   MAGIC_HLYZ = 3, //20801 火力压制
+   MAGIC_YMCZ = 4, //20901 野蛮冲撞
+   MAGIC_LDFY = 5, //21001 立盾防御
+   MAGIC_HJHX = 6, //20201 火箭浣熊
+   MAGIC_FG = 7, //20401 飞勾
+   MAGIC_WLFB = 8, //20601 威力翻倍
+   MAGIC_YLZ = 9, //20301 医疗站
+   MAGIC_YS = 10, //20501 隐身
 };
 
 struct xtimer_list;