UVCXR/ChunilENG
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

설비 대시 보드 UI 수정

Browse Source
This commit is contained in:
정영민
2025-04-07 15:19:27 +09:00
parent cb71589b8a
commit 3b03b7d7e0
8 changed files with 53 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/Scripts/UI/Panel_AssemblyProduction.cs
View File

@@ -38,7 +38,7 @@ public class Panel_AssemblyProduction : PanelBase
{
onOpen?.Invoke();
effect.gameObject.SetActive(true);
effect.ActivePanel();
gameObject.SetActive(true);
gameObject.transform.SetAsLastSibling();
@@ -49,7 +49,7 @@ public class Panel_AssemblyProduction : PanelBase
}
public void Close()
{
effect.gameObject.SetActive(false);
effect.DeactivePanel();
gameObject.SetActive(false);
gameObject.transform.localScale = Vector3.zero;
ResetStatusContentOrder();

47
Assets/Scripts/UI/Panel_Effect.cs
View File

@@ -9,28 +9,37 @@ public class Panel_Effect : MonoBehaviour, ISingle
private List<GameObject> activePanel = new();
public void ActivePanel(GameObject panelObject)
public void ActivePanel()
{
if (!activePanel.Contains(panelObject))
{
activePanel.Add(panelObject);
activeCount++;
}
gameObject.SetActive(true);
gameObject.transform.SetAsLastSibling();
}
public void DeactivePanel(GameObject panelObject)
public void DeactivePanel()
{
if (activeCount > 0)
{
activePanel.Remove(panelObject);
activeCount--;
if (activeCount <= 0)
{
gameObject.SetActive(false);
}
}
gameObject.SetActive(false);
}
//public void ActivePanel(GameObject panelObject)
//{
// if (!activePanel.Contains(panelObject))
// {
// activePanel.Add(panelObject);
// activeCount++;
// }
// gameObject.SetActive(true);
//}
//public void DeactivePanel(GameObject panelObject)
//{
// if (activeCount > 0)
// {
// activePanel.Remove(panelObject);
// activeCount--;
// if (activeCount <= 0)
// {
// gameObject.SetActive(false);
// }
// }
//}
}

4
Assets/Scripts/UI/Panel_InjectionProduction.cs
View File

@@ -39,7 +39,7 @@ public class Panel_InjectionProduction : PanelBase
{
onOpen?.Invoke();
effect.gameObject.SetActive(true);
effect.ActivePanel();
gameObject.SetActive(true);
gameObject.transform.SetAsLastSibling();
@@ -50,7 +50,7 @@ public class Panel_InjectionProduction : PanelBase
}
public void Close()
{
effect.gameObject.SetActive(false);
effect.DeactivePanel();
gameObject.SetActive(false);
gameObject.transform.localScale = Vector3.zero;
ResetStatusContentOrder();

4
Assets/Scripts/UI/Panel_WorkConditionAnalysis.cs
View File

@@ -78,7 +78,7 @@ namespace CHN
}
public void Open()
{
effect.transform.gameObject.SetActive(true);
effect.ActivePanel();
gameObject.SetActive(true);
gameObject.transform.SetAsLastSibling();
@@ -87,7 +87,7 @@ namespace CHN
}
public void Close()
{
effect.transform.gameObject.SetActive(false);
effect.DeactivePanel();
ui_Calendar.SetActive(false);
gameObject.SetActive(false);
gameObject.transform.localScale = Vector3.zero;

4
Assets/Scripts/UI/Panel_WorkProgressStatus.cs
View File

@@ -34,7 +34,7 @@ public class Panel_WorkProgressStatus : PanelBase
{
onOpen?.Invoke();
effect.gameObject.SetActive(true);
effect.ActivePanel();
gameObject.SetActive(true);
gameObject.transform.SetAsLastSibling();
@@ -43,7 +43,7 @@ public class Panel_WorkProgressStatus : PanelBase
}
public void Close()
{
effect.gameObject.SetActive(false);
effect.DeactivePanel();
gameObject.SetActive(false);
gameObject.transform.localScale = Vector3.zero;
}

4
Assets/Scripts/UI/Panel_WorkTimeAnalysis.cs
View File

@@ -61,7 +61,7 @@ namespace CHN
public void Open()
{
effect.ActivePanel(gameObject);
effect.ActivePanel();
gameObject.SetActive(true);
gameObject.transform.SetAsLastSibling();
@@ -70,7 +70,7 @@ namespace CHN
}
public void Close()
{
effect.DeactivePanel(gameObject);
effect.DeactivePanel();
ui_Calendar.Close();
gameObject.SetActive(false);
gameObject.transform.localScale = Vector3.zero;