diff --git a/.idea/.idea.SpringJam2026/.idea/workspace.xml b/.idea/.idea.SpringJam2026/.idea/workspace.xml index 6c6b1e7..941da95 100644 --- a/.idea/.idea.SpringJam2026/.idea/workspace.xml +++ b/.idea/.idea.SpringJam2026/.idea/workspace.xml @@ -6,37 +6,23 @@ - + + - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -60,6 +46,7 @@ - + diff --git a/Assets/Audio/Mixer.mixer b/Assets/Audio/Mixer.mixer index 7fb4bed..34908bd 100644 --- a/Assets/Audio/Mixer.mixer +++ b/Assets/Audio/Mixer.mixer @@ -102,7 +102,7 @@ AudioMixerSnapshotController: m_AudioMixer: {fileID: 24100000} m_SnapshotID: 1c7da3d91b34da5439d3d7e45150a919 m_FloatValues: - 1d26ff9ed06e75b4dbe006ce579a9a18: -30.32013 + 1d26ff9ed06e75b4dbe006ce579a9a18: -4.403264 m_TransitionOverrides: {} --- !u!244 &7885612715040600379 AudioMixerEffectController: diff --git a/Assets/Audio/Tracks/GameJamEvolutionSpring_snippet.wav b/Assets/Audio/Tracks/GameJamEvolutionSpring_snippet.wav new file mode 100644 index 0000000..c8ed245 --- /dev/null +++ b/Assets/Audio/Tracks/GameJamEvolutionSpring_snippet.wav @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:b07ae9e98ebe99e168beb31eb186a6542e5d25b4a996a8ee4f449668006e9b6a +size 6351090 diff --git a/Assets/Audio/Tracks/GameJamEvolutionSpring_snippet.wav.meta b/Assets/Audio/Tracks/GameJamEvolutionSpring_snippet.wav.meta new file mode 100644 index 0000000..3665726 --- /dev/null +++ b/Assets/Audio/Tracks/GameJamEvolutionSpring_snippet.wav.meta @@ -0,0 +1,23 @@ +fileFormatVersion: 2 +guid: 2e297bc6383171e488adbaeefe656011 +AudioImporter: + externalObjects: {} + serializedVersion: 8 + defaultSettings: + serializedVersion: 2 + loadType: 0 + sampleRateSetting: 0 + sampleRateOverride: 44100 + compressionFormat: 1 + quality: 1 + conversionMode: 0 + preloadAudioData: 0 + platformSettingOverrides: {} + forceToMono: 0 + normalize: 1 + loadInBackground: 0 + ambisonic: 0 + 3D: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/InputSystem_Actions.inputactions b/Assets/InputSystem_Actions.inputactions index 1a12cb9..04b2ea2 100644 --- a/Assets/InputSystem_Actions.inputactions +++ b/Assets/InputSystem_Actions.inputactions @@ -1,438 +1,26 @@ { + "version": 1, "name": "InputSystem_Actions", "maps": [ { "name": "Player", "id": "df70fa95-8a34-4494-b137-73ab6b9c7d37", "actions": [ - { - "name": "Move", - "type": "Value", - "id": "351f2ccd-1f9f-44bf-9bec-d62ac5c5f408", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Look", - "type": "Value", - "id": "6b444451-8a00-4d00-a97e-f47457f736a8", - "expectedControlType": "Vector2", - "processors": "", - "interactions": "", - "initialStateCheck": true - }, - { - "name": "Attack", - "type": "Button", - "id": "6c2ab1b8-8984-453a-af3d-a3c78ae1679a", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, { "name": "Interact", "type": "Button", "id": "852140f2-7766-474d-8707-702459ba45f3", - "expectedControlType": "Button", - "processors": "", - "interactions": "Hold", - "initialStateCheck": false - }, - { - "name": "Crouch", - "type": "Button", - "id": "27c5f898-bc57-4ee1-8800-db469aca5fe3", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Jump", - "type": "Button", - "id": "f1ba0d36-48eb-4cd5-b651-1c94a6531f70", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Previous", - "type": "Button", - "id": "2776c80d-3c14-4091-8c56-d04ced07a2b0", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Next", - "type": "Button", - "id": "b7230bb6-fc9b-4f52-8b25-f5e19cb2c2ba", - "expectedControlType": "Button", - "processors": "", - "interactions": "", - "initialStateCheck": false - }, - { - "name": "Sprint", - "type": "Button", - "id": "641cd816-40e6-41b4-8c3d-04687c349290", - "expectedControlType": "Button", + "expectedControlType": "", "processors": "", "interactions": "", "initialStateCheck": false } ], "bindings": [ - { - "name": "", - "id": "978bfe49-cc26-4a3d-ab7b-7d7a29327403", - "path": "/leftStick", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "WASD", - "id": "00ca640b-d935-4593-8157-c05846ea39b3", - "path": "Dpad", - "interactions": "", - "processors": "", - "groups": "", - "action": "Move", - "isComposite": true, - "isPartOfComposite": false - }, - { - "name": "up", - "id": "e2062cb9-1b15-46a2-838c-2f8d72a0bdd9", - "path": "/w", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "up", - "id": "8180e8bd-4097-4f4e-ab88-4523101a6ce9", - "path": "/upArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "320bffee-a40b-4347-ac70-c210eb8bc73a", - "path": "/s", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "down", - "id": "1c5327b5-f71c-4f60-99c7-4e737386f1d1", - "path": "/downArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "d2581a9b-1d11-4566-b27d-b92aff5fabbc", - "path": "/a", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "left", - "id": "2e46982e-44cc-431b-9f0b-c11910bf467a", - "path": "/leftArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "fcfe95b8-67b9-4526-84b5-5d0bc98d6400", - "path": "/d", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "right", - "id": "77bff152-3580-4b21-b6de-dcd0c7e41164", - "path": "/rightArrow", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Move", - "isComposite": false, - "isPartOfComposite": true - }, - { - "name": "", - "id": "1635d3fe-58b6-4ba9-a4e2-f4b964f6b5c8", - "path": "/{Primary2DAxis}", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "3ea4d645-4504-4529-b061-ab81934c3752", - "path": "/stick", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Move", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "c1f7a91b-d0fd-4a62-997e-7fb9b69bf235", - "path": "/rightStick", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Look", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8c8e490b-c610-4785-884f-f04217b23ca4", - "path": "/delta", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse;Touch", - "action": "Look", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "3e5f5442-8668-4b27-a940-df99bad7e831", - "path": "/{Hatswitch}", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Look", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "143bb1cd-cc10-4eca-a2f0-a3664166fe91", - "path": "/buttonWest", - "interactions": "", - "processors": "", - "groups": ";Gamepad", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "05f6913d-c316-48b2-a6bb-e225f14c7960", - "path": "/leftButton", - "interactions": "", - "processors": "", - "groups": ";Keyboard&Mouse", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "886e731e-7071-4ae4-95c0-e61739dad6fd", - "path": "/primaryTouch/tap", - "interactions": "", - "processors": "", - "groups": ";Touch", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "ee3d0cd2-254e-47a7-a8cb-bc94d9658c54", - "path": "/trigger", - "interactions": "", - "processors": "", - "groups": "Joystick", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8255d333-5683-4943-a58a-ccb207ff1dce", - "path": "/{PrimaryAction}", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "b3c1c7f0-bd20-4ee7-a0f1-899b24bca6d7", - "path": "/enter", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Attack", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "cbac6039-9c09-46a1-b5f2-4e5124ccb5ed", - "path": "/2", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Next", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "e15ca19d-e649-4852-97d5-7fe8ccc44e94", - "path": "/dpad/right", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Next", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "f2e9ba44-c423-42a7-ad56-f20975884794", - "path": "/leftShift", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Sprint", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "8cbb2f4b-a784-49cc-8d5e-c010b8c7f4e6", - "path": "/leftStickPress", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Sprint", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "d8bf24bf-3f2f-4160-a97c-38ec1eb520ba", - "path": "/trigger", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Sprint", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "eb40bb66-4559-4dfa-9a2f-820438abb426", - "path": "/space", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Jump", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "daba33a1-ad0c-4742-a909-43ad1cdfbeb6", - "path": "/buttonSouth", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Jump", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "603f3daf-40bd-4854-8724-93e8017f59e3", - "path": "/secondaryButton", - "interactions": "", - "processors": "", - "groups": "XR", - "action": "Jump", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "1534dc16-a6aa-499d-9c3a-22b47347b52a", - "path": "/1", - "interactions": "", - "processors": "", - "groups": "Keyboard&Mouse", - "action": "Previous", - "isComposite": false, - "isPartOfComposite": false - }, - { - "name": "", - "id": "25060bbd-a3a6-476e-8fba-45ae484aad05", - "path": "/dpad/left", - "interactions": "", - "processors": "", - "groups": "Gamepad", - "action": "Previous", - "isComposite": false, - "isPartOfComposite": false - }, { "name": "", "id": "1c04ea5f-b012-41d1-a6f7-02e963b52893", - "path": "/e", + "path": "/space", "interactions": "", "processors": "", "groups": "Keyboard&Mouse", @@ -453,23 +41,67 @@ }, { "name": "", - "id": "4f4649ac-64a8-4a73-af11-b3faef356a4d", - "path": "/buttonEast", + "id": "93c0a277-c24b-41f0-902c-21272e97e749", + "path": "/buttonWest", "interactions": "", "processors": "", - "groups": "Gamepad", - "action": "Crouch", + "groups": ";Gamepad", + "action": "Interact", "isComposite": false, "isPartOfComposite": false }, { "name": "", - "id": "36e52cba-0905-478e-a818-f4bfcb9f3b9a", - "path": "/c", + "id": "40c4bc64-9c00-45ec-8f20-04d60abcd383", + "path": "/buttonSouth", "interactions": "", "processors": "", - "groups": "Keyboard&Mouse", - "action": "Crouch", + "groups": ";Gamepad", + "action": "Interact", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "beed3afa-2745-4230-8b35-a0e560c51e0f", + "path": "/buttonEast", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Interact", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "764e7d51-144a-418d-b72a-d961b320a5e4", + "path": "/rightShoulder", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Interact", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "f25109c1-7a7f-435f-8bfe-cb91ab192c4d", + "path": "/rightTrigger", + "interactions": "", + "processors": "", + "groups": ";Gamepad", + "action": "Interact", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "e0402089-210a-4a22-b2ca-110909f99b91", + "path": "/leftButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Interact", "isComposite": false, "isPartOfComposite": false } diff --git a/Assets/Scenes/Bootstrap.unity b/Assets/Scenes/Bootstrap.unity index 51f87d8..4bb67b4 100644 --- a/Assets/Scenes/Bootstrap.unity +++ b/Assets/Scenes/Bootstrap.unity @@ -136,7 +136,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1327356648 Transform: m_ObjectHideFlags: 0 @@ -385,7 +385,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &1755353617 MonoBehaviour: m_ObjectHideFlags: 0 @@ -409,11 +409,11 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 8781117415510498633, guid: b8f5fa5f6f2c53443a6d2fc322b400eb, type: 2} m_audioClip: {fileID: 0} - m_Resource: {fileID: 0} - m_PlayOnAwake: 0 + m_Resource: {fileID: 8300000, guid: 2e297bc6383171e488adbaeefe656011, type: 3} + m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 - Loop: 0 + Loop: 1 Mute: 0 Spatialize: 0 SpatializePostEffects: 0 diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 5a4280a..87cc633 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -119,6 +119,26 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &86310092 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: -2253911629886400664, guid: e584f68a4dd69c34594f003d4a075168, type: 3} + m_PrefabInstance: {fileID: 118420888} + m_PrefabAsset: {fileID: 0} +--- !u!114 &86310095 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 86310092} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ec04be547022d844c9e680ad7aba5e29, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Parallax + cameraTransform: {fileID: 1102711994} + playerCam: {fileID: 1102711997} + parallaxFactor: 0.95 --- !u!1001 &118420888 PrefabInstance: m_ObjectHideFlags: 0 @@ -137,7 +157,7 @@ PrefabInstance: objectReference: {fileID: -7443756053782179069, guid: 4a8effd64de9c5f4b93fe853c02faf4f, type: 3} - target: {fileID: 3626916397498700004, guid: e584f68a4dd69c34594f003d4a075168, type: 3} propertyPath: m_Color.a - value: 0.49019608 + value: 0.79607844 objectReference: {fileID: 0} - target: {fileID: 3626916397498700004, guid: e584f68a4dd69c34594f003d4a075168, type: 3} propertyPath: m_SortingOrder @@ -145,23 +165,23 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7878350319992209165, guid: e584f68a4dd69c34594f003d4a075168, type: 3} propertyPath: m_LocalScale.x - value: 0.67675 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 7878350319992209165, guid: e584f68a4dd69c34594f003d4a075168, type: 3} propertyPath: m_LocalScale.y - value: 0.67675 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 7878350319992209165, guid: e584f68a4dd69c34594f003d4a075168, type: 3} propertyPath: m_LocalScale.z - value: 0.67675 + value: 0.6 objectReference: {fileID: 0} - target: {fileID: 7878350319992209165, guid: e584f68a4dd69c34594f003d4a075168, type: 3} propertyPath: m_LocalPosition.x - value: 0.06 + value: 0 objectReference: {fileID: 0} - target: {fileID: 7878350319992209165, guid: e584f68a4dd69c34594f003d4a075168, type: 3} propertyPath: m_LocalPosition.y - value: 5.06 + value: -4.44 objectReference: {fileID: 0} - target: {fileID: 7878350319992209165, guid: e584f68a4dd69c34594f003d4a075168, type: 3} propertyPath: m_LocalPosition.z @@ -198,7 +218,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: -2253911629886400664, guid: e584f68a4dd69c34594f003d4a075168, type: 3} + insertIndex: -1 + addedObject: {fileID: 86310095} m_SourcePrefab: {fileID: -8435245712485981826, guid: e584f68a4dd69c34594f003d4a075168, type: 3} --- !u!1 &135794688 GameObject: @@ -258,6 +281,7 @@ GameObject: - component: {fileID: 1102711992} - component: {fileID: 1102711995} - component: {fileID: 1102711996} + - component: {fileID: 1102711997} m_Layer: 0 m_Name: Main Camera m_TagString: MainCamera @@ -407,6 +431,20 @@ MonoBehaviour: m_CropFrameX: 0 m_CropFrameY: 0 m_StretchFill: 0 +--- !u!114 &1102711997 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1102711991} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 87d7038c84327c644ad4ac1df99cba55, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Cam + camSpeed: 5 + yOffset: 1 --- !u!212 &1111270482 stripped SpriteRenderer: m_CorrespondingSourceObject: {fileID: 342790821639359709, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} @@ -551,11 +589,391 @@ Tilemap: m_GameObject: {fileID: 1601201176} m_Enabled: 1 m_Tiles: + - first: {x: -19, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -18, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -17, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -16, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -15, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -14, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -13, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -12, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -11, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -10, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -9, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -8, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -7, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -6, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -5, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -4, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -3, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -2, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: -1, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 0, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 1, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 2, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 3, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 4, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 5, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 6, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 7, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 8, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 9, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 10, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 11, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 12, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 13, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 14, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 15, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 16, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 17, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 + - first: {x: 18, y: -8, z: 0} + second: + serializedVersion: 2 + m_TileIndex: 1 + m_TileSpriteIndex: 1 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 2147483649 - first: {x: -19, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -564,8 +982,8 @@ Tilemap: - first: {x: -18, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -574,8 +992,8 @@ Tilemap: - first: {x: -17, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -584,8 +1002,8 @@ Tilemap: - first: {x: -16, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -594,8 +1012,8 @@ Tilemap: - first: {x: -15, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -604,8 +1022,8 @@ Tilemap: - first: {x: -14, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -614,8 +1032,8 @@ Tilemap: - first: {x: -13, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -624,8 +1042,8 @@ Tilemap: - first: {x: -12, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -634,8 +1052,8 @@ Tilemap: - first: {x: -11, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -644,8 +1062,8 @@ Tilemap: - first: {x: -10, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -654,8 +1072,8 @@ Tilemap: - first: {x: -9, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -664,8 +1082,8 @@ Tilemap: - first: {x: -8, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -674,8 +1092,8 @@ Tilemap: - first: {x: -7, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -684,8 +1102,8 @@ Tilemap: - first: {x: -6, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -694,8 +1112,8 @@ Tilemap: - first: {x: -5, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -704,8 +1122,8 @@ Tilemap: - first: {x: -4, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -714,8 +1132,8 @@ Tilemap: - first: {x: -3, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -724,8 +1142,8 @@ Tilemap: - first: {x: -2, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -734,8 +1152,8 @@ Tilemap: - first: {x: -1, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -744,8 +1162,8 @@ Tilemap: - first: {x: 0, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -754,8 +1172,8 @@ Tilemap: - first: {x: 1, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -764,8 +1182,8 @@ Tilemap: - first: {x: 2, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -774,8 +1192,8 @@ Tilemap: - first: {x: 3, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -784,8 +1202,8 @@ Tilemap: - first: {x: 4, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -794,8 +1212,8 @@ Tilemap: - first: {x: 5, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -804,8 +1222,8 @@ Tilemap: - first: {x: 6, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -814,8 +1232,8 @@ Tilemap: - first: {x: 7, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -824,8 +1242,8 @@ Tilemap: - first: {x: 8, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -834,8 +1252,8 @@ Tilemap: - first: {x: 9, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -844,8 +1262,8 @@ Tilemap: - first: {x: 10, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -854,8 +1272,8 @@ Tilemap: - first: {x: 11, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -864,8 +1282,8 @@ Tilemap: - first: {x: 12, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -874,8 +1292,8 @@ Tilemap: - first: {x: 13, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -884,8 +1302,8 @@ Tilemap: - first: {x: 14, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -894,8 +1312,8 @@ Tilemap: - first: {x: 15, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -904,8 +1322,8 @@ Tilemap: - first: {x: 16, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -914,8 +1332,8 @@ Tilemap: - first: {x: 17, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -924,8 +1342,8 @@ Tilemap: - first: {x: 18, y: -7, z: 0} second: serializedVersion: 2 - m_TileIndex: 10 - m_TileSpriteIndex: 10 + m_TileIndex: 1 + m_TileSpriteIndex: 1 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2075,7 +2493,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 2 - m_TileSpriteIndex: 8 + m_TileSpriteIndex: 10 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2085,7 +2503,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 3 - m_TileSpriteIndex: 3 + m_TileSpriteIndex: 8 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -2725,7 +3143,7 @@ Tilemap: m_TileAssetArray: - m_RefCount: 38 m_Data: {fileID: 11400000, guid: 134f5f7acd979c145a58235ea1b40f5e, type: 2} - - m_RefCount: 76 + - m_RefCount: 152 m_Data: {fileID: 11400000, guid: a2293e4285fc73e4e9e857ac597aeafe, type: 2} - m_RefCount: 1 m_Data: {fileID: 11400000, guid: 60cea1cb8ed42f641a053ca1f26f0444, type: 2} @@ -2743,17 +3161,17 @@ Tilemap: m_Data: {fileID: 11400000, guid: 9afc5c7d903804548b379d9868d420db, type: 2} - m_RefCount: 17 m_Data: {fileID: 11400000, guid: 653bed1caa1cec7409e2218a015e35ca, type: 2} - - m_RefCount: 38 - m_Data: {fileID: 11400000, guid: 19f66220c354f4a46918885f07bf7695, type: 2} + - m_RefCount: 0 + m_Data: {fileID: 0} m_TileSpriteArray: - m_RefCount: 38 m_Data: {fileID: 9085546173938197295, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} - - m_RefCount: 76 + - m_RefCount: 152 m_Data: {fileID: -1930571348, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} - m_RefCount: 28 m_Data: {fileID: -1756127752, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 315442859, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 1 m_Data: {fileID: 981992248, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} - m_RefCount: 2 @@ -2763,13 +3181,13 @@ Tilemap: - m_RefCount: 11 m_Data: {fileID: 856717892, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} - m_RefCount: 1 - m_Data: {fileID: 1224811296, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} + m_Data: {fileID: 315442859, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} - m_RefCount: 17 m_Data: {fileID: 849119907, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} - - m_RefCount: 38 - m_Data: {fileID: 485721445, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 1224811296, guid: 4efdfdbf2085f1c4aade8e3d44b1ea43, type: 3} m_TileMatrixArray: - - m_RefCount: 217 + - m_RefCount: 255 m_Data: e00: 1 e01: 0 @@ -2788,13 +3206,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 217 + - m_RefCount: 255 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: -19, y: -7, z: 0} - m_Size: {x: 39, y: 20, z: 1} + m_Origin: {x: -19, y: -8, z: 0} + m_Size: {x: 39, y: 21, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -2872,12 +3290,12 @@ CompositeCollider2D: - X: -95000000 Y: -15000000 - X: -95000000 - Y: -35000000 + Y: -40000000 - X: 95000000 - Y: -35000000 + Y: -40000000 m_CompositePaths: m_Paths: - - - {x: 9.49997, y: -3.5} + - - {x: 9.49997, y: -4} - {x: 9.50003, y: -1.5} - {x: 10, y: -1.4999707} - {x: 9.99997, y: 6.5} @@ -2886,7 +3304,7 @@ CompositeCollider2D: - {x: 7.5, y: -1.0000293} - {x: 7.4999704, y: -1.5} - {x: -9.5, y: -1.5000293} - - {x: -9.49997, y: -3.5} + - {x: -9.49997, y: -4} m_VertexDistance: 0.0005 m_OffsetDistance: 0.00005 m_UseDelaunayMesh: 0 @@ -2928,7 +3346,7 @@ GameObject: m_Component: - component: {fileID: 1710711462} - component: {fileID: 1710711463} - m_Layer: 0 + m_Layer: 3 m_Name: Sprite m_TagString: Untagged m_Icon: {fileID: 0} @@ -3020,7 +3438,8 @@ GameObject: - component: {fileID: 1755712273} - component: {fileID: 1755712272} - component: {fileID: 1755712271} - m_Layer: 0 + - component: {fileID: 1755712274} + m_Layer: 3 m_Name: Spring m_TagString: Untagged m_Icon: {fileID: 0} @@ -3117,13 +3536,94 @@ Transform: m_GameObject: {fileID: 1755712270} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.01, y: -1.29, z: 0} + m_LocalPosition: {x: 0.03, y: -1.42, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1710711462} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &1755712274 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1755712270} + m_Enabled: 1 + serializedVersion: 3 + 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_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0.0053329766, y: 0.19199395} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.4973335, y: 0.11601212} + oldSize: {x: 2, y: 0.5} + newSize: {x: 2, y: 0.5} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + m_Size: {x: 2, y: 0.5} + m_EdgeRadius: 0 +--- !u!1 &1892581088 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7621021177568661959, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} + m_PrefabInstance: {fileID: 2062647807} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1892581094 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1892581088} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: Unity.InputSystem::UnityEngine.InputSystem.PlayerInput + m_Actions: {fileID: -944628639613478452, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3} + m_NotificationBehavior: 3 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: [] + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: Player + m_SplitScreenIndex: -1 + m_Camera: {fileID: 1102711993} --- !u!1001 &2062647807 PrefabInstance: m_ObjectHideFlags: 0 @@ -3144,10 +3644,18 @@ PrefabInstance: propertyPath: turnDelay value: 0.08 objectReference: {fileID: 0} + - target: {fileID: 3534034070345576868, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} + propertyPath: springPower + value: 20 + objectReference: {fileID: 0} - target: {fileID: 3534034070345576868, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} propertyPath: spriteRenderer value: objectReference: {fileID: 1111270482} + - target: {fileID: 3534034070345576868, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} + propertyPath: interactReference + value: + objectReference: {fileID: 1781555164194001046, guid: 2bcd2660ca9b64942af0de543d8d7100, type: 3} - target: {fileID: 6196444245332325679, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} propertyPath: m_LocalPosition.x value: -7.34 @@ -3192,10 +3700,17 @@ PrefabInstance: propertyPath: m_Name value: Player objectReference: {fileID: 0} + - target: {fileID: 7621021177568661959, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} + propertyPath: m_TagString + value: Player + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7621021177568661959, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} + insertIndex: -1 + addedObject: {fileID: 1892581094} m_SourcePrefab: {fileID: 100100000, guid: fbc05a08dfccd6a4cb1bcc1cf1910065, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: diff --git a/Assets/Scripts/Parallax.cs b/Assets/Scripts/Parallax.cs new file mode 100644 index 0000000..309687a --- /dev/null +++ b/Assets/Scripts/Parallax.cs @@ -0,0 +1,24 @@ +using System; +using UnityEngine; + +public class Parallax : MonoBehaviour +{ + [SerializeField] private Transform cameraTransform; + [SerializeField] private Player.Cam playerCam; + [SerializeField] private float parallaxFactor; + + private Vector3 _target; + private float _offset; + + private void Awake() + { + _offset = transform.position.y - cameraTransform.position.y; + } + + // Update is called once per frame + void Update() + { + _target.y = (cameraTransform.position.y + _offset) * parallaxFactor; + transform.position = _target; + } +} diff --git a/Assets/Scripts/Parallax.cs.meta b/Assets/Scripts/Parallax.cs.meta new file mode 100644 index 0000000..da618bc --- /dev/null +++ b/Assets/Scripts/Parallax.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: ec04be547022d844c9e680ad7aba5e29 \ No newline at end of file diff --git a/Assets/Scripts/Player/Cam.cs b/Assets/Scripts/Player/Cam.cs new file mode 100644 index 0000000..1a99b6c --- /dev/null +++ b/Assets/Scripts/Player/Cam.cs @@ -0,0 +1,25 @@ +using UnityEngine; + +namespace Player +{ + public class Cam : MonoBehaviour + { + public float YOffset => yOffset; + [SerializeField] private float camSpeed; + [SerializeField] private float yOffset; + private Transform _player; + private Vector3 _target = new Vector3(0f, 0f, -10f); + + // Update is called once per frame + void Update() + { + if (_player == null) + { + _player = GameObject.FindWithTag("Player").transform; + return; + } + _target.y = Mathf.Max(_player.position.y + yOffset, 1); + transform.position = Vector3.Lerp(transform.position, _target, camSpeed * Time.deltaTime); + } + } +} diff --git a/Assets/Scripts/Player/Cam.cs.meta b/Assets/Scripts/Player/Cam.cs.meta new file mode 100644 index 0000000..41d2f8d --- /dev/null +++ b/Assets/Scripts/Player/Cam.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: 87d7038c84327c644ad4ac1df99cba55 \ No newline at end of file diff --git a/Assets/Scripts/Player/Movement.cs b/Assets/Scripts/Player/Movement.cs index e3ad9fb..3d3d918 100644 --- a/Assets/Scripts/Player/Movement.cs +++ b/Assets/Scripts/Player/Movement.cs @@ -1,6 +1,7 @@ using System; using System.Collections.Generic; using UnityEngine; +using UnityEngine.InputSystem; namespace Player { @@ -11,22 +12,41 @@ namespace Player [SerializeField] private float springPower; [SerializeField] private SpriteRenderer spriteRenderer; [SerializeField] private float turnDelay; + [SerializeField] private InputActionReference interactReference; private bool _onSpring; private Rigidbody2D _rb; private bool _grounded = true; private bool _facingLeft; private float _turnDelayTimer; + private bool _interact; private void Awake() { _rb = GetComponent(); + InputSystem.actions.FindActionMap("UI").Disable(); + InputSystem.actions.FindActionMap("Player").Enable(); + interactReference.action.performed += HandleInteraction; + interactReference.action.canceled += HandleInteraction; + } + + private void HandleInteraction(InputAction.CallbackContext obj) + { + _interact = obj.ReadValueAsButton(); } private void Update() { _turnDelayTimer += Time.deltaTime; spriteRenderer.flipX = !_facingLeft; + Debug.Log($"{_onSpring} {_interact}"); + if (_onSpring && _interact) + { + _onSpring = false; + _grounded = false; + _rb.linearVelocityX = 0; + _rb.AddForce(Vector2.up * springPower, ForceMode2D.Impulse); + } } private void FixedUpdate() @@ -37,9 +57,24 @@ namespace Player } } + private void OnTriggerEnter2D(Collider2D other) + { + if (other.gameObject.layer == LayerMask.NameToLayer("Spring")) + _onSpring = true; + } + + private void OnTriggerExit2D(Collider2D other) + { + if (other.gameObject.layer == LayerMask.NameToLayer("Spring")) + { + _onSpring = false; + } + } + private void OnCollisionStay2D(Collision2D other) { if (_turnDelayTimer < turnDelay) return; + if (other.gameObject.layer == LayerMask.NameToLayer("Spring")) return; var contacts = new List(); other.GetContacts(contacts); foreach(var c in contacts) diff --git a/Assets/Tilemaps/background.png b/Assets/Tilemaps/background.png index 8195718..fd77be3 100644 --- a/Assets/Tilemaps/background.png +++ b/Assets/Tilemaps/background.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:81236d462932d4a707b7aa580b86ec9c736d1163bab321b601fa5e8fefb3f635 -size 5491 +oid sha256:68768d0f0f4beefd9d5298b83b8beff408a232b51ba13d793745d00febb3fe40 +size 3873 diff --git a/Assets/Tilemaps/background.png.meta b/Assets/Tilemaps/background.png.meta index e8845c5..0187d21 100644 --- a/Assets/Tilemaps/background.png.meta +++ b/Assets/Tilemaps/background.png.meta @@ -107,8 +107,8 @@ TextureImporter: y: 0 width: 256 height: 154 - alignment: 0 - pivot: {x: 0, y: 0} + alignment: 7 + pivot: {x: 0.5, y: 0} border: {x: 0, y: 0, z: 0, w: 0} customData: outline: [] @@ -125,7 +125,7 @@ TextureImporter: customData: physicsShape: [] bones: [] - spriteID: + spriteID: 7296d6fa705d32a4eb785ea170f273c7 internalID: 0 vertices: [] indices: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 1c92a78..8ec792b 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -2,13 +2,13 @@ %TAG !u! tag:unity3d.com,2011: --- !u!78 &1 TagManager: - serializedVersion: 2 + serializedVersion: 3 tags: [] layers: - Default - TransparentFX - Ignore Raycast - - + - Spring - Water - UI - @@ -41,3 +41,5 @@ TagManager: - name: Default uniqueID: 0 locked: 0 + m_RenderingLayers: + - Default