From e50e526ddb4213e1dccdca3f1f9103640823339e Mon Sep 17 00:00:00 2001 From: sippy-thinks Date: Mon, 3 Feb 2025 20:22:01 +0800 Subject: [PATCH] game: stamp done :3 --- .../SimpleCharacters_HDRP.unitypackage.meta | 7 +++ .../SimpleCharacters_URP.unitypackage.meta | 7 +++ SSLR/Assets/Scenes/SaiTrialPlaground.unity | 26 ++++++++++- SSLR/Assets/Scripts/StampInteractor.cs | 19 ++++---- SSLR/Assets/Scripts/StampSocketInteractor.cs | 46 +++++++++++++++++++ .../Scripts/StampSocketInteractor.cs.meta | 11 +++++ ...rePack_2020.3_HDRP_v1.24.unitypackage.meta | 7 +++ ...urePack_2020.3_URP_v1.24.unitypackage.meta | 7 +++ 8 files changed, 117 insertions(+), 13 deletions(-) create mode 100644 SSLR/Assets/RoyalCod/SimpleCharacters/_AlternativeRenderPipeline/SimpleCharacters_HDRP.unitypackage.meta create mode 100644 SSLR/Assets/RoyalCod/SimpleCharacters/_AlternativeRenderPipeline/SimpleCharacters_URP.unitypackage.meta create mode 100644 SSLR/Assets/Scripts/StampSocketInteractor.cs create mode 100644 SSLR/Assets/Scripts/StampSocketInteractor.cs.meta create mode 100644 SSLR/Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta create mode 100644 SSLR/Assets/SimpleNaturePack/SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta diff --git a/SSLR/Assets/RoyalCod/SimpleCharacters/_AlternativeRenderPipeline/SimpleCharacters_HDRP.unitypackage.meta b/SSLR/Assets/RoyalCod/SimpleCharacters/_AlternativeRenderPipeline/SimpleCharacters_HDRP.unitypackage.meta new file mode 100644 index 0000000..3318ef6 --- /dev/null +++ b/SSLR/Assets/RoyalCod/SimpleCharacters/_AlternativeRenderPipeline/SimpleCharacters_HDRP.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d95c3a2e9a39dee4289a159646510527 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SSLR/Assets/RoyalCod/SimpleCharacters/_AlternativeRenderPipeline/SimpleCharacters_URP.unitypackage.meta b/SSLR/Assets/RoyalCod/SimpleCharacters/_AlternativeRenderPipeline/SimpleCharacters_URP.unitypackage.meta new file mode 100644 index 0000000..7ace87a --- /dev/null +++ b/SSLR/Assets/RoyalCod/SimpleCharacters/_AlternativeRenderPipeline/SimpleCharacters_URP.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e49446b1e5ffd3e44868005292f43190 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SSLR/Assets/Scenes/SaiTrialPlaground.unity b/SSLR/Assets/Scenes/SaiTrialPlaground.unity index 8105758..6c052e9 100644 --- a/SSLR/Assets/Scenes/SaiTrialPlaground.unity +++ b/SSLR/Assets/Scenes/SaiTrialPlaground.unity @@ -767,6 +767,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 484825122} + - component: {fileID: 484825123} m_Layer: 0 m_Name: Stamp Area m_TagString: Untagged @@ -789,6 +790,27 @@ Transform: m_Children: [] m_Father: {fileID: 544043788} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!65 &484825123 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 484825121} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 0.17182535, y: 0.066651165, z: 0.12091601} + m_Center: {x: 0.009468913, y: 0.00025579333, z: -0.012485802} --- !u!1 &520849214 GameObject: m_ObjectHideFlags: 0 @@ -902,7 +924,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!23 &624452550 MeshRenderer: m_ObjectHideFlags: 0 @@ -1472,7 +1494,7 @@ GameObject: - component: {fileID: 1179830393} m_Layer: 0 m_Name: Paper - m_TagString: Untagged + m_TagString: Paper m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/SSLR/Assets/Scripts/StampInteractor.cs b/SSLR/Assets/Scripts/StampInteractor.cs index 7160415..ecd5845 100644 --- a/SSLR/Assets/Scripts/StampInteractor.cs +++ b/SSLR/Assets/Scripts/StampInteractor.cs @@ -1,18 +1,15 @@ +using System; using System.Collections; using System.Collections.Generic; using UnityEngine; public class StampInteractor : MonoBehaviour { - // Start is called before the first frame update - void Start() - { - - } - - // Update is called once per frame - void Update() - { - - } + private void OnCollisionEnter(Collision other) + { + if (StampSocketInteractor.isHeld && other.gameObject.CompareTag("Paper")) + { + Debug.Log("paper is stamped"); + } + } } diff --git a/SSLR/Assets/Scripts/StampSocketInteractor.cs b/SSLR/Assets/Scripts/StampSocketInteractor.cs new file mode 100644 index 0000000..a68507e --- /dev/null +++ b/SSLR/Assets/Scripts/StampSocketInteractor.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.XR.Interaction.Toolkit; +using UnityEngine.XR.Interaction.Toolkit.Interactors; + +public class StampSocketInteractor : MonoBehaviour +{ + XRSocketInteractor stampSocket; + public static bool isHeld = false; + + + private void Awake() + { + stampSocket = GetComponent(); + } + + void OnEnable() + { + stampSocket.selectEntered.AddListener(OnStampTable); + stampSocket.selectExited.AddListener(OnStampHeld); + + + } + + private void OnDisable() + { + stampSocket.selectEntered.RemoveListener(OnStampTable); + stampSocket.selectExited.RemoveListener(OnStampHeld); + } + + + private void OnStampHeld(SelectExitEventArgs args) + { + isHeld = true; + Debug.Log("Stamp is held"); + } + + private void OnStampTable(SelectEnterEventArgs args) + { + isHeld = false; + Debug.Log("Stamp is on table"); + } + +} diff --git a/SSLR/Assets/Scripts/StampSocketInteractor.cs.meta b/SSLR/Assets/Scripts/StampSocketInteractor.cs.meta new file mode 100644 index 0000000..c5de290 --- /dev/null +++ b/SSLR/Assets/Scripts/StampSocketInteractor.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 95023321d0056f943b32664c1c303781 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SSLR/Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta b/SSLR/Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta new file mode 100644 index 0000000..2f7eb2e --- /dev/null +++ b/SSLR/Assets/SimpleNaturePack/SimpleNaturePack_2020.3_HDRP_v1.24.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 58f7e79a87c79824597746e8c1bfe400 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/SSLR/Assets/SimpleNaturePack/SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta b/SSLR/Assets/SimpleNaturePack/SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta new file mode 100644 index 0000000..73c9a86 --- /dev/null +++ b/SSLR/Assets/SimpleNaturePack/SimpleNaturePack_2020.3_URP_v1.24.unitypackage.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: f58d25b9e504a4f41ab4a71cf87c1845 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: