From 51b0f6ed9f4e1d3bb6f8144470b46908c7699a96 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 11 五月 2026 16:20:37 +0800
Subject: [PATCH] Merge branch 'master' into h5version

---
 Main/System/Battle/Skill/SkillFactory.cs |   53 +++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/Main/System/Battle/Skill/SkillFactory.cs b/Main/System/Battle/Skill/SkillFactory.cs
index 13db911..947ca01 100644
--- a/Main/System/Battle/Skill/SkillFactory.cs
+++ b/Main/System/Battle/Skill/SkillFactory.cs
@@ -53,28 +53,53 @@
 			return null;
 		}
 
-		Debug.LogError("skill type is " + skillConfig.SkillType + " skill id is " + vNetData.SkillID);
-
-
 		SkillBase skill = null;
+
 		switch (skillConfig.SkillType)
 		{
 			case 1:
+			case 11:
 				//	鍏堝疄鐜颁竴涓敾鍑荤殑 鍚庣画鏈夊啀鎱㈡參澧炲姞
 				skill = new DirectlyDamageSkill(_caster, skillConfig, vNetData, packList, battleField);
 				break;
-			// case 2:
-			// 	// skill = new DirectlyHealSkill(_skillConfig);
-			// 	break;
-			// case 3:
-			// case 4:
-			// case 5:
-			// case 6:
-			// case 14:
-				// // skill = new MountBuffSkill(_caster, skillConfig, vNetData, packList, battleField);
-				// break;
+			case 2:
+				skill = new DirectlyHealSkill(_caster, skillConfig, vNetData, packList, battleField);
+				break;
+			case 3:
+			case 4:
+			case 0:
+				skill = new DotSkill(_caster, skillConfig, vNetData, packList, battleField);
+				break;
+			case 8:
+				skill = new RebornSkill(_caster, skillConfig, vNetData, packList, battleField);
+				break;
+			case 5:
+			case 6:
+			case 14:
+			case 15: 
+			case 16: 
+				skill = new MountBuffSkill(_caster, skillConfig, vNetData, packList, battleField);
+				break;
+
+			//	鍏夌幆
+			case 10:
+				//	
+				Debug.LogError(skillConfig.SkillID + " : 瓒呭嚭浜嗘妧鑳界被鍨嬭寖鍥� 璇锋鏌ラ厤缃�, 鐩墠鏆傛椂鍙敮鎸佹敾鍑荤被鍨嬬殑鎶�鑳� " + skillConfig.SkillType);
+				break;
+
+			case 7:
+			case 9:
+			case 12:
+				Debug.LogError(skillConfig.SkillID + " : 瓒呭嚭浜嗘妧鑳界被鍨嬭寖鍥� 璇锋鏌ラ厤缃�, 鐩墠鏆傛椂鍙敮鎸佹敾鍑荤被鍨嬬殑鎶�鑳� " + skillConfig.SkillType);
+				break;
+			
+			//	鍙敜
+			case 13:
+				Debug.LogError(skillConfig.SkillID + " : 瓒呭嚭浜嗘妧鑳界被鍨嬭寖鍥� 璇锋鏌ラ厤缃�, 鐩墠鏆傛椂鍙敮鎸佹敾鍑荤被鍨嬬殑鎶�鑳� " + skillConfig.SkillType);
+				break;
+
 			default:
-				Debug.LogError("瓒呭嚭浜嗘妧鑳界被鍨嬭寖鍥� 璇锋鏌ラ厤缃�, 鐩墠鏆傛椂鍙敮鎸佹敾鍑荤被鍨嬬殑鎶�鑳�");
+				Debug.LogError(skillConfig.SkillID + " : 瓒呭嚭浜嗘妧鑳界被鍨嬭寖鍥� 璇锋鏌ラ厤缃�, 鐩墠鏆傛椂鍙敮鎸佹敾鍑荤被鍨嬬殑鎶�鑳� " + skillConfig.SkillType);
 				break;
 		}
 

--
Gitblit v1.8.0