diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab index d2557083..be809567 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab @@ -730,7 +730,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: e767ec50f908d8e479795778a522ffd4, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -4070,7 +4071,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: 228e97c36df207b479c719c18e978e62, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -4498,7 +4500,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab index ee5baf5a..138eaf8d 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Mission/MissionCanvas.prefab @@ -513,7 +513,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: c0e67d3c5c942b7488e6e51862fac65a, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -794,7 +795,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: c0e67d3c5c942b7488e6e51862fac65a, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -5677,7 +5679,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -6277,7 +6280,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: c0e67d3c5c942b7488e6e51862fac65a, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -6838,7 +6842,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -6952,7 +6957,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: a9e961473b18e3248b466d48987ac4b2, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -6960,7 +6966,7 @@ MonoBehaviour: LocalizeCallBack: Target: {fileID: 0} MethodName: - mGUI_ShowReferences: 0 + mGUI_ShowReferences: 1 mGUI_ShowTems: 1 mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab index a60a49fd..4e9eba69 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab @@ -740,7 +740,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 0638cfefafe984ed1b913da0b4325917, type: 3} + m_Sprite: {fileID: 21300000, guid: df514f23fcba2fa4d98da9b371c8b77f, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1331,7 +1331,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 69a7fb681f31948029049f3df46aa576, type: 3} + m_Sprite: {fileID: 21300000, guid: c981e97ae7f318346906c68c0c2dfcc6, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -1656,7 +1656,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 1099f721240214f4a8bd5cb597c7dd0b, type: 3} + m_Sprite: {fileID: 21300000, guid: 55e5ffb0b46417e4bb53cad07ee560a4, type: 3} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2037,7 +2037,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61beefd3a05503e419363598678ad43a, type: 3} @@ -2472,7 +2472,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61beefd3a05503e419363598678ad43a, type: 3} @@ -3052,7 +3052,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61beefd3a05503e419363598678ad43a, type: 3} @@ -3487,7 +3487,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, + objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61beefd3a05503e419363598678ad43a, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab index 302945a6..071f0ee8 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab @@ -2637,7 +2637,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/MainCanvas.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/MainCanvas.prefab index 8ff00cfc..656063dc 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/MainCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/MainCanvas.prefab @@ -527,6 +527,11 @@ PrefabInstance: value: objectReference: {fileID: 21300000, guid: 298367eae1e6abe40ad4a92148482dd8, type: 3} + - target: {fileID: 1635669704753822050, guid: 2ceb27afa38c74b76b130f23621f7f50, + type: 3} + propertyPath: mLocalizeTarget + value: + objectReference: {fileID: 0} - target: {fileID: 2912042418010952920, guid: 2ceb27afa38c74b76b130f23621f7f50, type: 3} propertyPath: m_AnchorMax.y diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab index cf315a02..4554d58a 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Window.prefab @@ -2025,7 +2025,8 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 0} + objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + type: 3} - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_IsActive @@ -2189,7 +2190,8 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 0} + objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + type: 3} - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_IsActive @@ -2353,7 +2355,8 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 0} + objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + type: 3} - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_IsActive @@ -2517,7 +2520,8 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 0} + objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + type: 3} - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_IsActive @@ -2681,7 +2685,8 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 0} + objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + type: 3} - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_IsActive @@ -2845,7 +2850,8 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 0} + objectReference: {fileID: 21300000, guid: f352ec180ef482346b67e9dc363e8d00, + type: 3} - target: {fileID: 8536603424566114136, guid: 907730abf7bed70469027e0e8aba6fd9, type: 3} propertyPath: m_IsActive diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index b85c37d6..e4c98910 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -9073,7 +9073,7 @@ MonoBehaviour: TermType: 5 Description: Languages: - - ui_button_icon_close_logo + - ui_button_icon_Learned_logo - Material/Main/recipe/ui_button_icon_close_logo_zh[ui_button_icon_close_logo_zh] - -