From b21b4afd415ef1a49b50313e2e558e17000b9129 Mon Sep 17 00:00:00 2001 From: kimura Date: Tue, 1 Nov 2022 13:33:07 +0900 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BB=AE=E7=B4=A0=E6=9D=90=E5=89=8A?= =?UTF-8?q?=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Material/Main/material/material_Apple.png | Bin 2721 -> 0 bytes .../Main/material/material_Apple.png.meta | 98 ------------------ .../result/popcorn_package_big_f_Apple.png | Bin 24992 -> 0 bytes .../popcorn_package_big_f_Apple.png.meta | 98 ------------------ .../package/popcorn_package_f_Apple.png | Bin 10292 -> 0 bytes .../package/popcorn_package_f_Apple.png.meta | 98 ------------------ .../popcorn/popcorn_corn_usually_f_Apple.png | Bin 3208 -> 0 bytes .../popcorn_corn_usually_f_Apple.png.meta | 98 ------------------ .../icon/ui_shopping_icon_material_Apple.png | Bin 6790 -> 0 bytes .../ui_shopping_icon_material_Apple.png.meta | 98 ------------------ 10 files changed, 490 deletions(-) delete mode 100644 popcorn/Assets/MyGame/Resource/Material/Main/material/material_Apple.png delete mode 100644 popcorn/Assets/MyGame/Resource/Material/Main/material/material_Apple.png.meta delete mode 100644 popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_f_Apple.png delete mode 100644 popcorn/Assets/MyGame/Resource/Material/cooking/result/popcorn_package_big_f_Apple.png.meta delete mode 100644 popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_f_Apple.png delete mode 100644 popcorn/Assets/MyGame/Resource/Material/popcorn/package/popcorn_package_f_Apple.png.meta delete mode 100644 popcorn/Assets/MyGame/Resource/Material/popcorn/popcorn_corn_usually_f_Apple.png delete mode 100644 popcorn/Assets/MyGame/Resource/Material/popcorn/popcorn_corn_usually_f_Apple.png.meta delete mode 100644 popcorn/Assets/MyGame/Resource/Material/shopping/icon/ui_shopping_icon_material_Apple.png delete mode 100644 popcorn/Assets/MyGame/Resource/Material/shopping/icon/ui_shopping_icon_material_Apple.png.meta 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 b516afbb7bcd166ec9f02d6f8a05eeffcf745146..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2721 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 be*_o+)noxQT`9cO00000NkvXXu0mjf;g&Gk 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 2bdcf27a35f26168c8fdbfda7d2cb5519717414f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 24992 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 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 7864a6c55fb5d528516af454ad4bf986e4ed9291..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10292 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 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 6d2b5892de0f35054badd0abce3a8f7f79d000f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 6790 zcmV;18hPc3P)#-dSI=rl?4*gE_!R<&w2Mu?*De*QFl+z?#%4W?mX@(-Rhav%xur}uh03P zb01A4O`0@m(xgd~CQX_&Y0{)glO|1?G-=YLNz0$vD(wqD{@@L(*``6atIgtNL#%b^ zo_DueGTdVC!b>Fl+4$wswh71%Rc&w1u_Jd4MPrgBJr_ zzhIEPA#o}*uozGXZU3x6HB$yp_M`-?Ou*7K)9bl^A;5Q;WnCG#H6dM2XV?+g=JqX&@Zs`zNp$7+gcvbS~aVh4)l+5$SjWSg-Qj>UgF1Z2!VGr)lCajW|;AJEy8OUbR?lZ(Jhn-y7FXLiA5uU@EoOb$SI7+=S_5FVKcNVd1(51a6o&7N! z zmNtF(DHK=`>;b0Zx>3$x0A(3^yQxAtrtM|&J$9Qt#=&4DrHqg-yUFLyO1$er;HFBM zlu<5VrDzs-lwXg9Ibgkc(p;#8A;a4p2=mX+(xa|rP<2#FxuI+-EKFyiYv+lHUIR^3 z&BS+=-OhB8Eh)q&65r7T$_z@fz?wxuF{F9YH!2CJvI9$l>jS;k0yu8=4YL3uH$E3luzjM0%?V^;k)Rx3arEj17Yn_L#YVeZBk$J~MqJSe)C0He3 z+6pwrFIiWUeC*II65@7b{`DP>w9b9C#HcbnmSLd~WQC5}S~c#weK~)q&8`lUap)k` z>@JB>Wq|dN{)u~mD!v^qbxj9-_#2I6uCWA^?pA*a$l4N>(#jPqZFN6`$MP_d4s&T> z)M^9t!b*0Pc(A`}i~Fw4el0#4M#OkNBB@wCLLJU!OS zW^d)y!l18aw&8_JB9T=MD;ZXObsSJYW#P4+kXozEz+xwK3z=3;uDuV8?x(4sv{5noX?tx}o^oieRU=&Ni*yYrknBi=SL zOm^1NS-h^E60E^u3l?Q8;!&VgqG9e$L&uJrz3mGUtRl|_MJ9+7DMWjNcGDzO+JoZ( z2GMD9^j_jH+1b_>zI;RQIP+$)309TyIP7HCEpwFccq!i0%pp^-UA#1{)(S*>d3I<5 z3pK5VN?G}@B*4;YSBBv+q6U=1XS6R!u!=Mc;)J0K zMVv@jqY@(bkx$7M7^D6J`)N23hJa!&^DiPA?TG{z^lnwC7;O!CeYMP-I*>|!>us9ho4wS4+}ijR%bg|ipvQr`fD zqOmDMH4$vVNR;|nxa}Jor#SOsRloYLq-Jwzuv=t@t1BftEPAlC0dsAJ>`Oag;sn+l zKSCali-OT8UF==(77qr29*I@PrUGaPGpiA0Sq+!QUU+w~rqW@0ix$vRLb3vjnRMvq60r#0eZdaDb{?=99ua zhr-0Q&y>v-^v7d=r`GGC#_B2xM-}F|!Zf(+T^SCG9W3nx7_vbzrdkH4XLb zq(`OjD+a3i^DAIOmNWS!C=LQ z!(z`04cdwiKi2A3$OgwdJCloiKu{k$c8Ve_8?5)aslLk1;UdN#$_&s#vA9}lh$?DV z4?s{XR_X&hVu3c7!@=Qnvn}@F|6s$x2m@-2Zxz$MdWQG>AI(~SU$R(=i@{WODEne* zv4fR%tt(`Mful!g$(5=H8yy^`;8=h^Mo2>A!rtqm8Yb-BPCIYa%-iT!^_$Ehu{cE- zh-2Xx%LG|tA#W@+ap(5v!2=vDQ7lFHHWf=(OOI7V9!vBMim^}dSdAO*QDM5+Yxx0y zARP!kx6=|bcpyNOtHlNeD0K29xfWevxFB?fp)_qTzI~`&YOLwkSGcN;Lu54J4o?86 zs=aQewbbsM!ApHv{|&$+z|*&>Ky}$`?dN@mVir%O4W%h&@oo^f5WzS>e9RL&VF-hb z^O}O+z9=lF?pxz#aG1DATU%Lu-{oYt&g zoY89!et3pn{rBAN8aLi~gl74_VmN+NxG!6sRg_>^>MNaaA3dp_=+3^1)0a1%`_HtR$Pg4uN6Ia-hA;$ux83z zi7p(wc9KFTKUYuOSb(+cZe{bxx6}yq<|{{Opf51tYtNq^p(W3)V;*h=J^#JzZ%GKx ziY^{p4B=pu>nsykWxGavv5NP*tn`&rTeTRTAQxM4<2+ijY&PwB<9HG(Xf5p1H|*no zClIAQySn)Eo0;dz#c-^mm%uS+w)wxyR%aEf$MRe0E1V#quW~VHD-Mem0s+yMZ8vkz zWES@DXa|_S+V%Qp45}+=1A8yRXE4i|Kaq3isA~1~T4rcj&+?b!{SJ#2EW?%TY*Mdu zr_)2h^Cxop!1bH1p;=5{y~c#Nfa6gX76m|N&xVjGK!SMx%fJ6J*IWQCYn|m(JuNSn zXgB6GT|{LER?&q*ZI!;HneT;zs&=-9vcj76tz3W$h#=sDfmjMuJSkv6!HWSTQF1_A zzi}xS|Jmv+eLc%LXHG@bvx-q;`HjL|JrUxr5TP9O6+$5365a-n*Kb-%J6`Eb`yO~U zJxH%4KU0))O*{L1B2FTpCjS*|v0w>j9AKbX@8?%8#U1{n++G_3_griU<>uD=kv3_ywu z63_7&lU3`jObG@jyODtetH2py3RL0>7aAp314u%&>oYw7V=jSHM7ZrD>CvTq#@r}@C)kkPHWQ8KDEU>MT9;?I+ zpdchp29@gJf*B33DO4sbJywA&p2+V4wde~(lUAV~O9)&{`Yib$8k1+!Tek$OuvU=O z?lKYTnHZ|~kESV4OlIzu1(ZmnU2OM@as#WVLg9;VAL@Ag!5i}WnScRfsZcdXW(VDL z@|ZfSCtao|X7Hf3EUM?v7qEsRDL$u@>8@N%c-~lFKb5-`y~a{TM|sDs63Z3qLKX8szOps5uS1~;@28xi$ATw_6BP^G|;*wSgF>b2P>{E|ATpX)k~I4 z`NIK-mw~fnnL4%##ZocC0bUAV!IKHWfBy9Fl%OIT1Iccq{`Y@N!=H6hoLwlUC5`fB z8?^?n2FQNF0DEJmPNJ>YsM54X()D8`K*Od7`N)9!*$e6H^Uozm3lys*0F%Q;aRyW( zgC&!$TDc@|KN#-r1>v)=eka<8!CFC^$YoS;%~uU97lg;*-;<#fs5m;m0ss zq79qA%Ex74`68dYjxKF~c}hcQ3ISByY3H6wn6J8;R^E0iUA?+Y%gdYY^dVE(%?Eoy0KXz9KvuTBwx*J8vEoE3UnSxE*CUYAy0AH4dD)+scpl9 zS-})$UZ!b%BdxWl9kzOwWo-;>}^6hYM4}YBWa6UH+ z^>GTPS@canws84!s%x4{SF&w=Qt-E;5Y;$BHx6 zYi>`O=>lPo>0#>Kx7>V~O{81Bk$@hwT;?RAk5AOkQ0PQWYT)BNH2Ue$WXSv4Uwo5p zS$DVP`vFg9dpn&tu%DE0hy&#Fy2$BrkO!+eTj;T_?jEYG_0gQ!wKP5+ri+)XolCt2 z*ow9`zO@4Em7o5Mj{I)lw0o{%1`DC^kk$VIFsw()Z-kUOoyq_lh67`3vpKk@vl`na zRtZcb;+7rWs6QpN)s=_#?52^A_9nyLcb@%$Wyk|aAH2MsdnQ0qTkB;&r61rIk0+S7 zigJ*KhXV{cCskK_llvw!K=$Q_ALfvm4WaQ@Fa4*L_j-eYwW*@ON*5BX3>pmc4>9By z)5XNHlKHmqscsti^{z>wdY>g1pX}Vpz0=&LItH^N1)}ls5RC`I6b{E2xcR#iECAd1 z)KffknnnK4zWY5ZxYiaTTP$j@G`KcuaAh?Z4qyQ?JKt*SYt_|SdN@0SQtXdf+%hE| z4wKT?PoYnb^Wx@2P$BHS^DjSV-o``ono|#XaB!T4hQ~Qvg|r9$`r9eq3nB5PXMbdV zDJu1AD-J9TE}Wq!SldQLFxv8|pFYpwva(m7d7A60mX=v5p|7WRghoe$({`Mj|LG?w zo(q}_q0wZm`4;jeF*F$hleK5?1F*K0)PAuUxl<|12`(f&}+E-g4kKy`TZ%O-qq2M@GHPllK zw+!ywH_Ws7n|ElU(O|Kx|X=f7X0bDtfj@&0~(3zevn zFx}1xc3U}~g36i+oe%r`$k7R_>%1%x2-3A{?x5B8-9xjlR9Cn;|JmiaiT$U~ z&}Sd*rM@#~3U-_^K+OK3N^drFUQ4iw%=WR2>V69Wj1`?Dkq{l)xsy(RyqgL25Etw4 zVE2Ffuc+mk%fq4Zc;&t8=-``g(ZL;Wk@Vl#;_F{fL#76&91B zqxUzzd@c2d#0@g5YU%K<_h@u1Op&lUIB>MDpMLZ6f3;2o?pc?YV?tsOj>ahvRw%@_ zfU3Tsmj3kb{?_n10QHW=u}iRu#NPSkt9)#f*&Gfh{mD1}oO=4kXm~tAVNRZ>XW3#b7U89cxT08k9cUuP1oJkj8KT{$ zdZDe?DwcH1p<$HR}L45fjG!bLF2Ai%tjjkif|CM`E0o}`?W`q{H+ zxL;km5(USvee0W(W{U~tViYAxN-V}8Q5a}3djCIOrlWg4q6oB6n!<*9FKV>Q`x={@ z`B0gwZn-(7P9?xMkIB*>v;M-V*uKIdfD4`ATg+fJU(rIx4__Xvm&ss1E5pFQ&kyXU z?jxNvc&UemdU~~lfT$IpWm5x}k`?7RH7dI=}(eonKi`|NB2X44wepCSrJUwi70DHH=*N!@m7|t1l<4yzM4_ zoFDG|trb+;8B|*faXb>N%;CcDo!8C#;SJXP*#`dj!=1ZQLJh(sJQ*fch}k*$FfobZ zMCVbyHP@y9)XmIG;h6MZ)s&P}-U!kng$v=(a^T^@rAwIix>xlcA0MO>>||Pa2tI}j zfC0EF_PB9wQ`-JVVW{@Q&UUHOy#SJx!7~9U91CDd6Z#4cl>{r#aEX%(J+pMxayotd z6rDbCl5J1YrL+0J89Kb>!ljF8;nhp%>Q$<)JNUsK4t6O0gp$ggrBecMt=7V#f3lN~ z6OI!Pu@A^_o8eF}#2<6v&Yw?QD8+m0XE(CX^wQib7I1j6Z!X*RFks=GP8{yc1m4P? zS6Cu&iBYXjXYzW0paRy&fvaz9n_JT-b<4vO`0@m o(xgd~CQX_&Y0{)+VE-?`00q)9uj53j<^TWy07*qoM6N<$g5Q4 Date: Tue, 1 Nov 2022 13:34:59 +0900 Subject: [PATCH 2/5] =?UTF-8?q?=E3=82=B7=E3=83=BC=E3=83=88=E6=9B=B4?= =?UTF-8?q?=E6=96=B0(Lv20=E8=A1=A8=E7=A4=BA=E5=AF=BE=E5=BF=9C)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- popcorn/Assets/MyGame/Resources/Data/DownloadDate.txt | 2 +- popcorn/Assets/MyGame/Resources/Data/ShopLevelData.txt | 2 +- popcorn/Assets/MyGame/Scripts/Const.cs | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) 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 +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 \ No newline at end of file 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; From b687ed37b792b67cd5bbdfad2529c031c05716af Mon Sep 17 00:00:00 2001 From: kimura Date: Tue, 1 Nov 2022 13:36:04 +0900 Subject: [PATCH 3/5] =?UTF-8?q?=E3=83=88=E3=83=83=E3=83=94=E3=83=B3?= =?UTF-8?q?=E3=82=B0prefab=E9=81=A9=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PopcornToppings/package_apple.prefab | 45 +++++++++---------- 1 file changed, 20 insertions(+), 25 deletions(-) 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 From 90c9190d1a004f83ccdfc71e907ca340a08ee2b3 Mon Sep 17 00:00:00 2001 From: kimura Date: Tue, 1 Nov 2022 13:38:13 +0900 Subject: [PATCH 4/5] =?UTF-8?q?=E3=83=87=E3=83=90=E3=83=83=E3=82=B0?= =?UTF-8?q?=E4=BB=AE=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DebugOption/Scripts/DebugOptionManager.cs | 123 +++++++++--------- 1 file changed, 62 insertions(+), 61 deletions(-) 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(); } From 14e60701aa06c313ca84c7fc5240d573b84db4ee Mon Sep 17 00:00:00 2001 From: kimura Date: Tue, 1 Nov 2022 14:33:10 +0900 Subject: [PATCH 5/5] =?UTF-8?q?=E7=95=91=E3=81=AE=E8=83=8C=E6=99=AF?= =?UTF-8?q?=E5=88=87=E3=82=8A=E6=9B=BF=E3=81=88=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MyGame/Scenes/CornField/CornField.unity | 123 ++++++++---------- .../Scenes/CornField/Scripts/CornField.cs | 7 + .../Assets/MyGame/Scripts/SpreadsheetData.cs | 5 + 3 files changed, 66 insertions(+), 69 deletions(-) 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/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]