diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/material/material_Apple.png b/popcorn/Assets/MyGame/Resource/Material/Main/material/material_Apple.png deleted file mode 100644 index b516afbb..00000000 Binary files a/popcorn/Assets/MyGame/Resource/Material/Main/material/material_Apple.png and /dev/null differ diff --git a/popcorn/Assets/MyGame/Resource/Material/Main/material/material_Apple.png.meta b/popcorn/Assets/MyGame/Resource/Material/Main/material/material_Apple.png.meta deleted file mode 100644 index b8fd2e94..00000000 --- a/popcorn/Assets/MyGame/Resource/Material/Main/material/material_Apple.png.meta +++ /dev/null @@ -1,98 +0,0 @@ -fileFormatVersion: 2 -guid: cbadd850aec184a1c8ac39250ecb48d9 -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 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - 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 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 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: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_f_Apple.png b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_f_Apple.png deleted file mode 100644 index 2bdcf27a..00000000 Binary files a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_f_Apple.png and /dev/null differ diff --git a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_f_Apple.png.meta b/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_f_Apple.png.meta deleted file mode 100644 index 35368acb..00000000 --- a/popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_f_Apple.png.meta +++ /dev/null @@ -1,98 +0,0 @@ -fileFormatVersion: 2 -guid: dd73e59c297244b1fb121585efa7760c -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 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - 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 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 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: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_f_Apple.png b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_f_Apple.png deleted file mode 100644 index 7864a6c5..00000000 Binary files a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_f_Apple.png and /dev/null differ diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_f_Apple.png.meta b/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_f_Apple.png.meta deleted file mode 100644 index 86bad7ca..00000000 --- a/popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_f_Apple.png.meta +++ /dev/null @@ -1,98 +0,0 @@ -fileFormatVersion: 2 -guid: b0a937d312ed045ec815fe7c8abfdd7d -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 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - 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 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 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: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/popcorn_corn_usually_f_Apple.png b/popcorn/Assets/MyGame/Resource/Material/popcorn/popcorn_corn_usually_f_Apple.png deleted file mode 100644 index ef3279ba..00000000 Binary files a/popcorn/Assets/MyGame/Resource/Material/popcorn/popcorn_corn_usually_f_Apple.png and /dev/null differ diff --git a/popcorn/Assets/MyGame/Resource/Material/popcorn/popcorn_corn_usually_f_Apple.png.meta b/popcorn/Assets/MyGame/Resource/Material/popcorn/popcorn_corn_usually_f_Apple.png.meta deleted file mode 100644 index fd7cf5f0..00000000 --- a/popcorn/Assets/MyGame/Resource/Material/popcorn/popcorn_corn_usually_f_Apple.png.meta +++ /dev/null @@ -1,98 +0,0 @@ -fileFormatVersion: 2 -guid: 8e9878be823e441a2a0498556548e733 -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 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - 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 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 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: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resource/Material/shopping/icon/ui_shopping_icon_material_Apple.png b/popcorn/Assets/MyGame/Resource/Material/shopping/icon/ui_shopping_icon_material_Apple.png deleted file mode 100644 index 6d2b5892..00000000 Binary files a/popcorn/Assets/MyGame/Resource/Material/shopping/icon/ui_shopping_icon_material_Apple.png and /dev/null differ diff --git a/popcorn/Assets/MyGame/Resource/Material/shopping/icon/ui_shopping_icon_material_Apple.png.meta b/popcorn/Assets/MyGame/Resource/Material/shopping/icon/ui_shopping_icon_material_Apple.png.meta deleted file mode 100644 index 7441aff3..00000000 --- a/popcorn/Assets/MyGame/Resource/Material/shopping/icon/ui_shopping_icon_material_Apple.png.meta +++ /dev/null @@ -1,98 +0,0 @@ -fileFormatVersion: 2 -guid: 7b7d875a8637a40498028ca225e3c51b -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 - vTOnly: 0 - ignoreMasterTextureLimit: 0 - grayScaleToAlpha: 0 - generateCubemap: 6 - cubemapConvolution: 0 - seamlessCubemap: 0 - textureFormat: 1 - maxTextureSize: 2048 - textureSettings: - serializedVersion: 2 - filterMode: 1 - aniso: 1 - mipBias: 0 - 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 - flipbookRows: 1 - flipbookColumns: 1 - maxTextureSizeSet: 0 - compressionQualitySet: 0 - textureFormatSet: 0 - ignorePngGamma: 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: [] - nameFileIdTable: {} - spritePackingTag: - pSDRemoveMatte: 0 - pSDShowRemoveMatteOption: 0 - userData: - assetBundleName: - assetBundleVariant: diff --git a/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt b/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt index 395e7832..1049d800 100644 --- a/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt +++ b/popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt @@ -1 +1 @@ -fadS92OZIWUhQUV2cAuyNplZVy4iaSIfWHmVjyXvJR3NzqbvoAFiknqw+I3dVoFm \ No newline at end of file +yHg9s/3fxnNNZACgYTVbo49VBpkQgUTR6aWo/YVQ6I1pByHLuPfgts9kGlxixO9A \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Resources/Data/ShopLevelData.txt b/popcorn/Assets/MyGame/Resources/Data/ShopLevelData.txt index 45312f1b..7b48d637 100644 --- a/popcorn/Assets/MyGame/Resources/Data/ShopLevelData.txt +++ b/popcorn/Assets/MyGame/Resources/Data/ShopLevelData.txt @@ -1 +1 @@ -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 \ No newline at end of file +EtaI7lY7IDxWVrA5M3RFAVuPr+LaoEYDamyLG3NxOFySDKmiP5DXXzsFbTqp2FqCGtNFHvy7Wvy9KS/nj3sZbsktsy/7m+QgsQdkF3PqdvWwk8MSp+SAQEJW7K++6qKi7azMawPb6GzWEZoq+iVpvG/l+vRDBW4hP76/2r6sq3HI8y+qScZueGeB/psEVpXjKYyBWHX3B0Nk2IrFX6eh8sneZDUoRfMTbiztDEmLqXG1MJXSYai+U0/INiNzVyMwTdU9sYGf9bQrybQE7GQ2Yfezs22lNLZ0w899luZEfcjJTd8aM4xmdPY5/OIvVna9NFditLRn2Z8iq3b1hzut4QfVbqMz/un+8HJL/hLT5IFwYd2XvYl4vsQFaP3swPrE3airAgPE177t1X+uka6dafXG6R8f9/IJL3lA4ComXeW3FSLfag6XJ2gAhZ0t7hwTfH6JGQc1d1UBfahYikQbnbBsj0tonUdMQ8MDg4xbSinH5/hDEBDAViYKcZpTlCbShiH8/aHQCAMJYaO/2MGEOHR3pJei+Fok4pcEUVNTxEU70cH+JVv18jiPTPH7XlFo09w/vSzHpSYbVrosv+MsQW1Au/DdN20xcdlfjn3+knxOzTo/mIqR5KNcY5hgMMulO6D2fPUFNUyf1L7VO12r+rO/7Bt4KaFSzppQOz6Fzs5/dflU1txB4OkomjOtEhe1S6bTOFzmNX9y+YGL61zPS2sKp4ZtlURlj3KDcj1G1xia+3iXrl8sFpUF1DkY/AYIHysf7JELguPAqLR0aQT3F4vGyHQzwNFMLhmv+y9AIHF5hLnlYteygOm5MnqP0nE2CkKxZYjpR9c3MIb7MpgWuyxlZgqz/5zEDbtGEAC3336nvxUVjlO0V+4fuQP4FGWeCq++3xCRTiUwKewnoEmGYeC9ufV7lMCjK27W69ya/8yvztz7Bn0tf0MbO3BE1gSpwNiopD/W/rZ3SJV0XooMpymY099ziO90oYX6HY7CDoY7DgFL7ZEbHSrqxDKizicYCl/AVqeoFm0EMabCihjqUFP/GXMbu+cEZ09eY4RC44sw4jbf3CVyBd+GcLDNIJMbbbpIqHRn3nkYr4GBeciz9PBCV9cGPhom13eEh2JhAbo/WzmyyHg3Cwhqfzy/LM9Wetmw1x8EUAAL/yL9bbrgxAQv72mdiObM/G/7MDmgtFDNjIse3VF6qHD7suZo3BOpZSXu4lU1CI2mr68rZzdCDqKPBmnLkwfbVppgd7EBhImxBf1gGge3JJnnmecVz/Vxj0bF1NmUwihVTbyCDCETk0MdoPt6ccP8Fzr4F5dbnzSmOdNFIvEWoofVoCzh0ptnWWQbv9nRo0xdzUnT22P8r1/L3V+a5I6KBwx36AuGKw+pmaDam0R2MBOUwtZ4aUSVyQeQf4ZPCRYGVde6SGF9quSC+qqvMmyH3eUPAiuIEBDWbicTR1iAHECqUWlZpmhm4hhpVrJhBTa16SiYxQqhhUMDUWTabuhxNFUcDblGoYVPepFmWOCIIGj+rKUS/86dCt09rKTapIwTQ3eCYw8sSwwPWRms9FeACYIc7p7nhCsnaoU3qkklpLiTkwIKU6hz2Ez7tNztl24cHE/Bp7hs1Z7lAJSD5b04USlDV6qiARMuQ9inKJOqSj2RzfszvthYgPnfwgN5gEhN0b8n9DJ+djVdA/GrHICADVkDmuvdLUUdSu04pnbRhIVtd0jBAX7HY6Fu0Qz/UePXgWOcd9YLQcVDpbvMoOHfmVJDocdWrCn90AbwU6aQJoqiWJmEzMHA7PIYS/Af343qvvu9r03X1UH1Mt5WhvzsZyM0V2aqBCB4y/bI5Rd6t/zYfRhgN1UuKREoxDikH5DOkca59t3RE068Yz53zxgQhA+uXX92VChVQUYN+FcWhPYry4HaVUnrvRwLx9b3Kmf9WLWWS/BDA5HEDBT0Ou9ADP6nEgMKOSO5Jj/ux4dEWR3zG7GzqOvXDXKe7sNlxgJRCwMbM3LZgVp88JjxS7mVbaaR0auwIBQ21A3lYaR/TLQ0lXmWJ6DItclAD31rPcTQYd5sZpaVqJ9tdwhK5WBR7UiXRYvAR8+7W+KnQmBBHnHDHZnWOHP9w+y8lbVRZMgbZo1dyhWF63z1ZIW6UXYmSQ3UPVsLEQ/RCsM4E5PDtFCN2n5zKbfwZAUQpyUI489CEM4tnddHRtz+Suuw3FSdp830DufJy8r46/fWwLY15nUuiyCLIAQ2zxtjClcO6wjo2INyme5w+PPI4eLyb1Db3fA9d4ykyUKg1iNaED7u7g4tDvxnVwnZu7CovBceAzosFXLK7/Wr0pmw8l/XTCs3WstbIkmpo7AstfID2UnOerSwFl/1yWZQc09Xzcmz5DC4+iJyuEF+S7on1RGWCnZaF5FDxGwRRX7NWLGmoK/61LVpDFDyOXFPERkwq6t3plAoFyoof/y0PHu3Qd9Kv6Gk9/xMRHf2YrJe99qhy1Qd0WOugij/n4Ey7FzWJBcRJrRuWuXud0NeMyAe9xakOuzMDtOKEbvyeWMnpYuvaTbWoTqKqr8Ovi8N \ No newline at end of file diff --git a/popcorn/Assets/MyGame/Resources/PopcornToppings/package_apple.prefab b/popcorn/Assets/MyGame/Resources/PopcornToppings/package_apple.prefab index 41ec18a0..3f66be51 100644 --- a/popcorn/Assets/MyGame/Resources/PopcornToppings/package_apple.prefab +++ b/popcorn/Assets/MyGame/Resources/PopcornToppings/package_apple.prefab @@ -1,84 +1,79 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1001 &511223197364446445 +--- !u!1001 &1076860577665240353 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: m_TransformParent: {fileID: 5036600026252147965} m_Modifications: - - target: {fileID: 7320563079046373316, guid: d12c1f45710fc40deaae110e6bf90a34, + - target: {fileID: 7320563079046373316, guid: 3eb70ea30ec3b4054a50927bf5afc85d, type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 7320563079046373316, guid: d12c1f45710fc40deaae110e6bf90a34, + - target: {fileID: 7320563079046373316, guid: 3eb70ea30ec3b4054a50927bf5afc85d, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7320563079046373316, guid: d12c1f45710fc40deaae110e6bf90a34, + - target: {fileID: 7320563079046373316, guid: 3eb70ea30ec3b4054a50927bf5afc85d, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7320563079046373316, guid: d12c1f45710fc40deaae110e6bf90a34, + - target: {fileID: 7320563079046373316, guid: 3eb70ea30ec3b4054a50927bf5afc85d, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7320563079046373316, guid: d12c1f45710fc40deaae110e6bf90a34, + - target: {fileID: 7320563079046373316, guid: 3eb70ea30ec3b4054a50927bf5afc85d, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 7320563079046373316, guid: d12c1f45710fc40deaae110e6bf90a34, + - target: {fileID: 7320563079046373316, guid: 3eb70ea30ec3b4054a50927bf5afc85d, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7320563079046373316, guid: d12c1f45710fc40deaae110e6bf90a34, + - target: {fileID: 7320563079046373316, guid: 3eb70ea30ec3b4054a50927bf5afc85d, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7320563079046373316, guid: d12c1f45710fc40deaae110e6bf90a34, + - target: {fileID: 7320563079046373316, guid: 3eb70ea30ec3b4054a50927bf5afc85d, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7320563079046373316, guid: d12c1f45710fc40deaae110e6bf90a34, + - target: {fileID: 7320563079046373316, guid: 3eb70ea30ec3b4054a50927bf5afc85d, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 7320563079046373316, guid: d12c1f45710fc40deaae110e6bf90a34, + - target: {fileID: 7320563079046373316, guid: 3eb70ea30ec3b4054a50927bf5afc85d, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 7320563079046373316, guid: d12c1f45710fc40deaae110e6bf90a34, + - target: {fileID: 7320563079046373316, guid: 3eb70ea30ec3b4054a50927bf5afc85d, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 7320563079046373319, guid: d12c1f45710fc40deaae110e6bf90a34, + - target: {fileID: 7320563079046373319, guid: 3eb70ea30ec3b4054a50927bf5afc85d, type: 3} propertyPath: m_Name - value: material_SoySauce - objectReference: {fileID: 0} - - target: {fileID: 7320563079046373319, guid: d12c1f45710fc40deaae110e6bf90a34, - type: 3} - propertyPath: m_IsActive - value: 1 + value: material_Apple objectReference: {fileID: 0} m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: d12c1f45710fc40deaae110e6bf90a34, type: 3} ---- !u!95 &7102149809850481495 stripped + m_SourcePrefab: {fileID: 100100000, guid: 3eb70ea30ec3b4054a50927bf5afc85d, type: 3} +--- !u!95 &7738903422182478491 stripped Animator: - m_CorrespondingSourceObject: {fileID: 7320563079046373306, guid: d12c1f45710fc40deaae110e6bf90a34, + m_CorrespondingSourceObject: {fileID: 7320563079046373306, guid: 3eb70ea30ec3b4054a50927bf5afc85d, type: 3} - m_PrefabInstance: {fileID: 511223197364446445} + m_PrefabInstance: {fileID: 1076860577665240353} m_PrefabAsset: {fileID: 0} --- !u!1001 &7218845196277846121 PrefabInstance: @@ -161,13 +156,13 @@ PrefabInstance: type: 3} propertyPath: toppingSprite value: - objectReference: {fileID: 21300000, guid: 8e9878be823e441a2a0498556548e733, + objectReference: {fileID: 21300000, guid: f3515ce70d11e7444adc793bd87ccef4, type: 3} - target: {fileID: 2435291247113825431, guid: 328bd0a0e24fb40119f24fb2007b941e, type: 3} propertyPath: toppingAnimators.Array.data[0] value: - objectReference: {fileID: 7102149809850481495} + objectReference: {fileID: 7738903422182478491} - target: {fileID: 2990417425342172831, guid: 328bd0a0e24fb40119f24fb2007b941e, type: 3} propertyPath: m_IsActive diff --git a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity index 39180eb7..24a3ec63 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity +++ b/popcorn/Assets/MyGame/Scenes/CornField/CornField.unity @@ -610,6 +610,38 @@ Transform: m_Father: {fileID: 1501215306} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &169101453 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 169101454} + m_Layer: 0 + m_Name: HouseTarget + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &169101454 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 169101453} + 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_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6553501872873945362} + m_Father: {fileID: 1989990598} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &189803525 GameObject: m_ObjectHideFlags: 0 @@ -2879,7 +2911,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 645963151} - - component: {fileID: 645963153} - component: {fileID: 645963152} m_Layer: 0 m_Name: background_fever @@ -2917,59 +2948,7 @@ SortingGroup: m_Enabled: 1 m_SortingLayerID: 0 m_SortingLayer: 0 - m_SortingOrder: -5 ---- !u!212 &645963153 -SpriteRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 645963150} - m_Enabled: 1 - m_CastShadows: 0 - m_ReceiveShadows: 0 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 0 - m_RayTraceProcedural: 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: 1 - m_Sprite: {fileID: 21300000, guid: 6665bcb5988d9aa488b54cfb534809d7, type: 3} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_FlipX: 0 - m_FlipY: 0 - m_DrawMode: 0 - m_Size: {x: 17.66, y: 22.08039} - m_AdaptiveModeThreshold: 0.5 - m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 - m_MaskInteraction: 0 - m_SpriteSortPoint: 0 + m_SortingOrder: -7 --- !u!1 &665770084 GameObject: m_ObjectHideFlags: 0 @@ -3190,6 +3169,7 @@ MonoBehaviour: counterView: {fileID: 1507187603938887411} additionView: {fileID: 347092272} animationTarget: {fileID: 1881129199} + cityBackGroundTarget: {fileID: 169101454} plantLines: - {fileID: 1656378502} - {fileID: 1192216301} @@ -5350,6 +5330,7 @@ GameObject: m_Component: - component: {fileID: 1381520041} - component: {fileID: 1381520042} + - component: {fileID: 1381520043} m_Layer: 0 m_Name: Cloud m_TagString: Untagged @@ -5397,6 +5378,17 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!210 &1381520043 +SortingGroup: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1381520040} + m_Enabled: 1 + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: -8 --- !u!1 &1406886287 GameObject: m_ObjectHideFlags: 0 @@ -17012,7 +17004,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1989990598} - - component: {fileID: 1989990600} m_Layer: 0 m_Name: background m_TagString: Untagged @@ -17034,23 +17025,12 @@ Transform: m_Children: - {fileID: 1164585268} - {fileID: 1381520041} - - {fileID: 6553501872873945362} + - {fileID: 169101454} - {fileID: 1091047776} - {fileID: 120504944} m_Father: {fileID: 1501215306} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!210 &1989990600 -SortingGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1989990597} - m_Enabled: 1 - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: -10 --- !u!1 &1993403389 GameObject: m_ObjectHideFlags: 0 @@ -18275,7 +18255,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 1989990598} + m_TransformParent: {fileID: 169101454} m_Modifications: - target: {fileID: 475787842800321855, guid: ef7bca0ec048ab64b86804eb007385c4, type: 3} @@ -18290,7 +18270,7 @@ PrefabInstance: - target: {fileID: 3177023301897836689, guid: ef7bca0ec048ab64b86804eb007385c4, type: 3} propertyPath: m_RootOrder - value: 2 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3177023301897836689, guid: ef7bca0ec048ab64b86804eb007385c4, type: 3} @@ -18342,6 +18322,11 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 6553501873066179743, guid: ef7bca0ec048ab64b86804eb007385c4, + type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ef7bca0ec048ab64b86804eb007385c4, type: 3} --- !u!4 &6553501872873945362 stripped diff --git a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs index c558e87f..2dbaf41c 100644 --- a/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs +++ b/popcorn/Assets/MyGame/Scenes/CornField/Scripts/CornField.cs @@ -38,6 +38,7 @@ public class CornField : MonoBehaviour [SerializeField] private HarvestedCounterView counterView; [SerializeField] private HarvestedAdditionView additionView; [SerializeField] private Transform animationTarget; + [SerializeField] private Transform cityBackGroundTarget; [Space] [SerializeField] private List plantLines = new List(); [Space] @@ -70,6 +71,12 @@ public class CornField : MonoBehaviour // データ var globalGameData = GameDataManager.GameData; var cityGameData = GameDataManager.GetCurrentCityGameData(); + + // 背景 + var cityDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.CityDataSheet); + var cityData = cityDataList.First(data => data.id == GameDataManager.GameData.CurrentCityId); + cityBackGroundTarget.DestroyAllChildrens(); + Instantiate(cityData.GetCornFieldBgPrefab(), cityBackGroundTarget); if (!globalGameData.FinishedFlags.HasFlag(TutorialFlag.CornField)) { diff --git a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs index d68410de..e676c3b7 100644 --- a/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs +++ b/popcorn/Assets/MyGame/Scenes/DebugOption/Scripts/DebugOptionManager.cs @@ -47,11 +47,11 @@ public class DebugOptionManager : MonoBehaviour [SerializeField] private Dropdown shopLevelDropdown; [SerializeField] private Dropdown bulkOrderDropdown; [SerializeField] private Dropdown autoCookDropdown; + private readonly GameData globalGameData = GameDataManager.GameData; #if UNITY_EDITOR || DEVELOPMENT_BUILD // Start is called before the first frame update void Start() { - var gameData = GameDataManager.GameData; WorldMarketManager.Instance.IsPause.Value = true; if (!LocalCacheManager.Exists(DebugPrevSceneTag)) @@ -82,28 +82,28 @@ public class DebugOptionManager : MonoBehaviour resetFieldButton.OnClickAsObservable().Subscribe(_ => { - gameData.PlantLineDataList = new List + globalGameData.PlantLineDataList = new List { new PlantLineData(PlantLineType.Center, CornFieldRank.Rank1), }; - gameData.SeedlingDataList = new List(); - gameData.MachineLevel = 1; - gameData.CornSeed = 0; + globalGameData.SeedlingDataList = new List(); + globalGameData.MachineLevel = 1; + globalGameData.CornSeed = 0; }).AddTo(this); resetMaterialButton.OnClickAsObservable().Subscribe(_ => { // 所持素材 - gameData.Material.Clear(); + globalGameData.Material.Clear(); // レシピ - gameData.MyRecipes = GetMyRecipe(gameData.ViewedShopLevel, true); + globalGameData.MyRecipes = GetMyRecipe(globalGameData.ViewedShopLevel, true); // フライパン - gameData.Pans = new[] { Const.DefaultPanId }; + globalGameData.Pans = new[] { Const.DefaultPanId }; }).AddTo(this); resetTankButton.OnClickAsObservable().Subscribe(_ => { - gameData.InitTank(); + globalGameData.InitTank(); }).AddTo(this); refillManyProductButton.OnClickAsObservable().Subscribe(_ => @@ -116,11 +116,11 @@ public class DebugOptionManager : MonoBehaviour // CookingResult.AddStock(new ProductData(){volume = 5, id = 1}, ProductRarity.Gold); // CookingResult.AddStock(new ProductData(){volume = 5, id = 1}, ProductRarity.Rainbow); // CookingResult.AddStock(new ProductData(){volume = 20, id = 2}, ProductRarity.Silver); - if (gameData.StorageTanks.Count < 2) + if (globalGameData.StorageTanks.Count < 2) { - gameData.StorageTanks.Add(new StorageTank(){Capacity = Const.TankCapacity}); + globalGameData.StorageTanks.Add(new StorageTank(){Capacity = Const.TankCapacity}); } - var flavor = gameData.StorageTanks[0].FlavorId; + var flavor = globalGameData.StorageTanks[0].FlavorId; if (flavor < 1) { flavor = 1; @@ -135,17 +135,17 @@ public class DebugOptionManager : MonoBehaviour refillLittleProductButton.OnClickAsObservable().Subscribe(_ => { - gameData.StorageTanks.ForEach(x => x.ClearStock()); + globalGameData.StorageTanks.ForEach(x => x.ClearStock()); // CookingResult.AddStock(new ProductData(){volume = 5, id = 1}, ProductRarity.Yellow); CookingResult.AddStock(new ProductData(){volume = 3, id = 2}, ProductRarity.Copper); }).AddTo(this); bulkOrderResetButton.OnClickAsObservable().Subscribe(_ => { - gameData.AchievedOrderLevel = 0; - gameData.OrderIdInProgress = 0; - gameData.CancelOrderId = 0; - gameData.CompletedProductList.Clear(); + globalGameData.AchievedOrderLevel = 0; + globalGameData.OrderIdInProgress = 0; + globalGameData.CancelOrderId = 0; + globalGameData.CompletedProductList.Clear(); }).AddTo(this); shopLevelUpResetButton.OnClickAsObservable().Subscribe(_ => @@ -155,41 +155,41 @@ public class DebugOptionManager : MonoBehaviour dailyMissionResetButton.OnClickAsObservable().Subscribe(_ => { - gameData.lastDailyMissionSetTime = DateTime.MinValue.ToBinary(); + globalGameData.lastDailyMissionSetTime = DateTime.MinValue.ToBinary(); }).AddTo(this); dailyMissionCompleteButton.OnClickAsObservable().Subscribe(_ => { - gameData.dailyMissionAchievedIdArray = gameData.dailyMissionIdArray; - gameData.dailyMissionCompleted = false; + globalGameData.dailyMissionAchievedIdArray = globalGameData.dailyMissionIdArray; + globalGameData.dailyMissionCompleted = false; }).AddTo(this); normalMissionResetButton.OnClickAsObservable().Subscribe(_ => { - gameData.AchievedMission.Clear(); - gameData.ResetNormalTotalCount(); + globalGameData.AchievedMission.Clear(); + globalGameData.ResetNormalTotalCount(); }).AddTo(this); autoCookCompleteButton.OnClickAsObservable().Subscribe(_ => { - gameData.AutoCookFinishTime = DateTime.UtcNow.ToBinary(); + globalGameData.AutoCookFinishTime = DateTime.UtcNow.ToBinary(); }).AddTo(this); shopRecipeCompleteButton.OnClickAsObservable().Subscribe(_ => { var shopDataList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopDataSheet); var ownedRecipesList = shopDataList.Where(data => data.Category == ItemCategory.Recipe).Select(data => data.itemId).ToList(); - gameData.MyRecipes = gameData.MyRecipes.Union(ownedRecipesList).ToArray(); + globalGameData.MyRecipes = globalGameData.MyRecipes.Union(ownedRecipesList).ToArray(); }).AddTo(this); resetShopCustomizeButton.OnClickAsObservable().Subscribe(_ => { - gameData.FinishedFlags &= ~TutorialFlag.ShopCustomize; - gameData.ShopCustomizeLevel = 1; - gameData.ShopCustomizePoint = 0; - gameData.ShopCustomizeCoin = 0; - gameData.ShopCustomizeSettings = new ShopCustomizeSettings(); - gameData.ShopCustomizeMyItems = new[] + globalGameData.FinishedFlags &= ~TutorialFlag.ShopCustomize; + globalGameData.ShopCustomizeLevel = 1; + globalGameData.ShopCustomizePoint = 0; + globalGameData.ShopCustomizeCoin = 0; + globalGameData.ShopCustomizeSettings = new ShopCustomizeSettings(); + globalGameData.ShopCustomizeMyItems = new[] { Const.ShopCustomizeDefaultCartId, Const.ShopCustomizeDefaultDecoration1Id, @@ -205,9 +205,9 @@ public class DebugOptionManager : MonoBehaviour var shopCustomizeLevelList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopCustomizeLevelDataSheet); var maxLevelData = shopCustomizeLevelList.Last(); - gameData.ShopCustomizeLevel = maxLevelData.level; - gameData.ShopCustomizePoint = maxLevelData.point; - gameData.ShopCustomizeMyItems = gameData.ShopCustomizeMyItems + globalGameData.ShopCustomizeLevel = maxLevelData.level; + globalGameData.ShopCustomizePoint = maxLevelData.point; + globalGameData.ShopCustomizeMyItems = globalGameData.ShopCustomizeMyItems .Union(shopCustomizeDataList.Select(data => data.id)).ToArray(); }).AddTo(this); @@ -233,22 +233,22 @@ public class DebugOptionManager : MonoBehaviour LocalizationManager.CurrentLanguage = "Korean"; }).AddTo(this); - coinCount.text = $"{gameData.Coin}"; + coinCount.text = $"{globalGameData.Coin}"; coinCount.OnValueChangedAsObservable().Subscribe(x => { - gameData.Coin = Int32.Parse(x); + globalGameData.Coin = Int32.Parse(x); }).AddTo(this); - heartCount.text = $"{gameData.Heart}"; + heartCount.text = $"{globalGameData.Heart}"; heartCount.OnValueChangedAsObservable().Subscribe(x => { - gameData.Heart = Int32.Parse(x); + globalGameData.Heart = Int32.Parse(x); }).AddTo(this); - shopCustomizeCoinCount.text = $"{gameData.ShopCustomizeCoin}"; + shopCustomizeCoinCount.text = $"{globalGameData.ShopCustomizeCoin}"; shopCustomizeCoinCount.OnValueChangedAsObservable().Subscribe(x => { - gameData.ShopCustomizeCoin = Int32.Parse(x); + globalGameData.ShopCustomizeCoin = Int32.Parse(x); }).AddTo(this); /* @@ -260,16 +260,17 @@ public class DebugOptionManager : MonoBehaviour shopLevelDropdown.ClearOptions(); var shopLevelList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ShopLevelDataSheet); shopLevelDropdown.AddOptions(shopLevelList.Where(data => data.shopLevel != Const.SpecialShopLevel).Select(data => data.shopLevel.ToString()).ToList()); - shopLevelDropdown.value = gameData.ViewedShopLevel - 1; + shopLevelDropdown.value = globalGameData.ViewedShopLevel - 1; shopLevelDropdown.OnValueChangedAsObservable() .Skip(1) .DistinctUntilChanged() .Subscribe(x => { var shopLevelData = shopLevelList.First(data => data.shopLevel == x + 1); - gameData.ViewedShopLevel = shopLevelData.shopLevel; - gameData.Heart = shopLevelData.heart; - gameData.MyRecipes = GetMyRecipe(shopLevelData.shopLevel); + globalGameData.ViewedShopLevel = shopLevelData.shopLevel; + globalGameData.Heart = shopLevelData.heart; + globalGameData.MyRecipes = GetMyRecipe(shopLevelData.shopLevel); + heartCount.text = $"{globalGameData.Heart}"; }).AddTo(this); /* @@ -278,12 +279,12 @@ public class DebugOptionManager : MonoBehaviour bulkOrderDropdown.ClearOptions(); var bulkOrderList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.BulkOrderDataSheet); var nextOrderList = bulkOrderList - .Where(data => data.shopLevel <= gameData.ViewedShopLevel) + .Where(data => data.shopLevel <= globalGameData.ViewedShopLevel) .ToList(); if (nextOrderList.Count > 0) { var len = nextOrderList.Count; - var index = nextOrderList.FindIndex(data => data.id == gameData.OrderIdInProgress); + var index = nextOrderList.FindIndex(data => data.id == globalGameData.OrderIdInProgress); bulkOrderDropdown.AddOptions(nextOrderList.Select(data => $"id:{data.id}").ToList()); // 現在のIDをデフォで設定 if (index != -1) @@ -296,13 +297,13 @@ public class DebugOptionManager : MonoBehaviour .Subscribe(x => { // オーダー達成状況をリセット - gameData.DeliveredOrder.Clear(); - gameData.AchievedOrderLevel = nextOrderList[x].shopLevel - 1; + globalGameData.DeliveredOrder.Clear(); + globalGameData.AchievedOrderLevel = nextOrderList[x].shopLevel - 1; // 1つ前のオーダーを現在のオーダーに設定 var prevOrder = nextOrderList[(len + x - 1) % len]; gameData.OrderIdInProgress = gameData.CancelOrderId = prevOrder.id; // 即座に通知を発生 - gameData.OrderConditionCount = 99999; + globalGameData.OrderConditionCount = 99999; }).AddTo(this); } @@ -312,21 +313,21 @@ public class DebugOptionManager : MonoBehaviour autoCookDropdown.ClearOptions(); var autoCookList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.AutoCookDataSheet); autoCookDropdown.AddOptions(autoCookList.Select(data => data.level.ToString()).ToList()); - autoCookDropdown.value = gameData.AutoCookLevel - 1; + autoCookDropdown.value = globalGameData.AutoCookLevel - 1; autoCookDropdown.OnValueChangedAsObservable() .Skip(1) .DistinctUntilChanged() .Subscribe(x => { - gameData.AutoCookUsesCount = 0; - gameData.AutoCookLevel = autoCookList[x].level; + globalGameData.AutoCookUsesCount = 0; + globalGameData.AutoCookLevel = autoCookList[x].level; // level1ならチュートリアル復活 - if (gameData.AutoCookLevel == 1) + if (globalGameData.AutoCookLevel == 1) { - gameData.FinishedFlags &= ~TutorialFlag.AutoCook; - gameData.AutoCookFinishTime = DateTime.UtcNow.ToBinary(); - gameData.AutoCookProducts = Array.Empty(); - gameData.AutoCookUsesCount = 0; + globalGameData.FinishedFlags &= ~TutorialFlag.AutoCook; + globalGameData.AutoCookFinishTime = DateTime.UtcNow.ToBinary(); + globalGameData.AutoCookProducts = Array.Empty(); + globalGameData.AutoCookUsesCount = 0; } }).AddTo(this); @@ -359,21 +360,21 @@ public class DebugOptionManager : MonoBehaviour { UsayaStorageManager.Save(UsayaStorageFilename.Settings_Data, "DebugTutorialEnable", x); }).AddTo(this); - vipRewardToggle.isOn = gameData.vipCustomerFirstOpen; + vipRewardToggle.isOn = globalGameData.vipCustomerFirstOpen; vipRewardToggle.OnValueChangedAsObservable().Subscribe(x => { - gameData.vipCustomerFirstOpen = x; - gameData.vipCustomerLimitTime = (x ? DateTime.UtcNow.AddSeconds(60f) : DateTime.UtcNow).ToBinary(); + globalGameData.vipCustomerFirstOpen = x; + globalGameData.vipCustomerLimitTime = (x ? DateTime.UtcNow.AddSeconds(60f) : DateTime.UtcNow).ToBinary(); }).AddTo(this); } - private static int[] GetMyRecipe(int level, bool clearShopRecipe = false) + private int[] GetMyRecipe(int level, bool clearShopRecipe = false) { var productList = SpreadsheetDataManager.Instance.GetBaseDataList(Const.ProductDataSheet); var levelUpAchievedList = productList.Where(data => data.shopLevel != Const.SpecialShopLevel).ToList(); var levelUpAchievedRecipeList = levelUpAchievedList.Where(data => data.shopLevel <= level).Select(data => data.id); var shopRecipe = clearShopRecipe - ? GameDataManager.GameData.MyRecipes.Except(levelUpAchievedList.Select(data => data.id)) + ? globalGameData.MyRecipes.Except(levelUpAchievedList.Select(data => data.id)) : Array.Empty(); return levelUpAchievedRecipeList.Union(shopRecipe).ToArray(); } diff --git a/popcorn/Assets/MyGame/Scripts/Const.cs b/popcorn/Assets/MyGame/Scripts/Const.cs index 61520707..f3c2634b 100644 --- a/popcorn/Assets/MyGame/Scripts/Const.cs +++ b/popcorn/Assets/MyGame/Scripts/Const.cs @@ -12,7 +12,7 @@ public static class Const { public static readonly int DefaultPanId = 1; public static readonly int DefaultCityId = 1; public static readonly int ShopTankId = 20; - public static readonly int MaxShopLevel = 19; // Max 店舗レベル + public static readonly int MaxShopLevel = 20; // Max 店舗レベル public static readonly int TankCapacity = 20; public static readonly int SpecialShopLevel = 9999; public static readonly int SpecialCategory = 9999; diff --git a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs index c86256e8..d7ede451 100644 --- a/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs +++ b/popcorn/Assets/MyGame/Scripts/SpreadsheetData.cs @@ -643,6 +643,11 @@ public sealed class CityData { return Resources.Load($"MainCityBackground/{prefabName}"); } + + public Transform GetCornFieldBgPrefab() + { + return Resources.Load($"CornFieldCityBackground/{prefabName}"); + } } [Serializable]