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

Merge branch 'future/I2Localization' of bitbucket.org:usaya/popcorn into future/I2Localization

This commit is contained in:
koya_15 2022-01-19 19:30:15 +09:00
parent a8b818f97e 9b72a96752
commit 58a967c3d1
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
popcorn/Assets/MyGame/Resource/UI/ui_button_icon_Footer_Reinforcement_logo.png → popcorn/Assets/MyGame/Resource/UI/old/ui_button_icon_Footer_Reinforcement_logo.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

0
popcorn/Assets/MyGame/Resource/UI/ui_button_icon_Footer_Reinforcement_logo.png.meta → popcorn/Assets/MyGame/Resource/UI/old/ui_button_icon_Footer_Reinforcement_logo.png.meta
View File

2
popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/detail_Mission.prefab
View File

@ -695,7 +695,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 708ff18692a2b407b80a668a849617bf, type: 3}
m_Sprite: {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1

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

@ -293,7 +293,7 @@ MonoBehaviour:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3}
m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3}
m_FontSize: 30
m_FontStyle: 0
m_BestFit: 0
@ -305,7 +305,7 @@ MonoBehaviour:
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: "\u30C7\u30A4\u30EA\u30FC\u30DF\u30C3\u30B7\u30E7\u30F3\u3092\u9054\u6210\u3057\u3088\u3046"
m_Text: "\u53BB\u5B8C\u6210\u65E5\u5E38\u4EFB\u52A1\u5427\uFF01"
--- !u!114 &8610769905762339287
MonoBehaviour:
m_ObjectHideFlags: 0