diff --git a/Assets/DownloadAssets/XRLib/Scripts/UVC/UI/Tooltip/TooltipManager.cs b/Assets/DownloadAssets/XRLib/Scripts/UVC/UI/Tooltip/TooltipManager.cs index e53a4c4..b11a243 100644 --- a/Assets/DownloadAssets/XRLib/Scripts/UVC/UI/Tooltip/TooltipManager.cs +++ b/Assets/DownloadAssets/XRLib/Scripts/UVC/UI/Tooltip/TooltipManager.cs @@ -1,4 +1,4 @@ -#nullable enable +#nullable enable using TMPro; using UnityEngine; using UVC.Locale; diff --git a/Assets/Prefabs/AlarmSituationPanel.prefab b/Assets/Prefabs/AlarmSituationPanel.prefab index d8ea135..15ef328 100644 --- a/Assets/Prefabs/AlarmSituationPanel.prefab +++ b/Assets/Prefabs/AlarmSituationPanel.prefab @@ -517,7 +517,7 @@ RectTransform: - {fileID: 432706113256493330} - {fileID: 2613339380134393319} - {fileID: 2407482232985194006} - - {fileID: 650564285845142412} + - {fileID: 1005227031394897658} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -579,7 +579,7 @@ MonoBehaviour: prefab_AlarmInfoItem: {fileID: 0} ScrollView_AlarmInfo: {fileID: 0} Button_Close: {fileID: 0} - Image_Loading: {fileID: 0} + Text_NoData: {fileID: 0} --- !u!1 &1477495468929598115 GameObject: m_ObjectHideFlags: 0 @@ -592,7 +592,7 @@ GameObject: - component: {fileID: 2307774147922189221} - component: {fileID: 5988359868572395285} m_Layer: 5 - m_Name: Text (TMP) + m_Name: Text_NoData m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -610,7 +610,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 650564285845142412} + m_Father: {fileID: 7134482037033010297} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -852,51 +852,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &2071222526074121697 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 650564285845142412} - - component: {fileID: 478747648270708515} - m_Layer: 5 - m_Name: Image_Loading - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &650564285845142412 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2071222526074121697} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1005227031394897658} - m_Father: {fileID: 7134482037033010297} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 150, y: 150} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &478747648270708515 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2071222526074121697} - m_CullTransparentMesh: 1 --- !u!1 &3007384031687735411 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/MachineDataDashboard.prefab b/Assets/Prefabs/MachineDataDashboard.prefab index 0494f9e..3eba756 100644 --- a/Assets/Prefabs/MachineDataDashboard.prefab +++ b/Assets/Prefabs/MachineDataDashboard.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 5775531211768934413} - component: {fileID: 6064004826805254172} m_Layer: 5 - m_Name: Text (TMP) + m_Name: Text_NoData m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -30,7 +30,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 3457626192114021926} + m_Father: {fileID: 649763957245921010} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -171,7 +171,7 @@ RectTransform: - {fileID: 8998135706102761377} - {fileID: 9164287553495830531} - {fileID: 3979721843840899526} - - {fileID: 3457626192114021926} + - {fileID: 5868165760219881389} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} @@ -232,7 +232,7 @@ MonoBehaviour: IgnoreSingleOpenMode: 0 Text_MachineName: {fileID: 0} ScrollView_DataInfo: {fileID: 0} - Image_Loading: {fileID: 0} + Text_NoData: {fileID: 0} Button_Close: {fileID: 0} dataInfoItem: {fileID: 0} --- !u!1 &3562892904752662974 @@ -587,51 +587,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_ShowMaskGraphic: 0 ---- !u!1 &3809832194661078945 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3457626192114021926} - - component: {fileID: 2227431182593987448} - m_Layer: 5 - m_Name: Image_Loading - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3457626192114021926 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3809832194661078945} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 5868165760219881389} - m_Father: {fileID: 649763957245921010} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 150, y: 150} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &2227431182593987448 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3809832194661078945} - m_CullTransparentMesh: 1 --- !u!1 &4469823903502144049 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/ProductionProgressPanel.prefab b/Assets/Prefabs/ProductionProgressPanel.prefab index b5e2811..a7c1c10 100644 --- a/Assets/Prefabs/ProductionProgressPanel.prefab +++ b/Assets/Prefabs/ProductionProgressPanel.prefab @@ -12,7 +12,7 @@ GameObject: - component: {fileID: 443077480831675098} - component: {fileID: 3911790451541062803} m_Layer: 5 - m_Name: Text (TMP) + m_Name: Text_NoData m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -30,11 +30,11 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7611321891187329983} + m_Father: {fileID: 4768901803580435810} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: -23} m_SizeDelta: {x: 80, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &443077480831675098 @@ -1375,7 +1375,7 @@ RectTransform: m_Children: - {fileID: 1805272058803996461} - {fileID: 2562795200311218999} - - {fileID: 7611321891187329983} + - {fileID: 3427980828599881770} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1435,7 +1435,7 @@ MonoBehaviour: m_EditorClassIdentifier: IgnoreSingleOpenMode: 0 Content: {fileID: 0} - Image_Loading: {fileID: 0} + Text_NoData: {fileID: 0} Button_Close: {fileID: 0} CurrentDate: {fileID: 0} CurrentTime: {fileID: 0} @@ -4268,51 +4268,6 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &8208049598378287109 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7611321891187329983} - - component: {fileID: 5508765933070459118} - m_Layer: 5 - m_Name: Image_Loading - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7611321891187329983 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8208049598378287109} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 3427980828599881770} - m_Father: {fileID: 4768901803580435810} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -23} - m_SizeDelta: {x: 150, y: 150} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5508765933070459118 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8208049598378287109} - m_CullTransparentMesh: 1 --- !u!1 &8244329713058987060 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 8e992f8..39855fb 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -497,9 +497,9 @@ MonoBehaviour: m_EditorClassIdentifier: isInit: 0 worldOffset: {x: 0, y: 1.5, z: 0} - verticalPadding: 0 - overlapThreshold: 2 - smoothSpeed: 50 + verticalPadding: 0.1 + overlapThreshold: 1.5 + smoothSpeed: 60 occlusionLayer: serializedVersion: 2 m_Bits: 0 @@ -1175,10 +1175,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::AZTECHWB.UI.LoadingPanel IgnoreSingleOpenMode: 0 - Loading: {fileID: 0} - Logo: {fileID: 0} - Slider_LoadingProgress: {fileID: 0} - Text_Loading: {fileID: 0} fadeOutDuration: 0.8 simulationDuration: 4 --- !u!1 &410087039 @@ -6617,14 +6613,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Assembly-CSharp::AZTECHWB.UI.LoginPanel IgnoreSingleOpenMode: 0 - Login: {fileID: 0} - LoginInfo: {fileID: 0} - InputField_ID: {fileID: 0} - InputField_Password: {fileID: 0} - Toggle_Show: {fileID: 0} - Button_Login: {fileID: 0} - LoginError: {fileID: 0} - Text_Error: {fileID: 0} fadeDuration: 0.8 errorFadeDuration: 0.25 errorShowTime: 2 @@ -9562,8 +9550,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: standardButtonPrefab: {fileID: 9218577172950644075, guid: 6ddcf28d4dbbab846af10da00d6a25e8, type: 3} - camerastandardButtonPrefab: {fileID: 0} - cameraradioButtonPrefab: {fileID: 0} + camerastandardButtonPrefab: {fileID: 8606839082655664627, guid: ed4110dfeb5461f44a24befee3db1962, type: 3} + cameraradioButtonPrefab: {fileID: 102347781932044735, guid: da7128a10cb5511459faeb6e69d2593f, type: 3} toggleButtonPrefab: {fileID: 8606839082655664627, guid: ef3f8393f35c1724ab83be37f239fe56, type: 3} radioButtonPrefab: {fileID: 8606839082655664627, guid: 360200709f71d71409ed45c4389a07b8, type: 3} expandableButtonPrefab: {fileID: 9218577172950644075, guid: b4b8fd38475f2a149a9a3f54ee662445, type: 3} diff --git a/Assets/Scripts/UI/AISimulationInfo/AISimulationInfoPanel.cs b/Assets/Scripts/UI/AISimulationInfo/AISimulationInfoPanel.cs index 5a7064f..b19b7f2 100644 --- a/Assets/Scripts/UI/AISimulationInfo/AISimulationInfoPanel.cs +++ b/Assets/Scripts/UI/AISimulationInfo/AISimulationInfoPanel.cs @@ -9,11 +9,11 @@ namespace AZTECHWB.UI { public class AISimulationInfoPanel : UIPanel { - public ScrollRect ScrollView_DataInfo; - public Button Button_Close; + private ScrollRect ScrollView_DataInfo; + private Button Button_Close; - public SimulationInfoItem prf_SimulationInfoItem; - Dictionary itemMap = new Dictionary(); + private SimulationInfoItem prf_SimulationInfoItem; + private Dictionary itemMap = new Dictionary(); public override async UniTask Init() { @@ -36,12 +36,12 @@ namespace AZTECHWB.UI { var uiData = ToUIData(data); - // 1. ׸ Ʈ or + // 1. ���� �׸� ������Ʈ or ���� foreach (var kv in uiData) { if (!itemMap.TryGetValue(kv.Key, out var item)) { - // + // ������ ���� ���� item = Instantiate(prf_SimulationInfoItem, ScrollView_DataInfo.content); item.Init(); itemMap[kv.Key] = item; @@ -51,7 +51,7 @@ namespace AZTECHWB.UI item.gameObject.SetActive(true); } - // 2. ̻ ׸ + // 2. �� �̻� �� ���� �׸� ���� foreach (var kv in itemMap) { if (!uiData.ContainsKey(kv.Key)) @@ -65,16 +65,16 @@ namespace AZTECHWB.UI { var dict = new Dictionary(); - dict[""] = e.equipmentName; - dict[""] = e.processType; - dict[""] = e.overallStatus; - dict["ǰ"] = e.healthScore.ToString("0.0"); + dict["설비명"] = e.equipmentName; + dict["공정"] = e.processType; + dict["상태"] = e.overallStatus; + dict["건강도"] = e.healthScore.ToString("0.0"); if (e.prediction != null) { - dict[" Ȯ"] = (e.prediction.failureProbability * 100f).ToString("0") + "%"; - dict[" "] = e.prediction.estimatedFailureDate; - dict[" ġ"] = e.prediction.recommendedAction; + dict["고장 확률"] = (e.prediction.failureProbability * 100f).ToString("0") + "%"; + dict["예상 고장일"] = e.prediction.estimatedFailureDate; + dict["권장 조치"] = e.prediction.recommendedAction; } return dict; diff --git a/Assets/Scripts/UI/AISimulationInfo/SimulationInfoItem.cs b/Assets/Scripts/UI/AISimulationInfo/SimulationInfoItem.cs index 8e424e5..88bb22d 100644 --- a/Assets/Scripts/UI/AISimulationInfo/SimulationInfoItem.cs +++ b/Assets/Scripts/UI/AISimulationInfo/SimulationInfoItem.cs @@ -6,8 +6,8 @@ namespace AZTECHWB.UI { public class SimulationInfoItem : MonoBehaviour { - public TextMeshProUGUI InfoName; - public TextMeshProUGUI Data; + private TextMeshProUGUI InfoName; + private TextMeshProUGUI Data; public void Init() { diff --git a/Assets/Scripts/UI/AlarmSituation/AlarmInfoItem.cs b/Assets/Scripts/UI/AlarmSituation/AlarmInfoItem.cs index b4a3d06..07febcf 100644 --- a/Assets/Scripts/UI/AlarmSituation/AlarmInfoItem.cs +++ b/Assets/Scripts/UI/AlarmSituation/AlarmInfoItem.cs @@ -9,24 +9,20 @@ namespace AZTECHWB.UI { public enum MachineStatusnm { - , - 񰡵, - ȹ + 가동중, + 비가동, + 계획정지 } public class AlarmInfoItem : MonoBehaviour { - public Button button; + private Button button; public CompleteInfo completeInfo; - public TextMeshProUGUI Worknm; - public TextMeshProUGUI Progressrate; - public TextMeshProUGUI Ptotm; - public TextMeshProUGUI Statusnm; - - public float fontSize; - public float blankSize; + private TextMeshProUGUI Worknm; + private TextMeshProUGUI Progressrate; + private TextMeshProUGUI Ptotm; + private TextMeshProUGUI Statusnm; private string statusnm; - public bool isCheck; public Action onClickAlarm; public void Init() @@ -67,11 +63,11 @@ namespace AZTECHWB.UI var newColor = new Color(); switch (stat) { - case "": + case "가동중": ColorUtility.TryParseHtmlString("#00C314", out newColor); Statusnm.color = newColor; break; - case "񰡵": + case "비가동": Statusnm.color = Color.gray; break; default: @@ -91,7 +87,6 @@ namespace AZTECHWB.UI public void OnClickAlarm() { - isCheck = true; onClickAlarm?.Invoke(this); } } diff --git a/Assets/Scripts/UI/AlarmSituation/AlarmSituationPanel.cs b/Assets/Scripts/UI/AlarmSituation/AlarmSituationPanel.cs index 8df8477..8e7515c 100644 --- a/Assets/Scripts/UI/AlarmSituation/AlarmSituationPanel.cs +++ b/Assets/Scripts/UI/AlarmSituation/AlarmSituationPanel.cs @@ -5,6 +5,7 @@ using AZTECHWB.Management; using Cysharp.Threading.Tasks; using System.Collections.Generic; using System.Linq; +using TMPro; using UnityEngine; using UnityEngine.UI; @@ -12,31 +13,31 @@ namespace AZTECHWB.UI { public class AlarmSituationPanel : UIPanel { - public AlarmInfoItem prefab_AlarmInfoItem; - public ScrollRect ScrollView_AlarmInfo; - public Button Button_Close; - public RectTransform Image_Loading; + private AlarmInfoItem prefab_AlarmInfoItem; + private ScrollRect ScrollView_AlarmInfo; + private Button Button_Close; + private TextMeshProUGUI Text_NoData; - public Dictionary completeInfoList = new(); + private Dictionary completeInfoList = new(); public override async UniTask Init() { ScrollView_AlarmInfo = GetElement(nameof(ScrollView_AlarmInfo)); Button_Close = GetElement