Merge pull request 'DEG-86-팝업-및-설정-UI-구현' (!4) from DEG-86-팝업-및-설정-UI-구현 into main

Reviewed-on: #4
Reviewed-by: Sehyeon <sehyeon1837@gmail.com>
Reviewed-by: fiore <cjsdlf44@gmail.com>

Assets/LYM/Scripts/MainUIPanelController.cs

@@ -5,14 +5,18 @@ using UnityEngine.UI;
 
 public class MainUIPanelController : MonoBehaviour
 {
-
+    [SerializeField] private GameObject settingsPanelPrefab;
+    [SerializeField] private GameObject popupPanelPrefab;
+    
     public void OnClickStartButton()
     {
-        
+        var popupPanel = Instantiate(popupPanelPrefab, transform);
+        popupPanel.GetComponent<PopupPanelController>().Show("This is PopupPanel!!", () => {Debug.Log("Confirmed");});
     }
 
     public void OnClickSettingsButton()
     {
-        
+        var settingsPanel = Instantiate(settingsPanelPrefab, transform);
+        settingsPanel.GetComponent<SettingsPanelController>().Show();
     }
 }

Assets/LYM/Scripts/PanelController.cs

@@ -26,5 +26,6 @@ public class PanelController : MonoBehaviour
     {
         if (_canvasGroup == null) return;
         _canvasGroup.alpha = 0;
+        Destroy(gameObject);
     }
 }

Assets/LYM/Scripts/PopupPanelController.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
+using TMPro;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -8,26 +9,18 @@ public class PopupPanelController : PanelController
 {
     [SerializeField] private GameObject confirmButton;
     [SerializeField] private GameObject contradictButton;
+    [SerializeField] private TMP_Text popupText;
 
     public delegate void OnConfirmDelegate();
     private OnConfirmDelegate _onConfirmDelegate;
     public delegate void OnContradictDelegate();
     private OnContradictDelegate _onContradictDelegate;
-    private void Start()
-    {
-        Show(false, "", () => {});
-    }
 
-    public void Show(bool isNeed2Contradict, string message, OnConfirmDelegate onConfirm)
+    public void Show(string message, OnConfirmDelegate onConfirm, OnContradictDelegate onContradict = null)
     {
-        confirmButton.SetActive(isNeed2Contradict);
+        bool isNeed2Contradict = onContradict != null;
-        _onConfirmDelegate = onConfirm;
+        contradictButton.SetActive(isNeed2Contradict);
-        base.Show();
+        popupText.text = message;
-    }
-
-    public void Show(bool isNeed2Contradict, string message, OnConfirmDelegate onConfirm, OnContradictDelegate onContradict)
-    {
-        confirmButton.SetActive(isNeed2Contradict);
         _onConfirmDelegate = onConfirm;
         _onContradictDelegate = onContradict;
         base.Show();

Assets/LYM/Scripts/SettingsPanelController.cs

@@ -0,0 +1,66 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+
+public class SettingsPanelController : PanelController
+{
+
+    [SerializeField] private SliderButton sfxSliderButton;
+    [SerializeField] private SliderButton bgmSliderButton;
+    [SerializeField] private Slider sfxSlider;
+    [SerializeField] private Slider bgmSlider;
+
+    private void Start()
+    {
+        InitSettings();
+    }
+
+    private void InitSettings()
+    {
+        //todo:저장된 데이터를 가져오게 해야함
+        var sfxIsActive = true;
+        var bgmIsActive = true;
+        sfxSliderButton.Init(sfxIsActive);
+        bgmSliderButton.Init(bgmIsActive);
+        //todo:저장된 데이터를 가져오게 해야함
+        var sfxSliderValue = 1f;
+        var bgmSliderValue = 1f;
+        sfxSlider.value = sfxSliderValue;
+        bgmSlider.value = bgmSliderValue;
+        Show();
+    }
+    
+    //버튼 클릭 시 마다 호출
+    public void SFXSliderButtonClicked()
+    {
+        sfxSliderButton.OnClicked();
+        //todo: sfxSliderButton.IsActive를 기준으로 뮤트 여부 확인 및 뮤트 적용
+    }
+    
+    public void BGMSliderButtonClicked()
+    {
+        bgmSliderButton.OnClicked();
+        //todo: sfxSliderButton.IsActive를 기준으로 뮤트 여부 확인 및 뮤트 적용
+    }
+
+    //슬라이더 변경 시 마다 호출
+    public void OnSFXSliderValueChanged(float value)
+    {
+        //todo: 소리 볼륨 조절
+        Debug.Log("sfx changed value" + value);
+    }
+    
+    public void OnBGMSliderValueChanged(float value)
+    {
+        //todo: 소리 볼륨 조절
+        Debug.Log("bgm changed value" + value);
+    }
+
+    public void OnCloseButtonClicked()
+    {
+        //todo: 설정 저장 필요
+        Hide();
+    }
+}

Assets/LYM/Scripts/SettingsPanelController.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 3b8049d4c0267dd4481865a0eb1d5c3e
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/LYM/Scripts/SliderButton.cs

@@ -0,0 +1,42 @@
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+using UnityEngine.UI;
+using DG.Tweening;
+
+public class SliderButton : MonoBehaviour
+{
+    [SerializeField] private Image backgroundImage;
+    [SerializeField] private GameObject handle;
+
+    public bool IsActive { get; private set; }
+    private int _offXLocation = -15;
+    private int _onXLocation = 15;
+    private Color32 _offColor = new Color32(125, 125, 125, 255);
+    private Color32 _onColor = new Color32(70, 255, 90, 255);
+    
+    public void Init(bool isActive)
+    {
+        IsActive = isActive;
+        var xLocation = IsActive ? _onXLocation : _offXLocation;
+        var color = IsActive ? _onColor : _offColor;
+        handle.transform.localPosition = new Vector3(xLocation, handle.transform.localPosition.y, 0);
+        backgroundImage.color = color;
+    }
+
+    public void OnClicked()
+    {
+        if (IsActive)
+        {
+            handle.transform.DOLocalMoveX(_offXLocation, 0.2f);
+            backgroundImage.DOColor(_offColor, 0.2f);
+        }
+        else 
+        {
+            handle.transform.DOLocalMoveX(_onXLocation, 0.2f);
+            backgroundImage.DOColor(_onColor, 0.2f);
+        }
+        IsActive = !IsActive;
+    }
+}

Assets/LYM/Scripts/SliderButton.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 0da16f0ed11a3b14b9cf497a46f7abba
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/LYM/UIPrefabs/SettingsPanel.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 9fe584d3180d4924e97a2084be3b454e
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: