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:
  アップデートを待ってねPOP修正
  スクロール画像修正
This commit is contained in:
kimura 2021-11-11 17:45:07 +09:00
parent d52f78a6df b4bba34069
commit ee77a74d02
7 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
popcorn/Assets/MyGame/Resource/Material/Main/information/ui_Main_information_ScrollBar_Handle.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_ScrollBar_Handle.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.4 KiB

After

Width:  |  Height:  |  Size: 2.4 KiB

BIN
popcorn/Assets/MyGame/Resource/Material/Main/update/ui_Main_update_Brother_Blue.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 13 KiB

BIN
popcorn/Assets/MyGame/Resource/Material/Main/update/ui_Main_update_Brother_pink.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 14 KiB

After

Width:  |  Height:  |  Size: 14 KiB

4
popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab
View File

@ -3312,7 +3312,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 6ae6ccf589fe6a2418a24985e4d932f8, type: 3}
m_Sprite: {fileID: 21300000, guid: 2502042d9efc9e4488f029cad2b38790, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@ -3524,7 +3524,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: e634f6c90fd7c3e458e6a9d2ff85e2e4, type: 3}
m_Sprite: {fileID: 21300000, guid: 8cb7ad5a6b78a6448b6fac7e77282a9d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

4
popcorn/Assets/MyGame/Scenes/recipe/recipe.unity
View File

@ -1318,7 +1318,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 6ae6ccf589fe6a2418a24985e4d932f8, type: 3}
m_Sprite: {fileID: 21300000, guid: 2502042d9efc9e4488f029cad2b38790, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
@ -5104,7 +5104,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: e634f6c90fd7c3e458e6a9d2ff85e2e4, type: 3}
m_Sprite: {fileID: 21300000, guid: 8cb7ad5a6b78a6448b6fac7e77282a9d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

4
popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab
View File

@ -139,7 +139,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: e634f6c90fd7c3e458e6a9d2ff85e2e4, type: 3}
m_Sprite: {fileID: 21300000, guid: 8cb7ad5a6b78a6448b6fac7e77282a9d, type: 3}
m_Type: 0
m_PreserveAspect: 1
m_FillCenter: 1
@ -610,7 +610,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 6ae6ccf589fe6a2418a24985e4d932f8, type: 3}
m_Sprite: {fileID: 21300000, guid: 2502042d9efc9e4488f029cad2b38790, type: 3}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1