Merge remote-tracking branch 'origin/dev_cyp' into dev_lishuo
# Conflicts: # Assets/Scripts/UI/Prefab/Race/RaceButtonGroupScript.cs
This commit is contained in:
lishuo committed
commit
7d0128d912
15 files changed
+1095
-109
No files matched your search
@@ -64,7 +64,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 8d004e6a6e82b544bbab7c3db02cf43c, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: eb15a1b29ba09c14886b07a41640c267, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@@ -327,7 +327,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137255, a: 1}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
@@ -776,7 +776,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 66d048b771d02ce44a691f354a213d98, type: 3}
|
||||
m_Sprite: {fileID: 21300000, guid: bd4cdb4830bc1f248b6de6abaada3e0a, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
@@ -844,7 +844,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137255, a: 1}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
@@ -1374,7 +1374,7 @@ PrefabInstance:
|
||||
- target: {fileID: 8600990077643662720, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 20
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8600990077643662720, guid: 652cdefe0475dfd429e5a7e92bc3fa31,
|
||||
type: 3}
|
||||
@@ -1484,7 +1484,7 @@ PrefabInstance:
|
||||
- target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 20
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2054923810110871857, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
@@ -1719,7 +1719,7 @@ PrefabInstance:
|
||||
- target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 20
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6347209353323850145, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
@@ -1754,7 +1754,7 @@ PrefabInstance:
|
||||
- target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 20
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8197454007437855745, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
@@ -1779,7 +1779,7 @@ PrefabInstance:
|
||||
- target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
value: 20
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8526344065104504758, guid: a1999d0576fee6248a9c5a507ae8d10e,
|
||||
type: 3}
|
||||
|
||||
@@ -32,6 +32,7 @@ RectTransform:
|
||||
m_Children:
|
||||
- {fileID: 8976674304292884952}
|
||||
- {fileID: 4891852497432372523}
|
||||
- {fileID: 4745410272457715662}
|
||||
m_Father: {fileID: 1856582807434622599}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@@ -99,7 +100,7 @@ MonoBehaviour:
|
||||
m_ScrollSensitivity: 50
|
||||
m_Viewport: {fileID: 4891852497432372523}
|
||||
m_HorizontalScrollbar: {fileID: 0}
|
||||
m_VerticalScrollbar: {fileID: 0}
|
||||
m_VerticalScrollbar: {fileID: 3714912750620550917}
|
||||
m_HorizontalScrollbarVisibility: 0
|
||||
m_VerticalScrollbarVisibility: 0
|
||||
m_HorizontalScrollbarSpacing: -3
|
||||
@@ -2366,7 +2367,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 20, y: 0}
|
||||
m_SizeDelta: {x: -40, y: 0}
|
||||
m_SizeDelta: {x: -34, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &4891852497432372524
|
||||
CanvasRenderer:
|
||||
@@ -2541,6 +2542,80 @@ MonoBehaviour:
|
||||
m_MaskInteraction: 85
|
||||
m_UseStencil: 1
|
||||
m_RaycastFilter: 0
|
||||
--- !u!1 &5276276116649666566
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4180394555805809794}
|
||||
- component: {fileID: 2754427459529402935}
|
||||
- component: {fileID: 7747655051951156966}
|
||||
m_Layer: 5
|
||||
m_Name: Handle
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4180394555805809794
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5276276116649666566}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 7642792713427571634}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 20, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2754427459529402935
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5276276116649666566}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &7747655051951156966
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5276276116649666566}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137255, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &7155673232822736578
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2885,6 +2960,130 @@ MonoBehaviour:
|
||||
m_MaskInteraction: 85
|
||||
m_UseStencil: 1
|
||||
m_RaycastFilter: 0
|
||||
--- !u!1 &6050569855701897417
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 4745410272457715662}
|
||||
- component: {fileID: 5748471796170483597}
|
||||
- component: {fileID: 5582651108076499812}
|
||||
- component: {fileID: 3714912750620550917}
|
||||
m_Layer: 5
|
||||
m_Name: Scrollbar Vertical
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &4745410272457715662
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6050569855701897417}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 7642792713427571634}
|
||||
m_Father: {fileID: 465239218947862517}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 6, y: 0}
|
||||
m_Pivot: {x: 1, y: 1}
|
||||
--- !u!222 &5748471796170483597
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6050569855701897417}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &5582651108076499812
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6050569855701897417}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.23921569, g: 0.24313726, b: 0.3019608, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &3714912750620550917
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6050569855701897417}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 2a4db7a114972834c8e4117be1d82ba3, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
|
||||
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
|
||||
m_ColorMultiplier: 1
|
||||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_SelectedTrigger: Selected
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 7747655051951156966}
|
||||
m_HandleRect: {fileID: 4180394555805809794}
|
||||
m_Direction: 2
|
||||
m_Value: 0
|
||||
m_Size: 1
|
||||
m_NumberOfSteps: 0
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!114 &1429559311976359905
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -2933,6 +3132,42 @@ MonoBehaviour:
|
||||
m_MaskInteraction: 85
|
||||
m_UseStencil: 1
|
||||
m_RaycastFilter: 0
|
||||
--- !u!1 &6470237566337987207
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7642792713427571634}
|
||||
m_Layer: 5
|
||||
m_Name: Sliding Area
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &7642792713427571634
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6470237566337987207}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 4180394555805809794}
|
||||
m_Father: {fileID: 4745410272457715662}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: -20, y: -20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &6653062727056844702
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -5003,15 +5238,9 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3}
|
||||
--- !u!1 &4628129972378993927 stripped
|
||||
--- !u!1 &5779092891361109961 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5321188461237024149}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &6398833330297696636 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5321188461237024149}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
@@ -5021,18 +5250,6 @@ GameObject:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5321188461237024149}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &3075247155673026290 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5321188461237024149}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &8149286171844735752 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5321188461237024149}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &5464789140640568869 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
@@ -5051,9 +5268,27 @@ RectTransform:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5321188461237024149}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &5779092891361109961 stripped
|
||||
--- !u!1 &4628129972378993927 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1867831574853112412, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5321188461237024149}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &6398833330297696636 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5321188461237024149}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &3075247155673026290 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7166863393051868007, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5321188461237024149}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &8149286171844735752 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5321188461237024149}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
@@ -5196,21 +5431,9 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 5ee52e0b78bd38244a2b473e2236800c, type: 3}
|
||||
--- !u!1 &6423651778393776433 stripped
|
||||
--- !u!1 &7820744829146851513 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6073211655158443556}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &6216688916544654740 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6073211655158443556}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &4998415483215112909 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6073211655158443556}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
@@ -5220,15 +5443,9 @@ GameObject:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6073211655158443556}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &185106026378206774 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6073211655158443556}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &7820744829146851513 stripped
|
||||
--- !u!1 &6423651778393776433 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4089475371085219485, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
m_CorrespondingSourceObject: {fileID: 967434514102783765, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6073211655158443556}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
@@ -5238,18 +5455,36 @@ GameObject:
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6073211655158443556}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &185106026378206774 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 6258245508770672658, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6073211655158443556}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &6749386026079657654 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 712346121867735186, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6073211655158443556}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &4998415483215112909 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1231050277644289257, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6073211655158443556}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &3745822250017908288 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 7472514873862735972, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6073211655158443556}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &6216688916544654740 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 148192672769352624, guid: 5ee52e0b78bd38244a2b473e2236800c,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6073211655158443556}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &6653062728498872177
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -5374,15 +5609,15 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 07e45aecba1a2d542b043157aa2e9322, type: 3}
|
||||
--- !u!1 &4976321847170018841 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6653062728498872177}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!224 &7944455583227005010 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 3608523562535466787, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6653062728498872177}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &4976321847170018841 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1827088261433348456, guid: 07e45aecba1a2d542b043157aa2e9322,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6653062728498872177}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
@@ -1577,7 +1577,7 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 20
|
||||
m_Right: 0
|
||||
m_Right: 14
|
||||
m_Top: 20
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 0
|
||||
@@ -2055,7 +2055,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 20, y: 0}
|
||||
m_SizeDelta: {x: 6, y: 0}
|
||||
m_Pivot: {x: 1, y: 1}
|
||||
--- !u!222 &6208840624193956598
|
||||
CanvasRenderer:
|
||||
@@ -2078,7 +2078,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Color: {r: 0.23921569, g: 0.24313726, b: 0.3019608, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
@@ -2335,7 +2335,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_Color: {r: 0.36078432, g: 0.36078432, b: 0.43137255, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
|
||||
Reference in new issue
Block a user