diff --git a/Assets/Prefabs/Core/UI/GameOverScore.prefab b/Assets/Prefabs/Core/UI/GameOverScore.prefab new file mode 100644 index 0000000..c26e466 --- /dev/null +++ b/Assets/Prefabs/Core/UI/GameOverScore.prefab @@ -0,0 +1,225 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3842438280725305238 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3842438280725305239} + - component: {fileID: 3842438280725305237} + - component: {fileID: 3842438280725305236} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3842438280725305239 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3842438280725305238} + 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: 8187235579900679691} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 18, y: 0} + m_SizeDelta: {x: 60, y: 60} + m_Pivot: {x: 0, y: 0.5} +--- !u!222 &3842438280725305237 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3842438280725305238} + m_CullTransparentMesh: 0 +--- !u!114 &3842438280725305236 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3842438280725305238} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: bbf043ba8a6f2c341ad9db4d7e0f4b0a, type: 3} + m_Type: 0 + 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!1 &3842438282367334741 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3842438282367334738} + - component: {fileID: 3842438282367334736} + - component: {fileID: 3842438282367334739} + m_Layer: 5 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3842438282367334738 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3842438282367334741} + 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: 8187235579900679691} + 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: 48, y: 0} + m_SizeDelta: {x: -96, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3842438282367334736 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3842438282367334741} + m_CullTransparentMesh: 0 +--- !u!114 &3842438282367334739 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3842438282367334741} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.27450982, g: 0.75686276, b: 0.52156866, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: 75c9cbfd49e877c468331f81fc132714, type: 3} + m_FontSize: 50 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 0 + m_MaxSize: 52 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 0 +--- !u!1 &8187235579900679688 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8187235579900679691} + - component: {fileID: 8187235579900679701} + - component: {fileID: 2162530360092321737} + - component: {fileID: 3842438280461233931} + m_Layer: 5 + m_Name: GameOverScore + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8187235579900679691 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8187235579900679688} + 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: 3842438282367334738} + - {fileID: 3842438280725305239} + m_Father: {fileID: 0} + m_RootOrder: 0 + 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: -31, y: 0} + m_SizeDelta: {x: 480, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8187235579900679701 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8187235579900679688} + m_CullTransparentMesh: 0 +--- !u!114 &2162530360092321737 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8187235579900679688} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 68e459f5818c0884ca089d91defc1409, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &3842438280461233931 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8187235579900679688} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 434b0b9680e8eb946ad858c56a075518, type: 3} + m_Name: + m_EditorClassIdentifier: + displayWhen: 1 diff --git a/Assets/Prefabs/Core/UI/GameOverScore.prefab.meta b/Assets/Prefabs/Core/UI/GameOverScore.prefab.meta new file mode 100644 index 0000000..d326614 --- /dev/null +++ b/Assets/Prefabs/Core/UI/GameOverScore.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9c461db3d412fa549a48d7ea57075706 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Microgame_Nothing/NothingMicrogame.prefab b/Assets/Prefabs/Microgame_Nothing/NothingMicrogame.prefab index 4bb2d5d..0522190 100644 --- a/Assets/Prefabs/Microgame_Nothing/NothingMicrogame.prefab +++ b/Assets/Prefabs/Microgame_Nothing/NothingMicrogame.prefab @@ -93,7 +93,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 138a8f32353ffdc448fd9b1d859bbd3d, type: 3} m_Name: m_EditorClassIdentifier: - requiredDestructions: 5 + requiredDestructions: 4 --- !u!114 &740996690935749476 MonoBehaviour: m_ObjectHideFlags: 0 @@ -144,7 +144,7 @@ MonoBehaviour: type: 3} min: {x: -7, y: -3} max: {x: 7, y: 3} - quantity: 3 + quantity: 2 --- !u!1001 &4929531476676168932 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Default.unity b/Assets/Scenes/Default.unity index 25ff8bf..e16a3e1 100644 --- a/Assets/Scenes/Default.unity +++ b/Assets/Scenes/Default.unity @@ -240,6 +240,7 @@ RectTransform: - {fileID: 548149270} - {fileID: 1842189697} - {fileID: 1686871873} + - {fileID: 4957885000444734025} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -332,6 +333,24 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 3646290606250593900} m_PrefabAsset: {fileID: 0} +--- !u!1 &2064139543 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 3842438282367334741, guid: 9c461db3d412fa549a48d7ea57075706, + type: 3} + m_PrefabInstance: {fileID: 3842438280303197250} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2064139544 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2064139543} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 68e459f5818c0884ca089d91defc1409, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &742014443134654871 PrefabInstance: m_ObjectHideFlags: 0 @@ -789,6 +808,131 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f55c76379fd1c594b9b5138efc539234, type: 3} +--- !u!1001 &3842438280303197250 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 706082056} + m_Modifications: + - target: {fileID: 8187235579900679688, guid: 9c461db3d412fa549a48d7ea57075706, + type: 3} + propertyPath: m_Name + value: GameOverScore + objectReference: {fileID: 0} + - target: {fileID: 8187235579900679691, guid: 9c461db3d412fa549a48d7ea57075706, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8187235579900679691, guid: 9c461db3d412fa549a48d7ea57075706, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8187235579900679691, guid: 9c461db3d412fa549a48d7ea57075706, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8187235579900679691, guid: 9c461db3d412fa549a48d7ea57075706, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8187235579900679691, guid: 9c461db3d412fa549a48d7ea57075706, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8187235579900679691, guid: 9c461db3d412fa549a48d7ea57075706, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8187235579900679691, guid: 9c461db3d412fa549a48d7ea57075706, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8187235579900679691, guid: 9c461db3d412fa549a48d7ea57075706, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 8187235579900679691, guid: 9c461db3d412fa549a48d7ea57075706, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8187235579900679691, guid: 9c461db3d412fa549a48d7ea57075706, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8187235579900679691, guid: 9c461db3d412fa549a48d7ea57075706, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8187235579900679691, guid: 9c461db3d412fa549a48d7ea57075706, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -31 + objectReference: {fileID: 0} + - target: {fileID: 8187235579900679691, guid: 9c461db3d412fa549a48d7ea57075706, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8187235579900679691, guid: 9c461db3d412fa549a48d7ea57075706, + type: 3} + propertyPath: m_SizeDelta.x + value: 480 + objectReference: {fileID: 0} + - target: {fileID: 8187235579900679691, guid: 9c461db3d412fa549a48d7ea57075706, + type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 8187235579900679691, guid: 9c461db3d412fa549a48d7ea57075706, + type: 3} + propertyPath: m_AnchorMin.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8187235579900679691, guid: 9c461db3d412fa549a48d7ea57075706, + type: 3} + propertyPath: m_AnchorMin.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8187235579900679691, guid: 9c461db3d412fa549a48d7ea57075706, + type: 3} + propertyPath: m_AnchorMax.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8187235579900679691, guid: 9c461db3d412fa549a48d7ea57075706, + type: 3} + propertyPath: m_AnchorMax.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8187235579900679691, guid: 9c461db3d412fa549a48d7ea57075706, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 8187235579900679691, guid: 9c461db3d412fa549a48d7ea57075706, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 9c461db3d412fa549a48d7ea57075706, type: 3} +--- !u!224 &4957885000444734025 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8187235579900679691, guid: 9c461db3d412fa549a48d7ea57075706, + type: 3} + m_PrefabInstance: {fileID: 3842438280303197250} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5804266076916140296 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Core/UI/DisplayOnGameOver.cs.meta b/Assets/Scripts/Core/UI/DisplayOnGameOver.cs.meta index fe17cd0..d65306f 100644 --- a/Assets/Scripts/Core/UI/DisplayOnGameOver.cs.meta +++ b/Assets/Scripts/Core/UI/DisplayOnGameOver.cs.meta @@ -4,7 +4,7 @@ MonoImporter: externalObjects: {} serializedVersion: 2 defaultReferences: [] - executionOrder: 0 + executionOrder: 400 icon: {instanceID: 0} userData: assetBundleName: