From c53aa0a0a27767fe47c00cf8c6ac78e56c6ef6a8 Mon Sep 17 00:00:00 2001 From: koya_15 Date: Mon, 16 May 2022 17:07:42 +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=B4=A0=E6=9D=90=E3=83=97=E3=83=AC=E3=83=8F=E3=83=96?= =?UTF-8?q?=E3=83=90=E3=83=AA=E3=82=A2=E3=83=B3=E3=83=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/marketing/Customize.unity | 54 +++-- .../Prefabs/Customize/Item/Cart_b.prefab | 8 +- .../Prefabs/Customize/Item/Cart_c.prefab | 21 ++ .../Prefabs/Customize/Item/Cart_c.prefab.meta | 2 +- .../Prefabs/Customize/Item/Cart_z.prefab | 87 ++++++++ .../Prefabs/Customize/Item/Cart_z.prefab.meta | 7 + .../Customize/Item/Decoration1_b.prefab | 6 +- .../Customize/Item/Decoration1_b.prefab.meta | 2 +- .../Customize/Item/Decoration1_c.prefab | 191 ++++++++++++++++++ .../Customize/Item/Decoration1_c.prefab.meta | 7 + .../Customize/Item/Decoration1_z.prefab | 191 ++++++++++++++++++ .../Customize/Item/Decoration1_z.prefab.meta | 7 + .../Customize/Item/Decoration2_a.prefab | 8 +- .../Customize/Item/Decoration2_b.prefab | 18 +- .../Customize/Item/Decoration2_b.prefab.meta | 2 +- .../Customize/Item/Decoration2_c.prefab | 87 ++++++++ .../Customize/Item/Decoration2_c.prefab.meta | 7 + .../Customize/Item/Decoration2_z.prefab | 93 +++++++++ .../Customize/Item/Decoration2_z.prefab.meta | 7 + .../Prefabs/Customize/Item/Signboard_b.prefab | 15 +- .../Customize/Item/Signboard_b.prefab.meta | 2 +- .../Prefabs/Customize/Item/Signboard_c.prefab | 77 +++++++ .../Customize/Item/Signboard_c.prefab.meta | 7 + .../Prefabs/Customize/Item/Signboard_z.prefab | 88 ++++++++ .../Customize/Item/Signboard_z.prefab.meta | 7 + .../Prefabs/Customize/Item/Stock_b.prefab | 53 +---- .../Customize/Item/Stock_b.prefab.meta | 2 +- .../Prefabs/Customize/Item/Stock_c.prefab | 98 +++++++++ .../Customize/Item/Stock_c.prefab.meta | 7 + .../Prefabs/Customize/Item/Stock_z.prefab | 138 +++++++++++++ .../Customize/Item/Stock_z.prefab.meta | 7 + .../Customize/Item/_Decoration2.prefab | 4 +- .../Customize/Item/__Decoration2_ bpk.prefab | 2 +- .../Scenes/marketing/Prefabs/marketing.prefab | 36 ++++ 34 files changed, 1249 insertions(+), 99 deletions(-) create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Cart_z.prefab create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Cart_z.prefab.meta create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration1_c.prefab create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration1_c.prefab.meta create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration1_z.prefab create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration1_z.prefab.meta create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_c.prefab create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_c.prefab.meta create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_z.prefab create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_z.prefab.meta create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Signboard_c.prefab create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Signboard_c.prefab.meta create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Signboard_z.prefab create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Signboard_z.prefab.meta create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Stock_c.prefab create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Stock_c.prefab.meta create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Stock_z.prefab create mode 100644 popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Stock_z.prefab.meta diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity index 29287c22..304792a9 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity @@ -423,7 +423,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -433,7 +433,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -483,12 +483,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 449.19 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -168 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -757,7 +757,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -767,7 +767,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -817,12 +817,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 153 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -168 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -1864,7 +1864,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -1874,7 +1874,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -1924,12 +1924,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 1041.5701 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -168 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -3190,7 +3190,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMax.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -3200,7 +3200,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMin.y - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -3250,12 +3250,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.x - value: 0 + value: 745.38 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.y - value: 0 + value: -168 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -4215,6 +4215,22 @@ PrefabInstance: propertyPath: m_RootOrder value: 4 objectReference: {fileID: 0} + - target: {fileID: 1231956949149898109, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5124423628195254865, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: abbe0aecf7003874fa43358e2e47abe7, + type: 3} + - target: {fileID: 5174532017960290972, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} propertyPath: m_RootOrder @@ -4290,6 +4306,12 @@ PrefabInstance: propertyPath: m_RootOrder value: 0 objectReference: {fileID: 0} + - target: {fileID: 7262663937173645614, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 4717ef924abc849e18f0fa060a7420d3, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} --- !u!1001 &7213633219263105217 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Cart_b.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Cart_b.prefab index 30221d5d..2c43f457 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Cart_b.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Cart_b.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &4951861661748343506 +--- !u!1001 &8180127750444977528 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -70,18 +70,18 @@ PrefabInstance: - target: {fileID: 5373896368017440102, guid: 07a337175509346dcabfa62b3e426581, type: 3} propertyPath: m_LocalPosition.x - value: -0.1 + value: 0.04 objectReference: {fileID: 0} - target: {fileID: 5373896368017440102, guid: 07a337175509346dcabfa62b3e426581, type: 3} propertyPath: m_LocalPosition.y - value: 0.37 + value: -0 objectReference: {fileID: 0} - target: {fileID: 7412768829570877412, guid: 07a337175509346dcabfa62b3e426581, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 2c67657e99292ff43b1193c31c20ee83, + objectReference: {fileID: 21300000, guid: ebc4e245eaedfe64a8581365678aeb7e, type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 07a337175509346dcabfa62b3e426581, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Cart_c.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Cart_c.prefab index d157f1b0..27076b5e 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Cart_c.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Cart_c.prefab @@ -67,5 +67,26 @@ PrefabInstance: propertyPath: m_Name value: Cart_c objectReference: {fileID: 0} + - target: {fileID: 5373896368017440102, guid: 07a337175509346dcabfa62b3e426581, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.07 + objectReference: {fileID: 0} + - target: {fileID: 5373896368017440102, guid: 07a337175509346dcabfa62b3e426581, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.02 + objectReference: {fileID: 0} + - target: {fileID: 7257893257758048996, guid: 07a337175509346dcabfa62b3e426581, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7412768829570877412, guid: 07a337175509346dcabfa62b3e426581, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 7dd324e32c7db624e8c74fea88f45ca7, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 07a337175509346dcabfa62b3e426581, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Cart_c.prefab.meta b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Cart_c.prefab.meta index 247cf756..f7467898 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Cart_c.prefab.meta +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Cart_c.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 7364cdaecb5e44e56a3545cf120e607c +guid: d090813aee0e02943af554d91f32b7a1 PrefabImporter: externalObjects: {} userData: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Cart_z.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Cart_z.prefab new file mode 100644 index 00000000..30221d5d --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Cart_z.prefab @@ -0,0 +1,87 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &4951861661748343506 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 3341451300676561581, guid: 07a337175509346dcabfa62b3e426581, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3341451300676561581, guid: 07a337175509346dcabfa62b3e426581, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3341451300676561581, guid: 07a337175509346dcabfa62b3e426581, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3341451300676561581, guid: 07a337175509346dcabfa62b3e426581, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3341451300676561581, guid: 07a337175509346dcabfa62b3e426581, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3341451300676561581, guid: 07a337175509346dcabfa62b3e426581, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3341451300676561581, guid: 07a337175509346dcabfa62b3e426581, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3341451300676561581, guid: 07a337175509346dcabfa62b3e426581, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3341451300676561581, guid: 07a337175509346dcabfa62b3e426581, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3341451300676561581, guid: 07a337175509346dcabfa62b3e426581, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3341451300676561581, guid: 07a337175509346dcabfa62b3e426581, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4643234990923338716, guid: 07a337175509346dcabfa62b3e426581, + type: 3} + propertyPath: m_Name + value: Cart_b + objectReference: {fileID: 0} + - target: {fileID: 5373896368017440102, guid: 07a337175509346dcabfa62b3e426581, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.1 + objectReference: {fileID: 0} + - target: {fileID: 5373896368017440102, guid: 07a337175509346dcabfa62b3e426581, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.37 + objectReference: {fileID: 0} + - target: {fileID: 7412768829570877412, guid: 07a337175509346dcabfa62b3e426581, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 2c67657e99292ff43b1193c31c20ee83, + type: 3} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 07a337175509346dcabfa62b3e426581, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Cart_z.prefab.meta b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Cart_z.prefab.meta new file mode 100644 index 00000000..6fab6081 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Cart_z.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: c09b0ac7c3f884dbc83ff9e348a6669b +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration1_b.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration1_b.prefab index 854d3e66..1faefb62 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration1_b.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration1_b.prefab @@ -39,7 +39,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 1 - m_Sprite: {fileID: 21300000, guid: c8a415b94b30cce4fa57ca7147cebfed, type: 3} + m_Sprite: {fileID: 21300000, guid: 91d41b7f5fa472c48bcc64c600e65a1a, type: 3} m_Color: {r: 0, g: 0, b: 0, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -89,12 +89,12 @@ PrefabInstance: - target: {fileID: 2584303334822316966, guid: ce546d76f4fc44bc8b25061eec21e306, type: 3} propertyPath: m_LocalPosition.x - value: 0.17 + value: -1.3 objectReference: {fileID: 0} - target: {fileID: 2584303334822316966, guid: ce546d76f4fc44bc8b25061eec21e306, type: 3} propertyPath: m_LocalPosition.y - value: 1.6 + value: 1.39 objectReference: {fileID: 0} - target: {fileID: 2848167902531314834, guid: ce546d76f4fc44bc8b25061eec21e306, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration1_b.prefab.meta b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration1_b.prefab.meta index 63d5e2d6..79794ba4 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration1_b.prefab.meta +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration1_b.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 48986d8284d317647a8972ec7f693156 +guid: 77261956c706b944c9cda9ce9e03c588 PrefabImporter: externalObjects: {} userData: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration1_c.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration1_c.prefab new file mode 100644 index 00000000..501b8a2c --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration1_c.prefab @@ -0,0 +1,191 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!212 &483025294810130289 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7897673403619313734} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f138cade846eb48a995388422833859d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 21300000, guid: fa211323629069e47a4041b0e04a237f, type: 3} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 4.4, y: 3.66} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &8931769136506742201 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7897673403619313734} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: be0cfc5942f744c45a5ce0df89a65bd0, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1001 &4408622280253584334 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1832171981656107946, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505372828662253691, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2584303334822316966, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.732 + objectReference: {fileID: 0} + - target: {fileID: 2584303334822316966, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.783 + objectReference: {fileID: 0} + - target: {fileID: 2848167902531314834, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2848167902531314834, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2848167902531314834, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2848167902531314834, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2848167902531314834, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2848167902531314834, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2848167902531314834, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2848167902531314834, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2848167902531314834, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2848167902531314834, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2848167902531314834, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2848167902531314835, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_Name + value: Decoration1_c + objectReference: {fileID: 0} + - target: {fileID: 3155572210682455363, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4299427106360548399, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4421630343322616458, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4604393853280942664, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7834580153532732221, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ce546d76f4fc44bc8b25061eec21e306, type: 3} +--- !u!1 &7897673403619313734 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5815482505027173256, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + m_PrefabInstance: {fileID: 4408622280253584334} + m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration1_c.prefab.meta b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration1_c.prefab.meta new file mode 100644 index 00000000..db90b14f --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration1_c.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 18ae2d8171912274eab7e2088385d6c2 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration1_z.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration1_z.prefab new file mode 100644 index 00000000..854d3e66 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration1_z.prefab @@ -0,0 +1,191 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!212 &483025294810130289 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7897673403619313734} + m_Enabled: 1 + m_CastShadows: 0 + m_ReceiveShadows: 0 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: f138cade846eb48a995388422833859d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 0 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 1 + m_Sprite: {fileID: 21300000, guid: c8a415b94b30cce4fa57ca7147cebfed, type: 3} + m_Color: {r: 0, g: 0, b: 0, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 4.4, y: 3.66} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 +--- !u!95 &8931769136506742201 +Animator: + serializedVersion: 3 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7897673403619313734} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: be0cfc5942f744c45a5ce0df89a65bd0, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1001 &4408622280253584334 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1832171981656107946, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2505372828662253691, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2584303334822316966, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.17 + objectReference: {fileID: 0} + - target: {fileID: 2584303334822316966, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.6 + objectReference: {fileID: 0} + - target: {fileID: 2848167902531314834, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2848167902531314834, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2848167902531314834, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2848167902531314834, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2848167902531314834, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2848167902531314834, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2848167902531314834, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2848167902531314834, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 2848167902531314834, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2848167902531314834, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2848167902531314834, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2848167902531314835, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_Name + value: Decoration1_b + objectReference: {fileID: 0} + - target: {fileID: 3155572210682455363, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4299427106360548399, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4421630343322616458, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4604393853280942664, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7834580153532732221, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ce546d76f4fc44bc8b25061eec21e306, type: 3} +--- !u!1 &7897673403619313734 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5815482505027173256, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + m_PrefabInstance: {fileID: 4408622280253584334} + m_PrefabAsset: {fileID: 0} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration1_z.prefab.meta b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration1_z.prefab.meta new file mode 100644 index 00000000..63d5e2d6 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration1_z.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 48986d8284d317647a8972ec7f693156 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_a.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_a.prefab index 7b4c1d34..76565e36 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_a.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_a.prefab @@ -10,7 +10,7 @@ PrefabInstance: - target: {fileID: 1604048759392500456, guid: 2c2ecbebcc1bd4885a47517c698026fa, type: 3} propertyPath: m_Name - value: _Decoration2 + value: Decoration2_a objectReference: {fileID: 0} - target: {fileID: 1604048759392500457, guid: 2c2ecbebcc1bd4885a47517c698026fa, type: 3} @@ -67,5 +67,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5228767001950558546, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: abbe0aecf7003874fa43358e2e47abe7, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2c2ecbebcc1bd4885a47517c698026fa, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_b.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_b.prefab index a1010589..584ac1da 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_b.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_b.prefab @@ -67,27 +67,21 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2943213162931433284, guid: 2c2ecbebcc1bd4885a47517c698026fa, + - target: {fileID: 4364022137937732700, guid: 2c2ecbebcc1bd4885a47517c698026fa, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2943213162931433284, guid: 2c2ecbebcc1bd4885a47517c698026fa, - type: 3} - propertyPath: mLocalizeTarget - value: + propertyPath: m_LocalPosition.x + value: 0.209 objectReference: {fileID: 0} - target: {fileID: 4364022137937732700, guid: 2c2ecbebcc1bd4885a47517c698026fa, type: 3} propertyPath: m_LocalPosition.y - value: 1.25 + value: 0.048 objectReference: {fileID: 0} - target: {fileID: 5228767001950558546, guid: 2c2ecbebcc1bd4885a47517c698026fa, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 7b61dfaad516c6e4586bf090321dee24, + objectReference: {fileID: 21300000, guid: 1a827cf3ed1e0204da0b3a85fcb0b661, type: 3} - m_RemovedComponents: - - {fileID: 2943213162931433284, guid: 2c2ecbebcc1bd4885a47517c698026fa, type: 3} + m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2c2ecbebcc1bd4885a47517c698026fa, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_b.prefab.meta b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_b.prefab.meta index 3bbd0daf..04e9dd1c 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_b.prefab.meta +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_b.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 9dc04cc194512c54085deb0bf8e58e71 +guid: 23239220dcedd8145b94b7fe9f0f76e8 PrefabImporter: externalObjects: {} userData: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_c.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_c.prefab new file mode 100644 index 00000000..efd4913f --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_c.prefab @@ -0,0 +1,87 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &5768584941133994283 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1604048759392500456, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_Name + value: Decoration2_c + objectReference: {fileID: 0} + - target: {fileID: 1604048759392500457, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1604048759392500457, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1604048759392500457, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1604048759392500457, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1604048759392500457, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1604048759392500457, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1604048759392500457, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1604048759392500457, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1604048759392500457, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1604048759392500457, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1604048759392500457, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4364022137937732700, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.035 + objectReference: {fileID: 0} + - target: {fileID: 4364022137937732700, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.277 + objectReference: {fileID: 0} + - target: {fileID: 5228767001950558546, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f46abf72670f570469e3612d368201be, + type: 3} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2c2ecbebcc1bd4885a47517c698026fa, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_c.prefab.meta b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_c.prefab.meta new file mode 100644 index 00000000..5ee029bc --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_c.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: cfaa2925a47d3264eb29476f4e279da0 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_z.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_z.prefab new file mode 100644 index 00000000..a1010589 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_z.prefab @@ -0,0 +1,93 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &5768584941133994283 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 1604048759392500456, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_Name + value: Decoration2_b + objectReference: {fileID: 0} + - target: {fileID: 1604048759392500457, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1604048759392500457, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1604048759392500457, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1604048759392500457, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1604048759392500457, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1604048759392500457, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1604048759392500457, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1604048759392500457, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1604048759392500457, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1604048759392500457, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1604048759392500457, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2943213162931433284, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2943213162931433284, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: mLocalizeTarget + value: + objectReference: {fileID: 0} + - target: {fileID: 4364022137937732700, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.25 + objectReference: {fileID: 0} + - target: {fileID: 5228767001950558546, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 7b61dfaad516c6e4586bf090321dee24, + type: 3} + m_RemovedComponents: + - {fileID: 2943213162931433284, guid: 2c2ecbebcc1bd4885a47517c698026fa, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 2c2ecbebcc1bd4885a47517c698026fa, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_z.prefab.meta b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_z.prefab.meta new file mode 100644 index 00000000..3bbd0daf --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Decoration2_z.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 9dc04cc194512c54085deb0bf8e58e71 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Signboard_b.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Signboard_b.prefab index 22a5f989..d33d21d9 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Signboard_b.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Signboard_b.prefab @@ -71,18 +71,7 @@ PrefabInstance: type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 5b489eabe4a16b34e96ed4eef238689f, + objectReference: {fileID: 21300000, guid: 82625d5bbfe39114e93ffb52dbe1af25, type: 3} - - target: {fileID: 8332490658364066617, guid: 0db033495b6ff449ea623f57ea9250ef, - type: 3} - propertyPath: m_LocalPosition.x - value: 0.03 - objectReference: {fileID: 0} - - target: {fileID: 8332490658364066617, guid: 0db033495b6ff449ea623f57ea9250ef, - type: 3} - propertyPath: m_LocalPosition.y - value: -0.09 - objectReference: {fileID: 0} - m_RemovedComponents: - - {fileID: 7129869699020814611, guid: 0db033495b6ff449ea623f57ea9250ef, type: 3} + m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0db033495b6ff449ea623f57ea9250ef, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Signboard_b.prefab.meta b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Signboard_b.prefab.meta index a8baf978..79e4627d 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Signboard_b.prefab.meta +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Signboard_b.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: fcc380df209215d4dbc7f551937d533a +guid: 8d125b6df42e22e46a628c8c6d2f8f15 PrefabImporter: externalObjects: {} userData: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Signboard_c.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Signboard_c.prefab new file mode 100644 index 00000000..860a5376 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Signboard_c.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &1315021554282269909 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4815071359951551538, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815071359951551538, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815071359951551538, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815071359951551538, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815071359951551538, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4815071359951551538, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4815071359951551538, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4815071359951551538, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4815071359951551538, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815071359951551538, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815071359951551538, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5397996196210691170, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_Name + value: Signboard_c + objectReference: {fileID: 0} + - target: {fileID: 8207034540369402946, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: cee29e082ddcf9743ab95cb745d03b2f, + type: 3} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0db033495b6ff449ea623f57ea9250ef, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Signboard_c.prefab.meta b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Signboard_c.prefab.meta new file mode 100644 index 00000000..e048339a --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Signboard_c.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 5bcf55997cff1f345b25c0d667650baf +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Signboard_z.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Signboard_z.prefab new file mode 100644 index 00000000..22a5f989 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Signboard_z.prefab @@ -0,0 +1,88 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &1315021554282269909 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 4815071359951551538, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815071359951551538, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815071359951551538, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815071359951551538, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815071359951551538, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4815071359951551538, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4815071359951551538, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4815071359951551538, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4815071359951551538, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815071359951551538, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4815071359951551538, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5397996196210691170, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_Name + value: Signboard_b + objectReference: {fileID: 0} + - target: {fileID: 8207034540369402946, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 5b489eabe4a16b34e96ed4eef238689f, + type: 3} + - target: {fileID: 8332490658364066617, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.03 + objectReference: {fileID: 0} + - target: {fileID: 8332490658364066617, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.09 + objectReference: {fileID: 0} + m_RemovedComponents: + - {fileID: 7129869699020814611, guid: 0db033495b6ff449ea623f57ea9250ef, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 0db033495b6ff449ea623f57ea9250ef, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Signboard_z.prefab.meta b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Signboard_z.prefab.meta new file mode 100644 index 00000000..a8baf978 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Signboard_z.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fcc380df209215d4dbc7f551937d533a +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Stock_b.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Stock_b.prefab index 02c3d14d..f102af91 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Stock_b.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Stock_b.prefab @@ -7,72 +7,41 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2922805836281354774, guid: 2893923eb88ee4eb69c2dda4df483a0b, - type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: c376315cc69a7bf4ca5984fe3ed6e012, - type: 3} - target: {fileID: 3373136197140018219, guid: 2893923eb88ee4eb69c2dda4df483a0b, type: 3} propertyPath: m_LocalPosition.x - value: -0.03 + value: 0.21999997 + objectReference: {fileID: 0} + - target: {fileID: 3373136197140018219, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.31 objectReference: {fileID: 0} - target: {fileID: 3867970289715911327, guid: 2893923eb88ee4eb69c2dda4df483a0b, type: 3} propertyPath: m_Sprite value: - objectReference: {fileID: 21300000, guid: 631cd3dd0c27e7142b5e3588691a5a46, + objectReference: {fileID: 21300000, guid: e77280476bbbf8a45ab6f545e5db7086, type: 3} - target: {fileID: 5004154229686053151, guid: 2893923eb88ee4eb69c2dda4df483a0b, type: 3} propertyPath: m_LocalPosition.x - value: 3.55 + value: 3.41 objectReference: {fileID: 0} - target: {fileID: 5004154229686053151, guid: 2893923eb88ee4eb69c2dda4df483a0b, type: 3} propertyPath: m_LocalPosition.y - value: -2.35 + value: -2.3 objectReference: {fileID: 0} - target: {fileID: 6773000140537774233, guid: 2893923eb88ee4eb69c2dda4df483a0b, type: 3} propertyPath: m_LocalPosition.x - value: 0.01 + value: 0.07 objectReference: {fileID: 0} - target: {fileID: 6773000140537774233, guid: 2893923eb88ee4eb69c2dda4df483a0b, type: 3} propertyPath: m_LocalPosition.y - value: -0.61 - objectReference: {fileID: 0} - - target: {fileID: 6773000140537774233, guid: 2893923eb88ee4eb69c2dda4df483a0b, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6773000140537774233, guid: 2893923eb88ee4eb69c2dda4df483a0b, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6773000140537774233, guid: 2893923eb88ee4eb69c2dda4df483a0b, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6773000140537774233, guid: 2893923eb88ee4eb69c2dda4df483a0b, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6773000140537774233, guid: 2893923eb88ee4eb69c2dda4df483a0b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6773000140537774233, guid: 2893923eb88ee4eb69c2dda4df483a0b, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 0.31 objectReference: {fileID: 0} - target: {fileID: 7036498054588908228, guid: 2893923eb88ee4eb69c2dda4df483a0b, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Stock_b.prefab.meta b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Stock_b.prefab.meta index 0d1b1548..8acbdec4 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Stock_b.prefab.meta +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Stock_b.prefab.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0552dc72b3da5d44f8727f4fc500dd69 +guid: 8089b72031521d9448adbbc6606dd104 PrefabImporter: externalObjects: {} userData: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Stock_c.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Stock_c.prefab new file mode 100644 index 00000000..c19a699b --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Stock_c.prefab @@ -0,0 +1,98 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &5951189149711039011 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2922805836281354774, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 39338f73bd1e4f443958fdf6e03d345b, + type: 3} + - target: {fileID: 3867970289715911327, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 19e47aa2657cc1f47adfca0ad007a309, + type: 3} + - target: {fileID: 5004154229686053151, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalPosition.x + value: 3.6 + objectReference: {fileID: 0} + - target: {fileID: 6773000140537774233, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.32 + objectReference: {fileID: 0} + - target: {fileID: 6773000140537774233, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.24 + objectReference: {fileID: 0} + - target: {fileID: 7036498054588908228, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_Name + value: Stock_c + objectReference: {fileID: 0} + - target: {fileID: 7036498054588908229, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7036498054588908229, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7036498054588908229, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7036498054588908229, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7036498054588908229, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7036498054588908229, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7036498054588908229, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7036498054588908229, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7036498054588908229, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7036498054588908229, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7036498054588908229, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2893923eb88ee4eb69c2dda4df483a0b, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Stock_c.prefab.meta b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Stock_c.prefab.meta new file mode 100644 index 00000000..d750a1db --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Stock_c.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 2cd0cdebf6eaeb741b94d1f73a198b82 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Stock_z.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Stock_z.prefab new file mode 100644 index 00000000..02c3d14d --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Stock_z.prefab @@ -0,0 +1,138 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1001 &5951189149711039011 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2922805836281354774, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: c376315cc69a7bf4ca5984fe3ed6e012, + type: 3} + - target: {fileID: 3373136197140018219, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalPosition.x + value: -0.03 + objectReference: {fileID: 0} + - target: {fileID: 3867970289715911327, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 631cd3dd0c27e7142b5e3588691a5a46, + type: 3} + - target: {fileID: 5004154229686053151, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalPosition.x + value: 3.55 + objectReference: {fileID: 0} + - target: {fileID: 5004154229686053151, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalPosition.y + value: -2.35 + objectReference: {fileID: 0} + - target: {fileID: 6773000140537774233, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.01 + objectReference: {fileID: 0} + - target: {fileID: 6773000140537774233, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.61 + objectReference: {fileID: 0} + - target: {fileID: 6773000140537774233, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6773000140537774233, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773000140537774233, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773000140537774233, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773000140537774233, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6773000140537774233, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7036498054588908228, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_Name + value: Stock_b + objectReference: {fileID: 0} + - target: {fileID: 7036498054588908229, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7036498054588908229, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7036498054588908229, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7036498054588908229, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7036498054588908229, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7036498054588908229, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7036498054588908229, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7036498054588908229, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7036498054588908229, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7036498054588908229, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7036498054588908229, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 2893923eb88ee4eb69c2dda4df483a0b, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Stock_z.prefab.meta b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Stock_z.prefab.meta new file mode 100644 index 00000000..0d1b1548 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/Stock_z.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0552dc72b3da5d44f8727f4fc500dd69 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/_Decoration2.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/_Decoration2.prefab index 14aefc2e..a0a56c3f 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/_Decoration2.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/_Decoration2.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 1604048759392500457} m_Layer: 0 - m_Name: _Decoration2_ + m_Name: _Decoration2 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -103,7 +103,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 7 - m_Sprite: {fileID: 21300000, guid: f46abf72670f570469e3612d368201be, type: 3} + m_Sprite: {fileID: 21300000, guid: abbe0aecf7003874fa43358e2e47abe7, type: 3} m_Color: {r: 0, g: 0, b: 0, a: 1} m_FlipX: 0 m_FlipY: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/__Decoration2_ bpk.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/__Decoration2_ bpk.prefab index 768306c5..019c886d 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/__Decoration2_ bpk.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Customize/Item/__Decoration2_ bpk.prefab @@ -10,7 +10,7 @@ GameObject: m_Component: - component: {fileID: 1604048759392500457} m_Layer: 0 - m_Name: _Decoration2 + m_Name: __Decoration2_ bpk m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/marketing.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/marketing.prefab index e3a27db2..72cb8a9a 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/marketing.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/marketing.prefab @@ -6707,6 +6707,12 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 5228767001950558546, guid: 2c2ecbebcc1bd4885a47517c698026fa, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: abbe0aecf7003874fa43358e2e47abe7, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2c2ecbebcc1bd4885a47517c698026fa, type: 3} --- !u!4 &1859821823382827498 stripped @@ -6782,6 +6788,16 @@ PrefabInstance: propertyPath: m_Name value: _Decoration1 objectReference: {fileID: 0} + - target: {fileID: 2848167902531314835, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5815482505027173256, guid: ce546d76f4fc44bc8b25061eec21e306, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ce546d76f4fc44bc8b25061eec21e306, type: 3} --- !u!4 &2899003961775582400 stripped @@ -6797,6 +6813,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 5295231574505592702} m_Modifications: + - target: {fileID: 1327199629440297706, guid: 0db033495b6ff449ea623f57ea9250ef, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 4815071359951551538, guid: 0db033495b6ff449ea623f57ea9250ef, type: 3} propertyPath: m_RootOrder @@ -6877,6 +6898,11 @@ PrefabInstance: propertyPath: m_Name value: _Stock objectReference: {fileID: 0} + - target: {fileID: 7036498054588908228, guid: 2893923eb88ee4eb69c2dda4df483a0b, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7036498054588908229, guid: 2893923eb88ee4eb69c2dda4df483a0b, type: 3} propertyPath: m_RootOrder @@ -7007,6 +7033,16 @@ PrefabInstance: propertyPath: m_Name value: _Cart objectReference: {fileID: 0} + - target: {fileID: 4643234990923338716, guid: 07a337175509346dcabfa62b3e426581, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7257893257758048996, guid: 07a337175509346dcabfa62b3e426581, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 07a337175509346dcabfa62b3e426581, type: 3} --- !u!4 &4863446875865899942 stripped