From f79124999aceb6b31c6876636a89ee58c59892c8 Mon Sep 17 00:00:00 2001
From: chenxi <xi_chen@juzugame.com>
Date: Thu, 13 Apr 2023 14:32:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8B=B1=E9=9B=84=E5=B1=9E=E6=80=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/userdata/hero/hero_entity.lua | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/lua/app/userdata/hero/hero_entity.lua b/lua/app/userdata/hero/hero_entity.lua
index 706e556c..af47a7fc 100644
--- a/lua/app/userdata/hero/hero_entity.lua
+++ b/lua/app/userdata/hero/hero_entity.lua
@@ -4,8 +4,6 @@ function HeroEntity:ctor(cfgId, lv)
 	self.id = cfgId
 	self.cfgId = cfgId
 	self.data.lv = lv
-	self.atkKey = nil
-	self.hpKey = nil
 	self.attrDirty = false
 	self.config = ConfigManager:getConfig("hero")[self.cfgId]
 
@@ -28,8 +26,6 @@ function HeroEntity:setLv(lv)
 		return
 	end
 	self.data.lv = lv
-	self.atkKey = nil
-	self.hpKey = nil
 	self:setDirty()
 end
 
@@ -66,22 +62,13 @@ function HeroEntity:updateAttr()
 end
 
 function HeroEntity:updateBaseAttr()
-	self.baseAttrOriginal[GConst.ATTR_TYPE.hp] = self.config[self:getHpKey()] or 0
-	self.baseAttrOriginal[GConst.ATTR_TYPE.atk] = self.config[self:getAtkKey()] or 0
-end
-
-function HeroEntity:getHpKey()
-	if self.hpKey == nil then
-		self.hpKey = "hp_" .. self.data.lv
+	if self.data.lv <= 0 then
+		self.baseAttrOriginal[GConst.ATTR_TYPE.hp] = 0
+		self.baseAttrOriginal[GConst.ATTR_TYPE.atk] = 0
+	else
+		self.baseAttrOriginal[GConst.ATTR_TYPE.hp] = self.config.hp[self.data.lv] or self.config.hp[#self.config.hp]
+		self.baseAttrOriginal[GConst.ATTR_TYPE.atk] = self.config.atk[self.data.lv] or self.config.atk[#self.config.atk]
 	end
-	return self.hpKey
-end
-
-function HeroEntity:getAtkKey()
-	if self.atkKey == nil then
-		self.atkKey = "atk_" .. self.data.lv
-	end
-	return self.atkKey
 end
 
 function HeroEntity:getAtk()