From a54b2895bd2675496aa97392c6e84f2e730d40a8 Mon Sep 17 00:00:00 2001 From: capers Date: Thu, 19 Dec 2024 19:55:07 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B9=B4=EB=93=9C=20=EB=85=B8=EB=A9=80,=20?= =?UTF-8?q?=EB=A0=88=EC=96=B4,=20=EC=88=8D=20=ED=85=8C=EC=9D=B4=EB=B8=94?= =?UTF-8?q?=EC=97=90=20DoubleServing=20=ED=99=95=EB=A5=A0=200=EC=9C=BC?= =?UTF-8?q?=EB=A1=9C=20=EC=B6=94=EA=B0=80=20=EB=B0=8F=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CardNormalDataTable.asset | 24 ++++++++++-------- .../ScriptableObject/CardRareDataTable.asset | 4 +++ .../ScriptableObject/CardShopDataTable.asset | 18 ++++++------- .../Resources/Excel/CardNormalDataTable.xlsx | Bin 9152 -> 9201 bytes Assets/Resources/Excel/CardRareDataTable.xlsx | Bin 9128 -> 9161 bytes Assets/Resources/Excel/CardShopDataTable.xlsx | Bin 9167 -> 9292 bytes .../Resources/JSON/CardNormalDataTable.json | 24 ++++++++++-------- Assets/Resources/JSON/CardRareDataTable.json | 4 +++ Assets/Resources/JSON/CardShopDataTable.json | 18 ++++++------- 9 files changed, 54 insertions(+), 38 deletions(-) diff --git a/Assets/02.Scripts/ScriptableObject/CardNormalDataTable.asset b/Assets/02.Scripts/ScriptableObject/CardNormalDataTable.asset index e11ffbbaa..7cac21c63 100644 --- a/Assets/02.Scripts/ScriptableObject/CardNormalDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/CardNormalDataTable.asset @@ -68,40 +68,44 @@ MonoBehaviour: - k__BackingField: GaugeTimeUp k__BackingField: k__BackingField: GaugeTimeUp - k__BackingField: 5 + k__BackingField: 4 - k__BackingField: BarrelAutoSupply k__BackingField: k__BackingField: BarrelAutoSupply - k__BackingField: 5 + k__BackingField: 4 - k__BackingField: ServerNpcUpgrade k__BackingField: k__BackingField: ServerNpcUpgrade - k__BackingField: 5 + k__BackingField: 4 - k__BackingField: CleanerNpcUpgrade k__BackingField: k__BackingField: CleanerNpcUpgrade - k__BackingField: 5 + k__BackingField: 4 - k__BackingField: BartenderNpcUpgrade k__BackingField: k__BackingField: BartenderNpcUpgrade - k__BackingField: 5 + k__BackingField: 4 - k__BackingField: PassiveRandomChange k__BackingField: k__BackingField: PassiveRandomChange - k__BackingField: 2 + k__BackingField: 3 - k__BackingField: PassiveGoldAutoGain k__BackingField: k__BackingField: PassiveGoldAutoGain - k__BackingField: 2 + k__BackingField: 3 - k__BackingField: PassiveMakingBonus k__BackingField: k__BackingField: PassiveMakingBonus - k__BackingField: 2 + k__BackingField: 3 - k__BackingField: PassiveServingBonus k__BackingField: k__BackingField: PassiveServingBonus - k__BackingField: 2 + k__BackingField: 3 - k__BackingField: PassiveCleaningBonus k__BackingField: k__BackingField: PassiveCleaningBonus - k__BackingField: 2 + k__BackingField: 3 + - k__BackingField: PassiveDoubleServing + k__BackingField: + k__BackingField: PassiveDoubleServing + k__BackingField: 0 diff --git a/Assets/02.Scripts/ScriptableObject/CardRareDataTable.asset b/Assets/02.Scripts/ScriptableObject/CardRareDataTable.asset index 603062cc0..ccdbbf3b0 100644 --- a/Assets/02.Scripts/ScriptableObject/CardRareDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/CardRareDataTable.asset @@ -101,3 +101,7 @@ MonoBehaviour: k__BackingField: k__BackingField: PassiveCleaningBonus k__BackingField: 3 + - k__BackingField: PassiveDoubleServing + k__BackingField: + k__BackingField: PassiveDoubleServing + k__BackingField: 0 diff --git a/Assets/02.Scripts/ScriptableObject/CardShopDataTable.asset b/Assets/02.Scripts/ScriptableObject/CardShopDataTable.asset index d0df25155..5b11cda80 100644 --- a/Assets/02.Scripts/ScriptableObject/CardShopDataTable.asset +++ b/Assets/02.Scripts/ScriptableObject/CardShopDataTable.asset @@ -36,17 +36,17 @@ MonoBehaviour: - k__BackingField: SpeedBoost k__BackingField: k__BackingField: SpeedBoost - k__BackingField: 4 + k__BackingField: 5 k__BackingField: 250 - k__BackingField: GoldBoost k__BackingField: k__BackingField: GoldBoost - k__BackingField: 4 + k__BackingField: 5 k__BackingField: 250 - k__BackingField: DashCooldownReduction k__BackingField: k__BackingField: DashCooldownReduction - k__BackingField: 4 + k__BackingField: 5 k__BackingField: 250 - k__BackingField: TipBoost k__BackingField: @@ -56,32 +56,32 @@ MonoBehaviour: - k__BackingField: GaugeTimeUp k__BackingField: k__BackingField: GaugeTimeUp - k__BackingField: 4 + k__BackingField: 5 k__BackingField: 500 - k__BackingField: BarrelAutoSupply k__BackingField: k__BackingField: BarrelAutoSupply - k__BackingField: 4 + k__BackingField: 5 k__BackingField: 400 - k__BackingField: ServerNpcUpgrade k__BackingField: k__BackingField: ServerNpcUpgrade - k__BackingField: 4 + k__BackingField: 5 k__BackingField: 150 - k__BackingField: CleanerNpcUpgrade k__BackingField: k__BackingField: CleanerNpcUpgrade - k__BackingField: 4 + k__BackingField: 5 k__BackingField: 150 - k__BackingField: BartenderNpcUpgrade k__BackingField: k__BackingField: BartenderNpcUpgrade - k__BackingField: 4 + k__BackingField: 5 k__BackingField: 150 - k__BackingField: PassiveDoubleServing k__BackingField: k__BackingField: PassiveDoubleServing - k__BackingField: 8 + k__BackingField: 0 k__BackingField: 500 - k__BackingField: PassiveRandomChange k__BackingField: diff --git a/Assets/Resources/Excel/CardNormalDataTable.xlsx b/Assets/Resources/Excel/CardNormalDataTable.xlsx index 3207148c8e2f82d10faecf911dc999477015fcd0..a96ba6391085d0b32e44d057e9fe2f744a291ffb 100644 GIT binary patch delta 2713 zcmZ9Oc{tPy7stmkn2E7u%h>mQHxc5JonmAgqNWUPnzAIy^ur)ThGDE_Z9=w?E@d0J zmdHdQ!eklSJ7gzm-uma>_j%7>=lP!V-{<*$&*`+;w5cE9fb3_4M4V;=fk4Dj4kaKM z;?hdexQZWYP9!Rdu(4=-;ODpdh`jip;^h+aIvjqFdXLvsFpw8lirJTlP`0vj^&5!* z7XWg&9~e43bYl}SOjRHXiCD$h4O5bYUf4#4NYVm&^{&RdJPpjCItr?HdQ?-=_oa@T zU-56D72bkbV@jd7sxGb+V1%Bj1JB$pWL1OSq529{a|gm2RTawYvUSN@gH0Om48jIZ ze33oak`YC>(RB(^{(A3Kg5vAft%|vyz16Tv-8zuDWt1&)JLs*f77MyZueMgqIdyBo z%up-7{5kiRnM{^R`-7HmO2YaPuTJJhG!I0nTPciHaZ)i3cY6VJUi_C6T|mTX4qnSp z$9~P0_g^*CR({H>?F+waW0M=xD&r@(mkCM5?Gpp>-dM!UtoL^69am^H}Z{*zOl9auMaxLQ?g0KX5>hq~XG^M*KA9Z1ucaj+E?9;ifA2QCY4-DIwR`LPbU|Iw zS-+0s(j~1~e8^!MVFml?M@&{wwOo+J4vKebb3cRK=ILzz?OOS`%`RYv4;gVzOD0yD zxIk{_m9{Jg+~1BU1q^eRz#mDB8&G2PvEec4_ppZ{UMnl}O5Ga;s~`lTwC?mcR>0 z{nsv;ySHyP2RS}7aZv%12;6Nf){IH1)S_pdITJH{!X@tdb)eaKy&H#vG@bCU^z=iX z5_%ID?UbHEws^Dyain>U<4&S0xcoL`cm+nv>yOmQUM4xVcZMEHz6ie1(bc?Kk96X- zUo=lQ9E%K$dUVAK*Z01!F)d^CRa&y%%d#%*eCw~~0XDP3KbeXl7zB9!Ν+hpc?0 zkfuf3Le<~4RU^2r@qGguL{ty0KR;%Ih#72xjk-`hRtS3p1hVkUJ)J}>w+!HvUZBmF zxRL!`N_`d|>oma=S3OzlKJER9(fe7)vL1c)&w}WRRbWHZVnj73kbmOuJ(G<$k;;<1 zs0;~DB`5C@`4p8{_gwqtg3SBOJ(GLIZ=+`1ee#6u@3PxSd2GxI-Mjj#mgO5eq(&`h z9+#s>KgX8;x-XnMXMdxbF6jp_5?kK0)+I{Uc#8F&8ue)omtWWuPOQAHLhDcRwOq4F z0{58GH^e@-B$InI42Kxa8yLzmjQ@INxf#sazNya-QS&0YhPp447xo8Cctf!0wH+q6 z137~9oOfi%$v5gOT|aVYzUEVCH~#Y`MLrC3MX8&`*Lh_MX)he$eiw+HZsR9CzVbEf z^P3zuJD~U3^+cRN{=tajbzr%wLjK9ETUP2H6^;oDQlnu1=V;|(DS^H9BAw0XV<bD!gSl)q-+bv(a)$ONDXfoIWNIp&iWu_}%GoSGH2JtI;-Fd) zRrkZAk;xr88Ywtj`T$r2L|Si`bzvBv@R&!d#>h<9!KmWgu<4(L7=P>Y}{*ThCFhc%z!R3TV#@xia?h0SmQDvzune8zvM#-?ELNb!e)(#;f1Q=5>0 zc#~&WLKJ?1;_}JhZTk3~mpxEXZb z77&P&3j`AUMKLm1D=hFzsQ)$B@X#P^K$vFajo|8RC+rt(?u31CD5vF-^{9GWX}!dt z;gG($H#dC=l+yDeVW3>rC5XP4eMza$*B8ZMX0nozzBs*h`Ju?SEe%i8Wk5is5iL&R7?Eip>g^?lywlxp2bkv%E>L5EV zde`ye!?Bn0Gn0wi*Up?<3U;p@9M}tT8lmn$ zUsp#KgnU?*yoO0v(gj%-jONN|rLOrhu(Q7F~vGQS49j6&Etg^4-MuF0WvzfyYRd(&2 zhm*@HrKWKLR7xMp!*vJsepJUknugl?J21D@G*Vv;do%P(o;K{s;}2QgN@JG{^U3%Gj^y;S{6!72}TBhoZUt#Zia- zk4eI zCUi|8ZK8{r^=5ZNYQRWU*W!W7si)UGM|8?gj!8u~jr%>m$-@g@Ro>LnftTw$tdy6> z^FZK)6LS#f@R{+B(gPxaO{ftgd7kZmKEO7a^DNRtZdncZKX(lV0*U@I(ZA(NyeMnM za)X#JYtAYwLi{2tCI0`8`*&GUj3^?fDE<#bRuG8)-|6p8oaiNI%92dXk(1-_mievx E7gwwG(EtDd delta 2622 zcmY*bc{J3E7ypjIWG73OvG0t+=pk!FMs}HGEnD`9EQ1(J8Dtq|kjOqr_HB|ZA^T2t z^2iplmNj1QymQ|B{q7(4+Hx8 z#uXo(EZY!EFTz4o)}o?>ToDp}Mh8aO6HPaR)*7)q)HPUDign`HWd#FRsu!|aCc zJ10cc;RA_3Ha$TflFSs#(3D7$;Vh^QOY+V{yj1^wJI$#o`<4E!oSUxlV;D2!^`Anl ze0Fk=F!!uvi@0%&@4y(TIPiNDc(Li-Zdkix3JWjDPKVcYTalmqhz6bgdB_}FSj z*5mYOeWFx`+T+)+z4wr6r;^B=9Y)VT8}@?1kIGy;uEn;ks4FkK=Y1!4EO2gE&=UBA zzb=Z#zRhoCiC1i+$P(kKien z?vG)bv2Q%AzV*=brI#%nsFNFAMm%9tnmi);26m_S^{UY#iR<64K-yhgu^vAXN7{nd zZq`B9m;3d0vRmQg zToThAlgY6ZQ{hbfPq@vYE*bIyiY)I}9~E8B$gjs4962y{|!ZrU`n9#%WPa0^FezB-$QcAk$c=OWRqZzL9T-mKlW36XFjNL`5tvtik6eXAO6 z_X8}~bxEvM9C2=?NJ21YNfQKRX_+sZbQRU@aMYBo-OE%y4>Cdo6CQ}hP5jE6Us_m4 zWsVI+*>rAu9#V|Gj}ucK^u$z*JET;pDy!qxOjrgBs3c!&Q`WT?9guRm+e7-0pDRn9 zz0&6v1E;WSedRJ8*k_T%3jhEv{%M4iInP#UT5Vh6H*iVqX@Z6@<24iCWWP@$7QQnx zgCG{jm6Bun9Z`eV3ZlOIopMrz4>6F6Un2d}g6d2+eK2kdLVXeWqry;mr=D7pGNHu5ppBp6`hKY9#!I2l|g zGbb#xg$X9BYk5S#OhPBA(}$6zp=^>z(kPsjl0xxGB>D@_w(AR4={mBW{fFhO{x~EJ01~=+Jd0~L+4F&`?wWK*V{51#wmLPal zPAF#1U{;#(`F7$7ed6{Dl1?e3Zn&T3eVmxZ)*#q?*WK>VzIQ*_CrRbix1u&~q3%`-tQF>}gadC*RVFh_$QdJ#L3etS6COu7Pb*Ym)`y?Ip)v zK%f?jg4;`cu6x(~JNFLM*oI<_5Gm8dlT#&PLq?izL4G(r&!uy=&)c0k_NaZ) zaR+V7!_$N_IIN;>YMHD;atIj5k{NwqBThRwoAtF(QJ2{3Rum&~Ibd_S{_=8@GVyXc z<#dY(FX71+Jb`HS$ay29fZei*qTBr|R}Xe$T4&{K1mj-ebQa+Oh&P9|H%pfSpI|mo-R1>I)Wn5f4L+B0H*%~ W3~=FN1XV!h_%1;~N(uhIZ+`)(xX%ax diff --git a/Assets/Resources/Excel/CardRareDataTable.xlsx b/Assets/Resources/Excel/CardRareDataTable.xlsx index 29650171621ea18a05d0fad71598b4f1e8c69ce8..47766658751861f2982a7cacf3ca6a6ca8acc7b0 100644 GIT binary patch delta 2660 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 H;?L@T5~|XV delta 2642 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 diff --git a/Assets/Resources/Excel/CardShopDataTable.xlsx b/Assets/Resources/Excel/CardShopDataTable.xlsx index a5254da6c9cf04db32580cbc26189b7611e26e20..c0f3581919b66ddc3410820502e3ea52b5d7bbe7 100644 GIT binary patch delta 2352 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 WS{##TBRv7+lcpmh2DTvp0000oz+n{t delta 2250 zcmV;*2sQW2NY6*G$_5H7h|}de0{{RG2b0tWA%DEf5+(Uhh`hBU84a558csI87zk*I zj)+L2N>Z_d#U2Xux^K`u^xnfB3bcnlQPaLdhfh%>FL zz<;(?lCgrSo~T#}maUKl)i9M;wyGqfsmd7BMQ*!}Gq4NFOWYy^@;Mk{yX6UsL{b;5 z)Gdf)In_X4WxP@yT9G^luAuU|uB=296+mow&h>2ricygSCs(DAbd!VId(uaH3BLjS zi35$>?F6QStqPtCE!hn>IecIx2cOAm@PIXV z1S8HDqY;o+qm=-H_nBz@2W~E&9Bp~dE?Vg#T2(J;VKS9tlvAbSlxvoTcnDLmV~-2q zm8`2-&2zB2BjS#+J$aDxLc#=cKg~6hCDrU$lp3UVPyI_})nFfI0z{0K?1!3527k2! z5(0OirAa_HYC&~|YMF;P4%REEGZjgG!`3gS7x5CUUM;^nL+wfrE$U6qlgp(LdhPbm z?DTbvR@3u%`3)2pahk{T2ICPi=4giQ-hKG{{cr#L^kIGX%g=xP{>R<>Kh6BdU%|Nk zNYnJNfc}H3X<~wELm*pc+wrGC1%IDq&?$GJC4%uubPCx!qc@OCP)vGX>L-va;$4=B z49Ml1q3cB6eC}CNB;$v&<`<~U0yl77PW6vMX--0u85F~=uI=h#Nfex_`nm90h zPxqaLI6=+RM;dS1FglK92A?#Y?X7Xx9Eca3?bM^7%oOccyiCO|#1?VEsejw2(_Ld+ z@lFne@(9cx@+2iq61&e5nkNg1OxL_PCQe&BY_Ct1o*Y3BvgJUJ_|A0bjD5?A zy}sp-#;!H;J=Z$+BRB33<1Z+l^-X@v)e-z32WV40L3bw^mKl}$T+-wkZn7oY&Zq)G zwGIJK&|}Bi?!KD*3zLxp6tk%cGXf5pZ>PrV0{{S94gdfc0F&V&8h@OV+iv3^5Qgtp z+IK+Q$JkDrZml@gs#UeUSgG3MHNoQ;g@YGx4yyX@9q=Zpl$)rQjqw2AKLfw#cRQ`f z2Ar4H)U?QQO27!)NVBTx?_ZCTFO>MeO~aKnP}4nldbjxeX}+~??K^-#kYIdGyAb+{ zF)upM+-J52gCnhVntuoUbSvh22fRs(v|?qR&zR=Y(2-ENOBl9orGN)31`Q^R5C@6} z%-?si_XnC5m*6ya>!F_rt9wK&rIKNvppq^ncx7C;W6Qv&|1w{c!yFy^PZ^ zUhk)@cq_BE8Rph^>_uh5?~k@<@<-d`gRgaI4VJZYTHA(Njt+tiXRv|2!N#81a4&Ne zGeBxtN7D;9UiZIefV}~JVDNcTkCwwptqTQS8Q|C(;J{Cy66vI>^x8nj-biO>+|?qT zRF%Fp(0{Qv(n~h^tw<-;X~(`Z(6Kkt*$H<$kxr^g-y7)I8|jW+`(C7zs?rYzI`&3- z&FBY_PHL&`JQSAH!REl{7mxoW-E&@67Y|Iax5zf0IQUnh123y1up}O&k;iu*i=qLN zLECd&Va8!7DWRj>jo^z2Wj-}__IfjK7ahp>`OOb2|rk*A5VU)&M3AUXD{n( zXbC__6VR=mzZ7;W2PEqbEFlPK3OfD-z^XU{pN{GtT7nQ3Nx0er3cb|~d_tvP*bh9v)7}COcUNUtnz2s2q_fMgb_^h)S(gcL2dL)F44Qi%CTAPuGEw_Rj-da@LfU+iU-( zqwYCd@I%7{#WSgCea98i%7PPqZ*8dFH7^*+OAJMHvp zX5HKmdR2kA-52HbA$VLaf=$JAp5foI=XLrAD2Tud(S!aec^%x{moro(F-gOC6vk;u z#+2O9!SKDk{o;Hpc-W9fhkuF5FeD^Q#wCeqI-+TOMmzzE&inFH6yE@okpmQy2qX@& zA3y^NEQr(PI|Bd!4F{7-B257#lb9kc8=7yY#_IzB09y_K02lxO000000000000012 zli(sn0(cOU5fK%WJR>RrEt6*>Isq}0q9Z39KmplUQvm<~VFCaE5dZ)H0000000000 Y007+^ljS2l0cVpVBqIhnApigX00zn_od5s; diff --git a/Assets/Resources/JSON/CardNormalDataTable.json b/Assets/Resources/JSON/CardNormalDataTable.json index 1430f914c..0cc1bf9b2 100644 --- a/Assets/Resources/JSON/CardNormalDataTable.json +++ b/Assets/Resources/JSON/CardNormalDataTable.json @@ -53,42 +53,46 @@ }, { "Idx": "GaugeTimeUp", - "Ratio": 5 + "Ratio": 4 }, { "Idx": "BarrelAutoSupply", - "Ratio": 5 + "Ratio": 4 }, { "Idx": "ServerNpcUpgrade", - "Ratio": 5 + "Ratio": 4 }, { "Idx": "CleanerNpcUpgrade", - "Ratio": 5 + "Ratio": 4 }, { "Idx": "BartenderNpcUpgrade", - "Ratio": 5 + "Ratio": 4 }, { "Idx": "PassiveRandomChange", - "Ratio": 2 + "Ratio": 3 }, { "Idx": "PassiveGoldAutoGain", - "Ratio": 2 + "Ratio": 3 }, { "Idx": "PassiveMakingBonus", - "Ratio": 2 + "Ratio": 3 }, { "Idx": "PassiveServingBonus", - "Ratio": 2 + "Ratio": 3 }, { "Idx": "PassiveCleaningBonus", - "Ratio": 2 + "Ratio": 3 + }, + { + "Idx": "PassiveDoubleServing", + "Ratio": 0 } ] \ No newline at end of file diff --git a/Assets/Resources/JSON/CardRareDataTable.json b/Assets/Resources/JSON/CardRareDataTable.json index b93c04732..29d8f69c7 100644 --- a/Assets/Resources/JSON/CardRareDataTable.json +++ b/Assets/Resources/JSON/CardRareDataTable.json @@ -86,5 +86,9 @@ { "Idx": "PassiveCleaningBonus", "Ratio": 3 + }, + { + "Idx": "PassiveDoubleServing", + "Ratio": 0 } ] \ No newline at end of file diff --git a/Assets/Resources/JSON/CardShopDataTable.json b/Assets/Resources/JSON/CardShopDataTable.json index 10b87ee01..1804af29e 100644 --- a/Assets/Resources/JSON/CardShopDataTable.json +++ b/Assets/Resources/JSON/CardShopDataTable.json @@ -21,17 +21,17 @@ }, { "Idx": "SpeedBoost", - "Ratio": 4, + "Ratio": 5, "Price": 250 }, { "Idx": "GoldBoost", - "Ratio": 4, + "Ratio": 5, "Price": 250 }, { "Idx": "DashCooldownReduction", - "Ratio": 4, + "Ratio": 5, "Price": 250 }, { @@ -41,32 +41,32 @@ }, { "Idx": "GaugeTimeUp", - "Ratio": 4, + "Ratio": 5, "Price": 500 }, { "Idx": "BarrelAutoSupply", - "Ratio": 4, + "Ratio": 5, "Price": 400 }, { "Idx": "ServerNpcUpgrade", - "Ratio": 4, + "Ratio": 5, "Price": 150 }, { "Idx": "CleanerNpcUpgrade", - "Ratio": 4, + "Ratio": 5, "Price": 150 }, { "Idx": "BartenderNpcUpgrade", - "Ratio": 4, + "Ratio": 5, "Price": 150 }, { "Idx": "PassiveDoubleServing", - "Ratio": 8, + "Ratio": 0, "Price": 500 }, {