From ab5d62d20d415ab49e50027476365b8a8937988f Mon Sep 17 00:00:00 2001 From: Valdimir Date: Sat, 6 Jun 2026 11:50:19 +0300 Subject: [PATCH] fix HammerThrower --- Assets/Animations/Chest.controller | 5 +++-- Assets/Animations/Visual.controller | 7 ++++--- Assets/Scenes/Level 1.unity | 21 ++++++++++++++----- .../Scripts/Controllers/PlayerController.cs | 1 + Assets/Scripts/HammerThrower.cs | 17 ++++++++------- 5 files changed, 34 insertions(+), 17 deletions(-) diff --git a/Assets/Animations/Chest.controller b/Assets/Animations/Chest.controller index 9157d04..1ead611 100644 --- a/Assets/Animations/Chest.controller +++ b/Assets/Animations/Chest.controller @@ -33,7 +33,7 @@ AnimatorController: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Chest - serializedVersion: 5 + serializedVersion: 6 m_AnimatorParameters: - m_Name: OpenChest m_Type: 9 @@ -54,9 +54,10 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} + m_EvaluateTransitionsOnStart: 0 --- !u!1107 &3481588188332373823 AnimatorStateMachine: - serializedVersion: 6 + serializedVersion: 7 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} diff --git a/Assets/Animations/Visual.controller b/Assets/Animations/Visual.controller index 7f275dc..2a78a39 100644 --- a/Assets/Animations/Visual.controller +++ b/Assets/Animations/Visual.controller @@ -33,7 +33,7 @@ AnimatorController: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: Visual - serializedVersion: 5 + serializedVersion: 6 m_AnimatorParameters: [] m_AnimatorLayers: - serializedVersion: 5 @@ -48,9 +48,10 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} + m_EvaluateTransitionsOnStart: 0 --- !u!1107 &6082834793186586160 AnimatorStateMachine: - serializedVersion: 6 + serializedVersion: 7 m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -59,7 +60,7 @@ AnimatorStateMachine: m_ChildStates: - serializedVersion: 1 m_State: {fileID: -915364825027332659} - m_Position: {x: 200, y: 0, z: 0} + m_Position: {x: 310, y: 60, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] diff --git a/Assets/Scenes/Level 1.unity b/Assets/Scenes/Level 1.unity index 5ed279a..46468b4 100644 --- a/Assets/Scenes/Level 1.unity +++ b/Assets/Scenes/Level 1.unity @@ -2827,9 +2827,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ff6c3960de97db14f89d6633159838dc, type: 3} m_Name: m_EditorClassIdentifier: - _totalCoins: {fileID: 1923750336} - _keyIcon: {fileID: 1371746634} - _playerState: {fileID: 0} --- !u!1 &411449914 GameObject: m_ObjectHideFlags: 0 @@ -3839,7 +3836,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b3ead8e41e973dd43b93a8638ea30a36, type: 3} m_Name: m_EditorClassIdentifier: - _openDoor: {fileID: -1152093481, guid: 7c2d6acd22d2d0c40b84d99967afb42a, type: 3} --- !u!61 &679297303 BoxCollider2D: m_ObjectHideFlags: 0 @@ -7127,6 +7123,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 45d7bd38990996d4488582b07cbe7e40, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::InputManager +--- !u!114 &1627236066 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 681564194} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 907b91debf5d5864780e9466f4017f38, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::PlayerState + Lives: 3 --- !u!1 &1638752927 GameObject: m_ObjectHideFlags: 0 @@ -7331,7 +7340,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c43502b5415adc044b631292348c83e8, type: 3} m_Name: m_EditorClassIdentifier: - _doorGameObject: {fileID: 679297301} --- !u!4 &1782147597 stripped Transform: m_CorrespondingSourceObject: {fileID: 7047733282028940670, guid: 934a57b833e872445ac8463836f55a44, type: 3} @@ -8434,6 +8442,9 @@ PrefabInstance: - targetCorrespondingSourceObject: {fileID: 3931708971405200045, guid: a7f273d812293e54d92972f62e1f0159, type: 3} insertIndex: -1 addedObject: {fileID: 1627236062} + - targetCorrespondingSourceObject: {fileID: 3931708971405200045, guid: a7f273d812293e54d92972f62e1f0159, type: 3} + insertIndex: -1 + addedObject: {fileID: 1627236066} m_SourcePrefab: {fileID: 100100000, guid: a7f273d812293e54d92972f62e1f0159, type: 3} --- !u!4 &5855359588613562703 stripped Transform: diff --git a/Assets/Scripts/Controllers/PlayerController.cs b/Assets/Scripts/Controllers/PlayerController.cs index 2aaaeba..4e7042f 100644 --- a/Assets/Scripts/Controllers/PlayerController.cs +++ b/Assets/Scripts/Controllers/PlayerController.cs @@ -47,6 +47,7 @@ public class PlayerController : Character Vector2 move = _inputManager.Movement; MoveTo(move.x, isAllowVertical ? move.y : 0); + _hammerThrower.SetFacingDirection(_facingRight); } private void OnFireButtonPressed() diff --git a/Assets/Scripts/HammerThrower.cs b/Assets/Scripts/HammerThrower.cs index cb852f6..4898888 100644 --- a/Assets/Scripts/HammerThrower.cs +++ b/Assets/Scripts/HammerThrower.cs @@ -27,15 +27,18 @@ public class HammerThrower : MonoBehaviour _currentHammer = Instantiate(_hammerPrefab, _spawnPoint.position, _spawnPoint.rotation); - float direction = _facingRight ? 1f : -1f; + //float direction = _facingRight ? 1f : -1f; - var rb = _currentHammer.GetComponent(); - rb.linearVelocity = new Vector2(direction * _throwSpeed, 0); + //var rb = _currentHammer.GetComponent(); + //rb.linearVelocity = new Vector2(direction * _throwSpeed, 0); - // Flip hammer visually - var scale = _currentHammer.transform.localScale; - scale.x = Mathf.Abs(scale.x) * direction; - _currentHammer.transform.localScale = scale; + //// Flip hammer visually + //var scale = _currentHammer.transform.localScale; + //scale.x = Mathf.Abs(scale.x) * direction; + //_currentHammer.transform.localScale = scale; + + _currentHammer.transform.localScale = new Vector2(_currentHammer.transform.localScale.x * (_facingRight ? 1 : -1), _currentHammer.transform.localScale.y); + _currentHammer.GetComponent().linearVelocity = new Vector2(gameObject.transform.localScale.x * _throwSpeed, 0); } private void Update()