fix chest, breakable wall

This commit is contained in:
2026-06-06 11:43:11 +03:00
parent 7579175d24
commit a1420ed339
4 changed files with 48 additions and 20 deletions
+15 -7
View File
@@ -24,16 +24,17 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6742600071965714980} m_GameObject: {fileID: 6742600071965714980}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} 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: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 7345322822309755345} m_Father: {fileID: 7345322822309755345}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &1557174451233602412 --- !u!212 &1557174451233602412
SpriteRenderer: SpriteRenderer:
serializedVersion: 2
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@@ -49,6 +50,11 @@ SpriteRenderer:
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_RayTracingMode: 0 m_RayTracingMode: 0
m_RayTraceProcedural: 0 m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
@@ -70,9 +76,11 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: -133646357 m_SortingLayerID: -133646357
m_SortingLayer: 2 m_SortingLayer: 2
m_SortingOrder: 0 m_SortingOrder: 0
m_MaskInteraction: 0
m_Sprite: {fileID: -1109035998, guid: 7c2d6acd22d2d0c40b84d99967afb42a, type: 3} m_Sprite: {fileID: -1109035998, guid: 7c2d6acd22d2d0c40b84d99967afb42a, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@@ -82,7 +90,6 @@ SpriteRenderer:
m_AdaptiveModeThreshold: 0.5 m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0 m_SpriteTileMode: 0
m_WasSpriteAssigned: 1 m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0 m_SpriteSortPoint: 0
--- !u!1 &8175732239415438715 --- !u!1 &8175732239415438715
GameObject: GameObject:
@@ -109,6 +116,7 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8175732239415438715} m_GameObject: {fileID: 8175732239415438715}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -2.4775906, y: -4.069116, z: 0.16478391} m_LocalPosition: {x: -2.4775906, y: -4.069116, z: 0.16478391}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
@@ -116,7 +124,6 @@ Transform:
m_Children: m_Children:
- {fileID: 7515349249133635430} - {fileID: 7515349249133635430}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &3364452304498334467 --- !u!61 &3364452304498334467
BoxCollider2D: BoxCollider2D:
@@ -126,6 +133,7 @@ BoxCollider2D:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8175732239415438715} m_GameObject: {fileID: 8175732239415438715}
m_Enabled: 1 m_Enabled: 1
serializedVersion: 3
m_Density: 1 m_Density: 1
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IncludeLayers: m_IncludeLayers:
@@ -149,7 +157,8 @@ BoxCollider2D:
m_Bits: 4294967295 m_Bits: 4294967295
m_IsTrigger: 0 m_IsTrigger: 0
m_UsedByEffector: 0 m_UsedByEffector: 0
m_UsedByComposite: 0 m_CompositeOperation: 0
m_CompositeOrder: 0
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
m_SpriteTilingProperty: m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
@@ -160,7 +169,6 @@ BoxCollider2D:
drawMode: 0 drawMode: 0
adaptiveTiling: 0 adaptiveTiling: 0
m_AutoTiling: 0 m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 1, y: 1} m_Size: {x: 1, y: 1}
m_EdgeRadius: 0 m_EdgeRadius: 0
--- !u!114 &1775695730761962784 --- !u!114 &1775695730761962784
@@ -172,8 +180,8 @@ MonoBehaviour:
m_GameObject: {fileID: 8175732239415438715} m_GameObject: {fileID: 8175732239415438715}
m_Enabled: 1 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c718ee77619077344be4784233d84940, type: 3} m_Script: {fileID: 11500000, guid: 8251b2e2708d87d4ebc446c84ec5ed01, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
_elementSO: {fileID: 11400000, guid: da0ec95da6f0526499978941b1631c3e, type: 2} _elementSO: {fileID: 11400000, guid: da0ec95da6f0526499978941b1631c3e, type: 2}
_hitParticles: {fileID: 6015051975192149189, guid: bb996b9fa713ac747bbab4e1facb7c26, type: 3} _hitParticles: {fileID: 8175732239415438715}
+28 -11
View File
@@ -25,16 +25,17 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1975438356756539878} m_GameObject: {fileID: 1975438356756539878}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} 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: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 7047733282028940670} m_Father: {fileID: 7047733282028940670}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &6310184180613926196 --- !u!212 &6310184180613926196
SpriteRenderer: SpriteRenderer:
serializedVersion: 2
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@@ -50,6 +51,11 @@ SpriteRenderer:
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_RayTracingMode: 0 m_RayTracingMode: 0
m_RayTraceProcedural: 0 m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
@@ -71,9 +77,11 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: -133646357 m_SortingLayerID: -133646357
m_SortingLayer: 2 m_SortingLayer: 2
m_SortingOrder: 0 m_SortingOrder: 0
m_MaskInteraction: 0
m_Sprite: {fileID: -277072053, guid: 7c2d6acd22d2d0c40b84d99967afb42a, type: 3} m_Sprite: {fileID: -277072053, guid: 7c2d6acd22d2d0c40b84d99967afb42a, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1} m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0 m_FlipX: 0
@@ -83,11 +91,10 @@ SpriteRenderer:
m_AdaptiveModeThreshold: 0.5 m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0 m_SpriteTileMode: 0
m_WasSpriteAssigned: 1 m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0 m_SpriteSortPoint: 0
--- !u!95 &2261274658939422705 --- !u!95 &2261274658939422705
Animator: Animator:
serializedVersion: 5 serializedVersion: 7
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@@ -101,6 +108,7 @@ Animator:
m_ApplyRootMotion: 0 m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0 m_LinearVelocityBlending: 0
m_StabilizeFeet: 0 m_StabilizeFeet: 0
m_AnimatePhysics: 0
m_WarningMessage: m_WarningMessage:
m_HasTransformHierarchy: 1 m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1 m_AllowConstantClipSamplingOptimization: 1
@@ -130,16 +138,17 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2292145668633101757} m_GameObject: {fileID: 2292145668633101757}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0.02, z: 0} m_LocalPosition: {x: 0, y: 0.02, z: 0}
m_LocalScale: {x: 0.2, y: 0.2, z: 1} m_LocalScale: {x: 0.2, y: 0.2, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 7047733282028940670} m_Father: {fileID: 7047733282028940670}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!212 &5781124905000548271 --- !u!212 &5781124905000548271
SpriteRenderer: SpriteRenderer:
serializedVersion: 2
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@@ -155,6 +164,11 @@ SpriteRenderer:
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_RayTracingMode: 0 m_RayTracingMode: 0
m_RayTraceProcedural: 0 m_RayTraceProcedural: 0
m_RayTracingAccelStructBuildFlagsOverride: 0
m_RayTracingAccelStructBuildFlags: 1
m_SmallMeshCulling: 1
m_ForceMeshLod: -1
m_MeshLodSelectionBias: 0
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
@@ -176,9 +190,11 @@ SpriteRenderer:
m_AutoUVMaxDistance: 0.5 m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89 m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0} m_LightmapParameters: {fileID: 0}
m_GlobalIlluminationMeshLod: 0
m_SortingLayerID: 769195415 m_SortingLayerID: 769195415
m_SortingLayer: 3 m_SortingLayer: 3
m_SortingOrder: 0 m_SortingOrder: 0
m_MaskInteraction: 0
m_Sprite: {fileID: 0} m_Sprite: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0} m_Color: {r: 1, g: 1, b: 1, a: 0}
m_FlipX: 0 m_FlipX: 0
@@ -188,7 +204,6 @@ SpriteRenderer:
m_AdaptiveModeThreshold: 0.5 m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0 m_SpriteTileMode: 0
m_WasSpriteAssigned: 0 m_WasSpriteAssigned: 0
m_MaskInteraction: 0
m_SpriteSortPoint: 0 m_SpriteSortPoint: 0
--- !u!1 &7047733282028940674 --- !u!1 &7047733282028940674
GameObject: GameObject:
@@ -216,6 +231,7 @@ Transform:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7047733282028940674} m_GameObject: {fileID: 7047733282028940674}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} 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: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
@@ -224,7 +240,6 @@ Transform:
- {fileID: 7713479245319812145} - {fileID: 7713479245319812145}
- {fileID: 6039297779453541221} - {fileID: 6039297779453541221}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!61 &7047733282028940672 --- !u!61 &7047733282028940672
BoxCollider2D: BoxCollider2D:
@@ -234,6 +249,7 @@ BoxCollider2D:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7047733282028940674} m_GameObject: {fileID: 7047733282028940674}
m_Enabled: 1 m_Enabled: 1
serializedVersion: 3
m_Density: 1 m_Density: 1
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IncludeLayers: m_IncludeLayers:
@@ -257,7 +273,8 @@ BoxCollider2D:
m_Bits: 4294967295 m_Bits: 4294967295
m_IsTrigger: 1 m_IsTrigger: 1
m_UsedByEffector: 0 m_UsedByEffector: 0
m_UsedByComposite: 0 m_CompositeOperation: 0
m_CompositeOrder: 0
m_Offset: {x: 0, y: 0.24} m_Offset: {x: 0, y: 0.24}
m_SpriteTilingProperty: m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0} border: {x: 0, y: 0, z: 0, w: 0}
@@ -268,7 +285,6 @@ BoxCollider2D:
drawMode: 0 drawMode: 0
adaptiveTiling: 0 adaptiveTiling: 0
m_AutoTiling: 0 m_AutoTiling: 0
serializedVersion: 2
m_Size: {x: 0.8, y: 1} m_Size: {x: 0.8, y: 1}
m_EdgeRadius: 0 m_EdgeRadius: 0
--- !u!114 &7047733282028940673 --- !u!114 &7047733282028940673
@@ -278,16 +294,16 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7047733282028940674} m_GameObject: {fileID: 7047733282028940674}
m_Enabled: 0 m_Enabled: 1
m_EditorHideFlags: 0 m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0ade875a254231c4d8c43cacc7b27bfb, type: 3} m_Script: {fileID: 11500000, guid: ded23e667cffbfd46b2633ae22204797, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
animator: {fileID: 7277787345195142390} animator: {fileID: 7277787345195142390}
_treasureSO: {fileID: 11400000, guid: 1f2fcda5f0230034eba2b2cfd9d40897, type: 2} _treasureSO: {fileID: 11400000, guid: 1f2fcda5f0230034eba2b2cfd9d40897, type: 2}
--- !u!95 &7277787345195142390 --- !u!95 &7277787345195142390
Animator: Animator:
serializedVersion: 5 serializedVersion: 7
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@@ -301,6 +317,7 @@ Animator:
m_ApplyRootMotion: 0 m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0 m_LinearVelocityBlending: 0
m_StabilizeFeet: 0 m_StabilizeFeet: 0
m_AnimatePhysics: 0
m_WarningMessage: m_WarningMessage:
m_HasTransformHierarchy: 1 m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1 m_AllowConstantClipSamplingOptimization: 1
+1 -1
View File
@@ -5,7 +5,7 @@ public class HammerThrower : MonoBehaviour
{ {
[SerializeField] private Transform _spawnPoint; [SerializeField] private Transform _spawnPoint;
[SerializeField] private GameObject _hammerPrefab; [SerializeField] private GameObject _hammerPrefab;
[SerializeField] private float _throwSpeed = 10f; [SerializeField] private float _throwSpeed = 5f;
private GameObject _currentHammer; private GameObject _currentHammer;
private bool _hasHammer = true; private bool _hasHammer = true;
+4 -1
View File
@@ -23,7 +23,10 @@ public class InputManager : MonoBehaviour
public void OnEnable() public void OnEnable()
{ {
_actions.Enable(); if (_actions != null)
{
_actions.Enable();
}
} }
public void OnDisable() public void OnDisable()