From 984b4e2b5022fd9e6e548fd4f7471a58b685b2b5 Mon Sep 17 00:00:00 2001
From: chenxi <xi_chen@juzugame.com>
Date: Sun, 23 Apr 2023 18:45:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=A4=E5=AE=B3=E6=95=B0=E5=AD=97=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lua/app/common/config_manager.lua                    | 1 +
 lua/app/module/battle/battle_const.lua               | 7 +++++++
 lua/app/module/battle/component/battle_unit_comp.lua | 3 ++-
 lua/app/userdata/battle/battle_data.lua              | 2 ++
 lua/app/userdata/battle/team/battle_unit_entity.lua  | 4 ++++
 5 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/lua/app/common/config_manager.lua b/lua/app/common/config_manager.lua
index a137ad94..9ea71610 100644
--- a/lua/app/common/config_manager.lua
+++ b/lua/app/common/config_manager.lua
@@ -82,6 +82,7 @@ function ConfigManager:preLoadConfig()
 			if data then
 				monsterFullData[k].model_id = data.model_id
 				monsterFullData[k].hurt_num = data.hurt_num
+				monsterFullData[k].body = data.body
 			-- else
 				-- Logger.logHighlight("not data monster_baseid = " .. v.monster_baseid)
 			end
diff --git a/lua/app/module/battle/battle_const.lua b/lua/app/module/battle/battle_const.lua
index 15ae8e24..3527c4d7 100644
--- a/lua/app/module/battle/battle_const.lua
+++ b/lua/app/module/battle/battle_const.lua
@@ -72,6 +72,13 @@ BattleConst.TYPEOF_LUA_COMP = {
     BATTLE_NUMBER_COMPONENT = "app/module/battle/component/battle_number_comp",
 }
 
+BattleConst.MIN_NODE_HEIGHT_DEFAULT = 69
+BattleConst.MIN_NODE_HEIGHT = {
+    [1] = 34,
+    [2] = 69,
+    [3] = 160
+}
+
 BattleConst.SKILL_MOVE_TYPE = {
     MOVE = 1,           -- 移动到目标跟前使用
     STAND = 2,          -- 原地使用
diff --git a/lua/app/module/battle/component/battle_unit_comp.lua b/lua/app/module/battle/component/battle_unit_comp.lua
index 70d434b4..24fed43e 100644
--- a/lua/app/module/battle/component/battle_unit_comp.lua
+++ b/lua/app/module/battle/component/battle_unit_comp.lua
@@ -1130,7 +1130,8 @@ function BattleUnitComp:takeDamageOrCure(atker, num, effectType, effectStatus)
 end
 
 function BattleUnitComp:showEffectNumber(colorType, effectType, num, x, y)
-	self.battleController:showEffectNumber(colorType, effectType, num, x, y)
+	local addY = BattleConst.MIN_NODE_HEIGHT[self.unitEntity:getBody()] or BattleConst.MIN_NODE_HEIGHT_DEFAULT
+	self.battleController:showEffectNumber(colorType, effectType, num, x, y + addY)
 end
 
 function BattleUnitComp:playDead(callback)
diff --git a/lua/app/userdata/battle/battle_data.lua b/lua/app/userdata/battle/battle_data.lua
index 5a5d097a..e629ed08 100644
--- a/lua/app/userdata/battle/battle_data.lua
+++ b/lua/app/userdata/battle/battle_data.lua
@@ -502,6 +502,7 @@ function BattleData:initHeroData()
                     matchType = matchType,
                     normalSkills = heroEntity:getHurtSkill(),
                     assistingSkill = heroEntity:getAssistingSkill(),
+                    body = 2,       -- 英雄默认是中体型
 					attr = {
 						hp = hp,
 						max_hp = hp,
@@ -545,6 +546,7 @@ function BattleData:addMonster(monsterId, newTeam)
         assistingSkill = nil,
         isBoss = monsterInfo.is_boss,
         exp = monsterInfo.monster_exp or 0,
+        body = monsterInfo.body,
         attr = {
             hp = hp,
             max_hp = hp,
diff --git a/lua/app/userdata/battle/team/battle_unit_entity.lua b/lua/app/userdata/battle/team/battle_unit_entity.lua
index a35fcdd0..2da5aca8 100644
--- a/lua/app/userdata/battle/team/battle_unit_entity.lua
+++ b/lua/app/userdata/battle/team/battle_unit_entity.lua
@@ -120,6 +120,10 @@ function BattleUnitEntity:getIsMainUnit()
 	return self.isMainUnit
 end
 
+function BattleUnitEntity:getBody()
+	return self.unitData.body
+end
+
 function BattleUnitEntity:getNormalSkill(reRandom)
 	if self.normalSkills == nil then
 		return nil