From ca9cee6a963f96a28caf4ca475960a70b350bda5 Mon Sep 17 00:00:00 2001 From: Eicy Date: Wed, 11 Sep 2024 14:05:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86=E5=8E=9F=E5=9C=A8ItemBase=E7=9A=84?= =?UTF-8?q?=E6=8C=89=E9=94=AE=E5=88=A4=E6=96=AD=E7=A7=BB=E8=87=B3CameraInt?= =?UTF-8?q?eract=E7=B1=BB=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Scenes/SampleScene.unity | 54 ++++++++++++++++++++++- Assets/Scripts/Camera/CameraInteract.cs | 3 +- Assets/Scripts/Items/Abstract/ItemBase.cs | 5 +-- Assets/Scripts/Items/TestItem.cs | 10 ++--- 4 files changed, 61 insertions(+), 11 deletions(-) diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 90e4d73..a6dcd2f 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -620,6 +620,7 @@ MonoBehaviour: m_EditorClassIdentifier: rb: {fileID: 944706251} animator: {fileID: 0} + maxVelocity: 6 --- !u!54 &944706251 Rigidbody: m_ObjectHideFlags: 0 @@ -645,7 +646,7 @@ Rigidbody: m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 - m_Constraints: 80 + m_Constraints: 112 m_CollisionDetection: 1 --- !u!1 &963194225 GameObject: @@ -878,6 +879,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1644802856} + - {fileID: 1157830469} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -885,6 +887,56 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &1157830468 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1157830469} + - component: {fileID: 1157830470} + m_Layer: 5 + m_Name: Dialog + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1157830469 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1157830468} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1107264578} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1157830470 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1157830468} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 166525e51f1d41a2addfb1df626096fc, type: 3} + m_Name: + m_EditorClassIdentifier: + dialogsPath: + dialogJson: --- !u!1 &1306517519 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Camera/CameraInteract.cs b/Assets/Scripts/Camera/CameraInteract.cs index 4d73d2a..563ee02 100644 --- a/Assets/Scripts/Camera/CameraInteract.cs +++ b/Assets/Scripts/Camera/CameraInteract.cs @@ -1,4 +1,5 @@ using Event; +using Keyboard; using UnityEngine; namespace Camera @@ -12,7 +13,7 @@ namespace Camera private void Update() { Physics.Raycast(transform.position, transform.forward, out var raycastHit, maxInterActDistance); - if (raycastHit.collider) + if (raycastHit.collider && Input.GetKeyDown(KeySettingManager.Instance.GetKey("InterAct"))) EventManager.Instance.OnCameraInterAct(raycastHit.collider.gameObject); } diff --git a/Assets/Scripts/Items/Abstract/ItemBase.cs b/Assets/Scripts/Items/Abstract/ItemBase.cs index 7410c06..4820fab 100644 --- a/Assets/Scripts/Items/Abstract/ItemBase.cs +++ b/Assets/Scripts/Items/Abstract/ItemBase.cs @@ -1,6 +1,5 @@ using Event; using Event.EventArgs; -using Keyboard; using UnityEngine; namespace Items.Abstract @@ -15,10 +14,10 @@ namespace Items.Abstract protected virtual void ReceiveEvent(CameraInterActArgs item) { if (item.Item != gameObject) return; - + ActivateItem(); } - protected void ActivateItem() + protected virtual void ActivateItem() { Debug.Log("Item is activated"); } diff --git a/Assets/Scripts/Items/TestItem.cs b/Assets/Scripts/Items/TestItem.cs index 13507fa..80a8619 100644 --- a/Assets/Scripts/Items/TestItem.cs +++ b/Assets/Scripts/Items/TestItem.cs @@ -1,17 +1,15 @@ -using Event.EventArgs; +using Event; using Items.Abstract; using Items.Interface; -using Keyboard; -using UnityEngine; namespace Items { public class TestItem : ItemBase , IItem { - protected override void ReceiveEvent(CameraInterActArgs item) + protected override void ActivateItem() { - if(Input.GetKeyDown(KeySettingManager.Instance.GetKey("InterAct"))) - ActivateItem(); + base.ActivateItem(); + EventManager.Instance.OnDialogPop(0); } } } \ No newline at end of file