Degulleo/Degullmok-client
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO-89 [Fix] X 버튼 중복 처리

Browse Source
This commit is contained in:
Sehyeon 2025-03-31 11:52:24 +09:00
parent 26687852c9
commit 578e501c94
8 changed files with 77 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Assets/Resources/Prefabs/Panels/InGameMenu Panel.prefab
View File

@ -105,6 +105,7 @@ MonoBehaviour:
panelRectTransform: {fileID: 3566405136616423668}
drawRegisterButton: {fileID: 4952176830370869590}
settingsButton: {fileID: 2502852987797543892}
closeButton: {fileID: 3579054745597920021}
--- !u!1 &3579054745597920021
GameObject:
m_ObjectHideFlags: 0
@ -117,6 +118,7 @@ GameObject:
- component: {fileID: 7430679982596743438}
- component: {fileID: 7365647355793938106}
- component: {fileID: 6468503842976786270}
- component: {fileID: 5024916025478984467}
m_Layer: 5
m_Name: Close Button
m_TagString: Untagged
@ -237,6 +239,19 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &5024916025478984467
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3579054745597920021}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4330206548604932b038a7007dacf94b, type: 3}
m_Name:
m_EditorClassIdentifier:
enableOneTimeClick: 1
--- !u!1 &5179388986428920634
GameObject:
m_ObjectHideFlags: 0

15
Assets/Resources/Prefabs/Panels/Replay Panel.prefab
View File

@ -195,6 +195,7 @@ MonoBehaviour:
panelRectTransform: {fileID: 1819504122199746525}
scrollItemPrefab: {fileID: 7605012172595602668, guid: bef1de10a3cc5834a95a8689a2de2bb7, type: 3}
content: {fileID: 7514948643227889924}
closeButton: {fileID: 3668037476601755215}
--- !u!1 &3668037476601755215
GameObject:
m_ObjectHideFlags: 0
@ -207,6 +208,7 @@ GameObject:
- component: {fileID: 8575946642649479721}
- component: {fileID: 8444724274473405378}
- component: {fileID: 2765407718264440700}
- component: {fileID: 8125070878863374859}
m_Layer: 5
m_Name: Close Button
m_TagString: Untagged
@ -327,6 +329,19 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &8125070878863374859
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3668037476601755215}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4330206548604932b038a7007dacf94b, type: 3}
m_Name:
m_EditorClassIdentifier:
enableOneTimeClick: 1
--- !u!1 &6627411411516242057
GameObject:
m_ObjectHideFlags: 0

15
Assets/Resources/Prefabs/Panels/Setting Panel.prefab
View File

@ -386,6 +386,7 @@ MonoBehaviour:
panelRectTransform: {fileID: 3566405136616423668}
sfxSwitch: {fileID: 3464089222698319368}
bgmSwitch: {fileID: 6789969287113785900}
closeButton: {fileID: 3415738084506217009}
--- !u!1 &3415738084506217009
GameObject:
m_ObjectHideFlags: 0
@ -398,6 +399,7 @@ GameObject:
- component: {fileID: 1293506759801131046}
- component: {fileID: 4620135508563498056}
- component: {fileID: 3480686221752108514}
- component: {fileID: 2236322977238445129}
m_Layer: 5
m_Name: Close Button
m_TagString: Untagged
@ -518,6 +520,19 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &2236322977238445129
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3415738084506217009}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4330206548604932b038a7007dacf94b, type: 3}
m_Name:
m_EditorClassIdentifier:
enableOneTimeClick: 1
--- !u!1 &3857536818415472779
GameObject:
m_ObjectHideFlags: 0

15
Assets/Resources/Prefabs/Panels/Shop Panel.prefab
View File

@ -89,6 +89,7 @@ GameObject:
- component: {fileID: 7956384524120379576}
- component: {fileID: 5247638142364801513}
- component: {fileID: 7003094256969349138}
- component: {fileID: 678957045619692814}
m_Layer: 5
m_Name: Close Button
m_TagString: Untagged
@ -209,6 +210,19 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &678957045619692814
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3264995526714633224}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4330206548604932b038a7007dacf94b, type: 3}
m_Name:
m_EditorClassIdentifier:
enableOneTimeClick: 1
--- !u!1 &4171905043031436748
GameObject:
m_ObjectHideFlags: 0
@ -588,3 +602,4 @@ MonoBehaviour:
panelRectTransform: {fileID: 1865554703069439360}
scrollItemPrefab: {fileID: 7605012172595602668, guid: 5c61f63a5f85a8b4c9ffc8bf5c9d7a29, type: 3}
content: {fileID: 4612618164247174080}
closeButton: {fileID: 3264995526714633224}

2
Assets/Script/UI/PanelController/InGameMenuPanelController.cs
View File

@ -8,12 +8,14 @@ public class InGameMenuPanelController : PanelController
{
[SerializeField] private GameObject drawRegisterButton; // 무승부 요청
[SerializeField] private GameObject settingsButton; // 설정 버튼
[SerializeField] private GameObject closeButton;
public delegate void OnInGameMenuButtonClick();
private OnInGameMenuButtonClick onInGameMenuButtonClick;
public void Show(OnInGameMenuButtonClick onInGameMenuButtonClick)
{
closeButton.GetComponent<SingleInteractableButtonHandler>().ResetButton();
this.onInGameMenuButtonClick = onInGameMenuButtonClick;
base.Show();
}

1
Assets/Script/UI/PanelController/ReplayPanelItemsController.cs
View File

@ -4,7 +4,6 @@ using UnityEngine;
public class ReplayPanelItemsController : ScrollPanelController
{
private string _myNickname;
private UserManager _userManager;
private void Awake()

7
Assets/Script/UI/PanelController/ScrollPanelController.cs
View File

@ -11,6 +11,13 @@ public class ScrollPanelController : PanelController
[SerializeField]protected GameObject scrollItemPrefab;
[SerializeField]protected GameObject content;
[SerializeField] private GameObject closeButton;
public void Show()
{
closeButton.GetComponent<SingleInteractableButtonHandler>().ResetButton();
base.Show();
}
public void OnClickCloseButton()
{

9
Assets/Script/UI/PanelController/SettingPanelController.cs
View File

@ -7,7 +7,8 @@ public class SettingsPanelController : PanelController
{
[SerializeField] private Button sfxSwitch;
[SerializeField] private Button bgmSwitch;
[SerializeField] private GameObject closeButton;
void Start()
{
// 스위치 컨트롤러 상태 변경 이벤트 연결
@ -19,6 +20,12 @@ public class SettingsPanelController : PanelController
bgmSwitch.GetComponent<SwitchController>().SetSwitch(UserManager.IsPlayBGM);
}
public void Show()
{
closeButton.GetComponent<SingleInteractableButtonHandler>().ResetButton();
base.Show();
}
// SFX On/Off 시 호출되는 함수
public void OnSFXToggleValueChanged(bool value)
{