diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab index 031c7d80..60ecb639 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/UI/Footer.prefab @@ -65,7 +65,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 6b12d4304d8cc814988c6828d9b478e9, type: 3} + m_Sprite: {fileID: 21300000, guid: e259fa4d2057bac429e800d9dac78aae, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -716,7 +716,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0a13c07b1bd21434d801188fb9b7546d, type: 3} + m_Sprite: {fileID: 21300000, guid: 0469694e83769479fa737c3a3b9f6b06, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -831,7 +831,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 401e6b14583a46443be3b7124b78ac09, type: 3} + m_Sprite: {fileID: 21300000, guid: 3e8106fd24f7946e2a20ebd081ebb0b9, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1020,7 +1020,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e8fb21ace44c3e748959b969f895dd23, type: 3} + m_Sprite: {fileID: 21300000, guid: dab0cd6adf1694bd6b96c224ad8c38e6, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1438,7 +1438,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 7597f863b51829447a8afd00534fe6e4, type: 3} + m_Sprite: {fileID: 21300000, guid: afb06cd566c9b4c0eba30dd082477478, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -3051,7 +3051,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 88b678672e5bca548bedbae7386e4346, type: 3} + m_Sprite: {fileID: 21300000, guid: e644184ee7cac4454a2ebc1fc479ecb4, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Header.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Header.prefab index 5fb14cd8..f0d41651 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Header.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Header.prefab @@ -660,7 +660,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: fb63ee5957e15004eb27aaf367103806, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab index 66ea9366..05fb4ef2 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Result.prefab @@ -807,7 +807,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 5ceb82572adc3b74a9435c69995d018a, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1439,7 +1439,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 40ee8a21444623d49811e0563b43b5ef, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 diff --git a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab index d11c9bae..147dbe91 100644 --- a/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab +++ b/popcorn/Assets/MyGame/Scenes/MiniGame/Prefabs/Selection.prefab @@ -1094,7 +1094,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: b0d07c69efa3df24fac0843c9a1920d2, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -1740,7 +1740,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: e9aa432443b00f546af3b0c4e5e1846b, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2012,7 +2012,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 53455103b6864fd4093faca95dc52307, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 @@ -2283,7 +2283,7 @@ MonoBehaviour: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 030af2bbe28d3b24e94162845a2243bc, type: 3} m_Type: 0 - m_PreserveAspect: 0 + m_PreserveAspect: 1 m_FillCenter: 1 m_FillMethod: 4 m_FillAmount: 1 diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index 577c8def..f764c2f8 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -1573,10 +1573,10 @@ MonoBehaviour: Description: Languages: - minigame_Selection_detail_title_Advanced - - - - - - - - + - Material_zh/minigame/minigame_Selection_detail_title_Advanced_zh[minigame_Selection_detail_title_Advanced_zh] + - Material_zh/minigame/minigame_Selection_detail_title_Advanced_zh[minigame_Selection_detail_title_Advanced_zh] + - Material_ko/minigame/minigame_Selection_detail_title_Advanced_ko[minigame_Selection_detail_title_Advanced_ko] + - Material_en/minigame/minigame_Selection_detail_title_Advanced_en[minigame_Selection_detail_title_Advanced_en] Flags: 0000000000 Languages_Touch: [] - Term: minigame_Selection_detail_title_Beginner @@ -1584,10 +1584,10 @@ MonoBehaviour: Description: Languages: - minigame_Selection_detail_title_Beginner - - - - - - - - + - Material_zh/minigame/minigame_Selection_detail_title_Beginner_zh[minigame_Selection_detail_title_Beginner_zh] + - Material_zh/minigame/minigame_Selection_detail_title_Beginner_zh[minigame_Selection_detail_title_Beginner_zh] + - Material_ko/minigame/minigame_Selection_detail_title_Beginner_ko[minigame_Selection_detail_title_Beginner_ko] + - Material_en/minigame/minigame_Selection_detail_title_Beginner_en[minigame_Selection_detail_title_Beginner_en] Flags: 0000000000 Languages_Touch: [] - Term: minigame_Selection_detail_title_Intermediate @@ -1595,10 +1595,10 @@ MonoBehaviour: Description: Languages: - minigame_Selection_detail_title_Intermediate - - - - - - - - + - Material_zh/minigame/minigame_Selection_detail_title_Intermediate_zh[minigame_Selection_detail_title_Intermediate_zh] + - Material_zh/minigame/minigame_Selection_detail_title_Intermediate_zh[minigame_Selection_detail_title_Intermediate_zh] + - Material_ko/minigame/minigame_Selection_detail_title_Intermediate_ko[minigame_Selection_detail_title_Intermediate_ko] + - Material_en/minigame/minigame_Selection_detail_title_Intermediate_en[minigame_Selection_detail_title_Intermediate_en] Flags: 0000000000 Languages_Touch: [] - Term: minigame_Selection_title_logo @@ -1606,10 +1606,10 @@ MonoBehaviour: Description: Languages: - minigame_Selection_title_logo - - - - - - - - + - Material_zh/minigame/minigame_Selection_title_logo_zh[minigame_Selection_title_logo_zh] + - Material_zh/minigame/minigame_Selection_title_logo_zh[minigame_Selection_title_logo_zh] + - Material_ko/minigame/minigame_Selection_title_logo_ko[minigame_Selection_title_logo_ko] + - Material_en/minigame/minigame_Selection_title_logo_en[minigame_Selection_title_logo_en] Flags: 0000000000 Languages_Touch: [] - Term: minigame_main_Score @@ -1617,10 +1617,10 @@ MonoBehaviour: Description: Languages: - minigame_main_Score - - - - - - - - + - Material_zh/minigame/minigame_main_Score_zh[minigame_main_Score_zh] + - Material_zh/minigame/minigame_main_Score_zh[minigame_main_Score_zh] + - Material_ko/minigame/minigame_main_Score_ko[minigame_main_Score_ko] + - Material_en/minigame/minigame_main_Score_en[minigame_main_Score_en] Flags: 0000000000 Languages_Touch: [] - Term: minigame_main_explanation_text @@ -1628,10 +1628,10 @@ MonoBehaviour: Description: Languages: - minigame_main_explanation_text - - - - - - - - + - Material_zh/minigame/minigame_main_explanation_text_zh[minigame_main_explanation_text_zh] + - Material_zh/minigame/minigame_main_explanation_text_zh[minigame_main_explanation_text_zh] + - Material_ko/minigame/minigame_main_explanation_text_ko[minigame_main_explanation_text_ko] + - Material_en/minigame/minigame_main_explanation_text_en[minigame_main_explanation_text_en] Flags: 0000000000 Languages_Touch: [] - Term: minigame_main_frame_time @@ -1639,10 +1639,10 @@ MonoBehaviour: Description: Languages: - minigame_main_frame_time - - - - - - - - + - Material_zh/minigame/minigame_main_frame_time_zh[minigame_main_frame_time_zh] + - Material_zh/minigame/minigame_main_frame_time_zh[minigame_main_frame_time_zh] + - Material_ko/minigame/minigame_main_frame_time_ko[minigame_main_frame_time_ko] + - Material_en/minigame/minigame_main_frame_time_en[minigame_main_frame_time_en] Flags: 0000000000 Languages_Touch: [] - Term: minigame_result_material_title @@ -1650,10 +1650,10 @@ MonoBehaviour: Description: Languages: - minigame_result_material_title - - - - - - - - + - Material_zh/minigame/minigame_result_material_title_zh[minigame_result_material_title_zh] + - Material_zh/minigame/minigame_result_material_title_zh[minigame_result_material_title_zh] + - Material_ko/minigame/minigame_result_material_title_ko[minigame_result_material_title_ko] + - Material_en/minigame/minigame_result_material_title_en[minigame_result_material_title_en] Flags: 0000000000 Languages_Touch: [] - Term: minigame_result_meter_title @@ -1661,10 +1661,10 @@ MonoBehaviour: Description: Languages: - minigame_result_meter_title - - - - - - - - + - Material_zh/minigame/minigame_result_meter_title_zh[minigame_result_meter_title_zh] + - Material_zh/minigame/minigame_result_meter_title_zh[minigame_result_meter_title_zh] + - Material_ko/minigame/minigame_result_meter_title_ko[minigame_result_meter_title_ko] + - Material_en/minigame/minigame_result_meter_title_en[minigame_result_meter_title_en] Flags: 0000000000 Languages_Touch: [] - Term: minigame_result_title @@ -1672,10 +1672,10 @@ MonoBehaviour: Description: Languages: - minigame_result_title - - - - - - - - + - Material_zh/minigame/minigame_result_title_zh[minigame_result_title_zh] + - Material_zh/minigame/minigame_result_title_zh[minigame_result_title_zh] + - Material_ko/minigame/minigame_result_title_ko[minigame_result_title_ko] + - Material_en/minigame/minigame_result_title_en[minigame_result_title_en] Flags: 0000000000 Languages_Touch: [] - Term: ui_button_icon_Footer_MaterialProcurement_logo @@ -1683,10 +1683,10 @@ MonoBehaviour: Description: Languages: - ui_button_icon_Footer_MaterialProcurement_logo - - - - - - - - + - Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_zh[ui_button_icon_Footer_MaterialProcurement_logo_zh] + - Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_zh[ui_button_icon_Footer_MaterialProcurement_logo_zh] + - Material_ko/UI/ui_button_icon_Footer_MaterialProcurement_logo_ko[ui_button_icon_Footer_MaterialProcurement_logo_ko] + - Material_en/UI/ui_button_icon_Footer_MaterialProcurement_logo_en[ui_button_icon_Footer_MaterialProcurement_logo_en] Flags: 0000000000 Languages_Touch: [] - Term: ui_button_icon_Footer_MaterialProcurement_logo_key @@ -1694,10 +1694,10 @@ MonoBehaviour: Description: Languages: - ui_button_icon_Footer_MaterialProcurement_logo_key - - - - - - - - + - Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_zh[ui_button_icon_Footer_MaterialProcurement_logo_key_zh] + - Material_zh/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_zh[ui_button_icon_Footer_MaterialProcurement_logo_key_zh] + - Material_ko/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_ko[ui_button_icon_Footer_MaterialProcurement_logo_key_ko] + - Material_en/UI/ui_button_icon_Footer_MaterialProcurement_logo_key_en[ui_button_icon_Footer_MaterialProcurement_logo_key_en] Flags: 0000000000 Languages_Touch: [] - Term: ui_button_icon_movie_logo_Procurement @@ -1705,10 +1705,10 @@ MonoBehaviour: Description: Languages: - ui_button_icon_movie_logo_Procurement - - - - - - - - + - Material_zh/minigame/ui_button_icon_movie_logo_Procurement_zh[ui_button_icon_movie_logo_Procurement_zh] + - Material_zh/minigame/ui_button_icon_movie_logo_Procurement_zh[ui_button_icon_movie_logo_Procurement_zh] + - Material_ko/minigame/ui_button_icon_movie_logo_Procurement_ko[ui_button_icon_movie_logo_Procurement_ko] + - Material_en/minigame/ui_button_icon_movie_logo_Procurement_en[ui_button_icon_movie_logo_Procurement_en] Flags: 0000000000 Languages_Touch: [] - Term: minigame_explanation_Dither @@ -1716,10 +1716,10 @@ MonoBehaviour: Description: Languages: - minigame_explanation_Dither - - - - - - - - + - Material_zh/minigame/minigame_explanation_zh_Dither[minigame_explanation_zh_Dither] + - Material_zh/minigame/minigame_explanation_zh_Dither[minigame_explanation_zh_Dither] + - Material_ko/minigame/minigame_explanation_ko_Dither[minigame_explanation_ko_Dither] + - Material_en/minigame/minigame_explanation_en_Dither[minigame_explanation_en_Dither] Flags: 0000000000 Languages_Touch: [] - Term: Unit/Amount