From e22280eb945f78bc13f2401115215516a8fa7379 Mon Sep 17 00:00:00 2001 From: manhduyhoang90 Date: Fri, 1 May 2026 17:18:59 +0700 Subject: [PATCH 1/2] asdasd --- Assets/Prefabs/Player.prefab | 16 ++++++++++++++++ Assets/Scripts/Player.meta | 8 ++++++++ Assets/Scripts/Player/PlayerCollision.cs | 16 ++++++++++++++++ Assets/Scripts/Player/PlayerCollision.cs.meta | 2 ++ 4 files changed, 42 insertions(+) create mode 100644 Assets/Scripts/Player.meta create mode 100644 Assets/Scripts/Player/PlayerCollision.cs create mode 100644 Assets/Scripts/Player/PlayerCollision.cs.meta diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 4cb4b488..6b988ab9 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -22,6 +22,7 @@ GameObject: - component: {fileID: -5076913349690967641} - component: {fileID: 5474834257287499008} - component: {fileID: 591040529181574494} + - component: {fileID: 2152321812378662309} m_Layer: 0 m_Name: Player m_TagString: Player @@ -403,6 +404,9 @@ MonoBehaviour: _NetworkedMoveInput: {x: 0, y: 0} _NetworkedSpeed: 0 _NetworkedPosition: {x: 0, y: 0, z: 0} + _Health: 100 + _Stamina: 100 + _NoiseLevel: 0 --- !u!114 &3043298118541876184 MonoBehaviour: m_ObjectHideFlags: 0 @@ -537,6 +541,18 @@ MonoBehaviour: followOffset: {x: 1.5, y: 2, z: 0} smoothTime: 0.15 lookAtCamera: 1 +--- !u!114 &2152321812378662309 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1054594849095937263} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: feba9d7d89c862142aa1614997a3227f, type: 3} + m_Name: + m_EditorClassIdentifier: '::' --- !u!1 &2962936552048247184 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Player.meta b/Assets/Scripts/Player.meta new file mode 100644 index 00000000..f7ab98f1 --- /dev/null +++ b/Assets/Scripts/Player.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: e5b780c3b8cfd464ead0e292cd8afd02 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/PlayerCollision.cs b/Assets/Scripts/Player/PlayerCollision.cs new file mode 100644 index 00000000..657f562d --- /dev/null +++ b/Assets/Scripts/Player/PlayerCollision.cs @@ -0,0 +1,16 @@ +using UnityEngine; + +public class PlayerCollision : MonoBehaviour +{ + // Start is called once before the first execution of Update after the MonoBehaviour is created + void Start() + { + + } + + // Update is called once per frame + void Update() + { + + } +} diff --git a/Assets/Scripts/Player/PlayerCollision.cs.meta b/Assets/Scripts/Player/PlayerCollision.cs.meta new file mode 100644 index 00000000..4f84d365 --- /dev/null +++ b/Assets/Scripts/Player/PlayerCollision.cs.meta @@ -0,0 +1,2 @@ +fileFormatVersion: 2 +guid: feba9d7d89c862142aa1614997a3227f \ No newline at end of file From d9d17c3bf1c67ea2c7577c558775fce68afb33df Mon Sep 17 00:00:00 2001 From: manhduyhoang90 Date: Fri, 1 May 2026 17:35:13 +0700 Subject: [PATCH 2/2] Update Player.prefab --- Assets/Prefabs/Player.prefab | 125 ++++++++++++++++++++++++++--------- 1 file changed, 92 insertions(+), 33 deletions(-) diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index 6b988ab9..5a9d18ad 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -22,7 +22,10 @@ GameObject: - component: {fileID: -5076913349690967641} - component: {fileID: 5474834257287499008} - component: {fileID: 591040529181574494} - - component: {fileID: 2152321812378662309} + - component: {fileID: 7826563193135964281} + - component: {fileID: 517879385770431681} + - component: {fileID: 8601091490777624370} + - component: {fileID: 7730391503324595278} m_Layer: 0 m_Name: Player m_TagString: Player @@ -128,6 +131,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5962d8f2c8e40e240a4a4907c7b539fa, type: 3} m_Name: m_EditorClassIdentifier: Assembly-CSharp::OnlyScove.Scripts.InputReader + inputActions: {fileID: 0} --- !u!114 &3010251870038942475 MonoBehaviour: m_ObjectHideFlags: 0 @@ -357,6 +361,14 @@ MonoBehaviour: m_Calls: [] m_ActionId: 7e8b9416-0a2d-4652-98d8-e7368560ede9 m_ActionName: 'Player/ToggleView[/Keyboard/f2]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: ae29d662-c797-4411-8ff3-8b5ad78427d8 + m_ActionName: 'UI/ToggleSetting[/Keyboard/leftCtrl,/Keyboard/g]' + - m_PersistentCalls: + m_Calls: [] + m_ActionId: 79227a8d-6fd2-496d-8466-68f007a2c355 + m_ActionName: 'UI/Escape[/Keyboard/escape]' m_NeverAutoSwitchControlSchemes: 0 m_DefaultControlScheme: m_DefaultActionMap: Player @@ -378,35 +390,13 @@ MonoBehaviour: k__BackingField: {fileID: 5600577104145922999} k__BackingField: {fileID: 9098752589608501196} k__BackingField: {fileID: 5811177247042239962} - speedParamName: Speed - velocityXParamName: Velocity X - velocityZParamName: Velocity Z - k__BackingField: 5 - k__BackingField: 10 - k__BackingField: 9 - k__BackingField: 1.5 - k__BackingField: 15 - k__BackingField: 500 - k__BackingField: 0.2 - k__BackingField: 2 - k__BackingField: -9.81 - k__BackingField: -20 - k__BackingField: 0.11529434 - k__BackingField: {x: 0, y: 0.079278834, z: 0.05} - k__BackingField: - serializedVersion: 2 - m_Bits: 64 - k__BackingField: 2 - k__BackingField: - serializedVersion: 2 - m_Bits: 512 + Stats: {fileID: 0} + Interaction: {fileID: 0} + Movement: {fileID: 0} + AnimationHandler: {fileID: 0} _NetworkedCameraRotation: {x: 0, y: 0, z: 0, w: 0} _NetworkedMoveInput: {x: 0, y: 0} _NetworkedSpeed: 0 - _NetworkedPosition: {x: 0, y: 0, z: 0} - _Health: 100 - _Stamina: 100 - _NoiseLevel: 0 --- !u!114 &3043298118541876184 MonoBehaviour: m_ObjectHideFlags: 0 @@ -505,6 +495,10 @@ MonoBehaviour: - {fileID: 830356296960548640} - {fileID: 504047695906043424} - {fileID: 5474834257287499008} + - {fileID: 7826563193135964281} + - {fileID: 517879385770431681} + - {fileID: 8601091490777624370} + - {fileID: 7730391503324595278} ForceRemoteRenderTimeframe: 0 --- !u!114 &5474834257287499008 MonoBehaviour: @@ -541,7 +535,7 @@ MonoBehaviour: followOffset: {x: 1.5, y: 2, z: 0} smoothTime: 0.15 lookAtCamera: 1 ---- !u!114 &2152321812378662309 +--- !u!114 &7826563193135964281 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -550,9 +544,74 @@ MonoBehaviour: m_GameObject: {fileID: 1054594849095937263} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: feba9d7d89c862142aa1614997a3227f, type: 3} + m_Script: {fileID: 11500000, guid: a1494b79b59fcdf4d9f7956dde31bc42, type: 3} m_Name: - m_EditorClassIdentifier: '::' + m_EditorClassIdentifier: Assembly-CSharp::OnlyScove.Scripts.PlayerStats + _Health: 100 + _Stamina: 100 + _NoiseLevel: 0 +--- !u!114 &517879385770431681 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1054594849095937263} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9dcff2851697b4f4c8c25ef8381665ba, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::OnlyScove.Scripts.PlayerInteraction + InteractionRange: 2 + InteractionMask: + serializedVersion: 2 + m_Bits: 0 +--- !u!114 &8601091490777624370 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1054594849095937263} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 79bbcfd4d37b7834ebe0d61bb649714d, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::OnlyScove.Scripts.PlayerMovement + k__BackingField: 3 + k__BackingField: 6 + k__BackingField: 9 + k__BackingField: 1.5 + k__BackingField: 10 + k__BackingField: 500 + k__BackingField: 2 + k__BackingField: -15 + k__BackingField: -20 + k__BackingField: 0.2 + k__BackingField: {x: 0, y: 0, z: 0} + k__BackingField: + serializedVersion: 2 + m_Bits: 0 + _IsGrounded: 0 + _WasGrounded: 0 + _VelocityY: 0 + _NetworkedPosition: {x: 0, y: 0, z: 0} +--- !u!114 &7730391503324595278 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1054594849095937263} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 965ec86f3b9695640bdc85e624d0e9e7, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::OnlyScove.Scripts.PlayerAnimationHandler + speedParamName: Speed + velocityXParamName: Velocity X + velocityZParamName: Velocity Z + animationDamping: 0.2 --- !u!1 &2962936552048247184 GameObject: m_ObjectHideFlags: 0 @@ -886,8 +945,8 @@ MonoBehaviour: m_Calls: [] m_text: PlayerName m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: a32ff21294cb0854181fe2ea1602ab9f, type: 2} - m_sharedMaterial: {fileID: -5366533617542256513, guid: a32ff21294cb0854181fe2ea1602ab9f, type: 2} + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -911,7 +970,7 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 44.85 + m_fontSize: 40.9 m_fontSizeBase: 36 m_fontWeight: 400 m_enableAutoSizing: 1