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

dev_chengFeng
gaoxin 2020-09-01 15:31:11 +08:00
commit b939439eb2
2 changed files with 3 additions and 2 deletions

View File

@ -108744,7 +108744,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6874390154766067829}
m_Enabled: 1
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
@ -108784,7 +108784,7 @@ MonoBehaviour:
m_Top: 0
m_Bottom: 20
m_ChildAlignment: 4
m_Spacing: 20
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0

View File

@ -506,6 +506,7 @@ function this.SetSelectHero(isFirstIn,isFirstData,isMainIn)
if not o then
o=newObjToParent(this.s_pre,this.s_grid)
o.name="pre"..i
o:GetComponent("RectTransform").localScale = Vector2.New(0.9, 0.9)
heroList[i]=o
end
o.gameObject:SetActive(true)