diff --git a/popcorn/Assets/MyGame/Resources/Stove.meta b/popcorn/Assets/MyGame/Resources/Stove.meta new file mode 100644 index 00000000..6189ed19 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Stove.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 9900c69059968bc4fb6bd7d446c307d3 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Stove/Stove_usually.png b/popcorn/Assets/MyGame/Resources/Stove/Stove_usually.png new file mode 100644 index 00000000..03e7302f Binary files /dev/null and b/popcorn/Assets/MyGame/Resources/Stove/Stove_usually.png differ diff --git a/popcorn/Assets/MyGame/Resources/Stove/Stove_usually.png.meta b/popcorn/Assets/MyGame/Resources/Stove/Stove_usually.png.meta new file mode 100644 index 00000000..e214b398 --- /dev/null +++ b/popcorn/Assets/MyGame/Resources/Stove/Stove_usually.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: f9cd635480d222f42a428758b5be7ede +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 eb943657..9af2f46f 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/Main.unity +++ b/popcorn/Assets/MyGame/Scenes/Main/Main.unity @@ -1123,7 +1123,7 @@ Camera: m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 1 - m_BackGroundColor: {r: 1, g: 0.9292453, b: 0.9737217, a: 0} + m_BackGroundColor: {r: 0.9882353, g: 0.8627451, b: 0.5254902, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 m_FOVAxisMode: 0 diff --git a/popcorn/Assets/MyGame/Scenes/Main/corn.physicsMaterial2D b/popcorn/Assets/MyGame/Scenes/Main/corn.physicsMaterial2D index f36e72de..bdc866f9 100644 --- a/popcorn/Assets/MyGame/Scenes/Main/corn.physicsMaterial2D +++ b/popcorn/Assets/MyGame/Scenes/Main/corn.physicsMaterial2D @@ -6,6 +6,6 @@ PhysicsMaterial2D: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Corn + m_Name: corn friction: 0.5 bounciness: 0.4