yangwu
/
popcorn
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' of https://bitbucket.org/usaya/popcorn into develop 

* 'develop' of https://bitbucket.org/usaya/popcorn:
  試食画面文字等調整
This commit is contained in:
kimura 2021-11-24 18:53:37 +09:00
parent e5a29747d2 10aba193ec
commit cf822e1657
3 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_button_icon_Tasting_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.4 KiB

After

Width:  |  Height:  |  Size: 5.4 KiB

BIN
popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_illustration_Tasting.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 28 KiB

After

Width:  |  Height:  |  Size: 29 KiB

43
popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab
View File

@ -161,7 +161,7 @@ RectTransform:
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: 800, y: 180}
m_SizeDelta: {x: 850, y: 180}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5089467466247093044
CanvasRenderer:
@ -192,7 +192,7 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 35
m_FontSize: 40
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 0
@ -239,7 +239,7 @@ RectTransform:
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: 750, y: 6}
m_SizeDelta: {x: 830, y: 6}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5089467466339732556
CanvasRenderer:
@ -390,7 +390,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 300, y: 138}
m_SizeDelta: {x: 300, y: 146}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5089467466492122886
CanvasRenderer:
@ -419,7 +419,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 8f0e6d6f313cacd40b84e6ea0922b0fa, type: 3}
m_Sprite: {fileID: 21300000, guid: 089ca9e468fdfd14ebd66370e335159c, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@ -522,7 +522,7 @@ RectTransform:
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: -71}
m_AnchoredPosition: {x: 0, y: -73}
m_SizeDelta: {x: 630, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5089467466529880990
@ -615,7 +615,6 @@ MonoBehaviour:
closeButton: {fileID: 5089467467567286954}
tastingButton: {fileID: 5089467466492122904}
popcornName: {fileID: 5089467467985140646}
popcornImage: {fileID: 5089467466473792397}
packageImageTarget: {fileID: 5089467466839610379}
--- !u!1 &5089467466576579807
GameObject:
@ -651,7 +650,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: 256, y: -29}
m_AnchoredPosition: {x: 256, y: -34}
m_SizeDelta: {x: 200, y: 178}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5089467466576579804
@ -930,7 +929,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: 0, y: -22}
m_AnchoredPosition: {x: 0, y: -27}
m_SizeDelta: {x: 114, y: 52}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5089467467043396144
@ -1043,8 +1042,8 @@ RectTransform:
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: 4, y: -51.999977}
m_SizeDelta: {x: 516.7, y: 50}
m_AnchoredPosition: {x: 4, y: -60}
m_SizeDelta: {x: 530, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &5089467467449532907
GameObject:
@ -1080,7 +1079,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: -431, y: 0}
m_AnchoredPosition: {x: -455, y: 0}
m_SizeDelta: {x: 74, y: 68}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5089467467449532904
@ -1232,7 +1231,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 300, y: 138}
m_SizeDelta: {x: 300, y: 146}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5089467467567286952
CanvasRenderer:
@ -1368,8 +1367,8 @@ 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: 0, y: 240}
m_SizeDelta: {x: 1000, y: 312}
m_AnchoredPosition: {x: 0, y: 229}
m_SizeDelta: {x: 1000, y: 324}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5089467467585629818
CanvasRenderer:
@ -1442,7 +1441,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: 432, y: 0}
m_AnchoredPosition: {x: 455, y: 0}
m_SizeDelta: {x: 74, y: 68}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5089467467684478784
@ -1596,7 +1595,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: -264, y: -24}
m_AnchoredPosition: {x: -264, y: -29}
m_SizeDelta: {x: 206, y: 206}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5089467467838188610
@ -1670,8 +1669,8 @@ 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: 0, y: 3}
m_SizeDelta: {x: 516.7, y: 50}
m_AnchoredPosition: {x: 0, y: 9}
m_SizeDelta: {x: 750, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5089467467985140645
CanvasRenderer:
@ -1702,8 +1701,8 @@ MonoBehaviour:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_FontSize: 32
m_FontStyle: 0
m_FontSize: 40
m_FontStyle: 1
m_BestFit: 0
m_MinSize: 2
m_MaxSize: 300
@ -1748,7 +1747,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: 0, y: 4}
m_AnchoredPosition: {x: 0, y: 7}
m_SizeDelta: {x: 208, y: 52}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5089467468128331484