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 d3386db8..7f2d01c2 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/BulkOrder/Information/Canvas.prefab @@ -214,7 +214,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: 35 m_FontStyle: 0 m_BestFit: 1 @@ -332,7 +332,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: 35 m_FontStyle: 0 m_BestFit: 1 @@ -901,6 +901,7 @@ GameObject: - component: {fileID: 8991887406372028548} - component: {fileID: 4755057885622954608} - component: {fileID: 3337121566302665231} + - component: {fileID: 5449134050274049995} m_Layer: 5 m_Name: Text (1) m_TagString: Untagged @@ -955,7 +956,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: 35 m_FontStyle: 0 m_BestFit: 1 @@ -967,7 +968,46 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5916\u89B3\u30EC\u30D9\u30EB" + m_Text: UI/InfoShopCustomizeLevel +--- !u!114 &5449134050274049995 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5647039334911126105} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: UI/InfoShopCustomizeLevel + mTermSecondary: Font/DFHannotateStdN-W7 + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 0} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!1 &6182018219473053258 GameObject: m_ObjectHideFlags: 0 @@ -1184,7 +1224,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: 35 m_FontStyle: 0 m_BestFit: 1 @@ -1196,7 +1236,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" + m_Text: "\u5230\u4E0B\u6B21\u7B49\u7EA7\u63D0\u5347\u4E3A\u6B62" --- !u!114 &2879166960840634929 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1302,7 +1342,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: 35 m_FontStyle: 0 m_BestFit: 1 @@ -1314,7 +1354,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" + m_Text: "\u5230\u4E0B\u6B21\u7B49\u7EA7\u63D0\u5347\u4E3A\u6B62" --- !u!114 &5992511198008917351 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1419,7 +1459,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e767ec50f908d8e479795778a522ffd4, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -2385,7 +2425,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8c5b93ebfbed4964780f2d5137acb342, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -4196,7 +4236,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: 35 m_FontStyle: 0 m_BestFit: 0 @@ -4208,7 +4248,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u30EC\u30D9\u30EB" + m_Text: UI/InfoLevel --- !u!114 &1329620037901453848 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4547,7 +4587,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: 35 m_FontStyle: 0 m_BestFit: 1 @@ -4559,7 +4599,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" + m_Text: "\u5230\u4E0B\u6B21\u7B49\u7EA7\u63D0\u5347\u4E3A\u6B62" --- !u!114 &6089248131259734773 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4740,7 +4780,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: 35 m_FontStyle: 0 m_BestFit: 0 @@ -4752,7 +4792,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u5546\u54C1\u5728\u5EAB" + m_Text: "\u5546\u54C1\u5E93\u5B58" --- !u!114 &7038237413740392644 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4858,7 +4898,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: 35 m_FontStyle: 0 m_BestFit: 1 @@ -5320,7 +5360,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: 35 m_FontStyle: 0 m_BestFit: 0 @@ -5332,7 +5372,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u79F0\u53F7" + m_Text: "\u79F0\u8C13" --- !u!114 &862529373831645307 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5438,7 +5478,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: 35 m_FontStyle: 0 m_BestFit: 1 @@ -5633,7 +5673,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: b8ad8d53e7a334143ae4fc6b507549b4, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -5987,7 +6027,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: 35 m_FontStyle: 0 m_BestFit: 0 @@ -5999,7 +6039,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u6750\u6599\u5728\u5EAB" + m_Text: "\u6750\u6599\u5E93\u5B58" --- !u!114 &2317717004034477971 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6104,7 +6144,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 228e97c36df207b479c719c18e978e62, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 1 m_FillCenter: 1 @@ -6534,7 +6574,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: 35 m_FontStyle: 0 m_BestFit: 1 @@ -6546,7 +6586,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1 - m_Text: "\u30EC\u30D9\u30EB" + m_Text: "\u5E97\u94FA\u7B49\u7EA7" --- !u!114 &1113115768491845702 MonoBehaviour: m_ObjectHideFlags: 0 @@ -8014,6 +8054,7 @@ GameObject: - component: {fileID: 7869193144026742720} - component: {fileID: 4948256507771651192} - component: {fileID: 7037845673517582736} + - component: {fileID: 7515969663285405202} m_Layer: 5 m_Name: Text (1) m_TagString: Untagged @@ -8068,7 +8109,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: 35 m_FontStyle: 0 m_BestFit: 1 @@ -8081,6 +8122,45 @@ MonoBehaviour: m_VerticalOverflow: 0 m_LineSpacing: 1 m_Text: "\u81EA\u52D5\u8ABF\u7406\u30EC\u30D9\u30EB" +--- !u!114 &7515969663285405202 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8344792529554105269} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: UI/InfoAutoCookLevel + mTermSecondary: Font/DFHannotateStdN-W7 + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 0} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!1 &8359356744156248200 GameObject: m_ObjectHideFlags: 0 @@ -8530,7 +8610,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} - target: {fileID: 4260782103887353672, guid: 1c539a17d4daa5649ab703e163ba1b6d, type: 3} @@ -8651,7 +8731,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1c539a17d4daa5649ab703e163ba1b6d, type: 3} @@ -8672,7 +8752,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} - target: {fileID: 1140500467267622730, guid: a557fa0433dcbb04abebf8f0bb9a2f85, type: 3} @@ -8793,7 +8873,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a557fa0433dcbb04abebf8f0bb9a2f85, type: 3} @@ -8814,7 +8894,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} - target: {fileID: 1140500467267622730, guid: a557fa0433dcbb04abebf8f0bb9a2f85, type: 3} @@ -8930,7 +9010,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a557fa0433dcbb04abebf8f0bb9a2f85, type: 3} @@ -10795,7 +10875,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} - target: {fileID: 4260782103887353672, guid: 1c539a17d4daa5649ab703e163ba1b6d, type: 3} @@ -10911,7 +10991,7 @@ PrefabInstance: type: 3} propertyPath: m_FontData.m_Font value: - objectReference: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, + objectReference: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 1c539a17d4daa5649ab703e163ba1b6d, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/CustomizationDetails.unity b/popcorn/Assets/MyGame/Scenes/marketing/CustomizationDetails.unity index 3b48ca1f..c45d0e6c 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/CustomizationDetails.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/CustomizationDetails.unity @@ -216,6 +216,19 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 153} m_SizeDelta: {x: 740, y: 70} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &58219220 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1048417436} --- !u!1 &153656214 GameObject: m_ObjectHideFlags: 0 @@ -227,6 +240,7 @@ GameObject: - component: {fileID: 153656215} - component: {fileID: 153656217} - component: {fileID: 153656216} + - component: {fileID: 153656218} m_Layer: 0 m_Name: title_Image m_TagString: Untagged @@ -290,6 +304,46 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 153656214} m_CullTransparentMesh: 0 +--- !u!114 &153656218 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 153656214} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: ui_marketing_CustomizationDetails_title_text + mTermSecondary: + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: + - {fileID: 21300000, guid: ac590bcc9d962fc468c63e78856a1e4d, type: 3} + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 1949322082} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image --- !u!1 &191065714 GameObject: m_ObjectHideFlags: 0 @@ -523,6 +577,7 @@ GameObject: - component: {fileID: 293486474} - component: {fileID: 293486477} - component: {fileID: 293486476} + - component: {fileID: 293486475} m_Layer: 5 m_Name: text m_TagString: Untagged @@ -549,6 +604,45 @@ RectTransform: m_AnchoredPosition: {x: -60, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &293486475 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 293486473} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: UI/SalesBonus + mTermSecondary: Font/DFHannotateStdN-W7 + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 661680395} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!114 &293486476 MonoBehaviour: m_ObjectHideFlags: 0 @@ -569,7 +663,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: 35 m_FontStyle: 0 m_BestFit: 1 @@ -581,7 +675,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u58F2\u5024\u30DC\u30FC\u30CA\u30B9" + m_Text: UI/SalesBonus --- !u!222 &293486477 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1121,7 +1215,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, type: 3} + m_Sprite: {fileID: 0} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1287,6 +1381,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 482940419} m_CullTransparentMesh: 0 +--- !u!114 &661680395 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 293486476} --- !u!1 &751206692 GameObject: m_ObjectHideFlags: 0 @@ -1566,6 +1673,7 @@ GameObject: - component: {fileID: 1048417434} - component: {fileID: 1048417437} - component: {fileID: 1048417436} + - component: {fileID: 1048417435} m_Layer: 5 m_Name: text m_TagString: Untagged @@ -1592,6 +1700,45 @@ RectTransform: m_AnchoredPosition: {x: -60, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1048417435 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1048417433} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: UI/AdWalkerBonus + mTermSecondary: Font/DFHannotateStdN-W7 + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 58219220} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!114 &1048417436 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1612,7 +1759,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: 35 m_FontStyle: 0 m_BestFit: 1 @@ -1624,7 +1771,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u5BA3\u4F1D\u306E\u52B9\u679C\u30A2\u30C3\u30D7" + m_Text: UI/AdWalkerBonus --- !u!222 &1048417437 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1950,6 +2097,7 @@ GameObject: - component: {fileID: 1181495073} - component: {fileID: 1181495076} - component: {fileID: 1181495075} + - component: {fileID: 1181495074} m_Layer: 5 m_Name: text m_TagString: Untagged @@ -1976,6 +2124,45 @@ RectTransform: m_AnchoredPosition: {x: -60, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1181495074 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1181495072} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: UI/InfoShopCustomizeLevel + mTermSecondary: Font/DFHannotateStdN-W7 + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 1804148926} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!114 &1181495075 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1996,7 +2183,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: 35 m_FontStyle: 0 m_BestFit: 1 @@ -2028,6 +2215,7 @@ GameObject: - component: {fileID: 1185689756} - component: {fileID: 1185689759} - component: {fileID: 1185689758} + - component: {fileID: 1185689757} m_Layer: 5 m_Name: text m_TagString: Untagged @@ -2054,6 +2242,45 @@ RectTransform: m_AnchoredPosition: {x: -60, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1185689757 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1185689755} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: UI/InfoNextLevelUp + mTermSecondary: Font/DFHannotateStdN-W7 + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 1336098902} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!114 &1185689758 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2074,7 +2301,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: 35 m_FontStyle: 0 m_BestFit: 1 @@ -2086,7 +2313,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" + m_Text: "\u5230\u4E0B\u6B21\u7B49\u7EA7\u63D0\u5347\u4E3A\u6B62" --- !u!222 &1185689759 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2146,6 +2373,19 @@ CanvasGroup: m_Interactable: 1 m_BlocksRaycasts: 1 m_IgnoreParentGroups: 0 +--- !u!114 &1336098902 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1185689758} --- !u!1 &1351996689 GameObject: m_ObjectHideFlags: 0 @@ -2269,6 +2509,7 @@ GameObject: - component: {fileID: 1367586355} - component: {fileID: 1367586358} - component: {fileID: 1367586357} + - component: {fileID: 1367586356} m_Layer: 5 m_Name: text m_TagString: Untagged @@ -2295,6 +2536,45 @@ RectTransform: m_AnchoredPosition: {x: -60, y: -0.00007247925} m_SizeDelta: {x: 600, y: 67.5} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1367586356 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1367586354} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 344445a89b4f74a0e9a0a766903df87e, type: 3} + m_Name: + m_EditorClassIdentifier: + mTerm: UI/CustomerBonus + mTermSecondary: Font/DFHannotateStdN-W7 + PrimaryTermModifier: 0 + SecondaryTermModifier: 0 + TermPrefix: + TermSuffix: + LocalizeOnAwake: 1 + IgnoreRTL: 0 + MaxCharactersInRTL: 0 + IgnoreNumbersInRTL: 1 + CorrectAlignmentForRTL: 1 + AddSpacesToJoinedLanguages: 0 + AllowLocalizedParameters: 1 + AllowParameters: 1 + TranslatedObjects: [] + LocalizeEvent: + m_PersistentCalls: + m_Calls: [] + AlwaysForceLocalize: 0 + LocalizeCallBack: + Target: {fileID: 0} + MethodName: + mGUI_ShowReferences: 0 + mGUI_ShowTems: 1 + mGUI_ShowCallback: 0 + mLocalizeTarget: {fileID: 1855028098} + mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Text --- !u!114 &1367586357 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2315,7 +2595,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: 35 m_FontStyle: 0 m_BestFit: 1 @@ -2327,7 +2607,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u304A\u5BA2\u3055\u3093\u306E\u6570\u30A2\u30C3\u30D7" + m_Text: UI/CustomerBonus --- !u!222 &1367586358 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2928,6 +3208,32 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1797194412} m_CullTransparentMesh: 0 +--- !u!114 &1804148926 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1181495075} +--- !u!114 &1855028098 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 332e36893e7cf4a49b3c1f72f76cd5e1, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1367586357} --- !u!1 &1894036291 GameObject: m_ObjectHideFlags: 0 @@ -3040,6 +3346,19 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 82.999954} m_SizeDelta: {x: 740, y: 70} m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1949322082 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 153656216} --- !u!1 &2044657300 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index 7c140bb0..aba39464 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -7308,8 +7308,8 @@ MonoBehaviour: - "1\u3064\u306E\u30BF\u30F3\u30AF\u306B\u306F\u540C\u3058\u5473\u306E\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u3057\u304B\n\u4FDD\u5B58\u3067\u304D\u306A\u3044\u304B\u3089\u6CE8\u610F\u3057\u3088\u3046\u306D" - "\u8981\u6CE8\u610F\u7684\u662F\u540C\u4E00\u4E2A\u98DF\u54C1\u7BB1\u91CC\u9762\u53EA\u80FD\u653E\u4E00\u79CD\u53E3\u5473\u7684\u7206\u7C73\u82B1\u54E6" - "\u8981\u8A3B\u610F\u7684\u662F\u540C\u4E00\u500B\u98DF\u54C1\u7BB1\u88CF\u9762\u53EA\u80FD\u653E\u4E00\u7A2E\u53E3\u5473\u7684\u7206\u7C73\u82B1\u54E6" - - "\uD55C \uD0F1\uD06C\uC5D0\uB294 \uAC19\uC740 \uB9DB\uC758 \uD31D\uCF58\uBC16\uC5D0\n - \uC800\uC7A5\uD560 \uC218 \uC5C6\uC73C\uB2C8 \uC8FC\uC758\uD558\uC138\uC694" + - "\uD55C \uD0F1\uD06C\uC5D0\uB294 \uAC19\uC740 \uB9DB\uC758 \uD31D\uCF58\uBC16\uC5D0\n\uC800\uC7A5\uD560 + \uC218 \uC5C6\uC73C\uB2C8 \uC8FC\uC758\uD558\uC138\uC694" Flags: 00000000 Languages_Touch: [] - Term: Script/BrotherScript20021 @@ -10928,6 +10928,76 @@ MonoBehaviour: - Flags: 00000000 Languages_Touch: [] + - Term: UI/InfoShopCustomizeLevel + TermType: 0 + Description: + Languages: + - "\u5916\u89B3\u30EC\u30D9\u30EB" + - + - + - + Flags: 00000000 + Languages_Touch: [] + - Term: "\u81EA\u52D5\u8ABF\u7406\u30EC\u30D9\u30EB" + TermType: 0 + Description: + Languages: + - + - + - + - + Flags: 00000000 + Languages_Touch: [] + - Term: UI/InfoAutoCookLevel + TermType: 0 + Description: + Languages: + - "\u81EA\u52D5\u8ABF\u7406\u30EC\u30D9\u30EB" + - + - + - + Flags: 00000000 + Languages_Touch: [] + - Term: UI/SalesBonus + TermType: 0 + Description: + Languages: + - "\u58F2\u5024\u30DC\u30FC\u30CA\u30B9" + - + - + - + Flags: 00000000 + Languages_Touch: [] + - Term: UI/CustomerBonus + TermType: 0 + Description: + Languages: + - "\u304A\u5BA2\u3055\u3093\u306E\u6570\u30A2\u30C3\u30D7" + - + - + - + Flags: 00000000 + Languages_Touch: [] + - Term: UI/AdWalkerBonus + TermType: 0 + Description: + Languages: + - "\u5BA3\u4F1D\u306E\u52B9\u679C\u30A2\u30C3\u30D7" + - + - + - + Flags: 00000000 + Languages_Touch: [] + - Term: ui_marketing_CustomizationDetails_title_text + TermType: 5 + Description: + Languages: + - ui_marketing_CustomizationDetails_title_text + - + - + - + Flags: 00000000 + Languages_Touch: [] CaseInsensitiveTerms: 0 OnMissingTranslation: 3 mTerm_AppName: