From 204453c5a703b6372bca1bbc083aae8e80ac1a5f Mon Sep 17 00:00:00 2001 From: capers Date: Thu, 31 Oct 2024 21:03:55 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B9=B5=ED=85=8C=EC=9D=BC=20DB,=20=EC=B9=B4?= =?UTF-8?q?=EB=93=9C=20DB=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ScriptableObject/CardDataTable.asset | 4 +- .../Item/CocktailDataTable.asset | 157 +++++------------- Assets/Resources/Excel/CardDataTable.xlsx | Bin 9616 -> 9684 bytes Assets/Resources/Excel/CocktailDataTable.xlsx | Bin 9934 -> 10977 bytes Assets/Resources/JSON/CardDataTable.json | 4 +- Assets/Resources/JSON/CocktailDataTable.json | 46 ++--- 6 files changed, 65 insertions(+), 146 deletions(-) diff --git a/Assets/02.Scripts/ScriptableObject/CardDataTable.asset b/Assets/02.Scripts/ScriptableObject/CardDataTable.asset index cc6a9106e..26e523c13 100644 --- a/Assets/02.Scripts/ScriptableObject/CardDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/CardDataTable.asset @@ -35,7 +35,7 @@ MonoBehaviour: k__BackingField: HeartAllHealImg k__BackingField: "\uD558\uD2B8 \uC804\uCCB4 \uD68C\uBCF5" k__BackingField: 0 - k__BackingField: 10 + k__BackingField: 5 k__BackingField: {fileID: 21300000, guid: 7579ee4fd1c5ed34d939eeef18c625be, type: 3} - k__BackingField: AddLiquidB k__BackingField: @@ -157,5 +157,5 @@ MonoBehaviour: k__BackingField: "\uBAA8\uB4E0 \uC190\uB2D8\uB4E4\uC758 \uAE30\uB2E4\uB9BC \uCD08\uAE30\uD654" k__BackingField: 0 - k__BackingField: 5 + k__BackingField: 10 k__BackingField: {fileID: 21300000, guid: 1d6e6fd96eb499f42b79f04f3510af87, type: 3} diff --git a/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset b/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset index df393f679..886967eca 100644 --- a/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/Item/CocktailDataTable.asset @@ -46,10 +46,7 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 0cf23778fd0b2994c9d608fbbf185468, type: 3} - k__BackingField: - - k__BackingField: LiquidA - k__BackingField: 100 - k__BackingField: 300 + k__BackingField: [] - k__BackingField: Cocktail002 k__BackingField: k__BackingField: Cocktail002 @@ -66,10 +63,7 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 600806d36167cb140aa40eb51cf58afa, type: 3} - k__BackingField: - - k__BackingField: LiquidB - k__BackingField: 100 - k__BackingField: 300 + k__BackingField: [] - k__BackingField: Cocktail003 k__BackingField: k__BackingField: Cocktail003 @@ -86,10 +80,7 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: c55f4b0a55a391d488e54a28dc840509, type: 3} - k__BackingField: - - k__BackingField: LiquidC - k__BackingField: 100 - k__BackingField: 300 + k__BackingField: [] - k__BackingField: Cocktail004 k__BackingField: k__BackingField: Cocktail004 @@ -106,10 +97,7 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 576d6ff3856f8ef419586ff12f2742b5, type: 3} - k__BackingField: - - k__BackingField: LiquidD - k__BackingField: 100 - k__BackingField: 300 + k__BackingField: [] - k__BackingField: Cocktail005 k__BackingField: k__BackingField: Cocktail005 @@ -126,10 +114,7 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 527440f24542af142a67219f2bcbeec4, type: 3} - k__BackingField: - - k__BackingField: LiquidE - k__BackingField: 100 - k__BackingField: 300 + k__BackingField: [] - k__BackingField: Cocktail006 k__BackingField: k__BackingField: Cocktail006 @@ -146,13 +131,7 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 6a4cd8cdf11fe024e8ecac8e3d60e10d, type: 3} - k__BackingField: - - k__BackingField: LiquidA - k__BackingField: 50 - k__BackingField: 150 - - k__BackingField: LiquidC - k__BackingField: 50 - k__BackingField: 150 + k__BackingField: [] - k__BackingField: Cocktail007 k__BackingField: k__BackingField: Cocktail007 @@ -169,13 +148,7 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: b38089ff4046ac044ba79dfa5116aa1b, type: 3} - k__BackingField: - - k__BackingField: LiquidB - k__BackingField: 50 - k__BackingField: 150 - - k__BackingField: LiquidD - k__BackingField: 50 - k__BackingField: 150 + k__BackingField: [] - k__BackingField: Cocktail008 k__BackingField: k__BackingField: Cocktail008 @@ -192,74 +165,50 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 71954183dfb02424d835d964c2eb3fc6, type: 3} - k__BackingField: - - k__BackingField: LiquidC - k__BackingField: 50 - k__BackingField: 150 - - k__BackingField: LiquidD - k__BackingField: 50 - k__BackingField: 150 + k__BackingField: [] - k__BackingField: Cocktail009 k__BackingField: k__BackingField: Cocktail009 k__BackingField: "\uCE75\uD14C\uC77CABE" - k__BackingField: 10 + k__BackingField: 20 k__BackingField: LiquidA - k__BackingField: 25 + k__BackingField: 30 k__BackingField: LiquidB - k__BackingField: 25 + k__BackingField: 30 k__BackingField: LiquidE - k__BackingField: 50 + k__BackingField: 40 k__BackingField: k__BackingField: 0 k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: d0748411047fc4a41beb1fb8d551e01e, type: 3} - k__BackingField: - - k__BackingField: LiquidA - k__BackingField: 25 - k__BackingField: 75 - - k__BackingField: LiquidB - k__BackingField: 25 - k__BackingField: 75 - - k__BackingField: LiquidE - k__BackingField: 50 - k__BackingField: 150 + k__BackingField: [] - k__BackingField: Cocktail010 k__BackingField: k__BackingField: Cocktail010 k__BackingField: "\uCE75\uD14C\uC77CCDE" - k__BackingField: 10 + k__BackingField: 20 k__BackingField: LiquidC - k__BackingField: 25 + k__BackingField: 30 k__BackingField: LiquidD - k__BackingField: 25 - k__BackingField: LiquidE - k__BackingField: 50 + k__BackingField: 30 + k__BackingField: Garnish2 + k__BackingField: 40 k__BackingField: k__BackingField: 0 k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 335f1df58cd58914f97fe9ccae7f6c8c, type: 3} - k__BackingField: - - k__BackingField: LiquidC - k__BackingField: 25 - k__BackingField: 75 - - k__BackingField: LiquidD - k__BackingField: 25 - k__BackingField: 75 - - k__BackingField: LiquidE - k__BackingField: 50 - k__BackingField: 150 + k__BackingField: [] - k__BackingField: Cocktail011 k__BackingField: k__BackingField: Cocktail011 k__BackingField: "\uCE75\uD14C\uC77CB1" k__BackingField: 10 k__BackingField: LiquidB - k__BackingField: 80 + k__BackingField: 50 k__BackingField: Garnish1 - k__BackingField: 20 + k__BackingField: 50 k__BackingField: k__BackingField: 0 k__BackingField: @@ -267,22 +216,16 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 600806d36167cb140aa40eb51cf58afa, type: 3} - k__BackingField: - - k__BackingField: LiquidB - k__BackingField: 80 - k__BackingField: 240 - - k__BackingField: Garnish1 - k__BackingField: 20 - k__BackingField: 60 + k__BackingField: [] - k__BackingField: Cocktail012 k__BackingField: k__BackingField: Cocktail012 k__BackingField: "\uCE75\uD14C\uC77CD1" k__BackingField: 10 k__BackingField: LiquidD - k__BackingField: 80 + k__BackingField: 50 k__BackingField: Garnish1 - k__BackingField: 20 + k__BackingField: 50 k__BackingField: k__BackingField: 0 k__BackingField: @@ -290,22 +233,16 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: ee344f47787d148448bd3373235281b6, type: 3} - k__BackingField: - - k__BackingField: LiquidD - k__BackingField: 80 - k__BackingField: 240 - - k__BackingField: Garnish1 - k__BackingField: 20 - k__BackingField: 60 + k__BackingField: [] - k__BackingField: Cocktail013 k__BackingField: k__BackingField: Cocktail013 k__BackingField: "\uCE75\uD14C\uC77CA2" - k__BackingField: 5 + k__BackingField: 10 k__BackingField: LiquidA - k__BackingField: 90 + k__BackingField: 50 k__BackingField: Garnish2 - k__BackingField: 10 + k__BackingField: 50 k__BackingField: k__BackingField: 0 k__BackingField: @@ -313,22 +250,16 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: aef7fd596cbfc854d87f408c14951641, type: 3} - k__BackingField: - - k__BackingField: LiquidA - k__BackingField: 90 - k__BackingField: 270 - - k__BackingField: Garnish2 - k__BackingField: 10 - k__BackingField: 30 + k__BackingField: [] - k__BackingField: Cocktail014 k__BackingField: k__BackingField: Cocktail014 k__BackingField: "\uCE75\uD14C\uC77CC2" - k__BackingField: 5 + k__BackingField: 10 k__BackingField: LiquidC - k__BackingField: 90 + k__BackingField: 50 k__BackingField: Garnish2 - k__BackingField: 10 + k__BackingField: 50 k__BackingField: k__BackingField: 0 k__BackingField: @@ -336,22 +267,16 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 91d99e534e5f3c04094b14ed920bec04, type: 3} - k__BackingField: - - k__BackingField: LiquidC - k__BackingField: 90 - k__BackingField: 270 - - k__BackingField: Garnish2 - k__BackingField: 10 - k__BackingField: 30 + k__BackingField: [] - k__BackingField: Cocktail015 k__BackingField: k__BackingField: Cocktail015 k__BackingField: "\uCE75\uD14C\uC77CE2" - k__BackingField: 5 + k__BackingField: 10 k__BackingField: LiquidE - k__BackingField: 90 - k__BackingField: Garnish2 - k__BackingField: 10 + k__BackingField: 50 + k__BackingField: Garnish1 + k__BackingField: 50 k__BackingField: k__BackingField: 0 k__BackingField: @@ -359,10 +284,4 @@ MonoBehaviour: k__BackingField: k__BackingField: 0 k__BackingField: {fileID: 21300000, guid: 527440f24542af142a67219f2bcbeec4, type: 3} - k__BackingField: - - k__BackingField: LiquidE - k__BackingField: 90 - k__BackingField: 270 - - k__BackingField: Garnish2 - k__BackingField: 10 - k__BackingField: 30 + k__BackingField: [] diff --git a/Assets/Resources/Excel/CardDataTable.xlsx b/Assets/Resources/Excel/CardDataTable.xlsx index ee43ce23c16edf3592b4cecd01578fb1c45af589..513686fd589de0a1e5821aa5a0de01f2a2a43f66 100644 GIT binary patch delta 2463 zcmZ9OdpHw{8^8oAYGJ#Y{#Pmz zgp8c@ljRtv)+Dx`RFoNY)IDl;Ku_v+))lAcyVeF(2aB^!mL0^HExM4hxYf=Dc9vIO zg<5m4<}mmQggL&_5No zQ`c%lRcmG?9pXHdw4B-s)hqynF4%)5w6<~8nG>wZYwSF2kjWnCz7U(IBWBB5ZmtIIentfWjCPNqx>0kPb&2YTVW{#$ z-SM;ScGLx5@?igZYl1*yDTOAvaHWLUjH%wdP^emY`OFSBaNK|7h@_SscGnuFm^J~F zOf(y9gZuJh*-@#g1!*xDfpw>SK#BP~2tx}(E{~3V|PP~I{>{5Gj2KtFwa$CtLNYNU6hdZXB%gS_C4?I~_mT^Kti8gF&g zg4iW|zvcs==YbU4-%1`4p)N(Mnm3680L}6MfXY97MG^u7qaqD{$lIK-(4clsX{7%kEN@&Q+(-R@mIMfg#yXO|3*8fI>@tp>%t_ zXLxU9Iq-=W9z_VRF?Nf*)^d5^LQvwlB)Xg4)%omS^gUxW7QU#a))5h}x#`~4d|B{M znQ_^($hJuPlAn36kKX0?FeNI?Y#7d`dZ9NNggkVMM?g%S;i^}}u-Gg2ZkPD593yJq zx0L+C-&KQxp_;`I{~ibG;Kl4Lg=HgQgCXZoJ1g(juR&+O_2lMvDd<}Ch0RC~pJuIf zhRh7t-=w}-FL_;>ta)5^=s|DP;TE`?Dc)9ZOl*g-;FG^MFl%$v60IFFt;?i%_xvg{ z2eg&PoS+sCHukZDE@a9rr-Fc-lp?B{KpLa8fw(PLwGzcC`W{H(eQ^ps7PWB>t5X}( zvTf3yAkrCZ{^%k%>dS0OOxhr)VFzZK2+2ycaR60q*D5$w<}GOEWoJ?hM>2w?TBN$f$o~Kk%m`;7j`?mlGIbuc&u{AreC9 z_uz%XAB#~$44XHUPHvGG0C4Z@_ob-$hHh$D8Cz02Y#|%rTUF%`wd|c)+q{nfZw_0G zneJ@Ic3zlXjzxXBu{zr@Qj}Rgz8xOR+-zBD_SkWZL!pH`5mvlxNLIJ;W-9mbkf|nOSb0kKor}f`pz2Ivywo`D{dFtkSG#cnSW+_D$%=vrD{}qY9`|qi{iNjN;aZKUmdPO3v|y{x z?3*QV%HxoIlk)Om70Jl>XOOmf>yDcx#)Yi8x3y|+VQW4eqbNyrTlycb@KvAA#f}u+ zW>RU+;^+48peGkKo2#nt6*)v^#TXQQOw~gyGv^6@LUEiQ&>rXale&w=TrTRAJ7f+o ziJevNm}i$G?t5{?|9pD10W$2-rG4a7st;Yo+le(+i_U5}=+Hg^wL9S6_T0oElC(CB zaWUs22VmFhcxB!7Q~avX4x57l$KJ%7w(h!b!SF+r=b zw>8VwuHNLJAG@@P){}BFO3r(8`#)yxFC0nJ@mb^UC1toecb2HrGxrZwR)$6lE>#p5 zNQ}Trk$geL3bZ{0Y$+qTi1-L{1Ofp5?Hv#pkc#ayR7qVG6Iyc;nAK*if@V;Gm+2mw z(m+>kJU{bEBD|g7YZ7|5^A@GJn^b1LdGd~VI!YiCpsTH%ZgW`5(r7@}U4N9=Diw5) zm4i7=)b>mCU=fOEXYdX+4tpuan51x}mk;TcxMJ^{*CSB_FWVpz!LZrf<5N1Y+D}-j zi$CtwfkVIp;pPJ(>WgDeQ$Xv4{pGOy_9M=#xM`4SpJNhWS#Q4_8|}5n?j>4wgJbJ* zwt0LPXFrWK4zi|%K|{#;#yACJg?HbU!gfzg?D7p&w>G8{h!Ip;^%y{Yv_K1L^vAAr#HY+z*YKN_yM*5MI{0N$o<#- WLl@}>wT}Zs=t0^r@#C<+Pk#Y9mX0U@ delta 2385 zcmV-X39k0kOOQ*j$_9U+B8h_U0ssKg1^@sL0001ZY%h0ja%*C5Z)+}iZEUPn+is&U z5Pe^1{{it%!Gw?ml~f@YZKd5R>h&d3$%sVTEkbGV&3)42w-!ScGQ7L8W{;L*Ett>nS$FD z>Kc`R+lL1^(71o?PGCCODq}=&$ye$OpzVhAiT}v45jqM%bsB?@A$hi-PfX`<&r0~8 zWaaO%`~w(rzKn)ITD4XJ2;L{rx_fS}IXqvnl-@VeHE>Z};Y?>LHH{QYHI12~acK5n z$hY(`0bYr+h)R}%)$KcO*R+RwInM%9w!_`Y+Tbn zB@-0R4oC>xffkbhFXbGo#3)4?n&V(`mxCtfg8!yO$;B1jMrlbOfS6c}q@*x+O(ib{ zp>i>;2u&Ango#g2!9Pe76CD{FqR}vJ-rq+Ch>M_=-&_d;-Y+LVAq6-12@(Qnk9X(w z5+aT|k2!x40eXCK#xs8~_8kjFy^iILx{);)Pa7GrE-rRp_BnJ+M6HTM&)khpPB| zJlxjC2NtUYR&*Q>{BGucP_|BhG3xl9r%Ah-S!jPAF`6`tW^h@$IbvkLp;XsTpjP)r zUTgkF*Hi?BTK9F3LF0kmLtMtFPGb8R!6}&wLwEH;A7b6nD`=&DN>%ruJqGlU=Zt#J zz_Xlbr)zorfot`>j%$s*i97A~rju#Z)%nr&KlmS2us#Ao`(x286D-uNz+?lzqiec~ zumlc4H4Xt^&|}NmZoeA-1(T5j6tgZ0GXe<<=Ip?(1ONcOlWGhhf7_0mFc60CEA<^L z-vDnA*-sRo}g1a@s1=Dp~~g;PHI_3?61r2d&5stdpiK zX%fYhKr2io+jU8Qd|wQvlsM1ZiYwDXNsr*@)BOFr+1}WVYXCe!LhDM}c;6L_InjXT zE;1do=&6m>+~ccVe>2xv;8h=_6-(ndW17pBo(P3~gkkDh3V1eRtD*HLhy}$x=Ibq>}#FLn+asSgu=R`AT8khh)SBIas_?e1;d9e*I2KOJR*O zwU3a@PC4I~pR=5CaV6c?{}3h_F$+5x4)BIb-{(1D8U+zy6cTYHT84iQTaF)2xy#BoXicLypJd}K z9aAE<&Kv#f>^aAuBJrsDNSya)e->qVo+i@?My|m5g$&8PO2ISgDL9`g=_DFo^R$2e@s{iqDcK}s}Aa8_jL%G*f$BP z|5_iz98$-Z_S5V6d~wIiao>Nwe=k0tDykOK$MJ3ApB}qv@k8zL^!W1Y&eQ4qc6q8+ z4{f#YPrmh;d$}_4?_c{>zx>+w%hQbwl96VkWVL2avbNLkAYn7JC9BW=wZWfzXa5%b zB?FC7f3fIsJrq}8j{~ZQP^EZEO1d#fbMGv@25HGQaOjeC@M&Fhl@@x}&vFRmf^=(; z=H6L)3(}J9Kw2`ibAAw$!8?R%>7;q2|2^K^8^;5WT0+7BR}d$>%W8*eoHR8bYlAiS zMr#;?K|+EV9Tmh0S!b<7wP3w5SaWZ*#tD&-fABIY2!AEF$y$eM!Fp@3=H6%xvpYyg zcpDXj&+E2X>rgFN?+n)5J6m_Swh5U zMU%`~W!3pD{emgEo03u{R|n4@NChHZOHJ`!GRw0&_3p`cm0P`ZTP+bvG6@^ZP)%W^Mn$`1;6q@h@^^!j zEJ^B{=ZSAHloV}Yrbk6Pj3uV|lfRp%F=Po;-y9P)8F@vMkykVs`FyDI1Mls4ORSR0 z)nrX7nyg7l+hoV*qm>_+b6>`P>i)B{5I_wHjI)pTQvm<~VYB=lBLRO;!yp)j?@jy< z4fh?iJ2*+#Wgg~@TTJYt@s7Z^t+7x7Xx+b;wp;C@@el3XJEZ8RUh3*LrZ`^)BCv8t*;HEcAze}rFGkI&6h!(7#~ z;(*dbaLNrZSDI8Ztq%$A?bOpNm~|^Z=xq+-=8$HK``}@-4%SPHRf2!Vp4aHNP!NF^ zqOJZZc^Tf`WlNOCBpQcg5|VKiO=)yZhoiUp_OtV~V7noY4*wG4Q5cah9%bZ;4kt7w zJ>m(FHs0r-BK?z)0~ND+AWj1cpdyKa?*ae-(gu^#BTWL>36mitEF25w?7*%B006!c z000;O0000000000000003k;KQ3>uU5BM_5B5fBUj00000000000Phf!uOvSKq?7L? zIsvGYDkUcyjI)pTQvm<~VFCaE5dZ)H0000000000005qoY$ZMcD3hxtBL?~+00000 Dm+fWN diff --git a/Assets/Resources/Excel/CocktailDataTable.xlsx b/Assets/Resources/Excel/CocktailDataTable.xlsx index 5f244f5e53f9e99cf16f404989527c41348c1159..c6372d34bde84cab3d80d0ae93eb73ff61b93278 100644 GIT binary patch delta 4967 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 VEt2b200019@1X04(ma1|{{fYNFaiJo diff --git a/Assets/Resources/JSON/CardDataTable.json b/Assets/Resources/JSON/CardDataTable.json index 0493e324a..58872484a 100644 --- a/Assets/Resources/JSON/CardDataTable.json +++ b/Assets/Resources/JSON/CardDataTable.json @@ -18,7 +18,7 @@ "Img": "HeartAllHealImg", "ScriptText": "하트 전체 회복", "Max": 0, - "Ratio": 10 + "Ratio": 5 }, { "Idx": "AddLiquidB", @@ -123,6 +123,6 @@ "Img": "GaugeResetImg", "ScriptText": "모든 손님들의 기다림 초기화", "Max": 0, - "Ratio": 5 + "Ratio": 10 } ] \ No newline at end of file diff --git a/Assets/Resources/JSON/CocktailDataTable.json b/Assets/Resources/JSON/CocktailDataTable.json index 7131758cb..4f962df31 100644 --- a/Assets/Resources/JSON/CocktailDataTable.json +++ b/Assets/Resources/JSON/CocktailDataTable.json @@ -137,13 +137,13 @@ { "Idx": "Cocktail009", "Name": "칵테일ABE", - "RatioRange": 10, + "RatioRange": 20, "IngredientIdx1": "LiquidA", - "IngredientRatio1": 25, + "IngredientRatio1": 30, "IngredientIdx2": "LiquidB", - "IngredientRatio2": 25, + "IngredientRatio2": 30, "IngredientIdx3": "LiquidE", - "IngredientRatio3": 50, + "IngredientRatio3": 40, "IngredientIdx4": "", "IngredientRatio4": 0, "IngredientIdx5": "", @@ -152,13 +152,13 @@ { "Idx": "Cocktail010", "Name": "칵테일CDE", - "RatioRange": 10, + "RatioRange": 20, "IngredientIdx1": "LiquidC", - "IngredientRatio1": 25, + "IngredientRatio1": 30, "IngredientIdx2": "LiquidD", - "IngredientRatio2": 25, - "IngredientIdx3": "LiquidE", - "IngredientRatio3": 50, + "IngredientRatio2": 30, + "IngredientIdx3": "Garnish2", + "IngredientRatio3": 40, "IngredientIdx4": "", "IngredientRatio4": 0, "IngredientIdx5": "", @@ -169,9 +169,9 @@ "Name": "칵테일B1", "RatioRange": 10, "IngredientIdx1": "LiquidB", - "IngredientRatio1": 80, + "IngredientRatio1": 50, "IngredientIdx2": "Garnish1", - "IngredientRatio2": 20, + "IngredientRatio2": 50, "IngredientIdx3": "", "IngredientRatio3": 0, "IngredientIdx4": "", @@ -184,9 +184,9 @@ "Name": "칵테일D1", "RatioRange": 10, "IngredientIdx1": "LiquidD", - "IngredientRatio1": 80, + "IngredientRatio1": 50, "IngredientIdx2": "Garnish1", - "IngredientRatio2": 20, + "IngredientRatio2": 50, "IngredientIdx3": "", "IngredientRatio3": 0, "IngredientIdx4": "", @@ -197,11 +197,11 @@ { "Idx": "Cocktail013", "Name": "칵테일A2", - "RatioRange": 5, + "RatioRange": 10, "IngredientIdx1": "LiquidA", - "IngredientRatio1": 90, + "IngredientRatio1": 50, "IngredientIdx2": "Garnish2", - "IngredientRatio2": 10, + "IngredientRatio2": 50, "IngredientIdx3": "", "IngredientRatio3": 0, "IngredientIdx4": "", @@ -212,11 +212,11 @@ { "Idx": "Cocktail014", "Name": "칵테일C2", - "RatioRange": 5, + "RatioRange": 10, "IngredientIdx1": "LiquidC", - "IngredientRatio1": 90, + "IngredientRatio1": 50, "IngredientIdx2": "Garnish2", - "IngredientRatio2": 10, + "IngredientRatio2": 50, "IngredientIdx3": "", "IngredientRatio3": 0, "IngredientIdx4": "", @@ -227,11 +227,11 @@ { "Idx": "Cocktail015", "Name": "칵테일E2", - "RatioRange": 5, + "RatioRange": 10, "IngredientIdx1": "LiquidE", - "IngredientRatio1": 90, - "IngredientIdx2": "Garnish2", - "IngredientRatio2": 10, + "IngredientRatio1": 50, + "IngredientIdx2": "Garnish1", + "IngredientRatio2": 50, "IngredientIdx3": "", "IngredientRatio3": 0, "IngredientIdx4": "",