From ace7a71cfd354fc010ca917687858c3b4159ef4e Mon Sep 17 00:00:00 2001 From: Stefano Pigozzi Date: Sun, 19 Apr 2020 17:55:44 +0200 Subject: [PATCH] Keep EARTH alive --- Assets/Prefabs/Core/Game Controller.prefab | 4 +- Assets/Prefabs/Microgame_Earth.meta | 8 + .../Microgame_Earth/EarthMicrogame.prefab | 347 ++++++++++++++++++ .../EarthMicrogame.prefab.meta | 7 + .../Microgame_Earth/Meteorite Random.prefab | 151 ++++++++ .../Meteorite Random.prefab.meta | 7 + .../Meteorite Targeting.prefab | 151 ++++++++ .../Meteorite Targeting.prefab.meta | 7 + .../YourShipMicrogame.prefab | 8 +- Assets/Scenes/Default.unity | 9 +- Assets/Scenes/MicrogameTestLab.unity | 195 ++++------ .../Microgame_Earth/DeleteIfTooClose.cs | 19 + .../Microgame_Earth/DeleteIfTooClose.cs.meta | 11 + Assets/Scripts/Microgame_Earth/FollowMouse.cs | 24 ++ .../Microgame_Earth/FollowMouse.cs.meta | 11 + .../Scripts/Microgame_Earth/MoveRandomly.cs | 21 ++ .../Microgame_Earth/MoveRandomly.cs.meta | 11 + .../Microgame_Earth/MoveTowardsPlayer.cs | 23 ++ .../Microgame_Earth/MoveTowardsPlayer.cs.meta | 11 + .../Microgame_YourShip/FailOnCollision.cs | 12 +- .../Microgame_YourShip/RecolorOnCollision.cs | 11 +- Assets/Sprites/Microgame_Earth/earth.png.meta | 38 +- .../Microgame_Earth/meteorite.png.meta | 38 +- 23 files changed, 979 insertions(+), 145 deletions(-) create mode 100644 Assets/Prefabs/Microgame_Earth.meta create mode 100644 Assets/Prefabs/Microgame_Earth/EarthMicrogame.prefab create mode 100644 Assets/Prefabs/Microgame_Earth/EarthMicrogame.prefab.meta create mode 100644 Assets/Prefabs/Microgame_Earth/Meteorite Random.prefab create mode 100644 Assets/Prefabs/Microgame_Earth/Meteorite Random.prefab.meta create mode 100644 Assets/Prefabs/Microgame_Earth/Meteorite Targeting.prefab create mode 100644 Assets/Prefabs/Microgame_Earth/Meteorite Targeting.prefab.meta create mode 100644 Assets/Scripts/Microgame_Earth/DeleteIfTooClose.cs create mode 100644 Assets/Scripts/Microgame_Earth/DeleteIfTooClose.cs.meta create mode 100644 Assets/Scripts/Microgame_Earth/FollowMouse.cs create mode 100644 Assets/Scripts/Microgame_Earth/FollowMouse.cs.meta create mode 100644 Assets/Scripts/Microgame_Earth/MoveRandomly.cs create mode 100644 Assets/Scripts/Microgame_Earth/MoveRandomly.cs.meta create mode 100644 Assets/Scripts/Microgame_Earth/MoveTowardsPlayer.cs create mode 100644 Assets/Scripts/Microgame_Earth/MoveTowardsPlayer.cs.meta diff --git a/Assets/Prefabs/Core/Game Controller.prefab b/Assets/Prefabs/Core/Game Controller.prefab index 810f4f0..3a1ab6b 100644 --- a/Assets/Prefabs/Core/Game Controller.prefab +++ b/Assets/Prefabs/Core/Game Controller.prefab @@ -276,9 +276,9 @@ MonoBehaviour: startingDifficulty: 1 startingScore: 0 microgames: - - {fileID: 1798768979100361691, guid: 630cd222aaffefe4cb13161eeca7bf03, type: 3} - - {fileID: -1447348138257578213, guid: 4b285685b4a4a4c49ab075aaecba236e, type: 3} + - {fileID: 446180028923333666, guid: 69f9e1e67286d4e48951b2dd8a55a22b, type: 3} timescaleIncreaseFactor: 0.05 + increaseSpeedEvery: 1 wheelSelectionDelay: 0.05 wheelSelectionTime: 2 wheelDisplayTime: 2 diff --git a/Assets/Prefabs/Microgame_Earth.meta b/Assets/Prefabs/Microgame_Earth.meta new file mode 100644 index 0000000..0ef6f8d --- /dev/null +++ b/Assets/Prefabs/Microgame_Earth.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ac8a80d7d2e81bf4f881be368f5d66b4 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Microgame_Earth/EarthMicrogame.prefab b/Assets/Prefabs/Microgame_Earth/EarthMicrogame.prefab new file mode 100644 index 0000000..0d5a8e8 --- /dev/null +++ b/Assets/Prefabs/Microgame_Earth/EarthMicrogame.prefab @@ -0,0 +1,347 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &446180028885540243 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 446180028885540240} + - component: {fileID: 446180028885540206} + - component: {fileID: 446180028885540241} + m_Layer: 0 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &446180028885540240 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446180028885540243} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 446180028923333669} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &446180028885540206 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446180028885540243} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + 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_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 0 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!114 &446180028885540241 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446180028885540243} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0b7c75bc4b2382240b73fc29f38eccca, type: 3} + m_Name: + m_EditorClassIdentifier: + backgrounds: + - {fileID: 21300000, guid: 82e238fa33423cb4ab4ca2b7c2cd4f2e, type: 3} + - {fileID: 21300000, guid: 89a00a86f87b5c44e91375057f8c6d56, type: 3} +--- !u!1 &446180028923333668 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 446180028923333669} + - component: {fileID: 446180028923333666} + - component: {fileID: 3074269528171191123} + - component: {fileID: -8358957742720386010} + m_Layer: 0 + m_Name: EarthMicrogame + m_TagString: MicrogameController + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &446180028923333669 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446180028923333668} + 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: 446180028885540240} + - {fileID: 446180029092811517} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &446180028923333666 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446180028923333668} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c3e3fb49a6fc58d4e9034931b4d8120e, type: 3} + m_Name: + m_EditorClassIdentifier: + startingTime: 4 + microgameName: EARTH + microgameNameColor: {r: 0, g: 1, b: 0.20736837, a: 1} + microgameNameFont: {fileID: 12800000, guid: 75c9cbfd49e877c468331f81fc132714, type: 3} + victory: 1 +--- !u!114 &3074269528171191123 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446180028923333668} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a368340a86dccd4490da935980af708, type: 3} + m_Name: + m_EditorClassIdentifier: + instantiate: {fileID: 8624852140282200670, guid: daee4d495e75bdb45b00533763ad5087, + type: 3} + min: {x: -8.5, y: -4.5} + max: {x: 8.5, y: 4.5} + multiplier: 4 +--- !u!114 &-8358957742720386010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446180028923333668} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 2a368340a86dccd4490da935980af708, type: 3} + m_Name: + m_EditorClassIdentifier: + instantiate: {fileID: 8624852140282200670, guid: d2609768342de2048baf03b6b4313808, + type: 3} + min: {x: -8.5, y: -4.5} + max: {x: 8.5, y: 4.5} + multiplier: 8 +--- !u!1 &446180029092811516 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 446180029092811517} + - component: {fileID: 446180029092811512} + - component: {fileID: 446180029092811515} + - component: {fileID: 446180029092811514} + - component: {fileID: 446180029092811513} + - component: {fileID: 446180029092811511} + - component: {fileID: 446180029092811510} + m_Layer: 0 + m_Name: Earth + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &446180029092811517 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446180029092811516} + 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: 446180028923333669} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &446180029092811512 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446180029092811516} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + 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_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 21300000, guid: b2a571b61ebb10d4bae3ce92f6bf1124, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1.9, y: 1.9} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!50 &446180029092811515 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446180029092811516} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 1 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_Interpolate: 1 + m_SleepingMode: 1 + m_CollisionDetection: 1 + m_Constraints: 0 +--- !u!58 &446180029092811514 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446180029092811516} + 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} + serializedVersion: 2 + m_Radius: 0.63 +--- !u!114 &446180029092811513 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446180029092811516} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 63616322c82d5e64e8e7199d51c6a2ef, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &446180029092811511 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446180029092811516} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3942a3e38c32eed40bff470e6bbddf42, type: 3} + m_Name: + m_EditorClassIdentifier: + activationDelay: 0.7 +--- !u!114 &446180029092811510 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 446180029092811516} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 52bfd95665577fe42b21384ac7bff02f, type: 3} + m_Name: + m_EditorClassIdentifier: + color: {r: 1, g: 0, b: 0, a: 1} + activationDelay: 0.7 diff --git a/Assets/Prefabs/Microgame_Earth/EarthMicrogame.prefab.meta b/Assets/Prefabs/Microgame_Earth/EarthMicrogame.prefab.meta new file mode 100644 index 0000000..98c1f9b --- /dev/null +++ b/Assets/Prefabs/Microgame_Earth/EarthMicrogame.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 69f9e1e67286d4e48951b2dd8a55a22b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Microgame_Earth/Meteorite Random.prefab b/Assets/Prefabs/Microgame_Earth/Meteorite Random.prefab new file mode 100644 index 0000000..a3e2dbe --- /dev/null +++ b/Assets/Prefabs/Microgame_Earth/Meteorite Random.prefab @@ -0,0 +1,151 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8624852140282200670 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8624852140282200671} + - component: {fileID: 8624852140282200642} + - component: {fileID: 8624852140282200669} + - component: {fileID: 8624852140282200668} + - component: {fileID: 6607895714504299319} + - component: {fileID: -8011923907532278216} + m_Layer: 0 + m_Name: Meteorite Random + m_TagString: Enemy + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8624852140282200671 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8624852140282200670} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.1456754, y: -1.2780956, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8624852140282200642 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8624852140282200670} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + 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_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 21300000, guid: c00ea676c7af0194eb1596b6bf17bebc, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!58 &8624852140282200669 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8624852140282200670} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.38 +--- !u!50 &8624852140282200668 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8624852140282200670} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0.2 + m_AngularDrag: 0.2 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!114 &6607895714504299319 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8624852140282200670} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 231f5e0e56a14804b804968d836b01a3, type: 3} + m_Name: + m_EditorClassIdentifier: + forceMultiplier: 300 + torqueMultiplier: 120 +--- !u!114 &-8011923907532278216 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8624852140282200670} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f03d7186e9d428f48b9d8818db6c5adf, type: 3} + m_Name: + m_EditorClassIdentifier: + threshold: 2 diff --git a/Assets/Prefabs/Microgame_Earth/Meteorite Random.prefab.meta b/Assets/Prefabs/Microgame_Earth/Meteorite Random.prefab.meta new file mode 100644 index 0000000..eb686a7 --- /dev/null +++ b/Assets/Prefabs/Microgame_Earth/Meteorite Random.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d2609768342de2048baf03b6b4313808 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Microgame_Earth/Meteorite Targeting.prefab b/Assets/Prefabs/Microgame_Earth/Meteorite Targeting.prefab new file mode 100644 index 0000000..38fe681 --- /dev/null +++ b/Assets/Prefabs/Microgame_Earth/Meteorite Targeting.prefab @@ -0,0 +1,151 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &8624852140282200670 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8624852140282200671} + - component: {fileID: 8624852140282200642} + - component: {fileID: 8624852140282200669} + - component: {fileID: 8624852140282200668} + - component: {fileID: -3293827635354621373} + - component: {fileID: -3140845516481968978} + m_Layer: 0 + m_Name: Meteorite Targeting + m_TagString: Enemy + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8624852140282200671 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8624852140282200670} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -3.1456754, y: -1.2780956, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8624852140282200642 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8624852140282200670} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + 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_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 21300000, guid: c00ea676c7af0194eb1596b6bf17bebc, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!58 &8624852140282200669 +CircleCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8624852140282200670} + m_Enabled: 1 + m_Density: 1 + m_Material: {fileID: 0} + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + serializedVersion: 2 + m_Radius: 0.38 +--- !u!50 &8624852140282200668 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8624852140282200670} + m_BodyType: 0 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0.2 + m_AngularDrag: 0.2 + m_GravityScale: 0 + m_Material: {fileID: 0} + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 +--- !u!114 &-3293827635354621373 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8624852140282200670} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1a8cb9edc83d8914ebb4089f78d579df, type: 3} + m_Name: + m_EditorClassIdentifier: + forceMultiplier: 200 + torqueMultiplier: 30 +--- !u!114 &-3140845516481968978 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8624852140282200670} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f03d7186e9d428f48b9d8818db6c5adf, type: 3} + m_Name: + m_EditorClassIdentifier: + threshold: 2 diff --git a/Assets/Prefabs/Microgame_Earth/Meteorite Targeting.prefab.meta b/Assets/Prefabs/Microgame_Earth/Meteorite Targeting.prefab.meta new file mode 100644 index 0000000..c808468 --- /dev/null +++ b/Assets/Prefabs/Microgame_Earth/Meteorite Targeting.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: daee4d495e75bdb45b00533763ad5087 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/Microgame_YourShip/YourShipMicrogame.prefab b/Assets/Prefabs/Microgame_YourShip/YourShipMicrogame.prefab index c56b75f..d005b32 100644 --- a/Assets/Prefabs/Microgame_YourShip/YourShipMicrogame.prefab +++ b/Assets/Prefabs/Microgame_YourShip/YourShipMicrogame.prefab @@ -795,7 +795,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5247441600368992340} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.85, y: -2.01, z: 0} + m_LocalPosition: {x: 6.65, y: -1.13, z: 0} m_LocalScale: {x: 1, y: 1, z: 0} m_Children: [] m_Father: {fileID: 5249343775018332958} @@ -892,6 +892,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 3942a3e38c32eed40bff470e6bbddf42, type: 3} m_Name: m_EditorClassIdentifier: + activationDelay: 0.5 --- !u!114 &5247441600368992343 MonoBehaviour: m_ObjectHideFlags: 0 @@ -905,6 +906,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: color: {r: 1, g: 0, b: 0, a: 1} + activationDelay: 0.5 --- !u!1 &5247490226650109614 GameObject: m_ObjectHideFlags: 0 @@ -1389,7 +1391,7 @@ GameObject: - component: {fileID: 5248486291000105484} - component: {fileID: 5248486291000105487} m_Layer: 0 - m_Name: Your Ship + m_Name: YourShipMicrogame m_TagString: MicrogameController m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1445,4 +1447,4 @@ MonoBehaviour: type: 3} min: {x: -9, y: -2} max: {x: 9, y: 0} - multiplier: 4 + multiplier: 7 diff --git a/Assets/Scenes/Default.unity b/Assets/Scenes/Default.unity index 5c580f9..f8737b8 100644 --- a/Assets/Scenes/Default.unity +++ b/Assets/Scenes/Default.unity @@ -431,19 +431,14 @@ PrefabInstance: - target: {fileID: 742014442006323161, guid: e2bb5f24fc04fd94fa7d6f04c3713df6, type: 3} propertyPath: microgames.Array.size - value: 1 + value: 2 objectReference: {fileID: 0} - target: {fileID: 742014442006323161, guid: e2bb5f24fc04fd94fa7d6f04c3713df6, type: 3} - propertyPath: microgames.Array.data[0] + propertyPath: microgames.Array.data[1] value: objectReference: {fileID: 5248486291000105484, guid: 302761e08a5645541a8cd97ea48c40e8, type: 3} - - target: {fileID: 742014442006323161, guid: e2bb5f24fc04fd94fa7d6f04c3713df6, - type: 3} - propertyPath: timescaleIncreaseFactor - value: 0.25 - objectReference: {fileID: 0} - target: {fileID: 742014442006323162, guid: e2bb5f24fc04fd94fa7d6f04c3713df6, type: 3} propertyPath: m_Name diff --git a/Assets/Scenes/MicrogameTestLab.unity b/Assets/Scenes/MicrogameTestLab.unity index 51f0505..1bb7abb 100644 --- a/Assets/Scenes/MicrogameTestLab.unity +++ b/Assets/Scenes/MicrogameTestLab.unity @@ -204,131 +204,72 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1782236797 -GameObject: +--- !u!1001 &446180028181535726 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1782236798} - - component: {fileID: 1782236800} - - component: {fileID: 1782236799} - m_Layer: 0 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1782236798 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1782236797} - 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: 1954224075} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1782236799 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1782236797} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0b7c75bc4b2382240b73fc29f38eccca, type: 3} - m_Name: - m_EditorClassIdentifier: - backgrounds: - - {fileID: 21300000, guid: 82e238fa33423cb4ab4ca2b7c2cd4f2e, type: 3} - - {fileID: 21300000, guid: 89a00a86f87b5c44e91375057f8c6d56, type: 3} ---- !u!212 &1782236800 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1782236797} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - 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_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 0 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!1 &1954224074 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1954224075} - m_Layer: 0 - m_Name: Earth Microgame - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1954224075 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1954224074} - 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: 1782236798} - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 446180028923333668, guid: 69f9e1e67286d4e48951b2dd8a55a22b, + type: 3} + propertyPath: m_Name + value: EarthMicrogame + objectReference: {fileID: 0} + - target: {fileID: 446180028923333669, guid: 69f9e1e67286d4e48951b2dd8a55a22b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 446180028923333669, guid: 69f9e1e67286d4e48951b2dd8a55a22b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 446180028923333669, guid: 69f9e1e67286d4e48951b2dd8a55a22b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 446180028923333669, guid: 69f9e1e67286d4e48951b2dd8a55a22b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 446180028923333669, guid: 69f9e1e67286d4e48951b2dd8a55a22b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 446180028923333669, guid: 69f9e1e67286d4e48951b2dd8a55a22b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 446180028923333669, guid: 69f9e1e67286d4e48951b2dd8a55a22b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 446180028923333669, guid: 69f9e1e67286d4e48951b2dd8a55a22b, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 446180028923333669, guid: 69f9e1e67286d4e48951b2dd8a55a22b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 446180028923333669, guid: 69f9e1e67286d4e48951b2dd8a55a22b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 446180028923333669, guid: 69f9e1e67286d4e48951b2dd8a55a22b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 69f9e1e67286d4e48951b2dd8a55a22b, type: 3} diff --git a/Assets/Scripts/Microgame_Earth/DeleteIfTooClose.cs b/Assets/Scripts/Microgame_Earth/DeleteIfTooClose.cs new file mode 100644 index 0000000..ba32d33 --- /dev/null +++ b/Assets/Scripts/Microgame_Earth/DeleteIfTooClose.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class DeleteIfTooClose : MonoBehaviour +{ + private GameObject player; + public float threshold = 1f; + + void Awake() { + player = GameObject.FindGameObjectWithTag("Player"); + } + + void Start() { + if(Vector2.Distance(transform.position, player.transform.position) <= threshold) { + Destroy(gameObject); + } + } +} diff --git a/Assets/Scripts/Microgame_Earth/DeleteIfTooClose.cs.meta b/Assets/Scripts/Microgame_Earth/DeleteIfTooClose.cs.meta new file mode 100644 index 0000000..1465a8e --- /dev/null +++ b/Assets/Scripts/Microgame_Earth/DeleteIfTooClose.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f03d7186e9d428f48b9d8818db6c5adf +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Microgame_Earth/FollowMouse.cs b/Assets/Scripts/Microgame_Earth/FollowMouse.cs new file mode 100644 index 0000000..92212ba --- /dev/null +++ b/Assets/Scripts/Microgame_Earth/FollowMouse.cs @@ -0,0 +1,24 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[RequireComponent(typeof(Rigidbody2D))] +public class FollowMouse : MonoBehaviour +{ + private new Rigidbody2D rigidbody2D; + + void Awake() { + rigidbody2D = GetComponent(); + } + + void Start() { + Vector3 screenPoint = Camera.main.ScreenToWorldPoint(Input.mousePosition); + transform.position = new Vector3(screenPoint.x, screenPoint.y, transform.position.z); + } + + void FixedUpdate() + { + Vector3 screenPoint = Camera.main.ScreenToWorldPoint(Input.mousePosition); + rigidbody2D.MovePosition(new Vector3(screenPoint.x, screenPoint.y, transform.position.z)); + } +} diff --git a/Assets/Scripts/Microgame_Earth/FollowMouse.cs.meta b/Assets/Scripts/Microgame_Earth/FollowMouse.cs.meta new file mode 100644 index 0000000..88c44bc --- /dev/null +++ b/Assets/Scripts/Microgame_Earth/FollowMouse.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 63616322c82d5e64e8e7199d51c6a2ef +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 150 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Microgame_Earth/MoveRandomly.cs b/Assets/Scripts/Microgame_Earth/MoveRandomly.cs new file mode 100644 index 0000000..1809adf --- /dev/null +++ b/Assets/Scripts/Microgame_Earth/MoveRandomly.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[RequireComponent(typeof(Rigidbody2D))] +public class MoveRandomly : MonoBehaviour +{ + public float forceMultiplier = 3f; + public float torqueMultiplier = 30f; + + private new Rigidbody2D rigidbody2D; + + void Awake() { + rigidbody2D = GetComponent(); + } + + void Start() { + rigidbody2D.AddForce(new Vector3(Random.value - 0.5f, Random.value - 0.5f, 0).normalized * Random.value * forceMultiplier); + rigidbody2D.AddTorque((Random.value - 0.5f) * 2f * torqueMultiplier); + } +} diff --git a/Assets/Scripts/Microgame_Earth/MoveRandomly.cs.meta b/Assets/Scripts/Microgame_Earth/MoveRandomly.cs.meta new file mode 100644 index 0000000..04343d3 --- /dev/null +++ b/Assets/Scripts/Microgame_Earth/MoveRandomly.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 231f5e0e56a14804b804968d836b01a3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Microgame_Earth/MoveTowardsPlayer.cs b/Assets/Scripts/Microgame_Earth/MoveTowardsPlayer.cs new file mode 100644 index 0000000..e23871f --- /dev/null +++ b/Assets/Scripts/Microgame_Earth/MoveTowardsPlayer.cs @@ -0,0 +1,23 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[RequireComponent(typeof(Rigidbody2D))] +public class MoveTowardsPlayer : MonoBehaviour +{ + public float forceMultiplier = 3f; + public float torqueMultiplier = 30f; + + private new Rigidbody2D rigidbody2D; + private GameObject player; + + void Awake() { + rigidbody2D = GetComponent(); + player = GameObject.FindGameObjectWithTag("Player"); + } + + void Start() { + rigidbody2D.AddForce((player.transform.position - transform.position).normalized * Random.value * forceMultiplier); + rigidbody2D.AddTorque((Random.value - 0.5f) * 2f * torqueMultiplier); + } +} diff --git a/Assets/Scripts/Microgame_Earth/MoveTowardsPlayer.cs.meta b/Assets/Scripts/Microgame_Earth/MoveTowardsPlayer.cs.meta new file mode 100644 index 0000000..e3ce91d --- /dev/null +++ b/Assets/Scripts/Microgame_Earth/MoveTowardsPlayer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1a8cb9edc83d8914ebb4089f78d579df +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 200 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Microgame_YourShip/FailOnCollision.cs b/Assets/Scripts/Microgame_YourShip/FailOnCollision.cs index 2fb1611..040f9e6 100644 --- a/Assets/Scripts/Microgame_YourShip/FailOnCollision.cs +++ b/Assets/Scripts/Microgame_YourShip/FailOnCollision.cs @@ -4,15 +4,23 @@ using UnityEngine; public class FailOnCollision : MonoBehaviour { + public float activationDelay = 0.5f; + private MicrogameController microgameController; + private bool active; void Awake() { microgameController = GameObject.FindGameObjectWithTag("MicrogameController").GetComponent(); + Invoke("Activate", activationDelay); } - void OnTriggerEnter2D(Collider2D other) { - if(other.tag == "Enemy") { + void Activate() { + active = true; + } + + void OnTriggerStay2D(Collider2D other) { + if(other.tag == "Enemy" && active) { microgameController.victory = false; } } diff --git a/Assets/Scripts/Microgame_YourShip/RecolorOnCollision.cs b/Assets/Scripts/Microgame_YourShip/RecolorOnCollision.cs index 1390bb0..7d9c171 100644 --- a/Assets/Scripts/Microgame_YourShip/RecolorOnCollision.cs +++ b/Assets/Scripts/Microgame_YourShip/RecolorOnCollision.cs @@ -6,16 +6,23 @@ using UnityEngine; public class RecolorOnCollision : MonoBehaviour { public Color color; + public float activationDelay = 0.5f; private SpriteRenderer spriteRenderer; + private bool active; void Awake() { spriteRenderer = GetComponent(); + Invoke("Activate", activationDelay); + } + + void Activate() { + active = true; } - void OnTriggerEnter2D(Collider2D other) { - if(other.tag == "Enemy") { + void OnTriggerStay2D(Collider2D other) { + if(other.tag == "Enemy" && active) { spriteRenderer.color = color; } } diff --git a/Assets/Sprites/Microgame_Earth/earth.png.meta b/Assets/Sprites/Microgame_Earth/earth.png.meta index dad7c7d..5a4edff 100644 --- a/Assets/Sprites/Microgame_Earth/earth.png.meta +++ b/Assets/Sprites/Microgame_Earth/earth.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 113 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -71,6 +71,42 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: [] diff --git a/Assets/Sprites/Microgame_Earth/meteorite.png.meta b/Assets/Sprites/Microgame_Earth/meteorite.png.meta index 239ba8b..e880874 100644 --- a/Assets/Sprites/Microgame_Earth/meteorite.png.meta +++ b/Assets/Sprites/Microgame_Earth/meteorite.png.meta @@ -45,7 +45,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 100 + spritePixelsToUnits: 113 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -71,6 +71,42 @@ TextureImporter: overridden: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Android + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 spriteSheet: serializedVersion: 2 sprites: []