From ed98029a88cd89702980ac7c40b711afddc5aeb2 Mon Sep 17 00:00:00 2001
From: hch <305670599@qq.com>
Date: 星期四, 20 十一月 2025 14:44:59 +0800
Subject: [PATCH] Merge branch 'master' of http://mobile.secondworld.net.cn:10010/r/Project_SG_scripts
---
Main/System/Battle/Define/DamageType.cs | 63 ++++++++++++++++++++-----------
1 files changed, 41 insertions(+), 22 deletions(-)
diff --git a/Main/System/Battle/Define/DamageType.cs b/Main/System/Battle/Define/DamageType.cs
index de43553..7cf255d 100644
--- a/Main/System/Battle/Define/DamageType.cs
+++ b/Main/System/Battle/Define/DamageType.cs
@@ -1,46 +1,65 @@
-
-
-
// AttackType = 浼ゅ椋樿绫诲瀷
// 鍗矪attleType涓�鑸唬琛ㄦ湰娆℃妧鑳界殑鏀诲嚮鏂瑰紡锛屽 1-鐗╀激甯歌鏀诲嚮銆�11-鐗╀激杩炲嚮銆�22-娉曚激鍙嶅嚮绛�
// 鑰孉ttackType涓�鑸唬琛ㄧ殑鏄湰娆℃妧鑳界殑浼ゅ椋樿绫诲瀷锛屽鏅�氫激瀹筹紝鏆村嚮浼ゅ銆佹牸鎸°�佸洖琛�绛�
-// 浼よ绫诲瀷锛� 1-鏅�氾紱2-鍥炶锛�3-鍙嶅脊锛�4-娴佽锛�5-鏍兼尅锛�7-鏆村嚮锛�9-闂伩
//
// 101011111
-public enum DamageType
+
+// 鏈嶅姟鍣ㄦ嫢鏈夌殑DamageType
+public enum ServerDamageType
{
- Damage = 1, //鏅�氫激瀹�
+ Damage = 2,//鏅�氫激瀹�
+ Recovery = 4,//娌荤枟
- Recovery = 2, //娌荤枟
+ Immune = 16,//鍏嶇柅
- Reflect = 4, //鍙嶅脊浼ゅ
+ Block = 32, //鏍兼尅
- Bloody = 8, //娴佽浼ゅ
-
- Block = 16, //鏍兼尅
-
- TakePlace1 = 32,//鍗犱綅1 (鏆傛棤鐢�)
-
- Crit = 64, //鏆村嚮
-
- TakePlace2 = 128,//鍗犱綅2 (鏆傛棤鐢�)
+ Realdamage = 64, //鐪熶激
+ Crit = 128, //鏆村嚮
Dodge = 256, //闂伩
- RageUp = 512, //鎬掓皵鎻愬崌
+ DamageReverse = 512,//浼ゅ鍙嶈浆涓烘不鐤�
- SuckHP = 1024, //鍚歌
+ SuckHpReverse = 1024,//鍚歌鍙嶈浆涓轰激瀹�
- Realdamage = 2048, //鐪熶激
+ SelfHarm = 2048,//鑷畫
+}
- CritDamage = Crit + Damage, //鏆村嚮浼ゅ
+public enum DamageType
+{
+ Damage = 2, //鏅�氫激瀹� (2^1)
- CritHeal = Crit + Recovery, //鏆村嚮鍥炶
+ Recovery = 4, //娌荤枟 (2^2)
+
+ Reflect = 8, //鍙嶅脊浼ゅ (2^3)
+
+ Bloody = 16, //娴佽浼ゅ (2^4)
+
+ Block = 32, //鏍兼尅 (2^5)
+
+ Immune = 64, //鍏嶇柅 (2^6)
+
+ Crit = 128, //鏆村嚮 (2^7)
+
+ TakePlace2 = 256, //鍗犱綅2 (鏆傛棤鐢�) (2^8)
+
+ Dodge = 512, //闂伩 (2^9)
+
+ RageUp = 1024, //鎬掓皵鎻愬崌 (2^10)
+
+ SuckHP = 2048, //鍚歌 (2^11)
+
+ Realdamage = 4096, //鐪熶激 (2^12)
+
+ CritDamage = Crit + Damage, //鏆村嚮浼ゅ
+
+ CritHeal = Crit + Recovery, //鏆村嚮鍥炶
CritRealdamage = Crit + Realdamage, //鏆村嚮鐪熶激
}
--
Gitblit v1.8.0