From 3b5761d708c491152a738157a993ba4965335e3d 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: Fri, 24 Oct 2025 16:11:28 +0900 Subject: [PATCH] =?UTF-8?q?=EB=B2=A0=ED=8A=B8=EB=82=A8=20=EA=B0=80?= =?UTF-8?q?=EC=83=81=20=EA=B3=B5=EC=9E=A5=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?= =?UTF-8?q?=EC=97=B0=EB=8F=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../GenericController/GenericController.cs | 13 +- .../Panel/Panel_MachineDataDashBoard.prefab | 6 +- .../Panel/Panel_MachineDetailDashboard.prefab | 49 +- .../Prefabs/UI/Panel/Panel_TopToolBar.prefab | 88 +- Assets/Resources/DataOrder.json | 9 +- Assets/Resources/Korea_MachineData.json | 1172 ----------------- Assets/Resources/Korea_MachineData.json.meta | 7 - Assets/Resources/Korea_WorkShopData.json | 57 - Assets/Resources/Korea_WorkShopData.json.meta | 7 - .../Prefabs/UI/PRF_UI_AlramInfoItem.prefab | 4 +- .../UI/PRF_UI_MachineEffectivenessItem.prefab | 6 +- Assets/Resources/Vietnam_MachineData.json | 392 ------ .../Resources/Vietnam_MachineData.json.meta | 7 - Assets/Resources/Vietnam_WorkShopData.json | 57 - .../Resources/Vietnam_WorkShopData.json.meta | 7 - Assets/Scenes/Korea_Branch.unity | 219 ++- Assets/Scenes/Vietnam_Branch.unity | 80 +- Assets/Scripts/Branch/Machine.cs | 2 +- Assets/Scripts/Branch/Manager/AlarmManager.cs | 2 +- Assets/Scripts/Branch/Manager/DataManager.cs | 28 +- .../Scripts/Branch/Manager/LibraryManager.cs | 2 +- .../Manager/MachineStatusIconManager.cs | 10 +- Assets/Scripts/Branch/TourController.cs | 12 +- Assets/Scripts/Branch/UI/Panel_Library.cs | 10 +- .../Branch/UI/Panel_MachineDataDashboard.cs | 5 +- .../Branch/UI/Panel_MachineDetailDashboard.cs | 4 +- .../Branch/UI/Panel_ProductionProgress.cs | 3 +- Assets/Scripts/Branch/UI/Panel_TopToolBar.cs | 6 +- .../Scripts/Branch/UI/Panel_TotalProgress.cs | 3 +- Assets/Scripts/Branch/UI/UI_LibraryButton.cs | 8 +- Packages/manifest.json | 1 + Packages/packages-lock.json | 28 +- Vietnam_MachineStandardInfo.csv | 15 +- 33 files changed, 442 insertions(+), 1877 deletions(-) delete mode 100644 Assets/Resources/Korea_MachineData.json delete mode 100644 Assets/Resources/Korea_MachineData.json.meta delete mode 100644 Assets/Resources/Korea_WorkShopData.json delete mode 100644 Assets/Resources/Korea_WorkShopData.json.meta delete mode 100644 Assets/Resources/Vietnam_MachineData.json delete mode 100644 Assets/Resources/Vietnam_MachineData.json.meta delete mode 100644 Assets/Resources/Vietnam_WorkShopData.json delete mode 100644 Assets/Resources/Vietnam_WorkShopData.json.meta diff --git a/Assets/Plugins/GenericController/GenericController.cs b/Assets/Plugins/GenericController/GenericController.cs index 85877b6..e2eba9c 100644 --- a/Assets/Plugins/GenericController/GenericController.cs +++ b/Assets/Plugins/GenericController/GenericController.cs @@ -75,22 +75,23 @@ namespace WI } } } + private PointerEventData pointerData; + private readonly List raycastResults = new List(); + bool IsPointerOverExcludedUI() { - PointerEventData pointerData = new PointerEventData(EventSystem.current); - pointerData.position = Input.mousePosition; + if (pointerData == null) + pointerData = new PointerEventData(EventSystem.current); - List raycastResults = new List(); + pointerData.position = Input.mousePosition; + raycastResults.Clear(); EventSystem.current.RaycastAll(pointerData, raycastResults); if (raycastResults.Count > 0) { if ((LayerMask.GetMask("Default") & (1 << raycastResults[0].gameObject.layer)) != 0) - { return true; - } } - return false; } bool isPressed; diff --git a/Assets/Prefabs/UI/Panel/Panel_MachineDataDashBoard.prefab b/Assets/Prefabs/UI/Panel/Panel_MachineDataDashBoard.prefab index 4ccde47..9a81fad 100644 --- a/Assets/Prefabs/UI/Panel/Panel_MachineDataDashBoard.prefab +++ b/Assets/Prefabs/UI/Panel/Panel_MachineDataDashBoard.prefab @@ -269,8 +269,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 80, y: 0} - m_SizeDelta: {x: 160, y: 24} + m_AnchoredPosition: {x: 160, y: 0} + m_SizeDelta: {x: 320, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5476029036916847773 CanvasRenderer: @@ -300,7 +300,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 27-SUMITOMO + m_text: "WC-A-Injection Line M\xE1y 26" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 060de5c27554e5b4aae66d9c0f6127ef, type: 2} m_sharedMaterial: {fileID: 5044220275478796424, guid: 060de5c27554e5b4aae66d9c0f6127ef, type: 2} diff --git a/Assets/Prefabs/UI/Panel/Panel_MachineDetailDashboard.prefab b/Assets/Prefabs/UI/Panel/Panel_MachineDetailDashboard.prefab index 24a2d7e..fd07fca 100644 --- a/Assets/Prefabs/UI/Panel/Panel_MachineDetailDashboard.prefab +++ b/Assets/Prefabs/UI/Panel/Panel_MachineDetailDashboard.prefab @@ -2681,13 +2681,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 702990186630610785} + m_Father: {fileID: 4499474996380627187} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 185.5, y: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 9, y: 0} m_SizeDelta: {x: 1, y: 17} - m_Pivot: {x: 0.5, y: 0.5} + m_Pivot: {x: 1, y: 0.5} --- !u!222 &7968028175655238632 CanvasRenderer: m_ObjectHideFlags: 0 @@ -5352,11 +5352,11 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 8240033759668096344} - m_Father: {fileID: 702990186630610785} + m_Father: {fileID: 4499474996380627187} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 274, y: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: 102, y: 0} m_SizeDelta: {x: 166, y: 26} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5667552394888479114 @@ -6509,6 +6509,7 @@ GameObject: - component: {fileID: 4499474996380627187} - component: {fileID: 827514413101487831} - component: {fileID: 6624425143505080183} + - component: {fileID: 2085898014873577430} m_Layer: 5 m_Name: MachineName m_TagString: Untagged @@ -6527,14 +6528,16 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 3277761151369573359} + - {fileID: 1928270042727039419} m_Father: {fileID: 702990186630610785} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 95, y: 0} - m_SizeDelta: {x: 180, y: 31} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: -174.29, y: -15.5} + m_SizeDelta: {x: 0, y: 31} + m_Pivot: {x: -1, y: 0.5} --- !u!222 &827514413101487831 CanvasRenderer: m_ObjectHideFlags: 0 @@ -6634,6 +6637,20 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!114 &2085898014873577430 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3897808398365490524} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 --- !u!1 &3922712613824946982 GameObject: m_ObjectHideFlags: 0 @@ -15019,8 +15036,6 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4499474996380627187} - - {fileID: 3277761151369573359} - - {fileID: 1928270042727039419} - {fileID: 1946316325074033824} m_Father: {fileID: 2284100289011031509} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Prefabs/UI/Panel/Panel_TopToolBar.prefab b/Assets/Prefabs/UI/Panel/Panel_TopToolBar.prefab index 0245dd9..bcd0656 100644 --- a/Assets/Prefabs/UI/Panel/Panel_TopToolBar.prefab +++ b/Assets/Prefabs/UI/Panel/Panel_TopToolBar.prefab @@ -540,8 +540,11 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3857981739799530632} + - component: {fileID: 4558442331967383770} + - component: {fileID: 5733650221678073429} + - component: {fileID: 3468925900198208860} m_Layer: 5 - m_Name: Image_Logo + m_Name: Button_Logo m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -567,6 +570,88 @@ RectTransform: m_AnchoredPosition: {x: 73.5, y: -30} m_SizeDelta: {x: 87, y: 43} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &4558442331967383770 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 770147333485230683} + 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: 0} + 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!222 &5733650221678073429 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 770147333485230683} + m_CullTransparentMesh: 1 +--- !u!114 &3468925900198208860 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 770147333485230683} + 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: 0} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 0} + 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: 4558442331967383770} + m_OnClick: + m_PersistentCalls: + m_Calls: [] --- !u!1 &794715074720092388 GameObject: m_ObjectHideFlags: 0 @@ -3929,6 +4014,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f9d3df99ae7d86048ad9e71c434931c4, type: 3} m_Name: m_EditorClassIdentifier: + Button_Logo: {fileID: 0} Button_TotalProgress: {fileID: 0} Button_WorkProgress: {fileID: 0} Button_ProductionProgress: {fileID: 0} diff --git a/Assets/Resources/DataOrder.json b/Assets/Resources/DataOrder.json index 25c3dbb..d00ca2d 100644 --- a/Assets/Resources/DataOrder.json +++ b/Assets/Resources/DataOrder.json @@ -1,4 +1,4 @@ -[ +[ "1-SUMITOMO", "02-SODICK", "3-SUMITOMO", @@ -28,5 +28,10 @@ "27-SUMITOMO", "28-SODICK", "29-SODICK", - "30-SODICK" + "30-SODICK", + "WC-A-Injection Line Máy 26", + "WC-A-Injection Line Máy 76", + "WC-A-Injection Line Máy 32", + "WC-A-Injection Line Máy 80", + "WC-A-Injection Line Máy 59" ] \ No newline at end of file diff --git a/Assets/Resources/Korea_MachineData.json b/Assets/Resources/Korea_MachineData.json deleted file mode 100644 index 6127010..0000000 --- a/Assets/Resources/Korea_MachineData.json +++ /dev/null @@ -1,1172 +0,0 @@ -[ - { - "datagbn": "D", - "wordno": "WO202507010086", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ01", - "worknm": "Injector No.01", - "workseq": 3, - "status": "1", - "statusnm": "가동중", - "itemcd": "24295087-1", - "itemdesc": "COVER A-CHK/VLV BODY", - "pjtcd": "GF6", - "matcd": "", - "cycletime": 85, - "cavity": 1, - "planqty": 508, - "goalqty": 39, - "workqty": 30, - "goodqty": 30, - "badqty": 0, - "badrate": "0.0", - "efficiency": 75.08834, - "progressrate": 5.90551, - "sttm": "1706", - "totm": "", - "goaltime": 719, - "ptotm": "2025-07-02 05:05:26", - "psttm": "2025-07-01 17:06:26", - "moldcd": "24295087-1", - "moldseq": 9, - "eorate": 103.11111, - "porate": 103.11111, - "goodqtyrate": 100, - "lct": 84.375, - "wct": 84.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010002", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ02", - "worknm": "Injector No.02", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "24049859-1", - "itemdesc": "COVER-CHK/VLV BODY", - "pjtcd": "GF9", - "matcd": "", - "cycletime": 95, - "cavity": 1, - "planqty": 454, - "goalqty": 385, - "workqty": 387, - "goodqty": 387, - "badqty": 0, - "badrate": "0.0", - "efficiency": 100.44533, - "progressrate": 85.24229, - "sttm": "0753", - "totm": "", - "goaltime": 718, - "ptotm": "2025-07-01 19:51:00", - "psttm": "2025-07-01 07:53:00", - "moldcd": "24049859-1", - "moldseq": 1, - "eorate": 103.11111, - "porate": 103.11111, - "goodqtyrate": 100, - "lct": 84.375, - "wct": 84.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010003", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ03", - "worknm": "Injector No.03", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "24052991-1", - "itemdesc": "COVER-CHK/VLV BODY", - "pjtcd": "CVT", - "matcd": "", - "cycletime": 85, - "cavity": 1, - "planqty": 508, - "goalqty": 430, - "workqty": 429, - "goodqty": 429, - "badqty": 0, - "badrate": "0.0", - "efficiency": 99.68835, - "progressrate": 84.44882, - "sttm": "0753", - "totm": "", - "goaltime": 719, - "ptotm": "2025-07-01 19:52:23", - "psttm": "2025-07-01 07:53:23", - "moldcd": "24052991-1", - "moldseq": 5, - "eorate": 103.11111, - "porate": 103.11111, - "goodqtyrate": 100, - "lct": 84.375, - "wct": 84.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010004", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ04", - "worknm": "Injector No.04", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "24052991-1", - "itemdesc": "COVER-CHK/VLV BODY", - "pjtcd": "CVT", - "matcd": "", - "cycletime": 85, - "cavity": 1, - "planqty": 508, - "goalqty": 430, - "workqty": 436, - "goodqty": 436, - "badqty": 0, - "badrate": "0.0", - "efficiency": 101.33158, - "progressrate": 85.82677, - "sttm": "0753", - "totm": "", - "goaltime": 719, - "ptotm": "2025-07-01 19:52:29", - "psttm": "2025-07-01 07:53:29", - "moldcd": "24052991-1", - "moldseq": 4, - "eorate": 103.11111, - "porate": 103.11111, - "goodqtyrate": 100, - "lct": 84.375, - "wct": 84.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010005", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ05", - "worknm": "Injector No.05", - "workseq": 1, - "status": "2", - "statusnm": "비가동", - "itemcd": "24299053", - "itemdesc": "BAFFLE-FRT DIFF CARR", - "pjtcd": "GF6 GEN3", - "matcd": "", - "cycletime": 68, - "cavity": 2, - "planqty": 1270, - "goalqty": 1080, - "workqty": 760, - "goodqty": 760, - "badqty": 0, - "badrate": "0.0", - "efficiency": 70.31293, - "progressrate": 59.84252, - "sttm": "0750", - "totm": "", - "goaltime": 1439, - "ptotm": "2025-07-02 07:49:32", - "psttm": "2025-07-01 07:50:32", - "moldcd": "24299053", - "moldseq": 3, - "eorate": 103.11111, - "porate": 103.11111, - "goodqtyrate": 100, - "lct": 84.375, - "wct": 84.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010006", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ06", - "worknm": "Injector No.06", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "24295087-1", - "itemdesc": "COVER A-CHK/VLV BODY", - "pjtcd": "GF6", - "matcd": "", - "cycletime": 85, - "cavity": 1, - "planqty": 508, - "goalqty": 430, - "workqty": 428, - "goodqty": 428, - "badqty": 0, - "badrate": "0.0", - "efficiency": 99.49677, - "progressrate": 84.25197, - "sttm": "0753", - "totm": "", - "goaltime": 719, - "ptotm": "2025-07-01 19:52:38", - "psttm": "2025-07-01 07:53:38", - "moldcd": "24295087-1", - "moldseq": 4, - "eorate": 103.11111, - "porate": 103.11111, - "goodqtyrate": 100, - "lct": 84.375, - "wct": 84.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010007", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ07", - "worknm": "Injector No.07", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "55513502-1", - "itemdesc": "BODY-WAT OTLT", - "pjtcd": "CSS PRIME", - "matcd": "", - "cycletime": 78, - "cavity": 1, - "planqty": 553, - "goalqty": 470, - "workqty": 471, - "goodqty": 459, - "badqty": 12, - "badrate": "2.5", - "efficiency": 97.51328, - "progressrate": 83.00181, - "sttm": "0751", - "totm": "", - "goaltime": 718, - "ptotm": "2025-07-01 19:49:07", - "psttm": "2025-07-01 07:51:07", - "moldcd": "55513502-1", - "moldseq": 1, - "eorate": 103.11111, - "porate": 103.11111, - "goodqtyrate": 100, - "lct": 84.375, - "wct": 84.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010041", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ08", - "worknm": "Injector No.08", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "55513502-1", - "itemdesc": "BODY-WAT OTLT", - "pjtcd": "CSS PRIME", - "matcd": "", - "cycletime": 78, - "cavity": 1, - "planqty": 553, - "goalqty": 470, - "workqty": 432, - "goodqty": 432, - "badqty": 0, - "badrate": "0.0", - "efficiency": 91.80221, - "progressrate": 78.11935, - "sttm": "0751", - "totm": "", - "goaltime": 718, - "ptotm": "2025-07-01 19:49:17", - "psttm": "2025-07-01 07:51:17", - "moldcd": "55513502-1", - "moldseq": 4, - "eorate": 103.11111, - "porate": 103.11111, - "goodqtyrate": 100, - "lct": 84.375, - "wct": 84.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010008", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ09", - "worknm": "Injector No.09", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "12707589-1", - "itemdesc": "OUTLET – WATER BODY", - "pjtcd": "SGE", - "matcd": "", - "cycletime": 61, - "cavity": 1, - "planqty": 708, - "goalqty": 601, - "workqty": 609, - "goodqty": 605, - "badqty": 4, - "badrate": "0.7", - "efficiency": 100.64909, - "progressrate": 85.45198, - "sttm": "0751", - "totm": "", - "goaltime": 719, - "ptotm": "2025-07-01 19:50:55", - "psttm": "2025-07-01 07:51:55", - "moldcd": "12707589-1", - "moldseq": 6, - "eorate": 103.11111, - "porate": 103.11111, - "goodqtyrate": 100, - "lct": 84.375, - "wct": 84.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010009", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ10", - "worknm": "Injector No.10", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "12707589-1", - "itemdesc": "OUTLET – WATER BODY", - "pjtcd": "SGE", - "matcd": "", - "cycletime": 68, - "cavity": 1, - "planqty": 635, - "goalqty": 539, - "workqty": 555, - "goodqty": 555, - "badqty": 0, - "badrate": "0.0", - "efficiency": 102.96284, - "progressrate": 87.40157, - "sttm": "0752", - "totm": "", - "goaltime": 719, - "ptotm": "2025-07-01 19:51:08", - "psttm": "2025-07-01 07:52:08", - "moldcd": "12707589-1", - "moldseq": 8, - "eorate": 103.11111, - "porate": 103.11111, - "goodqtyrate": 100, - "lct": 84.375, - "wct": 84.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010086", - "workdt": "20250701", - "pvp": "80", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ11", - "worknm": "Injector No.11", - "workseq": 3, - "status": "1", - "statusnm": "가동중", - "itemcd": "24295087-1", - "itemdesc": "COVER A-CHK/VLV BODY", - "pjtcd": "GF6", - "matcd": "", - "cycletime": 85, - "cavity": 1, - "planqty": 408, - "goalqty": 78, - "workqty": 50, - "goodqty": 28, - "badqty": 0, - "badrate": "0.0", - "efficiency": 79.08834, - "progressrate": 7.90551, - "sttm": "1706", - "totm": "", - "goaltime": 719, - "ptotm": "2025-07-05 05:05:26", - "psttm": "2025-07-04 17:06:26", - "moldcd": "24295087-1", - "moldseq": 9, - "eorate": 83.11111, - "porate": 72.11111, - "goodqtyrate": 90, - "lct": 64.375, - "wct": 35.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010002", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ12", - "worknm": "Injector No.12", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "24049859-1", - "itemdesc": "COVER-CHK/VLV BODY", - "pjtcd": "GF9", - "matcd": "", - "cycletime": 95, - "cavity": 1, - "planqty": 554, - "goalqty": 375, - "workqty": 367, - "goodqty": 360, - "badqty": 0, - "badrate": "0.0", - "efficiency": 87.44533, - "progressrate": 75.24229, - "sttm": "0753", - "totm": "", - "goaltime": 718, - "ptotm": "2025-08-02 19:51:00", - "psttm": "2025-08-03 07:53:00", - "moldcd": "24049859-1", - "moldseq": 1, - "eorate": 80.11111, - "porate": 60.11111, - "goodqtyrate": 92, - "lct": 80.375, - "wct": 78.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010003", - "workdt": "20250701", - "pvp": "75", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ13", - "worknm": "Injector No.13", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "24052991-1", - "itemdesc": "COVER-CHK/VLV BODY", - "pjtcd": "CVT", - "matcd": "", - "cycletime": 85, - "cavity": 1, - "planqty": 808, - "goalqty": 790, - "workqty": 629, - "goodqty": 611, - "badqty": 0, - "badrate": "0.0", - "efficiency": 99.68835, - "progressrate": 84.44882, - "sttm": "0753", - "totm": "", - "goaltime": 719, - "ptotm": "2025-08-03 19:52:23", - "psttm": "2025-08-03 07:53:23", - "moldcd": "24052991-1", - "moldseq": 5, - "eorate": 89.56, - "porate": 100.00, - "goodqtyrate": 74, - "lct": 93.457, - "wct": 81.249 - }, - { - "datagbn": "D", - "wordno": "WO202507010004", - "workdt": "20250701", - "pvp": "92", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ14", - "worknm": "Injector No.14", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "24052991-1", - "itemdesc": "COVER-CHK/VLV BODY", - "pjtcd": "CVT", - "matcd": "", - "cycletime": 85, - "cavity": 1, - "planqty": 924, - "goalqty": 917, - "workqty": 865, - "goodqty": 877, - "badqty": 0, - "badrate": "0.0", - "efficiency": 99.33478, - "progressrate": 77.82598, - "sttm": "0753", - "totm": "", - "goaltime": 719, - "ptotm": "2025-08-03 19:52:29", - "psttm": "2025-08-03 07:53:29", - "moldcd": "24052991-1", - "moldseq": 4, - "eorate": 88.33111, - "porate": 89.41151, - "goodqtyrate": 98, - "lct": 71.365, - "wct": 86.374 - }, - { - "datagbn": "D", - "wordno": "WO202507010005", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ15", - "worknm": "Injector No.15", - "workseq": 1, - "status": "2", - "statusnm": "비가동", - "itemcd": "24299053", - "itemdesc": "BAFFLE-FRT DIFF CARR", - "pjtcd": "GF6 GEN3", - "matcd": "", - "cycletime": 68, - "cavity": 2, - "planqty": 1270, - "goalqty": 1080, - "workqty": 760, - "goodqty": 760, - "badqty": 0, - "badrate": "0.0", - "efficiency": 70.31293, - "progressrate": 59.84252, - "sttm": "0750", - "totm": "", - "goaltime": 1439, - "ptotm": "2025-08-03 07:49:32", - "psttm": "2025-08-03 07:50:32", - "moldcd": "24299053", - "moldseq": 3, - "eorate": 103.11111, - "porate": 103.11111, - "goodqtyrate": 100, - "lct": 84.375, - "wct": 84.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010006", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ16", - "worknm": "Injector No.16", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "24295087-1", - "itemdesc": "COVER A-CHK/VLV BODY", - "pjtcd": "GF6", - "matcd": "", - "cycletime": 85, - "cavity": 1, - "planqty": 348, - "goalqty": 320, - "workqty": 318, - "goodqty": 318, - "badqty": 0, - "badrate": "0.0", - "efficiency": 89.59677, - "progressrate": 88.26197, - "sttm": "0753", - "totm": "", - "goaltime": 719, - "ptotm": "2025-08-03 19:52:38", - "psttm": "2025-08-03 07:53:38", - "moldcd": "24295087-1", - "moldseq": 4, - "eorate": 97.11511, - "porate": 84.15168, - "goodqtyrate": 100, - "lct": 98.375, - "wct": 74.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010007", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ17", - "worknm": "Injector No.17", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "55513502-1", - "itemdesc": "BODY-WAT OTLT", - "pjtcd": "CSS PRIME", - "matcd": "", - "cycletime": 78, - "cavity": 1, - "planqty": 553, - "goalqty": 470, - "workqty": 471, - "goodqty": 459, - "badqty": 12, - "badrate": "2.5", - "efficiency": 97.51328, - "progressrate": 83.00181, - "sttm": "0751", - "totm": "", - "goaltime": 718, - "ptotm": "2025-08-03 19:49:07", - "psttm": "2025-08-03 07:51:07", - "moldcd": "55513502-1", - "moldseq": 1, - "eorate": 72.11111, - "porate": 84.11111, - "goodqtyrate": 100, - "lct": 84.375, - "wct": 84.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010041", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ18", - "worknm": "Injector No.18", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "55513502-1", - "itemdesc": "BODY-WAT OTLT", - "pjtcd": "CSS PRIME", - "matcd": "", - "cycletime": 78, - "cavity": 1, - "planqty": 632, - "goalqty": 621, - "workqty": 620, - "goodqty": 618, - "badqty": 0, - "badrate": "0.0", - "efficiency": 93.80221, - "progressrate": 77.12935, - "sttm": "0751", - "totm": "", - "goaltime": 718, - "ptotm": "2025-08-03 19:49:17", - "psttm": "2025-08-03 07:51:17", - "moldcd": "55513502-1", - "moldseq": 4, - "eorate": 82.11111, - "porate": 78.11111, - "goodqtyrate": 100, - "lct": 75.375, - "wct": 95.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010008", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ19", - "worknm": "Injector No.19", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "12707589-1", - "itemdesc": "OUTLET – WATER BODY", - "pjtcd": "SGE", - "matcd": "", - "cycletime": 61, - "cavity": 1, - "planqty": 708, - "goalqty": 601, - "workqty": 609, - "goodqty": 605, - "badqty": 4, - "badrate": "0.7", - "efficiency": 100.64909, - "progressrate": 85.45198, - "sttm": "0751", - "totm": "", - "goaltime": 719, - "ptotm": "2025-08-03 19:50:55", - "psttm": "2025-08-03 07:51:55", - "moldcd": "12707589-1", - "moldseq": 6, - "eorate": 103.11111, - "porate": 103.11111, - "goodqtyrate": 100, - "lct": 84.375, - "wct": 84.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010009", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ20", - "worknm": "Injector No.20", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "12707589-1", - "itemdesc": "OUTLET – WATER BODY", - "pjtcd": "SGE", - "matcd": "", - "cycletime": 68, - "cavity": 1, - "planqty": 635, - "goalqty": 539, - "workqty": 555, - "goodqty": 555, - "badqty": 0, - "badrate": "0.0", - "efficiency": 102.96284, - "progressrate": 87.40157, - "sttm": "0752", - "totm": "", - "goaltime": 719, - "ptotm": "2025-08-03 19:51:08", - "psttm": "2025-08-03 07:52:08", - "moldcd": "12707589-1", - "moldseq": 8, - "eorate": 86.11111, - "porate": 92.11111, - "goodqtyrate": 97, - "lct": 85.375, - "wct": 74.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010009", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ21", - "worknm": "Injector No.21", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "12707589-1", - "itemdesc": "OUTLET – WATER BODY", - "pjtcd": "SGE", - "matcd": "", - "cycletime": 68, - "cavity": 1, - "planqty": 635, - "goalqty": 539, - "workqty": 555, - "goodqty": 555, - "badqty": 0, - "badrate": "0.0", - "efficiency": 102.96284, - "progressrate": 87.40157, - "sttm": "0752", - "totm": "", - "goaltime": 719, - "ptotm": "2025-08-03 19:51:08", - "psttm": "2025-08-03 07:52:08", - "moldcd": "12707589-1", - "moldseq": 8, - "eorate": 86.11111, - "porate": 92.11111, - "goodqtyrate": 97, - "lct": 85.375, - "wct": 74.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010086", - "workdt": "20250701", - "pvp": "80", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ22", - "worknm": "Injector No.22", - "workseq": 3, - "status": "1", - "statusnm": "가동중", - "itemcd": "24295087-1", - "itemdesc": "COVER A-CHK/VLV BODY", - "pjtcd": "GF6", - "matcd": "", - "cycletime": 85, - "cavity": 1, - "planqty": 408, - "goalqty": 78, - "workqty": 50, - "goodqty": 28, - "badqty": 0, - "badrate": "0.0", - "efficiency": 79.08834, - "progressrate": 7.90551, - "sttm": "1706", - "totm": "", - "goaltime": 719, - "ptotm": "2025-07-05 05:05:26", - "psttm": "2025-07-04 17:06:26", - "moldcd": "24295087-1", - "moldseq": 9, - "eorate": 83.11111, - "porate": 72.11111, - "goodqtyrate": 90, - "lct": 64.375, - "wct": 35.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010006", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ23", - "worknm": "Injector No.23", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "24295087-1", - "itemdesc": "COVER A-CHK/VLV BODY", - "pjtcd": "GF6", - "matcd": "", - "cycletime": 85, - "cavity": 1, - "planqty": 348, - "goalqty": 320, - "workqty": 318, - "goodqty": 318, - "badqty": 0, - "badrate": "0.0", - "efficiency": 89.59677, - "progressrate": 88.26197, - "sttm": "0753", - "totm": "", - "goaltime": 719, - "ptotm": "2025-08-03 19:52:38", - "psttm": "2025-08-03 07:53:38", - "moldcd": "24295087-1", - "moldseq": 4, - "eorate": 97.11511, - "porate": 84.15168, - "goodqtyrate": 100, - "lct": 98.375, - "wct": 74.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010007", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ24", - "worknm": "Injector No.24", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "55513502-1", - "itemdesc": "BODY-WAT OTLT", - "pjtcd": "CSS PRIME", - "matcd": "", - "cycletime": 78, - "cavity": 1, - "planqty": 553, - "goalqty": 470, - "workqty": 471, - "goodqty": 459, - "badqty": 12, - "badrate": "2.5", - "efficiency": 97.51328, - "progressrate": 83.00181, - "sttm": "0751", - "totm": "", - "goaltime": 718, - "ptotm": "2025-08-03 19:49:07", - "psttm": "2025-08-03 07:51:07", - "moldcd": "55513502-1", - "moldseq": 1, - "eorate": 72.11111, - "porate": 84.11111, - "goodqtyrate": 100, - "lct": 84.375, - "wct": 84.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010041", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ25", - "worknm": "Injector No.25", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "55513502-1", - "itemdesc": "BODY-WAT OTLT", - "pjtcd": "CSS PRIME", - "matcd": "", - "cycletime": 78, - "cavity": 1, - "planqty": 632, - "goalqty": 621, - "workqty": 620, - "goodqty": 618, - "badqty": 0, - "badrate": "0.0", - "efficiency": 93.80221, - "progressrate": 77.12935, - "sttm": "0751", - "totm": "", - "goaltime": 718, - "ptotm": "2025-08-03 19:49:17", - "psttm": "2025-08-03 07:51:17", - "moldcd": "55513502-1", - "moldseq": 4, - "eorate": 82.11111, - "porate": 78.11111, - "goodqtyrate": 100, - "lct": 75.375, - "wct": 95.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010086", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ26", - "worknm": "Injector No.26", - "workseq": 3, - "status": "1", - "statusnm": "가동중", - "itemcd": "24295087-1", - "itemdesc": "COVER A-CHK/VLV BODY", - "pjtcd": "GF6", - "matcd": "", - "cycletime": 85, - "cavity": 1, - "planqty": 508, - "goalqty": 39, - "workqty": 30, - "goodqty": 30, - "badqty": 0, - "badrate": "0.0", - "efficiency": 75.08834, - "progressrate": 5.90551, - "sttm": "1706", - "totm": "", - "goaltime": 719, - "ptotm": "2025-07-02 05:05:26", - "psttm": "2025-07-01 17:06:26", - "moldcd": "24295087-1", - "moldseq": 9, - "eorate": 103.11111, - "porate": 103.11111, - "goodqtyrate": 100, - "lct": 84.375, - "wct": 84.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010002", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ27", - "worknm": "Injector No.27", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "24049859-1", - "itemdesc": "COVER-CHK/VLV BODY", - "pjtcd": "GF9", - "matcd": "", - "cycletime": 95, - "cavity": 1, - "planqty": 454, - "goalqty": 385, - "workqty": 387, - "goodqty": 387, - "badqty": 0, - "badrate": "0.0", - "efficiency": 100.44533, - "progressrate": 85.24229, - "sttm": "0753", - "totm": "", - "goaltime": 718, - "ptotm": "2025-07-01 19:51:00", - "psttm": "2025-07-01 07:53:00", - "moldcd": "24049859-1", - "moldseq": 1, - "eorate": 103.11111, - "porate": 103.11111, - "goodqtyrate": 100, - "lct": 84.375, - "wct": 84.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010003", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ28", - "worknm": "Injector No.28", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "24052991-1", - "itemdesc": "COVER-CHK/VLV BODY", - "pjtcd": "CVT", - "matcd": "", - "cycletime": 85, - "cavity": 1, - "planqty": 508, - "goalqty": 430, - "workqty": 429, - "goodqty": 429, - "badqty": 0, - "badrate": "0.0", - "efficiency": 99.68835, - "progressrate": 84.44882, - "sttm": "0753", - "totm": "", - "goaltime": 719, - "ptotm": "2025-07-01 19:52:23", - "psttm": "2025-07-01 07:53:23", - "moldcd": "24052991-1", - "moldseq": 5, - "eorate": 103.11111, - "porate": 103.11111, - "goodqtyrate": 100, - "lct": 84.375, - "wct": 84.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010086", - "workdt": "20250701", - "pvp": "80", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ29", - "worknm": "Injector No.29", - "workseq": 3, - "status": "1", - "statusnm": "가동중", - "itemcd": "24295087-1", - "itemdesc": "COVER A-CHK/VLV BODY", - "pjtcd": "GF6", - "matcd": "", - "cycletime": 85, - "cavity": 1, - "planqty": 408, - "goalqty": 78, - "workqty": 50, - "goodqty": 28, - "badqty": 0, - "badrate": "0.0", - "efficiency": 79.08834, - "progressrate": 7.90551, - "sttm": "1706", - "totm": "", - "goaltime": 719, - "ptotm": "2025-07-05 05:05:26", - "psttm": "2025-07-04 17:06:26", - "moldcd": "24295087-1", - "moldseq": 9, - "eorate": 83.11111, - "porate": 72.11111, - "goodqtyrate": 90, - "lct": 64.375, - "wct": 35.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010002", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ30", - "worknm": "Injector No.30", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "24049859-1", - "itemdesc": "COVER-CHK/VLV BODY", - "pjtcd": "GF9", - "matcd": "", - "cycletime": 95, - "cavity": 1, - "planqty": 554, - "goalqty": 375, - "workqty": 367, - "goodqty": 360, - "badqty": 0, - "badrate": "0.0", - "efficiency": 87.44533, - "progressrate": 75.24229, - "sttm": "0753", - "totm": "", - "goaltime": 718, - "ptotm": "2025-08-02 19:51:00", - "psttm": "2025-08-03 07:53:00", - "moldcd": "24049859-1", - "moldseq": 1, - "eorate": 80.11111, - "porate": 60.11111, - "goodqtyrate": 92, - "lct": 80.375, - "wct": 78.375 - } -] diff --git a/Assets/Resources/Korea_MachineData.json.meta b/Assets/Resources/Korea_MachineData.json.meta deleted file mode 100644 index b25735f..0000000 --- a/Assets/Resources/Korea_MachineData.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: e26d7e4366b852441b9dc2978aa9ad44 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Korea_WorkShopData.json b/Assets/Resources/Korea_WorkShopData.json deleted file mode 100644 index c2a682e..0000000 --- a/Assets/Resources/Korea_WorkShopData.json +++ /dev/null @@ -1,57 +0,0 @@ -[ - { - "groupcd": "W10", - "groupnm": "생산라인", - "mchcnt": 25, - "planqty": 49276, - "workqty": 27745, - "goodqty": 27727, - "badqty": 18, - "badrate": "0.1", - "progressrate": 56.3 - }, - { - "groupcd": "W20", - "groupnm": "조립라인", - "mchcnt": 12, - "planqty": 26462, - "workqty": 13850, - "goodqty": 13848, - "badqty": 2, - "badrate": "0.0", - "progressrate": 52.3 - }, - { - "groupcd": "W30", - "groupnm": "최종검사", - "mchcnt": 5, - "planqty": 13486, - "workqty": 8768, - "goodqty": 8768, - "badqty": 0, - "badrate": "0.0", - "progressrate": 65 - }, - { - "groupcd": "W40", - "groupnm": "조립라인(가공)", - "mchcnt": 0, - "planqty": 0, - "workqty": 0, - "goodqty": 0, - "badqty": 0, - "badrate": "0.0", - "progressrate": 0 - }, - { - "groupcd": "W50", - "groupnm": "금형부", - "mchcnt": 0, - "planqty": 0, - "workqty": 0, - "goodqty": 0, - "badqty": 0, - "badrate": "0.0", - "progressrate": 0 - } -] diff --git a/Assets/Resources/Korea_WorkShopData.json.meta b/Assets/Resources/Korea_WorkShopData.json.meta deleted file mode 100644 index e342819..0000000 --- a/Assets/Resources/Korea_WorkShopData.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 714e4a439af607f47a5ba118d45c007d -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Prefabs/UI/PRF_UI_AlramInfoItem.prefab b/Assets/Resources/Prefabs/UI/PRF_UI_AlramInfoItem.prefab index b9d7086..de4f643 100644 --- a/Assets/Resources/Prefabs/UI/PRF_UI_AlramInfoItem.prefab +++ b/Assets/Resources/Prefabs/UI/PRF_UI_AlramInfoItem.prefab @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 27-SUMITOMO + m_text: "WC-A-Injection Line M\xE1y 26\r\n" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: c2f32d96b71927e429b2adee0d64a773, type: 2} m_sharedMaterial: {fileID: -3516750883916327525, guid: c2f32d96b71927e429b2adee0d64a773, type: 2} @@ -104,7 +104,7 @@ MonoBehaviour: m_textAlignment: 65535 m_characterSpacing: -9 m_wordSpacing: 0 - m_lineSpacing: 0 + m_lineSpacing: -20 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 diff --git a/Assets/Resources/Prefabs/UI/PRF_UI_MachineEffectivenessItem.prefab b/Assets/Resources/Prefabs/UI/PRF_UI_MachineEffectivenessItem.prefab index 36b9a04..8c97c12 100644 --- a/Assets/Resources/Prefabs/UI/PRF_UI_MachineEffectivenessItem.prefab +++ b/Assets/Resources/Prefabs/UI/PRF_UI_MachineEffectivenessItem.prefab @@ -374,7 +374,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: -10} + m_AnchoredPosition: {x: 0, y: -15} m_SizeDelta: {x: 80, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &719616778712221133 @@ -405,7 +405,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 27-SMITOMO + m_text: "WC-A-Injection Line M\xE1y 26\r\n" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 9a2c7e704ad3e62438526dc8aecaeb56, type: 2} m_sharedMaterial: {fileID: 682561501981441939, guid: 9a2c7e704ad3e62438526dc8aecaeb56, type: 2} @@ -444,7 +444,7 @@ MonoBehaviour: m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 - m_lineSpacing: 0 + m_lineSpacing: -20 m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 diff --git a/Assets/Resources/Vietnam_MachineData.json b/Assets/Resources/Vietnam_MachineData.json deleted file mode 100644 index 92f933e..0000000 --- a/Assets/Resources/Vietnam_MachineData.json +++ /dev/null @@ -1,392 +0,0 @@ -[ - { - "datagbn": "D", - "wordno": "WO202507010086", - "workdt": "20250701", - "pvp": "80", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ01", - "worknm": "Injector No.01", - "workseq": 3, - "status": "1", - "statusnm": "가동중", - "itemcd": "24295087-1", - "itemdesc": "COVER A-CHK/VLV BODY", - "pjtcd": "GF6", - "matcd": "", - "cycletime": 85, - "cavity": 1, - "planqty": 408, - "goalqty": 78, - "workqty": 50, - "goodqty": 28, - "badqty": 0, - "badrate": "0.0", - "efficiency": 79.08834, - "progressrate": 7.90551, - "sttm": "1706", - "totm": "", - "goaltime": 719, - "ptotm": "2025-07-05 05:05:26", - "psttm": "2025-07-04 17:06:26", - "moldcd": "24295087-1", - "moldseq": 9, - "eorate": 83.11111, - "porate": 72.11111, - "goodqtyrate": 90, - "lct": 64.375, - "wct": 35.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010002", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ02", - "worknm": "Injector No.02", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "24049859-1", - "itemdesc": "COVER-CHK/VLV BODY", - "pjtcd": "GF9", - "matcd": "", - "cycletime": 95, - "cavity": 1, - "planqty": 554, - "goalqty": 375, - "workqty": 367, - "goodqty": 360, - "badqty": 0, - "badrate": "0.0", - "efficiency": 87.44533, - "progressrate": 75.24229, - "sttm": "0753", - "totm": "", - "goaltime": 718, - "ptotm": "2025-08-02 19:51:00", - "psttm": "2025-08-03 07:53:00", - "moldcd": "24049859-1", - "moldseq": 1, - "eorate": 80.11111, - "porate": 60.11111, - "goodqtyrate": 92, - "lct": 80.375, - "wct": 78.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010003", - "workdt": "20250701", - "pvp": "75", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ03", - "worknm": "Injector No.03", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "24052991-1", - "itemdesc": "COVER-CHK/VLV BODY", - "pjtcd": "CVT", - "matcd": "", - "cycletime": 85, - "cavity": 1, - "planqty": 808, - "goalqty": 790, - "workqty": 629, - "goodqty": 611, - "badqty": 0, - "badrate": "0.0", - "efficiency": 99.68835, - "progressrate": 84.44882, - "sttm": "0753", - "totm": "", - "goaltime": 719, - "ptotm": "2025-08-03 19:52:23", - "psttm": "2025-08-03 07:53:23", - "moldcd": "24052991-1", - "moldseq": 5, - "eorate": 89.56, - "porate": 100.00, - "goodqtyrate": 74, - "lct": 93.457, - "wct": 81.249 - }, - { - "datagbn": "D", - "wordno": "WO202507010004", - "workdt": "20250701", - "pvp": "92", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ04", - "worknm": "Injector No.04", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "24052991-1", - "itemdesc": "COVER-CHK/VLV BODY", - "pjtcd": "CVT", - "matcd": "", - "cycletime": 85, - "cavity": 1, - "planqty": 924, - "goalqty": 917, - "workqty": 865, - "goodqty": 877, - "badqty": 0, - "badrate": "0.0", - "efficiency": 99.33478, - "progressrate": 77.82598, - "sttm": "0753", - "totm": "", - "goaltime": 719, - "ptotm": "2025-08-03 19:52:29", - "psttm": "2025-08-03 07:53:29", - "moldcd": "24052991-1", - "moldseq": 4, - "eorate": 88.33111, - "porate": 89.41151, - "goodqtyrate": 98, - "lct": 71.365, - "wct": 86.374 - }, - { - "datagbn": "D", - "wordno": "WO202507010005", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ05", - "worknm": "Injector No.05", - "workseq": 1, - "status": "2", - "statusnm": "비가동", - "itemcd": "24299053", - "itemdesc": "BAFFLE-FRT DIFF CARR", - "pjtcd": "GF6 GEN3", - "matcd": "", - "cycletime": 68, - "cavity": 2, - "planqty": 1270, - "goalqty": 1080, - "workqty": 760, - "goodqty": 760, - "badqty": 0, - "badrate": "0.0", - "efficiency": 70.31293, - "progressrate": 59.84252, - "sttm": "0750", - "totm": "", - "goaltime": 1439, - "ptotm": "2025-08-03 07:49:32", - "psttm": "2025-08-03 07:50:32", - "moldcd": "24299053", - "moldseq": 3, - "eorate": 103.11111, - "porate": 103.11111, - "goodqtyrate": 100, - "lct": 84.375, - "wct": 84.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010006", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ06", - "worknm": "Injector No.06", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "24295087-1", - "itemdesc": "COVER A-CHK/VLV BODY", - "pjtcd": "GF6", - "matcd": "", - "cycletime": 85, - "cavity": 1, - "planqty": 348, - "goalqty": 320, - "workqty": 318, - "goodqty": 318, - "badqty": 0, - "badrate": "0.0", - "efficiency": 89.59677, - "progressrate": 88.26197, - "sttm": "0753", - "totm": "", - "goaltime": 719, - "ptotm": "2025-08-03 19:52:38", - "psttm": "2025-08-03 07:53:38", - "moldcd": "24295087-1", - "moldseq": 4, - "eorate": 97.11511, - "porate": 84.15168, - "goodqtyrate": 100, - "lct": 98.375, - "wct": 74.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010007", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ07", - "worknm": "Injector No.07", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "55513502-1", - "itemdesc": "BODY-WAT OTLT", - "pjtcd": "CSS PRIME", - "matcd": "", - "cycletime": 78, - "cavity": 1, - "planqty": 553, - "goalqty": 470, - "workqty": 471, - "goodqty": 459, - "badqty": 12, - "badrate": "2.5", - "efficiency": 97.51328, - "progressrate": 83.00181, - "sttm": "0751", - "totm": "", - "goaltime": 718, - "ptotm": "2025-08-03 19:49:07", - "psttm": "2025-08-03 07:51:07", - "moldcd": "55513502-1", - "moldseq": 1, - "eorate": 72.11111, - "porate": 84.11111, - "goodqtyrate": 100, - "lct": 84.375, - "wct": 84.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010041", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "IJ08", - "worknm": "Injector No.08", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "55513502-1", - "itemdesc": "BODY-WAT OTLT", - "pjtcd": "CSS PRIME", - "matcd": "", - "cycletime": 78, - "cavity": 1, - "planqty": 632, - "goalqty": 621, - "workqty": 620, - "goodqty": 618, - "badqty": 0, - "badrate": "0.0", - "efficiency": 93.80221, - "progressrate": 77.12935, - "sttm": "0751", - "totm": "", - "goaltime": 718, - "ptotm": "2025-08-03 19:49:17", - "psttm": "2025-08-03 07:51:17", - "moldcd": "55513502-1", - "moldseq": 4, - "eorate": 82.11111, - "porate": 78.11111, - "goodqtyrate": 100, - "lct": 75.375, - "wct": 95.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010008", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "CO-1", - "worknm": "GF6 C/VB LINE-1", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "12707589-1", - "itemdesc": "OUTLET – WATER BODY", - "pjtcd": "SGE", - "matcd": "", - "cycletime": 61, - "cavity": 1, - "planqty": 708, - "goalqty": 601, - "workqty": 609, - "goodqty": 605, - "badqty": 4, - "badrate": "0.7", - "efficiency": 100.64909, - "progressrate": 85.45198, - "sttm": "0751", - "totm": "", - "goaltime": 719, - "ptotm": "2025-08-03 19:50:55", - "psttm": "2025-08-03 07:51:55", - "moldcd": "12707589-1", - "moldseq": 6, - "eorate": 103.11111, - "porate": 103.11111, - "goodqtyrate": 100, - "lct": 84.375, - "wct": 84.375 - }, - { - "datagbn": "D", - "wordno": "WO202507010009", - "workdt": "20250701", - "pvp": "100", - "sitecd": "1", - "wccd": "W10", - "workcd": "CO-3", - "worknm": "GF9 C/VB LINE", - "workseq": 1, - "status": "1", - "statusnm": "가동중", - "itemcd": "12707589-1", - "itemdesc": "OUTLET – WATER BODY", - "pjtcd": "SGE", - "matcd": "", - "cycletime": 68, - "cavity": 1, - "planqty": 635, - "goalqty": 539, - "workqty": 555, - "goodqty": 555, - "badqty": 0, - "badrate": "0.0", - "efficiency": 102.96284, - "progressrate": 87.40157, - "sttm": "0752", - "totm": "", - "goaltime": 719, - "ptotm": "2025-08-03 19:51:08", - "psttm": "2025-08-03 07:52:08", - "moldcd": "12707589-1", - "moldseq": 8, - "eorate": 86.11111, - "porate": 92.11111, - "goodqtyrate": 97, - "lct": 85.375, - "wct": 74.375 - } -] \ No newline at end of file diff --git a/Assets/Resources/Vietnam_MachineData.json.meta b/Assets/Resources/Vietnam_MachineData.json.meta deleted file mode 100644 index 60c79fe..0000000 --- a/Assets/Resources/Vietnam_MachineData.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 6a894ce36ff58564e8edfd0c3b48395b -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Resources/Vietnam_WorkShopData.json b/Assets/Resources/Vietnam_WorkShopData.json deleted file mode 100644 index b6c4b1a..0000000 --- a/Assets/Resources/Vietnam_WorkShopData.json +++ /dev/null @@ -1,57 +0,0 @@ -[ - { - "groupcd": "W10", - "groupnm": "생산라인", - "mchcnt": 25, - "planqty": 59376, - "workqty": 37849, - "goodqty": 37831, - "badqty": 18, - "badrate": "0.1", - "progressrate": 59.3 - }, - { - "groupcd": "W20", - "groupnm": "조립라인", - "mchcnt": 12, - "planqty": 28492, - "workqty": 15870, - "goodqty": 15868, - "badqty": 2, - "badrate": "0.0", - "progressrate": 50.3 - }, - { - "groupcd": "W30", - "groupnm": "최종검사", - "mchcnt": 5, - "planqty": 11486, - "workqty": 8568, - "goodqty": 8568, - "badqty": 0, - "badrate": "0.0", - "progressrate": 75 - }, - { - "groupcd": "W40", - "groupnm": "조립라인(가공)", - "mchcnt": 0, - "planqty": 0, - "workqty": 0, - "goodqty": 0, - "badqty": 0, - "badrate": "0.0", - "progressrate": 0 - }, - { - "groupcd": "W50", - "groupnm": "금형부", - "mchcnt": 0, - "planqty": 0, - "workqty": 0, - "goodqty": 0, - "badqty": 0, - "badrate": "0.0", - "progressrate": 0 - } -] diff --git a/Assets/Resources/Vietnam_WorkShopData.json.meta b/Assets/Resources/Vietnam_WorkShopData.json.meta deleted file mode 100644 index 04e2c84..0000000 --- a/Assets/Resources/Vietnam_WorkShopData.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 39164abf6dc34c34cb6907c10443b799 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scenes/Korea_Branch.unity b/Assets/Scenes/Korea_Branch.unity index f20faf1..7fe3701 100644 --- a/Assets/Scenes/Korea_Branch.unity +++ b/Assets/Scenes/Korea_Branch.unity @@ -226,8 +226,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.30 - code: 30-SODICK + machineName: 30-SODICK typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -341,8 +340,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.03 - code: 3-SUMITOMO + machineName: 3-SUMITOMO typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -562,8 +560,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.20 - code: 20-SODICK + machineName: 20-SODICK typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -1919,8 +1916,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.14 - code: 14-SUMITOMO + machineName: 14-SUMITOMO typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -2087,6 +2083,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5ff9407c0dcbf9d41855621774d6355b, type: 3} m_Name: m_EditorClassIdentifier: + sceneName: currentMachine: {fileID: 0} --- !u!1001 &352671218 PrefabInstance: @@ -2359,8 +2356,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.05 - code: 5-SUMITOMO + machineName: 5-SUMITOMO typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -2640,8 +2636,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.04 - code: 4-SUMITOMO + machineName: 4-SUMITOMO typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -3084,8 +3079,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.13 - code: 13-SUMITOMO + machineName: 13-SUMITOMO typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -3235,8 +3229,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.17 - code: 17-SUMITOMO + machineName: 17-SUMITOMO typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -3350,8 +3343,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.25 - code: 25-SODICK + machineName: 25-SODICK typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -3465,8 +3457,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.23 - code: 23-SODICK + machineName: 23-SODICK typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -3737,8 +3728,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.07 - code: 7-SUMITOMO + machineName: 7-SUMITOMO typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -3852,8 +3842,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.08 - code: 8-SUMITOMO + machineName: 8-SUMITOMO typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -4249,8 +4238,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.21 - code: 21-SODICK + machineName: 21-SODICK typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -4369,8 +4357,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.27 - code: 27-SUMITOMO + machineName: 27-SUMITOMO typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -4515,8 +4502,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.26 - code: 26-SODICK + machineName: 26-SODICK typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -4751,8 +4737,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.19 - code: 19-SODICK + machineName: 19-SODICK typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -4866,8 +4851,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.15 - code: 15-SUMITOMO + machineName: 15-SUMITOMO typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -6043,8 +6027,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.16 - code: 16-SUMITOMO + machineName: 16-SUMITOMO typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -6154,8 +6137,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.01 - code: 1-SUMITOMO + machineName: 1-SUMITOMO typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -6318,8 +6300,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.28 - code: 28-SODICK + machineName: 28-SODICK typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -6433,8 +6414,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.02 - code: 02-SODICK + machineName: 02-SODICK typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -6548,8 +6528,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.11 - code: 11-SUMITOMO + machineName: 11-SUMITOMO typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -6824,8 +6803,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.22 - code: 22-SODICK + machineName: 22-SODICK typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -7251,8 +7229,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.06 - code: 6-SUMITOMO + machineName: 6-SUMITOMO typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -8191,8 +8168,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.12 - code: 12-SUMITOMO + machineName: 12-SUMITOMO typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -8477,8 +8453,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.24 - code: 24-SODICK + machineName: 24-SODICK typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -8592,8 +8567,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.10 - code: 10-SUMITOMO + machineName: 10-SUMITOMO typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -8707,8 +8681,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.09 - code: 9-SUMITOMO + machineName: 9-SUMITOMO typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -8960,8 +8933,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.18 - code: 18-SUMITOMO + machineName: 18-SUMITOMO typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -9183,8 +9155,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.29 - code: 29-SODICK + machineName: 29-SODICK typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -17650,6 +17621,102 @@ PrefabInstance: propertyPath: m_Name value: Panel_Library objectReference: {fileID: 0} + - target: {fileID: 509379465267621390, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 509379465267621390, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 509379465267621390, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 509379465267621390, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1189846344294746916, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1189846344294746916, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1189846344294746916, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1189846344294746916, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1923892264048297078, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1923892264048297078, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1923892264048297078, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1923892264048297078, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2485621169968141123, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2485621169968141123, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2485621169968141123, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2485621169968141123, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4155995512894969257, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4155995512894969257, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4155995512894969257, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4155995512894969257, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5140093174593216436, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5140093174593216436, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5140093174593216436, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5140093174593216436, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6686091374336419217, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} propertyPath: m_AnchorMax.x value: 0 @@ -17658,6 +17725,22 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7420377892087957114, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7420377892087957114, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7420377892087957114, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7420377892087957114, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7677221891869760545, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -17738,6 +17821,22 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 9213243736742647922, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9213243736742647922, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9213243736742647922, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 9213243736742647922, guid: 1fc88af379a7a364fb3d26a826fa4561, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scenes/Vietnam_Branch.unity b/Assets/Scenes/Vietnam_Branch.unity index 8fe3976..87bbc22 100644 --- a/Assets/Scenes/Vietnam_Branch.unity +++ b/Assets/Scenes/Vietnam_Branch.unity @@ -163,7 +163,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d8fa0e077ff947341993059cf8fff9b2, type: 3} m_Name: m_EditorClassIdentifier: - sceneName: Korea + sceneName: Vietnam standardInfos: [] machineFilters: [] --- !u!1 &44418107 @@ -320,7 +320,7 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 671ce9b330bebd94bbb0ffdbbc359803, type: 2} - target: {fileID: 919132149155446097, guid: 6e52267a6acdcc44a9abb720f3ce7bdc, type: 3} propertyPath: m_Name - value: "1\uD638\uAE30" + value: "WC-A-Injection Line M\xE1y 26" objectReference: {fileID: 0} - target: {fileID: 5247692264100764378, guid: 6e52267a6acdcc44a9abb720f3ce7bdc, type: 3} propertyPath: 'm_Materials.Array.data[0]' @@ -357,8 +357,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.01 - code: IJ01 + machineName: "WC-A-Injection Line M\xE1y 26" typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -484,7 +483,7 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 671ce9b330bebd94bbb0ffdbbc359803, type: 2} - target: {fileID: 919132149155446097, guid: 6e52267a6acdcc44a9abb720f3ce7bdc, type: 3} propertyPath: m_Name - value: "2\uD638\uAE30" + value: "WC-A-Injection Line M\xE1y 76" objectReference: {fileID: 0} - target: {fileID: 5247692264100764378, guid: 6e52267a6acdcc44a9abb720f3ce7bdc, type: 3} propertyPath: 'm_Materials.Array.data[0]' @@ -521,8 +520,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.02 - code: IJ02 + machineName: "WC-A-Injection Line M\xE1y 76" typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -995,7 +993,6 @@ MonoBehaviour: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} machineName: Injector No.07 - code: IJ07 typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -1068,7 +1065,7 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 671ce9b330bebd94bbb0ffdbbc359803, type: 2} - target: {fileID: 919132149155446097, guid: 6e52267a6acdcc44a9abb720f3ce7bdc, type: 3} propertyPath: m_Name - value: "5\uD638\uAE30" + value: "WC-A-Injection Line M\xE1y 59" objectReference: {fileID: 0} - target: {fileID: 5247692264100764378, guid: 6e52267a6acdcc44a9abb720f3ce7bdc, type: 3} propertyPath: 'm_Materials.Array.data[0]' @@ -1105,8 +1102,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.05 - code: IJ05 + machineName: "WC-A-Injection Line M\xE1y 59" typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -1448,7 +1444,6 @@ MonoBehaviour: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} machineName: Injector No.06 - code: IJ06 typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -1824,6 +1819,7 @@ Transform: - {fileID: 831243369} - {fileID: 1655900491} - {fileID: 1254832878} + - {fileID: 1881935906} m_Father: {fileID: 1007798844} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &816566959 @@ -3092,7 +3088,7 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 671ce9b330bebd94bbb0ffdbbc359803, type: 2} - target: {fileID: 919132149155446097, guid: 6e52267a6acdcc44a9abb720f3ce7bdc, type: 3} propertyPath: m_Name - value: "4\uD638\uAE30" + value: "WC-A-Injection Line M\xE1y 80" objectReference: {fileID: 0} - target: {fileID: 5247692264100764378, guid: 6e52267a6acdcc44a9abb720f3ce7bdc, type: 3} propertyPath: 'm_Materials.Array.data[0]' @@ -3129,8 +3125,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.04 - code: IJ04 + machineName: "WC-A-Injection Line M\xE1y 80" typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -3632,7 +3627,6 @@ MonoBehaviour: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} machineName: Injector No.08 - code: IJ08 typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -3922,7 +3916,7 @@ PrefabInstance: objectReference: {fileID: 2100000, guid: 671ce9b330bebd94bbb0ffdbbc359803, type: 2} - target: {fileID: 919132149155446097, guid: 6e52267a6acdcc44a9abb720f3ce7bdc, type: 3} propertyPath: m_Name - value: "3\uD638\uAE30" + value: "WC-A-Injection Line M\xE1y 32" objectReference: {fileID: 0} - target: {fileID: 5247692264100764378, guid: 6e52267a6acdcc44a9abb720f3ce7bdc, type: 3} propertyPath: 'm_Materials.Array.data[0]' @@ -3959,8 +3953,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} - machineName: Injector No.03 - code: IJ03 + machineName: "WC-A-Injection Line M\xE1y 32" typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -4960,7 +4953,6 @@ MonoBehaviour: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} machineName: GF6 C/VB LINE-1 - code: IJ09 typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} @@ -5722,6 +5714,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5ff9407c0dcbf9d41855621774d6355b, type: 3} m_Name: m_EditorClassIdentifier: + sceneName: Vietnam currentMachine: {fileID: 0} --- !u!1 &1753956306 GameObject: @@ -5980,13 +5973,56 @@ MonoBehaviour: m_EditorClassIdentifier: machineStatusIcon: {fileID: 0} machineName: GF9 C/VB LINE - code: IJ10 typeOptions: [] previewImage: {fileID: 21300000, guid: bd4916ec7d121a64c89f0e5472af9414, type: 3} centerPos: {x: 0, y: 0, z: 0} focusDistance: 10 focusAzimuth: 45 focusElevation: 45 +--- !u!1 &1881935905 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1881935906} + - component: {fileID: 1881935907} + m_Layer: 0 + m_Name: Roof + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1881935906 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1881935905} + serializedVersion: 2 + 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: 816566958} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1881935907 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1881935905} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e093f998e1d5444794dfffc794ae664, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1919776393 GameObject: m_ObjectHideFlags: 0 @@ -6033,7 +6069,7 @@ MonoBehaviour: m_EditorClassIdentifier: host: mqtt-input.flexing.ai port: 3000 - topics: XR/data/1a6079abc460216644aeabb7fa668b0c/SAMKWANG_GROUP_WORK,XR/data/348879b7122703b46a9cdd320ffbc7e6/SAMKWANG_TOTAL_WORK,XR/data/240ac85134594832ea6e288b943c19fd/SAMKWANG_EQUIPMENT,XR/data/6f9977e935c9938e9d50a3339fe2abe4/SAMKWANG_EQUIPMENT_DATA + topics: XR/data/6ecbf94795b7407b902282a68e6cb59b/SAMKWANG_GROUP_WORK,XR/data/30c5b3f23ad3bf7416851a07e8f3a4b3/SAMKWANG_TOTAL_WORK,XR/data/87d24e5b3510240e18679ce75e5a7944/SAMKWANG_EQUIPMENT,XR/data/8fb2904131a13c9ef268838e81dd04e9/SAMKWANG_EQUIPMENT_DATA branchinfos: SEND_TIME: 0 SERVER_RUNNING_TIME: 0 diff --git a/Assets/Scripts/Branch/Machine.cs b/Assets/Scripts/Branch/Machine.cs index 4d5c1b1..f09f276 100644 --- a/Assets/Scripts/Branch/Machine.cs +++ b/Assets/Scripts/Branch/Machine.cs @@ -9,7 +9,7 @@ namespace Samkwang public UI_MachineStatusIcon machineStatusIcon; public string machineName; - public string code; + //public string code; public string[] typeOptions; public Sprite previewImage; public Vector3 centerPos; diff --git a/Assets/Scripts/Branch/Manager/AlarmManager.cs b/Assets/Scripts/Branch/Manager/AlarmManager.cs index 386687e..2aa2afa 100644 --- a/Assets/Scripts/Branch/Manager/AlarmManager.cs +++ b/Assets/Scripts/Branch/Manager/AlarmManager.cs @@ -23,7 +23,7 @@ namespace Samkwang { foreach (var machine in machines) { - if (machine.code == machineName) + if (machine.machineName == machineName) { onFocusMachine?.Invoke(machine); } diff --git a/Assets/Scripts/Branch/Manager/DataManager.cs b/Assets/Scripts/Branch/Manager/DataManager.cs index 7fb87b1..1588641 100644 --- a/Assets/Scripts/Branch/Manager/DataManager.cs +++ b/Assets/Scripts/Branch/Manager/DataManager.cs @@ -9,9 +9,11 @@ namespace Samkwang { public class DataManager : MonoBehaviour { + public string sceneName; private Dictionary orderMap = new(); private Machine[] machines; + private List matchedMachineInfos = new List(); private Dictionary> equipmentInfos = new(); public Machine currentMachine; public Action> onSetMachineDatas; @@ -40,20 +42,20 @@ namespace Samkwang infoDict[info.worknm] = info; // Ű ֽ ͷ  } - var matchedInfos = new List(); + matchedMachineInfos.Clear(); foreach (var machine in machines) { - if (string.IsNullOrEmpty(machine.code)) + if (string.IsNullOrEmpty(machine.machineName)) continue; - if (infoDict.TryGetValue(machine.code, out var info)) + if (infoDict.TryGetValue(machine.machineName, out var info)) { - matchedInfos.Add(info); + matchedMachineInfos.Add(info); } } - var sortInfos = SortListByWorknm(matchedInfos); + var sortInfos = SortListByWorknm(matchedMachineInfos); onSetMachineDatas(sortInfos); UpdateShowMachineData(sortInfos); } @@ -64,12 +66,12 @@ namespace Samkwang } public void UpdateShowMachineData(List infos) { - if (currentMachine == null || currentMachine.code == null) + if (currentMachine == null || currentMachine.machineName == null) return; foreach(var info in infos) { - if(info.worknm == currentMachine.code) + if(info.worknm == currentMachine.machineName) { onSetMachineData(currentMachine,info); continue; @@ -100,22 +102,24 @@ namespace Samkwang } public void UpdateShowEquipmentData() { - if (currentMachine == null || currentMachine.code == null) + if (currentMachine == null || currentMachine.machineName == null) return; + var dataClearList = new List(); + if (equipmentInfos.Count() <= 0) { - onSetEquipmentDatas(currentMachine.code, new List()); + onSetEquipmentDatas(currentMachine.machineName, dataClearList); } else { - if (equipmentInfos.ContainsKey(currentMachine.code)) + if (equipmentInfos.ContainsKey(currentMachine.machineName)) { - onSetEquipmentDatas(currentMachine.code, equipmentInfos[currentMachine.code]); + onSetEquipmentDatas(currentMachine.machineName, equipmentInfos[currentMachine.machineName]); } else { - onSetEquipmentDatas(currentMachine.code, new List()); + onSetEquipmentDatas(currentMachine.machineName, dataClearList); } } } diff --git a/Assets/Scripts/Branch/Manager/LibraryManager.cs b/Assets/Scripts/Branch/Manager/LibraryManager.cs index 0ec6b55..53af5f2 100644 --- a/Assets/Scripts/Branch/Manager/LibraryManager.cs +++ b/Assets/Scripts/Branch/Manager/LibraryManager.cs @@ -107,7 +107,7 @@ namespace Samkwang machines = building.floors.SelectMany(f => f.machines).ToArray(); foreach (var info in standardInfos) { - var p = machines.Where(x => x.code.Equals(info.code)).FirstOrDefault(); + var p = machines.Where(x => x.machineName.Equals(info.code)).FirstOrDefault(); if (p == null) continue; p.typeOptions = info.filterInfo; diff --git a/Assets/Scripts/Branch/Manager/MachineStatusIconManager.cs b/Assets/Scripts/Branch/Manager/MachineStatusIconManager.cs index f64603a..48415c1 100644 --- a/Assets/Scripts/Branch/Manager/MachineStatusIconManager.cs +++ b/Assets/Scripts/Branch/Manager/MachineStatusIconManager.cs @@ -64,13 +64,13 @@ namespace Samkwang if (machineIcons.ContainsKey(data.worknm)) { - machineIcons[data.worknm].SetData(data, machine.code); + machineIcons[data.worknm].SetData(data, machine.machineName); uiElements.Add(machineIcons[data.worknm].rectTransform); continue; } var machineIcon = Instantiate(prefab_MachineStatusIcon, transform); - machineIcon.SetData(data, machine.code); + machineIcon.SetData(data, machine.machineName); machineIcon.onClickIcon += OnClickMachineKPI; machineIcon.name = data.worknm; machineIcon.gameObject.SetActive(false); @@ -81,9 +81,9 @@ namespace Samkwang foreach (var machine in machines) { - if (machineIcons.ContainsKey(machine.code)) + if (machineIcons.ContainsKey(machine.machineName)) { - machine.machineStatusIcon = machineIcons[machine.code]; + machine.machineStatusIcon = machineIcons[machine.machineName]; matchingMachines.Add(machine); iconToMachines.Add(machine.machineStatusIcon, machine); } @@ -94,7 +94,7 @@ namespace Samkwang Machine machine = null; for (int i = 0; i < machines.Length; i++) { - if (machines[i].code == worknm) + if (machines[i].machineName == worknm) { machine = machines[i]; break; diff --git a/Assets/Scripts/Branch/TourController.cs b/Assets/Scripts/Branch/TourController.cs index a497b29..ec68a2c 100644 --- a/Assets/Scripts/Branch/TourController.cs +++ b/Assets/Scripts/Branch/TourController.cs @@ -163,12 +163,13 @@ namespace Samkwang int nextIndex = (i + 1) % orbitCount; var point = tourPoints[i]; var nextPoint = tourPoints[nextIndex]; + var wfs = new WaitForSeconds(point.waitTime); // orbit 섹션에서는 OrbitLookAt으로 동작(유연성 위해 point.type 무시) yield return StartCoroutine(MoveOrbitTo(nextPoint.transform.position, orbitCenterPos, point.moveSpeed, point.rotateSpeed)); if (!isPlaying) yield break; - if (point.waitTime > 0f) yield return new WaitForSeconds(point.waitTime); + if (point.waitTime > 0f) yield return wfs; } // 2) orbit -> loopStart (천천히 진입) (만약 loop 구간이 유효하면) @@ -212,6 +213,8 @@ namespace Samkwang if (!isPlaying) yield break; + var wfs = new WaitForSeconds(point.waitTime); + if (point.type == PingType.MoveDirect) { yield return StartCoroutine(MoveTo(nextPoint.transform.position, point.moveSpeed)); @@ -221,12 +224,13 @@ namespace Samkwang var dir = (nextPoint.transform.position - tourCamera.transform.position).normalized; float az = Mathf.Atan2(dir.x, dir.z) * Mathf.Rad2Deg; float el = -Mathf.Asin(dir.y) * Mathf.Rad2Deg; + yield return StartCoroutine(RotateTo(az, el, point.rotateSpeed)); if (!isPlaying) yield break; - if (point.waitTime > 0f) - yield return new WaitForSeconds(point.waitTime); + if (point.waitTime > 0f) + yield return wfs; if (!isPlaying) yield break; yield return StartCoroutine(MoveTo(nextPoint.transform.position, point.moveSpeed)); @@ -239,7 +243,7 @@ namespace Samkwang // 1) 지정 방향 바라보기 yield return StartCoroutine(RotateTo(point.targetAzimuth, point.targetElevation, point.rotateSpeed)); if (!isPlaying) yield break; - if (point.waitTime > 0f) yield return new WaitForSeconds(point.waitTime); + if (point.waitTime > 0f) yield return wfs; if (!isPlaying) yield break; // 2) 다음 포인트 쪽으로 돌아보기 diff --git a/Assets/Scripts/Branch/UI/Panel_Library.cs b/Assets/Scripts/Branch/UI/Panel_Library.cs index 6bd3bc9..2f896d1 100644 --- a/Assets/Scripts/Branch/UI/Panel_Library.cs +++ b/Assets/Scripts/Branch/UI/Panel_Library.cs @@ -138,7 +138,7 @@ namespace Samkwang else { var matched = allMachines - .Where(machine => machine.code.Contains(currentSearchKeyword, StringComparison.OrdinalIgnoreCase)) + .Where(machine => machine.machineName.Contains(currentSearchKeyword, StringComparison.OrdinalIgnoreCase)) .ToHashSet(); UpdateLibraryMachineList(matched); @@ -156,16 +156,16 @@ namespace Samkwang foreach (var machine in sorted) { - if (!addLibraryButtons.ContainsKey(machine.code)) + if (!addLibraryButtons.ContainsKey(machine.machineName)) { var btn = Instantiate(prf_LibraryButton, content); btn.SettingButton(machine); btn.onClickButton += OnClickLibraryButton; - addLibraryButtons.Add(machine.code, btn); + addLibraryButtons.Add(machine.machineName, btn); } else { - addLibraryButtons[machine.code].gameObject.SetActive(true); + addLibraryButtons[machine.machineName].gameObject.SetActive(true); } } } @@ -183,7 +183,7 @@ namespace Samkwang var workcdOrder = JsonConvert.DeserializeObject>(dataOrder); var orderMap = workcdOrder.Select((workcd, index) => new { workcd, index }).ToDictionary(x => x.workcd, x => x.index); - return machines.OrderBy(field => orderMap[field.code]).ToList(); + return machines.OrderBy(field => orderMap[field.machineName]).ToList(); } diff --git a/Assets/Scripts/Branch/UI/Panel_MachineDataDashboard.cs b/Assets/Scripts/Branch/UI/Panel_MachineDataDashboard.cs index beb91e1..56a5820 100644 --- a/Assets/Scripts/Branch/UI/Panel_MachineDataDashboard.cs +++ b/Assets/Scripts/Branch/UI/Panel_MachineDataDashboard.cs @@ -14,7 +14,6 @@ namespace Samkwang public ScrollRect ScrollView_DataInfo; public RectTransform Image_Loading; public Button Button_Close; - private Button currentTabButton; public UI_MachineDataInfoItem prf_DataInfoItem; @@ -98,6 +97,10 @@ namespace Samkwang foreach (var field in fields) { var info = (string)field.GetValue(data); + + if (!dataInfoItems.ContainsKey($"{field}_{index}")) + continue; + dataInfoItems[$"{field}_{index}"].Setting(field.Name, info); } } diff --git a/Assets/Scripts/Branch/UI/Panel_MachineDetailDashboard.cs b/Assets/Scripts/Branch/UI/Panel_MachineDetailDashboard.cs index fed96d3..4603173 100644 --- a/Assets/Scripts/Branch/UI/Panel_MachineDetailDashboard.cs +++ b/Assets/Scripts/Branch/UI/Panel_MachineDetailDashboard.cs @@ -136,7 +136,9 @@ namespace Samkwang } private void SetTextData(CompleteInfo data, Machine machine) { - MachineName.SetText(SetNameData(data.worknm, machine.code)); + MachineName.SetText(SetNameData(data.worknm, machine.machineName)); + MachineName.rectTransform.anchoredPosition = new Vector2(-MachineName.preferredWidth, MachineName.rectTransform.anchoredPosition.y); + wordno.SetText(SetTextData(data.wordno)); sttm.SetText(CorrectionTime(data.sttm, "hh:mm")); totm.SetText(CorrectionTime(data.totm, "hh:mm")); diff --git a/Assets/Scripts/Branch/UI/Panel_ProductionProgress.cs b/Assets/Scripts/Branch/UI/Panel_ProductionProgress.cs index 924f464..e907e32 100644 --- a/Assets/Scripts/Branch/UI/Panel_ProductionProgress.cs +++ b/Assets/Scripts/Branch/UI/Panel_ProductionProgress.cs @@ -88,9 +88,10 @@ namespace Samkwang statusContents[currentContentIndex].gameObject.transform.SetAsFirstSibling(); currentContentIndex++; + var wfs = new WaitForSeconds(changeDataTime); while (true) { - yield return new WaitForSeconds(changeDataTime); + yield return wfs; if (currentContentIndex >= statusContents.Values.Count) { diff --git a/Assets/Scripts/Branch/UI/Panel_TopToolBar.cs b/Assets/Scripts/Branch/UI/Panel_TopToolBar.cs index 2f32bf4..731310f 100644 --- a/Assets/Scripts/Branch/UI/Panel_TopToolBar.cs +++ b/Assets/Scripts/Branch/UI/Panel_TopToolBar.cs @@ -10,7 +10,7 @@ namespace Samkwang { public class Panel_TopToolBar : MonoBehaviour { - + public Button Button_Logo; public Button Button_TotalProgress; public Button Button_WorkProgress; @@ -50,6 +50,8 @@ namespace Samkwang { var buttonDict = transform.GetChildComponentsByName