diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_MeterFrame.png b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_MeterFrame.png index 738a4b51..6dbd9cc6 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_MeterFrame.png and b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_MeterFrame.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_MeterFrame_Groundwork.png b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_MeterFrame_Groundwork.png new file mode 100644 index 00000000..bc414f47 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_MeterFrame_Groundwork.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_MeterFrame_Groundwork.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_MeterFrame_Groundwork.png.meta new file mode 100644 index 00000000..23692f77 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_MeterFrame_Groundwork.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: e25c6a6f53e3864408764f3949e43f66 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + 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 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + 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: 25, y: 0, z: 22, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_MeterFrame_fill.png b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_MeterFrame_fill.png index eeeacfc7..24799121 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_MeterFrame_fill.png and b/popcorn/Assets/MyGame/Resource/Material/Main/Mission/ui_Main_Mission_MeterFrame_fill.png differ diff --git a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity index a71052a2..5895677e 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Mission.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Mission.unity @@ -2767,10 +2767,5 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1628107519355832249, guid: 1559aa4b9e5d85c46ae00275092f8d28, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -7.0000105 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1559aa4b9e5d85c46ae00275092f8d28, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/detail_Mission.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/detail_Mission.prefab index 7bb0dddc..8acd58e4 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/detail_Mission.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/detail_Mission.prefab @@ -491,8 +491,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -0.23001099, y: 0} - m_SizeDelta: {x: 1.2599866, y: -28.000002} + m_AnchoredPosition: {x: 0.87509155, y: 0} + m_SizeDelta: {x: 4.890153, y: -28.000002} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &1628107519296330533 CanvasRenderer: @@ -566,7 +566,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: -10, y: 0} + m_AnchoredPosition: {x: -7, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1628107519460211743 @@ -754,8 +754,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: -30, y: 0} + m_AnchoredPosition: {x: -1.800003, y: 0} + m_SizeDelta: {x: -27.200005, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1628107519738777241 GameObject: @@ -785,8 +785,9 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1628107519757661907} + - {fileID: 4436618374625583947} - {fileID: 1628107519727420137} + - {fileID: 1628107519757661907} m_Father: {fileID: 1628107518890820206} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -875,7 +876,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 1628107519738777242} - m_RootOrder: 0 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} m_AnchorMax: {x: 1, y: 0.75} @@ -1317,3 +1318,77 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3943511651993985267 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4436618374625583947} + - component: {fileID: 2885995668717174927} + - component: {fileID: 886331159982986887} + m_Layer: 5 + m_Name: Groundwork + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4436618374625583947 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3943511651993985267} + 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_Children: [] + m_Father: {fileID: 1628107519738777242} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 0, y: 0.25} + m_AnchoredPosition: {x: 250, y: 34.9} + m_SizeDelta: {x: 476, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2885995668717174927 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3943511651993985267} + m_CullTransparentMesh: 0 +--- !u!114 &886331159982986887 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3943511651993985267} + 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: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e25c6a6f53e3864408764f3949e43f66, type: 3} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1