From 3b03b7d7e00bf1d969e0843a991230b829a4d2eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=98=81=EB=AF=BC?= <117150306+jym04@users.noreply.github.com> Date: Mon, 7 Apr 2025 15:19:27 +0900 Subject: [PATCH] =?UTF-8?q?=EC=84=A4=EB=B9=84=20=EB=8C=80=EC=8B=9C=20?= =?UTF-8?q?=EB=B3=B4=EB=93=9C=20UI=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UI/PRF_Panel_MachineDashBoard.prefab | 12 +++-- Assets/Scripts/UI/Panel_AssemblyProduction.cs | 4 +- Assets/Scripts/UI/Panel_Effect.cs | 47 +++++++++++-------- .../Scripts/UI/Panel_InjectionProduction.cs | 4 +- .../Scripts/UI/Panel_WorkConditionAnalysis.cs | 4 +- Assets/Scripts/UI/Panel_WorkProgressStatus.cs | 4 +- Assets/Scripts/UI/Panel_WorkTimeAnalysis.cs | 4 +- CompleteTimeAlarmInfo.json | 14 +++--- 8 files changed, 53 insertions(+), 40 deletions(-) diff --git a/Assets/Resources/Prefabs/UI/PRF_Panel_MachineDashBoard.prefab b/Assets/Resources/Prefabs/UI/PRF_Panel_MachineDashBoard.prefab index 6c460aed..39a0627f 100644 --- a/Assets/Resources/Prefabs/UI/PRF_Panel_MachineDashBoard.prefab +++ b/Assets/Resources/Prefabs/UI/PRF_Panel_MachineDashBoard.prefab @@ -109,15 +109,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 @@ -594,7 +596,7 @@ MonoBehaviour: m_Elasticity: 0.1 m_Inertia: 1 m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 + m_ScrollSensitivity: 15 m_Viewport: {fileID: 3336037648759467369} m_HorizontalScrollbar: {fileID: 0} m_VerticalScrollbar: {fileID: 0} @@ -1412,7 +1414,7 @@ MonoBehaviour: m_Elasticity: 0.1 m_Inertia: 1 m_DecelerationRate: 0.135 - m_ScrollSensitivity: 1 + m_ScrollSensitivity: 15 m_Viewport: {fileID: 2588290889824960605} m_HorizontalScrollbar: {fileID: 0} m_VerticalScrollbar: {fileID: 0} @@ -1771,15 +1773,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 + m_TextWrappingMode: 1 m_wordWrappingRatios: 0.4 m_overflowMode: 0 m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 + m_EmojiFallbackSupport: 1 m_parseCtrlCharacters: 1 m_isOrthographic: 1 m_isCullingEnabled: 0 diff --git a/Assets/Scripts/UI/Panel_AssemblyProduction.cs b/Assets/Scripts/UI/Panel_AssemblyProduction.cs index 0b5c3a37..c332ab77 100644 --- a/Assets/Scripts/UI/Panel_AssemblyProduction.cs +++ b/Assets/Scripts/UI/Panel_AssemblyProduction.cs @@ -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(); diff --git a/Assets/Scripts/UI/Panel_Effect.cs b/Assets/Scripts/UI/Panel_Effect.cs index ef2b3b5e..787b7230 100644 --- a/Assets/Scripts/UI/Panel_Effect.cs +++ b/Assets/Scripts/UI/Panel_Effect.cs @@ -9,28 +9,37 @@ public class Panel_Effect : MonoBehaviour, ISingle private List 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); + // } + // } + //} } diff --git a/Assets/Scripts/UI/Panel_InjectionProduction.cs b/Assets/Scripts/UI/Panel_InjectionProduction.cs index ba7baa0b..688e1b76 100644 --- a/Assets/Scripts/UI/Panel_InjectionProduction.cs +++ b/Assets/Scripts/UI/Panel_InjectionProduction.cs @@ -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(); diff --git a/Assets/Scripts/UI/Panel_WorkConditionAnalysis.cs b/Assets/Scripts/UI/Panel_WorkConditionAnalysis.cs index 46eff16d..375dbd56 100644 --- a/Assets/Scripts/UI/Panel_WorkConditionAnalysis.cs +++ b/Assets/Scripts/UI/Panel_WorkConditionAnalysis.cs @@ -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; diff --git a/Assets/Scripts/UI/Panel_WorkProgressStatus.cs b/Assets/Scripts/UI/Panel_WorkProgressStatus.cs index 1fa5e896..2af8a2eb 100644 --- a/Assets/Scripts/UI/Panel_WorkProgressStatus.cs +++ b/Assets/Scripts/UI/Panel_WorkProgressStatus.cs @@ -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; } diff --git a/Assets/Scripts/UI/Panel_WorkTimeAnalysis.cs b/Assets/Scripts/UI/Panel_WorkTimeAnalysis.cs index 1cc37620..5c0b753a 100644 --- a/Assets/Scripts/UI/Panel_WorkTimeAnalysis.cs +++ b/Assets/Scripts/UI/Panel_WorkTimeAnalysis.cs @@ -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; diff --git a/CompleteTimeAlarmInfo.json b/CompleteTimeAlarmInfo.json index af6b3f73..e0bae091 100644 --- a/CompleteTimeAlarmInfo.json +++ b/CompleteTimeAlarmInfo.json @@ -537,7 +537,7 @@ "worknm": "Injector No.16", "workseq": "1", "status": "1", - "statusnm": "자석공급기 수리", + "statusnm": "가동중", "itemcd": "24298740", "itemdesc": "BAFFLE ASM-FRT DIFF CARR", "pjtcd": "GF9", @@ -957,7 +957,7 @@ "worknm": "GF9 C/VB LINE", "workseq": "1", "status": "1", - "statusnm": "비가동", + "statusnm": "가동중", "itemcd": "24049859-GMA", "itemdesc": "COVER ASM-C/VLV BODY", "pjtcd": "GF9", @@ -1062,7 +1062,7 @@ "worknm": "SGE W/O LINE", "workseq": "1", "status": "1", - "statusnm": "비가동", + "statusnm": "가동중", "itemcd": "12707589-GMA", "itemdesc": "OUTLET ASM – WATER", "pjtcd": "SGE", @@ -1097,7 +1097,7 @@ "worknm": "CSS W/O LINE", "workseq": "1", "status": "1", - "statusnm": "비가동", + "statusnm": "가동중", "itemcd": "55513502", "itemdesc": "OUTLET ASM-WAT", "pjtcd": "CSS PRIME", @@ -1132,7 +1132,7 @@ "worknm": "U/SONIC WELD-1", "workseq": "1", "status": "1", - "statusnm": "비가동", + "statusnm": "가동중", "itemcd": "24051088-KOR", "itemdesc": "SCOOP ASM-DRV LINK LUB", "pjtcd": "GF6", @@ -1167,7 +1167,7 @@ "worknm": "U/SONIC WELD-2", "workseq": "1", "status": "1", - "statusnm": "비가동", + "statusnm": "가동중", "itemcd": "24298736", "itemdesc": "SCOOP ASM-DRV LINK LUB", "pjtcd": "GF9", @@ -1237,7 +1237,7 @@ "worknm": "INLET TUBE LINE", "workseq": "1", "status": "1", - "statusnm": "비가동", + "statusnm": "가동중", "itemcd": "WP131-GE000", "itemdesc": "INLET-TUBE ASSY W/P", "pjtcd": "GME T4",