Merge branch 'master_develop' of http://60.1.1.230/gaoxin/JL_Client into master_develop

dev_chengFeng
ZhangBiao 2020-09-03 16:51:16 +08:00
commit 0d6c12bd58
3 changed files with 16 additions and 16 deletions

View File

@ -761,7 +761,7 @@ RectTransform:
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.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 293.99, y: -155} m_AnchoredPosition: {x: 242.05, y: -155}
m_SizeDelta: {x: 380, y: 48} m_SizeDelta: {x: 380, y: 48}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &241999028642526116 --- !u!222 &241999028642526116
@ -835,8 +835,8 @@ RectTransform:
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.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 180.07, y: -15.200027} m_AnchoredPosition: {x: 135.8, y: -25}
m_SizeDelta: {x: 607.85, y: 143.5} m_SizeDelta: {x: 599, y: 211.9}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &379799289798725747 --- !u!222 &379799289798725747
CanvasRenderer: CanvasRenderer:

View File

@ -52,8 +52,8 @@ end
function this.UpdateFormation(msg) function this.UpdateFormation(msg)
Log("#msg.TeamPosInfo : " .. #msg.TeamPosInfo) Log("#msg.TeamPosInfo : " .. #msg.TeamPosInfo)
this.formationList = {} this.formationList = {}
this.curFormationIndex = this.SetCurFormationIndex() -- this.curFormationIndex = this.SetCurFormationIndex()
this.curFormationIndex = 1
for i, team in ipairs(msg.TeamPosInfo) do for i, team in ipairs(msg.TeamPosInfo) do
local oTeam = this.MakeAEmptyTeam(team.teamId) local oTeam = this.MakeAEmptyTeam(team.teamId)
@ -86,16 +86,16 @@ function this.UpdateFormation(msg)
this.CheckGuildFightDefendFormation() this.CheckGuildFightDefendFormation()
end end
function this.SetCurFormationIndex() -- function this.SetCurFormationIndex()
local curIndex = 1 -- local curIndex = 1
local curMapId = PlayerManager.curMapId -- local curMapId = PlayerManager.curMapId
local carbonType = 1 -- local carbonType = 1
if curMapId and curMapId > 0 then -- if curMapId and curMapId > 0 then
carbonType = ChallengeData[curMapId].Type -- carbonType = ChallengeData[curMapId].Type
end -- end
curIndex = carbonType == 4 and 401 or 1 -- curIndex = carbonType == 4 and 401 or 1
return curIndex -- return curIndex
end -- end
function this.RefreshFormation(index, roleList, pokemonList,isDiffmonster) function this.RefreshFormation(index, roleList, pokemonList,isDiffmonster)
local curFormation = this.formationList[index] local curFormation = this.formationList[index]

View File

@ -32,7 +32,7 @@ function this:InitComponent()
self.handPoint = Util.GetGameObject(self.buttonIcon,"GameObject") self.handPoint = Util.GetGameObject(self.buttonIcon,"GameObject")
poolManager:LoadLive("live2d_c_yff_0048", self.dialogRoot.transform, Vector3.one * 0.36, Vector3.New(-313, 100)) poolManager:LoadLive("live2d_c_yff_0048", self.dialogRoot.transform, Vector3.one * 0.36, Vector3.New(-330, 100))
end end
--绑定事件(用于子类重写) --绑定事件(用于子类重写)