From 973edc44a04dceb8b48a32ca912e6167f86189d4 Mon Sep 17 00:00:00 2001
From: yyl <yyl>
Date: 星期一, 25 八月 2025 17:38:02 +0800
Subject: [PATCH] Merge branch 'master' of http://192.168.1.20:10010/r/Project_SG_scripts

---
 Main/System/Hero/HeroInfo.Awake.cs |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/Main/System/Hero/HeroInfo.Awake.cs b/Main/System/Hero/HeroInfo.Awake.cs
index 0dd7b23..fd0ed7e 100644
--- a/Main/System/Hero/HeroInfo.Awake.cs
+++ b/Main/System/Hero/HeroInfo.Awake.cs
@@ -36,6 +36,8 @@
 			for(int j = 0; j < tmpAwakeConfig.AttrIDList.Length; j++)
 			{
 				int id = tmpAwakeConfig.AttrIDList[j];
+				if (id == 0)
+					continue;
 				if (!breakAttrs.ContainsKey(id))
 				{
 					breakAttrs.Add(id, tmpAwakeConfig.AttrValueList[j]);
@@ -49,10 +51,15 @@
 			if (tmpAwakeConfig.SkillID != 0)
 			{
 				var skillConfig = SkillConfig.Get(tmpAwakeConfig.SkillID);
+				if (skillConfig == null)
+				{ 
+					Debug.LogError("瑙夐啋鎶�鑳介厤缃敊璇�" + tmpAwakeConfig.SkillID);
+					continue;
+				}
 				if (allSkillTypeIDToID.ContainsKey(skillConfig.SkillTypeID))
 				{
 					var tmpSkillConfig = SkillConfig.Get(allSkillTypeIDToID[skillConfig.SkillTypeID]);
-					if (skillConfig.SkillID > tmpSkillConfig.SkillID)
+					if (skillConfig.SkillLV > tmpSkillConfig.SkillLV)
 					{
 						//鍙栨渶澶ф妧鑳�
 						allSkillTypeIDToID[skillConfig.SkillTypeID] = tmpAwakeConfig.SkillID;

--
Gitblit v1.8.0