diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index aa7b8053..542978b9 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -118810,7 +118810,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: DateTime: {fileID: 0} - offset: {x: 75, y: 480, z: 0} + offset: {x: -800, y: 62.5, z: 0} --- !u!1001 &334897234 PrefabInstance: m_ObjectHideFlags: 0 @@ -400266,50 +400266,6 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1324788322} m_PrefabAsset: {fileID: 0} ---- !u!1 &1418265911 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1418265913} - - component: {fileID: 1418265912} - m_Layer: 0 - m_Name: GameObject - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1418265912 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1418265911} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 88590da1ce6ef634888523925f8df0d4, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!4 &1418265913 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1418265911} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 986.8524, y: 506.1394, z: 221.95264} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1419480565 stripped Transform: m_CorrespondingSourceObject: {fileID: 3571782791591332055, guid: b6fb23e8e8140a74ea7cd160312cd108, @@ -471995,6 +471951,56 @@ PrefabInstance: propertyPath: m_Name value: Panel_ProductionStatus objectReference: {fileID: 0} + - target: {fileID: 1435541941998932536, guid: a74d4a3b763fd8d438c7fff5d89e9430, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 191.79997 + objectReference: {fileID: 0} + - target: {fileID: 1435541941998932536, guid: a74d4a3b763fd8d438c7fff5d89e9430, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20.22 + objectReference: {fileID: 0} + - target: {fileID: 2408036382282586975, guid: a74d4a3b763fd8d438c7fff5d89e9430, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 258.9 + objectReference: {fileID: 0} + - target: {fileID: 3668839221185386805, guid: a74d4a3b763fd8d438c7fff5d89e9430, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 320.9 + objectReference: {fileID: 0} + - target: {fileID: 3717066469867246182, guid: a74d4a3b763fd8d438c7fff5d89e9430, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 258.9 + objectReference: {fileID: 0} + - target: {fileID: 4401755688143459991, guid: a74d4a3b763fd8d438c7fff5d89e9430, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 378.19998 + objectReference: {fileID: 0} + - target: {fileID: 4507512029217021393, guid: a74d4a3b763fd8d438c7fff5d89e9430, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 378.2 + objectReference: {fileID: 0} + - target: {fileID: 5371854086866631428, guid: a74d4a3b763fd8d438c7fff5d89e9430, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 320.90002 + objectReference: {fileID: 0} + - target: {fileID: 5371854086866631428, guid: a74d4a3b763fd8d438c7fff5d89e9430, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20 + objectReference: {fileID: 0} + - target: {fileID: 5897577489099265493, guid: a74d4a3b763fd8d438c7fff5d89e9430, + type: 3} + propertyPath: m_SizeDelta.x + value: 145 + objectReference: {fileID: 0} - target: {fileID: 6053503471138626323, guid: a74d4a3b763fd8d438c7fff5d89e9430, type: 3} propertyPath: m_Pivot.x @@ -472095,6 +472101,26 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6635278265734175485, guid: a74d4a3b763fd8d438c7fff5d89e9430, + type: 3} + propertyPath: m_HorizontalAlignment + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8636739591009126030, guid: a74d4a3b763fd8d438c7fff5d89e9430, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 191.8 + objectReference: {fileID: 0} + - target: {fileID: 9141052772512173166, guid: a74d4a3b763fd8d438c7fff5d89e9430, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 86.39998 + objectReference: {fileID: 0} + - target: {fileID: 9141052772512173166, guid: a74d4a3b763fd8d438c7fff5d89e9430, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -20.220007 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -584543,7 +584569,6 @@ RectTransform: - {fileID: 906202995} - {fileID: 1073553747} - {fileID: 1675592997} - - {fileID: 3812485136228864713} - {fileID: 9086045479656650114} - {fileID: 362821157} - {fileID: 4492099379336218985} @@ -586425,14 +586450,6 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!222 &2594678627541977666 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4402694973255879613} - m_CullTransparentMesh: 1 --- !u!224 &2631720625424714690 RectTransform: m_ObjectHideFlags: 0 @@ -587771,25 +587788,6 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1e2f1310fcc725c4a82bd8a7a783ca22, type: 3} ---- !u!224 &3812485136228864713 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4402694973255879613} - 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: [] - m_Father: {fileID: 883006602906283311} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -257, y: -209.5} - m_SizeDelta: {x: 30, y: 30} - m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3826414752785986138 GameObject: m_ObjectHideFlags: 0 @@ -588261,25 +588259,6 @@ MonoBehaviour: currentDashBoard: {fileID: 0} panel_controlsetting: {fileID: 0} panel_protocolsetting: {fileID: 0} ---- !u!1 &4402694973255879613 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3812485136228864713} - - component: {fileID: 2594678627541977666} - - component: {fileID: 8657390523414286322} - - component: {fileID: 4459059910041873106} - m_Layer: 5 - m_Name: Button_Close - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 --- !u!222 &4406714311642689378 CanvasRenderer: m_ObjectHideFlags: 0 @@ -588307,50 +588286,6 @@ RectTransform: m_AnchoredPosition: {x: 140.7, y: -30} m_SizeDelta: {x: 229, y: 35} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &4459059910041873106 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4402694973255879613} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 8657390523414286322} - m_OnClick: - m_PersistentCalls: - m_Calls: [] --- !u!114 &4463671167146227416 MonoBehaviour: m_ObjectHideFlags: 0 @@ -592037,36 +591972,6 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!114 &8657390523414286322 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4402694973255879613} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6eee3213fcc9fd046a54e9ea9cd91fa1, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 --- !u!224 &8770565484153132845 RectTransform: m_ObjectHideFlags: 0 @@ -592611,4 +592516,3 @@ SceneRoots: - {fileID: 675490998} - {fileID: 1842453405} - {fileID: 2133105010} - - {fileID: 1418265913} diff --git a/Assets/Scripts/UI/Panel_CompleteAlramHistory.cs b/Assets/Scripts/UI/Panel_CompleteAlramHistory.cs index 6611fc59..0d60d8f6 100644 --- a/Assets/Scripts/UI/Panel_CompleteAlramHistory.cs +++ b/Assets/Scripts/UI/Panel_CompleteAlramHistory.cs @@ -33,10 +33,12 @@ namespace CHN SetActive(false); } + public void OnEnable() + { + onOpen?.Invoke(); + } public void Open() { - Debug.Log(""); - onOpen?.Invoke(); onDashobardOpen?.Invoke("Ϸ ð ˶"); } public void Close() diff --git a/Assets/Scripts/UI/Panel_Library.cs b/Assets/Scripts/UI/Panel_Library.cs index 9297eb71..dea111cb 100644 --- a/Assets/Scripts/UI/Panel_Library.cs +++ b/Assets/Scripts/UI/Panel_Library.cs @@ -38,10 +38,9 @@ namespace CHN { prf_LibraryButton = Resources.Load("Prefabs/UI/PRF_UI_LibraryButton"); prf_FilterToggle = Resources.Load("Prefabs/UI/PRF_UI_FilterButton"); - originPos = rectTransform.position; - SetPanelPosition(); - gameObject.SetActive(false); + originPos = rectTransform.position; + downPos = new Vector3(originPos.x, originPos.y - rectTransform.rect.height, originPos.z); } public void UpdateFileterList(string[] filters) @@ -57,6 +56,7 @@ namespace CHN { CreateFilterToggle(filters[i]); } + OnClickLabelButton(this.filters[0]); } UI_FilterButton CreateFilterToggle(string label) @@ -80,20 +80,16 @@ namespace CHN onClickLabelButton?.Invoke(pre_labelButton.label); } - private void OnEnable() + public void Open() { - if (filters.Count > 0) - { - OnClickLabelButton(filters[0]); - - StopAllCoroutines(); - StartCoroutine(MoveUpAnimation()); - } + StopAllCoroutines(); + StartCoroutine(MoveAnimation(originPos)); } - private void OnDisable() + public void Close() { onClose?.Invoke(); - SetPanelPosition(); + StopAllCoroutines(); + StartCoroutine(MoveAnimation(downPos)); } public void AddLibrarayButtons(HashSet machines) @@ -122,12 +118,7 @@ namespace CHN onClickLibraryButton?.Invoke(pre_libraryButton); } - private void SetPanelPosition() - { - downPos = new Vector3(originPos.x, originPos.y - rectTransform.rect.height, originPos.z); - rectTransform.position = downPos; - } - IEnumerator MoveUpAnimation() + IEnumerator MoveAnimation(Vector3 targetPos) { float timer = 0f; float percent = 0f; @@ -136,7 +127,7 @@ namespace CHN { timer += Time.deltaTime; percent = timer / fadeTime; - rectTransform.position = Vector3.Lerp(rectTransform.position, originPos, percent); + rectTransform.position = Vector3.Lerp(rectTransform.position, targetPos, percent); yield return null; } diff --git a/Assets/WorkSpace/Personal/JYM/Panel_DashBoard.cs b/Assets/WorkSpace/Personal/JYM/Panel_DashBoard.cs index ef1ac810..0cfc4acf 100644 --- a/Assets/WorkSpace/Personal/JYM/Panel_DashBoard.cs +++ b/Assets/WorkSpace/Personal/JYM/Panel_DashBoard.cs @@ -21,8 +21,8 @@ namespace CHN workConditionAnalysis = FindSingle(); workTimeAnalysis = FindSingle(); - PlayerPrefs.SetInt("isCompleteAlramHistory", 0); - PlayerPrefs.SetInt("isLibrary", 0); + PlayerPrefs.SetInt("isCompleteAlramHistory", 1); + PlayerPrefs.SetInt("isLibrary", 1); PlayerPrefs.SetInt("isWorkConditionAnalysis", 0); PlayerPrefs.SetInt("isWorkTimeAnalysis", 0); diff --git a/Assets/WorkSpace/Personal/JYM/UI_BarChartData.cs b/Assets/WorkSpace/Personal/JYM/UI_BarChartData.cs index 0359e833..e8485730 100644 --- a/Assets/WorkSpace/Personal/JYM/UI_BarChartData.cs +++ b/Assets/WorkSpace/Personal/JYM/UI_BarChartData.cs @@ -46,7 +46,7 @@ public class UI_BarChartData : UIBase float clampedX = Mathf.Clamp(topPosition.x + offset.x, -parentSize.x / 2 + uiSize.x / 2, parentSize.x / 2 - uiSize.x / 2); - rectTransform.position = new Vector2(clampedX + offset.x, offset.y); + rectTransform.localPosition = new Vector2(clampedX, offset.y); gameObject.SetActive(true); } } diff --git a/Assets/WorkSpace/Personal/JYM/UI_DashboardCheckListItem.cs b/Assets/WorkSpace/Personal/JYM/UI_DashboardCheckListItem.cs index 6eb07f2e..e4d00b6c 100644 --- a/Assets/WorkSpace/Personal/JYM/UI_DashboardCheckListItem.cs +++ b/Assets/WorkSpace/Personal/JYM/UI_DashboardCheckListItem.cs @@ -25,7 +25,12 @@ namespace CHN var isBool = PlayerPrefs.GetInt(type) == 0 ? false : true; toggle.isOn = isBool; - dashboardItem.gameObject.SetActive(isBool); + + if(type != "isLibrary") + { + dashboardItem.gameObject.SetActive(isBool); + } + toggle.onValueChanged.AddListener(OnValueChange); //LocaleService.Instance.OnChanged += OnChangeText; } @@ -62,7 +67,23 @@ namespace CHN PlayerPrefs.SetInt(type, isOn ? 1 : 0); PlayerPrefs.Save(); - dashboardItem.gameObject.SetActive(isOn); + if (type != "isLibrary") + { + dashboardItem.gameObject.SetActive(isOn); + } + else + { + var library = dashboardItem.gameObject.GetComponent(); + + if (isOn) + { + library.Open(); + } + else + { + library.Close(); + } + } } private string Type() diff --git a/CompleteTimeAlarmInfo.json b/CompleteTimeAlarmInfo.json index bed629dd..2996a0eb 100644 --- a/CompleteTimeAlarmInfo.json +++ b/CompleteTimeAlarmInfo.json @@ -607,7 +607,7 @@ "worknm": "Injector No.19", "workseq": "1", "status": "1", - "statusnm": "비가동", + "statusnm": "가동중", "itemcd": "24048103", "itemdesc": "COVER - TRANS CONV", "pjtcd": "9BQX", @@ -625,7 +625,7 @@ "sttm": "0900", "totm": "", "goaltime": "1440", - "ptotm": "2025-03-21 09:38:05", + "ptotm": "2025-03-20 23:52:14", "psttm": "2025-03-17 09:00:40" }, "isCheck": false @@ -1465,7 +1465,7 @@ "sttm": "0759", "totm": "", "goaltime": "426", - "ptotm": "2025-03-20 11:41:31", + "ptotm": "2025-03-20 17:40:09", "psttm": "2025-03-17 07:59:08" }, "isCheck": false @@ -1622,7 +1622,7 @@ "worknm": "Injector No.16", "workseq": "1", "status": "1", - "statusnm": "가동중", + "statusnm": "비가동", "itemcd": "24298739", "itemdesc": "BAFFLE ASM-FRT DIFF CARR", "pjtcd": "GF9",