From 4d0e12eaa8513cd2e18fc23c773a73ca1a0f95a7 Mon Sep 17 00:00:00 2001
From: koya_15 <koya@usaya.jp>
Date: Thu, 4 Nov 2021 15:43:32 +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=E3=81=ABMAX=E8=A1=A8=E8=A8=98=E8=BF=BD?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Fonts/DFHannotateStdN-W7 SDF.asset        |   4 +-
 .../Resource/UI/ui_meter_heart_text_max.png   | Bin 0 -> 2128 bytes
 .../UI/ui_meter_heart_text_max.png.meta       |  92 ++++++++++++++++++
 .../Scenes/Main/Prefabs/UI/Header.prefab      |  75 ++++++++++++++
 4 files changed, 169 insertions(+), 2 deletions(-)
 create mode 100644 popcorn/Assets/MyGame/Resource/UI/ui_meter_heart_text_max.png
 create mode 100644 popcorn/Assets/MyGame/Resource/UI/ui_meter_heart_text_max.png.meta

diff --git a/popcorn/Assets/MyGame/Resource/Fonts/DFHannotateStdN-W7 SDF.asset b/popcorn/Assets/MyGame/Resource/Fonts/DFHannotateStdN-W7 SDF.asset
index a9fa9b95..91672055 100644
--- a/popcorn/Assets/MyGame/Resource/Fonts/DFHannotateStdN-W7 SDF.asset	
+++ b/popcorn/Assets/MyGame/Resource/Fonts/DFHannotateStdN-W7 SDF.asset	
@@ -2685,10 +2685,10 @@ Material:
     - _OutlineSoftness: 0
     - _OutlineUVSpeedX: 0
     - _OutlineUVSpeedY: 0
-    - _OutlineWidth: 0.7
+    - _OutlineWidth: 1
     - _PerspectiveFilter: 0.875
     - _Reflectivity: 10
-    - _ScaleRatioA: 0.53333336
+    - _ScaleRatioA: 0.4528302
     - _ScaleRatioB: 0.011250019
     - _ScaleRatioC: 0.011250019
     - _ScaleX: 1
diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_meter_heart_text_max.png b/popcorn/Assets/MyGame/Resource/UI/ui_meter_heart_text_max.png
new file mode 100644
index 0000000000000000000000000000000000000000..b85de077907b2e28c780a70eee82a8fb42380c85
GIT binary patch
literal 2128
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
GLSTaY7~M<&

literal 0
HcmV?d00001

diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_meter_heart_text_max.png.meta b/popcorn/Assets/MyGame/Resource/UI/ui_meter_heart_text_max.png.meta
new file mode 100644
index 00000000..6c78e9c8
--- /dev/null
+++ b/popcorn/Assets/MyGame/Resource/UI/ui_meter_heart_text_max.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 7bc15daa8401c6644ba2891e854e12ad
+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: 0, y: 0, z: 0, 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/Prefabs/UI/Header.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab
index d32f05dd..8533a88a 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab
+++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Header.prefab
@@ -1304,6 +1304,7 @@ RectTransform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 137127163584464919}
+  - {fileID: 9036187569673410665}
   m_Father: {fileID: 137127164255914078}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1571,6 +1572,80 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &4558166201082566443
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 9036187569673410665}
+  - component: {fileID: 4017058460489609777}
+  - component: {fileID: 4124263560030120133}
+  m_Layer: 5
+  m_Name: ImageText_max
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &9036187569673410665
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4558166201082566443}
+  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: 137127164573744481}
+  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: -1.0000153, y: 0}
+  m_SizeDelta: {x: 98, y: 38}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4017058460489609777
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4558166201082566443}
+  m_CullTransparentMesh: 0
+--- !u!114 &4124263560030120133
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4558166201082566443}
+  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: 7bc15daa8401c6644ba2891e854e12ad, 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 &5097575317734896701
 GameObject:
   m_ObjectHideFlags: 0