diff --git a/Assets/Animations/Player.controller b/Assets/Animations/Player.controller index 63b26fb..2a45d79 100644 --- a/Assets/Animations/Player.controller +++ b/Assets/Animations/Player.controller @@ -21,7 +21,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: f0badeb726520e84ba7d0e645d8663fb, type: 2} + m_Motion: {fileID: 7400000, guid: 00f2cf8ec4608894eb6ab8d763dd1b8d, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -74,7 +74,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: 0c14e8b510a33494bae632bdaa7355c6, type: 2} + m_Motion: {fileID: 7400000, guid: 5617e84a5d249f843b84274c2202e23d, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: @@ -153,7 +153,7 @@ AnimatorController: 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 diff --git a/Assets/Animations/PlayerRunLeft.anim b/Assets/Animations/PlayerRunLeft.anim index df25384..e6482a6 100644 --- a/Assets/Animations/PlayerRunLeft.anim +++ b/Assets/Animations/PlayerRunLeft.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PlayerRunLeft - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -18,20 +18,44 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: - - curve: + - serializedVersion: 2 + curve: - time: 0 - value: {fileID: 7079147233807534215, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} - - time: 0.125 + value: {fileID: -7896281735413620878, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - time: 0.06666667 + value: {fileID: 4214452682036070143, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - time: 0.13333334 + value: {fileID: 6707464328325396904, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - time: 0.2 + value: {fileID: -6646785486133963012, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - time: 0.26666668 + value: {fileID: 6707464328325396904, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - time: 0.33333334 + value: {fileID: 4214452682036070143, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - time: 0.4 + value: {fileID: -7896281735413620878, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - time: 0.46666667 value: {fileID: 9203835802740118276, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} - - time: 0.25 + - time: 0.53333336 value: {fileID: 1903030100871761730, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} - - time: 0.375 + - time: 0.6 value: {fileID: 6646376060719561138, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - time: 0.6666667 + value: {fileID: 1382462362302480272, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - time: 0.73333335 + value: {fileID: 6646376060719561138, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - time: 0.8 + value: {fileID: 1903030100871761730, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - time: 0.8666667 + value: {fileID: 9203835802740118276, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - time: 0.93333334 + value: {fileID: -7896281735413620878, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} attribute: m_Sprite path: classID: 212 script: {fileID: 0} - m_SampleRate: 8 + flags: 2 + m_SampleRate: 15 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -45,17 +69,30 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: - - {fileID: 7079147233807534215, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - {fileID: -7896281735413620878, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - {fileID: 4214452682036070143, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - {fileID: 6707464328325396904, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - {fileID: -6646785486133963012, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - {fileID: 6707464328325396904, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - {fileID: 4214452682036070143, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - {fileID: -7896281735413620878, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} - {fileID: 9203835802740118276, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} - {fileID: 1903030100871761730, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} - {fileID: 6646376060719561138, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - {fileID: 1382462362302480272, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - {fileID: 6646376060719561138, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - {fileID: 1903030100871761730, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - {fileID: 9203835802740118276, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - {fileID: -7896281735413620878, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.5 + m_StopTime: 1 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animations/PlayerRunLeft.anim.meta b/Assets/Animations/PlayerRunLeft.anim.meta index 24d8d14..fc7a51f 100644 --- a/Assets/Animations/PlayerRunLeft.anim.meta +++ b/Assets/Animations/PlayerRunLeft.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0c14e8b510a33494bae632bdaa7355c6 +guid: 5617e84a5d249f843b84274c2202e23d NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/Animations/PlayerRunRight.anim b/Assets/Animations/PlayerRunRight.anim index 5f81eae..77721e0 100644 --- a/Assets/Animations/PlayerRunRight.anim +++ b/Assets/Animations/PlayerRunRight.anim @@ -7,7 +7,7 @@ AnimationClip: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: PlayerRunRight - serializedVersion: 6 + serializedVersion: 7 m_Legacy: 0 m_Compressed: 0 m_UseHighQualityCurve: 1 @@ -18,20 +18,44 @@ AnimationClip: m_ScaleCurves: [] m_FloatCurves: [] m_PPtrCurves: - - curve: + - serializedVersion: 2 + curve: - time: 0 value: {fileID: -7896281735413620878, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} - - time: 0.125 + - time: 0.06666667 value: {fileID: 4214452682036070143, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} - - time: 0.25 + - time: 0.13333334 value: {fileID: 6707464328325396904, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} - - time: 0.375 + - time: 0.2 value: {fileID: -6646785486133963012, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - time: 0.26666668 + value: {fileID: 6707464328325396904, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - time: 0.33333334 + value: {fileID: 4214452682036070143, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - time: 0.4 + value: {fileID: -7896281735413620878, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - time: 0.46666667 + value: {fileID: 9203835802740118276, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - time: 0.53333336 + value: {fileID: 1903030100871761730, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - time: 0.6 + value: {fileID: 6646376060719561138, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - time: 0.6666667 + value: {fileID: 1382462362302480272, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - time: 0.73333335 + value: {fileID: 6646376060719561138, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - time: 0.8 + value: {fileID: 1903030100871761730, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - time: 0.8666667 + value: {fileID: 9203835802740118276, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - time: 0.93333334 + value: {fileID: -7896281735413620878, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} attribute: m_Sprite path: classID: 212 script: {fileID: 0} - m_SampleRate: 8 + flags: 2 + m_SampleRate: 15 m_WrapMode: 0 m_Bounds: m_Center: {x: 0, y: 0, z: 0} @@ -45,17 +69,30 @@ AnimationClip: typeID: 212 customType: 23 isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 pptrCurveMapping: - {fileID: -7896281735413620878, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} - {fileID: 4214452682036070143, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} - {fileID: 6707464328325396904, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} - {fileID: -6646785486133963012, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - {fileID: 6707464328325396904, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - {fileID: 4214452682036070143, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - {fileID: -7896281735413620878, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - {fileID: 9203835802740118276, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - {fileID: 1903030100871761730, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - {fileID: 6646376060719561138, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - {fileID: 1382462362302480272, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - {fileID: 6646376060719561138, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - {fileID: 1903030100871761730, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - {fileID: 9203835802740118276, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} + - {fileID: -7896281735413620878, guid: 02a85e8195c892a488857ba6f45e1b3c, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.5 + m_StopTime: 1 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animations/PlayerRunRight.anim.meta b/Assets/Animations/PlayerRunRight.anim.meta index e9684cb..a3c68fa 100644 --- a/Assets/Animations/PlayerRunRight.anim.meta +++ b/Assets/Animations/PlayerRunRight.anim.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f0badeb726520e84ba7d0e645d8663fb +guid: 00f2cf8ec4608894eb6ab8d763dd1b8d NativeFormatImporter: externalObjects: {} mainObjectFileID: 7400000 diff --git a/Assets/Resources.meta b/Assets/Resources.meta new file mode 100644 index 0000000..2333757 --- /dev/null +++ b/Assets/Resources.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 886e7bd35b6ddf745acc73ee25dca6af +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/BillingMode.json b/Assets/Resources/BillingMode.json new file mode 100644 index 0000000..6f4bfb7 --- /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 0000000..8f0e0fc --- /dev/null +++ b/Assets/Resources/BillingMode.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bb4d9f1357c656644a1fcb17ecedc30a +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 9aa9312..69e279d 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -104,7 +104,7 @@ NavMeshSettings: serializedVersion: 2 m_ObjectHideFlags: 0 m_BuildSettings: - serializedVersion: 2 + serializedVersion: 3 agentTypeID: 0 agentRadius: 0.5 agentHeight: 2 @@ -117,7 +117,7 @@ NavMeshSettings: cellSize: 0.16666667 manualTileSize: 0 tileSize: 256 - accuratePlacement: 0 + buildHeightMesh: 0 maxJobWorkers: 0 preserveTilesOutsideBounds: 0 debug: @@ -152,6 +152,7 @@ Transform: 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: 1173618893} m_RootOrder: 0 @@ -167,6 +168,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -213,7 +215,7 @@ Tilemap: m_GameObject: {fileID: 350695914} m_Enabled: 1 m_Tiles: - - first: {x: -5, y: -3, z: 0} + - first: {x: -9, y: -5, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -223,11 +225,251 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -8, y: -5, 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: -7, y: -5, 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: -6, y: -5, 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: -5, y: -5, 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: -5, 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: -3, y: -5, 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: -2, y: -5, 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: -1, y: -5, 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: 0, y: -5, 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: 1, y: -5, 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: 2, y: -5, 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: 3, y: -5, 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: -5, 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: -5, 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: -5, 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: -5, 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: 8, y: -5, 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: -9, 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: -6, 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: 6, 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: 8, 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: -9, y: -3, 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: -6, y: -3, 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: -5, y: -3, 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: -4, y: -3, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -236,8 +478,8 @@ Tilemap: - first: {x: -3, y: -3, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -246,8 +488,8 @@ Tilemap: - first: {x: -2, y: -3, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -256,8 +498,8 @@ Tilemap: - first: {x: -1, y: -3, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -266,8 +508,8 @@ Tilemap: - first: {x: 0, y: -3, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -276,8 +518,8 @@ Tilemap: - first: {x: 1, y: -3, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -286,8 +528,8 @@ Tilemap: - first: {x: 2, y: -3, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -296,8 +538,8 @@ Tilemap: - first: {x: 3, y: -3, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -306,14 +548,34 @@ Tilemap: - first: {x: 4, y: -3, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -5, y: -2, z: 0} + - first: {x: 5, y: -3, 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: 6, y: -3, 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: 8, y: -3, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -323,7 +585,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 4, y: -2, z: 0} + - first: {x: -9, y: -2, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -333,7 +595,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -5, y: -1, z: 0} + - first: {x: 8, y: -2, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -343,6 +605,26 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -9, y: -1, 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: -6, 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: 0, y: -1, z: 0} second: serializedVersion: 2 @@ -363,7 +645,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 4, y: -1, z: 0} + - first: {x: 8, y: -1, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -373,7 +655,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -5, y: 0, z: 0} + - first: {x: -9, y: 0, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -383,7 +665,17 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 4, y: 0, z: 0} + - first: {x: -6, y: 0, 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: 8, y: 0, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -393,17 +685,97 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: -9, y: 1, 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: -6, 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: -5, y: 1, z: 0} second: serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 4, y: 1, z: 0} + - first: {x: -4, 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: -3, 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: -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: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 0, 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: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: 8, y: 1, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -413,7 +785,7 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -5, y: 2, z: 0} + - first: {x: -9, y: 2, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -423,67 +795,57 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: -4, y: 2, z: 0} + - first: {x: -6, y: 2, 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: 2, 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: -2, y: 2, 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: 2, 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: 0, y: 2, 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: 2, z: 0} - second: - serializedVersion: 2 - m_TileIndex: 0 - m_TileSpriteIndex: 0 + m_TileIndex: 2 + m_TileSpriteIndex: 2 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - first: {x: 3, 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: 4, 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: 5, 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: 6, 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: 8, y: 2, z: 0} second: serializedVersion: 2 m_TileIndex: 0 @@ -493,7 +855,197 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 - - first: {x: 4, y: 2, z: 0} + - first: {x: -9, y: 3, 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: -6, y: 3, 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: 8, y: 3, 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: -9, 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: -7, 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: -6, 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: -5, 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: -4, 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: 0 + m_TileSpriteIndex: 0 + m_TileMatrixIndex: 0 + m_TileColorIndex: 0 + m_TileObjectToInstantiateIndex: 65535 + dummyAlignment: 0 + m_AllTileFlags: 1073741825 + - first: {x: -2, 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: 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: 2, 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: 0 + m_TileSpriteIndex: 0 + 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: 0 + m_TileSpriteIndex: 0 + 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: 0 + m_TileSpriteIndex: 0 + 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: 0 + m_TileSpriteIndex: 0 + 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: 0 + m_TileSpriteIndex: 0 + 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: 0 @@ -505,21 +1057,29 @@ Tilemap: m_AllTileFlags: 1073741825 m_AnimatedTiles: {} m_TileAssetArray: - - m_RefCount: 27 + - m_RefCount: 40 m_Data: {fileID: 11400000, guid: 800934ea1143f66468cf3fbd14e70f2a, type: 2} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 2 + - m_RefCount: 12 + m_Data: {fileID: 11400000, guid: 24bf95f62094b7b439a57addabc738f2, type: 2} + - m_RefCount: 32 m_Data: {fileID: 11400000, guid: 086479e1ce082214fa7d49a77c6cbbf8, type: 2} - m_TileSpriteArray: - - m_RefCount: 27 - m_Data: {fileID: 21300000, guid: c2872d401b788cb4ea1d556ff8d524c0, type: 3} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 2 + - m_RefCount: 0 + m_Data: {fileID: 0} + m_TileSpriteArray: + - m_RefCount: 40 + m_Data: {fileID: 21300000, guid: c2872d401b788cb4ea1d556ff8d524c0, type: 3} + - m_RefCount: 12 + m_Data: {fileID: 21300000, guid: c6e8544807d83604d85e701d98f8ca91, type: 3} + - m_RefCount: 32 m_Data: {fileID: 21300000, guid: 56695aff6012eb246b1b1cd28454f933, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} m_TileMatrixArray: - - m_RefCount: 29 + - m_RefCount: 84 m_Data: e00: 1 e01: 0 @@ -538,13 +1098,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 29 + - m_RefCount: 84 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: -5, y: -3, z: 0} - m_Size: {x: 10, y: 6, z: 1} + m_Origin: {x: -9, y: -5, z: 0} + m_Size: {x: 18, y: 10, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -574,12 +1134,93 @@ TilemapCollider2D: 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.00001 + m_UseDelaunayMesh: 0 +--- !u!1001 &358877725 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1173618893} + m_Modifications: + - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} + propertyPath: m_LocalPosition.x + value: 5.488729 + objectReference: {fileID: 0} + - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} + propertyPath: m_LocalPosition.y + value: -1.42 + objectReference: {fileID: 0} + - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7047733282028940674, guid: 934a57b833e872445ac8463836f55a44, type: 3} + propertyPath: m_Name + value: Klad (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 934a57b833e872445ac8463836f55a44, type: 3} --- !u!1 &519420028 GameObject: m_ObjectHideFlags: 0 @@ -620,9 +1261,17 @@ Camera: 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_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -659,6 +1308,7 @@ Transform: 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_RootOrder: 0 @@ -702,10 +1352,13 @@ Transform: 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: 350695915} - {fileID: 1314998801} - {fileID: 1234867841} + - {fileID: 1326326937} + - {fileID: 1377373012} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -714,6 +1367,67 @@ Transform: m_CorrespondingSourceObject: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} m_PrefabInstance: {fileID: 7047733280813284351} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1241495131 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1173618893} + m_Modifications: + - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} + propertyPath: m_RootOrder + value: -1 + objectReference: {fileID: 0} + - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} + propertyPath: m_LocalPosition.x + value: -4.499395 + objectReference: {fileID: 0} + - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} + propertyPath: m_LocalPosition.y + value: 2.525 + objectReference: {fileID: 0} + - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7047733282028940674, guid: 934a57b833e872445ac8463836f55a44, type: 3} + propertyPath: m_Name + value: Klad + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 934a57b833e872445ac8463836f55a44, type: 3} --- !u!1 &1314998800 GameObject: m_ObjectHideFlags: 0 @@ -743,6 +1457,7 @@ Transform: 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: 1173618893} m_RootOrder: 1 @@ -757,12 +1472,32 @@ TilemapCollider2D: 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_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0.00001 + m_UseDelaunayMesh: 0 --- !u!483693784 &1314998803 TilemapRenderer: m_ObjectHideFlags: 0 @@ -774,6 +1509,7 @@ TilemapRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 @@ -820,6 +1556,46 @@ Tilemap: m_GameObject: {fileID: 1314998800} m_Enabled: 1 m_Tiles: + - first: {x: -7, 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: 7, 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: -7, y: -3, 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: 7, y: -3, 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: 2, y: -2, z: 0} second: serializedVersion: 2 @@ -830,6 +1606,16 @@ Tilemap: m_TileObjectToInstantiateIndex: 65535 dummyAlignment: 0 m_AllTileFlags: 1073741825 + - first: {x: 7, y: -2, 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: 2, y: -1, z: 0} second: serializedVersion: 2 @@ -872,17 +1658,17 @@ Tilemap: m_AllTileFlags: 1073741825 m_AnimatedTiles: {} m_TileAssetArray: - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 5 + m_Data: {fileID: 11400000, guid: 3e56c0f04b443874ab59b736b9647f5a, type: 2} - m_RefCount: 5 m_Data: {fileID: 11400000, guid: 44c02ef7daffb9c48b26fdbdd9a87e19, type: 2} m_TileSpriteArray: - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 5 + m_Data: {fileID: 21300000, guid: 60412656f09b58a4aada3cf61d5311ca, type: 3} - m_RefCount: 5 m_Data: {fileID: 21300000, guid: c2b1d85c88a14fb43b38edd6a81fb90a, type: 3} m_TileMatrixArray: - - m_RefCount: 5 + - m_RefCount: 10 m_Data: e00: 1 e01: 0 @@ -901,13 +1687,13 @@ Tilemap: e32: 0 e33: 1 m_TileColorArray: - - m_RefCount: 5 + - m_RefCount: 10 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: -5, y: -3, z: 0} - m_Size: {x: 10, y: 6, z: 1} + m_Origin: {x: -7, y: -4, z: 0} + m_Size: {x: 15, y: 7, z: 1} m_TileAnchor: {x: 0.5, y: 0.5, z: 0} m_TileOrientation: 0 m_TileOrientationMatrix: @@ -927,6 +1713,16 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!4 &1326326937 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} + m_PrefabInstance: {fileID: 358877725} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1377373012 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} + m_PrefabInstance: {fileID: 1241495131} + m_PrefabAsset: {fileID: 0} --- !u!1 &1627236048 GameObject: m_ObjectHideFlags: 0 @@ -939,8 +1735,8 @@ GameObject: - component: {fileID: 1627236049} - component: {fileID: 1627236051} - component: {fileID: 1627236054} - - component: {fileID: 1627236052} - component: {fileID: 1627236053} + - component: {fileID: 1627236055} m_Layer: 7 m_Name: Player m_TagString: Player @@ -959,6 +1755,7 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1007,8 +1804,9 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1627236048} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.55, y: -0.49, z: 0} + m_LocalPosition: {x: -7.5, y: 4.502, z: 0} m_LocalScale: {x: 0.891, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} m_RootOrder: 1 @@ -1030,29 +1828,19 @@ Rigidbody2D: m_AngularDrag: 1 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: 4 ---- !u!70 &1627236052 -CapsuleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1627236048} - m_Enabled: 1 - m_Density: 1 - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_UsedByComposite: 0 - m_Offset: {x: 0, y: 0} - m_Size: {x: 0.64, y: 0.97} - m_Direction: 0 --- !u!95 &1627236053 Animator: - serializedVersion: 3 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -1065,10 +1853,12 @@ Animator: m_UpdateMode: 0 m_ApplyRootMotion: 0 m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &1627236054 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1086,12 +1876,61 @@ MonoBehaviour: ladderLayer: serializedVersion: 2 m_Bits: 64 + groundLayer: + serializedVersion: 2 + m_Bits: 8 distance: 1 +--- !u!61 &1627236055 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1627236048} + 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.03} + m_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1.2307693, y: 1.2307693} + newSize: {x: 0.32, y: 0.32} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 0.57, y: 0.94} + m_EdgeRadius: 0 --- !u!1001 &7047733280813284351 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 1173618893} m_Modifications: - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} @@ -1104,7 +1943,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} propertyPath: m_LocalPosition.y - value: -1.441315 + value: -1.478 objectReference: {fileID: 0} - target: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} propertyPath: m_LocalPosition.z @@ -1143,4 +1982,7 @@ PrefabInstance: value: Klad objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 934a57b833e872445ac8463836f55a44, type: 3} diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index b2a1e0b..5de0f89 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -14,33 +14,38 @@ public class PlayerController : MonoBehaviour private float distance; private bool _isOnLadder; private Rigidbody2D _body; - private CapsuleCollider2D _capsule; + private BoxCollider2D _boxCollider; + private bool _isFall; void Start() { _body = GetComponent(); - _capsule= GetComponent(); + _boxCollider= GetComponent(); } void Update() { - float moveX = Input.GetAxisRaw("Horizontal"); - animator.SetFloat("Horizontal", moveX); + float moveX = 0; float moveY = 0; - var groundCheck = Physics2D.CapsuleCast(_capsule.bounds.center,_capsule.bounds.size,CapsuleDirection2D.Vertical,0f, Vector2.down, .1f,groundLayer); + var groundCheck = Physics2D.BoxCast(_boxCollider.bounds.center,_boxCollider.bounds.size,0f, Vector2.down, .1f,groundLayer); if (groundCheck || _isOnLadder) { - var ladderCheck = Physics2D.CapsuleCast(_capsule.bounds.center, _capsule.bounds.size, CapsuleDirection2D.Vertical, 0f, Vector2.down, .1f, ladderLayer); - if (ladderCheck) + + + _isFall =false; + moveX = Input.GetAxisRaw("Horizontal"); + animator.SetFloat("Horizontal", moveX); + + if (IsLadder(Vector2.down)) { _isOnLadder = true; moveY = Input.GetAxisRaw("Vertical"); if(moveY> 0) { - if(!Physics2D.CapsuleCast(_capsule.bounds.center, _capsule.bounds.size, CapsuleDirection2D.Vertical, 0f, Vector2.up, .1f, ladderLayer)) + if (!IsLadder(Vector2.up)) { - moveY= 0; + moveY = 0; } } } @@ -50,6 +55,16 @@ public class PlayerController : MonoBehaviour } _body.velocity = new Vector2(moveX * MovementSpeed, moveY * MovementSpeed); } + else + { + _isFall = true; + print("Falling"); + } + } + + private RaycastHit2D IsLadder(Vector2 direction) + { + return Physics2D.BoxCast(_boxCollider.bounds.center, _boxCollider.bounds.size, 0f, direction, .1f, ladderLayer); } private void FixedUpdate() @@ -61,7 +76,12 @@ public class PlayerController : MonoBehaviour } else { - _body.gravityScale = 5; + _body.gravityScale = 1; + } + if (_isFall) + { + _body.velocity = new Vector2(0, _body.velocity.y); + animator.SetFloat("Horizontal", 0); } } } diff --git a/Assets/Sprites/playerSprite.pdn b/Assets/Sprites/playerSprite.pdn new file mode 100644 index 0000000..9e85d3b Binary files /dev/null and b/Assets/Sprites/playerSprite.pdn differ diff --git a/Assets/Sprites/playerSprite.pdn.meta b/Assets/Sprites/playerSprite.pdn.meta new file mode 100644 index 0000000..a5988aa --- /dev/null +++ b/Assets/Sprites/playerSprite.pdn.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e47baa5c597ce7747bd2eb96eb4e7079 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sprites/playerSprite.png b/Assets/Sprites/playerSprite.png index 87293f9..12b0bee 100644 Binary files a/Assets/Sprites/playerSprite.png and b/Assets/Sprites/playerSprite.png differ diff --git a/Assets/Sprites/playerSprite.png.meta b/Assets/Sprites/playerSprite.png.meta index 7bce882..20c7734 100644 --- a/Assets/Sprites/playerSprite.png.meta +++ b/Assets/Sprites/playerSprite.png.meta @@ -78,7 +78,7 @@ TextureImporter: spriteMeshType: 1 alignment: 0 spritePivot: {x: 0.5, y: 0.5} - spritePixelsToUnits: 32 + spritePixelsToUnits: 26 spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 @@ -99,7 +99,7 @@ TextureImporter: platformSettings: - serializedVersion: 3 buildTarget: DefaultTexturePlatform - maxTextureSize: 2048 + maxTextureSize: 512 resizeAlgorithm: 0 textureFormat: -1 textureCompression: 0 @@ -158,10 +158,10 @@ TextureImporter: serializedVersion: 2 x: 0 y: 0 - width: 32 + width: 26 height: 32 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -177,12 +177,12 @@ TextureImporter: name: playerSprite_1 rect: serializedVersion: 2 - x: 32 + x: 26 y: 0 - width: 32 + width: 26 height: 32 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -198,12 +198,12 @@ TextureImporter: name: playerSprite_2 rect: serializedVersion: 2 - x: 64 + x: 52 y: 0 - width: 32 + width: 26 height: 32 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -219,12 +219,12 @@ TextureImporter: name: playerSprite_3 rect: serializedVersion: 2 - x: 96 + x: 78 y: 0 - width: 32 + width: 26 height: 32 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -240,12 +240,12 @@ TextureImporter: name: playerSprite_4 rect: serializedVersion: 2 - x: 128 + x: 104 y: 0 - width: 32 + width: 26 height: 32 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -261,12 +261,12 @@ TextureImporter: name: playerSprite_5 rect: serializedVersion: 2 - x: 160 + x: 130 y: 0 - width: 32 + width: 22 height: 32 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -282,12 +282,12 @@ TextureImporter: name: playerSprite_6 rect: serializedVersion: 2 - x: 192 + x: 162 y: 0 - width: 32 + width: 15 height: 32 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -303,12 +303,12 @@ TextureImporter: name: playerSprite_7 rect: serializedVersion: 2 - x: 224 + x: 182 y: 0 - width: 32 + width: 20 height: 32 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -324,12 +324,12 @@ TextureImporter: name: playerSprite_8 rect: serializedVersion: 2 - x: 256 + x: 208 y: 0 - width: 32 + width: 22 height: 32 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] @@ -350,7 +350,7 @@ TextureImporter: width: 32 height: 32 alignment: 0 - pivot: {x: 0, y: 0} + pivot: {x: 0.5, y: 0.5} border: {x: 0, y: 0, z: 0, w: 0} outline: [] physicsShape: [] diff --git a/Packages/manifest.json b/Packages/manifest.json index cb951e3..e90bd23 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -6,15 +6,19 @@ "com.unity.2d.sprite": "1.0.0", "com.unity.2d.spriteshape": "9.0.2", "com.unity.2d.tilemap": "1.0.0", + "com.unity.ads": "4.4.2", "com.unity.ai.navigation": "1.1.3", + "com.unity.analytics": "3.8.1", "com.unity.collab-proxy": "2.0.4", "com.unity.ide.rider": "3.0.21", "com.unity.ide.visualstudio": "2.0.18", "com.unity.ide.vscode": "1.2.5", + "com.unity.purchasing": "4.8.0", "com.unity.test-framework": "1.1.33", "com.unity.textmeshpro": "3.0.6", "com.unity.timeline": "1.7.4", "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", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index 7537d6e..8b58e98 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -70,6 +70,15 @@ "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.3", "depth": 0, @@ -79,6 +88,16 @@ }, "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.burst": { "version": "1.8.4", "depth": 2, @@ -144,6 +163,49 @@ "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.8.0", + "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": "4.4.0", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.ugui": "1.0.0", + "com.unity.services.core": "1.8.1", + "com.unity.nuget.newtonsoft-json": "3.0.2" + }, + "url": "https://packages.unity.com" + }, + "com.unity.services.core": { + "version": "1.9.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, @@ -185,6 +247,16 @@ "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, diff --git a/ProjectSettings/SceneTemplateSettings.json b/ProjectSettings/SceneTemplateSettings.json new file mode 100644 index 0000000..0449fe4 --- /dev/null +++ b/ProjectSettings/SceneTemplateSettings.json @@ -0,0 +1,167 @@ +{ + "templatePinStates": [], + "dependencyTypeInfos": [ + { + "userAdded": false, + "type": "UnityEngine.AnimationClip", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.Animations.AnimatorController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.AnimatorOverrideController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.Audio.AudioMixerController", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.ComputeShader", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Cubemap", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.GameObject", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.LightingDataAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": false + }, + { + "userAdded": false, + "type": "UnityEngine.LightingSettings", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Material", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.MonoScript", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicMaterial", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.PhysicsMaterial2D", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessProfile", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.PostProcessing.PostProcessResources", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Rendering.VolumeProfile", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEditor.SceneAsset", + "ignore": false, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Shader", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.ShaderVariantCollection", + "ignore": true, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Texture", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Texture2D", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + }, + { + "userAdded": false, + "type": "UnityEngine.Timeline.TimelineAsset", + "ignore": false, + "defaultInstantiationMode": 0, + "supportsModification": true + } + ], + "defaultDependencyTypeInfo": { + "userAdded": false, + "type": "", + "ignore": false, + "defaultInstantiationMode": 1, + "supportsModification": true + }, + "newSceneOverride": 0 +} \ No newline at end of file