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-22 14:31:51 +09:00
parent 9504909bcc 14d7bf6e8b
commit dc653bdf2a
18 changed files with 104 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
popcorn/Assets/MyGame/Resource/UI/ui_button_Footer_Big.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.0 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

BIN
popcorn/Assets/MyGame/Resource/UI/ui_button_Footer_small.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 5.1 KiB

After

Width:  |  Height:  |  Size: 6.7 KiB

BIN
popcorn/Assets/MyGame/Resource/UI/ui_button_icon_Footer_FryingPan.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 8.8 KiB

BIN
popcorn/Assets/MyGame/Resource/UI/ui_button_icon_Footer_FryingPan_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

BIN
popcorn/Assets/MyGame/Resource/UI/ui_button_icon_Footer_ProductManagement.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.9 KiB

BIN
popcorn/Assets/MyGame/Resource/UI/ui_button_icon_Footer_ProductManagement_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

BIN
popcorn/Assets/MyGame/Resource/UI/ui_button_icon_Footer_Purchasing.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.4 KiB

After

Width:  |  Height:  |  Size: 5.0 KiB

BIN
popcorn/Assets/MyGame/Resource/UI/ui_button_icon_Footer_Purchasing_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

BIN
popcorn/Assets/MyGame/Resource/UI/ui_button_icon_Footer_corn.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.6 KiB

BIN
popcorn/Assets/MyGame/Resource/UI/ui_button_icon_Footer_corn_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.1 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

BIN
popcorn/Assets/MyGame/Resource/UI/ui_button_icon_Footer_shop.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.9 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

BIN
popcorn/Assets/MyGame/Resource/UI/ui_button_icon_Footer_shop_logo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.1 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

18
popcorn/Assets/MyGame/Scenes/CornField/CornField.unity
View File

@ -1088,10 +1088,15 @@ PrefabInstance:
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3664916833637780612, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3664916833637780612, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 3664916833637780612, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: -355.19922 value: -375
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3664916833752817997, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 3664916833752817997, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
@ -1118,10 +1123,15 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: -535.10156 value: -575
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4348639590627783772, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 4348639590627783772, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
@ -1140,8 +1150,8 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6969874152703327186, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 6969874152703327186, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_LocalPosition.y
value: 260.69922 value: -843.2969
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 8103176713869808018, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}

10
popcorn/Assets/MyGame/Scenes/Main/Main.unity
View File

@ -5698,6 +5698,11 @@ PrefabInstance:
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3664916833637780612, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -375
objectReference: {fileID: 0}
- target: {fileID: 3664916833780733955, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 3664916833780733955, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
@ -5763,6 +5768,11 @@ PrefabInstance:
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -575
objectReference: {fileID: 0}
- target: {fileID: 3672624745086876516, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 3672624745086876516, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y

58
popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab
View File

@ -34,8 +34,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -23.199997} m_AnchoredPosition: {x: 0, y: -33.19998}
m_SizeDelta: {x: 98, y: 38} m_SizeDelta: {x: 161, y: 65}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3310671340499624765 --- !u!222 &3310671340499624765
CanvasRenderer: CanvasRenderer:
@ -108,8 +108,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -23.2} m_AnchoredPosition: {x: 0, y: -33.19999}
m_SizeDelta: {x: 98, y: 38} m_SizeDelta: {x: 161, y: 65}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3310671340824885727 --- !u!222 &3310671340824885727
CanvasRenderer: CanvasRenderer:
@ -182,8 +182,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 17.5} m_AnchoredPosition: {x: 0, y: 24}
m_SizeDelta: {x: 94, y: 76} m_SizeDelta: {x: 89, y: 95}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3310671340910471028 --- !u!222 &3310671340910471028
CanvasRenderer: CanvasRenderer:
@ -256,8 +256,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -23.2} m_AnchoredPosition: {x: 0, y: -33.19999}
m_SizeDelta: {x: 98, y: 38} m_SizeDelta: {x: 161, y: 65}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3310671340978879436 --- !u!222 &3310671340978879436
CanvasRenderer: CanvasRenderer:
@ -334,8 +334,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0} m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -535.1006, y: 274} m_AnchoredPosition: {x: -575, y: 274}
m_SizeDelta: {x: 150, y: 148} m_SizeDelta: {x: 193, y: 190}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3310671341034218316 --- !u!222 &3310671341034218316
CanvasRenderer: CanvasRenderer:
@ -467,8 +467,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 17.5} m_AnchoredPosition: {x: 0, y: 24}
m_SizeDelta: {x: 94, y: 76} m_SizeDelta: {x: 87, y: 82}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3310671341133373338 --- !u!222 &3310671341133373338
CanvasRenderer: CanvasRenderer:
@ -541,8 +541,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 17.5} m_AnchoredPosition: {x: 0, y: 25}
m_SizeDelta: {x: 94, y: 76} m_SizeDelta: {x: 118, y: 95}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3310671341184677557 --- !u!222 &3310671341184677557
CanvasRenderer: CanvasRenderer:
@ -615,8 +615,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -32} m_AnchoredPosition: {x: 0, y: -52}
m_SizeDelta: {x: 92, y: 48} m_SizeDelta: {x: 161, y: 65}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3310671341497605160 --- !u!222 &3310671341497605160
CanvasRenderer: CanvasRenderer:
@ -826,8 +826,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0} m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -355.2002, y: 274} m_AnchoredPosition: {x: -375, y: 274}
m_SizeDelta: {x: 150, y: 148} m_SizeDelta: {x: 193, y: 190}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3310671341662576993 --- !u!222 &3310671341662576993
CanvasRenderer: CanvasRenderer:
@ -960,7 +960,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 26} m_AnchoredPosition: {x: 0, y: 26}
m_SizeDelta: {x: 128, y: 112} m_SizeDelta: {x: 167, y: 147}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3310671341740920854 --- !u!222 &3310671341740920854
CanvasRenderer: CanvasRenderer:
@ -1037,8 +1037,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0} m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -714, y: 274} m_AnchoredPosition: {x: -775, y: 274}
m_SizeDelta: {x: 150, y: 148} m_SizeDelta: {x: 193, y: 190}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3310671341763054131 --- !u!222 &3310671341763054131
CanvasRenderer: CanvasRenderer:
@ -1174,8 +1174,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0} m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -148, y: 297.30078} m_AnchoredPosition: {x: -140, y: 297.30078}
m_SizeDelta: {x: 196, y: 194} m_SizeDelta: {x: 254, y: 252}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &3310671341787608545 --- !u!222 &3310671341787608545
CanvasRenderer: CanvasRenderer:
@ -1307,8 +1307,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -23.2} m_AnchoredPosition: {x: 0, y: -33.015877}
m_SizeDelta: {x: 114, y: 38} m_SizeDelta: {x: 161, y: 65}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &9142893009128331634 --- !u!222 &9142893009128331634
CanvasRenderer: CanvasRenderer:
@ -1381,8 +1381,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 17.5} m_AnchoredPosition: {x: 0, y: 28}
m_SizeDelta: {x: 94, y: 76} m_SizeDelta: {x: 78, y: 93}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1463838399473145955 --- !u!222 &1463838399473145955
CanvasRenderer: CanvasRenderer:
@ -1459,8 +1459,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0} m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -896, y: 274.00073} m_AnchoredPosition: {x: -975, y: 274.00073}
m_SizeDelta: {x: 150, y: 148} m_SizeDelta: {x: 193, y: 190}
m_Pivot: {x: 0.5, y: 0.5} m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1213212977369348249 --- !u!222 &1213212977369348249
CanvasRenderer: CanvasRenderer:

24
popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity
View File

@ -213,7 +213,7 @@ PrefabInstance:
- target: {fileID: 315354246554936540, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 315354246554936540, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 12 value: 8
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 566248750470715636, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 566248750470715636, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
@ -323,7 +323,7 @@ PrefabInstance:
- target: {fileID: 1913713732571476837, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 1913713732571476837, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 13 value: 9
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2835369144934501534, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 2835369144934501534, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
@ -525,20 +525,30 @@ PrefabInstance:
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3664916833637780612, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -375
objectReference: {fileID: 0}
- target: {fileID: 3664916833752817996, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 3664916833752817996, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 1 value: 1
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -575
objectReference: {fileID: 0}
- target: {fileID: 3906989310087811327, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 3906989310087811327, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 11 value: 10
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4037191023444158820, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 4037191023444158820, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 14 value: 11
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4348639590627783772, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 4348639590627783772, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
@ -548,7 +558,7 @@ PrefabInstance:
- target: {fileID: 5047569869407099398, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 5047569869407099398, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 10 value: 14
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6396292362141172708, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 6396292362141172708, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
@ -568,7 +578,7 @@ PrefabInstance:
- target: {fileID: 7715340749758393301, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 7715340749758393301, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 9 value: 12
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7758062554450272377, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 7758062554450272377, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
@ -593,7 +603,7 @@ PrefabInstance:
- target: {fileID: 8875044595818467139, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 8875044595818467139, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
value: 8 value: 13
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3}

23
popcorn/Assets/MyGame/Scenes/marketing/marketing.unity
View File

@ -2433,6 +2433,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: -22 value: -22
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1909038109161790577, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_RootOrder
value: 7
objectReference: {fileID: 0}
- target: {fileID: 1913713732571476837, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 1913713732571476837, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
propertyPath: m_RootOrder propertyPath: m_RootOrder
@ -2633,15 +2638,25 @@ PrefabInstance:
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3664916833637780612, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3664916833637780612, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 3664916833637780612, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: -355.19922 value: -375
objectReference: {fileID: 0}
- target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.x propertyPath: m_AnchoredPosition.x
value: -535.10156 value: -575
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3906989310087811327, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 3906989310087811327, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
@ -2660,8 +2675,8 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 6969874152703327186, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 6969874152703327186, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
propertyPath: m_AnchoredPosition.y propertyPath: m_LocalPosition.y
value: 260.69922 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7545339558603919741, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 7545339558603919741, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}

15
popcorn/Assets/MyGame/Scenes/shopping/shopping.unity
View File

@ -436,6 +436,11 @@ PrefabInstance:
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 1765.9999 value: 1765.9999
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1909038109161790577, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 3213111080442531914, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 3213111080442531914, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
@ -621,6 +626,16 @@ PrefabInstance:
propertyPath: m_SizeDelta.x propertyPath: m_SizeDelta.x
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3664916833637780612, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -375
objectReference: {fileID: 0}
- target: {fileID: 3664916834267713207, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -575
objectReference: {fileID: 0}
- target: {fileID: 4348639590627783772, guid: caaa748dbeed576499e8cae74d33f689, - target: {fileID: 4348639590627783772, guid: caaa748dbeed576499e8cae74d33f689,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive