완료 시간 알람 오류 및 작업 조건 분석 차트 오류 수정

Assets/Resources/Prefabs/UI/PRF_UI_CalendarItem.prefab

@@ -35,7 +35,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 20, y: 18}
+  m_SizeDelta: {x: 22, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3666807232690463195
 CanvasRenderer:
@@ -110,7 +110,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 20, y: 18}
+  m_SizeDelta: {x: 22, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5210010463140993914
 CanvasRenderer:
@@ -189,7 +189,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 28, y: 18}
+  m_SizeDelta: {x: 30, y: 25}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8570022658130637124
 CanvasRenderer:
@@ -250,7 +250,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 20, y: 18}
+  m_SizeDelta: {x: 22, y: 20}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3126620628418126379
 CanvasRenderer:
@@ -384,8 +384,8 @@ MonoBehaviour:
   m_faceColor:
     serializedVersion: 2
     rgba: 4294967295
-  m_fontSize: 10
+  m_fontSize: 12
-  m_fontSizeBase: 10
+  m_fontSizeBase: 12
   m_fontWeight: 400
   m_enableAutoSizing: 0
   m_fontSizeMin: 18
@@ -400,15 +400,17 @@ MonoBehaviour:
   m_lineSpacingMax: 0
   m_paragraphSpacing: 0
   m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
+  m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
   m_overflowMode: 0
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 1
+  m_ActiveFontFeatures: 6e72656b
   m_enableExtraPadding: 0
   checkPaddingRequired: 0
   m_isRichText: 1
+  m_EmojiFallbackSupport: 1
   m_parseCtrlCharacters: 1
   m_isOrthographic: 1
   m_isCullingEnabled: 0

Assets/Scenes/Main.unity

@@ -6642,15 +6642,7 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents:
+    m_AddedComponents: []
-    - targetCorrespondingSourceObject: {fileID: 1144717434440760548, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 1141253386675250457, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
   m_SourcePrefab: {fileID: 100100000, guid: c9bce1caf6ea7ac41bb8db48ac6a3804, type: 3}
 --- !u!4 &38146197 stripped
 Transform:
@@ -9253,15 +9245,7 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents:
+    m_AddedComponents: []
-    - targetCorrespondingSourceObject: {fileID: 1144717434440760548, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 1141253386675250457, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
   m_SourcePrefab: {fileID: 100100000, guid: c9bce1caf6ea7ac41bb8db48ac6a3804, type: 3}
 --- !u!4 &49935829 stripped
 Transform:
@@ -105109,15 +105093,7 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents:
+    m_AddedComponents: []
-    - targetCorrespondingSourceObject: {fileID: 1144717434440760548, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 1141253386675250457, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
   m_SourcePrefab: {fileID: 100100000, guid: c9bce1caf6ea7ac41bb8db48ac6a3804, type: 3}
 --- !u!4 &525845529 stripped
 Transform:
@@ -106727,15 +106703,7 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents:
+    m_AddedComponents: []
-    - targetCorrespondingSourceObject: {fileID: 1144717434440760548, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 1141253386675250457, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
   m_SourcePrefab: {fileID: 100100000, guid: c9bce1caf6ea7ac41bb8db48ac6a3804, type: 3}
 --- !u!4 &533384349 stripped
 Transform:
@@ -208211,8 +208179,8 @@ MonoBehaviour:
     automaticVerticalViewGap: 5
     automaticVerticallView: 0
     automaticcHorizontaViewGap: 0
-    automaticHorizontalView: 0
+    automaticHorizontalView: 1
-    horizontalViewSize: 50
+    horizontalViewSize: 10
     horizontalViewOrigin: 0
     verticalViewSize: 10
     verticalViewOrigin: 0
@@ -251869,15 +251837,7 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents:
+    m_AddedComponents: []
-    - targetCorrespondingSourceObject: {fileID: 1144717434440760548, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 1141253386675250457, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
   m_SourcePrefab: {fileID: 100100000, guid: c9bce1caf6ea7ac41bb8db48ac6a3804, type: 3}
 --- !u!4 &1041951697 stripped
 Transform:
@@ -251966,15 +251926,7 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents:
+    m_AddedComponents: []
-    - targetCorrespondingSourceObject: {fileID: 1144717434440760548, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 1141253386675250457, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
   m_SourcePrefab: {fileID: 100100000, guid: c9bce1caf6ea7ac41bb8db48ac6a3804, type: 3}
 --- !u!4 &1042066554 stripped
 Transform:
@@ -318929,15 +318881,7 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents:
+    m_AddedComponents: []
-    - targetCorrespondingSourceObject: {fileID: 1144717434440760548, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 1141253386675250457, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
   m_SourcePrefab: {fileID: 100100000, guid: c9bce1caf6ea7ac41bb8db48ac6a3804, type: 3}
 --- !u!4 &1389217140 stripped
 Transform:
@@ -319055,15 +318999,7 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents:
+    m_AddedComponents: []
-    - targetCorrespondingSourceObject: {fileID: 1144717434440760548, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 1141253386675250457, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
   m_SourcePrefab: {fileID: 100100000, guid: c9bce1caf6ea7ac41bb8db48ac6a3804, type: 3}
 --- !u!4 &1391906093 stripped
 Transform:
@@ -328017,15 +327953,7 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents:
+    m_AddedComponents: []
-    - targetCorrespondingSourceObject: {fileID: 1144717434440760548, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 1141253386675250457, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
   m_SourcePrefab: {fileID: 100100000, guid: c9bce1caf6ea7ac41bb8db48ac6a3804, type: 3}
 --- !u!4 &1438514985 stripped
 Transform:
@@ -391146,15 +391074,7 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents:
+    m_AddedComponents: []
-    - targetCorrespondingSourceObject: {fileID: 1144717434440760548, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 1141253386675250457, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
   m_SourcePrefab: {fileID: 100100000, guid: c9bce1caf6ea7ac41bb8db48ac6a3804, type: 3}
 --- !u!4 &1745370043 stripped
 Transform:
@@ -395054,15 +394974,7 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents:
+    m_AddedComponents: []
-    - targetCorrespondingSourceObject: {fileID: 1144717434440760548, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 1141253386675250457, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
   m_SourcePrefab: {fileID: 100100000, guid: c9bce1caf6ea7ac41bb8db48ac6a3804, type: 3}
 --- !u!4 &1764783461 stripped
 Transform:
@@ -405550,15 +405462,7 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents:
+    m_AddedComponents: []
-    - targetCorrespondingSourceObject: {fileID: 1144717434440760548, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 1141253386675250457, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
   m_SourcePrefab: {fileID: 100100000, guid: c9bce1caf6ea7ac41bb8db48ac6a3804, type: 3}
 --- !u!4 &1809110806 stripped
 Transform:
@@ -427404,7 +427308,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!4 &1913767675
 Transform:
   m_ObjectHideFlags: 0
@@ -451737,15 +451641,7 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents:
+    m_AddedComponents: []
-    - targetCorrespondingSourceObject: {fileID: 1144717434440760548, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 1141253386675250457, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
   m_SourcePrefab: {fileID: 100100000, guid: c9bce1caf6ea7ac41bb8db48ac6a3804, type: 3}
 --- !u!4 &2050526720 stripped
 Transform:
@@ -455840,15 +455736,7 @@ PrefabInstance:
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents:
+    m_AddedComponents: []
-    - targetCorrespondingSourceObject: {fileID: 1144717434440760548, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
-    - targetCorrespondingSourceObject: {fileID: 1141253386675250457, guid: c9bce1caf6ea7ac41bb8db48ac6a3804,
-        type: 3}
-      insertIndex: -1
-      addedObject: {fileID: 0}
   m_SourcePrefab: {fileID: 100100000, guid: c9bce1caf6ea7ac41bb8db48ac6a3804, type: 3}
 --- !u!4 &2066866556 stripped
 Transform:
@@ -486166,7 +486054,7 @@ GameObject:
   - component: {fileID: 543450652765985303}
   - component: {fileID: 919132149047771310}
   m_Layer: 6
-  m_Name: ChunilMachines_2F_250207
+  m_Name: Chunil_Building
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0

Assets/Scripts/CHNRaycaster.cs

@@ -13,15 +13,10 @@ namespace CHN
         public Machine currentClickMachine;
 
         RaycastHit[] hitInfo = new RaycastHit[16];
-        Canvas_Popup popupCanvas;
 
         RaycastHit hit;
-        Canvas_Top topCanvas;
 
         public event Action<Machine> onLeftClickMachine;
-        public event Action<Machine> onRightClickMachine;
-        public event Action onRightClick;
-        public event Action<BoardType> onClickProductionBoard;
         public event Action onClickThermostat;
 
         public LayerMask floorLayers;
@@ -30,8 +25,6 @@ namespace CHN
         public override void AfterAwake()
         {
             controller = FindSingle<OrbitalController>();
-            popupCanvas = FindSingle<Canvas_Popup>();
-            topCanvas = FindSingle<Canvas_Top>();
         }
         public override void AfterStart()
         {

Assets/Scripts/EventConnecter.cs

@@ -119,8 +119,6 @@ namespace CHN
             productionStatusManager.onFirstFloorInfo += popupCanvas.panel_injectionproduction.SetProductionStatus;
             productionStatusManager.onSecondFloorInfo += popupCanvas.panel_assemblyproduction.SetProductionStatus;
             productionStatusManager.onWorkShopInfo += popupCanvas.panel_workprogressstatus.SetWorkProgressStatus;
-            productionStatusManager.onActiveFirstBoard += popupCanvas.panel_injectionproduction.Open;
-            productionStatusManager.onActiveSecondBoard += popupCanvas.panel_assemblyproduction.Open;
 
             completeTimeManager.onLoadData += popupCanvas.panel_completealramhistory.SetAlarmInfoItems;
             completeTimeManager.onUnloadData += popupCanvas.panel_completealramhistory.SetAlarmInfoItems;
@@ -146,7 +144,6 @@ namespace CHN
             raycaster.onLeftClickMachine += popupCanvas.MachineDashBoardOpenFromOnClick;
             raycaster.onLeftClickMachine += highLightManager.ClickNotKPIToHighlight;
             raycaster.onClickThermostat += popupCanvas.panel_thermostatcontrol.Open;
-            raycaster.onClickProductionBoard += productionStatusManager.ActiveBoardToType;
 
             optionManager.onCompletedLoadOption += popupCanvas.panel_controlsetting.InitOptionSetting;
             optionManager.onCompletedLoadOption += popupCanvas.panel_protocolsetting.InitOptionSetting;

Assets/Scripts/ProductionStatusManager.cs

@@ -22,9 +22,6 @@ namespace CHN
 
         public Action<List<WorkShopInfo>> onWorkShopInfo;
 
-        public Action onActiveFirstBoard;
-        public Action onActiveSecondBoard;
-
         public override void AfterAwake()
         {
             building = FindSingle<Building>();
@@ -72,18 +69,6 @@ namespace CHN
                 }
             }
         }
-        public void ActiveBoardToType(BoardType boardType)
-        {
-            switch (boardType)
-            {
-                case BoardType.Injection:
-                    onActiveFirstBoard?.Invoke();
-                    break;
-                case BoardType.Assembly:
-                    onActiveSecondBoard?.Invoke();
-                    break;
-            }
-        }
     }
 
 }

Assets/Scripts/UI/Canvas_Popup.cs

@@ -33,7 +33,6 @@ namespace CHN
         public Panel_MachineDashBoard currentDashBoard;
         public Action onOpenDashboard;
 
-        private float multiply = 1.1f;
         public override void AfterAwake()
         {
             var asset = Resources.Load<Panel_MachineDashBoard>("Prefabs/UI/PRF_Panel_MachineDashBoard");

Assets/Scripts/UI/Panel_CompleteAlramHistory.cs

@@ -54,11 +54,7 @@ namespace CHN
         {
             ActiveLoadingImage(true);
 
-            var sortedInfos = infos.Select(data => new
+            var sortedInfos = SetSortInfoData(infos);
-            {
-                AlarmData = data,
-                Date = DateTime.Parse(data.completeInfo.ptotm)
-            }).OrderByDescending(item => item.Date).Select(item => item.AlarmData).ToList();
 
             for (int i = 0; i < sortedInfos.Count; i++)
             {
@@ -84,6 +80,26 @@ namespace CHN
 
             BlinkAlarmItems();
         }
+        private List<CompleteTimeAlarmData> SetSortInfoData(List<CompleteTimeAlarmData> infos)
+        {
+            var sortedInfos = infos.Select(data =>
+            {
+                DateTime parsedDate;
+                bool isValid = DateTime.TryParse(data.completeInfo.ptotm, out parsedDate);
+                return new
+                {
+                    AlarmData = data,
+                    IsValid = isValid,
+                    Date = parsedDate
+                };
+            })
+            .Where(item => item.IsValid)
+            .OrderByDescending(item => item.Date)
+            .Select(item => item.AlarmData)
+            .ToList();
+
+            return sortedInfos;
+        }
         private void BlinkAlarmItems()
         {
             onCheckAlarm?.Invoke(notCheckAlramList.Count);

Assets/WorkSpace/Personal/JYM/TestBarChart.cs

@@ -1,19 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using CHN;
-using Newtonsoft.Json;
-
-public class TestBarChart : MonoBehaviour
-{
-    private WorkTimeManager test;
-    // Start is called before the first frame update
-    void Start()
-    {
-        var textData = Resources.Load<TextAsset>("Test");
-        var response = JsonConvert.DeserializeObject<WorkTimeData>(textData.ToString());
-
-        test = FindSingle<WorkTimeManager>();
-        test.SetWorkTimeData(response);
-    }
-}

Assets/WorkSpace/Personal/JYM/TestBarChart.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 88590da1ce6ef634888523925f8df0d4
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: