From bd2ddf8a7b87b40eb2e677420594ee1a8ab0ec29 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Fri, 27 Aug 2021 17:37:18 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=8F=E3=83=BC=E3=83=88=E3=83=A1=E3=83=BC?= =?UTF-8?q?=E3=82=BF=E3=83=BC=E6=9E=A0=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Resource/UI/ui_meter_heart_frame.png | Bin 674 -> 298 bytes .../Resource/UI/ui_meter_heart_frame_fill.png | Bin 547 -> 199 bytes .../Resource/UI/ui_meter_heart_frame_up.png | Bin 0 -> 2637 bytes .../UI/ui_meter_heart_frame_up.png.meta | 92 ++++++++++++++++++ popcorn/Assets/MyGame/Scenes/Main/Main.unity | 35 +++++++ .../Scenes/Main/Prefabs/UI/Header.prefab | 14 +-- 6 files changed, 134 insertions(+), 7 deletions(-) create mode 100644 popcorn/Assets/MyGame/Resource/UI/ui_meter_heart_frame_up.png create mode 100644 popcorn/Assets/MyGame/Resource/UI/ui_meter_heart_frame_up.png.meta 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 5c94aa78cd1ea9007a8c111f3049b2cbecce2c74..12185fbc9330389fb49140a059b94436661c8d12 100644 GIT binary patch delta 234 zcmZ3)x{7InM?J$CPZ!6Kid%1PALMOv5O4@o5lhg#)W}+KK`7%uQqBP}i+~2%1kGs= zCNMZ|a73KOerzGI2a^ec8^FSU zVv?gg^_Tos2WazyfjI=r7#b&7cF_2qoV9cimJH2P<+MV=0~3c~G4bsaBU>S?!y_YI zf#u+F%fS_#w&cm?Ha;YK#Aio6WrT@YaYlUhN0}U9FT^EL?X3tCHeyX&_Ns(7 zBZ{yl@zAO%56K4c(5fK=s}T>aHjFrVFT2?iBdkmuj8#Tp72;s5O2P3(w)LXCKn(0e zzzEp!frW&@SevEMoH!V3j=%!qV5}h8tyq)2&=1G{cz;%klDM8@d%ZqJlc*w^PZc8kT*@ri0Lo zih{K}u3q8=-kC4Z@!LEdETagEMO%mcRQVLoD5~B7RLArItD7KLz6d_;LjcRW?ZCD3 zlkJ5qx}0Sxy8f31uo%2kxM1o_Zaq~m`7OWz<1)zf0Z8|@mcQk zyYNY-s#nd9C44MXVqjw75KwSvU|@tZlu)@~aV8)+!9L3V>Y)#z{S3?uQTD8>|1g@> PGXR07tDnm{r-UW|*VQVo delta 485 zcmVc5`)=$H1%Ct(;UmVlyC8%vI3E}V0;>KM2!c?HUtlc34}ZO3Y!OU(Rv-vMrNgU7 zAY5Ql1XGU&f-qESWK<)3mV%KWl%ngUum{E?KJp2`09r#%Yx=!I@WagG6zNSNbV@SV zAqeAn!Z4JUw8nmiP|e7Jhwj@oC2;H}`-#+yp@nv4?>_C6$r!;fg*J0Kgqp5T;Hg{F zyx9&}0bi{S9DhP*lRfa3swI_iNDQLbPML-9&gmV!_lM<*80p-DcH{VAQl`ck52~6J7};AW3^7Aapb*Ds9#bV60t} z0CL$q^t4MKq!WaZo`TWo5X&htFyp8xGtgs6-lhoXi>ThVLWb_f0I|SCAY+-GfF?7z b`y;>rZ=IK5F@8B=00000NkvXXu0mjfqHoxS 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 0000000000000000000000000000000000000000..75035c6d568b592189cee8ccef27fc28135b83d6 GIT binary patch literal 2637 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 literal 0 HcmV?d00001 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