From 39001a600fcae2bcf27c225df8752d75fb92fef4 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 31 十月 2025 11:18:26 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/System/Battle/Define/DamageType.cs |   60 +++++++++++++++++++++++++++++++++++++++++++++++++-----------
 1 files changed, 49 insertions(+), 11 deletions(-)

diff --git a/Main/System/Battle/Define/DamageType.cs b/Main/System/Battle/Define/DamageType.cs
index 11b4805..c0c7ffb 100644
--- a/Main/System/Battle/Define/DamageType.cs
+++ b/Main/System/Battle/Define/DamageType.cs
@@ -1,16 +1,54 @@
+// AttackType = 浼ゅ椋樿绫诲瀷
+
+// 鍗矪attleType涓�鑸唬琛ㄦ湰娆℃妧鑳界殑鏀诲嚮鏂瑰紡锛屽 1-鐗╀激甯歌鏀诲嚮銆�11-鐗╀激杩炲嚮銆�22-娉曚激鍙嶅嚮绛�
+
+// 鑰孉ttackType涓�鑸唬琛ㄧ殑鏄湰娆℃妧鑳界殑浼ゅ椋樿绫诲瀷锛屽鏅�氫激瀹筹紝鏆村嚮浼ゅ銆佹牸鎸°�佸洖琛�绛�
 
 
+//
+// 101011111
+
+
+//	鏈嶅姟鍣ㄦ嫢鏈夌殑DamageType
+public enum ServerDamageType
+{
+	Damage = 2,
+	Recovery = 4,
+	Block = 32,
+	Crit = 128,
+	Dodge = 512
+}
 
 public enum DamageType
 {
-	Normal,	//鏅�氫激瀹�
-	Dodge, 	//闂伩
-	Heal,	//娌荤枟
-	Continuous,//鎸佺画浼ゅ
-	Block,	//鏍兼尅
-	ReverseInjury,//鍙嶄激
-	Recovery,	//鍚歌
-	Crit,	//鏆村嚮
-	Combo,	//杩炲嚮
-	Stuned,	//鍑绘檿
-}
\ No newline at end of file
+	Damage = 2,         //鏅�氫激瀹� (2^1)
+
+	Recovery = 4,       //娌荤枟 (2^2)
+
+	Reflect = 8,        //鍙嶅脊浼ゅ (2^3)
+
+	Bloody = 16,        //娴佽浼ゅ (2^4)
+
+	Block = 32,         //鏍兼尅 (2^5)
+
+	TakePlace1 = 64,    //鍗犱綅1 (鏆傛棤鐢�) (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