diff --git a/Assets/Prefab/PlatfLevel-1.prefab b/Assets/Prefab/PlatfLevel-1.prefab index 9b48a66..90dfa7d 100644 --- a/Assets/Prefab/PlatfLevel-1.prefab +++ b/Assets/Prefab/PlatfLevel-1.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 6530457814582240327} m_Layer: 0 - m_Name: PlatfEndPosition (1) + m_Name: PlatfEndPosition m_TagString: Untagged m_Icon: {fileID: -5397416234189338067, guid: 0000000000000000d000000000000000, type: 0} m_NavMeshLayer: 0 @@ -41,7 +41,9 @@ GameObject: m_Component: - component: {fileID: 125308035280796441} - component: {fileID: 2907532592616255484} + - component: {fileID: 3504860314535058711} - component: {fileID: 1396437647833806050} + - component: {fileID: 6883983879823138768} m_Layer: 8 m_Name: Ground-1 m_TagString: Ground @@ -58,7 +60,7 @@ Transform: m_GameObject: {fileID: 7393099111313939161} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 20.5, y: -0.5, z: 0} + m_LocalPosition: {x: 20.5, y: -4.15, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -116,6 +118,33 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!50 &3504860314535058711 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7393099111313939161} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!61 &1396437647833806050 BoxCollider2D: m_ObjectHideFlags: 0 @@ -161,6 +190,20 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 5.05, y: 0.9} m_EdgeRadius: 0 +--- !u!114 &6883983879823138768 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7393099111313939161} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cd6ee5b0f1fa5844b8e9c942d62e9028, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 1 + acceleration: 0.2 --- !u!1 &9043798579608715691 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 824748a..392d03a 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -201,7 +201,9 @@ GameObject: m_Component: - component: {fileID: 75591475} - component: {fileID: 75591478} + - component: {fileID: 75591480} - component: {fileID: 75591477} + - component: {fileID: 75591479} m_Layer: 8 m_Name: Ground-0 m_TagString: Ground @@ -321,6 +323,137 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!114 &75591479 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 75591474} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cd6ee5b0f1fa5844b8e9c942d62e9028, type: 3} + m_Name: + m_EditorClassIdentifier: + speed: 1 + acceleration: 0.2 +--- !u!50 &75591480 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 75591474} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!1 &334590554 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 334590557} + - component: {fileID: 334590556} + - component: {fileID: 334590555} + m_Layer: 0 + m_Name: DestroyScanner + m_TagString: Untagged + m_Icon: {fileID: 7148428337604731935, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &334590555 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 334590554} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2e386a9af92c72140910ee7319eae6a8, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!61 &334590556 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 334590554} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + 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, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 11} + m_EdgeRadius: 0 +--- !u!4 &334590557 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 334590554} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -5, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &564379867 GameObject: m_ObjectHideFlags: 0 @@ -365,10 +498,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2a58f8ab6811b9942b34b7598fe7d37f, type: 3} m_Name: m_EditorClassIdentifier: - platformStart: {fileID: 2025757104} - platformList: - - {fileID: 7652078137904284070} - player: {fileID: 1599905695} --- !u!1 &599090430 GameObject: m_ObjectHideFlags: 0 @@ -510,6 +639,97 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &812477033 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 812477036} + - component: {fileID: 812477035} + - component: {fileID: 812477034} + m_Layer: 0 + m_Name: SpawnScanner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &812477034 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 812477033} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: abc71bc493ba9934db2ea213b5133ba0, type: 3} + m_Name: + m_EditorClassIdentifier: + platform: {fileID: 9043798579608715691, guid: 5af64511161f524498b4db27d67cfca8, type: 3} +--- !u!61 &812477035 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 812477033} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + 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, y: 0} + oldSize: {x: 0, y: 0} + newSize: {x: 0, y: 0} + adaptiveTilingThreshold: 0 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 10, y: 7} + m_EdgeRadius: 0 +--- !u!4 &812477036 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 812477033} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 12, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &909904974 GameObject: m_ObjectHideFlags: 0 @@ -629,7 +849,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -3 + m_SortingOrder: -1 m_Sprite: {fileID: 21300000, guid: 404199c1654ec164f8c7ca0da3040e1e, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -773,7 +993,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -3 + m_SortingOrder: -2 m_Sprite: {fileID: 21300000, guid: 6142a8a4e7dc69a40a725dbfcbda504d, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -1354,8 +1574,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: aec587ad29831fa4086120cb404dce39, type: 3} m_Name: m_EditorClassIdentifier: - speed: 1.5 - acceleration: 0.1 jumpPower: 5 --- !u!1 &1656243818 GameObject: @@ -1772,10 +1990,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3993355263451668087, guid: 5af64511161f524498b4db27d67cfca8, type: 3} - propertyPath: m_Name - value: PlatfEndPosition - objectReference: {fileID: 0} - target: {fileID: 9043798579608715691, guid: 5af64511161f524498b4db27d67cfca8, type: 3} propertyPath: m_Name value: PlatfLevel-1 @@ -1785,11 +1999,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 5af64511161f524498b4db27d67cfca8, type: 3} ---- !u!4 &7652078137904284070 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 3865044956813001410, guid: 5af64511161f524498b4db27d67cfca8, type: 3} - m_PrefabInstance: {fileID: 2321893803288505762} - m_PrefabAsset: {fileID: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -1801,3 +2010,5 @@ SceneRoots: - {fileID: 1781046106} - {fileID: 2096149586} - {fileID: 599090434} + - {fileID: 334590557} + - {fileID: 812477036} diff --git a/Assets/Scenes/MenuScene.unity b/Assets/Scenes/MenuScene.unity index 4fd0773..773203b 100644 --- a/Assets/Scenes/MenuScene.unity +++ b/Assets/Scenes/MenuScene.unity @@ -222,7 +222,7 @@ SpriteRenderer: m_Size: {x: 32, y: 10.8125} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &194007997 @@ -786,81 +786,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 839049245} m_CullTransparentMesh: 1 ---- !u!1 &1001477184 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1001477185} - - component: {fileID: 1001477187} - - component: {fileID: 1001477186} - m_Layer: 5 - m_Name: ImgButtonQuit - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1001477185 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1001477184} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 8, y: 8, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1370500322} - 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: 66, y: 0} - m_SizeDelta: {x: 100, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1001477186 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1001477184} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 600275ea2399ab443989a8fae8bcdeea, 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!222 &1001477187 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1001477184} - m_CullTransparentMesh: 1 --- !u!1 &1084805314 GameObject: m_ObjectHideFlags: 0 @@ -945,81 +870,6 @@ Transform: m_Children: [] m_Father: {fileID: 28434586} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1184203303 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1184203304} - - component: {fileID: 1184203306} - - component: {fileID: 1184203305} - m_Layer: 5 - m_Name: ImgButtonPlay - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1184203304 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1184203303} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 8, y: 8, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2008538594} - 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: 66, y: 0} - m_SizeDelta: {x: 100, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1184203305 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1184203303} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 600275ea2399ab443989a8fae8bcdeea, 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!222 &1184203306 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1184203303} - m_CullTransparentMesh: 1 --- !u!1 &1370500321 GameObject: m_ObjectHideFlags: 0 @@ -1051,14 +901,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1001477185} - {fileID: 1877623619} m_Father: {fileID: 1924043230} 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: -254} - m_SizeDelta: {x: 160, y: 30} + m_SizeDelta: {x: 630, y: 153} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1370500323 MonoBehaviour: @@ -1103,7 +952,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 1370500324} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1924043231} + m_TargetAssemblyTypeName: MenuScript, Assembly-CSharp + m_MethodName: Quit + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &1370500324 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1124,8 +985,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: e5bfc99b704110645a91f000781bee76, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1326,10 +1187,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 1370500322} 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: -19} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -76.5} + m_SizeDelta: {x: 630, y: 153} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1877623620 MonoBehaviour: @@ -1440,6 +1301,7 @@ GameObject: - component: {fileID: 1924043229} - component: {fileID: 1924043228} - component: {fileID: 1924043227} + - component: {fileID: 1924043231} m_Layer: 5 m_Name: UI-Canvas m_TagString: Untagged @@ -1535,6 +1397,19 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!114 &1924043231 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1924043226} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 74e31f827dc1ef847b31ffe90a0e3554, type: 3} + m_Name: + m_EditorClassIdentifier: + TimeText: {fileID: 0} --- !u!1 &2008538593 GameObject: m_ObjectHideFlags: 0 @@ -1564,16 +1439,15 @@ RectTransform: 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_ConstrainProportionsScale: 0 + m_ConstrainProportionsScale: 1 m_Children: - - {fileID: 1184203304} - {fileID: 2069380702} m_Father: {fileID: 1924043230} 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: -93.000015} - m_SizeDelta: {x: 160, y: 30} + m_SizeDelta: {x: 630, y: 153} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2008538595 MonoBehaviour: @@ -1618,7 +1492,19 @@ MonoBehaviour: m_TargetGraphic: {fileID: 2008538596} m_OnClick: m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1924043231} + m_TargetAssemblyTypeName: MenuScript, Assembly-CSharp + m_MethodName: ChangeScene + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!114 &2008538596 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1639,8 +1525,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 + m_Sprite: {fileID: 21300000, guid: e5bfc99b704110645a91f000781bee76, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1689,10 +1575,10 @@ RectTransform: m_Children: [] m_Father: {fileID: 2008538594} 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: -19} - m_SizeDelta: {x: 0, y: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -76.5} + m_SizeDelta: {x: 630, y: 153} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2069380703 MonoBehaviour: diff --git a/Assets/Scripts/GameScene/DestroyScanner.cs b/Assets/Scripts/GameScene/DestroyScanner.cs new file mode 100644 index 0000000..20d5618 --- /dev/null +++ b/Assets/Scripts/GameScene/DestroyScanner.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class DestroyScanner : MonoBehaviour +{ + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } + + private void OnTriggerExit2D(Collider2D collision) + { + Destroy(collision.gameObject); + } +} diff --git a/Assets/Scripts/GameScene/DestroyScanner.cs.meta b/Assets/Scripts/GameScene/DestroyScanner.cs.meta new file mode 100644 index 0000000..e70ea83 --- /dev/null +++ b/Assets/Scripts/GameScene/DestroyScanner.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 2e386a9af92c72140910ee7319eae6a8 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GameScene/OffScreenDestroyPlatform.cs b/Assets/Scripts/GameScene/OffScreenDestroyPlatform.cs new file mode 100644 index 0000000..cb78328 --- /dev/null +++ b/Assets/Scripts/GameScene/OffScreenDestroyPlatform.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// Platform destroyer +/// Original script found in: https://stackoverflow.com/questions/75924903/instantiating-and-destroying-unity-prefabs. +/// + +public class OffScreenDestroyPlatform : MonoBehaviour +{ + public static Vector2? screenBounds; + + private void FixedUpdate() + { + if (screenBounds == null) screenBounds = Camera.main.ScreenToWorldPoint(new Vector3(Screen.width, Screen.height, Camera.main.transform.position.z)); + + if (transform.position.x < screenBounds.Value.x * 5) + { + Destroy(gameObject); + } + } +} diff --git a/Assets/Scripts/GameScene/OffScreenDestroyPlatform.cs.meta b/Assets/Scripts/GameScene/OffScreenDestroyPlatform.cs.meta new file mode 100644 index 0000000..dfb4f01 --- /dev/null +++ b/Assets/Scripts/GameScene/OffScreenDestroyPlatform.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 6e1f87050f92a0048829711096bc7730 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GameScene/PlatformGenerator.cs b/Assets/Scripts/GameScene/PlatformGenerator.cs index 9a03706..dbef1c8 100644 --- a/Assets/Scripts/GameScene/PlatformGenerator.cs +++ b/Assets/Scripts/GameScene/PlatformGenerator.cs @@ -6,7 +6,7 @@ using UnityEngine; public class PlatformGenerator : MonoBehaviour { - + /* [SerializeField] private Transform platformStart; [SerializeField] private System.Collections.Generic.List platformList; [SerializeField] Vector2 nextSpawnPos; @@ -38,5 +38,5 @@ public class PlatformGenerator : MonoBehaviour { Transform platformLevelTransform = Instantiate(levelPlat, spawnPosition, Quaternion.identity); return platformLevelTransform; - } + }*/ } diff --git a/Assets/Scripts/GameScene/PlatformSpawner.cs b/Assets/Scripts/GameScene/PlatformSpawner.cs new file mode 100644 index 0000000..43b5a64 --- /dev/null +++ b/Assets/Scripts/GameScene/PlatformSpawner.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +/// +/// Platform spawner +/// Original script found in: https://stackoverflow.com/questions/75924903/instantiating-and-destroying-unity-prefabs. +/// + +public class PlatformSpawner : MonoBehaviour +{ + [SerializeField] private int platformCount; + [SerializeField] private OffScreenDestroyPlatform platformPrefab; + + void Start() + { + for (int i = 0; i < platformCount; i++) + { + var spawnPosition = new Vector2(Random.Range(1f, 10f), Random.Range(-2f, 2f)); + Instantiate(platformPrefab, spawnPosition, Quaternion.identity); + } + } +} diff --git a/Assets/Scripts/GameScene/PlatformSpawner.cs.meta b/Assets/Scripts/GameScene/PlatformSpawner.cs.meta new file mode 100644 index 0000000..6d42b1a --- /dev/null +++ b/Assets/Scripts/GameScene/PlatformSpawner.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: c31972b8c73d95d4098ee6aca9c698e9 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GameScene/PlayerController.cs b/Assets/Scripts/GameScene/PlayerController.cs index e322906..d463606 100644 --- a/Assets/Scripts/GameScene/PlayerController.cs +++ b/Assets/Scripts/GameScene/PlayerController.cs @@ -8,8 +8,9 @@ using UnityEngine; /// public class PlayerController : MonoBehaviour { - [SerializeField] public float speed; + /*[SerializeField] public float speed; [SerializeField] public float acceleration; + */ [SerializeField] public float jumpPower; private Rigidbody2D body; @@ -25,9 +26,11 @@ public class PlayerController : MonoBehaviour private void Update() { + /* // run logic auto speed += acceleration * Time.deltaTime; transform.Translate(new Vector2(1f, 0f) * speed * Time.deltaTime); + */ // jump logic + jump animation if (Input.GetKey(KeyCode.W) && isGround) diff --git a/Assets/Scripts/GameScene/SpawnScanner.cs b/Assets/Scripts/GameScene/SpawnScanner.cs new file mode 100644 index 0000000..51a74fe --- /dev/null +++ b/Assets/Scripts/GameScene/SpawnScanner.cs @@ -0,0 +1,18 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class SpawnScanner : MonoBehaviour +{ + [SerializeField] private GameObject platform; + private void OnTriggerExit2D(Collider2D collision) + { + Spawn(); + } + + private void Spawn() + { + Vector3 ggg = new Vector3(1f, 4f, 4f); + Instantiate(platform, ggg, Quaternion.identity); + } +} diff --git a/Assets/Scripts/GameScene/SpawnScanner.cs.meta b/Assets/Scripts/GameScene/SpawnScanner.cs.meta new file mode 100644 index 0000000..54b1a60 --- /dev/null +++ b/Assets/Scripts/GameScene/SpawnScanner.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: abc71bc493ba9934db2ea213b5133ba0 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/GameScene/movePlatform.cs b/Assets/Scripts/GameScene/movePlatform.cs new file mode 100644 index 0000000..c18ebac --- /dev/null +++ b/Assets/Scripts/GameScene/movePlatform.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class movePlatform : MonoBehaviour +{ + [SerializeField] private float speed; + public float acceleration; + + // Start is called before the first frame update + void Start() + { + + } + + // Update is called once per frame + void Update() + { + speed += acceleration * Time.deltaTime; + transform.Translate(new Vector2(-1f, 0f) * speed * Time.deltaTime); + } +} diff --git a/Assets/Scripts/GameScene/movePlatform.cs.meta b/Assets/Scripts/GameScene/movePlatform.cs.meta new file mode 100644 index 0000000..7594841 --- /dev/null +++ b/Assets/Scripts/GameScene/movePlatform.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cd6ee5b0f1fa5844b8e9c942d62e9028 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/MenuScene/ChangeScene.cs b/Assets/Scripts/MenuScene/ChangeScene.cs new file mode 100644 index 0000000..70eddf1 --- /dev/null +++ b/Assets/Scripts/MenuScene/ChangeScene.cs @@ -0,0 +1,25 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; + +/// +/// Change scene +/// + +public class ChangeScene : MonoBehaviour +{ + public void MoveToGameScene() + { + SceneManager.LoadSceneAsync("GameScene"); + } + + public void Quit() + { +#if UNITY_EDITOR + UnityEditor.EditorApplication.isPlaying = false; +#else + Application.Quit(); +#endif + } +} diff --git a/Assets/Scripts/MenuScene/ChangeScene.cs.meta b/Assets/Scripts/MenuScene/ChangeScene.cs.meta new file mode 100644 index 0000000..dad8f78 --- /dev/null +++ b/Assets/Scripts/MenuScene/ChangeScene.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 45e7dae11c5b90043b7b716843727a0a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/MenuScene/MenuScript.cs b/Assets/Scripts/MenuScene/MenuScript.cs index 4b4c3e7..07b2b17 100644 --- a/Assets/Scripts/MenuScene/MenuScript.cs +++ b/Assets/Scripts/MenuScene/MenuScript.cs @@ -5,7 +5,7 @@ using UnityEngine.SceneManagement; public class MenuScript : MonoBehaviour { - // time logic + /* // time logic public TextMeshProUGUI TimeText; void Start() @@ -26,6 +26,7 @@ public class MenuScript : MonoBehaviour // gameObject.transform.Rotate(0, 0, -400 * Time.deltaTime); } + */ public void ChangeScene() { SceneManager.LoadSceneAsync("GameScene"); diff --git a/Assets/Sprites/UI/MenuScene/button.png b/Assets/Sprites/UI/MenuScene/button.png index a0da1c5..a2b73aa 100644 Binary files a/Assets/Sprites/UI/MenuScene/button.png and b/Assets/Sprites/UI/MenuScene/button.png differ diff --git a/Assets/Sprites/UI/MenuScene/button.png.meta b/Assets/Sprites/UI/MenuScene/button.png.meta index bdff23b..8847d45 100644 --- a/Assets/Sprites/UI/MenuScene/button.png.meta +++ b/Assets/Sprites/UI/MenuScene/button.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 600275ea2399ab443989a8fae8bcdeea +guid: e5bfc99b704110645a91f000781bee76 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 1164969..ee211f1 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -8,4 +8,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/Scenes/MenuScene.unity guid: 2cda990e2423bbf4892e6590ba056729 + - enabled: 1 + path: Assets/Scenes/GameScene.unity + guid: 6e2ef5ea80cc01a469790ea0f591ac20 m_configObjects: {}