From 1453b5a1832ce74b4417309e3d7399dc89d70f3f Mon Sep 17 00:00:00 2001 From: koya_15 Date: Fri, 20 May 2022 18:55:27 +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=E7=94=BB=E9=9D=A2=E8=99=B9=E3=81=AE=E7=BE=BD=E6=9E=A0?= =?UTF-8?q?=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/marketing/Customize.unity | 214 +++++++++--------- .../marketing/CustomizeExplanation.unity | 2 +- 2 files changed, 108 insertions(+), 108 deletions(-) diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity index 4d253d77..ef13e3c4 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity @@ -306,6 +306,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 52044466} m_CullTransparentMesh: 0 +--- !u!114 &79158882 +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 &110891699 GameObject: m_ObjectHideFlags: 0 @@ -434,6 +447,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 0} +--- !u!114 &209112282 +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!1001 &227427381 PrefabInstance: m_ObjectHideFlags: 0 @@ -1702,7 +1728,7 @@ PrefabInstance: - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, type: 3} propertyPath: m_AnchoredPosition.y - value: 470 + value: 501 objectReference: {fileID: 0} - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, type: 3} @@ -2369,19 +2395,6 @@ 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 @@ -2893,6 +2906,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 915074762} m_CullTransparentMesh: 0 +--- !u!114 &929372873 +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 &930271088 GameObject: m_ObjectHideFlags: 0 @@ -3197,6 +3223,32 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 2018038962} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityUI_Image +--- !u!114 &946935151 +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 &951342957 +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!114 &956104263 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3359,19 +3411,6 @@ 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 @@ -3691,19 +3730,6 @@ 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 @@ -3933,7 +3959,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c11194ed6fd84a1f812fa2cfae75f873, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!114 &1404196162 +--- !u!114 &1380792731 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3945,7 +3971,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 498016303} + mTarget: {fileID: 641871196} --- !u!1001 &1428988151 PrefabInstance: m_ObjectHideFlags: 0 @@ -4070,19 +4096,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6ae614796715fc949a96921656b66a62, type: 3} ---- !u!114 &1433170753 -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 &1443084304 GameObject: m_ObjectHideFlags: 0 @@ -4148,19 +4161,6 @@ 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 @@ -4186,6 +4186,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1566697341 +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!114 &1567492957 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4338,19 +4351,6 @@ 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 @@ -4616,6 +4616,19 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1693567011} m_CullTransparentMesh: 0 +--- !u!114 &1711004213 +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 &1753840228 GameObject: m_ObjectHideFlags: 0 @@ -4712,19 +4725,6 @@ 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, @@ -4737,6 +4737,19 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1812001520 +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!4 &1826383572 stripped Transform: m_CorrespondingSourceObject: {fileID: 5209415119062664250, guid: 343971e948dfe44ddab5ab4f736c3f06, @@ -4856,19 +4869,6 @@ 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, diff --git a/popcorn/Assets/MyGame/Scenes/marketing/CustomizeExplanation.unity b/popcorn/Assets/MyGame/Scenes/marketing/CustomizeExplanation.unity index 27e6710a..2122070c 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/CustomizeExplanation.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/CustomizeExplanation.unity @@ -669,7 +669,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