diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Movie.meta b/popcorn/Assets/MyGame/Resource/Material/Main/Movie.meta new file mode 100644 index 00000000..4098d30c --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/Movie.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6e8c4351310990a4e81778f2906b863e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_Main_movie_Achievement_icon_coin.png b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_Main_movie_Achievement_icon_coin.png new file mode 100644 index 00000000..73e35f17 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_Main_movie_Achievement_icon_coin.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_Main_movie_Achievement_icon_coin.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_Main_movie_Achievement_icon_coin.png.meta new file mode 100644 index 00000000..c0342e3b --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_Main_movie_Achievement_icon_coin.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: b90e3e92da889e4468c0e6a7e37d01ee +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/Material/Main/Movie/ui_Main_movie_Achievement_title_text_coin.png b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_Main_movie_Achievement_title_text_coin.png new file mode 100644 index 00000000..2fc660e8 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_Main_movie_Achievement_title_text_coin.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_Main_movie_Achievement_title_text_coin.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_Main_movie_Achievement_title_text_coin.png.meta new file mode 100644 index 00000000..fa6837d9 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_Main_movie_Achievement_title_text_coin.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: f247faa75d88e5c40a92444ba0e075c3 +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/Material/cooking/result/ui_button_green.png b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_green.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_button_green.png rename to popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_green.png diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_button_green.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_green.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_button_green.png.meta rename to popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_green.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_button_green_Big.png b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_green_Big.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_button_green_Big.png rename to popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_green_Big.png diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_button_green_Big.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_green_Big.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_button_green_Big.png.meta rename to popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_green_Big.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_button_icon_GreatSuccess_logo.png b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_GreatSuccess_logo.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_button_icon_GreatSuccess_logo.png rename to popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_GreatSuccess_logo.png diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_button_icon_GreatSuccess_logo.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_GreatSuccess_logo.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_button_icon_GreatSuccess_logo.png.meta rename to popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_GreatSuccess_logo.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_button_icon_movie.png b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_button_icon_movie.png rename to popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie.png diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_button_icon_movie.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_button_icon_movie.png.meta rename to popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie.png.meta diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_Failure.png b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_Failure.png new file mode 100644 index 00000000..55f3a9f6 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_Failure.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_Failure.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_Failure.png.meta new file mode 100644 index 00000000..f84596f1 --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_Failure.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 8db0fc1a499f1264d9c324b5a4bafcb2 +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/Material/Main/Movie/ui_button_icon_movie_coin_a.png b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_coin_a.png new file mode 100644 index 00000000..93944363 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_coin_a.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_coin_a.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_coin_a.png.meta new file mode 100644 index 00000000..3de7eb3d --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_coin_a.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 21cac875f7f6ee34589c92e4dbac10e1 +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/Material/Main/Movie/ui_button_icon_movie_coin_b.png b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_coin_b.png new file mode 100644 index 00000000..444b5fe9 Binary files /dev/null and b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_coin_b.png differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_coin_b.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_coin_b.png.meta new file mode 100644 index 00000000..016f9c6c --- /dev/null +++ b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_coin_b.png.meta @@ -0,0 +1,92 @@ +fileFormatVersion: 2 +guid: 7beefe1174195dd419bee13a94179cda +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/Material/cooking/result/ui_button_icon_movie_logo.png b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_logo.png similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_button_icon_movie_logo.png rename to popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_logo.png diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_button_icon_movie_logo.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_logo.png.meta similarity index 100% rename from popcorn/Assets/MyGame/Resource/Material/cooking/result/ui_button_icon_movie_logo.png.meta rename to popcorn/Assets/MyGame/Resource/Material/Main/Movie/ui_button_icon_movie_logo.png.meta diff --git a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity index 1a7c3f84..e3e569fa 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/ReinforcementDetail.unity @@ -136,7 +136,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!224 &225302518 RectTransform: m_ObjectHideFlags: 0 @@ -2137,7 +2137,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &1495795007 RectTransform: m_ObjectHideFlags: 0 @@ -2565,7 +2565,7 @@ PrefabInstance: - target: {fileID: 867572946509113782, guid: a03eacc36379f7a4b9c976a5aaa17ee2, type: 3} propertyPath: m_AnchoredPosition.x - value: -161.40001 + value: -156 objectReference: {fileID: 0} - target: {fileID: 867572946509113782, guid: a03eacc36379f7a4b9c976a5aaa17ee2, type: 3}