diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_machine_small_Body.png b/popcorn/Assets/MyGame/Resource/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_machine_small_Body.png index 2fb2c2e1..fb4974e0 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_machine_small_Body.png and b/popcorn/Assets/MyGame/Resource/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_machine_small_Body.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_machine_small_Body_behind.png b/popcorn/Assets/MyGame/Resource/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_machine_small_Body_behind.png index b114232a..f5f0f91a 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_machine_small_Body_behind.png and b/popcorn/Assets/MyGame/Resource/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_machine_small_Body_behind.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_machine_small_Body_behind_Cylinder.png b/popcorn/Assets/MyGame/Resource/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_machine_small_Body_behind_Cylinder.png new file mode 100644 index 00000000..18efdbec Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_machine_small_Body_behind_Cylinder.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_machine_small_Body_behind_Cylinder.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_machine_small_Body_behind_Cylinder.png.meta new file mode 100644 index 00000000..75fdee02 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/AutomaticCooking/ui_Main_AutomaticCooking_machine_small_Body_behind_Cylinder.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 6b1211d3f688dbf49b74e248caff867a +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 11 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: -1 + aniso: -1 + mipBias: -100 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + applyGammaDecoding: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + spritePackingTag: + pSDRemoveMatte: 0 + pSDShowRemoveMatteOption: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Scenes/Main/Main.unity b/popcorn/Assets/MyGame/Scenes/Main/Main.unity index 63ea080d..0bae77dd 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -1299,7 +1299,7 @@ Transform: - {fileID: 758194585} - {fileID: 278785269} m_Father: {fileID: 2088316431} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &418169889 SpriteRenderer: @@ -1420,7 +1420,7 @@ SpriteRenderer: m_LightmapParameters: {fileID: 0} m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: 15 + m_SortingOrder: 18 m_Sprite: {fileID: 21300000, guid: 67b3bf59939170847a4f72c90083ff17, type: 3} m_Color: {r: 1, g: 1, b: 1, a: 1} m_FlipX: 0 @@ -3114,7 +3114,7 @@ Transform: m_LocalScale: {x: 1.96, y: 2.07, z: 1} m_Children: [] m_Father: {fileID: 2088316431} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &876594164 SpriteRenderer: @@ -4189,7 +4189,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 2088316431} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &1298571078 SpriteRenderer: @@ -4822,6 +4822,87 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &1592053832 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1592053833} + - component: {fileID: 1592053834} + m_Layer: 0 + m_Name: body_behind_Cylinder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1592053833 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1592053832} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: -0.275, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 2088316431} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!212 &1592053834 +SpriteRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1592053832} + 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: 15 + m_Sprite: {fileID: 21300000, guid: 6b1211d3f688dbf49b74e248caff867a, type: 3} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_FlipX: 0 + m_FlipY: 0 + m_DrawMode: 0 + m_Size: {x: 2.5, y: 3.04} + m_AdaptiveModeThreshold: 0.5 + m_SpriteTileMode: 0 + m_WasSpriteAssigned: 1 + m_MaskInteraction: 0 + m_SpriteSortPoint: 0 --- !u!1 &1613525273 GameObject: m_ObjectHideFlags: 0 @@ -6846,6 +6927,7 @@ Transform: m_Children: - {fileID: 419397246} - {fileID: 464418385} + - {fileID: 1592053833} - {fileID: 876594163} - {fileID: 418169888} - {fileID: 1298571077}