From 626df5be5f2494416dec590319a64f2ebbf9b727 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: Tue, 10 Feb 2026 21:43:10 +0900 Subject: [PATCH] =?UTF-8?q?[=EC=A0=95=EC=98=81=EB=AF=BC]=20=EC=B9=B4?= =?UTF-8?q?=EB=A9=94=EB=9D=BC=20=EC=9C=84=EC=B9=98=20=EC=A1=B0=EC=A0=95=20?= =?UTF-8?q?=EB=B0=8F=20UI=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 26.02.10 - 카메라 위치 조정 - UI 오류 수정 --- .../Factory_Interior/OCTODAY_Twin.unity | 234 +++++++++--------- .../Prefab/Injector_Bench.prefab | 80 ++++++ .../Canvas/ChunilENGPopupCanvas.prefab | 2 +- .../UICommand/OpenMachineDashBoardCommand.cs | 1 - .../UI/MachineInfoItem/MachineInfoItem.cs | 2 +- 5 files changed, 199 insertions(+), 120 deletions(-) diff --git a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin.unity b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin.unity index 8dddd151..11c1bc6d 100644 --- a/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin.unity +++ b/Assets/OCTODAY_Twin/Factory_Interior/Scenes/Factory_Interior/OCTODAY_Twin.unity @@ -1924,9 +1924,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!114 &30465229 MonoBehaviour: m_ObjectHideFlags: 2 @@ -2191,9 +2191,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &42534409 PrefabInstance: m_ObjectHideFlags: 0 @@ -3150,9 +3150,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &66981059 PrefabInstance: m_ObjectHideFlags: 0 @@ -4662,9 +4662,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!114 &92318444 MonoBehaviour: m_ObjectHideFlags: 2 @@ -6974,9 +6974,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &156758378 PrefabInstance: m_ObjectHideFlags: 0 @@ -8363,9 +8363,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!4 &180577154 stripped Transform: m_CorrespondingSourceObject: {fileID: 3290461870944717841, guid: 562e4060142558a44b4c03a5a9844674, type: 3} @@ -8397,9 +8397,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &181882314 PrefabInstance: m_ObjectHideFlags: 0 @@ -12671,9 +12671,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!114 &239318161 MonoBehaviour: m_ObjectHideFlags: 2 @@ -14735,9 +14735,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &278552903 PrefabInstance: m_ObjectHideFlags: 0 @@ -14977,9 +14977,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &288294015 PrefabInstance: m_ObjectHideFlags: 0 @@ -16363,9 +16363,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &312748277 PrefabInstance: m_ObjectHideFlags: 0 @@ -17599,9 +17599,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &333509698 PrefabInstance: m_ObjectHideFlags: 0 @@ -20725,9 +20725,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!114 &407354169 MonoBehaviour: m_ObjectHideFlags: 2 @@ -25201,9 +25201,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &517254376 PrefabInstance: m_ObjectHideFlags: 0 @@ -31045,9 +31045,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &640841342 PrefabInstance: m_ObjectHideFlags: 0 @@ -31542,9 +31542,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &654375022 PrefabInstance: m_ObjectHideFlags: 0 @@ -35701,9 +35701,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &761722024 PrefabInstance: m_ObjectHideFlags: 0 @@ -41872,9 +41872,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!114 &897140706 MonoBehaviour: m_ObjectHideFlags: 2 @@ -43219,9 +43219,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!114 &923616250 MonoBehaviour: m_ObjectHideFlags: 2 @@ -45669,12 +45669,12 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1698040805} - {fileID: 1877012570} - {fileID: 1740796822} - {fileID: 842397949} - {fileID: 503925392} - {fileID: 490108527} + - {fileID: 1698040805} m_Father: {fileID: 70695278} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1005625676 @@ -48502,9 +48502,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &1041045789 PrefabInstance: m_ObjectHideFlags: 0 @@ -53902,9 +53902,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!114 &1140306462 MonoBehaviour: m_ObjectHideFlags: 2 @@ -59536,9 +59536,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &1250770732 PrefabInstance: m_ObjectHideFlags: 0 @@ -67356,9 +67356,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &1426170875 PrefabInstance: m_ObjectHideFlags: 0 @@ -67601,9 +67601,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &1431275904 PrefabInstance: m_ObjectHideFlags: 0 @@ -69639,9 +69639,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &1465400756 PrefabInstance: m_ObjectHideFlags: 0 @@ -70029,9 +70029,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &1471047169 PrefabInstance: m_ObjectHideFlags: 0 @@ -70203,9 +70203,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &1474373136 PrefabInstance: m_ObjectHideFlags: 0 @@ -70900,9 +70900,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!114 &1492478026 MonoBehaviour: m_ObjectHideFlags: 2 @@ -79059,9 +79059,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &1678746728 PrefabInstance: m_ObjectHideFlags: 0 @@ -79669,7 +79669,7 @@ GameObject: - component: {fileID: 1698040805} - component: {fileID: 1698040806} m_Layer: 0 - m_Name: Default + m_Name: Empty Area m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -79684,7 +79684,7 @@ Transform: m_GameObject: {fileID: 1698040804} serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 2.3, y: 1.87, z: -1.21} + m_LocalPosition: {x: -19.64, y: 1.87, z: -5.36} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -83547,9 +83547,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!4 &1763454454 stripped Transform: m_CorrespondingSourceObject: {fileID: 3290461870944717841, guid: 562e4060142558a44b4c03a5a9844674, type: 3} @@ -83581,9 +83581,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!114 &1764213107 MonoBehaviour: m_ObjectHideFlags: 2 @@ -85929,9 +85929,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &1815195918 PrefabInstance: m_ObjectHideFlags: 0 @@ -89195,9 +89195,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &1870728634 PrefabInstance: m_ObjectHideFlags: 0 @@ -92031,9 +92031,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &1901561069 PrefabInstance: m_ObjectHideFlags: 0 @@ -92689,9 +92689,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!114 &1923117595 MonoBehaviour: m_ObjectHideFlags: 2 @@ -97137,9 +97137,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!114 &2009164038 MonoBehaviour: m_ObjectHideFlags: 2 @@ -97505,9 +97505,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &2027784664 PrefabInstance: m_ObjectHideFlags: 0 @@ -99990,9 +99990,9 @@ MonoBehaviour: originScale: {x: 0, y: 0, z: 0} animators: [] animSpeed: 0 - focusDistance: 0 - focusAzimuth: 0 - focusElevation: 0 + focusDistance: 8 + focusAzimuth: 45 + focusElevation: 45 --- !u!1001 &2069850753 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/OCTODAY_Twin/Model/Injector_Bench/Prefab/Injector_Bench.prefab b/Assets/OCTODAY_Twin/Model/Injector_Bench/Prefab/Injector_Bench.prefab index 558e8ad6..44cb3a30 100644 --- a/Assets/OCTODAY_Twin/Model/Injector_Bench/Prefab/Injector_Bench.prefab +++ b/Assets/OCTODAY_Twin/Model/Injector_Bench/Prefab/Injector_Bench.prefab @@ -61,6 +61,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -82,6 +84,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -147,6 +150,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -168,6 +173,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -233,6 +239,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -254,6 +262,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -319,6 +328,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -340,6 +351,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -405,6 +417,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -426,6 +440,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -491,6 +506,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -512,6 +529,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -577,6 +595,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -598,6 +618,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -663,6 +684,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -684,6 +707,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -749,6 +773,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -770,6 +796,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -835,6 +862,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -856,6 +885,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -869,6 +899,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 3290461870944717841} + - component: {fileID: 8330080063993196386} m_Layer: 0 m_Name: Injector_Bench m_TagString: Untagged @@ -910,6 +941,28 @@ Transform: - {fileID: 5893774659798285053} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!95 &8330080063993196386 +Animator: + serializedVersion: 7 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5048554205704080575} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 85713ce5f8692ea40b96759c3255e0cb, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_AnimatePhysics: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &6285856028248886589 GameObject: m_ObjectHideFlags: 0 @@ -971,6 +1024,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -992,6 +1047,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1057,6 +1113,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1078,6 +1136,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1143,6 +1202,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1164,6 +1225,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1229,6 +1291,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1250,6 +1314,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1315,6 +1380,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1336,6 +1403,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1401,6 +1469,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1422,6 +1492,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1487,6 +1558,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1508,6 +1581,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1573,6 +1647,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1594,6 +1670,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 @@ -1659,6 +1736,8 @@ MeshRenderer: m_RayTracingAccelStructBuildFlagsOverride: 0 m_RayTracingAccelStructBuildFlags: 1 m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1680,6 +1759,7 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 diff --git a/Assets/Resources/UI/Prefabs/Canvas/ChunilENGPopupCanvas.prefab b/Assets/Resources/UI/Prefabs/Canvas/ChunilENGPopupCanvas.prefab index e0ee8012..b5cf971a 100644 --- a/Assets/Resources/UI/Prefabs/Canvas/ChunilENGPopupCanvas.prefab +++ b/Assets/Resources/UI/Prefabs/Canvas/ChunilENGPopupCanvas.prefab @@ -45066,7 +45066,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 227.5, y: 117} + m_AnchoredPosition: {x: 223, y: 138.5} m_SizeDelta: {x: 147, y: 102} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1658488313289065640 diff --git a/Assets/Scripts/ChunilENG/Command/UICommand/OpenMachineDashBoardCommand.cs b/Assets/Scripts/ChunilENG/Command/UICommand/OpenMachineDashBoardCommand.cs index 439df0bb..6b91b495 100644 --- a/Assets/Scripts/ChunilENG/Command/UICommand/OpenMachineDashBoardCommand.cs +++ b/Assets/Scripts/ChunilENG/Command/UICommand/OpenMachineDashBoardCommand.cs @@ -20,7 +20,6 @@ namespace ChunilENG.UI.Command { var uiManager = ChunilENGSceneMain.Instance.GetManager(); uiManager.GetCanvas().GetPanel().SideTabBar.DeactivateCurrentTab(); - uiManager.GetCanvas().GetPanel().DeactiveSideToolButton(); uiManager.GetCanvas().GetPanel().HideItem(); diff --git a/Assets/Scripts/ChunilENG/UI/MachineInfoItem/MachineInfoItem.cs b/Assets/Scripts/ChunilENG/UI/MachineInfoItem/MachineInfoItem.cs index 84088f3a..e7c5abb8 100644 --- a/Assets/Scripts/ChunilENG/UI/MachineInfoItem/MachineInfoItem.cs +++ b/Assets/Scripts/ChunilENG/UI/MachineInfoItem/MachineInfoItem.cs @@ -69,7 +69,7 @@ namespace ChunilENG.UI this.data = data; eorate.SetText(DecimalPointCalculate(data.eorate).ToString() + "%"); - daynight.SetText(SetTextData((data.daynight == "1")? "�ְ�" : "�߰�")); + daynight.SetText(SetTextData((data.daynight == "1")? "주간" : "야간")); workcd.SetText(SetTextData(data.workcd)); goodqtyrate.SetText(DecimalPointCalculate(data.goodqtyrate).ToString() + "%"); porate.SetText(DecimalPointCalculate(data.porate).ToString() + "%");