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 |   58 ++++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/Main/System/Battle/Define/DamageType.cs b/Main/System/Battle/Define/DamageType.cs
index 352eb75..7cf255d 100644
--- a/Main/System/Battle/Define/DamageType.cs
+++ b/Main/System/Battle/Define/DamageType.cs
@@ -1,31 +1,65 @@
+// AttackType = 浼ゅ椋樿绫诲瀷
+
+// 鍗矪attleType涓�鑸唬琛ㄦ湰娆℃妧鑳界殑鏀诲嚮鏂瑰紡锛屽 1-鐗╀激甯歌鏀诲嚮銆�11-鐗╀激杩炲嚮銆�22-娉曚激鍙嶅嚮绛�
+
+// 鑰孉ttackType涓�鑸唬琛ㄧ殑鏄湰娆℃妧鑳界殑浼ゅ椋樿绫诲瀷锛屽鏅�氫激瀹筹紝鏆村嚮浼ゅ銆佹牸鎸°�佸洖琛�绛�
 
 
+//
+// 101011111
+
+
+//	鏈嶅姟鍣ㄦ嫢鏈夌殑DamageType
+public enum ServerDamageType
+{
+	Damage = 2,//鏅�氫激瀹�
+	Recovery = 4,//娌荤枟
+
+	Immune = 16,//鍏嶇柅
+
+	Block = 32, //鏍兼尅
+
+	Realdamage = 64, //鐪熶激
+	Crit = 128, //鏆村嚮
+
+	Dodge = 256, //闂伩
+
+	DamageReverse = 512,//浼ゅ鍙嶈浆涓烘不鐤�
+
+	SuckHpReverse = 1024,//鍚歌鍙嶈浆涓轰激瀹�
+
+	SelfHarm = 2048,//鑷畫
+}
 
 public enum DamageType
 {
-	Damage = 1, //鏅�氫激瀹�
+	Damage = 2,         //鏅�氫激瀹� (2^1)
 
-	Recovery = 2, //娌荤枟
+	Recovery = 4,       //娌荤枟 (2^2)
 
-	Reflect = 4, //鍙嶅脊浼ゅ
+	Reflect = 8,        //鍙嶅脊浼ゅ (2^3)
 
-	Bloody = 8, //娴佽浼ゅ
+	Bloody = 16,        //娴佽浼ゅ (2^4)
 
-	Block = 16, //鏍兼尅
+	Block = 32,         //鏍兼尅 (2^5)
 
-	Crit = 32, //鏆村嚮
+	Immune = 64,    //鍏嶇柅 (2^6)
 
-	Dodge = 64, //闂伩
+	Crit = 128,         //鏆村嚮 (2^7)
 
-	RageUp = 128, //鎬掓皵鎻愬崌
+	TakePlace2 = 256,   //鍗犱綅2 (鏆傛棤鐢�) (2^8)
 
-	SuckHP = 256, //鍚歌
+	Dodge = 512,        //闂伩 (2^9)
 
-	Realdamage = 512, //鐪熶激
+	RageUp = 1024,      //鎬掓皵鎻愬崌 (2^10)
 
-	CritDamage = Crit + Damage, //鏆村嚮浼ゅ
+	SuckHP = 2048,      //鍚歌 (2^11)
 
-	CritHeal = Crit + Recovery, //鏆村嚮鍥炶
+	Realdamage = 4096,  //鐪熶激 (2^12)
+
+	CritDamage = Crit + Damage,         //鏆村嚮浼ゅ
+
+	CritHeal = Crit + Recovery,         //鏆村嚮鍥炶
 
 	CritRealdamage = Crit + Realdamage, //鏆村嚮鐪熶激
 }

--
Gitblit v1.8.0