From d1cbf16cc7546d2a644c905a323f942c896b8a4e Mon Sep 17 00:00:00 2001
From: koya_15 <koya@usaya.jp>
Date: Mon, 30 Aug 2021 13:03:54 +0900
Subject: [PATCH] =?UTF-8?q?=E9=81=94=E6=88=90=E5=A0=B1=E9=85=AC=E3=82=92?=
 =?UTF-8?q?=E7=94=BB=E5=83=8F=E6=96=87=E5=AD=97=E3=81=AB=E5=A4=89=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...i_Main_recipe_MoneyFrame_text_Quantity.png | Bin 0 -> 811 bytes
 ...n_recipe_MoneyFrame_text_Quantity.png.meta |  92 ++++++++++++++++++
 .../Assets/MyGame/Scenes/Main/BulkOrder.unity |  30 +++---
 .../Assets/MyGame/Scenes/Main/Telephone.unity |  30 +++---
 .../Assets/MyGame/Scenes/Main/cancel.unity    |  30 +++---
 5 files changed, 131 insertions(+), 51 deletions(-)
 create mode 100644 popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_MoneyFrame_text_Quantity.png
 create mode 100644 popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_MoneyFrame_text_Quantity.png.meta

diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_MoneyFrame_text_Quantity.png b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_MoneyFrame_text_Quantity.png
new file mode 100644
index 0000000000000000000000000000000000000000..1c78f77fba97ae20c39eeeb89b8cdca2d48b34c1
GIT binary patch
literal 811
zcmV+`1JwM9P)<h;3K|Lk000e1NJLTq000^Q000~a1^@s6e-p3M0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!%}GQ-RCwCFR!wLVK@@(jdq~VBD^y5&
zXsqHP^bpbFL8yfk3*w=N3SNW;K~PYT9`qoJMNtYtnu8t$t$Ha~FomF0DuiMWqR<E>
z2hkc2rb594{7H|#Z!)t^)?{}ZqaRFnX1nvgdGCGiWr+S0ws?JT?&#h@IW1&z%hiq(
zF~JBw?(+!CS0I_<k(cihE_U;LsJtf;lZ;7{zri$<rPN}p7m3xiova-eeXoAoEK%aX
zo=EuByD#&9c*G<K$Ff>SVo^GE`HYw^%s!{e`d8ZcQKR1YZqmOAYzx}!rDuy&e7&NZ
z-N~MnOpOF_f6|QP@tqkuF`jZg{%Y|9MR^at%Un#;TB&S%#^W~;;}(w?CV@~;Y`{tH
zPTUqo0C<#pI48U+e=3Woj-k<EN{$|;pyr_@${L!&#?*g~ojxvd1EY$hPE-+L!8@zV
zqAT~VQM|v;D_14_F*I)k4jvhx`2IfH_*rB3KeybCQ^VtEPq!~3lf8-QAsb@X#hi^K
zITWiLI%jwSp@1z2gbHJgL+KDf158B%M0@HAdcg`yN<t@e5+#C<JZc;PM{XKm$ch(0
zg0b->OSBbo59TOyA<fUMSc7C?cAl1=F1p6gV2u}49HAnp%&8_PMD2v?rw_9zARI3!
zd7sy7$g|Pj9JlBD4)u%iDDB>{gzDHU#3ALE2#Lp-JbRt4p1dUU+wDyx$)^1h)i|^m
zC}7l+ADHd7=AbBrVUeS{`rbFFu_Ht%=HB=&if}oo&fz79wum5cNLp*0b}@I92)Utk
z5?<+W>wBhKc+mEB!0?Tkw2y;S^kujiQ9<1W5PRf6q4;LS&Pi1>1n-20vR6XpXh*J>
z6K=35+7Y!0y-PQuy2mCVeqjyA%PBi_vQG4M8zd=^G`$72xB*oi*DhS8-uk!&mAtN7
p_~{sw#<S9Rq7xU%e~w=Q3;+b`Cl)a8Dg6Kd002ovPDHLkV1g5@a(Dm$

literal 0
HcmV?d00001

diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_MoneyFrame_text_Quantity.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_MoneyFrame_text_Quantity.png.meta
new file mode 100644
index 00000000..e95443f5
--- /dev/null
+++ b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_MoneyFrame_text_Quantity.png.meta
@@ -0,0 +1,92 @@
+fileFormatVersion: 2
+guid: 086caf604a7f77e4395bff51404dbb22
+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/BulkOrder.unity b/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity
index 68bd5517..72d8e9e0 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity
+++ b/popcorn/Assets/MyGame/Scenes/Main/BulkOrder.unity
@@ -1646,7 +1646,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 94, y: -50}
-  m_SizeDelta: {x: 180, y: 70}
+  m_SizeDelta: {x: 130, y: 42}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1185678715
 MonoBehaviour:
@@ -1657,30 +1657,26 @@ MonoBehaviour:
   m_GameObject: {fileID: 1185678713}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.43137255, g: 0.29803923, b: 0.19215687, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
-    m_FontSize: 30
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 0
-    m_MaxSize: 30
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u9054\u6210\u5831\u916C"
+  m_Sprite: {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, 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!222 &1185678716
 CanvasRenderer:
   m_ObjectHideFlags: 0
diff --git a/popcorn/Assets/MyGame/Scenes/Main/Telephone.unity b/popcorn/Assets/MyGame/Scenes/Main/Telephone.unity
index 3e53dd72..f82ba63b 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/Telephone.unity
+++ b/popcorn/Assets/MyGame/Scenes/Main/Telephone.unity
@@ -1998,7 +1998,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 96.299995, y: -76.00004}
-  m_SizeDelta: {x: 160, y: 70}
+  m_SizeDelta: {x: 130, y: 42}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &2082742247
 MonoBehaviour:
@@ -2009,30 +2009,26 @@ MonoBehaviour:
   m_GameObject: {fileID: 2082742245}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.43137255, g: 0.29803923, b: 0.19215687, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
-    m_FontSize: 30
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 0
-    m_MaxSize: 30
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u9054\u6210\u5831\u916C"
+  m_Sprite: {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, 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!222 &2082742248
 CanvasRenderer:
   m_ObjectHideFlags: 0
diff --git a/popcorn/Assets/MyGame/Scenes/Main/cancel.unity b/popcorn/Assets/MyGame/Scenes/Main/cancel.unity
index 6075712b..f8a384a1 100644
--- a/popcorn/Assets/MyGame/Scenes/Main/cancel.unity
+++ b/popcorn/Assets/MyGame/Scenes/Main/cancel.unity
@@ -420,7 +420,7 @@ RectTransform:
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
   m_AnchoredPosition: {x: 96.299995, y: -76.00004}
-  m_SizeDelta: {x: 160, y: 70}
+  m_SizeDelta: {x: 130, y: 42}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &378495800
 MonoBehaviour:
@@ -431,30 +431,26 @@ MonoBehaviour:
   m_GameObject: {fileID: 378495798}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.43137255, g: 0.29803923, b: 0.19215687, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 0
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_FontData:
-    m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
-    m_FontSize: 30
-    m_FontStyle: 0
-    m_BestFit: 0
-    m_MinSize: 0
-    m_MaxSize: 30
-    m_Alignment: 4
-    m_AlignByGeometry: 0
-    m_RichText: 1
-    m_HorizontalOverflow: 0
-    m_VerticalOverflow: 0
-    m_LineSpacing: 1
-  m_Text: "\u9054\u6210\u5831\u916C"
+  m_Sprite: {fileID: 21300000, guid: bd3845c3836664a4a9adaac6d554621c, 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!222 &378495801
 CanvasRenderer:
   m_ObjectHideFlags: 0