Ashby/Ludo-3D
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactored UI scripts.

Browse Source
This commit is contained in:
Ashby Issac 2026-02-02 17:45:34 +05:30
parent d11c7dfe39
commit 0d1db5152e
5 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Scripts/UI/Pages/PopUp/InstructionsPopup.cs
View File

@ -21,7 +21,7 @@ public class InstructionsPopup : PopupBase
private void OnClick_closeBtn()
{
ScreenManager screenManager = InterfaceManager.Instance?.GetInterfaceInstance<ScreenManager>();
screenManager.ShowScreen(ScreenType.MenuScreen);
screenManager.ShowScreen(ScreenType.MainMenuScreen);
soundManager = soundManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<SoundManager>() : soundManager;
soundManager?.PlayGameSoundClip(SoundType.ButtonClick);

14
Assets/Scripts/UI/Pages/PopUp/OptionsPopup.cs
View File

@ -11,27 +11,28 @@ public class OptionsPopup : PopupBase
private void OnEnable()
{
closeBtn.onClick.AddListener(OnClick_closeBtn);
closeBtn.onClick.AddListener(OnClick_CloseButton);
mainVolSlider.onValueChanged.AddListener(OnMainVolChanged);
musicVolSlider.onValueChanged.AddListener(OnBGMVolChanged);
sfxVolSlider.onValueChanged.AddListener(OnSFXVolChanged);
InitializeSliders();
}
private void OnDisable()
{
closeBtn.onClick.RemoveListener(OnClick_closeBtn);
closeBtn.onClick.RemoveListener(OnClick_CloseButton);
mainVolSlider.onValueChanged.RemoveListener(OnMainVolChanged);
musicVolSlider.onValueChanged.RemoveListener(OnBGMVolChanged);
sfxVolSlider.onValueChanged.RemoveListener(OnSFXVolChanged);
}
private void OnClick_closeBtn()
private void OnClick_CloseButton()
{
ScreenManager screenManager = InterfaceManager.Instance?.GetInterfaceInstance<ScreenManager>();
screenManager.ShowScreen(ScreenType.MenuScreen);
popupManager.HidePopup(PopupType);
Hide();
ScreenManager screenManager = InterfaceManager.Instance?.GetInterfaceInstance<ScreenManager>();
screenManager.ShowScreen(ScreenType.MainMenuScreen);
}
public void OnMainVolChanged(float value)
@ -70,7 +71,6 @@ public class OptionsPopup : PopupBase
mainVolSlider.value = mainVol;
musicVolSlider.value = bgmVol;
sfxVolSlider.value = sfxVol;
}
}

5
Assets/Scripts/UI/Pages/PopUp/PvAIModePopup.cs
View File

@ -117,12 +117,13 @@ public class PvAIModePopup : PopupBase
private void OnClick_CloseButton()
{
popupManager.HidePopup(popupType);
screenManager = screenManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<ScreenManager>() : screenManager;
screenManager.ShowScreen(ScreenType.MenuScreen);
screenManager.ShowScreen(ScreenType.MainMenuScreen);
soundManager = soundManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<SoundManager>() : soundManager;
soundManager?.PlayGameSoundClip(SoundType.ButtonClick);
Hide();
}
private void OnColorSelected(PlayerType type, Button button)

6
Assets/Scripts/UI/Pages/PopUp/PvPModePopup.cs
View File

@ -247,12 +247,12 @@ public class PvPModePopup : PopupBase
private void OnClick_CloseButton()
{
popupManager.HidePopup(popupType);
screenManager = screenManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<ScreenManager>() : screenManager;
screenManager.ShowScreen(ScreenType.MenuScreen);
screenManager.ShowScreen(ScreenType.MainMenuScreen);
soundManager = soundManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<SoundManager>() : soundManager;
soundManager?.PlayGameSoundClip(SoundType.ButtonClick);
Hide();
}
}

45
Assets/Scripts/UI/Pages/Screens/MenuHUDScreen.cs
View File

@ -17,23 +17,23 @@ public class MenuHUDScreen : ScreenBase
private void OnEnable()
{
pvpModeBtn.onClick.AddListener(OnClick_pvpModeBtn);
pvaiModeBtn.onClick.AddListener(OnClick_pvaiModeBtn);
optionsBtn.onClick.AddListener(OnClick_optionsBtn);
instructionsBtn.onClick.AddListener(OnClick_instructionsBtn);
exitBtn.onClick.AddListener(OnClick_exitBtn);
pvpModeBtn.onClick.AddListener(OnClick_PVPModeButton);
pvaiModeBtn.onClick.AddListener(OnClick_PvAIModeButton);
optionsBtn.onClick.AddListener(OnClick_OptionsButton);
instructionsBtn.onClick.AddListener(OnClick_InstructionsButton);
exitBtn.onClick.AddListener(OnClick_ExitButton);
}
private void OnDisable()
{
pvpModeBtn.onClick.RemoveListener(OnClick_pvpModeBtn);
pvaiModeBtn.onClick.RemoveListener(OnClick_pvaiModeBtn);
optionsBtn.onClick.RemoveListener(OnClick_optionsBtn);
instructionsBtn.onClick.RemoveListener(OnClick_instructionsBtn);
exitBtn.onClick.RemoveListener(OnClick_exitBtn);
pvpModeBtn.onClick.RemoveListener(OnClick_PVPModeButton);
pvaiModeBtn.onClick.RemoveListener(OnClick_PvAIModeButton);
optionsBtn.onClick.RemoveListener(OnClick_OptionsButton);
instructionsBtn.onClick.RemoveListener(OnClick_InstructionsButton);
exitBtn.onClick.RemoveListener(OnClick_ExitButton);
}
private void OnClick_pvpModeBtn()
private void OnClick_PVPModeButton()
{
popupManager = popupManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<PopupManager>() : popupManager;
popupManager.ShowPopup(PopupType.PvPModePopup);
@ -41,12 +41,10 @@ public class MenuHUDScreen : ScreenBase
soundManager = soundManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<SoundManager>() : soundManager;
soundManager?.PlayGameSoundClip(SoundType.ButtonClick);
Hide();
// screenManager = screenManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<ScreenManager>() : screenManager;
// screenManager.HideScreen(ScreenType.MenuHUDScreen);
HideScreen();
}
private void OnClick_pvaiModeBtn()
private void OnClick_PvAIModeButton()
{
popupManager = popupManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<PopupManager>() : popupManager;
popupManager.ShowPopup(PopupType.PvAIModePopup);
@ -54,10 +52,10 @@ public class MenuHUDScreen : ScreenBase
soundManager = soundManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<SoundManager>() : soundManager;
soundManager?.PlayGameSoundClip(SoundType.ButtonClick);
Hide();
HideScreen();
}
private void OnClick_optionsBtn()
private void OnClick_OptionsButton()
{
popupManager = popupManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<PopupManager>() : popupManager;
popupManager.ShowPopup(PopupType.OptionsPopup);
@ -65,10 +63,10 @@ public class MenuHUDScreen : ScreenBase
soundManager = soundManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<SoundManager>() : soundManager;
soundManager?.PlayGameSoundClip(SoundType.ButtonClick);
Hide();
HideScreen();
}
private void OnClick_instructionsBtn()
private void OnClick_InstructionsButton()
{
popupManager = popupManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<PopupManager>() : popupManager;
popupManager.ShowPopup(PopupType.InstructionsPopup);
@ -76,10 +74,15 @@ public class MenuHUDScreen : ScreenBase
soundManager = soundManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<SoundManager>() : soundManager;
soundManager?.PlayGameSoundClip(SoundType.ButtonClick);
Hide();
HideScreen();
}
private void OnClick_exitBtn()
private void HideScreen()
{
screenManager.HideScreen(ScreenType);
}
private void OnClick_ExitButton()
{
soundManager = soundManager == null ? InterfaceManager.Instance?.GetInterfaceInstance<SoundManager>() : soundManager;
soundManager?.PlayGameSoundClip(SoundType.ButtonClick);