From ece898919d64a465580e12eed69fe1fa4a95ae9f Mon Sep 17 00:00:00 2001 From: Syed zainul abedin Date: Tue, 16 Jan 2024 23:56:15 +0530 Subject: [PATCH 01/26] feat: Added idle animation --- .../AnimationClips/Player_Idle.anim | 114 ++ .../AnimationClips/Player_Idle.anim.meta | 8 + .../Animators/Ellen/PlayerAnimator.controller | 78 + .../Ellen/PlayerAnimator.controller.meta | 8 + .../Ellen/EllenAtlas.spriteatlas | 211 ++- .../Ellen/EllenCutsceneAtlas.spriteatlas | 68 +- .../Enemies/ChomperAtlas.spriteatlas | 74 +- .../Enemies/SpitterAtlas.spriteatlas | 64 +- .../Sprites/Environment/AlienFlora.png.meta | 299 +++- .../Art/Sprites/Environment/BGPlants.png.meta | 175 ++- .../Art/Sprites/Environment/BGRock03.png.meta | 79 +- .../Art/Sprites/Environment/Clouds.png.meta | 121 +- .../Environment/FloatingRocks.png.meta | 193 ++- .../Environment/HangingPlants1.png.meta | 113 +- .../Environment/HangingPlants2.png.meta | 107 +- .../Sprites/Environment/LowerPlants1.png.meta | 173 ++- .../Sprites/Environment/LowerPlants2.png.meta | 113 +- .../Sprites/Environment/LowerPlants3.png.meta | 143 +- .../Sprites/Environment/LowerPlants4.png.meta | 113 +- .../Sprites/Environment/LowerPlants5.png.meta | 245 ++- .../Sprites/Environment/LowerPlants6.png.meta | 101 +- .../Environment/PlantMidSized.png.meta | 81 +- .../Art/Sprites/Environment/Plants.png.meta | 171 ++- .../Sprites/Environment/Platforms.png.meta | 97 +- .../Art/Sprites/Environment/Rubble.png.meta | 101 +- .../Sprites/Environment/Spiderwebs.png.meta | 105 +- .../Art/Sprites/Environment/Stones.png.meta | 125 +- .../TilesetRock_WaterBlockers.png.meta | 109 +- .../Tilesets/Tileset_Alien.png.meta | 457 +++++- .../Tilesets/Tileset_Rock.png.meta | 621 ++++++-- .../Environment/UndergroundRoots.png.meta | 75 +- .../Interactables/DestructibleColumn.png.meta | 115 +- .../Interactables/DestructibleWall.png.meta | 101 +- .../Sprites/Interactables/InfoSign.png.meta | 77 +- .../Interactables/MovingPlatform.png.meta | 79 +- .../MovingPlatformAlien.png.meta | 83 +- .../PassThroughPlatform.png.meta | 85 +- .../PassThroughPlatformAlien.png.meta | 83 +- .../Interactables/PressurePad.png.meta | 77 +- .../Interactables/PushableBox.png.meta | 79 +- .../Sprites/Interactables/SpikesNew.png.meta | 149 +- .../Art/Sprites/Interactables/Switch.png.meta | 75 +- .../Interactables/WeaponPickup.png.meta | 75 +- .../Art/Sprites/UI/HUD/BossHealth.png.meta | 117 +- .../Art/Sprites/UI/HUD/BossShield.png.meta | 117 +- .../Art/Sprites/UI/HUD/EllenHealth.png.meta | 117 +- .../Art/Sprites/UI/HUD/KeyIcon.png.meta | 99 +- .../Art/Sprites/UI/Menu/GameOver.png.meta | 81 +- .../Sprites/UI/Menu/GameOverEllen.png.meta | 207 ++- .../Art/Sprites/UI/Menu/Loading.png.meta | 111 +- .../Sprites/UI/Menu/LoadingChomper.png.meta | 111 +- .../UI/Menu/OptionsCloseButton.png.meta | 75 +- .../UI/Menu/OptionsMenu9Slice.png.meta | 81 +- .../Art/Sprites/UI/Menu/StartLogo.png.meta | 81 +- .../Art/Sprites/UI/Menu/StartMenu.png.meta | 87 +- .../Sprites/VFX/Ellen/BulletImpact2.png.meta | 89 +- .../Gunner/GunnerProjectileTrail.png.meta | 89 +- .../VFX/Environment/AcidBubbles.png.meta | 137 +- .../VFX/Environment/GrassParticle.png.meta | 89 +- .../Art/Sprites/VFX/Environment/Mist.png.meta | 75 +- .../VFX/Environment/SplashDrops.png.meta | 77 +- .../VFX/Interactables/RockChunks.png.meta | 89 +- .../VFX/Interactables/RockChunks.tif.meta | 89 +- Assets/Game Assets/Prefab.meta | 8 + Assets/Game Assets/Prefab/Player.prefab | 108 ++ Assets/Game Assets/Prefab/Player.prefab.meta | 7 + Assets/Resources.meta | 8 + Assets/Resources/BillingMode.json | 1 + Assets/Resources/BillingMode.json.meta | 7 + Assets/Scenes/AnimationTest.unity | 307 ++++ ...ne.unity.meta => AnimationTest.unity.meta} | 0 Assets/Scenes/AnimationTestSettings.lighting | 66 + .../AnimationTestSettings.lighting.meta | 8 + Assets/Scenes/SampleScene.unity | 188 --- Packages/manifest.json | 22 +- Packages/packages-lock.json | 423 ++++++ ProjectSettings/MemorySettings.asset | 35 + ProjectSettings/PackageManagerSettings.asset | 36 + .../com.unity.services.core/Settings.json | 0 ProjectSettings/ProjectSettings.asset | 462 +++++- ProjectSettings/ProjectVersion.txt | 3 +- ProjectSettings/SceneTemplateSettings.json | 121 ++ ProjectSettings/VersionControlSettings.asset | 8 + UserSettings/EditorUserSettings.asset | 28 + .../Layouts/CurrentMaximizeLayout.dwlt | 1327 +++++++++++++++++ UserSettings/Search.settings | 1 + 86 files changed, 9371 insertions(+), 1441 deletions(-) create mode 100644 Assets/Game Assets/Art/Animations/AnimationClips/Player_Idle.anim create mode 100644 Assets/Game Assets/Art/Animations/AnimationClips/Player_Idle.anim.meta create mode 100644 Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller create mode 100644 Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller.meta create mode 100644 Assets/Game Assets/Prefab.meta create mode 100644 Assets/Game Assets/Prefab/Player.prefab create mode 100644 Assets/Game Assets/Prefab/Player.prefab.meta create mode 100644 Assets/Resources.meta create mode 100644 Assets/Resources/BillingMode.json create mode 100644 Assets/Resources/BillingMode.json.meta create mode 100644 Assets/Scenes/AnimationTest.unity rename Assets/Scenes/{SampleScene.unity.meta => AnimationTest.unity.meta} (100%) create mode 100644 Assets/Scenes/AnimationTestSettings.lighting create mode 100644 Assets/Scenes/AnimationTestSettings.lighting.meta delete mode 100644 Assets/Scenes/SampleScene.unity create mode 100644 Packages/packages-lock.json create mode 100644 ProjectSettings/MemorySettings.asset create mode 100644 ProjectSettings/PackageManagerSettings.asset create mode 100644 ProjectSettings/Packages/com.unity.services.core/Settings.json create mode 100644 ProjectSettings/SceneTemplateSettings.json create mode 100644 ProjectSettings/VersionControlSettings.asset create mode 100644 UserSettings/EditorUserSettings.asset create mode 100644 UserSettings/Layouts/CurrentMaximizeLayout.dwlt create mode 100644 UserSettings/Search.settings diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Idle.anim b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Idle.anim new file mode 100644 index 0000000000..614da0b8c2 --- /dev/null +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Idle.anim @@ -0,0 +1,114 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player_Idle + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: c4d7d6470acd7bf45971042161c6e018, type: 3} + - time: 0.05 + value: {fileID: 21300000, guid: 1fa29ad54380226498c2250e612fec93, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: c7cf710ee57c1ae45aac513a85fcff07, type: 3} + - time: 0.13333334 + value: {fileID: 21300000, guid: 774282641b60d9d4daddad7c6ad7ae69, type: 3} + - time: 0.2 + value: {fileID: 21300000, guid: a53475b08393802498550588cf70ef5e, type: 3} + - time: 0.21666667 + value: {fileID: 21300000, guid: c6b584771aee7a148bcf2885a6f347ba, type: 3} + - time: 0.31666666 + value: {fileID: 21300000, guid: 60a2cfad92429cc4b9d2f6ce7148c37a, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: dcc9002875a3a244eacb72418d292f8e, type: 3} + - time: 0.35 + value: {fileID: 21300000, guid: 64afd51ca9828034f8c64a261e4b99b9, type: 3} + - time: 0.45 + value: {fileID: 21300000, guid: 76089009971280441963c2a3a55b5071, type: 3} + - time: 0.46666667 + value: {fileID: 21300000, guid: cd65a99c817869946969cd216cab2115, type: 3} + - time: 0.53333336 + value: {fileID: 21300000, guid: 591e3ea0fd60a1442bfbe969a16d4d74, type: 3} + - time: 0.5833333 + value: {fileID: 21300000, guid: d2d936bae69c599429ee1a386892a9f0, type: 3} + - time: 0.6166667 + value: {fileID: 21300000, guid: f3b094a028c28604382b41bfab29604a, type: 3} + - time: 0.6666667 + value: {fileID: 21300000, guid: ed4c6463819f7cb4b85a6a44dc35c9cf, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: c4d7d6470acd7bf45971042161c6e018, type: 3} + - {fileID: 21300000, guid: 1fa29ad54380226498c2250e612fec93, type: 3} + - {fileID: 21300000, guid: c7cf710ee57c1ae45aac513a85fcff07, type: 3} + - {fileID: 21300000, guid: 774282641b60d9d4daddad7c6ad7ae69, type: 3} + - {fileID: 21300000, guid: a53475b08393802498550588cf70ef5e, type: 3} + - {fileID: 21300000, guid: c6b584771aee7a148bcf2885a6f347ba, type: 3} + - {fileID: 21300000, guid: 60a2cfad92429cc4b9d2f6ce7148c37a, type: 3} + - {fileID: 21300000, guid: dcc9002875a3a244eacb72418d292f8e, type: 3} + - {fileID: 21300000, guid: 64afd51ca9828034f8c64a261e4b99b9, type: 3} + - {fileID: 21300000, guid: 76089009971280441963c2a3a55b5071, type: 3} + - {fileID: 21300000, guid: cd65a99c817869946969cd216cab2115, type: 3} + - {fileID: 21300000, guid: 591e3ea0fd60a1442bfbe969a16d4d74, type: 3} + - {fileID: 21300000, guid: d2d936bae69c599429ee1a386892a9f0, type: 3} + - {fileID: 21300000, guid: f3b094a028c28604382b41bfab29604a, type: 3} + - {fileID: 21300000, guid: ed4c6463819f7cb4b85a6a44dc35c9cf, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.68333334 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Idle.anim.meta b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Idle.anim.meta new file mode 100644 index 0000000000..bbc3878f53 --- /dev/null +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Idle.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1c7ca0685c9dc47628df3d1e84d9f4da +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller b/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller new file mode 100644 index 0000000000..9e0dbd1d44 --- /dev/null +++ b/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller @@ -0,0 +1,78 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1102 &-9024768835540588441 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player_Idle + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 1c7ca0685c9dc47628df3d1e84d9f4da, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1107 &-4154430246438009678 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -9024768835540588441} + m_Position: {x: 200, y: 240, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -9024768835540588441} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: PlayerAnimator + serializedVersion: 5 + m_AnimatorParameters: + - m_Name: Speed + m_Type: 1 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -4154430246438009678} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} diff --git a/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller.meta b/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller.meta new file mode 100644 index 0000000000..e3e07e5104 --- /dev/null +++ b/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5a5995370fc954e219729b95b7be89cd +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/EllenAtlas.spriteatlas b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/EllenAtlas.spriteatlas index 0b6cb5b9b9..ee5cd57194 100644 --- a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/EllenAtlas.spriteatlas +++ b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/EllenAtlas.spriteatlas @@ -21,7 +21,7 @@ SpriteAtlas: crunchedCompression: 0 sRGB: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 m_BuildTarget: DefaultTexturePlatform m_MaxTextureSize: 8192 m_ResizeAlgorithm: 0 @@ -31,7 +31,9 @@ SpriteAtlas: m_CrunchedCompression: 0 m_AllowsAlphaSplitting: 0 m_Overridden: 0 + m_IgnorePlatformSupport: 0 m_AndroidETC2FallbackOverride: 0 + m_ForceMaximumCompressionQuality_BC6H_BC7: 1 packingSettings: serializedVersion: 2 padding: 4 @@ -39,11 +41,215 @@ SpriteAtlas: allowAlphaSplitting: 0 enableRotation: 1 enableTightPacking: 1 + enableAlphaDilation: 0 + secondaryTextureSettings: {} variantMultiplier: 1 packables: - {fileID: 102900000, guid: 7b200a58dfffd8d45b54454b1cb82151, type: 3} - totalSpriteSurfaceArea: 98929035 bindAsDefault: 1 + isAtlasV2: 0 + cachedData: {fileID: 0} + packedSpriteRenderDataKeys: + - e4381a10685b28d4f906cc686ecbc2c7: 21300000 + - d366315072065fc4891bc2f5281daca4: 21300000 + - b2d03960805e00146a93e7a607cc5f72: 21300000 + - 87e29b609bb169245a2df3d89266630c: 21300000 + - 63543f60a4c70d546a5c4a0f63a2ad29: 21300000 + - 967004704d0400c45945b1dc74fc5eb6: 21300000 + - 8fc33c704bf75524facc770a491ffd2f: 21300000 + - 7ab12a808aa8d054aaf50c2741246de0: 21300000 + - e679c4902023e7a48b2cf79741a51fda: 21300000 + - f3b094a028c28604382b41bfab29604a: 21300000 + - dfd2eca0b8de7a443a0b28c6466f55ba: 21300000 + - 591e3ea0fd60a1442bfbe969a16d4d74: 21300000 + - a53475b08393802498550588cf70ef5e: 21300000 + - 129972c0ed661da47bd600512df59822: 21300000 + - e7f298e049bf3bb41bca4bbd8ceee9ad: 21300000 + - 28b55e113ed8d2e499533bc878cf9c3e: 21300000 + - b38254315edf5904d987dbca58a71ca0: 21300000 + - 5d25d9e1de070994db63a462e89932d7: 21300000 + - d3c1e30225625c14e9bf351c35be2fd9: 21300000 + - cb80a3123f378f743841b1f9fda37c83: 21300000 + - fffa3e12c34c2ee448d46f5c9db142e6: 21300000 + - 37547022c0607c544915b3089832635d: 21300000 + - a4cfd522aaaa4ac45980e1828c8dea2c: 21300000 + - 7d008f32d5ec4f444bf86f436666060d: 21300000 + - 5b1c7342d6504e3448979307c3f6a639: 21300000 + - 2350b442f31bb1741b68a6b77d09d40b: 21300000 + - 4d25e8426524e5d43a92fe2d594e4912: 21300000 + - 28e829622ce5c974bbf154a278a2be22: 21300000 + - 190f2e72bd4df1945b2d504efccde46c: 21300000 + - 55e66892de31d424885bc2c774f07ef7: 21300000 + - 51ba71b24b0a67641b799a9e958697b0: 21300000 + - 5edee3b2ea56ae64881eacb7f58be021: 21300000 + - 80583dd2d497d144b8d2282bf2184cc2: 21300000 + - 7568b5e22ac6e1b4687bb661ac8f0d74: 21300000 + - 658639e2f4d2568479631f3a888fc691: 21300000 + - 301fc9f2a0405ee45ad84f7b550051d5: 21300000 + - 453c8803862e72b43ad3652b8fe03437: 21300000 + - 575f490323d76254ab8d5d4cd472a3ea: 21300000 + - 7dcbef0330b37354dae1c1071956813a: 21300000 + - a9f05e230fdd41b4f99ac0e0b7c4fa2b: 21300000 + - 12ea17332fa174442af48960686e1769: 21300000 + - 4b74c95301673024c9dbf47514f2cb5b: 21300000 + - 6f8b0a53ff8c9e94f9d4af829e2ad6f3: 21300000 + - c93003632dfb3f346ae28336c8748cc1: 21300000 + - ed4c6463819f7cb4b85a6a44dc35c9cf: 21300000 + - baa7eb63e6b2764408c3c44ea0b180ac: 21300000 + - 27bc49736a5db6d44b8ae392a1ee34dd: 21300000 + - 3bcc6973de396d247a99745a0c323d38: 21300000 + - e701f6d3a4296e040ad8604e7ceaad2a: 21300000 + - 1877f93426f7f3848a2d0ec5ec6ee4a1: 21300000 + - 3fc8ba344d4587942a0b607b47985569: 21300000 + - ae6184443cb4d0f439bab73e9e76df4a: 21300000 + - affa4f4470b317440b7cb5187df710ef: 21300000 + - 83fab85494452284baf4ef65fc8b0273: 21300000 + - 774282641b60d9d4daddad7c6ad7ae69: 21300000 + - 78a64664c88ec60478ced92e86dbb784: 21300000 + - fe80dd64b9b2e1647b367fe8da273bf7: 21300000 + - 19b07ba4ccec70d4ebe4ed5e538cd326: 21300000 + - eef4c8c406166bd4c848e87480efa2bd: 21300000 + - 665bd6d4ae06fea488861b4bdad2f04d: 21300000 + - 929a47e4f89792c4aa28ae41634348c3: 21300000 + - 6469e4f4bdda7e8488924cf6ef74c464: 21300000 + - 32713ff48a4e8dc42a32b9d4d19ea5fe: 21300000 + - c195730543b85df41953d682fee276b3: 21300000 + - 92fbfb056ce42c940aa543cf14a9084a: 21300000 + - 7fb83f0538f2eaf4a9c6f3b08b60cab4: 21300000 + - 46fc6025308929d4b878bfb4b81ead12: 21300000 + - 05df8025a12814d46b434681a6989133: 21300000 + - 92f985257d4b81740b246818800efccd: 21300000 + - 57585d65d25175a4b82cdcd9092545ca: 21300000 + - bce1db75cf9f0c7448eb419ad2e38c8a: 21300000 + - 0adb3b85a77225b42823314ce0caedd3: 21300000 + - 1d7a01952b6b7e4409c83ade1ead91db: 21300000 + - 0b26c4d5c6b04e940932afa1ffa8284f: 21300000 + - 1fa29ad54380226498c2250e612fec93: 21300000 + - fcec6de5f73f3b74480aa66ffac97f43: 21300000 + - 97b570f5218f6d94cadf8a8d195dd50d: 21300000 + - 9391e70638fb9084ebf61e843059fdf1: 21300000 + - ca897d165bbb9094584da008d90d3df5: 21300000 + - 41c27046edf6d694e875b5766f672a8f: 21300000 + - 69997956b171bc04495e5a4782e4669f: 21300000 + - 5f800286e4f0550478208c51d0a48d0f: 21300000 + - 89339a864e8d9994ea7c9531ae92e67e: 21300000 + - 8def3b866cd238f4a928439e0a5a8907: 21300000 + - d4e307e6ea003de4bbc0d28256e6a032: 21300000 + - 221d99e63cd1a414bad8cd6c93cb95c2: 21300000 + - 5f51f8f690669d84cacaeab399fce579: 21300000 + - 5cdf5107efb2e8c4d980153f752a57c1: 21300000 + - b0cff70733e6b0b41a5ad812ead6cd8b: 21300000 + - bb6a891737c56e6438e808fb4e716321: 21300000 + - 9528c4275cc1a114f9e755b4d9084936: 21300000 + - 881250471e7213f42819ba1d7bb1d4e0: 21300000 + - c4d7d6470acd7bf45971042161c6e018: 21300000 + - f3e9585781fa62242a3018cd3dd529dd: 21300000 + - c6b584771aee7a148bcf2885a6f347ba: 21300000 + - 49594577334bdee479b8dd58aedf1d60: 21300000 + - ec7d0c8717f6c3b428b3f277de956cea: 21300000 + - 45ed26a75477df843a013176e95192a9: 21300000 + - cb0f74b7e0e21ee47b09fdb24a83094f: 21300000 + - 686160c7c3cfd5040a8ea08b867ff56c: 21300000 + - b0acf1d76f96df547a6135841ee354f8: 21300000 + - 1eb8ffe712da55942b19d29be7a6e5da: 21300000 + - fe5165f702e35144684bf593203a031c: 21300000 + - 63290ff7381eab84eb49e7b9345c809f: 21300000 + - 455b6008820c4b143bdc7ed7c6cd29c4: 21300000 + - 5767e2180fcbb7a4d9980e9a37e3d588: 21300000 + - 88f2ac18ae0c71845bc1d47bd924f8a8: 21300000 + - dcc9002875a3a244eacb72418d292f8e: 21300000 + - bcd729389571a684eb0951d69a67af73: 21300000 + - 2eaa4938329e1204ca267982a8cdb3fa: 21300000 + - a9c37448b62c0d149aced6ded9e44e4a: 21300000 + - b5b9f448600b9aa4daa1d9fd5069a764: 21300000 + - c995874838013244cac3056d42ced345: 21300000 + - d0505258bec70ac40b68ec355beaff76: 21300000 + - 3a5b7c781691c8642af63e9c1e6c14de: 21300000 + - 5c8d87881ea3aca4c9cea0978e1867ba: 21300000 + - 6b594b886c601ff4db79a8ffa0673177: 21300000 + - 753548c84e6e0264da62aca9c26f94c4: 21300000 + - 690102d87edd7d047824362d73a02788: 21300000 + - 0f341be85736cdc4bba911e059e0d16a: 21300000 + - 4ad59af83f2bcde4681baeba9d0d90c8: 21300000 + - 76089009971280441963c2a3a55b5071: 21300000 + - e9154409f452b244b9db4c7de97dff28: 21300000 + - 4214a14962bcf4943baf9e184b9b928e: 21300000 + - a9e9e74909b5a0947a093069d6a017cc: 21300000 + - 59b767590592a9e4685835a20cf41d69: 21300000 + - 82bf8779d3330604c9cec1bf2f219329: 21300000 + - 8feedb9983dae0d49a492dae5bbbf6d6: 21300000 + - e62f4ca9760884b4cb9ff0c3025838db: 21300000 + - c63c69d9fdf411147aede23769d5fcfc: 21300000 + - bb0dc30aba14f084b9f20cd11d7f59d8: 21300000 + - 852dea1a4d9a29a45b32e544647320ad: 21300000 + - c865be1abede9a048a20b6904ee2219a: 21300000 + - 13aa9a4a1bc68064c9e5e17a86df2666: 21300000 + - 3db4a46ab9121ab4c82e33ae0f3d8710: 21300000 + - b38d007a84ef48c45b4026b9be16e76b: 21300000 + - d2d936bae69c599429ee1a386892a9f0: 21300000 + - f645b6da0a4688d4288e29bcffabc941: 21300000 + - e94248daa5c32774fbf35a1cb4ecc4de: 21300000 + - 35322bfa3901c9145821274537244b1d: 21300000 + - 6b460d0b7c81b4d4cb5f131f7eeda623: 21300000 + - ec69df1b25263e844aa6c00cbb388ea6: 21300000 + - bf9cb13b45f6dfe41970b547e98bb782: 21300000 + - 6dcde73b5ddc21d4582ec3468a22cda5: 21300000 + - 438b3b4b88bde4f4c9770d84b50b772b: 21300000 + - 634ae46b18d6e8e42a8359e8219fa81c: 21300000 + - 5b13d17b360e2a64cbc7b4a2ac4cd375: 21300000 + - e67c667b7a6a3664a8f22db00d76ad38: 21300000 + - aacc218bfa62aef41920035f78af31e8: 21300000 + - 86106dab9033ac7448f28ca19c407c2a: 21300000 + - b53b9dcb8117dfe4ab1c5a250703548c: 21300000 + - cf749edb05d158d47a3e523439809960: 21300000 + - c66090fb301d69046ba811b94979feab: 21300000 + - 365443fb827749b4db671a5038ff79b1: 21300000 + - 64afd51ca9828034f8c64a261e4b99b9: 21300000 + - 898a532c97728b244b14ffccd83b6f7e: 21300000 + - a1c0872c2cf7825428b1f301727f4e1b: 21300000 + - 9346fa5c7f34ca845954029ac6857a12: 21300000 + - 7f64c56c59a2fd7429f7ec776a4213a2: 21300000 + - 0a78267c907b61449a0367178cabe70c: 21300000 + - c39af18c1c6c80841b32ec80316d1e87: 21300000 + - cd65a99c817869946969cd216cab2115: 21300000 + - 79d7163dfd26ad748bf88cdc6b98d2f5: 21300000 + - 8f8e5b3d53a0deb4d88a6a25a3db5ac4: 21300000 + - 049cab3d3a32a3a45856ca44f223ced1: 21300000 + - dfa5e44dcbacc1b4794ca05e7f7e3478: 21300000 + - aa9e3d4d344a1c548a75a061ab69c3fb: 21300000 + - 31d88d4dbed3d9546898b42447a63e77: 21300000 + - 9989c37dedfecfa4591fd9f1821713cb: 21300000 + - ff33d6adfeac52e419af23fad2d0abfd: 21300000 + - 60a2cfad92429cc4b9d2f6ce7148c37a: 21300000 + - df6f54cd95dfdf148a5c4cc0aca6d49f: 21300000 + - 614b90dda34ee634893a6168082923be: 21300000 + - e79c55edf28318b44b614f2eaf6cbb45: 21300000 + - c7cf710ee57c1ae45aac513a85fcff07: 21300000 + - 904a520e37320ab4aa482b623e1d52f4: 21300000 + - a4d1991ea98b3684c99f8728d28ec652: 21300000 + - 2d24972ef326cbf4d95898e1bee82f8e: 21300000 + - 0b69f35e166d1704f987340b84eaefe6: 21300000 + - 6b56e26ee92b18e4aa775af7975a9b17: 21300000 + - 5b31577ecf5954448b0d92a2c8a0501b: 21300000 + - 5a1cef7e9c9ed034da742d0e08ea786a: 21300000 + - 9d98f19e89667e84fa99ae2d2c01ad66: 21300000 + - af68c0be2e67f3846bcdf33841f8312b: 21300000 + - d9c068be09f82944db652218d2ef1c52: 21300000 + - 1ffccabe7b991aa4283e4106fca8f9bb: 21300000 + - 0b6c45ce7a9a03d4d8f457818ab57430: 21300000 + - 39f2b1de192463d41a4339ee2b5f2074: 21300000 + - eb350ede4895d6d418689eb126b772cb: 21300000 + - 1b0ea6ee3d93339468688584fa8f3bb9: 21300000 + - 657c921f612637e4f8ba1c8c4123d11d: 21300000 + - 8a9b494f275a2954aba6b318fc17d9bd: 21300000 + - f7f3915fcb9a6744a9a147ed3ee26ebe: 21300000 + - a3b4037f6cee2ac4fb949a47aa4a4d76: 21300000 + - d6e05ebf12ef9164c9b792b7088c0bdd: 21300000 + - 261da5cf99e3c864e9079de55f67a437: 21300000 + - aefc8fcf439e0ae40bab5098679276b5: 21300000 + - 7d37e1dfeba60ea4a8803c12675079b6: 21300000 + - 3b3834ff0aab3d849bca2adc0c0d5f84: 21300000 + - b5a42cffd70ab6441a230c8e772f3c56: 21300000 m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: e4381a10685b28d4f906cc686ecbc2c7, type: 3} @@ -447,5 +653,6 @@ SpriteAtlas: - Anim_CROUCH_00007 - ELLEN_RUN_NoGun_19 - Anim_DEATH_00017 + m_RenderDataMap: {} m_Tag: EllenAtlas m_IsVariant: 0 diff --git a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/EllenCutsceneAtlas.spriteatlas b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/EllenCutsceneAtlas.spriteatlas index 6264694945..1dd13439fa 100644 --- a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/EllenCutsceneAtlas.spriteatlas +++ b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/EllenCutsceneAtlas.spriteatlas @@ -21,7 +21,7 @@ SpriteAtlas: crunchedCompression: 0 sRGB: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 m_BuildTarget: DefaultTexturePlatform m_MaxTextureSize: 8192 m_ResizeAlgorithm: 0 @@ -31,7 +31,9 @@ SpriteAtlas: m_CrunchedCompression: 0 m_AllowsAlphaSplitting: 0 m_Overridden: 0 + m_IgnorePlatformSupport: 0 m_AndroidETC2FallbackOverride: 0 + m_ForceMaximumCompressionQuality_BC6H_BC7: 1 packingSettings: serializedVersion: 2 padding: 4 @@ -39,11 +41,72 @@ SpriteAtlas: allowAlphaSplitting: 0 enableRotation: 0 enableTightPacking: 0 + enableAlphaDilation: 0 + secondaryTextureSettings: {} variantMultiplier: 1 packables: - {fileID: 102900000, guid: 3b282ed300911054f9a15dfe288b180b, type: 3} - totalSpriteSurfaceArea: 3735552 bindAsDefault: 1 + isAtlasV2: 0 + cachedData: {fileID: 0} + packedSpriteRenderDataKeys: + - a5bd89109aa6b2040899eb517d4ff269: 21300000 + - 150834209dce0f04fbc80ba1c047862d: 21300000 + - d8066b3064c94ec418e624a9d42a7e9a: 21300000 + - 338b7ab050147cd4ba8dae8c5b192d06: 21300000 + - b7f0bbb0377ad59428edfb2ad7bb9c8b: 21300000 + - 6ca890c0d46aed24b9dc2b295bc00f66: 21300000 + - 4404ac2103491534c9e5846328919d85: 21300000 + - ffc84872fb897ac48ba785abe986ce5f: 21300000 + - 1df4990374184a74881ac6025bf44892: 21300000 + - f6f6b1436c8ac2f40b4772ae71e66616: 21300000 + - ec512da32fc72e341aaf998346dd918d: 21300000 + - c7b60a04d72144e4abc50f83229c24b8: 21300000 + - 89d60a14446e0e64d9fbc78d4f56f0e0: 21300000 + - 37b0ac0507a75e74b8463a66400768b6: 21300000 + - 4bfe2265e55eabc4e8661f4b53459a61: 21300000 + - 13da4665845ba7048a430c77c0c2e710: 21300000 + - 82e2dad5538a7b94fb7d4a2ec5892fc4: 21300000 + - 92afb8e693ef0bd479a9fbcca9cd4407: 21300000 + - 848f66f6aef71f5439b3f54a71fdfbb0: 21300000 + - 94506df6af9336d498bc4b125fec2bf5: 21300000 + - b21a4c07951e2a741ab6e18f67c5cd69: 21300000 + - 68451d277d2abba46a8ce6bf03ca7e0e: 21300000 + - ec2fd10884c649646bd87eeb6da8fbdc: 21300000 + - bf215208f75c7b942b1605483667f8e4: 21300000 + - 88e8dc18ca587db4dbf5748520fbc374: 21300000 + - 641c1968aa0040a43a5a56dcb15c37c1: 21300000 + - 8823d9880fbc90642a4778e42a762580: 21300000 + - d12400b8f60eb534489d29d74595c74c: 21300000 + - ac55bcb8f5e1e714e8dbc94eaa8b2476: 21300000 + - 4b8d7ee8c014eca44bac43ebc62ff54a: 21300000 + - a94191f83905200448f763e26e38b1f0: 21300000 + - 9055a2f863bb219428f97595a861d3ae: 21300000 + - fc020019f252cdb46a61d9796ded3e11: 21300000 + - e8917069f3e34da42b21d686fabc7edf: 21300000 + - 00e06269702d7004eb9a7c0e6bd22426: 21300000 + - 82a1256975469ad449c19d749f79d183: 21300000 + - 4db7de89bec7d9241b6f8f9a9149ea12: 21300000 + - 240b042a2678c13429cb0a31094f929d: 21300000 + - 411cf84ac65191c4bb59a562f6ff00d5: 21300000 + - 430a778a5e873dd47b839ef9c835fe65: 21300000 + - 970d88aa5a19ea34f966f654dba3c40a: 21300000 + - 667322eabce35e54782b9a44a073a105: 21300000 + - e025cbdb4e2ba0c4da395d1f388932dd: 21300000 + - c0c34b3ce5f3bad4a92ae2ace64ea54b: 21300000 + - f2f48b5c6d23a094ab94c8c2a222706d: 21300000 + - a2a0016c152367442b171d0cd3dee9f6: 21300000 + - 6a9d269c995597949912371419d0e37c: 21300000 + - 93e3d0ece463bdd4f8de3a5e13640f52: 21300000 + - 0eb4fabd70cb42c4e853c56d1227a3fd: 21300000 + - f4d973fde270bf646989674f9883ff37: 21300000 + - 951eaffdc3e0af047968b7ab9cd39b79: 21300000 + - ff6abd3e3a894514cb908c7048a19d4d: 21300000 + - 0aa4758e6a5fb5548b825f9b9f30d7c6: 21300000 + - c526eeae045772a4d864b60d1a1d5296: 21300000 + - febb0f6fef5a4a047a1acf99e84d9fb8: 21300000 + - 2ddda87f253edea40a6f886160952413: 21300000 + - e8dea0af68b70944d9a787becfc0689a: 21300000 m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: a5bd89109aa6b2040899eb517d4ff269, type: 3} @@ -161,5 +224,6 @@ SpriteAtlas: - Ellen_CutscenePortrait_006 - Ellen_CutscenePortrait_009 - Ellen_CutscenePortrait_034 + m_RenderDataMap: {} m_Tag: EllenCutsceneAtlas m_IsVariant: 0 diff --git a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/ChomperAtlas.spriteatlas b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/ChomperAtlas.spriteatlas index 3cb271805c..e299423bbf 100644 --- a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/ChomperAtlas.spriteatlas +++ b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/ChomperAtlas.spriteatlas @@ -21,7 +21,7 @@ SpriteAtlas: crunchedCompression: 0 sRGB: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 m_BuildTarget: DefaultTexturePlatform m_MaxTextureSize: 8192 m_ResizeAlgorithm: 0 @@ -31,7 +31,9 @@ SpriteAtlas: m_CrunchedCompression: 0 m_AllowsAlphaSplitting: 0 m_Overridden: 0 + m_IgnorePlatformSupport: 0 m_AndroidETC2FallbackOverride: 0 + m_ForceMaximumCompressionQuality_BC6H_BC7: 1 packingSettings: serializedVersion: 2 padding: 4 @@ -39,11 +41,78 @@ SpriteAtlas: allowAlphaSplitting: 0 enableRotation: 1 enableTightPacking: 1 + enableAlphaDilation: 0 + secondaryTextureSettings: {} variantMultiplier: 1 packables: - {fileID: 102900000, guid: b70e068a42df2514cafb501eda8734e4, type: 3} - totalSpriteSurfaceArea: 10489500 bindAsDefault: 1 + isAtlasV2: 0 + cachedData: {fileID: 0} + packedSpriteRenderDataKeys: + - ab415a003dc7634428737e396fb6b118: 21300000 + - 5ff5b330714abac42a0db7b827b418a6: 21300000 + - ae7c3e30807a6b14ea27333b478b7159: 21300000 + - 22f7a3407a0448d438b85694136896c1: 21300000 + - 62e4d070156482a4995f75774447f83d: 21300000 + - c10ee680b45acec46af60e470d8c1930: 21300000 + - 2682d6b08082e2f49b748e74174a8e87: 21300000 + - 1d094e315b7be8444ab6502f9dcca260: 21300000 + - 8ae4d681ab837c64796c0b72ee2584a0: 21300000 + - 8b571ba119e277145b0b92cd8fd42067: 21300000 + - ef846db2d56c3124b8f82467a163ebdf: 21300000 + - 483490e295d65ea45b0ca6ec50a93382: 21300000 + - a003b41375f47594a9d754a4e55dc568: 21300000 + - d3ae7713c92135644b592b6979acbcfc: 21300000 + - e1faa5d36f8d3e843b5367af93176284: 21300000 + - ac9307145261eee499a455ddeb80db4b: 21300000 + - 9e540f44219d80243bec5e2191787a0c: 21300000 + - b801fd8404ee341479f2a795c6dd8ab5: 21300000 + - 41ee8205a421b1643824c4bd4c9b12b0: 21300000 + - aeb8b905156a5164ea3f260ddc951efd: 21300000 + - c00121950f177f84092fd15f53c6ac66: 21300000 + - 8b5d6d95c402e6e479a2528aceb461c1: 21300000 + - 882f64064bde2e64db7df2086bc259df: 21300000 + - a5cc0836f318e7d47928222a8a8c6bd5: 21300000 + - 980a4b66b0a2bba42a9a3b50f4da76d6: 21300000 + - 9405a54793ed1b74bb19ee929c860b0d: 21300000 + - 72182c4737bc6a242be25cda1beacbf4: 21300000 + - a3ee41879a5dc174f9767e2bfdcde909: 21300000 + - 0ce1ce8775d04c04091f4c852f4f4ec5: 21300000 + - b6e64dd7555a5fc44b98d71cb5c0d43c: 21300000 + - f0657c0811c44934ba275af9b1aa5c85: 21300000 + - 75a36c8886a27f54b833c41de3d11d24: 21300000 + - 38c40e88299ccf042b83f09b5c3fd89b: 21300000 + - 2db361d87da36334cb20db2ebf74e3c1: 21300000 + - 1e12a6098ecee9a47b8b65f259c08991: 21300000 + - dae848790acd29544a951ec295aecf71: 21300000 + - f7636f79f29fce1469dfb21774e2b9d7: 21300000 + - 02d12d99a7d9fc24fa0f9e2472426c7b: 21300000 + - 26aea5a92fc76f648bb6522f06a0af58: 21300000 + - d720e2d90151e91479a4d3d4287bb61b: 21300000 + - 924e830a0c9d55a4bbe5afdc9729d55f: 21300000 + - 4843081a76a173a468369f4fab334928: 21300000 + - c3bc842a37054c74bbc28d1f34c9847a: 21300000 + - a25859ca3789d8a469bdd28a7d38daf2: 21300000 + - 312a5bfa1cd438440b81906da98959f9: 21300000 + - b3da84ebb4d3f0748b47f5cf58ae9d40: 21300000 + - f14aa10c3b4eb5b47860e729e2144c28: 21300000 + - 8398530cb9366974ca3cb94c16af54f7: 21300000 + - 6e07004c8f0965d4ab66a275e02b77a0: 21300000 + - b6737a6c649b5664baa6b0e1f942a9e9: 21300000 + - a0740f7c6b0a21346b139ff42dc3cb17: 21300000 + - 54bda8bcfb03f4345aafea5fe8271478: 21300000 + - a64b8a0d006d7b744b431b7cd3e59096: 21300000 + - f49c41dd300e6f6439fb3dafb10f4e9d: 21300000 + - 6c05bc2e66e3ff342abf6c6128d48be8: 21300000 + - 3d64a15e480cc6847bc34f715f1999fa: 21300000 + - 3b35fd7e10ffa5a4886deb9a7fe973be: 21300000 + - 030bf29ece336fa4590a0d4039eb5a00: 21300000 + - b789f21f154a3744592f10328f51d9b9: 21300000 + - c476985fb9af3ff4aafceffed501e06a: 21300000 + - 6de87e9f00722e74d9fc96304b8f1a3d: 21300000 + - 1c64f7cfb7bf99d48abddaeb45da9704: 21300000 + - 94f6e6ef133c2fc4d978f8e13f22331e: 21300000 m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: ab415a003dc7634428737e396fb6b118, type: 3} @@ -173,5 +242,6 @@ SpriteAtlas: - ChomperIdle_00053 - ChomperDEATH_Paint_11 - ChomperDEATH_Paint_01 + m_RenderDataMap: {} m_Tag: ChomperAtlas m_IsVariant: 0 diff --git a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/SpitterAtlas.spriteatlas b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/SpitterAtlas.spriteatlas index 9972e0a7c9..3993568672 100644 --- a/Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/SpitterAtlas.spriteatlas +++ b/Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/SpitterAtlas.spriteatlas @@ -21,7 +21,7 @@ SpriteAtlas: crunchedCompression: 0 sRGB: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 m_BuildTarget: DefaultTexturePlatform m_MaxTextureSize: 8192 m_ResizeAlgorithm: 0 @@ -31,7 +31,9 @@ SpriteAtlas: m_CrunchedCompression: 0 m_AllowsAlphaSplitting: 0 m_Overridden: 0 + m_IgnorePlatformSupport: 0 m_AndroidETC2FallbackOverride: 0 + m_ForceMaximumCompressionQuality_BC6H_BC7: 1 packingSettings: serializedVersion: 2 padding: 4 @@ -39,11 +41,68 @@ SpriteAtlas: allowAlphaSplitting: 0 enableRotation: 1 enableTightPacking: 1 + enableAlphaDilation: 0 + secondaryTextureSettings: {} variantMultiplier: 1 packables: - {fileID: 102900000, guid: cc699bfd783c8e34cbc62772daba3c30, type: 3} - totalSpriteSurfaceArea: 8824500 bindAsDefault: 1 + isAtlasV2: 0 + cachedData: {fileID: 0} + packedSpriteRenderDataKeys: + - 8adfa5608930ca2439e971779195e6d5: 21300000 + - 32dc08a018447f543976c94bf9491196: 21300000 + - a607bd01a7a4db74d8db6d947dcbc875: 21300000 + - b380a2116ae89cf468d48830ec7d79c2: 21300000 + - 7355c851fc65ff849b5df7c47140e9d8: 21300000 + - 63fc7cb115139c848995a4ae9ac9dacb: 21300000 + - 835211e15123ac143bd33f517fb7a006: 21300000 + - 52e91402b85ab7b4da1289c8f9a70393: 21300000 + - c8cbc822ff1ea224fa14efed547a1962: 21300000 + - 585a6432587c7c147b3d5e9df9f422c4: 21300000 + - 10136a82fe95130409081e398fe24178: 21300000 + - 08a08ba28e247a640b93b2069105d119: 21300000 + - dda1ecc29988c874bbc23937de1f6e5e: 21300000 + - bfc349e2425296543a5c8a12bdf4df11: 21300000 + - e91b4143d098bed4c9e823cdcbea18b2: 21300000 + - c413889380ba9bc48a815e80b274fffd: 21300000 + - 9f5b1b248f1d42b45b4907efad9af9ae: 21300000 + - a2bf0c84810352345928f875e9722574: 21300000 + - f09178b404a32834883bc08597522d22: 21300000 + - bdebbaf48377ad346a0dad337aceea94: 21300000 + - 914c7ff4b2e03254f8fca375221689a5: 21300000 + - 850fcf2571df67c4ea7f94f407d1a42c: 21300000 + - 10871335f574c994891877ebab0be6ac: 21300000 + - ddcad965dfaadd94393dcc3cec52b3ce: 21300000 + - 6016bca53a5cef1449c5464da0fd040c: 21300000 + - d090c51669b3435449d4a2d4819b4261: 21300000 + - 48948d469c03d1146ad3d7026a482156: 21300000 + - e33ab0866768e0149af41c52aaa4359c: 21300000 + - 9cc3fcf61bd66d34c996a561899716bb: 21300000 + - 1db1cf67e678da1489caff40f4149421: 21300000 + - dfc824d7751687d4ab5c25b40b7cfd9a: 21300000 + - 22953dd7b1cd95b4c9b5ddf9ac346037: 21300000 + - 04ba3238e0770214cb44ec04498eaf41: 21300000 + - eadcf2981659a764c86bafbe6ce6f044: 21300000 + - 702fbb19c7d7d684b8ce058404284c70: 21300000 + - c169f3a975c97764392837f81a84c249: 21300000 + - 70036f2bc0a3c1641bcfcdfe41364ebf: 21300000 + - dd0430cb00274c1489be6b617ee81916: 21300000 + - e59f64eb7bc6fec48a686c2831a477ac: 21300000 + - 09cbcc2cfc7f96f41904a753c589c3bb: 21300000 + - 8354564cdfb17ef47929b25a0c696be4: 21300000 + - 7c80543db09a5ec4cbf32e6ebd148879: 21300000 + - 18b6ab4d386ee2a4c8907ac47974884b: 21300000 + - ea75f18dd428482458ec6b1ea19ae71b: 21300000 + - c873423e7212f3b469150de37075a8db: 21300000 + - 7b195ceea64132d40bb2a215dd26b903: 21300000 + - 4397030f9e6fb174ea079b632727d6f8: 21300000 + - 93dbc21f8c967174d9724ded23bcaa46: 21300000 + - ba45ea1ff3eb95d4bb7ace3022705886: 21300000 + - e797a63f8ec23e84e94f4d6b25cf69a9: 21300000 + - ed03b24fc6d38dc4094f2bf8830f9df2: 21300000 + - 1360f45f3eea5294fad01a0d4dacd624: 21300000 + - 8d4804cf4e8b18246a0b9de4bb5f7887: 21300000 m_MasterAtlas: {fileID: 0} m_PackedSprites: - {fileID: 21300000, guid: 8adfa5608930ca2439e971779195e6d5, type: 3} @@ -153,5 +212,6 @@ SpriteAtlas: - SpitterAttack_16 - SpitterWalk_09 - SpitterAttack_18 + m_RenderDataMap: {} m_Tag: SpitterAtlas m_IsVariant: 0 diff --git a/Assets/Game Assets/Art/Sprites/Environment/AlienFlora.png.meta b/Assets/Game Assets/Art/Sprites/Environment/AlienFlora.png.meta index 254d38e9a9..453334cfc7 100644 --- a/Assets/Game Assets/Art/Sprites/Environment/AlienFlora.png.meta +++ b/Assets/Game Assets/Art/Sprites/Environment/AlienFlora.png.meta @@ -1,48 +1,126 @@ fileFormatVersion: 2 guid: 6e43932fcf79bb44881725c7dba2dfde TextureImporter: - fileIDToRecycleName: - 21300000: AlienFlora_0 - 21300002: AlienFlora_1 - 21300004: AlienFlora_3 - 21300006: AlienFlora_4 - 21300008: AlienFlora_5 - 21300010: AlienFlora_6 - 21300012: AlienFlora_7 - 21300014: AlienFlora_8 - 21300016: AlienFlora_9 - 21300018: AlienFlora_10 - 21300020: AlienFlora_11 - 21300022: AlienFlora_12 - 21300024: AlienFlora_14 - 21300026: AlienFlora_16 - 21300028: AlienFlora_17 - 21300030: AlienFlora_18 - 21300032: AlienFlora_19 - 21300034: AlienFlora_20 - 21300036: AlienFlora_21 - 21300038: AlienFlora_22 - 21300040: AlienFlora_23 - 21300042: AlienFlora_24 - 21300044: AlienFlora_26 - 21300046: AlienFlora_27 - 21300048: AlienFlora_28 - 21300050: AlienFlora_29 - 21300052: AlienFlora_30 - 21300054: AlienFlora_31 - 21300056: AlienFlora_32 - 21300058: AlienFlora_33 - 21300060: AlienFlora_35 - 21300062: AlienFlora_36 - 21300064: AlienFlora_38 - 21300066: AlienFlora_39 - 21300068: AlienFlora_42 - 21300070: AlienFlora_45 - 21300072: AlienFlora_48 - 21300074: AlienFlora_51 - 21300076: AlienFlora_52 + internalIDToNameTable: + - first: + 213: 21300000 + second: AlienFlora_0 + - first: + 213: 21300002 + second: AlienFlora_1 + - first: + 213: 21300004 + second: AlienFlora_3 + - first: + 213: 21300006 + second: AlienFlora_4 + - first: + 213: 21300008 + second: AlienFlora_5 + - first: + 213: 21300010 + second: AlienFlora_6 + - first: + 213: 21300012 + second: AlienFlora_7 + - first: + 213: 21300014 + second: AlienFlora_8 + - first: + 213: 21300016 + second: AlienFlora_9 + - first: + 213: 21300018 + second: AlienFlora_10 + - first: + 213: 21300020 + second: AlienFlora_11 + - first: + 213: 21300022 + second: AlienFlora_12 + - first: + 213: 21300024 + second: AlienFlora_14 + - first: + 213: 21300026 + second: AlienFlora_16 + - first: + 213: 21300028 + second: AlienFlora_17 + - first: + 213: 21300030 + second: AlienFlora_18 + - first: + 213: 21300032 + second: AlienFlora_19 + - first: + 213: 21300034 + second: AlienFlora_20 + - first: + 213: 21300036 + second: AlienFlora_21 + - first: + 213: 21300038 + second: AlienFlora_22 + - first: + 213: 21300040 + second: AlienFlora_23 + - first: + 213: 21300042 + second: AlienFlora_24 + - first: + 213: 21300044 + second: AlienFlora_26 + - first: + 213: 21300046 + second: AlienFlora_27 + - first: + 213: 21300048 + second: AlienFlora_28 + - first: + 213: 21300050 + second: AlienFlora_29 + - first: + 213: 21300052 + second: AlienFlora_30 + - first: + 213: 21300054 + second: AlienFlora_31 + - first: + 213: 21300056 + second: AlienFlora_32 + - first: + 213: 21300058 + second: AlienFlora_33 + - first: + 213: 21300060 + second: AlienFlora_35 + - first: + 213: 21300062 + second: AlienFlora_36 + - first: + 213: 21300064 + second: AlienFlora_38 + - first: + 213: 21300066 + second: AlienFlora_39 + - first: + 213: 21300068 + second: AlienFlora_42 + - first: + 213: 21300070 + second: AlienFlora_45 + - first: + 213: 21300072 + second: AlienFlora_48 + - first: + 213: 21300074 + second: AlienFlora_51 + - first: + 213: 21300076 + second: AlienFlora_52 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -59,9 +137,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -70,12 +151,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -93,11 +174,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -107,8 +194,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -118,8 +207,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -129,7 +220,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -149,6 +268,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -169,6 +289,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -189,6 +310,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -209,6 +331,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -229,6 +352,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -249,6 +373,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -269,6 +394,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c2305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -289,6 +415,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e2305410000000000800000000000000 + internalID: 21300014 vertices: [] indices: edges: [] @@ -309,6 +436,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 03305410000000000800000000000000 + internalID: 21300016 vertices: [] indices: edges: [] @@ -329,6 +457,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 23305410000000000800000000000000 + internalID: 21300018 vertices: [] indices: edges: [] @@ -349,6 +478,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 43305410000000000800000000000000 + internalID: 21300020 vertices: [] indices: edges: [] @@ -369,6 +499,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 63305410000000000800000000000000 + internalID: 21300022 vertices: [] indices: edges: [] @@ -389,6 +520,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 83305410000000000800000000000000 + internalID: 21300024 vertices: [] indices: edges: [] @@ -409,6 +541,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a3305410000000000800000000000000 + internalID: 21300026 vertices: [] indices: edges: [] @@ -429,6 +562,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c3305410000000000800000000000000 + internalID: 21300028 vertices: [] indices: edges: [] @@ -449,6 +583,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e3305410000000000800000000000000 + internalID: 21300030 vertices: [] indices: edges: [] @@ -469,6 +604,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 04305410000000000800000000000000 + internalID: 21300032 vertices: [] indices: edges: [] @@ -489,6 +625,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 24305410000000000800000000000000 + internalID: 21300034 vertices: [] indices: edges: [] @@ -509,6 +646,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 44305410000000000800000000000000 + internalID: 21300036 vertices: [] indices: edges: [] @@ -529,6 +667,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 64305410000000000800000000000000 + internalID: 21300038 vertices: [] indices: edges: [] @@ -549,6 +688,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 84305410000000000800000000000000 + internalID: 21300040 vertices: [] indices: edges: [] @@ -569,6 +709,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a4305410000000000800000000000000 + internalID: 21300042 vertices: [] indices: edges: [] @@ -589,6 +730,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c4305410000000000800000000000000 + internalID: 21300044 vertices: [] indices: edges: [] @@ -609,6 +751,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e4305410000000000800000000000000 + internalID: 21300046 vertices: [] indices: edges: [] @@ -629,6 +772,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 05305410000000000800000000000000 + internalID: 21300048 vertices: [] indices: edges: [] @@ -649,6 +793,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 25305410000000000800000000000000 + internalID: 21300050 vertices: [] indices: edges: [] @@ -669,6 +814,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 45305410000000000800000000000000 + internalID: 21300052 vertices: [] indices: edges: [] @@ -689,6 +835,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 65305410000000000800000000000000 + internalID: 21300054 vertices: [] indices: edges: [] @@ -709,6 +856,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 85305410000000000800000000000000 + internalID: 21300056 vertices: [] indices: edges: [] @@ -729,6 +877,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a5305410000000000800000000000000 + internalID: 21300058 vertices: [] indices: edges: [] @@ -749,6 +898,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c5305410000000000800000000000000 + internalID: 21300060 vertices: [] indices: edges: [] @@ -769,6 +919,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e5305410000000000800000000000000 + internalID: 21300062 vertices: [] indices: edges: [] @@ -789,6 +940,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 06305410000000000800000000000000 + internalID: 21300064 vertices: [] indices: edges: [] @@ -809,6 +961,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 26305410000000000800000000000000 + internalID: 21300066 vertices: [] indices: edges: [] @@ -829,6 +982,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 46305410000000000800000000000000 + internalID: 21300068 vertices: [] indices: edges: [] @@ -849,6 +1003,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 66305410000000000800000000000000 + internalID: 21300070 vertices: [] indices: edges: [] @@ -869,6 +1024,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 86305410000000000800000000000000 + internalID: 21300072 vertices: [] indices: edges: [] @@ -889,6 +1045,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a6305410000000000800000000000000 + internalID: 21300074 vertices: [] indices: edges: [] @@ -909,6 +1066,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c6305410000000000800000000000000 + internalID: 21300076 vertices: [] indices: edges: [] @@ -917,13 +1075,54 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + AlienFlora_0: 21300000 + AlienFlora_1: 21300002 + AlienFlora_10: 21300018 + AlienFlora_11: 21300020 + AlienFlora_12: 21300022 + AlienFlora_14: 21300024 + AlienFlora_16: 21300026 + AlienFlora_17: 21300028 + AlienFlora_18: 21300030 + AlienFlora_19: 21300032 + AlienFlora_20: 21300034 + AlienFlora_21: 21300036 + AlienFlora_22: 21300038 + AlienFlora_23: 21300040 + AlienFlora_24: 21300042 + AlienFlora_26: 21300044 + AlienFlora_27: 21300046 + AlienFlora_28: 21300048 + AlienFlora_29: 21300050 + AlienFlora_3: 21300004 + AlienFlora_30: 21300052 + AlienFlora_31: 21300054 + AlienFlora_32: 21300056 + AlienFlora_33: 21300058 + AlienFlora_35: 21300060 + AlienFlora_36: 21300062 + AlienFlora_38: 21300064 + AlienFlora_39: 21300066 + AlienFlora_4: 21300006 + AlienFlora_42: 21300068 + AlienFlora_45: 21300070 + AlienFlora_48: 21300072 + AlienFlora_5: 21300008 + AlienFlora_51: 21300074 + AlienFlora_52: 21300076 + AlienFlora_6: 21300010 + AlienFlora_7: 21300012 + AlienFlora_8: 21300014 + AlienFlora_9: 21300016 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Environment/BGPlants.png.meta b/Assets/Game Assets/Art/Sprites/Environment/BGPlants.png.meta index e86b8ae414..cf83fea7d5 100644 --- a/Assets/Game Assets/Art/Sprites/Environment/BGPlants.png.meta +++ b/Assets/Game Assets/Art/Sprites/Environment/BGPlants.png.meta @@ -1,28 +1,66 @@ fileFormatVersion: 2 guid: 776d10e19ab11c44a8271fc18a42ab83 TextureImporter: - fileIDToRecycleName: - 21300000: BGPlants_0 - 21300002: BGPlants_1 - 21300004: BGPlants_2 - 21300006: BGPlants_3 - 21300008: BGPlants_4 - 21300010: BGPlants_5 - 21300012: BGPlants_6 - 21300014: BGPlants_9 - 21300016: BGPlants_10 - 21300018: BGPlants_14 - 21300020: BGPlants_15 - 21300022: BGPlants_18 - 21300024: BGPlants_20 - 21300026: BGPlants_21 - 21300028: BGPlants_22 - 21300030: BGPlants_23 - 21300032: BGPlants_24 - 21300034: BGPlants_25 - 21300036: BGPlants_26 + internalIDToNameTable: + - first: + 213: 21300000 + second: BGPlants_0 + - first: + 213: 21300002 + second: BGPlants_1 + - first: + 213: 21300004 + second: BGPlants_2 + - first: + 213: 21300006 + second: BGPlants_3 + - first: + 213: 21300008 + second: BGPlants_4 + - first: + 213: 21300010 + second: BGPlants_5 + - first: + 213: 21300012 + second: BGPlants_6 + - first: + 213: 21300014 + second: BGPlants_9 + - first: + 213: 21300016 + second: BGPlants_10 + - first: + 213: 21300018 + second: BGPlants_14 + - first: + 213: 21300020 + second: BGPlants_15 + - first: + 213: 21300022 + second: BGPlants_18 + - first: + 213: 21300024 + second: BGPlants_20 + - first: + 213: 21300026 + second: BGPlants_21 + - first: + 213: 21300028 + second: BGPlants_22 + - first: + 213: 21300030 + second: BGPlants_23 + - first: + 213: 21300032 + second: BGPlants_24 + - first: + 213: 21300034 + second: BGPlants_25 + - first: + 213: 21300036 + second: BGPlants_26 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -39,9 +77,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -51,8 +92,8 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 2 - aniso: -1 - mipBias: -100 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -73,11 +114,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 8192 resizeAlgorithm: 0 @@ -87,8 +134,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 8192 resizeAlgorithm: 0 @@ -98,8 +147,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 8192 resizeAlgorithm: 0 @@ -109,7 +160,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -164,6 +243,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -208,6 +288,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -254,6 +335,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -284,6 +366,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -311,6 +394,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -337,6 +421,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -363,6 +448,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c2305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -392,6 +478,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 03305410000000000800000000000000 + internalID: 21300014 vertices: [] indices: edges: [] @@ -433,6 +520,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 43305410000000000800000000000000 + internalID: 21300016 vertices: [] indices: edges: [] @@ -472,6 +560,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 63305410000000000800000000000000 + internalID: 21300018 vertices: [] indices: edges: [] @@ -504,6 +593,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 83305410000000000800000000000000 + internalID: 21300020 vertices: [] indices: edges: [] @@ -537,6 +627,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a4305410000000000800000000000000 + internalID: 21300022 vertices: [] indices: edges: [] @@ -575,6 +666,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a3305410000000000800000000000000 + internalID: 21300024 vertices: [] indices: edges: [] @@ -605,6 +697,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e4305410000000000800000000000000 + internalID: 21300026 vertices: [] indices: edges: [] @@ -637,6 +730,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c3305410000000000800000000000000 + internalID: 21300028 vertices: [] indices: edges: [] @@ -673,6 +767,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e3305410000000000800000000000000 + internalID: 21300030 vertices: [] indices: edges: [] @@ -705,6 +800,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 04305410000000000800000000000000 + internalID: 21300032 vertices: [] indices: edges: [] @@ -733,6 +829,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 24305410000000000800000000000000 + internalID: 21300034 vertices: [] indices: edges: [] @@ -760,6 +857,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 44305410000000000800000000000000 + internalID: 21300036 vertices: [] indices: edges: [] @@ -768,13 +866,34 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + BGPlants_0: 21300000 + BGPlants_1: 21300002 + BGPlants_10: 21300016 + BGPlants_14: 21300018 + BGPlants_15: 21300020 + BGPlants_18: 21300022 + BGPlants_2: 21300004 + BGPlants_20: 21300024 + BGPlants_21: 21300026 + BGPlants_22: 21300028 + BGPlants_23: 21300030 + BGPlants_24: 21300032 + BGPlants_25: 21300034 + BGPlants_26: 21300036 + BGPlants_3: 21300006 + BGPlants_4: 21300008 + BGPlants_5: 21300010 + BGPlants_6: 21300012 + BGPlants_9: 21300014 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Environment/BGRock03.png.meta b/Assets/Game Assets/Art/Sprites/Environment/BGRock03.png.meta index 3568d647ee..f507fc6c52 100644 --- a/Assets/Game Assets/Art/Sprites/Environment/BGRock03.png.meta +++ b/Assets/Game Assets/Art/Sprites/Environment/BGRock03.png.meta @@ -1,11 +1,15 @@ fileFormatVersion: 2 guid: 5222c5dbe44c8494da11d0cdcf795f18 TextureImporter: - fileIDToRecycleName: - 21300000: BGRock_03_0 - 21300002: BGRock_03_1 + internalIDToNameTable: + - first: + 213: 21300000 + second: BGRock_03_0 + - first: + 213: 21300002 + second: BGRock_03_1 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,9 +26,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,12 +40,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 - wrapV: -1 - wrapW: -1 + wrapV: 0 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -56,11 +63,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -70,8 +83,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -81,8 +96,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -92,7 +109,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -117,6 +162,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -143,6 +189,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -151,13 +198,17 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + BGRock_03_0: 21300000 + BGRock_03_1: 21300002 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Environment/Clouds.png.meta b/Assets/Game Assets/Art/Sprites/Environment/Clouds.png.meta index cd37a46a97..c77743106b 100644 --- a/Assets/Game Assets/Art/Sprites/Environment/Clouds.png.meta +++ b/Assets/Game Assets/Art/Sprites/Environment/Clouds.png.meta @@ -1,18 +1,36 @@ fileFormatVersion: 2 guid: 76465a0a33addfa4686beca3ade8fc17 TextureImporter: - fileIDToRecycleName: - 21300000: Clouds_0 - 21300002: Clouds_4 - 21300004: Clouds_5 - 21300006: Clouds_6 - 21300008: Clouds_9 - 21300010: Clouds_16 - 21300012: Clouds_15 - 21300014: Clouds_7 - 21300016: Clouds_8 + internalIDToNameTable: + - first: + 213: 21300000 + second: Clouds_0 + - first: + 213: 21300002 + second: Clouds_4 + - first: + 213: 21300004 + second: Clouds_5 + - first: + 213: 21300006 + second: Clouds_6 + - first: + 213: 21300008 + second: Clouds_9 + - first: + 213: 21300010 + second: Clouds_16 + - first: + 213: 21300012 + second: Clouds_15 + - first: + 213: 21300014 + second: Clouds_7 + - first: + 213: 21300016 + second: Clouds_8 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -29,9 +47,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -40,12 +61,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 - wrapV: -1 - wrapW: -1 + wrapV: 0 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -63,11 +84,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -77,8 +104,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -88,8 +117,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -99,7 +130,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -125,6 +184,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -153,6 +213,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -182,6 +243,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -212,6 +274,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c2305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -268,6 +331,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 03305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -297,6 +361,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 43305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -328,6 +393,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 63305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -357,6 +423,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300014 vertices: [] indices: edges: [] @@ -386,6 +453,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300016 vertices: [] indices: edges: [] @@ -394,13 +462,24 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + Clouds_0: 21300000 + Clouds_15: 21300012 + Clouds_16: 21300010 + Clouds_4: 21300002 + Clouds_5: 21300004 + Clouds_6: 21300006 + Clouds_7: 21300014 + Clouds_8: 21300016 + Clouds_9: 21300008 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Environment/FloatingRocks.png.meta b/Assets/Game Assets/Art/Sprites/Environment/FloatingRocks.png.meta index f86c14d689..8fac129a93 100644 --- a/Assets/Game Assets/Art/Sprites/Environment/FloatingRocks.png.meta +++ b/Assets/Game Assets/Art/Sprites/Environment/FloatingRocks.png.meta @@ -1,30 +1,72 @@ fileFormatVersion: 2 guid: e49210b2eba9a5442b6fe40c91776cd2 TextureImporter: - fileIDToRecycleName: - 21300000: FloatingRocks_0 - 21300002: FloatingRocks_1 - 21300004: FloatingRocks_2 - 21300006: FloatingRocks_3 - 21300008: FloatingRocks_4 - 21300010: FloatingRocks_5 - 21300012: FloatingRocks_6 - 21300014: FloatingRocks_7 - 21300016: FloatingRocks_8 - 21300018: FloatingRocks_9 - 21300020: FloatingRocks_10 - 21300022: FloatingRocks_11 - 21300024: FloatingRocks_12 - 21300026: FloatingRocks_13 - 21300028: FloatingRocks_14 - 21300030: FloatingRocks_15 - 21300032: FloatingRocks_16 - 21300034: FloatingRocks_17 - 21300036: FloatingRocks_18 - 21300038: FloatingRocks_19 - 21300040: FloatingRocks_21 + internalIDToNameTable: + - first: + 213: 21300000 + second: FloatingRocks_0 + - first: + 213: 21300002 + second: FloatingRocks_1 + - first: + 213: 21300004 + second: FloatingRocks_2 + - first: + 213: 21300006 + second: FloatingRocks_3 + - first: + 213: 21300008 + second: FloatingRocks_4 + - first: + 213: 21300010 + second: FloatingRocks_5 + - first: + 213: 21300012 + second: FloatingRocks_6 + - first: + 213: 21300014 + second: FloatingRocks_7 + - first: + 213: 21300016 + second: FloatingRocks_8 + - first: + 213: 21300018 + second: FloatingRocks_9 + - first: + 213: 21300020 + second: FloatingRocks_10 + - first: + 213: 21300022 + second: FloatingRocks_11 + - first: + 213: 21300024 + second: FloatingRocks_12 + - first: + 213: 21300026 + second: FloatingRocks_13 + - first: + 213: 21300028 + second: FloatingRocks_14 + - first: + 213: 21300030 + second: FloatingRocks_15 + - first: + 213: 21300032 + second: FloatingRocks_16 + - first: + 213: 21300034 + second: FloatingRocks_17 + - first: + 213: 21300036 + second: FloatingRocks_18 + - first: + 213: 21300038 + second: FloatingRocks_19 + - first: + 213: 21300040 + second: FloatingRocks_21 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -41,9 +83,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -52,12 +97,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 - wrapV: -1 - wrapW: -1 + wrapV: 0 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -75,11 +120,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -89,8 +140,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -100,8 +153,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -111,7 +166,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -144,6 +227,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -171,6 +255,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -197,6 +282,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -243,6 +329,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -285,6 +372,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -322,6 +410,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -352,6 +441,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c2305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -386,6 +476,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e2305410000000000800000000000000 + internalID: 21300014 vertices: [] indices: edges: [] @@ -424,6 +515,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 03305410000000000800000000000000 + internalID: 21300016 vertices: [] indices: edges: [] @@ -451,6 +543,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 23305410000000000800000000000000 + internalID: 21300018 vertices: [] indices: edges: [] @@ -481,6 +574,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 43305410000000000800000000000000 + internalID: 21300020 vertices: [] indices: edges: [] @@ -508,6 +602,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 63305410000000000800000000000000 + internalID: 21300022 vertices: [] indices: edges: [] @@ -537,6 +632,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 83305410000000000800000000000000 + internalID: 21300024 vertices: [] indices: edges: [] @@ -564,6 +660,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a3305410000000000800000000000000 + internalID: 21300026 vertices: [] indices: edges: [] @@ -593,6 +690,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c3305410000000000800000000000000 + internalID: 21300028 vertices: [] indices: edges: [] @@ -620,6 +718,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e3305410000000000800000000000000 + internalID: 21300030 vertices: [] indices: edges: [] @@ -649,6 +748,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 04305410000000000800000000000000 + internalID: 21300032 vertices: [] indices: edges: [] @@ -677,6 +777,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 24305410000000000800000000000000 + internalID: 21300034 vertices: [] indices: edges: [] @@ -709,6 +810,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 44305410000000000800000000000000 + internalID: 21300036 vertices: [] indices: edges: [] @@ -737,6 +839,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 64305410000000000800000000000000 + internalID: 21300038 vertices: [] indices: edges: [] @@ -765,6 +868,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a4305410000000000800000000000000 + internalID: 21300040 vertices: [] indices: edges: [] @@ -773,13 +877,36 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + FloatingRocks_0: 21300000 + FloatingRocks_1: 21300002 + FloatingRocks_10: 21300020 + FloatingRocks_11: 21300022 + FloatingRocks_12: 21300024 + FloatingRocks_13: 21300026 + FloatingRocks_14: 21300028 + FloatingRocks_15: 21300030 + FloatingRocks_16: 21300032 + FloatingRocks_17: 21300034 + FloatingRocks_18: 21300036 + FloatingRocks_19: 21300038 + FloatingRocks_2: 21300004 + FloatingRocks_21: 21300040 + FloatingRocks_3: 21300006 + FloatingRocks_4: 21300008 + FloatingRocks_5: 21300010 + FloatingRocks_6: 21300012 + FloatingRocks_7: 21300014 + FloatingRocks_8: 21300016 + FloatingRocks_9: 21300018 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Environment/HangingPlants1.png.meta b/Assets/Game Assets/Art/Sprites/Environment/HangingPlants1.png.meta index 0944b37362..73e3d9d543 100644 --- a/Assets/Game Assets/Art/Sprites/Environment/HangingPlants1.png.meta +++ b/Assets/Game Assets/Art/Sprites/Environment/HangingPlants1.png.meta @@ -1,17 +1,33 @@ fileFormatVersion: 2 guid: f66c4b63264e91e48bbdc9c0a5966da4 TextureImporter: - fileIDToRecycleName: - 21300000: HangingPlants1_0 - 21300002: HangingPlants1_1 - 21300004: HangingPlants1_2 - 21300006: HangingPlants1_4 - 21300008: HangingPlants1_6 - 21300010: HangingPlants1_7 - 21300012: HangingPlants1_8 - 21300014: HangingPlants1_9 + internalIDToNameTable: + - first: + 213: 21300000 + second: HangingPlants1_0 + - first: + 213: 21300002 + second: HangingPlants1_1 + - first: + 213: 21300004 + second: HangingPlants1_2 + - first: + 213: 21300006 + second: HangingPlants1_4 + - first: + 213: 21300008 + second: HangingPlants1_6 + - first: + 213: 21300010 + second: HangingPlants1_7 + - first: + 213: 21300012 + second: HangingPlants1_8 + - first: + 213: 21300014 + second: HangingPlants1_9 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -28,9 +44,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -39,12 +58,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -62,11 +81,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -76,8 +101,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -87,8 +114,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -98,7 +127,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -159,6 +216,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -360,6 +418,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -471,6 +530,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -625,6 +685,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -668,6 +729,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c2305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -730,6 +792,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -793,6 +856,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 03305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -838,6 +902,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 23305410000000000800000000000000 + internalID: 21300014 vertices: [] indices: edges: [] @@ -846,13 +911,23 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + HangingPlants1_0: 21300000 + HangingPlants1_1: 21300002 + HangingPlants1_2: 21300004 + HangingPlants1_4: 21300006 + HangingPlants1_6: 21300008 + HangingPlants1_7: 21300010 + HangingPlants1_8: 21300012 + HangingPlants1_9: 21300014 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Environment/HangingPlants2.png.meta b/Assets/Game Assets/Art/Sprites/Environment/HangingPlants2.png.meta index c7ca0f4162..97600f7a7a 100644 --- a/Assets/Game Assets/Art/Sprites/Environment/HangingPlants2.png.meta +++ b/Assets/Game Assets/Art/Sprites/Environment/HangingPlants2.png.meta @@ -1,16 +1,30 @@ fileFormatVersion: 2 guid: f88d8f6be5a5b2a4bb198ffa5fc1be8b TextureImporter: - fileIDToRecycleName: - 21300000: HangingPlants2_0 - 21300002: HangingPlants2_1 - 21300004: HangingPlants2_2 - 21300006: HangingPlants2_3 - 21300008: HangingPlants2_4 - 21300010: HangingPlants2_5 - 21300012: HangingPlants2_6 + internalIDToNameTable: + - first: + 213: 21300000 + second: HangingPlants2_0 + - first: + 213: 21300002 + second: HangingPlants2_1 + - first: + 213: 21300004 + second: HangingPlants2_2 + - first: + 213: 21300006 + second: HangingPlants2_3 + - first: + 213: 21300008 + second: HangingPlants2_4 + - first: + 213: 21300010 + second: HangingPlants2_5 + - first: + 213: 21300012 + second: HangingPlants2_6 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -27,9 +41,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -38,12 +55,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -61,11 +78,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -75,8 +98,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -86,8 +111,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -97,7 +124,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -143,6 +198,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -181,6 +237,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -218,6 +275,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -250,6 +308,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -282,6 +341,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -326,6 +386,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -386,6 +447,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c2305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -394,13 +456,22 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + HangingPlants2_0: 21300000 + HangingPlants2_1: 21300002 + HangingPlants2_2: 21300004 + HangingPlants2_3: 21300006 + HangingPlants2_4: 21300008 + HangingPlants2_5: 21300010 + HangingPlants2_6: 21300012 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Environment/LowerPlants1.png.meta b/Assets/Game Assets/Art/Sprites/Environment/LowerPlants1.png.meta index 59e1ae995b..2b900d6c3f 100644 --- a/Assets/Game Assets/Art/Sprites/Environment/LowerPlants1.png.meta +++ b/Assets/Game Assets/Art/Sprites/Environment/LowerPlants1.png.meta @@ -1,27 +1,63 @@ fileFormatVersion: 2 guid: 47b428b699457b74992fad3070540648 TextureImporter: - fileIDToRecycleName: - 21300000: LowerPlants1_0 - 21300002: LowerPlants1_2 - 21300004: LowerPlants1_3 - 21300006: LowerPlants1_6 - 21300008: LowerPlants1_7 - 21300010: LowerPlants1_9 - 21300012: LowerPlants1_10 - 21300014: LowerPlants1_11 - 21300016: LowerPlants1_12 - 21300018: LowerPlants1_16 - 21300020: LowerPlants1_17 - 21300022: LowerPlants1_18 - 21300024: LowerPlants1_20 - 21300026: LowerPlants1_21 - 21300028: LowerPlants1_22 - 21300030: LowerPlants1_24 - 21300032: LowerPlants1_26 - 21300034: LowerPlants1_29 + internalIDToNameTable: + - first: + 213: 21300000 + second: LowerPlants1_0 + - first: + 213: 21300002 + second: LowerPlants1_2 + - first: + 213: 21300004 + second: LowerPlants1_3 + - first: + 213: 21300006 + second: LowerPlants1_6 + - first: + 213: 21300008 + second: LowerPlants1_7 + - first: + 213: 21300010 + second: LowerPlants1_9 + - first: + 213: 21300012 + second: LowerPlants1_10 + - first: + 213: 21300014 + second: LowerPlants1_11 + - first: + 213: 21300016 + second: LowerPlants1_12 + - first: + 213: 21300018 + second: LowerPlants1_16 + - first: + 213: 21300020 + second: LowerPlants1_17 + - first: + 213: 21300022 + second: LowerPlants1_18 + - first: + 213: 21300024 + second: LowerPlants1_20 + - first: + 213: 21300026 + second: LowerPlants1_21 + - first: + 213: 21300028 + second: LowerPlants1_22 + - first: + 213: 21300030 + second: LowerPlants1_24 + - first: + 213: 21300032 + second: LowerPlants1_26 + - first: + 213: 21300034 + second: LowerPlants1_29 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -38,9 +74,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -49,12 +88,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -72,11 +111,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -86,8 +131,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -97,8 +144,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -108,7 +157,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -145,6 +222,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -176,6 +254,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -215,6 +294,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -248,6 +328,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -283,6 +364,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -312,6 +394,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -348,6 +431,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c2305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -375,6 +459,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e2305410000000000800000000000000 + internalID: 21300014 vertices: [] indices: edges: [] @@ -403,6 +488,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 03305410000000000800000000000000 + internalID: 21300016 vertices: [] indices: edges: [] @@ -429,6 +515,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 23305410000000000800000000000000 + internalID: 21300018 vertices: [] indices: edges: [] @@ -457,6 +544,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 43305410000000000800000000000000 + internalID: 21300020 vertices: [] indices: edges: [] @@ -493,6 +581,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 63305410000000000800000000000000 + internalID: 21300022 vertices: [] indices: edges: [] @@ -522,6 +611,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 83305410000000000800000000000000 + internalID: 21300024 vertices: [] indices: edges: [] @@ -557,6 +647,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a3305410000000000800000000000000 + internalID: 21300026 vertices: [] indices: edges: [] @@ -597,6 +688,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c3305410000000000800000000000000 + internalID: 21300028 vertices: [] indices: edges: [] @@ -623,6 +715,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e3305410000000000800000000000000 + internalID: 21300030 vertices: [] indices: edges: [] @@ -659,6 +752,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 04305410000000000800000000000000 + internalID: 21300032 vertices: [] indices: edges: [] @@ -688,6 +782,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 24305410000000000800000000000000 + internalID: 21300034 vertices: [] indices: edges: [] @@ -696,13 +791,33 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + LowerPlants1_0: 21300000 + LowerPlants1_10: 21300012 + LowerPlants1_11: 21300014 + LowerPlants1_12: 21300016 + LowerPlants1_16: 21300018 + LowerPlants1_17: 21300020 + LowerPlants1_18: 21300022 + LowerPlants1_2: 21300002 + LowerPlants1_20: 21300024 + LowerPlants1_21: 21300026 + LowerPlants1_22: 21300028 + LowerPlants1_24: 21300030 + LowerPlants1_26: 21300032 + LowerPlants1_29: 21300034 + LowerPlants1_3: 21300004 + LowerPlants1_6: 21300006 + LowerPlants1_7: 21300008 + LowerPlants1_9: 21300010 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Environment/LowerPlants2.png.meta b/Assets/Game Assets/Art/Sprites/Environment/LowerPlants2.png.meta index 5993782d92..f8a970a6c7 100644 --- a/Assets/Game Assets/Art/Sprites/Environment/LowerPlants2.png.meta +++ b/Assets/Game Assets/Art/Sprites/Environment/LowerPlants2.png.meta @@ -1,17 +1,33 @@ fileFormatVersion: 2 guid: 65064d37f969d7e479d033b652437758 TextureImporter: - fileIDToRecycleName: - 21300000: LowerPlants2_0 - 21300002: LowerPlants2_1 - 21300004: LowerPlants2_3 - 21300006: LowerPlants2_8 - 21300008: LowerPlants2_10 - 21300010: LowerPlants2_11 - 21300012: LowerPlants2_12 - 21300014: LowerPlants2_13 + internalIDToNameTable: + - first: + 213: 21300000 + second: LowerPlants2_0 + - first: + 213: 21300002 + second: LowerPlants2_1 + - first: + 213: 21300004 + second: LowerPlants2_3 + - first: + 213: 21300006 + second: LowerPlants2_8 + - first: + 213: 21300008 + second: LowerPlants2_10 + - first: + 213: 21300010 + second: LowerPlants2_11 + - first: + 213: 21300012 + second: LowerPlants2_12 + - first: + 213: 21300014 + second: LowerPlants2_13 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -28,9 +44,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -39,12 +58,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -62,11 +81,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -76,8 +101,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -87,8 +114,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -98,7 +127,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -283,6 +340,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -329,6 +387,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -376,6 +435,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -412,6 +472,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -449,6 +510,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -485,6 +547,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -521,6 +584,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c2305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -645,6 +709,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e2305410000000000800000000000000 + internalID: 21300014 vertices: [] indices: edges: [] @@ -653,13 +718,23 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + LowerPlants2_0: 21300000 + LowerPlants2_1: 21300002 + LowerPlants2_10: 21300008 + LowerPlants2_11: 21300010 + LowerPlants2_12: 21300012 + LowerPlants2_13: 21300014 + LowerPlants2_3: 21300004 + LowerPlants2_8: 21300006 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Environment/LowerPlants3.png.meta b/Assets/Game Assets/Art/Sprites/Environment/LowerPlants3.png.meta index 94517f7387..f2c256442b 100644 --- a/Assets/Game Assets/Art/Sprites/Environment/LowerPlants3.png.meta +++ b/Assets/Game Assets/Art/Sprites/Environment/LowerPlants3.png.meta @@ -1,22 +1,48 @@ fileFormatVersion: 2 guid: 2b30fc6e4ddac2545af6462ae063edad TextureImporter: - fileIDToRecycleName: - 21300000: LowerPlants3_0 - 21300002: LowerPlants3_3 - 21300004: LowerPlants3_5 - 21300006: LowerPlants3_9 - 21300008: LowerPlants3_10 - 21300010: LowerPlants3_14 - 21300012: LowerPlants3_15 - 21300014: LowerPlants3_17 - 21300016: LowerPlants3_19 - 21300018: LowerPlants3_20 - 21300020: LowerPlants3_21 - 21300022: LowerPlants3_24 - 21300024: LowerPlants3_25 + internalIDToNameTable: + - first: + 213: 21300000 + second: LowerPlants3_0 + - first: + 213: 21300002 + second: LowerPlants3_3 + - first: + 213: 21300004 + second: LowerPlants3_5 + - first: + 213: 21300006 + second: LowerPlants3_9 + - first: + 213: 21300008 + second: LowerPlants3_10 + - first: + 213: 21300010 + second: LowerPlants3_14 + - first: + 213: 21300012 + second: LowerPlants3_15 + - first: + 213: 21300014 + second: LowerPlants3_17 + - first: + 213: 21300016 + second: LowerPlants3_19 + - first: + 213: 21300018 + second: LowerPlants3_20 + - first: + 213: 21300020 + second: LowerPlants3_21 + - first: + 213: 21300022 + second: LowerPlants3_24 + - first: + 213: 21300024 + second: LowerPlants3_25 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -33,9 +59,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -44,12 +73,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -67,11 +96,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -81,8 +116,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -92,8 +129,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -103,7 +142,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -136,6 +203,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -162,6 +230,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -190,6 +259,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -220,6 +290,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -253,6 +324,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -289,6 +361,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -319,6 +392,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c2305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -358,6 +432,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e2305410000000000800000000000000 + internalID: 21300014 vertices: [] indices: edges: [] @@ -394,6 +469,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 03305410000000000800000000000000 + internalID: 21300016 vertices: [] indices: edges: [] @@ -423,6 +499,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 23305410000000000800000000000000 + internalID: 21300018 vertices: [] indices: edges: [] @@ -452,6 +529,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 43305410000000000800000000000000 + internalID: 21300020 vertices: [] indices: edges: [] @@ -478,6 +556,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 63305410000000000800000000000000 + internalID: 21300022 vertices: [] indices: edges: [] @@ -506,6 +585,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 83305410000000000800000000000000 + internalID: 21300024 vertices: [] indices: edges: [] @@ -514,13 +594,28 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + LowerPlants3_0: 21300000 + LowerPlants3_10: 21300008 + LowerPlants3_14: 21300010 + LowerPlants3_15: 21300012 + LowerPlants3_17: 21300014 + LowerPlants3_19: 21300016 + LowerPlants3_20: 21300018 + LowerPlants3_21: 21300020 + LowerPlants3_24: 21300022 + LowerPlants3_25: 21300024 + LowerPlants3_3: 21300002 + LowerPlants3_5: 21300004 + LowerPlants3_9: 21300006 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Environment/LowerPlants4.png.meta b/Assets/Game Assets/Art/Sprites/Environment/LowerPlants4.png.meta index cd449f3489..1417c4486f 100644 --- a/Assets/Game Assets/Art/Sprites/Environment/LowerPlants4.png.meta +++ b/Assets/Game Assets/Art/Sprites/Environment/LowerPlants4.png.meta @@ -1,17 +1,33 @@ fileFormatVersion: 2 guid: ca959e4b1f739134eb2418d8e56c04b6 TextureImporter: - fileIDToRecycleName: - 21300000: LowerPlants4_0 - 21300002: LowerPlants4_1 - 21300004: LowerPlants4_2 - 21300006: LowerPlants4_3 - 21300008: LowerPlants4_4 - 21300010: LowerPlants4_5 - 21300012: LowerPlants4_6 - 21300014: LowerPlants4_7 + internalIDToNameTable: + - first: + 213: 21300000 + second: LowerPlants4_0 + - first: + 213: 21300002 + second: LowerPlants4_1 + - first: + 213: 21300004 + second: LowerPlants4_2 + - first: + 213: 21300006 + second: LowerPlants4_3 + - first: + 213: 21300008 + second: LowerPlants4_4 + - first: + 213: 21300010 + second: LowerPlants4_5 + - first: + 213: 21300012 + second: LowerPlants4_6 + - first: + 213: 21300014 + second: LowerPlants4_7 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -28,9 +44,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -39,12 +58,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -62,11 +81,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -76,8 +101,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -87,8 +114,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -98,7 +127,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -126,6 +183,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -155,6 +213,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -181,6 +240,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -208,6 +268,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -240,6 +301,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -267,6 +329,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -295,6 +358,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c2305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -323,6 +387,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e2305410000000000800000000000000 + internalID: 21300014 vertices: [] indices: edges: [] @@ -331,13 +396,23 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + LowerPlants4_0: 21300000 + LowerPlants4_1: 21300002 + LowerPlants4_2: 21300004 + LowerPlants4_3: 21300006 + LowerPlants4_4: 21300008 + LowerPlants4_5: 21300010 + LowerPlants4_6: 21300012 + LowerPlants4_7: 21300014 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Environment/LowerPlants5.png.meta b/Assets/Game Assets/Art/Sprites/Environment/LowerPlants5.png.meta index ecb9613b5f..1301016c38 100644 --- a/Assets/Game Assets/Art/Sprites/Environment/LowerPlants5.png.meta +++ b/Assets/Game Assets/Art/Sprites/Environment/LowerPlants5.png.meta @@ -1,39 +1,99 @@ fileFormatVersion: 2 guid: 6abd01d1bd500b7468e35f5fc76023ea TextureImporter: - fileIDToRecycleName: - 21300000: LowerPlants5_2 - 21300002: LowerPlants5_5 - 21300004: LowerPlants5_7 - 21300006: LowerPlants5_9 - 21300008: LowerPlants5_10 - 21300010: LowerPlants5_11 - 21300012: LowerPlants5_21 - 21300014: LowerPlants5_23 - 21300016: LowerPlants5_24 - 21300018: LowerPlants5_26 - 21300020: LowerPlants5_28 - 21300022: LowerPlants5_29 - 21300024: LowerPlants5_31 - 21300026: LowerPlants5_34 - 21300028: LowerPlants5_37 - 21300030: LowerPlants5_38 - 21300032: LowerPlants5_39 - 21300034: LowerPlants5_40 - 21300036: LowerPlants5_45 - 21300038: LowerPlants5_47 - 21300040: LowerPlants5_49 - 21300042: LowerPlants5_50 - 21300044: LowerPlants5_51 - 21300046: LowerPlants5_53 - 21300048: LowerPlants5_55 - 21300050: LowerPlants5_56 - 21300052: LowerPlants5_62 - 21300054: LowerPlants5_63 - 21300056: LowerPlants5_64 - 21300058: LowerPlants5_65 + internalIDToNameTable: + - first: + 213: 21300000 + second: LowerPlants5_2 + - first: + 213: 21300002 + second: LowerPlants5_5 + - first: + 213: 21300004 + second: LowerPlants5_7 + - first: + 213: 21300006 + second: LowerPlants5_9 + - first: + 213: 21300008 + second: LowerPlants5_10 + - first: + 213: 21300010 + second: LowerPlants5_11 + - first: + 213: 21300012 + second: LowerPlants5_21 + - first: + 213: 21300014 + second: LowerPlants5_23 + - first: + 213: 21300016 + second: LowerPlants5_24 + - first: + 213: 21300018 + second: LowerPlants5_26 + - first: + 213: 21300020 + second: LowerPlants5_28 + - first: + 213: 21300022 + second: LowerPlants5_29 + - first: + 213: 21300024 + second: LowerPlants5_31 + - first: + 213: 21300026 + second: LowerPlants5_34 + - first: + 213: 21300028 + second: LowerPlants5_37 + - first: + 213: 21300030 + second: LowerPlants5_38 + - first: + 213: 21300032 + second: LowerPlants5_39 + - first: + 213: 21300034 + second: LowerPlants5_40 + - first: + 213: 21300036 + second: LowerPlants5_45 + - first: + 213: 21300038 + second: LowerPlants5_47 + - first: + 213: 21300040 + second: LowerPlants5_49 + - first: + 213: 21300042 + second: LowerPlants5_50 + - first: + 213: 21300044 + second: LowerPlants5_51 + - first: + 213: 21300046 + second: LowerPlants5_53 + - first: + 213: 21300048 + second: LowerPlants5_55 + - first: + 213: 21300050 + second: LowerPlants5_56 + - first: + 213: 21300052 + second: LowerPlants5_62 + - first: + 213: 21300054 + second: LowerPlants5_63 + - first: + 213: 21300056 + second: LowerPlants5_64 + - first: + 213: 21300058 + second: LowerPlants5_65 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -50,9 +110,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -61,12 +124,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -84,11 +147,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -98,8 +167,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -109,8 +180,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -120,7 +193,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -151,6 +252,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -184,6 +286,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -213,6 +316,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -240,6 +344,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -272,6 +377,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -305,6 +411,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -332,6 +439,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c2305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -363,6 +471,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e2305410000000000800000000000000 + internalID: 21300014 vertices: [] indices: edges: [] @@ -394,6 +503,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 03305410000000000800000000000000 + internalID: 21300016 vertices: [] indices: edges: [] @@ -421,6 +531,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 23305410000000000800000000000000 + internalID: 21300018 vertices: [] indices: edges: [] @@ -453,6 +564,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 43305410000000000800000000000000 + internalID: 21300020 vertices: [] indices: edges: [] @@ -483,6 +595,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 63305410000000000800000000000000 + internalID: 21300022 vertices: [] indices: edges: [] @@ -511,6 +624,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 83305410000000000800000000000000 + internalID: 21300024 vertices: [] indices: edges: [] @@ -539,6 +653,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a3305410000000000800000000000000 + internalID: 21300026 vertices: [] indices: edges: [] @@ -573,6 +688,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c3305410000000000800000000000000 + internalID: 21300028 vertices: [] indices: edges: [] @@ -603,6 +719,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e3305410000000000800000000000000 + internalID: 21300030 vertices: [] indices: edges: [] @@ -633,6 +750,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 04305410000000000800000000000000 + internalID: 21300032 vertices: [] indices: edges: [] @@ -660,6 +778,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 24305410000000000800000000000000 + internalID: 21300034 vertices: [] indices: edges: [] @@ -687,6 +806,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 44305410000000000800000000000000 + internalID: 21300036 vertices: [] indices: edges: [] @@ -715,6 +835,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 64305410000000000800000000000000 + internalID: 21300038 vertices: [] indices: edges: [] @@ -744,6 +865,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 84305410000000000800000000000000 + internalID: 21300040 vertices: [] indices: edges: [] @@ -772,6 +894,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a4305410000000000800000000000000 + internalID: 21300042 vertices: [] indices: edges: [] @@ -800,6 +923,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c4305410000000000800000000000000 + internalID: 21300044 vertices: [] indices: edges: [] @@ -831,6 +955,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e4305410000000000800000000000000 + internalID: 21300046 vertices: [] indices: edges: [] @@ -858,6 +983,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 05305410000000000800000000000000 + internalID: 21300048 vertices: [] indices: edges: [] @@ -886,6 +1012,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 25305410000000000800000000000000 + internalID: 21300050 vertices: [] indices: edges: [] @@ -918,6 +1045,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 45305410000000000800000000000000 + internalID: 21300052 vertices: [] indices: edges: [] @@ -943,6 +1071,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 65305410000000000800000000000000 + internalID: 21300054 vertices: [] indices: edges: [] @@ -968,6 +1097,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 85305410000000000800000000000000 + internalID: 21300056 vertices: [] indices: edges: [] @@ -1001,6 +1131,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a5305410000000000800000000000000 + internalID: 21300058 vertices: [] indices: edges: [] @@ -1009,13 +1140,45 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + LowerPlants5_10: 21300008 + LowerPlants5_11: 21300010 + LowerPlants5_2: 21300000 + LowerPlants5_21: 21300012 + LowerPlants5_23: 21300014 + LowerPlants5_24: 21300016 + LowerPlants5_26: 21300018 + LowerPlants5_28: 21300020 + LowerPlants5_29: 21300022 + LowerPlants5_31: 21300024 + LowerPlants5_34: 21300026 + LowerPlants5_37: 21300028 + LowerPlants5_38: 21300030 + LowerPlants5_39: 21300032 + LowerPlants5_40: 21300034 + LowerPlants5_45: 21300036 + LowerPlants5_47: 21300038 + LowerPlants5_49: 21300040 + LowerPlants5_5: 21300002 + LowerPlants5_50: 21300042 + LowerPlants5_51: 21300044 + LowerPlants5_53: 21300046 + LowerPlants5_55: 21300048 + LowerPlants5_56: 21300050 + LowerPlants5_62: 21300052 + LowerPlants5_63: 21300054 + LowerPlants5_64: 21300056 + LowerPlants5_65: 21300058 + LowerPlants5_7: 21300004 + LowerPlants5_9: 21300006 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Environment/LowerPlants6.png.meta b/Assets/Game Assets/Art/Sprites/Environment/LowerPlants6.png.meta index 2e2909c4ec..083ad9b579 100644 --- a/Assets/Game Assets/Art/Sprites/Environment/LowerPlants6.png.meta +++ b/Assets/Game Assets/Art/Sprites/Environment/LowerPlants6.png.meta @@ -1,15 +1,27 @@ fileFormatVersion: 2 guid: 14ad88aa05b531d40bb7667bf21651eb TextureImporter: - fileIDToRecycleName: - 21300000: LowerPlants6_0 - 21300002: LowerPlants6_1 - 21300004: LowerPlants6_2 - 21300006: LowerPlants6_3 - 21300008: LowerPlants6_4 - 21300010: LowerPlants6_5 + internalIDToNameTable: + - first: + 213: 21300000 + second: LowerPlants6_0 + - first: + 213: 21300002 + second: LowerPlants6_1 + - first: + 213: 21300004 + second: LowerPlants6_2 + - first: + 213: 21300006 + second: LowerPlants6_3 + - first: + 213: 21300008 + second: LowerPlants6_4 + - first: + 213: 21300010 + second: LowerPlants6_5 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -26,9 +38,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -37,12 +52,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -60,11 +75,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -74,8 +95,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -85,8 +108,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -96,7 +121,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -122,6 +175,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -151,6 +205,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -178,6 +233,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -204,6 +260,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -234,6 +291,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -260,6 +318,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -268,13 +327,21 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + LowerPlants6_0: 21300000 + LowerPlants6_1: 21300002 + LowerPlants6_2: 21300004 + LowerPlants6_3: 21300006 + LowerPlants6_4: 21300008 + LowerPlants6_5: 21300010 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Environment/PlantMidSized.png.meta b/Assets/Game Assets/Art/Sprites/Environment/PlantMidSized.png.meta index 0d2d181d74..85b1192c6d 100644 --- a/Assets/Game Assets/Art/Sprites/Environment/PlantMidSized.png.meta +++ b/Assets/Game Assets/Art/Sprites/Environment/PlantMidSized.png.meta @@ -1,12 +1,18 @@ fileFormatVersion: 2 guid: cad6f8f282a98b04b9027eadbdb78451 TextureImporter: - fileIDToRecycleName: - 21300000: PlantMidSized_0 - 21300002: PlantMidSized_1 - 21300004: PlantMidSized_2 + internalIDToNameTable: + - first: + 213: 21300000 + second: PlantMidSized_0 + - first: + 213: 21300002 + second: PlantMidSized_1 + - first: + 213: 21300004 + second: PlantMidSized_2 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,9 +29,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -34,9 +43,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -57,11 +66,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -71,8 +86,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -82,8 +99,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -93,7 +112,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -208,6 +255,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -316,6 +364,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -381,6 +430,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -389,13 +439,18 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + PlantMidSized_0: 21300000 + PlantMidSized_1: 21300002 + PlantMidSized_2: 21300004 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Environment/Plants.png.meta b/Assets/Game Assets/Art/Sprites/Environment/Plants.png.meta index 31a68e309b..909da6d1e5 100644 --- a/Assets/Game Assets/Art/Sprites/Environment/Plants.png.meta +++ b/Assets/Game Assets/Art/Sprites/Environment/Plants.png.meta @@ -1,27 +1,63 @@ fileFormatVersion: 2 guid: e134e0f4ed64a1848aece477e814af31 TextureImporter: - fileIDToRecycleName: - 21300000: Plants_0 - 21300002: Plants_1 - 21300004: Plants_2 - 21300006: Plants_3 - 21300008: Plants_6 - 21300010: Plants_4 - 21300012: Plants_8 - 21300014: Plants_11 - 21300016: Plants_12 - 21300018: Plants_15 - 21300020: Plants_18 - 21300022: Plants_19 - 21300024: Plants_22 - 21300026: Plants_23 - 21300028: Plants_26 - 21300030: Plants_24 - 21300032: Plants_16 - 21300034: Plants_17 + internalIDToNameTable: + - first: + 213: 21300000 + second: Plants_0 + - first: + 213: 21300002 + second: Plants_1 + - first: + 213: 21300004 + second: Plants_2 + - first: + 213: 21300006 + second: Plants_3 + - first: + 213: 21300008 + second: Plants_6 + - first: + 213: 21300010 + second: Plants_4 + - first: + 213: 21300012 + second: Plants_8 + - first: + 213: 21300014 + second: Plants_11 + - first: + 213: 21300016 + second: Plants_12 + - first: + 213: 21300018 + second: Plants_15 + - first: + 213: 21300020 + second: Plants_18 + - first: + 213: 21300022 + second: Plants_19 + - first: + 213: 21300024 + second: Plants_22 + - first: + 213: 21300026 + second: Plants_23 + - first: + 213: 21300028 + second: Plants_26 + - first: + 213: 21300030 + second: Plants_24 + - first: + 213: 21300032 + second: Plants_16 + - first: + 213: 21300034 + second: Plants_17 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -38,9 +74,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -50,11 +89,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 2 - aniso: -1 - mipBias: -100 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -72,11 +111,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 8192 resizeAlgorithm: 0 @@ -86,8 +131,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 8192 resizeAlgorithm: 0 @@ -97,8 +144,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 8192 resizeAlgorithm: 0 @@ -108,7 +157,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -155,6 +232,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -193,6 +271,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -255,6 +334,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -299,6 +379,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -330,6 +411,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -371,6 +453,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -566,6 +649,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e2305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -603,6 +687,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 43305410000000000800000000000000 + internalID: 21300014 vertices: [] indices: edges: [] @@ -644,6 +729,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 83305410000000000800000000000000 + internalID: 21300016 vertices: [] indices: edges: [] @@ -688,6 +774,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c3305410000000000800000000000000 + internalID: 21300018 vertices: [] indices: edges: [] @@ -738,6 +825,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 04305410000000000800000000000000 + internalID: 21300020 vertices: [] indices: edges: [] @@ -783,6 +871,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 24305410000000000800000000000000 + internalID: 21300022 vertices: [] indices: edges: [] @@ -818,6 +907,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 64305410000000000800000000000000 + internalID: 21300024 vertices: [] indices: edges: [] @@ -848,6 +938,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 84305410000000000800000000000000 + internalID: 21300026 vertices: [] indices: edges: [] @@ -909,6 +1000,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a4305410000000000800000000000000 + internalID: 21300028 vertices: [] indices: edges: [] @@ -967,6 +1059,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 25305410000000000800000000000000 + internalID: 21300030 vertices: [] indices: edges: [] @@ -1002,6 +1095,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 65305410000000000800000000000000 + internalID: 21300032 vertices: [] indices: edges: [] @@ -1038,6 +1132,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 85305410000000000800000000000000 + internalID: 21300034 vertices: [] indices: edges: [] @@ -1046,13 +1141,33 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + Plants_0: 21300000 + Plants_1: 21300002 + Plants_11: 21300014 + Plants_12: 21300016 + Plants_15: 21300018 + Plants_16: 21300032 + Plants_17: 21300034 + Plants_18: 21300020 + Plants_19: 21300022 + Plants_2: 21300004 + Plants_22: 21300024 + Plants_23: 21300026 + Plants_24: 21300030 + Plants_26: 21300028 + Plants_3: 21300006 + Plants_4: 21300010 + Plants_6: 21300008 + Plants_8: 21300012 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Environment/Platforms.png.meta b/Assets/Game Assets/Art/Sprites/Environment/Platforms.png.meta index 54e4810d9c..7e38b27fa6 100644 --- a/Assets/Game Assets/Art/Sprites/Environment/Platforms.png.meta +++ b/Assets/Game Assets/Art/Sprites/Environment/Platforms.png.meta @@ -1,14 +1,24 @@ fileFormatVersion: 2 guid: 06555221cbcfd224692fc060ab31f685 TextureImporter: - fileIDToRecycleName: - 21300000: Platforms_1 - 21300002: Platforms_2 - 21300004: Platforms_3 - 21300006: Platforms_4 - 21300008: Platforms_5 + internalIDToNameTable: + - first: + 213: 21300000 + second: Platforms_1 + - first: + 213: 21300002 + second: Platforms_2 + - first: + 213: 21300004 + second: Platforms_3 + - first: + 213: 21300006 + second: Platforms_4 + - first: + 213: 21300008 + second: Platforms_5 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -25,9 +35,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -36,12 +49,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 - wrapV: -1 - wrapW: -1 + wrapV: 0 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -59,11 +72,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -73,8 +92,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -84,8 +105,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -95,7 +118,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -124,6 +175,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -155,6 +207,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -181,6 +234,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -207,6 +261,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -236,6 +291,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -244,13 +300,20 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + Platforms_1: 21300000 + Platforms_2: 21300002 + Platforms_3: 21300004 + Platforms_4: 21300006 + Platforms_5: 21300008 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Environment/Rubble.png.meta b/Assets/Game Assets/Art/Sprites/Environment/Rubble.png.meta index 30fb2dc60a..b182dff3d3 100644 --- a/Assets/Game Assets/Art/Sprites/Environment/Rubble.png.meta +++ b/Assets/Game Assets/Art/Sprites/Environment/Rubble.png.meta @@ -1,15 +1,27 @@ fileFormatVersion: 2 guid: d76850a37a3b5144093c7940ae562b4b TextureImporter: - fileIDToRecycleName: - 21300000: Rubble_0 - 21300002: Rubble_1 - 21300004: Rubble_2 - 21300006: Rubble_3 - 21300008: Rubble_4 - 21300010: Rubble_5 + internalIDToNameTable: + - first: + 213: 21300000 + second: Rubble_0 + - first: + 213: 21300002 + second: Rubble_1 + - first: + 213: 21300004 + second: Rubble_2 + - first: + 213: 21300006 + second: Rubble_3 + - first: + 213: 21300008 + second: Rubble_4 + - first: + 213: 21300010 + second: Rubble_5 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -26,9 +38,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -37,12 +52,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -60,11 +75,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -74,8 +95,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -85,8 +108,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -96,7 +121,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -125,6 +178,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -160,6 +214,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -194,6 +249,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -222,6 +278,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -248,6 +305,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -276,6 +334,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -284,13 +343,21 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + Rubble_0: 21300000 + Rubble_1: 21300002 + Rubble_2: 21300004 + Rubble_3: 21300006 + Rubble_4: 21300008 + Rubble_5: 21300010 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Environment/Spiderwebs.png.meta b/Assets/Game Assets/Art/Sprites/Environment/Spiderwebs.png.meta index 4640663a5e..be65aad75a 100644 --- a/Assets/Game Assets/Art/Sprites/Environment/Spiderwebs.png.meta +++ b/Assets/Game Assets/Art/Sprites/Environment/Spiderwebs.png.meta @@ -1,16 +1,30 @@ fileFormatVersion: 2 guid: 8a054d1ecee1b154eab5cf67c3d481e6 TextureImporter: - fileIDToRecycleName: - 21300000: spiderwebs_0 - 21300002: spiderwebs_1 - 21300004: spiderwebs_2 - 21300006: spiderwebs_3 - 21300008: spiderwebs_4 - 21300010: spiderwebs_5 - 21300012: spiderwebs_6 + internalIDToNameTable: + - first: + 213: 21300000 + second: spiderwebs_0 + - first: + 213: 21300002 + second: spiderwebs_1 + - first: + 213: 21300004 + second: spiderwebs_2 + - first: + 213: 21300006 + second: spiderwebs_3 + - first: + 213: 21300008 + second: spiderwebs_4 + - first: + 213: 21300010 + second: spiderwebs_5 + - first: + 213: 21300012 + second: spiderwebs_6 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -27,9 +41,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -38,9 +55,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -61,11 +78,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -75,8 +98,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -86,8 +111,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -97,7 +124,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -572,6 +627,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -752,6 +808,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -1124,6 +1181,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -1576,6 +1634,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -1960,6 +2019,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -2506,6 +2566,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -3822,6 +3883,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c2305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -3830,13 +3892,22 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + spiderwebs_0: 21300000 + spiderwebs_1: 21300002 + spiderwebs_2: 21300004 + spiderwebs_3: 21300006 + spiderwebs_4: 21300008 + spiderwebs_5: 21300010 + spiderwebs_6: 21300012 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Environment/Stones.png.meta b/Assets/Game Assets/Art/Sprites/Environment/Stones.png.meta index 31c53bb5ad..731b96eee5 100644 --- a/Assets/Game Assets/Art/Sprites/Environment/Stones.png.meta +++ b/Assets/Game Assets/Art/Sprites/Environment/Stones.png.meta @@ -1,19 +1,39 @@ fileFormatVersion: 2 guid: 8c4b1cadd52d1b24cb3e5a64c6b3e683 TextureImporter: - fileIDToRecycleName: - 21300000: Stones_0 - 21300002: Stones_1 - 21300004: Stones_2 - 21300006: Stones_3 - 21300008: Stones_4 - 21300010: Stones_5 - 21300012: Stones_6 - 21300014: Stones_7 - 21300016: Stones_8 - 21300018: Stones_9 + internalIDToNameTable: + - first: + 213: 21300000 + second: Stones_0 + - first: + 213: 21300002 + second: Stones_1 + - first: + 213: 21300004 + second: Stones_2 + - first: + 213: 21300006 + second: Stones_3 + - first: + 213: 21300008 + second: Stones_4 + - first: + 213: 21300010 + second: Stones_5 + - first: + 213: 21300012 + second: Stones_6 + - first: + 213: 21300014 + second: Stones_7 + - first: + 213: 21300016 + second: Stones_8 + - first: + 213: 21300018 + second: Stones_9 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -30,9 +50,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -41,12 +64,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -64,11 +87,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -78,8 +107,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -89,8 +120,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -100,7 +133,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -130,6 +191,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -157,6 +219,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -188,6 +251,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -218,6 +282,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -246,6 +311,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -281,6 +347,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -315,6 +382,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c2305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -343,6 +411,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e2305410000000000800000000000000 + internalID: 21300014 vertices: [] indices: edges: [] @@ -371,6 +440,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 03305410000000000800000000000000 + internalID: 21300016 vertices: [] indices: edges: [] @@ -404,6 +474,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 23305410000000000800000000000000 + internalID: 21300018 vertices: [] indices: edges: [] @@ -412,13 +483,25 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + Stones_0: 21300000 + Stones_1: 21300002 + Stones_2: 21300004 + Stones_3: 21300006 + Stones_4: 21300008 + Stones_5: 21300010 + Stones_6: 21300012 + Stones_7: 21300014 + Stones_8: 21300016 + Stones_9: 21300018 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Environment/Tilesets/TilesetRock_WaterBlockers.png.meta b/Assets/Game Assets/Art/Sprites/Environment/Tilesets/TilesetRock_WaterBlockers.png.meta index 63c04e7de4..a419bbbb16 100644 --- a/Assets/Game Assets/Art/Sprites/Environment/Tilesets/TilesetRock_WaterBlockers.png.meta +++ b/Assets/Game Assets/Art/Sprites/Environment/Tilesets/TilesetRock_WaterBlockers.png.meta @@ -1,16 +1,30 @@ fileFormatVersion: 2 guid: 19ddc710aa1f2fd44bfe558f9bcf95f7 TextureImporter: - fileIDToRecycleName: - 21300000: TilesetRock_WaterBlockers_0 - 21300002: TilesetRock_WaterBlockers_1 - 21300004: TilesetRock_WaterBlockers_2 - 21300006: TilesetRock_WaterBlockers_3 - 21300008: TilesetRock_WaterBlockers_4 - 21300010: TilesetRock_WaterBlockers_5 - 21300012: TilesetRock_WaterBlockers_6 + internalIDToNameTable: + - first: + 213: 21300000 + second: TilesetRock_WaterBlockers_0 + - first: + 213: 21300002 + second: TilesetRock_WaterBlockers_1 + - first: + 213: 21300004 + second: TilesetRock_WaterBlockers_2 + - first: + 213: 21300006 + second: TilesetRock_WaterBlockers_3 + - first: + 213: 21300008 + second: TilesetRock_WaterBlockers_4 + - first: + 213: 21300010 + second: TilesetRock_WaterBlockers_5 + - first: + 213: 21300012 + second: TilesetRock_WaterBlockers_6 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -27,9 +41,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -38,12 +55,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 - wrapV: -1 - wrapW: -1 + wrapV: 0 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -61,11 +78,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -75,8 +98,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -86,8 +111,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -97,7 +124,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -117,6 +172,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -137,6 +193,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -157,6 +214,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -177,6 +235,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -197,6 +256,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -217,6 +277,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -237,6 +298,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c2305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -245,13 +307,22 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + TilesetRock_WaterBlockers_0: 21300000 + TilesetRock_WaterBlockers_1: 21300002 + TilesetRock_WaterBlockers_2: 21300004 + TilesetRock_WaterBlockers_3: 21300006 + TilesetRock_WaterBlockers_4: 21300008 + TilesetRock_WaterBlockers_5: 21300010 + TilesetRock_WaterBlockers_6: 21300012 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Environment/Tilesets/Tileset_Alien.png.meta b/Assets/Game Assets/Art/Sprites/Environment/Tilesets/Tileset_Alien.png.meta index 51e98096d0..ec1421dddb 100644 --- a/Assets/Game Assets/Art/Sprites/Environment/Tilesets/Tileset_Alien.png.meta +++ b/Assets/Game Assets/Art/Sprites/Environment/Tilesets/Tileset_Alien.png.meta @@ -1,75 +1,207 @@ fileFormatVersion: 2 guid: 05f0bf62dcfb65a4ebd0402151fc3c11 TextureImporter: - fileIDToRecycleName: - 21300000: Tileset_Alien_FloorCornerOuterLeft - 21300002: Tileset_Alien_Floor0 - 21300004: Tileset_Alien_Floor1 - 21300006: Tileset_Alien_Floor2 - 21300008: Tileset_Alien_Floor3 - 21300010: Tileset_Alien_Floor4 - 21300012: Tileset_Alien_Floor5 - 21300014: Tileset_Alien_Floor6 - 21300016: Tileset_Alien_FloorCornerOuterRight - 21300018: Tileset_Alien_WallLeft0 - 21300020: Tileset_Alien_Fill0 - 21300022: Tileset_Alien_Fill1 - 21300024: Tileset_Alien_Fill2 - 21300026: Tileset_Alien_Fill3 - 21300028: Tileset_Alien_Fill4 - 21300030: Tileset_Alien_Fill5 - 21300032: Tileset_Alien_Fill6 - 21300034: Tileset_Alien_WallRight0 - 21300036: Tileset_Alien_WallLeft1 - 21300038: Tileset_Alien_Ceiling0 - 21300040: Tileset_Alien_Ceiling1 - 21300042: Tileset_Alien_WallRight1 - 21300044: Tileset_Alien_WallLeft2 - 21300046: Tileset_Alien_CeilingCornerOuterLeft - 21300048: Tileset_Alien_Ceiling2 - 21300050: Tileset_Alien_Ceiling3 - 21300052: Tileset_Alien_Ceiling4 - 21300054: Tileset_Alien_Ceiling5 - 21300056: Tileset_Alien_Ceiling6 - 21300058: Tileset_Alien_CeilingCornerOuterRight - 21300060: Tileset_Alien_WallRight2 - 21300062: Tileset_Alien_WallLeft3 - 21300064: Tileset_Alien_FloorSingleBlock - 21300066: Tileset_Alien_FloorCornerInnerLeft0 - 21300068: Tileset_Alien_WallRight3 - 21300070: Tileset_Alien_WallLeft4 - 21300072: Tileset_Alien_SingleBlock - 21300074: Tileset_Alien_FloorCornerInnerRight0 - 21300076: Tileset_Alien_WallRight4 - 21300078: Tileset_Alien_WallLeft5 - 21300080: Tileset_Alien_LeftWallCorner - 21300082: Tileset_Alien_FloorSingleBlock0 - 21300084: Tileset_Alien_FloorSingleBlock1 - 21300086: Tileset_Alien_RightWallCorner - 21300088: Tileset_Alien_WallRight5 - 21300090: Tileset_Alien_WallLeft6 - 21300092: Tileset_Alien_FloorSingleBlockLeft - 21300094: Tileset_Alien_FloorSingleBlock2 - 21300096: Tileset_Alien_FloorSingleBlock3 - 21300098: Tileset_Alien_FloorSingleBlockRight - 21300100: Tileset_Alien_WallRight6 - 21300102: Tileset_Alien_80 - 21300104: Tileset_Alien_89 - 21300106: Tileset_Alien_SingleColumnwall0 - 21300108: Tileset_Alien_SingleColumnwall1 - 21300110: Tileset_Alien_SingleColumnwall2 - 21300112: Tileset_Alien_SingleColumnwall3 - 21300114: Tileset_Alien_SingleBlockCornerLeft - 21300116: Tileset_Alien_SingleBlockCornerRight - 21300118: Tileset_Alien_CeilingCornerFloorRight - 21300120: Tileset_Alien_CeilingCornerFloorLeft - 21300122: Tileset_Alien_SingleColumnCentreCeiling - 21300124: Tileset_Alien_SingleColumnCentreCorners - 21300126: Tileset_Alien_SingleColumnBottom - 21300128: Tileset_Alien_WallLeftCornerFloor - 21300130: Tileset_Alien_WallRightCornerFloor + internalIDToNameTable: + - first: + 213: 21300000 + second: Tileset_Alien_FloorCornerOuterLeft + - first: + 213: 21300002 + second: Tileset_Alien_Floor0 + - first: + 213: 21300004 + second: Tileset_Alien_Floor1 + - first: + 213: 21300006 + second: Tileset_Alien_Floor2 + - first: + 213: 21300008 + second: Tileset_Alien_Floor3 + - first: + 213: 21300010 + second: Tileset_Alien_Floor4 + - first: + 213: 21300012 + second: Tileset_Alien_Floor5 + - first: + 213: 21300014 + second: Tileset_Alien_Floor6 + - first: + 213: 21300016 + second: Tileset_Alien_FloorCornerOuterRight + - first: + 213: 21300018 + second: Tileset_Alien_WallLeft0 + - first: + 213: 21300020 + second: Tileset_Alien_Fill0 + - first: + 213: 21300022 + second: Tileset_Alien_Fill1 + - first: + 213: 21300024 + second: Tileset_Alien_Fill2 + - first: + 213: 21300026 + second: Tileset_Alien_Fill3 + - first: + 213: 21300028 + second: Tileset_Alien_Fill4 + - first: + 213: 21300030 + second: Tileset_Alien_Fill5 + - first: + 213: 21300032 + second: Tileset_Alien_Fill6 + - first: + 213: 21300034 + second: Tileset_Alien_WallRight0 + - first: + 213: 21300036 + second: Tileset_Alien_WallLeft1 + - first: + 213: 21300038 + second: Tileset_Alien_Ceiling0 + - first: + 213: 21300040 + second: Tileset_Alien_Ceiling1 + - first: + 213: 21300042 + second: Tileset_Alien_WallRight1 + - first: + 213: 21300044 + second: Tileset_Alien_WallLeft2 + - first: + 213: 21300046 + second: Tileset_Alien_CeilingCornerOuterLeft + - first: + 213: 21300048 + second: Tileset_Alien_Ceiling2 + - first: + 213: 21300050 + second: Tileset_Alien_Ceiling3 + - first: + 213: 21300052 + second: Tileset_Alien_Ceiling4 + - first: + 213: 21300054 + second: Tileset_Alien_Ceiling5 + - first: + 213: 21300056 + second: Tileset_Alien_Ceiling6 + - first: + 213: 21300058 + second: Tileset_Alien_CeilingCornerOuterRight + - first: + 213: 21300060 + second: Tileset_Alien_WallRight2 + - first: + 213: 21300062 + second: Tileset_Alien_WallLeft3 + - first: + 213: 21300064 + second: Tileset_Alien_FloorSingleBlock + - first: + 213: 21300066 + second: Tileset_Alien_FloorCornerInnerLeft0 + - first: + 213: 21300068 + second: Tileset_Alien_WallRight3 + - first: + 213: 21300070 + second: Tileset_Alien_WallLeft4 + - first: + 213: 21300072 + second: Tileset_Alien_SingleBlock + - first: + 213: 21300074 + second: Tileset_Alien_FloorCornerInnerRight0 + - first: + 213: 21300076 + second: Tileset_Alien_WallRight4 + - first: + 213: 21300078 + second: Tileset_Alien_WallLeft5 + - first: + 213: 21300080 + second: Tileset_Alien_LeftWallCorner + - first: + 213: 21300082 + second: Tileset_Alien_FloorSingleBlock0 + - first: + 213: 21300084 + second: Tileset_Alien_FloorSingleBlock1 + - first: + 213: 21300086 + second: Tileset_Alien_RightWallCorner + - first: + 213: 21300088 + second: Tileset_Alien_WallRight5 + - first: + 213: 21300090 + second: Tileset_Alien_WallLeft6 + - first: + 213: 21300092 + second: Tileset_Alien_FloorSingleBlockLeft + - first: + 213: 21300094 + second: Tileset_Alien_FloorSingleBlock2 + - first: + 213: 21300096 + second: Tileset_Alien_FloorSingleBlock3 + - first: + 213: 21300098 + second: Tileset_Alien_FloorSingleBlockRight + - first: + 213: 21300100 + second: Tileset_Alien_WallRight6 + - first: + 213: 21300102 + second: Tileset_Alien_80 + - first: + 213: 21300104 + second: Tileset_Alien_89 + - first: + 213: 21300106 + second: Tileset_Alien_SingleColumnwall0 + - first: + 213: 21300108 + second: Tileset_Alien_SingleColumnwall1 + - first: + 213: 21300110 + second: Tileset_Alien_SingleColumnwall2 + - first: + 213: 21300112 + second: Tileset_Alien_SingleColumnwall3 + - first: + 213: 21300114 + second: Tileset_Alien_SingleBlockCornerLeft + - first: + 213: 21300116 + second: Tileset_Alien_SingleBlockCornerRight + - first: + 213: 21300118 + second: Tileset_Alien_CeilingCornerFloorRight + - first: + 213: 21300120 + second: Tileset_Alien_CeilingCornerFloorLeft + - first: + 213: 21300122 + second: Tileset_Alien_SingleColumnCentreCeiling + - first: + 213: 21300124 + second: Tileset_Alien_SingleColumnCentreCorners + - first: + 213: 21300126 + second: Tileset_Alien_SingleColumnBottom + - first: + 213: 21300128 + second: Tileset_Alien_WallLeftCornerFloor + - first: + 213: 21300130 + second: Tileset_Alien_WallRightCornerFloor externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -86,9 +218,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -98,8 +233,8 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 0 - aniso: -1 - mipBias: -100 + aniso: 1 + mipBias: 0 wrapU: 0 wrapV: 0 wrapW: 0 @@ -120,11 +255,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 8192 resizeAlgorithm: 0 @@ -134,8 +275,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 8192 resizeAlgorithm: 0 @@ -145,8 +288,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 8192 resizeAlgorithm: 0 @@ -156,7 +301,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -180,6 +353,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -204,6 +378,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -228,6 +403,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -252,6 +428,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -276,6 +453,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -300,6 +478,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -324,6 +503,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c2305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -348,6 +528,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e2305410000000000800000000000000 + internalID: 21300014 vertices: [] indices: edges: [] @@ -372,6 +553,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 03305410000000000800000000000000 + internalID: 21300016 vertices: [] indices: edges: [] @@ -398,6 +580,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 23305410000000000800000000000000 + internalID: 21300018 vertices: [] indices: edges: [] @@ -422,6 +605,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 43305410000000000800000000000000 + internalID: 21300020 vertices: [] indices: edges: [] @@ -446,6 +630,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 63305410000000000800000000000000 + internalID: 21300022 vertices: [] indices: edges: [] @@ -470,6 +655,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 83305410000000000800000000000000 + internalID: 21300024 vertices: [] indices: edges: [] @@ -494,6 +680,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a3305410000000000800000000000000 + internalID: 21300026 vertices: [] indices: edges: [] @@ -518,6 +705,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c3305410000000000800000000000000 + internalID: 21300028 vertices: [] indices: edges: [] @@ -542,6 +730,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e3305410000000000800000000000000 + internalID: 21300030 vertices: [] indices: edges: [] @@ -566,6 +755,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 04305410000000000800000000000000 + internalID: 21300032 vertices: [] indices: edges: [] @@ -590,6 +780,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 24305410000000000800000000000000 + internalID: 21300034 vertices: [] indices: edges: [] @@ -615,6 +806,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 44305410000000000800000000000000 + internalID: 21300036 vertices: [] indices: edges: [] @@ -640,6 +832,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 05305410000000000800000000000000 + internalID: 21300038 vertices: [] indices: edges: [] @@ -665,6 +858,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 25305410000000000800000000000000 + internalID: 21300040 vertices: [] indices: edges: [] @@ -689,6 +883,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 45305410000000000800000000000000 + internalID: 21300042 vertices: [] indices: edges: [] @@ -713,6 +908,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 65305410000000000800000000000000 + internalID: 21300044 vertices: [] indices: edges: [] @@ -740,6 +936,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 85305410000000000800000000000000 + internalID: 21300046 vertices: [] indices: edges: [] @@ -765,6 +962,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a5305410000000000800000000000000 + internalID: 21300048 vertices: [] indices: edges: [] @@ -791,6 +989,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c5305410000000000800000000000000 + internalID: 21300050 vertices: [] indices: edges: [] @@ -816,6 +1015,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e5305410000000000800000000000000 + internalID: 21300052 vertices: [] indices: edges: [] @@ -842,6 +1042,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 06305410000000000800000000000000 + internalID: 21300054 vertices: [] indices: edges: [] @@ -867,6 +1068,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 26305410000000000800000000000000 + internalID: 21300056 vertices: [] indices: edges: [] @@ -894,6 +1096,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 46305410000000000800000000000000 + internalID: 21300058 vertices: [] indices: edges: [] @@ -922,6 +1125,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 66305410000000000800000000000000 + internalID: 21300060 vertices: [] indices: edges: [] @@ -947,6 +1151,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 86305410000000000800000000000000 + internalID: 21300062 vertices: [] indices: edges: [] @@ -971,6 +1176,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a6305410000000000800000000000000 + internalID: 21300064 vertices: [] indices: edges: [] @@ -995,6 +1201,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c6305410000000000800000000000000 + internalID: 21300066 vertices: [] indices: edges: [] @@ -1019,6 +1226,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 47305410000000000800000000000000 + internalID: 21300068 vertices: [] indices: edges: [] @@ -1048,6 +1256,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 67305410000000000800000000000000 + internalID: 21300070 vertices: [] indices: edges: [] @@ -1074,6 +1283,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 87305410000000000800000000000000 + internalID: 21300072 vertices: [] indices: edges: [] @@ -1098,6 +1308,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a7305410000000000800000000000000 + internalID: 21300074 vertices: [] indices: edges: [] @@ -1122,6 +1333,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 28305410000000000800000000000000 + internalID: 21300076 vertices: [] indices: edges: [] @@ -1147,6 +1359,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 48305410000000000800000000000000 + internalID: 21300078 vertices: [] indices: edges: [] @@ -1172,6 +1385,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 68305410000000000800000000000000 + internalID: 21300080 vertices: [] indices: edges: [] @@ -1196,6 +1410,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 88305410000000000800000000000000 + internalID: 21300082 vertices: [] indices: edges: [] @@ -1220,6 +1435,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a8305410000000000800000000000000 + internalID: 21300084 vertices: [] indices: edges: [] @@ -1246,6 +1462,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c8305410000000000800000000000000 + internalID: 21300086 vertices: [] indices: edges: [] @@ -1270,6 +1487,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 49305410000000000800000000000000 + internalID: 21300088 vertices: [] indices: edges: [] @@ -1295,6 +1513,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 69305410000000000800000000000000 + internalID: 21300090 vertices: [] indices: edges: [] @@ -1319,6 +1538,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 89305410000000000800000000000000 + internalID: 21300092 vertices: [] indices: edges: [] @@ -1343,6 +1563,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a9305410000000000800000000000000 + internalID: 21300094 vertices: [] indices: edges: [] @@ -1367,6 +1588,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c9305410000000000800000000000000 + internalID: 21300096 vertices: [] indices: edges: [] @@ -1391,6 +1613,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e9305410000000000800000000000000 + internalID: 21300098 vertices: [] indices: edges: [] @@ -1415,6 +1638,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 0a305410000000000800000000000000 + internalID: 21300100 vertices: [] indices: edges: [] @@ -1440,6 +1664,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 2a305410000000000800000000000000 + internalID: 21300102 vertices: [] indices: edges: [] @@ -1465,6 +1690,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 0b305410000000000800000000000000 + internalID: 21300104 vertices: [] indices: edges: [] @@ -1485,6 +1711,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: eb305410000000000800000000000000 + internalID: 21300106 vertices: [] indices: edges: [] @@ -1505,6 +1732,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 0c305410000000000800000000000000 + internalID: 21300108 vertices: [] indices: edges: [] @@ -1525,6 +1753,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 2c305410000000000800000000000000 + internalID: 21300110 vertices: [] indices: edges: [] @@ -1545,6 +1774,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 4c305410000000000800000000000000 + internalID: 21300112 vertices: [] indices: edges: [] @@ -1565,6 +1795,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 6c305410000000000800000000000000 + internalID: 21300114 vertices: [] indices: edges: [] @@ -1585,6 +1816,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 8c305410000000000800000000000000 + internalID: 21300116 vertices: [] indices: edges: [] @@ -1605,6 +1837,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: ac305410000000000800000000000000 + internalID: 21300118 vertices: [] indices: edges: [] @@ -1625,6 +1858,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: cc305410000000000800000000000000 + internalID: 21300120 vertices: [] indices: edges: [] @@ -1645,6 +1879,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: ec305410000000000800000000000000 + internalID: 21300122 vertices: [] indices: edges: [] @@ -1665,6 +1900,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 0d305410000000000800000000000000 + internalID: 21300124 vertices: [] indices: edges: [] @@ -1685,6 +1921,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 2d305410000000000800000000000000 + internalID: 21300126 vertices: [] indices: edges: [] @@ -1705,6 +1942,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 4d305410000000000800000000000000 + internalID: 21300128 vertices: [] indices: edges: [] @@ -1725,6 +1963,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 6d305410000000000800000000000000 + internalID: 21300130 vertices: [] indices: edges: [] @@ -1733,13 +1972,81 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + Tileset_Alien_80: 21300102 + Tileset_Alien_89: 21300104 + Tileset_Alien_Ceiling0: 21300038 + Tileset_Alien_Ceiling1: 21300040 + Tileset_Alien_Ceiling2: 21300048 + Tileset_Alien_Ceiling3: 21300050 + Tileset_Alien_Ceiling4: 21300052 + Tileset_Alien_Ceiling5: 21300054 + Tileset_Alien_Ceiling6: 21300056 + Tileset_Alien_CeilingCornerFloorLeft: 21300120 + Tileset_Alien_CeilingCornerFloorRight: 21300118 + Tileset_Alien_CeilingCornerOuterLeft: 21300046 + Tileset_Alien_CeilingCornerOuterRight: 21300058 + Tileset_Alien_Fill0: 21300020 + Tileset_Alien_Fill1: 21300022 + Tileset_Alien_Fill2: 21300024 + Tileset_Alien_Fill3: 21300026 + Tileset_Alien_Fill4: 21300028 + Tileset_Alien_Fill5: 21300030 + Tileset_Alien_Fill6: 21300032 + Tileset_Alien_Floor0: 21300002 + Tileset_Alien_Floor1: 21300004 + Tileset_Alien_Floor2: 21300006 + Tileset_Alien_Floor3: 21300008 + Tileset_Alien_Floor4: 21300010 + Tileset_Alien_Floor5: 21300012 + Tileset_Alien_Floor6: 21300014 + Tileset_Alien_FloorCornerInnerLeft0: 21300066 + Tileset_Alien_FloorCornerInnerRight0: 21300074 + Tileset_Alien_FloorCornerOuterLeft: 21300000 + Tileset_Alien_FloorCornerOuterRight: 21300016 + Tileset_Alien_FloorSingleBlock: 21300064 + Tileset_Alien_FloorSingleBlock0: 21300082 + Tileset_Alien_FloorSingleBlock1: 21300084 + Tileset_Alien_FloorSingleBlock2: 21300094 + Tileset_Alien_FloorSingleBlock3: 21300096 + Tileset_Alien_FloorSingleBlockLeft: 21300092 + Tileset_Alien_FloorSingleBlockRight: 21300098 + Tileset_Alien_LeftWallCorner: 21300080 + Tileset_Alien_RightWallCorner: 21300086 + Tileset_Alien_SingleBlock: 21300072 + Tileset_Alien_SingleBlockCornerLeft: 21300114 + Tileset_Alien_SingleBlockCornerRight: 21300116 + Tileset_Alien_SingleColumnBottom: 21300126 + Tileset_Alien_SingleColumnCentreCeiling: 21300122 + Tileset_Alien_SingleColumnCentreCorners: 21300124 + Tileset_Alien_SingleColumnwall0: 21300106 + Tileset_Alien_SingleColumnwall1: 21300108 + Tileset_Alien_SingleColumnwall2: 21300110 + Tileset_Alien_SingleColumnwall3: 21300112 + Tileset_Alien_WallLeft0: 21300018 + Tileset_Alien_WallLeft1: 21300036 + Tileset_Alien_WallLeft2: 21300044 + Tileset_Alien_WallLeft3: 21300062 + Tileset_Alien_WallLeft4: 21300070 + Tileset_Alien_WallLeft5: 21300078 + Tileset_Alien_WallLeft6: 21300090 + Tileset_Alien_WallLeftCornerFloor: 21300128 + Tileset_Alien_WallRight0: 21300034 + Tileset_Alien_WallRight1: 21300042 + Tileset_Alien_WallRight2: 21300060 + Tileset_Alien_WallRight3: 21300068 + Tileset_Alien_WallRight4: 21300076 + Tileset_Alien_WallRight5: 21300088 + Tileset_Alien_WallRight6: 21300100 + Tileset_Alien_WallRightCornerFloor: 21300130 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Environment/Tilesets/Tileset_Rock.png.meta b/Assets/Game Assets/Art/Sprites/Environment/Tilesets/Tileset_Rock.png.meta index 723c2521c5..6281f9cdbb 100644 --- a/Assets/Game Assets/Art/Sprites/Environment/Tilesets/Tileset_Rock.png.meta +++ b/Assets/Game Assets/Art/Sprites/Environment/Tilesets/Tileset_Rock.png.meta @@ -1,102 +1,288 @@ fileFormatVersion: 2 guid: 6e1db66fc7e57884380659e0a55351f0 TextureImporter: - fileIDToRecycleName: - 21300000: Tileset_Rock_FloorCornerOuterLeft - 21300002: Tileset_Rock_Floor0 - 21300004: Tileset_Rock_Floor1 - 21300006: Tileset_Rock_Floor2 - 21300008: Tileset_Rock_Floor3 - 21300010: Tileset_Rock_Floor4 - 21300012: Tileset_Rock_Floor5 - 21300014: Tileset_Rock_Floor6 - 21300016: Tileset_Rock_FloorCornerOuterRight - 21300018: Tileset_Rock_WallLeft0 - 21300020: Tileset_Rock_Fill0 - 21300022: Tileset_Rock_Fill1 - 21300024: Tileset_Rock_Fill2 - 21300026: Tileset_Rock_Fill3 - 21300028: Tileset_Rock_Fill4 - 21300030: Tileset_Rock_Fill5 - 21300032: Tileset_Rock_Fill6 - 21300034: Tileset_Rock_WallRight0 - 21300036: Tileset_Rock_WallLeft1 - 21300038: Tileset_Rock_Fill7 - 21300040: Tileset_Rock_Fill8 - 21300042: Tileset_Rock_Fill9 - 21300044: Tileset_Rock_Fill10 - 21300046: Tileset_Rock_Fill11 - 21300048: Tileset_Rock_Ceiling0 - 21300050: Tileset_Rock_Ceiling1 - 21300052: Tileset_Rock_WallRight1 - 21300054: Tileset_Rock_WallLeft2 - 21300056: Tileset_Rock_CeilingCornerOuterLeft - 21300058: Tileset_Rock_Ceiling2 - 21300060: Tileset_Rock_Ceiling3 - 21300062: Tileset_Rock_Ceiling4 - 21300064: Tileset_Rock_Ceiling5 - 21300066: Tileset_Rock_Ceiling6 - 21300068: Tileset_Rock_CeilingCornerOuterRight - 21300070: Tileset_Rock_WallRight2 - 21300072: Tileset_Rock_WallLeft3 - 21300074: Tileset_Rock_FloorSingleBlock - 21300076: Tileset_Rock_FloorCornerInnerRight0 - 21300078: Tileset_Rock_FloorCornerInnerRight1 - 21300080: Tileset_Rock_FloorCornerInnerRight2 - 21300082: Tileset_Rock_FloorCornerInnerRight3 - 21300084: Tileset_Rock_WallRight3 - 21300086: Tileset_Rock_WallLeft4 - 21300088: Tileset_Rock_SingleBlock - 21300090: Tileset_Rock_FloorCornerInnerLeft0 - 21300092: Tileset_Rock_FloorCornerInnerLeft1 - 21300094: Tileset_Rock_FloorCornerInnerLeft2 - 21300096: Tileset_Rock_FloorCornerInnerLeft3 - 21300098: Tileset_Rock_WallRight4 - 21300100: Tileset_Rock_WallLeft5 - 21300102: Tileset_Rock_FloorCornerSingleBlockLeft - 21300104: Tileset_Rock_FloorSingleBlock0 - 21300106: Tileset_Rock_FloorSingleBlock1 - 21300108: Tileset_Rock_FloorSingleBlock2 - 21300110: Tileset_Rock_FloorSingleBlock3 - 21300112: Tileset_Rock_FloorSingleBlock4 - 21300114: Tileset_Rock_FloorCornerSingleBlockRight - 21300116: Tileset_Rock_WallRight5 - 21300118: Tileset_Rock_WallLeft6 - 21300120: Tileset_Rock_FloorSingleBlockLeft - 21300122: Tileset_Rock_FloorSingleBlock5 - 21300124: Tileset_Rock_FloorSingleBlock6 - 21300126: Tileset_Rock_FloorSingleBlockRight - 21300128: Tileset_Rock_WallRight6 - 21300130: Tileset_Rock_WallLeftCeilingCorner0 - 21300132: Tileset_Rock_WallLeftCeilingCorner1 - 21300134: Tileset_Rock_WallLeftCeilingCorner2 - 21300136: Tileset_Rock_WallLeftCeilingCorner3 - 21300138: Tileset_Rock_WallLeftCeilingCorner4 - 21300140: Tileset_Rock_WallLeftCeilingCorner5 - 21300142: Tileset_Rock_WallLeftCeilingCorner6 - 21300144: Tileset_Rock_WallRightCeilingCorner0 - 21300146: Tileset_Rock_WallRightCeilingCorner1 - 21300148: Tileset_Rock_WallRightCeilingCorner2 - 21300150: Tileset_Rock_WallRightCeilingCorner3 - 21300152: Tileset_Rock_WallRightCeilingCorner4 - 21300154: Tileset_Rock_WallRightCeilingCorner5 - 21300156: Tileset_Rock_WallRightCeilingCorner6 - 21300158: Tileset_Rock_SingleColumn0 - 21300160: Tileset_Rock_SingleColumn1 - 21300162: Tileset_Rock_SingleColumn2 - 21300164: Tileset_Rock_SingleColumnBottom - 21300166: Tileset_Rock_SingleBlockCorner_Left - 21300168: Tileset_Rock_SingleBlockCorner_Right - 21300170: Tileset_Rock_WallLeftCornerGrass - 21300172: Tileset_Rock_WallCornerRightGrass - 21300174: Tileset_Rock_SingleColumnCentreCorners - 21300176: Tileset_Rock_CeilingCornerGrassRight - 21300178: Tileset_Rock_CeilingCornerGrassLeft - 21300180: Tileset_Rock_SingleColumnCentreCeiling - 21300182: Tileset_Rock_CeilingCornerGrassSingleLeft - 21300184: Tileset_Rock_CeilingCornerGrassSingleRight + internalIDToNameTable: + - first: + 213: 21300000 + second: Tileset_Rock_FloorCornerOuterLeft + - first: + 213: 21300002 + second: Tileset_Rock_Floor0 + - first: + 213: 21300004 + second: Tileset_Rock_Floor1 + - first: + 213: 21300006 + second: Tileset_Rock_Floor2 + - first: + 213: 21300008 + second: Tileset_Rock_Floor3 + - first: + 213: 21300010 + second: Tileset_Rock_Floor4 + - first: + 213: 21300012 + second: Tileset_Rock_Floor5 + - first: + 213: 21300014 + second: Tileset_Rock_Floor6 + - first: + 213: 21300016 + second: Tileset_Rock_FloorCornerOuterRight + - first: + 213: 21300018 + second: Tileset_Rock_WallLeft0 + - first: + 213: 21300020 + second: Tileset_Rock_Fill0 + - first: + 213: 21300022 + second: Tileset_Rock_Fill1 + - first: + 213: 21300024 + second: Tileset_Rock_Fill2 + - first: + 213: 21300026 + second: Tileset_Rock_Fill3 + - first: + 213: 21300028 + second: Tileset_Rock_Fill4 + - first: + 213: 21300030 + second: Tileset_Rock_Fill5 + - first: + 213: 21300032 + second: Tileset_Rock_Fill6 + - first: + 213: 21300034 + second: Tileset_Rock_WallRight0 + - first: + 213: 21300036 + second: Tileset_Rock_WallLeft1 + - first: + 213: 21300038 + second: Tileset_Rock_Fill7 + - first: + 213: 21300040 + second: Tileset_Rock_Fill8 + - first: + 213: 21300042 + second: Tileset_Rock_Fill9 + - first: + 213: 21300044 + second: Tileset_Rock_Fill10 + - first: + 213: 21300046 + second: Tileset_Rock_Fill11 + - first: + 213: 21300048 + second: Tileset_Rock_Ceiling0 + - first: + 213: 21300050 + second: Tileset_Rock_Ceiling1 + - first: + 213: 21300052 + second: Tileset_Rock_WallRight1 + - first: + 213: 21300054 + second: Tileset_Rock_WallLeft2 + - first: + 213: 21300056 + second: Tileset_Rock_CeilingCornerOuterLeft + - first: + 213: 21300058 + second: Tileset_Rock_Ceiling2 + - first: + 213: 21300060 + second: Tileset_Rock_Ceiling3 + - first: + 213: 21300062 + second: Tileset_Rock_Ceiling4 + - first: + 213: 21300064 + second: Tileset_Rock_Ceiling5 + - first: + 213: 21300066 + second: Tileset_Rock_Ceiling6 + - first: + 213: 21300068 + second: Tileset_Rock_CeilingCornerOuterRight + - first: + 213: 21300070 + second: Tileset_Rock_WallRight2 + - first: + 213: 21300072 + second: Tileset_Rock_WallLeft3 + - first: + 213: 21300074 + second: Tileset_Rock_FloorSingleBlock + - first: + 213: 21300076 + second: Tileset_Rock_FloorCornerInnerRight0 + - first: + 213: 21300078 + second: Tileset_Rock_FloorCornerInnerRight1 + - first: + 213: 21300080 + second: Tileset_Rock_FloorCornerInnerRight2 + - first: + 213: 21300082 + second: Tileset_Rock_FloorCornerInnerRight3 + - first: + 213: 21300084 + second: Tileset_Rock_WallRight3 + - first: + 213: 21300086 + second: Tileset_Rock_WallLeft4 + - first: + 213: 21300088 + second: Tileset_Rock_SingleBlock + - first: + 213: 21300090 + second: Tileset_Rock_FloorCornerInnerLeft0 + - first: + 213: 21300092 + second: Tileset_Rock_FloorCornerInnerLeft1 + - first: + 213: 21300094 + second: Tileset_Rock_FloorCornerInnerLeft2 + - first: + 213: 21300096 + second: Tileset_Rock_FloorCornerInnerLeft3 + - first: + 213: 21300098 + second: Tileset_Rock_WallRight4 + - first: + 213: 21300100 + second: Tileset_Rock_WallLeft5 + - first: + 213: 21300102 + second: Tileset_Rock_FloorCornerSingleBlockLeft + - first: + 213: 21300104 + second: Tileset_Rock_FloorSingleBlock0 + - first: + 213: 21300106 + second: Tileset_Rock_FloorSingleBlock1 + - first: + 213: 21300108 + second: Tileset_Rock_FloorSingleBlock2 + - first: + 213: 21300110 + second: Tileset_Rock_FloorSingleBlock3 + - first: + 213: 21300112 + second: Tileset_Rock_FloorSingleBlock4 + - first: + 213: 21300114 + second: Tileset_Rock_FloorCornerSingleBlockRight + - first: + 213: 21300116 + second: Tileset_Rock_WallRight5 + - first: + 213: 21300118 + second: Tileset_Rock_WallLeft6 + - first: + 213: 21300120 + second: Tileset_Rock_FloorSingleBlockLeft + - first: + 213: 21300122 + second: Tileset_Rock_FloorSingleBlock5 + - first: + 213: 21300124 + second: Tileset_Rock_FloorSingleBlock6 + - first: + 213: 21300126 + second: Tileset_Rock_FloorSingleBlockRight + - first: + 213: 21300128 + second: Tileset_Rock_WallRight6 + - first: + 213: 21300130 + second: Tileset_Rock_WallLeftCeilingCorner0 + - first: + 213: 21300132 + second: Tileset_Rock_WallLeftCeilingCorner1 + - first: + 213: 21300134 + second: Tileset_Rock_WallLeftCeilingCorner2 + - first: + 213: 21300136 + second: Tileset_Rock_WallLeftCeilingCorner3 + - first: + 213: 21300138 + second: Tileset_Rock_WallLeftCeilingCorner4 + - first: + 213: 21300140 + second: Tileset_Rock_WallLeftCeilingCorner5 + - first: + 213: 21300142 + second: Tileset_Rock_WallLeftCeilingCorner6 + - first: + 213: 21300144 + second: Tileset_Rock_WallRightCeilingCorner0 + - first: + 213: 21300146 + second: Tileset_Rock_WallRightCeilingCorner1 + - first: + 213: 21300148 + second: Tileset_Rock_WallRightCeilingCorner2 + - first: + 213: 21300150 + second: Tileset_Rock_WallRightCeilingCorner3 + - first: + 213: 21300152 + second: Tileset_Rock_WallRightCeilingCorner4 + - first: + 213: 21300154 + second: Tileset_Rock_WallRightCeilingCorner5 + - first: + 213: 21300156 + second: Tileset_Rock_WallRightCeilingCorner6 + - first: + 213: 21300158 + second: Tileset_Rock_SingleColumn0 + - first: + 213: 21300160 + second: Tileset_Rock_SingleColumn1 + - first: + 213: 21300162 + second: Tileset_Rock_SingleColumn2 + - first: + 213: 21300164 + second: Tileset_Rock_SingleColumnBottom + - first: + 213: 21300166 + second: Tileset_Rock_SingleBlockCorner_Left + - first: + 213: 21300168 + second: Tileset_Rock_SingleBlockCorner_Right + - first: + 213: 21300170 + second: Tileset_Rock_WallLeftCornerGrass + - first: + 213: 21300172 + second: Tileset_Rock_WallCornerRightGrass + - first: + 213: 21300174 + second: Tileset_Rock_SingleColumnCentreCorners + - first: + 213: 21300176 + second: Tileset_Rock_CeilingCornerGrassRight + - first: + 213: 21300178 + second: Tileset_Rock_CeilingCornerGrassLeft + - first: + 213: 21300180 + second: Tileset_Rock_SingleColumnCentreCeiling + - first: + 213: 21300182 + second: Tileset_Rock_CeilingCornerGrassSingleLeft + - first: + 213: 21300184 + second: Tileset_Rock_CeilingCornerGrassSingleRight externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -113,9 +299,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -124,9 +313,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -147,11 +336,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 8192 resizeAlgorithm: 0 @@ -161,8 +356,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 8192 resizeAlgorithm: 0 @@ -172,8 +369,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 8192 resizeAlgorithm: 0 @@ -183,7 +382,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -273,6 +500,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 86305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -394,6 +622,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: ac305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -525,6 +754,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a6305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -616,6 +846,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c6305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -668,6 +899,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: cc305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -777,6 +1009,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 07305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -857,6 +1090,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 27305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -1181,6 +1415,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e2305410000000000800000000000000 + internalID: 21300014 vertices: [] indices: edges: [] @@ -1354,6 +1589,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: ec305410000000000800000000000000 + internalID: 21300016 vertices: [] indices: edges: [] @@ -1383,6 +1619,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 0d305410000000000800000000000000 + internalID: 21300018 vertices: [] indices: edges: [] @@ -1411,6 +1648,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 67305410000000000800000000000000 + internalID: 21300020 vertices: [] indices: edges: [] @@ -1439,6 +1677,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 87305410000000000800000000000000 + internalID: 21300022 vertices: [] indices: edges: [] @@ -1467,6 +1706,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a7305410000000000800000000000000 + internalID: 21300024 vertices: [] indices: edges: [] @@ -1495,6 +1735,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c7305410000000000800000000000000 + internalID: 21300026 vertices: [] indices: edges: [] @@ -1523,6 +1764,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e7305410000000000800000000000000 + internalID: 21300028 vertices: [] indices: edges: [] @@ -1551,6 +1793,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 08305410000000000800000000000000 + internalID: 21300030 vertices: [] indices: edges: [] @@ -1579,6 +1822,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 28305410000000000800000000000000 + internalID: 21300032 vertices: [] indices: edges: [] @@ -1610,6 +1854,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 24305410000000000800000000000000 + internalID: 21300034 vertices: [] indices: edges: [] @@ -1638,6 +1883,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 44305410000000000800000000000000 + internalID: 21300036 vertices: [] indices: edges: [] @@ -1666,6 +1912,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 48305410000000000800000000000000 + internalID: 21300038 vertices: [] indices: edges: [] @@ -1694,6 +1941,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 2d305410000000000800000000000000 + internalID: 21300040 vertices: [] indices: edges: [] @@ -1722,6 +1970,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a4305410000000000800000000000000 + internalID: 21300042 vertices: [] indices: edges: [] @@ -1750,6 +1999,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c4305410000000000800000000000000 + internalID: 21300044 vertices: [] indices: edges: [] @@ -1778,6 +2028,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 4d305410000000000800000000000000 + internalID: 21300046 vertices: [] indices: edges: [] @@ -1806,6 +2057,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e8305410000000000800000000000000 + internalID: 21300048 vertices: [] indices: edges: [] @@ -1834,6 +2086,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 25305410000000000800000000000000 + internalID: 21300050 vertices: [] indices: edges: [] @@ -1863,6 +2116,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 45305410000000000800000000000000 + internalID: 21300052 vertices: [] indices: edges: [] @@ -1893,6 +2147,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 65305410000000000800000000000000 + internalID: 21300054 vertices: [] indices: edges: [] @@ -1927,6 +2182,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 85305410000000000800000000000000 + internalID: 21300056 vertices: [] indices: edges: [] @@ -1955,6 +2211,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a5305410000000000800000000000000 + internalID: 21300058 vertices: [] indices: edges: [] @@ -1986,6 +2243,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c5305410000000000800000000000000 + internalID: 21300060 vertices: [] indices: edges: [] @@ -2019,6 +2277,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 09305410000000000800000000000000 + internalID: 21300062 vertices: [] indices: edges: [] @@ -2047,6 +2306,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 06305410000000000800000000000000 + internalID: 21300064 vertices: [] indices: edges: [] @@ -2075,6 +2335,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 26305410000000000800000000000000 + internalID: 21300066 vertices: [] indices: edges: [] @@ -2105,6 +2366,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 46305410000000000800000000000000 + internalID: 21300068 vertices: [] indices: edges: [] @@ -2134,6 +2396,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 66305410000000000800000000000000 + internalID: 21300070 vertices: [] indices: edges: [] @@ -2165,6 +2428,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 29305410000000000800000000000000 + internalID: 21300072 vertices: [] indices: edges: [] @@ -2343,6 +2607,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 49305410000000000800000000000000 + internalID: 21300074 vertices: [] indices: edges: [] @@ -2377,6 +2642,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 69305410000000000800000000000000 + internalID: 21300076 vertices: [] indices: edges: [] @@ -2410,6 +2676,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 89305410000000000800000000000000 + internalID: 21300078 vertices: [] indices: edges: [] @@ -2446,6 +2713,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a9305410000000000800000000000000 + internalID: 21300080 vertices: [] indices: edges: [] @@ -2481,6 +2749,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c9305410000000000800000000000000 + internalID: 21300082 vertices: [] indices: edges: [] @@ -2509,6 +2778,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e9305410000000000800000000000000 + internalID: 21300084 vertices: [] indices: edges: [] @@ -2537,6 +2807,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 0a305410000000000800000000000000 + internalID: 21300086 vertices: [] indices: edges: [] @@ -2668,6 +2939,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 2a305410000000000800000000000000 + internalID: 21300088 vertices: [] indices: edges: [] @@ -2703,6 +2975,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 6a305410000000000800000000000000 + internalID: 21300090 vertices: [] indices: edges: [] @@ -2738,6 +3011,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 8a305410000000000800000000000000 + internalID: 21300092 vertices: [] indices: edges: [] @@ -2773,6 +3047,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: aa305410000000000800000000000000 + internalID: 21300094 vertices: [] indices: edges: [] @@ -2808,6 +3083,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: ca305410000000000800000000000000 + internalID: 21300096 vertices: [] indices: edges: [] @@ -2837,6 +3113,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: ea305410000000000800000000000000 + internalID: 21300098 vertices: [] indices: edges: [] @@ -2873,6 +3150,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 0b305410000000000800000000000000 + internalID: 21300100 vertices: [] indices: edges: [] @@ -2904,6 +3182,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 2b305410000000000800000000000000 + internalID: 21300102 vertices: [] indices: edges: [] @@ -3003,6 +3282,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 4b305410000000000800000000000000 + internalID: 21300104 vertices: [] indices: edges: [] @@ -3153,6 +3433,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 6b305410000000000800000000000000 + internalID: 21300106 vertices: [] indices: edges: [] @@ -3315,6 +3596,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 8b305410000000000800000000000000 + internalID: 21300108 vertices: [] indices: edges: [] @@ -3380,6 +3662,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: ab305410000000000800000000000000 + internalID: 21300110 vertices: [] indices: edges: [] @@ -3497,6 +3780,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: cb305410000000000800000000000000 + internalID: 21300112 vertices: [] indices: edges: [] @@ -3540,6 +3824,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: eb305410000000000800000000000000 + internalID: 21300114 vertices: [] indices: edges: [] @@ -3575,6 +3860,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 0c305410000000000800000000000000 + internalID: 21300116 vertices: [] indices: edges: [] @@ -3606,6 +3892,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 2c305410000000000800000000000000 + internalID: 21300118 vertices: [] indices: edges: [] @@ -3711,6 +3998,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 4c305410000000000800000000000000 + internalID: 21300120 vertices: [] indices: edges: [] @@ -4050,6 +4338,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 6c305410000000000800000000000000 + internalID: 21300122 vertices: [] indices: edges: [] @@ -4138,6 +4427,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 8c305410000000000800000000000000 + internalID: 21300124 vertices: [] indices: edges: [] @@ -4319,6 +4609,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 6d305410000000000800000000000000 + internalID: 21300126 vertices: [] indices: edges: [] @@ -4348,6 +4639,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 8d305410000000000800000000000000 + internalID: 21300128 vertices: [] indices: edges: [] @@ -4376,6 +4668,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: ad305410000000000800000000000000 + internalID: 21300130 vertices: [] indices: edges: [] @@ -4404,6 +4697,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: cd305410000000000800000000000000 + internalID: 21300132 vertices: [] indices: edges: [] @@ -4432,6 +4726,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: ed305410000000000800000000000000 + internalID: 21300134 vertices: [] indices: edges: [] @@ -4460,6 +4755,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 0e305410000000000800000000000000 + internalID: 21300136 vertices: [] indices: edges: [] @@ -4488,6 +4784,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 2e305410000000000800000000000000 + internalID: 21300138 vertices: [] indices: edges: [] @@ -4517,6 +4814,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 4e305410000000000800000000000000 + internalID: 21300140 vertices: [] indices: edges: [] @@ -4545,6 +4843,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 6e305410000000000800000000000000 + internalID: 21300142 vertices: [] indices: edges: [] @@ -4573,6 +4872,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 8e305410000000000800000000000000 + internalID: 21300144 vertices: [] indices: edges: [] @@ -4601,6 +4901,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: ae305410000000000800000000000000 + internalID: 21300146 vertices: [] indices: edges: [] @@ -4629,6 +4930,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: ce305410000000000800000000000000 + internalID: 21300148 vertices: [] indices: edges: [] @@ -4657,6 +4959,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: ee305410000000000800000000000000 + internalID: 21300150 vertices: [] indices: edges: [] @@ -4685,6 +4988,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 0f305410000000000800000000000000 + internalID: 21300152 vertices: [] indices: edges: [] @@ -4713,6 +5017,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 6f305410000000000800000000000000 + internalID: 21300154 vertices: [] indices: edges: [] @@ -4741,6 +5046,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 8f305410000000000800000000000000 + internalID: 21300156 vertices: [] indices: edges: [] @@ -4773,6 +5079,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: af305410000000000800000000000000 + internalID: 21300158 vertices: [] indices: edges: [] @@ -4800,6 +5107,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: cf305410000000000800000000000000 + internalID: 21300160 vertices: [] indices: edges: [] @@ -4825,6 +5133,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: ef305410000000000800000000000000 + internalID: 21300162 vertices: [] indices: edges: [] @@ -4851,6 +5160,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 00405410000000000800000000000000 + internalID: 21300164 vertices: [] indices: edges: [] @@ -4878,6 +5188,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 20405410000000000800000000000000 + internalID: 21300166 vertices: [] indices: edges: [] @@ -4906,6 +5217,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 40405410000000000800000000000000 + internalID: 21300168 vertices: [] indices: edges: [] @@ -4930,6 +5242,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 60405410000000000800000000000000 + internalID: 21300170 vertices: [] indices: edges: [] @@ -4955,6 +5268,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 80405410000000000800000000000000 + internalID: 21300172 vertices: [] indices: edges: [] @@ -4987,6 +5301,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a0405410000000000800000000000000 + internalID: 21300174 vertices: [] indices: edges: [] @@ -5013,6 +5328,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c0405410000000000800000000000000 + internalID: 21300176 vertices: [] indices: edges: [] @@ -5044,6 +5360,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e0405410000000000800000000000000 + internalID: 21300178 vertices: [] indices: edges: [] @@ -5076,6 +5393,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 01405410000000000800000000000000 + internalID: 21300180 vertices: [] indices: edges: [] @@ -5103,6 +5421,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 21405410000000000800000000000000 + internalID: 21300182 vertices: [] indices: edges: [] @@ -5128,6 +5447,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 41405410000000000800000000000000 + internalID: 21300184 vertices: [] indices: edges: [] @@ -5136,13 +5456,108 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + Tileset_Rock_Ceiling0: 21300048 + Tileset_Rock_Ceiling1: 21300050 + Tileset_Rock_Ceiling2: 21300058 + Tileset_Rock_Ceiling3: 21300060 + Tileset_Rock_Ceiling4: 21300062 + Tileset_Rock_Ceiling5: 21300064 + Tileset_Rock_Ceiling6: 21300066 + Tileset_Rock_CeilingCornerGrassLeft: 21300178 + Tileset_Rock_CeilingCornerGrassRight: 21300176 + Tileset_Rock_CeilingCornerGrassSingleLeft: 21300182 + Tileset_Rock_CeilingCornerGrassSingleRight: 21300184 + Tileset_Rock_CeilingCornerOuterLeft: 21300056 + Tileset_Rock_CeilingCornerOuterRight: 21300068 + Tileset_Rock_Fill0: 21300020 + Tileset_Rock_Fill1: 21300022 + Tileset_Rock_Fill10: 21300044 + Tileset_Rock_Fill11: 21300046 + Tileset_Rock_Fill2: 21300024 + Tileset_Rock_Fill3: 21300026 + Tileset_Rock_Fill4: 21300028 + Tileset_Rock_Fill5: 21300030 + Tileset_Rock_Fill6: 21300032 + Tileset_Rock_Fill7: 21300038 + Tileset_Rock_Fill8: 21300040 + Tileset_Rock_Fill9: 21300042 + Tileset_Rock_Floor0: 21300002 + Tileset_Rock_Floor1: 21300004 + Tileset_Rock_Floor2: 21300006 + Tileset_Rock_Floor3: 21300008 + Tileset_Rock_Floor4: 21300010 + Tileset_Rock_Floor5: 21300012 + Tileset_Rock_Floor6: 21300014 + Tileset_Rock_FloorCornerInnerLeft0: 21300090 + Tileset_Rock_FloorCornerInnerLeft1: 21300092 + Tileset_Rock_FloorCornerInnerLeft2: 21300094 + Tileset_Rock_FloorCornerInnerLeft3: 21300096 + Tileset_Rock_FloorCornerInnerRight0: 21300076 + Tileset_Rock_FloorCornerInnerRight1: 21300078 + Tileset_Rock_FloorCornerInnerRight2: 21300080 + Tileset_Rock_FloorCornerInnerRight3: 21300082 + Tileset_Rock_FloorCornerOuterLeft: 21300000 + Tileset_Rock_FloorCornerOuterRight: 21300016 + Tileset_Rock_FloorCornerSingleBlockLeft: 21300102 + Tileset_Rock_FloorCornerSingleBlockRight: 21300114 + Tileset_Rock_FloorSingleBlock: 21300074 + Tileset_Rock_FloorSingleBlock0: 21300104 + Tileset_Rock_FloorSingleBlock1: 21300106 + Tileset_Rock_FloorSingleBlock2: 21300108 + Tileset_Rock_FloorSingleBlock3: 21300110 + Tileset_Rock_FloorSingleBlock4: 21300112 + Tileset_Rock_FloorSingleBlock5: 21300122 + Tileset_Rock_FloorSingleBlock6: 21300124 + Tileset_Rock_FloorSingleBlockLeft: 21300120 + Tileset_Rock_FloorSingleBlockRight: 21300126 + Tileset_Rock_SingleBlock: 21300088 + Tileset_Rock_SingleBlockCorner_Left: 21300166 + Tileset_Rock_SingleBlockCorner_Right: 21300168 + Tileset_Rock_SingleColumn0: 21300158 + Tileset_Rock_SingleColumn1: 21300160 + Tileset_Rock_SingleColumn2: 21300162 + Tileset_Rock_SingleColumnBottom: 21300164 + Tileset_Rock_SingleColumnCentreCeiling: 21300180 + Tileset_Rock_SingleColumnCentreCorners: 21300174 + Tileset_Rock_WallCornerRightGrass: 21300172 + Tileset_Rock_WallLeft0: 21300018 + Tileset_Rock_WallLeft1: 21300036 + Tileset_Rock_WallLeft2: 21300054 + Tileset_Rock_WallLeft3: 21300072 + Tileset_Rock_WallLeft4: 21300086 + Tileset_Rock_WallLeft5: 21300100 + Tileset_Rock_WallLeft6: 21300118 + Tileset_Rock_WallLeftCeilingCorner0: 21300130 + Tileset_Rock_WallLeftCeilingCorner1: 21300132 + Tileset_Rock_WallLeftCeilingCorner2: 21300134 + Tileset_Rock_WallLeftCeilingCorner3: 21300136 + Tileset_Rock_WallLeftCeilingCorner4: 21300138 + Tileset_Rock_WallLeftCeilingCorner5: 21300140 + Tileset_Rock_WallLeftCeilingCorner6: 21300142 + Tileset_Rock_WallLeftCornerGrass: 21300170 + Tileset_Rock_WallRight0: 21300034 + Tileset_Rock_WallRight1: 21300052 + Tileset_Rock_WallRight2: 21300070 + Tileset_Rock_WallRight3: 21300084 + Tileset_Rock_WallRight4: 21300098 + Tileset_Rock_WallRight5: 21300116 + Tileset_Rock_WallRight6: 21300128 + Tileset_Rock_WallRightCeilingCorner0: 21300144 + Tileset_Rock_WallRightCeilingCorner1: 21300146 + Tileset_Rock_WallRightCeilingCorner2: 21300148 + Tileset_Rock_WallRightCeilingCorner3: 21300150 + Tileset_Rock_WallRightCeilingCorner4: 21300152 + Tileset_Rock_WallRightCeilingCorner5: 21300154 + Tileset_Rock_WallRightCeilingCorner6: 21300156 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Environment/UndergroundRoots.png.meta b/Assets/Game Assets/Art/Sprites/Environment/UndergroundRoots.png.meta index 833ddc2b79..6f1999cfb7 100644 --- a/Assets/Game Assets/Art/Sprites/Environment/UndergroundRoots.png.meta +++ b/Assets/Game Assets/Art/Sprites/Environment/UndergroundRoots.png.meta @@ -1,11 +1,15 @@ fileFormatVersion: 2 guid: a0db901905a42bb4397f3268337c528b TextureImporter: - fileIDToRecycleName: - 21300000: UndergroundRoots_0 - 21300002: UndergroundRoots_2 + internalIDToNameTable: + - first: + 213: 21300000 + second: UndergroundRoots_0 + - first: + 213: 21300002 + second: UndergroundRoots_2 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,9 +26,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,9 +40,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -56,11 +63,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -70,8 +83,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -81,8 +96,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -92,7 +109,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -112,6 +157,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -132,6 +178,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -140,13 +187,17 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + UndergroundRoots_0: 21300000 + UndergroundRoots_2: 21300002 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Interactables/DestructibleColumn.png.meta b/Assets/Game Assets/Art/Sprites/Interactables/DestructibleColumn.png.meta index f749828320..9398f860d3 100644 --- a/Assets/Game Assets/Art/Sprites/Interactables/DestructibleColumn.png.meta +++ b/Assets/Game Assets/Art/Sprites/Interactables/DestructibleColumn.png.meta @@ -1,17 +1,33 @@ fileFormatVersion: 2 guid: cbf958bb9960a5d4cb587a17cedbfeac TextureImporter: - fileIDToRecycleName: - 21300000: DestructibleColumn_0 - 21300002: DestructibleColumn_1 - 21300004: DestructibleColumn_2 - 21300006: DestructibleColumn_3 - 21300008: DestructibleColumn_4 - 21300010: DestructibleColumn_5 - 21300012: DestructibleColumn_6 - 21300014: DestructibleColumn_7 + internalIDToNameTable: + - first: + 213: 21300000 + second: DestructibleColumn_0 + - first: + 213: 21300002 + second: DestructibleColumn_1 + - first: + 213: 21300004 + second: DestructibleColumn_2 + - first: + 213: 21300006 + second: DestructibleColumn_3 + - first: + 213: 21300008 + second: DestructibleColumn_4 + - first: + 213: 21300010 + second: DestructibleColumn_5 + - first: + 213: 21300012 + second: DestructibleColumn_6 + - first: + 213: 21300014 + second: DestructibleColumn_7 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -28,9 +44,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -39,12 +58,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 - wrapV: -1 - wrapW: -1 + wrapV: 0 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -62,11 +81,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -76,8 +101,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -87,8 +114,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -98,7 +127,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -118,6 +175,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -138,6 +196,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -158,6 +217,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -178,6 +238,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -198,6 +259,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -218,6 +280,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -238,6 +301,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c2305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -258,6 +322,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e2305410000000000800000000000000 + internalID: 21300014 vertices: [] indices: edges: [] @@ -266,13 +331,23 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + DestructibleColumn_0: 21300000 + DestructibleColumn_1: 21300002 + DestructibleColumn_2: 21300004 + DestructibleColumn_3: 21300006 + DestructibleColumn_4: 21300008 + DestructibleColumn_5: 21300010 + DestructibleColumn_6: 21300012 + DestructibleColumn_7: 21300014 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Interactables/DestructibleWall.png.meta b/Assets/Game Assets/Art/Sprites/Interactables/DestructibleWall.png.meta index 0491e58c01..d8df7841e0 100644 --- a/Assets/Game Assets/Art/Sprites/Interactables/DestructibleWall.png.meta +++ b/Assets/Game Assets/Art/Sprites/Interactables/DestructibleWall.png.meta @@ -1,15 +1,27 @@ fileFormatVersion: 2 guid: 51d594e192d316448a2c8ebecb28eebc TextureImporter: - fileIDToRecycleName: - 21300000: DestructibleWall_0 - 21300002: DestructibleWall_3 - 21300004: DestructibleWall_4 - 21300006: DestructibleWall_6 - 21300008: DestructibleWall_12 - 21300010: DestructibleWall_13 + internalIDToNameTable: + - first: + 213: 21300000 + second: DestructibleWall_0 + - first: + 213: 21300002 + second: DestructibleWall_3 + - first: + 213: 21300004 + second: DestructibleWall_4 + - first: + 213: 21300006 + second: DestructibleWall_6 + - first: + 213: 21300008 + second: DestructibleWall_12 + - first: + 213: 21300010 + second: DestructibleWall_13 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -26,9 +38,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -37,12 +52,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -60,11 +75,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -74,8 +95,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -85,8 +108,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -96,7 +121,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -116,6 +169,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 04305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -136,6 +190,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -156,6 +211,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -176,6 +232,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 24305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -196,6 +253,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 64305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -216,6 +274,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 84305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -224,13 +283,21 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + DestructibleWall_0: 21300000 + DestructibleWall_12: 21300008 + DestructibleWall_13: 21300010 + DestructibleWall_3: 21300002 + DestructibleWall_4: 21300004 + DestructibleWall_6: 21300006 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Interactables/InfoSign.png.meta b/Assets/Game Assets/Art/Sprites/Interactables/InfoSign.png.meta index f29bf695c0..568f1e0f53 100644 --- a/Assets/Game Assets/Art/Sprites/Interactables/InfoSign.png.meta +++ b/Assets/Game Assets/Art/Sprites/Interactables/InfoSign.png.meta @@ -1,11 +1,15 @@ fileFormatVersion: 2 guid: d718e5e633b23ce4096bff9a77d77325 TextureImporter: - fileIDToRecycleName: - 21300000: InfoSign_0 - 21300002: InfoSign_1 + internalIDToNameTable: + - first: + 213: 21300000 + second: InfoSign_0 + - first: + 213: 21300002 + second: InfoSign_1 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,9 +26,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,12 +40,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -56,11 +63,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -70,8 +83,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -81,8 +96,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -92,7 +109,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -112,6 +157,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -132,6 +178,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -140,13 +187,17 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + InfoSign_0: 21300000 + InfoSign_1: 21300002 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Interactables/MovingPlatform.png.meta b/Assets/Game Assets/Art/Sprites/Interactables/MovingPlatform.png.meta index 40657bc248..88deaea64d 100644 --- a/Assets/Game Assets/Art/Sprites/Interactables/MovingPlatform.png.meta +++ b/Assets/Game Assets/Art/Sprites/Interactables/MovingPlatform.png.meta @@ -1,12 +1,18 @@ fileFormatVersion: 2 guid: 04aaca4e4e330b641a3ca7d7a94a835f TextureImporter: - fileIDToRecycleName: - 21300000: MovingPlatform_Left - 21300002: MovingPlatform_Right - 21300004: MovingPlatform_Middle + internalIDToNameTable: + - first: + 213: 21300000 + second: MovingPlatform_Left + - first: + 213: 21300002 + second: MovingPlatform_Right + - first: + 213: 21300004 + second: MovingPlatform_Middle externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,9 +29,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -35,8 +44,8 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 2 - aniso: -1 - mipBias: -100 + aniso: 1 + mipBias: 0 wrapU: 2 wrapV: 2 wrapW: 2 @@ -57,11 +66,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 8192 resizeAlgorithm: 0 @@ -71,8 +86,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 8192 resizeAlgorithm: 0 @@ -82,8 +99,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 8192 resizeAlgorithm: 0 @@ -93,7 +112,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 8192 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -117,6 +164,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -143,6 +191,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -170,6 +219,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -178,13 +228,18 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + MovingPlatform_Left: 21300000 + MovingPlatform_Middle: 21300004 + MovingPlatform_Right: 21300002 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Interactables/MovingPlatformAlien.png.meta b/Assets/Game Assets/Art/Sprites/Interactables/MovingPlatformAlien.png.meta index 9a0f50fc8d..d1f38c7a3a 100644 --- a/Assets/Game Assets/Art/Sprites/Interactables/MovingPlatformAlien.png.meta +++ b/Assets/Game Assets/Art/Sprites/Interactables/MovingPlatformAlien.png.meta @@ -1,12 +1,18 @@ fileFormatVersion: 2 guid: 2da3192b993471540944ac96226c9333 TextureImporter: - fileIDToRecycleName: - 21300000: MovingPlatform_Alien_Left - 21300002: MovingPlatform_Alien_Right - 21300004: MovingPlatform_Alien_Middle + internalIDToNameTable: + - first: + 213: 21300000 + second: MovingPlatform_Alien_Left + - first: + 213: 21300002 + second: MovingPlatform_Alien_Right + - first: + 213: 21300004 + second: MovingPlatform_Alien_Middle externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,9 +29,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -34,12 +43,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -57,11 +66,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -71,8 +86,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -82,8 +99,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -93,7 +112,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -113,6 +160,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -133,6 +181,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -153,6 +202,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -161,13 +211,18 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + MovingPlatform_Alien_Left: 21300000 + MovingPlatform_Alien_Middle: 21300004 + MovingPlatform_Alien_Right: 21300002 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Interactables/PassThroughPlatform.png.meta b/Assets/Game Assets/Art/Sprites/Interactables/PassThroughPlatform.png.meta index 9677fcb261..d6bec68b54 100644 --- a/Assets/Game Assets/Art/Sprites/Interactables/PassThroughPlatform.png.meta +++ b/Assets/Game Assets/Art/Sprites/Interactables/PassThroughPlatform.png.meta @@ -1,12 +1,18 @@ fileFormatVersion: 2 guid: 389dc290ab41ea34485314d037cc75df TextureImporter: - fileIDToRecycleName: - 21300000: PassThroughPlatform_0 - 21300002: PassThroughPlatform_1 - 21300004: PassThroughPlatform_2 + internalIDToNameTable: + - first: + 213: 21300000 + second: PassThroughPlatform_0 + - first: + 213: 21300002 + second: PassThroughPlatform_1 + - first: + 213: 21300004 + second: PassThroughPlatform_2 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,9 +29,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -34,12 +43,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 - wrapV: -1 - wrapW: -1 + wrapV: 0 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -57,11 +66,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -71,8 +86,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -82,8 +99,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -93,7 +112,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -113,6 +160,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -133,6 +181,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -153,6 +202,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -161,13 +211,18 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + PassThroughPlatform_0: 21300000 + PassThroughPlatform_1: 21300002 + PassThroughPlatform_2: 21300004 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Interactables/PassThroughPlatformAlien.png.meta b/Assets/Game Assets/Art/Sprites/Interactables/PassThroughPlatformAlien.png.meta index 9731ae094d..633781c553 100644 --- a/Assets/Game Assets/Art/Sprites/Interactables/PassThroughPlatformAlien.png.meta +++ b/Assets/Game Assets/Art/Sprites/Interactables/PassThroughPlatformAlien.png.meta @@ -1,12 +1,18 @@ fileFormatVersion: 2 guid: f67d52e5fa8873946867aa19a7bac3b6 TextureImporter: - fileIDToRecycleName: - 21300000: PassThroughPlatform_Alien_0 - 21300002: PassThroughPlatform_Alien_1 - 21300004: PassThroughPlatform_Alien_2 + internalIDToNameTable: + - first: + 213: 21300000 + second: PassThroughPlatform_Alien_0 + - first: + 213: 21300002 + second: PassThroughPlatform_Alien_1 + - first: + 213: 21300004 + second: PassThroughPlatform_Alien_2 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,9 +29,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -34,12 +43,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -57,11 +66,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -71,8 +86,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -82,8 +99,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -93,7 +112,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -113,6 +160,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -133,6 +181,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -153,6 +202,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -161,13 +211,18 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + PassThroughPlatform_Alien_0: 21300000 + PassThroughPlatform_Alien_1: 21300002 + PassThroughPlatform_Alien_2: 21300004 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Interactables/PressurePad.png.meta b/Assets/Game Assets/Art/Sprites/Interactables/PressurePad.png.meta index 9598efee89..07a48c5cc0 100644 --- a/Assets/Game Assets/Art/Sprites/Interactables/PressurePad.png.meta +++ b/Assets/Game Assets/Art/Sprites/Interactables/PressurePad.png.meta @@ -1,11 +1,15 @@ fileFormatVersion: 2 guid: c812bc8c71a77a949ad4ddc0cf831fc1 TextureImporter: - fileIDToRecycleName: - 21300000: PressurePad_0 - 21300002: PressurePad_1 + internalIDToNameTable: + - first: + 213: 21300000 + second: PressurePad_0 + - first: + 213: 21300002 + second: PressurePad_1 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,9 +26,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,12 +40,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -56,11 +63,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 1024 resizeAlgorithm: 0 @@ -70,8 +83,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 1024 resizeAlgorithm: 0 @@ -81,8 +96,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 1024 resizeAlgorithm: 0 @@ -92,7 +109,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -112,6 +157,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -132,6 +178,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -140,13 +187,17 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + PressurePad_0: 21300000 + PressurePad_1: 21300002 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Interactables/PushableBox.png.meta b/Assets/Game Assets/Art/Sprites/Interactables/PushableBox.png.meta index 3914187e28..9ccbda59e7 100644 --- a/Assets/Game Assets/Art/Sprites/Interactables/PushableBox.png.meta +++ b/Assets/Game Assets/Art/Sprites/Interactables/PushableBox.png.meta @@ -1,11 +1,15 @@ fileFormatVersion: 2 guid: 133a93172967d354890e27ed10cf88e9 TextureImporter: - fileIDToRecycleName: - 21300000: PushableBox_0 - 21300002: PushableBox_1 + internalIDToNameTable: + - first: + 213: 21300000 + second: PushableBox_0 + - first: + 213: 21300002 + second: PushableBox_1 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,9 +26,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,12 +40,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 - wrapV: -1 - wrapW: -1 + wrapV: 0 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -56,11 +63,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -70,8 +83,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -81,8 +96,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -92,7 +109,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -112,6 +157,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -132,6 +178,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -192,13 +239,17 @@ TextureImporter: - {x: 435, y: -404} bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + PushableBox_0: 21300000 + PushableBox_1: 21300002 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Interactables/SpikesNew.png.meta b/Assets/Game Assets/Art/Sprites/Interactables/SpikesNew.png.meta index edea1fcc7e..06d8b9cc7d 100644 --- a/Assets/Game Assets/Art/Sprites/Interactables/SpikesNew.png.meta +++ b/Assets/Game Assets/Art/Sprites/Interactables/SpikesNew.png.meta @@ -1,23 +1,51 @@ fileFormatVersion: 2 guid: 44c1b3b37217c0b4bb07a979fc3b4714 TextureImporter: - fileIDToRecycleName: - 21300000: SpikesNew_0 - 21300002: SpikesNew_1 - 21300004: SpikesNew_4 - 21300006: SpikesNew_5 - 21300008: SpikesNew_8 - 21300010: SpikesNew_10 - 21300012: SpikesNew_11 - 21300014: SpikesNew_13 - 21300016: SpikesNew_14 - 21300018: SpikesNew_15 - 21300020: SpikesNew_16 - 21300022: SpikesNew_17 - 21300024: SpikesNew_18 - 21300026: SpikesNew_19 + internalIDToNameTable: + - first: + 213: 21300000 + second: SpikesNew_0 + - first: + 213: 21300002 + second: SpikesNew_1 + - first: + 213: 21300004 + second: SpikesNew_4 + - first: + 213: 21300006 + second: SpikesNew_5 + - first: + 213: 21300008 + second: SpikesNew_8 + - first: + 213: 21300010 + second: SpikesNew_10 + - first: + 213: 21300012 + second: SpikesNew_11 + - first: + 213: 21300014 + second: SpikesNew_13 + - first: + 213: 21300016 + second: SpikesNew_14 + - first: + 213: 21300018 + second: SpikesNew_15 + - first: + 213: 21300020 + second: SpikesNew_16 + - first: + 213: 21300022 + second: SpikesNew_17 + - first: + 213: 21300024 + second: SpikesNew_18 + - first: + 213: 21300026 + second: SpikesNew_19 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -34,9 +62,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -45,12 +76,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -68,11 +99,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 1024 resizeAlgorithm: 0 @@ -82,8 +119,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 1024 resizeAlgorithm: 0 @@ -93,8 +132,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 1024 resizeAlgorithm: 0 @@ -104,7 +145,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 1024 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -165,6 +234,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -211,6 +281,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -266,6 +337,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -332,6 +404,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -380,6 +453,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 03305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -423,6 +497,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 43305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -476,6 +551,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 63305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -574,6 +650,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 83305410000000000800000000000000 + internalID: 21300014 vertices: [] indices: edges: [] @@ -638,6 +715,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a3305410000000000800000000000000 + internalID: 21300016 vertices: [] indices: edges: [] @@ -692,6 +770,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c3305410000000000800000000000000 + internalID: 21300018 vertices: [] indices: edges: [] @@ -759,6 +838,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e3305410000000000800000000000000 + internalID: 21300020 vertices: [] indices: edges: [] @@ -820,6 +900,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 04305410000000000800000000000000 + internalID: 21300022 vertices: [] indices: edges: [] @@ -868,6 +949,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 24305410000000000800000000000000 + internalID: 21300024 vertices: [] indices: edges: [] @@ -921,6 +1003,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 44305410000000000800000000000000 + internalID: 21300026 vertices: [] indices: edges: [] @@ -929,13 +1012,29 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + SpikesNew_0: 21300000 + SpikesNew_1: 21300002 + SpikesNew_10: 21300010 + SpikesNew_11: 21300012 + SpikesNew_13: 21300014 + SpikesNew_14: 21300016 + SpikesNew_15: 21300018 + SpikesNew_16: 21300020 + SpikesNew_17: 21300022 + SpikesNew_18: 21300024 + SpikesNew_19: 21300026 + SpikesNew_4: 21300004 + SpikesNew_5: 21300006 + SpikesNew_8: 21300008 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Interactables/Switch.png.meta b/Assets/Game Assets/Art/Sprites/Interactables/Switch.png.meta index 9e3d008765..702ab43aeb 100644 --- a/Assets/Game Assets/Art/Sprites/Interactables/Switch.png.meta +++ b/Assets/Game Assets/Art/Sprites/Interactables/Switch.png.meta @@ -1,11 +1,15 @@ fileFormatVersion: 2 guid: 95e6e0c1a1ea1804e95813fba7ecb4c6 TextureImporter: - fileIDToRecycleName: - 21300000: Switch_0 - 21300002: Switch_1 + internalIDToNameTable: + - first: + 213: 21300000 + second: Switch_0 + - first: + 213: 21300002 + second: Switch_1 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,9 +26,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,9 +40,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -56,11 +63,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -70,8 +83,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -81,8 +96,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -92,7 +109,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -112,6 +157,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -132,6 +178,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -140,13 +187,17 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + Switch_0: 21300000 + Switch_1: 21300002 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/Interactables/WeaponPickup.png.meta b/Assets/Game Assets/Art/Sprites/Interactables/WeaponPickup.png.meta index 9cdbbd0402..fdaedfb0e5 100644 --- a/Assets/Game Assets/Art/Sprites/Interactables/WeaponPickup.png.meta +++ b/Assets/Game Assets/Art/Sprites/Interactables/WeaponPickup.png.meta @@ -1,11 +1,15 @@ fileFormatVersion: 2 guid: 8c2c753f45b686447b98240ee8ab9d4d TextureImporter: - fileIDToRecycleName: - 21300000: WeaponPickup_0 - 21300002: WeaponPickup_1 + internalIDToNameTable: + - first: + 213: 21300000 + second: WeaponPickup_0 + - first: + 213: 21300002 + second: WeaponPickup_1 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 1 @@ -22,9 +26,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -34,11 +41,11 @@ TextureImporter: textureSettings: serializedVersion: 2 filterMode: 2 - aniso: -1 - mipBias: -100 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -56,11 +63,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -70,8 +83,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -81,8 +96,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -92,7 +109,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -112,6 +157,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -132,6 +178,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -140,13 +187,17 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + WeaponPickup_0: 21300000 + WeaponPickup_1: 21300002 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/UI/HUD/BossHealth.png.meta b/Assets/Game Assets/Art/Sprites/UI/HUD/BossHealth.png.meta index 87e8ff93d4..3b57de9c36 100644 --- a/Assets/Game Assets/Art/Sprites/UI/HUD/BossHealth.png.meta +++ b/Assets/Game Assets/Art/Sprites/UI/HUD/BossHealth.png.meta @@ -1,18 +1,36 @@ fileFormatVersion: 2 guid: 2a305122cc204a041804db2417ad3ac2 TextureImporter: - fileIDToRecycleName: - 21300000: BossHealth_DefaultBorder - 21300002: BossHealth_Handle - 21300004: BossHealth_Fill - 21300006: BossHealth_SphereFill - 21300008: BossHealth_Damaged - 21300010: BossHealth_DamageSpark - 21300012: BossHealth_HandleFlash - 21300014: BossHealth_HighlightedBorder - 21300016: BossHealth_SmashedBorder + internalIDToNameTable: + - first: + 213: 21300000 + second: BossHealth_DefaultBorder + - first: + 213: 21300002 + second: BossHealth_Handle + - first: + 213: 21300004 + second: BossHealth_Fill + - first: + 213: 21300006 + second: BossHealth_SphereFill + - first: + 213: 21300008 + second: BossHealth_Damaged + - first: + 213: 21300010 + second: BossHealth_DamageSpark + - first: + 213: 21300012 + second: BossHealth_HandleFlash + - first: + 213: 21300014 + second: BossHealth_HighlightedBorder + - first: + 213: 21300016 + second: BossHealth_SmashedBorder externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -29,9 +47,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -40,9 +61,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -63,11 +84,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -77,8 +104,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -88,8 +117,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -99,7 +130,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -139,6 +198,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -163,6 +223,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -187,6 +248,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -213,6 +275,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -251,6 +314,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -279,6 +343,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -304,6 +369,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c2305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -344,6 +410,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e2305410000000000800000000000000 + internalID: 21300014 vertices: [] indices: edges: [] @@ -709,6 +776,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 03305410000000000800000000000000 + internalID: 21300016 vertices: [] indices: edges: [] @@ -717,13 +785,24 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + BossHealth_DamageSpark: 21300010 + BossHealth_Damaged: 21300008 + BossHealth_DefaultBorder: 21300000 + BossHealth_Fill: 21300004 + BossHealth_Handle: 21300002 + BossHealth_HandleFlash: 21300012 + BossHealth_HighlightedBorder: 21300014 + BossHealth_SmashedBorder: 21300016 + BossHealth_SphereFill: 21300006 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/UI/HUD/BossShield.png.meta b/Assets/Game Assets/Art/Sprites/UI/HUD/BossShield.png.meta index 44270d3a52..31880b5906 100644 --- a/Assets/Game Assets/Art/Sprites/UI/HUD/BossShield.png.meta +++ b/Assets/Game Assets/Art/Sprites/UI/HUD/BossShield.png.meta @@ -1,18 +1,36 @@ fileFormatVersion: 2 guid: d9c54273056f7d943920c5257c20b75f TextureImporter: - fileIDToRecycleName: - 21300000: BossShield_DefaultBorder - 21300002: BossShield_Handle - 21300004: BossShield_Fill - 21300006: BossShield_SphereFill - 21300008: BossShield_Damaged - 21300010: BossShield_Defeated - 21300012: BossShield_HandleFlash - 21300014: BossShield_HighlightedBorder - 21300016: BossShield_SmashedBorder + internalIDToNameTable: + - first: + 213: 21300000 + second: BossShield_DefaultBorder + - first: + 213: 21300002 + second: BossShield_Handle + - first: + 213: 21300004 + second: BossShield_Fill + - first: + 213: 21300006 + second: BossShield_SphereFill + - first: + 213: 21300008 + second: BossShield_Damaged + - first: + 213: 21300010 + second: BossShield_Defeated + - first: + 213: 21300012 + second: BossShield_HandleFlash + - first: + 213: 21300014 + second: BossShield_HighlightedBorder + - first: + 213: 21300016 + second: BossShield_SmashedBorder externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -29,9 +47,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -40,9 +61,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -63,11 +84,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -77,8 +104,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -88,8 +117,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -99,7 +130,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -119,6 +178,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -139,6 +199,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -159,6 +220,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -179,6 +241,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -199,6 +262,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -219,6 +283,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -239,6 +304,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c2305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -259,6 +325,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e2305410000000000800000000000000 + internalID: 21300014 vertices: [] indices: edges: [] @@ -279,6 +346,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 03305410000000000800000000000000 + internalID: 21300016 vertices: [] indices: edges: [] @@ -287,13 +355,24 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + BossShield_Damaged: 21300008 + BossShield_DefaultBorder: 21300000 + BossShield_Defeated: 21300010 + BossShield_Fill: 21300004 + BossShield_Handle: 21300002 + BossShield_HandleFlash: 21300012 + BossShield_HighlightedBorder: 21300014 + BossShield_SmashedBorder: 21300016 + BossShield_SphereFill: 21300006 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/UI/HUD/EllenHealth.png.meta b/Assets/Game Assets/Art/Sprites/UI/HUD/EllenHealth.png.meta index 08f9d6b5f4..c2fe9cb0c2 100644 --- a/Assets/Game Assets/Art/Sprites/UI/HUD/EllenHealth.png.meta +++ b/Assets/Game Assets/Art/Sprites/UI/HUD/EllenHealth.png.meta @@ -1,18 +1,36 @@ fileFormatVersion: 2 guid: fc49794cc535bef4f969645c4eb97b80 TextureImporter: - fileIDToRecycleName: - 21300000: EllenHealth_Empty - 21300002: EllenHealth_Gaining00 - 21300004: EllenHealth_Gaining01 - 21300006: EllenHealth_Gaining02 - 21300008: EllenHealth_Gaining03 - 21300010: EllenHealth_Full - 21300012: EllenHealth_Losing00 - 21300014: EllenHealth_Losing01 - 21300016: EllenHealth_Losing02 + internalIDToNameTable: + - first: + 213: 21300000 + second: EllenHealth_Empty + - first: + 213: 21300002 + second: EllenHealth_Gaining00 + - first: + 213: 21300004 + second: EllenHealth_Gaining01 + - first: + 213: 21300006 + second: EllenHealth_Gaining02 + - first: + 213: 21300008 + second: EllenHealth_Gaining03 + - first: + 213: 21300010 + second: EllenHealth_Full + - first: + 213: 21300012 + second: EllenHealth_Losing00 + - first: + 213: 21300014 + second: EllenHealth_Losing01 + - first: + 213: 21300016 + second: EllenHealth_Losing02 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -29,9 +47,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -40,9 +61,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -63,11 +84,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -77,8 +104,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -88,8 +117,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -99,7 +130,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -119,6 +178,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -139,6 +199,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -159,6 +220,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -179,6 +241,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -199,6 +262,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 23305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -219,6 +283,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -239,6 +304,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -259,6 +325,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c2305410000000000800000000000000 + internalID: 21300014 vertices: [] indices: edges: [] @@ -279,6 +346,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e2305410000000000800000000000000 + internalID: 21300016 vertices: [] indices: edges: [] @@ -287,13 +355,24 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + EllenHealth_Empty: 21300000 + EllenHealth_Full: 21300010 + EllenHealth_Gaining00: 21300002 + EllenHealth_Gaining01: 21300004 + EllenHealth_Gaining02: 21300006 + EllenHealth_Gaining03: 21300008 + EllenHealth_Losing00: 21300012 + EllenHealth_Losing01: 21300014 + EllenHealth_Losing02: 21300016 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/UI/HUD/KeyIcon.png.meta b/Assets/Game Assets/Art/Sprites/UI/HUD/KeyIcon.png.meta index 00bc7b7eb8..1c25666061 100644 --- a/Assets/Game Assets/Art/Sprites/UI/HUD/KeyIcon.png.meta +++ b/Assets/Game Assets/Art/Sprites/UI/HUD/KeyIcon.png.meta @@ -1,15 +1,27 @@ fileFormatVersion: 2 guid: 47b79e0414059df4c9e864efad6475b9 TextureImporter: - fileIDToRecycleName: - 21300000: KeyIcon_Empty - 21300002: KeyIcon_00 - 21300004: KeyIcon_01 - 21300006: KeyIcon_02 - 21300008: KeyIcon_03 - 21300010: KeyIcon_Collected + internalIDToNameTable: + - first: + 213: 21300000 + second: KeyIcon_Empty + - first: + 213: 21300002 + second: KeyIcon_00 + - first: + 213: 21300004 + second: KeyIcon_01 + - first: + 213: 21300006 + second: KeyIcon_02 + - first: + 213: 21300008 + second: KeyIcon_03 + - first: + 213: 21300010 + second: KeyIcon_Collected externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -26,9 +38,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -37,9 +52,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -60,11 +75,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -74,8 +95,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -85,8 +108,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -96,7 +121,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -116,6 +169,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -136,6 +190,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -156,6 +211,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -176,6 +232,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -196,6 +253,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -216,6 +274,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -224,13 +283,21 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + KeyIcon_00: 21300002 + KeyIcon_01: 21300004 + KeyIcon_02: 21300006 + KeyIcon_03: 21300008 + KeyIcon_Collected: 21300010 + KeyIcon_Empty: 21300000 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/UI/Menu/GameOver.png.meta b/Assets/Game Assets/Art/Sprites/UI/Menu/GameOver.png.meta index 854aefe64b..630c65ffd7 100644 --- a/Assets/Game Assets/Art/Sprites/UI/Menu/GameOver.png.meta +++ b/Assets/Game Assets/Art/Sprites/UI/Menu/GameOver.png.meta @@ -1,12 +1,18 @@ fileFormatVersion: 2 guid: be668f8b2ae220b4ba6ed120e2613f06 TextureImporter: - fileIDToRecycleName: - 21300000: GameOver_0 - 21300002: GameOver_1 - 21300004: GameOver_2 + internalIDToNameTable: + - first: + 213: 21300000 + second: GameOver_0 + - first: + 213: 21300002 + second: GameOver_1 + - first: + 213: 21300004 + second: GameOver_2 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,9 +29,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -34,9 +43,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -57,11 +66,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -71,8 +86,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -82,8 +99,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -93,7 +112,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -113,6 +160,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -133,6 +181,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -153,6 +202,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -161,13 +211,18 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + GameOver_0: 21300000 + GameOver_1: 21300002 + GameOver_2: 21300004 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/UI/Menu/GameOverEllen.png.meta b/Assets/Game Assets/Art/Sprites/UI/Menu/GameOverEllen.png.meta index e3b46397e1..927afbaba9 100644 --- a/Assets/Game Assets/Art/Sprites/UI/Menu/GameOverEllen.png.meta +++ b/Assets/Game Assets/Art/Sprites/UI/Menu/GameOverEllen.png.meta @@ -1,33 +1,81 @@ fileFormatVersion: 2 guid: e3c54db6d8a88d14e80b30406b8aa79e TextureImporter: - fileIDToRecycleName: - 21300000: GameOverEllen_0 - 21300002: GameOverEllen_1 - 21300004: GameOverEllen_2 - 21300006: GameOverEllen_3 - 21300008: GameOverEllen_4 - 21300010: GameOverEllen_5 - 21300012: GameOverEllen_6 - 21300014: GameOverEllen_7 - 21300016: GameOverEllen_8 - 21300018: GameOverEllen_9 - 21300020: GameOverEllen_10 - 21300022: GameOverEllen_11 - 21300024: GameOverEllen_12 - 21300026: GameOverEllen_13 - 21300028: GameOverEllen_14 - 21300030: GameOverEllen_15 - 21300032: GameOverEllen_16 - 21300034: GameOverEllen_17 - 21300036: GameOverEllen_18 - 21300038: GameOverEllen_19 - 21300040: GameOverEllen_20 - 21300042: GameOverEllen_21 - 21300044: GameOverEllen_22 - 21300046: GameOverEllen_23 + internalIDToNameTable: + - first: + 213: 21300000 + second: GameOverEllen_0 + - first: + 213: 21300002 + second: GameOverEllen_1 + - first: + 213: 21300004 + second: GameOverEllen_2 + - first: + 213: 21300006 + second: GameOverEllen_3 + - first: + 213: 21300008 + second: GameOverEllen_4 + - first: + 213: 21300010 + second: GameOverEllen_5 + - first: + 213: 21300012 + second: GameOverEllen_6 + - first: + 213: 21300014 + second: GameOverEllen_7 + - first: + 213: 21300016 + second: GameOverEllen_8 + - first: + 213: 21300018 + second: GameOverEllen_9 + - first: + 213: 21300020 + second: GameOverEllen_10 + - first: + 213: 21300022 + second: GameOverEllen_11 + - first: + 213: 21300024 + second: GameOverEllen_12 + - first: + 213: 21300026 + second: GameOverEllen_13 + - first: + 213: 21300028 + second: GameOverEllen_14 + - first: + 213: 21300030 + second: GameOverEllen_15 + - first: + 213: 21300032 + second: GameOverEllen_16 + - first: + 213: 21300034 + second: GameOverEllen_17 + - first: + 213: 21300036 + second: GameOverEllen_18 + - first: + 213: 21300038 + second: GameOverEllen_19 + - first: + 213: 21300040 + second: GameOverEllen_20 + - first: + 213: 21300042 + second: GameOverEllen_21 + - first: + 213: 21300044 + second: GameOverEllen_22 + - first: + 213: 21300046 + second: GameOverEllen_23 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -44,9 +92,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -55,9 +106,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -78,11 +129,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 4096 resizeAlgorithm: 0 @@ -92,8 +149,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 4096 resizeAlgorithm: 0 @@ -103,8 +162,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 4096 resizeAlgorithm: 0 @@ -114,7 +175,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 4096 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -134,6 +223,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -154,6 +244,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -174,6 +265,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -194,6 +286,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -214,6 +307,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -234,6 +328,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -254,6 +349,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c2305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -274,6 +370,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e2305410000000000800000000000000 + internalID: 21300014 vertices: [] indices: edges: [] @@ -294,6 +391,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 03305410000000000800000000000000 + internalID: 21300016 vertices: [] indices: edges: [] @@ -314,6 +412,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 23305410000000000800000000000000 + internalID: 21300018 vertices: [] indices: edges: [] @@ -334,6 +433,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 43305410000000000800000000000000 + internalID: 21300020 vertices: [] indices: edges: [] @@ -354,6 +454,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 63305410000000000800000000000000 + internalID: 21300022 vertices: [] indices: edges: [] @@ -374,6 +475,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 83305410000000000800000000000000 + internalID: 21300024 vertices: [] indices: edges: [] @@ -394,6 +496,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a3305410000000000800000000000000 + internalID: 21300026 vertices: [] indices: edges: [] @@ -414,6 +517,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c3305410000000000800000000000000 + internalID: 21300028 vertices: [] indices: edges: [] @@ -434,6 +538,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e3305410000000000800000000000000 + internalID: 21300030 vertices: [] indices: edges: [] @@ -454,6 +559,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 04305410000000000800000000000000 + internalID: 21300032 vertices: [] indices: edges: [] @@ -474,6 +580,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 24305410000000000800000000000000 + internalID: 21300034 vertices: [] indices: edges: [] @@ -494,6 +601,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 44305410000000000800000000000000 + internalID: 21300036 vertices: [] indices: edges: [] @@ -514,6 +622,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 64305410000000000800000000000000 + internalID: 21300038 vertices: [] indices: edges: [] @@ -534,6 +643,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 84305410000000000800000000000000 + internalID: 21300040 vertices: [] indices: edges: [] @@ -554,6 +664,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a4305410000000000800000000000000 + internalID: 21300042 vertices: [] indices: edges: [] @@ -574,6 +685,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c4305410000000000800000000000000 + internalID: 21300044 vertices: [] indices: edges: [] @@ -594,6 +706,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e4305410000000000800000000000000 + internalID: 21300046 vertices: [] indices: edges: [] @@ -602,13 +715,39 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + GameOverEllen_0: 21300000 + GameOverEllen_1: 21300002 + GameOverEllen_10: 21300020 + GameOverEllen_11: 21300022 + GameOverEllen_12: 21300024 + GameOverEllen_13: 21300026 + GameOverEllen_14: 21300028 + GameOverEllen_15: 21300030 + GameOverEllen_16: 21300032 + GameOverEllen_17: 21300034 + GameOverEllen_18: 21300036 + GameOverEllen_19: 21300038 + GameOverEllen_2: 21300004 + GameOverEllen_20: 21300040 + GameOverEllen_21: 21300042 + GameOverEllen_22: 21300044 + GameOverEllen_23: 21300046 + GameOverEllen_3: 21300006 + GameOverEllen_4: 21300008 + GameOverEllen_5: 21300010 + GameOverEllen_6: 21300012 + GameOverEllen_7: 21300014 + GameOverEllen_8: 21300016 + GameOverEllen_9: 21300018 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/UI/Menu/Loading.png.meta b/Assets/Game Assets/Art/Sprites/UI/Menu/Loading.png.meta index ebb51af3d6..94588304b4 100644 --- a/Assets/Game Assets/Art/Sprites/UI/Menu/Loading.png.meta +++ b/Assets/Game Assets/Art/Sprites/UI/Menu/Loading.png.meta @@ -1,17 +1,33 @@ fileFormatVersion: 2 guid: dfb323e4dde4be54f998e71325c9a717 TextureImporter: - fileIDToRecycleName: - 21300000: Loading_0 - 21300002: Loading_1 - 21300004: Loading_2 - 21300006: Loading_3 - 21300008: Loading_4 - 21300010: Loading_5 - 21300012: Loading_6 - 21300014: Loading_7 + internalIDToNameTable: + - first: + 213: 21300000 + second: Loading_0 + - first: + 213: 21300002 + second: Loading_1 + - first: + 213: 21300004 + second: Loading_2 + - first: + 213: 21300006 + second: Loading_3 + - first: + 213: 21300008 + second: Loading_4 + - first: + 213: 21300010 + second: Loading_5 + - first: + 213: 21300012 + second: Loading_6 + - first: + 213: 21300014 + second: Loading_7 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -28,9 +44,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -39,9 +58,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -62,11 +81,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -76,8 +101,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -87,8 +114,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -98,7 +127,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -118,6 +175,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -138,6 +196,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -158,6 +217,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -178,6 +238,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -198,6 +259,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -218,6 +280,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -238,6 +301,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c2305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -258,6 +322,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e2305410000000000800000000000000 + internalID: 21300014 vertices: [] indices: edges: [] @@ -266,13 +331,23 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + Loading_0: 21300000 + Loading_1: 21300002 + Loading_2: 21300004 + Loading_3: 21300006 + Loading_4: 21300008 + Loading_5: 21300010 + Loading_6: 21300012 + Loading_7: 21300014 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/UI/Menu/LoadingChomper.png.meta b/Assets/Game Assets/Art/Sprites/UI/Menu/LoadingChomper.png.meta index d47650f8d4..9c7a06980c 100644 --- a/Assets/Game Assets/Art/Sprites/UI/Menu/LoadingChomper.png.meta +++ b/Assets/Game Assets/Art/Sprites/UI/Menu/LoadingChomper.png.meta @@ -1,17 +1,33 @@ fileFormatVersion: 2 guid: db417fe29ca346946b5392ada84eaf0d TextureImporter: - fileIDToRecycleName: - 21300000: LoadingChomper_0 - 21300002: LoadingChomper_1 - 21300004: LoadingChomper_2 - 21300006: LoadingChomper_3 - 21300008: LoadingChomper_4 - 21300010: LoadingChomper_5 - 21300012: LoadingChomper_6 - 21300014: LoadingChomper_7 + internalIDToNameTable: + - first: + 213: 21300000 + second: LoadingChomper_0 + - first: + 213: 21300002 + second: LoadingChomper_1 + - first: + 213: 21300004 + second: LoadingChomper_2 + - first: + 213: 21300006 + second: LoadingChomper_3 + - first: + 213: 21300008 + second: LoadingChomper_4 + - first: + 213: 21300010 + second: LoadingChomper_5 + - first: + 213: 21300012 + second: LoadingChomper_6 + - first: + 213: 21300014 + second: LoadingChomper_7 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -28,9 +44,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -39,9 +58,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -62,11 +81,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -76,8 +101,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -87,8 +114,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -98,7 +127,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -118,6 +175,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -138,6 +196,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -158,6 +217,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -178,6 +238,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -198,6 +259,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -218,6 +280,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -238,6 +301,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c2305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -258,6 +322,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e2305410000000000800000000000000 + internalID: 21300014 vertices: [] indices: edges: [] @@ -266,13 +331,23 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + LoadingChomper_0: 21300000 + LoadingChomper_1: 21300002 + LoadingChomper_2: 21300004 + LoadingChomper_3: 21300006 + LoadingChomper_4: 21300008 + LoadingChomper_5: 21300010 + LoadingChomper_6: 21300012 + LoadingChomper_7: 21300014 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/UI/Menu/OptionsCloseButton.png.meta b/Assets/Game Assets/Art/Sprites/UI/Menu/OptionsCloseButton.png.meta index 0ea774e83b..9d7d428227 100644 --- a/Assets/Game Assets/Art/Sprites/UI/Menu/OptionsCloseButton.png.meta +++ b/Assets/Game Assets/Art/Sprites/UI/Menu/OptionsCloseButton.png.meta @@ -1,11 +1,15 @@ fileFormatVersion: 2 guid: d3c4e35f6af02a840a9461e0aee32e4a TextureImporter: - fileIDToRecycleName: - 21300000: OptionsCloseButton_0 - 21300002: OptionsCloseButton_1 + internalIDToNameTable: + - first: + 213: 21300000 + second: OptionsCloseButton_0 + - first: + 213: 21300002 + second: OptionsCloseButton_1 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,9 +26,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,9 +40,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -56,11 +63,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -70,8 +83,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -81,8 +96,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -92,7 +109,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -112,6 +157,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -132,6 +178,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -140,13 +187,17 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + OptionsCloseButton_0: 21300000 + OptionsCloseButton_1: 21300002 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/UI/Menu/OptionsMenu9Slice.png.meta b/Assets/Game Assets/Art/Sprites/UI/Menu/OptionsMenu9Slice.png.meta index e58e31e6bc..71a50dfd1b 100644 --- a/Assets/Game Assets/Art/Sprites/UI/Menu/OptionsMenu9Slice.png.meta +++ b/Assets/Game Assets/Art/Sprites/UI/Menu/OptionsMenu9Slice.png.meta @@ -1,12 +1,18 @@ fileFormatVersion: 2 guid: 347c9750b492608498affdb981cbf7f1 TextureImporter: - fileIDToRecycleName: - 21300000: OptionsMenu9Slice_0 - 21300002: OptionsMenu9Slice_1 - 21300004: OptionsMenu9Slice_2 + internalIDToNameTable: + - first: + 213: 21300000 + second: OptionsMenu9Slice_0 + - first: + 213: 21300002 + second: OptionsMenu9Slice_1 + - first: + 213: 21300004 + second: OptionsMenu9Slice_2 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,9 +29,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -34,9 +43,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -57,11 +66,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -71,8 +86,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -82,8 +99,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -93,7 +112,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -113,6 +160,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -133,6 +181,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -153,6 +202,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -161,13 +211,18 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + OptionsMenu9Slice_0: 21300000 + OptionsMenu9Slice_1: 21300002 + OptionsMenu9Slice_2: 21300004 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/UI/Menu/StartLogo.png.meta b/Assets/Game Assets/Art/Sprites/UI/Menu/StartLogo.png.meta index a2fa454f69..d1bc6a10af 100644 --- a/Assets/Game Assets/Art/Sprites/UI/Menu/StartLogo.png.meta +++ b/Assets/Game Assets/Art/Sprites/UI/Menu/StartLogo.png.meta @@ -1,12 +1,18 @@ fileFormatVersion: 2 guid: a5ace13b550b5e54587948013cac9a8d TextureImporter: - fileIDToRecycleName: - 21300000: StartLogo_0 - 21300002: StartLogo_1 - 21300004: StartLogo_2 + internalIDToNameTable: + - first: + 213: 21300000 + second: StartLogo_0 + - first: + 213: 21300002 + second: StartLogo_1 + - first: + 213: 21300004 + second: StartLogo_2 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -23,9 +29,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -34,9 +43,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -57,11 +66,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -71,8 +86,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -82,8 +99,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -93,7 +112,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -113,6 +160,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -133,6 +181,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -153,6 +202,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -161,13 +211,18 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + StartLogo_0: 21300000 + StartLogo_1: 21300002 + StartLogo_2: 21300004 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/UI/Menu/StartMenu.png.meta b/Assets/Game Assets/Art/Sprites/UI/Menu/StartMenu.png.meta index 6735dd119e..b5dbe54ba3 100644 --- a/Assets/Game Assets/Art/Sprites/UI/Menu/StartMenu.png.meta +++ b/Assets/Game Assets/Art/Sprites/UI/Menu/StartMenu.png.meta @@ -1,13 +1,21 @@ fileFormatVersion: 2 guid: 7f83de9ce1b2e9a4882fa64589108f14 TextureImporter: - fileIDToRecycleName: - 21300000: StartMenu_BG - 21300002: StartMenu_Indicator - 21300004: StartMenu_ButtonDefault - 21300006: StartMenu_ButtonHighlighted + internalIDToNameTable: + - first: + 213: 21300000 + second: StartMenu_BG + - first: + 213: 21300002 + second: StartMenu_Indicator + - first: + 213: 21300004 + second: StartMenu_ButtonDefault + - first: + 213: 21300006 + second: StartMenu_ButtonHighlighted externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -24,9 +32,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -35,9 +46,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -58,11 +69,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -72,8 +89,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -83,8 +102,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -94,7 +115,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -114,6 +163,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -134,6 +184,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -154,6 +205,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -174,6 +226,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -182,13 +235,19 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + StartMenu_BG: 21300000 + StartMenu_ButtonDefault: 21300004 + StartMenu_ButtonHighlighted: 21300006 + StartMenu_Indicator: 21300002 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/VFX/Ellen/BulletImpact2.png.meta b/Assets/Game Assets/Art/Sprites/VFX/Ellen/BulletImpact2.png.meta index 33a8f97b63..83f92ea467 100644 --- a/Assets/Game Assets/Art/Sprites/VFX/Ellen/BulletImpact2.png.meta +++ b/Assets/Game Assets/Art/Sprites/VFX/Ellen/BulletImpact2.png.meta @@ -1,13 +1,21 @@ fileFormatVersion: 2 guid: 89f413bb94de50745831d20f00d673f7 TextureImporter: - fileIDToRecycleName: - 21300000: BulletImpact2_0 - 21300002: BulletImpact2_1 - 21300004: BulletImpact2_2 - 21300006: BulletImpact2_3 + internalIDToNameTable: + - first: + 213: 21300000 + second: BulletImpact2_0 + - first: + 213: 21300002 + second: BulletImpact2_1 + - first: + 213: 21300004 + second: BulletImpact2_2 + - first: + 213: 21300006 + second: BulletImpact2_3 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -24,9 +32,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -35,12 +46,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -58,11 +69,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -72,8 +89,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -83,8 +102,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -94,7 +115,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -114,6 +163,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -134,6 +184,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -154,6 +205,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -174,6 +226,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -182,13 +235,19 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + BulletImpact2_0: 21300000 + BulletImpact2_1: 21300002 + BulletImpact2_2: 21300004 + BulletImpact2_3: 21300006 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/VFX/Enemies/Gunner/GunnerProjectileTrail.png.meta b/Assets/Game Assets/Art/Sprites/VFX/Enemies/Gunner/GunnerProjectileTrail.png.meta index f7a60145a8..53727274fc 100644 --- a/Assets/Game Assets/Art/Sprites/VFX/Enemies/Gunner/GunnerProjectileTrail.png.meta +++ b/Assets/Game Assets/Art/Sprites/VFX/Enemies/Gunner/GunnerProjectileTrail.png.meta @@ -1,13 +1,21 @@ fileFormatVersion: 2 guid: 8a19221d6ae43a74ca56c12fa30895fa TextureImporter: - fileIDToRecycleName: - 21300000: GunnerProjectileTrail_0 - 21300002: GunnerProjectileTrail_1 - 21300004: GunnerProjectileTrail_2 - 21300006: GunnerProjectileTrail_3 + internalIDToNameTable: + - first: + 213: 21300000 + second: GunnerProjectileTrail_0 + - first: + 213: 21300002 + second: GunnerProjectileTrail_1 + - first: + 213: 21300004 + second: GunnerProjectileTrail_2 + - first: + 213: 21300006 + second: GunnerProjectileTrail_3 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -24,9 +32,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -35,12 +46,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -58,11 +69,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -72,8 +89,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -83,8 +102,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -94,7 +115,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -114,6 +163,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -134,6 +184,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -154,6 +205,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -174,6 +226,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -182,13 +235,19 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + GunnerProjectileTrail_0: 21300000 + GunnerProjectileTrail_1: 21300002 + GunnerProjectileTrail_2: 21300004 + GunnerProjectileTrail_3: 21300006 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/VFX/Environment/AcidBubbles.png.meta b/Assets/Game Assets/Art/Sprites/VFX/Environment/AcidBubbles.png.meta index adcf048c3f..9f6bb6f2ca 100644 --- a/Assets/Game Assets/Art/Sprites/VFX/Environment/AcidBubbles.png.meta +++ b/Assets/Game Assets/Art/Sprites/VFX/Environment/AcidBubbles.png.meta @@ -1,21 +1,45 @@ fileFormatVersion: 2 guid: 86d5ee14dfb5a6342ad6aae1133f4561 TextureImporter: - fileIDToRecycleName: - 21300000: AcidBubbles_0 - 21300002: AcidBubbles_1 - 21300004: AcidBubbles_2 - 21300006: AcidBubbles_3 - 21300008: AcidBubbles_4 - 21300010: AcidBubbles_5 - 21300012: AcidBubbles_6 - 21300014: AcidBubbles_7 - 21300016: AcidBubbles_8 - 21300018: AcidBubbles_9 - 21300020: AcidBubbles_10 - 21300022: AcidBubbles_11 + internalIDToNameTable: + - first: + 213: 21300000 + second: AcidBubbles_0 + - first: + 213: 21300002 + second: AcidBubbles_1 + - first: + 213: 21300004 + second: AcidBubbles_2 + - first: + 213: 21300006 + second: AcidBubbles_3 + - first: + 213: 21300008 + second: AcidBubbles_4 + - first: + 213: 21300010 + second: AcidBubbles_5 + - first: + 213: 21300012 + second: AcidBubbles_6 + - first: + 213: 21300014 + second: AcidBubbles_7 + - first: + 213: 21300016 + second: AcidBubbles_8 + - first: + 213: 21300018 + second: AcidBubbles_9 + - first: + 213: 21300020 + second: AcidBubbles_10 + - first: + 213: 21300022 + second: AcidBubbles_11 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -32,9 +56,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -43,12 +70,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -66,11 +93,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,8 +113,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -91,8 +126,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -102,7 +139,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -122,6 +187,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -142,6 +208,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -162,6 +229,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -182,6 +250,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -202,6 +271,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 82305410000000000800000000000000 + internalID: 21300008 vertices: [] indices: edges: [] @@ -222,6 +292,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: a2305410000000000800000000000000 + internalID: 21300010 vertices: [] indices: edges: [] @@ -242,6 +313,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: c2305410000000000800000000000000 + internalID: 21300012 vertices: [] indices: edges: [] @@ -262,6 +334,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: e2305410000000000800000000000000 + internalID: 21300014 vertices: [] indices: edges: [] @@ -282,6 +355,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 03305410000000000800000000000000 + internalID: 21300016 vertices: [] indices: edges: [] @@ -302,6 +376,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 23305410000000000800000000000000 + internalID: 21300018 vertices: [] indices: edges: [] @@ -322,6 +397,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 43305410000000000800000000000000 + internalID: 21300020 vertices: [] indices: edges: [] @@ -342,6 +418,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 63305410000000000800000000000000 + internalID: 21300022 vertices: [] indices: edges: [] @@ -350,13 +427,27 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + AcidBubbles_0: 21300000 + AcidBubbles_1: 21300002 + AcidBubbles_10: 21300020 + AcidBubbles_11: 21300022 + AcidBubbles_2: 21300004 + AcidBubbles_3: 21300006 + AcidBubbles_4: 21300008 + AcidBubbles_5: 21300010 + AcidBubbles_6: 21300012 + AcidBubbles_7: 21300014 + AcidBubbles_8: 21300016 + AcidBubbles_9: 21300018 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/VFX/Environment/GrassParticle.png.meta b/Assets/Game Assets/Art/Sprites/VFX/Environment/GrassParticle.png.meta index e0f2489183..38603fa71c 100644 --- a/Assets/Game Assets/Art/Sprites/VFX/Environment/GrassParticle.png.meta +++ b/Assets/Game Assets/Art/Sprites/VFX/Environment/GrassParticle.png.meta @@ -1,13 +1,21 @@ fileFormatVersion: 2 guid: dd3db44cdc8893543b8752999d323ba2 TextureImporter: - fileIDToRecycleName: - 21300000: GrassParticle_0 - 21300002: GrassParticle_1 - 21300004: GrassParticle_2 - 21300006: GrassParticle_3 + internalIDToNameTable: + - first: + 213: 21300000 + second: GrassParticle_0 + - first: + 213: 21300002 + second: GrassParticle_1 + - first: + 213: 21300004 + second: GrassParticle_2 + - first: + 213: 21300006 + second: GrassParticle_3 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -24,9 +32,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -35,12 +46,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -58,11 +69,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -72,8 +89,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -83,8 +102,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -94,7 +115,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -114,6 +163,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -134,6 +184,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -154,6 +205,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -174,6 +226,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -182,13 +235,19 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + GrassParticle_0: 21300000 + GrassParticle_1: 21300002 + GrassParticle_2: 21300004 + GrassParticle_3: 21300006 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/VFX/Environment/Mist.png.meta b/Assets/Game Assets/Art/Sprites/VFX/Environment/Mist.png.meta index 9c6fbf16a9..5aaaa82df2 100644 --- a/Assets/Game Assets/Art/Sprites/VFX/Environment/Mist.png.meta +++ b/Assets/Game Assets/Art/Sprites/VFX/Environment/Mist.png.meta @@ -1,11 +1,15 @@ fileFormatVersion: 2 guid: 1f36800460882774b85c7622b070106b TextureImporter: - fileIDToRecycleName: - 21300000: Mist_0 - 21300002: Mist_1 + internalIDToNameTable: + - first: + 213: 21300000 + second: Mist_0 + - first: + 213: 21300002 + second: Mist_1 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,9 +26,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,9 +40,9 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 wrapW: 1 @@ -56,11 +63,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -70,8 +83,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -81,8 +96,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -92,7 +109,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -112,6 +157,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -132,6 +178,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -140,13 +187,17 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + Mist_0: 21300000 + Mist_1: 21300002 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/VFX/Environment/SplashDrops.png.meta b/Assets/Game Assets/Art/Sprites/VFX/Environment/SplashDrops.png.meta index 7d58d285d7..4bb06fee57 100644 --- a/Assets/Game Assets/Art/Sprites/VFX/Environment/SplashDrops.png.meta +++ b/Assets/Game Assets/Art/Sprites/VFX/Environment/SplashDrops.png.meta @@ -1,11 +1,15 @@ fileFormatVersion: 2 guid: c152f8f2446244548aadd2bb39e31ca1 TextureImporter: - fileIDToRecycleName: - 21300000: SplashDrops_0 - 21300002: SplashDrops_1 + internalIDToNameTable: + - first: + 213: 21300000 + second: SplashDrops_0 + - first: + 213: 21300002 + second: SplashDrops_1 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -22,9 +26,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -33,12 +40,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -56,11 +63,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -70,8 +83,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -81,8 +96,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -92,7 +109,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -112,6 +157,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -132,6 +178,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -140,13 +187,17 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + SplashDrops_0: 21300000 + SplashDrops_1: 21300002 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/VFX/Interactables/RockChunks.png.meta b/Assets/Game Assets/Art/Sprites/VFX/Interactables/RockChunks.png.meta index 634ad535b1..d1552959fc 100644 --- a/Assets/Game Assets/Art/Sprites/VFX/Interactables/RockChunks.png.meta +++ b/Assets/Game Assets/Art/Sprites/VFX/Interactables/RockChunks.png.meta @@ -1,13 +1,21 @@ fileFormatVersion: 2 guid: 41ee6cd071cd1574d96bfdea097a48d1 TextureImporter: - fileIDToRecycleName: - 21300000: RockChunks_0 - 21300002: RockChunks_1 - 21300004: RockChunks_2 - 21300006: RockChunks_3 + internalIDToNameTable: + - first: + 213: 21300000 + second: RockChunks_0 + - first: + 213: 21300002 + second: RockChunks_1 + - first: + 213: 21300004 + second: RockChunks_2 + - first: + 213: 21300006 + second: RockChunks_3 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -24,9 +32,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -35,12 +46,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -58,11 +69,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -72,8 +89,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -83,8 +102,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -94,7 +115,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -114,6 +163,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -134,6 +184,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -154,6 +205,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -174,6 +226,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -182,13 +235,19 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + RockChunks_0: 21300000 + RockChunks_1: 21300002 + RockChunks_2: 21300004 + RockChunks_3: 21300006 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Art/Sprites/VFX/Interactables/RockChunks.tif.meta b/Assets/Game Assets/Art/Sprites/VFX/Interactables/RockChunks.tif.meta index 4d728c47c9..c2b0b77af8 100644 --- a/Assets/Game Assets/Art/Sprites/VFX/Interactables/RockChunks.tif.meta +++ b/Assets/Game Assets/Art/Sprites/VFX/Interactables/RockChunks.tif.meta @@ -1,13 +1,21 @@ fileFormatVersion: 2 guid: acf8e7c6211d47045a0288178dcac305 TextureImporter: - fileIDToRecycleName: - 21300000: RockChunks_0 - 21300002: RockChunks_1 - 21300004: RockChunks_2 - 21300006: RockChunks_3 + internalIDToNameTable: + - first: + 213: 21300000 + second: RockChunks_0 + - first: + 213: 21300002 + second: RockChunks_1 + - first: + 213: 21300004 + second: RockChunks_2 + - first: + 213: 21300006 + second: RockChunks_3 externalObjects: {} - serializedVersion: 9 + serializedVersion: 12 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -24,9 +32,12 @@ TextureImporter: externalNormalMap: 0 heightScale: 0.25 normalMapFilter: 0 + flipGreenChannel: 0 isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 grayScaleToAlpha: 0 generateCubemap: 6 cubemapConvolution: 0 @@ -35,12 +46,12 @@ TextureImporter: maxTextureSize: 2048 textureSettings: serializedVersion: 2 - filterMode: -1 - aniso: -1 - mipBias: -100 + filterMode: 1 + aniso: 1 + mipBias: 0 wrapU: 1 wrapV: 1 - wrapW: -1 + wrapW: 0 nPOTScale: 0 lightmap: 0 compressionQuality: 50 @@ -58,11 +69,17 @@ TextureImporter: textureType: 8 textureShape: 1 singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 maxTextureSizeSet: 0 compressionQualitySet: 0 textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 1 + swizzle: 50462976 + cookieLightType: 1 platformSettings: - - serializedVersion: 2 + - serializedVersion: 3 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -72,8 +89,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -83,8 +102,10 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 - - serializedVersion: 2 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 buildTarget: Android maxTextureSize: 2048 resizeAlgorithm: 0 @@ -94,7 +115,35 @@ TextureImporter: crunchedCompression: 0 allowsAlphaSplitting: 0 overridden: 0 + ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: iPhone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 1 spriteSheet: serializedVersion: 2 sprites: @@ -114,6 +163,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 02305410000000000800000000000000 + internalID: 21300000 vertices: [] indices: edges: [] @@ -134,6 +184,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 22305410000000000800000000000000 + internalID: 21300002 vertices: [] indices: edges: [] @@ -154,6 +205,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 42305410000000000800000000000000 + internalID: 21300004 vertices: [] indices: edges: [] @@ -174,6 +226,7 @@ TextureImporter: tessellationDetail: 0 bones: [] spriteID: 62305410000000000800000000000000 + internalID: 21300006 vertices: [] indices: edges: [] @@ -182,13 +235,19 @@ TextureImporter: physicsShape: [] bones: [] spriteID: + internalID: 0 vertices: [] indices: edges: [] weights: [] - spritePackingTag: + secondaryTextures: [] + nameFileIdTable: + RockChunks_0: 21300000 + RockChunks_1: 21300002 + RockChunks_2: 21300004 + RockChunks_3: 21300006 + mipmapLimitGroupName: pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 userData: assetBundleName: assetBundleVariant: diff --git a/Assets/Game Assets/Prefab.meta b/Assets/Game Assets/Prefab.meta new file mode 100644 index 0000000000..79157723d4 --- /dev/null +++ b/Assets/Game Assets/Prefab.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 78df6681971174f1c8aa027f20f7295d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Prefab/Player.prefab b/Assets/Game Assets/Prefab/Player.prefab new file mode 100644 index 0000000000..51257698f2 --- /dev/null +++ b/Assets/Game Assets/Prefab/Player.prefab @@ -0,0 +1,108 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &328097028837166983 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3593540518909196710} + - component: {fileID: 7709620395850905416} + - component: {fileID: 5820244955174857028} + m_Layer: 0 + m_Name: Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3593540518909196710 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 328097028837166983} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &7709620395850905416 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 328097028837166983} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: c4d7d6470acd7bf45971042161c6e018, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.7534883, y: 2.8325582} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &5820244955174857028 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 328097028837166983} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 5a5995370fc954e219729b95b7be89cd, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 diff --git a/Assets/Game Assets/Prefab/Player.prefab.meta b/Assets/Game Assets/Prefab/Player.prefab.meta new file mode 100644 index 0000000000..64609580bc --- /dev/null +++ b/Assets/Game Assets/Prefab/Player.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2d26a819bd59c42f09e953f24c366259 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources.meta b/Assets/Resources.meta new file mode 100644 index 0000000000..07a6b1b3bb --- /dev/null +++ b/Assets/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 87110825aec0240d58052e28f1b67769 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/BillingMode.json b/Assets/Resources/BillingMode.json new file mode 100644 index 0000000000..6f4bfb7103 --- /dev/null +++ b/Assets/Resources/BillingMode.json @@ -0,0 +1 @@ +{"androidStore":"GooglePlay"} \ No newline at end of file diff --git a/Assets/Resources/BillingMode.json.meta b/Assets/Resources/BillingMode.json.meta new file mode 100644 index 0000000000..f98e141122 --- /dev/null +++ b/Assets/Resources/BillingMode.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6374e4d5da0ca4ae3b485801677b57bf +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/AnimationTest.unity b/Assets/Scenes/AnimationTest.unity new file mode 100644 index 0000000000..a7516c9fff --- /dev/null +++ b/Assets/Scenes/AnimationTest.unity @@ -0,0 +1,307 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 0 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 4890085278179872738, guid: 47d2fc78f5b4c4b1a97f298b8613f162, + type: 2} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &519420028 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 519420032} + - component: {fileID: 519420031} + - component: {fileID: 519420029} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &519420029 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 +--- !u!20 &519420031 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 0 + m_HDR: 1 + m_AllowMSAA: 0 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 0 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &519420032 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 519420028} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -10} + 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!1001 &2101336368777957266 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 328097028837166983, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_Name + value: Player + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalScale.x + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalScale.y + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalScale.z + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalPosition.y + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2d26a819bd59c42f09e953f24c366259, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 519420032} + - {fileID: 2101336368777957266} diff --git a/Assets/Scenes/SampleScene.unity.meta b/Assets/Scenes/AnimationTest.unity.meta similarity index 100% rename from Assets/Scenes/SampleScene.unity.meta rename to Assets/Scenes/AnimationTest.unity.meta diff --git a/Assets/Scenes/AnimationTestSettings.lighting b/Assets/Scenes/AnimationTestSettings.lighting new file mode 100644 index 0000000000..7f04862da8 --- /dev/null +++ b/Assets/Scenes/AnimationTestSettings.lighting @@ -0,0 +1,66 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!850595691 &4890085278179872738 +LightingSettings: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: AnimationTestSettings + serializedVersion: 6 + m_GIWorkflowMode: 1 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_RealtimeEnvironmentLighting: 1 + m_BounceScale: 1 + m_AlbedoBoost: 1 + m_IndirectOutputScale: 1 + m_UsingShadowmask: 1 + m_BakeBackend: 0 + m_LightmapMaxSize: 1024 + m_BakeResolution: 40 + m_Padding: 2 + m_LightmapCompression: 3 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAO: 0 + m_MixedBakeMode: 2 + m_LightmapsBakeMode: 1 + m_FilterMode: 1 + m_LightmapParameters: {fileID: 15204, guid: 0000000000000000f000000000000000, type: 0} + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_RealtimeResolution: 2 + m_ForceWhiteAlbedo: 0 + m_ForceUpdates: 0 + m_FinalGather: 0 + m_FinalGatherRayCount: 256 + m_FinalGatherFiltering: 1 + m_PVRCulling: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVREnvironmentSampleCount: 512 + m_PVREnvironmentReferencePointCount: 2048 + m_LightProbeSampleCountMultiplier: 4 + m_PVRBounces: 2 + m_PVRMinBounces: 2 + m_PVREnvironmentImportanceSampling: 0 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_PVRTiledBaking: 0 + m_NumRaysToShootPerTexel: -1 + m_RespectSceneVisibilityWhenBakingGI: 0 diff --git a/Assets/Scenes/AnimationTestSettings.lighting.meta b/Assets/Scenes/AnimationTestSettings.lighting.meta new file mode 100644 index 0000000000..16fe2d82a8 --- /dev/null +++ b/Assets/Scenes/AnimationTestSettings.lighting.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 47d2fc78f5b4c4b1a97f298b8613f162 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 4890085278179872738 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity deleted file mode 100644 index e5ecd0a002..0000000000 --- a/Assets/Scenes/SampleScene.unity +++ /dev/null @@ -1,188 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 3 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 11 - m_GIWorkflowMode: 1 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 0 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 10 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 0 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 500 - m_PVRBounces: 2 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVRFilteringMode: 1 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ShowResolutionOverlay: 1 - m_LightingDataAsset: {fileID: 0} - m_UseShadowmask: 1 ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 2 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - accuratePlacement: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &519420028 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 519420032} - - component: {fileID: 519420031} - - component: {fileID: 519420029} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &519420029 -AudioListener: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_Enabled: 1 ---- !u!20 &519420031 -Camera: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 2 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 0 - m_HDR: 1 - m_AllowMSAA: 0 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 0 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &519420032 -Transform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} - 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} diff --git a/Packages/manifest.json b/Packages/manifest.json index 49d6c9e048..21c0299072 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,12 +1,22 @@ { "dependencies": { - "com.unity.ads": "2.0.8", - "com.unity.analytics": "3.2.3", - "com.unity.collab-proxy": "1.2.15", - "com.unity.package-manager-ui": "2.0.8", - "com.unity.purchasing": "2.0.3", - "com.unity.textmeshpro": "1.4.1", + "com.unity.2d.sprite": "1.0.0", + "com.unity.2d.tilemap": "1.0.0", + "com.unity.ads": "4.4.2", + "com.unity.ai.navigation": "1.1.5", + "com.unity.analytics": "3.8.1", + "com.unity.collab-proxy": "2.2.0", + "com.unity.ide.rider": "3.0.25", + "com.unity.ide.visualstudio": "2.0.21", + "com.unity.ide.vscode": "1.2.5", + "com.unity.purchasing": "4.9.3", + "com.unity.test-framework": "1.1.33", + "com.unity.textmeshpro": "3.0.6", + "com.unity.timeline": "1.7.6", + "com.unity.ugui": "1.0.0", + "com.unity.xr.legacyinputhelpers": "2.1.10", "com.unity.modules.ai": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", "com.unity.modules.assetbundle": "1.0.0", "com.unity.modules.audio": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json new file mode 100644 index 0000000000..0a4c735197 --- /dev/null +++ b/Packages/packages-lock.json @@ -0,0 +1,423 @@ +{ + "dependencies": { + "com.unity.2d.sprite": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.2d.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.uielements": "1.0.0" + } + }, + "com.unity.ads": { + "version": "4.4.2", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ai.navigation": { + "version": "1.1.5", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.ai": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.analytics": { + "version": "3.8.1", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.services.analytics": "1.0.4", + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.collab-proxy": { + "version": "2.2.0", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ext.nunit": { + "version": "1.0.6", + "depth": 1, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.ide.rider": { + "version": "3.0.25", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.6" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.visualstudio": { + "version": "2.0.21", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.test-framework": "1.1.9" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ide.vscode": { + "version": "1.2.5", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.nuget.newtonsoft-json": { + "version": "3.2.1", + "depth": 2, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, + "com.unity.purchasing": { + "version": "4.9.3", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.androidjni": "1.0.0", + "com.unity.services.core": "1.8.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.analytics": { + "version": "5.0.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.services.core": "1.10.1" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.core": { + "version": "1.11.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.modules.androidjni": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.test-framework": { + "version": "1.1.33", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ext.nunit": "1.0.6", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.textmeshpro": { + "version": "3.0.6", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.timeline": { + "version": "1.7.6", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.director": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.ugui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0" + } + }, + "com.unity.xr.legacyinputhelpers": { + "version": "2.1.10", + "depth": 0, + "source": "registry", + "dependencies": { + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.xr": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.modules.ai": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.androidjni": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.animation": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.assetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.audio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.cloth": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.director": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.animation": "1.0.0" + } + }, + "com.unity.modules.imageconversion": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.imgui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.jsonserialize": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.particlesystem": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.physics2d": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.screencapture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.subsystems": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.terrain": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.terrainphysics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.terrain": "1.0.0" + } + }, + "com.unity.modules.tilemap": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics2d": "1.0.0" + } + }, + "com.unity.modules.ui": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.uielements": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.umbra": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unityanalytics": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" + } + }, + "com.unity.modules.unitywebrequest": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.unitywebrequestassetbundle": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestaudio": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.audio": "1.0.0" + } + }, + "com.unity.modules.unitywebrequesttexture": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.unitywebrequestwww": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0" + } + }, + "com.unity.modules.vehicles": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0" + } + }, + "com.unity.modules.video": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0" + } + }, + "com.unity.modules.vr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } + }, + "com.unity.modules.wind": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, + "com.unity.modules.xr": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": { + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.subsystems": "1.0.0" + } + } + } +} diff --git a/ProjectSettings/MemorySettings.asset b/ProjectSettings/MemorySettings.asset new file mode 100644 index 0000000000..5b5facecac --- /dev/null +++ b/ProjectSettings/MemorySettings.asset @@ -0,0 +1,35 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!387306366 &1 +MemorySettings: + m_ObjectHideFlags: 0 + m_EditorMemorySettings: + m_MainAllocatorBlockSize: -1 + m_ThreadAllocatorBlockSize: -1 + m_MainGfxBlockSize: -1 + m_ThreadGfxBlockSize: -1 + m_CacheBlockSize: -1 + m_TypetreeBlockSize: -1 + m_ProfilerBlockSize: -1 + m_ProfilerEditorBlockSize: -1 + m_BucketAllocatorGranularity: -1 + m_BucketAllocatorBucketsCount: -1 + m_BucketAllocatorBlockSize: -1 + m_BucketAllocatorBlockCount: -1 + m_ProfilerBucketAllocatorGranularity: -1 + m_ProfilerBucketAllocatorBucketsCount: -1 + m_ProfilerBucketAllocatorBlockSize: -1 + m_ProfilerBucketAllocatorBlockCount: -1 + m_TempAllocatorSizeMain: -1 + m_JobTempAllocatorBlockSize: -1 + m_BackgroundJobTempAllocatorBlockSize: -1 + m_JobTempAllocatorReducedBlockSize: -1 + m_TempAllocatorSizeGIBakingWorker: -1 + m_TempAllocatorSizeNavMeshWorker: -1 + m_TempAllocatorSizeAudioWorker: -1 + m_TempAllocatorSizeCloudWorker: -1 + m_TempAllocatorSizeGfx: -1 + m_TempAllocatorSizeJobWorker: -1 + m_TempAllocatorSizeBackgroundWorker: -1 + m_TempAllocatorSizePreloadManager: -1 + m_PlatformMemorySettings: {} diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset new file mode 100644 index 0000000000..89ffc0e9c1 --- /dev/null +++ b/ProjectSettings/PackageManagerSettings.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 53 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_EnablePreReleasePackages: 0 + m_AdvancedSettingsExpanded: 1 + m_ScopedRegistriesSettingsExpanded: 1 + m_SeeAllPackageVersions: 0 + m_DismissPreviewPackagesInUse: 0 + oneTimeWarningShown: 0 + m_Registries: + - m_Id: main + m_Name: + m_Url: https://packages.unity.com + m_Scopes: [] + m_IsDefault: 1 + m_Capabilities: 7 + m_ConfigSource: 0 + m_UserSelectedRegistryName: + m_UserAddingNewScopedRegistry: 0 + m_RegistryInfoDraft: + m_Modified: 0 + m_ErrorMessage: + m_UserModificationsInstanceId: -864 + m_OriginalInstanceId: -866 + m_LoadAssets: 0 diff --git a/ProjectSettings/Packages/com.unity.services.core/Settings.json b/ProjectSettings/Packages/com.unity.services.core/Settings.json new file mode 100644 index 0000000000..e69de29bb2 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 078b9d65a3..3114f10261 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -3,7 +3,7 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 18 + serializedVersion: 26 productGUID: 04705b78364580b47a37eb33f3caa6d0 AndroidProfiler: 0 AndroidFilterTouchesWhenObscured: 0 @@ -48,13 +48,16 @@ PlayerSettings: defaultScreenHeightWeb: 600 m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 + unsupportedMSAAFallback: 0 + m_SpriteBatchVertexThreshold: 300 m_MTRendering: 1 + mipStripping: 0 + numberOfMipsStripped: 0 + numberOfMipsStrippedPerMipmapLimitGroup: {} m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 - displayResolutionDialog: 1 iosUseCustomAppBackgroundBehavior: 0 - iosAllowHTTPDownload: 1 allowedAutorotateToPortrait: 1 allowedAutorotateToPortraitUpsideDown: 1 allowedAutorotateToLandscapeRight: 1 @@ -65,7 +68,14 @@ PlayerSettings: disableDepthAndStencilBuffers: 0 androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 0 + androidUseSwappy: 0 androidBlitType: 0 + androidResizableWindow: 0 + androidDefaultWindowWidth: 1920 + androidDefaultWindowHeight: 1080 + androidMinimumWindowWidth: 400 + androidMinimumWindowHeight: 300 + androidFullscreenMode: 1 defaultIsNativeResolution: 1 macRetinaSupport: 1 runInBackground: 1 @@ -77,13 +87,14 @@ PlayerSettings: hideHomeButton: 0 submitAnalytics: 1 usePlayerLog: 1 + dedicatedServerOptimizations: 0 bakeCollisionMeshes: 0 forceSingleInstance: 0 + useFlipModelSwapchain: 1 resizableWindow: 0 useMacAppStoreValidation: 0 macAppStoreCategory: public.app-category.games gpuSkinning: 0 - graphicsJobs: 0 xboxPIXTextureCapture: 0 xboxEnableAvatar: 0 xboxEnableKinect: 0 @@ -91,7 +102,6 @@ PlayerSettings: xboxEnableFitness: 0 visibleInBackground: 1 allowFullscreenSwitch: 1 - graphicsJobMode: 0 fullscreenMode: 1 xboxSpeechDB: 0 xboxEnableHeadOrientation: 0 @@ -112,13 +122,20 @@ PlayerSettings: switchNVNShaderPoolsGranularity: 33554432 switchNVNDefaultPoolsGranularity: 16777216 switchNVNOtherPoolsGranularity: 16777216 + switchGpuScratchPoolGranularity: 2097152 + switchAllowGpuScratchShrinking: 0 + switchNVNMaxPublicTextureIDCount: 0 + switchNVNMaxPublicSamplerIDCount: 0 + switchNVNGraphicsFirmwareMemory: 32 + switchMaxWorkerMultiple: 8 + stadiaPresentMode: 0 + stadiaTargetFramerate: 0 + vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 - m_SupportedAspectRatios: - 4:3: 1 - 5:4: 1 - 16:10: 1 - 16:9: 1 - Others: 1 + vulkanEnablePreTransform: 0 + vulkanEnableLateAcquireNextImage: 0 + vulkanEnableCommandBufferRecycling: 1 + loadStoreDebugModeEnabled: 0 bundleVersion: 0.1 preloadedAssets: [] metroInputSource: 0 @@ -126,41 +143,30 @@ PlayerSettings: m_HolographicPauseOnTrackingLoss: 1 xboxOneDisableKinectGpuReservation: 1 xboxOneEnable7thCore: 1 - isWsaHolographicRemotingEnabled: 0 vrSettings: - cardboard: - depthFormat: 0 - enableTransitionView: 0 - daydream: - depthFormat: 0 - useSustainedPerformanceMode: 0 - enableVideoLayer: 0 - useProtectedVideoMemory: 0 - minimumSupportedHeadTracking: 0 - maximumSupportedHeadTracking: 1 - hololens: - depthFormat: 1 - depthBufferSharingEnabled: 1 - oculus: - sharedDepthBuffer: 1 - dashSupport: 1 - lowOverheadMode: 0 - protectedContext: 0 - v2Signing: 0 enable360StereoCapture: 0 - protectGraphicsMemory: 0 + isWsaHolographicRemotingEnabled: 0 enableFrameTimingStats: 0 + enableOpenGLProfilerGPURecorders: 1 + allowHDRDisplaySupport: 0 useHDRDisplay: 0 + hdrBitDepth: 0 m_ColorGamuts: 00000000 targetPixelDensity: 30 resolutionScalingMode: 0 + resetResolutionOnWindowResize: 0 androidSupportedAspectRatio: 1 androidMaxAspectRatio: 2.1 applicationIdentifier: Standalone: com.Company.ProductName - buildNumber: {} + buildNumber: + Standalone: 0 + VisionOS: 0 + iPhone: 0 + tvOS: 0 + overrideDefaultApplicationIdentifier: 1 AndroidBundleVersionCode: 1 - AndroidMinSdkVersion: 16 + AndroidMinSdkVersion: 22 AndroidTargetSdkVersion: 0 AndroidPreferredInstallLocation: 1 aotOptions: @@ -173,30 +179,21 @@ PlayerSettings: APKExpansionFiles: 0 keepLoadedShadersAlive: 0 StripUnusedMeshComponents: 1 + strictShaderVariantMatching: 0 VertexChannelCompressionMask: 4054 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: 9.0 + iOSTargetOSVersionString: 12.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: 9.0 + tvOSTargetOSVersionString: 12.0 + VisionOSSdkVersion: 0 + VisionOSTargetOSVersionString: 1.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 uIStatusBarHidden: 1 uIExitOnSuspend: 0 uIStatusBarStyle: 0 - iPhoneSplashScreen: {fileID: 0} - iPhoneHighResSplashScreen: {fileID: 0} - iPhoneTallHighResSplashScreen: {fileID: 0} - iPhone47inSplashScreen: {fileID: 0} - iPhone55inPortraitSplashScreen: {fileID: 0} - iPhone55inLandscapeSplashScreen: {fileID: 0} - iPhone58inPortraitSplashScreen: {fileID: 0} - iPhone58inLandscapeSplashScreen: {fileID: 0} - iPadPortraitSplashScreen: {fileID: 0} - iPadHighResPortraitSplashScreen: {fileID: 0} - iPadLandscapeSplashScreen: {fileID: 0} - iPadHighResLandscapeSplashScreen: {fileID: 0} appleTVSplashScreen: {fileID: 0} appleTVSplashScreen2x: {fileID: 0} tvOSSmallIconLayers: [] @@ -224,59 +221,325 @@ PlayerSettings: iOSLaunchScreeniPadFillPct: 100 iOSLaunchScreeniPadSize: 100 iOSLaunchScreeniPadCustomXibPath: - iOSUseLaunchScreenStoryboard: 0 iOSLaunchScreenCustomStoryboardPath: + iOSLaunchScreeniPadCustomStoryboardPath: iOSDeviceRequirements: [] iOSURLSchemes: [] + macOSURLSchemes: [] iOSBackgroundModes: 0 iOSMetalForceHardShadows: 0 metalEditorSupport: 1 metalAPIValidation: 1 iOSRenderExtraFrameOnPause: 0 + iosCopyPluginsCodeInsteadOfSymlink: 0 appleDeveloperTeamID: iOSManualSigningProvisioningProfileID: tvOSManualSigningProvisioningProfileID: + VisionOSManualSigningProvisioningProfileID: iOSManualSigningProvisioningProfileType: 0 tvOSManualSigningProvisioningProfileType: 0 + VisionOSManualSigningProvisioningProfileType: 0 appleEnableAutomaticSigning: 0 iOSRequireARKit: 0 iOSAutomaticallyDetectAndAddCapabilities: 1 appleEnableProMotion: 0 + shaderPrecisionModel: 0 clonedFromGUID: 5f34be1353de5cf4398729fda238591b templatePackageId: com.unity.template.2d@1.3.0 templateDefaultScene: Assets/Scenes/SampleScene.unity + useCustomMainManifest: 0 + useCustomLauncherManifest: 0 + useCustomMainGradleTemplate: 0 + useCustomLauncherGradleManifest: 0 + useCustomBaseGradleTemplate: 0 + useCustomGradlePropertiesTemplate: 0 + useCustomGradleSettingsTemplate: 0 + useCustomProguardFile: 0 AndroidTargetArchitectures: 5 + AndroidTargetDevices: 0 AndroidSplashScreenScale: 0 androidSplashScreen: {fileID: 0} AndroidKeystoreName: AndroidKeyaliasName: + AndroidEnableArmv9SecurityFeatures: 0 AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 1 AndroidIsGame: 1 AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 + androidUseCustomKeystore: 0 m_AndroidBanners: - width: 320 height: 180 banner: {fileID: 0} androidGamepadSupportLevel: 0 - resolutionDialogBanner: {fileID: 0} + chromeosInputEmulation: 1 + AndroidMinifyRelease: 0 + AndroidMinifyDebug: 0 + AndroidValidateAppBundleSize: 1 + AndroidAppBundleSizeToValidate: 150 m_BuildTargetIcons: [] - m_BuildTargetPlatformIcons: [] + m_BuildTargetPlatformIcons: + - m_BuildTarget: iPhone + m_Icons: + - m_Textures: [] + m_Width: 180 + m_Height: 180 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 120 + m_Height: 120 + m_Kind: 0 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 167 + m_Height: 167 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 152 + m_Height: 152 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 76 + m_Height: 76 + m_Kind: 0 + m_SubKind: iPad + - m_Textures: [] + m_Width: 120 + m_Height: 120 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 80 + m_Height: 80 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 3 + m_SubKind: iPad + - m_Textures: [] + m_Width: 87 + m_Height: 87 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 58 + m_Height: 58 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 29 + m_Height: 29 + m_Kind: 1 + m_SubKind: iPad + - m_Textures: [] + m_Width: 60 + m_Height: 60 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPhone + - m_Textures: [] + m_Width: 40 + m_Height: 40 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 20 + m_Height: 20 + m_Kind: 2 + m_SubKind: iPad + - m_Textures: [] + m_Width: 1024 + m_Height: 1024 + m_Kind: 4 + m_SubKind: App Store + - m_BuildTarget: Android + m_Icons: + - m_Textures: [] + m_Width: 432 + m_Height: 432 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 324 + m_Height: 324 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 216 + m_Height: 216 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 162 + m_Height: 162 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 108 + m_Height: 108 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 81 + m_Height: 81 + m_Kind: 2 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 1 + m_SubKind: + - m_Textures: [] + m_Width: 192 + m_Height: 192 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 144 + m_Height: 144 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 96 + m_Height: 96 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 72 + m_Height: 72 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 48 + m_Height: 48 + m_Kind: 0 + m_SubKind: + - m_Textures: [] + m_Width: 36 + m_Height: 36 + m_Kind: 0 + m_SubKind: m_BuildTargetBatching: [] - m_BuildTargetGraphicsAPIs: [] + m_BuildTargetShaderSettings: [] + m_BuildTargetGraphicsJobs: + - m_BuildTarget: WindowsStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: MacStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: LinuxStandaloneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AndroidPlayer + m_GraphicsJobs: 0 + - m_BuildTarget: iOSSupport + m_GraphicsJobs: 0 + - m_BuildTarget: PS4Player + m_GraphicsJobs: 0 + - m_BuildTarget: PS5Player + m_GraphicsJobs: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobs: 0 + - m_BuildTarget: GameCoreXboxOneSupport + m_GraphicsJobs: 0 + - m_BuildTarget: GameCoreScarlettSupport + m_GraphicsJobs: 0 + - m_BuildTarget: Switch + m_GraphicsJobs: 0 + - m_BuildTarget: WebGLSupport + m_GraphicsJobs: 0 + - m_BuildTarget: MetroSupport + m_GraphicsJobs: 0 + - m_BuildTarget: AppleTVSupport + m_GraphicsJobs: 0 + - m_BuildTarget: VisionOSPlayer + m_GraphicsJobs: 0 + - m_BuildTarget: BJMSupport + m_GraphicsJobs: 0 + - m_BuildTarget: CloudRendering + m_GraphicsJobs: 0 + - m_BuildTarget: EmbeddedLinux + m_GraphicsJobs: 0 + - m_BuildTarget: QNX + m_GraphicsJobs: 0 + m_BuildTargetGraphicsJobMode: + - m_BuildTarget: PS4Player + m_GraphicsJobMode: 0 + - m_BuildTarget: XboxOnePlayer + m_GraphicsJobMode: 0 + m_BuildTargetGraphicsAPIs: + - m_BuildTarget: iOSSupport + m_APIs: 10000000 + m_Automatic: 1 + - m_BuildTarget: AndroidPlayer + m_APIs: 0b00000008000000 + m_Automatic: 0 m_BuildTargetVRSettings: [] - m_BuildTargetEnableVuforiaSettings: [] + m_DefaultShaderChunkSizeInMB: 16 + m_DefaultShaderChunkCount: 0 openGLRequireES31: 0 openGLRequireES31AEP: 0 + openGLRequireES32: 0 m_TemplateCustomTags: {} mobileMTRendering: Android: 1 iPhone: 1 tvOS: 1 m_BuildTargetGroupLightmapEncodingQuality: [] + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] + m_BuildTargetGroupLoadStoreDebugModeSettings: [] + m_BuildTargetNormalMapEncoding: [] + m_BuildTargetDefaultTextureCompressionFormat: [] playModeTestRunnerEnabled: 0 runPlayModeTestAsEditModeTest: 0 actionOnDotNetUnhandledException: 1 @@ -286,14 +549,21 @@ PlayerSettings: cameraUsageDescription: locationUsageDescription: microphoneUsageDescription: + bluetoothUsageDescription: + macOSTargetOSVersion: 10.13.0 + switchNMETAOverride: switchNetLibKey: switchSocketMemoryPoolSize: 6144 switchSocketAllocatorPoolSize: 128 switchSocketConcurrencyLimit: 14 switchScreenResolutionBehavior: 2 switchUseCPUProfiler: 0 + switchEnableFileSystemTrace: 0 + switchUseGOLDLinker: 0 + switchLTOSetting: 0 switchApplicationID: 0x01004b9000490000 switchNSODependencies: + switchCompilerFlags: switchTitleNames_0: switchTitleNames_1: switchTitleNames_2: @@ -309,6 +579,7 @@ PlayerSettings: switchTitleNames_12: switchTitleNames_13: switchTitleNames_14: + switchTitleNames_15: switchPublisherNames_0: switchPublisherNames_1: switchPublisherNames_2: @@ -324,6 +595,7 @@ PlayerSettings: switchPublisherNames_12: switchPublisherNames_13: switchPublisherNames_14: + switchPublisherNames_15: switchIcons_0: {fileID: 0} switchIcons_1: {fileID: 0} switchIcons_2: {fileID: 0} @@ -339,6 +611,7 @@ PlayerSettings: switchIcons_12: {fileID: 0} switchIcons_13: {fileID: 0} switchIcons_14: {fileID: 0} + switchIcons_15: {fileID: 0} switchSmallIcons_0: {fileID: 0} switchSmallIcons_1: {fileID: 0} switchSmallIcons_2: {fileID: 0} @@ -354,6 +627,7 @@ PlayerSettings: switchSmallIcons_12: {fileID: 0} switchSmallIcons_13: {fileID: 0} switchSmallIcons_14: {fileID: 0} + switchSmallIcons_15: {fileID: 0} switchManualHTML: switchAccessibleURLs: switchLegalInformation: @@ -363,7 +637,6 @@ PlayerSettings: switchReleaseVersion: 0 switchDisplayVersion: 1.0.0 switchStartupUserAccount: 0 - switchTouchScreenUsage: 0 switchSupportedLanguagesMask: 0 switchLogoType: 0 switchApplicationErrorCodeCategory: @@ -405,6 +678,7 @@ PlayerSettings: switchNativeFsCacheSize: 32 switchIsHoldTypeHorizontal: 0 switchSupportedNpadCount: 8 + switchEnableTouchScreen: 1 switchSocketConfigEnabled: 0 switchTcpInitialSendBufferSize: 32 switchTcpInitialReceiveBufferSize: 64 @@ -415,7 +689,12 @@ PlayerSettings: switchSocketBufferEfficiency: 4 switchSocketInitializeEnabled: 1 switchNetworkInterfaceManagerInitializeEnabled: 1 - switchPlayerConnectionEnabled: 1 + switchUseNewStyleFilepaths: 1 + switchUseLegacyFmodPriorities: 0 + switchUseMicroSleepForYield: 1 + switchEnableRamDiskSupport: 0 + switchMicroSleepForYieldTime: 25 + switchRamDiskSpaceSize: 12 ps4NPAgeRating: 12 ps4NPTitleSecret: ps4NPTrophyPackPath: @@ -442,6 +721,7 @@ PlayerSettings: ps4ShareFilePath: ps4ShareOverlayImagePath: ps4PrivacyGuardImagePath: + ps4ExtraSceSysFile: ps4NPtitleDatPath: ps4RemotePlayKeyAssignment: -1 ps4RemotePlayKeyMappingDir: @@ -454,6 +734,7 @@ PlayerSettings: ps4DownloadDataSize: 0 ps4GarlicHeapSize: 2048 ps4ProGarlicHeapSize: 2560 + playerPrefsMaxSize: 32768 ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ ps4pnSessions: 1 ps4pnPresence: 1 @@ -466,6 +747,7 @@ PlayerSettings: ps4UseResolutionFallback: 0 ps4ReprojectionSupport: 0 ps4UseAudio3dBackend: 0 + ps4UseLowGarlicFragmentationMode: 1 ps4SocialScreenEnabled: 0 ps4ScriptOptimizationLevel: 0 ps4Audio3dVirtualSpeakerCount: 14 @@ -482,15 +764,21 @@ PlayerSettings: ps4disableAutoHideSplash: 0 ps4videoRecordingFeaturesUsed: 0 ps4contentSearchFeaturesUsed: 0 + ps4CompatibilityPS5: 0 + ps4AllowPS5Detection: 0 + ps4GPU800MHz: 1 ps4attribEyeToEyeDistanceSettingVR: 0 ps4IncludedModules: [] + ps4attribVROutputEnabled: 0 monoEnv: splashScreenBackgroundSourceLandscape: {fileID: 0} splashScreenBackgroundSourcePortrait: {fileID: 0} + blurSplashScreenBackground: 1 spritePackerPolicy: webGLMemorySize: 256 webGLExceptionSupport: 1 webGLNameFilesAsHashes: 0 + webGLShowDiagnostics: 0 webGLDataCaching: 1 webGLDebugSymbols: 0 webGLEmscriptenArgs: @@ -499,17 +787,46 @@ PlayerSettings: webGLAnalyzeBuildSize: 0 webGLUseEmbeddedResources: 0 webGLCompressionFormat: 1 + webGLWasmArithmeticExceptions: 0 webGLLinkerTarget: 1 webGLThreadsSupport: 0 + webGLDecompressionFallback: 0 + webGLInitialMemorySize: 32 + webGLMaximumMemorySize: 2048 + webGLMemoryGrowthMode: 2 + webGLMemoryLinearGrowthStep: 16 + webGLMemoryGeometricGrowthStep: 0.2 + webGLMemoryGeometricGrowthCap: 96 + webGLPowerPreference: 2 scriptingDefineSymbols: {} + additionalCompilerArguments: {} platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} - managedStrippingLevel: {} + il2cppCodeGeneration: {} + managedStrippingLevel: + EmbeddedLinux: 1 + GameCoreScarlett: 1 + GameCoreXboxOne: 1 + Nintendo Switch: 1 + PS4: 1 + PS5: 1 + QNX: 1 + Stadia: 1 + VisionOS: 1 + WebGL: 1 + Windows Store Apps: 1 + XboxOne: 1 + iPhone: 1 + tvOS: 1 incrementalIl2cppBuild: {} + suppressCommonWarnings: 1 allowUnsafeCode: 0 + useDeterministicCompilation: 1 additionalIl2CppArgs: scriptingRuntimeVersion: 1 + gcIncremental: 1 + gcWBarrierValidation: 0 apiCompatibilityLevelPerPlatform: {} m_RenderingPath: 1 m_MobileRenderingPath: 1 @@ -540,7 +857,7 @@ PlayerSettings: metroFTAName: metroFTAFileTypes: [] metroProtocolName: - metroCompilationOverrides: 1 + vcxProjDefaultLanguage: XboxOneProductId: XboxOneUpdateKey: XboxOneSandboxId: @@ -559,18 +876,16 @@ PlayerSettings: XboxOneCapability: [] XboxOneGameRating: {} XboxOneIsContentPackage: 0 + XboxOneEnhancedXboxCompatibilityMode: 0 XboxOneEnableGPUVariability: 1 XboxOneSockets: {} XboxOneSplashScreen: {fileID: 0} XboxOneAllowedProductIds: [] XboxOnePersistentLocalStorageSize: 0 XboxOneXTitleMemory: 8 - xboxOneScriptCompiler: 1 XboxOneOverrideIdentityName: - vrEditorSettings: - daydream: - daydreamIconForeground: {fileID: 0} - daydreamIconBackground: {fileID: 0} + XboxOneOverrideIdentityPublisher: + vrEditorSettings: {} cloudServicesEnabled: UNet: 1 luminIcon: @@ -579,24 +894,27 @@ PlayerSettings: m_PortalFolderPath: luminCert: m_CertPath: - m_PrivateKeyPath: + m_SignPackage: 1 luminIsChannelApp: 0 luminVersion: m_VersionCode: 1 m_VersionName: - facebookSdkVersion: 7.9.4 - facebookAppId: - facebookCookies: 1 - facebookLogging: 1 - facebookStatus: 1 - facebookXfbml: 0 - facebookFrictionlessRequests: 1 + hmiPlayerDataPath: + hmiForceSRGBBlit: 1 + embeddedLinuxEnableGamepadInput: 1 + hmiLogStartupTiming: 0 + hmiCpuConfiguration: apiCompatibilityLevel: 6 + activeInputHandler: 0 + windowsGamepadBackendHint: 0 cloudProjectId: framebufferDepthMemorylessMode: 0 + qualitySettingsNames: [] projectName: organizationId: cloudEnabled: 0 - enableNativePlatformBackendsForNewInputSystem: 0 - disableOldInputManagerSupport: 0 legacyClampBlendShapeWeights: 0 + hmiLoadingImage: {fileID: 0} + platformRequiresReadableAssets: 0 + virtualTexturingSupportEnabled: 0 + insecureHttpOption: 0 diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index ef4a753e2f..e4eac15914 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1,2 @@ -m_EditorVersion: 2018.4.20f1 +m_EditorVersion: 2022.3.12f1 +m_EditorVersionWithRevision: 2022.3.12f1 (4fe6e059c7ef) diff --git a/ProjectSettings/SceneTemplateSettings.json b/ProjectSettings/SceneTemplateSettings.json new file mode 100644 index 0000000000..5e97f8393e --- /dev/null +++ b/ProjectSettings/SceneTemplateSettings.json @@ -0,0 +1,121 @@ +{ + "templatePinStates": [], + "dependencyTypeInfos": [ + { + "userAdded": false, + "type": "UnityEngine.AnimationClip", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.Animations.AnimatorController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.AnimatorOverrideController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.Audio.AudioMixerController", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.ComputeShader", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Cubemap", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.GameObject", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.LightingDataAsset", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.LightingSettings", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Material", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.MonoScript", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicMaterial", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial2D", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.VolumeProfile", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEditor.SceneAsset", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Shader", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.ShaderVariantCollection", + "defaultInstantiationMode": 1 + }, + { + "userAdded": false, + "type": "UnityEngine.Texture", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Texture2D", + "defaultInstantiationMode": 0 + }, + { + "userAdded": false, + "type": "UnityEngine.Timeline.TimelineAsset", + "defaultInstantiationMode": 0 + } + ], + "defaultDependencyTypeInfo": { + "userAdded": false, + "type": "", + "defaultInstantiationMode": 1 + }, + "newSceneOverride": 0 +} \ No newline at end of file diff --git a/ProjectSettings/VersionControlSettings.asset b/ProjectSettings/VersionControlSettings.asset new file mode 100644 index 0000000000..dca288142f --- /dev/null +++ b/ProjectSettings/VersionControlSettings.asset @@ -0,0 +1,8 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!890905787 &1 +VersionControlSettings: + m_ObjectHideFlags: 0 + m_Mode: Visible Meta Files + m_CollabEditorSettings: + inProgressEnabled: 1 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset new file mode 100644 index 0000000000..23a81e21f0 --- /dev/null +++ b/UserSettings/EditorUserSettings.asset @@ -0,0 +1,28 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!162 &1 +EditorUserSettings: + m_ObjectHideFlags: 0 + serializedVersion: 4 + m_ConfigSettings: + RecentlyUsedSceneGuid-0: + value: 505000500454510b5a5d08241674084442164a2e7a29703228791b64b6b7363e + flags: 0 + vcSharedLogLevel: + value: 0d5e400f0650 + flags: 0 + m_VCAutomaticAdd: 1 + m_VCDebugCom: 0 + m_VCDebugCmd: 0 + m_VCDebugOut: 0 + m_SemanticMergeMode: 2 + m_DesiredImportWorkerCount: 2 + m_StandbyImportWorkerCount: 2 + m_IdleImportWorkerShutdownDelay: 60000 + m_VCShowFailedCheckout: 1 + m_VCOverwriteFailedCheckoutAssets: 1 + m_VCProjectOverlayIcons: 1 + m_VCHierarchyOverlayIcons: 1 + m_VCOtherOverlayIcons: 1 + m_VCAllowAsyncUpdate: 1 + m_ArtifactGarbageCollection: 1 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt new file mode 100644 index 0000000000..4766068796 --- /dev/null +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -0,0 +1,1327 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 3} + - {fileID: 14} + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 1470 + height: 779 + m_MinSize: {x: 300, y: 100} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 37 +--- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 281 + y: 95 + width: 815 + height: 416.5 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SerializedViewNames: + - UnityEditor.DeviceSimulation.SimulatorWindow + m_SerializedViewValues: + - /Users/zain/Documents/Car-Rush/Car_Rush_Unity/Library/PlayModeViewStates/aec39a0061da841349728bc3d5b9aa81 + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 2960, y: 1440} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 0000000000000000000000000c000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -740 + m_HBaseRangeMax: 740 + m_VBaseRangeMin: -360 + m_VBaseRangeMax: 360 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 0 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 815 + height: 395.5 + m_Scale: {x: 0.54930556, y: 0.54930556} + m_Translation: {x: 407.5, y: 197.75} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -741.84576 + y: -360 + width: 1483.6915 + height: 720 + m_MinimalGUI: 1 + m_defaultScale: 0.54930556 + m_LastWindowPixelSize: {x: 1630, y: 833} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 00000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 4} + - {fileID: 10} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1098 + height: 779 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 16192} + vertical: 1 + controlID: 38 +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 5} + - {fileID: 7} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1098 + height: 437.5 + m_MinSize: {x: 200, y: 50} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 39 +--- !u!114 &5 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 281 + height: 437.5 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 6} + m_Panes: + - {fileID: 6} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &6 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Hierarchy + m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 95 + width: 280 + height: 416.5 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 78d6feff + m_LastClickedID: -76168 + m_ExpandedIDs: a2d8feffdad8feffded9feff + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 4c969a2b90040154d917609493e03593 +--- !u!114 &7 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: GameView + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 281 + y: 0 + width: 817 + height: 437.5 + m_MinSize: {x: 102, y: 121} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 2} + m_Panes: + - {fileID: 8} + - {fileID: 2} + - {fileID: 9} + m_Selected: 1 + m_LastSelected: 2 +--- !u!114 &8 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Scene + m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 281 + y: 95 + width: 815 + height: 416.5 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -171, y: -26} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 3 + id: Tool Settings + index: 0 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -141, y: -206.5} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 3 + id: unity-grid-and-snap-toolbar + index: 1 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-scene-view-toolbar + index: 0 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-search-toolbar + index: 1 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-transform-toolbar + index: 0 + layout: 2 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 197} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-component-tools + index: 1 + layout: 2 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 2, y: 86} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Orientation + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Light Settings + index: 2 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Camera + index: 1 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Constraints + index: 3 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Collisions + index: 4 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Navmesh Display + index: 4 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Agent Display + index: 5 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Obstacle Display + index: 6 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Occlusion Culling + index: 5 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Physics Debugger + index: 6 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Scene Visibility + index: 7 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Particles + index: 8 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap + index: 11 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Palette Helper + index: 12 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 2, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: AINavigationOverlay + index: 9 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-spline-inspector + index: 8 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: APV Overlay + index: 9 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Cinemachine Tool Settings + index: 10 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/TrailRenderer + index: 10 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 117.5, y: 25} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: UnityEditor.SceneViewCameraOverlay + index: 11 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Open Tile Palette + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Focus + index: 1 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + m_OverlaysVisible: 1 + m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 + m_Gizmos: 0 + m_OverrideSceneCullingMask: 6917529027641081856 + m_SceneIsLit: 0 + m_SceneLighting: 1 + m_2DMode: 1 + m_isRotationLocked: 0 + m_PlayAudio: 0 + m_AudioPlay: 0 + m_Position: + m_Target: {x: 1.046092, y: 1.597505, z: -0.0009978599} + speed: 2 + m_Value: {x: 1.046092, y: 1.597505, z: -0.0009978599} + m_RenderMode: 0 + m_CameraMode: + drawMode: 0 + name: Shaded + section: Shading Mode + m_ValidateTrueMetals: 0 + m_DoValidateTrueMetals: 0 + m_SceneViewState: + m_AlwaysRefresh: 0 + showFog: 1 + showSkybox: 1 + showFlares: 1 + showImageEffects: 1 + showParticleSystems: 1 + showVisualEffectGraphs: 1 + m_FxEnabled: 1 + m_Grid: + xGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0} + yGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + zGrid: + m_Fade: + m_Target: 1 + speed: 2 + m_Value: 1 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + m_ShowGrid: 1 + m_GridAxis: 1 + m_gridOpacity: 0.5 + m_Rotation: + m_Target: {x: 0, y: 0, z: 0, w: 1} + speed: 2 + m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Size: + m_Target: 2.4530814 + speed: 2 + m_Value: 2.4530814 + m_Ortho: + m_Target: 1 + speed: 2 + m_Value: 1 + m_CameraSettings: + m_Speed: 1 + m_SpeedNormalized: 0.5 + m_SpeedMin: 0.001 + m_SpeedMax: 2 + m_EasingEnabled: 1 + m_EasingDuration: 0.4 + m_AccelerationEnabled: 1 + m_FieldOfViewHorizontalOrVertical: 60 + m_NearClip: 0.03 + m_FarClip: 10000 + m_DynamicClip: 1 + m_OcclusionCulling: 0 + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewOrtho: 0 + m_ReplacementShader: {fileID: 0} + m_ReplacementString: + m_SceneVisActive: 1 + m_LastLockedObject: {fileID: 0} + m_ViewIsLockedToObject: 0 +--- !u!114 &9 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animator + m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 281 + y: 95 + width: 815 + height: 416.5 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: 110773768, guid: b09e60546065cf9448b36ebb7f759a91, type: 2} + - {fileID: 1107120589572563820, guid: 228edf468d7393e4d8452f80c542fb85, type: 2} + - {fileID: 1107679161928848652, guid: 95e1487dd55102042a8ec1a03fa064ef, type: 2} + - {fileID: 1107150604400011336, guid: e6d811e1f6dfcd247ac0fa75186762b9, type: 2} + - {fileID: 1107352176486139556, guid: 6408c3077d4204944a6451f38cd1f7e5, type: 2} + - {fileID: -4154430246438009678, guid: 5a5995370fc954e219729b95b7be89cd, type: 2} + m_ValueSerializationHelper: + - e00: 0.992175 + e01: 0 + e02: 0 + e03: 1.7471008 + e10: 0 + e11: 0.992175 + e12: 0 + e13: -153.7979 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.5463158 + e01: 0 + e02: 0 + e03: -12.315796 + e10: 0 + e11: 0.5463158 + e12: 0 + e13: 136.85 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.5463158 + e01: 0 + e02: 0 + e03: -12.315796 + e10: 0 + e11: 0.5463158 + e12: 0 + e13: 113.90474 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.5463158 + e01: 0 + e02: 0 + e03: -12.315796 + e10: 0 + e11: 0.5463158 + e12: 0 + e13: 107.348946 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.5463158 + e01: 0 + e02: 0 + e03: -12.315796 + e10: 0 + e11: 0.5463158 + e12: 0 + e13: 136.85 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.5744305 + e01: 0 + e02: 0 + e03: 102.00577 + e10: 0 + e11: 0.5744305 + e12: 0 + e13: 169.72649 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: 5a5995370fc954e219729b95b7be89cd, + type: 2} + m_BreadCrumbs: + - m_Target: {fileID: -4154430246438009678, guid: 5a5995370fc954e219729b95b7be89cd, + type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentEditor: 1 + m_LayerEditor: + m_SelectedLayerIndex: 0 +--- !u!114 &10 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: AnimationWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 437.5 + width: 1098 + height: 341.5 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 13} + m_Panes: + - {fileID: 11} + - {fileID: 12} + - {fileID: 13} + m_Selected: 2 + m_LastSelected: 0 +--- !u!114 &11 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 532.5 + width: 1097 + height: 320.5 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Game Assets/Art/Animations/AnimationClips + m_Globs: [] + m_OriginalText: + m_ImportLogFlags: 0 + m_FilterByTypeIntersection: 0 + m_ViewMode: 1 + m_StartGridSize: 96 + m_LastFolders: + - Assets/Game Assets/Art/Animations/AnimationClips + m_LastFoldersGridSize: 96 + m_LastProjectPath: /Users/zain/2D-Platformer-Game + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 143} + m_SelectedIDs: c6460000 + m_LastClickedID: 18118 + m_ExpandedIDs: 00000000da40000076410000ea410000264200002e420000b2420000de430000e644000072450000de450000c646000002490000e64b000000ca9a3bffffff7f + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: b0d3feff + m_LastClickedInstanceID: -76880 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000d87c0000e67c00001882000092a80000f2ac00005e7f00002cb900006c9f000034ba000036bb00009a7f0000947e00002a580100a85c0100667f0000b88700004a7e00005a7c0000fe7d00001aa00000687f00006a7f0000189f0000f87f00005c530400 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 96 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 207 +--- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 573.5 + width: 1097 + height: 279.5 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animation + m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 532.5 + width: 1097 + height: 320.5 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: -76168 +--- !u!114 &14 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: InspectorWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 1098 + y: 0 + width: 372 + height: 779 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 15} + m_Panes: + - {fileID: 15} + - {fileID: 16} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &15 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 1098 + y: 95 + width: 371 + height: 758 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 291 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} +--- !u!114 &16 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13854, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 310, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Project Settings + m_Image: {fileID: 866346219090771560, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 951 + y: 95 + width: 518 + height: 820 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_PosLeft: {x: 0, y: 0} + m_PosRight: {x: 0, y: 46} + m_Scope: 1 + m_SplitterFlex: 0.23507462 + m_SearchText: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 4dcf9b58 + m_LastClickedID: 1486606157 + m_ExpandedIDs: 213269b253336be2e36eadf800000000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: diff --git a/UserSettings/Search.settings b/UserSettings/Search.settings new file mode 100644 index 0000000000..9e26dfeeb6 --- /dev/null +++ b/UserSettings/Search.settings @@ -0,0 +1 @@ +{} \ No newline at end of file From d243e99d3d3eebe96cd780b9f80502441eba4d1b Mon Sep 17 00:00:00 2001 From: Syed zainul abedin Date: Wed, 17 Jan 2024 00:00:01 +0530 Subject: [PATCH 02/26] feat: Added crouch animation --- .../AnimationClips/Player_Crouch.anim | 84 +++++++++++++ .../AnimationClips/Player_Crouch.anim.meta | 8 ++ .../AnimationClips/Player_Walk.anim | 114 ++++++++++++++++++ .../AnimationClips/Player_Walk.anim.meta | 8 ++ .../Animators/Ellen/PlayerAnimator.controller | 58 +++++++++ Assets/Scenes/AnimationTest.unity | 15 --- 6 files changed, 272 insertions(+), 15 deletions(-) create mode 100644 Assets/Game Assets/Art/Animations/AnimationClips/Player_Crouch.anim create mode 100644 Assets/Game Assets/Art/Animations/AnimationClips/Player_Crouch.anim.meta create mode 100644 Assets/Game Assets/Art/Animations/AnimationClips/Player_Walk.anim create mode 100644 Assets/Game Assets/Art/Animations/AnimationClips/Player_Walk.anim.meta diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Crouch.anim b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Crouch.anim new file mode 100644 index 0000000000..84132a3be1 --- /dev/null +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Crouch.anim @@ -0,0 +1,84 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player_Crouch + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: 5a1cef7e9c9ed034da742d0e08ea786a, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: a9c37448b62c0d149aced6ded9e44e4a, type: 3} + - time: 0.21666667 + value: {fileID: 21300000, guid: 7d37e1dfeba60ea4a8803c12675079b6, type: 3} + - time: 0.31666666 + value: {fileID: 21300000, guid: a9e9e74909b5a0947a093069d6a017cc, type: 3} + - time: 0.41666666 + value: {fileID: 21300000, guid: b5b9f448600b9aa4daa1d9fd5069a764, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: 5a1cef7e9c9ed034da742d0e08ea786a, type: 3} + - {fileID: 21300000, guid: a9c37448b62c0d149aced6ded9e44e4a, type: 3} + - {fileID: 21300000, guid: 7d37e1dfeba60ea4a8803c12675079b6, type: 3} + - {fileID: 21300000, guid: a9e9e74909b5a0947a093069d6a017cc, type: 3} + - {fileID: 21300000, guid: b5b9f448600b9aa4daa1d9fd5069a764, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.43333334 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Crouch.anim.meta b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Crouch.anim.meta new file mode 100644 index 0000000000..57bcacda48 --- /dev/null +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Crouch.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ba32c46ab10b944168bc88713e2ba6d6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Walk.anim b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Walk.anim new file mode 100644 index 0000000000..619dc5374c --- /dev/null +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Walk.anim @@ -0,0 +1,114 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player_Walk + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: b38d007a84ef48c45b4026b9be16e76b, type: 3} + - time: 0.05 + value: {fileID: 21300000, guid: ec7d0c8717f6c3b428b3f277de956cea, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: 929a47e4f89792c4aa28ae41634348c3, type: 3} + - time: 0.15 + value: {fileID: 21300000, guid: 8fc33c704bf75524facc770a491ffd2f, type: 3} + - time: 0.18333334 + value: {fileID: 21300000, guid: d4e307e6ea003de4bbc0d28256e6a032, type: 3} + - time: 0.23333333 + value: {fileID: 21300000, guid: 6b56e26ee92b18e4aa775af7975a9b17, type: 3} + - time: 0.28333333 + value: {fileID: 21300000, guid: d0505258bec70ac40b68ec355beaff76, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 9d98f19e89667e84fa99ae2d2c01ad66, type: 3} + - time: 0.38333333 + value: {fileID: 21300000, guid: 365443fb827749b4db671a5038ff79b1, type: 3} + - time: 0.43333334 + value: {fileID: 21300000, guid: c865be1abede9a048a20b6904ee2219a, type: 3} + - time: 0.48333332 + value: {fileID: 21300000, guid: bb0dc30aba14f084b9f20cd11d7f59d8, type: 3} + - time: 0.51666665 + value: {fileID: 21300000, guid: f3e9585781fa62242a3018cd3dd529dd, type: 3} + - time: 0.56666666 + value: {fileID: 21300000, guid: b38254315edf5904d987dbca58a71ca0, type: 3} + - time: 0.6166667 + value: {fileID: 21300000, guid: 82bf8779d3330604c9cec1bf2f219329, type: 3} + - time: 0.6666667 + value: {fileID: 21300000, guid: bcd729389571a684eb0951d69a67af73, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: b38d007a84ef48c45b4026b9be16e76b, type: 3} + - {fileID: 21300000, guid: ec7d0c8717f6c3b428b3f277de956cea, type: 3} + - {fileID: 21300000, guid: 929a47e4f89792c4aa28ae41634348c3, type: 3} + - {fileID: 21300000, guid: 8fc33c704bf75524facc770a491ffd2f, type: 3} + - {fileID: 21300000, guid: d4e307e6ea003de4bbc0d28256e6a032, type: 3} + - {fileID: 21300000, guid: 6b56e26ee92b18e4aa775af7975a9b17, type: 3} + - {fileID: 21300000, guid: d0505258bec70ac40b68ec355beaff76, type: 3} + - {fileID: 21300000, guid: 9d98f19e89667e84fa99ae2d2c01ad66, type: 3} + - {fileID: 21300000, guid: 365443fb827749b4db671a5038ff79b1, type: 3} + - {fileID: 21300000, guid: c865be1abede9a048a20b6904ee2219a, type: 3} + - {fileID: 21300000, guid: bb0dc30aba14f084b9f20cd11d7f59d8, type: 3} + - {fileID: 21300000, guid: f3e9585781fa62242a3018cd3dd529dd, type: 3} + - {fileID: 21300000, guid: b38254315edf5904d987dbca58a71ca0, type: 3} + - {fileID: 21300000, guid: 82bf8779d3330604c9cec1bf2f219329, type: 3} + - {fileID: 21300000, guid: bcd729389571a684eb0951d69a67af73, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.68333334 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Walk.anim.meta b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Walk.anim.meta new file mode 100644 index 0000000000..5f370a762d --- /dev/null +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Walk.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 38d1bacd4a82b4790bb84a1f1563630d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller b/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller index 9e0dbd1d44..570866dfcb 100644 --- a/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller +++ b/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller @@ -26,6 +26,32 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &-5334714141835380790 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player_Walk + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 38d1bacd4a82b4790bb84a1f1563630d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &-4154430246438009678 AnimatorStateMachine: serializedVersion: 6 @@ -38,6 +64,12 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: -9024768835540588441} m_Position: {x: 200, y: 240, z: 0} + - serializedVersion: 1 + m_State: {fileID: -5334714141835380790} + m_Position: {x: 235, y: 305, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1725952575496220380} + m_Position: {x: 270, y: 370, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -76,3 +108,29 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1102 &1725952575496220380 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player_Crouch + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: ba32c46ab10b944168bc88713e2ba6d6, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Scenes/AnimationTest.unity b/Assets/Scenes/AnimationTest.unity index a7516c9fff..c55e785bd2 100644 --- a/Assets/Scenes/AnimationTest.unity +++ b/Assets/Scenes/AnimationTest.unity @@ -229,21 +229,6 @@ PrefabInstance: propertyPath: m_Name value: Player objectReference: {fileID: 0} - - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - propertyPath: m_LocalScale.x - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - propertyPath: m_LocalScale.y - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - propertyPath: m_LocalScale.z - value: 2 - objectReference: {fileID: 0} - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, type: 3} propertyPath: m_LocalPosition.x From 81907b68c64873f5851370687a89324cd1497872 Mon Sep 17 00:00:00 2001 From: Syed zainul abedin Date: Wed, 17 Jan 2024 12:31:48 +0530 Subject: [PATCH 03/26] feat: Updated animation controller --- .../Animators/Ellen/PlayerAnimator.controller | 102 +- UserSettings/Layouts/default-2022.dwlt | 1422 +++++++++++++++++ 2 files changed, 1519 insertions(+), 5 deletions(-) create mode 100644 UserSettings/Layouts/default-2022.dwlt diff --git a/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller b/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller index 570866dfcb..a83626bfb9 100644 --- a/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller +++ b/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller @@ -10,7 +10,9 @@ AnimatorState: m_Name: Player_Idle m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 4129752464728350232} + - {fileID: 5938351793167912262} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -36,7 +38,8 @@ AnimatorState: m_Name: Player_Walk m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 6558108255511765441} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -66,10 +69,10 @@ AnimatorStateMachine: m_Position: {x: 200, y: 240, z: 0} - serializedVersion: 1 m_State: {fileID: -5334714141835380790} - m_Position: {x: 235, y: 305, z: 0} + m_Position: {x: 570, y: 320, z: 0} - serializedVersion: 1 m_State: {fileID: 1725952575496220380} - m_Position: {x: 270, y: 370, z: 0} + m_Position: {x: 260, y: 470, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -118,7 +121,8 @@ AnimatorState: m_Name: Player_Crouch m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 6332234346085945739} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -134,3 +138,91 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &4129752464728350232 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5334714141835380790} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.63414633 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &5938351793167912262 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1725952575496220380} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.63414633 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &6332234346085945739 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -9024768835540588441} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.42307693 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &6558108255511765441 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: [] + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 1725952575496220380} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.63414633 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt new file mode 100644 index 0000000000..96497ce575 --- /dev/null +++ b/UserSettings/Layouts/default-2022.dwlt @@ -0,0 +1,1422 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_PixelRect: + serializedVersion: 2 + x: 0 + y: 65 + width: 1470 + height: 829 + m_ShowMode: 4 + m_Title: Animator + m_RootView: {fileID: 2} + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_Maximized: 1 +--- !u!114 &2 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12008, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 3} + - {fileID: 5} + - {fileID: 4} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1470 + height: 829 + m_MinSize: {x: 875, y: 300} + m_MaxSize: {x: 10000, y: 10000} + m_UseTopView: 1 + m_TopViewHeight: 30 + m_UseBottomView: 1 + m_BottomViewHeight: 20 +--- !u!114 &3 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12011, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 1470 + height: 30 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} + m_LastLoadedLayoutName: +--- !u!114 &4 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12042, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 809 + width: 1470 + height: 20 + m_MinSize: {x: 0, y: 0} + m_MaxSize: {x: 0, y: 0} +--- !u!114 &5 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 6} + - {fileID: 11} + m_Position: + serializedVersion: 2 + x: 0 + y: 30 + width: 1470 + height: 779 + m_MinSize: {x: 300, y: 100} + m_MaxSize: {x: 24288, y: 16192} + vertical: 0 + controlID: 2725 +--- !u!114 &6 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 7} + - {fileID: 10} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 981 + height: 779 + m_MinSize: {x: 200, y: 100} + m_MaxSize: {x: 16192, y: 16192} + vertical: 1 + controlID: 2726 +--- !u!114 &7 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: + - {fileID: 8} + - {fileID: 9} + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 981 + height: 437.5 + m_MinSize: {x: 200, y: 50} + m_MaxSize: {x: 16192, y: 8096} + vertical: 0 + controlID: 2727 +--- !u!114 &8 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 0 + width: 248 + height: 437.5 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 13} + m_Panes: + - {fileID: 13} + m_Selected: 0 + m_LastSelected: 0 +--- !u!114 &9 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: AnimatorControllerTool + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 248 + y: 0 + width: 733 + height: 437.5 + m_MinSize: {x: 102, y: 121} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 15} + m_Panes: + - {fileID: 14} + - {fileID: 12} + - {fileID: 15} + m_Selected: 2 + m_LastSelected: 1 +--- !u!114 &10 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: AnimationWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 0 + y: 437.5 + width: 981 + height: 341.5 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 18} + m_Panes: + - {fileID: 16} + - {fileID: 18} + - {fileID: 17} + m_Selected: 1 + m_LastSelected: 0 +--- !u!114 &11 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} + m_Name: InspectorWindow + m_EditorClassIdentifier: + m_Children: [] + m_Position: + serializedVersion: 2 + x: 981 + y: 0 + width: 489 + height: 779 + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 19} + m_Panes: + - {fileID: 19} + - {fileID: 20} + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Game + m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 281 + y: 95 + width: 815 + height: 416.5 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SerializedViewNames: + - UnityEditor.DeviceSimulation.SimulatorWindow + m_SerializedViewValues: + - /Users/zain/Documents/Car-Rush/Car_Rush_Unity/Library/PlayModeViewStates/aec39a0061da841349728bc3d5b9aa81 + m_PlayModeViewName: GameView + m_ShowGizmos: 0 + m_TargetDisplay: 0 + m_ClearColor: {r: 0, g: 0, b: 0, a: 0} + m_TargetSize: {x: 2960, y: 1440} + m_TextureFilterMode: 0 + m_TextureHideFlags: 61 + m_RenderIMGUI: 1 + m_EnterPlayModeBehavior: 0 + m_UseMipMap: 0 + m_VSyncEnabled: 0 + m_Gizmos: 0 + m_Stats: 0 + m_SelectedSizes: 0000000000000000000000000c000000000000000000000000000000000000000000000000000000 + m_ZoomArea: + m_HRangeLocked: 0 + m_VRangeLocked: 0 + hZoomLockedByDefault: 0 + vZoomLockedByDefault: 0 + m_HBaseRangeMin: -740 + m_HBaseRangeMax: 740 + m_VBaseRangeMin: -360 + m_VBaseRangeMax: 360 + m_HAllowExceedBaseRangeMin: 1 + m_HAllowExceedBaseRangeMax: 1 + m_VAllowExceedBaseRangeMin: 1 + m_VAllowExceedBaseRangeMax: 1 + m_ScaleWithWindow: 0 + m_HSlider: 0 + m_VSlider: 0 + m_IgnoreScrollWheelUntilClicked: 0 + m_EnableMouseInput: 1 + m_EnableSliderZoomHorizontal: 0 + m_EnableSliderZoomVertical: 0 + m_UniformScale: 1 + m_UpDirection: 1 + m_DrawArea: + serializedVersion: 2 + x: 0 + y: 21 + width: 815 + height: 395.5 + m_Scale: {x: 0.54930556, y: 0.54930556} + m_Translation: {x: 407.5, y: 197.75} + m_MarginLeft: 0 + m_MarginRight: 0 + m_MarginTop: 0 + m_MarginBottom: 0 + m_LastShownAreaInsideMargins: + serializedVersion: 2 + x: -741.84576 + y: -360 + width: 1483.6915 + height: 720 + m_MinimalGUI: 1 + m_defaultScale: 0.54930556 + m_LastWindowPixelSize: {x: 1630, y: 833} + m_ClearInEditMode: 1 + m_NoCameraWarning: 1 + m_LowResolutionForAspectRatios: 00000000000000000000 + m_XRRenderMode: 0 + m_RenderTexture: {fileID: 0} +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12061, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Hierarchy + m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 95 + width: 247 + height: 416.5 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SceneHierarchy: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 94c6feff + m_LastClickedID: 0 + m_ExpandedIDs: a2d8feffdad8feffded9feff + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_ExpandedScenes: [] + m_CurrenRootInstanceID: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentSortingName: TransformSorting + m_WindowGUID: 4c969a2b90040154d917609493e03593 +--- !u!114 &14 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12013, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Scene + m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 281 + y: 95 + width: 815 + height: 416.5 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -171, y: -26} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 3 + id: Tool Settings + index: 0 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: -141, y: -206.5} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 3 + id: unity-grid-and-snap-toolbar + index: 1 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-scene-view-toolbar + index: 0 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-toolbar__top + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 1 + id: unity-search-toolbar + index: 1 + layout: 1 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 25} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-transform-toolbar + index: 0 + layout: 2 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--left + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 0, y: 197} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-component-tools + index: 1 + layout: 2 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 0 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 2, y: 86} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Orientation + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Light Settings + index: 2 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Camera + index: 1 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Constraints + index: 3 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Cloth Collisions + index: 4 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Navmesh Display + index: 4 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Agent Display + index: 5 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Obstacle Display + index: 6 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Occlusion Culling + index: 5 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Physics Debugger + index: 6 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Scene Visibility + index: 7 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Particles + index: 8 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap + index: 11 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 0, y: 0} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Palette Helper + index: 12 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 2, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: AINavigationOverlay + index: 9 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: unity-spline-inspector + index: 8 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: APV Overlay + index: 9 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Cinemachine Tool Settings + index: 10 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/TrailRenderer + index: 10 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 1 + snapOffset: {x: 117.5, y: 25} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: UnityEditor.SceneViewCameraOverlay + index: 11 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Open Tile Palette + index: 0 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + - dockPosition: 1 + containerId: overlay-container--right + floating: 0 + collapsed: 0 + displayed: 0 + snapOffset: {x: 48, y: 48} + snapOffsetDelta: {x: 0, y: 0} + snapCorner: 0 + id: Scene View/Tilemap Focus + index: 1 + layout: 4 + size: {x: 0, y: 0} + sizeOverriden: 0 + m_OverlaysVisible: 1 + m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 + m_Gizmos: 0 + m_OverrideSceneCullingMask: 6917529027641081856 + m_SceneIsLit: 0 + m_SceneLighting: 1 + m_2DMode: 1 + m_isRotationLocked: 0 + m_PlayAudio: 0 + m_AudioPlay: 0 + m_Position: + m_Target: {x: 1.924883, y: 1.2241839, z: -0.009598574} + speed: 2 + m_Value: {x: 1.924883, y: 1.2241839, z: -0.009598574} + m_RenderMode: 0 + m_CameraMode: + drawMode: 0 + name: Shaded + section: Shading Mode + m_ValidateTrueMetals: 0 + m_DoValidateTrueMetals: 0 + m_SceneViewState: + m_AlwaysRefresh: 0 + showFog: 1 + showSkybox: 1 + showFlares: 1 + showImageEffects: 1 + showParticleSystems: 1 + showVisualEffectGraphs: 1 + m_FxEnabled: 1 + m_Grid: + xGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 0, y: 0} + yGrid: + m_Fade: + m_Target: 0 + speed: 2 + m_Value: 0 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + zGrid: + m_Fade: + m_Target: 1 + speed: 2 + m_Value: 1 + m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} + m_Pivot: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 1} + m_ShowGrid: 1 + m_GridAxis: 1 + m_gridOpacity: 0.5 + m_Rotation: + m_Target: {x: 0, y: 0, z: 0, w: 1} + speed: 2 + m_Value: {x: 0, y: 0, z: 0, w: 1} + m_Size: + m_Target: 3.3131514 + speed: 2 + m_Value: 3.3131514 + m_Ortho: + m_Target: 1 + speed: 2 + m_Value: 1 + m_CameraSettings: + m_Speed: 1 + m_SpeedNormalized: 0.5 + m_SpeedMin: 0.001 + m_SpeedMax: 2 + m_EasingEnabled: 1 + m_EasingDuration: 0.4 + m_AccelerationEnabled: 1 + m_FieldOfViewHorizontalOrVertical: 60 + m_NearClip: 0.03 + m_FarClip: 10000 + m_DynamicClip: 1 + m_OcclusionCulling: 0 + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewOrtho: 0 + m_ReplacementShader: {fileID: 0} + m_ReplacementString: + m_SceneVisActive: 1 + m_LastLockedObject: {fileID: 0} + m_ViewIsLockedToObject: 0 +--- !u!114 &15 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animator + m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 248 + y: 95 + width: 731 + height: 416.5 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: 110773768, guid: b09e60546065cf9448b36ebb7f759a91, type: 2} + - {fileID: 1107120589572563820, guid: 228edf468d7393e4d8452f80c542fb85, type: 2} + - {fileID: 1107679161928848652, guid: 95e1487dd55102042a8ec1a03fa064ef, type: 2} + - {fileID: 1107150604400011336, guid: e6d811e1f6dfcd247ac0fa75186762b9, type: 2} + - {fileID: 1107352176486139556, guid: 6408c3077d4204944a6451f38cd1f7e5, type: 2} + - {fileID: -4154430246438009678, guid: 5a5995370fc954e219729b95b7be89cd, type: 2} + m_ValueSerializationHelper: + - e00: 0.992175 + e01: 0 + e02: 0 + e03: 1.7471008 + e10: 0 + e11: 0.992175 + e12: 0 + e13: -153.7979 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.5463158 + e01: 0 + e02: 0 + e03: -12.315796 + e10: 0 + e11: 0.5463158 + e12: 0 + e13: 136.85 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.5463158 + e01: 0 + e02: 0 + e03: -12.315796 + e10: 0 + e11: 0.5463158 + e12: 0 + e13: 113.90474 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.5463158 + e01: 0 + e02: 0 + e03: -12.315796 + e10: 0 + e11: 0.5463158 + e12: 0 + e13: 107.348946 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.5463158 + e01: 0 + e02: 0 + e03: -12.315796 + e10: 0 + e11: 0.5463158 + e12: 0 + e13: 136.85 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.49144173 + e01: 0 + e02: 0 + e03: -57.323975 + e10: 0 + e11: 0.49144173 + e12: 0 + e13: -0.9439392 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: 5a5995370fc954e219729b95b7be89cd, + type: 2} + m_BreadCrumbs: + - m_Target: {fileID: -4154430246438009678, guid: 5a5995370fc954e219729b95b7be89cd, + type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentEditor: 1 + m_LayerEditor: + m_SelectedLayerIndex: 0 +--- !u!114 &16 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} + m_TitleContent: + m_Text: Project + m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 532.5 + width: 1097 + height: 320.5 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Crouch + m_Globs: [] + m_OriginalText: + m_ImportLogFlags: 0 + m_FilterByTypeIntersection: 0 + m_ViewMode: 1 + m_StartGridSize: 96 + m_LastFolders: + - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Crouch + m_LastFoldersGridSize: 96 + m_LastProjectPath: /Users/zain/2D-Platformer-Game + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 195.5} + m_SelectedIDs: 564c0000 + m_LastClickedID: 19542 + m_ExpandedIDs: 00000000da40000076410000ea410000b2420000de430000de45000002490000e64b000000ca9a3bffffff7f + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 00000000da40000000ca9a3bffffff7f + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: 5ca3000016a500002ca70000cea300005c9b0000 + m_LastClickedInstanceID: 39772 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000d87c0000e67c00001882000092a80000f2ac00005e7f00002cb900006c9f000034ba000036bb00009a7f0000947e00002a580100a85c0100667f0000b88700004a7e00005a7c0000fe7d00001aa00000687f00006a7f0000189f0000f87f00005c530400369e0000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 96 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 207 +--- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Console + m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 573.5 + width: 1097 + height: 279.5 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 +--- !u!114 &18 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animation + m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 532.5 + width: 980 + height: 320.5 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: -76168 +--- !u!114 &19 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 1 + m_Script: {fileID: 12019, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Inspector + m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 981 + y: 95 + width: 488 + height: 758 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_ObjectsLockedBeforeSerialization: [] + m_InstanceIDsLockedBeforeSerialization: + m_PreviewResizer: + m_CachedPref: 291 + m_ControlHash: -371814159 + m_PrefName: Preview_InspectorPreview + m_LastInspectedObjectInstanceID: -1 + m_LastVerticalScrollValue: 0 + m_GlobalObjectId: + m_InspectorMode: 0 + m_LockTracker: + m_IsLocked: 0 + m_PreviewWindow: {fileID: 0} +--- !u!114 &20 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13854, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 310, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Project Settings + m_Image: {fileID: 866346219090771560, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 951 + y: 95 + width: 518 + height: 820 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_PosLeft: {x: 0, y: 0} + m_PosRight: {x: 0, y: 46} + m_Scope: 1 + m_SplitterFlex: 0.23507462 + m_SearchText: + m_TreeViewState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: 4dcf9b58 + m_LastClickedID: 1486606157 + m_ExpandedIDs: 213269b253336be2e36eadf800000000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 0 + m_ClientGUIView: {fileID: 0} + m_SearchString: From 7f149c69e2b26b70fb87dac1e76551f46f5e7878 Mon Sep 17 00:00:00 2001 From: Syed zainul abedin Date: Wed, 17 Jan 2024 13:11:40 +0530 Subject: [PATCH 04/26] feat: Added player controller --- .../.idea.2D-Platformer-Game/.idea/.gitignore | 13 + .../.idea/encodings.xml | 4 + .../.idea/indexLayout.xml | 8 + .idea/.idea.2D-Platformer-Game/.idea/vcs.xml | 6 + .../AnimationClips/Player_Crouch.anim | 2 +- .../Animations/AnimationClips/Player_Run.anim | 135 +++++ .../AnimationClips/Player_Run.anim.meta | 8 + .../Animators/Ellen/PlayerAnimator.controller | 170 ++++--- Assets/Game Assets/Prefab/Player.prefab | 46 ++ Assets/Scenes/AnimationTest.unity | 465 +++++++++++++++++- Assets/Scripts.meta | 8 + Assets/Scripts/PlayerController.cs | 24 + Assets/Scripts/PlayerController.cs.meta | 11 + Packages/manifest.json | 2 - Packages/packages-lock.json | 23 +- ProjectSettings/TagManager.asset | 2 +- UserSettings/Layouts/default-2022.dwlt | 76 +-- 17 files changed, 862 insertions(+), 141 deletions(-) create mode 100644 .idea/.idea.2D-Platformer-Game/.idea/.gitignore create mode 100644 .idea/.idea.2D-Platformer-Game/.idea/encodings.xml create mode 100644 .idea/.idea.2D-Platformer-Game/.idea/indexLayout.xml create mode 100644 .idea/.idea.2D-Platformer-Game/.idea/vcs.xml create mode 100644 Assets/Game Assets/Art/Animations/AnimationClips/Player_Run.anim create mode 100644 Assets/Game Assets/Art/Animations/AnimationClips/Player_Run.anim.meta create mode 100644 Assets/Scripts.meta create mode 100644 Assets/Scripts/PlayerController.cs create mode 100644 Assets/Scripts/PlayerController.cs.meta diff --git a/.idea/.idea.2D-Platformer-Game/.idea/.gitignore b/.idea/.idea.2D-Platformer-Game/.idea/.gitignore new file mode 100644 index 0000000000..904fe5f35f --- /dev/null +++ b/.idea/.idea.2D-Platformer-Game/.idea/.gitignore @@ -0,0 +1,13 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Rider ignored files +/modules.xml +/projectSettingsUpdater.xml +/.idea.2D-Platformer-Game.iml +/contentModel.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/.idea.2D-Platformer-Game/.idea/encodings.xml b/.idea/.idea.2D-Platformer-Game/.idea/encodings.xml new file mode 100644 index 0000000000..df87cf951f --- /dev/null +++ b/.idea/.idea.2D-Platformer-Game/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/.idea.2D-Platformer-Game/.idea/indexLayout.xml b/.idea/.idea.2D-Platformer-Game/.idea/indexLayout.xml new file mode 100644 index 0000000000..7b08163ceb --- /dev/null +++ b/.idea/.idea.2D-Platformer-Game/.idea/indexLayout.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/.idea.2D-Platformer-Game/.idea/vcs.xml b/.idea/.idea.2D-Platformer-Game/.idea/vcs.xml new file mode 100644 index 0000000000..35eb1ddfbb --- /dev/null +++ b/.idea/.idea.2D-Platformer-Game/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Crouch.anim b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Crouch.anim index 84132a3be1..85cbcee7fb 100644 --- a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Crouch.anim +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Crouch.anim @@ -67,7 +67,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Run.anim b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Run.anim new file mode 100644 index 0000000000..3005086cb2 --- /dev/null +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Run.anim @@ -0,0 +1,135 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player_Run + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: ff33d6adfeac52e419af23fad2d0abfd, type: 3} + - time: 0.033333335 + value: {fileID: 21300000, guid: 12ea17332fa174442af48960686e1769, type: 3} + - time: 0.06666667 + value: {fileID: 21300000, guid: 45ed26a75477df843a013176e95192a9, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: 3a5b7c781691c8642af63e9c1e6c14de, type: 3} + - time: 0.13333334 + value: {fileID: 21300000, guid: 87e29b609bb169245a2df3d89266630c, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: a4cfd522aaaa4ac45980e1828c8dea2c, type: 3} + - time: 0.18333334 + value: {fileID: 21300000, guid: 2eaa4938329e1204ca267982a8cdb3fa, type: 3} + - time: 0.21666667 + value: {fileID: 21300000, guid: dfd2eca0b8de7a443a0b28c6466f55ba, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: 301fc9f2a0405ee45ad84f7b550051d5, type: 3} + - time: 0.28333333 + value: {fileID: 21300000, guid: 05df8025a12814d46b434681a6989133, type: 3} + - time: 0.31666666 + value: {fileID: 21300000, guid: 5d25d9e1de070994db63a462e89932d7, type: 3} + - time: 0.35 + value: {fileID: 21300000, guid: 9989c37dedfecfa4591fd9f1821713cb, type: 3} + - time: 0.38333333 + value: {fileID: 21300000, guid: 89339a864e8d9994ea7c9531ae92e67e, type: 3} + - time: 0.41666666 + value: {fileID: 21300000, guid: 453c8803862e72b43ad3652b8fe03437, type: 3} + - time: 0.45 + value: {fileID: 21300000, guid: eb350ede4895d6d418689eb126b772cb, type: 3} + - time: 0.48333332 + value: {fileID: 21300000, guid: 79d7163dfd26ad748bf88cdc6b98d2f5, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: 690102d87edd7d047824362d73a02788, type: 3} + - time: 0.53333336 + value: {fileID: 21300000, guid: 5cdf5107efb2e8c4d980153f752a57c1, type: 3} + - time: 0.56666666 + value: {fileID: 21300000, guid: 3b3834ff0aab3d849bca2adc0c0d5f84, type: 3} + - time: 0.6 + value: {fileID: 21300000, guid: d3c1e30225625c14e9bf351c35be2fd9, type: 3} + - time: 0.6333333 + value: {fileID: 21300000, guid: 88f2ac18ae0c71845bc1d47bd924f8a8, type: 3} + - time: 0.6666667 + value: {fileID: 21300000, guid: 37547022c0607c544915b3089832635d, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: ff33d6adfeac52e419af23fad2d0abfd, type: 3} + - {fileID: 21300000, guid: 12ea17332fa174442af48960686e1769, type: 3} + - {fileID: 21300000, guid: 45ed26a75477df843a013176e95192a9, type: 3} + - {fileID: 21300000, guid: 3a5b7c781691c8642af63e9c1e6c14de, type: 3} + - {fileID: 21300000, guid: 87e29b609bb169245a2df3d89266630c, type: 3} + - {fileID: 21300000, guid: a4cfd522aaaa4ac45980e1828c8dea2c, type: 3} + - {fileID: 21300000, guid: 2eaa4938329e1204ca267982a8cdb3fa, type: 3} + - {fileID: 21300000, guid: dfd2eca0b8de7a443a0b28c6466f55ba, type: 3} + - {fileID: 21300000, guid: 301fc9f2a0405ee45ad84f7b550051d5, type: 3} + - {fileID: 21300000, guid: 05df8025a12814d46b434681a6989133, type: 3} + - {fileID: 21300000, guid: 5d25d9e1de070994db63a462e89932d7, type: 3} + - {fileID: 21300000, guid: 9989c37dedfecfa4591fd9f1821713cb, type: 3} + - {fileID: 21300000, guid: 89339a864e8d9994ea7c9531ae92e67e, type: 3} + - {fileID: 21300000, guid: 453c8803862e72b43ad3652b8fe03437, type: 3} + - {fileID: 21300000, guid: eb350ede4895d6d418689eb126b772cb, type: 3} + - {fileID: 21300000, guid: 79d7163dfd26ad748bf88cdc6b98d2f5, type: 3} + - {fileID: 21300000, guid: 690102d87edd7d047824362d73a02788, type: 3} + - {fileID: 21300000, guid: 5cdf5107efb2e8c4d980153f752a57c1, type: 3} + - {fileID: 21300000, guid: 3b3834ff0aab3d849bca2adc0c0d5f84, type: 3} + - {fileID: 21300000, guid: d3c1e30225625c14e9bf351c35be2fd9, type: 3} + - {fileID: 21300000, guid: 88f2ac18ae0c71845bc1d47bd924f8a8, type: 3} + - {fileID: 21300000, guid: 37547022c0607c544915b3089832635d, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.68333334 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Run.anim.meta b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Run.anim.meta new file mode 100644 index 0000000000..bb984925a3 --- /dev/null +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Run.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5abcc795b299648e39c09a3b5c6235ba +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller b/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller index a83626bfb9..4fddf06659 100644 --- a/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller +++ b/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller @@ -11,8 +11,8 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 4129752464728350232} - {fileID: 5938351793167912262} + - {fileID: 1162118716121810041} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -28,18 +28,46 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1102 &-5334714141835380790 +--- !u!1107 &-4154430246438009678 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: -9024768835540588441} + m_Position: {x: 200, y: 240, z: 0} + - serializedVersion: 1 + m_State: {fileID: 1725952575496220380} + m_Position: {x: 300, y: 510, z: 0} + - serializedVersion: 1 + m_State: {fileID: -550194764353508568} + m_Position: {x: 500, y: 370, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: -9024768835540588441} +--- !u!1102 &-550194764353508568 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Player_Walk + m_Name: Player_Run m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 6558108255511765441} + - {fileID: -423941246477349033} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -49,40 +77,37 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 38d1bacd4a82b4790bb84a1f1563630d, type: 2} + m_Motion: {fileID: 7400000, guid: 5abcc795b299648e39c09a3b5c6235ba, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1107 &-4154430246438009678 -AnimatorStateMachine: - serializedVersion: 6 +--- !u!1101 &-423941246477349033 +AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Base Layer - m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -9024768835540588441} - m_Position: {x: 200, y: 240, z: 0} - - serializedVersion: 1 - m_State: {fileID: -5334714141835380790} - m_Position: {x: 570, y: 320, z: 0} - - serializedVersion: 1 - m_State: {fileID: 1725952575496220380} - m_Position: {x: 260, y: 470, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: [] - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 50, y: 20, z: 0} - m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -9024768835540588441} + m_Name: + m_Conditions: + - m_ConditionMode: 4 + m_ConditionEvent: Speed + m_EventTreshold: 0.3 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -9024768835540588441} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.63414633 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -98,6 +123,12 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} + - m_Name: Crouch + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -111,6 +142,31 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} +--- !u!1101 &1162118716121810041 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 3 + m_ConditionEvent: Speed + m_EventTreshold: 0.3 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -550194764353508568} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.63414633 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &1725952575496220380 AnimatorState: serializedVersion: 6 @@ -138,28 +194,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &4129752464728350232 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -5334714141835380790} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0.63414633 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &5938351793167912262 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -167,7 +201,10 @@ AnimatorStateTransition: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: [] + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Crouch + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 1725952575496220380} m_Solo: 0 @@ -189,38 +226,19 @@ AnimatorStateTransition: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: - m_Conditions: [] + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Crouch + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -9024768835540588441} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.42307693 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &6558108255511765441 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 1725952575496220380} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 m_TransitionDuration: 0 m_TransitionOffset: 0 - m_ExitTime: 0.63414633 + m_ExitTime: 0.42307693 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 diff --git a/Assets/Game Assets/Prefab/Player.prefab b/Assets/Game Assets/Prefab/Player.prefab index 51257698f2..e3128b962b 100644 --- a/Assets/Game Assets/Prefab/Player.prefab +++ b/Assets/Game Assets/Prefab/Player.prefab @@ -11,6 +11,7 @@ GameObject: - component: {fileID: 3593540518909196710} - component: {fileID: 7709620395850905416} - component: {fileID: 5820244955174857028} + - component: {fileID: 1899511879573762748} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -106,3 +107,48 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!61 &1899511879573762748 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 328097028837166983} + 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: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.047171265, y: 0.9883903} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.42, y: 0.1} + oldSize: {x: 3.7534883, y: 2.8325582} + newSize: {x: 3.7534883, y: 2.8325582} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.667985, y: 2.1817095} + m_EdgeRadius: 0 diff --git a/Assets/Scenes/AnimationTest.unity b/Assets/Scenes/AnimationTest.unity index c55e785bd2..ed34ab0f97 100644 --- a/Assets/Scenes/AnimationTest.unity +++ b/Assets/Scenes/AnimationTest.unity @@ -124,6 +124,266 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &4354825 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4354828} + - component: {fileID: 4354827} + - component: {fileID: 4354826} + m_Layer: 0 + m_Name: Ground2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &4354826 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4354825} + 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: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.06} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 7.761719, y: 2.3253536} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 0.9414788} + m_EdgeRadius: 0 +--- !u!212 &4354827 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4354825} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 21300002, guid: 389dc290ab41ea34485314d037cc75df, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.761719, y: 2.3253536} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &4354828 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4354825} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.915, y: -3.313, z: 0} + m_LocalScale: {x: 2.35, y: 2.35, z: 2.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &282281674 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 282281676} + - component: {fileID: 282281675} + - component: {fileID: 282281677} + m_Layer: 0 + m_Name: Ground1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &282281675 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 282281674} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 389dc290ab41ea34485314d037cc75df, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.761719, y: 2.3253536} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &282281676 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 282281674} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.773, y: -3.27, z: 0} + m_LocalScale: {x: 2.35, y: 2.35, z: 2.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &282281677 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 282281674} + 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: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.06} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 7.761719, y: 2.3253536} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 0.9457176} + m_EdgeRadius: 0 --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -216,6 +476,136 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1857259668 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1857259671} + - component: {fileID: 1857259670} + - component: {fileID: 1857259669} + m_Layer: 0 + m_Name: Ground3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &1857259669 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857259668} + 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: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.06} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 7.761719, y: 2.3253536} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 0.9268483} + m_EdgeRadius: 0 +--- !u!212 &1857259670 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857259668} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 21300004, guid: 389dc290ab41ea34485314d037cc75df, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.761719, y: 2.3253536} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1857259671 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857259668} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.57, y: -3.244, z: 0} + m_LocalScale: {x: 2.35, y: 2.35, z: 2.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2101336368777957266 PrefabInstance: m_ObjectHideFlags: 0 @@ -229,6 +619,16 @@ PrefabInstance: propertyPath: m_Name value: Player objectReference: {fileID: 0} + - target: {fileID: 1899511879573762748, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_Size.y + value: 2.1688023 + objectReference: {fileID: 0} + - target: {fileID: 1899511879573762748, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_Offset.y + value: 0.99484396 + objectReference: {fileID: 0} - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, type: 3} propertyPath: m_LocalPosition.x @@ -282,11 +682,74 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 328097028837166983, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2101336368777957269} + - targetCorrespondingSourceObject: {fileID: 328097028837166983, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2101336368777957274} m_SourcePrefab: {fileID: 100100000, guid: 2d26a819bd59c42f09e953f24c366259, type: 3} +--- !u!1 &2101336368777957267 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 328097028837166983, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + m_PrefabInstance: {fileID: 2101336368777957266} + m_PrefabAsset: {fileID: 0} +--- !u!50 &2101336368777957269 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2101336368777957267} + m_BodyType: 0 + 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!95 &2101336368777957271 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 5820244955174857028, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + m_PrefabInstance: {fileID: 2101336368777957266} + m_PrefabAsset: {fileID: 0} +--- !u!114 &2101336368777957274 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2101336368777957267} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a234ca469ff004fd281ff64323790871, type: 3} + m_Name: + m_EditorClassIdentifier: + animator: {fileID: 2101336368777957271} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 519420032} - {fileID: 2101336368777957266} + - {fileID: 282281676} + - {fileID: 4354828} + - {fileID: 1857259671} diff --git a/Assets/Scripts.meta b/Assets/Scripts.meta new file mode 100644 index 0000000000..7493307dec --- /dev/null +++ b/Assets/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9fc669fccd4e9454cba6ea872737f48e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs new file mode 100644 index 0000000000..ff2d9c1082 --- /dev/null +++ b/Assets/Scripts/PlayerController.cs @@ -0,0 +1,24 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class PlayerController : MonoBehaviour +{ + [SerializeField] private Animator animator; + private bool isCrouching = false; + + void Update() + { + float speed = Input.GetAxis("Horizontal"); + + animator.SetFloat("Speed", Mathf.Abs(speed)); + bool isFlipped = speed < 0; + float x = (isFlipped ? -1 : 1) * Mathf.Abs(transform.localScale.x); + transform.localScale = new Vector3(x, transform.localScale.y, transform.localScale.z); + if (Input.GetKeyDown(KeyCode.C) && speed == 0) + { + isCrouching = !isCrouching; + animator.SetBool("Crouch", isCrouching); + } + } +} diff --git a/Assets/Scripts/PlayerController.cs.meta b/Assets/Scripts/PlayerController.cs.meta new file mode 100644 index 0000000000..73cc60d68f --- /dev/null +++ b/Assets/Scripts/PlayerController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a234ca469ff004fd281ff64323790871 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Packages/manifest.json b/Packages/manifest.json index 21c0299072..4106bc13b6 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -4,7 +4,6 @@ "com.unity.2d.tilemap": "1.0.0", "com.unity.ads": "4.4.2", "com.unity.ai.navigation": "1.1.5", - "com.unity.analytics": "3.8.1", "com.unity.collab-proxy": "2.2.0", "com.unity.ide.rider": "3.0.25", "com.unity.ide.visualstudio": "2.0.21", @@ -35,7 +34,6 @@ "com.unity.modules.ui": "1.0.0", "com.unity.modules.uielements": "1.0.0", "com.unity.modules.umbra": "1.0.0", - "com.unity.modules.unityanalytics": "1.0.0", "com.unity.modules.unitywebrequest": "1.0.0", "com.unity.modules.unitywebrequestassetbundle": "1.0.0", "com.unity.modules.unitywebrequestaudio": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 0a4c735197..e745851c00 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -33,16 +33,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.analytics": { - "version": "3.8.1", - "depth": 0, - "source": "registry", - "dependencies": { - "com.unity.services.analytics": "1.0.4", - "com.unity.ugui": "1.0.0" - }, - "url": "https://packages.unity.com" - }, "com.unity.collab-proxy": { "version": "2.2.0", "depth": 0, @@ -103,17 +93,6 @@ }, "url": "https://packages.unity.com" }, - "com.unity.services.analytics": { - "version": "5.0.0", - "depth": 1, - "source": "registry", - "dependencies": { - "com.unity.ugui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.services.core": "1.10.1" - }, - "url": "https://packages.unity.com" - }, "com.unity.services.core": { "version": "1.11.0", "depth": 1, @@ -322,7 +301,7 @@ }, "com.unity.modules.unityanalytics": { "version": "1.0.0", - "depth": 0, + "depth": 1, "source": "builtin", "dependencies": { "com.unity.modules.unitywebrequest": "1.0.0", diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 1c92a7840e..7b4c964862 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -8,7 +8,7 @@ TagManager: - Default - TransparentFX - Ignore Raycast - - + - Platform - Water - UI - diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 96497ce575..2fbcdcb9c0 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1470 height: 829 m_ShowMode: 4 - m_Title: Animator + m_Title: Console m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 2725 + controlID: 110 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -144,7 +144,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 2726 + controlID: 20 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -169,7 +169,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 2727 + controlID: 21 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -206,7 +206,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AnimatorControllerTool + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: @@ -215,15 +215,15 @@ MonoBehaviour: y: 0 width: 733 height: 437.5 - m_MinSize: {x: 102, y: 121} + m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} - {fileID: 12} - {fileID: 15} - m_Selected: 2 - m_LastSelected: 1 + m_Selected: 0 + m_LastSelected: 2 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -234,7 +234,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AnimationWindow + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: @@ -245,13 +245,13 @@ MonoBehaviour: height: 341.5 m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 18} + m_ActualView: {fileID: 17} m_Panes: - {fileID: 16} - {fileID: 18} - {fileID: 17} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 2 + m_LastSelected: 1 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -418,9 +418,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 94c6feff - m_LastClickedID: 0 - m_ExpandedIDs: a2d8feffdad8feffded9feff + m_SelectedIDs: e243ffff + m_LastClickedID: -48158 + m_ExpandedIDs: e443ffffe244ffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -436,7 +436,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 8} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -465,9 +465,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 281 + x: 248 y: 95 - width: 815 + width: 731 height: 416.5 m_SerializedDataModeController: m_DataMode: 0 @@ -853,9 +853,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1.924883, y: 1.2241839, z: -0.009598574} + m_Target: {x: 0.19731823, y: 0.3814012, z: 0.007834057} speed: 2 - m_Value: {x: 1.924883, y: 1.2241839, z: -0.009598574} + m_Value: {x: 0.22806987, y: 0.3726041, z: 0.0072366213} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -905,9 +905,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 3.3131514 + m_Target: 3.9231884 speed: 2 - m_Value: 3.3131514 + m_Value: 3.9829323 m_Ortho: m_Target: 1 speed: 2 @@ -1113,7 +1113,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 532.5 - width: 1097 + width: 980 height: 320.5 m_SerializedDataModeController: m_DataMode: 0 @@ -1136,7 +1136,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Crouch + - Assets m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1144,16 +1144,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 96 m_LastFolders: - - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Crouch + - Assets m_LastFoldersGridSize: 96 m_LastProjectPath: /Users/zain/2D-Platformer-Game m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 195.5} - m_SelectedIDs: 564c0000 - m_LastClickedID: 19542 - m_ExpandedIDs: 00000000da40000076410000ea410000b2420000de430000de45000002490000e64b000000ca9a3bffffff7f + scrollPos: {x: 0, y: 79} + m_SelectedIDs: 84800000 + m_LastClickedID: 32900 + m_ExpandedIDs: 0000000054770000848000009e800000ae800000b0800000b2800000b480000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1181,7 +1181,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000da40000000ca9a3bffffff7f + m_ExpandedIDs: 0000000084800000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1206,10 +1206,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 5ca3000016a500002ca70000cea300005c9b0000 - m_LastClickedInstanceID: 39772 + m_SelectedInstanceIDs: e243ffff + m_LastClickedInstanceID: -48158 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000d87c0000e67c00001882000092a80000f2ac00005e7f00002cb900006c9f000034ba000036bb00009a7f0000947e00002a580100a85c0100667f0000b88700004a7e00005a7c0000fe7d00001aa00000687f00006a7f0000189f0000f87f00005c530400369e0000 + m_ExpandedInstanceIDs: c6230000d87c0000e67c00001882000092a80000f2ac00005e7f00002cb900006c9f000034ba000036bb00009a7f0000947e00002a580100a85c0100667f0000b88700004a7e00005a7c0000fe7d00001aa00000687f00006a7f0000189f0000f87f00005c530400369e0000e88a0000e48a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1259,9 +1259,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 573.5 - width: 1097 - height: 279.5 + y: 532.5 + width: 980 + height: 320.5 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1309,7 +1309,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -76168 + m_LastSelectedObjectID: -48158 --- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 From ac0a904702d747da797134282ae829cd9b1c4799 Mon Sep 17 00:00:00 2001 From: Syed zainul abedin Date: Wed, 17 Jan 2024 13:19:47 +0530 Subject: [PATCH 05/26] feat: Added logic for adjusting croucing collider --- Assets/Scripts/PlayerController.cs | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index ff2d9c1082..820e148965 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -5,7 +5,10 @@ public class PlayerController : MonoBehaviour { [SerializeField] private Animator animator; + [SerializeField] private BoxCollider2D boxCollider2D; private bool isCrouching = false; + private float crouchOffset = 0.5f; + private float crouchSize = 0.5f; void Update() { @@ -15,10 +18,20 @@ void Update() bool isFlipped = speed < 0; float x = (isFlipped ? -1 : 1) * Mathf.Abs(transform.localScale.x); transform.localScale = new Vector3(x, transform.localScale.y, transform.localScale.z); - if (Input.GetKeyDown(KeyCode.C) && speed == 0) + if ((Input.GetKeyDown(KeyCode.LeftControl) || Input.GetKeyDown(KeyCode.RightControl)) && speed == 0) { isCrouching = !isCrouching; animator.SetBool("Crouch", isCrouching); + if (isCrouching) + { + boxCollider2D.size = new Vector2(boxCollider2D.size.x, boxCollider2D.size.y * crouchSize); + boxCollider2D.offset = new Vector2(boxCollider2D.offset.x, boxCollider2D.offset.y - crouchOffset); + } + else + { + boxCollider2D.size = new Vector2(boxCollider2D.size.x, boxCollider2D.size.y / crouchSize); + boxCollider2D.offset = new Vector2(boxCollider2D.offset.x, boxCollider2D.offset.y + crouchOffset); + } } } } From 4f18631b8a0f636cb19aee248cd4de4dd29a041d Mon Sep 17 00:00:00 2001 From: Syed zainul abedin Date: Wed, 17 Jan 2024 13:28:28 +0530 Subject: [PATCH 06/26] feat: Updating collider based on animation instead manuall --- .../AnimationClips/Player_Crouch.anim | 280 +++++++++++++++++- Assets/Game Assets/Prefab/Player.prefab | 47 ++- Assets/Scenes/AnimationTest.unity | 72 +---- Assets/Scripts/PlayerController.cs | 20 +- 4 files changed, 334 insertions(+), 85 deletions(-) diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Crouch.anim b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Crouch.anim index 85cbcee7fb..0493982cd6 100644 --- a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Crouch.anim +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Crouch.anim @@ -16,7 +16,127 @@ AnimationClip: m_EulerCurves: [] m_PositionCurves: [] m_ScaleCurves: [] - m_FloatCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.9827912 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 0.6031297 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Offset.y + path: + classID: 61 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 2.1446967 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 1.3853737 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Size.y + path: + classID: 61 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.047171265 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: -0.1155408 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Offset.x + path: + classID: 61 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.667985 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 0.99340916 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Size.x + path: + classID: 61 + script: {fileID: 0} + flags: 0 m_PPtrCurves: - serializedVersion: 2 curve: @@ -42,6 +162,42 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 1872933342 + script: {fileID: 0} + typeID: 61 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 2368279999 + script: {fileID: 0} + typeID: 61 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 413499720 + script: {fileID: 0} + typeID: 61 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + - serializedVersion: 2 + path: 0 + attribute: 4197328169 + script: {fileID: 0} + typeID: 61 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 0 attribute: 0 @@ -77,7 +233,127 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.9827912 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 0.6031297 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Offset.y + path: + classID: 61 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 2.1446967 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 1.3853737 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Size.y + path: + classID: 61 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.047171265 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: -0.1155408 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Offset.x + path: + classID: 61 + script: {fileID: 0} + flags: 0 + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.667985 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.21666667 + value: 0.99340916 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Size.x + path: + classID: 61 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Game Assets/Prefab/Player.prefab b/Assets/Game Assets/Prefab/Player.prefab index e3128b962b..86c6fc3ff7 100644 --- a/Assets/Game Assets/Prefab/Player.prefab +++ b/Assets/Game Assets/Prefab/Player.prefab @@ -12,6 +12,8 @@ GameObject: - component: {fileID: 7709620395850905416} - component: {fileID: 5820244955174857028} - component: {fileID: 1899511879573762748} + - component: {fileID: 7252644103890736809} + - component: {fileID: 7015224702095746497} m_Layer: 0 m_Name: Player m_TagString: Untagged @@ -139,7 +141,7 @@ BoxCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: 0.047171265, y: 0.9883903} + m_Offset: {x: 0.047171265, y: 0.9827912} m_SpriteTilingProperty: border: {x: 0, y: 0, z: 0, w: 0} pivot: {x: 0.42, y: 0.1} @@ -150,5 +152,46 @@ BoxCollider2D: adaptiveTiling: 0 m_AutoTiling: 0 serializedVersion: 2 - m_Size: {x: 0.667985, y: 2.1817095} + m_Size: {x: 0.667985, y: 2.1446967} m_EdgeRadius: 0 +--- !u!50 &7252644103890736809 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 328097028837166983} + m_BodyType: 0 + 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!114 &7015224702095746497 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 328097028837166983} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a234ca469ff004fd281ff64323790871, type: 3} + m_Name: + m_EditorClassIdentifier: + animator: {fileID: 5820244955174857028} + boxCollider2D: {fileID: 1899511879573762748} diff --git a/Assets/Scenes/AnimationTest.unity b/Assets/Scenes/AnimationTest.unity index ed34ab0f97..364bc1c51c 100644 --- a/Assets/Scenes/AnimationTest.unity +++ b/Assets/Scenes/AnimationTest.unity @@ -619,16 +619,6 @@ PrefabInstance: propertyPath: m_Name value: Player objectReference: {fileID: 0} - - target: {fileID: 1899511879573762748, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - propertyPath: m_Size.y - value: 2.1688023 - objectReference: {fileID: 0} - - target: {fileID: 1899511879573762748, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - propertyPath: m_Offset.y - value: 0.99484396 - objectReference: {fileID: 0} - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, type: 3} propertyPath: m_LocalPosition.x @@ -682,68 +672,8 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 328097028837166983, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - insertIndex: -1 - addedObject: {fileID: 2101336368777957269} - - targetCorrespondingSourceObject: {fileID: 328097028837166983, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - insertIndex: -1 - addedObject: {fileID: 2101336368777957274} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2d26a819bd59c42f09e953f24c366259, type: 3} ---- !u!1 &2101336368777957267 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 328097028837166983, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - m_PrefabInstance: {fileID: 2101336368777957266} - m_PrefabAsset: {fileID: 0} ---- !u!50 &2101336368777957269 -Rigidbody2D: - serializedVersion: 4 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2101336368777957267} - m_BodyType: 0 - 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!95 &2101336368777957271 stripped -Animator: - m_CorrespondingSourceObject: {fileID: 5820244955174857028, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - m_PrefabInstance: {fileID: 2101336368777957266} - m_PrefabAsset: {fileID: 0} ---- !u!114 &2101336368777957274 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2101336368777957267} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: a234ca469ff004fd281ff64323790871, type: 3} - m_Name: - m_EditorClassIdentifier: - animator: {fileID: 2101336368777957271} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 820e148965..73347dddbe 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -22,16 +22,16 @@ void Update() { isCrouching = !isCrouching; animator.SetBool("Crouch", isCrouching); - if (isCrouching) - { - boxCollider2D.size = new Vector2(boxCollider2D.size.x, boxCollider2D.size.y * crouchSize); - boxCollider2D.offset = new Vector2(boxCollider2D.offset.x, boxCollider2D.offset.y - crouchOffset); - } - else - { - boxCollider2D.size = new Vector2(boxCollider2D.size.x, boxCollider2D.size.y / crouchSize); - boxCollider2D.offset = new Vector2(boxCollider2D.offset.x, boxCollider2D.offset.y + crouchOffset); - } + // if (isCrouching) + // { + // boxCollider2D.size = new Vector2(boxCollider2D.size.x, boxCollider2D.size.y * crouchSize); + // boxCollider2D.offset = new Vector2(boxCollider2D.offset.x, boxCollider2D.offset.y - crouchOffset); + // } + // else + // { + // boxCollider2D.size = new Vector2(boxCollider2D.size.x, boxCollider2D.size.y / crouchSize); + // boxCollider2D.offset = new Vector2(boxCollider2D.offset.x, boxCollider2D.offset.y + crouchOffset); + // } } } } From d3c8e527dea7b2775b8f6c36fef05b2a21a91ae3 Mon Sep 17 00:00:00 2001 From: Syed zainul abedin Date: Wed, 17 Jan 2024 13:30:12 +0530 Subject: [PATCH 07/26] feat: Added comment for crouch logic --- Assets/Scripts/PlayerController.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 73347dddbe..d114d92d56 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -22,6 +22,10 @@ void Update() { isCrouching = !isCrouching; animator.SetBool("Crouch", isCrouching); + + // Both ways are working + // 1. Using animation and adjusting collider + // 2. Using code and adjusting box collider size and offset // if (isCrouching) // { // boxCollider2D.size = new Vector2(boxCollider2D.size.x, boxCollider2D.size.y * crouchSize); From 23b62a5b199d095eabdf3b10dff64a82c9bd1703 Mon Sep 17 00:00:00 2001 From: Syed zainul abedin Date: Wed, 17 Jan 2024 16:27:19 +0530 Subject: [PATCH 08/26] feat: Added jump and movement --- .../AnimationClips/Player_Idle.anim | 28 ++-- .../AnimationClips/Player_Jump.anim | 126 +++++++++++++++++ .../AnimationClips/Player_Jump.anim.meta | 8 ++ .../Animators/Ellen/PlayerAnimator.controller | 132 +++++++++++++++++- Assets/Game Assets/Prefab/Player.prefab | 6 +- Assets/Scenes/AnimationTest.unity | 26 ++++ Assets/Scripts/PlayerController.cs | 37 ++++- UserSettings/Search.index | 13 ++ UserSettings/Search.settings | 76 +++++++++- 9 files changed, 427 insertions(+), 25 deletions(-) create mode 100644 Assets/Game Assets/Art/Animations/AnimationClips/Player_Jump.anim create mode 100644 Assets/Game Assets/Art/Animations/AnimationClips/Player_Jump.anim.meta create mode 100644 UserSettings/Search.index diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Idle.anim b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Idle.anim index 614da0b8c2..4f7c3114f6 100644 --- a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Idle.anim +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Idle.anim @@ -24,31 +24,31 @@ AnimationClip: value: {fileID: 21300000, guid: c4d7d6470acd7bf45971042161c6e018, type: 3} - time: 0.05 value: {fileID: 21300000, guid: 1fa29ad54380226498c2250e612fec93, type: 3} - - time: 0.083333336 + - time: 0.1 value: {fileID: 21300000, guid: c7cf710ee57c1ae45aac513a85fcff07, type: 3} - - time: 0.13333334 + - time: 0.18333334 value: {fileID: 21300000, guid: 774282641b60d9d4daddad7c6ad7ae69, type: 3} - - time: 0.2 + - time: 0.28333333 value: {fileID: 21300000, guid: a53475b08393802498550588cf70ef5e, type: 3} - - time: 0.21666667 + - time: 0.3 value: {fileID: 21300000, guid: c6b584771aee7a148bcf2885a6f347ba, type: 3} - - time: 0.31666666 + - time: 0.46666667 value: {fileID: 21300000, guid: 60a2cfad92429cc4b9d2f6ce7148c37a, type: 3} - - time: 0.33333334 + - time: 0.48333332 value: {fileID: 21300000, guid: dcc9002875a3a244eacb72418d292f8e, type: 3} - - time: 0.35 + - time: 0.51666665 value: {fileID: 21300000, guid: 64afd51ca9828034f8c64a261e4b99b9, type: 3} - - time: 0.45 + - time: 0.6666667 value: {fileID: 21300000, guid: 76089009971280441963c2a3a55b5071, type: 3} - - time: 0.46666667 + - time: 0.7 value: {fileID: 21300000, guid: cd65a99c817869946969cd216cab2115, type: 3} - - time: 0.53333336 + - time: 0.8 value: {fileID: 21300000, guid: 591e3ea0fd60a1442bfbe969a16d4d74, type: 3} - - time: 0.5833333 + - time: 0.8666667 value: {fileID: 21300000, guid: d2d936bae69c599429ee1a386892a9f0, type: 3} - - time: 0.6166667 + - time: 0.9166667 value: {fileID: 21300000, guid: f3b094a028c28604382b41bfab29604a, type: 3} - - time: 0.6666667 + - time: 1 value: {fileID: 21300000, guid: ed4c6463819f7cb4b85a6a44dc35c9cf, type: 3} attribute: m_Sprite path: @@ -92,7 +92,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.68333334 + m_StopTime: 1.0166667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Jump.anim b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Jump.anim new file mode 100644 index 0000000000..c3385556b0 --- /dev/null +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Jump.anim @@ -0,0 +1,126 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player_Jump + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: 5767e2180fcbb7a4d9980e9a37e3d588, type: 3} + - time: 0.05 + value: {fileID: 21300000, guid: e4381a10685b28d4f906cc686ecbc2c7, type: 3} + - time: 0.06666667 + value: {fileID: 21300000, guid: 6f8b0a53ff8c9e94f9d4af829e2ad6f3, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: affa4f4470b317440b7cb5187df710ef, type: 3} + - time: 0.13333334 + value: {fileID: 21300000, guid: 4214a14962bcf4943baf9e184b9b928e, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: bb6a891737c56e6438e808fb4e716321, type: 3} + - time: 0.18333334 + value: {fileID: 21300000, guid: af68c0be2e67f3846bcdf33841f8312b, type: 3} + - time: 0.23333333 + value: {fileID: 21300000, guid: a9f05e230fdd41b4f99ac0e0b7c4fa2b, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: ae6184443cb4d0f439bab73e9e76df4a, type: 3} + - time: 0.3 + value: {fileID: 21300000, guid: fcec6de5f73f3b74480aa66ffac97f43, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 7dcbef0330b37354dae1c1071956813a, type: 3} + - time: 0.35 + value: {fileID: 21300000, guid: ca897d165bbb9094584da008d90d3df5, type: 3} + - time: 0.4 + value: {fileID: 21300000, guid: fffa3e12c34c2ee448d46f5c9db142e6, type: 3} + - time: 0.41666666 + value: {fileID: 21300000, guid: 5b31577ecf5954448b0d92a2c8a0501b, type: 3} + - time: 0.45 + value: {fileID: 21300000, guid: 13aa9a4a1bc68064c9e5e17a86df2666, type: 3} + - time: 0.48333332 + value: {fileID: 21300000, guid: 1eb8ffe712da55942b19d29be7a6e5da, type: 3} + - time: 0.53333336 + value: {fileID: 21300000, guid: 31d88d4dbed3d9546898b42447a63e77, type: 3} + - time: 0.53333336 + value: {fileID: 21300000, guid: 686160c7c3cfd5040a8ea08b867ff56c, type: 3} + - time: 0.5833333 + value: {fileID: 21300000, guid: cb0f74b7e0e21ee47b09fdb24a83094f, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: 5767e2180fcbb7a4d9980e9a37e3d588, type: 3} + - {fileID: 21300000, guid: e4381a10685b28d4f906cc686ecbc2c7, type: 3} + - {fileID: 21300000, guid: 6f8b0a53ff8c9e94f9d4af829e2ad6f3, type: 3} + - {fileID: 21300000, guid: affa4f4470b317440b7cb5187df710ef, type: 3} + - {fileID: 21300000, guid: 4214a14962bcf4943baf9e184b9b928e, type: 3} + - {fileID: 21300000, guid: bb6a891737c56e6438e808fb4e716321, type: 3} + - {fileID: 21300000, guid: af68c0be2e67f3846bcdf33841f8312b, type: 3} + - {fileID: 21300000, guid: a9f05e230fdd41b4f99ac0e0b7c4fa2b, type: 3} + - {fileID: 21300000, guid: ae6184443cb4d0f439bab73e9e76df4a, type: 3} + - {fileID: 21300000, guid: fcec6de5f73f3b74480aa66ffac97f43, type: 3} + - {fileID: 21300000, guid: 7dcbef0330b37354dae1c1071956813a, type: 3} + - {fileID: 21300000, guid: ca897d165bbb9094584da008d90d3df5, type: 3} + - {fileID: 21300000, guid: fffa3e12c34c2ee448d46f5c9db142e6, type: 3} + - {fileID: 21300000, guid: 5b31577ecf5954448b0d92a2c8a0501b, type: 3} + - {fileID: 21300000, guid: 13aa9a4a1bc68064c9e5e17a86df2666, type: 3} + - {fileID: 21300000, guid: 1eb8ffe712da55942b19d29be7a6e5da, type: 3} + - {fileID: 21300000, guid: 31d88d4dbed3d9546898b42447a63e77, type: 3} + - {fileID: 21300000, guid: 686160c7c3cfd5040a8ea08b867ff56c, type: 3} + - {fileID: 21300000, guid: cb0f74b7e0e21ee47b09fdb24a83094f, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.59999996 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Jump.anim.meta b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Jump.anim.meta new file mode 100644 index 0000000000..457794e1a4 --- /dev/null +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Jump.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e574883f11f61476a8361482d3edf1d5 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller b/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller index 4fddf06659..ca31baf665 100644 --- a/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller +++ b/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller @@ -42,12 +42,16 @@ AnimatorStateMachine: m_Position: {x: 200, y: 240, z: 0} - serializedVersion: 1 m_State: {fileID: 1725952575496220380} - m_Position: {x: 300, y: 510, z: 0} + m_Position: {x: 440, y: 560, z: 0} - serializedVersion: 1 m_State: {fileID: -550194764353508568} m_Position: {x: 500, y: 370, z: 0} + - serializedVersion: 1 + m_State: {fileID: 6950904116198280210} + m_Position: {x: 540, y: 60, z: 0} m_ChildStateMachines: [] - m_AnyStateTransitions: [] + m_AnyStateTransitions: + - {fileID: 8919909326570546917} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] @@ -129,6 +133,18 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} + - m_Name: Jump + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: isGrounded + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -194,6 +210,34 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &4469878811732974554 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Jump + m_EventTreshold: 0 + - m_ConditionMode: 3 + m_ConditionEvent: Speed + m_EventTreshold: 0.3 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -550194764353508568} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.516129 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &5938351793167912262 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -219,6 +263,34 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &6138191876500889057 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Jump + m_EventTreshold: 0 + - m_ConditionMode: 4 + m_ConditionEvent: Speed + m_EventTreshold: 0.3 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -9024768835540588441} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.516129 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &6332234346085945739 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -244,3 +316,59 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &6950904116198280210 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player_Jump + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 6138191876500889057} + - {fileID: 4469878811732974554} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: e574883f11f61476a8361482d3edf1d5, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: +--- !u!1101 &8919909326570546917 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Jump + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: isGrounded + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 6950904116198280210} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 diff --git a/Assets/Game Assets/Prefab/Player.prefab b/Assets/Game Assets/Prefab/Player.prefab index 86c6fc3ff7..2e03ec2974 100644 --- a/Assets/Game Assets/Prefab/Player.prefab +++ b/Assets/Game Assets/Prefab/Player.prefab @@ -180,7 +180,7 @@ Rigidbody2D: m_Interpolate: 0 m_SleepingMode: 1 m_CollisionDetection: 0 - m_Constraints: 0 + m_Constraints: 4 --- !u!114 &7015224702095746497 MonoBehaviour: m_ObjectHideFlags: 0 @@ -194,4 +194,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: animator: {fileID: 5820244955174857028} - boxCollider2D: {fileID: 1899511879573762748} + rigidbody2D: {fileID: 7252644103890736809} + jumpForce: 24 + speed: 10 diff --git a/Assets/Scenes/AnimationTest.unity b/Assets/Scenes/AnimationTest.unity index 364bc1c51c..664c775363 100644 --- a/Assets/Scenes/AnimationTest.unity +++ b/Assets/Scenes/AnimationTest.unity @@ -669,11 +669,37 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7015224702095746497, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: speed + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7015224702095746497, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: jumpForce + value: 24 + objectReference: {fileID: 0} + - target: {fileID: 7015224702095746497, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: rigidbody2D + value: + objectReference: {fileID: 2101336368777957269} + - target: {fileID: 7252644103890736809, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_Constraints + value: 4 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2d26a819bd59c42f09e953f24c366259, type: 3} +--- !u!50 &2101336368777957269 stripped +Rigidbody2D: + m_CorrespondingSourceObject: {fileID: 7252644103890736809, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + m_PrefabInstance: {fileID: 2101336368777957266} + m_PrefabAsset: {fileID: 0} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index d114d92d56..e7647b72d7 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -5,19 +5,31 @@ public class PlayerController : MonoBehaviour { [SerializeField] private Animator animator; - [SerializeField] private BoxCollider2D boxCollider2D; + [SerializeField] private Rigidbody2D rigidbody2D; + [SerializeField] private float jumpForce; + + [SerializeField] private float speed; + // [SerializeField] private BoxCollider2D boxCollider2D; + private bool isCrouching = false; - private float crouchOffset = 0.5f; - private float crouchSize = 0.5f; + // private float crouchOffset = 0.5f; + // private float crouchSize = 0.5f; void Update() { - float speed = Input.GetAxis("Horizontal"); + float horizontal = Input.GetAxisRaw("Horizontal"); + float vertical = Input.GetAxisRaw("Jump"); - animator.SetFloat("Speed", Mathf.Abs(speed)); - bool isFlipped = speed < 0; + PlayerMovement(horizontal, vertical); + PlayerAnimation(horizontal, vertical); + } + + private void PlayerAnimation(float horizontal, float vertical) + { + bool isFlipped = horizontal < 0; float x = (isFlipped ? -1 : 1) * Mathf.Abs(transform.localScale.x); transform.localScale = new Vector3(x, transform.localScale.y, transform.localScale.z); + animator.SetFloat("Speed", Mathf.Abs(horizontal)); if ((Input.GetKeyDown(KeyCode.LeftControl) || Input.GetKeyDown(KeyCode.RightControl)) && speed == 0) { isCrouching = !isCrouching; @@ -37,5 +49,18 @@ void Update() // boxCollider2D.offset = new Vector2(boxCollider2D.offset.x, boxCollider2D.offset.y + crouchOffset); // } } + bool isGrounded = Mathf.Abs(rigidbody2D.velocity.y) < 0.001f; + animator.SetBool("Jump", !isGrounded); + // animator.SetBool("isGrounded", Mathf.Abs(rigidbody2D.velocity.y) < 0.001f); + } + + private void PlayerMovement(float horizontal, float vertical) + { + float horizontalMovement = horizontal * this.speed * Time.deltaTime; + transform.position += new Vector3(horizontalMovement, 0, 0); + if (vertical > 0 && Mathf.Abs(rigidbody2D.velocity.y) < 0.001f) + { + rigidbody2D.AddForce(new Vector2(0, jumpForce), ForceMode2D.Force); + } } } diff --git a/UserSettings/Search.index b/UserSettings/Search.index new file mode 100644 index 0000000000..dba62d53ab --- /dev/null +++ b/UserSettings/Search.index @@ -0,0 +1,13 @@ +{ + "name": "Assets", + "roots": ["Assets"], + "includes": [], + "excludes": [], + "options": { + "types": true, + "properties": true, + "extended": false, + "dependencies": false + }, + "baseScore": 999 +} \ No newline at end of file diff --git a/UserSettings/Search.settings b/UserSettings/Search.settings index 9e26dfeeb6..1361074a50 100644 --- a/UserSettings/Search.settings +++ b/UserSettings/Search.settings @@ -1 +1,75 @@ -{} \ No newline at end of file +trackSelection = true +refreshSearchWindowsInPlayMode = false +fetchPreview = true +defaultFlags = 0 +keepOpen = false +queryFolder = "Assets" +onBoardingDoNotAskAgain = true +showPackageIndexes = false +showStatusBar = false +scopes = { +} +providers = { + packages = { + active = true + priority = 90 + defaultAction = null + } + adb = { + active = false + priority = 2500 + defaultAction = null + } + asset = { + active = true + priority = 25 + defaultAction = null + } + find = { + active = true + priority = 25 + defaultAction = null + } + log = { + active = false + priority = 210 + defaultAction = null + } + profilermarkers = { + active = false + priority = 100 + defaultAction = null + } + performance = { + active = false + priority = 100 + defaultAction = null + } + store = { + active = true + priority = 100 + defaultAction = null + } + scene = { + active = true + priority = 50 + defaultAction = null + } +} +objectSelectors = { +} +recentSearches = [ +] +searchItemFavorites = [ +] +savedSearchesSortOrder = 0 +showSavedSearchPanel = false +hideTabs = false +expandedQueries = [ +] +queryBuilder = false +ignoredProperties = "id;name;classname;imagecontentshash" +helperWidgetCurrentArea = "all" +disabledIndexers = "" +minIndexVariations = 2 +findProviderIndexHelper = true \ No newline at end of file From 15178202e7444570f2b02a095227cdb66f90628e Mon Sep 17 00:00:00 2001 From: Syed zainul abedin Date: Thu, 18 Jan 2024 01:17:19 +0530 Subject: [PATCH 09/26] feat: Updated jump logic --- .../AnimationClips/Player_Idle.anim | 28 +- .../AnimationClips/Player_Jump.anim | 38 +- .../Animators/Ellen/PlayerAnimator.controller | 6 +- Assets/Game Assets/Prefab/Player.prefab | 4 +- Assets/Scenes/AnimationTest.unity | 133 +++++- Assets/Scripts/PlayerController.cs | 27 +- .../Layouts/CurrentMaximizeLayout.dwlt | 448 +++++++++--------- UserSettings/Layouts/default-2022.dwlt | 172 +++---- 8 files changed, 502 insertions(+), 354 deletions(-) diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Idle.anim b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Idle.anim index 4f7c3114f6..abf272e8c2 100644 --- a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Idle.anim +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Idle.anim @@ -24,31 +24,31 @@ AnimationClip: value: {fileID: 21300000, guid: c4d7d6470acd7bf45971042161c6e018, type: 3} - time: 0.05 value: {fileID: 21300000, guid: 1fa29ad54380226498c2250e612fec93, type: 3} - - time: 0.1 + - time: 0.083333336 value: {fileID: 21300000, guid: c7cf710ee57c1ae45aac513a85fcff07, type: 3} - - time: 0.18333334 + - time: 0.15 value: {fileID: 21300000, guid: 774282641b60d9d4daddad7c6ad7ae69, type: 3} - - time: 0.28333333 + - time: 0.23333333 value: {fileID: 21300000, guid: a53475b08393802498550588cf70ef5e, type: 3} - - time: 0.3 + - time: 0.25 value: {fileID: 21300000, guid: c6b584771aee7a148bcf2885a6f347ba, type: 3} - - time: 0.46666667 + - time: 0.4 value: {fileID: 21300000, guid: 60a2cfad92429cc4b9d2f6ce7148c37a, type: 3} - - time: 0.48333332 + - time: 0.41666666 value: {fileID: 21300000, guid: dcc9002875a3a244eacb72418d292f8e, type: 3} - - time: 0.51666665 + - time: 0.43333334 value: {fileID: 21300000, guid: 64afd51ca9828034f8c64a261e4b99b9, type: 3} - - time: 0.6666667 + - time: 0.56666666 value: {fileID: 21300000, guid: 76089009971280441963c2a3a55b5071, type: 3} - - time: 0.7 + - time: 0.6 value: {fileID: 21300000, guid: cd65a99c817869946969cd216cab2115, type: 3} - - time: 0.8 + - time: 0.68333334 value: {fileID: 21300000, guid: 591e3ea0fd60a1442bfbe969a16d4d74, type: 3} - - time: 0.8666667 + - time: 0.73333335 value: {fileID: 21300000, guid: d2d936bae69c599429ee1a386892a9f0, type: 3} - - time: 0.9166667 + - time: 0.78333336 value: {fileID: 21300000, guid: f3b094a028c28604382b41bfab29604a, type: 3} - - time: 1 + - time: 0.85 value: {fileID: 21300000, guid: ed4c6463819f7cb4b85a6a44dc35c9cf, type: 3} attribute: m_Sprite path: @@ -92,7 +92,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1.0166667 + m_StopTime: 0.8666667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Jump.anim b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Jump.anim index c3385556b0..903ee9eba8 100644 --- a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Jump.anim +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Jump.anim @@ -22,41 +22,41 @@ AnimationClip: curve: - time: 0 value: {fileID: 21300000, guid: 5767e2180fcbb7a4d9980e9a37e3d588, type: 3} - - time: 0.05 - value: {fileID: 21300000, guid: e4381a10685b28d4f906cc686ecbc2c7, type: 3} - time: 0.06666667 - value: {fileID: 21300000, guid: 6f8b0a53ff8c9e94f9d4af829e2ad6f3, type: 3} + value: {fileID: 21300000, guid: e4381a10685b28d4f906cc686ecbc2c7, type: 3} - time: 0.1 + value: {fileID: 21300000, guid: 6f8b0a53ff8c9e94f9d4af829e2ad6f3, type: 3} + - time: 0.15 value: {fileID: 21300000, guid: affa4f4470b317440b7cb5187df710ef, type: 3} - - time: 0.13333334 + - time: 0.18333334 value: {fileID: 21300000, guid: 4214a14962bcf4943baf9e184b9b928e, type: 3} - - time: 0.16666667 + - time: 0.23333333 value: {fileID: 21300000, guid: bb6a891737c56e6438e808fb4e716321, type: 3} - - time: 0.18333334 + - time: 0.26666668 value: {fileID: 21300000, guid: af68c0be2e67f3846bcdf33841f8312b, type: 3} - - time: 0.23333333 + - time: 0.33333334 value: {fileID: 21300000, guid: a9f05e230fdd41b4f99ac0e0b7c4fa2b, type: 3} - - time: 0.25 + - time: 0.35 value: {fileID: 21300000, guid: ae6184443cb4d0f439bab73e9e76df4a, type: 3} - - time: 0.3 + - time: 0.43333334 value: {fileID: 21300000, guid: fcec6de5f73f3b74480aa66ffac97f43, type: 3} - - time: 0.33333334 + - time: 0.48333332 value: {fileID: 21300000, guid: 7dcbef0330b37354dae1c1071956813a, type: 3} - - time: 0.35 + - time: 0.5 value: {fileID: 21300000, guid: ca897d165bbb9094584da008d90d3df5, type: 3} - - time: 0.4 + - time: 0.56666666 value: {fileID: 21300000, guid: fffa3e12c34c2ee448d46f5c9db142e6, type: 3} - - time: 0.41666666 + - time: 0.6 value: {fileID: 21300000, guid: 5b31577ecf5954448b0d92a2c8a0501b, type: 3} - - time: 0.45 + - time: 0.65 value: {fileID: 21300000, guid: 13aa9a4a1bc68064c9e5e17a86df2666, type: 3} - - time: 0.48333332 + - time: 0.68333334 value: {fileID: 21300000, guid: 1eb8ffe712da55942b19d29be7a6e5da, type: 3} - - time: 0.53333336 + - time: 0.76666665 value: {fileID: 21300000, guid: 31d88d4dbed3d9546898b42447a63e77, type: 3} - - time: 0.53333336 + - time: 0.76666665 value: {fileID: 21300000, guid: 686160c7c3cfd5040a8ea08b867ff56c, type: 3} - - time: 0.5833333 + - time: 0.8333333 value: {fileID: 21300000, guid: cb0f74b7e0e21ee47b09fdb24a83094f, type: 3} attribute: m_Sprite path: @@ -104,7 +104,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.59999996 + m_StopTime: 0.84999996 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller b/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller index ca31baf665..bcf3e42b28 100644 --- a/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller +++ b/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller @@ -230,10 +230,10 @@ AnimatorStateTransition: m_Mute: 0 m_IsExit: 0 serializedVersion: 3 - m_TransitionDuration: 0.25 + m_TransitionDuration: 0 m_TransitionOffset: 0 m_ExitTime: 0.516129 - m_HasExitTime: 1 + m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -371,4 +371,4 @@ AnimatorStateTransition: m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 + m_CanTransitionToSelf: 0 diff --git a/Assets/Game Assets/Prefab/Player.prefab b/Assets/Game Assets/Prefab/Player.prefab index 2e03ec2974..47bff7ac9e 100644 --- a/Assets/Game Assets/Prefab/Player.prefab +++ b/Assets/Game Assets/Prefab/Player.prefab @@ -166,7 +166,7 @@ Rigidbody2D: m_Simulated: 1 m_UseFullKinematicContacts: 0 m_UseAutoMass: 0 - m_Mass: 1 + m_Mass: 10 m_LinearDrag: 0 m_AngularDrag: 0.05 m_GravityScale: 1 @@ -195,5 +195,5 @@ MonoBehaviour: m_EditorClassIdentifier: animator: {fileID: 5820244955174857028} rigidbody2D: {fileID: 7252644103890736809} - jumpForce: 24 + jumpForce: 15 speed: 10 diff --git a/Assets/Scenes/AnimationTest.unity b/Assets/Scenes/AnimationTest.unity index 664c775363..5add1051b8 100644 --- a/Assets/Scenes/AnimationTest.unity +++ b/Assets/Scenes/AnimationTest.unity @@ -333,7 +333,7 @@ Transform: m_GameObject: {fileID: 282281674} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.773, y: -3.27, z: 0} + m_LocalPosition: {x: -3.58, y: -3.27, z: 0} m_LocalScale: {x: 2.35, y: 2.35, z: 2.35} m_ConstrainProportionsScale: 0 m_Children: [] @@ -476,6 +476,136 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1275231954 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1275231957} + - component: {fileID: 1275231956} + - component: {fileID: 1275231955} + m_Layer: 0 + m_Name: Ground4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!61 &1275231955 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275231954} + 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: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.06} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 7.761719, y: 2.3253536} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 0.9268483} + m_EdgeRadius: 0 +--- !u!212 &1275231956 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275231954} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 21300004, guid: 389dc290ab41ea34485314d037cc75df, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.761719, y: 2.3253536} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1275231957 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275231954} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.21, y: -3.244, z: 0} + m_LocalScale: {x: 2.35, y: 2.35, z: 2.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1857259668 GameObject: m_ObjectHideFlags: 0 @@ -709,3 +839,4 @@ SceneRoots: - {fileID: 282281676} - {fileID: 4354828} - {fileID: 1857259671} + - {fileID: 1275231957} diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index e7647b72d7..0361b24a17 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; @@ -12,9 +13,18 @@ public class PlayerController : MonoBehaviour // [SerializeField] private BoxCollider2D boxCollider2D; private bool isCrouching = false; + private bool isGrounded => Math.Abs(rigidbody2D.velocity.y) < 0.001f; + private bool midAir = false; + [SerializeField] private float maxJumpHeight = 2f; + private float currentPlatformHeight = 0f; // private float crouchOffset = 0.5f; // private float crouchSize = 0.5f; - + + private void Start() + { + currentPlatformHeight = transform.position.y; + } + void Update() { float horizontal = Input.GetAxisRaw("Horizontal"); @@ -49,18 +59,25 @@ private void PlayerAnimation(float horizontal, float vertical) // boxCollider2D.offset = new Vector2(boxCollider2D.offset.x, boxCollider2D.offset.y + crouchOffset); // } } - bool isGrounded = Mathf.Abs(rigidbody2D.velocity.y) < 0.001f; animator.SetBool("Jump", !isGrounded); - // animator.SetBool("isGrounded", Mathf.Abs(rigidbody2D.velocity.y) < 0.001f); + animator.SetBool("isGrounded", isGrounded); } private void PlayerMovement(float horizontal, float vertical) { float horizontalMovement = horizontal * this.speed * Time.deltaTime; transform.position += new Vector3(horizontalMovement, 0, 0); - if (vertical > 0 && Mathf.Abs(rigidbody2D.velocity.y) < 0.001f) + + midAir = rigidbody2D.velocity.y < 0; + + if (vertical > 0 && !midAir && transform.position.y < currentPlatformHeight + maxJumpHeight) { - rigidbody2D.AddForce(new Vector2(0, jumpForce), ForceMode2D.Force); + Jump(); } } + + private void Jump() + { + rigidbody2D.AddForce(new Vector2(0, jumpForce), ForceMode2D.Force); + } } diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 4766068796..9d655fc01b 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 37 + controlID: 1539 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -46,9 +46,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 281 + x: 294 y: 95 - width: 815 + width: 732 height: 416.5 m_SerializedDataModeController: m_DataMode: 0 @@ -104,23 +104,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 815 + width: 732 height: 395.5 - m_Scale: {x: 0.54930556, y: 0.54930556} - m_Translation: {x: 407.5, y: 197.75} + m_Scale: {x: 0.4945946, y: 0.4945946} + m_Translation: {x: 366, y: 197.75} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -741.84576 - y: -360 - width: 1483.6915 - height: 720 + x: -740 + y: -399.8224 + width: 1480 + height: 799.6448 m_MinimalGUI: 1 - m_defaultScale: 0.54930556 - m_LastWindowPixelSize: {x: 1630, y: 833} + m_defaultScale: 0.4945946 + m_LastWindowPixelSize: {x: 1464, y: 833} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 @@ -140,17 +140,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 4} - - {fileID: 10} + - {fileID: 9} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1098 + width: 1028 height: 779 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 38 + controlID: 1540 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -170,12 +170,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1098 + width: 1028 height: 437.5 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 39 + controlID: 1541 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -193,10 +193,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 281 + width: 294 height: 437.5 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 6} m_Panes: - {fileID: 6} @@ -225,7 +225,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 95 - width: 280 + width: 293 height: 416.5 m_SerializedDataModeController: m_DataMode: 0 @@ -240,9 +240,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 78d6feff - m_LastClickedID: -76168 - m_ExpandedIDs: a2d8feffdad8feffded9feff + m_SelectedIDs: 74f1ffff + m_LastClickedID: -3724 + m_ExpandedIDs: 24fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -258,7 +258,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 5} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -281,9 +281,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 281 + x: 294 y: 0 - width: 817 + width: 734 height: 437.5 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} @@ -291,9 +291,8 @@ MonoBehaviour: m_Panes: - {fileID: 8} - {fileID: 2} - - {fileID: 9} m_Selected: 1 - m_LastSelected: 2 + m_LastSelected: 0 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -315,9 +314,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 281 + x: 294 y: 95 - width: 815 + width: 732 height: 416.5 m_SerializedDataModeController: m_DataMode: 0 @@ -703,9 +702,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1.046092, y: 1.597505, z: -0.0009978599} + m_Target: {x: -0.48123854, y: -3.667344, z: -0.0062960596} speed: 2 - m_Value: {x: 1.046092, y: 1.597505, z: -0.0009978599} + m_Value: {x: -0.48123854, y: -3.667344, z: -0.0062960596} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -755,9 +754,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 2.4530814 + m_Target: 2.3272245 speed: 2 - m_Value: 2.4530814 + m_Value: 2.3272245 m_Ortho: m_Target: 1 speed: 2 @@ -783,164 +782,6 @@ MonoBehaviour: m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 --- !u!114 &9 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Animator - m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 281 - y: 95 - width: 815 - height: 416.5 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_ViewTransforms: - m_KeySerializationHelper: - - {fileID: 110773768, guid: b09e60546065cf9448b36ebb7f759a91, type: 2} - - {fileID: 1107120589572563820, guid: 228edf468d7393e4d8452f80c542fb85, type: 2} - - {fileID: 1107679161928848652, guid: 95e1487dd55102042a8ec1a03fa064ef, type: 2} - - {fileID: 1107150604400011336, guid: e6d811e1f6dfcd247ac0fa75186762b9, type: 2} - - {fileID: 1107352176486139556, guid: 6408c3077d4204944a6451f38cd1f7e5, type: 2} - - {fileID: -4154430246438009678, guid: 5a5995370fc954e219729b95b7be89cd, type: 2} - m_ValueSerializationHelper: - - e00: 0.992175 - e01: 0 - e02: 0 - e03: 1.7471008 - e10: 0 - e11: 0.992175 - e12: 0 - e13: -153.7979 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.5463158 - e01: 0 - e02: 0 - e03: -12.315796 - e10: 0 - e11: 0.5463158 - e12: 0 - e13: 136.85 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.5463158 - e01: 0 - e02: 0 - e03: -12.315796 - e10: 0 - e11: 0.5463158 - e12: 0 - e13: 113.90474 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.5463158 - e01: 0 - e02: 0 - e03: -12.315796 - e10: 0 - e11: 0.5463158 - e12: 0 - e13: 107.348946 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.5463158 - e01: 0 - e02: 0 - e03: -12.315796 - e10: 0 - e11: 0.5463158 - e12: 0 - e13: 136.85 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.5744305 - e01: 0 - e02: 0 - e03: 102.00577 - e10: 0 - e11: 0.5744305 - e12: 0 - e13: 169.72649 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 5a5995370fc954e219729b95b7be89cd, - type: 2} - m_BreadCrumbs: - - m_Target: {fileID: -4154430246438009678, guid: 5a5995370fc954e219729b95b7be89cd, - type: 2} - m_ScrollPosition: {x: 0, y: 0} - stateMachineGraph: {fileID: 0} - stateMachineGraphGUI: {fileID: 0} - blendTreeGraph: {fileID: 0} - blendTreeGraphGUI: {fileID: 0} - m_AutoLiveLink: 1 - m_MiniTool: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentEditor: 1 - m_LayerEditor: - m_SelectedLayerIndex: 0 ---- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -957,18 +798,19 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 437.5 - width: 1098 + width: 1028 height: 341.5 m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 13} + m_ActualView: {fileID: 12} m_Panes: + - {fileID: 10} - {fileID: 11} - {fileID: 12} - {fileID: 13} m_Selected: 2 m_LastSelected: 0 ---- !u!114 &11 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -991,7 +833,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 532.5 - width: 1097 + width: 888 height: 320.5 m_SerializedDataModeController: m_DataMode: 0 @@ -1029,9 +871,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 143} - m_SelectedIDs: c6460000 - m_LastClickedID: 18118 - m_ExpandedIDs: 00000000da40000076410000ea410000264200002e420000b2420000de430000e644000072450000de450000c646000002490000e64b000000ca9a3bffffff7f + m_SelectedIDs: 98640000 + m_LastClickedID: 25752 + m_ExpandedIDs: 00000000c05c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1059,7 +901,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: + m_ExpandedIDs: 00000000c05c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1084,10 +926,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: b0d3feff - m_LastClickedInstanceID: -76880 + m_SelectedInstanceIDs: 2476ffff + m_LastClickedInstanceID: -35292 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000d87c0000e67c00001882000092a80000f2ac00005e7f00002cb900006c9f000034ba000036bb00009a7f0000947e00002a580100a85c0100667f0000b88700004a7e00005a7c0000fe7d00001aa00000687f00006a7f0000189f0000f87f00005c530400 + m_ExpandedInstanceIDs: c6230000d87c0000e67c00001882000092a80000f2ac00005e7f00002cb900006c9f000034ba000036bb00009a7f0000947e00002a580100a85c0100667f0000b88700004a7e00005a7c0000fe7d00001aa00000687f00006a7f0000189f0000f87f00005c530400369e0000e88a0000e48a00006e5b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1115,7 +957,7 @@ MonoBehaviour: m_GridSize: 96 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &12 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1137,9 +979,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 573.5 - width: 1097 - height: 279.5 + y: 532.5 + width: 915.5 + height: 320.5 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1150,7 +992,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &13 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1173,7 +1015,45 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 532.5 - width: 1097 + width: 1027 + height: 320.5 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: -3724 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animator + m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 532.5 + width: 888 height: 320.5 m_SerializedDataModeController: m_DataMode: 0 @@ -1185,9 +1065,129 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: 110773768, guid: b09e60546065cf9448b36ebb7f759a91, type: 2} + - {fileID: 1107120589572563820, guid: 228edf468d7393e4d8452f80c542fb85, type: 2} + - {fileID: 1107679161928848652, guid: 95e1487dd55102042a8ec1a03fa064ef, type: 2} + - {fileID: 1107150604400011336, guid: e6d811e1f6dfcd247ac0fa75186762b9, type: 2} + - {fileID: 1107352176486139556, guid: 6408c3077d4204944a6451f38cd1f7e5, type: 2} + - {fileID: -4154430246438009678, guid: 5a5995370fc954e219729b95b7be89cd, type: 2} + m_ValueSerializationHelper: + - e00: 0.992175 + e01: 0 + e02: 0 + e03: 1.7471008 + e10: 0 + e11: 0.992175 + e12: 0 + e13: -153.7979 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.5463158 + e01: 0 + e02: 0 + e03: -12.315796 + e10: 0 + e11: 0.5463158 + e12: 0 + e13: 136.85 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.5463158 + e01: 0 + e02: 0 + e03: -12.315796 + e10: 0 + e11: 0.5463158 + e12: 0 + e13: 113.90474 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.5463158 + e01: 0 + e02: 0 + e03: -12.315796 + e10: 0 + e11: 0.5463158 + e12: 0 + e13: 107.348946 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.5463158 + e01: 0 + e02: 0 + e03: -12.315796 + e10: 0 + e11: 0.5463158 + e12: 0 + e13: 136.85 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.4491085 + e01: 0 + e02: 0 + e03: 222.82448 + e10: 0 + e11: 0.4491085 + e12: 0 + e13: 87.38968 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: 5a5995370fc954e219729b95b7be89cd, + type: 2} + m_BreadCrumbs: + - m_Target: {fileID: -4154430246438009678, guid: 5a5995370fc954e219729b95b7be89cd, + type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -76168 + m_CurrentEditor: 1 + m_LayerEditor: + m_SelectedLayerIndex: 0 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1203,12 +1203,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1098 + x: 1028 y: 0 - width: 372 + width: 442 height: 779 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} @@ -1236,9 +1236,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1098 + x: 1028 y: 95 - width: 371 + width: 441 height: 758 m_SerializedDataModeController: m_DataMode: 0 @@ -1284,10 +1284,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 951 + x: 916.5 y: 95 - width: 518 - height: 820 + width: 552.5 + height: 758 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1299,15 +1299,15 @@ MonoBehaviour: m_SaveData: [] m_OverlaysVisible: 1 m_PosLeft: {x: 0, y: 0} - m_PosRight: {x: 0, y: 46} + m_PosRight: {x: 0, y: 0} m_Scope: 1 m_SplitterFlex: 0.23507462 m_SearchText: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 4dcf9b58 - m_LastClickedID: 1486606157 - m_ExpandedIDs: 213269b253336be2e36eadf800000000 + m_SelectedIDs: 7b59923f + m_LastClickedID: 1066555771 + m_ExpandedIDs: a01a5fa6213269b253336be2e36eadf800000000c53aba5a m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 2fbcdcb9c0..7f05598d3b 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1470 height: 829 m_ShowMode: 4 - m_Title: Console + m_Title: Game m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 110 + controlID: 40 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 981 + width: 889 height: 779 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 20 + controlID: 41 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,12 +164,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 981 + width: 889 height: 437.5 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 21 + controlID: 42 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -187,10 +187,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 248 + width: 254 height: 437.5 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -206,24 +206,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: SceneView + m_Name: GameView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 248 + x: 254 y: 0 - width: 733 + width: 635 height: 437.5 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} - m_ActualView: {fileID: 14} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 12} m_Panes: - {fileID: 14} - {fileID: 12} - - {fileID: 15} - m_Selected: 0 - m_LastSelected: 2 + m_Selected: 1 + m_LastSelected: 1 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -234,24 +233,25 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: AnimationWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 437.5 - width: 981 + width: 889 height: 341.5 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 17} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 18} m_Panes: - {fileID: 16} - - {fileID: 18} - {fileID: 17} + - {fileID: 18} + - {fileID: 15} m_Selected: 2 - m_LastSelected: 1 + m_LastSelected: 0 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -267,12 +267,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 981 + x: 889 y: 0 - width: 489 + width: 581 height: 779 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 19} m_Panes: - {fileID: 19} @@ -300,9 +300,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 281 + x: 254 y: 95 - width: 815 + width: 633 height: 416.5 m_SerializedDataModeController: m_DataMode: 0 @@ -349,7 +349,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -358,23 +358,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 815 + width: 633 height: 395.5 - m_Scale: {x: 0.54930556, y: 0.54930556} - m_Translation: {x: 407.5, y: 197.75} + m_Scale: {x: 0.4277027, y: 0.4277027} + m_Translation: {x: 316.5, y: 197.75} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -741.84576 - y: -360 - width: 1483.6915 - height: 720 + x: -740 + y: -462.35388 + width: 1480 + height: 924.70776 m_MinimalGUI: 1 - m_defaultScale: 0.54930556 - m_LastWindowPixelSize: {x: 1630, y: 833} + m_defaultScale: 0.4277027 + m_LastWindowPixelSize: {x: 1266, y: 833} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 @@ -403,7 +403,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 95 - width: 247 + width: 253 height: 416.5 m_SerializedDataModeController: m_DataMode: 0 @@ -418,23 +418,23 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: e243ffff - m_LastClickedID: -48158 - m_ExpandedIDs: e443ffffe244ffff + m_SelectedIDs: 565b0000 + m_LastClickedID: 23382 + m_ExpandedIDs: e2faffff m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Ground2 + m_OriginalName: Ground2 m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 23348 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 8} m_SearchString: @@ -465,9 +465,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 248 + x: 324.5 y: 95 - width: 731 + width: 802 height: 416.5 m_SerializedDataModeController: m_DataMode: 0 @@ -853,9 +853,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0.19731823, y: 0.3814012, z: 0.007834057} + m_Target: {x: 0.60055804, y: 0.26604652, z: 0} speed: 2 - m_Value: {x: 0.22806987, y: 0.3726041, z: 0.0072366213} + m_Value: {x: 0.60055804, y: 0.26604652, z: 0} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -905,9 +905,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 3.9231884 + m_Target: 4.7065973 speed: 2 - m_Value: 3.9829323 + m_Value: 4.7065973 m_Ortho: m_Target: 1 speed: 2 @@ -953,10 +953,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 248 - y: 95 - width: 731 - height: 416.5 + x: 0 + y: 532.5 + width: 888 + height: 320.5 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1056,14 +1056,14 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 0.49144173 + - e00: 0.4491085 e01: 0 e02: 0 - e03: -57.323975 + e03: 222.82448 e10: 0 - e11: 0.49144173 + e11: 0.4491085 e12: 0 - e13: -0.9439392 + e13: 87.38968 e20: 0 e21: 0 e22: 1 @@ -1113,7 +1113,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 532.5 - width: 980 + width: 888 height: 320.5 m_SerializedDataModeController: m_DataMode: 0 @@ -1136,7 +1136,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Game Assets/Art/Animations/AnimationClips m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1144,16 +1144,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 96 m_LastFolders: - - Assets + - Assets/Game Assets/Art/Animations/AnimationClips m_LastFoldersGridSize: 96 m_LastProjectPath: /Users/zain/2D-Platformer-Game m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 79} - m_SelectedIDs: 84800000 - m_LastClickedID: 32900 - m_ExpandedIDs: 0000000054770000848000009e800000ae800000b0800000b2800000b480000000ca9a3bffffff7f + scrollPos: {x: 0, y: 143} + m_SelectedIDs: 98640000 + m_LastClickedID: 25752 + m_ExpandedIDs: 00000000ac540000c25c0000ec630000986400009a6400009c640000a4640000bc640000be64000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1181,7 +1181,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000084800000 + m_ExpandedIDs: 00000000c25c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1206,10 +1206,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: e243ffff - m_LastClickedInstanceID: -48158 + m_SelectedInstanceIDs: 2476ffff + m_LastClickedInstanceID: -35292 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000d87c0000e67c00001882000092a80000f2ac00005e7f00002cb900006c9f000034ba000036bb00009a7f0000947e00002a580100a85c0100667f0000b88700004a7e00005a7c0000fe7d00001aa00000687f00006a7f0000189f0000f87f00005c530400369e0000e88a0000e48a0000 + m_ExpandedInstanceIDs: c6230000d87c0000e67c00001882000092a80000f2ac00005e7f00002cb900006c9f000034ba000036bb00009a7f0000947e00002a580100a85c0100667f0000b88700004a7e00005a7c0000fe7d00001aa00000687f00006a7f0000189f0000f87f00005c530400369e0000e88a0000e48a00006e5b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1260,7 +1260,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 532.5 - width: 980 + width: 915.5 height: 320.5 m_SerializedDataModeController: m_DataMode: 0 @@ -1295,7 +1295,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 532.5 - width: 980 + width: 888 height: 320.5 m_SerializedDataModeController: m_DataMode: 0 @@ -1309,7 +1309,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -48158 + m_LastSelectedObjectID: 23382 --- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1331,9 +1331,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 981 + x: 889 y: 95 - width: 488 + width: 580 height: 758 m_SerializedDataModeController: m_DataMode: 0 @@ -1379,10 +1379,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 951 + x: 916.5 y: 95 - width: 518 - height: 820 + width: 552.5 + height: 758 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1394,15 +1394,15 @@ MonoBehaviour: m_SaveData: [] m_OverlaysVisible: 1 m_PosLeft: {x: 0, y: 0} - m_PosRight: {x: 0, y: 46} + m_PosRight: {x: 0, y: 0} m_Scope: 1 m_SplitterFlex: 0.23507462 m_SearchText: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 4dcf9b58 - m_LastClickedID: 1486606157 - m_ExpandedIDs: 213269b253336be2e36eadf800000000 + m_SelectedIDs: 7b59923f + m_LastClickedID: 1066555771 + m_ExpandedIDs: a01a5fa6213269b253336be2e36eadf800000000c53aba5a m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: From 4dbc788a2fc551f0254d9836f6ef9279a4ea0ab8 Mon Sep 17 00:00:00 2001 From: Syed zainul abedin Date: Thu, 18 Jan 2024 14:51:43 +0530 Subject: [PATCH 10/26] feat:Added level design and level end logic --- .../AnimationClips/Player_Airborne.anim | 72 + .../AnimationClips/Player_Airborne.anim.meta | 8 + .../AnimationClips/Player_Jump.anim | 32 +- .../AnimationClips/Player_Land.anim | 99 + .../AnimationClips/Player_Land.anim.meta | 8 + .../Animators/Ellen/PlayerAnimator.controller | 187 +- .../Tileset/TilesRock/GroundTile.prefab | 272 +++ .../Tileset/TilesRock/GroundTile.prefab.meta | 7 + .../Tileset/TilesRock/WallTile.asset | 36 + .../Tileset/TilesRock/WallTile.asset.meta | 8 + .../Tileset/TilesRock/WallTile02.asset | 36 + .../Tileset/TilesRock/WallTile02.asset.meta | 8 + .../Tileset/TilesRock/WallTileEnd.asset | 36 + .../Tileset/TilesRock/WallTileEnd.asset.meta | 8 + Assets/Game Assets/Prefab/Player.prefab | 100 +- Assets/Scenes/AnimationTest.unity | 842 ------- Assets/Scenes/Level1.unity | 1627 +++++++++++++ ...ationTest.unity.meta => Level1.unity.meta} | 0 Assets/Scenes/Level2.unity | 2033 +++++++++++++++++ Assets/Scenes/Level2.unity.meta | 7 + Assets/Scripts/LevelEndController.cs | 13 + Assets/Scripts/LevelEndController.cs.meta | 11 + Assets/Scripts/LevelStartController.cs | 6 + Assets/Scripts/LevelStartController.cs.meta | 3 + Assets/Scripts/PlayerController.cs | 12 +- ProjectSettings/EditorBuildSettings.asset | 8 +- UserSettings/EditorUserSettings.asset | 3 + .../Layouts/CurrentMaximizeLayout.dwlt | 283 ++- 28 files changed, 4690 insertions(+), 1075 deletions(-) create mode 100644 Assets/Game Assets/Art/Animations/AnimationClips/Player_Airborne.anim create mode 100644 Assets/Game Assets/Art/Animations/AnimationClips/Player_Airborne.anim.meta create mode 100644 Assets/Game Assets/Art/Animations/AnimationClips/Player_Land.anim create mode 100644 Assets/Game Assets/Art/Animations/AnimationClips/Player_Land.anim.meta create mode 100644 Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/GroundTile.prefab create mode 100644 Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/GroundTile.prefab.meta create mode 100644 Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/WallTile.asset create mode 100644 Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/WallTile.asset.meta create mode 100644 Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/WallTile02.asset create mode 100644 Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/WallTile02.asset.meta create mode 100644 Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/WallTileEnd.asset create mode 100644 Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/WallTileEnd.asset.meta delete mode 100644 Assets/Scenes/AnimationTest.unity create mode 100644 Assets/Scenes/Level1.unity rename Assets/Scenes/{AnimationTest.unity.meta => Level1.unity.meta} (100%) create mode 100644 Assets/Scenes/Level2.unity create mode 100644 Assets/Scenes/Level2.unity.meta create mode 100644 Assets/Scripts/LevelEndController.cs create mode 100644 Assets/Scripts/LevelEndController.cs.meta create mode 100644 Assets/Scripts/LevelStartController.cs create mode 100644 Assets/Scripts/LevelStartController.cs.meta diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Airborne.anim b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Airborne.anim new file mode 100644 index 0000000000..af80db6915 --- /dev/null +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Airborne.anim @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player_Airborne + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: a9f05e230fdd41b4f99ac0e0b7c4fa2b, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: a9f05e230fdd41b4f99ac0e0b7c4fa2b, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.016666668 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Airborne.anim.meta b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Airborne.anim.meta new file mode 100644 index 0000000000..f4fa76f35a --- /dev/null +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Airborne.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cd706099ef92748b295342c2f75eead3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Jump.anim b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Jump.anim index 903ee9eba8..024853e6da 100644 --- a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Jump.anim +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Jump.anim @@ -38,26 +38,6 @@ AnimationClip: value: {fileID: 21300000, guid: a9f05e230fdd41b4f99ac0e0b7c4fa2b, type: 3} - time: 0.35 value: {fileID: 21300000, guid: ae6184443cb4d0f439bab73e9e76df4a, type: 3} - - time: 0.43333334 - value: {fileID: 21300000, guid: fcec6de5f73f3b74480aa66ffac97f43, type: 3} - - time: 0.48333332 - value: {fileID: 21300000, guid: 7dcbef0330b37354dae1c1071956813a, type: 3} - - time: 0.5 - value: {fileID: 21300000, guid: ca897d165bbb9094584da008d90d3df5, type: 3} - - time: 0.56666666 - value: {fileID: 21300000, guid: fffa3e12c34c2ee448d46f5c9db142e6, type: 3} - - time: 0.6 - value: {fileID: 21300000, guid: 5b31577ecf5954448b0d92a2c8a0501b, type: 3} - - time: 0.65 - value: {fileID: 21300000, guid: 13aa9a4a1bc68064c9e5e17a86df2666, type: 3} - - time: 0.68333334 - value: {fileID: 21300000, guid: 1eb8ffe712da55942b19d29be7a6e5da, type: 3} - - time: 0.76666665 - value: {fileID: 21300000, guid: 31d88d4dbed3d9546898b42447a63e77, type: 3} - - time: 0.76666665 - value: {fileID: 21300000, guid: 686160c7c3cfd5040a8ea08b867ff56c, type: 3} - - time: 0.8333333 - value: {fileID: 21300000, guid: cb0f74b7e0e21ee47b09fdb24a83094f, type: 3} attribute: m_Sprite path: classID: 212 @@ -89,22 +69,12 @@ AnimationClip: - {fileID: 21300000, guid: af68c0be2e67f3846bcdf33841f8312b, type: 3} - {fileID: 21300000, guid: a9f05e230fdd41b4f99ac0e0b7c4fa2b, type: 3} - {fileID: 21300000, guid: ae6184443cb4d0f439bab73e9e76df4a, type: 3} - - {fileID: 21300000, guid: fcec6de5f73f3b74480aa66ffac97f43, type: 3} - - {fileID: 21300000, guid: 7dcbef0330b37354dae1c1071956813a, type: 3} - - {fileID: 21300000, guid: ca897d165bbb9094584da008d90d3df5, type: 3} - - {fileID: 21300000, guid: fffa3e12c34c2ee448d46f5c9db142e6, type: 3} - - {fileID: 21300000, guid: 5b31577ecf5954448b0d92a2c8a0501b, type: 3} - - {fileID: 21300000, guid: 13aa9a4a1bc68064c9e5e17a86df2666, type: 3} - - {fileID: 21300000, guid: 1eb8ffe712da55942b19d29be7a6e5da, type: 3} - - {fileID: 21300000, guid: 31d88d4dbed3d9546898b42447a63e77, type: 3} - - {fileID: 21300000, guid: 686160c7c3cfd5040a8ea08b867ff56c, type: 3} - - {fileID: 21300000, guid: cb0f74b7e0e21ee47b09fdb24a83094f, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.84999996 + m_StopTime: 0.36666667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Land.anim b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Land.anim new file mode 100644 index 0000000000..524141e671 --- /dev/null +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Land.anim @@ -0,0 +1,99 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player_Land + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: fcec6de5f73f3b74480aa66ffac97f43, type: 3} + - time: 0.033333335 + value: {fileID: 21300000, guid: 7dcbef0330b37354dae1c1071956813a, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: ca897d165bbb9094584da008d90d3df5, type: 3} + - time: 0.11666667 + value: {fileID: 21300000, guid: fffa3e12c34c2ee448d46f5c9db142e6, type: 3} + - time: 0.15 + value: {fileID: 21300000, guid: 5b31577ecf5954448b0d92a2c8a0501b, type: 3} + - time: 0.18333334 + value: {fileID: 21300000, guid: 13aa9a4a1bc68064c9e5e17a86df2666, type: 3} + - time: 0.21666667 + value: {fileID: 21300000, guid: 1eb8ffe712da55942b19d29be7a6e5da, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: 31d88d4dbed3d9546898b42447a63e77, type: 3} + - time: 0.3 + value: {fileID: 21300000, guid: 686160c7c3cfd5040a8ea08b867ff56c, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: cb0f74b7e0e21ee47b09fdb24a83094f, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: fcec6de5f73f3b74480aa66ffac97f43, type: 3} + - {fileID: 21300000, guid: 7dcbef0330b37354dae1c1071956813a, type: 3} + - {fileID: 21300000, guid: ca897d165bbb9094584da008d90d3df5, type: 3} + - {fileID: 21300000, guid: fffa3e12c34c2ee448d46f5c9db142e6, type: 3} + - {fileID: 21300000, guid: 5b31577ecf5954448b0d92a2c8a0501b, type: 3} + - {fileID: 21300000, guid: 13aa9a4a1bc68064c9e5e17a86df2666, type: 3} + - {fileID: 21300000, guid: 1eb8ffe712da55942b19d29be7a6e5da, type: 3} + - {fileID: 21300000, guid: 31d88d4dbed3d9546898b42447a63e77, type: 3} + - {fileID: 21300000, guid: 686160c7c3cfd5040a8ea08b867ff56c, type: 3} + - {fileID: 21300000, guid: cb0f74b7e0e21ee47b09fdb24a83094f, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.35000002 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Land.anim.meta b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Land.anim.meta new file mode 100644 index 0000000000..cbbce3f6e6 --- /dev/null +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Land.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ef315177df9694d969b7486d1c9de67d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller b/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller index bcf3e42b28..e0fed13336 100644 --- a/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller +++ b/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller @@ -28,6 +28,62 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &-8652486173879100969 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: Jump + m_EventTreshold: 0 + - m_ConditionMode: 4 + m_ConditionEvent: Speed + m_EventTreshold: 0.3 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -9024768835540588441} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.516129 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-7863472098109471230 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: Jump + m_EventTreshold: 0 + - m_ConditionMode: 3 + m_ConditionEvent: Speed + m_EventTreshold: 0.3 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -550194764353508568} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.516129 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1107 &-4154430246438009678 AnimatorStateMachine: serializedVersion: 6 @@ -39,16 +95,19 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -9024768835540588441} - m_Position: {x: 200, y: 240, z: 0} + m_Position: {x: 170, y: 290, z: 0} - serializedVersion: 1 m_State: {fileID: 1725952575496220380} m_Position: {x: 440, y: 560, z: 0} - serializedVersion: 1 m_State: {fileID: -550194764353508568} - m_Position: {x: 500, y: 370, z: 0} + m_Position: {x: 580, y: 310, z: 0} - serializedVersion: 1 m_State: {fileID: 6950904116198280210} - m_Position: {x: 540, y: 60, z: 0} + m_Position: {x: 390, y: 40, z: 0} + - serializedVersion: 1 + m_State: {fileID: 7035716155563237746} + m_Position: {x: 380, y: 170, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: 8919909326570546917} @@ -57,9 +116,34 @@ AnimatorStateMachine: m_StateMachineBehaviours: [] m_AnyStatePosition: {x: 50, y: 20, z: 0} m_EntryPosition: {x: 50, y: 120, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} + m_ExitPosition: {x: 930, y: 160, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_DefaultState: {fileID: -9024768835540588441} +--- !u!1101 &-2945750599019272868 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isGrounded + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 7035716155563237746} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.3181818 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &-550194764353508568 AnimatorState: serializedVersion: 6 @@ -126,25 +210,25 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Crouch m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: Jump m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} - m_Name: isGrounded m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 0} + m_Controller: {fileID: 9100000} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -210,34 +294,6 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &4469878811732974554 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 2 - m_ConditionEvent: Jump - m_EventTreshold: 0 - - m_ConditionMode: 3 - m_ConditionEvent: Speed - m_EventTreshold: 0.3 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -550194764353508568} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0.516129 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &5938351793167912262 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -263,34 +319,6 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &6138191876500889057 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 2 - m_ConditionEvent: Jump - m_EventTreshold: 0 - - m_ConditionMode: 4 - m_ConditionEvent: Speed - m_EventTreshold: 0.3 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -9024768835540588441} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0 - m_TransitionOffset: 0 - m_ExitTime: 0.516129 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 --- !u!1101 &6332234346085945739 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -327,8 +355,7 @@ AnimatorState: m_Speed: 1 m_CycleOffset: 0 m_Transitions: - - {fileID: 6138191876500889057} - - {fileID: 4469878811732974554} + - {fileID: -2945750599019272868} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -344,6 +371,34 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1102 &7035716155563237746 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player_Land + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -8652486173879100969} + - {fileID: -7863472098109471230} + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: ef315177df9694d969b7486d1c9de67d, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1101 &8919909326570546917 AnimatorStateTransition: m_ObjectHideFlags: 1 diff --git a/Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/GroundTile.prefab b/Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/GroundTile.prefab new file mode 100644 index 0000000000..7ecc10efdf --- /dev/null +++ b/Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/GroundTile.prefab @@ -0,0 +1,272 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3425132435630861617 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4341580361984708920} + - component: {fileID: 5482121971842473973} + - component: {fileID: 8382711929484533621} + m_Layer: 0 + m_Name: Layer1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4341580361984708920 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3425132435630861617} + serializedVersion: 2 + 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_Children: [] + m_Father: {fileID: 8000788905568026853} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1839735485 &5482121971842473973 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3425132435630861617} + m_Enabled: 1 + m_Tiles: + - first: {x: -2, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -1, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -2, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -1, y: 0, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + m_AnimatedTiles: {} + m_TileAssetArray: + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: 1dfabe381ebee48b485e1520f0f664eb, type: 2} + - m_RefCount: 1 + m_Data: {fileID: 11400000, guid: f599eca27ab804acdaf363a77b9c0937, type: 2} + - m_RefCount: 2 + m_Data: {fileID: 11400000, guid: cdf3aa23cf36b4a9a9c4147163173313, type: 2} + m_TileSpriteArray: + - m_RefCount: 1 + m_Data: {fileID: 21300000, guid: 6aa3a976ac9ecc54aad638ffbf4e67c6, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300000, guid: 62d2808515efe6d4897f8d8cd5218f31, type: 3} + - m_RefCount: 2 + m_Data: {fileID: 21300000, guid: 804743266b3b62d428e86255220b6694, type: 3} + m_TileMatrixArray: + - m_RefCount: 3 + m_Data: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - m_RefCount: 1 + m_Data: + e00: -0.9876882 + e01: 0 + e02: -0.15643437 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0.15643437 + e21: 0 + e22: -0.9876882 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_TileColorArray: + - m_RefCount: 4 + m_Data: {r: 1, g: 1, b: 1, a: 1} + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: -2, y: -1, z: 0} + m_Size: {x: 2, y: 2, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 +--- !u!483693784 &8382711929484533621 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3425132435630861617} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 0 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0.5, y: 0.5, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!1 &5358270124132249595 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8000788905568026853} + - component: {fileID: 3892116588672053286} + m_Layer: 0 + m_Name: GroundTile + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8000788905568026853 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5358270124132249595} + serializedVersion: 2 + 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_Children: + - {fileID: 4341580361984708920} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!156049354 &3892116588672053286 +Grid: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5358270124132249595} + m_Enabled: 1 + m_CellSize: {x: 2, y: 2, z: 0} + m_CellGap: {x: 0, y: 0, z: 0} + m_CellLayout: 0 + m_CellSwizzle: 0 +--- !u!114 &8441307719544278193 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12395, guid: 0000000000000000e000000000000000, type: 0} + m_Name: Palette Settings + m_EditorClassIdentifier: + cellSizing: 0 + m_TransparencySortMode: 0 + m_TransparencySortAxis: {x: 0, y: 0, z: 1} diff --git a/Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/GroundTile.prefab.meta b/Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/GroundTile.prefab.meta new file mode 100644 index 0000000000..6723415805 --- /dev/null +++ b/Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/GroundTile.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6e332b8d1b3114745b4de4b5f1cca602 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/WallTile.asset b/Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/WallTile.asset new file mode 100644 index 0000000000..4da3cf5105 --- /dev/null +++ b/Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/WallTile.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: WallTile + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300000, guid: 6aa3a976ac9ecc54aad638ffbf4e67c6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/WallTile.asset.meta b/Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/WallTile.asset.meta new file mode 100644 index 0000000000..00667aa73f --- /dev/null +++ b/Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/WallTile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1dfabe381ebee48b485e1520f0f664eb +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/WallTile02.asset b/Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/WallTile02.asset new file mode 100644 index 0000000000..298e7bcd9e --- /dev/null +++ b/Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/WallTile02.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: WallTile02 + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300000, guid: 62d2808515efe6d4897f8d8cd5218f31, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/WallTile02.asset.meta b/Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/WallTile02.asset.meta new file mode 100644 index 0000000000..f02ab7f9ec --- /dev/null +++ b/Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/WallTile02.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f599eca27ab804acdaf363a77b9c0937 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/WallTileEnd.asset b/Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/WallTileEnd.asset new file mode 100644 index 0000000000..b89c0f1ff5 --- /dev/null +++ b/Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/WallTileEnd.asset @@ -0,0 +1,36 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 13312, guid: 0000000000000000e000000000000000, type: 0} + m_Name: WallTileEnd + m_EditorClassIdentifier: + m_Sprite: {fileID: 21300000, guid: 804743266b3b62d428e86255220b6694, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Transform: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_InstancedGameObject: {fileID: 0} + m_Flags: 1 + m_ColliderType: 1 diff --git a/Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/WallTileEnd.asset.meta b/Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/WallTileEnd.asset.meta new file mode 100644 index 0000000000..7001a5ebf8 --- /dev/null +++ b/Assets/Game Assets/Art/TileMapPalettes/Tileset/TilesRock/WallTileEnd.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: cdf3aa23cf36b4a9a9c4147163173313 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Prefab/Player.prefab b/Assets/Game Assets/Prefab/Player.prefab index 47bff7ac9e..6ee52bf5a9 100644 --- a/Assets/Game Assets/Prefab/Player.prefab +++ b/Assets/Game Assets/Prefab/Player.prefab @@ -16,7 +16,7 @@ GameObject: - component: {fileID: 7015224702095746497} m_Layer: 0 m_Name: Player - m_TagString: Untagged + m_TagString: Player m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -33,7 +33,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 2, y: 2, z: 2} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 6712255127414498175} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &7709620395850905416 @@ -195,5 +196,98 @@ MonoBehaviour: m_EditorClassIdentifier: animator: {fileID: 5820244955174857028} rigidbody2D: {fileID: 7252644103890736809} - jumpForce: 15 + jumpForce: 30 speed: 10 + maxJumpHeight: 5 +--- !u!1 &2534428795180559486 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6712255127414498175} + - component: {fileID: 7851594371880949575} + - component: {fileID: 4063944800693930539} + m_Layer: 0 + m_Name: Main Camera + m_TagString: MainCamera + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6712255127414498175 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2534428795180559486} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1.24, z: -5} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3593540518909196710} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &7851594371880949575 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2534428795180559486} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 5 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 0 + m_HDR: 1 + m_AllowMSAA: 0 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 0 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!81 &4063944800693930539 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2534428795180559486} + m_Enabled: 1 diff --git a/Assets/Scenes/AnimationTest.unity b/Assets/Scenes/AnimationTest.unity deleted file mode 100644 index 5add1051b8..0000000000 --- a/Assets/Scenes/AnimationTest.unity +++ /dev/null @@ -1,842 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!29 &1 -OcclusionCullingSettings: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_OcclusionBakeSettings: - smallestOccluder: 5 - smallestHole: 0.25 - backfaceThreshold: 100 - m_SceneGUID: 00000000000000000000000000000000 - m_OcclusionCullingData: {fileID: 0} ---- !u!104 &2 -RenderSettings: - m_ObjectHideFlags: 0 - serializedVersion: 9 - m_Fog: 0 - m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - m_FogMode: 3 - m_FogDensity: 0.01 - m_LinearFogStart: 0 - m_LinearFogEnd: 300 - m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} - m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} - m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} - m_AmbientIntensity: 1 - m_AmbientMode: 3 - m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} - m_SkyboxMaterial: {fileID: 0} - m_HaloStrength: 0.5 - m_FlareStrength: 1 - m_FlareFadeSpeed: 3 - m_HaloTexture: {fileID: 0} - m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} - m_DefaultReflectionMode: 0 - m_DefaultReflectionResolution: 128 - m_ReflectionBounces: 1 - m_ReflectionIntensity: 1 - m_CustomReflection: {fileID: 0} - m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} - m_UseRadianceAmbientProbe: 0 ---- !u!157 &3 -LightmapSettings: - m_ObjectHideFlags: 0 - serializedVersion: 12 - m_GIWorkflowMode: 1 - m_GISettings: - serializedVersion: 2 - m_BounceScale: 1 - m_IndirectOutputScale: 1 - m_AlbedoBoost: 1 - m_EnvironmentLightingMode: 0 - m_EnableBakedLightmaps: 0 - m_EnableRealtimeLightmaps: 0 - m_LightmapEditorSettings: - serializedVersion: 12 - m_Resolution: 2 - m_BakeResolution: 40 - m_AtlasSize: 1024 - m_AO: 0 - m_AOMaxDistance: 1 - m_CompAOExponent: 1 - m_CompAOExponentDirect: 0 - m_ExtractAmbientOcclusion: 0 - m_Padding: 2 - m_LightmapParameters: {fileID: 0} - m_LightmapsBakeMode: 1 - m_TextureCompression: 1 - m_FinalGather: 0 - m_FinalGatherFiltering: 1 - m_FinalGatherRayCount: 256 - m_ReflectionCompression: 2 - m_MixedBakeMode: 2 - m_BakeBackend: 0 - m_PVRSampling: 1 - m_PVRDirectSampleCount: 32 - m_PVRSampleCount: 500 - m_PVRBounces: 2 - m_PVREnvironmentSampleCount: 500 - m_PVREnvironmentReferencePointCount: 2048 - m_PVRFilteringMode: 2 - m_PVRDenoiserTypeDirect: 0 - m_PVRDenoiserTypeIndirect: 0 - m_PVRDenoiserTypeAO: 0 - m_PVRFilterTypeDirect: 0 - m_PVRFilterTypeIndirect: 0 - m_PVRFilterTypeAO: 0 - m_PVREnvironmentMIS: 0 - m_PVRCulling: 1 - m_PVRFilteringGaussRadiusDirect: 1 - m_PVRFilteringGaussRadiusIndirect: 5 - m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousPositionSigmaDirect: 0.5 - m_PVRFilteringAtrousPositionSigmaIndirect: 2 - m_PVRFilteringAtrousPositionSigmaAO: 1 - m_ExportTrainingData: 0 - m_TrainingDataDestination: TrainingData - m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 0} - m_LightingSettings: {fileID: 4890085278179872738, guid: 47d2fc78f5b4c4b1a97f298b8613f162, - type: 2} ---- !u!196 &4 -NavMeshSettings: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_BuildSettings: - serializedVersion: 3 - agentTypeID: 0 - agentRadius: 0.5 - agentHeight: 2 - agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 - minRegionArea: 2 - manualCellSize: 0 - cellSize: 0.16666667 - manualTileSize: 0 - tileSize: 256 - buildHeightMesh: 0 - maxJobWorkers: 0 - preserveTilesOutsideBounds: 0 - debug: - m_Flags: 0 - m_NavMeshData: {fileID: 0} ---- !u!1 &4354825 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4354828} - - component: {fileID: 4354827} - - component: {fileID: 4354826} - m_Layer: 0 - m_Name: Ground2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!61 &4354826 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4354825} - 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: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: -0.06} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 7.761719, y: 2.3253536} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 0.9414788} - m_EdgeRadius: 0 ---- !u!212 &4354827 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4354825} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 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: 21300002, guid: 389dc290ab41ea34485314d037cc75df, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 7.761719, y: 2.3253536} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &4354828 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4354825} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 2.915, y: -3.313, z: 0} - m_LocalScale: {x: 2.35, y: 2.35, z: 2.35} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &282281674 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 282281676} - - component: {fileID: 282281675} - - component: {fileID: 282281677} - m_Layer: 0 - m_Name: Ground1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &282281675 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 282281674} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 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: 389dc290ab41ea34485314d037cc75df, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 7.761719, y: 2.3253536} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &282281676 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 282281674} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -3.58, y: -3.27, z: 0} - m_LocalScale: {x: 2.35, y: 2.35, z: 2.35} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &282281677 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 282281674} - 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: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: -0.06} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 7.761719, y: 2.3253536} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 0.9457176} - m_EdgeRadius: 0 ---- !u!1 &519420028 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 519420032} - - component: {fileID: 519420031} - - component: {fileID: 519420029} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!81 &519420029 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_Enabled: 1 ---- !u!20 &519420031 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 2 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 1 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 0 - m_HDR: 1 - m_AllowMSAA: 0 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 0 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &519420032 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519420028} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: -10} - 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 &1275231954 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1275231957} - - component: {fileID: 1275231956} - - component: {fileID: 1275231955} - m_Layer: 0 - m_Name: Ground4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!61 &1275231955 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1275231954} - 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: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: -0.06} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 7.761719, y: 2.3253536} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 0.9268483} - m_EdgeRadius: 0 ---- !u!212 &1275231956 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1275231954} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 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: 21300004, guid: 389dc290ab41ea34485314d037cc75df, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 7.761719, y: 2.3253536} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1275231957 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1275231954} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.21, y: -3.244, z: 0} - m_LocalScale: {x: 2.35, y: 2.35, z: 2.35} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1857259668 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1857259671} - - component: {fileID: 1857259670} - - component: {fileID: 1857259669} - m_Layer: 0 - m_Name: Ground3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!61 &1857259669 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1857259668} - 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: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: -0.06} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 7.761719, y: 2.3253536} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 0.9268483} - m_EdgeRadius: 0 ---- !u!212 &1857259670 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1857259668} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 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: 21300004, guid: 389dc290ab41ea34485314d037cc75df, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 7.761719, y: 2.3253536} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1857259671 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1857259668} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.57, y: -3.244, z: 0} - m_LocalScale: {x: 2.35, y: 2.35, z: 2.35} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &2101336368777957266 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 328097028837166983, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - propertyPath: m_Name - value: Player - objectReference: {fileID: 0} - - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - propertyPath: m_LocalPosition.y - value: -2 - objectReference: {fileID: 0} - - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7015224702095746497, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - propertyPath: speed - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 7015224702095746497, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - propertyPath: jumpForce - value: 24 - objectReference: {fileID: 0} - - target: {fileID: 7015224702095746497, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - propertyPath: rigidbody2D - value: - objectReference: {fileID: 2101336368777957269} - - target: {fileID: 7252644103890736809, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - propertyPath: m_Constraints - value: 4 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2d26a819bd59c42f09e953f24c366259, type: 3} ---- !u!50 &2101336368777957269 stripped -Rigidbody2D: - m_CorrespondingSourceObject: {fileID: 7252644103890736809, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - m_PrefabInstance: {fileID: 2101336368777957266} - m_PrefabAsset: {fileID: 0} ---- !u!1660057539 &9223372036854775807 -SceneRoots: - m_ObjectHideFlags: 0 - m_Roots: - - {fileID: 519420032} - - {fileID: 2101336368777957266} - - {fileID: 282281676} - - {fileID: 4354828} - - {fileID: 1857259671} - - {fileID: 1275231957} diff --git a/Assets/Scenes/Level1.unity b/Assets/Scenes/Level1.unity new file mode 100644 index 0000000000..fcbe37b64e --- /dev/null +++ b/Assets/Scenes/Level1.unity @@ -0,0 +1,1627 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 0 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 4890085278179872738, guid: 47d2fc78f5b4c4b1a97f298b8613f162, + type: 2} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &4354825 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4354828} + - component: {fileID: 4354827} + - component: {fileID: 4354826} + m_Layer: 0 + m_Name: Ground2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!61 &4354826 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4354825} + 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: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.06} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 7.761719, y: 2.3253536} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 0.9414788} + m_EdgeRadius: 0 +--- !u!212 &4354827 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4354825} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 21300002, guid: 389dc290ab41ea34485314d037cc75df, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.761719, y: 2.3253536} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &4354828 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4354825} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.915, y: -3.313, z: 0} + m_LocalScale: {x: 2.35, y: 2.35, z: 2.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &49351568 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 49351569} + - component: {fileID: 49351570} + - component: {fileID: 49351571} + m_Layer: 0 + m_Name: LevelEnd + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &49351569 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 49351568} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 18.977915, y: 1.9746668, z: -0.07214421} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1412279564} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &49351570 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 49351568} + 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: 1} + m_EdgeRadius: 0 +--- !u!114 &49351571 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 49351568} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f9451ad9a7bb543c0b34f61f62d85e38, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &282281674 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 282281676} + - component: {fileID: 282281675} + - component: {fileID: 282281677} + m_Layer: 0 + m_Name: Ground1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!212 &282281675 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 282281674} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 389dc290ab41ea34485314d037cc75df, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.761719, y: 2.3253536} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &282281676 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 282281674} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.58, y: -3.27, z: 0} + m_LocalScale: {x: 2.35, y: 2.35, z: 2.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &282281677 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 282281674} + 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: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.06} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 7.761719, y: 2.3253536} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 0.9457176} + m_EdgeRadius: 0 +--- !u!1 &692167323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 692167324} + - component: {fileID: 692167325} + m_Layer: 0 + m_Name: LevelStart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &692167324 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 692167323} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -19.722086, y: 1.9746668, z: -0.07214421} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1412279564} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &692167325 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 692167323} + 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: 1} + m_EdgeRadius: 0 +--- !u!1 &1139415633 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1139415634} + - component: {fileID: 1139415636} + - component: {fileID: 1139415635} + - component: {fileID: 1139415637} + m_Layer: 0 + m_Name: TileMap + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1139415634 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1139415633} + serializedVersion: 2 + 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_Children: [] + m_Father: {fileID: 2107246408} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!483693784 &1139415635 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1139415633} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0.5, y: 0.5, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!1839735485 &1139415636 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1139415633} + m_Enabled: 1 + m_Tiles: + - first: {x: 0, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 4, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 5, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 6, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 7, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 8, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 9, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 10, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 11, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 12, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 13, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 14, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 16, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 17, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 18, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 19, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 20, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 21, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 22, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 23, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 24, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 27, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 32, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 33, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 34, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 36, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 37, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 38, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 39, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 40, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 14, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 16, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 36, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 37, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 14, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 16, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 35, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 36, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 37, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 14, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 15, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 16, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + m_AnimatedTiles: {} + m_TileAssetArray: + - m_RefCount: 5 + m_Data: {fileID: 11400000, guid: cdf3aa23cf36b4a9a9c4147163173313, type: 2} + - m_RefCount: 34 + m_Data: {fileID: 11400000, guid: 1dfabe381ebee48b485e1520f0f664eb, type: 2} + - m_RefCount: 6 + m_Data: {fileID: 11400000, guid: f599eca27ab804acdaf363a77b9c0937, type: 2} + m_TileSpriteArray: + - m_RefCount: 5 + m_Data: {fileID: 21300000, guid: 804743266b3b62d428e86255220b6694, type: 3} + - m_RefCount: 34 + m_Data: {fileID: 21300000, guid: 6aa3a976ac9ecc54aad638ffbf4e67c6, type: 3} + - m_RefCount: 6 + m_Data: {fileID: 21300000, guid: 62d2808515efe6d4897f8d8cd5218f31, type: 3} + m_TileMatrixArray: + - m_RefCount: 43 + m_Data: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - m_RefCount: 2 + m_Data: + e00: -0.9876882 + e01: 0 + e02: -0.15643437 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0.15643437 + e21: 0 + e22: -0.9876882 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_TileColorArray: + - m_RefCount: 45 + m_Data: {r: 1, g: 1, b: 1, a: 1} + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: 0, y: -4, z: 0} + m_Size: {x: 41, y: 5, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 +--- !u!19719996 &1139415637 +TilemapCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1139415633} + 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: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_MaximumTileChangeCount: 1000 + m_ExtrusionFactor: 0 + m_UseDelaunayMesh: 0 +--- !u!1 &1275231954 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1275231957} + - component: {fileID: 1275231956} + - component: {fileID: 1275231955} + m_Layer: 0 + m_Name: Ground4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!61 &1275231955 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275231954} + 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: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.06} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 7.761719, y: 2.3253536} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 0.9268483} + m_EdgeRadius: 0 +--- !u!212 &1275231956 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275231954} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 21300004, guid: 389dc290ab41ea34485314d037cc75df, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.761719, y: 2.3253536} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1275231957 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275231954} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.21, y: -3.244, z: 0} + m_LocalScale: {x: 2.35, y: 2.35, z: 2.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1412279563 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1412279564} + m_Layer: 0 + m_Name: Checkpoints + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1412279564 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1412279563} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 20.722086, y: -3.4746668, z: 0.5721442} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 692167324} + - {fileID: 49351569} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1857259668 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1857259671} + - component: {fileID: 1857259670} + - component: {fileID: 1857259669} + m_Layer: 0 + m_Name: Ground3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!61 &1857259669 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857259668} + 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: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.06} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 7.761719, y: 2.3253536} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 0.9268483} + m_EdgeRadius: 0 +--- !u!212 &1857259670 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857259668} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 21300004, guid: 389dc290ab41ea34485314d037cc75df, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.761719, y: 2.3253536} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1857259671 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857259668} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.57, y: -3.244, z: 0} + m_LocalScale: {x: 2.35, y: 2.35, z: 2.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2107246407 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2107246408} + - component: {fileID: 2107246409} + m_Layer: 0 + m_Name: LevelDesign + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2107246408 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107246407} + serializedVersion: 2 + 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_Children: + - {fileID: 1139415634} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!156049354 &2107246409 +Grid: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107246407} + m_Enabled: 1 + m_CellSize: {x: 1, y: 1, z: 1} + m_CellGap: {x: 0, y: 0, z: 0} + m_CellLayout: 0 + m_CellSwizzle: 0 +--- !u!1001 &2101336368777957266 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 328097028837166983, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_Name + value: Player + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalPosition.y + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2d26a819bd59c42f09e953f24c366259, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 2101336368777957266} + - {fileID: 282281676} + - {fileID: 4354828} + - {fileID: 1857259671} + - {fileID: 1275231957} + - {fileID: 2107246408} + - {fileID: 1412279564} diff --git a/Assets/Scenes/AnimationTest.unity.meta b/Assets/Scenes/Level1.unity.meta similarity index 100% rename from Assets/Scenes/AnimationTest.unity.meta rename to Assets/Scenes/Level1.unity.meta diff --git a/Assets/Scenes/Level2.unity b/Assets/Scenes/Level2.unity new file mode 100644 index 0000000000..3169f700bf --- /dev/null +++ b/Assets/Scenes/Level2.unity @@ -0,0 +1,2033 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 0 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 4890085278179872738, guid: 47d2fc78f5b4c4b1a97f298b8613f162, + type: 2} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &4354825 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4354828} + - component: {fileID: 4354827} + - component: {fileID: 4354826} + m_Layer: 0 + m_Name: Ground2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!61 &4354826 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4354825} + 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: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.06} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 7.761719, y: 2.3253536} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 0.9414788} + m_EdgeRadius: 0 +--- !u!212 &4354827 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4354825} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 21300002, guid: 389dc290ab41ea34485314d037cc75df, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.761719, y: 2.3253536} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &4354828 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4354825} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.915, y: -3.313, z: 0} + m_LocalScale: {x: 2.35, y: 2.35, z: 2.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &49351568 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 49351569} + - component: {fileID: 49351570} + m_Layer: 0 + m_Name: LevelEnd + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &49351569 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 49351568} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 18.977915, y: 1.9746668, z: -0.07214421} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1412279564} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &49351570 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 49351568} + 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: 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, 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: 1} + m_EdgeRadius: 0 +--- !u!1 &221009003 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 221009006} + - component: {fileID: 221009005} + - component: {fileID: 221009004} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &221009004 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 221009003} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &221009005 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 221009003} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &221009006 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 221009003} + serializedVersion: 2 + 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_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &282281674 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 282281676} + - component: {fileID: 282281675} + - component: {fileID: 282281677} + m_Layer: 0 + m_Name: Ground1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!212 &282281675 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 282281674} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 389dc290ab41ea34485314d037cc75df, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.761719, y: 2.3253536} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &282281676 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 282281674} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.58, y: -3.27, z: 0} + m_LocalScale: {x: 2.35, y: 2.35, z: 2.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &282281677 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 282281674} + 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: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.06} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 7.761719, y: 2.3253536} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 0.9457176} + m_EdgeRadius: 0 +--- !u!1 &613862172 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 613862175} + - component: {fileID: 613862174} + - component: {fileID: 613862173} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &613862173 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 613862172} + m_Enabled: 1 +--- !u!20 &613862174 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 613862172} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &613862175 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 613862172} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1529.2927, y: 477.8936, z: -2.812845} + 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 &692167323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 692167324} + - component: {fileID: 692167325} + m_Layer: 0 + m_Name: LevelStart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &692167324 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 692167323} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -19.722086, y: 1.9746668, z: -0.07214421} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1412279564} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &692167325 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 692167323} + 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: 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, 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: 1} + m_EdgeRadius: 0 +--- !u!1 &1139415633 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1139415634} + - component: {fileID: 1139415636} + - component: {fileID: 1139415635} + - component: {fileID: 1139415637} + m_Layer: 0 + m_Name: TileMap + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1139415634 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1139415633} + serializedVersion: 2 + 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_Children: [] + m_Father: {fileID: 2107246408} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!483693784 &1139415635 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1139415633} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0.5, y: 0.5, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!1839735485 &1139415636 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1139415633} + m_Enabled: 1 + m_Tiles: + - first: {x: 0, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 4, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 5, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 6, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 7, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 8, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 9, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 10, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 11, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 12, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 13, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 14, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 16, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 17, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 18, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 19, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 20, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 21, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 22, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 23, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 24, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 27, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 32, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 33, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 34, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 36, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 37, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 38, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 39, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 40, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 1 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 14, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 16, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 36, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 37, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 14, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 16, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 35, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 36, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 37, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 14, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 15, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 16, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + m_AnimatedTiles: {} + m_TileAssetArray: + - m_RefCount: 5 + m_Data: {fileID: 11400000, guid: cdf3aa23cf36b4a9a9c4147163173313, type: 2} + - m_RefCount: 34 + m_Data: {fileID: 11400000, guid: 1dfabe381ebee48b485e1520f0f664eb, type: 2} + - m_RefCount: 6 + m_Data: {fileID: 11400000, guid: f599eca27ab804acdaf363a77b9c0937, type: 2} + m_TileSpriteArray: + - m_RefCount: 5 + m_Data: {fileID: 21300000, guid: 804743266b3b62d428e86255220b6694, type: 3} + - m_RefCount: 34 + m_Data: {fileID: 21300000, guid: 6aa3a976ac9ecc54aad638ffbf4e67c6, type: 3} + - m_RefCount: 6 + m_Data: {fileID: 21300000, guid: 62d2808515efe6d4897f8d8cd5218f31, type: 3} + m_TileMatrixArray: + - m_RefCount: 43 + m_Data: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - m_RefCount: 2 + m_Data: + e00: -0.9876882 + e01: 0 + e02: -0.15643437 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0.15643437 + e21: 0 + e22: -0.9876882 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_TileColorArray: + - m_RefCount: 45 + m_Data: {r: 1, g: 1, b: 1, a: 1} + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: 0, y: -4, z: 0} + m_Size: {x: 41, y: 5, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 +--- !u!19719996 &1139415637 +TilemapCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1139415633} + 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: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_MaximumTileChangeCount: 1000 + m_ExtrusionFactor: 0 + m_UseDelaunayMesh: 0 +--- !u!1 &1275231954 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1275231957} + - component: {fileID: 1275231956} + - component: {fileID: 1275231955} + m_Layer: 0 + m_Name: Ground4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!61 &1275231955 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275231954} + 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: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.06} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 7.761719, y: 2.3253536} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 0.9268483} + m_EdgeRadius: 0 +--- !u!212 &1275231956 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275231954} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 21300004, guid: 389dc290ab41ea34485314d037cc75df, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.761719, y: 2.3253536} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1275231957 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275231954} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.21, y: -3.244, z: 0} + m_LocalScale: {x: 2.35, y: 2.35, z: 2.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1412279563 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1412279564} + m_Layer: 0 + m_Name: Checkpoints + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1412279564 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1412279563} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 20.722086, y: -3.4746668, z: 0.5721442} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 692167324} + - {fileID: 49351569} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1857259668 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1857259671} + - component: {fileID: 1857259670} + - component: {fileID: 1857259669} + m_Layer: 0 + m_Name: Ground3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!61 &1857259669 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857259668} + 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: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.06} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 7.761719, y: 2.3253536} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 0.9268483} + m_EdgeRadius: 0 +--- !u!212 &1857259670 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857259668} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 21300004, guid: 389dc290ab41ea34485314d037cc75df, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.761719, y: 2.3253536} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1857259671 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857259668} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.57, y: -3.244, z: 0} + m_LocalScale: {x: 2.35, y: 2.35, z: 2.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1900638844 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1900638845} + - component: {fileID: 1900638847} + - component: {fileID: 1900638846} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1900638845 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1900638844} + 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_Children: [] + m_Father: {fileID: 2107974181} + 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: -11.6} + m_SizeDelta: {x: 322.5294, y: 80.6324} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1900638846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1900638844} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Level 1 Completed! + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1900638847 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1900638844} + m_CullTransparentMesh: 1 +--- !u!1 &2107246407 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2107246408} + - component: {fileID: 2107246409} + m_Layer: 0 + m_Name: LevelDesign + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &2107246408 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107246407} + serializedVersion: 2 + 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_Children: + - {fileID: 1139415634} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!156049354 &2107246409 +Grid: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107246407} + m_Enabled: 1 + m_CellSize: {x: 1, y: 1, z: 1} + m_CellGap: {x: 0, y: 0, z: 0} + m_CellLayout: 0 + m_CellSwizzle: 0 +--- !u!1 &2107974177 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2107974181} + - component: {fileID: 2107974180} + - component: {fileID: 2107974179} + - component: {fileID: 2107974178} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &2107974178 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107974177} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &2107974179 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107974177} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &2107974180 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107974177} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &2107974181 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107974177} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1900638845} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!1001 &2101336368777957266 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 328097028837166983, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_Name + value: Player + objectReference: {fileID: 0} + - target: {fileID: 328097028837166983, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalPosition.y + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6712255127414498175, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.24 + objectReference: {fileID: 0} + - target: {fileID: 7015224702095746497, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: jumpForce + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 7015224702095746497, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: maxJumpHeight + value: 5 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2d26a819bd59c42f09e953f24c366259, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 2101336368777957266} + - {fileID: 282281676} + - {fileID: 4354828} + - {fileID: 1857259671} + - {fileID: 1275231957} + - {fileID: 2107246408} + - {fileID: 1412279564} + - {fileID: 2107974181} + - {fileID: 221009006} + - {fileID: 613862175} diff --git a/Assets/Scenes/Level2.unity.meta b/Assets/Scenes/Level2.unity.meta new file mode 100644 index 0000000000..3d49826f73 --- /dev/null +++ b/Assets/Scenes/Level2.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 4fd0f95d27b1d4a1cb491d516d84208e +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/LevelEndController.cs b/Assets/Scripts/LevelEndController.cs new file mode 100644 index 0000000000..30d5ddd4ea --- /dev/null +++ b/Assets/Scripts/LevelEndController.cs @@ -0,0 +1,13 @@ +using UnityEngine; +using UnityEngine.SceneManagement; + +public class LevelEndController : MonoBehaviour +{ + private void OnTriggerEnter2D(Collider2D other) + { + if (other.CompareTag("Player")) + { + SceneManager.LoadScene("Scenes/Level2"); + } + } +} diff --git a/Assets/Scripts/LevelEndController.cs.meta b/Assets/Scripts/LevelEndController.cs.meta new file mode 100644 index 0000000000..b034280c20 --- /dev/null +++ b/Assets/Scripts/LevelEndController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f9451ad9a7bb543c0b34f61f62d85e38 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/LevelStartController.cs b/Assets/Scripts/LevelStartController.cs new file mode 100644 index 0000000000..7f57f46373 --- /dev/null +++ b/Assets/Scripts/LevelStartController.cs @@ -0,0 +1,6 @@ +using UnityEngine; + +public class LevelStartController : MonoBehaviour +{ + +} diff --git a/Assets/Scripts/LevelStartController.cs.meta b/Assets/Scripts/LevelStartController.cs.meta new file mode 100644 index 0000000000..e15b3868a6 --- /dev/null +++ b/Assets/Scripts/LevelStartController.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 2e8d3a01c2f94a02847a102e8cf484b9 +timeCreated: 1705569425 \ No newline at end of file diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 0361b24a17..a6110b95ee 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -10,20 +10,12 @@ public class PlayerController : MonoBehaviour [SerializeField] private float jumpForce; [SerializeField] private float speed; - // [SerializeField] private BoxCollider2D boxCollider2D; private bool isCrouching = false; private bool isGrounded => Math.Abs(rigidbody2D.velocity.y) < 0.001f; private bool midAir = false; [SerializeField] private float maxJumpHeight = 2f; private float currentPlatformHeight = 0f; - // private float crouchOffset = 0.5f; - // private float crouchSize = 0.5f; - - private void Start() - { - currentPlatformHeight = transform.position.y; - } void Update() { @@ -32,6 +24,10 @@ void Update() PlayerMovement(horizontal, vertical); PlayerAnimation(horizontal, vertical); + if (isGrounded) + { + currentPlatformHeight = transform.position.y; + } } private void PlayerAnimation(float horizontal, float vertical) diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index 0147887ef4..ea2a1a50e0 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -4,5 +4,11 @@ EditorBuildSettings: m_ObjectHideFlags: 0 serializedVersion: 2 - m_Scenes: [] + m_Scenes: + - enabled: 1 + path: Assets/Scenes/Level2.unity + guid: 4fd0f95d27b1d4a1cb491d516d84208e + - enabled: 1 + path: Assets/Scenes/Level1.unity + guid: 3a46aa8073dff7744a2d6a6be0f747bf m_configObjects: {} diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 23a81e21f0..200a201ed4 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -8,6 +8,9 @@ EditorUserSettings: RecentlyUsedSceneGuid-0: value: 505000500454510b5a5d08241674084442164a2e7a29703228791b64b6b7363e flags: 0 + RecentlyUsedSceneGuid-1: + value: 57575056030c5c5f5f590e7314775e4115154c737d2c73617b2d4567b0b06c3d + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 9d655fc01b..da9b67f436 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 3} - - {fileID: 14} + - {fileID: 15} m_Position: serializedVersion: 2 x: 0 @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 1539 + controlID: 14696 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -46,10 +46,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 294 + x: 284 y: 95 - width: 732 - height: 416.5 + width: 707.5 + height: 398.5 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -104,10 +104,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 732 - height: 395.5 - m_Scale: {x: 0.4945946, y: 0.4945946} - m_Translation: {x: 366, y: 197.75} + width: 707.5 + height: 377.5 + m_Scale: {x: 0.47804055, y: 0.47804055} + m_Translation: {x: 353.75, y: 188.75} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -115,12 +115,12 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -740 - y: -399.8224 + y: -394.84097 width: 1480 - height: 799.6448 + height: 789.68195 m_MinimalGUI: 1 - m_defaultScale: 0.4945946 - m_LastWindowPixelSize: {x: 1464, y: 833} + m_defaultScale: 0.47804055 + m_LastWindowPixelSize: {x: 1415, y: 797} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 @@ -145,12 +145,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1028 + width: 993.5 height: 779 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 1540 + controlID: 14697 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -170,12 +170,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1028 - height: 437.5 + width: 993.5 + height: 419.5 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 1541 + controlID: 14698 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -193,10 +193,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 294 - height: 437.5 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 284 + height: 419.5 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 6} m_Panes: - {fileID: 6} @@ -225,8 +225,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 95 - width: 293 - height: 416.5 + width: 283 + height: 398.5 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -240,9 +240,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 74f1ffff - m_LastClickedID: -3724 - m_ExpandedIDs: 24fbffff + m_SelectedIDs: c07c0000e85f0000 + m_LastClickedID: 0 + m_ExpandedIDs: 4875ffff10fbffff12fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -258,7 +258,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 5} + m_ClientGUIView: {fileID: 0} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -281,10 +281,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 294 + x: 284 y: 0 - width: 734 - height: 437.5 + width: 709.5 + height: 419.5 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 2} @@ -314,10 +314,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 294 + x: 284 y: 95 - width: 732 - height: 416.5 + width: 707.5 + height: 398.5 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -657,7 +657,7 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: 117.5, y: 25} + snapOffset: {x: 0, y: 25} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: UnityEditor.SceneViewCameraOverlay @@ -682,7 +682,7 @@ MonoBehaviour: containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 0 + displayed: 1 snapOffset: {x: 48, y: 48} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -693,7 +693,7 @@ MonoBehaviour: sizeOverriden: 0 m_OverlaysVisible: 1 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 - m_Gizmos: 0 + m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 0 m_SceneLighting: 1 @@ -702,9 +702,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: -0.48123854, y: -3.667344, z: -0.0062960596} + m_Target: {x: 40.236546, y: -1.6232038, z: 0.49407825} speed: 2 - m_Value: {x: -0.48123854, y: -3.667344, z: -0.0062960596} + m_Value: {x: 40.236546, y: -1.6232038, z: 0.49407825} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -740,13 +740,13 @@ MonoBehaviour: m_Size: {x: 1, y: 1} zGrid: m_Fade: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} - m_ShowGrid: 1 + m_ShowGrid: 0 m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: @@ -754,9 +754,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 2.3272245 + m_Target: 1.2992802 speed: 2 - m_Value: 2.3272245 + m_Value: 1.2992802 m_Ortho: m_Target: 1 speed: 2 @@ -791,25 +791,26 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AnimationWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 437.5 - width: 1028 - height: 341.5 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 12} + y: 419.5 + width: 993.5 + height: 359.5 + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 10} m_Panes: - {fileID: 10} - {fileID: 11} - {fileID: 12} - {fileID: 13} - m_Selected: 2 - m_LastSelected: 0 + - {fileID: 14} + m_Selected: 0 + m_LastSelected: 4 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -832,9 +833,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 532.5 - width: 888 - height: 320.5 + y: 514.5 + width: 992.5 + height: 338.5 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -846,7 +847,7 @@ MonoBehaviour: m_SaveData: [] m_OverlaysVisible: 1 m_SearchFilter: - m_NameFilter: + m_NameFilter: level m_ClassNames: [] m_AssetLabels: [] m_AssetBundleNames: [] @@ -856,24 +857,24 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Game Assets/Art/Animations/AnimationClips + - Assets/Scripts m_Globs: [] - m_OriginalText: + m_OriginalText: level m_ImportLogFlags: 0 m_FilterByTypeIntersection: 0 m_ViewMode: 1 m_StartGridSize: 96 m_LastFolders: - - Assets/Game Assets/Art/Animations/AnimationClips + - Assets/Scripts m_LastFoldersGridSize: 96 m_LastProjectPath: /Users/zain/2D-Platformer-Game m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 143} - m_SelectedIDs: 98640000 - m_LastClickedID: 25752 - m_ExpandedIDs: 00000000c05c0000 + scrollPos: {x: 0, y: 79} + m_SelectedIDs: ee5c0000 + m_LastClickedID: 23790 + m_ExpandedIDs: 00000000c85c000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -901,7 +902,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000c05c0000 + m_ExpandedIDs: 00000000c85c000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -926,10 +927,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 2476ffff - m_LastClickedInstanceID: -35292 + m_SelectedInstanceIDs: c07c0000e85f0000 + m_LastClickedInstanceID: 31936 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000d87c0000e67c00001882000092a80000f2ac00005e7f00002cb900006c9f000034ba000036bb00009a7f0000947e00002a580100a85c0100667f0000b88700004a7e00005a7c0000fe7d00001aa00000687f00006a7f0000189f0000f87f00005c530400369e0000e88a0000e48a00006e5b0000 + m_ExpandedInstanceIDs: c6230000d87c0000e67c00001882000092a80000f2ac00005e7f00002cb900006c9f000034ba000036bb00009a7f0000947e00002a580100a85c0100667f0000b88700004a7e00005a7c0000fe7d00001aa00000687f00006a7f0000189f0000f87f00005c530400369e0000e88a0000e48a00006e5b00000000000012700000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -945,7 +946,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 9} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -993,44 +994,6 @@ MonoBehaviour: m_SaveData: [] m_OverlaysVisible: 1 --- !u!114 &12 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Animation - m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 532.5 - width: 1027 - height: 320.5 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_LockTracker: - m_IsLocked: 0 - m_LastSelectedObjectID: -3724 ---- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1052,9 +1015,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 532.5 - width: 888 - height: 320.5 + y: 371.5 + width: 992.5 + height: 481.5 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1154,14 +1117,14 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 0.4491085 + - e00: 0.62402505 e01: 0 e02: 0 - e03: 222.82448 + e03: -55.59482 e10: 0 - e11: 0.4491085 + e11: 0.62402505 e12: 0 - e13: 87.38968 + e13: 39.253586 e20: 0 e21: 0 e22: 1 @@ -1188,7 +1151,79 @@ MonoBehaviour: m_CurrentEditor: 1 m_LayerEditor: m_SelectedLayerIndex: 0 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3f683d99f24875748a6656966ca9cea0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 240, y: 200} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Tile Palette + m_Image: {fileID: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 532.5 + width: 992.5 + height: 320.5 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 --- !u!114 &14 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animation + m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 371.5 + width: 992.5 + height: 481.5 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: -35356 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1203,19 +1238,19 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1028 + x: 993.5 y: 0 - width: 442 + width: 476.5 height: 779 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 15} + m_ActualView: {fileID: 16} m_Panes: - - {fileID: 15} - {fileID: 16} + - {fileID: 17} m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &15 + m_LastSelected: 0 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1236,9 +1271,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1028 + x: 993.5 y: 95 - width: 441 + width: 475.5 height: 758 m_SerializedDataModeController: m_DataMode: 0 @@ -1253,7 +1288,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 291 + m_CachedPref: 347 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 @@ -1263,7 +1298,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &16 +--- !u!114 &17 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} From 24ae5e9f87649a1bcdcbf6c74afaaf58b2f4e5b3 Mon Sep 17 00:00:00 2001 From: Syed zainul abedin Date: Thu, 18 Jan 2024 14:54:32 +0530 Subject: [PATCH 11/26] feat: Added death logic --- Assets/Scripts/PlayerController.cs | 12 +++++++++++- UserSettings/EditorUserSettings.asset | 4 ++-- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index a6110b95ee..abfc34061c 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -2,6 +2,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; +using UnityEngine.SceneManagement; public class PlayerController : MonoBehaviour { @@ -28,8 +29,17 @@ void Update() { currentPlatformHeight = transform.position.y; } + CheckIfPlayerFell(); } - + + private void CheckIfPlayerFell() + { + if (transform.position.y < currentPlatformHeight - 10) + { + SceneManager.LoadScene(SceneManager.GetActiveScene().name); + } + } + private void PlayerAnimation(float horizontal, float vertical) { bool isFlipped = horizontal < 0; diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 200a201ed4..7d368076b3 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -6,10 +6,10 @@ EditorUserSettings: serializedVersion: 4 m_ConfigSettings: RecentlyUsedSceneGuid-0: - value: 505000500454510b5a5d08241674084442164a2e7a29703228791b64b6b7363e + value: 57575056030c5c5f5f590e7314775e4115154c737d2c73617b2d4567b0b06c3d flags: 0 RecentlyUsedSceneGuid-1: - value: 57575056030c5c5f5f590e7314775e4115154c737d2c73617b2d4567b0b06c3d + value: 505000500454510b5a5d08241674084442164a2e7a29703228791b64b6b7363e flags: 0 vcSharedLogLevel: value: 0d5e400f0650 From a922ec62d75efcaf6a54ccbb1a904bc0a8129296 Mon Sep 17 00:00:00 2001 From: Syed zainul abedin Date: Thu, 18 Jan 2024 17:10:44 +0530 Subject: [PATCH 12/26] feat: Added collectibles --- .../Interactables/Key.controller | 72 ++++ .../Interactables/Key.controller.meta | 8 + .../AnimationClips/Interactables/KeySpin.anim | 162 +++++++ .../Interactables/KeySpin.anim.meta | 8 + Assets/Game Assets/Prefab/Key.prefab | 167 ++++++++ Assets/Game Assets/Prefab/Key.prefab.meta | 7 + Assets/Game Assets/Prefab/Player.prefab | 3 +- Assets/Scenes/Level1.unity | 404 +++++++++++++++++- Assets/Scripts/KeyController.cs | 17 + Assets/Scripts/KeyController.cs.meta | 11 + Assets/Scripts/PlayerController.cs | 27 +- Assets/Scripts/ScoreController.cs | 26 ++ Assets/Scripts/ScoreController.cs.meta | 3 + ProjectSettings/TagManager.asset | 3 +- .../Layouts/CurrentMaximizeLayout.dwlt | 164 ++++--- 15 files changed, 985 insertions(+), 97 deletions(-) create mode 100644 Assets/Game Assets/Art/Animations/AnimationClips/Interactables/Key.controller create mode 100644 Assets/Game Assets/Art/Animations/AnimationClips/Interactables/Key.controller.meta create mode 100644 Assets/Game Assets/Art/Animations/AnimationClips/Interactables/KeySpin.anim create mode 100644 Assets/Game Assets/Art/Animations/AnimationClips/Interactables/KeySpin.anim.meta create mode 100644 Assets/Game Assets/Prefab/Key.prefab create mode 100644 Assets/Game Assets/Prefab/Key.prefab.meta create mode 100644 Assets/Scripts/KeyController.cs create mode 100644 Assets/Scripts/KeyController.cs.meta create mode 100644 Assets/Scripts/ScoreController.cs create mode 100644 Assets/Scripts/ScoreController.cs.meta diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Interactables/Key.controller b/Assets/Game Assets/Art/Animations/AnimationClips/Interactables/Key.controller new file mode 100644 index 0000000000..5ab305134b --- /dev/null +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Interactables/Key.controller @@ -0,0 +1,72 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1107 &-3929752780267098213 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: + - serializedVersion: 1 + m_State: {fileID: 7005268648453378191} + m_Position: {x: 200, y: 0, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 7005268648453378191} +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Key + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: -3929752780267098213} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1102 &7005268648453378191 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: KeySpin + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: f7e312bb1539c4594b952c6a414cda40, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Interactables/Key.controller.meta b/Assets/Game Assets/Art/Animations/AnimationClips/Interactables/Key.controller.meta new file mode 100644 index 0000000000..68bf7e05d8 --- /dev/null +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Interactables/Key.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c423fc03e8a8f4fceb4fd8feb5f95bb2 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Interactables/KeySpin.anim b/Assets/Game Assets/Art/Animations/AnimationClips/Interactables/KeySpin.anim new file mode 100644 index 0000000000..edd39833d7 --- /dev/null +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Interactables/KeySpin.anim @@ -0,0 +1,162 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: KeySpin + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: 3abf1705bc9d76244ad760412db78a65, type: 3} + - time: 0.033333335 + value: {fileID: 21300000, guid: f16737ca9f1dc29448765a816d0a1b49, type: 3} + - time: 0.06666667 + value: {fileID: 21300000, guid: 7a0de91dea9f59140bb693004bf0b0ad, type: 3} + - time: 0.1 + value: {fileID: 21300000, guid: 7c8bdf6129a84e141a690926a43cb384, type: 3} + - time: 0.13333334 + value: {fileID: 21300000, guid: 2a8146b76a8332e46b9c00f3cb2960e8, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 2c9d2d33aa1cb054cb019c852a64b6d4, type: 3} + - time: 0.2 + value: {fileID: 21300000, guid: 6b805b3d02c25084780e70f6b6e7ab38, type: 3} + - time: 0.23333333 + value: {fileID: 21300000, guid: b53184e6a2932ee409a26e6838f16aae, type: 3} + - time: 0.26666668 + value: {fileID: 21300000, guid: 44fbfa5afc056fe459c80663e42e9ae4, type: 3} + - time: 0.3 + value: {fileID: 21300000, guid: 862eb60c627dd534cb832145605ac12d, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 7a85663a637e4004e92472acad01c2b8, type: 3} + - time: 0.36666667 + value: {fileID: 21300000, guid: e800ef09025e509499b2916a88d7da82, type: 3} + - time: 0.4 + value: {fileID: 21300000, guid: 3dbc35981e1cf7b4e8e17794cc775b4d, type: 3} + - time: 0.43333334 + value: {fileID: 21300000, guid: 0a3bfa4764855014695c9c734bd910a5, type: 3} + - time: 0.46666667 + value: {fileID: 21300000, guid: 2c458ee8cd0fbbf4fa714059d5f3136d, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: b940cb8a87dbc2b4c9924fa949455cab, type: 3} + - time: 0.53333336 + value: {fileID: 21300000, guid: 36d7a8d875f6bec499f358447156b5fc, type: 3} + - time: 0.56666666 + value: {fileID: 21300000, guid: 5bc4e6fd2df715c46b166367924563d2, type: 3} + - time: 0.6 + value: {fileID: 21300000, guid: c7e105af68f080d408ff8dcfc71d976f, type: 3} + - time: 0.6333333 + value: {fileID: 21300000, guid: 55b7d14da52e94f40a7977ab1fd4678e, type: 3} + - time: 0.6666667 + value: {fileID: 21300000, guid: 75c23d1c7c70bb847b9946964aaf0825, type: 3} + - time: 0.7 + value: {fileID: 21300000, guid: cd5d447894330194aa31e955895c2404, type: 3} + - time: 0.73333335 + value: {fileID: 21300000, guid: 854bacb421a0cf0409b811ca82dc0b72, type: 3} + - time: 0.76666665 + value: {fileID: 21300000, guid: 36cb6f5bee0e9c64b8fd1b8d8fa3a779, type: 3} + - time: 0.8 + value: {fileID: 21300000, guid: e2eadf32de58de044a6101c5d48fb7d5, type: 3} + - time: 0.8333333 + value: {fileID: 21300000, guid: 2e67ec8e00de06747930191c34bec57b, type: 3} + - time: 0.8666667 + value: {fileID: 21300000, guid: d48d2bef2814aec4db2752ccf322c364, type: 3} + - time: 0.9 + value: {fileID: 21300000, guid: ee67da4db316077448ea9b6e1f5429b4, type: 3} + - time: 0.93333334 + value: {fileID: 21300000, guid: 3ece3017d2ee76f4d84987cb7e02ea37, type: 3} + - time: 0.96666664 + value: {fileID: 21300000, guid: 3ece3017d2ee76f4d84987cb7e02ea37, type: 3} + - time: 1 + value: {fileID: 21300000, guid: a74e1b80bec2c7a41b68c0a4e6a2085a, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: 3abf1705bc9d76244ad760412db78a65, type: 3} + - {fileID: 21300000, guid: f16737ca9f1dc29448765a816d0a1b49, type: 3} + - {fileID: 21300000, guid: 7a0de91dea9f59140bb693004bf0b0ad, type: 3} + - {fileID: 21300000, guid: 7c8bdf6129a84e141a690926a43cb384, type: 3} + - {fileID: 21300000, guid: 2a8146b76a8332e46b9c00f3cb2960e8, type: 3} + - {fileID: 21300000, guid: 2c9d2d33aa1cb054cb019c852a64b6d4, type: 3} + - {fileID: 21300000, guid: 6b805b3d02c25084780e70f6b6e7ab38, type: 3} + - {fileID: 21300000, guid: b53184e6a2932ee409a26e6838f16aae, type: 3} + - {fileID: 21300000, guid: 44fbfa5afc056fe459c80663e42e9ae4, type: 3} + - {fileID: 21300000, guid: 862eb60c627dd534cb832145605ac12d, type: 3} + - {fileID: 21300000, guid: 7a85663a637e4004e92472acad01c2b8, type: 3} + - {fileID: 21300000, guid: e800ef09025e509499b2916a88d7da82, type: 3} + - {fileID: 21300000, guid: 3dbc35981e1cf7b4e8e17794cc775b4d, type: 3} + - {fileID: 21300000, guid: 0a3bfa4764855014695c9c734bd910a5, type: 3} + - {fileID: 21300000, guid: 2c458ee8cd0fbbf4fa714059d5f3136d, type: 3} + - {fileID: 21300000, guid: b940cb8a87dbc2b4c9924fa949455cab, type: 3} + - {fileID: 21300000, guid: 36d7a8d875f6bec499f358447156b5fc, type: 3} + - {fileID: 21300000, guid: 5bc4e6fd2df715c46b166367924563d2, type: 3} + - {fileID: 21300000, guid: c7e105af68f080d408ff8dcfc71d976f, type: 3} + - {fileID: 21300000, guid: 55b7d14da52e94f40a7977ab1fd4678e, type: 3} + - {fileID: 21300000, guid: 75c23d1c7c70bb847b9946964aaf0825, type: 3} + - {fileID: 21300000, guid: cd5d447894330194aa31e955895c2404, type: 3} + - {fileID: 21300000, guid: 854bacb421a0cf0409b811ca82dc0b72, type: 3} + - {fileID: 21300000, guid: 36cb6f5bee0e9c64b8fd1b8d8fa3a779, type: 3} + - {fileID: 21300000, guid: e2eadf32de58de044a6101c5d48fb7d5, type: 3} + - {fileID: 21300000, guid: 2e67ec8e00de06747930191c34bec57b, type: 3} + - {fileID: 21300000, guid: d48d2bef2814aec4db2752ccf322c364, type: 3} + - {fileID: 21300000, guid: ee67da4db316077448ea9b6e1f5429b4, type: 3} + - {fileID: 21300000, guid: 3ece3017d2ee76f4d84987cb7e02ea37, type: 3} + - {fileID: 21300000, guid: 3ece3017d2ee76f4d84987cb7e02ea37, type: 3} + - {fileID: 21300000, guid: a74e1b80bec2c7a41b68c0a4e6a2085a, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 1.0166667 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 1 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Interactables/KeySpin.anim.meta b/Assets/Game Assets/Art/Animations/AnimationClips/Interactables/KeySpin.anim.meta new file mode 100644 index 0000000000..5264c78236 --- /dev/null +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Interactables/KeySpin.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f7e312bb1539c4594b952c6a414cda40 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Prefab/Key.prefab b/Assets/Game Assets/Prefab/Key.prefab new file mode 100644 index 0000000000..99cce0dfde --- /dev/null +++ b/Assets/Game Assets/Prefab/Key.prefab @@ -0,0 +1,167 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3247414073640957559 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4471653062095033656} + - component: {fileID: 57524540069546659} + - component: {fileID: 8859764443169284386} + - component: {fileID: 6051874608271823949} + - component: {fileID: 5050036714277477747} + m_Layer: 0 + m_Name: Key + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4471653062095033656 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3247414073640957559} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 15.36, y: 1.4, 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!212 &57524540069546659 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3247414073640957559} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 3abf1705bc9d76244ad760412db78a65, 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!95 &8859764443169284386 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3247414073640957559} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: c423fc03e8a8f4fceb4fd8feb5f95bb2, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!61 &6051874608271823949 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3247414073640957559} + 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: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0.0020551682, y: 0} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.45334625, y: 1} + m_EdgeRadius: 0 +--- !u!114 &5050036714277477747 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3247414073640957559} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a6c839f1c5525409e8898515033a2b33, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Game Assets/Prefab/Key.prefab.meta b/Assets/Game Assets/Prefab/Key.prefab.meta new file mode 100644 index 0000000000..f4bf7d6a6f --- /dev/null +++ b/Assets/Game Assets/Prefab/Key.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6fc4d51c0204541e3ab51a50b2dac1eb +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Prefab/Player.prefab b/Assets/Game Assets/Prefab/Player.prefab index 6ee52bf5a9..11b48775e2 100644 --- a/Assets/Game Assets/Prefab/Player.prefab +++ b/Assets/Game Assets/Prefab/Player.prefab @@ -197,6 +197,7 @@ MonoBehaviour: animator: {fileID: 5820244955174857028} rigidbody2D: {fileID: 7252644103890736809} jumpForce: 30 + scoreController: {fileID: 0} speed: 10 maxJumpHeight: 5 --- !u!1 &2534428795180559486 @@ -227,7 +228,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 1.24, z: -5} - m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3593540518909196710} diff --git a/Assets/Scenes/Level1.unity b/Assets/Scenes/Level1.unity index fcbe37b64e..dc0c667f05 100644 --- a/Assets/Scenes/Level1.unity +++ b/Assets/Scenes/Level1.unity @@ -474,6 +474,108 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 0.9457176} m_EdgeRadius: 0 +--- !u!1 &610196007 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 610196011} + - component: {fileID: 610196010} + - component: {fileID: 610196009} + - component: {fileID: 610196008} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &610196008 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 610196007} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &610196009 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 610196007} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &610196010 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 610196007} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &610196011 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 610196007} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1953530439} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &692167323 GameObject: m_ObjectHideFlags: 0 @@ -551,6 +653,74 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 +--- !u!1 &1054651008 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1054651011} + - component: {fileID: 1054651010} + - component: {fileID: 1054651009} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1054651009 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1054651008} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1054651010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1054651008} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1054651011 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1054651008} + serializedVersion: 2 + 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_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1139415633 GameObject: m_ObjectHideFlags: 0 @@ -565,7 +735,7 @@ GameObject: - component: {fileID: 1139415637} m_Layer: 0 m_Name: TileMap - m_TagString: Untagged + m_TagString: Platform m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1501,6 +1671,160 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1953530438 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1953530439} + - component: {fileID: 1953530441} + - component: {fileID: 1953530440} + - component: {fileID: 1953530442} + m_Layer: 5 + m_Name: ScoreLabel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1953530439 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1953530438} + 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_Children: [] + m_Father: {fileID: 610196011} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 210.9961, y: -46.431335} + m_SizeDelta: {x: 301.9923, y: 56.2627} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1953530440 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1953530438} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 'Score:' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: e85f1cf0bfd4d1447bed2bc737c47be7, type: 2} + m_sharedMaterial: {fileID: 21069318434546836, guid: e85f1cf0bfd4d1447bed2bc737c47be7, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 50 + m_fontSizeBase: 50 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1953530441 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1953530438} + m_CullTransparentMesh: 1 +--- !u!114 &1953530442 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1953530438} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9019b8104c79482aac1e8599f63d4fb8, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &2055596504 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + m_PrefabInstance: {fileID: 484190929103018125} + m_PrefabAsset: {fileID: 0} --- !u!1 &2107246407 GameObject: m_ObjectHideFlags: 0 @@ -1532,6 +1856,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1139415634} + - {fileID: 2055596504} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!156049354 &2107246409 @@ -1546,6 +1871,74 @@ Grid: m_CellGap: {x: 0, y: 0, z: 0} m_CellLayout: 0 m_CellSwizzle: 0 +--- !u!1001 &484190929103018125 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2107246408} + m_Modifications: + - target: {fileID: 3247414073640957559, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_Name + value: Key + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalPosition.x + value: 15.36 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.4 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, type: 3} --- !u!1001 &2101336368777957266 PrefabInstance: m_ObjectHideFlags: 0 @@ -1562,7 +1955,7 @@ PrefabInstance: - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 1.86 objectReference: {fileID: 0} - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, type: 3} @@ -1609,6 +2002,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 7015224702095746497, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: scoreController + value: + objectReference: {fileID: 1953530442} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -1625,3 +2023,5 @@ SceneRoots: - {fileID: 1275231957} - {fileID: 2107246408} - {fileID: 1412279564} + - {fileID: 610196011} + - {fileID: 1054651011} diff --git a/Assets/Scripts/KeyController.cs b/Assets/Scripts/KeyController.cs new file mode 100644 index 0000000000..4e35cc00cd --- /dev/null +++ b/Assets/Scripts/KeyController.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class KeyController : MonoBehaviour +{ + private void OnCollisionEnter2D(Collision2D other) + { + if (other.gameObject.CompareTag("Player") && other.gameObject.GetComponent() != null) + { + var playerController = other.gameObject.GetComponent(); + playerController.PickUpKey(); + Destroy(gameObject); + } + } +} diff --git a/Assets/Scripts/KeyController.cs.meta b/Assets/Scripts/KeyController.cs.meta new file mode 100644 index 0000000000..74761511ae --- /dev/null +++ b/Assets/Scripts/KeyController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: a6c839f1c5525409e8898515033a2b33 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index abfc34061c..53fddbe70a 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -9,11 +9,12 @@ public class PlayerController : MonoBehaviour [SerializeField] private Animator animator; [SerializeField] private Rigidbody2D rigidbody2D; [SerializeField] private float jumpForce; - + [SerializeField] private ScoreController scoreController; [SerializeField] private float speed; private bool isCrouching = false; - private bool isGrounded => Math.Abs(rigidbody2D.velocity.y) < 0.001f; + private bool isGrounded = false; + // private bool isGrounded => Math.Abs(rigidbody2D.velocity.y) < 0.001f; private bool midAir = false; [SerializeField] private float maxJumpHeight = 2f; private float currentPlatformHeight = 0f; @@ -32,6 +33,28 @@ void Update() CheckIfPlayerFell(); } + private void OnCollisionStay2D(Collision2D other) + { + if (other.gameObject.CompareTag("Platform")) + { + isGrounded = true; + } + } + + private void OnCollisionExit2D(Collision2D other) + { + if (other.gameObject.CompareTag("Platform")) + { + isGrounded = false; + } + } + + public void PickUpKey() + { + Debug.Log("Picked up key"); + scoreController.AddScore(10); + } + private void CheckIfPlayerFell() { if (transform.position.y < currentPlatformHeight - 10) diff --git a/Assets/Scripts/ScoreController.cs b/Assets/Scripts/ScoreController.cs new file mode 100644 index 0000000000..5b07e18fc2 --- /dev/null +++ b/Assets/Scripts/ScoreController.cs @@ -0,0 +1,26 @@ +using System; +using TMPro; +using UnityEngine; + +public class ScoreController : MonoBehaviour +{ + private TextMeshProUGUI scoreText; + private int score = 0; + + private void Awake() + { + scoreText = GetComponent(); + UpdateUI(); + } + + private void UpdateUI() + { + scoreText.text = string.Format("Score: {0}", score); + } + + public void AddScore(int scoreToAdd) + { + score += scoreToAdd; + UpdateUI(); + } +} \ No newline at end of file diff --git a/Assets/Scripts/ScoreController.cs.meta b/Assets/Scripts/ScoreController.cs.meta new file mode 100644 index 0000000000..845b734ef0 --- /dev/null +++ b/Assets/Scripts/ScoreController.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 9019b8104c79482aac1e8599f63d4fb8 +timeCreated: 1705576155 \ No newline at end of file diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 7b4c964862..05825831c7 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -3,7 +3,8 @@ --- !u!78 &1 TagManager: serializedVersion: 2 - tags: [] + tags: + - Platform layers: - Default - TransparentFX diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index da9b67f436..e1c07939b1 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -14,7 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 3} - - {fileID: 15} + - {fileID: 14} m_Position: serializedVersion: 2 x: 0 @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 14696 + controlID: 22279 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -150,7 +150,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 14697 + controlID: 22280 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -175,7 +175,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 14698 + controlID: 22086 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -240,25 +240,25 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: c07c0000e85f0000 + m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 4875ffff10fbffff12fbffff + m_ExpandedIDs: 3c47ffff025cffff045cffff3a63ffff4875ffff10fbffff12fbffff7c840000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: TileMap + m_OriginalName: TileMap m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: 33886 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 5} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -652,16 +652,16 @@ MonoBehaviour: layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 + - dockPosition: 0 + containerId: Floating + floating: 1 collapsed: 0 displayed: 1 - snapOffset: {x: 0, y: 25} + snapOffset: {x: 20.5, y: 259.5} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: UnityEditor.SceneViewCameraOverlay - index: 11 + index: 0 layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 @@ -682,7 +682,7 @@ MonoBehaviour: containerId: overlay-container--right floating: 0 collapsed: 0 - displayed: 1 + displayed: 0 snapOffset: {x: 48, y: 48} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 @@ -702,9 +702,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 40.236546, y: -1.6232038, z: 0.49407825} + m_Target: {x: 5.6860123, y: -1.5798638, z: -8.297903} speed: 2 - m_Value: {x: 40.236546, y: -1.6232038, z: 0.49407825} + m_Value: {x: 5.6860123, y: -1.5798638, z: -8.297903} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -754,9 +754,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 1.2992802 + m_Target: 2.9035587 speed: 2 - m_Value: 1.2992802 + m_Value: 2.9035587 m_Ortho: m_Target: 1 speed: 2 @@ -774,7 +774,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} + m_LastSceneViewRotation: {x: -0.19618315, y: 0.49484262, z: -0.11576471, w: -0.8385956} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -791,7 +791,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: AnimatorControllerTool m_EditorClassIdentifier: m_Children: [] m_Position: @@ -800,17 +800,16 @@ MonoBehaviour: y: 419.5 width: 993.5 height: 359.5 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 10} + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 12} m_Panes: - {fileID: 10} - {fileID: 11} - {fileID: 12} - {fileID: 13} - - {fileID: 14} - m_Selected: 0 - m_LastSelected: 4 + m_Selected: 2 + m_LastSelected: 2 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -847,7 +846,7 @@ MonoBehaviour: m_SaveData: [] m_OverlaysVisible: 1 m_SearchFilter: - m_NameFilter: level + m_NameFilter: m_ClassNames: [] m_AssetLabels: [] m_AssetBundleNames: [] @@ -857,24 +856,24 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Jump m_Globs: [] - m_OriginalText: level + m_OriginalText: m_ImportLogFlags: 0 m_FilterByTypeIntersection: 0 m_ViewMode: 1 m_StartGridSize: 96 m_LastFolders: - - Assets/Scripts + - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Jump m_LastFoldersGridSize: 96 m_LastProjectPath: /Users/zain/2D-Platformer-Game m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 79} - m_SelectedIDs: ee5c0000 - m_LastClickedID: 23790 - m_ExpandedIDs: 00000000c85c000000ca9a3bffffff7f + scrollPos: {x: 0, y: 129.5} + m_SelectedIDs: fc710000 + m_LastClickedID: 29180 + m_ExpandedIDs: 000000009e540000c85c0000e85c0000165d00001e5d0000a65e0000ce75000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -927,10 +926,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: c07c0000e85f0000 - m_LastClickedInstanceID: 31936 + m_SelectedInstanceIDs: 30700000 + m_LastClickedInstanceID: 28720 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000d87c0000e67c00001882000092a80000f2ac00005e7f00002cb900006c9f000034ba000036bb00009a7f0000947e00002a580100a85c0100667f0000b88700004a7e00005a7c0000fe7d00001aa00000687f00006a7f0000189f0000f87f00005c530400369e0000e88a0000e48a00006e5b00000000000012700000 + m_ExpandedInstanceIDs: c6230000d87c0000e67c00001882000092a80000f2ac00005e7f00002cb900006c9f000034ba000036bb00009a7f0000947e00002a580100a85c0100667f0000b88700004a7e00005a7c0000fe7d00001aa00000687f00006a7f0000189f0000f87f00005c530400369e0000e88a0000e48a00006e5b000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -946,7 +945,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 9} + m_ClientGUIView: {fileID: 0} m_CreateAssetUtility: m_EndAction: {fileID: 0} m_InstanceID: 0 @@ -954,7 +953,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} + m_ScrollPosition: {x: 0, y: 108.5} m_GridSize: 96 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 @@ -980,9 +979,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 532.5 - width: 915.5 - height: 320.5 + y: 514.5 + width: 992.5 + height: 338.5 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1015,9 +1014,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 371.5 + y: 514.5 width: 992.5 - height: 481.5 + height: 338.5 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1036,6 +1035,7 @@ MonoBehaviour: - {fileID: 1107150604400011336, guid: e6d811e1f6dfcd247ac0fa75186762b9, type: 2} - {fileID: 1107352176486139556, guid: 6408c3077d4204944a6451f38cd1f7e5, type: 2} - {fileID: -4154430246438009678, guid: 5a5995370fc954e219729b95b7be89cd, type: 2} + - {fileID: -3929752780267098213, guid: c423fc03e8a8f4fceb4fd8feb5f95bb2, type: 2} m_ValueSerializationHelper: - e00: 0.992175 e01: 0 @@ -1124,7 +1124,23 @@ MonoBehaviour: e10: 0 e11: 0.62402505 e12: 0 - e13: 39.253586 + e13: 39.253593 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 e20: 0 e21: 0 e22: 1 @@ -1152,40 +1168,6 @@ MonoBehaviour: m_LayerEditor: m_SelectedLayerIndex: 0 --- !u!114 &13 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3f683d99f24875748a6656966ca9cea0, type: 3} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 240, y: 200} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Tile Palette - m_Image: {fileID: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 532.5 - width: 992.5 - height: 320.5 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 ---- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1207,9 +1189,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 371.5 + y: 514.5 width: 992.5 - height: 481.5 + height: 338.5 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1222,8 +1204,8 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -35356 ---- !u!114 &15 + m_LastSelectedObjectID: -41982 +--- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1244,13 +1226,13 @@ MonoBehaviour: height: 779 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 16} + m_ActualView: {fileID: 15} m_Panes: + - {fileID: 15} - {fileID: 16} - - {fileID: 17} m_Selected: 0 m_LastSelected: 0 ---- !u!114 &16 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1288,7 +1270,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 347 + m_CachedPref: 151 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 @@ -1298,7 +1280,7 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_PreviewWindow: {fileID: 0} ---- !u!114 &17 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} From eb7dbc5c5669038cdefbafb0186450bd9890e439 Mon Sep 17 00:00:00 2001 From: Syed zainul abedin Date: Thu, 18 Jan 2024 17:28:50 +0530 Subject: [PATCH 13/26] feat: Added enemy logic --- Assets/Scenes/Level1.unity | 166 ++++++++++++++++++ Assets/Scripts/EnemyController.cs | 17 ++ Assets/Scripts/EnemyController.cs.meta | 11 ++ Assets/Scripts/PlayerController.cs | 5 + .../Layouts/CurrentMaximizeLayout.dwlt | 77 ++++---- 5 files changed, 246 insertions(+), 30 deletions(-) create mode 100644 Assets/Scripts/EnemyController.cs create mode 100644 Assets/Scripts/EnemyController.cs.meta diff --git a/Assets/Scenes/Level1.unity b/Assets/Scenes/Level1.unity index dc0c667f05..a478c46ef4 100644 --- a/Assets/Scenes/Level1.unity +++ b/Assets/Scenes/Level1.unity @@ -344,6 +344,171 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9451ad9a7bb543c0b34f61f62d85e38, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &188380160 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 188380161} + - component: {fileID: 188380163} + - component: {fileID: 188380162} + - component: {fileID: 188380164} + - component: {fileID: 188380165} + m_Layer: 0 + m_Name: Chomper + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &188380161 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 188380160} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 21.93, y: -2.4, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2107246408} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &188380162 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 188380160} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 379fc8d7910868541878c8a34170d498, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!212 &188380163 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 188380160} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 26aea5a92fc76f648bb6522f06a0af58, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.3333333, y: 2.22} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!61 &188380164 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 188380160} + 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: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.021529794, y: 0.61958945} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.25} + oldSize: {x: 3.3333333, y: 2.22} + newSize: {x: 3.3333333, y: 2.22} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.6109488, y: 1.3157482} + m_EdgeRadius: 0 +--- !u!114 &188380165 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 188380160} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 742e3e9b0921d46d2af0417e4bee7886, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &282281674 GameObject: m_ObjectHideFlags: 0 @@ -1857,6 +2022,7 @@ Transform: m_Children: - {fileID: 1139415634} - {fileID: 2055596504} + - {fileID: 188380161} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!156049354 &2107246409 diff --git a/Assets/Scripts/EnemyController.cs b/Assets/Scripts/EnemyController.cs new file mode 100644 index 0000000000..fe8011e6fc --- /dev/null +++ b/Assets/Scripts/EnemyController.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class EnemyController : MonoBehaviour +{ + private void OnCollisionEnter2D(Collision2D other) + { + if (other.gameObject.CompareTag("Player") && other.gameObject.GetComponent() != null) + { + Debug.Log("Player hit enemy"); + var playerController = other.gameObject.GetComponent(); + playerController.Die(); + } + } +} diff --git a/Assets/Scripts/EnemyController.cs.meta b/Assets/Scripts/EnemyController.cs.meta new file mode 100644 index 0000000000..b31d538def --- /dev/null +++ b/Assets/Scripts/EnemyController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 742e3e9b0921d46d2af0417e4bee7886 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 53fddbe70a..3bf1656f44 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -109,4 +109,9 @@ private void Jump() { rigidbody2D.AddForce(new Vector2(0, jumpForce), ForceMode2D.Force); } + + public void Die() + { + SceneManager.LoadScene(SceneManager.GetActiveScene().name); + } } diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index e1c07939b1..36c7f72216 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 22279 + controlID: 29236 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -150,7 +150,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 22280 + controlID: 29237 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -175,7 +175,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 22086 + controlID: 29238 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -240,23 +240,23 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 9e9c0000 m_LastClickedID: 0 m_ExpandedIDs: 3c47ffff025cffff045cffff3a63ffff4875ffff10fbffff12fbffff7c840000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: TileMap - m_OriginalName: TileMap + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 33886 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 5} m_SearchString: @@ -702,9 +702,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 5.6860123, y: -1.5798638, z: -8.297903} + m_Target: {x: 21.67264, y: -2.5276625, z: 0.003354432} speed: 2 - m_Value: {x: 5.6860123, y: -1.5798638, z: -8.297903} + m_Value: {x: 21.67264, y: -2.5276625, z: 0.003354432} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -754,9 +754,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 2.9035587 + m_Target: 1.6695215 speed: 2 - m_Value: 2.9035587 + m_Value: 1.6695215 m_Ortho: m_Target: 1 speed: 2 @@ -774,7 +774,7 @@ MonoBehaviour: m_FarClip: 10000 m_DynamicClip: 1 m_OcclusionCulling: 0 - m_LastSceneViewRotation: {x: -0.19618315, y: 0.49484262, z: -0.11576471, w: -0.8385956} + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226} m_LastSceneViewOrtho: 0 m_ReplacementShader: {fileID: 0} m_ReplacementString: @@ -791,7 +791,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AnimatorControllerTool + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: @@ -800,15 +800,15 @@ MonoBehaviour: y: 419.5 width: 993.5 height: 359.5 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 12} + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 10} m_Panes: - {fileID: 10} - {fileID: 11} - {fileID: 12} - {fileID: 13} - m_Selected: 2 + m_Selected: 0 m_LastSelected: 2 --- !u!114 &10 MonoBehaviour: @@ -856,7 +856,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Jump + - Assets/Scripts m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -864,16 +864,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 96 m_LastFolders: - - Assets/Game Assets/Art/Sprites/AnimatedSprites/Ellen/Animations/Jump + - Assets/Scripts m_LastFoldersGridSize: 96 m_LastProjectPath: /Users/zain/2D-Platformer-Game m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 129.5} - m_SelectedIDs: fc710000 - m_LastClickedID: 29180 - m_ExpandedIDs: 000000009e540000c85c0000e85c0000165d00001e5d0000a65e0000ce75000000ca9a3bffffff7f + scrollPos: {x: 0, y: 529.5} + m_SelectedIDs: ee5c0000 + m_LastClickedID: 23790 + m_ExpandedIDs: 000000009e54000046560000c85c0000e85c0000165d00001e5d0000a65e0000ce750000d075000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -926,8 +926,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 30700000 - m_LastClickedInstanceID: 28720 + m_SelectedInstanceIDs: 9e9c0000 + m_LastClickedInstanceID: 40094 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000d87c0000e67c00001882000092a80000f2ac00005e7f00002cb900006c9f000034ba000036bb00009a7f0000947e00002a580100a85c0100667f0000b88700004a7e00005a7c0000fe7d00001aa00000687f00006a7f0000189f0000f87f00005c530400369e0000e88a0000e48a00006e5b000000000000 m_RenameOverlay: @@ -953,7 +953,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 108.5} + m_ScrollPosition: {x: 0, y: 0} m_GridSize: 96 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 @@ -1036,6 +1036,7 @@ MonoBehaviour: - {fileID: 1107352176486139556, guid: 6408c3077d4204944a6451f38cd1f7e5, type: 2} - {fileID: -4154430246438009678, guid: 5a5995370fc954e219729b95b7be89cd, type: 2} - {fileID: -3929752780267098213, guid: c423fc03e8a8f4fceb4fd8feb5f95bb2, type: 2} + - {fileID: 1107865927472116046, guid: 379fc8d7910868541878c8a34170d498, type: 2} m_ValueSerializationHelper: - e00: 0.992175 e01: 0 @@ -1149,11 +1150,27 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 + - e00: 0.46365264 + e01: 0 + e02: 0 + e03: 94.49401 + e10: 0 + e11: 0.46365264 + e12: 0 + e13: 58.941097 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 5a5995370fc954e219729b95b7be89cd, + m_AnimatorController: {fileID: 9100000, guid: 379fc8d7910868541878c8a34170d498, type: 2} m_BreadCrumbs: - - m_Target: {fileID: -4154430246438009678, guid: 5a5995370fc954e219729b95b7be89cd, + - m_Target: {fileID: 1107865927472116046, guid: 379fc8d7910868541878c8a34170d498, type: 2} m_ScrollPosition: {x: 0, y: 0} stateMachineGraph: {fileID: 0} @@ -1204,7 +1221,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -41982 + m_LastSelectedObjectID: -77854 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 From d197c00a6915e1cd60644fd1acea744d2cb5ce3f Mon Sep 17 00:00:00 2001 From: Syed zainul abedin Date: Thu, 18 Jan 2024 17:48:31 +0530 Subject: [PATCH 14/26] feat: Enemy patrols over a range --- .../Animators/Enemies/Chomper.controller | 196 ++++++++++-------- Assets/Scenes/Level1.unity | 3 + Assets/Scripts/EnemyController.cs | 32 +++ Assets/Scripts/PlayerController.cs | 17 +- .../Layouts/CurrentMaximizeLayout.dwlt | 54 ++--- 5 files changed, 187 insertions(+), 115 deletions(-) diff --git a/Assets/Game Assets/Art/Animations/Animators/Enemies/Chomper.controller b/Assets/Game Assets/Art/Animations/Animators/Enemies/Chomper.controller index 3bb8e6ff14..a947872b7c 100644 --- a/Assets/Game Assets/Art/Animations/Animators/Enemies/Chomper.controller +++ b/Assets/Game Assets/Art/Animations/Animators/Enemies/Chomper.controller @@ -3,8 +3,9 @@ --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Chomper serializedVersion: 5 m_AnimatorParameters: @@ -13,37 +14,37 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Spotted m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: TargetLost m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Death m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Hit m_Type: 9 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Grounded m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_DefaultBool: 1 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -60,8 +61,9 @@ AnimatorController: --- !u!114 &114122343716302974 MonoBehaviour: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -77,8 +79,9 @@ MonoBehaviour: --- !u!114 &114304316251376358 MonoBehaviour: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -94,8 +97,9 @@ MonoBehaviour: --- !u!114 &114341740280602290 MonoBehaviour: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -105,8 +109,9 @@ MonoBehaviour: --- !u!114 &114363742347091314 MonoBehaviour: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -116,8 +121,9 @@ MonoBehaviour: --- !u!114 &114852316690344710 MonoBehaviour: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -127,8 +133,9 @@ MonoBehaviour: --- !u!114 &114966190878069938 MonoBehaviour: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 @@ -138,8 +145,9 @@ MonoBehaviour: --- !u!1101 &1101174263859480886 AnimatorStateTransition: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - m_ConditionMode: 1 @@ -162,8 +170,9 @@ AnimatorStateTransition: --- !u!1101 &1101248647474982280 AnimatorStateTransition: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: [] m_DstStateMachine: {fileID: 0} @@ -183,8 +192,9 @@ AnimatorStateTransition: --- !u!1101 &1101281110530383118 AnimatorStateTransition: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: [] m_DstStateMachine: {fileID: 0} @@ -204,8 +214,9 @@ AnimatorStateTransition: --- !u!1101 &1101282056755073286 AnimatorStateTransition: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - m_ConditionMode: 2 @@ -228,8 +239,9 @@ AnimatorStateTransition: --- !u!1101 &1101523337151686366 AnimatorStateTransition: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: [] m_DstStateMachine: {fileID: 0} @@ -249,8 +261,9 @@ AnimatorStateTransition: --- !u!1101 &1101572793305271000 AnimatorStateTransition: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - m_ConditionMode: 2 @@ -273,8 +286,9 @@ AnimatorStateTransition: --- !u!1101 &1101589293867834160 AnimatorStateTransition: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - m_ConditionMode: 1 @@ -297,8 +311,9 @@ AnimatorStateTransition: --- !u!1101 &1101696208423308026 AnimatorStateTransition: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - m_ConditionMode: 1 @@ -321,8 +336,9 @@ AnimatorStateTransition: --- !u!1101 &1101735762501846964 AnimatorStateTransition: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - m_ConditionMode: 1 @@ -345,8 +361,9 @@ AnimatorStateTransition: --- !u!1101 &1101751877177550120 AnimatorStateTransition: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - m_ConditionMode: 2 @@ -369,8 +386,9 @@ AnimatorStateTransition: --- !u!1101 &1101785865238516086 AnimatorStateTransition: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - m_ConditionMode: 1 @@ -393,8 +411,9 @@ AnimatorStateTransition: --- !u!1101 &1101853609862255280 AnimatorStateTransition: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - m_ConditionMode: 1 @@ -417,8 +436,9 @@ AnimatorStateTransition: --- !u!1101 &1101907618892691282 AnimatorStateTransition: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - m_ConditionMode: 2 @@ -441,8 +461,9 @@ AnimatorStateTransition: --- !u!1101 &1101936029043036306 AnimatorStateTransition: m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: [] m_DstStateMachine: {fileID: 0} @@ -461,10 +482,11 @@ AnimatorStateTransition: m_CanTransitionToSelf: 1 --- !u!1102 &1102272782851722176 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: ChomperHit m_Speed: 1 m_CycleOffset: 0 @@ -487,10 +509,11 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102425393613339190 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Falling m_Speed: 1 m_CycleOffset: 0 @@ -513,18 +536,18 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102547917608442718 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: ChomperWalk m_Speed: 1 m_CycleOffset: 0 m_Transitions: - {fileID: 1101174263859480886} - {fileID: 1101282056755073286} - m_StateMachineBehaviours: - - {fileID: 114341740280602290} + m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 m_WriteDefaultValues: 1 @@ -541,18 +564,17 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102584966912405672 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: ChomperDeath m_Speed: 1 m_CycleOffset: 0 m_Transitions: - {fileID: 1101281110530383118} - m_StateMachineBehaviours: - - {fileID: 114966190878069938} - - {fileID: 114304316251376358} + m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 m_WriteDefaultValues: 1 @@ -569,10 +591,11 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102594043898834812 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: ChomperIdle m_Speed: 1 m_CycleOffset: 0 @@ -596,10 +619,11 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102635609596054508 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: ChomperRun m_Speed: 1 m_CycleOffset: 0 @@ -607,8 +631,7 @@ AnimatorState: - {fileID: 1101589293867834160} - {fileID: 1101735762501846964} - {fileID: 1101572793305271000} - m_StateMachineBehaviours: - - {fileID: 114852316690344710} + m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 m_WriteDefaultValues: 1 @@ -625,19 +648,18 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102642398570009708 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: ChomperAttack m_Speed: 1 m_CycleOffset: 0 m_Transitions: - {fileID: 1101936029043036306} - {fileID: 1101907618892691282} - m_StateMachineBehaviours: - - {fileID: 114363742347091314} - - {fileID: 114122343716302974} + m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 m_WriteDefaultValues: 1 @@ -654,10 +676,11 @@ AnimatorState: m_TimeParameter: --- !u!1102 &1102847061698364178 AnimatorState: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: PostDeath m_Speed: 1 m_CycleOffset: 0 @@ -679,10 +702,11 @@ AnimatorState: m_TimeParameter: --- !u!1107 &1107865927472116046 AnimatorStateMachine: - serializedVersion: 5 + serializedVersion: 6 m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: Base Layer m_ChildStates: - serializedVersion: 1 diff --git a/Assets/Scenes/Level1.unity b/Assets/Scenes/Level1.unity index a478c46ef4..cc26b8d766 100644 --- a/Assets/Scenes/Level1.unity +++ b/Assets/Scenes/Level1.unity @@ -509,6 +509,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 742e3e9b0921d46d2af0417e4bee7886, type: 3} m_Name: m_EditorClassIdentifier: + animator: {fileID: 188380162} + patrolSpeed: 3 + patrolDistance: 3 --- !u!1 &282281674 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/EnemyController.cs b/Assets/Scripts/EnemyController.cs index fe8011e6fc..b41bf8ff3f 100644 --- a/Assets/Scripts/EnemyController.cs +++ b/Assets/Scripts/EnemyController.cs @@ -5,6 +5,22 @@ public class EnemyController : MonoBehaviour { + [SerializeField] private Animator animator; + [SerializeField] private float patrolSpeed = 3f; + [SerializeField] private float patrolDistance = 3f; + + private Vector3 initialPosition; + private Vector3 direction = Vector3.right; + private void Start() + { + initialPosition = transform.position; + } + + private void Update() + { + Patrol(); + } + private void OnCollisionEnter2D(Collision2D other) { if (other.gameObject.CompareTag("Player") && other.gameObject.GetComponent() != null) @@ -14,4 +30,20 @@ private void OnCollisionEnter2D(Collision2D other) playerController.Die(); } } + + private void Flip() + { + direction = -direction; + transform.Rotate(0f, 180f, 0f); + } + + private void Patrol() + { + var distance = Vector3.Distance(transform.position, initialPosition); + if (distance > patrolDistance) + { + Flip(); + } + transform.position += direction * (patrolSpeed * Time.deltaTime); + } } diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 3bf1656f44..1877dbf224 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -63,11 +63,24 @@ private void CheckIfPlayerFell() } } + private void Flip() + { + var scale = Math.Abs(transform.localScale.x); + transform.localScale = new Vector3(- scale, transform.localScale.y, transform.localScale.z); + } + private void PlayerAnimation(float horizontal, float vertical) { bool isFlipped = horizontal < 0; - float x = (isFlipped ? -1 : 1) * Mathf.Abs(transform.localScale.x); - transform.localScale = new Vector3(x, transform.localScale.y, transform.localScale.z); + if (horizontal < 0) + { + Flip(); + } + else if (horizontal > 0) + { + var scale = Math.Abs(transform.localScale.x); + transform.localScale = new Vector3(scale, transform.localScale.y, transform.localScale.z); + } animator.SetFloat("Speed", Mathf.Abs(horizontal)); if ((Input.GetKeyDown(KeyCode.LeftControl) || Input.GetKeyDown(KeyCode.RightControl)) && speed == 0) { diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 36c7f72216..57acf679fd 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 29236 + controlID: 30102 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -150,7 +150,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 29237 + controlID: 30103 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -175,7 +175,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 29238 + controlID: 30104 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -240,23 +240,23 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 9e9c0000 - m_LastClickedID: 0 + m_SelectedIDs: e2cffeff + m_LastClickedID: -77854 m_ExpandedIDs: 3c47ffff025cffff045cffff3a63ffff4875ffff10fbffff12fbffff7c840000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Chomper + m_OriginalName: Chomper m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: -77854 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 5} m_SearchString: @@ -702,9 +702,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 21.67264, y: -2.5276625, z: 0.003354432} + m_Target: {x: 24.699179, y: -1.1560998, z: -0.074381225} speed: 2 - m_Value: {x: 21.67264, y: -2.5276625, z: 0.003354432} + m_Value: {x: 24.630823, y: -1.1651876, z: -0.073400006} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -754,9 +754,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 1.6695215 + m_Target: 9.443085 speed: 2 - m_Value: 1.6695215 + m_Value: 9.344963 m_Ortho: m_Target: 1 speed: 2 @@ -791,7 +791,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: @@ -800,15 +800,15 @@ MonoBehaviour: y: 419.5 width: 993.5 height: 359.5 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 10} + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 11} m_Panes: - {fileID: 10} - {fileID: 11} - {fileID: 12} - {fileID: 13} - m_Selected: 0 + m_Selected: 1 m_LastSelected: 2 --- !u!114 &10 MonoBehaviour: @@ -870,10 +870,10 @@ MonoBehaviour: m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 529.5} + scrollPos: {x: 0, y: 133.5} m_SelectedIDs: ee5c0000 m_LastClickedID: 23790 - m_ExpandedIDs: 000000009e54000046560000c85c0000e85c0000165d00001e5d0000a65e0000ce750000d075000000ca9a3bffffff7f + m_ExpandedIDs: 00000000c85c000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -926,9 +926,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 9e9c0000 - m_LastClickedInstanceID: 40094 - m_HadKeyboardFocusLastEvent: 1 + m_SelectedInstanceIDs: e2cffeff + m_LastClickedInstanceID: -77854 + m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000d87c0000e67c00001882000092a80000f2ac00005e7f00002cb900006c9f000034ba000036bb00009a7f0000947e00002a580100a85c0100667f0000b88700004a7e00005a7c0000fe7d00001aa00000687f00006a7f0000189f0000f87f00005c530400369e0000e88a0000e48a00006e5b000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -1150,14 +1150,14 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 0.46365264 + - e00: 0.8342552 e01: 0 e02: 0 - e03: 94.49401 + e03: 73.556885 e10: 0 - e11: 0.46365264 + e11: 0.8342552 e12: 0 - e13: 58.941097 + e13: -27.764557 e20: 0 e21: 0 e22: 1 From 37ad2c9832e265f8811fa4ebf763985e3fa2df5b Mon Sep 17 00:00:00 2001 From: Syed zainul abedin Date: Fri, 19 Jan 2024 00:06:57 +0530 Subject: [PATCH 15/26] feat: Added health system --- Assets/Scenes/Level1.unity | 339 +++++++++++ Assets/Scripts/EnemyController.cs | 2 +- Assets/Scripts/HealthController.cs | 47 ++ Assets/Scripts/HealthController.cs.meta | 11 + Assets/Scripts/PlayerController.cs | 8 +- .../Layouts/CurrentMaximizeLayout.dwlt | 76 +-- UserSettings/Layouts/default-2022.dwlt | 538 ++++++++++-------- 7 files changed, 726 insertions(+), 295 deletions(-) create mode 100644 Assets/Scripts/HealthController.cs create mode 100644 Assets/Scripts/HealthController.cs.meta diff --git a/Assets/Scenes/Level1.unity b/Assets/Scenes/Level1.unity index cc26b8d766..6db4f8ebab 100644 --- a/Assets/Scenes/Level1.unity +++ b/Assets/Scenes/Level1.unity @@ -737,6 +737,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1953530439} + - {fileID: 1333002890} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -821,6 +822,81 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 +--- !u!1 &788738932 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 788738933} + - component: {fileID: 788738935} + - component: {fileID: 788738934} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &788738933 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 788738932} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1333002890} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &788738934 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 788738932} + 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: 21300010, guid: fc49794cc535bef4f969645c4eb97b80, 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 &788738935 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 788738932} + m_CullTransparentMesh: 1 --- !u!1 &1054651008 GameObject: m_ObjectHideFlags: 0 @@ -1546,6 +1622,81 @@ TilemapCollider2D: m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0 m_UseDelaunayMesh: 0 +--- !u!1 &1248432746 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1248432747} + - component: {fileID: 1248432749} + - component: {fileID: 1248432748} + m_Layer: 5 + m_Name: Image (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1248432747 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1248432746} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1333002890} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1248432748 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1248432746} + 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: 21300010, guid: fc49794cc535bef4f969645c4eb97b80, 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 &1248432749 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1248432746} + m_CullTransparentMesh: 1 --- !u!1 &1275231954 GameObject: m_ObjectHideFlags: 0 @@ -1676,6 +1827,99 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1333002889 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1333002890} + - component: {fileID: 1333002892} + - component: {fileID: 1333002893} + - component: {fileID: 1333002894} + m_Layer: 5 + m_Name: Hearts + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1333002890 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1333002889} + 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_Children: + - {fileID: 788738933} + - {fileID: 1631414845} + - {fileID: 1248432747} + m_Father: {fileID: 610196011} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 112, y: -140} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1333002892 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1333002889} + m_CullTransparentMesh: 1 +--- !u!114 &1333002893 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1333002889} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &1333002894 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1333002889} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 577e533071be5486eb82a54c36065088, type: 3} + m_Name: + m_EditorClassIdentifier: + hearts: + - {fileID: 1248432748} + - {fileID: 1631414846} + - {fileID: 788738934} + fullHeart: {fileID: 21300010, guid: fc49794cc535bef4f969645c4eb97b80, type: 3} + emptyHeart: {fileID: 21300000, guid: fc49794cc535bef4f969645c4eb97b80, type: 3} --- !u!1 &1412279563 GameObject: m_ObjectHideFlags: 0 @@ -1709,6 +1953,81 @@ Transform: - {fileID: 49351569} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1631414844 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1631414845} + - component: {fileID: 1631414847} + - component: {fileID: 1631414846} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1631414845 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631414844} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1333002890} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1631414846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631414844} + 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: 21300010, guid: fc49794cc535bef4f969645c4eb97b80, 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 &1631414847 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631414844} + m_CullTransparentMesh: 1 --- !u!1 &1857259668 GameObject: m_ObjectHideFlags: 0 @@ -2176,6 +2495,26 @@ PrefabInstance: propertyPath: scoreController value: objectReference: {fileID: 1953530442} + - target: {fileID: 7015224702095746497, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: healthController + value: + objectReference: {fileID: 1333002894} + - target: {fileID: 7851594371880949575, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_BackGroundColor.b + value: 0.03773582 + objectReference: {fileID: 0} + - target: {fileID: 7851594371880949575, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_BackGroundColor.g + value: 0.03773582 + objectReference: {fileID: 0} + - target: {fileID: 7851594371880949575, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_BackGroundColor.r + value: 0.03773582 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scripts/EnemyController.cs b/Assets/Scripts/EnemyController.cs index b41bf8ff3f..999dc8aa58 100644 --- a/Assets/Scripts/EnemyController.cs +++ b/Assets/Scripts/EnemyController.cs @@ -27,7 +27,7 @@ private void OnCollisionEnter2D(Collision2D other) { Debug.Log("Player hit enemy"); var playerController = other.gameObject.GetComponent(); - playerController.Die(); + playerController.TakeDamage(); } } diff --git a/Assets/Scripts/HealthController.cs b/Assets/Scripts/HealthController.cs new file mode 100644 index 0000000000..31e15ea380 --- /dev/null +++ b/Assets/Scripts/HealthController.cs @@ -0,0 +1,47 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; +using UnityEngine.UI; + +public class HealthController : MonoBehaviour +{ + [SerializeField] List hearts; + [SerializeField] Sprite fullHeart; + [SerializeField] Sprite emptyHeart; + private float health = 3; + private void Start() + { + UpdateHealth(hearts.Count); + } + + public void TakeDamage(int damage) + { + health -= damage; + UpdateHealth((int)health); + if (health <= 0) + { + Die(); + } + } + + public void Die() + { + SceneManager.LoadScene(SceneManager.GetActiveScene().name); + } + + public void UpdateHealth(int health) + { + for (int i = 0; i < hearts.Count; i++) + { + if (i < health) + { + hearts[i].sprite = fullHeart; + } + else + { + hearts[i].sprite = emptyHeart; + } + } + } +} diff --git a/Assets/Scripts/HealthController.cs.meta b/Assets/Scripts/HealthController.cs.meta new file mode 100644 index 0000000000..bd9dbb2429 --- /dev/null +++ b/Assets/Scripts/HealthController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 577e533071be5486eb82a54c36065088 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 1877dbf224..8f38425def 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -10,6 +10,7 @@ public class PlayerController : MonoBehaviour [SerializeField] private Rigidbody2D rigidbody2D; [SerializeField] private float jumpForce; [SerializeField] private ScoreController scoreController; + [SerializeField] private HealthController healthController; [SerializeField] private float speed; private bool isCrouching = false; @@ -71,7 +72,6 @@ private void Flip() private void PlayerAnimation(float horizontal, float vertical) { - bool isFlipped = horizontal < 0; if (horizontal < 0) { Flip(); @@ -122,9 +122,9 @@ private void Jump() { rigidbody2D.AddForce(new Vector2(0, jumpForce), ForceMode2D.Force); } - - public void Die() + + public void TakeDamage() { - SceneManager.LoadScene(SceneManager.GetActiveScene().name); + healthController.TakeDamage(1); } } diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 57acf679fd..a1c62287f3 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 30102 + controlID: 7287 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -150,7 +150,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 30103 + controlID: 7288 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -175,7 +175,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 30104 + controlID: 7289 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -240,23 +240,23 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: e2cffeff - m_LastClickedID: -77854 - m_ExpandedIDs: 3c47ffff025cffff045cffff3a63ffff4875ffff10fbffff12fbffff7c840000 + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 66f9ffff24fbffff645b0000a65b0000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Chomper - m_OriginalName: Chomper + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: -77854 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 5} m_SearchString: @@ -702,9 +702,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 24.699179, y: -1.1560998, z: -0.074381225} + m_Target: {x: 200.19849, y: 1231.9033, z: 0.45016608} speed: 2 - m_Value: {x: 24.630823, y: -1.1651876, z: -0.073400006} + m_Value: {x: 200.19849, y: 1231.9033, z: 0.45016608} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -754,9 +754,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 9.443085 + m_Target: 113.09778 speed: 2 - m_Value: 9.344963 + m_Value: 113.09778 m_Ortho: m_Target: 1 speed: 2 @@ -791,7 +791,7 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ConsoleWindow + m_Name: ProjectBrowser m_EditorClassIdentifier: m_Children: [] m_Position: @@ -800,16 +800,16 @@ MonoBehaviour: y: 419.5 width: 993.5 height: 359.5 - m_MinSize: {x: 101, y: 121} - m_MaxSize: {x: 4001, y: 4021} - m_ActualView: {fileID: 11} + m_MinSize: {x: 231, y: 271} + m_MaxSize: {x: 10001, y: 10021} + m_ActualView: {fileID: 10} m_Panes: - {fileID: 10} - {fileID: 11} - {fileID: 12} - {fileID: 13} - m_Selected: 1 - m_LastSelected: 2 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -856,7 +856,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts + - Assets/Game Assets/Art/Sprites/UI/HUD m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -864,16 +864,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 96 m_LastFolders: - - Assets/Scripts + - Assets/Game Assets/Art/Sprites/UI/HUD m_LastFoldersGridSize: 96 m_LastProjectPath: /Users/zain/2D-Platformer-Game m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 133.5} - m_SelectedIDs: ee5c0000 - m_LastClickedID: 23790 - m_ExpandedIDs: 00000000c85c000000ca9a3bffffff7f + scrollPos: {x: 0, y: 79} + m_SelectedIDs: 446a0000 + m_LastClickedID: 27204 + m_ExpandedIDs: 00000000da5d0000e4690000126a0000146a0000206a000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -901,7 +901,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000c85c000000ca9a3bffffff7f + m_ExpandedIDs: 00000000da5d000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -926,10 +926,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: e2cffeff - m_LastClickedInstanceID: -77854 - m_HadKeyboardFocusLastEvent: 0 - m_ExpandedInstanceIDs: c6230000d87c0000e67c00001882000092a80000f2ac00005e7f00002cb900006c9f000034ba000036bb00009a7f0000947e00002a580100a85c0100667f0000b88700004a7e00005a7c0000fe7d00001aa00000687f00006a7f0000189f0000f87f00005c530400369e0000e88a0000e48a00006e5b000000000000 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000d87c0000e67c00001882000092a80000f2ac00005e7f00002cb900006c9f000034ba000036bb00009a7f0000947e00002a580100a85c0100667f0000b88700004a7e00005a7c0000fe7d00001aa00000687f00006a7f0000189f0000f87f00005c530400369e0000e88a0000e48a00006e5b000000000000de6900004a6a0000da690000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -953,7 +953,7 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} + m_ScrollPosition: {x: 0, y: 168.24823} m_GridSize: 96 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 @@ -1167,10 +1167,10 @@ MonoBehaviour: e32: 0 e33: 1 m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 379fc8d7910868541878c8a34170d498, + m_AnimatorController: {fileID: 9100000, guid: 5a5995370fc954e219729b95b7be89cd, type: 2} m_BreadCrumbs: - - m_Target: {fileID: 1107865927472116046, guid: 379fc8d7910868541878c8a34170d498, + - m_Target: {fileID: -4154430246438009678, guid: 5a5995370fc954e219729b95b7be89cd, type: 2} m_ScrollPosition: {x: 0, y: 0} stateMachineGraph: {fileID: 0} @@ -1221,7 +1221,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -77854 + m_LastSelectedObjectID: -1690 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1241,8 +1241,8 @@ MonoBehaviour: y: 0 width: 476.5 height: 779 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} @@ -1291,7 +1291,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 146 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index 7f05598d3b..ea397a5e28 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 40 + controlID: 34026 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 889 + width: 993.5 height: 779 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 41 + controlID: 34027 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,12 +164,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 889 - height: 437.5 + width: 993.5 + height: 419.5 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 42 + controlID: 34028 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -187,10 +187,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 254 - height: 437.5 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + width: 284 + height: 419.5 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -206,22 +206,22 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: GameView + m_Name: SceneView m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 - x: 254 + x: 284 y: 0 - width: 635 - height: 437.5 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 12} + width: 709.5 + height: 419.5 + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} - {fileID: 12} - m_Selected: 1 + m_Selected: 0 m_LastSelected: 1 --- !u!114 &10 MonoBehaviour: @@ -233,25 +233,25 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: AnimationWindow + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 437.5 - width: 889 - height: 341.5 - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_ActualView: {fileID: 18} + y: 419.5 + width: 993.5 + height: 359.5 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 16} m_Panes: + - {fileID: 15} - {fileID: 16} - {fileID: 17} - {fileID: 18} - - {fileID: 15} - m_Selected: 2 - m_LastSelected: 0 + m_Selected: 1 + m_LastSelected: 2 --- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 @@ -267,18 +267,18 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 889 + x: 993.5 y: 0 - width: 581 + width: 476.5 height: 779 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 19} m_Panes: - {fileID: 19} - {fileID: 20} m_Selected: 0 - m_LastSelected: 1 + m_LastSelected: 0 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -300,10 +300,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 254 + x: 284 y: 95 - width: 633 - height: 416.5 + width: 707.5 + height: 398.5 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -358,10 +358,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 633 - height: 395.5 - m_Scale: {x: 0.4277027, y: 0.4277027} - m_Translation: {x: 316.5, y: 197.75} + width: 707.5 + height: 377.5 + m_Scale: {x: 0.47804055, y: 0.47804055} + m_Translation: {x: 353.75, y: 188.75} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 @@ -369,12 +369,12 @@ MonoBehaviour: m_LastShownAreaInsideMargins: serializedVersion: 2 x: -740 - y: -462.35388 + y: -394.84097 width: 1480 - height: 924.70776 + height: 789.68195 m_MinimalGUI: 1 - m_defaultScale: 0.4277027 - m_LastWindowPixelSize: {x: 1266, y: 833} + m_defaultScale: 0.47804055 + m_LastWindowPixelSize: {x: 1415, y: 797} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 @@ -403,8 +403,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 95 - width: 253 - height: 416.5 + width: 283 + height: 398.5 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -418,23 +418,23 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 565b0000 - m_LastClickedID: 23382 - m_ExpandedIDs: e2faffff + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 7aa1feff3c47ffff025cffff045cffff3a63ffff4875ffff10fbffff12fbffff7c840000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Ground2 - m_OriginalName: Ground2 + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 23348 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 8} m_SearchString: @@ -465,10 +465,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 324.5 + x: 284 y: 95 - width: 802 - height: 416.5 + width: 707.5 + height: 398.5 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -803,16 +803,16 @@ MonoBehaviour: layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 - - dockPosition: 1 - containerId: overlay-container--right - floating: 0 + - dockPosition: 0 + containerId: Floating + floating: 1 collapsed: 0 displayed: 1 - snapOffset: {x: 117.5, y: 25} + snapOffset: {x: 20.5, y: 259.5} snapOffsetDelta: {x: 0, y: 0} snapCorner: 0 id: UnityEditor.SceneViewCameraOverlay - index: 11 + index: 0 layout: 4 size: {x: 0, y: 0} sizeOverriden: 0 @@ -844,7 +844,7 @@ MonoBehaviour: sizeOverriden: 0 m_OverlaysVisible: 1 m_WindowGUID: cc27987af1a868c49b0894db9c0f5429 - m_Gizmos: 0 + m_Gizmos: 1 m_OverrideSceneCullingMask: 6917529027641081856 m_SceneIsLit: 0 m_SceneLighting: 1 @@ -853,9 +853,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 0.60055804, y: 0.26604652, z: 0} + m_Target: {x: 4.3444576, y: 17.512, z: -10.223003} speed: 2 - m_Value: {x: 0.60055804, y: 0.26604652, z: 0} + m_Value: {x: 4.2905736, y: 17.142601, z: -10.218167} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -891,13 +891,13 @@ MonoBehaviour: m_Size: {x: 1, y: 1} zGrid: m_Fade: - m_Target: 1 + m_Target: 0 speed: 2 - m_Value: 1 + m_Value: 0 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} m_Pivot: {x: 0, y: 0, z: 0} m_Size: {x: 1, y: 1} - m_ShowGrid: 1 + m_ShowGrid: 0 m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: @@ -905,9 +905,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 4.7065973 + m_Target: 34.424603 speed: 2 - m_Value: 4.7065973 + m_Value: 33.940945 m_Ortho: m_Target: 1 speed: 2 @@ -933,164 +933,6 @@ MonoBehaviour: m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 --- !u!114 &15 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Animator - m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 532.5 - width: 888 - height: 320.5 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_ViewTransforms: - m_KeySerializationHelper: - - {fileID: 110773768, guid: b09e60546065cf9448b36ebb7f759a91, type: 2} - - {fileID: 1107120589572563820, guid: 228edf468d7393e4d8452f80c542fb85, type: 2} - - {fileID: 1107679161928848652, guid: 95e1487dd55102042a8ec1a03fa064ef, type: 2} - - {fileID: 1107150604400011336, guid: e6d811e1f6dfcd247ac0fa75186762b9, type: 2} - - {fileID: 1107352176486139556, guid: 6408c3077d4204944a6451f38cd1f7e5, type: 2} - - {fileID: -4154430246438009678, guid: 5a5995370fc954e219729b95b7be89cd, type: 2} - m_ValueSerializationHelper: - - e00: 0.992175 - e01: 0 - e02: 0 - e03: 1.7471008 - e10: 0 - e11: 0.992175 - e12: 0 - e13: -153.7979 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.5463158 - e01: 0 - e02: 0 - e03: -12.315796 - e10: 0 - e11: 0.5463158 - e12: 0 - e13: 136.85 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.5463158 - e01: 0 - e02: 0 - e03: -12.315796 - e10: 0 - e11: 0.5463158 - e12: 0 - e13: 113.90474 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.5463158 - e01: 0 - e02: 0 - e03: -12.315796 - e10: 0 - e11: 0.5463158 - e12: 0 - e13: 107.348946 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.5463158 - e01: 0 - e02: 0 - e03: -12.315796 - e10: 0 - e11: 0.5463158 - e12: 0 - e13: 136.85 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - - e00: 0.4491085 - e01: 0 - e02: 0 - e03: 222.82448 - e10: 0 - e11: 0.4491085 - e12: 0 - e13: 87.38968 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 5a5995370fc954e219729b95b7be89cd, - type: 2} - m_BreadCrumbs: - - m_Target: {fileID: -4154430246438009678, guid: 5a5995370fc954e219729b95b7be89cd, - type: 2} - m_ScrollPosition: {x: 0, y: 0} - stateMachineGraph: {fileID: 0} - stateMachineGraphGUI: {fileID: 0} - blendTreeGraph: {fileID: 0} - blendTreeGraphGUI: {fileID: 0} - m_AutoLiveLink: 1 - m_MiniTool: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentEditor: 1 - m_LayerEditor: - m_SelectedLayerIndex: 0 ---- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1112,9 +954,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 532.5 - width: 888 - height: 320.5 + y: 514.5 + width: 992.5 + height: 338.5 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1136,7 +978,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Game Assets/Art/Animations/AnimationClips + - Assets/Scripts m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1144,16 +986,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 96 m_LastFolders: - - Assets/Game Assets/Art/Animations/AnimationClips + - Assets/Scripts m_LastFoldersGridSize: 96 m_LastProjectPath: /Users/zain/2D-Platformer-Game m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 143} - m_SelectedIDs: 98640000 - m_LastClickedID: 25752 - m_ExpandedIDs: 00000000ac540000c25c0000ec630000986400009a6400009c640000a4640000bc640000be64000000ca9a3bffffff7f + scrollPos: {x: 0, y: 133.5} + m_SelectedIDs: ee5c0000 + m_LastClickedID: 23790 + m_ExpandedIDs: 00000000c85c000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1181,7 +1023,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000c25c0000 + m_ExpandedIDs: 00000000c85c000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1206,10 +1048,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 2476ffff - m_LastClickedInstanceID: -35292 - m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000d87c0000e67c00001882000092a80000f2ac00005e7f00002cb900006c9f000034ba000036bb00009a7f0000947e00002a580100a85c0100667f0000b88700004a7e00005a7c0000fe7d00001aa00000687f00006a7f0000189f0000f87f00005c530400369e0000e88a0000e48a00006e5b0000 + m_SelectedInstanceIDs: e2cffeff + m_LastClickedInstanceID: -77854 + m_HadKeyboardFocusLastEvent: 0 + m_ExpandedInstanceIDs: c6230000d87c0000e67c00001882000092a80000f2ac00005e7f00002cb900006c9f000034ba000036bb00009a7f0000947e00002a580100a85c0100667f0000b88700004a7e00005a7c0000fe7d00001aa00000687f00006a7f0000189f0000f87f00005c530400369e0000e88a0000e48a00006e5b000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1237,7 +1079,7 @@ MonoBehaviour: m_GridSize: 96 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &17 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1259,9 +1101,44 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 532.5 - width: 915.5 - height: 320.5 + y: 514.5 + width: 992.5 + height: 338.5 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 +--- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animator + m_Image: {fileID: 1711060831702674872, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 514.5 + width: 992.5 + height: 338.5 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1272,6 +1149,163 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: 110773768, guid: b09e60546065cf9448b36ebb7f759a91, type: 2} + - {fileID: 1107120589572563820, guid: 228edf468d7393e4d8452f80c542fb85, type: 2} + - {fileID: 1107679161928848652, guid: 95e1487dd55102042a8ec1a03fa064ef, type: 2} + - {fileID: 1107150604400011336, guid: e6d811e1f6dfcd247ac0fa75186762b9, type: 2} + - {fileID: 1107352176486139556, guid: 6408c3077d4204944a6451f38cd1f7e5, type: 2} + - {fileID: -4154430246438009678, guid: 5a5995370fc954e219729b95b7be89cd, type: 2} + - {fileID: -3929752780267098213, guid: c423fc03e8a8f4fceb4fd8feb5f95bb2, type: 2} + - {fileID: 1107865927472116046, guid: 379fc8d7910868541878c8a34170d498, type: 2} + m_ValueSerializationHelper: + - e00: 0.992175 + e01: 0 + e02: 0 + e03: 1.7471008 + e10: 0 + e11: 0.992175 + e12: 0 + e13: -153.7979 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.5463158 + e01: 0 + e02: 0 + e03: -12.315796 + e10: 0 + e11: 0.5463158 + e12: 0 + e13: 136.85 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.5463158 + e01: 0 + e02: 0 + e03: -12.315796 + e10: 0 + e11: 0.5463158 + e12: 0 + e13: 113.90474 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.5463158 + e01: 0 + e02: 0 + e03: -12.315796 + e10: 0 + e11: 0.5463158 + e12: 0 + e13: 107.348946 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.5463158 + e01: 0 + e02: 0 + e03: -12.315796 + e10: 0 + e11: 0.5463158 + e12: 0 + e13: 136.85 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.62402505 + e01: 0 + e02: 0 + e03: -55.59482 + e10: 0 + e11: 0.62402505 + e12: 0 + e13: 39.253593 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - e00: 0.8342552 + e01: 0 + e02: 0 + e03: 73.556885 + e10: 0 + e11: 0.8342552 + e12: 0 + e13: -27.764557 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: 5a5995370fc954e219729b95b7be89cd, + type: 2} + m_BreadCrumbs: + - m_Target: {fileID: -4154430246438009678, guid: 5a5995370fc954e219729b95b7be89cd, + type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 + m_LockTracker: + m_IsLocked: 0 + m_CurrentEditor: 1 + m_LayerEditor: + m_SelectedLayerIndex: 0 --- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1294,9 +1328,9 @@ MonoBehaviour: m_Pos: serializedVersion: 2 x: 0 - y: 532.5 - width: 888 - height: 320.5 + y: 514.5 + width: 992.5 + height: 338.5 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1309,7 +1343,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 23382 + m_LastSelectedObjectID: -41982 --- !u!114 &19 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1331,9 +1365,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 889 + x: 993.5 y: 95 - width: 580 + width: 475.5 height: 758 m_SerializedDataModeController: m_DataMode: 0 @@ -1348,7 +1382,7 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 291 + m_CachedPref: 151 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 From 6f10728e6bdd472a7ad82497e1c300c445c695bb Mon Sep 17 00:00:00 2001 From: Syed zainul abedin Date: Fri, 19 Jan 2024 00:18:26 +0530 Subject: [PATCH 16/26] feat: Added another patroling enemy --- Assets/Game Assets/Prefab/Chomper.prefab | 170 +++++++ Assets/Game Assets/Prefab/Chomper.prefab.meta | 7 + Assets/Game Assets/Prefab/Gunner.prefab | 170 +++++++ Assets/Game Assets/Prefab/Gunner.prefab.meta | 7 + Assets/Scenes/Level1.unity | 419 +++++++++--------- ProjectSettings/Physics2DSettings.asset | 16 +- ProjectSettings/TagManager.asset | 2 +- .../Layouts/CurrentMaximizeLayout.dwlt | 144 +++--- 8 files changed, 651 insertions(+), 284 deletions(-) create mode 100644 Assets/Game Assets/Prefab/Chomper.prefab create mode 100644 Assets/Game Assets/Prefab/Chomper.prefab.meta create mode 100644 Assets/Game Assets/Prefab/Gunner.prefab create mode 100644 Assets/Game Assets/Prefab/Gunner.prefab.meta diff --git a/Assets/Game Assets/Prefab/Chomper.prefab b/Assets/Game Assets/Prefab/Chomper.prefab new file mode 100644 index 0000000000..ed53df3eb0 --- /dev/null +++ b/Assets/Game Assets/Prefab/Chomper.prefab @@ -0,0 +1,170 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4240479789766735715 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4690134043500217851} + - component: {fileID: 6397771608887093492} + - component: {fileID: 5875506916244966014} + - component: {fileID: 675786376294343984} + - component: {fileID: 7599392323198263911} + m_Layer: 0 + m_Name: Chomper + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4690134043500217851 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4240479789766735715} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 21.93, y: -2.4, 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!212 &6397771608887093492 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4240479789766735715} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 26aea5a92fc76f648bb6522f06a0af58, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 3.3333333, y: 2.22} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &5875506916244966014 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4240479789766735715} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 379fc8d7910868541878c8a34170d498, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!61 &675786376294343984 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4240479789766735715} + 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: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.021529794, y: 0.61958945} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.25} + oldSize: {x: 3.3333333, y: 2.22} + newSize: {x: 3.3333333, y: 2.22} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.6109488, y: 1.3157482} + m_EdgeRadius: 0 +--- !u!114 &7599392323198263911 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4240479789766735715} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 742e3e9b0921d46d2af0417e4bee7886, type: 3} + m_Name: + m_EditorClassIdentifier: + animator: {fileID: 5875506916244966014} + patrolSpeed: 3 + patrolDistance: 3 diff --git a/Assets/Game Assets/Prefab/Chomper.prefab.meta b/Assets/Game Assets/Prefab/Chomper.prefab.meta new file mode 100644 index 0000000000..a79de0ed36 --- /dev/null +++ b/Assets/Game Assets/Prefab/Chomper.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 28fcdca5ad40a430f8d536e210abf4fc +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Prefab/Gunner.prefab b/Assets/Game Assets/Prefab/Gunner.prefab new file mode 100644 index 0000000000..bb6bbe9308 --- /dev/null +++ b/Assets/Game Assets/Prefab/Gunner.prefab @@ -0,0 +1,170 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &4886885305723851823 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1800569500376395423} + - component: {fileID: 8749341591044131516} + - component: {fileID: 5763626143607041670} + - component: {fileID: 2132206099314369513} + - component: {fileID: 6385112374039116806} + m_Layer: 0 + m_Name: Gunner + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1800569500376395423 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4886885305723851823} + serializedVersion: 2 + 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_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &8749341591044131516 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4886885305723851823} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 4397030f9e6fb174ea079b632727d6f8, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 15.17037, y: 15.17037} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &5763626143607041670 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4886885305723851823} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 023b9afcbf08ab842a4336a7069f6afb, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!61 &2132206099314369513 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4886885305723851823} + 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: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: -0.12515831, y: 0.5719755} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.25} + oldSize: {x: 3.3333333, y: 2.22} + newSize: {x: 15.17037, y: 15.17037} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1.5651131, y: 1.3179904} + m_EdgeRadius: 0 +--- !u!114 &6385112374039116806 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4886885305723851823} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 742e3e9b0921d46d2af0417e4bee7886, type: 3} + m_Name: + m_EditorClassIdentifier: + animator: {fileID: 5763626143607041670} + patrolSpeed: 5 + patrolDistance: 10 diff --git a/Assets/Game Assets/Prefab/Gunner.prefab.meta b/Assets/Game Assets/Prefab/Gunner.prefab.meta new file mode 100644 index 0000000000..717567a0f3 --- /dev/null +++ b/Assets/Game Assets/Prefab/Gunner.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 6a06b6176412d40a786530ee70704738 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Level1.unity b/Assets/Scenes/Level1.unity index 6db4f8ebab..1310943d3b 100644 --- a/Assets/Scenes/Level1.unity +++ b/Assets/Scenes/Level1.unity @@ -344,174 +344,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9451ad9a7bb543c0b34f61f62d85e38, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &188380160 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 188380161} - - component: {fileID: 188380163} - - component: {fileID: 188380162} - - component: {fileID: 188380164} - - component: {fileID: 188380165} - m_Layer: 0 - m_Name: Chomper - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &188380161 +--- !u!4 &188380161 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 188380160} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 21.93, y: -2.4, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2107246408} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!95 &188380162 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 188380160} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 379fc8d7910868541878c8a34170d498, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!212 &188380163 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 188380160} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 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: 26aea5a92fc76f648bb6522f06a0af58, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 3.3333333, y: 2.22} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!61 &188380164 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 188380160} - 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: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: -0.021529794, y: 0.61958945} - m_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.25} - oldSize: {x: 3.3333333, y: 2.22} - newSize: {x: 3.3333333, y: 2.22} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1.6109488, y: 1.3157482} - m_EdgeRadius: 0 ---- !u!114 &188380165 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + m_PrefabInstance: {fileID: 4450895270237833664} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 188380160} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 742e3e9b0921d46d2af0417e4bee7886, type: 3} - m_Name: - m_EditorClassIdentifier: - animator: {fileID: 188380162} - patrolSpeed: 3 - patrolDistance: 3 --- !u!1 &282281674 GameObject: m_ObjectHideFlags: 0 @@ -1300,18 +1138,48 @@ Tilemap: - first: {x: 27, y: -4, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 1 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 32, y: -4, z: 0} + - first: {x: 28, y: -4, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 29, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 30, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 31, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1377,17 +1245,17 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 40, y: -4, z: 0} + - first: {x: 41, y: -4, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 1 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 14, y: -3, z: 0} + - first: {x: 42, y: -4, z: 0} second: serializedVersion: 2 m_TileIndex: 1 @@ -1397,7 +1265,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 16, y: -3, z: 0} + - first: {x: 43, y: -4, z: 0} second: serializedVersion: 2 m_TileIndex: 1 @@ -1407,7 +1275,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 36, y: -3, z: 0} + - first: {x: 44, y: -4, z: 0} second: serializedVersion: 2 m_TileIndex: 1 @@ -1417,7 +1285,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 37, y: -3, z: 0} + - first: {x: 45, y: -4, z: 0} second: serializedVersion: 2 m_TileIndex: 1 @@ -1427,7 +1295,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 14, y: -2, z: 0} + - first: {x: 46, y: -4, z: 0} second: serializedVersion: 2 m_TileIndex: 1 @@ -1437,7 +1305,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 16, y: -2, z: 0} + - first: {x: 47, y: -4, z: 0} second: serializedVersion: 2 m_TileIndex: 1 @@ -1447,17 +1315,17 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 35, y: -2, z: 0} + - first: {x: 14, y: -3, z: 0} second: serializedVersion: 2 - m_TileIndex: 2 - m_TileSpriteIndex: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 36, y: -2, z: 0} + - first: {x: 16, y: -3, z: 0} second: serializedVersion: 2 m_TileIndex: 1 @@ -1467,11 +1335,21 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 37, y: -2, z: 0} + - first: {x: 14, y: -2, z: 0} second: serializedVersion: 2 - m_TileIndex: 2 - m_TileSpriteIndex: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 16, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1509,21 +1387,21 @@ Tilemap: m_AllTileFlags: 1073741825 m_AnimatedTiles: {} m_TileAssetArray: - - m_RefCount: 5 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: cdf3aa23cf36b4a9a9c4147163173313, type: 2} - - m_RefCount: 34 + - m_RefCount: 43 m_Data: {fileID: 11400000, guid: 1dfabe381ebee48b485e1520f0f664eb, type: 2} - - m_RefCount: 6 + - m_RefCount: 4 m_Data: {fileID: 11400000, guid: f599eca27ab804acdaf363a77b9c0937, type: 2} m_TileSpriteArray: - - m_RefCount: 5 + - m_RefCount: 2 m_Data: {fileID: 21300000, guid: 804743266b3b62d428e86255220b6694, type: 3} - - m_RefCount: 34 + - m_RefCount: 43 m_Data: {fileID: 21300000, guid: 6aa3a976ac9ecc54aad638ffbf4e67c6, type: 3} - - m_RefCount: 6 + - m_RefCount: 4 m_Data: {fileID: 21300000, guid: 62d2808515efe6d4897f8d8cd5218f31, type: 3} m_TileMatrixArray: - - m_RefCount: 43 + - m_RefCount: 49 m_Data: e00: 1 e01: 0 @@ -1541,7 +1419,7 @@ Tilemap: e31: 0 e32: 0 e33: 1 - - m_RefCount: 2 + - m_RefCount: 0 m_Data: e00: -0.9876882 e01: 0 @@ -1560,13 +1438,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 45 + - m_RefCount: 49 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Origin: {x: 0, y: -4, z: 0} - m_Size: {x: 41, y: 5, z: 1} + m_Size: {x: 48, y: 5, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -1697,6 +1575,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1248432746} m_CullTransparentMesh: 1 +--- !u!4 &1274176838 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + m_PrefabInstance: {fileID: 4984790873687906411} + m_PrefabAsset: {fileID: 0} --- !u!1 &1275231954 GameObject: m_ObjectHideFlags: 0 @@ -2345,6 +2229,7 @@ Transform: - {fileID: 1139415634} - {fileID: 2055596504} - {fileID: 188380161} + - {fileID: 1274176838} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!156049354 &2107246409 @@ -2520,6 +2405,142 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2d26a819bd59c42f09e953f24c366259, type: 3} +--- !u!1001 &4450895270237833664 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2107246408} + m_Modifications: + - target: {fileID: 4240479789766735715, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_Name + value: Chomper + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalPosition.x + value: 21.93 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.4 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 28fcdca5ad40a430f8d536e210abf4fc, type: 3} +--- !u!1001 &4984790873687906411 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2107246408} + m_Modifications: + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalPosition.x + value: 35.51 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.43 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4886885305723851823, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_Name + value: Gunner + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6a06b6176412d40a786530ee70704738, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset index 47880b1c8c..fbe25019b6 100644 --- a/ProjectSettings/Physics2DSettings.asset +++ b/ProjectSettings/Physics2DSettings.asset @@ -3,7 +3,7 @@ --- !u!19 &1 Physics2DSettings: m_ObjectHideFlags: 0 - serializedVersion: 4 + serializedVersion: 6 m_Gravity: {x: 0, y: -9.81} m_DefaultMaterial: {fileID: 0} m_VelocityIterations: 8 @@ -38,19 +38,11 @@ Physics2DSettings: m_IslandSolverJointCostScale: 10 m_IslandSolverBodiesPerJob: 50 m_IslandSolverContactsPerJob: 50 - m_AutoSimulation: 1 + m_SimulationMode: 0 m_QueriesHitTriggers: 1 m_QueriesStartInColliders: 1 m_CallbacksOnDisable: 1 m_ReuseCollisionCallbacks: 1 m_AutoSyncTransforms: 0 - m_AlwaysShowColliders: 0 - m_ShowColliderSleep: 1 - m_ShowColliderContacts: 0 - m_ShowColliderAABB: 0 - m_ContactArrowScale: 0.2 - m_ColliderAwakeColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.7529412} - m_ColliderAsleepColor: {r: 0.5686275, g: 0.95686275, b: 0.54509807, a: 0.36078432} - m_ColliderContactColor: {r: 1, g: 0, b: 1, a: 0.6862745} - m_ColliderAABBColor: {r: 1, g: 1, b: 0, a: 0.2509804} - m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_GizmoOptions: 10 + m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffbfffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 05825831c7..451db34e2e 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -12,7 +12,7 @@ TagManager: - Platform - Water - UI - - + - Enemy - - - diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index a1c62287f3..a585a03cef 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 7287 + controlID: 7680 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -140,7 +140,7 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 4} - - {fileID: 9} + - {fileID: 10} m_Position: serializedVersion: 2 x: 0 @@ -150,7 +150,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 7288 + controlID: 7681 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -175,7 +175,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 7289 + controlID: 7682 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -240,23 +240,23 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 + m_SelectedIDs: 2ad1ffff + m_LastClickedID: -11990 m_ExpandedIDs: 66f9ffff24fbffff645b0000a65b0000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: + m_Name: Gunner + m_OriginalName: Gunner m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: 0 + m_UserData: -11990 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 11 + m_OriginalEventType: 0 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 5} m_SearchString: @@ -291,6 +291,7 @@ MonoBehaviour: m_Panes: - {fileID: 8} - {fileID: 2} + - {fileID: 9} m_Selected: 1 m_LastSelected: 0 --- !u!114 &8 @@ -702,9 +703,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 200.19849, y: 1231.9033, z: 0.45016608} + m_Target: {x: 37.011066, y: -2.5550573, z: -0.10618025} speed: 2 - m_Value: {x: 200.19849, y: 1231.9033, z: 0.45016608} + m_Value: {x: 37.011066, y: -2.5550573, z: -0.10618025} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -754,9 +755,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 113.09778 + m_Target: 15.107059 speed: 2 - m_Value: 113.09778 + m_Value: 15.107059 m_Ortho: m_Target: 1 speed: 2 @@ -782,6 +783,44 @@ MonoBehaviour: m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 --- !u!114 &9 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animation + m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 284 + y: 95 + width: 707.5 + height: 398.5 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: -11990 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -802,15 +841,14 @@ MonoBehaviour: height: 359.5 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 10} + m_ActualView: {fileID: 11} m_Panes: - - {fileID: 10} - {fileID: 11} - {fileID: 12} - {fileID: 13} m_Selected: 0 - m_LastSelected: 1 ---- !u!114 &10 + m_LastSelected: 0 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -856,7 +894,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Game Assets/Art/Sprites/UI/HUD + - Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/Spitter/Walk m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -864,16 +902,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 96 m_LastFolders: - - Assets/Game Assets/Art/Sprites/UI/HUD + - Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/Spitter/Walk m_LastFoldersGridSize: 96 m_LastProjectPath: /Users/zain/2D-Platformer-Game m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 79} - m_SelectedIDs: 446a0000 - m_LastClickedID: 27204 - m_ExpandedIDs: 00000000da5d0000e4690000126a0000146a0000206a000000ca9a3bffffff7f + scrollPos: {x: 0, y: 241.5} + m_SelectedIDs: f0750000 + m_LastClickedID: 30192 + m_ExpandedIDs: 000000004e5600004a580000da5d0000e4690000126a0000146a00001a6a0000206a0000988100009c81000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -926,10 +964,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: 2ad1ffff + m_LastClickedInstanceID: -11990 m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000d87c0000e67c00001882000092a80000f2ac00005e7f00002cb900006c9f000034ba000036bb00009a7f0000947e00002a580100a85c0100667f0000b88700004a7e00005a7c0000fe7d00001aa00000687f00006a7f0000189f0000f87f00005c530400369e0000e88a0000e48a00006e5b000000000000de6900004a6a0000da690000 + m_ExpandedInstanceIDs: c6230000d87c0000e67c000092a80000f2ac00005e7f00002cb900006c9f000034ba000036bb00009a7f0000947e00002a580100a85c0100667f0000b88700004a7e00005a7c0000fe7d00001aa00000687f00006a7f0000189f0000f87f00005c530400369e0000e88a0000e48a00006e5b000000000000de6900004a6a0000da690000f25b000016830000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -953,11 +991,11 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 168.24823} + m_ScrollPosition: {x: 0, y: 0} m_GridSize: 96 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &11 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -992,7 +1030,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &12 +--- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1184,44 +1222,6 @@ MonoBehaviour: m_CurrentEditor: 1 m_LayerEditor: m_SelectedLayerIndex: 0 ---- !u!114 &13 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Animation - m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 0 - y: 514.5 - width: 992.5 - height: 338.5 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_LockTracker: - m_IsLocked: 0 - m_LastSelectedObjectID: -1690 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1241,8 +1241,8 @@ MonoBehaviour: y: 0 width: 476.5 height: 779 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} @@ -1287,11 +1287,11 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 151 + m_CachedPref: 424 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 146 + m_LastVerticalScrollValue: 305 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: From 0f5cb5e0d02993230745e957ece26007bad3c5a9 Mon Sep 17 00:00:00 2001 From: Syed zainul abedin Date: Fri, 19 Jan 2024 00:40:12 +0530 Subject: [PATCH 17/26] feat:Added lobby screen --- Assets/Scenes/MainMenu.unity | 1193 +++++++++++++++++ Assets/Scenes/MainMenu.unity.meta | 7 + Assets/Scripts/MainMenu.cs | 26 + Assets/Scripts/MainMenu.cs.meta | 11 + ProjectSettings/EditorBuildSettings.asset | 7 +- UserSettings/EditorUserSettings.asset | 3 + .../Layouts/CurrentMaximizeLayout.dwlt | 114 +- 7 files changed, 1302 insertions(+), 59 deletions(-) create mode 100644 Assets/Scenes/MainMenu.unity create mode 100644 Assets/Scenes/MainMenu.unity.meta create mode 100644 Assets/Scripts/MainMenu.cs create mode 100644 Assets/Scripts/MainMenu.cs.meta diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity new file mode 100644 index 0000000000..7824a88607 --- /dev/null +++ b/Assets/Scenes/MainMenu.unity @@ -0,0 +1,1193 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 1 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 512 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 256 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 1 + m_PVRDenoiserTypeDirect: 1 + m_PVRDenoiserTypeIndirect: 1 + m_PVRDenoiserTypeAO: 1 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 1 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 0} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &134893922 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 134893923} + - component: {fileID: 134893926} + - component: {fileID: 134893925} + - component: {fileID: 134893924} + m_Layer: 5 + m_Name: PlayButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &134893923 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 134893922} + 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_Children: + - {fileID: 389468274} + m_Father: {fileID: 1845223420} + 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: -197.78} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &134893924 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 134893922} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 134893925} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &134893925 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 134893922} + 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: 21300004, guid: 7f83de9ce1b2e9a4882fa64589108f14, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &134893926 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 134893922} + m_CullTransparentMesh: 1 +--- !u!1 &389468273 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 389468274} + - component: {fileID: 389468276} + - component: {fileID: 389468275} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &389468274 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 389468273} + 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_Children: [] + m_Father: {fileID: 134893923} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &389468275 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 389468273} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Play + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: e85f1cf0bfd4d1447bed2bc737c47be7, type: 2} + m_sharedMaterial: {fileID: 21069318434546836, guid: e85f1cf0bfd4d1447bed2bc737c47be7, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 65 + m_fontSizeBase: 65 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &389468276 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 389468273} + m_CullTransparentMesh: 1 +--- !u!1 &392235093 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 392235096} + - component: {fileID: 392235095} + - component: {fileID: 392235094} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &392235094 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 392235093} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &392235095 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 392235093} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &392235096 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 392235093} + serializedVersion: 2 + 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_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &640882139 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 640882140} + - component: {fileID: 640882142} + - component: {fileID: 640882141} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &640882140 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 640882139} + 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_Children: [] + m_Father: {fileID: 1845223420} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0, y: 0} +--- !u!114 &640882141 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 640882139} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: v.0.0.1 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 4c1f115f2c9b80b4cabb22cae230db1c, type: 2} + m_sharedMaterial: {fileID: 21498813622556604, guid: 4c1f115f2c9b80b4cabb22cae230db1c, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &640882142 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 640882139} + m_CullTransparentMesh: 1 +--- !u!1 &822632352 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 822632353} + - component: {fileID: 822632355} + - component: {fileID: 822632354} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &822632353 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 822632352} + 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_Children: [] + m_Father: {fileID: 1845223420} + 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: 0} + m_SizeDelta: {x: 871.6506, y: 194.6592} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &822632354 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 822632352} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Jungle Adventures + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: e85f1cf0bfd4d1447bed2bc737c47be7, type: 2} + m_sharedMaterial: {fileID: 21069318434546836, guid: e85f1cf0bfd4d1447bed2bc737c47be7, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 100 + m_fontSizeBase: 100 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &822632355 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 822632352} + m_CullTransparentMesh: 1 +--- !u!1 &986945889 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 986945892} + - component: {fileID: 986945891} + - component: {fileID: 986945890} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!81 &986945890 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 986945889} + m_Enabled: 1 +--- !u!20 &986945891 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 986945889} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 1 + m_BackGroundColor: {r: 0.20392157, g: 0.59607846, b: 0.85882354, a: 1} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 0} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &986945892 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 986945889} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 416.36707, y: -117.893074, z: -5.6797204} + 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 &995975433 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 995975434} + - component: {fileID: 995975437} + - component: {fileID: 995975436} + - component: {fileID: 995975435} + m_Layer: 5 + m_Name: QuitButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &995975434 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 995975433} + 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_Children: + - {fileID: 1327910754} + m_Father: {fileID: 1845223420} + 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: -324} + m_SizeDelta: {x: 300, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &995975435 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 995975433} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 995975436} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &995975436 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 995975433} + 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: 21300004, guid: 7f83de9ce1b2e9a4882fa64589108f14, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &995975437 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 995975433} + m_CullTransparentMesh: 1 +--- !u!1 &1327910753 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1327910754} + - component: {fileID: 1327910756} + - component: {fileID: 1327910755} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1327910754 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1327910753} + 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_Children: [] + m_Father: {fileID: 995975434} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1327910755 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1327910753} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Quit + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: e85f1cf0bfd4d1447bed2bc737c47be7, type: 2} + m_sharedMaterial: {fileID: 21069318434546836, guid: e85f1cf0bfd4d1447bed2bc737c47be7, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 65 + m_fontSizeBase: 65 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1327910756 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1327910753} + m_CullTransparentMesh: 1 +--- !u!1 &1845223416 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1845223420} + - component: {fileID: 1845223419} + - component: {fileID: 1845223418} + - component: {fileID: 1845223417} + - component: {fileID: 1845223421} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1845223417 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845223416} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &1845223418 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845223416} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &1845223419 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845223416} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &1845223420 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845223416} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 822632353} + - {fileID: 134893923} + - {fileID: 995975434} + - {fileID: 640882140} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!114 &1845223421 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1845223416} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f2bf9d927566b483ba5599868e1abc6d, type: 3} + m_Name: + m_EditorClassIdentifier: + startButton: {fileID: 134893924} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 1845223420} + - {fileID: 392235096} + - {fileID: 986945892} diff --git a/Assets/Scenes/MainMenu.unity.meta b/Assets/Scenes/MainMenu.unity.meta new file mode 100644 index 0000000000..2e462c369e --- /dev/null +++ b/Assets/Scenes/MainMenu.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9192e307d20474230b0cb8d708ecc46f +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/MainMenu.cs b/Assets/Scripts/MainMenu.cs new file mode 100644 index 0000000000..7fbed22884 --- /dev/null +++ b/Assets/Scripts/MainMenu.cs @@ -0,0 +1,26 @@ +using UnityEngine; +using UnityEngine.UI; + +public class MainMenu : MonoBehaviour +{ + [SerializeField] + private Button startButton; + [SerializeField] + private Button quitButton; + + void Start() + { + startButton.onClick.AddListener(StartGame); + quitButton.onClick.AddListener(QuitGame); + } + + private void QuitGame() + { + Application.Quit(); + } + + private void StartGame() + { + UnityEngine.SceneManagement.SceneManager.LoadScene(1); + } +} diff --git a/Assets/Scripts/MainMenu.cs.meta b/Assets/Scripts/MainMenu.cs.meta new file mode 100644 index 0000000000..357be8dfb5 --- /dev/null +++ b/Assets/Scripts/MainMenu.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f2bf9d927566b483ba5599868e1abc6d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index ea2a1a50e0..77c90f287f 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,9 +6,12 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/Level2.unity - guid: 4fd0f95d27b1d4a1cb491d516d84208e + path: Assets/Scenes/MainMenu.unity + guid: 9192e307d20474230b0cb8d708ecc46f - enabled: 1 path: Assets/Scenes/Level1.unity guid: 3a46aa8073dff7744a2d6a6be0f747bf + - enabled: 1 + path: Assets/Scenes/Level2.unity + guid: 4fd0f95d27b1d4a1cb491d516d84208e m_configObjects: {} diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 7d368076b3..f05e9d3acc 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -11,6 +11,9 @@ EditorUserSettings: RecentlyUsedSceneGuid-1: value: 505000500454510b5a5d08241674084442164a2e7a29703228791b64b6b7363e flags: 0 + RecentlyUsedSceneGuid-2: + value: 5a000d540006590c095c5c7647770d43461548292e7022677d711830e1b4623e + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index a585a03cef..3386d157f5 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 7680 + controlID: 16002 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -46,9 +46,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 284 + x: 338 y: 95 - width: 707.5 + width: 844 height: 398.5 m_SerializedDataModeController: m_DataMode: 0 @@ -104,23 +104,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 707.5 + width: 844 height: 377.5 - m_Scale: {x: 0.47804055, y: 0.47804055} - m_Translation: {x: 353.75, y: 188.75} + m_Scale: {x: 0.5243056, y: 0.5243056} + m_Translation: {x: 422, y: 188.74998} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -740 - y: -394.84097 - width: 1480 - height: 789.68195 + x: -804.87415 + y: -359.99994 + width: 1609.7483 + height: 719.99994 m_MinimalGUI: 1 - m_defaultScale: 0.47804055 - m_LastWindowPixelSize: {x: 1415, y: 797} + m_defaultScale: 0.5243056 + m_LastWindowPixelSize: {x: 1688, y: 797} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 @@ -145,12 +145,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 993.5 + width: 1184 height: 779 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 7681 + controlID: 16003 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -170,12 +170,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 993.5 + width: 1184 height: 419.5 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 7682 + controlID: 16004 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -193,7 +193,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 284 + width: 338 height: 419.5 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} @@ -225,7 +225,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 95 - width: 283 + width: 337 height: 398.5 m_SerializedDataModeController: m_DataMode: 0 @@ -240,23 +240,23 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 2ad1ffff - m_LastClickedID: -11990 - m_ExpandedIDs: 66f9ffff24fbffff645b0000a65b0000 + m_SelectedIDs: e8b7ffff + m_LastClickedID: -18456 + m_ExpandedIDs: aca4ffffe8b7ffff3cb8ffffd4b8ffff66f9ffff24fbffff645b0000a65b0000 m_RenameOverlay: m_UserAcceptedRename: 0 - m_Name: Gunner - m_OriginalName: Gunner + m_Name: + m_OriginalName: m_EditFieldRect: serializedVersion: 2 x: 0 y: 0 width: 0 height: 0 - m_UserData: -11990 + m_UserData: 0 m_IsWaitingForDelay: 0 m_IsRenaming: 0 - m_OriginalEventType: 0 + m_OriginalEventType: 11 m_IsRenamingFilename: 0 m_ClientGUIView: {fileID: 5} m_SearchString: @@ -281,9 +281,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 284 + x: 338 y: 0 - width: 709.5 + width: 846 height: 419.5 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} @@ -315,9 +315,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 284 + x: 338 y: 95 - width: 707.5 + width: 844 height: 398.5 m_SerializedDataModeController: m_DataMode: 0 @@ -703,9 +703,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 37.011066, y: -2.5550573, z: -0.10618025} + m_Target: {x: 1501.1118, y: 540.93286, z: -1.3594198} speed: 2 - m_Value: {x: 37.011066, y: -2.5550573, z: -0.10618025} + m_Value: {x: 1501.1118, y: 540.93286, z: -1.3594198} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -755,9 +755,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 15.107059 + m_Target: 294.0548 speed: 2 - m_Value: 15.107059 + m_Value: 294.0548 m_Ortho: m_Target: 1 speed: 2 @@ -819,7 +819,7 @@ MonoBehaviour: m_OverlaysVisible: 1 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: -11990 + m_LastSelectedObjectID: -18810 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -837,7 +837,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 419.5 - width: 993.5 + width: 1184 height: 359.5 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} @@ -871,7 +871,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 514.5 - width: 992.5 + width: 1183 height: 338.5 m_SerializedDataModeController: m_DataMode: 0 @@ -894,7 +894,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/Spitter/Walk + - Assets m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -902,16 +902,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 96 m_LastFolders: - - Assets/Game Assets/Art/Sprites/AnimatedSprites/Enemies/Spitter/Walk + - Assets m_LastFoldersGridSize: 96 m_LastProjectPath: /Users/zain/2D-Platformer-Game m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 241.5} - m_SelectedIDs: f0750000 - m_LastClickedID: 30192 - m_ExpandedIDs: 000000004e5600004a580000da5d0000e4690000126a0000146a00001a6a0000206a0000988100009c81000000ca9a3bffffff7f + scrollPos: {x: 0, y: 79} + m_SelectedIDs: da5d0000 + m_LastClickedID: 24026 + m_ExpandedIDs: 00000000da5d000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -964,10 +964,10 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 2ad1ffff - m_LastClickedInstanceID: -11990 - m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000d87c0000e67c000092a80000f2ac00005e7f00002cb900006c9f000034ba000036bb00009a7f0000947e00002a580100a85c0100667f0000b88700004a7e00005a7c0000fe7d00001aa00000687f00006a7f0000189f0000f87f00005c530400369e0000e88a0000e48a00006e5b000000000000de6900004a6a0000da690000f25b000016830000 + m_SelectedInstanceIDs: e8b7ffff + m_LastClickedInstanceID: -18456 + m_HadKeyboardFocusLastEvent: 0 + m_ExpandedInstanceIDs: c6230000d87c0000e67c000092a80000f2ac00005e7f00002cb900006c9f000034ba000036bb00009a7f0000947e00002a580100a85c0100667f0000b88700004a7e00005a7c0000fe7d00001aa00000687f00006a7f0000189f0000f87f00005c530400369e0000e88a0000e48a00006e5b0000de6900004a6a0000da690000f25b00001683000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1237,9 +1237,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 993.5 + x: 1184 y: 0 - width: 476.5 + width: 286 height: 779 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} @@ -1248,7 +1248,7 @@ MonoBehaviour: - {fileID: 15} - {fileID: 16} m_Selected: 0 - m_LastSelected: 0 + m_LastSelected: 1 --- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1270,9 +1270,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 993.5 + x: 1184 y: 95 - width: 475.5 + width: 285 height: 758 m_SerializedDataModeController: m_DataMode: 0 @@ -1287,11 +1287,11 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 424 + m_CachedPref: 209 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 305 + m_LastVerticalScrollValue: 76 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: @@ -1318,9 +1318,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 916.5 + x: 816.5 y: 95 - width: 552.5 + width: 652.5 height: 758 m_SerializedDataModeController: m_DataMode: 0 @@ -1339,8 +1339,8 @@ MonoBehaviour: m_SearchText: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 7b59923f - m_LastClickedID: 1066555771 + m_SelectedIDs: eb925b96 + m_LastClickedID: -1772383509 m_ExpandedIDs: a01a5fa6213269b253336be2e36eadf800000000c53aba5a m_RenameOverlay: m_UserAcceptedRename: 0 From 2c60b78068621c69008be434ae575613b6ce2813 Mon Sep 17 00:00:00 2001 From: Syed zainul abedin Date: Fri, 19 Jan 2024 00:54:04 +0530 Subject: [PATCH 18/26] feat: Added logic for restart ui --- .../AnimationClips/Player_Dead.anim | 105 +++++ .../AnimationClips/Player_Dead.anim.meta | 8 + .../Animators/Ellen/PlayerAnimator.controller | 69 ++- Assets/Game Assets/Prefab/Player.prefab | 4 +- Assets/Scenes/Level1.unity | 442 +++++++++++++++++- Assets/Scenes/MainMenu.unity | 1 + Assets/Scripts/GameOverController.cs | 26 ++ Assets/Scripts/GameOverController.cs.meta | 11 + Assets/Scripts/HealthController.cs | 16 +- Assets/Scripts/PlayerController.cs | 8 + UserSettings/EditorUserSettings.asset | 4 +- .../Layouts/CurrentMaximizeLayout.dwlt | 202 ++++---- 12 files changed, 764 insertions(+), 132 deletions(-) create mode 100644 Assets/Game Assets/Art/Animations/AnimationClips/Player_Dead.anim create mode 100644 Assets/Game Assets/Art/Animations/AnimationClips/Player_Dead.anim.meta create mode 100644 Assets/Scripts/GameOverController.cs create mode 100644 Assets/Scripts/GameOverController.cs.meta diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Dead.anim b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Dead.anim new file mode 100644 index 0000000000..e9f8981b36 --- /dev/null +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Dead.anim @@ -0,0 +1,105 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!74 &7400000 +AnimationClip: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player_Dead + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: 0b26c4d5c6b04e940932afa1ffa8284f, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: cf749edb05d158d47a3e523439809960, type: 3} + - time: 0.15 + value: {fileID: 21300000, guid: 59b767590592a9e4685835a20cf41d69, type: 3} + - time: 0.23333333 + value: {fileID: 21300000, guid: c195730543b85df41953d682fee276b3, type: 3} + - time: 0.3 + value: {fileID: 21300000, guid: 1ffccabe7b991aa4283e4106fca8f9bb, type: 3} + - time: 0.38333333 + value: {fileID: 21300000, guid: a1c0872c2cf7825428b1f301727f4e1b, type: 3} + - time: 0.45 + value: {fileID: 21300000, guid: baa7eb63e6b2764408c3c44ea0b180ac, type: 3} + - time: 0.53333336 + value: {fileID: 21300000, guid: b5a42cffd70ab6441a230c8e772f3c56, type: 3} + - time: 0.6 + value: {fileID: 21300000, guid: 35322bfa3901c9145821274537244b1d, type: 3} + - time: 0.68333334 + value: {fileID: 21300000, guid: ec69df1b25263e844aa6c00cbb388ea6, type: 3} + - time: 0.75 + value: {fileID: 21300000, guid: 190f2e72bd4df1945b2d504efccde46c, type: 3} + - time: 0.8333333 + value: {fileID: 21300000, guid: eef4c8c406166bd4c848e87480efa2bd, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + m_SampleRate: 60 + m_WrapMode: 0 + m_Bounds: + m_Center: {x: 0, y: 0, z: 0} + m_Extent: {x: 0, y: 0, z: 0} + m_ClipBindingConstant: + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: 0b26c4d5c6b04e940932afa1ffa8284f, type: 3} + - {fileID: 21300000, guid: cf749edb05d158d47a3e523439809960, type: 3} + - {fileID: 21300000, guid: 59b767590592a9e4685835a20cf41d69, type: 3} + - {fileID: 21300000, guid: c195730543b85df41953d682fee276b3, type: 3} + - {fileID: 21300000, guid: 1ffccabe7b991aa4283e4106fca8f9bb, type: 3} + - {fileID: 21300000, guid: a1c0872c2cf7825428b1f301727f4e1b, type: 3} + - {fileID: 21300000, guid: baa7eb63e6b2764408c3c44ea0b180ac, type: 3} + - {fileID: 21300000, guid: b5a42cffd70ab6441a230c8e772f3c56, type: 3} + - {fileID: 21300000, guid: 35322bfa3901c9145821274537244b1d, type: 3} + - {fileID: 21300000, guid: ec69df1b25263e844aa6c00cbb388ea6, type: 3} + - {fileID: 21300000, guid: 190f2e72bd4df1945b2d504efccde46c, type: 3} + - {fileID: 21300000, guid: eef4c8c406166bd4c848e87480efa2bd, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.84999996 + m_OrientationOffsetY: 0 + m_Level: 0 + m_CycleOffset: 0 + m_HasAdditiveReferencePose: 0 + m_LoopTime: 0 + m_LoopBlend: 0 + m_LoopBlendOrientation: 0 + m_LoopBlendPositionY: 0 + m_LoopBlendPositionXZ: 0 + m_KeepOriginalOrientation: 0 + m_KeepOriginalPositionY: 1 + m_KeepOriginalPositionXZ: 0 + m_HeightFromFeet: 0 + m_Mirror: 0 + m_EditorCurves: [] + m_EulerEditorCurves: [] + m_HasGenericRootTransform: 0 + m_HasMotionFloatCurves: 0 + m_Events: [] diff --git a/Assets/Game Assets/Art/Animations/AnimationClips/Player_Dead.anim.meta b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Dead.anim.meta new file mode 100644 index 0000000000..d3fb3e1cf2 --- /dev/null +++ b/Assets/Game Assets/Art/Animations/AnimationClips/Player_Dead.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 2af62fda070b94351b1c7bf616d6f221 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller b/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller index e0fed13336..f3b1396b95 100644 --- a/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller +++ b/Assets/Game Assets/Art/Animations/Animators/Ellen/PlayerAnimator.controller @@ -108,9 +108,13 @@ AnimatorStateMachine: - serializedVersion: 1 m_State: {fileID: 7035716155563237746} m_Position: {x: 380, y: 170, z: 0} + - serializedVersion: 1 + m_State: {fileID: -16955093974769600} + m_Position: {x: 240.56885, y: -71.182465, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: - {fileID: 8919909326570546917} + - {fileID: 2015622660515501458} m_EntryTransitions: [] m_StateMachineTransitions: {} m_StateMachineBehaviours: [] @@ -196,6 +200,32 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1102 &-16955093974769600 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Player_Dead + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: [] + m_StateMachineBehaviours: [] + m_Position: {x: 50, y: 50, z: 0} + m_IKOnFeet: 0 + m_WriteDefaultValues: 1 + m_Mirror: 0 + m_SpeedParameterActive: 0 + m_MirrorParameterActive: 0 + m_CycleOffsetParameterActive: 0 + m_TimeParameterActive: 0 + m_Motion: {fileID: 7400000, guid: 2af62fda070b94351b1c7bf616d6f221, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -210,25 +240,31 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Crouch m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: Jump m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} - m_Name: isGrounded m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} + m_Controller: {fileID: 0} + - m_Name: isDead + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -294,6 +330,31 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &2015622660515501458 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: isDead + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -16955093974769600} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 0 --- !u!1101 &5938351793167912262 AnimatorStateTransition: m_ObjectHideFlags: 1 diff --git a/Assets/Game Assets/Prefab/Player.prefab b/Assets/Game Assets/Prefab/Player.prefab index 11b48775e2..0af610fd46 100644 --- a/Assets/Game Assets/Prefab/Player.prefab +++ b/Assets/Game Assets/Prefab/Player.prefab @@ -198,6 +198,8 @@ MonoBehaviour: rigidbody2D: {fileID: 7252644103890736809} jumpForce: 30 scoreController: {fileID: 0} + healthController: {fileID: 0} + gameOverController: {fileID: 0} speed: 10 maxJumpHeight: 5 --- !u!1 &2534428795180559486 @@ -243,7 +245,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_BackGroundColor: {r: 0.03773582, g: 0.03773582, b: 0.03773582, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 diff --git a/Assets/Scenes/Level1.unity b/Assets/Scenes/Level1.unity index 1310943d3b..46de48f6c2 100644 --- a/Assets/Scenes/Level1.unity +++ b/Assets/Scenes/Level1.unity @@ -576,6 +576,7 @@ RectTransform: m_Children: - {fileID: 1953530439} - {fileID: 1333002890} + - {fileID: 776999278} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -660,6 +661,98 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 +--- !u!1 &776999277 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 776999278} + - component: {fileID: 776999280} + - component: {fileID: 776999279} + - component: {fileID: 776999281} + m_Layer: 5 + m_Name: GameOverUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &776999278 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 776999277} + 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_Children: + - {fileID: 798625017} + - {fileID: 1649047349} + m_Father: {fileID: 610196011} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &776999279 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 776999277} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.066037714, g: 0.066037714, b: 0.066037714, a: 0.69411767} + 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: 0} + 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 &776999280 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 776999277} + m_CullTransparentMesh: 1 +--- !u!114 &776999281 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 776999277} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7843ff72d0410456888c236b8c43b464, type: 3} + m_Name: + m_EditorClassIdentifier: + gameOverPanel: {fileID: 776999277} + restartButton: {fileID: 1649047350} --- !u!1 &788738932 GameObject: m_ObjectHideFlags: 0 @@ -735,6 +828,216 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 788738932} m_CullTransparentMesh: 1 +--- !u!1 &798625016 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 798625017} + - component: {fileID: 798625019} + - component: {fileID: 798625018} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &798625017 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 798625016} + 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_Children: [] + m_Father: {fileID: 776999278} + 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: 0} + m_SizeDelta: {x: 797, y: 683} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &798625018 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 798625016} + 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: 0.8352941} + 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: be668f8b2ae220b4ba6ed120e2613f06, 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 &798625019 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 798625016} + m_CullTransparentMesh: 1 +--- !u!1 &874502510 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 874502511} + - component: {fileID: 874502513} + - component: {fileID: 874502512} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &874502511 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 874502510} + 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_Children: [] + m_Father: {fileID: 1649047349} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &874502512 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 874502510} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Restart + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: e85f1cf0bfd4d1447bed2bc737c47be7, type: 2} + m_sharedMaterial: {fileID: 21069318434546836, guid: e85f1cf0bfd4d1447bed2bc737c47be7, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 50 + m_fontSizeBase: 50 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &874502513 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 874502510} + m_CullTransparentMesh: 1 --- !u!1 &1054651008 GameObject: m_ObjectHideFlags: 0 @@ -1912,6 +2215,127 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1631414844} m_CullTransparentMesh: 1 +--- !u!1 &1649047348 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1649047349} + - component: {fileID: 1649047352} + - component: {fileID: 1649047351} + - component: {fileID: 1649047350} + m_Layer: 5 + m_Name: RestartButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1649047349 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1649047348} + 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_Children: + - {fileID: 874502511} + m_Father: {fileID: 776999278} + 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: -555} + m_SizeDelta: {x: 320.2662, y: 106.3917} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1649047350 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1649047348} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1649047351} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1649047351 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1649047348} + 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: 21300004, guid: 7f83de9ce1b2e9a4882fa64589108f14, 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 &1649047352 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1649047348} + m_CullTransparentMesh: 1 --- !u!1 &1857259668 GameObject: m_ObjectHideFlags: 0 @@ -2385,21 +2809,11 @@ PrefabInstance: propertyPath: healthController value: objectReference: {fileID: 1333002894} - - target: {fileID: 7851594371880949575, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - propertyPath: m_BackGroundColor.b - value: 0.03773582 - objectReference: {fileID: 0} - - target: {fileID: 7851594371880949575, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - propertyPath: m_BackGroundColor.g - value: 0.03773582 - objectReference: {fileID: 0} - - target: {fileID: 7851594371880949575, guid: 2d26a819bd59c42f09e953f24c366259, + - target: {fileID: 7015224702095746497, guid: 2d26a819bd59c42f09e953f24c366259, type: 3} - propertyPath: m_BackGroundColor.r - value: 0.03773582 - objectReference: {fileID: 0} + propertyPath: gameOverController + value: + objectReference: {fileID: 776999281} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 7824a88607..7005d44473 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -1184,6 +1184,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: startButton: {fileID: 134893924} + quitButton: {fileID: 995975435} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GameOverController.cs b/Assets/Scripts/GameOverController.cs new file mode 100644 index 0000000000..12f255527a --- /dev/null +++ b/Assets/Scripts/GameOverController.cs @@ -0,0 +1,26 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.SceneManagement; +using UnityEngine.UI; + +public class GameOverController : MonoBehaviour +{ + [SerializeField] private GameObject gameOverPanel; + [SerializeField] private Button restartButton; + void Start() + { + gameOverPanel.SetActive(false); + restartButton.onClick.AddListener(RestartGame); + } + + public void ShowGameOverPanel() + { + gameOverPanel.SetActive(true); + } + + private void RestartGame() + { + SceneManager.LoadScene(SceneManager.GetActiveScene().buildIndex); + } +} diff --git a/Assets/Scripts/GameOverController.cs.meta b/Assets/Scripts/GameOverController.cs.meta new file mode 100644 index 0000000000..8288128116 --- /dev/null +++ b/Assets/Scripts/GameOverController.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7843ff72d0410456888c236b8c43b464 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/HealthController.cs b/Assets/Scripts/HealthController.cs index 31e15ea380..3e19e174ab 100644 --- a/Assets/Scripts/HealthController.cs +++ b/Assets/Scripts/HealthController.cs @@ -15,22 +15,18 @@ private void Start() UpdateHealth(hearts.Count); } - public void TakeDamage(int damage) + public float GetHealth() { - health -= damage; - UpdateHealth((int)health); - if (health <= 0) - { - Die(); - } + return health; } - public void Die() + public void TakeDamage(int damage) { - SceneManager.LoadScene(SceneManager.GetActiveScene().name); + health -= damage; + UpdateHealth((int)health); } - public void UpdateHealth(int health) + private void UpdateHealth(int health) { for (int i = 0; i < hearts.Count; i++) { diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index 8f38425def..ec65166d3d 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -11,6 +11,7 @@ public class PlayerController : MonoBehaviour [SerializeField] private float jumpForce; [SerializeField] private ScoreController scoreController; [SerializeField] private HealthController healthController; + [SerializeField] private GameOverController gameOverController; [SerializeField] private float speed; private bool isCrouching = false; @@ -126,5 +127,12 @@ private void Jump() public void TakeDamage() { healthController.TakeDamage(1); + if (healthController.GetHealth() <= 0) + { + gameOverController.ShowGameOverPanel(); + rigidbody2D.constraints = RigidbodyConstraints2D.FreezeAll; + rigidbody2D.velocity = Vector2.zero; + animator.SetBool("isDead", true); + } } } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index f05e9d3acc..9bc119f7b7 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -9,10 +9,10 @@ EditorUserSettings: value: 57575056030c5c5f5f590e7314775e4115154c737d2c73617b2d4567b0b06c3d flags: 0 RecentlyUsedSceneGuid-1: - value: 505000500454510b5a5d08241674084442164a2e7a29703228791b64b6b7363e + value: 5a000d540006590c095c5c7647770d43461548292e7022677d711830e1b4623e flags: 0 RecentlyUsedSceneGuid-2: - value: 5a000d540006590c095c5c7647770d43461548292e7022677d711830e1b4623e + value: 505000500454510b5a5d08241674084442164a2e7a29703228791b64b6b7363e flags: 0 vcSharedLogLevel: value: 0d5e400f0650 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 3386d157f5..5926c3b650 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -24,7 +24,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 16002 + controlID: 21914 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -46,9 +46,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 338 + x: 267 y: 95 - width: 844 + width: 665 height: 398.5 m_SerializedDataModeController: m_DataMode: 0 @@ -104,23 +104,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 844 + width: 665 height: 377.5 - m_Scale: {x: 0.5243056, y: 0.5243056} - m_Translation: {x: 422, y: 188.74998} + m_Scale: {x: 0.4493243, y: 0.4493243} + m_Translation: {x: 332.5, y: 188.75} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -804.87415 - y: -359.99994 - width: 1609.7483 - height: 719.99994 + x: -740 + y: -420.0752 + width: 1480 + height: 840.1504 m_MinimalGUI: 1 - m_defaultScale: 0.5243056 - m_LastWindowPixelSize: {x: 1688, y: 797} + m_defaultScale: 0.4493243 + m_LastWindowPixelSize: {x: 1330, y: 797} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 00000000000000000000 @@ -140,17 +140,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 4} - - {fileID: 10} + - {fileID: 9} m_Position: serializedVersion: 2 x: 0 y: 0 - width: 1184 + width: 934 height: 779 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 16003 + controlID: 21915 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -170,12 +170,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1184 + width: 934 height: 419.5 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 16004 + controlID: 21906 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -193,7 +193,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 338 + width: 267 height: 419.5 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} @@ -225,7 +225,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 95 - width: 337 + width: 266 height: 398.5 m_SerializedDataModeController: m_DataMode: 0 @@ -240,9 +240,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: e8b7ffff - m_LastClickedID: -18456 - m_ExpandedIDs: aca4ffffe8b7ffff3cb8ffffd4b8ffff66f9ffff24fbffff645b0000a65b0000 + m_SelectedIDs: de83ffff + m_LastClickedID: 0 + m_ExpandedIDs: b09affffe29dffff729effffaca4ffffe8b7ffff3cb8ffffd4b8ffff66f9ffff24fbffff645b0000a65b0000b29a0000189b0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -258,7 +258,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 5} + m_ClientGUIView: {fileID: 0} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -281,9 +281,9 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 338 + x: 267 y: 0 - width: 846 + width: 667 height: 419.5 m_MinSize: {x: 102, y: 121} m_MaxSize: {x: 4002, y: 4021} @@ -291,7 +291,6 @@ MonoBehaviour: m_Panes: - {fileID: 8} - {fileID: 2} - - {fileID: 9} m_Selected: 1 m_LastSelected: 0 --- !u!114 &8 @@ -315,9 +314,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 338 + x: 267 y: 95 - width: 844 + width: 665 height: 398.5 m_SerializedDataModeController: m_DataMode: 0 @@ -703,9 +702,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1501.1118, y: 540.93286, z: -1.3594198} + m_Target: {x: 2.101471, y: 1.2815512, z: -8.341415} speed: 2 - m_Value: {x: 1501.1118, y: 540.93286, z: -1.3594198} + m_Value: {x: 2.101471, y: 1.2815512, z: -8.341415} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -755,9 +754,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 294.0548 + m_Target: 7.255017 speed: 2 - m_Value: 294.0548 + m_Value: 7.255017 m_Ortho: m_Target: 1 speed: 2 @@ -783,44 +782,6 @@ MonoBehaviour: m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 --- !u!114 &9 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Animation - m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, - type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 284 - y: 95 - width: 707.5 - height: 398.5 - m_SerializedDataModeController: - m_DataMode: 0 - m_PreferredDataMode: 0 - m_SupportedDataModes: - isAutomatic: 1 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_OverlaysVisible: 1 - m_LockTracker: - m_IsLocked: 0 - m_LastSelectedObjectID: -18810 ---- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -830,25 +791,26 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: AnimatorControllerTool m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 y: 419.5 - width: 1184 + width: 934 height: 359.5 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 11} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 12} m_Panes: + - {fileID: 10} - {fileID: 11} - {fileID: 12} - {fileID: 13} - m_Selected: 0 - m_LastSelected: 0 ---- !u!114 &11 + m_Selected: 2 + m_LastSelected: 3 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -871,7 +833,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 514.5 - width: 1183 + width: 1137 height: 338.5 m_SerializedDataModeController: m_DataMode: 0 @@ -894,7 +856,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Game Assets/Art/Animations/AnimationClips m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -902,16 +864,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 96 m_LastFolders: - - Assets + - Assets/Game Assets/Art/Animations/AnimationClips m_LastFoldersGridSize: 96 m_LastProjectPath: /Users/zain/2D-Platformer-Game m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 79} - m_SelectedIDs: da5d0000 - m_LastClickedID: 24026 - m_ExpandedIDs: 00000000da5d000000ca9a3bffffff7f + m_SelectedIDs: 6ea70000 + m_LastClickedID: 42862 + m_ExpandedIDs: 00000000da5d0000e4690000146a0000166a000000ca9a3bffffff7f m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -964,8 +926,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: e8b7ffff - m_LastClickedInstanceID: -18456 + m_SelectedInstanceIDs: 529effff + m_LastClickedInstanceID: -25006 m_HadKeyboardFocusLastEvent: 0 m_ExpandedInstanceIDs: c6230000d87c0000e67c000092a80000f2ac00005e7f00002cb900006c9f000034ba000036bb00009a7f0000947e00002a580100a85c0100667f0000b88700004a7e00005a7c0000fe7d00001aa00000687f00006a7f0000189f0000f87f00005c530400369e0000e88a0000e48a00006e5b0000de6900004a6a0000da690000f25b00001683000000000000 m_RenameOverlay: @@ -995,7 +957,7 @@ MonoBehaviour: m_GridSize: 96 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 207 ---- !u!114 &12 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1018,7 +980,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 514.5 - width: 992.5 + width: 1137 height: 338.5 m_SerializedDataModeController: m_DataMode: 0 @@ -1030,7 +992,7 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 ---- !u!114 &13 +--- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1053,7 +1015,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 514.5 - width: 992.5 + width: 933 height: 338.5 m_SerializedDataModeController: m_DataMode: 0 @@ -1156,14 +1118,14 @@ MonoBehaviour: e31: 0 e32: 0 e33: 1 - - e00: 0.62402505 + - e00: 0.8142528 e01: 0 e02: 0 - e03: -55.59482 + e03: -50.807312 e10: 0 - e11: 0.62402505 + e11: 0.8142528 e12: 0 - e13: 39.253593 + e13: 82.388084 e20: 0 e21: 0 e22: 1 @@ -1222,6 +1184,44 @@ MonoBehaviour: m_CurrentEditor: 1 m_LayerEditor: m_SelectedLayerIndex: 0 +--- !u!114 &13 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12071, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animation + m_Image: {fileID: -3237396543322336831, guid: 0000000000000000d000000000000000, + type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 0 + y: 514.5 + width: 1137 + height: 338.5 + m_SerializedDataModeController: + m_DataMode: 0 + m_PreferredDataMode: 0 + m_SupportedDataModes: + isAutomatic: 1 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_OverlaysVisible: 1 + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: -25006 --- !u!114 &14 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1237,12 +1237,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1184 + x: 934 y: 0 - width: 286 + width: 536 height: 779 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 15} m_Panes: - {fileID: 15} @@ -1270,9 +1270,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1184 + x: 934 y: 95 - width: 285 + width: 535 height: 758 m_SerializedDataModeController: m_DataMode: 0 @@ -1291,7 +1291,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 76 + m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: From 1eec887476dc95aacbcc37b1f32a1ab0f403153e Mon Sep 17 00:00:00 2001 From: Syed zainul abedin Date: Fri, 19 Jan 2024 17:44:55 +0530 Subject: [PATCH 19/26] feat: Added level selection logic --- Assets/Game Assets/Prefab/UI.meta | 8 + .../Game Assets/Prefab/UI/GameOverUI.prefab | 682 ++++ .../Prefab/UI/GameOverUI.prefab.meta | 7 + .../Game Assets/Prefab/UI/LevelButton.prefab | 272 ++ .../Prefab/UI/LevelButton.prefab.meta | 7 + Assets/Scenes/Level1.unity | 637 ++-- Assets/Scenes/Level2.unity | 1340 ++++++-- Assets/Scenes/Level2.unity.meta | 2 +- Assets/Scenes/Level3.unity | 2779 +++++++++++++++++ Assets/Scenes/Level3.unity.meta | 7 + Assets/Scenes/MainMenu.unity | 1006 +++++- Assets/Scripts/GameOverController.cs | 9 +- Assets/Scripts/LevelSelector.cs | 21 + Assets/Scripts/LevelSelector.cs.meta | 11 + Assets/Scripts/MainMenu.cs | 7 +- ProjectSettings/EditorBuildSettings.asset | 3 + UserSettings/EditorUserSettings.asset | 4 +- .../Layouts/CurrentMaximizeLayout.dwlt | 68 +- UserSettings/Layouts/default-2022.dwlt | 128 +- 19 files changed, 6183 insertions(+), 815 deletions(-) create mode 100644 Assets/Game Assets/Prefab/UI.meta create mode 100644 Assets/Game Assets/Prefab/UI/GameOverUI.prefab create mode 100644 Assets/Game Assets/Prefab/UI/GameOverUI.prefab.meta create mode 100644 Assets/Game Assets/Prefab/UI/LevelButton.prefab create mode 100644 Assets/Game Assets/Prefab/UI/LevelButton.prefab.meta create mode 100644 Assets/Scenes/Level3.unity create mode 100644 Assets/Scenes/Level3.unity.meta create mode 100644 Assets/Scripts/LevelSelector.cs create mode 100644 Assets/Scripts/LevelSelector.cs.meta diff --git a/Assets/Game Assets/Prefab/UI.meta b/Assets/Game Assets/Prefab/UI.meta new file mode 100644 index 0000000000..5e45f10e4d --- /dev/null +++ b/Assets/Game Assets/Prefab/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 308060673a9d343c5a7a10a3b177c86f +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Prefab/UI/GameOverUI.prefab b/Assets/Game Assets/Prefab/UI/GameOverUI.prefab new file mode 100644 index 0000000000..3a38c7e232 --- /dev/null +++ b/Assets/Game Assets/Prefab/UI/GameOverUI.prefab @@ -0,0 +1,682 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2719193495642876784 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 374247089292581555} + - component: {fileID: 7989261822250625740} + - component: {fileID: 7913754248175387908} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &374247089292581555 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2719193495642876784} + 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_Children: [] + m_Father: {fileID: 4818131760437644056} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7989261822250625740 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2719193495642876784} + m_CullTransparentMesh: 1 +--- !u!114 &7913754248175387908 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2719193495642876784} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Restart + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: e85f1cf0bfd4d1447bed2bc737c47be7, type: 2} + m_sharedMaterial: {fileID: 21069318434546836, guid: e85f1cf0bfd4d1447bed2bc737c47be7, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 50 + m_fontSizeBase: 50 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &3869229548756008630 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5739155011791152470} + - component: {fileID: 5457579302790143738} + - component: {fileID: 4578669234272173466} + - component: {fileID: 5109888935030558080} + m_Layer: 5 + m_Name: GameOverUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5739155011791152470 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3869229548756008630} + 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_Children: + - {fileID: 5927013391916905091} + - {fileID: 4818131760437644056} + - {fileID: 7391848958958019845} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5457579302790143738 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3869229548756008630} + m_CullTransparentMesh: 1 +--- !u!114 &4578669234272173466 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3869229548756008630} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.066037714, g: 0.066037714, b: 0.066037714, a: 0.69411767} + 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: 0} + 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!114 &5109888935030558080 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3869229548756008630} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7843ff72d0410456888c236b8c43b464, type: 3} + m_Name: + m_EditorClassIdentifier: + gameOverPanel: {fileID: 3869229548756008630} + restartButton: {fileID: 9103638121462393919} +--- !u!1 &4337750483543232297 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6416546690846924414} + - component: {fileID: 4211858640803393982} + - component: {fileID: 7616476779295738464} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6416546690846924414 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4337750483543232297} + 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_Children: [] + m_Father: {fileID: 7391848958958019845} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4211858640803393982 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4337750483543232297} + m_CullTransparentMesh: 1 +--- !u!114 &7616476779295738464 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4337750483543232297} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Menu + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: e85f1cf0bfd4d1447bed2bc737c47be7, type: 2} + m_sharedMaterial: {fileID: 21069318434546836, guid: e85f1cf0bfd4d1447bed2bc737c47be7, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 50 + m_fontSizeBase: 50 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4615281284302608359 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7391848958958019845} + - component: {fileID: 5660283805514209976} + - component: {fileID: 9021498488566804285} + - component: {fileID: 8423806484672142499} + m_Layer: 5 + m_Name: Menu + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7391848958958019845 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4615281284302608359} + 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_Children: + - {fileID: 6416546690846924414} + m_Father: {fileID: 5739155011791152470} + 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: -538.5} + m_SizeDelta: {x: 320.2662, y: 106.3917} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5660283805514209976 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4615281284302608359} + m_CullTransparentMesh: 1 +--- !u!114 &9021498488566804285 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4615281284302608359} + 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: 21300004, guid: 347c9750b492608498affdb981cbf7f1, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 0.28 +--- !u!114 &8423806484672142499 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4615281284302608359} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 9021498488566804285} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &6073659202099179107 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5927013391916905091} + - component: {fileID: 7432121119774137401} + - component: {fileID: 5953632601427319092} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5927013391916905091 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6073659202099179107} + 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_Children: [] + m_Father: {fileID: 5739155011791152470} + 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: 0} + m_SizeDelta: {x: 797, y: 683} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7432121119774137401 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6073659202099179107} + m_CullTransparentMesh: 1 +--- !u!114 &5953632601427319092 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6073659202099179107} + 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: 0.8352941} + 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: be668f8b2ae220b4ba6ed120e2613f06, 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 &7905590748434035837 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4818131760437644056} + - component: {fileID: 2479083435635594386} + - component: {fileID: 6080736284045848049} + - component: {fileID: 9103638121462393919} + m_Layer: 5 + m_Name: RestartButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4818131760437644056 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7905590748434035837} + 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_Children: + - {fileID: 374247089292581555} + m_Father: {fileID: 5739155011791152470} + 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: -437} + m_SizeDelta: {x: 320.2662, y: 106.3917} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2479083435635594386 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7905590748434035837} + m_CullTransparentMesh: 1 +--- !u!114 &6080736284045848049 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7905590748434035837} + 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: 21300004, guid: 347c9750b492608498affdb981cbf7f1, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 0.28 +--- !u!114 &9103638121462393919 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7905590748434035837} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 6080736284045848049} + m_OnClick: + m_PersistentCalls: + m_Calls: [] diff --git a/Assets/Game Assets/Prefab/UI/GameOverUI.prefab.meta b/Assets/Game Assets/Prefab/UI/GameOverUI.prefab.meta new file mode 100644 index 0000000000..00abf0c991 --- /dev/null +++ b/Assets/Game Assets/Prefab/UI/GameOverUI.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: a65d78e51dd624f7d86cb2da98691146 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Game Assets/Prefab/UI/LevelButton.prefab b/Assets/Game Assets/Prefab/UI/LevelButton.prefab new file mode 100644 index 0000000000..fee0a15aa5 --- /dev/null +++ b/Assets/Game Assets/Prefab/UI/LevelButton.prefab @@ -0,0 +1,272 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &863527246293882139 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2101117273414878397} + - component: {fileID: 8976145330473083162} + - component: {fileID: 795405308824884250} + - component: {fileID: 8463175498560760579} + - component: {fileID: 1566057710304737209} + m_Layer: 5 + m_Name: LevelButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2101117273414878397 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 863527246293882139} + 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_Children: + - {fileID: 4472400545073661099} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 200, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8976145330473083162 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 863527246293882139} + m_CullTransparentMesh: 1 +--- !u!114 &795405308824884250 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 863527246293882139} + 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: 21300004, guid: 347c9750b492608498affdb981cbf7f1, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 0.15 +--- !u!114 &8463175498560760579 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 863527246293882139} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 795405308824884250} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1566057710304737209 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 863527246293882139} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b2e6922718c0a419d9c1b7dac1ce9190, type: 3} + m_Name: + m_EditorClassIdentifier: + levelIndex: 1 +--- !u!1 &7677432926222722718 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4472400545073661099} + - component: {fileID: 2385053778249153325} + - component: {fileID: 7015698388595687519} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4472400545073661099 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7677432926222722718} + 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_Children: [] + m_Father: {fileID: 2101117273414878397} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2385053778249153325 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7677432926222722718} + m_CullTransparentMesh: 1 +--- !u!114 &7015698388595687519 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7677432926222722718} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Level 1 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: e85f1cf0bfd4d1447bed2bc737c47be7, type: 2} + m_sharedMaterial: {fileID: 21069318434546836, guid: e85f1cf0bfd4d1447bed2bc737c47be7, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 50 + m_fontSizeBase: 50 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Game Assets/Prefab/UI/LevelButton.prefab.meta b/Assets/Game Assets/Prefab/UI/LevelButton.prefab.meta new file mode 100644 index 0000000000..b38e763bc1 --- /dev/null +++ b/Assets/Game Assets/Prefab/UI/LevelButton.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2be3c0c12b774445089a22809ea52212 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Level1.unity b/Assets/Scenes/Level1.unity index 46de48f6c2..3d48e446eb 100644 --- a/Assets/Scenes/Level1.unity +++ b/Assets/Scenes/Level1.unity @@ -480,6 +480,37 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 0.9457176} m_EdgeRadius: 0 +--- !u!1 &600689289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 600689290} + m_Layer: 0 + m_Name: ----Level---- + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &600689290 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 600689289} + serializedVersion: 2 + 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_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &610196007 GameObject: m_ObjectHideFlags: 0 @@ -661,98 +692,24 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 ---- !u!1 &776999277 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 776999278} - - component: {fileID: 776999280} - - component: {fileID: 776999279} - - component: {fileID: 776999281} - m_Layer: 5 - m_Name: GameOverUI - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &776999278 +--- !u!224 &776999278 stripped RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 776999277} - 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_Children: - - {fileID: 798625017} - - {fileID: 1649047349} - m_Father: {fileID: 610196011} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &776999279 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 776999277} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.066037714, g: 0.066037714, b: 0.066037714, a: 0.69411767} - 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: 0} - 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 &776999280 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + m_PrefabInstance: {fileID: 3964863024506580846} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 776999277} - m_CullTransparentMesh: 1 ---- !u!114 &776999281 +--- !u!114 &776999281 stripped MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 5109888935030558080, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + m_PrefabInstance: {fileID: 3964863024506580846} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 776999277} + m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 7843ff72d0410456888c236b8c43b464, type: 3} m_Name: m_EditorClassIdentifier: - gameOverPanel: {fileID: 776999277} - restartButton: {fileID: 1649047350} --- !u!1 &788738932 GameObject: m_ObjectHideFlags: 0 @@ -828,216 +785,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 788738932} m_CullTransparentMesh: 1 ---- !u!1 &798625016 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 798625017} - - component: {fileID: 798625019} - - component: {fileID: 798625018} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &798625017 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 798625016} - 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_Children: [] - m_Father: {fileID: 776999278} - 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: 0} - m_SizeDelta: {x: 797, y: 683} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &798625018 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 798625016} - 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: 0.8352941} - 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: be668f8b2ae220b4ba6ed120e2613f06, 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 &798625019 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 798625016} - m_CullTransparentMesh: 1 ---- !u!1 &874502510 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 874502511} - - component: {fileID: 874502513} - - component: {fileID: 874502512} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &874502511 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 874502510} - 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_Children: [] - m_Father: {fileID: 1649047349} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &874502512 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 874502510} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Restart - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: e85f1cf0bfd4d1447bed2bc737c47be7, type: 2} - m_sharedMaterial: {fileID: 21069318434546836, guid: e85f1cf0bfd4d1447bed2bc737c47be7, - type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 50 - m_fontSizeBase: 50 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &874502513 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 874502510} - m_CullTransparentMesh: 1 --- !u!1 &1054651008 GameObject: m_ObjectHideFlags: 0 @@ -2014,6 +1761,37 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1299748685 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1299748686} + m_Layer: 0 + m_Name: ----------- + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1299748686 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1299748685} + serializedVersion: 2 + 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_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1333002889 GameObject: m_ObjectHideFlags: 0 @@ -2215,127 +1993,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1631414844} m_CullTransparentMesh: 1 ---- !u!1 &1649047348 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1649047349} - - component: {fileID: 1649047352} - - component: {fileID: 1649047351} - - component: {fileID: 1649047350} - m_Layer: 5 - m_Name: RestartButton - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1649047349 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1649047348} - 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_Children: - - {fileID: 874502511} - m_Father: {fileID: 776999278} - 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: -555} - m_SizeDelta: {x: 320.2662, y: 106.3917} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1649047350 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1649047348} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1649047351} - m_OnClick: - m_PersistentCalls: - m_Calls: [] ---- !u!114 &1649047351 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1649047348} - 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: 21300004, guid: 7f83de9ce1b2e9a4882fa64589108f14, 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 &1649047352 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1649047348} - m_CullTransparentMesh: 1 --- !u!1 &1857259668 GameObject: m_ObjectHideFlags: 0 @@ -2614,6 +2271,37 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9019b8104c79482aac1e8599f63d4fb8, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &2039470345 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2039470346} + m_Layer: 0 + m_Name: ----UI----- + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2039470346 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2039470345} + serializedVersion: 2 + 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_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &2055596504 stripped Transform: m_CorrespondingSourceObject: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, @@ -2819,6 +2507,124 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2d26a819bd59c42f09e953f24c366259, type: 3} +--- !u!1001 &3964863024506580846 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 610196011} + m_Modifications: + - target: {fileID: 3869229548756008630, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_Name + value: GameOverUI + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a65d78e51dd624f7d86cb2da98691146, type: 3} --- !u!1001 &4450895270237833664 PrefabInstance: m_ObjectHideFlags: 0 @@ -2964,7 +2770,10 @@ SceneRoots: - {fileID: 4354828} - {fileID: 1857259671} - {fileID: 1275231957} + - {fileID: 600689290} - {fileID: 2107246408} + - {fileID: 1299748686} - {fileID: 1412279564} + - {fileID: 2039470346} - {fileID: 610196011} - {fileID: 1054651011} diff --git a/Assets/Scenes/Level2.unity b/Assets/Scenes/Level2.unity index 3169f700bf..3d48e446eb 100644 --- a/Assets/Scenes/Level2.unity +++ b/Assets/Scenes/Level2.unity @@ -264,6 +264,7 @@ GameObject: m_Component: - component: {fileID: 49351569} - component: {fileID: 49351570} + - component: {fileID: 49351571} m_Layer: 0 m_Name: LevelEnd m_TagString: Untagged @@ -315,7 +316,7 @@ BoxCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} @@ -331,74 +332,24 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 ---- !u!1 &221009003 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 221009006} - - component: {fileID: 221009005} - - component: {fileID: 221009004} - m_Layer: 0 - m_Name: EventSystem - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &221009004 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 221009003} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 ---- !u!114 &221009005 +--- !u!114 &49351571 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 221009003} + m_GameObject: {fileID: 49351568} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Script: {fileID: 11500000, guid: f9451ad9a7bb543c0b34f61f62d85e38, type: 3} m_Name: m_EditorClassIdentifier: - m_FirstSelected: {fileID: 0} - m_sendNavigationEvents: 1 - m_DragThreshold: 10 ---- !u!4 &221009006 +--- !u!4 &188380161 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + m_PrefabInstance: {fileID: 4450895270237833664} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 221009003} - serializedVersion: 2 - 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_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &282281674 GameObject: m_ObjectHideFlags: 0 @@ -529,7 +480,7 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 0.9457176} m_EdgeRadius: 0 ---- !u!1 &613862172 +--- !u!1 &600689289 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -537,90 +488,133 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 613862175} - - component: {fileID: 613862174} - - component: {fileID: 613862173} + - component: {fileID: 600689290} m_Layer: 0 - m_Name: Camera + m_Name: ----Level---- m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!81 &613862173 -AudioListener: +--- !u!4 &600689290 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 613862172} - m_Enabled: 1 ---- !u!20 &613862174 -Camera: + m_GameObject: {fileID: 600689289} + serializedVersion: 2 + 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_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &610196007 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 610196011} + - component: {fileID: 610196010} + - component: {fileID: 610196009} + - component: {fileID: 610196008} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &610196008 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 613862172} + m_GameObject: {fileID: 610196007} m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_Iso: 200 - m_ShutterSpeed: 0.005 - m_Aperture: 16 - m_FocusDistance: 10 - m_FocalLength: 50 - m_BladeCount: 5 - m_Curvature: {x: 2, y: 11} - m_BarrelClipping: 0.25 - m_Anamorphism: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} +--- !u!114 &610196009 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 610196007} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &610196010 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 610196007} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!4 &613862175 -Transform: +--- !u!224 &610196011 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 613862172} - serializedVersion: 2 + m_GameObject: {fileID: 610196007} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1529.2927, y: 477.8936, z: -2.812845} - m_LocalScale: {x: 1, y: 1, z: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1953530439} + - {fileID: 1333002890} + - {fileID: 776999278} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} --- !u!1 &692167323 GameObject: m_ObjectHideFlags: 0 @@ -682,7 +676,7 @@ BoxCollider2D: m_CallbackLayers: serializedVersion: 2 m_Bits: 4294967295 - m_IsTrigger: 0 + m_IsTrigger: 1 m_UsedByEffector: 0 m_UsedByComposite: 0 m_Offset: {x: 0, y: 0} @@ -698,6 +692,167 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1, y: 1} m_EdgeRadius: 0 +--- !u!224 &776999278 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + m_PrefabInstance: {fileID: 3964863024506580846} + m_PrefabAsset: {fileID: 0} +--- !u!114 &776999281 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5109888935030558080, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + m_PrefabInstance: {fileID: 3964863024506580846} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7843ff72d0410456888c236b8c43b464, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &788738932 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 788738933} + - component: {fileID: 788738935} + - component: {fileID: 788738934} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &788738933 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 788738932} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1333002890} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &788738934 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 788738932} + 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: 21300010, guid: fc49794cc535bef4f969645c4eb97b80, 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 &788738935 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 788738932} + m_CullTransparentMesh: 1 +--- !u!1 &1054651008 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1054651011} + - component: {fileID: 1054651010} + - component: {fileID: 1054651009} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1054651009 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1054651008} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1054651010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1054651008} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1054651011 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1054651008} + serializedVersion: 2 + 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_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1139415633 GameObject: m_ObjectHideFlags: 0 @@ -712,7 +867,7 @@ GameObject: - component: {fileID: 1139415637} m_Layer: 0 m_Name: TileMap - m_TagString: Untagged + m_TagString: Platform m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 @@ -1033,18 +1188,48 @@ Tilemap: - first: {x: 27, y: -4, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 1 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 32, y: -4, z: 0} + - first: {x: 28, y: -4, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 29, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 30, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 31, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1110,17 +1295,17 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 40, y: -4, z: 0} + - first: {x: 41, y: -4, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 - m_TileMatrixIndex: 1 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 14, y: -3, z: 0} + - first: {x: 42, y: -4, z: 0} second: serializedVersion: 2 m_TileIndex: 1 @@ -1130,7 +1315,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 16, y: -3, z: 0} + - first: {x: 43, y: -4, z: 0} second: serializedVersion: 2 m_TileIndex: 1 @@ -1140,7 +1325,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 36, y: -3, z: 0} + - first: {x: 44, y: -4, z: 0} second: serializedVersion: 2 m_TileIndex: 1 @@ -1150,7 +1335,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 37, y: -3, z: 0} + - first: {x: 45, y: -4, z: 0} second: serializedVersion: 2 m_TileIndex: 1 @@ -1160,7 +1345,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 14, y: -2, z: 0} + - first: {x: 46, y: -4, z: 0} second: serializedVersion: 2 m_TileIndex: 1 @@ -1170,7 +1355,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 16, y: -2, z: 0} + - first: {x: 47, y: -4, z: 0} second: serializedVersion: 2 m_TileIndex: 1 @@ -1180,17 +1365,17 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 35, y: -2, z: 0} + - first: {x: 14, y: -3, z: 0} second: serializedVersion: 2 - m_TileIndex: 2 - m_TileSpriteIndex: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 36, y: -2, z: 0} + - first: {x: 16, y: -3, z: 0} second: serializedVersion: 2 m_TileIndex: 1 @@ -1200,11 +1385,21 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 37, y: -2, z: 0} + - first: {x: 14, y: -2, z: 0} second: serializedVersion: 2 - m_TileIndex: 2 - m_TileSpriteIndex: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 16, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -1242,21 +1437,21 @@ Tilemap: m_AllTileFlags: 1073741825 m_AnimatedTiles: {} m_TileAssetArray: - - m_RefCount: 5 + - m_RefCount: 2 m_Data: {fileID: 11400000, guid: cdf3aa23cf36b4a9a9c4147163173313, type: 2} - - m_RefCount: 34 + - m_RefCount: 43 m_Data: {fileID: 11400000, guid: 1dfabe381ebee48b485e1520f0f664eb, type: 2} - - m_RefCount: 6 + - m_RefCount: 4 m_Data: {fileID: 11400000, guid: f599eca27ab804acdaf363a77b9c0937, type: 2} m_TileSpriteArray: - - m_RefCount: 5 + - m_RefCount: 2 m_Data: {fileID: 21300000, guid: 804743266b3b62d428e86255220b6694, type: 3} - - m_RefCount: 34 + - m_RefCount: 43 m_Data: {fileID: 21300000, guid: 6aa3a976ac9ecc54aad638ffbf4e67c6, type: 3} - - m_RefCount: 6 + - m_RefCount: 4 m_Data: {fileID: 21300000, guid: 62d2808515efe6d4897f8d8cd5218f31, type: 3} m_TileMatrixArray: - - m_RefCount: 43 + - m_RefCount: 49 m_Data: e00: 1 e01: 0 @@ -1274,7 +1469,7 @@ Tilemap: e31: 0 e32: 0 e33: 1 - - m_RefCount: 2 + - m_RefCount: 0 m_Data: e00: -0.9876882 e01: 0 @@ -1293,13 +1488,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 45 + - m_RefCount: 49 m_Data: {r: 1, g: 1, b: 1, a: 1} m_TileObjectToInstantiateArray: [] m_AnimationFrameRate: 1 m_Color: {r: 1, g: 1, b: 1, a: 1} m_Origin: {x: 0, y: -4, z: 0} - m_Size: {x: 41, y: 5, z: 1} + m_Size: {x: 48, y: 5, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -1355,6 +1550,87 @@ TilemapCollider2D: m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0 m_UseDelaunayMesh: 0 +--- !u!1 &1248432746 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1248432747} + - component: {fileID: 1248432749} + - component: {fileID: 1248432748} + m_Layer: 5 + m_Name: Image (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1248432747 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1248432746} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1333002890} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1248432748 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1248432746} + 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: 21300010, guid: fc49794cc535bef4f969645c4eb97b80, 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 &1248432749 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1248432746} + m_CullTransparentMesh: 1 +--- !u!4 &1274176838 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + m_PrefabInstance: {fileID: 4984790873687906411} + m_PrefabAsset: {fileID: 0} --- !u!1 &1275231954 GameObject: m_ObjectHideFlags: 0 @@ -1485,6 +1761,130 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1299748685 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1299748686} + m_Layer: 0 + m_Name: ----------- + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1299748686 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1299748685} + serializedVersion: 2 + 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_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1333002889 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1333002890} + - component: {fileID: 1333002892} + - component: {fileID: 1333002893} + - component: {fileID: 1333002894} + m_Layer: 5 + m_Name: Hearts + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1333002890 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1333002889} + 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_Children: + - {fileID: 788738933} + - {fileID: 1631414845} + - {fileID: 1248432747} + m_Father: {fileID: 610196011} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 112, y: -140} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1333002892 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1333002889} + m_CullTransparentMesh: 1 +--- !u!114 &1333002893 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1333002889} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &1333002894 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1333002889} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 577e533071be5486eb82a54c36065088, type: 3} + m_Name: + m_EditorClassIdentifier: + hearts: + - {fileID: 1248432748} + - {fileID: 1631414846} + - {fileID: 788738934} + fullHeart: {fileID: 21300010, guid: fc49794cc535bef4f969645c4eb97b80, type: 3} + emptyHeart: {fileID: 21300000, guid: fc49794cc535bef4f969645c4eb97b80, type: 3} --- !u!1 &1412279563 GameObject: m_ObjectHideFlags: 0 @@ -1500,7 +1900,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1412279564 Transform: m_ObjectHideFlags: 0 @@ -1518,6 +1918,81 @@ Transform: - {fileID: 49351569} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1631414844 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1631414845} + - component: {fileID: 1631414847} + - component: {fileID: 1631414846} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1631414845 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631414844} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1333002890} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1631414846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631414844} + 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: 21300010, guid: fc49794cc535bef4f969645c4eb97b80, 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 &1631414847 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631414844} + m_CullTransparentMesh: 1 --- !u!1 &1857259668 GameObject: m_ObjectHideFlags: 0 @@ -1648,7 +2123,7 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1900638844 +--- !u!1 &1953530438 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1656,42 +2131,43 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1900638845} - - component: {fileID: 1900638847} - - component: {fileID: 1900638846} + - component: {fileID: 1953530439} + - component: {fileID: 1953530441} + - component: {fileID: 1953530440} + - component: {fileID: 1953530442} m_Layer: 5 - m_Name: Text (TMP) + m_Name: ScoreLabel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1900638845 +--- !u!224 &1953530439 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1900638844} + m_GameObject: {fileID: 1953530438} 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_Children: [] - m_Father: {fileID: 2107974181} + m_Father: {fileID: 610196011} 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: -11.6} - m_SizeDelta: {x: 322.5294, y: 80.6324} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 210.9961, y: -46.431335} + m_SizeDelta: {x: 301.9923, y: 56.2627} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1900638846 +--- !u!114 &1953530440 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1900638844} + m_GameObject: {fileID: 1953530438} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -1705,10 +2181,11 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Level 1 Completed! + m_text: 'Score:' m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: e85f1cf0bfd4d1447bed2bc737c47be7, type: 2} + m_sharedMaterial: {fileID: 21069318434546836, guid: e85f1cf0bfd4d1447bed2bc737c47be7, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -1732,15 +2209,15 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 + m_fontSize: 50 + m_fontSizeBase: 50 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 512 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 @@ -1774,60 +2251,64 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1900638847 +--- !u!222 &1953530441 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1900638844} + m_GameObject: {fileID: 1953530438} m_CullTransparentMesh: 1 ---- !u!1 &2107246407 -GameObject: +--- !u!114 &1953530442 +MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2107246408} - - component: {fileID: 2107246409} + m_GameObject: {fileID: 1953530438} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9019b8104c79482aac1e8599f63d4fb8, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &2039470345 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2039470346} m_Layer: 0 - m_Name: LevelDesign + m_Name: ----UI----- m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &2107246408 + m_IsActive: 1 +--- !u!4 &2039470346 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2107246407} + m_GameObject: {fileID: 2039470345} serializedVersion: 2 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_Children: - - {fileID: 1139415634} + m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!156049354 &2107246409 -Grid: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} +--- !u!4 &2055596504 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + m_PrefabInstance: {fileID: 484190929103018125} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2107246407} - m_Enabled: 1 - m_CellSize: {x: 1, y: 1, z: 1} - m_CellGap: {x: 0, y: 0, z: 0} - m_CellLayout: 0 - m_CellSwizzle: 0 ---- !u!1 &2107974177 +--- !u!1 &2107246407 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1835,100 +2316,114 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2107974181} - - component: {fileID: 2107974180} - - component: {fileID: 2107974179} - - component: {fileID: 2107974178} - m_Layer: 5 - m_Name: Canvas + - component: {fileID: 2107246408} + - component: {fileID: 2107246409} + m_Layer: 0 + m_Name: LevelDesign m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &2107974178 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2107974177} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &2107974179 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2107974177} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 0 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 800, y: 600} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &2107974180 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2107974177} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &2107974181 -RectTransform: +--- !u!4 &2107246408 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2107974177} + m_GameObject: {fileID: 2107246407} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1900638845} + - {fileID: 1139415634} + - {fileID: 2055596504} + - {fileID: 188380161} + - {fileID: 1274176838} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} +--- !u!156049354 &2107246409 +Grid: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107246407} + m_Enabled: 1 + m_CellSize: {x: 1, y: 1, z: 1} + m_CellGap: {x: 0, y: 0, z: 0} + m_CellLayout: 0 + m_CellSwizzle: 0 +--- !u!1001 &484190929103018125 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2107246408} + m_Modifications: + - target: {fileID: 3247414073640957559, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_Name + value: Key + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalPosition.x + value: 15.36 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.4 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, type: 3} --- !u!1001 &2101336368777957266 PrefabInstance: m_ObjectHideFlags: 0 @@ -1942,15 +2437,10 @@ PrefabInstance: propertyPath: m_Name value: Player objectReference: {fileID: 0} - - target: {fileID: 328097028837166983, guid: 2d26a819bd59c42f09e953f24c366259, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 1.86 objectReference: {fileID: 0} - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, type: 3} @@ -1997,26 +2487,280 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6712255127414498175, guid: 2d26a819bd59c42f09e953f24c366259, + - target: {fileID: 7015224702095746497, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: scoreController + value: + objectReference: {fileID: 1953530442} + - target: {fileID: 7015224702095746497, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: healthController + value: + objectReference: {fileID: 1333002894} + - target: {fileID: 7015224702095746497, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: gameOverController + value: + objectReference: {fileID: 776999281} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2d26a819bd59c42f09e953f24c366259, type: 3} +--- !u!1001 &3964863024506580846 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 610196011} + m_Modifications: + - target: {fileID: 3869229548756008630, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_Name + value: GameOverUI + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a65d78e51dd624f7d86cb2da98691146, type: 3} +--- !u!1001 &4450895270237833664 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2107246408} + m_Modifications: + - target: {fileID: 4240479789766735715, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_Name + value: Chomper + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalPosition.x + value: 21.93 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.4 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 28fcdca5ad40a430f8d536e210abf4fc, type: 3} +--- !u!1001 &4984790873687906411 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2107246408} + m_Modifications: + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalPosition.x + value: 35.51 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, type: 3} propertyPath: m_LocalPosition.y - value: 1.24 + value: -2.43 objectReference: {fileID: 0} - - target: {fileID: 7015224702095746497, guid: 2d26a819bd59c42f09e953f24c366259, + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, type: 3} - propertyPath: jumpForce - value: 30 + propertyPath: m_LocalPosition.z + value: 0 objectReference: {fileID: 0} - - target: {fileID: 7015224702095746497, guid: 2d26a819bd59c42f09e953f24c366259, + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, type: 3} - propertyPath: maxJumpHeight - value: 5 + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4886885305723851823, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_Name + value: Gunner objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2d26a819bd59c42f09e953f24c366259, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 6a06b6176412d40a786530ee70704738, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 @@ -2026,8 +2770,10 @@ SceneRoots: - {fileID: 4354828} - {fileID: 1857259671} - {fileID: 1275231957} + - {fileID: 600689290} - {fileID: 2107246408} + - {fileID: 1299748686} - {fileID: 1412279564} - - {fileID: 2107974181} - - {fileID: 221009006} - - {fileID: 613862175} + - {fileID: 2039470346} + - {fileID: 610196011} + - {fileID: 1054651011} diff --git a/Assets/Scenes/Level2.unity.meta b/Assets/Scenes/Level2.unity.meta index 3d49826f73..dc9428f269 100644 --- a/Assets/Scenes/Level2.unity.meta +++ b/Assets/Scenes/Level2.unity.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4fd0f95d27b1d4a1cb491d516d84208e +guid: dee76cebce40444e08a2dc7a5b66a3d2 DefaultImporter: externalObjects: {} userData: diff --git a/Assets/Scenes/Level3.unity b/Assets/Scenes/Level3.unity new file mode 100644 index 0000000000..3d48e446eb --- /dev/null +++ b/Assets/Scenes/Level3.unity @@ -0,0 +1,2779 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!29 &1 +OcclusionCullingSettings: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_OcclusionBakeSettings: + smallestOccluder: 5 + smallestHole: 0.25 + backfaceThreshold: 100 + m_SceneGUID: 00000000000000000000000000000000 + m_OcclusionCullingData: {fileID: 0} +--- !u!104 &2 +RenderSettings: + m_ObjectHideFlags: 0 + serializedVersion: 9 + m_Fog: 0 + m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} + m_FogMode: 3 + m_FogDensity: 0.01 + m_LinearFogStart: 0 + m_LinearFogEnd: 300 + m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1} + m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1} + m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1} + m_AmbientIntensity: 1 + m_AmbientMode: 3 + m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1} + m_SkyboxMaterial: {fileID: 0} + m_HaloStrength: 0.5 + m_FlareStrength: 1 + m_FlareFadeSpeed: 3 + m_HaloTexture: {fileID: 0} + m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0} + m_DefaultReflectionMode: 0 + m_DefaultReflectionResolution: 128 + m_ReflectionBounces: 1 + m_ReflectionIntensity: 1 + m_CustomReflection: {fileID: 0} + m_Sun: {fileID: 0} + m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1} + m_UseRadianceAmbientProbe: 0 +--- !u!157 &3 +LightmapSettings: + m_ObjectHideFlags: 0 + serializedVersion: 12 + m_GIWorkflowMode: 1 + m_GISettings: + serializedVersion: 2 + m_BounceScale: 1 + m_IndirectOutputScale: 1 + m_AlbedoBoost: 1 + m_EnvironmentLightingMode: 0 + m_EnableBakedLightmaps: 0 + m_EnableRealtimeLightmaps: 0 + m_LightmapEditorSettings: + serializedVersion: 12 + m_Resolution: 2 + m_BakeResolution: 40 + m_AtlasSize: 1024 + m_AO: 0 + m_AOMaxDistance: 1 + m_CompAOExponent: 1 + m_CompAOExponentDirect: 0 + m_ExtractAmbientOcclusion: 0 + m_Padding: 2 + m_LightmapParameters: {fileID: 0} + m_LightmapsBakeMode: 1 + m_TextureCompression: 1 + m_FinalGather: 0 + m_FinalGatherFiltering: 1 + m_FinalGatherRayCount: 256 + m_ReflectionCompression: 2 + m_MixedBakeMode: 2 + m_BakeBackend: 0 + m_PVRSampling: 1 + m_PVRDirectSampleCount: 32 + m_PVRSampleCount: 500 + m_PVRBounces: 2 + m_PVREnvironmentSampleCount: 500 + m_PVREnvironmentReferencePointCount: 2048 + m_PVRFilteringMode: 2 + m_PVRDenoiserTypeDirect: 0 + m_PVRDenoiserTypeIndirect: 0 + m_PVRDenoiserTypeAO: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 + m_PVREnvironmentMIS: 0 + m_PVRCulling: 1 + m_PVRFilteringGaussRadiusDirect: 1 + m_PVRFilteringGaussRadiusIndirect: 5 + m_PVRFilteringGaussRadiusAO: 2 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 + m_ExportTrainingData: 0 + m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 + m_LightingDataAsset: {fileID: 0} + m_LightingSettings: {fileID: 4890085278179872738, guid: 47d2fc78f5b4c4b1a97f298b8613f162, + type: 2} +--- !u!196 &4 +NavMeshSettings: + serializedVersion: 2 + m_ObjectHideFlags: 0 + m_BuildSettings: + serializedVersion: 3 + agentTypeID: 0 + agentRadius: 0.5 + agentHeight: 2 + agentSlope: 45 + agentClimb: 0.4 + ledgeDropHeight: 0 + maxJumpAcrossDistance: 0 + minRegionArea: 2 + manualCellSize: 0 + cellSize: 0.16666667 + manualTileSize: 0 + tileSize: 256 + buildHeightMesh: 0 + maxJobWorkers: 0 + preserveTilesOutsideBounds: 0 + debug: + m_Flags: 0 + m_NavMeshData: {fileID: 0} +--- !u!1 &4354825 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4354828} + - component: {fileID: 4354827} + - component: {fileID: 4354826} + m_Layer: 0 + m_Name: Ground2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!61 &4354826 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4354825} + 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: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.06} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 7.761719, y: 2.3253536} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 0.9414788} + m_EdgeRadius: 0 +--- !u!212 &4354827 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4354825} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 21300002, guid: 389dc290ab41ea34485314d037cc75df, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.761719, y: 2.3253536} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &4354828 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4354825} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.915, y: -3.313, z: 0} + m_LocalScale: {x: 2.35, y: 2.35, z: 2.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &49351568 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 49351569} + - component: {fileID: 49351570} + - component: {fileID: 49351571} + m_Layer: 0 + m_Name: LevelEnd + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &49351569 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 49351568} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 18.977915, y: 1.9746668, z: -0.07214421} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1412279564} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &49351570 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 49351568} + 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: 1} + m_EdgeRadius: 0 +--- !u!114 &49351571 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 49351568} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f9451ad9a7bb543c0b34f61f62d85e38, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &188380161 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + m_PrefabInstance: {fileID: 4450895270237833664} + m_PrefabAsset: {fileID: 0} +--- !u!1 &282281674 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 282281676} + - component: {fileID: 282281675} + - component: {fileID: 282281677} + m_Layer: 0 + m_Name: Ground1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!212 &282281675 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 282281674} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 389dc290ab41ea34485314d037cc75df, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.761719, y: 2.3253536} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &282281676 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 282281674} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -3.58, y: -3.27, z: 0} + m_LocalScale: {x: 2.35, y: 2.35, z: 2.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &282281677 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 282281674} + 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: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.06} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 7.761719, y: 2.3253536} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 0.9457176} + m_EdgeRadius: 0 +--- !u!1 &600689289 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 600689290} + m_Layer: 0 + m_Name: ----Level---- + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &600689290 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 600689289} + serializedVersion: 2 + 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_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &610196007 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 610196011} + - component: {fileID: 610196010} + - component: {fileID: 610196009} + - component: {fileID: 610196008} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &610196008 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 610196007} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!114 &610196009 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 610196007} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!223 &610196010 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 610196007} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &610196011 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 610196007} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1953530439} + - {fileID: 1333002890} + - {fileID: 776999278} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!1 &692167323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 692167324} + - component: {fileID: 692167325} + m_Layer: 0 + m_Name: LevelStart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &692167324 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 692167323} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -19.722086, y: 1.9746668, z: -0.07214421} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1412279564} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &692167325 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 692167323} + 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: 1} + m_EdgeRadius: 0 +--- !u!224 &776999278 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + m_PrefabInstance: {fileID: 3964863024506580846} + m_PrefabAsset: {fileID: 0} +--- !u!114 &776999281 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5109888935030558080, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + m_PrefabInstance: {fileID: 3964863024506580846} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7843ff72d0410456888c236b8c43b464, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &788738932 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 788738933} + - component: {fileID: 788738935} + - component: {fileID: 788738934} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &788738933 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 788738932} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1333002890} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &788738934 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 788738932} + 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: 21300010, guid: fc49794cc535bef4f969645c4eb97b80, 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 &788738935 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 788738932} + m_CullTransparentMesh: 1 +--- !u!1 &1054651008 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1054651011} + - component: {fileID: 1054651010} + - component: {fileID: 1054651009} + m_Layer: 0 + m_Name: EventSystem + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1054651009 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1054651008} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_HorizontalAxis: Horizontal + m_VerticalAxis: Vertical + m_SubmitButton: Submit + m_CancelButton: Cancel + m_InputActionsPerSecond: 10 + m_RepeatDelay: 0.5 + m_ForceModuleActive: 0 +--- !u!114 &1054651010 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1054651008} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_FirstSelected: {fileID: 0} + m_sendNavigationEvents: 1 + m_DragThreshold: 10 +--- !u!4 &1054651011 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1054651008} + serializedVersion: 2 + 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_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1139415633 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1139415634} + - component: {fileID: 1139415636} + - component: {fileID: 1139415635} + - component: {fileID: 1139415637} + m_Layer: 0 + m_Name: TileMap + m_TagString: Platform + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1139415634 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1139415633} + serializedVersion: 2 + 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_Children: [] + m_Father: {fileID: 2107246408} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!483693784 &1139415635 +TilemapRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1139415633} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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_ChunkSize: {x: 32, y: 32, z: 32} + m_ChunkCullingBounds: {x: 0.5, y: 0.5, z: 0} + m_MaxChunkCount: 16 + m_MaxFrameAge: 16 + m_SortOrder: 0 + m_Mode: 0 + m_DetectChunkCullingBounds: 0 + m_MaskInteraction: 0 +--- !u!1839735485 &1139415636 +Tilemap: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1139415633} + m_Enabled: 1 + m_Tiles: + - first: {x: 0, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 1, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 3, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 4, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 5, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 6, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 7, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 8, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 9, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 10, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 11, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 12, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 13, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 14, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 16, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 17, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 18, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 19, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 20, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 21, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 22, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 23, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 24, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 25, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 27, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 28, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 29, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 30, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 31, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 33, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 34, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 36, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 37, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 2 + m_TileSpriteIndex: 2 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 38, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 39, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 41, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 42, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 43, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 44, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 45, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 46, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 47, y: -4, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 14, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 16, y: -3, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 14, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 16, y: -2, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 14, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 15, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 16, y: -1, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + m_AnimatedTiles: {} + m_TileAssetArray: + - m_RefCount: 2 + m_Data: {fileID: 11400000, guid: cdf3aa23cf36b4a9a9c4147163173313, type: 2} + - m_RefCount: 43 + m_Data: {fileID: 11400000, guid: 1dfabe381ebee48b485e1520f0f664eb, type: 2} + - m_RefCount: 4 + m_Data: {fileID: 11400000, guid: f599eca27ab804acdaf363a77b9c0937, type: 2} + m_TileSpriteArray: + - m_RefCount: 2 + m_Data: {fileID: 21300000, guid: 804743266b3b62d428e86255220b6694, type: 3} + - m_RefCount: 43 + m_Data: {fileID: 21300000, guid: 6aa3a976ac9ecc54aad638ffbf4e67c6, type: 3} + - m_RefCount: 4 + m_Data: {fileID: 21300000, guid: 62d2808515efe6d4897f8d8cd5218f31, type: 3} + m_TileMatrixArray: + - m_RefCount: 49 + m_Data: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + - m_RefCount: 0 + m_Data: + e00: -0.9876882 + e01: 0 + e02: -0.15643437 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0.15643437 + e21: 0 + e22: -0.9876882 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_TileColorArray: + - m_RefCount: 49 + m_Data: {r: 1, g: 1, b: 1, a: 1} + m_TileObjectToInstantiateArray: [] + m_AnimationFrameRate: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Origin: {x: 0, y: -4, z: 0} + m_Size: {x: 48, y: 5, z: 1} + m_TileAnchor: {x: 0.5, y: 0.5, z: 0} + m_TileOrientation: 0 + m_TileOrientationMatrix: + e00: 1 + e01: 0 + e02: 0 + e03: 0 + e10: 0 + e11: 1 + e12: 0 + e13: 0 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 +--- !u!19719996 &1139415637 +TilemapCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1139415633} + 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: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: 0} + m_MaximumTileChangeCount: 1000 + m_ExtrusionFactor: 0 + m_UseDelaunayMesh: 0 +--- !u!1 &1248432746 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1248432747} + - component: {fileID: 1248432749} + - component: {fileID: 1248432748} + m_Layer: 5 + m_Name: Image (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1248432747 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1248432746} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1333002890} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1248432748 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1248432746} + 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: 21300010, guid: fc49794cc535bef4f969645c4eb97b80, 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 &1248432749 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1248432746} + m_CullTransparentMesh: 1 +--- !u!4 &1274176838 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + m_PrefabInstance: {fileID: 4984790873687906411} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1275231954 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1275231957} + - component: {fileID: 1275231956} + - component: {fileID: 1275231955} + m_Layer: 0 + m_Name: Ground4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!61 &1275231955 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275231954} + 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: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.06} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 7.761719, y: 2.3253536} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 0.9268483} + m_EdgeRadius: 0 +--- !u!212 &1275231956 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275231954} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 21300004, guid: 389dc290ab41ea34485314d037cc75df, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.761719, y: 2.3253536} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1275231957 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275231954} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.21, y: -3.244, z: 0} + m_LocalScale: {x: 2.35, y: 2.35, z: 2.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1299748685 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1299748686} + m_Layer: 0 + m_Name: ----------- + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1299748686 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1299748685} + serializedVersion: 2 + 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_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1333002889 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1333002890} + - component: {fileID: 1333002892} + - component: {fileID: 1333002893} + - component: {fileID: 1333002894} + m_Layer: 5 + m_Name: Hearts + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1333002890 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1333002889} + 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_Children: + - {fileID: 788738933} + - {fileID: 1631414845} + - {fileID: 1248432747} + m_Father: {fileID: 610196011} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 112, y: -140} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1333002892 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1333002889} + m_CullTransparentMesh: 1 +--- !u!114 &1333002893 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1333002889} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!114 &1333002894 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1333002889} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 577e533071be5486eb82a54c36065088, type: 3} + m_Name: + m_EditorClassIdentifier: + hearts: + - {fileID: 1248432748} + - {fileID: 1631414846} + - {fileID: 788738934} + fullHeart: {fileID: 21300010, guid: fc49794cc535bef4f969645c4eb97b80, type: 3} + emptyHeart: {fileID: 21300000, guid: fc49794cc535bef4f969645c4eb97b80, type: 3} +--- !u!1 &1412279563 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1412279564} + m_Layer: 0 + m_Name: Checkpoints + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1412279564 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1412279563} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 20.722086, y: -3.4746668, z: 0.5721442} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 692167324} + - {fileID: 49351569} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1631414844 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1631414845} + - component: {fileID: 1631414847} + - component: {fileID: 1631414846} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1631414845 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631414844} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 3, y: 3, z: 3} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1333002890} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1631414846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631414844} + 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: 21300010, guid: fc49794cc535bef4f969645c4eb97b80, 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 &1631414847 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1631414844} + m_CullTransparentMesh: 1 +--- !u!1 &1857259668 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1857259671} + - component: {fileID: 1857259670} + - component: {fileID: 1857259669} + m_Layer: 0 + m_Name: Ground3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!61 &1857259669 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857259668} + 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: 0 + m_UsedByEffector: 0 + m_UsedByComposite: 0 + m_Offset: {x: 0, y: -0.06} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 7.761719, y: 2.3253536} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 0.9268483} + m_EdgeRadius: 0 +--- !u!212 &1857259670 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857259668} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 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: 21300004, guid: 389dc290ab41ea34485314d037cc75df, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 7.761719, y: 2.3253536} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &1857259671 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1857259668} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.57, y: -3.244, z: 0} + m_LocalScale: {x: 2.35, y: 2.35, z: 2.35} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1953530438 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1953530439} + - component: {fileID: 1953530441} + - component: {fileID: 1953530440} + - component: {fileID: 1953530442} + m_Layer: 5 + m_Name: ScoreLabel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1953530439 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1953530438} + 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_Children: [] + m_Father: {fileID: 610196011} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 210.9961, y: -46.431335} + m_SizeDelta: {x: 301.9923, y: 56.2627} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1953530440 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1953530438} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 'Score:' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: e85f1cf0bfd4d1447bed2bc737c47be7, type: 2} + m_sharedMaterial: {fileID: 21069318434546836, guid: e85f1cf0bfd4d1447bed2bc737c47be7, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 50 + m_fontSizeBase: 50 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1953530441 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1953530438} + m_CullTransparentMesh: 1 +--- !u!114 &1953530442 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1953530438} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9019b8104c79482aac1e8599f63d4fb8, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &2039470345 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2039470346} + m_Layer: 0 + m_Name: ----UI----- + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2039470346 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2039470345} + serializedVersion: 2 + 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_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &2055596504 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + m_PrefabInstance: {fileID: 484190929103018125} + m_PrefabAsset: {fileID: 0} +--- !u!1 &2107246407 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2107246408} + - component: {fileID: 2107246409} + m_Layer: 0 + m_Name: LevelDesign + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2107246408 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107246407} + serializedVersion: 2 + 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_Children: + - {fileID: 1139415634} + - {fileID: 2055596504} + - {fileID: 188380161} + - {fileID: 1274176838} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!156049354 &2107246409 +Grid: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2107246407} + m_Enabled: 1 + m_CellSize: {x: 1, y: 1, z: 1} + m_CellGap: {x: 0, y: 0, z: 0} + m_CellLayout: 0 + m_CellSwizzle: 0 +--- !u!1001 &484190929103018125 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2107246408} + m_Modifications: + - target: {fileID: 3247414073640957559, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_Name + value: Key + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalPosition.x + value: 15.36 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.4 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4471653062095033656, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6fc4d51c0204541e3ab51a50b2dac1eb, type: 3} +--- !u!1001 &2101336368777957266 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 328097028837166983, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_Name + value: Player + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalPosition.x + value: 1.86 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalPosition.y + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3593540518909196710, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7015224702095746497, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: scoreController + value: + objectReference: {fileID: 1953530442} + - target: {fileID: 7015224702095746497, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: healthController + value: + objectReference: {fileID: 1333002894} + - target: {fileID: 7015224702095746497, guid: 2d26a819bd59c42f09e953f24c366259, + type: 3} + propertyPath: gameOverController + value: + objectReference: {fileID: 776999281} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2d26a819bd59c42f09e953f24c366259, type: 3} +--- !u!1001 &3964863024506580846 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 610196011} + m_Modifications: + - target: {fileID: 3869229548756008630, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_Name + value: GameOverUI + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_AnchorMax.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5739155011791152470, guid: a65d78e51dd624f7d86cb2da98691146, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a65d78e51dd624f7d86cb2da98691146, type: 3} +--- !u!1001 &4450895270237833664 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2107246408} + m_Modifications: + - target: {fileID: 4240479789766735715, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_Name + value: Chomper + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalPosition.x + value: 21.93 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.4 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4690134043500217851, guid: 28fcdca5ad40a430f8d536e210abf4fc, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 28fcdca5ad40a430f8d536e210abf4fc, type: 3} +--- !u!1001 &4984790873687906411 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 2107246408} + m_Modifications: + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalPosition.x + value: 35.51 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.43 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1800569500376395423, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4886885305723851823, guid: 6a06b6176412d40a786530ee70704738, + type: 3} + propertyPath: m_Name + value: Gunner + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 6a06b6176412d40a786530ee70704738, type: 3} +--- !u!1660057539 &9223372036854775807 +SceneRoots: + m_ObjectHideFlags: 0 + m_Roots: + - {fileID: 2101336368777957266} + - {fileID: 282281676} + - {fileID: 4354828} + - {fileID: 1857259671} + - {fileID: 1275231957} + - {fileID: 600689290} + - {fileID: 2107246408} + - {fileID: 1299748686} + - {fileID: 1412279564} + - {fileID: 2039470346} + - {fileID: 610196011} + - {fileID: 1054651011} diff --git a/Assets/Scenes/Level3.unity.meta b/Assets/Scenes/Level3.unity.meta new file mode 100644 index 0000000000..bf86c6e4bd --- /dev/null +++ b/Assets/Scenes/Level3.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 67be6e3d7aa4d497a9b9e2456b98ca94 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index 7005d44473..f66563e06f 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -123,6 +123,140 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1001 &77740828 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1028123326} + m_Modifications: + - target: {fileID: 863527246293882139, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_Name + value: LevelButton (3) + objectReference: {fileID: 0} + - target: {fileID: 1566057710304737209, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: levelIndex + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_SizeDelta.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_SizeDelta.y + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 1050 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -167.19 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7015698388595687519, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_text + value: Level 3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2be3c0c12b774445089a22809ea52212, type: 3} +--- !u!224 &77740829 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + m_PrefabInstance: {fileID: 77740828} + m_PrefabAsset: {fileID: 0} --- !u!1 &134893922 GameObject: m_ObjectHideFlags: 0 @@ -244,6 +378,215 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 134893922} m_CullTransparentMesh: 1 +--- !u!1 &137843264 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 137843265} + - component: {fileID: 137843267} + - component: {fileID: 137843266} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &137843265 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137843264} + 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_Children: [] + m_Father: {fileID: 1845223420} + 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: 0} + m_SizeDelta: {x: 3554.415, y: 1729.1749} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &137843266 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137843264} + 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: 279b37e2c51cda44380cb81a46fcb8e7, type: 3} + m_Type: 0 + m_PreserveAspect: 1 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &137843267 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 137843264} + m_CullTransparentMesh: 1 +--- !u!1001 &382503854 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1028123326} + m_Modifications: + - target: {fileID: 863527246293882139, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_Name + value: LevelButton (1) + objectReference: {fileID: 0} + - target: {fileID: 1566057710304737209, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: levelIndex + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_SizeDelta.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_SizeDelta.y + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 450 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -167.19 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7015698388595687519, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_text + value: Level 2 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2be3c0c12b774445089a22809ea52212, type: 3} +--- !u!224 &382503855 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + m_PrefabInstance: {fileID: 382503854} + m_PrefabAsset: {fileID: 0} --- !u!1 &389468273 GameObject: m_ObjectHideFlags: 0 @@ -616,7 +959,7 @@ RectTransform: 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: 0} + m_AnchoredPosition: {x: 0, y: 575} m_SizeDelta: {x: 871.6506, y: 194.6592} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &822632354 @@ -717,6 +1060,12 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 822632352} m_CullTransparentMesh: 1 +--- !u!224 &944999268 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + m_PrefabInstance: {fileID: 7074547832852184123} + m_PrefabAsset: {fileID: 0} --- !u!1 &986945889 GameObject: m_ObjectHideFlags: 0 @@ -930,6 +1279,326 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 995975433} m_CullTransparentMesh: 1 +--- !u!1 &1015969064 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1015969065} + - component: {fileID: 1015969068} + - component: {fileID: 1015969067} + - component: {fileID: 1015969066} + m_Layer: 5 + m_Name: CloseButton + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1015969065 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1015969064} + 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_Children: [] + m_Father: {fileID: 1716969559} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 200, y: 200} + m_Pivot: {x: 0, y: 1} +--- !u!114 &1015969066 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1015969064} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 2 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 21300002, guid: d3c4e35f6af02a840a9461e0aee32e4a, type: 3} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1015969067} + m_OnClick: + m_PersistentCalls: + m_Calls: [] +--- !u!114 &1015969067 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1015969064} + 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: d3c4e35f6af02a840a9461e0aee32e4a, 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 &1015969068 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1015969064} + m_CullTransparentMesh: 1 +--- !u!1 &1028123325 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1028123326} + - component: {fileID: 1028123327} + m_Layer: 5 + m_Name: Levels + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1028123326 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1028123325} + 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_Children: + - {fileID: 944999268} + - {fileID: 382503855} + - {fileID: 1183504288} + - {fileID: 77740829} + m_Father: {fileID: 1716969559} + 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: 0} + m_SizeDelta: {x: 1039, y: 334.38} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1028123327 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1028123325} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 4 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 + m_ReverseArrangement: 0 +--- !u!1001 &1183504287 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1028123326} + m_Modifications: + - target: {fileID: 863527246293882139, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_Name + value: LevelButton (2) + objectReference: {fileID: 0} + - target: {fileID: 1566057710304737209, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: levelIndex + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_SizeDelta.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_SizeDelta.y + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 750 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -167.19 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7015698388595687519, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_text + value: Level 3 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2be3c0c12b774445089a22809ea52212, type: 3} +--- !u!224 &1183504288 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + m_PrefabInstance: {fileID: 1183504287} + m_PrefabAsset: {fileID: 0} --- !u!1 &1327910753 GameObject: m_ObjectHideFlags: 0 @@ -1065,6 +1734,219 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1327910753} m_CullTransparentMesh: 1 +--- !u!1 &1716969558 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1716969559} + - component: {fileID: 1716969561} + - component: {fileID: 1716969560} + m_Layer: 5 + m_Name: LevelSelection + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &1716969559 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1716969558} + 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_Children: + - {fileID: 1734024552} + - {fileID: 1028123326} + - {fileID: 1015969065} + m_Father: {fileID: 1845223420} + 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: 0} + m_SizeDelta: {x: 2960, y: 1440} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1716969560 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1716969558} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.1981132, g: 0.1981132, b: 0.1981132, a: 0.85882354} + 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: 0} + 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 &1716969561 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1716969558} + m_CullTransparentMesh: 1 +--- !u!1 &1734024551 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1734024552} + - component: {fileID: 1734024554} + - component: {fileID: 1734024553} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1734024552 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1734024551} + 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_Children: [] + m_Father: {fileID: 1716969559} + 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: 590} + m_SizeDelta: {x: 776.7623, y: 185.8805} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1734024553 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1734024551} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Level Selection + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: e85f1cf0bfd4d1447bed2bc737c47be7, type: 2} + m_sharedMaterial: {fileID: 21069318434546836, guid: e85f1cf0bfd4d1447bed2bc737c47be7, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 100 + m_fontSizeBase: 100 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1734024554 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1734024551} + m_CullTransparentMesh: 1 --- !u!1 &1845223416 GameObject: m_ObjectHideFlags: 0 @@ -1160,10 +2042,12 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 137843265} - {fileID: 822632353} - {fileID: 134893923} - {fileID: 995975434} - {fileID: 640882140} + - {fileID: 1716969559} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1185,6 +2069,126 @@ MonoBehaviour: m_EditorClassIdentifier: startButton: {fileID: 134893924} quitButton: {fileID: 995975435} + closeLevelSelectorButton: {fileID: 1015969066} + levelSelector: {fileID: 1716969558} +--- !u!1001 &7074547832852184123 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1028123326} + m_Modifications: + - target: {fileID: 863527246293882139, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_Name + value: LevelButton + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_SizeDelta.x + value: 300 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_SizeDelta.y + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 150 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -167.19 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2101117273414878397, guid: 2be3c0c12b774445089a22809ea52212, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2be3c0c12b774445089a22809ea52212, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/GameOverController.cs b/Assets/Scripts/GameOverController.cs index 12f255527a..877969b6cd 100644 --- a/Assets/Scripts/GameOverController.cs +++ b/Assets/Scripts/GameOverController.cs @@ -8,12 +8,19 @@ public class GameOverController : MonoBehaviour { [SerializeField] private GameObject gameOverPanel; [SerializeField] private Button restartButton; + [SerializeField] private Button menuButton; void Start() { gameOverPanel.SetActive(false); restartButton.onClick.AddListener(RestartGame); + menuButton.onClick.AddListener(GoToMainMenu); } - + + private void GoToMainMenu() + { + SceneManager.LoadScene(0); + } + public void ShowGameOverPanel() { gameOverPanel.SetActive(true); diff --git a/Assets/Scripts/LevelSelector.cs b/Assets/Scripts/LevelSelector.cs new file mode 100644 index 0000000000..037b299ad9 --- /dev/null +++ b/Assets/Scripts/LevelSelector.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +[RequireComponent(typeof(Button))] +public class LevelSelector : MonoBehaviour +{ + [SerializeField] private int levelIndex; + private Button button; + void Start() + { + button = GetComponent