From 9868e632193388219a23b45f060af3ef280260e9 Mon Sep 17 00:00:00 2001 From: RedStealthDev Date: Thu, 26 Jan 2023 09:50:30 +0100 Subject: [PATCH] Done Cleaing --- Assets/Materials/Grapic/Buttons.png.meta | 135 ++++++ Assets/Scenes/Main_Game.unity | 439 ++++++++---------- Assets/Scripts/PlayerMovement.cs | 75 ++- Assets/Scripts/camera.cs | 20 +- ...SyncFile~16c106de972c72640bc6053a2dc2b1f9~ | 0 ...SyncFile~248656a664236cd4ab3fbb60c66522c6~ | 0 ...SyncFile~4a5fef8fdee55ae40b16d1c3f9cfecc3~ | 0 ...SyncFile~752535251800cdc40a6bff4951552a8e~ | 0 ...SyncFile~7de3fedcc74b3294da1db91061d1a839~ | 0 ...SyncFile~8af886f1e98a0e74297899cac83f1365~ | 0 ...SyncFile~cc1946a31ef2f9a47933989435e10238~ | 0 .../Layouts/CurrentMaximizeLayout.dwlt | 336 +++++++------- UserSettings/Layouts/default-2021.dwlt | 322 ++++++------- 13 files changed, 685 insertions(+), 642 deletions(-) create mode 100644 Assets/Materials/Grapic/Buttons.png.meta create mode 100644 Assets/~UnityDirMonSyncFile~16c106de972c72640bc6053a2dc2b1f9~ create mode 100644 Assets/~UnityDirMonSyncFile~248656a664236cd4ab3fbb60c66522c6~ create mode 100644 Assets/~UnityDirMonSyncFile~4a5fef8fdee55ae40b16d1c3f9cfecc3~ create mode 100644 Assets/~UnityDirMonSyncFile~752535251800cdc40a6bff4951552a8e~ create mode 100644 Assets/~UnityDirMonSyncFile~7de3fedcc74b3294da1db91061d1a839~ create mode 100644 Assets/~UnityDirMonSyncFile~8af886f1e98a0e74297899cac83f1365~ create mode 100644 Assets/~UnityDirMonSyncFile~cc1946a31ef2f9a47933989435e10238~ diff --git a/Assets/Materials/Grapic/Buttons.png.meta b/Assets/Materials/Grapic/Buttons.png.meta new file mode 100644 index 0000000..d3b3bc6 --- /dev/null +++ b/Assets/Materials/Grapic/Buttons.png.meta @@ -0,0 +1,135 @@ +fileFormatVersion: 2 +guid: 26cf75e3e25975347b0e35797b3c291b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMasterTextureLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: WebGL + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Main_Game.unity b/Assets/Scenes/Main_Game.unity index 9cb5ea1..a232338 100644 --- a/Assets/Scenes/Main_Game.unity +++ b/Assets/Scenes/Main_Game.unity @@ -123,6 +123,117 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &47750003 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 47750005} + - component: {fileID: 47750004} + - component: {fileID: 47750006} + m_Layer: 6 + m_Name: Square + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!212 &47750004 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 47750003} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!4 &47750005 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 47750003} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 4.1680903, y: -15.975444, z: 0} + m_LocalScale: {x: 100, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!61 &47750006 +BoxCollider2D: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 47750003} + 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_SpriteTilingProperty: + border: {x: 0, y: 0, z: 0, w: 0} + pivot: {x: 0.5, y: 0.5} + oldSize: {x: 1, y: 1} + newSize: {x: 1, y: 1} + adaptiveTilingThreshold: 0.5 + drawMode: 0 + adaptiveTiling: 0 + m_AutoTiling: 0 + serializedVersion: 2 + m_Size: {x: 1, y: 1} + m_EdgeRadius: 0 --- !u!1 &96465037 GameObject: m_ObjectHideFlags: 0 @@ -206,7 +317,8 @@ Transform: m_LocalPosition: {x: 0, y: 6, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 102117059} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -222,10 +334,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 697f3848188d511178ae224d2ed73cde, type: 3} m_Name: m_EditorClassIdentifier: - FollowedObject: {fileID: 1426947899} - offset: {x: 0, y: 6} - sus: {x: 20, y: 5} - Speed: 1 + FollowedObject: {fileID: 1739913275} + Damping: 3 --- !u!114 &96465042 MonoBehaviour: m_ObjectHideFlags: 0 @@ -239,8 +349,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_AssetsPPU: 4 - m_RefResolutionX: 480 - m_RefResolutionY: 270 + m_RefResolutionX: 640 + m_RefResolutionY: 360 m_UpscaleRT: 0 m_PixelSnapping: 0 m_CropFrameX: 0 @@ -267,7 +377,7 @@ Rigidbody2D: m_SleepingMode: 0 m_CollisionDetection: 1 m_Constraints: 4 ---- !u!1 &225923646 +--- !u!1 &102117058 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -275,31 +385,82 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 225923647} + - component: {fileID: 102117059} + - component: {fileID: 102117060} m_Layer: 0 - m_Name: Test Map + m_Name: Camera marker m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &225923647 +--- !u!4 &102117059 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 225923646} + m_GameObject: {fileID: 102117058} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1734573319} - - {fileID: 1748358147} - m_Father: {fileID: 0} - m_RootOrder: 2 + m_Children: [] + m_Father: {fileID: 96465040} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &102117060 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 102117058} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} + m_Color: {r: 1, g: 0.06914881, b: 0, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 1, y: 1} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &874085733 GameObject: m_ObjectHideFlags: 0 @@ -331,7 +492,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1426947899} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 30, y: -90, z: 0} --- !u!199 &874085735 ParticleSystemRenderer: @@ -5155,7 +5316,7 @@ Transform: m_Children: - {fileID: 1576707494} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1426947895 GameObject: @@ -5290,8 +5451,8 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1504207990} - - {fileID: 1766360384} - {fileID: 874085734} + - {fileID: 1739913275} m_Father: {fileID: 0} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -5585,7 +5746,7 @@ TilemapCollider2D: m_Offset: {x: 0, y: 0} m_MaximumTileChangeCount: 1000 m_ExtrusionFactor: 0.00001 ---- !u!1 &1734573316 +--- !u!1 &1739913274 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5593,248 +5754,26 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1734573319} - - component: {fileID: 1734573318} - - component: {fileID: 1734573320} - m_Layer: 6 - m_Name: test map - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!212 &1734573318 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1734573316} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!4 &1734573319 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1734573316} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -50, z: 0} - m_LocalScale: {x: 1000, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 225923647} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &1734573320 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1734573316} - 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_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 ---- !u!1 &1748358146 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1748358147} - - component: {fileID: 1748358148} - - component: {fileID: 1748358149} - m_Layer: 0 - m_Name: Square - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1748358147 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1748358146} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -500, y: -0.5, z: 0} - m_LocalScale: {x: 1, y: 100, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 225923647} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1748358148 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1748358146} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - m_SelectedEditorRenderState: 0 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_Sprite: {fileID: 7482667652216324306, guid: 311925a002f4447b3a28927169b83ea6, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 1, y: 1} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 ---- !u!61 &1748358149 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1748358146} - 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_SpriteTilingProperty: - border: {x: 0, y: 0, z: 0, w: 0} - pivot: {x: 0.5, y: 0.5} - oldSize: {x: 1, y: 1} - newSize: {x: 1, y: 1} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - serializedVersion: 2 - m_Size: {x: 1, y: 1} - m_EdgeRadius: 0 ---- !u!1 &1766360383 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1766360384} + - component: {fileID: 1739913275} m_Layer: 0 - m_Name: test + m_Name: CamFollow m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &1766360384 +--- !u!4 &1739913275 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1766360383} + m_GameObject: {fileID: 1739913274} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -1.87, y: -32, z: 0} + m_LocalPosition: {x: 0, y: 8, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1426947899} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scripts/PlayerMovement.cs b/Assets/Scripts/PlayerMovement.cs index 8ad13f0..d97bc13 100644 --- a/Assets/Scripts/PlayerMovement.cs +++ b/Assets/Scripts/PlayerMovement.cs @@ -7,21 +7,18 @@ using UnityEngine.InputSystem; public class PlayerMovement : MonoBehaviour { private Rigidbody2D rb; - private SpriteRenderer SR; private Transform Gr; private Animator Ani; - private Collider2D C2D; private Inputs Input; private InputAction Walk; private InputAction Jump; private InputAction Dash; - private Vector2 Force; private ParticleSystem Fart; private float x; private int usedash; - public float drag; - public LayerMask GroundLayer; + public LayerMask g; public Vector2 dashvec; + public float drag; public int dashes; public float Speed; public float JumpPwr; @@ -29,11 +26,9 @@ public class PlayerMovement : MonoBehaviour { Input = new Inputs(); rb = this.gameObject.GetComponent(); - Gr = this.gameObject.transform.Find("GroundCheck").transform; + Gr = this.transform.Find("GroundCheck").transform; Ani = this.gameObject.GetComponent(); - SR = this.gameObject.GetComponent(); - C2D = this.gameObject.GetComponent(); - Fart = this.gameObject.transform.Find("Fart").GetComponent(); + Fart = this.transform.Find("Fart").GetComponent(); } private void OnEnable() { @@ -54,36 +49,31 @@ public class PlayerMovement : MonoBehaviour { Jump.performed += _ => jump(); Dash.performed += _ => dash(); - Force = Walk.ReadValue(); - if(Force.x < 0) + Vector2 Force = Walk.ReadValue(); + rb.velocity = new Vector2(x + Force.x * Speed, rb.velocity.y); + if (Force.x < 0) { - if(x > 0) + if (x > 0) { x = -x; } - SR.flipX = true; - Fart.transform.localPosition = new Vector3(2.14f, 1.5f, 0); - Fart.transform.localRotation = Quaternion.Euler(new Vector3(30, 90, 0)); Ani.SetBool("Running", true); - C2D.offset = new Vector2(1.125f, 2.5f); + rb.transform.rotation = new Quaternion(0, 180, 0, 0); } - else if(Force.x > 0) + else if (Force.x > 0) { - if(x < 0) + if (x < 0) { x = -x; } - SR.flipX = false; - Fart.transform.localPosition = new Vector3(-2.14f, 1.5f, 0); - Fart.transform.localRotation = Quaternion.Euler(new Vector3(30, -90, 0)); Ani.SetBool("Running", true); - C2D.offset = new Vector2(-1.125f, 2.5f); + rb.transform.rotation = new Quaternion(0, 0, 0, 0); } else { Ani.SetBool("Running", false); } - if(rb.velocity.y < 0 && !IsGrounded()) + if (rb.velocity.y < 0 && !IsGrounded()) { Ani.SetBool("Falling", true); } @@ -91,31 +81,27 @@ public class PlayerMovement : MonoBehaviour { Ani.SetBool("Falling", false); } - if(IsGrounded()) + if (IsGrounded()) { + if (x > -0.01 && x < 0.01) + { + x = 0; + } + else + { + x = Mathf.Lerp(x, 0, Time.deltaTime * drag); + } Ani.SetBool("Dash", false); usedash = dashes; } } - private void FixedUpdate() - { - rb.velocity = new Vector2(x + Force.x*Speed, rb.velocity.y); - if(x > -0.01 && x < 0.01 || IsGrounded()) - { - x=0; - } - else - { - x = Mathf.Lerp(x, 0, Time.deltaTime * drag); - } - } private bool IsGrounded() { - return Physics2D.OverlapBox(Gr.position, new Vector2(6, 1), 0f, GroundLayer); + return Physics2D.OverlapBox(Gr.position, new Vector2(6, 1), 0f, g); } private void jump() { - if(IsGrounded()) + if (IsGrounded()) { rb.velocity = new Vector2(rb.velocity.x, JumpPwr); Ani.SetBool("Jump", true); @@ -123,19 +109,10 @@ public class PlayerMovement : MonoBehaviour } private void dash() { - if(!IsGrounded() && !Fart.isPlaying && usedash !=0) + if (!IsGrounded() && !Fart.isPlaying && usedash != 0) { - float e = 0; - if(SR.flipX) - { - e = -1; - } - else - { - e = 1; - } rb.velocity = new Vector2(rb.velocity.x, rb.velocity.y + dashvec.y); - x += dashvec.x * e; + x += dashvec.x; Fart.Play(); Ani.SetBool("Dash", true); Ani.SetBool("Jump", false); diff --git a/Assets/Scripts/camera.cs b/Assets/Scripts/camera.cs index 58cd463..719737f 100644 --- a/Assets/Scripts/camera.cs +++ b/Assets/Scripts/camera.cs @@ -6,26 +6,18 @@ using UnityEngine; public class camera : MonoBehaviour { public Transform FollowedObject; - public Vector2 offset; - private Vector2 dest; - private Vector2 Vel; + public float Damping; private Rigidbody2D RB; - private Rigidbody2D FolRB; - public Vector2 sus; - public float Speed; + private Vector2 RefVel; + private Vector2 Target; private void Awake() { RB = this.gameObject.GetComponent(); - FolRB = FollowedObject.GetComponent(); } void Update() { - dest = FolRB.position + offset; - Vel = RB.velocity; - RB.velocity = (new Vector2(MathF.Round(dest.x*4, MidpointRounding.AwayFromZero)/4, MathF.Round(dest.y*4, MidpointRounding.AwayFromZero)/4) - RB.position)*Vector2.Distance(RB.position, FolRB.position)/Speed; - } - void FixedUpdate() - { - + Target = new Vector2(FollowedObject.position.x, FollowedObject.position.y); + RefVel = RB.velocity; + RB.velocity = (Vector2.SmoothDamp(RB.position, Target, ref RefVel, 0.1f) - Target) * new Vector2(-1*Damping, -1*Damping); } } \ No newline at end of file diff --git a/Assets/~UnityDirMonSyncFile~16c106de972c72640bc6053a2dc2b1f9~ b/Assets/~UnityDirMonSyncFile~16c106de972c72640bc6053a2dc2b1f9~ new file mode 100644 index 0000000..e69de29 diff --git a/Assets/~UnityDirMonSyncFile~248656a664236cd4ab3fbb60c66522c6~ b/Assets/~UnityDirMonSyncFile~248656a664236cd4ab3fbb60c66522c6~ new file mode 100644 index 0000000..e69de29 diff --git a/Assets/~UnityDirMonSyncFile~4a5fef8fdee55ae40b16d1c3f9cfecc3~ b/Assets/~UnityDirMonSyncFile~4a5fef8fdee55ae40b16d1c3f9cfecc3~ new file mode 100644 index 0000000..e69de29 diff --git a/Assets/~UnityDirMonSyncFile~752535251800cdc40a6bff4951552a8e~ b/Assets/~UnityDirMonSyncFile~752535251800cdc40a6bff4951552a8e~ new file mode 100644 index 0000000..e69de29 diff --git a/Assets/~UnityDirMonSyncFile~7de3fedcc74b3294da1db91061d1a839~ b/Assets/~UnityDirMonSyncFile~7de3fedcc74b3294da1db91061d1a839~ new file mode 100644 index 0000000..e69de29 diff --git a/Assets/~UnityDirMonSyncFile~8af886f1e98a0e74297899cac83f1365~ b/Assets/~UnityDirMonSyncFile~8af886f1e98a0e74297899cac83f1365~ new file mode 100644 index 0000000..e69de29 diff --git a/Assets/~UnityDirMonSyncFile~cc1946a31ef2f9a47933989435e10238~ b/Assets/~UnityDirMonSyncFile~cc1946a31ef2f9a47933989435e10238~ new file mode 100644 index 0000000..e69de29 diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 4f8525e..a376bf6 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -21,11 +21,11 @@ MonoBehaviour: x: 0 y: 30 width: 1920 - height: 927 + height: 947 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 6172 + controlID: 4103 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -46,10 +46,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2223 - y: 89 - width: 1163 - height: 643 + x: 302 + y: 73 + width: 1277 + height: 741 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -62,25 +62,25 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1106, y: 622} + m_TargetSize: {x: 1280, y: 720} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 + m_EnterPlayModeBehavior: 1 m_UseMipMap: 0 - m_VSyncEnabled: 0 + m_VSyncEnabled: 1 m_Gizmos: 0 m_Stats: 0 - m_SelectedSizes: 01000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_SelectedSizes: 07000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -553 - m_HBaseRangeMax: 553 - m_VBaseRangeMin: -311 - m_VBaseRangeMax: 311 + m_HBaseRangeMin: -640 + m_HBaseRangeMax: 640 + m_VBaseRangeMin: -360 + m_VBaseRangeMax: 360 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -89,7 +89,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 0 + m_EnableMouseInput: 1 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -98,23 +98,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1163 - height: 622 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 581.5, y: 311} + width: 1277 + height: 720 + m_Scale: {x: 0.9976562, y: 0.9976562} + m_Translation: {x: 638.5, y: 360} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -581.5 - y: -311 - width: 1163 - height: 622 + x: -640 + y: -360.84573 + width: 1280 + height: 721.69147 m_MinimalGUI: 1 - m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1163, y: 643} + m_defaultScale: 0.9976562 + m_LastWindowPixelSize: {x: 1277, y: 741} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -137,8 +137,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 303 - height: 927 + width: 302 + height: 947 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 4} @@ -166,10 +166,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1920 - y: 89 - width: 302 - height: 906 + x: 0 + y: 73 + width: 301 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -177,9 +177,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 2c620000 - m_LastClickedID: 25132 - m_ExpandedIDs: 9ef8ffff20fbffff3462000038620000 + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 28fbffff5c620000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -217,17 +217,17 @@ MonoBehaviour: m_EditorClassIdentifier: m_Children: - {fileID: 6} - - {fileID: 9} + - {fileID: 8} m_Position: serializedVersion: 2 - x: 303 + x: 302 y: 0 - width: 1165 - height: 927 + width: 1279 + height: 947 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 6173 + controlID: 4108 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -245,15 +245,14 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1165 - height: 664 - m_MinSize: {x: 202, y: 221} - m_MaxSize: {x: 4002, y: 4021} + width: 1279 + height: 762 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} m_Panes: - {fileID: 7} - {fileID: 2} - - {fileID: 8} m_Selected: 1 m_LastSelected: 0 --- !u!114 &7 @@ -276,10 +275,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2223 - y: 89 - width: 1163 - height: 643 + x: 302 + y: 73 + width: 1101 + height: 640 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -300,9 +299,9 @@ MonoBehaviour: floating: 0 collapsed: 0 displayed: 1 - snapOffset: {x: -141, y: 149} + snapOffset: {x: 101, y: 0} snapOffsetDelta: {x: 0, y: 0} - snapCorner: 1 + snapCorner: 0 id: unity-grid-and-snap-toolbar index: 1 layout: 1 @@ -536,9 +535,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 1.5677803, y: -4.3286753, z: -0.12356802} + m_Target: {x: 0.71574366, y: 5.940697, z: -0.9195421} speed: 2 - m_Value: {x: 1.5677803, y: -4.3286753, z: -0.12356802} + m_Value: {x: 0.71574366, y: 5.940697, z: -0.9195421} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -589,9 +588,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 5.889936 + m_Target: 21.81658 speed: 2 - m_Value: 5.889936 + m_Value: 21.81658 m_Ortho: m_Target: 1 speed: 2 @@ -617,70 +616,6 @@ MonoBehaviour: m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 --- !u!114 &8 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Animator - m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 2223 - y: 89 - width: 1163 - height: 643 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ViewTransforms: - m_KeySerializationHelper: - - {fileID: -9079914194315318268, guid: 6b0aac9c28934ea58a29403562054c6a, type: 2} - m_ValueSerializationHelper: - - e00: 1 - e01: 0 - e02: 0 - e03: 289 - e10: 0 - e11: 1 - e12: 0 - e13: 14 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 6b0aac9c28934ea58a29403562054c6a, type: 2} - m_BreadCrumbs: - - m_Target: {fileID: -9079914194315318268, guid: 6b0aac9c28934ea58a29403562054c6a, type: 2} - m_ScrollPosition: {x: 0, y: 0} - stateMachineGraph: {fileID: 0} - stateMachineGraphGUI: {fileID: 0} - blendTreeGraph: {fileID: 0} - blendTreeGraphGUI: {fileID: 0} - m_AutoLiveLink: 1 - m_MiniTool: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentEditor: 1 - m_LayerEditor: - m_SelectedLayerIndex: 0 ---- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -690,25 +625,26 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 664 - width: 1165 - height: 263 - m_MinSize: {x: 232, y: 271} - m_MaxSize: {x: 10002, y: 10021} - m_ActualView: {fileID: 11} + y: 762 + width: 1279 + height: 185 + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_ActualView: {fileID: 9} m_Panes: + - {fileID: 9} - {fileID: 10} - {fileID: 11} - {fileID: 12} - m_Selected: 1 - m_LastSelected: 0 ---- !u!114 &10 + m_Selected: 0 + m_LastSelected: 1 +--- !u!114 &9 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -728,15 +664,15 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2223 - y: 753 - width: 1163 - height: 242 + x: 302 + y: 835 + width: 1277 + height: 164 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &11 +--- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -756,10 +692,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2223 - y: 753 - width: 1163 - height: 242 + x: 302 + y: 734 + width: 1101 + height: 265 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -777,22 +713,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/AnimatorsAnims + - Assets/Scripts m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/AnimatorsAnims + - Assets/Scripts m_LastFoldersGridSize: -1 - m_LastProjectPath: /home/red/projekts/RatAttack2D + m_LastProjectPath: D:\repos\WIP\RatAttack2D m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 22} - m_SelectedIDs: aa630000 - m_LastClickedID: 25514 - m_ExpandedIDs: 0000000012630000a6630000a863000000ca9a3b + scrollPos: {x: 0, y: 0} + m_SelectedIDs: c4630000 + m_LastClickedID: 25540 + m_ExpandedIDs: 000000009263000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -808,7 +744,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 9} + m_ClientGUIView: {fileID: 8} m_SearchString: m_CreateAssetUtility: m_EndAction: {fileID: 0} @@ -820,7 +756,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 0000000012630000a863000000ca9a3b + m_ExpandedIDs: 000000009263000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -845,9 +781,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: 2c620000 - m_LastClickedInstanceID: 25132 - m_HadKeyboardFocusLastEvent: 0 + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c623000000000000 m_RenameOverlay: m_UserAcceptedRename: 0 @@ -876,7 +812,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 123 ---- !u!114 &12 +--- !u!114 &11 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -896,17 +832,81 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2223 - y: 753 - width: 1163 - height: 242 + x: 302 + y: 734 + width: 1101 + height: 265 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: 25146 +--- !u!114 &12 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animator + m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 302 + y: 735 + width: 1102 + height: 264 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: -9079914194315318268, guid: 6b0aac9c28934ea58a29403562054c6a, type: 2} + m_ValueSerializationHelper: + - e00: 0.8526872 + e01: 0 + e02: 0 + e03: 214.97694 + e10: 0 + e11: 0.8526872 + e12: 0 + e13: -120.11471 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: 6b0aac9c28934ea58a29403562054c6a, type: 2} + m_BreadCrumbs: + - m_Target: {fileID: -9079914194315318268, guid: 6b0aac9c28934ea58a29403562054c6a, type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 25132 + m_CurrentEditor: 1 + m_LayerEditor: + m_SelectedLayerIndex: 0 --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -922,10 +922,10 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 1468 + x: 1581 y: 0 - width: 452 - height: 927 + width: 339 + height: 947 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 14} @@ -954,10 +954,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 3388 - y: 89 - width: 451 - height: 906 + x: 1581 + y: 73 + width: 338 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -965,10 +965,10 @@ MonoBehaviour: m_ObjectsLockedBeforeSerialization: [] m_InstanceIDsLockedBeforeSerialization: m_PreviewResizer: - m_CachedPref: 342 + m_CachedPref: 151 m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview - m_LastInspectedObjectInstanceID: -1 + m_LastInspectedObjectInstanceID: 25146 m_LastVerticalScrollValue: 0 m_GlobalObjectId: m_InspectorMode: 0 @@ -995,10 +995,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 3388 - y: 89 - width: 451 - height: 906 + x: 1406 + y: 73 + width: 513 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index e75f48c..70957b1 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -14,16 +14,16 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 240 - y: 113 - width: 1265 - height: 663 + x: 0 + y: 43 + width: 1920 + height: 997 m_ShowMode: 4 m_Title: Inspector m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 350} m_MaxSize: {x: 10000, y: 10000} - m_Maximized: 0 + m_Maximized: 1 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -44,8 +44,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1265 - height: 663 + width: 1920 + height: 997 m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} m_UseTopView: 1 @@ -69,7 +69,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1265 + width: 1920 height: 30 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -90,8 +90,8 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 643 - width: 1265 + y: 977 + width: 1920 height: 20 m_MinSize: {x: 0, y: 0} m_MaxSize: {x: 0, y: 0} @@ -115,12 +115,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 30 - width: 1265 - height: 613 + width: 1920 + height: 947 m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 45 + controlID: 4489 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -138,10 +138,10 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 199 - height: 613 - m_MinSize: {x: 201, y: 221} - m_MaxSize: {x: 4001, y: 4021} + width: 354 + height: 947 + m_MinSize: {x: 200, y: 200} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 12} m_Panes: - {fileID: 12} @@ -164,14 +164,14 @@ MonoBehaviour: - {fileID: 9} m_Position: serializedVersion: 2 - x: 199 + x: 354 y: 0 - width: 727 - height: 613 + width: 1182 + height: 947 m_MinSize: {x: 100, y: 200} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 96 + controlID: 4551 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -189,8 +189,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 727 - height: 428 + width: 1182 + height: 680 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 13} @@ -209,25 +209,25 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 428 - width: 727 - height: 185 - m_MinSize: {x: 232, y: 271} - m_MaxSize: {x: 10002, y: 10021} - m_ActualView: {fileID: 16} + y: 680 + width: 1182 + height: 267 + m_MinSize: {x: 102, y: 121} + m_MaxSize: {x: 4002, y: 4021} + m_ActualView: {fileID: 14} m_Panes: + - {fileID: 14} - {fileID: 15} - {fileID: 16} - {fileID: 17} - - {fileID: 14} - m_Selected: 1 - m_LastSelected: 0 + m_Selected: 0 + m_LastSelected: 1 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -243,12 +243,12 @@ MonoBehaviour: m_Children: [] m_Position: serializedVersion: 2 - x: 926 + x: 1536 y: 0 - width: 339 - height: 613 - m_MinSize: {x: 276, y: 71} - m_MaxSize: {x: 4001, y: 4021} + width: 384 + height: 947 + m_MinSize: {x: 275, y: 50} + m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -275,10 +275,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 302 + x: 354 y: 73 - width: 1102 - height: 641 + width: 1180 + height: 659 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -291,7 +291,7 @@ MonoBehaviour: m_ShowGizmos: 0 m_TargetDisplay: 0 m_ClearColor: {r: 0, g: 0, b: 0, a: 0} - m_TargetSize: {x: 1102, y: 620} + m_TargetSize: {x: 1280, y: 720} m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 @@ -300,16 +300,16 @@ MonoBehaviour: m_VSyncEnabled: 1 m_Gizmos: 0 m_Stats: 0 - m_SelectedSizes: 01000000000000000000000000000000000000000000000000000000000000000000000000000000 + m_SelectedSizes: 07000000000000000000000000000000000000000000000000000000000000000000000000000000 m_ZoomArea: m_HRangeLocked: 0 m_VRangeLocked: 0 hZoomLockedByDefault: 0 vZoomLockedByDefault: 0 - m_HBaseRangeMin: -551 - m_HBaseRangeMax: 551 - m_VBaseRangeMin: -310 - m_VBaseRangeMax: 310 + m_HBaseRangeMin: -640 + m_HBaseRangeMax: 640 + m_VBaseRangeMin: -360 + m_VBaseRangeMax: 360 m_HAllowExceedBaseRangeMin: 1 m_HAllowExceedBaseRangeMax: 1 m_VAllowExceedBaseRangeMin: 1 @@ -318,7 +318,7 @@ MonoBehaviour: m_HSlider: 0 m_VSlider: 0 m_IgnoreScrollWheelUntilClicked: 0 - m_EnableMouseInput: 1 + m_EnableMouseInput: 0 m_EnableSliderZoomHorizontal: 0 m_EnableSliderZoomVertical: 0 m_UniformScale: 1 @@ -327,23 +327,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1102 - height: 620 - m_Scale: {x: 1, y: 1} - m_Translation: {x: 551, y: 310} + width: 1180 + height: 638 + m_Scale: {x: 0.88611114, y: 0.88611114} + m_Translation: {x: 590, y: 319} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -551 - y: -310 - width: 1102 - height: 620 + x: -665.8307 + y: -360 + width: 1331.6614 + height: 720 m_MinimalGUI: 1 - m_defaultScale: 1 - m_LastWindowPixelSize: {x: 1102, y: 641} + m_defaultScale: 0.88611114 + m_LastWindowPixelSize: {x: 1180, y: 659} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -369,10 +369,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 240 - y: 143 - width: 198 - height: 592 + x: 0 + y: 73 + width: 353 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -380,9 +380,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 84610000 - m_LastClickedID: 0 - m_ExpandedIDs: b2faffffc6620000de620000e2620000 + m_SelectedIDs: 5c620000 + m_LastClickedID: 25180 + m_ExpandedIDs: 28fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -426,10 +426,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 439 - y: 143 - width: 725 - height: 407 + x: 354 + y: 73 + width: 1180 + height: 659 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -686,9 +686,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 11.690928, y: -8.980604, z: -1.1344234} + m_Target: {x: 20.91162, y: 10.159811, z: -1.0832449} speed: 2 - m_Value: {x: 12.255868, y: -8.683155, z: -1.147584} + m_Value: {x: 20.91162, y: 10.159811, z: -1.0832449} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -725,7 +725,7 @@ MonoBehaviour: m_Size: {x: 1, y: 1} zGrid: m_Fade: - m_Target: 0 + m_Target: 1 speed: 2 m_Value: 1 m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4} @@ -739,9 +739,9 @@ MonoBehaviour: speed: 2 m_Value: {x: 0, y: 0, z: 0, w: 1} m_Size: - m_Target: 27.929539 + m_Target: 24.431524 speed: 2 - m_Value: 29.24559 + m_Value: 24.431524 m_Ortho: m_Target: 1 speed: 2 @@ -767,70 +767,6 @@ MonoBehaviour: m_LastLockedObject: {fileID: 0} m_ViewIsLockedToObject: 0 --- !u!114 &14 -MonoBehaviour: - m_ObjectHideFlags: 52 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} - m_Name: - m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} - m_TitleContent: - m_Text: Animator - m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} - m_Tooltip: - m_Pos: - serializedVersion: 2 - x: 302 - y: 735 - width: 1102 - height: 264 - m_ViewDataDictionary: {fileID: 0} - m_OverlayCanvas: - m_LastAppliedPresetName: Default - m_SaveData: [] - m_ViewTransforms: - m_KeySerializationHelper: - - {fileID: -9079914194315318268, guid: 6b0aac9c28934ea58a29403562054c6a, type: 2} - m_ValueSerializationHelper: - - e00: 0.8526872 - e01: 0 - e02: 0 - e03: 214.97694 - e10: 0 - e11: 0.8526872 - e12: 0 - e13: -120.11471 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_PreviewAnimator: {fileID: 0} - m_AnimatorController: {fileID: 9100000, guid: 6b0aac9c28934ea58a29403562054c6a, type: 2} - m_BreadCrumbs: - - m_Target: {fileID: -9079914194315318268, guid: 6b0aac9c28934ea58a29403562054c6a, type: 2} - m_ScrollPosition: {x: 0, y: 0} - stateMachineGraph: {fileID: 0} - stateMachineGraphGUI: {fileID: 0} - blendTreeGraph: {fileID: 0} - blendTreeGraphGUI: {fileID: 0} - m_AutoLiveLink: 1 - m_MiniTool: 0 - m_LockTracker: - m_IsLocked: 0 - m_CurrentEditor: 1 - m_LayerEditor: - m_SelectedLayerIndex: 0 ---- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -850,15 +786,15 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 302 - y: 735 - width: 1102 - height: 264 + x: 354 + y: 753 + width: 1180 + height: 246 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] ---- !u!114 &16 +--- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -878,10 +814,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 439 - y: 571 - width: 725 - height: 164 + x: 302 + y: 734 + width: 1101 + height: 265 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -899,22 +835,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Materials/Grapic + - Assets/Scripts m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Materials/Grapic + - Assets/Scripts m_LastFoldersGridSize: -1 - m_LastProjectPath: E:\Repos\RatAttack2D + m_LastProjectPath: D:\repos\WIP\RatAttack2D m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: 5a6a0000 - m_LastClickedID: 27226 - m_ExpandedIDs: 00000000a0630000c26300005a6a000000ca9a3b + m_SelectedIDs: c4630000 + m_LastClickedID: 25540 + m_ExpandedIDs: 000000009263000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -942,7 +878,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000a0630000 + m_ExpandedIDs: 000000009263000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -998,7 +934,7 @@ MonoBehaviour: m_GridSize: 64 m_SkipHiddenPackages: 0 m_DirectoriesAreaWidth: 123 ---- !u!114 &17 +--- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 m_CorrespondingSourceObject: {fileID: 0} @@ -1016,6 +952,37 @@ MonoBehaviour: m_Text: Animation m_Image: {fileID: -8166618308981325432, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: + m_Pos: + serializedVersion: 2 + x: 302 + y: 734 + width: 1101 + height: 265 + m_ViewDataDictionary: {fileID: 0} + m_OverlayCanvas: + m_LastAppliedPresetName: Default + m_SaveData: [] + m_LockTracker: + m_IsLocked: 0 + m_LastSelectedObjectID: 25180 +--- !u!114 &17 +MonoBehaviour: + m_ObjectHideFlags: 52 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 12914, guid: 0000000000000000e000000000000000, type: 0} + m_Name: + m_EditorClassIdentifier: + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} + m_TitleContent: + m_Text: Animator + m_Image: {fileID: -1673928668082335149, guid: 0000000000000000d000000000000000, type: 0} + m_Tooltip: m_Pos: serializedVersion: 2 x: 302 @@ -1026,9 +993,42 @@ MonoBehaviour: m_OverlayCanvas: m_LastAppliedPresetName: Default m_SaveData: [] + m_ViewTransforms: + m_KeySerializationHelper: + - {fileID: -9079914194315318268, guid: 6b0aac9c28934ea58a29403562054c6a, type: 2} + m_ValueSerializationHelper: + - e00: 0.8526872 + e01: 0 + e02: 0 + e03: 214.97694 + e10: 0 + e11: 0.8526872 + e12: 0 + e13: -120.11471 + e20: 0 + e21: 0 + e22: 1 + e23: 0 + e30: 0 + e31: 0 + e32: 0 + e33: 1 + m_PreviewAnimator: {fileID: 0} + m_AnimatorController: {fileID: 9100000, guid: 6b0aac9c28934ea58a29403562054c6a, type: 2} + m_BreadCrumbs: + - m_Target: {fileID: -9079914194315318268, guid: 6b0aac9c28934ea58a29403562054c6a, type: 2} + m_ScrollPosition: {x: 0, y: 0} + stateMachineGraph: {fileID: 0} + stateMachineGraphGUI: {fileID: 0} + blendTreeGraph: {fileID: 0} + blendTreeGraphGUI: {fileID: 0} + m_AutoLiveLink: 1 + m_MiniTool: 0 m_LockTracker: m_IsLocked: 0 - m_LastSelectedObjectID: 25314 + m_CurrentEditor: 1 + m_LayerEditor: + m_SelectedLayerIndex: 0 --- !u!114 &18 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1049,10 +1049,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1166 - y: 143 - width: 338 - height: 592 + x: 1536 + y: 73 + width: 383 + height: 926 m_ViewDataDictionary: {fileID: 0} m_OverlayCanvas: m_LastAppliedPresetName: Default @@ -1064,7 +1064,7 @@ MonoBehaviour: m_ControlHash: -371814159 m_PrefName: Preview_InspectorPreview m_LastInspectedObjectInstanceID: -1 - m_LastVerticalScrollValue: 0 + m_LastVerticalScrollValue: 648 m_GlobalObjectId: m_InspectorMode: 0 m_LockTracker: