diff --git a/Assets/Prefabs/UI/Panel/Panel_Menu.prefab b/Assets/Prefabs/UI/Panel/Panel_Menu.prefab index b90648c6..193bd9f3 100644 --- a/Assets/Prefabs/UI/Panel/Panel_Menu.prefab +++ b/Assets/Prefabs/UI/Panel/Panel_Menu.prefab @@ -780,8 +780,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 307.8999, y: -12.009979} - m_SizeDelta: {x: 65, y: 14} + m_AnchoredPosition: {x: 301.1999, y: -12.009979} + m_SizeDelta: {x: 80, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2202562145910905305 CanvasRenderer: @@ -10040,8 +10040,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 307.89987, y: -11.999939} - m_SizeDelta: {x: 65, y: 14} + m_AnchoredPosition: {x: 301.19992, y: -12} + m_SizeDelta: {x: 80, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &186761788535113537 CanvasRenderer: @@ -15468,8 +15468,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 307.8999, y: -12.009979} - m_SizeDelta: {x: 65, y: 14} + m_AnchoredPosition: {x: 301.1999, y: -12.009979} + m_SizeDelta: {x: 80, y: 14} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7656610146868460002 CanvasRenderer: diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index bebac853..c42c3110 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -14804,6 +14804,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Graph: {fileID: 0} + chartDetailData: {fileID: 0} graphName: "\uC8FC\uBCC0\uC2B5\uB3C4" isMainChart: 0 --- !u!222 &73895479 @@ -44043,7 +44044,7 @@ MonoBehaviour: m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 - m_ActiveFontFeatures: 00000000 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 @@ -76947,6 +76948,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Graph: {fileID: 0} + chartDetailData: {fileID: 0} graphName: "\uC8FC\uBCC0\uC628\uB3C4(\xB0C)" isMainChart: 0 --- !u!222 &374636466 @@ -88006,7 +88008,7 @@ 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: 349, y: 0} + m_AnchoredPosition: {x: 340.22998, y: 0} m_SizeDelta: {x: 20, y: 20} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &437699119 @@ -90253,6 +90255,81 @@ Transform: type: 3} m_PrefabInstance: {fileID: 449393684} m_PrefabAsset: {fileID: 0} +--- !u!1 &450031050 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 450031051} + - component: {fileID: 450031053} + - component: {fileID: 450031052} + m_Layer: 5 + m_Name: Cover + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &450031051 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 450031050} + 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: 1544034178} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &450031052 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 450031050} + 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: 0} + 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 &450031053 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 450031050} + m_CullTransparentMesh: 1 --- !u!1 &450384387 GameObject: m_ObjectHideFlags: 0 @@ -125257,8 +125334,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 30} + m_AnchoredPosition: {x: -2, y: 0} + m_SizeDelta: {x: -6, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &626203352 MonoBehaviour: @@ -161666,6 +161743,81 @@ Transform: type: 3} m_PrefabInstance: {fileID: 713862078} m_PrefabAsset: {fileID: 0} +--- !u!1 &714145478 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 714145479} + - component: {fileID: 714145481} + - component: {fileID: 714145480} + m_Layer: 5 + m_Name: Cover + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &714145479 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 714145478} + 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: 790001947} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &714145480 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 714145478} + 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: 0} + 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 &714145481 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 714145478} + m_CullTransparentMesh: 1 --- !u!1 &714320546 GameObject: m_ObjectHideFlags: 0 @@ -186811,6 +186963,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1508423374} + - {fileID: 714145479} m_Father: {fileID: 1749542293} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} @@ -216816,6 +216969,82 @@ BoxCollider: serializedVersion: 3 m_Size: {x: 1.0000002, y: 1, z: 1} m_Center: {x: 0, y: -0.000000059604645, z: 0} +--- !u!1 &863600739 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 863600740} + - component: {fileID: 863600742} + - component: {fileID: 863600741} + m_Layer: 5 + m_Name: Panel_NotData + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &863600740 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 863600739} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 1526106608} + m_Father: {fileID: 907476996} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -8.667511, y: -69.738495} + m_SizeDelta: {x: 1652.165, y: 562.04297} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &863600741 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 863600739} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 374d6b5d651e6b74e97a0896e8b38bbf, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &863600742 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 863600739} + m_CullTransparentMesh: 1 --- !u!1 &863997601 GameObject: m_ObjectHideFlags: 0 @@ -219585,7 +219814,7 @@ MonoBehaviour: m_linkedTextComponent: {fileID: 0} parentLinkedComponent: {fileID: 0} m_enableKerning: 1 - m_ActiveFontFeatures: 00000000 + m_ActiveFontFeatures: 6e72656b m_enableExtraPadding: 0 checkPaddingRequired: 0 m_isRichText: 1 @@ -222176,7 +222405,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 226.26123, y: 89.053406} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 250, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &890313741 @@ -222194,7 +222423,7 @@ MonoBehaviour: DataName: {fileID: 0} DataValue: {fileID: 0} DateTime: {fileID: 0} - offset: {x: 125, y: 50, z: 0} + offset: {x: -120, y: 10, z: 0} --- !u!114 &890313742 MonoBehaviour: m_ObjectHideFlags: 0 @@ -225717,9 +225946,9 @@ RectTransform: - {fileID: 1992036390} - {fileID: 71533337} - {fileID: 16506882} + - {fileID: 863600740} - {fileID: 1102646602} - {fileID: 705522611} - - {fileID: 1526106608} m_Father: {fileID: 1673135432} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -239304,6 +239533,81 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 979166179} m_Mesh: {fileID: 4300000, guid: 7ea2621aee6566047a71541168ed38ae, type: 2} +--- !u!1 &979616009 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 979616010} + - component: {fileID: 979616012} + - component: {fileID: 979616011} + m_Layer: 5 + m_Name: Cover + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &979616010 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 979616009} + 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: 1547586988} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &979616011 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 979616009} + 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: 0} + 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 &979616012 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 979616009} + m_CullTransparentMesh: 1 --- !u!1 &980255593 GameObject: m_ObjectHideFlags: 0 @@ -344154,7 +344458,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &1526106608 RectTransform: m_ObjectHideFlags: 0 @@ -344162,12 +344466,12 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1526106607} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: 907476996} + m_Father: {fileID: 863600740} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -347433,6 +347737,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1383965005} + - {fileID: 450031051} m_Father: {fileID: 374636463} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} @@ -348418,6 +348723,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 193495140} + - {fileID: 979616010} m_Father: {fileID: 73895476} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} @@ -390001,6 +390307,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Graph: {fileID: 0} + chartDetailData: {fileID: 0} graphName: "\uC2F8\uC774\uD074\uD0C0\uC784" isMainChart: 0 --- !u!222 &1749542296 @@ -410221,11 +410528,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 72826899763102914, guid: b59b3195a2b1ed64ebe226010a38ae94, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.000038146973 - objectReference: {fileID: 0} - target: {fileID: 1384948461540278751, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_AnchorMax.y @@ -410246,16 +410548,6 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 2364008575253282443, guid: b59b3195a2b1ed64ebe226010a38ae94, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0.00047302246 - objectReference: {fileID: 0} - - target: {fileID: 2400748074649539468, guid: b59b3195a2b1ed64ebe226010a38ae94, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.000038146973 - objectReference: {fileID: 0} - target: {fileID: 4279625218761935695, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_AnchorMax.y @@ -410286,11 +410578,6 @@ PrefabInstance: propertyPath: m_Name value: Panel_Menu objectReference: {fileID: 0} - - target: {fileID: 5357827643854497337, guid: b59b3195a2b1ed64ebe226010a38ae94, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.000038146973 - objectReference: {fileID: 0} - target: {fileID: 6187420705898449986, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_Pivot.x @@ -410396,16 +410683,6 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7596382070873155345, guid: b59b3195a2b1ed64ebe226010a38ae94, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.000038146973 - objectReference: {fileID: 0} - - target: {fileID: 8978297681017112528, guid: b59b3195a2b1ed64ebe226010a38ae94, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -0.000038146973 - objectReference: {fileID: 0} - target: {fileID: 9057057586466721074, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_AnchorMax.y @@ -453004,6 +453281,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: Graph: {fileID: 0} + chartDetailData: {fileID: 0} graphName: "\uBCF4\uC555 (Peak)" isMainChart: 1 --- !u!222 &2059883911 diff --git a/Assets/Scripts/UI/Panel_WorkConditionAnalysis.cs b/Assets/Scripts/UI/Panel_WorkConditionAnalysis.cs index 3d66d76a..46eff16d 100644 --- a/Assets/Scripts/UI/Panel_WorkConditionAnalysis.cs +++ b/Assets/Scripts/UI/Panel_WorkConditionAnalysis.cs @@ -27,7 +27,7 @@ namespace CHN //private TMP_InputField InputField_WorkOrderNumber; private Button Button_Search; private Button Button_Close; - private TextMeshProUGUI NotDataText; + private RectTransform Panel_NotData; private TextMeshProUGUI ITEMCD; private TMP_Dropdown Dropdown_DataColumn; @@ -88,6 +88,7 @@ namespace CHN public void Close() { effect.transform.gameObject.SetActive(false); + ui_Calendar.SetActive(false); gameObject.SetActive(false); gameObject.transform.localScale = Vector3.zero; } @@ -179,11 +180,11 @@ namespace CHN { if (workConditionsData.data.count == "0") { - NotDataText.gameObject.SetActive(true); + Panel_NotData.gameObject.SetActive(true); ChartDatas.gameObject.SetActive(false); return; } - NotDataText.gameObject.SetActive(false); + Panel_NotData.gameObject.SetActive(false); ChartDatas.gameObject.SetActive(true); data = workConditionsData; diff --git a/Assets/WorkSpace/Personal/JYM/UI_GraphChart.cs b/Assets/WorkSpace/Personal/JYM/UI_GraphChart.cs index 4884b575..37ea3755 100644 --- a/Assets/WorkSpace/Personal/JYM/UI_GraphChart.cs +++ b/Assets/WorkSpace/Personal/JYM/UI_GraphChart.cs @@ -15,7 +15,7 @@ public class UI_GraphChart : UIBase, IPointerClickHandler //public UI_DateTime prf_dateTime; //public RectTransform Content_DateTime; - private UI_GraphChartData chartDetailData; + public UI_GraphChartData chartDetailData; private TextMeshProUGUI GraphName; public string graphName; @@ -38,7 +38,24 @@ public class UI_GraphChart : UIBase, IPointerClickHandler { Graph = GetComponentInChildren(); //prf_dateTime = Resources.Load("Prefabs/UI/PRF_UI_DateTime"); - chartDetailData = FindSingle(); + chartDetailData = GetComponentInChildren(true); + } + public void Update() + { + if (!isMainChart) + return; + + if (Input.GetMouseButtonDown(0)) + { + if (RectTransformUtility.RectangleContainsScreenPoint(chartDetailData.rectTransform, Input.mousePosition)) + { + Debug.Log(""); + return; + } + + + chartDetailData.SetActive(false); + } } public void OnPointerClick(PointerEventData eventData) { diff --git a/Assets/WorkSpace/Personal/JYM/UI_GraphChartData.cs b/Assets/WorkSpace/Personal/JYM/UI_GraphChartData.cs index 2cf17cc4..84276e8c 100644 --- a/Assets/WorkSpace/Personal/JYM/UI_GraphChartData.cs +++ b/Assets/WorkSpace/Personal/JYM/UI_GraphChartData.cs @@ -21,7 +21,7 @@ public class UI_GraphChartData : UIBase, ISingle } public void SetData(string dataName, float dataValue, string dateTime, Vector3 pos) { - ShowUINextToClickedUI(); + ShowUINextToClickedUI(pos); DataName.SetText(dataName); DateTime.SetText(dateTime); @@ -31,26 +31,16 @@ public class UI_GraphChartData : UIBase, ISingle } - void ShowUINextToClickedUI() + void ShowUINextToClickedUI(Vector3 topPosition) { RectTransform parentRectTransform = rectTransform.parent.GetComponent(); - Vector2 localPoint; - RectTransformUtility.ScreenPointToLocalPointInRectangle(parentRectTransform, Input.mousePosition, null, out localPoint); + var parentSize = parentRectTransform.rect.size; + var uiSize = rectTransform.rect.size; - rectTransform.localPosition = new Vector2(localPoint.x + offset.x, localPoint.y + offset.y); + float clampedX = Mathf.Clamp(topPosition.x + offset.x, -parentSize.x / 2 + uiSize.x / 2, parentSize.x / 2 - uiSize.x / 2); + rectTransform.localPosition = new Vector2(clampedX, offset.y); gameObject.SetActive(true); } - - void Update() - { - if (Input.GetMouseButtonDown(0)) - { - if (EventSystem.current.currentSelectedGameObject != null) - return; - - SetActive(false); - } - } } diff --git a/CompleteTimeAlarmInfo.json b/CompleteTimeAlarmInfo.json index 5fcf8654..59377c66 100644 --- a/CompleteTimeAlarmInfo.json +++ b/CompleteTimeAlarmInfo.json @@ -1237,7 +1237,7 @@ "worknm": "INLET TUBE LINE", "workseq": "1", "status": "1", - "statusnm": "가동중", + "statusnm": "비가동", "itemcd": "WP131-GE000", "itemdesc": "INLET-TUBE ASSY W/P", "pjtcd": "GME T4", @@ -1605,7 +1605,7 @@ "sttm": "0800", "totm": "", "goaltime": "468", - "ptotm": "2025-04-07 12:44:06", + "ptotm": "2025-04-07 17:39:36", "psttm": "2025-04-03 08:00:12" }, "isCheck": false