From 5909666c81bd9a14a88d79d9f27229b1f14d2e55 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 29 八月 2025 18:30:47 +0800
Subject: [PATCH] 125 【战斗】战斗系统

---
 Main/System/Battle/Skill/SkillFactory.cs |   83 +++++++++++++++++++++++------------------
 1 files changed, 46 insertions(+), 37 deletions(-)

diff --git a/Main/System/Battle/Skill/SkillFactory.cs b/Main/System/Battle/Skill/SkillFactory.cs
index ad63b1b..56f4620 100644
--- a/Main/System/Battle/Skill/SkillFactory.cs
+++ b/Main/System/Battle/Skill/SkillFactory.cs
@@ -5,45 +5,56 @@
 
 public static class SkillFactory
 {
-// SkillType	
-// 鎶�鑳界被鍨�	瀹氫箟
-// 鐗规畩   0	
-// 鏀诲嚮绫�   1	涓诲姩浼氶�犳垚鐬棿浼ゅ鎶�鑳界被鍨嬩负1
-// 鎭㈠绫�   2	涓诲姩浼氭仮澶嶇敓鍛藉�肩殑鎶�鑳界被鍨嬩负2
-// 鎸佺画澧炵泭BUFF  3	涓诲姩涓�娈垫椂闂村唴闂撮殧鏃堕棿缁欎簣澧炵泭buff鎶�鑳界被鍨嬩负3锛屾瘮濡傛寔缁洖琛�
-// 鎸佺画鍑忕泭BUFF  4	涓诲姩涓�娈垫椂闂村唴闂撮殧鏃堕棿缁欎簣鍑忕泭buff鎶�鑳界被鍨嬩负4锛屾瘮濡備腑姣�
-// 澧炵泭BUFF 5	涓诲姩鎸佺画涓�娈垫椂闂寸粰浜堝鐩奲uff锛屼笉浼氬嚭鐜伴棿闅旀椂闂碽uff绫诲瀷涓�5锛屾瘮濡傞簰楹熺浘
-// 鍑忕泭BUFF 6	涓诲姩鎸佺画涓�娈垫椂闂寸粰浜堝噺鐩奲uff锛屼笉浼氬嚭鐜伴棿闅旀椂闂碽uff绫诲瀷涓�6锛屾瘮濡傚噺閫�
-// 琚姩鎶�   7	琚姩瑙﹀彂鐨勬妧鑳界被鍨嬩负7
-// 澶嶆椿     8	鐗у笀澶嶆椿闃熷弸鎶�鑳斤紝鏆傛椂鏃犵敤
-// 澧炲�兼妧鑳斤紙涓嶅彲娓呴櫎锛�9  	鍜屽鐩婃妧鑳界被浼硷紝鏃犳硶鐐瑰嚮鍥炬爣鍙栨秷锛屾殏鏃舵棤鐢�
-// 鍏夌幆鎶�鑳�  10	闃熷弸鍏变韩璇ユ妧鑳界殑鍏夌幆锛岀被浼奸瓟鍏戒簤闇哥殑寮哄嚮鍏夌幆锛岃崋妫樺厜鐜紝鏆傛椂鏃犺繖鏍锋妧鑳�
-// 瑁呭鎶�鑳�  11	瑁呭涓婇檮鍔犱簡鎶�鑳斤紝姣斿濂楄闄勫姞鏀诲嚮+50%锛屾殏鏃舵棤杩欐牱鎶�鑳�
-// 鍖哄煙鎶�鑳�  12	"甯冩�櫒閲� 鏈変釜閰嶇疆鎶�鑳絀D  姣斿閰嶄釜鐏尯鍩熺伡鐑�
-// "
-// 鍙敜      13	涓诲姩鍙敜鍑轰竴涓�墿锛屽垯閰嶇疆涓�13锛屾殏鏃舵棤杩欐牱鐨勬妧鑳�
-// 鎺у埗鍨婤UFF 14	姣斿鐪╂檿锛屽畾韬妧鑳介渶瑕侀厤缃帶鍒跺瀷buff
-// 澶氭浼ゅbuff鏀诲嚮绫诲瀷锛堢被xp鎶�鑳斤級 15	澶氭浼ゅ涓诲姩姣忕浼ゅbuff鎶�鑳界被鍨嬩负15
-// 琚姩瑙﹀彂澧炵泭绫籦uff 16	琚姩瑙﹀彂鎸佺画涓�娈垫椂闂寸粰浜堝鐩奲uff锛屼笉浼氬嚭鐜伴棿闅旀椂闂碽uff绫诲瀷涓�16锛屽锛�50065鐤鹃锛�
-// 琚姩瑙﹀彂鍑忕泭绫籦uff 17	琚姩瑙﹀彂鎸佺画涓�娈垫椂闂寸粰浜堝噺鐩奲uff锛屼笉浼氬嚭鐜伴棿闅旀椂闂碽uff绫诲瀷涓�17锛屽锛�50235璐熶激锛�
-// 琚姩瑙﹀彂鐨勬帶鍒剁被buff 18	琚姩瑙﹀彂鎸佺画涓�娈垫椂闂寸殑鎺у埗鎶�鑳戒负17锛屽锛�50365婵�鎬掞級
-// 灞炴�х被鎶�鑳� 20锛堝鍧愰獞灞炴�э紝瀹犵墿灞炴�э級	琚姩澧炲姞浜嗗睘鎬ф晥鏋滃�硷紝闀挎湡鐨勬妧鑳戒负20锛屽锛�50605瀹堟姢锛�
-// 琚姩buff 19锛堟殏鏃朵笉鐭ラ亾骞插暐鐨勶級	
-// 琚姩瑙﹀彂鎸佺画绫诲鐩婄被buff 21	琚姩涓�娈垫椂闂村唴闂撮殧鏃堕棿缁欎簣澧炵泭buff鎶�鑳界被鍨嬩负3锛屾瘮濡傦紙50635绁濈锛�
-// 琚姩瑙﹀彂鎸佺画绫诲噺鐩婄被buff 22	琚姩涓�娈垫椂闂村唴闂撮殧鏃堕棿缁欎簣鍑忕泭buff鎶�鑳界被鍨嬩负4锛屾瘮濡傛瘨榫欏棞澶�
+	// SkillType	
+	// 鎶�鑳界被鍨�	瀹氫箟
+	// 鐗规畩   0	
+	// 鏀诲嚮绫�   1	涓诲姩浼氶�犳垚鐬棿浼ゅ鎶�鑳界被鍨嬩负1
+	// 鎭㈠绫�   2	涓诲姩浼氭仮澶嶇敓鍛藉�肩殑鎶�鑳界被鍨嬩负2
+	// 鎸佺画澧炵泭BUFF  3	涓诲姩涓�娈垫椂闂村唴闂撮殧鏃堕棿缁欎簣澧炵泭buff鎶�鑳界被鍨嬩负3锛屾瘮濡傛寔缁洖琛�
+	// 鎸佺画鍑忕泭BUFF  4	涓诲姩涓�娈垫椂闂村唴闂撮殧鏃堕棿缁欎簣鍑忕泭buff鎶�鑳界被鍨嬩负4锛屾瘮濡備腑姣�
+	// 澧炵泭BUFF 5	涓诲姩鎸佺画涓�娈垫椂闂寸粰浜堝鐩奲uff锛屼笉浼氬嚭鐜伴棿闅旀椂闂碽uff绫诲瀷涓�5锛屾瘮濡傞簰楹熺浘
+	// 鍑忕泭BUFF 6	涓诲姩鎸佺画涓�娈垫椂闂寸粰浜堝噺鐩奲uff锛屼笉浼氬嚭鐜伴棿闅旀椂闂碽uff绫诲瀷涓�6锛屾瘮濡傚噺閫�
+	// 琚姩鎶�   7	琚姩瑙﹀彂鐨勬妧鑳界被鍨嬩负7
+	// 澶嶆椿     8	鐗у笀澶嶆椿闃熷弸鎶�鑳斤紝鏆傛椂鏃犵敤
+	// 澧炲�兼妧鑳斤紙涓嶅彲娓呴櫎锛�9  	鍜屽鐩婃妧鑳界被浼硷紝鏃犳硶鐐瑰嚮鍥炬爣鍙栨秷锛屾殏鏃舵棤鐢�
+	// 鍏夌幆鎶�鑳�  10	闃熷弸鍏变韩璇ユ妧鑳界殑鍏夌幆锛岀被浼奸瓟鍏戒簤闇哥殑寮哄嚮鍏夌幆锛岃崋妫樺厜鐜紝鏆傛椂鏃犺繖鏍锋妧鑳�
+	// 瑁呭鎶�鑳�  11	瑁呭涓婇檮鍔犱簡鎶�鑳斤紝姣斿濂楄闄勫姞鏀诲嚮+50%锛屾殏鏃舵棤杩欐牱鎶�鑳�
+	// 鍖哄煙鎶�鑳�  12	"甯冩�櫒閲� 鏈変釜閰嶇疆鎶�鑳絀D  姣斿閰嶄釜鐏尯鍩熺伡鐑�
+	// "
+	// 鍙敜      13	涓诲姩鍙敜鍑轰竴涓�墿锛屽垯閰嶇疆涓�13锛屾殏鏃舵棤杩欐牱鐨勬妧鑳�
+	// 鎺у埗鍨婤UFF 14	姣斿鐪╂檿锛屽畾韬妧鑳介渶瑕侀厤缃帶鍒跺瀷buff
+	// 澶氭浼ゅbuff鏀诲嚮绫诲瀷锛堢被xp鎶�鑳斤級 15	澶氭浼ゅ涓诲姩姣忕浼ゅbuff鎶�鑳界被鍨嬩负15
+	// 琚姩瑙﹀彂澧炵泭绫籦uff 16	琚姩瑙﹀彂鎸佺画涓�娈垫椂闂寸粰浜堝鐩奲uff锛屼笉浼氬嚭鐜伴棿闅旀椂闂碽uff绫诲瀷涓�16锛屽锛�50065鐤鹃锛�
+	// 琚姩瑙﹀彂鍑忕泭绫籦uff 17	琚姩瑙﹀彂鎸佺画涓�娈垫椂闂寸粰浜堝噺鐩奲uff锛屼笉浼氬嚭鐜伴棿闅旀椂闂碽uff绫诲瀷涓�17锛屽锛�50235璐熶激锛�
+	// 琚姩瑙﹀彂鐨勬帶鍒剁被buff 18	琚姩瑙﹀彂鎸佺画涓�娈垫椂闂寸殑鎺у埗鎶�鑳戒负17锛屽锛�50365婵�鎬掞級
+	// 灞炴�х被鎶�鑳� 20锛堝鍧愰獞灞炴�э紝瀹犵墿灞炴�э級	琚姩澧炲姞浜嗗睘鎬ф晥鏋滃�硷紝闀挎湡鐨勬妧鑳戒负20锛屽锛�50605瀹堟姢锛�
+	// 琚姩buff 19锛堟殏鏃朵笉鐭ラ亾骞插暐鐨勶級	
+	// 琚姩瑙﹀彂鎸佺画绫诲鐩婄被buff 21	琚姩涓�娈垫椂闂村唴闂撮殧鏃堕棿缁欎簣澧炵泭buff鎶�鑳界被鍨嬩负3锛屾瘮濡傦紙50635绁濈锛�
+	// 琚姩瑙﹀彂鎸佺画绫诲噺鐩婄被buff 22	琚姩涓�娈垫椂闂村唴闂撮殧鏃堕棿缁欎簣鍑忕泭buff鎶�鑳界被鍨嬩负4锛屾瘮濡傛瘨榫欏棞澶�
 
 
-// 鏀诲嚮鎶�鑳斤細鏈洖鍚堝鏁屼汉姝﹀皢閫犳垚浼ゅ
-// 娌荤枟鎶�鑳斤細鏈洖鍚堝宸叉柟姝﹀皢鍥炲鐢熷懡鍊�,鍥炲鐢熷懡鍊间笉鍙秴杩囩敓鍛戒笂闄�
-// 杈呭姪鎶�鑳斤細澧炲姞鎬掓皵銆佸彫鍞ゃ�佸厜鐜瓑
-// BUFF鎶�鑳斤細鎻愬崌宸叉柟灞炴�х殑澧炵泭BUFF(鍔犳敾銆佸姞琛�銆佸姞鐘舵�佺瓑),闄嶄綆鏁屾柟灞炴�х殑鍑忕泭BUFF(鍑忔敾銆佸噺琛�銆佹帶鍒剁瓑),鎸佺画澶氬洖鍚�
-// 澶嶆椿鎶�鑳斤細澶嶆椿宸叉柟宸叉姝﹀皢骞跺洖澶峏鐢熷懡鍊�,澶嶆椿锛氱户鎵挎浜″墠鐨勬墍鏈夌姸鎬�(鍚勭鐘舵�併�佸悇绉岯UFF銆佹�掓皵鍊肩瓑),澶嶆椿鍚庨敊杩囨湰鍥炲悎鏀诲嚮鏃舵満鍒欎笅涓�鍥炲悎鎵嶈兘鍑烘墜
+	// 鏀诲嚮鎶�鑳斤細鏈洖鍚堝鏁屼汉姝﹀皢閫犳垚浼ゅ
+	// 娌荤枟鎶�鑳斤細鏈洖鍚堝宸叉柟姝﹀皢鍥炲鐢熷懡鍊�,鍥炲鐢熷懡鍊间笉鍙秴杩囩敓鍛戒笂闄�
+	// 杈呭姪鎶�鑳斤細澧炲姞鎬掓皵銆佸彫鍞ゃ�佸厜鐜瓑
+	// BUFF鎶�鑳斤細鎻愬崌宸叉柟灞炴�х殑澧炵泭BUFF(鍔犳敾銆佸姞琛�銆佸姞鐘舵�佺瓑),闄嶄綆鏁屾柟灞炴�х殑鍑忕泭BUFF(鍑忔敾銆佸噺琛�銆佹帶鍒剁瓑),鎸佺画澶氬洖鍚�
+	// 澶嶆椿鎶�鑳斤細澶嶆椿宸叉柟宸叉姝﹀皢骞跺洖澶峏鐢熷懡鍊�,澶嶆椿锛氱户鎵挎浜″墠鐨勬墍鏈夌姸鎬�(鍚勭鐘舵�併�佸悇绉岯UFF銆佹�掓皵鍊肩瓑),澶嶆椿鍚庨敊杩囨湰鍥炲悎鏀诲嚮鏃舵満鍒欎笅涓�鍥炲悎鎵嶈兘鍑烘墜
+
+
 
 
 
 	public static SkillBase CreateSkill(BattleObject _caster, HB427_tagSCUseSkill vNetData, List<GameNetPackBasic> packList, BattleField battleField)
 	{
 		SkillConfig skillConfig = SkillConfig.Get((int)vNetData.SkillID);
+
+		if (null == skillConfig)
+		{
+			Debug.LogError("skill config is null id is " + vNetData.SkillID);
+			return null;
+		}
+
+		Debug.LogError("skill type is " + skillConfig.SkillType + " skill id is " + vNetData.SkillID);
+
 
 		SkillBase skill = null;
 		switch (skillConfig.SkillType)
@@ -56,16 +67,14 @@
 				// skill = new DirectlyHealSkill(_skillConfig);
 				break;
 			case 3:
-				// skill = new SupportSkill(_skillConfig);
-				break;
 			case 4:
-				// skill = new MountBuffSkill(_skillConfig);
-				break;
 			case 5:
-				// skill = new ReviveSkill(_skillConfig);
+			case 6:
+			case 14:
+				// skill = new MountBuffSkill(_caster, skillConfig, vNetData, packList, battleField);
 				break;
 			default:
-				BattleDebug.LogError("瓒呭嚭浜嗘妧鑳界被鍨嬭寖鍥� 璇锋鏌ラ厤缃�");
+				Debug.LogError("瓒呭嚭浜嗘妧鑳界被鍨嬭寖鍥� 璇锋鏌ラ厤缃�");
 				break;
 		}
 

--
Gitblit v1.8.0