diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_illustration_Tasting_two.png b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_illustration_Tasting_two.png new file mode 100644 index 00000000..a517eb76 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_illustration_Tasting_two.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_illustration_Tasting_two.png.meta b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_illustration_Tasting_two.png.meta new file mode 100644 index 00000000..8736a0f7 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/marketing/ProductManagement/ui_marketing_ProductManagement_illustration_Tasting_two.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: ad8dc90a2b434734d9f505455440c3ce +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab index b5a36fb0..61c74403 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/Description.prefab @@ -109,8 +109,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: 41} - m_SizeDelta: {x: 580, y: 220} + m_AnchoredPosition: {x: 0, y: 48} + m_SizeDelta: {x: 630, y: 250} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &4753495964141152955 CanvasRenderer: @@ -1147,7 +1147,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: 302} + m_AnchoredPosition: {x: 0, y: 297} m_SizeDelta: {x: 650, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3856012875447652418 @@ -1560,7 +1560,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 0.3, y: 0} - m_SizeDelta: {x: 560, y: 198} + m_SizeDelta: {x: 610, y: 210} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &3856012875694233249 CanvasRenderer: @@ -1591,7 +1591,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 28 + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 0 @@ -1601,8 +1601,8 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1.3 - m_Text: "\u30C1\u30FB\u30AD\u30FC\u30F3\u6D77\u3067\u4F5C\u3089\u308C\u305F\r\n\u7279\u7523\u306E\u5869\u3092\u3075\u3093\u3060\u3093\u306B\u4F7F\u3063\u305F\r\n\u5B9A\u756A\u306E\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3" + m_LineSpacing: 1.2 + m_Text: "\u3053\u3060\u308F\u308A\u306E\u30AB\u30AB\u30AA\u8C46\u3067\u4F5C\u3089\u308C\u305F\r\n\u677F\u72B6\u306E\u30C1\u30E7\u30B3\u30EC\u30FC\u30C8\r\n\u305D\u306E\u307E\u307E\u98DF\u3079\u3066\u3082\u7F8E\u5473\u3057\u3044\u304C\u5DE5\u592B\u6B21\u7B2C\u3067\r\n\u69D8\u3005\u306A\u5473\u308F\u3044\u3092\u5F15\u304D\u51FA\u3059\u3053\u3068\u304C\u3067\u304D\u308B" --- !u!1 &3856012875805691664 GameObject: m_ObjectHideFlags: 0 @@ -2112,7 +2112,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: 0} + m_AnchoredPosition: {x: 0, y: 15} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &3856012876438822079 diff --git a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab index 1cdc0176..02b0b134 100644 --- a/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab +++ b/popcorn/Assets/MyGame/Scenes/marketing/Prefabs/TastingWindow.prefab @@ -680,7 +680,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e9f8cd23420f7d741a5c8c9c41ad0a95, type: 3} + m_Sprite: {fileID: 21300000, guid: ad8dc90a2b434734d9f505455440c3ce, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab index d8e8ec54..c5b82243 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab @@ -27,14 +27,14 @@ RectTransform: m_GameObject: {fileID: 847466213409106283} 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: 2646634445844468798} 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: -68.500015, y: -44.700024} + m_AnchoredPosition: {x: -63.3, y: -42.1} m_SizeDelta: {x: 70, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &6556948699061727839 diff --git a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity index bf87af73..7f8f7074 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity @@ -869,7 +869,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: 600, y: 200} + m_SizeDelta: {x: 680, y: 260} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &649320304 MonoBehaviour: @@ -1454,14 +1454,14 @@ RectTransform: m_GameObject: {fileID: 878944767} 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.3, y: 1.3, z: 1.3} m_Children: [] m_Father: {fileID: 1626721124} 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: 47, y: -27.00003} + m_AnchoredPosition: {x: 56, y: -27} m_SizeDelta: {x: 70, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &878944769 @@ -1777,7 +1777,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 20, y: 50} - m_SizeDelta: {x: 960, y: 1300} + m_SizeDelta: {x: 960, y: 1350} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1037294270 GameObject: @@ -2011,7 +2011,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: 550, y: 180} + m_SizeDelta: {x: 650, y: 200} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1116792172 MonoBehaviour: @@ -2034,7 +2034,7 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 12800000, guid: b5532e9ce15694f55a0893a76a98cd78, type: 3} - m_FontSize: 27 + m_FontSize: 32 m_FontStyle: 0 m_BestFit: 0 m_MinSize: 2 @@ -2044,8 +2044,8 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1.3 - m_Text: "\u30C1\u30FB\u30AD\u30FC\u30F3\u6D77\u3067\u4F5C\u3089\u308C\u305F\u7279\u7523\u306E\u5869\r\n\u3068\u3066\u3082\u307E\u308D\u3084\u304B\u306A\u5869\u3067\r\n\u30DD\u30C3\u30D7\u30B3\u30FC\u30F3\u306B\u5408\u3046\u3053\u3068\u9593\u9055\u3044\u306A\u3057" + m_LineSpacing: 1.2 + m_Text: "\u3053\u3060\u308F\u308A\u306E\u30AB\u30AB\u30AA\u8C46\u3067\u4F5C\u3089\u308C\u305F\r\n\u677F\u72B6\u306E\u30C1\u30E7\u30B3\u30EC\u30FC\u30C8\r\n\u305D\u306E\u307E\u307E\u98DF\u3079\u3066\u3082\u7F8E\u5473\u3057\u3044\u304C\u5DE5\u592B\u6B21\u7B2C\u3067\r\n\u69D8\u3005\u306A\u5473\u308F\u3044\u3092\u5F15\u304D\u51FA\u3059\u3053\u3068\u304C\u3067\u304D\u308B" --- !u!222 &1116792173 CanvasRenderer: m_ObjectHideFlags: 0 @@ -2163,7 +2163,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: 960, y: 1300} + m_SizeDelta: {x: 960, y: 1350} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1157984680 MonoBehaviour: @@ -2450,8 +2450,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: -9, y: 163.00005} - m_SizeDelta: {x: 600, y: 200} + m_AnchoredPosition: {x: -9, y: 174} + m_SizeDelta: {x: 700, y: 260} m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &1408233925 PrefabInstance: @@ -3497,7 +3497,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: 81, y: -231} + m_AnchoredPosition: {x: 81, y: -226} m_SizeDelta: {x: 495, y: 130} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2045825934 @@ -3531,7 +3531,7 @@ MonoBehaviour: m_RichText: 1 m_HorizontalOverflow: 0 m_VerticalOverflow: 0 - m_LineSpacing: 1 + m_LineSpacing: 1.2 m_Text: "\u30B7\u30F3\u30D7\u30EB\u306A\u30D5\u30C3\u7D20\u52A0\u5DE5\u306E\u30D5\u30E9\u30A4\u30D1\u30F3\r\n\u5B89\u5B9A\u3057\u305F\u4F7F\u3044\u3084\u3059\u3055\u3067\u521D\u5FC3\u8005\u306B\u3082\u30AA\u30B9\u30B9\u30E1\r\n\u5927\u6210\u529F\u3067\u58F2\u5024\u304C5%\u30A2\u30C3\u30D7" --- !u!222 &2045825935 CanvasRenderer: @@ -3849,8 +3849,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: -7, y: -48} - m_SizeDelta: {x: 700, y: 220} + m_AnchoredPosition: {x: -7, y: -70} + m_SizeDelta: {x: 780, y: 220} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &318270869295207907 MonoBehaviour: