From 374d75d379e0d2a2af4d11dfce0b36d38a8f9f92 Mon Sep 17 00:00:00 2001 From: Vladimir Date: Sat, 20 Jun 2026 19:59:03 +0300 Subject: [PATCH] Refactor treasure scriptable objects; update references and remove unused assets --- Assets/Prefabs/Chest.prefab | 2 +- Assets/Prefabs/SciptableObjects.meta | 8 -------- Assets/Prefabs/SciptableObjects/Coin.asset | 16 ---------------- Assets/Prefabs/SciptableObjects/Coin.asset.meta | 8 -------- Assets/Prefabs/SciptableObjects/Key.asset | 16 ---------------- Assets/Prefabs/SciptableObjects/Key.asset.meta | 8 -------- Assets/Scripts/Managers/NoiseSystem.cs | 2 +- Assets/Scripts/Player/HammerThrower.cs | 15 +++++++++++++++ Assets/Scripts/Utilities/Character.cs | 2 +- 9 files changed, 18 insertions(+), 59 deletions(-) delete mode 100644 Assets/Prefabs/SciptableObjects.meta delete mode 100644 Assets/Prefabs/SciptableObjects/Coin.asset delete mode 100644 Assets/Prefabs/SciptableObjects/Coin.asset.meta delete mode 100644 Assets/Prefabs/SciptableObjects/Key.asset delete mode 100644 Assets/Prefabs/SciptableObjects/Key.asset.meta diff --git a/Assets/Prefabs/Chest.prefab b/Assets/Prefabs/Chest.prefab index cced584..1ed8778 100644 --- a/Assets/Prefabs/Chest.prefab +++ b/Assets/Prefabs/Chest.prefab @@ -300,7 +300,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: animator: {fileID: 7277787345195142390} - _treasureSO: {fileID: 11400000, guid: d40fd30a10b87f9438f7ac341613dfa2, type: 2} + _treasureSO: {fileID: 11400000, guid: 1f2fcda5f0230034eba2b2cfd9d40897, type: 2} --- !u!95 &7277787345195142390 Animator: serializedVersion: 7 diff --git a/Assets/Prefabs/SciptableObjects.meta b/Assets/Prefabs/SciptableObjects.meta deleted file mode 100644 index f2894e3..0000000 --- a/Assets/Prefabs/SciptableObjects.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: ad356843f4c7ac7459d06943f0ece1a5 -folderAsset: yes -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/SciptableObjects/Coin.asset b/Assets/Prefabs/SciptableObjects/Coin.asset deleted file mode 100644 index 93c6234..0000000 --- a/Assets/Prefabs/SciptableObjects/Coin.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: 11500000, guid: 81dec0bb25670ad4db25ef9ce940b721, type: 3} - m_Name: Coin - m_EditorClassIdentifier: Assembly-CSharp::TreasureSO - Image: {fileID: 8331088274507185253, guid: fb6dbbc81180d204bb4ff36aae48fbc9, type: 3} - Treasure: 0 diff --git a/Assets/Prefabs/SciptableObjects/Coin.asset.meta b/Assets/Prefabs/SciptableObjects/Coin.asset.meta deleted file mode 100644 index b7fb8cf..0000000 --- a/Assets/Prefabs/SciptableObjects/Coin.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: eabbfa3560e70f942a5ae19872153053 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/SciptableObjects/Key.asset b/Assets/Prefabs/SciptableObjects/Key.asset deleted file mode 100644 index e2dbdf6..0000000 --- a/Assets/Prefabs/SciptableObjects/Key.asset +++ /dev/null @@ -1,16 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - 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: 11500000, guid: 81dec0bb25670ad4db25ef9ce940b721, type: 3} - m_Name: Key - m_EditorClassIdentifier: Assembly-CSharp::TreasureSO - Image: {fileID: 7818119699687691340, guid: fb6dbbc81180d204bb4ff36aae48fbc9, type: 3} - Treasure: 1 diff --git a/Assets/Prefabs/SciptableObjects/Key.asset.meta b/Assets/Prefabs/SciptableObjects/Key.asset.meta deleted file mode 100644 index e11a4f7..0000000 --- a/Assets/Prefabs/SciptableObjects/Key.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d40fd30a10b87f9438f7ac341613dfa2 -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Managers/NoiseSystem.cs b/Assets/Scripts/Managers/NoiseSystem.cs index 25abeac..81298a5 100644 --- a/Assets/Scripts/Managers/NoiseSystem.cs +++ b/Assets/Scripts/Managers/NoiseSystem.cs @@ -6,7 +6,7 @@ public class NoiseSystem : MonoBehaviour public static NoiseSystem Instance { get; private set; } [SerializeField] private bool _debugMode = false; - [SerializeField] private LayerMask _enemyLayer = LayerMask.GetMask("Enemy"); + [SerializeField] private LayerMask _enemyLayer; public event EventHandler OnNoiseEmitted; diff --git a/Assets/Scripts/Player/HammerThrower.cs b/Assets/Scripts/Player/HammerThrower.cs index 8522387..296305a 100644 --- a/Assets/Scripts/Player/HammerThrower.cs +++ b/Assets/Scripts/Player/HammerThrower.cs @@ -12,11 +12,17 @@ public class HammerThrower : MonoBehaviour private bool _hasHammer = true; private bool _facingRight = true; private float _cooldownTimer = 0f; + private Collider2D _playerCollider; public bool HasHammer => _hasHammer; public bool CanThrow => _hasHammer && _cooldownTimer <= 0f; public float CooldownRemaining => Mathf.Max(0f, _cooldownTimer); + private void Awake() + { + _playerCollider = GetComponent() ?? GetComponentInChildren(); + } + public void SetFacingDirection(bool facingRight) { _facingRight = facingRight; @@ -38,6 +44,15 @@ public class HammerThrower : MonoBehaviour _currentHammer = Instantiate(_hammerPrefab, _spawnPoint.position, _spawnPoint.rotation); + if (_playerCollider != null) + { + var hammerCollider = _currentHammer.GetComponent(); + if (hammerCollider != null) + { + Physics2D.IgnoreCollision(_playerCollider, hammerCollider); + } + } + // Initialize hammer with direction and speed var hammerComponent = _currentHammer.GetComponent(); if (hammerComponent != null) diff --git a/Assets/Scripts/Utilities/Character.cs b/Assets/Scripts/Utilities/Character.cs index a17bce8..a1af5b4 100644 --- a/Assets/Scripts/Utilities/Character.cs +++ b/Assets/Scripts/Utilities/Character.cs @@ -47,7 +47,7 @@ public abstract class Character : MonoBehaviour protected void MoveTo(float inputHorizontal, float inputVertical) { - var block = GetMapElement(); + var block = GetMapElement(); if (block?.ElementSO.ElementType == MapElementType.Water) {