diff --git a/Assets/DownloadAssets/XRLib/Scripts/UVC/UI/Tab/SideTabBarAccordion.cs b/Assets/DownloadAssets/XRLib/Scripts/UVC/UI/Tab/SideTabBarAccordion.cs index 40f59ab5..26281b42 100644 --- a/Assets/DownloadAssets/XRLib/Scripts/UVC/UI/Tab/SideTabBarAccordion.cs +++ b/Assets/DownloadAssets/XRLib/Scripts/UVC/UI/Tab/SideTabBarAccordion.cs @@ -532,17 +532,17 @@ namespace UVC.Tab if (library != null) { var data = new AccordionData(); - var sec1 = new AccordionSectionData - { - Title = "Assembly", - IsExpanded = true, - LayoutType = AccordionItemLayoutType.Grid - }; - library.StakerCraneData.list.ForEach(stackerCrane => - { - sec1.Items.Add(new AccordionGridItemData { Caption = stackerCrane.label, Image = library.LibraryPath + stackerCrane.image, Data = stackerCrane }); - }); - data.Sections.Add(sec1); + //var sec1 = new AccordionSectionData + //{ + // Title = "Assembly", + // IsExpanded = true, + // LayoutType = AccordionItemLayoutType.Grid + //}; + //library.StakerCraneData.list.ForEach(stackerCrane => + //{ + // sec1.Items.Add(new AccordionGridItemData { Caption = stackerCrane.label, Image = library.LibraryPath + stackerCrane.image, Data = stackerCrane }); + //}); + //data.Sections.Add(sec1); var sec2 = new AccordionSectionData { Title = "Injection", @@ -556,7 +556,7 @@ namespace UVC.Tab data.Sections.Add(sec2); var sec3 = new AccordionSectionData { - Title = "Ract", + Title = "Assembly", IsExpanded = true, LayoutType = AccordionItemLayoutType.Grid }; diff --git a/Assets/Resources/UI/Prefabs/ChunilENG/MachineInfoItem.prefab b/Assets/Resources/UI/Prefabs/ChunilENG/MachineInfoItem.prefab index 9a7eabcc..e5db40c2 100644 --- a/Assets/Resources/UI/Prefabs/ChunilENG/MachineInfoItem.prefab +++ b/Assets/Resources/UI/Prefabs/ChunilENG/MachineInfoItem.prefab @@ -1340,9 +1340,9 @@ MonoBehaviour: m_fontSize: 10 m_fontSizeBase: 10 m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 + m_enableAutoSizing: 1 + m_fontSizeMin: 5 + m_fontSizeMax: 10 m_fontStyle: 0 m_HorizontalAlignment: 1 m_VerticalAlignment: 512 @@ -2727,7 +2727,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 34cbfb74c14e0bd44b078d08df4ce7cb, type: 3} + m_Sprite: {fileID: 21300000, guid: 692332e07de9f234bb1972a138141c3b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Resources/UI/Sprites/MachineKPI/Group 1000002475 1.png b/Assets/Resources/UI/Sprites/MachineKPI/Group 1000002475 1.png new file mode 100644 index 00000000..a35d1a19 Binary files /dev/null and b/Assets/Resources/UI/Sprites/MachineKPI/Group 1000002475 1.png differ diff --git a/Assets/Resources/UI/Sprites/MachineKPI/Group 1000002475 1.png.meta b/Assets/Resources/UI/Sprites/MachineKPI/Group 1000002475 1.png.meta new file mode 100644 index 00000000..16988ece --- /dev/null +++ b/Assets/Resources/UI/Sprites/MachineKPI/Group 1000002475 1.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 692332e07de9f234bb1972a138141c3b +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 13 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 0 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 4 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 4 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + customData: + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spriteCustomMetadata: + entries: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Demo_시연.unity b/Assets/Scenes/Demo_시연.unity index 5f1e095b..0cad08ea 100644 --- a/Assets/Scenes/Demo_시연.unity +++ b/Assets/Scenes/Demo_시연.unity @@ -13436,6 +13436,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 2487313445638238029, guid: 53dc99c47ad0b9b47a70382721cd50ac, type: 3} + propertyPath: maxScale + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 2487313445638238029, guid: 53dc99c47ad0b9b47a70382721cd50ac, type: 3} + propertyPath: minScale + value: 1.5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Scripts/ChunilENG/ChunilENGSceneMain.cs b/Assets/Scripts/ChunilENG/ChunilENGSceneMain.cs index 7d80cd99..63bbc00a 100644 --- a/Assets/Scripts/ChunilENG/ChunilENGSceneMain.cs +++ b/Assets/Scripts/ChunilENG/ChunilENGSceneMain.cs @@ -32,7 +32,6 @@ namespace ChunilENG public void InitSceneMain() { Debug.Log("ChunilENGSceneMain: InitSceneMain called."); - if (!TooltipManager.Instance.IsInitialized) TooltipManager.Instance.Initialize(); OnAppInitialized(); } diff --git a/Assets/Scripts/ChunilENG/Managements/MachineInfoItemManager.cs b/Assets/Scripts/ChunilENG/Managements/MachineInfoItemManager.cs index 7d1f99aa..ea8cc152 100644 --- a/Assets/Scripts/ChunilENG/Managements/MachineInfoItemManager.cs +++ b/Assets/Scripts/ChunilENG/Managements/MachineInfoItemManager.cs @@ -28,8 +28,8 @@ namespace ChunilENG.Management public float defaultNameHeight = 2f; [Header("Scale Settings")] - [Range(0.1f, 0.8f)] public float minScale; - [Range(0.5f, 1.5f)] public float maxScale; + [Range(0.1f, 1.5f)] public float minScale; + [Range(0.5f, 3f)] public float maxScale; [Range(0.1f, 2f)] public float scaleClamp; public override async UniTask Init() diff --git a/Assets/StreamingAssets/Studio/Library/AGV.json b/Assets/StreamingAssets/Studio/Library/AGV.json index 2688dac6..f5080f3f 100644 --- a/Assets/StreamingAssets/Studio/Library/AGV.json +++ b/Assets/StreamingAssets/Studio/Library/AGV.json @@ -281,147 +281,6 @@ ] } } - }, - { - "id": "GF9 SCOOP", - "label": "GF9 SCOOP", - "gltf": "Model/GF9 SCOOP.glb", - "image": "Model/GF9 SCOOP.png", - "propertiesInfo": [ - { - "section": "Root", - "modelPart": null, - "modelType": null, - "properties": [ - { - "label": "Driving speed", - "type": "Float", - "value": 50, - "unit": "cm/s" - } - ] - }, - { - "section": "Body", - "modelPart": "Frame", - "modelType": "General", - "properties": [ - { - "label": "Width", - "type": "Float", - "value": 150, - "unit": "cm" - }, - { - "label": "Height", - "type": "Float", - "value": 300, - "unit": "cm" - }, - { - "label": "Length", - "type": "Float", - "value": 200, - "unit": "cm" - } - ] - }, - { - "section": "CV Unit", - "modelPart": "CV_Unit", - "modelType": "Repeat", - "properties": [ - { - "label": "Repeat Spacing", - "type": "Float", - "value": 200, - "unit": "cm" - }, - { - "label": "Repeat Axis", - "type": "Float", - "value": "0,0,1", - "unit": "" - }, - { - "label": "Conveyor Speed", - "type": "Float", - "value": 200, - "unit": "cm/s" - }, - { - "label": "Width", - "type": "Float", - "value": 150, - "unit": "cm" - }, - { - "label": "Height", - "type": "Float", - "value": 300, - "unit": "cm" - }, - { - "label": "Length", - "type": "Float", - "value": 200, - "unit": "cm" - } - ] - } - ], - "statusInfo": { - "network": { - "section": "Higher network status", - "properties": [ - { - "label": "true", - "stat": "connect", - "value": null - }, - { - "label": "false", - "stat": "disconnect", - "value": "#696969" - } - ] - }, - "equipment": { - "section": "Equipment status", - "properties": [ - { - "label": "0", - "stat": "normal", - "value": null - }, - { - "label": "1", - "stat": "running", - "value": "#228B22" - }, - { - "label": "2", - "stat": "manual", - "value": "#B8860B" - }, - { - "label": "3", - "stat": "error", - "value": "#8B0000" - }, - { - "label": "4", - "stat": "fire", - "value": "#FF4500" - }, - { - "label": "5", - "stat": "charging", - "value": "#00FF00" - } - ] - } - } } ] }