diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/ui_CornField_corn_icon.png b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_CornField_corn_icon.png index 50242a4e..f2f44757 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/CornField/ui_CornField_corn_icon.png and b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_CornField_corn_icon.png differ diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_button_Blue.png b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_Blue.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_button_Blue.png rename to popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_Blue.png diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_button_Blue.png.meta b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_Blue.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_button_Blue.png.meta rename to popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_Blue.png.meta diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_button_Blue_Push.png b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_Blue_Push.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_button_Blue_Push.png rename to popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_Blue_Push.png diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_button_Blue_Push.png.meta b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_Blue_Push.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_button_Blue_Push.png.meta rename to popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_Blue_Push.png.meta diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_button_Blue_background.png b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_Blue_background.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_button_Blue_background.png rename to popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_Blue_background.png diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_button_Blue_background.png.meta b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_Blue_background.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_button_Blue_background.png.meta rename to popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_Blue_background.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_Blue_icon.png b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_Blue_icon.png new file mode 100644 index 00000000..87339bbc Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_Blue_icon.png differ diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_button_Blue_icon.png.meta b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_Blue_icon.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_button_Blue_icon.png.meta rename to popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_Blue_icon.png.meta diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_button_Blue_logo.png b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_Blue_logo.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_button_Blue_logo.png rename to popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_Blue_logo.png diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_button_Blue_logo.png.meta b/popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_Blue_logo.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/UI/ui_button_Blue_logo.png.meta rename to popcorn/Assets/MyGame/Resource/Material/CornField/ui_button_Blue_logo.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Main_Stove_a.png b/popcorn/Assets/MyGame/Resource/Material/Main/Main_Stove_a.png index 0a43f096..c6471da8 100644 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/Main_Stove_a.png and b/popcorn/Assets/MyGame/Resource/Material/Main/Main_Stove_a.png differ diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_CornField_corn_icon.png b/popcorn/Assets/MyGame/Resource/UI/ui_CornField_corn_icon.png new file mode 100644 index 00000000..f2f44757 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/UI/ui_CornField_corn_icon.png differ diff --git a/popcorn/Assets/MyGame/Resource/UI/ui_CornField_corn_icon.png.meta b/popcorn/Assets/MyGame/Resource/UI/ui_CornField_corn_icon.png.meta new file mode 100644 index 00000000..53bfde2f --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/UI/ui_CornField_corn_icon.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 498250e3620c29847acee6e8b0e92026 +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/Resource/UI/ui_button_Blue_icon.png b/popcorn/Assets/MyGame/Resource/UI/ui_button_Blue_icon.png deleted file mode 100644 index 307d6f96..00000000 Binary files a/popcorn/Assets/MyGame/Resource/UI/ui_button_Blue_icon.png and /dev/null differ