From e1d56797f99ee2feffaeb39ee00fb9c4bdb2c477 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Fri, 20 May 2022 18:01:20 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=AB=E3=82=B9=E3=82=BF=E3=83=9E=E3=82=A4?= =?UTF-8?q?=E3=82=BA=E3=83=95=E3=83=83=E3=82=BF=E3=83=BCUI=E5=86=8D?= =?UTF-8?q?=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../marketing/CustomizationDetails.unity | 24 +- .../MyGame/Scenes/marketing/Customize.unity | 302 +++++++++++------- popcorn/Assets/Resources/I2Languages.asset | 4 +- 3 files changed, 203 insertions(+), 127 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/CustomizationDetails.unity b/popcorn/Assets/MyGame/Scenes/marketing/CustomizationDetails.unity index c45d0e6c..2bc4c39a 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/CustomizationDetails.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/CustomizationDetails.unity @@ -663,7 +663,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -675,7 +675,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: UI/SalesBonus + m_Text: "\u58F2\u5024\u30DC\u30FC\u30CA\u30B9" --- !u!222 &293486477 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1041,7 +1041,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0.000015258789} + m_AnchoredPosition: {x: 0, y: 83} m_SizeDelta: {x: 740, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &447077183 @@ -1215,7 +1215,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 0} + m_Sprite: {fileID: 21300000, guid: f3a0ccdabb17f2244abcb3798b5b589e, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1759,7 +1759,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -1771,7 +1771,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: UI/AdWalkerBonus + m_Text: "\u5BA3\u4F1D\u306E\u52B9\u679C\u30A2\u30C3\u30D7" --- !u!222 &1048417437 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2183,7 +2183,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -2301,7 +2301,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -2313,7 +2313,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: "\u5230\u4E0B\u6B21\u7B49\u7EA7\u63D0\u5347\u4E3A\u6B62" + m_Text: "\u6B21\u306E\u30EC\u30D9\u30EB\u30A2\u30C3\u30D7\u307E\u3067" --- !u!222 &1185689759 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2595,7 +2595,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_FontData: - m_Font: {fileID: 12800000, guid: 89edfb758376d401583d3bad3def2b62, type: 3} + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 35 m_FontStyle: 0 m_BestFit: 1 @@ -2607,7 +2607,7 @@ MonoBehaviour: m_HorizontalOverflow: 0 m_VerticalOverflow: 0 m_LineSpacing: 1.1 - m_Text: UI/CustomerBonus + m_Text: "\u304A\u5BA2\u3055\u3093\u306E\u6570\u30A2\u30C3\u30D7" --- !u!222 &1367586358 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3343,7 +3343,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 82.999954} + m_AnchoredPosition: {x: 0, y: -2} m_SizeDelta: {x: 740, y: 70} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1949322082 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity index aef9f901..4d253d77 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity @@ -223,7 +223,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 26} + m_AnchoredPosition: {x: 0, y: 69} m_SizeDelta: {x: 300, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &52044468 @@ -421,19 +421,6 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 1538659930} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image ---- !u!114 &133076189 -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: 630125264} --- !u!114 &134216885 MonoBehaviour: m_ObjectHideFlags: 0 @@ -447,19 +434,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 0} ---- !u!114 &217829189 -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: 1199331211} --- !u!1001 &227427381 PrefabInstance: m_ObjectHideFlags: 0 @@ -1059,7 +1033,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 0} m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: 330, y: 26} + m_AnchoredPosition: {x: 330, y: 68.999954} m_SizeDelta: {x: 118, y: 126} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &355133278 @@ -1196,7 +1170,8 @@ RectTransform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 1592747032} m_Father: {fileID: 643926044} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1368,19 +1343,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 429811576} m_CullTransparentMesh: 0 ---- !u!114 &472333319 -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: 641871196} --- !u!114 &498016303 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2754114606576373327, guid: 6ae614796715fc949a96921656b66a62, @@ -1925,7 +1887,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -926} + m_AnchoredPosition: {x: 0, y: -911} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &662552813 @@ -2144,7 +2106,8 @@ MonoBehaviour: AddSpacesToJoinedLanguages: 0 AllowLocalizedParameters: 1 AllowParameters: 1 - TranslatedObjects: [] + TranslatedObjects: + - {fileID: 21300000, guid: 0ad0c35e347f29e4dafe89c890bcbee6, type: 3} LocalizeEvent: m_PersistentCalls: m_Calls: [] @@ -2406,6 +2369,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 527833883} +--- !u!114 &810618482 +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: 1539035364} --- !u!1001 &811473976 PrefabInstance: m_ObjectHideFlags: 0 @@ -2565,7 +2541,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 575} + m_AnchoredPosition: {x: 0, y: 675} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &838116263 @@ -2581,19 +2557,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 670054032} ---- !u!114 &838773142 -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: 3b29d7ab09a96634a9f704e6a1f21193, type: 3} - m_Name: - m_EditorClassIdentifier: - mTarget: {fileID: 1680411219} --- !u!1 &847511108 GameObject: m_ObjectHideFlags: 0 @@ -2855,19 +2818,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 904390280} m_CullTransparentMesh: 0 ---- !u!114 &908489008 -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: 498016303} --- !u!1 &915074762 GameObject: m_ObjectHideFlags: 0 @@ -2903,7 +2853,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: -346, y: 25} + m_AnchoredPosition: {x: -346, y: 67.999954} m_SizeDelta: {x: 268, y: 118} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &915074764 @@ -3409,6 +3359,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 959868501} m_CullTransparentMesh: 0 +--- !u!114 &1028445420 +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: 641871196} --- !u!1 &1028508433 GameObject: m_ObjectHideFlags: 0 @@ -3601,19 +3564,6 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!114 &1079893630 -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: 1791607513} --- !u!1 &1084709692 GameObject: m_ObjectHideFlags: 0 @@ -3741,6 +3691,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1211200710 +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: 630125264} --- !u!1 &1276255578 GameObject: m_ObjectHideFlags: 0 @@ -3970,6 +3933,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c11194ed6fd84a1f812fa2cfae75f873, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1404196162 +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: 498016303} --- !u!1001 &1428988151 PrefabInstance: m_ObjectHideFlags: 0 @@ -4094,7 +4070,7 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ae614796715fc949a96921656b66a62, type: 3} ---- !u!114 &1429645702 +--- !u!114 &1433170753 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -4106,7 +4082,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 1539035364} + mTarget: {fileID: 1448469452} --- !u!1 &1443084304 GameObject: m_ObjectHideFlags: 0 @@ -4172,6 +4148,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1493816713 +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: 1199331211} --- !u!114 &1538659930 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4210,6 +4199,80 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 1028508436} +--- !u!1 &1592747031 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1592747032} + - component: {fileID: 1592747034} + - component: {fileID: 1592747033} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1592747032 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1592747031} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 420422591} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: -327} + m_SizeDelta: {x: 1766, y: 300} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1592747033 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1592747031} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.6666667, g: 0.4431373, b: 0.29411766, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 0} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &1592747034 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1592747031} + m_CullTransparentMesh: 0 --- !u!114 &1618662803 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3836306740968186770, guid: 343971e948dfe44ddab5ab4f736c3f06, @@ -4275,6 +4338,19 @@ MonoBehaviour: button: {fileID: 1276255581} onObject: {fileID: 601118649} offObject: {fileID: 1276255578} +--- !u!114 &1653060707 +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: 3b29d7ab09a96634a9f704e6a1f21193, type: 3} + m_Name: + m_EditorClassIdentifier: + mTarget: {fileID: 1680411219} --- !u!1 &1657044925 GameObject: m_ObjectHideFlags: 0 @@ -4540,19 +4616,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1693567011} m_CullTransparentMesh: 0 ---- !u!114 &1722120184 -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: 2058534241} --- !u!1 &1753840228 GameObject: m_ObjectHideFlags: 0 @@ -4649,6 +4712,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c11194ed6fd84a1f812fa2cfae75f873, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1766625740 +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: 2058534241} --- !u!114 &1791607513 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 2754114606576373327, guid: 6ae614796715fc949a96921656b66a62, @@ -4780,6 +4856,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 938417939} +--- !u!114 &2050384246 +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: 1791607513} --- !u!114 &2058534241 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8475355993796972592, guid: 6ae614796715fc949a96921656b66a62, @@ -5064,19 +5153,6 @@ MonoBehaviour: scrollRect: {fileID: 2083561337} verticalSlider: {fileID: 429811578} direction: 0 ---- !u!114 &2135378899 -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: 1448469452} --- !u!1 &1135563714249534642 GameObject: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/Resources/I2Languages.asset b/popcorn/Assets/Resources/I2Languages.asset index 57377bd2..a05827c1 100644 --- a/popcorn/Assets/Resources/I2Languages.asset +++ b/popcorn/Assets/Resources/I2Languages.asset @@ -1132,8 +1132,8 @@ MonoBehaviour: Description: Languages: - ui_marketing_StockMeter_StocktText - - Material_zh/marketing/ui_marketing_StockMeter_StocktText_zh[ui_marketing_StockMeter_StocktText_zh] - - Material_zh/marketing/ui_marketing_StockMeter_StocktText_zh[ui_marketing_StockMeter_StocktText_zh] + - Material/marketing/ui_marketing_StockMeter_StocktText_zh[ui_marketing_StockMeter_StocktText_zh] + - Material/marketing/ui_marketing_StockMeter_StocktText_zh[ui_marketing_StockMeter_StocktText_zh] - Material_ko/marketing/ui_marketing_StockMeter_StocktText_ko[ui_marketing_StockMeter_StocktText_ko] Flags: 00000000 Languages_Touch: []