diff --git a/Assets/Images/UI/DashBoard/IMG_DashBoardBackground.png b/Assets/Images/UI/DashBoard/IMG_DashBoardBackground.png index 2fdfbed8..aa990cbf 100644 Binary files a/Assets/Images/UI/DashBoard/IMG_DashBoardBackground.png and b/Assets/Images/UI/DashBoard/IMG_DashBoardBackground.png differ diff --git a/Assets/Images/UI/DashBoard/IMG_DashBoardBackground.png.meta b/Assets/Images/UI/DashBoard/IMG_DashBoardBackground.png.meta index e186fad2..605f32a9 100644 --- a/Assets/Images/UI/DashBoard/IMG_DashBoardBackground.png.meta +++ b/Assets/Images/UI/DashBoard/IMG_DashBoardBackground.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 401408cc9e6935440b369c9a941f90a4 +guid: 5e59acf201e1f7348a4b4505b7019905 TextureImporter: internalIDToNameTable: [] externalObjects: {} - serializedVersion: 12 + serializedVersion: 13 mipmaps: mipMapMode: 0 enableMipMap: 0 @@ -49,7 +49,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteBorder: {x: 30, y: 30, z: 30, w: 30} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 @@ -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,45 +93,22 @@ 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 - internalID: 0 + internalID: 1537655665 vertices: [] indices: edges: [] weights: [] secondaryTextures: [] + spriteCustomMetadata: + entries: [] nameFileIdTable: {} mipmapLimitGroupName: pSDRemoveMatte: 0 diff --git a/Assets/Images/UI/MachineDashBoard/IMG_HighLighter.png b/Assets/Images/UI/MachineDashBoard/IMG_HighLighter.png index ba948422..42ad9c85 100644 Binary files a/Assets/Images/UI/MachineDashBoard/IMG_HighLighter.png and b/Assets/Images/UI/MachineDashBoard/IMG_HighLighter.png differ diff --git a/Assets/Images/UI/MachineDashBoard/IMG_HighLighter.png.meta b/Assets/Images/UI/MachineDashBoard/IMG_HighLighter.png.meta index 4576cc59..58e0b4e8 100644 --- a/Assets/Images/UI/MachineDashBoard/IMG_HighLighter.png.meta +++ b/Assets/Images/UI/MachineDashBoard/IMG_HighLighter.png.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f10826b15e9593f4589352dc5b0607e3 +guid: d7d68376e0c51194f8c35b833c7c2b61 TextureImporter: internalIDToNameTable: [] externalObjects: {} diff --git a/Assets/Images/UI/MachineDashBoard/IMG_SelectButton.png b/Assets/Images/UI/MachineDashBoard/IMG_SelectButton.png index ffecd9d4..204e6587 100644 Binary files a/Assets/Images/UI/MachineDashBoard/IMG_SelectButton.png and b/Assets/Images/UI/MachineDashBoard/IMG_SelectButton.png differ diff --git a/Assets/Images/UI/MachineDashBoard/IMG_SelectButton.png.meta b/Assets/Images/UI/MachineDashBoard/IMG_SelectButton.png.meta index e6329d5a..c38215e4 100644 --- a/Assets/Images/UI/MachineDashBoard/IMG_SelectButton.png.meta +++ b/Assets/Images/UI/MachineDashBoard/IMG_SelectButton.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 8e1862f8be92f014295d767a172efd3c +guid: 23ad803e7d41c8540876d186060d8ebf 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/MiniMap/IMG_MiniMapFloor_bg.png b/Assets/Images/UI/MiniMap/IMG_MiniMapFloor_bg.png index a4c9cd55..f6fade9e 100644 Binary files a/Assets/Images/UI/MiniMap/IMG_MiniMapFloor_bg.png and b/Assets/Images/UI/MiniMap/IMG_MiniMapFloor_bg.png differ diff --git a/Assets/Images/UI/MiniMap/IMG_MiniMapFloor_bg.png.meta b/Assets/Images/UI/MiniMap/IMG_MiniMapFloor_bg.png.meta index 8a1571c5..c4ff715f 100644 --- a/Assets/Images/UI/MiniMap/IMG_MiniMapFloor_bg.png.meta +++ b/Assets/Images/UI/MiniMap/IMG_MiniMapFloor_bg.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: b3113bf2cf17cc742b53bde2505431f2 +guid: c294cd1be8b069644ac6ece88ed7fd8d 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,23 +93,11 @@ TextureImporter: 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 @@ -132,6 +107,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + spriteCustomMetadata: + entries: [] nameFileIdTable: {} mipmapLimitGroupName: pSDRemoveMatte: 0 diff --git a/Assets/Images/UI/MiniMap/IMG_MiniMap_bg.png b/Assets/Images/UI/MiniMap/IMG_MiniMap_bg.png index 9992561f..ac751b8b 100644 Binary files a/Assets/Images/UI/MiniMap/IMG_MiniMap_bg.png and b/Assets/Images/UI/MiniMap/IMG_MiniMap_bg.png differ diff --git a/Assets/Images/UI/MiniMap/IMG_MiniMap_bg.png.meta b/Assets/Images/UI/MiniMap/IMG_MiniMap_bg.png.meta index 66c4fdd1..4a699234 100644 --- a/Assets/Images/UI/MiniMap/IMG_MiniMap_bg.png.meta +++ b/Assets/Images/UI/MiniMap/IMG_MiniMap_bg.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: f4c80b56dc657494ea95cd673c693b61 +guid: ddd750285154f6f45b4019d2140e9edf 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,23 +93,11 @@ TextureImporter: 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 @@ -132,6 +107,8 @@ TextureImporter: edges: [] weights: [] secondaryTextures: [] + spriteCustomMetadata: + entries: [] nameFileIdTable: {} mipmapLimitGroupName: pSDRemoveMatte: 0 diff --git a/Assets/Prefabs/UI/Panel/Panel_MiniMap.prefab b/Assets/Prefabs/UI/Panel/Panel_MiniMap.prefab index 7404e192..43aeb095 100644 --- a/Assets/Prefabs/UI/Panel/Panel_MiniMap.prefab +++ b/Assets/Prefabs/UI/Panel/Panel_MiniMap.prefab @@ -143,8 +143,7 @@ MonoBehaviour: m_text: 0 F m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 73a8cbdb8d46fbb4bae58573ac247b09, type: 2} - m_sharedMaterial: {fileID: -2117747647215524922, guid: 73a8cbdb8d46fbb4bae58573ac247b09, - type: 2} + m_sharedMaterial: {fileID: -2117747647215524922, guid: 73a8cbdb8d46fbb4bae58573ac247b09, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -281,7 +280,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f4c80b56dc657494ea95cd673c693b61, type: 3} + m_Sprite: {fileID: 21300000, guid: ddd750285154f6f45b4019d2140e9edf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -466,7 +465,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b3113bf2cf17cc742b53bde2505431f2, type: 3} + m_Sprite: {fileID: 21300000, guid: c294cd1be8b069644ac6ece88ed7fd8d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -546,8 +545,7 @@ MonoBehaviour: ' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 73a8cbdb8d46fbb4bae58573ac247b09, type: 2} - m_sharedMaterial: {fileID: -2117747647215524922, guid: 73a8cbdb8d46fbb4bae58573ac247b09, - type: 2} + m_sharedMaterial: {fileID: -2117747647215524922, guid: 73a8cbdb8d46fbb4bae58573ac247b09, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] diff --git a/Assets/Resources/Prefabs/UI/PRF_Panel_MachineDashBoard.prefab b/Assets/Resources/Prefabs/UI/PRF_Panel_MachineDashBoard.prefab index 4c849eb9..993864e7 100644 --- a/Assets/Resources/Prefabs/UI/PRF_Panel_MachineDashBoard.prefab +++ b/Assets/Resources/Prefabs/UI/PRF_Panel_MachineDashBoard.prefab @@ -68,8 +68,7 @@ MonoBehaviour: m_text: "7\uD638\uAE30" m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 73a8cbdb8d46fbb4bae58573ac247b09, type: 2} - m_sharedMaterial: {fileID: -2117747647215524922, guid: 73a8cbdb8d46fbb4bae58573ac247b09, - type: 2} + m_sharedMaterial: {fileID: -2117747647215524922, guid: 73a8cbdb8d46fbb4bae58573ac247b09, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -520,9 +519,8 @@ MonoBehaviour: m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: - m_HighlightedSprite: {fileID: 21300000, guid: f10826b15e9593f4589352dc5b0607e3, - type: 3} - m_PressedSprite: {fileID: 21300000, guid: f10826b15e9593f4589352dc5b0607e3, type: 3} + m_HighlightedSprite: {fileID: 21300000, guid: d7d68376e0c51194f8c35b833c7c2b61, type: 3} + m_PressedSprite: {fileID: 21300000, guid: d7d68376e0c51194f8c35b833c7c2b61, type: 3} m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: @@ -643,9 +641,8 @@ MonoBehaviour: m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: - m_HighlightedSprite: {fileID: 21300000, guid: f10826b15e9593f4589352dc5b0607e3, - type: 3} - m_PressedSprite: {fileID: 21300000, guid: f10826b15e9593f4589352dc5b0607e3, type: 3} + m_HighlightedSprite: {fileID: 21300000, guid: d7d68376e0c51194f8c35b833c7c2b61, type: 3} + m_PressedSprite: {fileID: 21300000, guid: d7d68376e0c51194f8c35b833c7c2b61, type: 3} m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: @@ -1287,7 +1284,7 @@ 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: 0, g: 0, b: 0, a: 0.9411765} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -1397,7 +1394,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 8e1862f8be92f014295d767a172efd3c, type: 3} + m_Texture: {fileID: 2800000, guid: 23ad803e7d41c8540876d186060d8ebf, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -1587,9 +1584,8 @@ MonoBehaviour: m_ColorMultiplier: 1 m_FadeDuration: 0.1 m_SpriteState: - m_HighlightedSprite: {fileID: 21300000, guid: f10826b15e9593f4589352dc5b0607e3, - type: 3} - m_PressedSprite: {fileID: 21300000, guid: f10826b15e9593f4589352dc5b0607e3, type: 3} + m_HighlightedSprite: {fileID: 21300000, guid: d7d68376e0c51194f8c35b833c7c2b61, type: 3} + m_PressedSprite: {fileID: 21300000, guid: d7d68376e0c51194f8c35b833c7c2b61, type: 3} m_SelectedSprite: {fileID: 0} m_DisabledSprite: {fileID: 0} m_AnimationTriggers: @@ -1989,7 +1985,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 8e1862f8be92f014295d767a172efd3c, type: 3} + m_Texture: {fileID: 2800000, guid: 23ad803e7d41c8540876d186060d8ebf, type: 3} m_UVRect: serializedVersion: 2 x: 0 @@ -2064,8 +2060,7 @@ MonoBehaviour: m_text: Equipment m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 73a8cbdb8d46fbb4bae58573ac247b09, type: 2} - m_sharedMaterial: {fileID: -2117747647215524922, guid: 73a8cbdb8d46fbb4bae58573ac247b09, - type: 2} + m_sharedMaterial: {fileID: -2117747647215524922, guid: 73a8cbdb8d46fbb4bae58573ac247b09, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] @@ -2399,7 +2394,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Texture: {fileID: 2800000, guid: 8e1862f8be92f014295d767a172efd3c, type: 3} + m_Texture: {fileID: 2800000, guid: 23ad803e7d41c8540876d186060d8ebf, type: 3} m_UVRect: serializedVersion: 2 x: 0 diff --git a/Assets/Resources/Prefabs/UI/UI_DashboardCheckListItem.prefab b/Assets/Resources/Prefabs/UI/UI_DashboardCheckListItem.prefab index 32eb3878..d57927a7 100644 --- a/Assets/Resources/Prefabs/UI/UI_DashboardCheckListItem.prefab +++ b/Assets/Resources/Prefabs/UI/UI_DashboardCheckListItem.prefab @@ -75,10 +75,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.5882353} - m_PressedColor: {r: 0.09411765, g: 0.23137255, b: 0.4627451, a: 0.78431374} - m_SelectedColor: {r: 0.09411765, g: 0.23137255, b: 0.4627451, a: 0} + m_NormalColor: {r: 0.75, g: 0.75, b: 0.75, a: 0} + m_HighlightedColor: {r: 0.75, g: 0.75, b: 0.75, a: 0.5882353} + m_PressedColor: {r: 0.75, g: 0.75, b: 0.75, a: 0.78431374} + m_SelectedColor: {r: 0.75, g: 0.75, b: 0.75, a: 0} m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} m_ColorMultiplier: 1 m_FadeDuration: 0.1 @@ -119,7 +119,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.7490196, g: 0.7490196, b: 0.7490196, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -204,8 +204,7 @@ MonoBehaviour: m_text: New Text m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 2ec62c2b5b163f64e92dc4988250c9c8, type: 2} - m_sharedMaterial: {fileID: 1892695685711531568, guid: 2ec62c2b5b163f64e92dc4988250c9c8, - type: 2} + m_sharedMaterial: {fileID: 1892695685711531568, guid: 2ec62c2b5b163f64e92dc4988250c9c8, type: 2} m_fontSharedMaterials: [] m_fontMaterial: {fileID: 0} m_fontMaterials: [] diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 5e1f5c01..0e2b0098 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -230595,8 +230595,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 401408cc9e6935440b369c9a941f90a4, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 5e59acf201e1f7348a4b4505b7019905, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -230604,7 +230604,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 4 --- !u!222 &966864694 CanvasRenderer: m_ObjectHideFlags: 0