diff --git a/Assets/Images/UI/생산 진행 현황판( Production Status)/IMG_Background.png b/Assets/Images/UI/생산 진행 현황판( Production Status)/IMG_Background.png index cf2d4280..9ab0b810 100644 Binary files a/Assets/Images/UI/생산 진행 현황판( Production Status)/IMG_Background.png and b/Assets/Images/UI/생산 진행 현황판( Production Status)/IMG_Background.png differ diff --git a/Assets/Images/UI/생산 진행 현황판( Production Status)/IMG_Background.png.meta b/Assets/Images/UI/생산 진행 현황판( Production Status)/IMG_Background.png.meta index 2cd1a069..7f0424e8 100644 --- a/Assets/Images/UI/생산 진행 현황판( Production Status)/IMG_Background.png.meta +++ b/Assets/Images/UI/생산 진행 현황판( Production Status)/IMG_Background.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 489d01a0660ef714d8948184e6c2df8f +guid: 3d321b15fba869f4fb59e71ac9c22fd3 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: 72, y: 72, z: 72, w: 72} 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/생산 진행 현황판( Production Status)/IMG_Line.png b/Assets/Images/UI/생산 진행 현황판( Production Status)/IMG_Line.png index b0375044..0e64cbc7 100644 Binary files a/Assets/Images/UI/생산 진행 현황판( Production Status)/IMG_Line.png and b/Assets/Images/UI/생산 진행 현황판( Production Status)/IMG_Line.png differ diff --git a/Assets/Images/UI/생산 진행 현황판( Production Status)/IMG_Line.png.meta b/Assets/Images/UI/생산 진행 현황판( Production Status)/IMG_Line.png.meta index c22fca1d..55a690f5 100644 --- a/Assets/Images/UI/생산 진행 현황판( Production Status)/IMG_Line.png.meta +++ b/Assets/Images/UI/생산 진행 현황판( Production Status)/IMG_Line.png.meta @@ -1,9 +1,9 @@ fileFormatVersion: 2 -guid: 80e19ea7f5cc2cf4e86289cf64c070de +guid: a487547bfe51bf549b19c23cd966bde5 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/생산 진행 현황판( Production Status)/IMG_TitleBackground.png b/Assets/Images/UI/생산 진행 현황판( Production Status)/IMG_TitleBackground.png new file mode 100644 index 00000000..453bd14c Binary files /dev/null and b/Assets/Images/UI/생산 진행 현황판( Production Status)/IMG_TitleBackground.png differ diff --git a/Assets/Images/UI/생산 진행 현황판( Production Status)/IMG_TitleBackground.png.meta b/Assets/Images/UI/생산 진행 현황판( Production Status)/IMG_TitleBackground.png.meta new file mode 100644 index 00000000..ba427a7a --- /dev/null +++ b/Assets/Images/UI/생산 진행 현황판( Production Status)/IMG_TitleBackground.png.meta @@ -0,0 +1,117 @@ +fileFormatVersion: 2 +guid: 0110304b840674b468644310093f1a95 +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/Prefabs/UI/Panel/Panel_AssemblyProduction.prefab b/Assets/Prefabs/UI/Panel/Panel_AssemblyProduction.prefab index 35486553..c7576828 100644 --- a/Assets/Prefabs/UI/Panel/Panel_AssemblyProduction.prefab +++ b/Assets/Prefabs/UI/Panel/Panel_AssemblyProduction.prefab @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 80e19ea7f5cc2cf4e86289cf64c070de, type: 3} + m_Sprite: {fileID: 21300000, guid: a487547bfe51bf549b19c23cd966bde5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -509,11 +509,11 @@ RectTransform: - {fileID: 854797298799632733} - {fileID: 6068166189340199735} - {fileID: 1135556885291071919} - m_Father: {fileID: 4768901803580435810} + m_Father: {fileID: 8044112391201916470} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -136.8} + m_AnchoredPosition: {x: 0, y: -37.500015} m_SizeDelta: {x: 1720, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5180109984388464268 @@ -918,8 +918,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 5109533170497525156} - - {fileID: 1709755407059597719} + - {fileID: 8044112391201916470} - {fileID: 7606984360522393326} - {fileID: 5557226499483123571} m_Father: {fileID: 0} @@ -957,8 +956,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 489d01a0660ef714d8948184e6c2df8f, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 3d321b15fba869f4fb59e71ac9c22fd3, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -966,7 +965,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 4 --- !u!114 &7099514687358409080 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1010,7 +1009,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2898945362052975825} - 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: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1019,12 +1018,12 @@ RectTransform: - {fileID: 727005579204540355} - {fileID: 4196761572219367325} - {fileID: 690486746170502698} - m_Father: {fileID: 4768901803580435810} + m_Father: {fileID: 8044112391201916470} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 330} - m_SizeDelta: {x: 0, y: -660} + m_AnchoredPosition: {x: 0, y: 87.30005} + m_SizeDelta: {x: 2, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3108822034357246234 CanvasRenderer: @@ -3687,6 +3686,119 @@ MonoBehaviour: m_ChildScaleWidth: 0 m_ChildScaleHeight: 0 m_ReverseArrangement: 0 +--- !u!1 &7457345926676137155 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8254726654320533369} + - component: {fileID: 1569950057925165540} + - component: {fileID: 8846159924872811811} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8254726654320533369 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7457345926676137155} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 8044112391201916470} + 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.000061035, y: 49.649963} + m_SizeDelta: {x: 1720, y: 174.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1569950057925165540 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7457345926676137155} + m_CullTransparentMesh: 1 +--- !u!114 &8846159924872811811 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7457345926676137155} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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: 0110304b840674b468644310093f1a95, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8540931472614797312 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8044112391201916470} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8044112391201916470 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8540931472614797312} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 8254726654320533369} + - {fileID: 5109533170497525156} + - {fileID: 1709755407059597719} + m_Father: {fileID: 4768901803580435810} + 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, y: 242.70001} + m_SizeDelta: {x: 1720, y: 75.000015} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8774749964979603869 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/UI/Panel/Panel_InjectionProduction.prefab b/Assets/Prefabs/UI/Panel/Panel_InjectionProduction.prefab index 0b44e369..f6384a61 100644 --- a/Assets/Prefabs/UI/Panel/Panel_InjectionProduction.prefab +++ b/Assets/Prefabs/UI/Panel/Panel_InjectionProduction.prefab @@ -40,11 +40,11 @@ RectTransform: - {fileID: 2288499217347505621} - {fileID: 8418907891395956054} - {fileID: 6058817297776574070} - m_Father: {fileID: 8012176388321684954} + m_Father: {fileID: 4913998461846426341} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -136.8} + m_AnchoredPosition: {x: 0, y: -37.500015} m_SizeDelta: {x: 1720, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &787314444618534231 @@ -848,7 +848,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 80e19ea7f5cc2cf4e86289cf64c070de, type: 3} + m_Sprite: {fileID: 21300000, guid: a487547bfe51bf549b19c23cd966bde5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2085,6 +2085,81 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5190585549853805362 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2533626529513513675} + - component: {fileID: 2917546108510432476} + - component: {fileID: 4551652197681886298} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2533626529513513675 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5190585549853805362} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4913998461846426341} + 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.50006, y: 49.649902} + m_SizeDelta: {x: 1721, y: 174.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2917546108510432476 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5190585549853805362} + m_CullTransparentMesh: 1 +--- !u!114 &4551652197681886298 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5190585549853805362} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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: 0110304b840674b468644310093f1a95, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &5533866831276254921 GameObject: m_ObjectHideFlags: 0 @@ -2357,6 +2432,44 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &6200095703066952441 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4913998461846426341} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4913998461846426341 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6200095703066952441} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2533626529513513675} + - {fileID: 3593254001705787520} + - {fileID: 7321676491443764295} + m_Father: {fileID: 8012176388321684954} + 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, y: 242.70001} + m_SizeDelta: {x: 1720, y: 75.000015} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &6445332334240986520 GameObject: m_ObjectHideFlags: 0 @@ -3064,7 +3177,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8211886852280046996} - 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: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -3073,12 +3186,12 @@ RectTransform: - {fileID: 4294232784137311994} - {fileID: 2602106690286003929} - {fileID: 860131469760548914} - m_Father: {fileID: 8012176388321684954} + m_Father: {fileID: 4913998461846426341} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 330} - m_SizeDelta: {x: 0, y: -660} + m_AnchoredPosition: {x: 0, y: 87.30005} + m_SizeDelta: {x: 2, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4973197933950128874 CanvasRenderer: @@ -3528,8 +3641,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3593254001705787520} - - {fileID: 7321676491443764295} + - {fileID: 4913998461846426341} - {fileID: 5445336235382705009} - {fileID: 3811233514234136088} m_Father: {fileID: 0} @@ -3567,8 +3679,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 489d01a0660ef714d8948184e6c2df8f, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 3d321b15fba869f4fb59e71ac9c22fd3, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -3576,7 +3688,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 4 --- !u!114 &2661370759819461677 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/UI/Panel/Panel_WorkProgressStatus.prefab b/Assets/Prefabs/UI/Panel/Panel_WorkProgressStatus.prefab index 6f166598..7bc077b0 100644 --- a/Assets/Prefabs/UI/Panel/Panel_WorkProgressStatus.prefab +++ b/Assets/Prefabs/UI/Panel/Panel_WorkProgressStatus.prefab @@ -721,11 +721,11 @@ RectTransform: - {fileID: 7836071351152629192} - {fileID: 7386556610489419456} - {fileID: 2941036043501147390} - m_Father: {fileID: 6677719011449264208} + m_Father: {fileID: 6423990354274479425} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -136.8} + m_AnchoredPosition: {x: 0, y: -37.500015} m_SizeDelta: {x: 1720, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7376330912740539397 @@ -1692,7 +1692,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 80e19ea7f5cc2cf4e86289cf64c070de, type: 3} + m_Sprite: {fileID: 21300000, guid: a487547bfe51bf549b19c23cd966bde5, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2691,8 +2691,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3615595748834177091} - - {fileID: 5751035358188716612} + - {fileID: 6423990354274479425} - {fileID: 7024527563682387187} - {fileID: 6077864150461484285} m_Father: {fileID: 0} @@ -2730,8 +2729,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 489d01a0660ef714d8948184e6c2df8f, type: 3} - m_Type: 0 + m_Sprite: {fileID: 21300000, guid: 3d321b15fba869f4fb59e71ac9c22fd3, type: 3} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -2739,7 +2738,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + m_PixelsPerUnitMultiplier: 4 --- !u!114 &6490819945548657831 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2856,7 +2855,7 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7053171930084527284} - 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: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -2865,12 +2864,12 @@ RectTransform: - {fileID: 6830830425222973008} - {fileID: 8676688709557037049} - {fileID: 7317978319113413593} - m_Father: {fileID: 6677719011449264208} + m_Father: {fileID: 6423990354274479425} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 330} - m_SizeDelta: {x: 0, y: -660} + m_AnchoredPosition: {x: 0, y: 87.30005} + m_SizeDelta: {x: 2, y: 24} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &763166280475027002 CanvasRenderer: @@ -2880,6 +2879,119 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7053171930084527284} m_CullTransparentMesh: 1 +--- !u!1 &7187995430725536597 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6423990354274479425} + m_Layer: 5 + m_Name: Title + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6423990354274479425 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7187995430725536597} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 861754537160675317} + - {fileID: 3615595748834177091} + - {fileID: 5751035358188716612} + m_Father: {fileID: 6677719011449264208} + 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, y: 242.70001} + m_SizeDelta: {x: 1720, y: 75.000015} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &7469994119364309969 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 861754537160675317} + - component: {fileID: 4508354288835387822} + - component: {fileID: 4935918926058763201} + m_Layer: 5 + m_Name: Background + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &861754537160675317 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7469994119364309969} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6423990354274479425} + 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.5, y: 49.649963} + m_SizeDelta: {x: 1721, y: 174.3} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4508354288835387822 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7469994119364309969} + m_CullTransparentMesh: 1 +--- !u!114 &4935918926058763201 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7469994119364309969} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + 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: 0110304b840674b468644310093f1a95, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 --- !u!1 &8285535034847117635 GameObject: m_ObjectHideFlags: 0