Commit 7aaf691d authored by astatham's avatar astatham
Browse files

Merge branch 'master' of https://altitude.otago.ac.nz/gstuitje/ringmaster into piethrowing

# Conflicts:
#	RingMaster/RingMaster/.vs/RingMaster/xs/UserPrefs.xml
parents 4c53e0d6 05df969e
...@@ -79,7 +79,7 @@ MonoBehaviour: ...@@ -79,7 +79,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
speed: 4 speed: 4
points: 10 points: 5
explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2} explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2}
--- !u!212 &212407946038748536 --- !u!212 &212407946038748536
SpriteRenderer: SpriteRenderer:
......
...@@ -79,7 +79,7 @@ MonoBehaviour: ...@@ -79,7 +79,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
speed: 4 speed: 4
points: 10 points: 5
explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2} explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2}
--- !u!212 &212811011743869882 --- !u!212 &212811011743869882
SpriteRenderer: SpriteRenderer:
......
...@@ -210,7 +210,7 @@ MonoBehaviour: ...@@ -210,7 +210,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
speed: 4 speed: 4
points: 10 points: 5
explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2} explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2}
--- !u!212 &212894587835513782 --- !u!212 &212894587835513782
SpriteRenderer: SpriteRenderer:
......
...@@ -79,7 +79,7 @@ MonoBehaviour: ...@@ -79,7 +79,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
speed: 4 speed: 4
points: 10 points: 5
explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2} explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2}
--- !u!212 &212407946038748536 --- !u!212 &212407946038748536
SpriteRenderer: SpriteRenderer:
......
...@@ -24,7 +24,7 @@ GameObject: ...@@ -24,7 +24,7 @@ GameObject:
- component: {fileID: 61342928451587054} - component: {fileID: 61342928451587054}
m_Layer: 8 m_Layer: 8
m_Name: Q(Left) m_Name: Q(Left)
m_TagString: Untagged m_TagString: TutorialBlock
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
...@@ -79,7 +79,7 @@ MonoBehaviour: ...@@ -79,7 +79,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
speed: 4 speed: 4
points: 10 points: 5
explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2} explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2}
--- !u!212 &212888216861688268 --- !u!212 &212888216861688268
SpriteRenderer: SpriteRenderer:
......
...@@ -79,7 +79,7 @@ MonoBehaviour: ...@@ -79,7 +79,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
speed: 4 speed: 4
points: 10 points: 5
explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2} explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2}
--- !u!212 &212506891093594290 --- !u!212 &212506891093594290
SpriteRenderer: SpriteRenderer:
......
...@@ -79,7 +79,7 @@ MonoBehaviour: ...@@ -79,7 +79,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
speed: 4 speed: 4
points: 10 points: 5
explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2} explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2}
--- !u!212 &212407946038748536 --- !u!212 &212407946038748536
SpriteRenderer: SpriteRenderer:
......
...@@ -782,6 +782,8 @@ MonoBehaviour: ...@@ -782,6 +782,8 @@ MonoBehaviour:
specialItem: {fileID: 1929470931612680} specialItem: {fileID: 1929470931612680}
OnCollectParticles: {fileID: 1290046360213332, guid: 107a7a15d7e65914d89e2647ad01e920, OnCollectParticles: {fileID: 1290046360213332, guid: 107a7a15d7e65914d89e2647ad01e920,
type: 2} type: 2}
textParticles: {fileID: 1044449210632190, guid: bf8747e4259d9bd46acdd2b6e3588586,
type: 2}
--- !u!114 &114078961028380754 --- !u!114 &114078961028380754
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -798,6 +800,8 @@ MonoBehaviour: ...@@ -798,6 +800,8 @@ MonoBehaviour:
specialItem: {fileID: 1104844275863738} specialItem: {fileID: 1104844275863738}
OnCollectParticles: {fileID: 1290046360213332, guid: 107a7a15d7e65914d89e2647ad01e920, OnCollectParticles: {fileID: 1290046360213332, guid: 107a7a15d7e65914d89e2647ad01e920,
type: 2} type: 2}
textParticles: {fileID: 1044449210632190, guid: bf8747e4259d9bd46acdd2b6e3588586,
type: 2}
--- !u!114 &114088591933865888 --- !u!114 &114088591933865888
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
...@@ -814,6 +818,8 @@ MonoBehaviour: ...@@ -814,6 +818,8 @@ MonoBehaviour:
specialItem: {fileID: 1693443499505372} specialItem: {fileID: 1693443499505372}
OnCollectParticles: {fileID: 1290046360213332, guid: 107a7a15d7e65914d89e2647ad01e920, OnCollectParticles: {fileID: 1290046360213332, guid: 107a7a15d7e65914d89e2647ad01e920,
type: 2} type: 2}
textParticles: {fileID: 1044449210632190, guid: bf8747e4259d9bd46acdd2b6e3588586,
type: 2}
--- !u!212 &212044486889390446 --- !u!212 &212044486889390446
SpriteRenderer: SpriteRenderer:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
......
...@@ -79,7 +79,7 @@ MonoBehaviour: ...@@ -79,7 +79,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
speed: 4 speed: 4
points: 10 points: 5
explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2} explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2}
--- !u!212 &212407946038748536 --- !u!212 &212407946038748536
SpriteRenderer: SpriteRenderer:
......
...@@ -79,7 +79,7 @@ MonoBehaviour: ...@@ -79,7 +79,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
speed: 4 speed: 4
points: 10 points: 5
explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2} explosion: {fileID: 1349330085042370, guid: 0ac730bfcfd78434a97df3989e6443c7, type: 2}
--- !u!212 &212407946038748536 --- !u!212 &212407946038748536
SpriteRenderer: SpriteRenderer:
......
This diff is collapsed.
fileFormatVersion: 2
guid: f33ab7a5d2bf1437899c3ce6e056a405
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
...@@ -1309,7 +1309,7 @@ Transform: ...@@ -1309,7 +1309,7 @@ Transform:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 258363426} m_GameObject: {fileID: 258363426}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 4.5, z: -10.146484} m_LocalPosition: {x: 0, y: 4.5, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 503603553} m_Father: {fileID: 503603553}
...@@ -7341,7 +7341,7 @@ RectTransform: ...@@ -7341,7 +7341,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1} m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -94.25, y: -15} m_AnchoredPosition: {x: -94.25001, y: -15}
m_SizeDelta: {x: 170.51, y: 30} m_SizeDelta: {x: 170.51, y: 30}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &848493752 --- !u!114 &848493752
...@@ -12578,7 +12578,7 @@ Transform: ...@@ -12578,7 +12578,7 @@ Transform:
m_LocalScale: {x: 4, y: 3.6999998, z: 1} m_LocalScale: {x: 4, y: 3.6999998, z: 1}
m_Children: [] m_Children: []
m_Father: {fileID: 1230210401} m_Father: {fileID: 1230210401}
m_RootOrder: 4 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1008886850 --- !u!212 &1008886850
SpriteRenderer: SpriteRenderer:
...@@ -18079,6 +18079,7 @@ Transform: ...@@ -18079,6 +18079,7 @@ Transform:
- {fileID: 1402622834} - {fileID: 1402622834}
- {fileID: 503603553} - {fileID: 503603553}
- {fileID: 102930289} - {fileID: 102930289}
- {fileID: 1679412200}
- {fileID: 1008886849} - {fileID: 1008886849}
m_Father: {fileID: 491873958} m_Father: {fileID: 491873958}
m_RootOrder: 7 m_RootOrder: 7
...@@ -28497,6 +28498,7 @@ Transform: ...@@ -28497,6 +28498,7 @@ Transform:
- {fileID: 636012976} - {fileID: 636012976}
- {fileID: 231697273} - {fileID: 231697273}
- {fileID: 1146273524} - {fileID: 1146273524}
- {fileID: 1751635343}
m_Father: {fileID: 1175208678} m_Father: {fileID: 1175208678}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -28530,11 +28532,213 @@ Transform: ...@@ -28530,11 +28532,213 @@ Transform:
m_Father: {fileID: 836855645} m_Father: {fileID: 836855645}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1679412199
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1679412200}
- component: {fileID: 1679412202}
- component: {fileID: 1679412201}
m_Layer: 0
m_Name: Fence_1 (3)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1679412200
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1679412199}
m_LocalRotation: {x: 0.02769416, y: 0.647262, z: -0.03256354, w: -0.7610681}
m_LocalPosition: {x: -46.95, y: -2.21, z: 100}
m_LocalScale: {x: 8.556785, y: 3.7514532, z: 1.056516}
m_Children: []
m_Father: {fileID: 1230210401}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 279.24, z: 4.9}
--- !u!61 &1679412201
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1679412199}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 6.21, y: 0.44}
newSize: {x: 6.21, y: 0.44}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 3.04, y: 0.44}
m_EdgeRadius: 0
--- !u!212 &1679412202
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1679412199}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -1966733235
m_SortingLayer: 2
m_SortingOrder: 1
m_Sprite: {fileID: 21300002, guid: 4912bb1b0bc6d2146898d2cfb55c153f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 6.21, y: 0.44}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1 &1684358589 stripped --- !u!1 &1684358589 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 1201578362876714, guid: 2c7917ac87eca42679b31ab33e2eec29, m_CorrespondingSourceObject: {fileID: 1201578362876714, guid: 2c7917ac87eca42679b31ab33e2eec29,
type: 2} type: 2}
m_PrefabInternal: {fileID: 1109435144} m_PrefabInternal: {fileID: 1109435144}
--- !u!1 &1751635342
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1751635343}
- component: {fileID: 1751635345}
- component: {fileID: 1751635344}
m_Layer: 0
m_Name: Fence_1 (4)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1751635343
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1751635342}
m_LocalRotation: {x: 0.0327465, y: 0.7653442, z: 0.027477577, w: 0.6422001}
m_LocalPosition: {x: 29.07, y: -4, z: 100}
m_LocalScale: {x: 8, y: 3.6999998, z: 1}
m_Children: []
m_Father: {fileID: 1646371380}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 100, z: 4.9}
--- !u!61 &1751635344
BoxCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1751635342}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_UsedByComposite: 0
m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 6.21, y: 0.44}
newSize: {x: 6.21, y: 0.44}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 3.04, y: 0.44}
m_EdgeRadius: 0
--- !u!212 &1751635345
SpriteRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1751635342}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 0
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: -1966733235
m_SortingLayer: 2
m_SortingOrder: 1
m_Sprite: {fileID: 21300002, guid: 4912bb1b0bc6d2146898d2cfb55c153f, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 6.21, y: 0.44}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!1001 &1756462862 --- !u!1001 &1756462862
Prefab: Prefab:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
...@@ -166,7 +166,7 @@ MonoBehaviour: ...@@ -166,7 +166,7 @@ MonoBehaviour:
left: {fileID: 1420096474736596, guid: 7a0fe9f3a92734dcc92243c917a58270, type: 2} left: {fileID: 1420096474736596, guid: 7a0fe9f3a92734dcc92243c917a58270, type: 2}
right: {fileID: 1420096474736596, guid: c0fb00b50a9764bf3ab259a3b2e1059a, type: 2} right: {fileID: 1420096474736596, guid: c0fb00b50a9764bf3ab259a3b2e1059a, type: 2}
skip: 0 skip: 0
volumeFade: 0.2 volumeFade: 0.125
qwer: 1 qwer: 1
playSpeed: 1 playSpeed: 1
--- !u!82 &89139957 --- !u!82 &89139957
...@@ -277,6 +277,84 @@ MonoBehaviour: ...@@ -277,6 +277,84 @@ MonoBehaviour:
m_EditorClassIdentifier: m_EditorClassIdentifier:
score: {fileID: 1270994740} score: {fileID: 1270994740}
combo: {fileID: 1828139996} combo: {fileID: 1828139996}
multi: {fileID: 106097054}
exitPanel: {fileID: 1216935864}
exitText: {fileID: 1272109652}
--- !u!1 &106097052
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 106097053}
- component: {fileID: 106097055}
- component: {fileID: 106097054}
m_Layer: 0
m_Name: Multiplier
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &106097053
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 106097052}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9999327, y: 0.9999327, z: 0.9999327}
m_Children: []
m_Father: {fileID: 333498656}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 113.180176, y: -21.85}
m_SizeDelta: {x: -266.39996, y: 40}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &106097054
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 106097052}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 40
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 'Multiplier: 100'
--- !u!222 &106097055
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 106097052}
m_CullTransparentMesh: 0
--- !u!1 &165739920 --- !u!1 &165739920
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -729,6 +807,7 @@ RectTransform: ...@@ -729,6 +807,7 @@ RectTransform:
m_Children: m_Children:
- {fileID: 1270994739} - {fileID: 1270994739}
- {fileID: 1828139995} - {fileID: 1828139995}
- {fileID: 106097053}
m_Father: {fileID: 1542602636} m_Father: {fileID: 1542602636}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -2515,6 +2594,77 @@ CanvasRenderer: ...@@ -2515,6 +2594,77 @@ CanvasRenderer:
m_PrefabInternal: {fileID: 0} m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 1202603867} m_GameObject: {fileID: 1202603867}
m_CullTransparentMesh: 0 m_CullTransparentMesh: 0
--- !u!1 &1216935864