diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_a.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_a.anim index b13dd7c4..3432a181 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_a.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_a.anim @@ -151,6 +151,63 @@ AnimationClip: m_PostInfinity: 2 m_RotationOrder: 4 path: AnimationPivot_Blue + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0.03, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: AnimationPivot_Blue/Blue/mouth + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0, y: 0.4109997, z: 0} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: AnimationPivot_Blue/Blue/eye + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: {x: 0.93, y: 0.79, z: -0.1870522} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 0.96666664 + value: {x: 1.18, y: 1.03, z: -0.1870522} + inSlope: {x: 0, y: 0, z: 0} + outSlope: {x: 0, y: 0, z: 0} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + path: AnimationPivot_Blue/Blue/Effect_Sweat m_ScaleCurves: [] m_FloatCurves: - curve: @@ -237,7 +294,61 @@ AnimationClip: path: AnimationPivot_Blue/Blue/wing/right classID: 1 script: {fileID: 0} - m_PPtrCurves: [] + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + 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: AnimationPivot_Blue/Blue/Effect_Sweat + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.96666664 + value: 0.003921569 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: AnimationPivot_Blue/Blue/Effect_Sweat + classID: 212 + script: {fileID: 0} + m_PPtrCurves: + - curve: + - time: 0 + value: {fileID: 21300000, guid: b527a655d1b194d48b7105083e0bd07e, type: 3} + attribute: m_Sprite + path: AnimationPivot_Blue/Blue/body + classID: 212 + script: {fileID: 0} m_SampleRate: 60 m_WrapMode: 0 m_Bounds: @@ -252,6 +363,13 @@ AnimationClip: typeID: 4 customType: 0 isPPtrCurve: 0 + - serializedVersion: 2 + path: 1852547998 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 - serializedVersion: 2 path: 2437803436 attribute: 4 @@ -294,7 +412,43 @@ AnimationClip: typeID: 1 customType: 0 isPPtrCurve: 0 - pptrCurveMapping: [] + - serializedVersion: 2 + path: 1852547998 + attribute: 2086281974 + script: {fileID: 0} + typeID: 1 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 1852547998 + attribute: 304273561 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 36684837 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + - serializedVersion: 2 + path: 4034387391 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + - serializedVersion: 2 + path: 602786904 + attribute: 1 + script: {fileID: 0} + typeID: 4 + customType: 0 + isPPtrCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: b527a655d1b194d48b7105083e0bd07e, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} @@ -826,6 +980,251 @@ AnimationClip: path: AnimationPivot_Blue/Blue/wing/armPivot/left_mat_p/left_c_p classID: 4 script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: AnimationPivot_Blue/Blue/mouth + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.03 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: AnimationPivot_Blue/Blue/mouth + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: AnimationPivot_Blue/Blue/mouth + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: AnimationPivot_Blue/Blue/eye + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.4109997 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: AnimationPivot_Blue/Blue/eye + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: AnimationPivot_Blue/Blue/eye + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + 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: AnimationPivot_Blue/Blue/Effect_Sweat + classID: 1 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.93 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.96666664 + value: 1.18 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.x + path: AnimationPivot_Blue/Blue/Effect_Sweat + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0.79 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.96666664 + value: 1.03 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.y + path: AnimationPivot_Blue/Blue/Effect_Sweat + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: -0.1870522 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.96666664 + value: -0.1870522 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_LocalPosition.z + path: AnimationPivot_Blue/Blue/Effect_Sweat + classID: 4 + script: {fileID: 0} + - curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.96666664 + value: 0.003921569 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_Color.a + path: AnimationPivot_Blue/Blue/Effect_Sweat + classID: 212 + script: {fileID: 0} m_EulerEditorCurves: - curve: serializedVersion: 2 diff --git a/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_b.anim b/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_b.anim index 63601cd2..1781d394 100644 --- a/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_b.anim +++ b/popcorn/Assets/MyGame/Resource/Animation/Brother_blue_cleaning_b.anim @@ -445,7 +445,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.0166667 + time: 2 value: 1 inSlope: Infinity outSlope: Infinity @@ -1761,7 +1761,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 1.0166667 + time: 2 value: 1 inSlope: Infinity outSlope: Infinity diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_button_Stand.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_button_Stand.png index 98533e8e..e3015f40 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_button_Stand.png and b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_button_Stand.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_MediumFrame.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_MediumFrame.png index 6a4f5410..d985d607 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_MediumFrame.png and b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_MediumFrame.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_Dither.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_Dither.png index 2d388801..1ca48f16 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_a.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_a.png deleted file mode 100644 index d011b567..00000000 Binary files a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_a.png and /dev/null differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_a_Dither.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_a_Dither.png new file mode 100644 index 00000000..0243eddd Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_a_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_a.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_a_Dither.png.meta similarity index 97% rename from popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_a.png.meta rename to popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_a_Dither.png.meta index 020dd6e9..ea7f07e1 100644 --- a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_a.png.meta +++ b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_a_Dither.png.meta @@ -46,7 +46,7 @@ TextureImporter: alignment: 0 spritePivot: {x: 0.5, y: 0.5} spritePixelsToUnits: 100 - spriteBorder: {x: 80, y: 80, z: 80, w: 80} + spriteBorder: {x: 0, y: 0, z: 0, w: 0} spriteGenerateFallbackPhysicsShape: 1 alphaUsage: 1 alphaIsTransparency: 1 diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_b.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_b.png deleted file mode 100644 index e5c049bd..00000000 Binary files a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_b.png and /dev/null differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_b_Dither.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_b_Dither.png new file mode 100644 index 00000000..bcf1ed95 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_b_Dither.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_b.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_b_Dither.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_b.png.meta rename to popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_b_Dither.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_c.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_c.png index bd8198c6..0898146d 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_c.png and b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_c.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_d.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_d.png new file mode 100644 index 00000000..d0a88c98 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_d.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_d.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_d.png.meta new file mode 100644 index 00000000..a0cd9c47 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_background_d.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: b61efbed52c427048b4350cdc0a54b12 +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: 16, y: 16, z: 16, w: 16} + 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/marketing/ProductManagement/ui_marketing_ProductManagement_detail_MediumFrame_Choice.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_detail_MediumFrame_Choice.png index 3273a61a..1debbae8 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_detail_MediumFrame_Choice.png and b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_detail_MediumFrame_Choice.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_detail_MediumFrame_addition.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_detail_MediumFrame_addition.png index 419f540c..6f178446 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_detail_MediumFrame_addition.png and b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_detail_MediumFrame_addition.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_detail_MediumFrame_stock.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_detail_MediumFrame_stock.png index 83cee08d..cbc51b08 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_detail_MediumFrame_stock.png and b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_detail_MediumFrame_stock.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_a.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_a.png index 7b57cb1c..590dd004 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_a.png and b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_a.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_b.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_b.png index 7d100a65..0692fd18 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_b.png and b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_explanation_text_b.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_OuterFrame_Dither.png b/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_OuterFrame_Dither.png index 380f482e..06ada003 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_OuterFrame_Dither.png and b/popcorn/Assets/MyGame/Resource/Material/shopping/ui_shopping_detail_OuterFrame_Dither.png differ diff --git a/popcorn/Assets/MyGame/Scenes/Title/Title.unity b/popcorn/Assets/MyGame/Scenes/Title/Title.unity index 217426a1..f36651ec 100644 --- a/popcorn/Assets/MyGame/Scenes/Title/Title.unity +++ b/popcorn/Assets/MyGame/Scenes/Title/Title.unity @@ -504,87 +504,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &73420102 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 73420103} - - component: {fileID: 73420104} - m_Layer: 0 - m_Name: ClockNeedle_long - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &73420103 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 73420102} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.009999897, y: -0.0050001685, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1829077856} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &73420104 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 73420102} - 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: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 2375edd2822fc4cf499818d4f36fb501, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.1, y: 0.37} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &113260712 GameObject: m_ObjectHideFlags: 0 @@ -1084,6 +1003,87 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &262356685 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 262356686} + - component: {fileID: 262356687} + m_Layer: 0 + m_Name: ClockNeedle_long + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &262356686 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 262356685} + m_LocalRotation: {x: 0, y: 0, z: -0.6691306, w: 0.7431448} + m_LocalPosition: {x: 0.009999897, y: -0.0050001685, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1759659942} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &262356687 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 262356685} + 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: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 2375edd2822fc4cf499818d4f36fb501, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.1, y: 0.37} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1001 &294638332 PrefabInstance: m_ObjectHideFlags: 0 @@ -2494,7 +2494,7 @@ Transform: m_LocalPosition: {x: 0, y: 5.24, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - - {fileID: 1685655678} + - {fileID: 990585524} m_Father: {fileID: 1361506310} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3257,6 +3257,65 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &990585523 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 990585524} + - component: {fileID: 990585526} + - component: {fileID: 990585525} + m_Layer: 0 + m_Name: Clock (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &990585524 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 990585523} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.97, y: 1.656, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1759659942} + m_Father: {fileID: 829254542} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &990585525 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 990585523} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cb219b23cdf4b314f94a27bca3cc8012, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &990585526 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 990585523} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6686769e44a54cccba71011ca528e233, type: 3} + m_Name: + m_EditorClassIdentifier: + shortNeedle: {fileID: 1309905085} + longNeedle: {fileID: 262356686} --- !u!1 &992145460 GameObject: m_ObjectHideFlags: 0 @@ -3581,87 +3640,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &1101161683 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1101161684} - - component: {fileID: 1101161685} - m_Layer: 0 - m_Name: ClockNeedle_short - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1101161684 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1101161683} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0.008000042, y: 0.0040006097, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 1829077856} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1101161685 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1101161683} - 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: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 5 - m_Sprite: {fileID: 21300000, guid: 97c0e2b86b1f24e2e985f652c93eb18f, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.08, y: 0.29} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1 &1104317405 GameObject: m_ObjectHideFlags: 0 @@ -4274,6 +4252,87 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1309905084 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1309905085} + - component: {fileID: 1309905086} + m_Layer: 0 + m_Name: ClockNeedle_short + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1309905085 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1309905084} + m_LocalRotation: {x: 0, y: 0, z: 0.9659259, w: -0.25881898} + m_LocalPosition: {x: 0.008000042, y: 0.0040006097, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 1759659942} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1309905086 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1309905084} + 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: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 5 + m_Sprite: {fileID: 21300000, guid: 97c0e2b86b1f24e2e985f652c93eb18f, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.08, y: 0.29} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1325069776 GameObject: m_ObjectHideFlags: 0 @@ -14736,37 +14795,6 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 ---- !u!1 &1685655677 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1685655678} - m_Layer: 0 - m_Name: Clock - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1685655678 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1685655677} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 3.967, y: 1.675, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1829077856} - m_Father: {fileID: 829254542} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1687836774 GameObject: m_ObjectHideFlags: 0 @@ -15395,6 +15423,89 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1748255714} m_PrefabAsset: {fileID: 0} +--- !u!1 &1759659941 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1759659942} + - component: {fileID: 1759659943} + m_Layer: 0 + m_Name: ClockPivot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1759659942 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1759659941} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -0.002, y: -0.019, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1309905085} + - {fileID: 262356686} + m_Father: {fileID: 990585524} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1759659943 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1759659941} + 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: 10754, guid: 0000000000000000f000000000000000, type: 0} + 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: 11 + m_Sprite: {fileID: 21300000, guid: f9789bd3761d84617be4043b1dc625e0, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 0.14, y: 0.14} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1769147130 GameObject: m_ObjectHideFlags: 0 @@ -15600,89 +15711,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 1 m_SpriteSortPoint: 0 ---- !u!1 &1829077855 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1829077856} - - component: {fileID: 1829077857} - m_Layer: 0 - m_Name: ClockPivot - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1829077856 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1829077855} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.002, y: -0.019, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1101161684} - - {fileID: 73420103} - m_Father: {fileID: 1685655678} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!212 &1829077857 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1829077855} - 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: 10754, guid: 0000000000000000f000000000000000, type: 0} - 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: 11 - m_Sprite: {fileID: 21300000, guid: f9789bd3761d84617be4043b1dc625e0, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 0.14, y: 0.14} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 --- !u!1001 &1834411656 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab index 271cc6d2..d6fe8506 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/MainCanvas.prefab @@ -109,7 +109,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: -98, y: 100.99997} + m_AnchoredPosition: {x: -98, y: 93.99998} m_SizeDelta: {x: 650, y: 150} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7183459702793061870 @@ -336,9 +336,83 @@ 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: 340, y: -27} + m_AnchoredPosition: {x: 340, y: -34} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1169544503297837550 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3204050909556269808} + - component: {fileID: 6510244675010310358} + - component: {fileID: 1308109691532869507} + m_Layer: 5 + m_Name: wood_a + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3204050909556269808 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1169544503297837550} + 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: 2205221117190923421} + m_RootOrder: 4 + 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: -700} + m_SizeDelta: {x: 1766, y: 58} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6510244675010310358 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1169544503297837550} + m_CullTransparentMesh: 0 +--- !u!114 &1308109691532869507 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1169544503297837550} + 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: b61efbed52c427048b4350cdc0a54b12, 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!1 &1604830801856392308 GameObject: m_ObjectHideFlags: 0 @@ -521,8 +595,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: 0, y: 92} - m_SizeDelta: {x: 784, y: 50} + m_AnchoredPosition: {x: 0, y: 89} + m_SizeDelta: {x: 850, y: 54} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4788906835824280238 CanvasRenderer: @@ -588,14 +662,14 @@ RectTransform: m_GameObject: {fileID: 4660380742922617424} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} + m_LocalScale: {x: 0.7, y: 0.7, z: 0.7} m_Children: [] m_Father: {fileID: 7482805389168622905} m_RootOrder: 2 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: -441, y: -27} + m_AnchoredPosition: {x: -428, y: -41.999992} m_SizeDelta: {x: 186, y: 196} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &9072260743210799930 @@ -660,16 +734,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4870597941042567310} - m_LocalRotation: {x: -0, y: -0, z: -0.15031789, w: 0.98863775} + m_LocalRotation: {x: -0, y: -0, z: -0.25248042, w: 0.967602} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.9, y: 0.9, z: 0.9} m_Children: [] m_Father: {fileID: 7482805389168622905} m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -17.291} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -29.249} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 462, y: 38} + m_AnchoredPosition: {x: 462, y: 27} m_SizeDelta: {x: 200, y: 178} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &615584548489827413 @@ -748,7 +822,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -697} + m_AnchoredPosition: {x: 0, y: -704} m_SizeDelta: {x: 1766, y: 260} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &5802749112650197351 @@ -821,7 +895,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -38, y: -87} + m_AnchoredPosition: {x: -38, y: -93.99999} m_SizeDelta: {x: 700, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5879044823776041846 @@ -930,6 +1004,7 @@ RectTransform: - {fileID: 3614969982694527390} - {fileID: 5505851828519651022} - {fileID: 8157765726200260526} + - {fileID: 3204050909556269808} m_Father: {fileID: 334844612484922270} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1107,7 +1182,7 @@ GameObject: - component: {fileID: 3561376018369912609} - component: {fileID: 7480591200006294457} m_Layer: 5 - m_Name: roof + m_Name: wood m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1127,10 +1202,10 @@ RectTransform: m_Father: {fileID: 2205221117190923421} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -268} - m_SizeDelta: {x: 1344, y: 192} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 380} + m_SizeDelta: {x: 1766, y: 762} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3561376018369912609 CanvasRenderer: @@ -1203,8 +1278,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -104} - m_SizeDelta: {x: 1766, y: 218} + m_AnchoredPosition: {x: 0, y: -189} + m_SizeDelta: {x: 1766, y: 382} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6630709293719035679 CanvasRenderer: @@ -1234,7 +1309,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] m_Sprite: {fileID: 21300000, guid: 46c1d436fb8e9c940a30c24d2f65dd01, type: 3} - m_Type: 1 + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -1277,7 +1352,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -264.00012} + m_AnchoredPosition: {x: 0, y: -305} m_SizeDelta: {x: 358, y: 104} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5161980301888140780 @@ -1352,7 +1427,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: 1766, y: 260} + m_SizeDelta: {x: 1000, y: 300} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &5181049679574446363 CanvasRenderer: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab index 5e2e3ce1..cb0a00d5 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TankList.prefab @@ -1,5 +1,79 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &971078956624200669 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 331299410525890612} + - component: {fileID: 4337899306784949151} + - component: {fileID: 8654061855605395671} + m_Layer: 5 + m_Name: lTitleFrame (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &331299410525890612 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 971078956624200669} + 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: 6124127957792349541} + m_RootOrder: 2 + 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: 398} + m_SizeDelta: {x: 900, y: 6} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4337899306784949151 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 971078956624200669} + m_CullTransparentMesh: 0 +--- !u!114 &8654061855605395671 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 971078956624200669} + 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: ff4296f46be2e7a4583db68be1c12d4c, type: 3} + m_Type: 2 + 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 &6124127956927218627 GameObject: m_ObjectHideFlags: 0 @@ -34,7 +108,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: -327} + m_AnchoredPosition: {x: 0, y: -316} m_SizeDelta: {x: 900, y: 6} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6124127956927218630 @@ -111,11 +185,11 @@ RectTransform: - {fileID: 2705466138803716959} - {fileID: 2705466136803566539} m_Father: {fileID: 6124127957792349541} - m_RootOrder: 2 + m_RootOrder: 3 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: -410, y: 248} + m_AnchoredPosition: {x: -410, y: 256} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &6124127957040273547 @@ -338,7 +412,7 @@ RectTransform: - {fileID: 6124127958085519822} - {fileID: 6124127957076174823} m_Father: {fileID: 6124127957792349541} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -375,6 +449,7 @@ RectTransform: m_Children: - {fileID: 6124127958216406382} - {fileID: 6124127956927218628} + - {fileID: 331299410525890612} - {fileID: 6124127957040273545} - {fileID: 6124127957932188863} - {fileID: 6124127957362852678} @@ -589,11 +664,11 @@ RectTransform: m_LocalScale: {x: 1.1, y: 1.1, z: 1.1} m_Children: [] m_Father: {fileID: 6124127957792349541} - m_RootOrder: 3 + m_RootOrder: 4 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: 423} + m_AnchoredPosition: {x: 0, y: 440} m_SizeDelta: {x: 600, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6124127957932188849 @@ -1755,12 +1830,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61beefd3a05503e419363598678ad43a, type: 3} ---- !u!224 &6124127957488033513 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8175998082654142962, guid: 61beefd3a05503e419363598678ad43a, - type: 3} - m_PrefabInstance: {fileID: 2705466137574694683} - m_PrefabAsset: {fileID: 0} --- !u!114 &1703305198614521804 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3614389473544141015, guid: 61beefd3a05503e419363598678ad43a, @@ -1773,6 +1842,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cb86ab823f03425b97e7c977c5e65267, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!224 &6124127957488033513 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8175998082654142962, guid: 61beefd3a05503e419363598678ad43a, + type: 3} + m_PrefabInstance: {fileID: 2705466137574694683} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6124127957283136057 PrefabInstance: m_ObjectHideFlags: 0 @@ -2758,6 +2833,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 61beefd3a05503e419363598678ad43a, type: 3} +--- !u!224 &2705466137867714208 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 8175998082654142962, guid: 61beefd3a05503e419363598678ad43a, + type: 3} + m_PrefabInstance: {fileID: 6124127958334701394} + m_PrefabAsset: {fileID: 0} --- !u!114 &7410006873414403973 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 3614389473544141015, guid: 61beefd3a05503e419363598678ad43a, @@ -2770,12 +2851,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: cb86ab823f03425b97e7c977c5e65267, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &2705466137867714208 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8175998082654142962, guid: 61beefd3a05503e419363598678ad43a, - type: 3} - m_PrefabInstance: {fileID: 6124127958334701394} - m_PrefabAsset: {fileID: 0} --- !u!1001 &6124127958473786029 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab index e9bc9549..5cad17fe 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/detail.prefab @@ -1181,7 +1181,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -31.8} + m_AnchoredPosition: {x: 0, y: -41.800003} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8175998082262830090 @@ -1205,7 +1205,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 0.9372549, a: 1} + m_Color: {r: 0.43137258, g: 0.29803923, b: 0.19215688, a: 1} m_RaycastTarget: 0 m_Maskable: 1 m_OnCullStateChanged: @@ -1214,7 +1214,7 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 45 - m_FontStyle: 0 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 45 @@ -1475,7 +1475,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: 224, y: 328} + m_SizeDelta: {x: 240, y: 344} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8175998082772346532 CanvasRenderer: @@ -1773,7 +1773,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 80, y: 91} + m_AnchoredPosition: {x: 81.7, y: 91.8} m_SizeDelta: {x: 54, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8175998082998279045 @@ -1983,7 +1983,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 2, y: -119.2} + m_AnchoredPosition: {x: 2, y: -120.9} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &8175998083386752684 @@ -2020,7 +2020,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -31.800016} + m_AnchoredPosition: {x: 0, y: -41.8} m_SizeDelta: {x: 50, y: 50} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8175998083386752689 @@ -2044,7 +2044,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 0.9372549, a: 1} + m_Color: {r: 0.43137258, g: 0.29803923, b: 0.19215688, a: 1} m_RaycastTarget: 0 m_Maskable: 1 m_OnCullStateChanged: @@ -2053,7 +2053,7 @@ MonoBehaviour: m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} m_FontSize: 45 - m_FontStyle: 0 + m_FontStyle: 1 m_BestFit: 0 m_MinSize: 3 m_MaxSize: 45 @@ -2098,7 +2098,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 40.9} + m_AnchoredPosition: {x: 0, y: 46.699997} m_SizeDelta: {x: 200, y: 60} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8175998083605669214 @@ -2179,7 +2179,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 2.4} + m_AnchoredPosition: {x: 0, y: 9.9} m_SizeDelta: {x: 90, y: 96} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8175998083657673472 @@ -2390,7 +2390,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: 224, y: 328} + m_SizeDelta: {x: 240, y: 344} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8175998084184389998 CanvasRenderer: @@ -2469,7 +2469,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: 224, y: 328} + m_SizeDelta: {x: 240, y: 344} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8175998084231429041 CanvasRenderer: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity index 90da316b..3510a9da 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/ProductManagement.unity @@ -213,7 +213,7 @@ PrefabInstance: - target: {fileID: 315354246554936540, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 8 + value: 12 objectReference: {fileID: 0} - target: {fileID: 566248750470715636, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -323,7 +323,7 @@ PrefabInstance: - target: {fileID: 1913713732571476837, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 9 + value: 13 objectReference: {fileID: 0} - target: {fileID: 2835369144934501534, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -543,12 +543,12 @@ PrefabInstance: - target: {fileID: 3906989310087811327, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 10 + value: 11 objectReference: {fileID: 0} - target: {fileID: 4037191023444158820, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 11 + value: 14 objectReference: {fileID: 0} - target: {fileID: 4348639590627783772, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -558,7 +558,7 @@ PrefabInstance: - target: {fileID: 5047569869407099398, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 14 + value: 10 objectReference: {fileID: 0} - target: {fileID: 6396292362141172708, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -578,7 +578,7 @@ PrefabInstance: - target: {fileID: 7715340749758393301, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 12 + value: 9 objectReference: {fileID: 0} - target: {fileID: 7758062554450272377, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -603,7 +603,7 @@ PrefabInstance: - target: {fileID: 8875044595818467139, guid: caaa748dbeed576499e8cae74d33f689, type: 3} propertyPath: m_RootOrder - value: 13 + value: 8 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: caaa748dbeed576499e8cae74d33f689, type: 3} @@ -1564,11 +1564,6 @@ PrefabInstance: propertyPath: m_AnchorMax.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 334844612484922271, guid: 0b1e1a744f3d5447d88970ba4f22d761, - type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - target: {fileID: 334844613153412688, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} propertyPath: m_SizeDelta.x @@ -1819,21 +1814,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3614969982694527390, guid: 0b1e1a744f3d5447d88970ba4f22d761, - type: 3} - propertyPath: m_SizeDelta.y - value: 300 - objectReference: {fileID: 0} - - target: {fileID: 3614969982694527390, guid: 0b1e1a744f3d5447d88970ba4f22d761, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -20 - objectReference: {fileID: 0} - - target: {fileID: 5505851828519651022, guid: 0b1e1a744f3d5447d88970ba4f22d761, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -233 - objectReference: {fileID: 0} - target: {fileID: 5939429326738238117, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} propertyPath: m_AnchorMax.y @@ -2014,11 +1994,6 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8157765726200260526, guid: 0b1e1a744f3d5447d88970ba4f22d761, - type: 3} - propertyPath: m_AnchoredPosition.y - value: -229.00006 - objectReference: {fileID: 0} - target: {fileID: 8908151885642361585, guid: 0b1e1a744f3d5447d88970ba4f22d761, type: 3} propertyPath: m_SizeDelta.x diff --git a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity index acf7677e..f8fbd3b2 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity +++ b/popcorn/Assets/MyGame/Scenes/marketing/marketing.unity @@ -308,7 +308,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 40039601} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.5960488, y: -3.9466197, z: -0.18144062} + m_LocalPosition: {x: -2.5960488, y: -3.63, z: -0.18144062} m_LocalScale: {x: 0.97, y: 0.97, z: 0.97} m_Children: [] m_Father: {fileID: 2085962459} @@ -1941,7 +1941,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 443832893} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -2.65, y: -4, z: 0} + m_LocalPosition: {x: -2.65, y: -3.68338, z: 0} m_LocalScale: {x: 1.05, y: 1.05, z: 1.05} m_Children: - {fileID: 224068397} @@ -1965,7 +1965,7 @@ SortingGroup: m_Enabled: 1 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 10 + m_SortingOrder: 23 --- !u!1 &447080622 GameObject: m_ObjectHideFlags: 0 @@ -14231,13 +14231,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1866866950} - m_LocalRotation: {x: -0, y: -0, z: 0.122499555, w: 0.99246854} - m_LocalPosition: {x: 0.96, y: 2.92, z: -0.17762177} + m_LocalRotation: {x: -0, y: -0, z: 0.1947258, w: 0.98085773} + m_LocalPosition: {x: 0.66, y: 3.05, z: -0.17762177} m_LocalScale: {x: 1.1998432, y: 1.1699773, z: 1.1869801} m_Children: [] m_Father: {fileID: 443832894} m_RootOrder: 7 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 14.073001} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 22.457} --- !u!199 &1866866952 ParticleSystemRenderer: serializedVersion: 6 @@ -14278,7 +14278,7 @@ ParticleSystemRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 10 + m_SortingOrder: 114 m_RenderMode: 0 m_SortMode: 0 m_MinParticleSize: 0 @@ -14375,7 +14375,7 @@ ParticleSystem: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 - moveWithTransform: 0 + moveWithTransform: 1 moveWithCustomTransform: {fileID: 0} scalingMode: 1 randomSeed: 0