diff --git a/Assets/Animations/Player.controller b/Assets/Animations/Player.controller index f71c99d..7be2c50 100644 --- a/Assets/Animations/Player.controller +++ b/Assets/Animations/Player.controller @@ -313,7 +313,7 @@ AnimatorState: m_MirrorParameterActive: 0 m_CycleOffsetParameterActive: 0 m_TimeParameterActive: 0 - m_Motion: {fileID: 7400000, guid: a0447cbe7f357b24f9a7801fc6a16453, type: 2} + m_Motion: {fileID: 7400000, guid: 338fe03d4e50c43408a233110291c45e, type: 2} m_Tag: m_SpeedParameter: m_MirrorParameter: diff --git a/Assets/Materials/BlockWithGrass.mat b/Assets/Materials/BlockWithGrass.mat new file mode 100644 index 0000000..bbafbc7 --- /dev/null +++ b/Assets/Materials/BlockWithGrass.mat @@ -0,0 +1,50 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: BlockWithGrass + m_Shader: {fileID: 4800000, guid: e260cfa7296ee7642b167f1eb5be5023, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _AlphaTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MaskTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _NormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _EnableExternalAlpha: 0 + - _ZWrite: 0 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _RendererColor: {r: 1, g: 1, b: 1, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Materials/BlockWithGrass.mat.meta b/Assets/Materials/BlockWithGrass.mat.meta new file mode 100644 index 0000000..44cdfd0 --- /dev/null +++ b/Assets/Materials/BlockWithGrass.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dcc7052cbcee8c841825fd9f6e2a349c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Test.unity b/Assets/Scenes/Test.unity index 64a9792..9e1bddc 100644 --- a/Assets/Scenes/Test.unity +++ b/Assets/Scenes/Test.unity @@ -150,6 +150,91 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &71271081 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1557174451233602412, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: -6785098178125120784, guid: 8ef86f4ae12091b41adef5a389394740, type: 3} + - target: {fileID: 1557174451233602412, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} + propertyPath: m_SortingLayer + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 1557174451233602412, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} + propertyPath: m_SortingOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1557174451233602412, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} + propertyPath: m_SortingLayerID + value: -133646357 + objectReference: {fileID: 0} + - target: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} + propertyPath: m_LocalPosition.x + value: -4.42 + objectReference: {fileID: 0} + - target: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} + propertyPath: m_LocalPosition.y + value: -1.801 + objectReference: {fileID: 0} + - target: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} + propertyPath: m_LocalPosition.z + value: 0.16478391 + objectReference: {fileID: 0} + - target: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7345322822309755345, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7515349249133635430, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} + propertyPath: m_LocalScale.x + value: 1.1 + objectReference: {fileID: 0} + - target: {fileID: 7515349249133635430, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} + propertyPath: m_LocalScale.y + value: 1.2 + objectReference: {fileID: 0} + - target: {fileID: 7515349249133635430, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8175732239415438715, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} + propertyPath: m_Name + value: BreakableTile + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 3d1aa56cd139405448c73b1385177b04, type: 3} --- !u!1 &83149022 GameObject: m_ObjectHideFlags: 0 @@ -288,8 +373,8 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 769195415 - m_SortingLayer: 3 + m_SortingLayerID: -133646357 + m_SortingLayer: 2 m_SortingOrder: 0 m_MaskInteraction: 0 m_Sprite: {fileID: 4957045185305522080, guid: 8ef86f4ae12091b41adef5a389394740, type: 3} @@ -440,8 +525,8 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 769195415 - m_SortingLayer: 3 + m_SortingLayerID: -133646357 + m_SortingLayer: 2 m_SortingOrder: 0 m_MaskInteraction: 0 m_Sprite: {fileID: 4957045185305522080, guid: 8ef86f4ae12091b41adef5a389394740, type: 3} @@ -592,8 +677,8 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 769195415 - m_SortingLayer: 3 + m_SortingLayerID: -133646357 + m_SortingLayer: 2 m_SortingOrder: 0 m_MaskInteraction: 0 m_Sprite: {fileID: 4957045185305522080, guid: 8ef86f4ae12091b41adef5a389394740, type: 3} @@ -899,8 +984,8 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 769195415 - m_SortingLayer: 3 + m_SortingLayerID: -133646357 + m_SortingLayer: 2 m_SortingOrder: 0 m_MaskInteraction: 0 m_Sprite: {fileID: 4957045185305522080, guid: 8ef86f4ae12091b41adef5a389394740, type: 3} @@ -1051,8 +1136,8 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 769195415 - m_SortingLayer: 3 + m_SortingLayerID: -133646357 + m_SortingLayer: 2 m_SortingOrder: 0 m_MaskInteraction: 0 m_Sprite: {fileID: 4957045185305522080, guid: 8ef86f4ae12091b41adef5a389394740, type: 3} @@ -1203,8 +1288,8 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 769195415 - m_SortingLayer: 3 + m_SortingLayerID: -133646357 + m_SortingLayer: 2 m_SortingOrder: 0 m_MaskInteraction: 0 m_Sprite: {fileID: 4957045185305522080, guid: 8ef86f4ae12091b41adef5a389394740, type: 3} @@ -1262,7 +1347,6 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1828430747} - - {fileID: 806156935} - {fileID: 767504162} - {fileID: 1211214815} - {fileID: 1831474521} @@ -1271,7 +1355,6 @@ Transform: - {fileID: 83149023} - {fileID: 450358591} - {fileID: 381967874} - - {fileID: 1231076850} - {fileID: 297371478} - {fileID: 946133802} - {fileID: 1126823642} @@ -1284,6 +1367,7 @@ Transform: - {fileID: 2064965355} - {fileID: 1091993837} - {fileID: 2034197306} + - {fileID: 627174955} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!19719996 &617249161 @@ -1362,6 +1446,118 @@ Tilemap: e31: 0 e32: 0 e33: 1 +--- !u!1 &627174954 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 627174955} + - component: {fileID: 627174958} + - component: {fileID: 627174957} + - component: {fileID: 627174956} + m_Layer: 3 + m_Name: Cube + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &627174955 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 627174954} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -6.512, y: -2.691, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 617249160} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &627174956 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 627174954} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1, y: 1, z: 1} + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &627174957 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 627174954} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 9452ae1262a74094f8a68013fbcd1834, type: 2} + 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: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &627174958 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 627174954} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &767504161 GameObject: m_ObjectHideFlags: 0 @@ -1500,8 +1696,8 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 769195415 - m_SortingLayer: 3 + m_SortingLayerID: -133646357 + m_SortingLayer: 2 m_SortingOrder: 0 m_MaskInteraction: 0 m_Sprite: {fileID: 8537651536920830917, guid: 8ef86f4ae12091b41adef5a389394740, type: 3} @@ -1652,8 +1848,8 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 769195415 - m_SortingLayer: 3 + m_SortingLayerID: -133646357 + m_SortingLayer: 2 m_SortingOrder: 0 m_MaskInteraction: 0 m_Sprite: {fileID: 4957045185305522080, guid: 8ef86f4ae12091b41adef5a389394740, type: 3} @@ -1666,158 +1862,6 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 ---- !u!1 &806156934 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 806156935} - - component: {fileID: 806156936} - - component: {fileID: 806156937} - - component: {fileID: 806156938} - m_Layer: 3 - m_Name: TileMap_0 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &806156935 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 806156934} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -7.5115, y: -2.49, z: 0} - m_LocalScale: {x: 1.0239, y: 0.99992514, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 617249160} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &806156936 -SpriteRenderer: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 806156934} - 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_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - 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_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 769195415 - m_SortingLayer: 3 - m_SortingOrder: 0 - m_MaskInteraction: 0 - m_Sprite: {fileID: 8537651536920830917, guid: 8ef86f4ae12091b41adef5a389394740, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.96, y: 0.91} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_SpriteSortPoint: 0 ---- !u!114 &806156937 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 806156934} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: edf40d39eadb17a4ebb0368b3ac5399a, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::MapElement - _elementSO: {fileID: 11400000, guid: 3ddd02ac61c9b634aa71ab17c40521b7, type: 2} ---- !u!61 &806156938 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 806156934} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 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: 0.96, y: 0.91} - newSize: {x: 0.96, y: 0.91} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 0.96, y: 0.91} - m_EdgeRadius: 0 --- !u!1 &946133801 GameObject: m_ObjectHideFlags: 0 @@ -1956,8 +2000,8 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 769195415 - m_SortingLayer: 3 + m_SortingLayerID: -133646357 + m_SortingLayer: 2 m_SortingOrder: 0 m_MaskInteraction: 0 m_Sprite: {fileID: 4957045185305522080, guid: 8ef86f4ae12091b41adef5a389394740, type: 3} @@ -2049,8 +2093,8 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 769195415 - m_SortingLayer: 3 + m_SortingLayerID: -133646357 + m_SortingLayer: 2 m_SortingOrder: 0 m_MaskInteraction: 0 m_Sprite: {fileID: 4957045185305522080, guid: 8ef86f4ae12091b41adef5a389394740, type: 3} @@ -2260,8 +2304,8 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 769195415 - m_SortingLayer: 3 + m_SortingLayerID: -133646357 + m_SortingLayer: 2 m_SortingOrder: 0 m_MaskInteraction: 0 m_Sprite: {fileID: 4957045185305522080, guid: 8ef86f4ae12091b41adef5a389394740, type: 3} @@ -2412,8 +2456,8 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 769195415 - m_SortingLayer: 3 + m_SortingLayerID: -133646357 + m_SortingLayer: 2 m_SortingOrder: 0 m_MaskInteraction: 0 m_Sprite: {fileID: 4957045185305522080, guid: 8ef86f4ae12091b41adef5a389394740, type: 3} @@ -2564,8 +2608,8 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 769195415 - m_SortingLayer: 3 + m_SortingLayerID: -133646357 + m_SortingLayer: 2 m_SortingOrder: 0 m_MaskInteraction: 0 m_Sprite: {fileID: 8537651536920830917, guid: 8ef86f4ae12091b41adef5a389394740, type: 3} @@ -2578,158 +2622,6 @@ SpriteRenderer: m_SpriteTileMode: 0 m_WasSpriteAssigned: 1 m_SpriteSortPoint: 0 ---- !u!1 &1231076849 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1231076850} - - component: {fileID: 1231076853} - - component: {fileID: 1231076852} - - component: {fileID: 1231076851} - m_Layer: 3 - m_Name: TileMap_2 (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1231076850 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1231076849} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -6, y: -2.5, z: 0} - m_LocalScale: {x: 1.1960672, y: 1.1566381, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 617249160} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!61 &1231076851 -BoxCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1231076849} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ForceSendLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ForceReceiveLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_ContactCaptureLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_CallbackLayers: - serializedVersion: 2 - m_Bits: 4294967295 - m_IsTrigger: 0 - m_UsedByEffector: 0 - m_CompositeOperation: 0 - m_CompositeOrder: 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.64, y: 0.77} - newSize: {x: 1.64, y: 0.77} - adaptiveTilingThreshold: 0.5 - drawMode: 0 - adaptiveTiling: 0 - m_AutoTiling: 0 - m_Size: {x: 1.64, y: 0.77} - m_EdgeRadius: 0 ---- !u!114 &1231076852 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1231076849} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: edf40d39eadb17a4ebb0368b3ac5399a, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::MapElement - _elementSO: {fileID: 11400000, guid: 3ddd02ac61c9b634aa71ab17c40521b7, type: 2} ---- !u!212 &1231076853 -SpriteRenderer: - serializedVersion: 2 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1231076849} - 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_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_ForceMeshLod: -1 - m_MeshLodSelectionBias: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2} - 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_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 769195415 - m_SortingLayer: 3 - m_SortingOrder: 0 - m_MaskInteraction: 0 - m_Sprite: {fileID: 4957045185305522080, guid: 8ef86f4ae12091b41adef5a389394740, 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.64, y: 0.77} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_SpriteSortPoint: 0 --- !u!1 &1504345146 GameObject: m_ObjectHideFlags: 0 @@ -2868,8 +2760,8 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 769195415 - m_SortingLayer: 3 + m_SortingLayerID: -133646357 + m_SortingLayer: 2 m_SortingOrder: 0 m_MaskInteraction: 0 m_Sprite: {fileID: 8537651536920830917, guid: 8ef86f4ae12091b41adef5a389394740, type: 3} @@ -3020,8 +2912,8 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 769195415 - m_SortingLayer: 3 + m_SortingLayerID: -133646357 + m_SortingLayer: 2 m_SortingOrder: 0 m_MaskInteraction: 0 m_Sprite: {fileID: 4957045185305522080, guid: 8ef86f4ae12091b41adef5a389394740, type: 3} @@ -3172,8 +3064,8 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 769195415 - m_SortingLayer: 3 + m_SortingLayerID: -133646357 + m_SortingLayer: 2 m_SortingOrder: 0 m_MaskInteraction: 0 m_Sprite: {fileID: 4957045185305522080, guid: 8ef86f4ae12091b41adef5a389394740, type: 3} @@ -3371,8 +3263,8 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 769195415 - m_SortingLayer: 3 + m_SortingLayerID: -133646357 + m_SortingLayer: 2 m_SortingOrder: 0 m_MaskInteraction: 0 m_Sprite: {fileID: 4957045185305522080, guid: 8ef86f4ae12091b41adef5a389394740, type: 3} @@ -3449,8 +3341,8 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 769195415 - m_SortingLayer: 3 + m_SortingLayerID: -133646357 + m_SortingLayer: 2 m_SortingOrder: 0 m_MaskInteraction: 0 m_Sprite: {fileID: -5641712530122005352, guid: 8ef86f4ae12091b41adef5a389394740, type: 3} @@ -3675,8 +3567,8 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 769195415 - m_SortingLayer: 3 + m_SortingLayerID: -133646357 + m_SortingLayer: 2 m_SortingOrder: 0 m_MaskInteraction: 0 m_Sprite: {fileID: 8537651536920830917, guid: 8ef86f4ae12091b41adef5a389394740, type: 3} @@ -4058,8 +3950,8 @@ SpriteRenderer: m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} m_GlobalIlluminationMeshLod: 0 - m_SortingLayerID: 769195415 - m_SortingLayer: 3 + m_SortingLayerID: -133646357 + m_SortingLayer: 2 m_SortingOrder: 0 m_MaskInteraction: 0 m_Sprite: {fileID: 4957045185305522080, guid: 8ef86f4ae12091b41adef5a389394740, type: 3} @@ -4200,7 +4092,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4930800371010268411} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:Hips m_TagString: Untagged m_Icon: {fileID: 0} @@ -4216,7 +4108,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 934032392481278156} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightHandThumb4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4249,8 +4141,7 @@ GameObject: m_Component: - component: {fileID: 593888134675041391} - component: {fileID: 593888134675041392} - - component: {fileID: 593888134675041393} - m_Layer: 0 + m_Layer: 8 m_Name: Dwarf m_TagString: Untagged m_Icon: {fileID: 0} @@ -4391,7 +4282,7 @@ Transform: m_GameObject: {fileID: 249451357978777301} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0.8480481, z: 0, w: 0.5299193} - m_LocalPosition: {x: 0, y: -0.537, z: 0} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -4412,7 +4303,7 @@ Animator: m_Controller: {fileID: 9100000, guid: bc2b6589ef348f54e989763cea23efb7, type: 2} m_CullingMode: 0 m_UpdateMode: 0 - m_ApplyRootMotion: 0 + m_ApplyRootMotion: 1 m_LinearVelocityBlending: 0 m_StabilizeFeet: 0 m_AnimatePhysics: 0 @@ -4421,23 +4312,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &593888134675041393 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 249451357978777301} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59cb4a98d6866124793e8758b2ec958a, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::HammerThrower - _spawnPoint: {fileID: 1586111131116016716} - hammerInHand: {fileID: 6823722725711890662} - _throwSpeed: 5 - _throwCooldown: 1.5 - _playerCollider: {fileID: 8117888831474612991} --- !u!4 &766659779101801451 Transform: m_ObjectHideFlags: 0 @@ -4480,7 +4354,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6697672531457651841} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightArm m_TagString: Untagged m_Icon: {fileID: 0} @@ -4496,7 +4370,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7893683967731061273} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightShoulder m_TagString: Untagged m_Icon: {fileID: 0} @@ -4561,7 +4435,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9120364082674576674} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightHandIndex1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4577,7 +4451,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4613164891730354024} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:Spine m_TagString: Untagged m_Icon: {fileID: 0} @@ -4593,7 +4467,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6213786994334522154} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftToeBase m_TagString: Untagged m_Icon: {fileID: 0} @@ -4641,7 +4515,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7613422198643176895} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftHandIndex3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4685,7 +4559,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3184954817996477831} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftUpLeg m_TagString: Untagged m_Icon: {fileID: 0} @@ -4701,7 +4575,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4348494556527186831} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightHandIndex2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4717,7 +4591,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7821048192973000025} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftLeg m_TagString: Untagged m_Icon: {fileID: 0} @@ -4748,7 +4622,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8577166843976751618} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:HeadTop_End m_TagString: Untagged m_Icon: {fileID: 0} @@ -4780,7 +4654,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3323966819800509296} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftShoulder m_TagString: Untagged m_Icon: {fileID: 0} @@ -4796,7 +4670,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1586111131116016716} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightHand m_TagString: Untagged m_Icon: {fileID: 0} @@ -4892,7 +4766,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2143880938197688424} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftHandIndex1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4908,7 +4782,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6164081771643141703} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftHand m_TagString: Untagged m_Icon: {fileID: 0} @@ -4924,7 +4798,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5263067835356635334} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightHandIndex3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4940,7 +4814,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1475320551908104862} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightHandThumb3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4956,7 +4830,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 136872427230066226} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftHandThumb3 m_TagString: Untagged m_Icon: {fileID: 0} @@ -4987,7 +4861,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6186581214704809878} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:Neck m_TagString: Untagged m_Icon: {fileID: 0} @@ -5003,7 +4877,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 283254941373320986} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftHandIndex4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5019,7 +4893,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7593089911482176893} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftForeArm m_TagString: Untagged m_Icon: {fileID: 0} @@ -5051,7 +4925,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2868492653051149612} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightToeBase m_TagString: Untagged m_Icon: {fileID: 0} @@ -5067,7 +4941,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7042111823405451865} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightHandIndex4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5099,7 +4973,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 766659779101801451} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:Spine2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5149,7 +5023,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8830787380966555514} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightHandThumb1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5182,7 +5056,7 @@ GameObject: m_Component: - component: {fileID: 2543951424218242873} - component: {fileID: 415552913957405891} - m_Layer: 0 + m_Layer: 8 m_Name: DwarfModel m_TagString: Untagged m_Icon: {fileID: 0} @@ -5214,7 +5088,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2823428442863688607} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftHandThumb4 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5230,7 +5104,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4878956036552877406} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightLeg m_TagString: Untagged m_Icon: {fileID: 0} @@ -5246,13 +5120,12 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7687862676731468201} - - component: {fileID: 8072020879697766177} - component: {fileID: 8117888831474612988} - component: {fileID: 2434832672896571937} + - component: {fileID: 8117888831474612989} - component: {fileID: 8117888831474612991} - component: {fileID: 8117888831474612990} - - component: {fileID: 8117888831474612989} - m_Layer: 7 + m_Layer: 8 m_Name: Player m_TagString: Player m_Icon: {fileID: 0} @@ -5317,7 +5190,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 9144604184690940868} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightUpLeg m_TagString: Untagged m_Icon: {fileID: 0} @@ -5376,9 +5249,9 @@ GameObject: - component: {fileID: 6634541637282179933} - component: {fileID: 8829349425300725802} - component: {fileID: 8829349425300725803} - - component: {fileID: 8829349425300725805} - component: {fileID: 8829349425300725804} - m_Layer: 0 + - component: {fileID: 8829349425300725805} + m_Layer: 8 m_Name: Hammer m_TagString: Untagged m_Icon: {fileID: 0} @@ -5425,7 +5298,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6922942435543621006} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightToe_End m_TagString: Untagged m_Icon: {fileID: 0} @@ -5456,7 +5329,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 5312386110348879826} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftHandThumb1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5488,7 +5361,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 4012361856617455356} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftToe_End m_TagString: Untagged m_Icon: {fileID: 0} @@ -5504,7 +5377,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6796346266422157036} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:Head m_TagString: Untagged m_Icon: {fileID: 0} @@ -5536,7 +5409,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3414694545517054558} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftHandThumb2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5568,7 +5441,7 @@ Transform: m_GameObject: {fileID: 5856668094535331790} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -6.364, y: -1.552, z: 0} + m_LocalPosition: {x: -6.364, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -5600,7 +5473,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3400150497511028149} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftFoot m_TagString: Untagged m_Icon: {fileID: 0} @@ -5623,33 +5496,6 @@ Transform: - {fileID: 6697672531457651841} m_Father: {fileID: 766659779101801451} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!50 &8072020879697766177 -Rigidbody2D: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5856668094535331790} - m_BodyType: 0 - m_Simulated: 1 - m_UseFullKinematicContacts: 0 - m_UseAutoMass: 0 - m_Mass: 1 - m_LinearDamping: 0 - m_AngularDamping: 0 - 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: 0 - m_CollisionDetection: 0 - m_Constraints: 4 --- !u!114 &8117888831474612988 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5667,7 +5513,6 @@ MonoBehaviour: _mapLayer: serializedVersion: 2 m_Bits: 8 - _hammerThrower: {fileID: 593888134675041393} --- !u!114 &8117888831474612989 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5680,33 +5525,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 45d7bd38990996d4488582b07cbe7e40, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::InputManager ---- !u!114 &8117888831474612990 -MonoBehaviour: +--- !u!136 &8117888831474612990 +CapsuleCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5856668094535331790} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 59cb4a98d6866124793e8758b2ec958a, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::HammerThrower - _spawnPoint: {fileID: 0} - hammerInHand: {fileID: 0} - _throwSpeed: 5 - _throwCooldown: 1.5 - _playerCollider: {fileID: 0} ---- !u!70 &8117888831474612991 -CapsuleCollider2D: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5856668094535331790} - m_Enabled: 1 - serializedVersion: 3 - m_Density: 1 m_Material: {fileID: 0} m_IncludeLayers: serializedVersion: 2 @@ -5715,25 +5540,41 @@ CapsuleCollider2D: 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_CompositeOperation: 0 - m_CompositeOrder: 0 - m_Offset: {x: -0.04, y: 0} - m_Size: {x: 0.55, y: 0.89} - m_Direction: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Radius: 0.35 + m_Height: 1.04 + m_Direction: 1 + m_Center: {x: 0, y: 0.5, z: 0} +--- !u!54 &8117888831474612991 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5856668094535331790} + serializedVersion: 5 + m_Mass: 1 + m_LinearDamping: 0 + m_AngularDamping: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 0 + m_CollisionDetection: 0 --- !u!1 &8258636392711292803 GameObject: m_ObjectHideFlags: 0 @@ -5743,7 +5584,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2240819492353051520} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:Spine1 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5759,7 +5600,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8961430638797787929} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightHandThumb2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5775,7 +5616,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3180682117419703852} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightForeArm m_TagString: Untagged m_Icon: {fileID: 0} @@ -5791,7 +5632,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 6911613208742082748} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftArm m_TagString: Untagged m_Icon: {fileID: 0} @@ -5822,7 +5663,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 7337163736274765772} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:LeftHandIndex2 m_TagString: Untagged m_Icon: {fileID: 0} @@ -5838,7 +5679,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 560243001377410552} - m_Layer: 0 + m_Layer: 8 m_Name: mixamorig:RightFoot m_TagString: Untagged m_Icon: {fileID: 0} @@ -5979,8 +5820,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a389cb21d7bb9ce4391feffae499272f, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::Hammer - _lifespan: 5 - _stunDuration: 1 _impactNoiseRadius: 10 _emitNoiseOnImpact: 1 --- !u!4 &8830787380966555514 @@ -6056,3 +5895,4 @@ SceneRoots: - {fileID: 617249160} - {fileID: 2096110260} - {fileID: 7687862676731468201} + - {fileID: 71271081} diff --git a/Assets/Scripts/Combat/Hammer.cs b/Assets/Scripts/Combat/Hammer.cs index bf5baa0..a6cbcab 100644 --- a/Assets/Scripts/Combat/Hammer.cs +++ b/Assets/Scripts/Combat/Hammer.cs @@ -1,3 +1,4 @@ +using System.Collections; using UnityEngine; public class Hammer : MonoBehaviour @@ -8,6 +9,8 @@ public class Hammer : MonoBehaviour private bool _hasCollided = false; private Rigidbody2D _rigidbody; private Collider2D _collider; + private bool _canHit = false; + private Coroutine _disableHitCoroutine; private void Awake() { @@ -61,6 +64,11 @@ public class Hammer : MonoBehaviour private void ProcessHit(Collider2D collider, Vector2 impactVelocity, Vector2 contactPoint) { + // Only process hits when the hammer is allowed to hit (activated by input) + if (!_canHit) + return; + + StartCoroutine(ResetCollisionCoroutine()); // Check for enemy collision (stun) var enemy = collider.gameObject.GetComponent(); if (enemy != null) @@ -83,6 +91,21 @@ public class Hammer : MonoBehaviour EmitImpactNoise(contactPoint); } + public void ActivateHit(float duration) + { + _canHit = true; + if (_disableHitCoroutine != null) + StopCoroutine(_disableHitCoroutine); + _disableHitCoroutine = StartCoroutine(DisableHitAfter(duration)); + } + + private IEnumerator DisableHitAfter(float duration) + { + yield return new WaitForSeconds(duration); + _canHit = false; + _disableHitCoroutine = null; + } + private void HandleEnemyCollision(Character enemy, Vector2 impactVelocity) { // Apply stun to enemy @@ -105,5 +128,11 @@ public class Hammer : MonoBehaviour noiseSystem.Emit(position, _impactNoiseRadius); } } + + private IEnumerator ResetCollisionCoroutine() + { + yield return new WaitForSeconds(0.25f); + _hasCollided = false; + } } diff --git a/Assets/Scripts/Environment/BreakableWall.cs b/Assets/Scripts/Environment/BreakableWall.cs index a364dcb..7e12d8e 100644 --- a/Assets/Scripts/Environment/BreakableWall.cs +++ b/Assets/Scripts/Environment/BreakableWall.cs @@ -26,7 +26,7 @@ public class BreakableWall : MapElement public override void Hit() { IsEnabled = false; - _boxCollider.isTrigger = true; + _boxCollider.enabled = false; _spriteRenderer.enabled = IsEnabled; Instantiate(_hitParticles, transform.position, Quaternion.identity); @@ -55,7 +55,7 @@ public class BreakableWall : MapElement print("Character is dead"); } IsEnabled = true; - _boxCollider.isTrigger = false; + _boxCollider.enabled = true; _spriteRenderer.enabled = IsEnabled; _needRespawn = false; } diff --git a/Assets/Scripts/Utilities/Character.cs b/Assets/Scripts/Utilities/Character.cs index 85988b8..a34d523 100644 --- a/Assets/Scripts/Utilities/Character.cs +++ b/Assets/Scripts/Utilities/Character.cs @@ -12,8 +12,8 @@ public abstract class Character : MonoBehaviour [SerializeField] private LayerMask _mapLayer; - private Rigidbody2D _body; - private CapsuleCollider2D _capsuleCollider; + private Rigidbody _body; + private CapsuleCollider _capsuleCollider; protected bool _isOnBridge; private bool _isOnLadder = false; @@ -31,8 +31,8 @@ public abstract class Character : MonoBehaviour public void Init() { - _body = GetComponent(); - _capsuleCollider = GetComponent(); + _body = GetComponent(); + _capsuleCollider = GetComponent(); _cellSize = new Vector2(0.6f, 1f); } @@ -98,11 +98,11 @@ public abstract class Character : MonoBehaviour if (_isOnLadder || _isOnBridge) { - _body.gravityScale = 0; + //_body.gravityScale = 0; } else { - _body.gravityScale = 1; + //_body.gravityScale = 1; } if (_isFalling) { @@ -125,12 +125,12 @@ public abstract class Character : MonoBehaviour private bool CanClimbUp() { - var rayCastHit = Physics2D.Raycast(_capsuleCollider.bounds.center, Vector2.down, _capsuleCollider.size.y / 2,_mapLayer); - if(rayCastHit) - if(rayCastHit.collider.transform.GetComponent().ElementSO.ElementType==MapElementType.Ladder) - { - return true; - } + // var rayCastHit = Physics2D.Raycast(_capsuleCollider.bounds.center, Vector2.down, _capsuleCollider.size.y / 2,_mapLayer); + // if(rayCastHit) + // if(rayCastHit.collider.transform.GetComponent().ElementSO.ElementType==MapElementType.Ladder) + // { + // return true; + // } return false; } @@ -153,20 +153,20 @@ public abstract class Character : MonoBehaviour private MapElement GetMapElement() { - var collider = BoxCast(_capsuleCollider.bounds.center, _cellSize, 0f, Vector3.forward, .01f, _mapLayer); - Color color = Color.red; - MapElement mapElement = null; - if (collider.Length > 0) - { - var elements=collider.Select(x=>x.transform.GetComponent()); - mapElement = elements.Where(x => x.ElementSO.ElementType == MapElementType.Ladder).FirstOrDefault(); - if(mapElement == null) - { - mapElement = elements.First(); - } - } + var collider = BoxCast(_capsuleCollider.bounds.center, _cellSize, 0f, Vector3.forward, .01f, _mapLayer); + Color color = Color.red; + MapElement mapElement = null; + if (collider.Length > 0) + { + var elements=collider.Select(x=>x.transform.GetComponent()); + mapElement = elements.Where(x => x.ElementSO.ElementType == MapElementType.Ladder).FirstOrDefault(); + if(mapElement == null) + { + mapElement = elements.First(); + } + } - return mapElement; + return mapElement; } protected abstract void SetWalkingAnimation(bool isWalking);