From 5e5296c45608c427d37b72efd0776788a0676e8f Mon Sep 17 00:00:00 2001 From: nlevin6 Date: Sun, 30 Mar 2025 00:09:37 -0400 Subject: [PATCH] wordle puzzle fully fixed, reassigned tablet button to TAB --- .../Word Puzzle/Scripts/TabletToggle.cs | 24 ---------- .../Word Puzzle/Scripts/TabletToggle.cs.meta | 2 - Assets/Scenes/level2.unity | 48 +------------------ Assets/Scripts/OpenDoor.cs | 2 +- Assets/Scripts/TabletController.cs | 2 +- 5 files changed, 3 insertions(+), 75 deletions(-) delete mode 100644 Assets/Puzzles/Word Puzzle/Scripts/TabletToggle.cs delete mode 100644 Assets/Puzzles/Word Puzzle/Scripts/TabletToggle.cs.meta diff --git a/Assets/Puzzles/Word Puzzle/Scripts/TabletToggle.cs b/Assets/Puzzles/Word Puzzle/Scripts/TabletToggle.cs deleted file mode 100644 index a4002f8f..00000000 --- a/Assets/Puzzles/Word Puzzle/Scripts/TabletToggle.cs +++ /dev/null @@ -1,24 +0,0 @@ -using UnityEngine; -using UnityEngine.EventSystems; -using TMPro; - -public class TabletToggle : MonoBehaviour -{ - public GameObject tablet; - - void Update() - { - if (Input.GetKeyDown(KeyCode.T)) - { - TMP_InputField inputField = null; - if (EventSystem.current != null && EventSystem.current.currentSelectedGameObject != null) - { - inputField = EventSystem.current.currentSelectedGameObject.GetComponent(); - } - if (inputField != null && inputField.isFocused) - return; - - tablet.SetActive(!tablet.activeSelf); - } - } -} diff --git a/Assets/Puzzles/Word Puzzle/Scripts/TabletToggle.cs.meta b/Assets/Puzzles/Word Puzzle/Scripts/TabletToggle.cs.meta deleted file mode 100644 index ad506194..00000000 --- a/Assets/Puzzles/Word Puzzle/Scripts/TabletToggle.cs.meta +++ /dev/null @@ -1,2 +0,0 @@ -fileFormatVersion: 2 -guid: 1f363690cf70e6449a55d819bd9503b6 \ No newline at end of file diff --git a/Assets/Scenes/level2.unity b/Assets/Scenes/level2.unity index 233a7396..963c5e8d 100644 --- a/Assets/Scenes/level2.unity +++ b/Assets/Scenes/level2.unity @@ -22013,7 +22013,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Press T to close tablet + m_text: Press TAB to close tablet m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 7b2580bdc852e1317abe1e2230348975, type: 2} m_sharedMaterial: {fileID: 4369202036407883034, guid: 7b2580bdc852e1317abe1e2230348975, type: 2} @@ -24107,51 +24107,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 69125d056127da746a8a1ed8371ea8d6, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1328799368 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1328799370} - - component: {fileID: 1328799369} - m_Layer: 0 - m_Name: TabletToggleManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1328799369 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1328799368} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1f363690cf70e6449a55d819bd9503b6, type: 3} - m_Name: - m_EditorClassIdentifier: - tablet: {fileID: 0} ---- !u!4 &1328799370 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1328799368} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.88123596, y: 23.22024, z: -4.681444} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1339936851 GameObject: m_ObjectHideFlags: 0 @@ -41800,4 +41755,3 @@ SceneRoots: - {fileID: 171829751} - {fileID: 1766395669} - {fileID: 1232642964} - - {fileID: 1328799370} diff --git a/Assets/Scripts/OpenDoor.cs b/Assets/Scripts/OpenDoor.cs index cc7a12b4..64e891f1 100644 --- a/Assets/Scripts/OpenDoor.cs +++ b/Assets/Scripts/OpenDoor.cs @@ -97,7 +97,7 @@ public class DoorInteraction : MonoBehaviour if (!tabletController.isShowing && doorCount > 0) { - TextPopUp("Press T to open tablet."); + TextPopUp("Press TAB to open tablet."); tabletIcon.enabled = true; // tabletScript.SetScreen(TabletScreen.MainMenu); diff --git a/Assets/Scripts/TabletController.cs b/Assets/Scripts/TabletController.cs index 95ca6e82..4614727c 100644 --- a/Assets/Scripts/TabletController.cs +++ b/Assets/Scripts/TabletController.cs @@ -34,7 +34,7 @@ public class TabletController : MonoBehaviour // { // isMoving = false; // }&& !isMoving - if (Input.GetKeyDown(KeyCode.T)) + if (Input.GetKeyDown(KeyCode.Tab)) { // if is not showing play tablet open animation if (!isShowing)