diff --git a/Assets/Images/UI/CompleteAlarm/IMG_Background_1.png b/Assets/Images/UI/CompleteAlarm/IMG_Background_1.png index 7c5a1d40..fc24b229 100644 Binary files a/Assets/Images/UI/CompleteAlarm/IMG_Background_1.png and b/Assets/Images/UI/CompleteAlarm/IMG_Background_1.png differ diff --git a/Assets/Images/UI/CompleteAlarm/IMG_Background_1.png.meta b/Assets/Images/UI/CompleteAlarm/IMG_Background_1.png.meta index 2873e238..deeedd56 100644 --- a/Assets/Images/UI/CompleteAlarm/IMG_Background_1.png.meta +++ b/Assets/Images/UI/CompleteAlarm/IMG_Background_1.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: b6ae1ee620749984eaf67219fa1ed4ac +guid: 7a899468ee688a44c9f40035f857f1e3 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 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/CompleteAlarm/IMG_Line.png b/Assets/Images/UI/CompleteAlarm/IMG_Line.png index ea25b4bc..5b3e0dcf 100644 Binary files a/Assets/Images/UI/CompleteAlarm/IMG_Line.png and b/Assets/Images/UI/CompleteAlarm/IMG_Line.png differ diff --git a/Assets/Images/UI/CompleteAlarm/IMG_Line.png.meta b/Assets/Images/UI/CompleteAlarm/IMG_Line.png.meta index 0aaf3a87..68936f3f 100644 --- a/Assets/Images/UI/CompleteAlarm/IMG_Line.png.meta +++ b/Assets/Images/UI/CompleteAlarm/IMG_Line.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 430f59b0d33b9754fb438f89cf22fd82 +guid: c45f02d4ce9f650418fec092b4c90786 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 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/Prefabs/UI/Panel/Panel_CompleteAlramHistory.prefab b/Assets/Prefabs/UI/Panel/Panel_CompleteAlramHistory.prefab index f6f66d70..9e5b2597 100644 --- a/Assets/Prefabs/UI/Panel/Panel_CompleteAlramHistory.prefab +++ b/Assets/Prefabs/UI/Panel/Panel_CompleteAlramHistory.prefab @@ -168,14 +168,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.09803922, g: 0.19215687, b: 0.3764706, a: 0.9411765} + 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: 11458540a112dcb4aa786d9f19f9b7e7, type: 3} + m_Sprite: {fileID: 21300000, guid: 7a899468ee688a44c9f40035f857f1e3, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -653,7 +653,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} m_AnchoredPosition: {x: 0, y: -86.97998} - m_SizeDelta: {x: 324, y: 2} + m_SizeDelta: {x: 324, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &353711557804667732 CanvasRenderer: @@ -683,7 +683,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 430f59b0d33b9754fb438f89cf22fd82, type: 3} + m_Sprite: {fileID: 21300000, guid: c45f02d4ce9f650418fec092b4c90786, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/Assets/Resources/Prefabs/UI/PRF_UI_CompleteTimeAlramInfo.prefab b/Assets/Resources/Prefabs/UI/PRF_UI_CompleteTimeAlramInfo.prefab index a51cc854..f799b908 100644 --- a/Assets/Resources/Prefabs/UI/PRF_UI_CompleteTimeAlramInfo.prefab +++ b/Assets/Resources/Prefabs/UI/PRF_UI_CompleteTimeAlramInfo.prefab @@ -352,7 +352,7 @@ MonoBehaviour: workqty: goodqty: badqty: - adrate: + badrate: efficiency: progressrate: sttm: @@ -360,6 +360,8 @@ MonoBehaviour: goaltime: ptotm: psttm: + moldcd: + moldseq: Worknm: {fileID: 0} Progressrate: {fileID: 0} Ptotm: {fileID: 0} @@ -386,7 +388,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.09411765, g: 0.23137255, b: 0.4627451, a: 1} + m_Color: {r: 0.25, g: 0.25, b: 0.25, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -424,10 +426,10 @@ MonoBehaviour: m_SelectOnRight: {fileID: 0} m_Transition: 1 m_Colors: - m_NormalColor: {r: 0.09411765, g: 0.23137255, b: 0.4627451, a: 0} - m_HighlightedColor: {r: 0.09411765, g: 0.23137255, b: 0.4627451, a: 0.47058824} - m_PressedColor: {r: 0.09411766, g: 0.23137257, b: 0.46274513, a: 0.78431374} - m_SelectedColor: {r: 0.09411765, g: 0.23137255, b: 0.47058824, a: 0} + m_NormalColor: {r: 0.25, g: 0.25, b: 0.25, a: 0} + m_HighlightedColor: {r: 0.25, g: 0.25, b: 0.25, a: 0.47058824} + m_PressedColor: {r: 0.25, g: 0.25, b: 0.25, a: 0.78431374} + m_SelectedColor: {r: 0.25, g: 0.25, b: 0.25, a: 0} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 @@ -618,7 +620,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} m_AnchoredPosition: {x: 0, y: 1} - m_SizeDelta: {x: 326.5, y: 2} + m_SizeDelta: {x: 326.5, y: 1} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8375255472013704872 CanvasRenderer: @@ -648,7 +650,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 430f59b0d33b9754fb438f89cf22fd82, type: 3} + m_Sprite: {fileID: 21300000, guid: c45f02d4ce9f650418fec092b4c90786, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1