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

12
Assets/Resources/Prefabs/UI/PRF_Panel_MachineDashBoard.prefab
View File

@@ -109,15 +109,17 @@ MonoBehaviour:
m_lineSpacingMax: 0 m_lineSpacingMax: 0
m_paragraphSpacing: 0 m_paragraphSpacing: 0
m_charWidthMaxAdj: 0 m_charWidthMaxAdj: 0
m_enableWordWrapping: 1 m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4 m_wordWrappingRatios: 0.4
m_overflowMode: 0 m_overflowMode: 0
m_linkedTextComponent: {fileID: 0} m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0} parentLinkedComponent: {fileID: 0}
m_enableKerning: 1 m_enableKerning: 1
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0 m_enableExtraPadding: 0
checkPaddingRequired: 0 checkPaddingRequired: 0
m_isRichText: 1 m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1 m_parseCtrlCharacters: 1
m_isOrthographic: 1 m_isOrthographic: 1
m_isCullingEnabled: 0 m_isCullingEnabled: 0
@@ -594,7 +596,7 @@ MonoBehaviour:
m_Elasticity: 0.1 m_Elasticity: 0.1
m_Inertia: 1 m_Inertia: 1
m_DecelerationRate: 0.135 m_DecelerationRate: 0.135
m_ScrollSensitivity: 1 m_ScrollSensitivity: 15
m_Viewport: {fileID: 3336037648759467369} m_Viewport: {fileID: 3336037648759467369}
m_HorizontalScrollbar: {fileID: 0} m_HorizontalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 0} m_VerticalScrollbar: {fileID: 0}
@@ -1412,7 +1414,7 @@ MonoBehaviour:
m_Elasticity: 0.1 m_Elasticity: 0.1
m_Inertia: 1 m_Inertia: 1
m_DecelerationRate: 0.135 m_DecelerationRate: 0.135
m_ScrollSensitivity: 1 m_ScrollSensitivity: 15
m_Viewport: {fileID: 2588290889824960605} m_Viewport: {fileID: 2588290889824960605}
m_HorizontalScrollbar: {fileID: 0} m_HorizontalScrollbar: {fileID: 0}
m_VerticalScrollbar: {fileID: 0} m_VerticalScrollbar: {fileID: 0}
@@ -1771,15 +1773,17 @@ MonoBehaviour:
m_lineSpacingMax: 0 m_lineSpacingMax: 0
m_paragraphSpacing: 0 m_paragraphSpacing: 0
m_charWidthMaxAdj: 0 m_charWidthMaxAdj: 0
m_enableWordWrapping: 1 m_TextWrappingMode: 1
m_wordWrappingRatios: 0.4 m_wordWrappingRatios: 0.4
m_overflowMode: 0 m_overflowMode: 0
m_linkedTextComponent: {fileID: 0} m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0} parentLinkedComponent: {fileID: 0}
m_enableKerning: 1 m_enableKerning: 1
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0 m_enableExtraPadding: 0
checkPaddingRequired: 0 checkPaddingRequired: 0
m_isRichText: 1 m_isRichText: 1
m_EmojiFallbackSupport: 1
m_parseCtrlCharacters: 1 m_parseCtrlCharacters: 1
m_isOrthographic: 1 m_isOrthographic: 1
m_isCullingEnabled: 0 m_isCullingEnabled: 0

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

@@ -38,7 +38,7 @@ public class Panel_AssemblyProduction : PanelBase
{ {
onOpen?.Invoke(); onOpen?.Invoke();
effect.gameObject.SetActive(true); effect.ActivePanel();
gameObject.SetActive(true); gameObject.SetActive(true);
gameObject.transform.SetAsLastSibling(); gameObject.transform.SetAsLastSibling();
@@ -49,7 +49,7 @@ public class Panel_AssemblyProduction : PanelBase
} }
public void Close() public void Close()
{ {
effect.gameObject.SetActive(false); effect.DeactivePanel();
gameObject.SetActive(false); gameObject.SetActive(false);
gameObject.transform.localScale = Vector3.zero; gameObject.transform.localScale = Vector3.zero;
ResetStatusContentOrder(); 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(); 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.SetActive(true);
gameObject.transform.SetAsLastSibling();
} }
public void DeactivePanel(GameObject panelObject) public void DeactivePanel()
{ {
if (activeCount > 0) gameObject.SetActive(false);
{
activePanel.Remove(panelObject);
activeCount--;
if (activeCount <= 0)
{
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(); onOpen?.Invoke();
effect.gameObject.SetActive(true); effect.ActivePanel();
gameObject.SetActive(true); gameObject.SetActive(true);
gameObject.transform.SetAsLastSibling(); gameObject.transform.SetAsLastSibling();
@@ -50,7 +50,7 @@ public class Panel_InjectionProduction : PanelBase
} }
public void Close() public void Close()
{ {
effect.gameObject.SetActive(false); effect.DeactivePanel();
gameObject.SetActive(false); gameObject.SetActive(false);
gameObject.transform.localScale = Vector3.zero; gameObject.transform.localScale = Vector3.zero;
ResetStatusContentOrder(); ResetStatusContentOrder();

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

@@ -78,7 +78,7 @@ namespace CHN
} }
public void Open() public void Open()
{ {
effect.transform.gameObject.SetActive(true); effect.ActivePanel();
gameObject.SetActive(true); gameObject.SetActive(true);
gameObject.transform.SetAsLastSibling(); gameObject.transform.SetAsLastSibling();
@@ -87,7 +87,7 @@ namespace CHN
} }
public void Close() public void Close()
{ {
effect.transform.gameObject.SetActive(false); effect.DeactivePanel();
ui_Calendar.SetActive(false); ui_Calendar.SetActive(false);
gameObject.SetActive(false); gameObject.SetActive(false);
gameObject.transform.localScale = Vector3.zero; 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(); onOpen?.Invoke();
effect.gameObject.SetActive(true); effect.ActivePanel();
gameObject.SetActive(true); gameObject.SetActive(true);
gameObject.transform.SetAsLastSibling(); gameObject.transform.SetAsLastSibling();
@@ -43,7 +43,7 @@ public class Panel_WorkProgressStatus : PanelBase
} }
public void Close() public void Close()
{ {
effect.gameObject.SetActive(false); effect.DeactivePanel();
gameObject.SetActive(false); gameObject.SetActive(false);
gameObject.transform.localScale = Vector3.zero; gameObject.transform.localScale = Vector3.zero;
} }

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

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

14
CompleteTimeAlarmInfo.json
View File

@@ -537,7 +537,7 @@
"worknm": "Injector No.16", "worknm": "Injector No.16",
"workseq": "1", "workseq": "1",
"status": "1", "status": "1",
"statusnm": "자석공급기 수리", "statusnm": "가동중",
"itemcd": "24298740", "itemcd": "24298740",
"itemdesc": "BAFFLE ASM-FRT DIFF CARR", "itemdesc": "BAFFLE ASM-FRT DIFF CARR",
"pjtcd": "GF9", "pjtcd": "GF9",
@@ -957,7 +957,7 @@
"worknm": "GF9 C/VB LINE", "worknm": "GF9 C/VB LINE",
"workseq": "1", "workseq": "1",
"status": "1", "status": "1",
"statusnm": "비가동", "statusnm": "가동중",
"itemcd": "24049859-GMA", "itemcd": "24049859-GMA",
"itemdesc": "COVER ASM-C/VLV BODY", "itemdesc": "COVER ASM-C/VLV BODY",
"pjtcd": "GF9", "pjtcd": "GF9",
@@ -1062,7 +1062,7 @@
"worknm": "SGE W/O LINE", "worknm": "SGE W/O LINE",
"workseq": "1", "workseq": "1",
"status": "1", "status": "1",
"statusnm": "비가동", "statusnm": "가동중",
"itemcd": "12707589-GMA", "itemcd": "12707589-GMA",
"itemdesc": "OUTLET ASM – WATER", "itemdesc": "OUTLET ASM – WATER",
"pjtcd": "SGE", "pjtcd": "SGE",
@@ -1097,7 +1097,7 @@
"worknm": "CSS W/O LINE", "worknm": "CSS W/O LINE",
"workseq": "1", "workseq": "1",
"status": "1", "status": "1",
"statusnm": "비가동", "statusnm": "가동중",
"itemcd": "55513502", "itemcd": "55513502",
"itemdesc": "OUTLET ASM-WAT", "itemdesc": "OUTLET ASM-WAT",
"pjtcd": "CSS PRIME", "pjtcd": "CSS PRIME",
@@ -1132,7 +1132,7 @@
"worknm": "U/SONIC WELD-1", "worknm": "U/SONIC WELD-1",
"workseq": "1", "workseq": "1",
"status": "1", "status": "1",
"statusnm": "비가동", "statusnm": "가동중",
"itemcd": "24051088-KOR", "itemcd": "24051088-KOR",
"itemdesc": "SCOOP ASM-DRV LINK LUB", "itemdesc": "SCOOP ASM-DRV LINK LUB",
"pjtcd": "GF6", "pjtcd": "GF6",
@@ -1167,7 +1167,7 @@
"worknm": "U/SONIC WELD-2", "worknm": "U/SONIC WELD-2",
"workseq": "1", "workseq": "1",
"status": "1", "status": "1",
"statusnm": "비가동", "statusnm": "가동중",
"itemcd": "24298736", "itemcd": "24298736",
"itemdesc": "SCOOP ASM-DRV LINK LUB", "itemdesc": "SCOOP ASM-DRV LINK LUB",
"pjtcd": "GF9", "pjtcd": "GF9",
@@ -1237,7 +1237,7 @@
"worknm": "INLET TUBE LINE", "worknm": "INLET TUBE LINE",
"workseq": "1", "workseq": "1",
"status": "1", "status": "1",
"statusnm": "비가동", "statusnm": "가동중",
"itemcd": "WP131-GE000", "itemcd": "WP131-GE000",
"itemdesc": "INLET-TUBE ASSY W/P", "itemdesc": "INLET-TUBE ASSY W/P",
"pjtcd": "GME T4", "pjtcd": "GME T4",