Merge branch '0功能/神魂' of http://60.1.1.230/gaoxin/JL_Client into 0功能/神魂
commit
e049612d3a
|
@ -1103,7 +1103,7 @@ MonoBehaviour:
|
||||||
m_Right: 0
|
m_Right: 0
|
||||||
m_Top: 0
|
m_Top: 0
|
||||||
m_Bottom: 0
|
m_Bottom: 0
|
||||||
m_ChildAlignment: 3
|
m_ChildAlignment: 6
|
||||||
m_Spacing: -16
|
m_Spacing: -16
|
||||||
m_ChildForceExpandWidth: 1
|
m_ChildForceExpandWidth: 1
|
||||||
m_ChildForceExpandHeight: 1
|
m_ChildForceExpandHeight: 1
|
||||||
|
@ -4014,7 +4014,7 @@ MonoBehaviour:
|
||||||
m_Right: 0
|
m_Right: 0
|
||||||
m_Top: 0
|
m_Top: 0
|
||||||
m_Bottom: 0
|
m_Bottom: 0
|
||||||
m_ChildAlignment: 3
|
m_ChildAlignment: 6
|
||||||
m_Spacing: -16
|
m_Spacing: -16
|
||||||
m_ChildForceExpandWidth: 1
|
m_ChildForceExpandWidth: 1
|
||||||
m_ChildForceExpandHeight: 1
|
m_ChildForceExpandHeight: 1
|
||||||
|
|
|
@ -265,7 +265,6 @@ end
|
||||||
function this.PokemonUnitAdapter(pokemonUnit,camp,_teamDamage)
|
function this.PokemonUnitAdapter(pokemonUnit,camp,_teamDamage)
|
||||||
-- 基础数据
|
-- 基础数据
|
||||||
--LogError("teamdamage=="..tonumber(pokemonUnit.forceScore))
|
--LogError("teamdamage=="..tonumber(pokemonUnit.forceScore))
|
||||||
LogError("性别=="..tonumber(pokemonUnit.playerSex))
|
|
||||||
local role = {
|
local role = {
|
||||||
id = tonumber(pokemonUnit.unitId),
|
id = tonumber(pokemonUnit.unitId),
|
||||||
position = tonumber(pokemonUnit.position),
|
position = tonumber(pokemonUnit.position),
|
||||||
|
@ -317,6 +316,7 @@ function this.GetBattleServerData(msg, isFightPlayer)
|
||||||
local position = tonumber(data.fightUnitList[i].position)
|
local position = tonumber(data.fightUnitList[i].position)
|
||||||
local star = tonumber(data.fightUnitList[i].star)
|
local star = tonumber(data.fightUnitList[i].star)
|
||||||
local skin=tonumber(data.fightUnitList[i].skinId)
|
local skin=tonumber(data.fightUnitList[i].skinId)
|
||||||
|
local _godSoulLv=tonumber(data.fightUnitList[i].godSoulLv)
|
||||||
local skills = string.split(data.fightUnitList[i].unitSkillIds, "#")
|
local skills = string.split(data.fightUnitList[i].unitSkillIds, "#")
|
||||||
local propertys = string.split(data.fightUnitList[i].property, "#")
|
local propertys = string.split(data.fightUnitList[i].property, "#")
|
||||||
local role = {
|
local role = {
|
||||||
|
@ -324,6 +324,7 @@ function this.GetBattleServerData(msg, isFightPlayer)
|
||||||
position = position,
|
position = position,
|
||||||
star = star,
|
star = star,
|
||||||
skinId=skin,
|
skinId=skin,
|
||||||
|
godSoulLv=_godSoulLv,
|
||||||
camp = 0,
|
camp = 0,
|
||||||
type = 1,
|
type = 1,
|
||||||
quality = 0,
|
quality = 0,
|
||||||
|
@ -342,6 +343,7 @@ function this.GetBattleServerData(msg, isFightPlayer)
|
||||||
if #skills > 2 then
|
if #skills > 2 then
|
||||||
local passivityList = {}
|
local passivityList = {}
|
||||||
for j = 3, #skills do
|
for j = 3, #skills do
|
||||||
|
--LogError("pass id=="..tostring(skills[i]))
|
||||||
table.insert(passivityList, tonumber(skills[j]))
|
table.insert(passivityList, tonumber(skills[j]))
|
||||||
end
|
end
|
||||||
role.passivity = this.GetPassivityData(passivityList)
|
role.passivity = this.GetPassivityData(passivityList)
|
||||||
|
@ -399,6 +401,7 @@ function this.GetBattleServerData(msg, isFightPlayer)
|
||||||
local position = tonumber(data2.fightUnitList[j].position)
|
local position = tonumber(data2.fightUnitList[j].position)
|
||||||
local star = tonumber(data2.fightUnitList[j].star)
|
local star = tonumber(data2.fightUnitList[j].star)
|
||||||
local skin=tonumber(data2.fightUnitList[j].skinId)
|
local skin=tonumber(data2.fightUnitList[j].skinId)
|
||||||
|
local _godSoulLv=tonumber(data2.fightUnitList[i].godSoulLv)
|
||||||
skills = string.split(data2.fightUnitList[j].unitSkillIds, "#")
|
skills = string.split(data2.fightUnitList[j].unitSkillIds, "#")
|
||||||
propertys = string.split(data2.fightUnitList[j].property, "#")
|
propertys = string.split(data2.fightUnitList[j].property, "#")
|
||||||
role = {
|
role = {
|
||||||
|
@ -407,6 +410,7 @@ function this.GetBattleServerData(msg, isFightPlayer)
|
||||||
position = position,
|
position = position,
|
||||||
star = star,
|
star = star,
|
||||||
skinId=skin,
|
skinId=skin,
|
||||||
|
godSoulLv=_godSoulLv,
|
||||||
job=HeroConfig[monsterConfig.MonsterId].Job,
|
job=HeroConfig[monsterConfig.MonsterId].Job,
|
||||||
camp = 1,
|
camp = 1,
|
||||||
type = monsterConfig.Type,
|
type = monsterConfig.Type,
|
||||||
|
|
|
@ -332,7 +332,7 @@ function this.HeadAdapter(head, data)
|
||||||
local roleLv = data:GetRoleData(RoleDataName.Level)
|
local roleLv = data:GetRoleData(RoleDataName.Level)
|
||||||
local skinId = data.roleData.skinId
|
local skinId = data.roleData.skinId
|
||||||
local star = data.star
|
local star = data.star
|
||||||
|
-- LogError("id=="..roleId.."star=="..star.." data.roleData.godSoulLv=="..data.roleData.godSoulLv.." ")
|
||||||
local config = {}
|
local config = {}
|
||||||
if data.position==100 then
|
if data.position==100 then
|
||||||
config.Quality=4
|
config.Quality=4
|
||||||
|
@ -382,7 +382,13 @@ function this.HeadAdapter(head, data)
|
||||||
lv:SetActive(true)
|
lv:SetActive(true)
|
||||||
lvText.text = config.lv
|
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)
|
prefess:SetActive(false)
|
||||||
-- 属性
|
-- 属性
|
||||||
|
|
|
@ -75,7 +75,14 @@ function PlayerView:onCreate(go, role, position, root)
|
||||||
self.bg1.sprite = self.spLoader:LoadSprite(GetBattleHeroCardStarBg[role.roleData.star])
|
self.bg1.sprite = self.spLoader:LoadSprite(GetBattleHeroCardStarBg[role.roleData.star])
|
||||||
self.bg2.sprite = self.spLoader:LoadSprite(GetHeroCardStarFg[role.roleData.star])
|
self.bg2.sprite = self.spLoader:LoadSprite(GetHeroCardStarFg[role.roleData.star])
|
||||||
local starGrid = Util.GetGameObject(go, "StarGrid")
|
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 zs = Util.GetGameObject(go, "zs")
|
||||||
local zsName = GetHeroCardStarZs[role.roleData.star]
|
local zsName = GetHeroCardStarZs[role.roleData.star]
|
||||||
if zsName == "" then
|
if zsName == "" then
|
||||||
|
|
Loading…
Reference in New Issue