Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
commit
292515e12e
|
@ -30,7 +30,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6217108928360588620}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
@ -110,7 +110,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 3132150514659972833}
|
||||
m_Father: {fileID: 6217108928360588620}
|
||||
m_RootOrder: 2
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
@ -177,13 +177,12 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 2294155410556675137}
|
||||
- {fileID: 3453601070238695747}
|
||||
- {fileID: 1649018574136500327}
|
||||
- {fileID: 5375860999358363320}
|
||||
- {fileID: 5211130397965869800}
|
||||
- {fileID: 8489496452498174145}
|
||||
m_Father: {fileID: 9076740770643775636}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
@ -448,7 +447,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6217108928360588620}
|
||||
m_RootOrder: 5
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
@ -529,7 +528,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 7809438392867091468}
|
||||
m_Father: {fileID: 6217108928360588620}
|
||||
m_RootOrder: 4
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
|
@ -761,7 +760,7 @@ RectTransform:
|
|||
m_Children:
|
||||
- {fileID: 5789570343152581409}
|
||||
m_Father: {fileID: 9076740770643775636}
|
||||
m_RootOrder: 2
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
|
@ -834,6 +833,7 @@ RectTransform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 2546753596356924735}
|
||||
- {fileID: 3453601070238695747}
|
||||
- {fileID: 6217108928360588620}
|
||||
- {fileID: 3152736529766456598}
|
||||
m_Father: {fileID: 0}
|
||||
|
@ -1073,12 +1073,12 @@ RectTransform:
|
|||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 0.99978995, y: 0.99978995, z: 0.99978995}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6217108928360588620}
|
||||
m_Father: {fileID: 9076740770643775636}
|
||||
m_RootOrder: 1
|
||||
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: 426, y: 19}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -100, y: 0}
|
||||
m_SizeDelta: {x: 127, y: 126}
|
||||
m_Pivot: {x: 0.49999955, y: 0.5}
|
||||
--- !u!222 &3206577869030083617
|
||||
|
|
|
@ -81393,9 +81393,9 @@ RectTransform:
|
|||
m_Father: {fileID: 5633248320576759341}
|
||||
m_RootOrder: 3
|
||||
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: 164, y: 1738}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 164, y: 795}
|
||||
m_SizeDelta: {x: 433, y: 197}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8726534544573223009
|
||||
|
|
|
@ -5870,7 +5870,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 968.6, y: -46.6}
|
||||
m_AnchoredPosition: {x: 902, y: -43}
|
||||
m_SizeDelta: {x: 231.36, y: 155.44}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &7550113600486497034
|
||||
|
|
|
@ -958,9 +958,9 @@ RectTransform:
|
|||
m_Father: {fileID: 1553045991312230259}
|
||||
m_RootOrder: 3
|
||||
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: 452, y: 682.2}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -88, y: 682.2}
|
||||
m_SizeDelta: {x: 126, y: 126}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &4545457492515630526
|
||||
|
@ -1664,9 +1664,9 @@ RectTransform:
|
|||
m_Father: {fileID: 1553045991312230259}
|
||||
m_RootOrder: 11
|
||||
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: 452, y: 815}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
m_AnchoredPosition: {x: -88, y: 815}
|
||||
m_SizeDelta: {x: 68, y: 68}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5530729419931159675
|
||||
|
|
|
@ -19,7 +19,7 @@ function ShengYiTianJiang:InitComponent(gameObject)
|
|||
this.time = Util.GetGameObject(gameObject, "time/times"):GetComponent("Text")
|
||||
this.buyBtn = Util.GetGameObject(gameObject, "layout/buyBtn")
|
||||
this.buyBtnText = Util.GetGameObject(this.buyBtn, "Text"):GetComponent("Text")
|
||||
this.reviewBtn = Util.GetGameObject(gameObject, "layout/reviewBtn")
|
||||
this.reviewBtn = Util.GetGameObject(gameObject, "reviewBtn")
|
||||
this.scrollItem = Util.GetGameObject(gameObject, "scroller/grid")
|
||||
this.proPertyText = Util.GetGameObject(gameObject, "layout/proPertyText"):GetComponent("Text")
|
||||
this.buytimes = Util.GetGameObject(gameObject, "layout/buytimes"):GetComponent("Text")
|
||||
|
|
Loading…
Reference in New Issue