Merge branch 'TCX_LongZhu' of http://192.168.1.21:3000/root/miduo_client into TCX_LongZhu
commit
27d5470250
Binary file not shown.
Before Width: | Height: | Size: 54 KiB After Width: | Height: | Size: 104 KiB |
|
@ -477,7 +477,7 @@ RectTransform:
|
||||||
- {fileID: 2829618591546992533}
|
- {fileID: 2829618591546992533}
|
||||||
- {fileID: 1097687476548570597}
|
- {fileID: 1097687476548570597}
|
||||||
m_Father: {fileID: 1220779376253879819}
|
m_Father: {fileID: 1220779376253879819}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 3
|
||||||
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}
|
||||||
|
@ -704,8 +704,8 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 3328611305080823179}
|
- {fileID: 3328611305080823179}
|
||||||
- {fileID: 7884838541806772700}
|
- {fileID: 7884838541806772700}
|
||||||
- {fileID: 4774959997631316829}
|
|
||||||
- {fileID: 5326367651309699246}
|
- {fileID: 5326367651309699246}
|
||||||
|
- {fileID: 4774959997631316829}
|
||||||
- {fileID: 8550293565824960037}
|
- {fileID: 8550293565824960037}
|
||||||
m_Father: {fileID: 7192441510342929614}
|
m_Father: {fileID: 7192441510342929614}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 3
|
||||||
|
@ -2730,7 +2730,7 @@ RectTransform:
|
||||||
- {fileID: 7474059244063619966}
|
- {fileID: 7474059244063619966}
|
||||||
- {fileID: 9196862880698259895}
|
- {fileID: 9196862880698259895}
|
||||||
m_Father: {fileID: 4026387186930331749}
|
m_Father: {fileID: 4026387186930331749}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 3
|
||||||
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}
|
||||||
|
@ -3379,8 +3379,8 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 4299542618276249011}
|
- {fileID: 4299542618276249011}
|
||||||
- {fileID: 5965158166875134781}
|
- {fileID: 5965158166875134781}
|
||||||
- {fileID: 919779818932436198}
|
|
||||||
- {fileID: 3375630820603012396}
|
- {fileID: 3375630820603012396}
|
||||||
|
- {fileID: 919779818932436198}
|
||||||
- {fileID: 4140569525172060741}
|
- {fileID: 4140569525172060741}
|
||||||
m_Father: {fileID: 7192441510342929614}
|
m_Father: {fileID: 7192441510342929614}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
|
@ -4896,12 +4896,12 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 5719322795286442020}
|
m_Father: {fileID: 5719322795286442020}
|
||||||
m_RootOrder: 3
|
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.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: 6, y: 25}
|
m_AnchoredPosition: {x: 0, y: 20}
|
||||||
m_SizeDelta: {x: 164.6, y: 270.2}
|
m_SizeDelta: {x: 300, y: 300}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &4140150918573555864
|
--- !u!222 &4140150918573555864
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -4931,7 +4931,7 @@ MonoBehaviour:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_Sprite: {fileID: 21300000, guid: 8b07d4dbfbb76514ea507db7ae670703, type: 3}
|
m_Sprite: {fileID: 21300000, guid: 55e398dcbb89e0440a21f67a06a293e1, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
@ -5065,12 +5065,12 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 1220779376253879819}
|
m_Father: {fileID: 1220779376253879819}
|
||||||
m_RootOrder: 3
|
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.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: 6, y: 25}
|
m_AnchoredPosition: {x: 0, y: 20}
|
||||||
m_SizeDelta: {x: 164.6, y: 270.2}
|
m_SizeDelta: {x: 300, y: 300}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &826051147338625761
|
--- !u!222 &826051147338625761
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -5100,7 +5100,7 @@ MonoBehaviour:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_Sprite: {fileID: 21300000, guid: 8b07d4dbfbb76514ea507db7ae670703, type: 3}
|
m_Sprite: {fileID: 21300000, guid: 55e398dcbb89e0440a21f67a06a293e1, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
@ -6343,12 +6343,12 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 6265722148768912989}
|
m_Father: {fileID: 6265722148768912989}
|
||||||
m_RootOrder: 3
|
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.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: 6, y: 25}
|
m_AnchoredPosition: {x: 0, y: 20}
|
||||||
m_SizeDelta: {x: 164.6, y: 270.2}
|
m_SizeDelta: {x: 300, y: 300}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &8014576735061191309
|
--- !u!222 &8014576735061191309
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -6378,7 +6378,7 @@ MonoBehaviour:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_Sprite: {fileID: 21300000, guid: 8b07d4dbfbb76514ea507db7ae670703, type: 3}
|
m_Sprite: {fileID: 21300000, guid: 55e398dcbb89e0440a21f67a06a293e1, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
@ -7248,8 +7248,8 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 2303154231150753752}
|
- {fileID: 2303154231150753752}
|
||||||
- {fileID: 8072551158853733495}
|
- {fileID: 8072551158853733495}
|
||||||
- {fileID: 5267636850557601787}
|
|
||||||
- {fileID: 2672983211003256262}
|
- {fileID: 2672983211003256262}
|
||||||
|
- {fileID: 5267636850557601787}
|
||||||
- {fileID: 6896540909832342489}
|
- {fileID: 6896540909832342489}
|
||||||
m_Father: {fileID: 7192441510342929614}
|
m_Father: {fileID: 7192441510342929614}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
|
@ -7331,7 +7331,7 @@ RectTransform:
|
||||||
- {fileID: 5321880998071467076}
|
- {fileID: 5321880998071467076}
|
||||||
- {fileID: 1787325313176593336}
|
- {fileID: 1787325313176593336}
|
||||||
m_Father: {fileID: 6265722148768912989}
|
m_Father: {fileID: 6265722148768912989}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 3
|
||||||
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}
|
||||||
|
@ -7842,8 +7842,8 @@ RectTransform:
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 2633473193331923672}
|
- {fileID: 2633473193331923672}
|
||||||
- {fileID: 3668041728249064023}
|
- {fileID: 3668041728249064023}
|
||||||
- {fileID: 5821971477995489840}
|
|
||||||
- {fileID: 904868177071956272}
|
- {fileID: 904868177071956272}
|
||||||
|
- {fileID: 5821971477995489840}
|
||||||
- {fileID: 77962170189728890}
|
- {fileID: 77962170189728890}
|
||||||
m_Father: {fileID: 7192441510342929614}
|
m_Father: {fileID: 7192441510342929614}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 2
|
||||||
|
@ -8343,7 +8343,7 @@ RectTransform:
|
||||||
- {fileID: 5203385254270428338}
|
- {fileID: 5203385254270428338}
|
||||||
- {fileID: 3385911536946731775}
|
- {fileID: 3385911536946731775}
|
||||||
m_Father: {fileID: 5719322795286442020}
|
m_Father: {fileID: 5719322795286442020}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 3
|
||||||
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}
|
||||||
|
@ -8920,12 +8920,12 @@ RectTransform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 4026387186930331749}
|
m_Father: {fileID: 4026387186930331749}
|
||||||
m_RootOrder: 3
|
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.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: 6, y: 25}
|
m_AnchoredPosition: {x: 0, y: 20}
|
||||||
m_SizeDelta: {x: 164.6, y: 270.2}
|
m_SizeDelta: {x: 300, y: 300}
|
||||||
m_Pivot: {x: 0.5, y: 0.5}
|
m_Pivot: {x: 0.5, y: 0.5}
|
||||||
--- !u!222 &3513921133628159832
|
--- !u!222 &3513921133628159832
|
||||||
CanvasRenderer:
|
CanvasRenderer:
|
||||||
|
@ -8955,7 +8955,7 @@ MonoBehaviour:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||||
m_Sprite: {fileID: 21300000, guid: 8b07d4dbfbb76514ea507db7ae670703, type: 3}
|
m_Sprite: {fileID: 21300000, guid: 55e398dcbb89e0440a21f67a06a293e1, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
|
Loading…
Reference in New Issue