Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop
commit
58728fa555
|
@ -305,9 +305,9 @@ RectTransform:
|
||||||
m_Father: {fileID: 8485517753741111699}
|
m_Father: {fileID: 8485517753741111699}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0}
|
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||||
m_AnchorMax: {x: 0.5, y: 0}
|
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||||
m_AnchoredPosition: {x: 0, y: 81.09961}
|
m_AnchoredPosition: {x: 0, y: -878.9004}
|
||||||
m_SizeDelta: {x: 348, y: 44}
|
m_SizeDelta: {x: 348, y: 44}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &624247546002579982
|
--- !u!222 &624247546002579982
|
||||||
|
@ -902,10 +902,10 @@ RectTransform:
|
||||||
m_Father: {fileID: 8485517753741111699}
|
m_Father: {fileID: 8485517753741111699}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
m_AnchorMin: {x: 0, y: 0}
|
||||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
m_AnchorMax: {x: 1, y: 1}
|
||||||
m_AnchoredPosition: {x: 0, y: 0}
|
m_AnchoredPosition: {x: 0, y: 0}
|
||||||
m_SizeDelta: {x: 1080, y: 1920}
|
m_SizeDelta: {x: 0, y: 0}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8487183040723315029
|
--- !u!222 &8487183040723315029
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
|
|
@ -116,7 +116,7 @@ function this:FormationAdapter(msg)
|
||||||
local demonData = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId)
|
local demonData = ConfigManager.GetConfigData(ConfigName.HeroConfig, demonId)
|
||||||
Util.GetGameObject(demon, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(demonData.Icon))
|
Util.GetGameObject(demon, "icon"):GetComponent("Image").sprite = Util.LoadSprite(GetResourcePath(demonData.Icon))
|
||||||
local heroConFig = ConfigManager.GetConfigData(ConfigName.HeroConfig,demonId)
|
local heroConFig = ConfigManager.GetConfigData(ConfigName.HeroConfig,demonId)
|
||||||
Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroConFig.Quality,heroConFig.Star))
|
Util.GetGameObject(demon, "frame"):GetComponent("Image").sprite = Util.LoadSprite(GetHeroQuantityImageByquality(heroConFig.Quality, curData.hero.star))
|
||||||
Util.GetGameObject(demon, "nameText"):GetComponent("Text").text = ConfigManager.GetConfigData(ConfigName.HeroConfig,demonId).ReadingName
|
Util.GetGameObject(demon, "nameText"):GetComponent("Text").text = ConfigManager.GetConfigData(ConfigName.HeroConfig,demonId).ReadingName
|
||||||
SetHeroStars(starGrid, curData.hero.star)
|
SetHeroStars(starGrid, curData.hero.star)
|
||||||
proImage.sprite = Util.LoadSprite(GetProStrImageByProNum(demonData.PropertyName))
|
proImage.sprite = Util.LoadSprite(GetProStrImageByProNum(demonData.PropertyName))
|
||||||
|
|
|
@ -216,6 +216,7 @@ function this.CheckHeroIdExist(heroId)
|
||||||
end
|
end
|
||||||
|
|
||||||
function this.UserPowerChanged()
|
function this.UserPowerChanged()
|
||||||
|
|
||||||
local maxPower, targetTeamId = 0
|
local maxPower, targetTeamId = 0
|
||||||
for _, teamInfo in pairs(this.formationList) do
|
for _, teamInfo in pairs(this.formationList) do
|
||||||
if #teamInfo.teamHeroInfos > 0 then
|
if #teamInfo.teamHeroInfos > 0 then
|
||||||
|
@ -227,7 +228,7 @@ function this.UserPowerChanged()
|
||||||
end
|
end
|
||||||
if maxPower > PlayerManager.maxForce then
|
if maxPower > PlayerManager.maxForce then
|
||||||
Log(Language[10684])
|
Log(Language[10684])
|
||||||
NetManager.RequestUserForceChange(targetTeamId)
|
NetManager.RequestUserForceChange(FormationTypeDef.FORMATION_NORMAL)--targetTeamId
|
||||||
PlayerManager.maxForce = maxPower
|
PlayerManager.maxForce = maxPower
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -47,23 +47,23 @@ local jumpDic = {
|
||||||
end
|
end
|
||||||
end,
|
end,
|
||||||
[JumpType.Arena] = function(data)--竞技场
|
[JumpType.Arena] = function(data)--竞技场
|
||||||
local arenaDefend = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_DEFEND)
|
-- local arenaDefend = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_DEFEND)
|
||||||
local arenaAttack = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_ATTACK)
|
local arenaAttack = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_ARENA_ATTACK)
|
||||||
|
|
||||||
--首次进入竞技场 将主线编队复制到竞技场防守、进攻编队
|
--首次进入竞技场 将主线编队复制到竞技场防守、进攻编队
|
||||||
if #arenaAttack.teamHeroInfos==0 then
|
-- if #arenaAttack.teamHeroInfos==0 then
|
||||||
-- LogColor("red","竞技进攻编队为空")
|
-- -- LogColor("red","竞技进攻编队为空")
|
||||||
local formation = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_NORMAL)
|
-- local formation = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_NORMAL)
|
||||||
local newFormation = {}
|
-- local newFormation = {}
|
||||||
for index = 1, #formation.teamHeroInfos do
|
-- for index = 1, #formation.teamHeroInfos do
|
||||||
local teamInfo = formation.teamHeroInfos[index]
|
-- local teamInfo = formation.teamHeroInfos[index]
|
||||||
local singleData = {}
|
-- local singleData = {}
|
||||||
singleData.heroId = teamInfo.heroId
|
-- singleData.heroId = teamInfo.heroId
|
||||||
singleData.position = index
|
-- singleData.position = index
|
||||||
table.insert(newFormation, singleData)
|
-- table.insert(newFormation, singleData)
|
||||||
end
|
-- end
|
||||||
FormationManager.RefreshFormation(FormationTypeDef.FORMATION_ARENA_ATTACK,newFormation,formation.teamPokemonInfos)
|
-- FormationManager.RefreshFormation(FormationTypeDef.FORMATION_ARENA_ATTACK,newFormation,formation.teamPokemonInfos)
|
||||||
end
|
-- end
|
||||||
if #arenaDefend.teamHeroInfos == 0 then
|
if #arenaDefend.teamHeroInfos == 0 then
|
||||||
-- LogColor("red","竞技防守编队为空")
|
-- LogColor("red","竞技防守编队为空")
|
||||||
local formation = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_NORMAL)
|
local formation = FormationManager.GetFormationByID(FormationTypeDef.FORMATION_NORMAL)
|
||||||
|
|
Loading…
Reference in New Issue