diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_meter_heart_frame.png b/popcorn/Assets/MyGame/Resource/UI/ui_meter_heart_frame.png index 5c94aa78..12185fbc 100644 Binary files a/popcorn/Assets/MyGame/Resource/UI/ui_meter_heart_frame.png and b/popcorn/Assets/MyGame/Resource/UI/ui_meter_heart_frame.png differ diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_meter_heart_frame_fill.png b/popcorn/Assets/MyGame/Resource/UI/ui_meter_heart_frame_fill.png index 4630893d..e8c479ec 100644 Binary files a/popcorn/Assets/MyGame/Resource/UI/ui_meter_heart_frame_fill.png and b/popcorn/Assets/MyGame/Resource/UI/ui_meter_heart_frame_fill.png differ diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_meter_heart_frame_up.png b/popcorn/Assets/MyGame/Resource/UI/ui_meter_heart_frame_up.png new file mode 100644 index 00000000..75035c6d Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/UI/ui_meter_heart_frame_up.png differ diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_meter_heart_frame_up.png.meta b/popcorn/Assets/MyGame/Resource/UI/ui_meter_heart_frame_up.png.meta new file mode 100644 index 00000000..32b77f6f --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/UI/ui_meter_heart_frame_up.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: b3faafff23cb1eb42ab6fd823995f5e5 +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: 112, y: 0, z: 40, 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/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index ce6a2f81..54277269 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -1924,21 +1924,56 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 3664916833545329524, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} - target: {fileID: 3664916833546693945, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_SizeDelta.x value: 0 objectReference: {fileID: 0} + - target: {fileID: 3664916833637780612, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -339.2998 + objectReference: {fileID: 0} + - target: {fileID: 3664916833637780612, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 260.69922 + objectReference: {fileID: 0} - target: {fileID: 3664916833780733955, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_Name value: Button_cooking objectReference: {fileID: 0} + - target: {fileID: 3664916833805477842, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -698.0996 + objectReference: {fileID: 0} + - target: {fileID: 3664916833805477842, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 260.69922 + objectReference: {fileID: 0} - target: {fileID: 3664916834121473267, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchoredPosition.x + value: -519.2002 + objectReference: {fileID: 0} + - target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 260.69922 + objectReference: {fileID: 0} - target: {fileID: 4348639590627783772, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_IsActive diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab index a5f2718d..36df1192 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab @@ -273,7 +273,7 @@ RectTransform: - {fileID: 137127164225778476} - {fileID: 137127162649858634} m_Father: {fileID: 137127164255914078} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -720,12 +720,12 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 137127164255914078} - m_RootOrder: 0 + m_RootOrder: 1 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: 0} - m_SizeDelta: {x: 316, y: 74} + m_AnchoredPosition: {x: -14, y: 0} + m_SizeDelta: {x: 340, y: 74} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &137127163636726002 CanvasRenderer: @@ -754,7 +754,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: ff4d597826f53ac49821fc3d60148965, type: 3} + m_Sprite: {fileID: 21300000, guid: b3faafff23cb1eb42ab6fd823995f5e5, type: 3} m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 @@ -905,15 +905,15 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 137127163636725900} - {fileID: 137127162796222318} + - {fileID: 137127163636725900} - {fileID: 137127164573744481} m_Father: {fileID: 137127163878687691} m_RootOrder: 1 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: -77.600586} + m_AnchoredPosition: {x: 0, y: -77.60156} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &137127164255914076