From 7479aaeac97dac18f95e65289da1bd814505f928 Mon Sep 17 00:00:00 2001 From: Lim0_C Date: Wed, 23 Apr 2025 16:28:26 +0900 Subject: [PATCH] =?UTF-8?q?DEG-84=20[Fix]=20=EC=A1=B0=EC=9D=B4=EC=8A=A4?= =?UTF-8?q?=ED=8B=B1=20=EC=BB=A8=ED=8A=B8=EB=A1=A4=EB=9F=AC=20=EB=B0=8F=20?= =?UTF-8?q?=EC=97=90=EB=94=94=ED=84=B0=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 씬에 따라 활성화 될 UI 판단하여 활성화 코드 추가 에디터 폴더 수정 --- Assets/JoystickPanelController.cs | 23 ---------- Assets/LYM/Scenes/HousingUI.unity | 4 +- Assets/LYM/{Shader.meta => Scripts.meta} | 2 +- .../{ => LYM/Scripts}/ChatWindowController.cs | 0 .../Scripts}/ChatWindowController.cs.meta | 0 .../Scripts}/InteractionPanelController.cs | 0 .../InteractionPanelController.cs.meta | 0 Assets/LYM/Scripts/JoystickPanelController.cs | 44 +++++++++++++++++++ .../Scripts}/JoystickPanelController.cs.meta | 0 .../LYM/UIPrefabs/HousingMainUIPanel.prefab | 4 +- Assets/LYM/UIPrefabs/JoystickPanel.prefab | 4 +- 11 files changed, 51 insertions(+), 30 deletions(-) delete mode 100644 Assets/JoystickPanelController.cs rename Assets/LYM/{Shader.meta => Scripts.meta} (77%) rename Assets/{ => LYM/Scripts}/ChatWindowController.cs (100%) rename Assets/{ => LYM/Scripts}/ChatWindowController.cs.meta (100%) rename Assets/{ => LYM/Scripts}/InteractionPanelController.cs (100%) rename Assets/{ => LYM/Scripts}/InteractionPanelController.cs.meta (100%) create mode 100644 Assets/LYM/Scripts/JoystickPanelController.cs rename Assets/{ => LYM/Scripts}/JoystickPanelController.cs.meta (100%) diff --git a/Assets/JoystickPanelController.cs b/Assets/JoystickPanelController.cs deleted file mode 100644 index b1e0322f..00000000 --- a/Assets/JoystickPanelController.cs +++ /dev/null @@ -1,23 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using Unity.VisualScripting; -using UnityEngine; -using UnityEngine.UI; - -public class JoystickPanelController : MonoBehaviour -{ - public void OnClickAttackButton() - { - - } - - public void OnClickDashButton() - { - - } - - public void OnClickInteractionButton() - { - - } -} diff --git a/Assets/LYM/Scenes/HousingUI.unity b/Assets/LYM/Scenes/HousingUI.unity index f13c7fd4..fb708b38 100644 --- a/Assets/LYM/Scenes/HousingUI.unity +++ b/Assets/LYM/Scenes/HousingUI.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4dad81470e0ddc9547339216ddc47be4319d984ca5bf7a490d7b50a0ea06cb7a -size 138946 +oid sha256:ed44d5ca35ed2d2d659c9784ec9e7eb5252ef87f4b5a80951b37ccd231f6d0ee +size 127544 diff --git a/Assets/LYM/Shader.meta b/Assets/LYM/Scripts.meta similarity index 77% rename from Assets/LYM/Shader.meta rename to Assets/LYM/Scripts.meta index a5879e93..ac6272fe 100644 --- a/Assets/LYM/Shader.meta +++ b/Assets/LYM/Scripts.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: a7e1feb6ebaf3bd4d9978ca3c76fdcc7 +guid: bb031fff0dd38c1499e8108a1b04c699 folderAsset: yes DefaultImporter: externalObjects: {} diff --git a/Assets/ChatWindowController.cs b/Assets/LYM/Scripts/ChatWindowController.cs similarity index 100% rename from Assets/ChatWindowController.cs rename to Assets/LYM/Scripts/ChatWindowController.cs diff --git a/Assets/ChatWindowController.cs.meta b/Assets/LYM/Scripts/ChatWindowController.cs.meta similarity index 100% rename from Assets/ChatWindowController.cs.meta rename to Assets/LYM/Scripts/ChatWindowController.cs.meta diff --git a/Assets/InteractionPanelController.cs b/Assets/LYM/Scripts/InteractionPanelController.cs similarity index 100% rename from Assets/InteractionPanelController.cs rename to Assets/LYM/Scripts/InteractionPanelController.cs diff --git a/Assets/InteractionPanelController.cs.meta b/Assets/LYM/Scripts/InteractionPanelController.cs.meta similarity index 100% rename from Assets/InteractionPanelController.cs.meta rename to Assets/LYM/Scripts/InteractionPanelController.cs.meta diff --git a/Assets/LYM/Scripts/JoystickPanelController.cs b/Assets/LYM/Scripts/JoystickPanelController.cs new file mode 100644 index 00000000..6a0bc5fd --- /dev/null +++ b/Assets/LYM/Scripts/JoystickPanelController.cs @@ -0,0 +1,44 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using Unity.VisualScripting; +using UnityEditor.SearchService; +using UnityEngine; +using UnityEngine.SceneManagement; +using UnityEngine.UI; + +public class JoystickPanelController : MonoBehaviour +{ + [SerializeField] private GameObject dungeonUI; + [SerializeField] private GameObject housingUI; + + private void Start() + { + dungeonUI.SetActive(false); + housingUI.SetActive(false); + //현재 씬 이름 확인해 UI 별 활성화 판단 + if (SceneManager.GetActiveScene().name == "HousingUI") + { + housingUI.SetActive(true); + } + else if (SceneManager.GetActiveScene().name == "DungeonUI") + { + dungeonUI.SetActive(true); + } + } + + public void OnClickAttackButton() + { + + } + + public void OnClickDashButton() + { + + } + + public void OnClickInteractionButton() + { + + } +} diff --git a/Assets/JoystickPanelController.cs.meta b/Assets/LYM/Scripts/JoystickPanelController.cs.meta similarity index 100% rename from Assets/JoystickPanelController.cs.meta rename to Assets/LYM/Scripts/JoystickPanelController.cs.meta diff --git a/Assets/LYM/UIPrefabs/HousingMainUIPanel.prefab b/Assets/LYM/UIPrefabs/HousingMainUIPanel.prefab index 80634d81..cc47d378 100644 --- a/Assets/LYM/UIPrefabs/HousingMainUIPanel.prefab +++ b/Assets/LYM/UIPrefabs/HousingMainUIPanel.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:3c0b46ebb0a2d2fdd1e52de143e36d5f2b01e5fc35eaad4de00f5d398f9c5f6b -size 53425 +oid sha256:86de845d1a2cdff88e99d13d7c175db7daf3e6f899a80cca22f30e7f6459a624 +size 57700 diff --git a/Assets/LYM/UIPrefabs/JoystickPanel.prefab b/Assets/LYM/UIPrefabs/JoystickPanel.prefab index be24a062..1274f933 100644 --- a/Assets/LYM/UIPrefabs/JoystickPanel.prefab +++ b/Assets/LYM/UIPrefabs/JoystickPanel.prefab @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d6e4a58de2c7fdd8547ba2d67e3ce15fe8dc1acbbc374c69eaf206aa7900071 -size 22395 +oid sha256:2f39d998ec002e9d89b6ba9e29ec29f3ce1cf44c76fd3d02c79b4e2671aba241 +size 22481