Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
09c438a341
|
@ -17,7 +17,7 @@ GameObject:
|
|||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
m_IsActive: 0
|
||||
--- !u!224 &909235706
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -33,9 +33,9 @@ RectTransform:
|
|||
m_Father: {fileID: 8396209728857207438}
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0}
|
||||
m_AnchorMax: {x: 0.5, y: 0}
|
||||
m_AnchoredPosition: {x: -10, y: 160.72998}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 604, y: 266}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &909235708
|
||||
|
|
|
@ -391,9 +391,9 @@ RectTransform:
|
|||
m_Father: {fileID: 8791069319542950841}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -404.4, y: 633.5}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: -357.01, y: 633.5}
|
||||
m_SizeDelta: {x: 218, y: 197.5}
|
||||
m_Pivot: {x: 0.5, y: 0}
|
||||
--- !u!1 &268868957243558588
|
||||
|
@ -11314,7 +11314,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 447, y: 854.6}
|
||||
m_AnchoredPosition: {x: 409.3, y: 854.6}
|
||||
m_SizeDelta: {x: 68, y: 68}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5406922750988588122
|
||||
|
@ -36511,10 +36511,10 @@ RectTransform:
|
|||
m_Father: {fileID: 4558947000371413883}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 15.3}
|
||||
m_SizeDelta: {x: 1080, y: 238}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 102.3}
|
||||
m_SizeDelta: {x: 178, y: 238}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7845450655864266445
|
||||
CanvasRenderer:
|
||||
|
@ -42600,9 +42600,9 @@ RectTransform:
|
|||
m_Father: {fileID: 8791069319542950841}
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: 450, y: 713}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 402.4, y: 713}
|
||||
m_SizeDelta: {x: 130, y: 126}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8545088816228627475
|
||||
|
|
|
@ -361,6 +361,8 @@ function this:SetIndex()
|
|||
coroutine.wait(0.01)
|
||||
end
|
||||
this.mask:SetActive(false)
|
||||
this.select.transform:SetParent(this.itemList[2].go.transform)
|
||||
this.select.transform:GetComponent("RectTransform").anchoredPosition = Vector3.zero
|
||||
this.select.gameObject:SetActive(true)
|
||||
this.selectIma.sprite = this.spLoader:LoadSprite(self.dicData[self.curPage].Icon[2])
|
||||
this:RefreshJianTou()
|
||||
|
@ -400,6 +402,8 @@ function this:LeftAction()
|
|||
self.lastPage = self.curPage
|
||||
self.curPage = self.nextPage
|
||||
self.nextPage = self.curPage + 1 > #self.dicData and 1 or self.curPage + 1
|
||||
this.select.transform:SetParent(this.itemList[2].go.transform)
|
||||
this.select.transform:GetComponent("RectTransform").anchoredPosition = Vector3.zero
|
||||
this.select.gameObject:SetActive(true)
|
||||
this.selectIma.sprite = this.spLoader:LoadSprite(self.dicData[self.curPage].Icon[2])
|
||||
this:RefreshJianTou()
|
||||
|
@ -412,6 +416,8 @@ function this:RightAction()
|
|||
self.nextPage = self.curPage
|
||||
self.curPage = self.lastPage
|
||||
self.lastPage = self.curPage - 1 > 0 and self.curPage - 1 or #self.dicData
|
||||
this.select.transform:SetParent(this.itemList[2].go.transform)
|
||||
this.select.transform:GetComponent("RectTransform").anchoredPosition = Vector3.zero
|
||||
this.select.gameObject:SetActive(true)
|
||||
this.selectIma.sprite = this.spLoader:LoadSprite(self.dicData[self.curPage].Icon[2])
|
||||
this:RefreshJianTou()
|
||||
|
|
Loading…
Reference in New Issue