From f81c50b5a0db7336bd2ff236bc07802f4a91795a Mon Sep 17 00:00:00 2001 From: kookiekenobi Date: Mon, 17 Feb 2025 21:40:02 +0800 Subject: [PATCH] game: sign isnt working --- SSLR/Assets/Scenes/LiviPlayground.unity | 10 +++++++--- .../LiviPlayground/NavMesh-Game Manager.asset | Bin 0 -> 17352 bytes .../NavMesh-Game Manager.asset.meta | 8 ++++++++ SSLR/Assets/Scripts/PaperSocket.cs | 4 +++- SSLR/Assets/Scripts/PenInteractor.cs | 2 +- .../Assets/Scripts/PlayerDialogueInteraction.cs | 10 ++++++---- SSLR/Assets/Scripts/StampDocument.cs | 8 +++++--- 7 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 SSLR/Assets/Scenes/LiviPlayground/NavMesh-Game Manager.asset create mode 100644 SSLR/Assets/Scenes/LiviPlayground/NavMesh-Game Manager.asset.meta diff --git a/SSLR/Assets/Scenes/LiviPlayground.unity b/SSLR/Assets/Scenes/LiviPlayground.unity index 0a84988..5e959ac 100644 --- a/SSLR/Assets/Scenes/LiviPlayground.unity +++ b/SSLR/Assets/Scenes/LiviPlayground.unity @@ -5663,7 +5663,7 @@ MonoBehaviour: m_OverrideVoxelSize: 0 m_VoxelSize: 0.06666667 m_MinRegionArea: 2 - m_NavMeshData: {fileID: 23800000, guid: e3436bd4caa03b0448c2702401bde1e3, type: 2} + m_NavMeshData: {fileID: 23800000, guid: 0d3826611b9f1d141ab5b351c944490f, type: 2} m_BuildHeightMesh: 1 --- !u!114 &520849219 MonoBehaviour: @@ -5719,7 +5719,7 @@ MonoBehaviour: m_EditorClassIdentifier: url: https://fchobpauqasfebohuuam.supabase.co anonKey: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImZjaG9icGF1cWFzZmVib2h1dWFtIiwicm9sZSI6ImFub24iLCJpYXQiOjE3MzczNTYyNTUsImV4cCI6MjA1MjkzMjI1NX0.LkwCnzjtf8CPLrm6OONkjyjxZW8jE05V_spbOEeAXEM - menuButtons: {fileID: 0} + menuButtons: {fileID: 387192628} --- !u!1 &553967502 GameObject: m_ObjectHideFlags: 0 @@ -6867,7 +6867,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 0bab791ccf13189449b82b8f0b70b269, type: 3} m_Name: m_EditorClassIdentifier: - shiftDuration: 20 + shiftDuration: 60 npcSpawnArea: {fileID: 1126609776} --- !u!1 &741702766 GameObject: @@ -17536,6 +17536,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1432899214} m_Modifications: + - target: {fileID: 5163886654783036366, guid: 0197fe44356b38740b9747f44a27fa94, type: 3} + propertyPath: m_TagString + value: Pen + objectReference: {fileID: 0} - target: {fileID: 8641240288083967895, guid: 0197fe44356b38740b9747f44a27fa94, type: 3} propertyPath: m_Name value: Mug_With_Tools_Pen diff --git a/SSLR/Assets/Scenes/LiviPlayground/NavMesh-Game Manager.asset b/SSLR/Assets/Scenes/LiviPlayground/NavMesh-Game Manager.asset new file mode 100644 index 0000000000000000000000000000000000000000..cf72cbc5b438363c34fd72b9b9dccb14e225c15a GIT binary patch literal 17352 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 + socket.interactionManager.SelectExit(socket, args.interactableObject); } } } diff --git a/SSLR/Assets/Scripts/PenInteractor.cs b/SSLR/Assets/Scripts/PenInteractor.cs index 7e37ec9..fc9c981 100644 --- a/SSLR/Assets/Scripts/PenInteractor.cs +++ b/SSLR/Assets/Scripts/PenInteractor.cs @@ -35,6 +35,7 @@ public class PenInteractor : MonoBehaviour if(!stampDocScript.isSigned) { PlayerDialogueInteraction.instance.servicesPanel.SetActive(true); + PlayerDialogueInteraction.instance.questionPanel.SetActive(false); } } else @@ -44,5 +45,4 @@ public class PenInteractor : MonoBehaviour } } } - } diff --git a/SSLR/Assets/Scripts/PlayerDialogueInteraction.cs b/SSLR/Assets/Scripts/PlayerDialogueInteraction.cs index 242a2b1..8168e81 100644 --- a/SSLR/Assets/Scripts/PlayerDialogueInteraction.cs +++ b/SSLR/Assets/Scripts/PlayerDialogueInteraction.cs @@ -44,13 +44,13 @@ public class PlayerDialogueInteraction : MonoBehaviour public GameObject giveDocumentsTick; [Header("Services")] - public GameObject comcareServiceButton; + /*public GameObject comcareServiceButton; public GameObject fscServiceButton; public GameObject peersServiceButton; public GameObject transitionalSheltersServiceButton; public GameObject cpsServiceButton; - public GameObject sgEnableServiceButton; - public StampDocument currentDocument; + public GameObject sgEnableServiceButton;*/ + public GameObject currentDocument; /// /// Do not destroy on load, and resetting UI @@ -206,6 +206,8 @@ public class PlayerDialogueInteraction : MonoBehaviour public void OnServiceSelected(string service) { servicesPanel.SetActive(false); - currentDocument.Sign(service); + questionPanel.SetActive(true); + + currentDocument.GetComponent().Sign(service); } } diff --git a/SSLR/Assets/Scripts/StampDocument.cs b/SSLR/Assets/Scripts/StampDocument.cs index 6ab60fd..fd512a0 100644 --- a/SSLR/Assets/Scripts/StampDocument.cs +++ b/SSLR/Assets/Scripts/StampDocument.cs @@ -166,12 +166,14 @@ public class StampDocument : MonoBehaviour /// Declares this is current document /// /// - private void OnTriggerEnter(Collider other) + private void OnColliderEnter(Collider collision) { - if (other.gameObject.CompareTag("Pen")) + if (collision.gameObject.CompareTag("Pen")) { + /* PlayerDialogueInteraction.instance.servicesPanel.SetActive(true); - PlayerDialogueInteraction.instance.currentDocument = this; + */ + PlayerDialogueInteraction.instance.currentDocument = gameObject; } } } \ No newline at end of file