diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_Customize_icon_RainbowWings_big.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_Customize_icon_RainbowWings_big.png new file mode 100644 index 00000000..e1385a8d Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_Customize_icon_RainbowWings_big.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_Customize_icon_RainbowWings_big.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_Customize_icon_RainbowWings_big.png.meta new file mode 100644 index 00000000..81806ebc --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/marketing/ui_marketing_Customize_icon_RainbowWings_big.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 3325d5b02e06a7c479e7603d863dd13a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab index 48daa8c4..f4cb9a4f 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/Main/Prefabs/Canvas.prefab @@ -3764,6 +3764,11 @@ PrefabInstance: propertyPath: m_Name value: icon_get objectReference: {fileID: 0} + - target: {fileID: 5788652954579550797, guid: 42b6e2c5e0aa46a4e973df1237dc5691, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 9193060593438266932, guid: 42b6e2c5e0aa46a4e973df1237dc5691, type: 3} propertyPath: m_LocalPosition.y @@ -4168,18 +4173,18 @@ PrefabInstance: m_RemovedComponents: - {fileID: 3928365105026016678, guid: ac3be7383b736d941b251a588e626963, type: 3} m_SourcePrefab: {fileID: 100100000, guid: ac3be7383b736d941b251a588e626963, type: 3} ---- !u!1 &3664916834242367712 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 137127163878687690, guid: ac3be7383b736d941b251a588e626963, - type: 3} - m_PrefabInstance: {fileID: 3691625806369805098} - m_PrefabAsset: {fileID: 0} --- !u!224 &3664916834242367713 stripped RectTransform: m_CorrespondingSourceObject: {fileID: 137127163878687691, guid: ac3be7383b736d941b251a588e626963, type: 3} m_PrefabInstance: {fileID: 3691625806369805098} m_PrefabAsset: {fileID: 0} +--- !u!1 &3664916834242367712 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 137127163878687690, guid: ac3be7383b736d941b251a588e626963, + type: 3} + m_PrefabInstance: {fileID: 3691625806369805098} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5515389989501635960 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity b/popcorn/Assets/MyGame/Scenes/marketing/Customize.unity index 304792a9..4754ff4f 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: 1 + value: 0 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: 1 + value: 0 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: 449.19 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.y - value: -168 + value: 0 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: 1 + value: 0 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: 1 + value: 0 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: 153 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.y - value: -168 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -1418,6 +1418,176 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 527833880} m_CullTransparentMesh: 0 +--- !u!1001 &551709010 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8477184252459630158} + m_Modifications: + - target: {fileID: 1275687393837241562, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393837241562, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393837241562, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393837241562, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393837241562, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_SizeDelta.y + value: 74 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 30 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 470 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332079, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_Name + value: StockRainbowWings + objectReference: {fileID: 0} + - target: {fileID: 1275687395215027699, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687395215027699, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687395215027699, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687395215027699, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, type: 3} +--- !u!224 &551709011 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + m_PrefabInstance: {fileID: 551709010} + m_PrefabAsset: {fileID: 0} --- !u!1 &601118649 GameObject: m_ObjectHideFlags: 0 @@ -1864,7 +2034,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -1874,7 +2044,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -1924,12 +2094,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.x - value: 1041.5701 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.y - value: -168 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -3190,7 +3360,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -3200,7 +3370,7 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -3250,12 +3420,12 @@ PrefabInstance: - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.x - value: 745.38 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} propertyPath: m_AnchoredPosition.y - value: -168 + value: 0 objectReference: {fileID: 0} - target: {fileID: 9136989296408743451, guid: 6ae614796715fc949a96921656b66a62, type: 3} @@ -5016,6 +5186,7 @@ RectTransform: - {fileID: 1059209561} - {fileID: 8477184252067930423} - {fileID: 643926044} + - {fileID: 551709011} m_Father: {fileID: 8477184251337102197} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/StockRainbowWings.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/StockRainbowWings.prefab new file mode 100644 index 00000000..bbf0b7f0 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/StockRainbowWings.prefab @@ -0,0 +1,307 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1275687393837241561 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1275687393837241562} + - component: {fileID: 1275687393837241564} + - component: {fileID: 1275687393837241563} + m_Layer: 5 + m_Name: Text_StockCoin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1275687393837241562 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275687393837241561} + 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: 1275687393892332064} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1275687393837241564 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275687393837241561} + m_CullTransparentMesh: 0 +--- !u!114 &1275687393837241563 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275687393837241561} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 351b4ffae35e149bf81549887561d561, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.3372549, g: 0.21960784, b: 0.14117648, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_FontData: + m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} + m_FontSize: 45 + m_FontStyle: 1 + m_BestFit: 1 + m_MinSize: 45 + m_MaxSize: 45 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: 100 +--- !u!1 &1275687393892332079 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1275687393892332064} + - component: {fileID: 1275687393892332068} + - component: {fileID: 1275687393892332067} + - component: {fileID: 1275687393892332066} + - component: {fileID: 1275687393892332065} + m_Layer: 5 + m_Name: StockRainbowWings + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1275687393892332064 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275687393892332079} + 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: + - {fileID: 1275687395215027699} + - {fileID: 1275687393837241562} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 26, y: -141.80078} + m_SizeDelta: {x: 0, y: 74} + m_Pivot: {x: 0, y: 1} +--- !u!222 &1275687393892332068 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275687393892332079} + m_CullTransparentMesh: 0 +--- !u!114 &1275687393892332067 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275687393892332079} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: ff4d597826f53ac49821fc3d60148965, type: 3} + m_Type: 1 + 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!114 &1275687393892332066 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275687393892332079} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3} + m_Name: + m_EditorClassIdentifier: + m_HorizontalFit: 2 + m_VerticalFit: 0 +--- !u!114 &1275687393892332065 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275687393892332079} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 42 + m_Right: 20 + m_Top: -10 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 54 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 0 + m_ChildScaleWidth: 0 + m_ChildScaleHeight: 0 +--- !u!1 &1275687394498706116 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1275687394498706117} + - component: {fileID: 1275687394498706119} + - component: {fileID: 1275687394498706118} + m_Layer: 5 + m_Name: Image_RainbowWings + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1275687394498706117 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275687394498706116} + 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: 1275687395215027699} + 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: 0} + m_SizeDelta: {x: 62, y: 86} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1275687394498706119 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275687394498706116} + m_CullTransparentMesh: 0 +--- !u!114 &1275687394498706118 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275687394498706116} + 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: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 3325d5b02e06a7c479e7603d863dd13a, type: 3} + 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!1 &1275687395215027698 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1275687395215027699} + m_Layer: 5 + m_Name: Icon_RainbowWings + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1275687395215027699 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1275687395215027698} + 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: + - {fileID: 1275687394498706117} + m_Father: {fileID: 1275687393892332064} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 92} + m_Pivot: {x: 0.5, y: 0.5} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/StockRainbowWings.prefab.meta b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/StockRainbowWings.prefab.meta new file mode 100644 index 00000000..84b96795 --- /dev/null +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/StockRainbowWings.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 0581d3c2be8cfaf44920f7a3ed37bd2e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index c6b52f0a..62494a4a 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -1305,7 +1305,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &294428444 +--- !u!114 &313727387 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1317,7 +1317,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 714437468} + mTarget: {fileID: 714437469} --- !u!1 &361467702 GameObject: m_ObjectHideFlags: 0 @@ -2325,19 +2325,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &597753595 -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: 714437472} --- !u!1 &639103586 GameObject: m_ObjectHideFlags: 0 @@ -2780,19 +2767,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: mTarget: {fileID: 1987982871} ---- !u!114 &688797460 -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: 714437473} --- !u!1 &699827848 GameObject: m_ObjectHideFlags: 0 @@ -4516,6 +4490,19 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &866465337 +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: 714437470} --- !u!1 &876376901 GameObject: m_ObjectHideFlags: 0 @@ -5425,7 +5412,7 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &1043642798 +--- !u!114 &1027485507 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -5434,10 +5421,10 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: bedef2aeaac8da04faa9a07b7241d0ad, type: 3} + m_Script: {fileID: 11500000, guid: 3b29d7ab09a96634a9f704e6a1f21193, type: 3} m_Name: m_EditorClassIdentifier: - mTarget: {fileID: 714437469} + mTarget: {fileID: 1685069511} --- !u!1 &1054830762 GameObject: m_ObjectHideFlags: 0 @@ -6627,6 +6614,32 @@ Transform: m_Father: {fileID: 443832894} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1348914126 +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: 714437473} +--- !u!114 &1374181164 +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: 714437471} --- !u!1 &1384972636 GameObject: m_ObjectHideFlags: 0 @@ -7284,6 +7297,19 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: animator: {fileID: 1178501603} +--- !u!114 &1514306756 +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: 714437468} --- !u!1 &1522686119 GameObject: m_ObjectHideFlags: 0 @@ -7492,19 +7518,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &1587498291 -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: 714437471} --- !u!1 &1603646714 GameObject: m_ObjectHideFlags: 0 @@ -12657,6 +12670,12 @@ PrefabInstance: propertyPath: mLocalizeTarget value: objectReference: {fileID: 796602059} + - target: {fileID: 5124423628195254865, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: f46abf72670f570469e3612d368201be, + type: 3} - target: {fileID: 6725113438918222137, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} propertyPath: m_RootOrder @@ -12724,6 +12743,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 343971e948dfe44ddab5ab4f736c3f06, type: 3} +--- !u!212 &1685069511 stripped +SpriteRenderer: + m_CorrespondingSourceObject: {fileID: 5124423628195254865, guid: 343971e948dfe44ddab5ab4f736c3f06, + type: 3} + m_PrefabInstance: {fileID: 1685069510} + m_PrefabAsset: {fileID: 0} --- !u!114 &1685069515 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3836306740968186770, guid: 343971e948dfe44ddab5ab4f736c3f06, @@ -13368,19 +13393,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!114 &1843614431 -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: 714437470} --- !u!1 &1851967067 GameObject: m_ObjectHideFlags: 0 @@ -18630,6 +18642,19 @@ MonoBehaviour: mGUI_ShowCallback: 0 mLocalizeTarget: {fileID: 687627425} mLocalizeTargetName: I2.Loc.LocalizeTarget_UnityStandard_SpriteRenderer +--- !u!114 &1998453789 +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: 714437472} --- !u!1 &2017358936 GameObject: m_ObjectHideFlags: 0 @@ -23860,6 +23885,125 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b875e6e94a97840ca8490ce0718fca6e, type: 3} +--- !u!1001 &4848284630431542680 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 714437465} + m_Modifications: + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_AnchorMax.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_AnchorMin.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_SizeDelta.y + value: 74 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 26 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -141.80078 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332064, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1275687393892332079, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, + type: 3} + propertyPath: m_Name + value: StockRainbowWings + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0581d3c2be8cfaf44920f7a3ed37bd2e, type: 3} --- !u!1001 &6474394021739311813 PrefabInstance: m_ObjectHideFlags: 0