huodong commit

jiaoyangna 2020-08-29 13:46:08 +08:00
parent 8391f5638f
commit 98e9b9757e
2 changed files with 33 additions and 48 deletions

View File

@ -744,7 +744,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &5489039324293512018
RectTransform:
m_ObjectHideFlags: 0
@ -766,7 +766,7 @@ RectTransform:
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: -6, y: 408}
m_AnchoredPosition: {x: -3634, y: 482}
m_SizeDelta: {x: 1080, y: 240}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3194347943538256385
@ -4843,10 +4843,10 @@ RectTransform:
m_Father: {fileID: 4492904220401090137}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -25}
m_SizeDelta: {x: 140, y: 38}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 38}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &4351523970267476369
CanvasRenderer:
@ -18517,9 +18517,9 @@ RectTransform:
m_Father: {fileID: 4492904220401090137}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 140, y: -25}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 140, y: 0}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &490872853371369416
@ -18557,8 +18557,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Left: -5
m_Right: -10
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 3
@ -18695,6 +18695,7 @@ GameObject:
- component: {fileID: 424732031091494258}
- component: {fileID: 7860949511530723952}
- component: {fileID: 2130199386442900294}
- component: {fileID: 162629205785195128}
m_Layer: 5
m_Name: page_4
m_TagString: Untagged
@ -18764,6 +18765,14 @@ MonoBehaviour:
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!222 &162629205785195128
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5262116819834456937}
m_CullTransparentMesh: 0
--- !u!1 &5296666992329814226
GameObject:
m_ObjectHideFlags: 0
@ -27985,7 +27994,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -538.24, y: 82}
m_SizeDelta: {x: 467, y: 50}
m_SizeDelta: {x: 0, y: 50}
m_Pivot: {x: 0, y: 0.5}
--- !u!114 &4232190997202796534
MonoBehaviour:
@ -29137,7 +29146,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &2620699115784601724
RectTransform:
m_ObjectHideFlags: 0
@ -29159,8 +29168,8 @@ RectTransform:
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: -11}
m_SizeDelta: {x: 1080, y: 240}
m_AnchoredPosition: {x: -6224, y: -61}
m_SizeDelta: {x: 1080, y: 239.5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7170134193974468110
CanvasRenderer:
@ -29383,10 +29392,10 @@ RectTransform:
m_Father: {fileID: 4492904220401090137}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 186, y: -25}
m_SizeDelta: {x: 281, y: 38}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 186, y: 0}
m_SizeDelta: {x: 0, y: 38}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &5421451615274732876
CanvasRenderer:
@ -31181,7 +31190,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &6872382260446978439
RectTransform:
m_ObjectHideFlags: 0
@ -35327,10 +35336,10 @@ RectTransform:
m_Father: {fileID: 4492904220401090137}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 140, y: -25}
m_SizeDelta: {x: 46, y: 46}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 140, y: 0}
m_SizeDelta: {x: 0, y: 46}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &49029013758658618
CanvasRenderer:

View File

@ -10369,7 +10369,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 8898359459109622746}
- component: {fileID: 3154605615505738986}
m_Layer: 5
m_Name: itemList
m_TagString: Untagged
@ -10396,29 +10395,6 @@ RectTransform:
m_AnchoredPosition: {x: 0.000012398, y: -244}
m_SizeDelta: {x: 910.1, y: 875.3}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &3154605615505738986
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8018142310961394712}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 0
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 0
m_Spacing: 0
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
--- !u!1 &8199847582237032916
GameObject:
m_ObjectHideFlags: 0