From 21488796efae93ab7f074d7ad9bfc9d15d82a182 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期五, 29 八月 2025 15:21:49 +0800
Subject: [PATCH] 125 【战斗】战斗系统
---
Main/System/Team/TeamHero.cs | 37 ++++++++++++++++++++++++++++---------
1 files changed, 28 insertions(+), 9 deletions(-)
diff --git a/Main/System/Team/TeamHero.cs b/Main/System/Team/TeamHero.cs
index ce19457..e8c2ce7 100644
--- a/Main/System/Team/TeamHero.cs
+++ b/Main/System/Team/TeamHero.cs
@@ -11,6 +11,7 @@
public float modelScale = 1f;
+ public int level = 0;
public TeamBase teamBase
{
@@ -18,7 +19,9 @@
}
public int positionNum; //娉ㄦ剰鏈嶅姟绔殑1鍙蜂綅鏄�1锛屽鎴风鍦ㄤ娇鐢ㄦ椂鏄�0锛岄�氫俊鍜岀瓥鍒掓矡閫氱敤1
-// 鎴樺満鏁版嵁
+
+
+ // 鎴樺満鏁版嵁
public int ObjID = 0;// 鎴樻枟鍗曚綅鍞竴ID
public int NPCID = 0;// 鎴樻枟NPCID锛屼笉鍚岀殑瀹炰緥ID瀵瑰簲鐨凬PCID鍙兘涓�鏍�
@@ -30,25 +33,41 @@
// 鍒ゆ柇涓�涓嬫槸npc杩樻槸鐜╁
heroId = (int)fightObj.HeroID;
- if (fightObj.NPCID > 0)
+ // B4 24 鍥炲悎鎴樻枟鍒濆鍖� #tagSCTurnFightInit
+ // 灏佸寘涓殑 HeroID銆丼kinID 瀛楁涓嶅啀鏄帺瀹堕樀瀹圭嫭鏈夛紝NPC闃靛涔熷彲鑳芥湁鍊硷紝涓�鑸槸鍏宠仈姝﹀皢鐨凬PC鏈夊��
+ // 濡傛灉 HeroID銆丼kinID 涓嶄负绌猴紝鍒欏彲璁や负鏄叧鑱旀灏嗙殑NPC锛屽瑙傜浉鍏抽粯璁ら�氳繃HeroID璇诲彇姝﹀皢鐩稿叧锛屽鍚嶇О
+ // 鐨偆 SkinID 涓嶄负绌烘椂锛屽垯妯″瀷榛樿浣跨敤璇ョ毊鑲�
+ // 濡傛灉 HeroID銆丼kinID 涓虹┖锛� NPCID涓嶄负绌猴紝鍒欒蛋鍘烴PC榛樿瑙勫垯
+
+ // 琛ュ厖 skinid璺焗eroid瑕佷箞鍚屾椂娌℃湁 瑕佷箞鍚屾椂鏈� 濡傛灉杩欎笁涓猧d閮芥病鏈夌殑璇� 閭ｅ氨鏄厤缃弗閲嶉敊璇� 鏃犳硶寮ヨˉ
+
+ if (fightObj.SkinID > 0 && fightObj.HeroID > 0)
+ {
+ // 璧扮帺瀹堕�昏緫
+ var heroConfig = HeroConfig.Get(heroId);
+ if (null == heroConfig)
+ {
+ Debug.LogError("hero config is null, heroId : " + heroId);
+ return;
+ }
+ Country = (HeroCountry)heroConfig.Country;
+ SkinID = (int)fightObj.SkinID;
+ modelScale = 1f;
+ }
+ else if (fightObj.NPCID > 0)
{
//璧癗PC鐨勯�昏緫
NPCConfig npcConfig = NPCConfig.Get((int)fightObj.NPCID);
Country = (HeroCountry)npcConfig.Country;
SkinID = npcConfig.SkinID;
- BattleDebug.LogError("npc skin id is " + SkinID);
modelScale = npcConfig.ModelScale;
}
else
{
- //璧扮帺瀹堕�昏緫
- var heroConfig = HeroConfig.Get(heroId);
- Country = (HeroCountry)heroConfig.Country;
- SkinID = (int)fightObj.SkinID;
- BattleDebug.LogError("normal hero skin id is " + SkinID);
- modelScale = 1f;
+ throw new System.Exception("hero id and skin id are both invalid, npc id is invalid too (all <= 0)");
}
+ level = (int)fightObj.LV;
skinConfig = HeroSkinConfig.Get(SkinID);
teamBase = _teamBase;
--
Gitblit v1.8.0