diff --git a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab index 7d5c7c7b83..d43111b70a 100644 --- a/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab +++ b/Assets/ManagedResources/Prefabs/UI/Battle/DamageResult.prefab @@ -1103,7 +1103,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 3 + m_ChildAlignment: 6 m_Spacing: -16 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 @@ -4014,7 +4014,7 @@ MonoBehaviour: m_Right: 0 m_Top: 0 m_Bottom: 0 - m_ChildAlignment: 3 + m_ChildAlignment: 6 m_Spacing: -16 m_ChildForceExpandWidth: 1 m_ChildForceExpandHeight: 1 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua index 7cf11cbe55..9d6acc7c6e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/BattleManager.lua @@ -265,7 +265,6 @@ end function this.PokemonUnitAdapter(pokemonUnit,camp,_teamDamage) -- 基础数据 --LogError("teamdamage=="..tonumber(pokemonUnit.forceScore)) - LogError("性别=="..tonumber(pokemonUnit.playerSex)) local role = { id = tonumber(pokemonUnit.unitId), position = tonumber(pokemonUnit.position), @@ -317,6 +316,7 @@ function this.GetBattleServerData(msg, isFightPlayer) local position = tonumber(data.fightUnitList[i].position) local star = tonumber(data.fightUnitList[i].star) local skin=tonumber(data.fightUnitList[i].skinId) + local _godSoulLv=tonumber(data.fightUnitList[i].godSoulLv) local skills = string.split(data.fightUnitList[i].unitSkillIds, "#") local propertys = string.split(data.fightUnitList[i].property, "#") local role = { @@ -324,6 +324,7 @@ function this.GetBattleServerData(msg, isFightPlayer) position = position, star = star, skinId=skin, + godSoulLv=_godSoulLv, camp = 0, type = 1, quality = 0, @@ -342,6 +343,7 @@ function this.GetBattleServerData(msg, isFightPlayer) if #skills > 2 then local passivityList = {} for j = 3, #skills do + --LogError("pass id=="..tostring(skills[i])) table.insert(passivityList, tonumber(skills[j])) end role.passivity = this.GetPassivityData(passivityList) @@ -399,6 +401,7 @@ function this.GetBattleServerData(msg, isFightPlayer) local position = tonumber(data2.fightUnitList[j].position) local star = tonumber(data2.fightUnitList[j].star) local skin=tonumber(data2.fightUnitList[j].skinId) + local _godSoulLv=tonumber(data2.fightUnitList[i].godSoulLv) skills = string.split(data2.fightUnitList[j].unitSkillIds, "#") propertys = string.split(data2.fightUnitList[j].property, "#") role = { @@ -407,6 +410,7 @@ function this.GetBattleServerData(msg, isFightPlayer) position = position, star = star, skinId=skin, + godSoulLv=_godSoulLv, job=HeroConfig[monsterConfig.MonsterId].Job, camp = 1, type = monsterConfig.Type, diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua index dd74c67b87..8556937772 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/DamageResultPanel.lua @@ -332,7 +332,7 @@ function this.HeadAdapter(head, data) local roleLv = data:GetRoleData(RoleDataName.Level) local skinId = data.roleData.skinId local star = data.star - + -- LogError("id=="..roleId.."star=="..star.." data.roleData.godSoulLv=="..data.roleData.godSoulLv.." ") local config = {} if data.position==100 then config.Quality=4 @@ -382,7 +382,13 @@ function this.HeadAdapter(head, data) lv:SetActive(true) lvText.text = config.lv -- 星级 - SetHeroStars(this.spLoader, starRoot, star) + + local starType = 1 + if data.roleData.godSoulLv and data.roleData.godSoulLv > 0 then + star = data.roleData.godSoulLv + starType = 3 + end + SetHeroStars(this.spLoader, starRoot, star,starType) -- 职业 prefess:SetActive(false) -- 属性 diff --git a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua index dbdbce9cc2..bd74b2852e 100644 --- a/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua +++ b/Assets/ManagedResources/~Lua/Modules/Battle/View/Unit/PlayerView.lua @@ -75,7 +75,14 @@ function PlayerView:onCreate(go, role, position, root) self.bg1.sprite = self.spLoader:LoadSprite(GetBattleHeroCardStarBg[role.roleData.star]) self.bg2.sprite = self.spLoader:LoadSprite(GetHeroCardStarFg[role.roleData.star]) local starGrid = Util.GetGameObject(go, "StarGrid") - SetCardStars(starGrid, role.roleData.star or 5) + local star = role.roleData.star or 5 + local starType = 1 + if role.roleData.godSoulLv and role.roleData.godSoulLv > 0 then + star = role.roleData.godSoulLv + starType = 3 + self.bg2.sprite = self.spLoader:LoadSprite("t_zhandoukuang_zhuangshi006") + end + SetCardStars(starGrid, star,starType) local zs = Util.GetGameObject(go, "zs") local zsName = GetHeroCardStarZs[role.roleData.star] if zsName == "" then