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

車色位置調整

This commit is contained in:
koya_15 2021-07-26 19:55:46 +09:00
parent 810eebffc7
commit a3c61ae6cf
33 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_back_stop.png → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_back_stop.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.1 KiB

After

Width:  |  Height:  |  Size: 7.1 KiB

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_back_stop.png.meta → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_back_stop.png.meta
View File

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_back_walk_a.png → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_back_walk_a.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 7.2 KiB

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_back_walk_a.png.meta → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_back_walk_a.png.meta
View File

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_back_walk_b.png → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_back_walk_b.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.4 KiB

After

Width:  |  Height:  |  Size: 7.4 KiB

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_back_walk_b.png.meta → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_back_walk_b.png.meta
View File

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_eat_stop.png → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_eat_stop.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_eat_stop.png.meta → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_eat_stop.png.meta
View File

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_eat_walk_a.png → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_eat_walk_a.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_eat_walk_a.png.meta → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_eat_walk_a.png.meta
View File

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_eat_walk_b.png → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_eat_walk_b.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.2 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_eat_walk_b.png.meta → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_eat_walk_b.png.meta
View File

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_front_stop.png → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_front_stop.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.6 KiB

After

Width:  |  Height:  |  Size: 7.6 KiB

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_front_stop.png.meta → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_front_stop.png.meta
View File

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_front_walk_a.png → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_front_walk_a.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_front_walk_a.png.meta → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_front_walk_a.png.meta
View File

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_front_walk_b.png → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_front_walk_b.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_front_walk_b.png.meta → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_front_walk_b.png.meta
View File

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_side_Before.png → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_side_Before.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_side_Before.png.meta → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_side_Before.png.meta
View File

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_side_back.png → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_side_back.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 7.5 KiB

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_side_back.png.meta → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_side_back.png.meta
View File

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_side_middle.png → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_side_middle.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 7.7 KiB

After

Width:  |  Height:  |  Size: 7.7 KiB

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_side_middle.png.meta → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_side_middle.png.meta
View File

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_sideeat_Before.png → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_sideeat_Before.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.1 KiB

After

Width:  |  Height:  |  Size: 8.1 KiB

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_sideeat_Before.png.meta → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_sideeat_Before.png.meta
View File

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_sideeat_back.png → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_sideeat_back.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_sideeat_back.png.meta → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_sideeat_back.png.meta
View File

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_sideeat_middle.png → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_sideeat_middle.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 8.0 KiB

After

Width:  |  Height:  |  Size: 8.0 KiB

0
popcorn/Assets/MyGame/Resource/Material/Customer/Customer_a_sideeat_middle.png.meta → popcorn/Assets/MyGame/Resource/Material/Customer/old/Customer_a_sideeat_middle.png.meta
View File

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 68 KiB

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

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.7 KiB

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

@ -1089,7 +1089,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 438315598} m_GameObject: {fileID: 438315598}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1.56, y: -0.16, z: 0} m_LocalPosition: {x: 3.16, y: -0.16, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 53013341} - {fileID: 53013341}
@ -1789,6 +1789,16 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y propertyPath: m_AnchoredPosition.y
value: 260.70312 value: 260.70312
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7545339558603919741, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -413
objectReference: {fileID: 0}
- target: {fileID: 7545339558603919741, guid: caaa748dbeed576499e8cae74d33f689,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 670
objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3}
--- !u!1 &757275525 --- !u!1 &757275525
@ -2816,7 +2826,7 @@ Transform:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1280903570} m_GameObject: {fileID: 1280903570}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -5.59, y: 3.51, z: 0} m_LocalPosition: {x: -6.67, y: 3.51, z: 0}
m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_LocalScale: {x: 0.8, y: 0.8, z: 0.8}
m_Children: m_Children:
- {fileID: 240851457} - {fileID: 240851457}