diff --git a/Assets/Images/UI/ToolBar/IMG_Background.png b/Assets/Images/UI/ToolBar/IMG_Background.png index 41f52731..ef0eb350 100644 Binary files a/Assets/Images/UI/ToolBar/IMG_Background.png and b/Assets/Images/UI/ToolBar/IMG_Background.png differ diff --git a/Assets/Images/UI/ToolBar/IMG_Background.png.meta b/Assets/Images/UI/ToolBar/IMG_Background.png.meta index 44d0c951..d00cde0b 100644 --- a/Assets/Images/UI/ToolBar/IMG_Background.png.meta +++ b/Assets/Images/UI/ToolBar/IMG_Background.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: a8b13dbb875d83c45b287be72d97b96d +guid: f09ec62fc3a72db468a0ad0ba054e245 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -21,7 +21,7 @@ TextureImporter: heightScale: 0.25 normalMapFilter: 0 flipGreenChannel: 0 - isReadable: 1 + isReadable: 0 streamingMipmaps: 0 streamingMipmapsPriority: 0 vTOnly: 0 @@ -67,7 +67,7 @@ TextureImporter: swizzle: 50462976 cookieLightType: 0 platformSettings: - - serializedVersion: 3 + - serializedVersion: 4 buildTarget: DefaultTexturePlatform maxTextureSize: 2048 resizeAlgorithm: 0 @@ -80,20 +80,7 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: WebGL - 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: 3 + - serializedVersion: 4 buildTarget: Standalone maxTextureSize: 2048 resizeAlgorithm: 0 @@ -106,36 +93,11 @@ TextureImporter: ignorePlatformSupport: 0 androidETC2FallbackOverride: 0 forceMaximumCompressionQuality_BC6H_BC7: 0 - - serializedVersion: 3 - buildTarget: Android - 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: 3 - buildTarget: Server - 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 @@ -145,6 +107,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + spriteCustomMetadata: + entries: [] nameFileIdTable: {} mipmapLimitGroupName: pSDRemoveMatte: 0 diff --git a/Assets/Images/UI/ToolBar/heroicons_square-3-stack-3d.png b/Assets/Images/UI/ToolBar/heroicons_square-3-stack-3d.png deleted file mode 100644 index 161444cd..00000000 Binary files a/Assets/Images/UI/ToolBar/heroicons_square-3-stack-3d.png and /dev/null differ diff --git a/Assets/Images/UI/ToolBar/heroicons_square-3-stack-3d.png.meta b/Assets/Images/UI/ToolBar/heroicons_square-3-stack-3d.png.meta deleted file mode 100644 index d761fc33..00000000 --- a/Assets/Images/UI/ToolBar/heroicons_square-3-stack-3d.png.meta +++ /dev/null @@ -1,153 +0,0 @@ -fileFormatVersion: 2 -guid: ef778cc5950025b40998c8d9120e9948 -TextureImporter: - internalIDToNameTable: [] - externalObjects: {} - serializedVersion: 12 - 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: 3 - 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: 3 - buildTarget: WebGL - 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: 3 - 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 - - serializedVersion: 3 - buildTarget: Android - 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: 3 - buildTarget: Server - 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: [] - physicsShape: [] - bones: [] - spriteID: 5e97eb03825dee720800000000000000 - internalID: 0 - vertices: [] - indices: - edges: [] - weights: [] - secondaryTextures: [] - nameFileIdTable: {} - mipmapLimitGroupName: - pSDRemoveMatte: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/UI/Panel/Panel_MiniMap.prefab b/Assets/Prefabs/UI/Panel/Panel_MiniMap.prefab index 4f617ba2..b25d4acb 100644 --- a/Assets/Prefabs/UI/Panel/Panel_MiniMap.prefab +++ b/Assets/Prefabs/UI/Panel/Panel_MiniMap.prefab @@ -184,15 +184,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 @@ -271,7 +273,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.64705884} + 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 @@ -417,7 +419,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 25.083, y: -24.2} + m_AnchoredPosition: {x: 24.78, y: -18.85} m_SizeDelta: {x: 34, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3507133253443768192 @@ -494,15 +496,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 diff --git a/Assets/Prefabs/UI/Panel/Panel_ProductionStatus.prefab b/Assets/Prefabs/UI/Panel/Panel_ProductionStatus.prefab index 8ef8f934..e916dacd 100644 --- a/Assets/Prefabs/UI/Panel/Panel_ProductionStatus.prefab +++ b/Assets/Prefabs/UI/Panel/Panel_ProductionStatus.prefab @@ -139,7 +139,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} m_AnchoredPosition: {x: 83.9, y: -18.2} - m_SizeDelta: {x: 130, y: 21} + m_SizeDelta: {x: 145, y: 21} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2229292125401231143 CanvasRenderer: @@ -213,15 +213,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 0 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 @@ -273,7 +275,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: 327.5, y: -20} + m_AnchoredPosition: {x: 329.69995, y: -21.570984} m_SizeDelta: {x: 35, y: 17} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &685578386431306348 @@ -348,15 +350,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 0 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 @@ -408,7 +412,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: 264.23987, y: 2.35} + m_AnchoredPosition: {x: 272.2, y: 9.5} m_SizeDelta: {x: 35, y: 17} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4819629460345502791 @@ -483,15 +487,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 0 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 @@ -543,7 +549,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: 432.16, y: 2.35} + m_AnchoredPosition: {x: 432.16, y: 9.5} m_SizeDelta: {x: 35, y: 17} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &883044640877294090 @@ -618,15 +624,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 0 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 @@ -678,7 +686,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: 387.47, y: -20} + m_AnchoredPosition: {x: 385.04007, y: -21.571} m_SizeDelta: {x: 35, y: 17} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7501616347096654992 @@ -753,15 +761,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 0 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 @@ -813,7 +823,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: 203.89, y: -20.22} + m_AnchoredPosition: {x: 204.2, y: -21.571} m_SizeDelta: {x: 35, y: 17} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1142306950698434582 @@ -844,7 +854,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: "\uAC00\uB3D9\uC911" + m_text: "\uACC4\uD68D\uC815\uC9C0" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 96e949185e2eaae42ad564765eb6a897, type: 2} m_sharedMaterial: {fileID: -8416880332663595364, guid: 96e949185e2eaae42ad564765eb6a897, @@ -888,15 +898,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 0 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 @@ -948,7 +960,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: 327.97, y: 2.35} + m_AnchoredPosition: {x: 329.7, y: 9.5} m_SizeDelta: {x: 35, y: 17} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &752682602814583221 @@ -1023,15 +1035,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 0 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 @@ -1083,7 +1097,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: 263.73, y: -20} + m_AnchoredPosition: {x: 272.19998, y: -21.570984} m_SizeDelta: {x: 35, y: 17} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6284733063415688312 @@ -1158,15 +1172,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 0 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 @@ -1218,7 +1234,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: 203.97, y: 2.35} + m_AnchoredPosition: {x: 204.2, y: 9.5} m_SizeDelta: {x: 35, y: 17} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &486215177845287692 @@ -1293,15 +1309,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 0 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 @@ -1353,7 +1371,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: 431.93, y: -20} + m_AnchoredPosition: {x: 432.15997, y: -21.570984} m_SizeDelta: {x: 35, y: 17} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1793996467542972890 @@ -1428,15 +1446,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 0 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 @@ -1563,15 +1583,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 0 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 @@ -1623,7 +1645,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: 78.24, y: 2.35} + m_AnchoredPosition: {x: 82, y: 9.5} m_SizeDelta: {x: 35, y: 17} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5476048689429227745 @@ -1698,15 +1720,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 0 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 @@ -1758,8 +1782,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: 84.1, y: -19.6} - m_SizeDelta: {x: 150, y: 17} + m_AnchoredPosition: {x: 82, y: -21.571} + m_SizeDelta: {x: 150, y: 43.1413} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5603558930303465888 CanvasRenderer: @@ -1789,7 +1813,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: x76 GORE GAP + m_text: CAP FILL O-Ring & Printing m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 96e949185e2eaae42ad564765eb6a897, type: 2} m_sharedMaterial: {fileID: -8416880332663595364, guid: 96e949185e2eaae42ad564765eb6a897, @@ -1829,19 +1853,21 @@ MonoBehaviour: m_textAlignment: 65535 m_characterSpacing: 0 m_wordSpacing: 0 - m_lineSpacing: 0 + m_lineSpacing: -40 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 @@ -1893,7 +1919,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: 385.08, y: 2.35} + m_AnchoredPosition: {x: 385.04, y: 9.5} m_SizeDelta: {x: 35, y: 17} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6253543669800524510 @@ -1968,15 +1994,17 @@ MonoBehaviour: m_lineSpacingMax: 0 m_paragraphSpacing: 0 m_charWidthMaxAdj: 0 - m_enableWordWrapping: 0 + m_TextWrappingMode: 0 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 diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 0f646747..b429687d 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -657,11 +657,6 @@ PrefabInstance: propertyPath: m_Name value: Panel_MiniMap objectReference: {fileID: 0} - - target: {fileID: 1150849515297238015, guid: 565fc7bc07217ae439fa29f99158e1db, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 2563419348715790888, guid: 565fc7bc07217ae439fa29f99158e1db, type: 3} propertyPath: m_Pivot.x @@ -740,12 +735,12 @@ PrefabInstance: - target: {fileID: 2563419348715790888, guid: 565fc7bc07217ae439fa29f99158e1db, type: 3} propertyPath: m_AnchoredPosition.x - value: 292.15497 + value: 277 objectReference: {fileID: 0} - target: {fileID: 2563419348715790888, guid: 565fc7bc07217ae439fa29f99158e1db, type: 3} propertyPath: m_AnchoredPosition.y - value: -204.2981 + value: -203.5 objectReference: {fileID: 0} - target: {fileID: 2563419348715790888, guid: 565fc7bc07217ae439fa29f99158e1db, type: 3} @@ -762,11 +757,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 4148054281812016220, guid: 565fc7bc07217ae439fa29f99158e1db, - type: 3} - propertyPath: m_Color.a - value: 1 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -68833,8 +68823,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: 39.23, y: -354} - m_SizeDelta: {x: 50, y: 528} + m_AnchoredPosition: {x: 39.22992, y: -322.021} + m_SizeDelta: {x: 51, y: 462.5} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &140491507 MonoBehaviour: @@ -68856,7 +68846,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a8b13dbb875d83c45b287be72d97b96d, type: 3} + m_Sprite: {fileID: 21300000, guid: f09ec62fc3a72db468a0ad0ba054e245, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -101839,7 +101829,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 5.3, y: -204.83} + m_AnchoredPosition: {x: 5.8, y: -167} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0, y: 1} --- !u!114 &275618679 @@ -149539,7 +149529,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 25, y: -168.5} + m_AnchoredPosition: {x: 25.6, y: -149.84} m_SizeDelta: {x: 29, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &451692503 @@ -159701,7 +159691,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: 0.789978, y: 145.1} + m_AnchoredPosition: {x: 0.789978, y: 113} m_SizeDelta: {x: 34, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &491919426 @@ -193440,7 +193430,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 5.79, y: -256} + m_AnchoredPosition: {x: 6.29, y: -215.5} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0, y: 1} --- !u!114 &619713713 @@ -231528,8 +231518,9 @@ MonoBehaviour: m_Calls: [] m_text: Dash Board m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontAsset: {fileID: 11400000, guid: 73a8cbdb8d46fbb4bae58573ac247b09, type: 2} + m_sharedMaterial: {fileID: -2117747647215524922, guid: 73a8cbdb8d46fbb4bae58573ac247b09, + type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -240748,7 +240739,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 1, g: 1, b: 1, a: 0.6313726} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -257408,7 +257399,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &871774989 RectTransform: m_ObjectHideFlags: 0 @@ -290146,7 +290137,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: 0.789978, y: 219.07} + m_AnchoredPosition: {x: 0.789978, y: 186.9} m_SizeDelta: {x: 34, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &992426997 @@ -297543,19 +297534,19 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1020204721} - 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: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 799640707} - m_Father: {fileID: 8993453308749756956} + m_Father: {fileID: 4777910217330488538} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} + m_AnchoredPosition: {x: 960, y: 540} + m_SizeDelta: {x: 1920, y: 1080} + m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1020204723 MonoBehaviour: m_ObjectHideFlags: 0 @@ -433205,7 +433196,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 207.5, y: -413} + m_AnchoredPosition: {x: 194.4, y: -408.1} m_SizeDelta: {x: 207, y: 158} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1522602761 @@ -439908,7 +439899,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: 0.789978, y: 185.03} + m_AnchoredPosition: {x: 0.789978, y: 152.9} m_SizeDelta: {x: 34, y: 34} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1551743168 @@ -481647,56 +481638,6 @@ PrefabInstance: propertyPath: m_Name value: Panel_ProductionStatus objectReference: {fileID: 0} - - target: {fileID: 1435541941998932536, guid: a74d4a3b763fd8d438c7fff5d89e9430, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 191.79997 - objectReference: {fileID: 0} - - target: {fileID: 1435541941998932536, guid: a74d4a3b763fd8d438c7fff5d89e9430, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20.22 - objectReference: {fileID: 0} - - target: {fileID: 2408036382282586975, guid: a74d4a3b763fd8d438c7fff5d89e9430, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 258.9 - objectReference: {fileID: 0} - - target: {fileID: 3668839221185386805, guid: a74d4a3b763fd8d438c7fff5d89e9430, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 320.9 - objectReference: {fileID: 0} - - target: {fileID: 3717066469867246182, guid: a74d4a3b763fd8d438c7fff5d89e9430, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 258.9 - objectReference: {fileID: 0} - - target: {fileID: 4401755688143459991, guid: a74d4a3b763fd8d438c7fff5d89e9430, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 378.19998 - objectReference: {fileID: 0} - - target: {fileID: 4507512029217021393, guid: a74d4a3b763fd8d438c7fff5d89e9430, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 378.2 - objectReference: {fileID: 0} - - target: {fileID: 5371854086866631428, guid: a74d4a3b763fd8d438c7fff5d89e9430, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 320.90002 - objectReference: {fileID: 0} - - target: {fileID: 5371854086866631428, guid: a74d4a3b763fd8d438c7fff5d89e9430, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 5897577489099265493, guid: a74d4a3b763fd8d438c7fff5d89e9430, - type: 3} - propertyPath: m_SizeDelta.x - value: 145 - objectReference: {fileID: 0} - target: {fileID: 6053503471138626323, guid: a74d4a3b763fd8d438c7fff5d89e9430, type: 3} propertyPath: m_Pivot.x @@ -481735,7 +481676,7 @@ PrefabInstance: - target: {fileID: 6053503471138626323, guid: a74d4a3b763fd8d438c7fff5d89e9430, type: 3} propertyPath: m_SizeDelta.y - value: 109 + value: 123.729 objectReference: {fileID: 0} - target: {fileID: 6053503471138626323, guid: a74d4a3b763fd8d438c7fff5d89e9430, type: 3} @@ -481780,7 +481721,7 @@ PrefabInstance: - target: {fileID: 6053503471138626323, guid: a74d4a3b763fd8d438c7fff5d89e9430, type: 3} propertyPath: m_AnchoredPosition.y - value: -145.5 + value: -152.8645 objectReference: {fileID: 0} - target: {fileID: 6053503471138626323, guid: a74d4a3b763fd8d438c7fff5d89e9430, type: 3} @@ -481797,26 +481738,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6635278265734175485, guid: a74d4a3b763fd8d438c7fff5d89e9430, - type: 3} - propertyPath: m_HorizontalAlignment - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8636739591009126030, guid: a74d4a3b763fd8d438c7fff5d89e9430, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 191.8 - objectReference: {fileID: 0} - - target: {fileID: 9141052772512173166, guid: a74d4a3b763fd8d438c7fff5d89e9430, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 86.39998 - objectReference: {fileID: 0} - - target: {fileID: 9141052772512173166, guid: a74d4a3b763fd8d438c7fff5d89e9430, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20.220007 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -486941,7 +486862,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 5.9, y: -360.01} + m_AnchoredPosition: {x: 6.290001, y: -311.89978} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0, y: 1} --- !u!114 &1734980219 @@ -550327,7 +550248,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 5, y: -462.33} + m_AnchoredPosition: {x: 5.5, y: -400.4} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0, y: 1} --- !u!114 &1971991592 @@ -566373,7 +566294,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 5.8, y: -308.01} + m_AnchoredPosition: {x: 6.29, y: -263.6} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0, y: 1} --- !u!114 &2031679699 @@ -579678,7 +579599,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 5.8, y: -412.01} + m_AnchoredPosition: {x: 6.290001, y: -351.89978} m_SizeDelta: {x: 40, y: 40} m_Pivot: {x: 0, y: 1} --- !u!114 &2080202526 @@ -598520,7 +598441,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 113.8999, y: -662.24866} + m_AnchoredPosition: {x: 114.2, y: -662.24866} m_SizeDelta: {x: 46.65, y: 329.0974} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2793278894578051582 @@ -599368,6 +599289,21 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 2449789410797628947, guid: 1e2f1310fcc725c4a82bd8a7a783ca22, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 2975405984462419634, guid: 1e2f1310fcc725c4a82bd8a7a783ca22, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 4610205583130223525, guid: 1e2f1310fcc725c4a82bd8a7a783ca22, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 5290342058106165413, guid: 1e2f1310fcc725c4a82bd8a7a783ca22, type: 3} propertyPath: m_Pivot.x @@ -599468,6 +599404,16 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5292785705023812001, guid: 1e2f1310fcc725c4a82bd8a7a783ca22, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 5840782451572989804, guid: 1e2f1310fcc725c4a82bd8a7a783ca22, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 8100983100533929295, guid: 1e2f1310fcc725c4a82bd8a7a783ca22, type: 3} propertyPath: m_SizeDelta.y @@ -600090,6 +600036,7 @@ RectTransform: - {fileID: 8524328621274765839} - {fileID: 140491506} - {fileID: 1713634417} + - {fileID: 1020204722} m_Father: {fileID: 8993453308749756956} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -601562,6 +601509,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -223.2 objectReference: {fileID: 0} + - target: {fileID: 255955969380399077, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 725460719517789725, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_AnchorMax.y @@ -601602,6 +601554,11 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 964500661259602012, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 1006971571989468488, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_AnchorMax.y @@ -601642,6 +601599,31 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 1356878245281148075, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 1376646498358872957, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 1388057137447882062, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 1633756269360774349, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 1897277666332270816, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 2126839117375542382, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_Size @@ -601657,6 +601639,21 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -0.0007324219 objectReference: {fileID: 0} + - target: {fileID: 2165113373930329551, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 2282985390080880533, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 2494468150493095757, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 2799623781109828506, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_Pivot.x @@ -601777,6 +601774,26 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 2933362909482045194, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 2977537869706001842, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 3442190326133164002, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 3476287430081287593, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 3762445379208932715, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_AnchorMax.y @@ -601797,6 +601814,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3807919227423709089, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 3933712202954025984, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_Size @@ -601807,6 +601829,16 @@ PrefabInstance: propertyPath: m_Value value: 0 objectReference: {fileID: 0} + - target: {fileID: 3943108446679530132, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 4047322851021647310, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 4184708823572714135, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_SizeDelta.y @@ -601817,11 +601849,36 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0.000030755997 objectReference: {fileID: 0} + - target: {fileID: 4186112046978924181, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 4204081407802176469, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 4257677803987049133, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 4276374445422171033, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 4545483208309274464, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 4632955027691296846, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 4653500200297815218, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_AnchorMax.x @@ -601837,6 +601894,11 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 4841157725834311624, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 5188498599565583930, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_AnchorMax.x @@ -601867,6 +601929,21 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5329198405807088734, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 5501930853491747624, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 5524677325559105663, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 5578207460069989747, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_AnchorMax.x @@ -601882,11 +601959,36 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5600345794147557569, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 5663838037729817824, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 5747974055858150788, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 5803661090733190270, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 5959915911758418721, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 5961206268258356140, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 6104760564461234430, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: UI_StandardInfoFile @@ -601932,11 +602034,21 @@ PrefabInstance: propertyPath: m_AnchorMin.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6456038812471069908, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 6564088650713739554, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 6638768192301261675, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 6639526771875077624, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_Size @@ -601947,11 +602059,31 @@ PrefabInstance: propertyPath: m_Value value: 1 objectReference: {fileID: 0} + - target: {fileID: 6748249594741621481, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 6794370685377610843, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 6796847322990813275, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 6950860213651819288, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7004930298146669220, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 7216000125600437725, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_AnchorMax.y @@ -601977,6 +602109,36 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7287379492485873305, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 7393923552685757701, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 7409791571556298897, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 7426268543612986707, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 7489691654021847073, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 7613692555540608367, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 7660468968724866664, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_Size @@ -601992,11 +602154,26 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 7876066814925999632, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 7913232925606765545, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_AnchoredPosition.y value: 0.00002527237 objectReference: {fileID: 0} + - target: {fileID: 8214840837444281794, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 8279345752574209318, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 8317600729547681056, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_AnchorMax.x @@ -602012,6 +602189,26 @@ PrefabInstance: propertyPath: m_SizeDelta.x value: -7 objectReference: {fileID: 0} + - target: {fileID: 8332663369730885449, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 8364134823191581893, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 8376046592507056763, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 8413158794303615536, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 8482847412563954756, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_SizeDelta.y @@ -602032,6 +602229,21 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 8887295877531505068, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 8900303910633003058, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} + - target: {fileID: 8981225323486190449, guid: b59b3195a2b1ed64ebe226010a38ae94, + type: 3} + propertyPath: 'm_ActiveFontFeatures.Array.data[0]' + value: 1801810542 + objectReference: {fileID: 0} - target: {fileID: 9214386572504789251, guid: b59b3195a2b1ed64ebe226010a38ae94, type: 3} propertyPath: m_AnchorMax.x @@ -603627,7 +603839,6 @@ Transform: - {fileID: 883006602906283311} - {fileID: 2814303991191466808} - {fileID: 4777910217330488538} - - {fileID: 1020204722} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &9077544614072761896 diff --git a/CompleteTimeAlarmInfo.json b/CompleteTimeAlarmInfo.json index 74d1c619..826b3fb3 100644 --- a/CompleteTimeAlarmInfo.json +++ b/CompleteTimeAlarmInfo.json @@ -1167,7 +1167,7 @@ "worknm": "OILSUCTION PIPE", "workseq": "1", "status": "2", - "statusnm": "가동중", + "statusnm": "비가동", "itemcd": "55511445", "itemdesc": "PIPE ASM-O/PMP SUC", "pjtcd": "CSS 50V LM2", @@ -1360,7 +1360,7 @@ "sttm": "0814", "totm": "", "goaltime": "500", - "ptotm": "2025-03-25 09:38:30", + "ptotm": "2025-03-25 18:17:05", "psttm": "2025-03-17 08:14:33" }, "isCheck": false