diff --git a/popcorn/Assets/MyGame/Prefabs/icon_Rare.prefab b/popcorn/Assets/MyGame/Prefabs/icon_Rare.prefab index ee14732f..3e9d258a 100644 --- a/popcorn/Assets/MyGame/Prefabs/icon_Rare.prefab +++ b/popcorn/Assets/MyGame/Prefabs/icon_Rare.prefab @@ -212,7 +212,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 10 - m_Sprite: {fileID: 21300000, guid: 55a9ae6dba49c3940865bd76918cbddf, type: 3} + m_Sprite: {fileID: 21300000, guid: 8f60e4d8c7b90414caf6447ff0fda4d8, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -332,7 +332,8 @@ Transform: m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 9138555990566045856} m_Father: {fileID: 5841351845785292974} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -375,7 +376,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 10 - m_Sprite: {fileID: 21300000, guid: e97f9c209502fae42ba9fe6c73d0875a, type: 3} + m_Sprite: {fileID: 21300000, guid: 55a9ae6dba49c3940865bd76918cbddf, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -457,7 +458,7 @@ SpriteRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 10 - m_Sprite: {fileID: 21300000, guid: 8f60e4d8c7b90414caf6447ff0fda4d8, type: 3} + m_Sprite: {fileID: 21300000, guid: 5e081b830511fa24f9419b6aef07368b, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 m_FlipY: 0 @@ -798,6 +799,116 @@ Transform: type: 3} m_PrefabInstance: {fileID: 4036395783033744965} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5342064014764649663 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 5163271794299328350} + m_Modifications: + - target: {fileID: 2766725442730909358, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_SortingOrder + value: 200 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4586964025877252094, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: m_Name + value: effect_Glitter (4) + objectReference: {fileID: 0} + - target: {fileID: 6397847358890529686, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: moveWithTransform + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6397847358890529686, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: ShapeModule.radius.value + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 6397847358890529686, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + propertyPath: InitialModule.startSize.scalar + value: 0.08 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: db966de52df9e004b96bb4bc77c41b5e, type: 3} +--- !u!4 &9138555990566045856 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3814688160085222431, guid: db966de52df9e004b96bb4bc77c41b5e, + type: 3} + m_PrefabInstance: {fileID: 5342064014764649663} + m_PrefabAsset: {fileID: 0} --- !u!1001 &5390659369552193181 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Resource/Animation/Customer_complain.anim b/popcorn/Assets/MyGame/Resource/Animation/Customer_complain.anim index c9e81951..2d97663e 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Customer_complain.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Customer_complain.anim @@ -260,6 +260,25 @@ AnimationClip: path: complain/c classID: 1 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Text (TMP) + classID: 1 + script: {fileID: 0} m_PPtrCurves: [] m_SampleRate: 60 m_WrapMode: 0 @@ -310,6 +329,13 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 271242783 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 pptrCurveMapping: [] m_AnimationClipSettings: serializedVersion: 2 @@ -711,6 +737,25 @@ AnimationClip: path: classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_IsActive + path: Text (TMP) + classID: 1 + script: {fileID: 0} m_EulerEditorCurves: [] m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_detail_Cooked_rare_purple.png b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_detail_Cooked_rare_purple.png new file mode 100644 index 00000000..f7207d27 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_detail_Cooked_rare_purple.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_detail_Cooked_rare_purple.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_detail_Cooked_rare_purple.png.meta new file mode 100644 index 00000000..2788fa80 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/BulkOrder/ui_Main_BulkOrder_detail_Cooked_rare_purple.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 9e83c76181e7dca4b92cbbb0ec3751ee +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/Resource/Material/cooking/result/ui_cooking_result_detail_rare_purple_big.png b/popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_cooking_result_detail_rare_purple_big.png new file mode 100644 index 00000000..7d664727 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_cooking_result_detail_rare_purple_big.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_cooking_result_detail_rare_purple_big.png.meta b/popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_cooking_result_detail_rare_purple_big.png.meta new file mode 100644 index 00000000..0cf80320 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_cooking_result_detail_rare_purple_big.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 0f8b056c4d31eb840a4f89267e8122b3 +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/Resource/Material/shopping/ui_shopping_detail_MediumFrame_button_detail.png b/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_MediumFrame_button_detail.png index cc7bc3e1..26af3cad 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_MediumFrame_button_detail.png and b/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_MediumFrame_button_detail.png differ diff --git a/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab b/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab index 3fd3b524..038c95f6 100644 --- a/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab +++ b/popcorn/Assets/MyGame/Resources/Avatars/customer_normal.prefab @@ -5195,7 +5195,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3340056901353795718} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.344, y: 0.602, z: 0} + m_LocalPosition: {x: 0.42, y: 0.72, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6833058327206855056} diff --git a/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity index d358901f..e564821a 100644 --- a/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity +++ b/popcorn/Assets/MyGame/Scenes/Cooking/CookingResults.unity @@ -19004,6 +19004,12 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} + - target: {fileID: 8869708493324659635, guid: 4d49c71079a444963857b600f7b6384c, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 7654e044ece88164dbee09bf458961d6, + type: 3} - target: {fileID: 8869708493587088493, guid: 4d49c71079a444963857b600f7b6384c, type: 3} propertyPath: m_Text @@ -19149,5 +19155,23 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 8869708493948071811, guid: 4d49c71079a444963857b600f7b6384c, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: a168a9e02e4621345a96d19959a7e04b, + type: 3} + - target: {fileID: 8869708494877278141, guid: 4d49c71079a444963857b600f7b6384c, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 159022d28443b654a81362c923c14664, + type: 3} + - target: {fileID: 8869708495356234989, guid: 4d49c71079a444963857b600f7b6384c, + type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 0f8b056c4d31eb840a4f89267e8122b3, + type: 3} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 4d49c71079a444963857b600f7b6384c, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab index 600a7712..30896d70 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab @@ -2495,36 +2495,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1885844597663085898, guid: 769012ad2d933ed439e798970ef29fdd, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 25.800293 - objectReference: {fileID: 0} - - target: {fileID: 2059738712371773594, guid: 769012ad2d933ed439e798970ef29fdd, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2613923737832606406, guid: 769012ad2d933ed439e798970ef29fdd, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} - target: {fileID: 6575807548503812178, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} - - target: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd, - type: 3} - propertyPath: rarity - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7802156769292725947, guid: 769012ad2d933ed439e798970ef29fdd, - type: 3} - propertyPath: m_Layer - value: 5 - objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} --- !u!224 &3084478268397759140 stripped @@ -2580,7 +2555,7 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -2590,17 +2565,17 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_SizeDelta.x - value: 198 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_SizeDelta.y - value: 72 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -2640,12 +2615,12 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchoredPosition.x - value: 305 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchoredPosition.y - value: -128 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -2697,6 +2672,11 @@ PrefabInstance: propertyPath: m_Layer value: 5 objectReference: {fileID: 0} + - target: {fileID: 8966107942931458497, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} --- !u!224 &3613327424185171990 stripped @@ -2834,6 +2814,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1830622607173961941, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1885844597663085898, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchoredPosition.x @@ -2857,7 +2842,7 @@ PrefabInstance: - target: {fileID: 6575807548503812178, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7347831002230456565, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -2924,7 +2909,7 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -2934,17 +2919,17 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_SizeDelta.x - value: 198 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_SizeDelta.y - value: 72 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -2984,12 +2969,12 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchoredPosition.x - value: 99 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchoredPosition.y - value: -128 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -3026,6 +3011,11 @@ PrefabInstance: propertyPath: m_IsActive value: 0 objectReference: {fileID: 0} + - target: {fileID: 5378502411292485285, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 6575807548503812178, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_IsActive @@ -3178,6 +3168,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 1242589404625503983, guid: 769012ad2d933ed439e798970ef29fdd, + type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 1830622607173961941, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_IsActive @@ -3283,7 +3278,7 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchorMax.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -3293,17 +3288,17 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchorMin.y - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_SizeDelta.x - value: 198 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_SizeDelta.y - value: 72 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} @@ -3343,12 +3338,12 @@ PrefabInstance: - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchoredPosition.x - value: 511 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} propertyPath: m_AnchoredPosition.y - value: -128 + value: 0 objectReference: {fileID: 0} - target: {fileID: 551217487534969408, guid: 769012ad2d933ed439e798970ef29fdd, type: 3} diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/RareDetails.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/RareDetails.prefab index cf8ca6b7..db0270d2 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/RareDetails.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/RareDetails.prefab @@ -184,7 +184,7 @@ GameObject: - component: {fileID: 6486029259687730670} - component: {fileID: 7496425599929197993} m_Layer: 5 - m_Name: silver + m_Name: gold m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -236,7 +236,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8f60e4d8c7b90414caf6447ff0fda4d8, type: 3} + m_Sprite: {fileID: 21300000, guid: 5e081b830511fa24f9419b6aef07368b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -258,7 +258,7 @@ GameObject: - component: {fileID: 7244427594386943271} - component: {fileID: 5438419457479045714} m_Layer: 5 - m_Name: copper + m_Name: silver m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -310,7 +310,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 55a9ae6dba49c3940865bd76918cbddf, type: 3} + m_Sprite: {fileID: 21300000, guid: 8f60e4d8c7b90414caf6447ff0fda4d8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -332,7 +332,7 @@ GameObject: - component: {fileID: 7559748154084302323} - component: {fileID: 6279451777898973806} m_Layer: 5 - m_Name: yellow + m_Name: copper m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -384,7 +384,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e97f9c209502fae42ba9fe6c73d0875a, type: 3} + m_Sprite: {fileID: 21300000, guid: 55a9ae6dba49c3940865bd76918cbddf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -558,7 +558,7 @@ GameObject: - component: {fileID: 8714369511752251344} - component: {fileID: 3359193964770176237} m_Layer: 5 - m_Name: gold + m_Name: purple m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -610,7 +610,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5e081b830511fa24f9419b6aef07368b, type: 3} + m_Sprite: {fileID: 21300000, guid: 9e83c76181e7dca4b92cbbb0ec3751ee, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab index d51a2242..e9bc9549 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab @@ -15,7 +15,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &2887575335600208513 RectTransform: m_ObjectHideFlags: 0 @@ -32,9 +32,9 @@ RectTransform: m_Father: {fileID: 135021159977205431} m_RootOrder: 5 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 339, y: -2} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &83536216591997874 @@ -121,7 +121,7 @@ GameObject: m_Component: - component: {fileID: 295254682879803719} m_Layer: 5 - m_Name: silver + m_Name: gold m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -176,7 +176,8 @@ RectTransform: m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] + m_Children: + - {fileID: 6153581475224441021} m_Father: {fileID: 7340080036641221667} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -212,7 +213,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e97f9c209502fae42ba9fe6c73d0875a, type: 3} + m_Sprite: {fileID: 21300000, guid: 55a9ae6dba49c3940865bd76918cbddf, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -287,7 +288,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 5e081b830511fa24f9419b6aef07368b, type: 3} + m_Sprite: {fileID: 21300000, guid: 9e83c76181e7dca4b92cbbb0ec3751ee, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -307,12 +308,12 @@ GameObject: m_Component: - component: {fileID: 6403505569804138876} m_Layer: 5 - m_Name: gold + m_Name: purple m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &6403505569804138876 RectTransform: m_ObjectHideFlags: 0 @@ -329,9 +330,9 @@ RectTransform: m_Father: {fileID: 135021159977205431} m_RootOrder: 4 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_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 305, y: -2} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &2308454864973730191 @@ -566,7 +567,7 @@ GameObject: m_Component: - component: {fileID: 7340080036641221667} m_Layer: 5 - m_Name: yellow + m_Name: copper m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -658,7 +659,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 8f60e4d8c7b90414caf6447ff0fda4d8, type: 3} + m_Sprite: {fileID: 21300000, guid: 5e081b830511fa24f9419b6aef07368b, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -1045,7 +1046,7 @@ GameObject: m_Component: - component: {fileID: 7428997426145977575} m_Layer: 5 - m_Name: copper + m_Name: silver m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1802,7 +1803,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e0939e7a58e752244aefcae5de48a36f, type: 3} + m_Sprite: {fileID: 21300000, guid: fe59704549e1e8c4fafe379d5a121714, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2647,7 +2648,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 55a9ae6dba49c3940865bd76918cbddf, type: 3} + m_Sprite: {fileID: 21300000, guid: 8f60e4d8c7b90414caf6447ff0fda4d8, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -2936,6 +2937,81 @@ Transform: type: 3} m_PrefabInstance: {fileID: 2578452183215564572} m_PrefabAsset: {fileID: 0} +--- !u!1001 &6583438282654538371 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 2520922652578556911} + m_Modifications: + - target: {fileID: 1024845457055648318, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1024845457055648318, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1024845457055648318, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.000079870224 + objectReference: {fileID: 0} + - target: {fileID: 1024845457055648318, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1024845457055648318, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1024845457055648318, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1024845457055648318, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1024845457055648318, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 1024845457055648318, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 1024845457055648318, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1024845457055648318, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4716757900467751090, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + propertyPath: m_Name + value: pt_Glitter (1) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c57f625e1d4a17f4dbc55e25fbb71794, type: 3} +--- !u!4 &6153581475224441021 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1024845457055648318, guid: c57f625e1d4a17f4dbc55e25fbb71794, + type: 3} + m_PrefabInstance: {fileID: 6583438282654538371} + m_PrefabAsset: {fileID: 0} --- !u!1001 &7859714066852031417 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab index 4890a88f..9b520571 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/Frame.prefab @@ -27,7 +27,7 @@ RectTransform: m_GameObject: {fileID: 1735230268650569057} 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_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 8536603424566114135} m_RootOrder: 1 @@ -149,7 +149,7 @@ RectTransform: 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: 186, y: 98} + m_SizeDelta: {x: 186, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8536603422629144345 CanvasRenderer: @@ -776,8 +776,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -260, y: 57} - m_SizeDelta: {x: 46, y: 52} + m_AnchoredPosition: {x: -261, y: 54} + m_SizeDelta: {x: 54, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8536603424057203240 CanvasRenderer: @@ -902,7 +902,7 @@ RectTransform: m_GameObject: {fileID: 8536603424202476249} 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_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 8536603422629144348} m_RootOrder: 0 @@ -1063,7 +1063,7 @@ RectTransform: 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: 186, y: 98} + m_SizeDelta: {x: 186, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8536603424418812067 CanvasRenderer: @@ -1207,7 +1207,7 @@ RectTransform: m_GameObject: {fileID: 8536603424476639146} 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_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 8536603424566114135} m_RootOrder: 0 @@ -1291,7 +1291,7 @@ RectTransform: 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: 198, y: 100} + m_SizeDelta: {x: 198, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8536603424566114133 CanvasRenderer: @@ -1431,7 +1431,7 @@ RectTransform: m_GameObject: {fileID: 8536603424714656551} 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_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 8536603424418812069} m_RootOrder: 0 diff --git a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab index f6d9941b..b896653e 100644 --- a/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab +++ b/popcorn/Assets/MyGame/Scenes/shopping/Prefabs/PurchaseView.prefab @@ -641,7 +641,7 @@ RectTransform: m_GameObject: {fileID: 9133304335344414330} 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_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 9133304335268316947} m_RootOrder: 0 @@ -1880,7 +1880,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0, y: 4} - m_SizeDelta: {x: 88, y: 36} + m_SizeDelta: {x: 102, y: 42} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9133304336582582508 CanvasRenderer: @@ -1909,7 +1909,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: de598de8a3393044686c7ef88b193396, type: 3} + m_Sprite: {fileID: 21300000, guid: 99fb76b36ecee354fb95912e34437775, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1