diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail_Quantity.png b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail_Quantity.png new file mode 100644 index 00000000..b8c7699f Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail_Quantity.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail_Quantity.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail_Quantity.png.meta new file mode 100644 index 00000000..b091b395 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/recipe/ui_Main_recipe_pop_detail_Quantity.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 2eaba2e34ca3604469112c489f758042 +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/recipe/Prefabs/Frame.prefab b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab index f8f37e2c..bd26c457 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab +++ b/popcorn/Assets/MyGame/Scenes/recipe/Prefabs/Frame.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &829885949630159631 +--- !u!1 &847466213409106283 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,50 +8,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 6626877353507539474} - - component: {fileID: 616496518107127084} - - component: {fileID: 9201798278428605049} + - component: {fileID: 6600406719070841345} + - component: {fileID: 6556948699061727839} + - component: {fileID: 1393624615969654781} m_Layer: 0 - m_Name: text_Quantity + m_Name: TextQuantity m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &6626877353507539474 +--- !u!224 &6600406719070841345 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 829885949630159631} + 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_Children: [] - m_Father: {fileID: 2929932626910560293} + 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: 65.5, y: -10.3} - m_SizeDelta: {x: 26, y: 28} + m_AnchoredPosition: {x: -95.8, y: -22.3} + m_SizeDelta: {x: 70, y: 30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &616496518107127084 +--- !u!222 &6556948699061727839 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 829885949630159631} + m_GameObject: {fileID: 847466213409106283} m_CullTransparentMesh: 0 ---- !u!114 &9201798278428605049 +--- !u!114 &1393624615969654781 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 829885949630159631} + m_GameObject: {fileID: 847466213409106283} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -64,7 +64,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 086caf604a7f77e4395bff51404dbb22, type: 3} + m_Sprite: {fileID: 21300000, guid: 2eaba2e34ca3604469112c489f758042, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -106,6 +106,7 @@ RectTransform: m_Children: - {fileID: 8815894619366199284} - {fileID: 2929932626576346080} + - {fileID: 6600406719070841345} - {fileID: 3275864313872047402} - {fileID: 2929932626752093612} m_Father: {fileID: 2929932627350163026} @@ -223,7 +224,7 @@ RectTransform: m_GameObject: {fileID: 2929932626248606813} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_LocalScale: {x: 0.33, y: 0.33, z: 0.33} m_Children: [] m_Father: {fileID: 2929932626910560293} m_RootOrder: 0 @@ -295,16 +296,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2929932626576346081} - m_LocalRotation: {x: -0, y: -0, z: -0.06725802, w: 0.9977356} + m_LocalRotation: {x: 0, y: 0, z: -0.067144625, w: 0.9977433} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.90000015, y: 0.90000015, z: 0.9} + m_LocalScale: {x: 0.8, y: 0.8, z: 0.8} m_Children: [] m_Father: {fileID: 2646634445844468798} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: -7.7130003} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -7.7} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -135.2, y: 11.5} + m_AnchoredPosition: {x: -135.2, y: 20.8} m_SizeDelta: {x: 92, y: 136} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &2929932626576346094 @@ -373,7 +374,7 @@ RectTransform: m_Children: - {fileID: 2929932626910560293} m_Father: {fileID: 2646634445844468798} - 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} @@ -410,7 +411,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2646634445844468798} - 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} @@ -489,7 +490,6 @@ RectTransform: m_Children: - {fileID: 2929932626248606812} - {fileID: 2929932627123125674} - - {fileID: 6626877353507539474} m_Father: {fileID: 3275864313872047402} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity index 5e71a70d..f4ec3782 100644 --- a/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity +++ b/popcorn/Assets/MyGame/Scenes/recipe/RecipeChoice.unity @@ -152,7 +152,6 @@ RectTransform: m_Children: - {fileID: 930273407} - {fileID: 498799266} - - {fileID: 359736401} m_Father: {fileID: 1626721124} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -387,80 +386,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 326258101} m_CullTransparentMesh: 0 ---- !u!1 &359736400 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 359736401} - - component: {fileID: 359736403} - - component: {fileID: 359736402} - m_Layer: 0 - m_Name: text_Quantity - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &359736401 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 359736400} - 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: 138926718} - 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: 78.1, y: -10.8} - m_SizeDelta: {x: 26, y: 28} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &359736402 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 359736400} - 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: 086caf604a7f77e4395bff51404dbb22, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &359736403 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 359736400} - m_CullTransparentMesh: 0 --- !u!1 &374985848 GameObject: m_ObjectHideFlags: 0 @@ -1491,6 +1416,80 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!1 &878944767 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 878944768} + - component: {fileID: 878944770} + - component: {fileID: 878944769} + m_Layer: 0 + m_Name: TextQuantity + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &878944768 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + 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_Children: [] + m_Father: {fileID: 1626721124} + 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: 47, y: -32} + m_SizeDelta: {x: 70, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &878944769 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 878944767} + 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: 2eaba2e34ca3604469112c489f758042, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &878944770 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 878944767} + m_CullTransparentMesh: 0 --- !u!1 &930273406 GameObject: m_ObjectHideFlags: 0 @@ -1518,14 +1517,14 @@ RectTransform: m_GameObject: {fileID: 930273406} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.3, y: 0.3, z: 0.3} + m_LocalScale: {x: 0.33, y: 0.33, z: 0.33} m_Children: [] m_Father: {fileID: 138926718} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 22.6, y: -24.5} + m_AnchoredPosition: {x: 25, y: -24.5} m_SizeDelta: {x: 86, y: 92} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &930273408 @@ -2665,7 +2664,7 @@ RectTransform: m_Children: - {fileID: 1497671329} m_Father: {fileID: 1626721124} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -2739,6 +2738,7 @@ RectTransform: - {fileID: 2124266407} - {fileID: 1826815494} - {fileID: 138926718} + - {fileID: 878944768} - {fileID: 1517415305} - {fileID: 1811755283} m_Father: {fileID: 1001521034} @@ -2889,7 +2889,7 @@ RectTransform: - {fileID: 546807794} - {fileID: 1109202678} m_Father: {fileID: 1626721124} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}