From 0d745b9715b7fe56ebd89beb891394fa4e69e1fd Mon Sep 17 00:00:00 2001 From: "DESKTOP-5RP3AKU\\Jisol" <2858626794@qq.com> Date: Wed, 10 Jan 2024 01:36:20 +0800 Subject: [PATCH] =?UTF-8?q?=E9=94=BB=E9=80=A0=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Datas/宠物系统/宠物装备/装备锻造台.xlsx | Bin 13942 -> 16606 bytes DataTables/Datas/战斗/宠物/宠物表.xlsx | Bin 10194 -> 10321 bytes .../assets/resources/config/json/tbgrole.json | 21 +- .../config/json/tbgroleequipquality.json | 900 +++- .../resources/prefab/ui/主页/MainView.prefab | 3977 +++++++++++++---- .../prefab/ui/主页/锻造台/锻造台.prefab | 662 ++- JisolGameCocos/assets/script/App.ts | 8 +- .../script/battle/base/role/GRoleDefault.ts | 7 +- .../assets/script/config/data/schema.ts | 18 + .../assets/script/tools/NumberTools.ts | 11 +- .../ui/Consts/Resource/PlayerResourceShow.ts | 3 +- .../assets/script/ui/Home/MainView.ts | 2 +- .../Main/src/main/java/cfg/TB/TbGRole.java | 6 + .../main/java/cfg/TB/TbGRoleEquipQuality.java | 12 + .../game/GPlayerEquipController.java | 19 +- .../game/entity/table/EquipForgingBench.java | 9 +- .../jisol/game/service/ResourceService.java | 2 +- .../service/impl/ResourceServiceImpl.java | 11 +- .../vo/pet/equip/EquipForgingBenchOV.java | 29 + .../Main/src/main/resources/application.yml | 4 +- .../Main/src/main/resources/json/tbgrole.json | 21 +- .../resources/json/tbgroleequipquality.json | 900 +++- 22 files changed, 5392 insertions(+), 1230 deletions(-) create mode 100644 JisolGameServer/Main/src/main/java/cn/jisol/game/vo/pet/equip/EquipForgingBenchOV.java diff --git a/DataTables/Datas/宠物系统/宠物装备/装备锻造台.xlsx b/DataTables/Datas/宠物系统/宠物装备/装备锻造台.xlsx index 51a5d530314d9cb4ee3b20f3c3995a0fddcc9c48..c12bb26b2fb1b2f4f086b15284e7570ea1875e80 100644 GIT binary patch delta 12258 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 delta 9585 zcmb_?by$?^_V&;r9g+?prAR7BhvXngC?O#!p)`mzuP8Dg%^;~DB`Gc4AR!D$cbD{L z$YF?YaL3ukKIeCx@9@WSJ=c3J?zNtKt#v=^otY^=jD6d}XbhawtOPo3SUd(8=uvyY z&)BxbQHQm1N&n_S0Y;2S2}~s>u-DyYZ2IP9sy?03usT1^S|qqG{D|@5NQ8oUp9<<^ zzd5s>OtoBZRpNP{GOyf%7q%#~2QNh>Nw2GfTU&c?fO2D>p={vOcfEpQk_7IzJn~Jl z5tz}+GU738LW>H4H(RNw%;CZjfWXFRK-n7e9>UB~g0s$bt89ztFquC(AFzRs>60)(KJXYwcrs+$qa8KB$eE z>BSh076|3lhda>3>h9f}l-DVldzLEW_?em?mTN6~!O_Yfl-FX6dp%m0AW(bf!S3Gv zF7gPmeabj9ouV+fL`>>${=nMY7h-=@66_w93f{)!rK@^KhB9AOzrx}+SRTHqYY)Fw zCVUt>BJL8j6{V@lQ7T=WD<=U;9YY-gfpr)q1Xv{)Bvb_V*dwSwAoF4nh!zCPm!SvV zP8zt3D<-sVqdtsnz3Us?`~;cPdor5j{IIY`RJ5(q{Nb360)-F-CFjn{0Zs?U0KApS zsO#lmD=8l~VwONXpraEwb#?PXEU#{_So)l;K5=~NgR`KYiLgw)b!Ws>GXu+xSFVkD8&0YlGu^ zdrWS*DEKCGc<%V3V)xlfKfL*##F+6`{a5!brr6}gveq4sr>`8`oJFQgyn!daZo=|DH-h0{9KHcx+S-7Ja+Zz> zwjqy^JEP0c%#t4MYV z?BGgbW3aFT9?kr{lnpg$U@}iiTGAldHm1JTU@|{nIQIZyEh>rZ@$@;^^z^tE9@1!n zSl==puAJU19}0gxJ+wBx)=WoNlcjFv6?de|S0F45RaVF=&c68wJtHsO`>@-Ua7@TToUvRh2b)Wrux+LhEt$m4wWmE6{W5Gj9)q{D& zj^mAhQTQ`)&2BpYHNLn!TW(BLcet?FSbQlK4b=FXt>^ao?si$H`9pDD>G{L2s$n>s z5)s2~8>+R|0jp4{JD0#F#n$f?jlJdYwtIE>60kz7F4YT5ea3}1+wzMix=zY1S1-5i zXY1Bm*7zbTPQ5P|WI7)qZu0?~_UoG~<>SYNdDGaqe2Tyx3{^FSgxfoKn0&ssrCfH3 zJepfXCL<*3rna^R?MW-ip^~^OVBKoTg<01T^SI6Jo12=_AJ&Ww78x!gabG)psU|Mj zpsbM!=nx+9e$gp>=q)#5=k7bNxRMRjdMRWBv%+x1xFzyI$#I=tolT6iU?)@JqB8AU0ggZFo#yJ*MK;X6Jyc8;&13g(*59<(OYWSX{q0=@G@XqP@a=tJR$eaAN#YmQ z@3oja2}Yz#tP3a~RESNPC!EJa-c$Wqm>WUNHT}+wVIc@iY8F;DlE$-X9V|UY@zh}E zqOYXHai2rNVmTa9ZHe?L@gC*|tYf5ab|wP}i#>2etR>Q>9}(o%&Y(P3 z7=tn#>R^>Kay@0@qp7YWrimE<{bv%b|c<;@TJX-U%F2KesW(Nbnulyc^2(n9MFO^jgy-9 z->587uRaK!z2Fi2YKyQ~?xc{;cKSL(*q@58xccix5;UVc@s;DPEPSC9mQw$)FO&gA z6Gx;4(=Jauk_Da<_bQo?-%X(9o*t$5j)+y8>BLKXpW3i}iPB!0vFAO)#2XYOJ- zN|k+rGp@$@`}>ArFTXppNAmqu%NH)$2iDI!q|%KuJm0A9Ityl9(0ZApNt~nLngtdL zv`i+dTL@K@VsNu4wPD(4N(FX0(>?2y3nO}`46a{(&|*$wMV+H4lyz}1#dCmpjFYwU z^Oie!Bhhd2rP|XJPi^=?9F1&7JUbNC} ztiCqz^%E`E08WnVU>5FRs+d+dy*$dFEw=s=%LZS>0m~wf>`A!BZ}IZO!`g3n6)V1X zAF&Ws&YFIruq~BdBTAd@eXN>lv&yAb?k`_LXeE?$>thzlU>a_(6iWw=qY?zAvfu;p z29G+$;V_Hlu?ExZvLh9CR5Ppa>5tU;c}^K8^6T+ z6d6c(Y3TwJ&_iWVd}=cGQ3jmHW9rBE%S=ntdW6 zh*p+GS;)XuEvG7Wwgf<1B=@iG+$YE`aiZP0_F__6oqiD=^vj4sr@($5mfpN3z3HGod@H2>#wYg!6z!XLvTPL-6UcN-$#1K%M`s|f=j$isN5 zT3Wf6Kgdah*jk{|U8N9&*kv?b_mx^!%>2KTvU9S+XgOV5t`xA|<@Nv8EC#ZvdM``< zCQ5&z?EHoDL$?59oax%2e7T##XdoAejww5^!c=TW6hnBGB~1 z+%Yh!)D57A0-z_y^P8~~UG=};c>h@Sj`4ydv1k=T zbN!h3*Ia*dW$_<6BUX9dF;czEYO3Y#3RO~|3GsWtkpE>PYQpI7+ul-R~X=b zg!A9R0Drt_c=@v(JRYtOHm_Fc7wy{VX4#p4Ln2OoaD}aFn=w@ z+By?1jWUKn&xOFQMG501^e0)1$i21LVb1UZwQ2BEYn2dsLgkSA6s$2Vf$Rcie{GBG zXo^r{QOAo4l3$RYG8z@EXo`Tz#nF4*e5}{`a1>uZm-rOO&TmE#avzg5rs0q6CSXR8 z=L-S?{fO5Z0*uM-Tk#20Kwbr<$>di(jmV_kyAVZN#HPp{M6P1i^4AvB5;anm9vBq5 z+M;M2albM>tADyK)kmm8B$^6AT(;A;XNBBZ>3l;(*-n$E23bwU^0wC_v#)>Hywl@EL( zj9r~LlGm6Vq=wGa@-{q6d`I#ZnvmstmL+w;0IF2K&bZ^+?x*;PV5Xt9JIBGtQAZV9 zI*FpvU^Q?IX>OaF@R?q%*z0i7wYJ2;6U)jp-ZZX!bYV7bZ28BGtGf!=A;Z9!{ZZfCH(6O?S72){o78 zoRd$VN3M~M7gy!CN8MOIl60#Wjse{J^=&%(u9QM0$9JG=22#$7h>vgwUvqORut#^O zPa6Tdh5+No#S?ys3jN&BDpYp^_yY>Bo6L6w)!0BXYg4Gpa0xqXl7S_~Pq&{cLz7`- zQzJ~!@Y0juD|91`Ku;^4%>%&E1iG2ORyj*P#IEvUb8z?|z}IBU6ST+AZw_}9$@H9g ziUlkjG`nhO@1T6j*Sc7=7(O;sZlr#VLoBsAN)+PGLROFFO-Euv7ow?75T2xJImJ|> zliOaP`Iy~HE1%s83^nbQ3sUBj^NObHPKHKEjSYfNXRg%&ZYohWMOSqSVulz9PPRTZ ze|;u&zs+om;*kTiC(jI^m7Zm zj6-nu%Lp$+_r-2dr%$a0+hFR1o1TrT3Tuar{?~i$3!OlPu5p=Hb)J{V6GN8D858HB zIFqQQr;S4w3-6Xc$<@mXt5F@J9mZFWxaH#^5ie~0z`>rcXp(?P|Le3unLiHF;H}$S z5_6goPy1_}u=ux%CuaQ|*A?G1Il7=WbRAdCUO>eM$%z2N9u>vfsxVx6M@tth#hDaJ zBA&y`k@Jaw5*|MzeG?q>vL#Oy@A7JGgVbFiLyusB5bvH17Amhx6XcN`(~s8gzrFO( zE%tbZ#H%|6D-D4Qb|0i|P-wImDb7=KaV=}mx3chcRdrD)6TBdmTjW|BhF&f7#0{2; zcNFx+mi8!ClHwv|X(o5L*6#ER8az%Ld>kK;pFaioURqD|?6kE8$>}}4y?ip<=v`vu zFsOa+#(;$|wHcsbKeXuF-!;O=4i7oG+ZTe@-su1jjr!M<2}5UT`B#c13xYTHRg`a- z*GCJ^XGblTTgIjGeRQx~kBzcy^}YJYsFw_+bK~}%Zw5E^jRoL`9F+DpZotVqJQZUK zy>7opCx;VD0n58`6_G?=-rP7QKEZloumWY_zG!E^Yv|R(GzMlIy3A9g47-w0rS)oyk|l1L;O?zj zd;5iDcIV>+n)c47nidZij4+@uB;)~;h@_hY1V477T3%3Lf+uOyB?0mn=4VeD`aVT4 zv}!2O%xIu?gfxFN!n)VvEcNO`wpSSuZzHH`b=7g~o!8e&~21A2y5tTT_5((VfWS%IUxMkOz!NuBYC~6?vXl6!u&p4L*J%6xE2U)X! z3%guM6@jK5h=Om9N0%X{)8O?ZeMd;5&P(Q0uqu^8mbrG2*+qGL;E`$IHCj^v92JGP zJV9L8Q5;~dQOtG~OIG?k3XNwkoRwOsyU9w0KA435@ zu?kT1$IqUzgBvNb_o+h!Uwwf*dQ8JQp?^wDe@`lI6~nG9fmYkH0R*MS=?Ed8DNJA% ziuSl0t0`BBeI-RHp98o(GA3)TH@Xi`$+Nw%?A|d+r<0>o`~k{fqfNjb>tz4to?i4s zL+0%(qDDGpYqJ_UWm~2mL1eo1In8Ny)CwJzhPk%W&FFugZr&~~_92CyFR|O7_azxW zqZh;0YvTuwSI|o#-SFSGDqCKU*Q2~j0Z>m~ZSGe+ZhN{*QN|{X2Zek_{#NPn@pDhe zE)EJeigp%es5KvwCoEm%*lh|)cLSRE z4X@do?y0snDY}q()qC2SRNglYd`j_&7@GUA021aR2cn-bBVBwuYW>Nf~w-!;iNF6q88K0bU1h$du3!g?`!1_t2<1-d}WfDKnLoxeq zW}cm*Mz_6+ZV4`BVDdj8CW5GRfzRv^r(XTijOx-yO59Mzln}#Rvu9L&D?nSDRr0Yw zOvAm|kU;+95~XC!ij}uYH9{lQJqfuNkmT{OnZB&!R0V^JY5X?wSF&mN<7WN+AF;|h zUM*_r$BMa&t;vSolg}YBSf%{FtRwMYUIgM=NnrkHIGLz#!u?q~j1r#9k+AxtBngPT zyIKR83iI`o-R@mJQqBVakgjxdJKEL_;_kU{CoU@x;Zkh-LGD4<~6d`|wWm7ysxuZ>K23o|0RX#k1?(1$Dj%5%Sr}cLbIE$kmngWH-Ng zSQ}}#6w-Qsb2++f2Ac+#g->wNpf90RgSdyff`#&7Z@X^ujuH(5$c!uqSf-lj!~cRm zp*)t+N_k=Gj9DXs?zKE|9bbljkP%)qhpMGk7JVIfrAa@AjyeZ7jJ9>nOsw05{i*~R zu9{y&a=d2BWB2Y=*=|e4mpQZXxfkLS(RKk=`796fpIuY781(3F>in&{8U1XT+qQx_ zt0RO^yZHu9S=@z-0}mD1HL*-h?%CnzrZICxz_RLZZDGUuZ>Rticmew?o|5doftTsV zvFbh1^SRe7e4(vOHM~ANdF}Z+EO+XO1BykbH)ch^R~j60@7a8}>0v8AnBTv?PsDK? z(c@N@u(ThR@!@0ihoOWN@jaoEx{tLw!eR#F<1yLRx0h)m=yrK~a-lif&Rd;YT?urx z{gm%BwB}daUzCeI#%ku#QV}L*@m>>`p2qq(a5vYw4P-&K-YIAGcax}b%v%#({&sIqyYl(LPvU0wO z*YTjni>K@!bxOsP-j0rrDtr>PjhW0x=JhXQ)2WEMn-#}4qv~(udEwiH}8nEmgq4o~QR#36gBg{9T1y29CE5Iz>4W8F7 zkHmFvTM^l2SGO!Al#H;wk&B5cTLVXi5Cmzads5iiGo&R^4NLk~;ey}Skq_Xliuk~K(1Bv?Zq z!EwXL<-qQnn^Q~_ZI2Rk)OQBIT5P+cPLMhqZev;lwV&K|RHa@mqZZd52+#>DboSPa zGVcfXGJQ`y*e;lD7)|{)76?T8`x}ItgR>2+_9hL`-UhF%1C48(#xyD%Xr!O`U|zMiSwT@Tru80_U7 zHhEnlpt7u1mij#-38CMcRF+rIE!oKR?vdx?kt@>cp&v;Nu+g~cPdV?tDGnc86jNR ze=Wp<&T_OC`@z?sI`e9&^_{ov@D}PNV#^1_qH6{jD13Tlxx;Hlo<))e4{RdEvOhX{ zkH4B9Y|`gg@kVwi=a+Zx9#q7+xG8Phi&MkXHB!HnsA^f?@2b8e4qnYA7z!0s=hP>C zd<&}bo@N(^8+XR6)tCkwmCmqu_e6T`g-2D0DqCh-P|I5Nq^WSESGAAp zY+>ud$9ulQBBi-t@sb9A{2mD@sf9rZQG`i4gu*J35fv&>5vkJ?j9rr=@3RbrD2rrkS+lM$sv`z z`n&Jl`@OgSSm%6epS90F`#a~`Yf5`krzQ=6^-vRGWdP3tFu-KAkb=~aKAyqYk_n|teo7T%7PTvt+h()%3R!IFz|X8CJ@E?oAs4g##IMS-{1iRynVfVwsBt`w z*g2l-ZM@i;Tpz5#o^~n{VP-orU-Duz6cy0)XqgonE+VKYh;+m9ic62aRO>N?qVlJJ zOcIgg!pSN&KXq@X#qx#kc0#1~MC-pC;NFyWxMcA8k~JMxYAsqr(k&LM#XiY?ZH^m8 zT$j7BARz8?x=bzO6oPQXD@i;zdq@Jm?IQ0%n(^c4GduJ1i_7!h*Qcm^y7jdJ<=Gzu zMBz5(w|%$C%jfn~C^}^sg(!ZS&rs^=T5S$6v(M~`>JCq{9qSV9t;PX?nS!}+%-#f} z$#+PUFPc*06$%#J3DD8Nz$8aQL&HIf()upf@afGPI1qywHtdKLBv!tPxDT6H{f5-F z#$M`4!c?c?6CGV0@UX4{u?{*Y?sXY6Ki8mIX&Bxhv>zKOMi@&57YR1aafgAv5aWFH zUP1&u%4^PMitKJxX&lXeH?aQ9q-Ds}bxO5J)yhnO_XNjQ#MjNmj0O5zexNTBYy{qG zNJ%&=Szuj(dCO2W{(zGYF~_3lP=iu@VJJLof%fgmJBkIzpr-n^Lx=NLzw5`cAzH1S zqwA)l6|HueSY96t06oR{shki@iN4JAhDFfVYx+>svL>@m!Z~71R>s#!+TB>|ZsI5$ zwOeFLxEbfoUY0o-JTb8*2=Y{LkL^T~o73MrkePEhA62X*p~9WjbW@8hy@h$~c@rI_ z5R~qtg@y64TTf`cz_Z&azp>#Vm_WEcraZ1nG*meY3k^+?9R3xP31;evkiZXG%eo`N zKaSE!wcr@cB3GC`?AW_YAT6`P4Z(1kuI~!6rDd&g@NXj8j=OzU2Ze~^!-7g26%gVy^VWkBmOuly?iMFLcuv ztsVW-urK9##zd#^y+J$#am`n^*wkapEg2Fqd#(&sIm898VD|M3CfV%`h2COuDxu3V z**eD^#gLy-qN4qZo#@69G7S9I11zTgMNGpflI}ztol8%w!aa{{>bPj<^EZZbK%hb> z;Hx$86OKjQK>~@k+?L>ePPbDeNrG&&YAO_(+k(Ma{BoH9x!zk9C|Y|?b<+EpJ01%X zdHndIZj0FhHZeQ!RIucLeQ8APwzW_&D`a-b%BYAJKz6dGW@9v2ni833UH7ha7Ne8| z6>q@4qOQMt&Q0&@5 z(5x3)c8=*bJafs7<*P0bIDGizzNtbHxegC6JKw2+HSW1N#C`ql-RV zOSr)l;{;l?=CB&$q0 ztnJFau&5J;4UAsZaBZAC5-m%i1@<5NxWh&^Ciy_59$Hg@(a+G3N?b$0gR(hHUoez_ z4MH_yAw8%nWz#i!;?*agy|It~wa>u5MSc5`l(LY=EuRfLb(=T3c6dHSsKft+e1oRf zGn@)XfW(5iUBx%dE%AhMgT6N)oCt@J1kC&vrXrCgD)`CNoUKMdEV5CD=h5QVhgU+O zD^5aHQ}T&Yoa%U}KR|?%=2R!kdZUxZPwJ(UChoB;uPff8sdM>LG#5v{-sP8h$niJ* zaC@9_5(}nwCEth>;08gjWUpzs56&?OnCY$3ukaI^4d_&NjjwlQH}@=cx?&}*M9ptl zpv_$9z3$NTt1fW-yqG=oXihvad_6c%qiRz^eZ|*glUtIZJpzK;H#-7eCaMi{EnK^88UioXa5|b2pSz*H^C~1-~Th<{wRO*_39705`0JVeOayuhg{_ zN^V=3x4vvkKyZ9Bk_sLFWy~lXH{oQql#}!DFOJS^7^}0q4dhV^^7-|yjscwg<=Zcs zf)By!p)@*1V+cb*tiTeJyI3T{MbCt>sg1Lm3r+_%{;qw5!Lb@%fCvc( z^dZ@qD@gZbK3fO`Q+#W`&hnB9OD|kNN`&j@$rqOf`rL{*{@mS8L<~BYqkn}7eeOK{ zN2I>Dn4|xc5+MAO5*S_>$$>IgYA4#+;E^PXoAWgXK8EyiOH+y#D7-yi&$N@w=qql=M<}EtKK6qs3qqQ60vSpvt=_@^&fgdMuV2j6hX8u!@Z1 zz6ckx^`WuiT{l`UGl$*NK48}~<34=^%Z$`3J-|gnqcuW9Blzi+ezbHC0-^ zgifR5W!hBL-AW0$v~q8DF$rsUcCX1coOem}=4g9ZCZm;{#+Y=EI+`zYfDd1bKt?8=JEStvNSl{psM!)m%0@}rZ zbNKrWHx=)-pDkk(dw%=*62M*TVRCROQXXX(m?)5*=^*hQU_SCM-CGz9IXpH$00 z4;dM4ZgspGozr|}c!DnKvZ+Xm&iHQ#H*?I5AxN&V1v(}@kf-_ zScp~4QC+W{Vc!G9Mb5~Yq|S<9EMz!*ge*0!RbOsxI3x~@tH*rwlJ@fe8bwr&dB4R@ zL{L|fmg@3vn#BXgg4rN^is^${m7^Q9Qomvl7Xzoez8_59 z*lXubBM29dh-1G{&3Jhv!qU~;Y}e3xQ{ilDDs^l=uxc*aM+VO!y3t?MN5o#>nwWJ; zy3_TKYn5qtNj#jboK?%FS=3$6kDuXOq4_O(hg6+7yL^l+koA&j~Bn<-EJ0Y>MROQ?nRlf@Nu1z`k@0)vYWck0vMF z2?j&M1|f<)_(RS;-+t8SiHH`ZSJHo0TTFfp(2kaO_IsKo_R0)#$Xk1a`H0}uHRYWk z2MlqhwM+&&|48#$xW85f@dDzssMLpE#<@HbbR#X%IKMur<&A@69BwMotu9RgkmM{Z zhLg0|w_;#)s`a1}V4I56ganp#a?y~}YK_nSYtD=rhKr|mWYkhkvuvD~rVXsP>Yauw zVlUdh99f)%iS52uWse_1c&!^M1lNaZ)Ywv2F8*{1Y5X>H>nH}~sVf1VGy_fNxVK!z zn(%FW+G-EpV!hMy>riS{wF8Z_cv{$Ye0wGObK9}Q!gcqBAME0i$Fi$nme!EMl5<#V z@6!V?v)YjRLj7~W&u!ZbbxWACi_zBG>G*@4R6D3_hUhfl^c3;=z32OsJF}_3?2pCN zn}YnwkJ~x_YoZ zDXZtyME{b|(vQcC`&H6Y4ihfUlsNRm@;NMLXBmJUHLC>-Nh)H$Ek(j$YhV5+SaZauB| zMPChZjgR-ho*CnwPj=-BWREhN0zY`=$Q~{qpd1{u!1KVl$_-QO z!no{`YnNdD;9{l*PhE_Px~v5(mb*OAQd_Py?IniuV#{qr}tdcxN&Kaa)T?uWicycz`o`~@pn8qNYXq_k?vt_uu@h=SfTHP@GDR{%c zzZr2DAd&V5-1-`OFJ6g-|f*tQ7q3#bSD+77Tt(LnU!DE%N6zXAwqE zWTm-Yw=}bhuenqBZTKo-WHr$1TXmehE0B1RS%j8- zvr7lGd`%U3gAgby8y`Q;%MH986XnLCj%S$3nRhBu2Tct5e_9P6JgipqJO=|e(;f=LB?9}2a#iNe(sUxy zsA1kf^YMClin@*4%cV7N5P8grnNEZmHS7#}JucmiLKWTYf zPB9#wzehyw;Ep`Ug3L_Mp4?7`-&YT>kusaR^-F1^#x3iaS@){RLV)u4)5ub_(acdHcL!J*TeEBFS_S931 z*^}(AVq`XA1V-V;<_HnXtv^}pq1wRJM|x6G%OgBA-)sSYoq>5KV2brBQ6O4{os;fMTzG-COl9bnC+iM3db3o~~$W|lcrv2Bg zc1GWT?+!mS#;z`|E(if*D;ieAN0OUMUFhCj#C2pDIHUpZm-IJKDRrGf4IAQjB`)hu zX!lamb7_-QjNtMK((cQLGOe`8NmKLYd!qkq4mFbYoKT^op*6x^(bB_QUr)=?_2=Pr zM!ESF=4(v3=!*^#7tC|8Xua%S$T_Ut;$Jn7yGWVuF>1CV$wHKjgnSB(CwR#Bg1r^X zC_e55RgzU-lqcgYU)|g-ANMD19+Z@YRErUBW|Cr?c(P9rm+KJ0D=-+qoaP;bqWny# zeC@{`a%Ao`TNdq>p8T+eG`3}c7;`UeWDk!Rxg1zkQAuw{$QD4pmu^VFAdD$vp{R!0 zsVg|D%o?1DR;jSBB$3~O)*#iR{d4zHi4$$^$9!W1VxM5ZNwK9VG%6j07h`mvJQma2+7pyUon5Z%t`o(bM_zvIQ5q%ExSJyA1}- zX6@3ORX%<$Byaw;oC(S!jMn68A%PM)gRym$~u@l(_3S#0}oFUwj97 z)AYS3Qmm=maZ{==k-o+F!Y;YLbY=(>S5 z>ZXDt$>M9<%dIG`0q*yu4$r^d9B&P};g?%zksFAug5#f9DBaah4hGB)#}rl!-MLKd z_l5EKP3U&yWE#)v9=9Ddz%L;Ufgk-PYx656$6S^jl<#O3P|9KqKHA&Yi@W`~j$36f zZ;F6>^_%zT_3`xjj{rIFbyhiaOeQ!BNEn@y32p>R{U0ay5F|zW*JtDaprH}|X(zHj zbJyPhpfUZy$8ZHUIczJ;e`Ybb6bBs~1|me)VTL!diJ|*2!w=YaY5&uRe@^}NF8{{A z)xB^Lb`IMAKh^y=kAQo#O92AmHSFSmV)zcb96BBYoQp#m5DK^DV5a@Ai-(3r{ZHBd QEnEdJ;NW>A3i?a_3tW2jyZ`_I delta 5705 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 a5H`?%M{j>u{CCM(Br7*B{zs0#uzvwLHJZ2p diff --git a/JisolGameCocos/assets/resources/config/json/tbgrole.json b/JisolGameCocos/assets/resources/config/json/tbgrole.json index 3699866f..0bb8e179 100644 --- a/JisolGameCocos/assets/resources/config/json/tbgrole.json +++ b/JisolGameCocos/assets/resources/config/json/tbgrole.json @@ -4,14 +4,16 @@ "roleName": "小石头", "spine": 130001, "roleSkillIds": [], - "roleAttackRange": 100 + "roleAttackRange": 100, + "roleHight": 140 }, { "id": 10002, "roleName": "坚强小石", "spine": 130002, "roleSkillIds": [], - "roleAttackRange": 100 + "roleAttackRange": 100, + "roleHight": 140 }, { "id": 10003, @@ -20,7 +22,8 @@ "roleSkillIds": [ 40001 ], - "roleAttackRange": 500 + "roleAttackRange": 500, + "roleHight": 140 }, { "id": 10004, @@ -29,21 +32,24 @@ "roleSkillIds": [ 40002 ], - "roleAttackRange": 350 + "roleAttackRange": 350, + "roleHight": 140 }, { "id": 10005, "roleName": "雷吉艾斯", "spine": 130005, "roleSkillIds": [], - "roleAttackRange": 350 + "roleAttackRange": 350, + "roleHight": 140 }, { "id": 10006, "roleName": "星球杯", "spine": 130006, "roleSkillIds": [], - "roleAttackRange": 500 + "roleAttackRange": 500, + "roleHight": 140 }, { "id": 10007, @@ -52,6 +58,7 @@ "roleSkillIds": [ 40003 ], - "roleAttackRange": 100 + "roleAttackRange": 100, + "roleHight": 140 } ] \ No newline at end of file diff --git a/JisolGameCocos/assets/resources/config/json/tbgroleequipquality.json b/JisolGameCocos/assets/resources/config/json/tbgroleequipquality.json index 4a8578b4..72f53c24 100644 --- a/JisolGameCocos/assets/resources/config/json/tbgroleequipquality.json +++ b/JisolGameCocos/assets/resources/config/json/tbgroleequipquality.json @@ -13,7 +13,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 100 + } + ], + "upTime": 60 }, { "id": 2, @@ -29,7 +36,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 400 + } + ], + "upTime": 240 }, { "id": 3, @@ -45,7 +59,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 900 + } + ], + "upTime": 540 }, { "id": 4, @@ -61,7 +82,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 1600 + } + ], + "upTime": 960 }, { "id": 5, @@ -77,7 +105,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 2500 + } + ], + "upTime": 1500 }, { "id": 6, @@ -93,7 +128,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 3600 + } + ], + "upTime": 2160 }, { "id": 7, @@ -109,7 +151,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 4900 + } + ], + "upTime": 2940 }, { "id": 8, @@ -125,7 +174,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 6400 + } + ], + "upTime": 3840 }, { "id": 9, @@ -141,7 +197,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 8100 + } + ], + "upTime": 4860 }, { "id": 10, @@ -157,7 +220,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 10000 + } + ], + "upTime": 6000 }, { "id": 11, @@ -173,7 +243,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 12100 + } + ], + "upTime": 7260 }, { "id": 12, @@ -189,7 +266,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 14400 + } + ], + "upTime": 8640 }, { "id": 13, @@ -205,7 +289,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 16900 + } + ], + "upTime": 10140 }, { "id": 14, @@ -221,7 +312,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 19600 + } + ], + "upTime": 11760 }, { "id": 15, @@ -237,7 +335,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 22500 + } + ], + "upTime": 13500 }, { "id": 16, @@ -253,7 +358,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 25600 + } + ], + "upTime": 15360 }, { "id": 17, @@ -269,7 +381,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 28900 + } + ], + "upTime": 17340 }, { "id": 18, @@ -285,7 +404,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 32400 + } + ], + "upTime": 19440 }, { "id": 19, @@ -301,7 +427,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 36100 + } + ], + "upTime": 21660 }, { "id": 20, @@ -317,7 +450,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 40000 + } + ], + "upTime": 24000 }, { "id": 21, @@ -333,7 +473,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 44100 + } + ], + "upTime": 26460 }, { "id": 22, @@ -349,7 +496,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 48400 + } + ], + "upTime": 29040 }, { "id": 23, @@ -365,7 +519,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 52900 + } + ], + "upTime": 31740 }, { "id": 24, @@ -381,7 +542,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 57600 + } + ], + "upTime": 34560 }, { "id": 25, @@ -397,7 +565,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 62500 + } + ], + "upTime": 37500 }, { "id": 26, @@ -413,7 +588,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 67600 + } + ], + "upTime": 40560 }, { "id": 27, @@ -429,7 +611,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 72900 + } + ], + "upTime": 43740 }, { "id": 28, @@ -445,7 +634,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 78400 + } + ], + "upTime": 47040 }, { "id": 29, @@ -461,7 +657,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 84100 + } + ], + "upTime": 50460 }, { "id": 30, @@ -477,7 +680,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 90000 + } + ], + "upTime": 54000 }, { "id": 31, @@ -493,7 +703,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 96100 + } + ], + "upTime": 57660 }, { "id": 32, @@ -509,7 +726,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 102400 + } + ], + "upTime": 61440 }, { "id": 33, @@ -525,7 +749,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 108900 + } + ], + "upTime": 65340 }, { "id": 34, @@ -541,7 +772,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 115600 + } + ], + "upTime": 69360 }, { "id": 35, @@ -557,7 +795,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 122500 + } + ], + "upTime": 73500 }, { "id": 36, @@ -573,7 +818,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 129600 + } + ], + "upTime": 77760 }, { "id": 37, @@ -589,7 +841,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 136900 + } + ], + "upTime": 82140 }, { "id": 38, @@ -605,7 +864,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 144400 + } + ], + "upTime": 86640 }, { "id": 39, @@ -621,7 +887,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 152100 + } + ], + "upTime": 91260 }, { "id": 40, @@ -637,7 +910,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 160000 + } + ], + "upTime": 96000 }, { "id": 41, @@ -653,7 +933,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 168100 + } + ], + "upTime": 100860 }, { "id": 42, @@ -669,7 +956,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 176400 + } + ], + "upTime": 105840 }, { "id": 43, @@ -685,7 +979,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 184900 + } + ], + "upTime": 110940 }, { "id": 44, @@ -701,7 +1002,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 193600 + } + ], + "upTime": 116160 }, { "id": 45, @@ -717,7 +1025,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 202500 + } + ], + "upTime": 121500 }, { "id": 46, @@ -733,7 +1048,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 211600 + } + ], + "upTime": 126960 }, { "id": 47, @@ -749,7 +1071,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 220900 + } + ], + "upTime": 132540 }, { "id": 48, @@ -765,7 +1094,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 230400 + } + ], + "upTime": 138240 }, { "id": 49, @@ -781,7 +1117,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 240100 + } + ], + "upTime": 144060 }, { "id": 50, @@ -797,7 +1140,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 250000 + } + ], + "upTime": 150000 }, { "id": 51, @@ -813,7 +1163,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 260100 + } + ], + "upTime": 156060 }, { "id": 52, @@ -829,7 +1186,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 270400 + } + ], + "upTime": 162240 }, { "id": 53, @@ -845,7 +1209,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 280900 + } + ], + "upTime": 168540 }, { "id": 54, @@ -861,7 +1232,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 291600 + } + ], + "upTime": 174960 }, { "id": 55, @@ -877,7 +1255,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 302500 + } + ], + "upTime": 181500 }, { "id": 56, @@ -893,7 +1278,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 313600 + } + ], + "upTime": 188160 }, { "id": 57, @@ -909,7 +1301,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 324900 + } + ], + "upTime": 194940 }, { "id": 58, @@ -925,7 +1324,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 336400 + } + ], + "upTime": 201840 }, { "id": 59, @@ -941,7 +1347,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 348100 + } + ], + "upTime": 208860 }, { "id": 60, @@ -957,7 +1370,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 360000 + } + ], + "upTime": 216000 }, { "id": 61, @@ -973,7 +1393,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 372100 + } + ], + "upTime": 223260 }, { "id": 62, @@ -989,7 +1416,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 384400 + } + ], + "upTime": 230640 }, { "id": 63, @@ -1005,7 +1439,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 396900 + } + ], + "upTime": 238140 }, { "id": 64, @@ -1021,7 +1462,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 409600 + } + ], + "upTime": 245760 }, { "id": 65, @@ -1037,7 +1485,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 422500 + } + ], + "upTime": 253500 }, { "id": 66, @@ -1053,7 +1508,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 435600 + } + ], + "upTime": 261360 }, { "id": 67, @@ -1069,7 +1531,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 448900 + } + ], + "upTime": 269340 }, { "id": 68, @@ -1085,7 +1554,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 462400 + } + ], + "upTime": 277440 }, { "id": 69, @@ -1101,7 +1577,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 476100 + } + ], + "upTime": 285660 }, { "id": 70, @@ -1117,7 +1600,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 490000 + } + ], + "upTime": 294000 }, { "id": 71, @@ -1133,7 +1623,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 504100 + } + ], + "upTime": 302460 }, { "id": 72, @@ -1149,7 +1646,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 518400 + } + ], + "upTime": 311040 }, { "id": 73, @@ -1165,7 +1669,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 532900 + } + ], + "upTime": 319740 }, { "id": 74, @@ -1181,7 +1692,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 547600 + } + ], + "upTime": 328560 }, { "id": 75, @@ -1197,7 +1715,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 562500 + } + ], + "upTime": 337500 }, { "id": 76, @@ -1213,7 +1738,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 577600 + } + ], + "upTime": 346560 }, { "id": 77, @@ -1229,7 +1761,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 592900 + } + ], + "upTime": 355740 }, { "id": 78, @@ -1245,7 +1784,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 608400 + } + ], + "upTime": 365040 }, { "id": 79, @@ -1261,7 +1807,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 624100 + } + ], + "upTime": 374460 }, { "id": 80, @@ -1277,7 +1830,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 640000 + } + ], + "upTime": 384000 }, { "id": 81, @@ -1293,7 +1853,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 656100 + } + ], + "upTime": 393660 }, { "id": 82, @@ -1309,7 +1876,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 672400 + } + ], + "upTime": 403440 }, { "id": 83, @@ -1325,7 +1899,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 688900 + } + ], + "upTime": 413340 }, { "id": 84, @@ -1341,7 +1922,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 705600 + } + ], + "upTime": 423360 }, { "id": 85, @@ -1357,7 +1945,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 722500 + } + ], + "upTime": 433500 }, { "id": 86, @@ -1373,7 +1968,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 739600 + } + ], + "upTime": 443760 }, { "id": 87, @@ -1389,7 +1991,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 756900 + } + ], + "upTime": 454140 }, { "id": 88, @@ -1405,7 +2014,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 774400 + } + ], + "upTime": 464640 }, { "id": 89, @@ -1421,7 +2037,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 792100 + } + ], + "upTime": 475260 }, { "id": 90, @@ -1437,7 +2060,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 810000 + } + ], + "upTime": 486000 }, { "id": 91, @@ -1453,7 +2083,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 828100 + } + ], + "upTime": 496860 }, { "id": 92, @@ -1469,7 +2106,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 846400 + } + ], + "upTime": 507840 }, { "id": 93, @@ -1485,7 +2129,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 864900 + } + ], + "upTime": 518940 }, { "id": 94, @@ -1501,7 +2152,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 883600 + } + ], + "upTime": 530160 }, { "id": 95, @@ -1517,7 +2175,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 902500 + } + ], + "upTime": 541500 }, { "id": 96, @@ -1533,7 +2198,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 921600 + } + ], + "upTime": 552960 }, { "id": 97, @@ -1549,7 +2221,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 940900 + } + ], + "upTime": 564540 }, { "id": 98, @@ -1565,7 +2244,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 960400 + } + ], + "upTime": 576240 }, { "id": 99, @@ -1581,7 +2267,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 980100 + } + ], + "upTime": 588060 }, { "id": 100, @@ -1597,6 +2290,13 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 1000000 + } + ], + "upTime": 600000 } ] \ No newline at end of file diff --git a/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab b/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab index 43852963..4e71796f 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab @@ -25,29 +25,29 @@ "__id__": 10 }, { - "__id__": 125 + "__id__": 221 }, { - "__id__": 321 + "__id__": 417 }, { - "__id__": 485 + "__id__": 581 } ], "_active": true, "_components": [ { - "__id__": 502 + "__id__": 598 }, { - "__id__": 504 + "__id__": 600 }, { - "__id__": 506 + "__id__": 602 } ], "_prefab": { - "__id__": 508 + "__id__": 604 }, "_lpos": { "__type__": "cc.Vec3", @@ -269,32 +269,35 @@ "__id__": 24 }, { - "__id__": 40 + "__id__": 56 }, { - "__id__": 52 + "__id__": 86 }, { - "__id__": 71 + "__id__": 146 }, { - "__id__": 82 + "__id__": 165 }, { - "__id__": 101 + "__id__": 178 + }, + { + "__id__": 197 } ], "_active": true, "_components": [ { - "__id__": 120 + "__id__": 216 }, { - "__id__": 122 + "__id__": 218 } ], "_prefab": { - "__id__": 124 + "__id__": 220 }, "_lpos": { "__type__": "cc.Vec3", @@ -481,7 +484,7 @@ }, { "__type__": "cc.Node", - "_name": "玩家信息", + "_name": "金币", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -495,22 +498,82 @@ "_active": true, "_components": [ { - "__id__": 33 + "__id__": 49 }, { - "__id__": 35 + "__id__": 51 }, { - "__id__": 37 + "__id__": 53 } ], "_prefab": { - "__id__": 39 + "__id__": 55 }, "_lpos": { "__type__": "cc.Vec3", - "x": -240, - "y": 520, + "x": 92.814, + "y": 540, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "内容", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 24 + }, + "_children": [ + { + "__id__": 26 + }, + { + "__id__": 34 + } + ], + "_active": true, + "_components": [ + { + "__id__": 42 + }, + { + "__id__": 44 + }, + { + "__id__": 46 + } + ], + "_prefab": { + "__id__": 48 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, "z": 0 }, "_lrot": { @@ -542,24 +605,1285 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 24 + "__id__": 25 }, "_children": [], "_active": true, "_components": [ { - "__id__": 26 + "__id__": 27 }, { - "__id__": 28 + "__id__": 29 }, { - "__id__": 30 + "__id__": 31 } ], "_prefab": { + "__id__": 33 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -10.0615234375, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 26 + }, + "_enabled": true, + "__prefab": { + "__id__": 28 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 50.66015625, + "height": 54.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5aaXigD3dMO6gVBqoyytXX" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 26 + }, + "_enabled": true, + "__prefab": { + "__id__": 30 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "金币:", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 20, + "_fontSize": 20, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "65dern9FZBq71B1jxeiM4J" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 26 + }, + "_enabled": true, + "__prefab": { "__id__": 32 }, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "c8/3EVmj9GWKc6cVklaHq9" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c5TfJY7p9NLKG/yXWdtAD+", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Label-001", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 25 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 35 + }, + { + "__id__": 37 + }, + { + "__id__": 39 + } + ], + "_prefab": { + "__id__": 41 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 27.830078125, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 34 + }, + "_enabled": true, + "__prefab": { + "__id__": 36 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 15.123046875, + "height": 54.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "28KOMJAHhDCrlSm6NJQGCu" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 34 + }, + "_enabled": true, + "__prefab": { + "__id__": 38 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "0", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 20, + "_fontSize": 20, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1atHJuXNZDIJ8I29PZbDLu" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 34 + }, + "_enabled": true, + "__prefab": { + "__id__": 40 + }, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a90L8zDnJJ0pMpGtAWHuva" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "ffXNGyqC9KobppVJG0WfuL", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 25 + }, + "_enabled": true, + "__prefab": { + "__id__": 43 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 70.783203125, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "66/WVhpw5C7qafMoLLCtjZ" + }, + { + "__type__": "cc.Layout", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 25 + }, + "_enabled": true, + "__prefab": { + "__id__": 45 + }, + "_resizeMode": 1, + "_layoutType": 1, + "_cellSize": { + "__type__": "cc.Size", + "width": 40, + "height": 40 + }, + "_startAxis": 0, + "_paddingLeft": 0, + "_paddingRight": 0, + "_paddingTop": 0, + "_paddingBottom": 0, + "_spacingX": 5, + "_spacingY": 0, + "_verticalDirection": 1, + "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, + "_affectedByScale": false, + "_isAlign": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "12/BskhKFNuLe9GYs7gcwP" + }, + { + "__type__": "dd6ff3gNGFAzKeTlGPK1jnx", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 25 + }, + "_enabled": true, + "__prefab": { + "__id__": 47 + }, + "type": 90001, + "show": { + "__id__": 37 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2e6CoPTn1BfL0uhBDRu7k7" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "9bFCLo83FG0bLsyQsQk/hg", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 24 + }, + "_enabled": true, + "__prefab": { + "__id__": 50 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 150, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "caSoSjdzhCCp24DKBo9KBq" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 24 + }, + "_enabled": true, + "__prefab": { + "__id__": 52 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3aSTvsJcFBV7vB2O845Q/6" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 24 + }, + "_enabled": true, + "__prefab": { + "__id__": 54 + }, + "_alignFlags": 1, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 20, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "74hKJSx0FPOKpDOAIsDr8o" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "1cqLWDahBAH7fnkC/1+g+M", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "宝石", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 10 + }, + "_children": [ + { + "__id__": 57 + } + ], + "_active": true, + "_components": [ + { + "__id__": 79 + }, + { + "__id__": 81 + }, + { + "__id__": 83 + } + ], + "_prefab": { + "__id__": 85 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 267.601, + "y": 540, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "内容", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 56 + }, + "_children": [ + { + "__id__": 58 + }, + { + "__id__": 66 + } + ], + "_active": true, + "_components": [ + { + "__id__": 74 + }, + { + "__id__": 76 + } + ], + "_prefab": { + "__id__": 78 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 57 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 59 + }, + { + "__id__": 61 + }, + { + "__id__": 63 + } + ], + "_prefab": { + "__id__": 65 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -10.0615234375, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 58 + }, + "_enabled": true, + "__prefab": { + "__id__": 60 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 50.66015625, + "height": 54.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f7qIvsJ69F46BC9OLsAoUL" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 58 + }, + "_enabled": true, + "__prefab": { + "__id__": 62 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "宝石:", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 20, + "_fontSize": 20, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8619DTETxHXoq5FamMlu61" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 58 + }, + "_enabled": true, + "__prefab": { + "__id__": 64 + }, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e0zZOfqdZPX4BlGVwrBSwY" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "d7EWk13V1FVLXSjilq47+0", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Label-001", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 57 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 67 + }, + { + "__id__": 69 + }, + { + "__id__": 71 + } + ], + "_prefab": { + "__id__": 73 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 27.830078125, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 66 + }, + "_enabled": true, + "__prefab": { + "__id__": 68 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 15.123046875, + "height": 54.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6e6PwnE4lJ/6arvIxNlLTV" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 66 + }, + "_enabled": true, + "__prefab": { + "__id__": 70 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "0", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 20, + "_fontSize": 20, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e9684Bzt1I3q1ycrfDQvI7" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 66 + }, + "_enabled": true, + "__prefab": { + "__id__": 72 + }, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "04b/0hrgRAH7R0AJT2XOBZ" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c6C0T+OLBFeIOuatljAz1J", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 57 + }, + "_enabled": true, + "__prefab": { + "__id__": 75 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 70.783203125, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "5cgpj8QPdN176lRgDf1czg" + }, + { + "__type__": "cc.Layout", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 57 + }, + "_enabled": true, + "__prefab": { + "__id__": 77 + }, + "_resizeMode": 1, + "_layoutType": 1, + "_cellSize": { + "__type__": "cc.Size", + "width": 40, + "height": 40 + }, + "_startAxis": 0, + "_paddingLeft": 0, + "_paddingRight": 0, + "_paddingTop": 0, + "_paddingBottom": 0, + "_spacingX": 5, + "_spacingY": 0, + "_verticalDirection": 1, + "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, + "_affectedByScale": false, + "_isAlign": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2fUs/AEBVP47oojcoUKF+w" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "f30IBNmgpE6ZwWUQKFVO2m", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 56 + }, + "_enabled": true, + "__prefab": { + "__id__": 80 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 150, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "86ajNkCMxFcr4QivL12vO+" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 56 + }, + "_enabled": true, + "__prefab": { + "__id__": 82 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "40jAjOULpLxbjZNZ2H8ZOP" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 56 + }, + "_enabled": true, + "__prefab": { + "__id__": 84 + }, + "_alignFlags": 1, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 20, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "63HN4blYtBgqy+Fs8Zh+2G" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "02SeBFcBdOvqdyTYqx1Wg0", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "玩家信息", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 10 + }, + "_children": [ + { + "__id__": 87 + }, + { + "__id__": 95 + }, + { + "__id__": 103 + }, + { + "__id__": 111 + } + ], + "_active": true, + "_components": [ + { + "__id__": 141 + }, + { + "__id__": 143 + } + ], + "_prefab": { + "__id__": 145 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -190, + "y": 500, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "背景", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 86 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 88 + }, + { + "__id__": 90 + }, + { + "__id__": 92 + } + ], + "_prefab": { + "__id__": 94 + }, "_lpos": { "__type__": "cc.Vec3", "x": 0, @@ -595,16 +1919,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 87 }, "_enabled": true, "__prefab": { - "__id__": 27 + "__id__": 89 }, "_contentSize": { "__type__": "cc.Size", - "width": 124, - "height": 54.4 + "width": 300, + "height": 120 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -613,6 +1937,356 @@ }, "_id": "" }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "52HiARxHJKkYfWzcjM9I7S" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 87 + }, + "_enabled": true, + "__prefab": { + "__id__": 91 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 177, + "g": 177, + "b": 177, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "eeapZ3jKlDKrHs4hzt2lQK" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 87 + }, + "_enabled": true, + "__prefab": { + "__id__": 93 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 100, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "85j+I1pltIC6FcC2LVxJj1" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "61ooO3HTBAD7XuIWvuD2iu", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "头像", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 86 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 96 + }, + { + "__id__": 98 + }, + { + "__id__": 100 + } + ], + "_prefab": { + "__id__": 102 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -110, + "y": 20, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 95 + }, + "_enabled": true, + "__prefab": { + "__id__": 97 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 80, + "height": 80 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f5pmfzay5CCJY64Wcee5Os" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 95 + }, + "_enabled": true, + "__prefab": { + "__id__": 99 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "3ev0SBEjlBwI/2494cxv6P" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 95 + }, + "_enabled": true, + "__prefab": { + "__id__": 101 + }, + "_alignFlags": 9, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8eg5PvIjdHgpJehQ1g7VD/" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "97A0taRgZEKKo6p2j76nGM", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "玩家名称", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 86 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 104 + }, + { + "__id__": 106 + }, + { + "__id__": 108 + } + ], + "_prefab": { + "__id__": 110 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -65.866, + "y": 21.425, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 103 + }, + "_enabled": true, + "__prefab": { + "__id__": 105 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 108, + "height": 54.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0.5 + }, + "_id": "" + }, { "__type__": "cc.CompPrefabInfo", "fileId": "472EPuIi5BQbqoiwp5FAVj" @@ -623,11 +2297,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 103 }, "_enabled": true, "__prefab": { - "__id__": 29 + "__id__": 107 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -642,8 +2316,8 @@ "_string": "玩家名称", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 30, - "_fontSize": 30, + "_actualFontSize": 26, + "_fontSize": 26, "_fontFamily": "Arial", "_lineHeight": 40, "_overflow": 0, @@ -668,11 +2342,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 103 }, "_enabled": true, "__prefab": { - "__id__": 31 + "__id__": 109 }, "_color": { "__type__": "cc.Color", @@ -701,22 +2375,189 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "玩家战力", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 86 + }, + "_children": [ + { + "__id__": 112 + } + ], + "_active": true, + "_components": [ + { + "__id__": 134 + }, + { + "__id__": 136 + }, + { + "__id__": 138 + } + ], + "_prefab": { + "__id__": 140 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -40, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "内容", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 111 + }, + "_children": [ + { + "__id__": 113 + }, + { + "__id__": 121 + } + ], + "_active": true, + "_components": [ + { + "__id__": 129 + }, + { + "__id__": 131 + } + ], + "_prefab": { + "__id__": 133 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 112 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 114 + }, + { + "__id__": 116 + }, + { + "__id__": 118 + } + ], + "_prefab": { + "__id__": 120 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -10.0615234375, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, { "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 24 + "__id__": 113 }, "_enabled": true, "__prefab": { - "__id__": 34 + "__id__": 115 }, "_contentSize": { "__type__": "cc.Size", - "width": 200, - "height": 80 + "width": 50.66015625, + "height": 54.4 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -727,7 +2568,363 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e9rBw2jx1IiJEwcWsaXui9" + "fileId": "b4j6JGzKVJfJCjk4HocOUb" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 113 + }, + "_enabled": true, + "__prefab": { + "__id__": 117 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "战力:", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 20, + "_fontSize": 20, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "71iIo3WxRIVaxbTmerJUoT" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 113 + }, + "_enabled": true, + "__prefab": { + "__id__": 119 + }, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "866t4KjnJFM5gxTSNDqK3E" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "deQo7UyK1HGrlBnU/v/bUE", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Label-001", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 112 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 122 + }, + { + "__id__": 124 + }, + { + "__id__": 126 + } + ], + "_prefab": { + "__id__": 128 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 27.830078125, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 121 + }, + "_enabled": true, + "__prefab": { + "__id__": 123 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 15.123046875, + "height": 54.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "55oA0EV6xOp5Wv0xtYpxy9" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 121 + }, + "_enabled": true, + "__prefab": { + "__id__": 125 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "0", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 20, + "_fontSize": 20, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ddQjLDdTBBS5CsEUMbxzNC" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 121 + }, + "_enabled": true, + "__prefab": { + "__id__": 127 + }, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "cdhdLLDpRPbZ06ssjZQFs0" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c0gJZY3RZG+6S5BhiorlPI", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 112 + }, + "_enabled": true, + "__prefab": { + "__id__": 130 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 70.783203125, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "42DnMkIkBMSq+w6ujy7iGR" + }, + { + "__type__": "cc.Layout", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 112 + }, + "_enabled": true, + "__prefab": { + "__id__": 132 + }, + "_resizeMode": 1, + "_layoutType": 1, + "_cellSize": { + "__type__": "cc.Size", + "width": 40, + "height": 40 + }, + "_startAxis": 0, + "_paddingLeft": 0, + "_paddingRight": 0, + "_paddingTop": 0, + "_paddingBottom": 0, + "_spacingX": 5, + "_spacingY": 0, + "_verticalDirection": 1, + "_horizontalDirection": 0, + "_constraint": 0, + "_constraintNum": 2, + "_affectedByScale": false, + "_isAlign": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "31vTlREZ1J2JwjX6kz2BjJ" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "04efhaBOxM07qTIdXx8USf", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 111 + }, + "_enabled": true, + "__prefab": { + "__id__": 135 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 300, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "24pjweM4VJKIT6b/k6dDeA" }, { "__type__": "cc.Sprite", @@ -735,20 +2932,20 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 24 + "__id__": 111 }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 137 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 235, - "g": 235, - "b": 235, + "r": 211, + "g": 211, + "b": 211, "a": 255 }, "_spriteFrame": { @@ -772,7 +2969,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "7cJYuG4m5LGJXk3KiyrGeb" + "fileId": "46ClM4popJFoBLdP7FW2SY" }, { "__type__": "cc.Widget", @@ -780,11 +2977,88 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 24 + "__id__": 111 }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 139 + }, + "_alignFlags": 44, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 20, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 150, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e6+KGv+idD1ZxElq2zUr4E" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "98ruxv7RpFYIBbtA+z6V4I", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 86 + }, + "_enabled": true, + "__prefab": { + "__id__": 142 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 300, + "height": 120 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e9rBw2jx1IiJEwcWsaXui9" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 86 + }, + "_enabled": true, + "__prefab": { + "__id__": 144 }, "_alignFlags": 9, "_target": null, @@ -823,179 +3097,6 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Node", - "_objFlags": 0, - "_parent": { - "__id__": 10 - }, - "_prefab": { - "__id__": 41 - }, - "__editorExtras__": {} - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 40 - }, - "asset": { - "__uuid__": "f9a7b5b8-0c1a-4b0c-a6c7-bbf2e077442a", - "__expectedType__": "cc.Prefab" - }, - "fileId": "7ehoARooRAIIfX4ttdeppc", - "instance": { - "__id__": 42 - }, - "targetOverrides": null - }, - { - "__type__": "cc.PrefabInstance", - "fileId": "a7ViMHX7hGBJBmNxJ40Qav", - "prefabRootNode": { - "__id__": 1 - }, - "mountedChildren": [], - "mountedComponents": [ - { - "__id__": 43 - } - ], - "propertyOverrides": [ - { - "__id__": 47 - }, - { - "__id__": 49 - }, - { - "__id__": 50 - }, - { - "__id__": 51 - } - ], - "removedComponents": [] - }, - { - "__type__": "cc.MountedComponentsInfo", - "targetInfo": { - "__id__": 44 - }, - "components": [ - { - "__id__": 45 - } - ] - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "7ehoARooRAIIfX4ttdeppc" - ] - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": { - "mountedRoot": { - "__id__": 40 - } - }, - "node": { - "__id__": 40 - }, - "_enabled": true, - "__prefab": { - "__id__": 46 - }, - "_alignFlags": 1, - "_target": null, - "_left": 0, - "_right": 0, - "_top": 29.331999999999994, - "_bottom": 0, - "_horizontalCenter": 0, - "_verticalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 0, - "_originalHeight": 0, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "cbOG5wQ59PyYh4dBFBGh6g" - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 48 - }, - "propertyPath": [ - "_name" - ], - "value": "玩家资源显示" - }, - { - "__type__": "cc.TargetInfo", - "localID": [ - "7ehoARooRAIIfX4ttdeppc" - ] - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 48 - }, - "propertyPath": [ - "_lpos" - ], - "value": { - "__type__": "cc.Vec3", - "x": -46.486, - "y": 520.668, - "z": 0 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 48 - }, - "propertyPath": [ - "_lrot" - ], - "value": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - } - }, - { - "__type__": "CCPropertyOverrideInfo", - "targetInfo": { - "__id__": 48 - }, - "propertyPath": [ - "_euler" - ], - "value": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - } - }, { "__type__": "cc.Node", "_name": "PVP按钮", @@ -1006,26 +3107,26 @@ }, "_children": [ { - "__id__": 53 + "__id__": 147 } ], "_active": true, "_components": [ { - "__id__": 61 + "__id__": 155 }, { - "__id__": 63 + "__id__": 157 }, { - "__id__": 65 + "__id__": 159 }, { - "__id__": 68 + "__id__": 162 } ], "_prefab": { - "__id__": 70 + "__id__": 164 }, "_lpos": { "__type__": "cc.Vec3", @@ -1062,23 +3163,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 52 + "__id__": 146 }, "_children": [], "_active": true, "_components": [ { - "__id__": 54 + "__id__": 148 }, { - "__id__": 56 + "__id__": 150 }, { - "__id__": 58 + "__id__": 152 } ], "_prefab": { - "__id__": 60 + "__id__": 154 }, "_lpos": { "__type__": "cc.Vec3", @@ -1115,11 +3216,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 53 + "__id__": 147 }, "_enabled": true, "__prefab": { - "__id__": 55 + "__id__": 149 }, "_contentSize": { "__type__": "cc.Size", @@ -1143,11 +3244,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 53 + "__id__": 147 }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 151 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1188,11 +3289,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 53 + "__id__": 147 }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 153 }, "_color": { "__type__": "cc.Color", @@ -1227,11 +3328,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 52 + "__id__": 146 }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 156 }, "_contentSize": { "__type__": "cc.Size", @@ -1255,11 +3356,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 52 + "__id__": 146 }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 158 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1300,15 +3401,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 52 + "__id__": 146 }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 160 }, "clickEvents": [ { - "__id__": 67 + "__id__": 161 } ], "_interactable": true, @@ -1360,7 +3461,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 52 + "__id__": 146 }, "_id": "" }, @@ -1384,11 +3485,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 52 + "__id__": 146 }, "_enabled": true, "__prefab": { - "__id__": 69 + "__id__": 163 }, "_alignFlags": 36, "_target": null, @@ -1434,14 +3535,14 @@ "__id__": 10 }, "_prefab": { - "__id__": 72 + "__id__": 166 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 71 + "__id__": 165 }, "asset": { "__uuid__": "c9df301b-3532-4bbd-8d7e-d0620db322a0", @@ -1449,7 +3550,7 @@ }, "fileId": "9eultbNU5HCLypkPXqoRGA", "instance": { - "__id__": 73 + "__id__": 167 }, "targetOverrides": null }, @@ -1463,31 +3564,34 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 74 + "__id__": 168 }, { - "__id__": 76 + "__id__": 170 }, { - "__id__": 77 + "__id__": 171 }, { - "__id__": 78 + "__id__": 172 }, { - "__id__": 79 + "__id__": 173 + }, + { + "__id__": 175 } ], "removedComponents": [ { - "__id__": 81 + "__id__": 177 } ] }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 75 + "__id__": 169 }, "propertyPath": [ "_name" @@ -1503,7 +3607,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 75 + "__id__": 169 }, "propertyPath": [ "_lpos" @@ -1511,14 +3615,14 @@ "value": { "__type__": "cc.Vec3", "x": 14.153, - "y": 419.694, + "y": 395, "z": 0 } }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 75 + "__id__": 169 }, "propertyPath": [ "_lrot" @@ -1534,7 +3638,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 75 + "__id__": 169 }, "propertyPath": [ "_euler" @@ -1549,7 +3653,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 80 + "__id__": 174 }, "propertyPath": [ "_contentSize" @@ -1557,7 +3661,7 @@ "value": { "__type__": "cc.Size", "width": 200, - "height": 60 + "height": 70 } }, { @@ -1566,6 +3670,22 @@ "5b1ztjg0FI7YvHJaHCU2ms" ] }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 176 + }, + "propertyPath": [ + "_top" + ], + "value": 150 + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "58+NYe5CFKzLz2VGok5XlR" + ] + }, { "__type__": "cc.TargetInfo", "localID": [ @@ -1582,31 +3702,31 @@ }, "_children": [ { - "__id__": 83 + "__id__": 179 } ], "_active": true, "_components": [ { - "__id__": 91 + "__id__": 187 }, { - "__id__": 93 + "__id__": 189 }, { - "__id__": 95 + "__id__": 191 }, { - "__id__": 98 + "__id__": 194 } ], "_prefab": { - "__id__": 100 + "__id__": 196 }, "_lpos": { "__type__": "cc.Vec3", - "x": 178.56600000000003, - "y": 419.694, + "x": 188.449, + "y": 395, "z": 0 }, "_lrot": { @@ -1638,23 +3758,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 82 + "__id__": 178 }, "_children": [], "_active": true, "_components": [ { - "__id__": 84 + "__id__": 180 }, { - "__id__": 86 + "__id__": 182 }, { - "__id__": 88 + "__id__": 184 } ], "_prefab": { - "__id__": 90 + "__id__": 186 }, "_lpos": { "__type__": "cc.Vec3", @@ -1691,11 +3811,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 83 + "__id__": 179 }, "_enabled": true, "__prefab": { - "__id__": 85 + "__id__": 181 }, "_contentSize": { "__type__": "cc.Size", @@ -1719,11 +3839,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 83 + "__id__": 179 }, "_enabled": true, "__prefab": { - "__id__": 87 + "__id__": 183 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1764,11 +3884,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 83 + "__id__": 179 }, "_enabled": true, "__prefab": { - "__id__": 89 + "__id__": 185 }, "_color": { "__type__": "cc.Color", @@ -1803,16 +3923,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 82 + "__id__": 178 }, "_enabled": true, "__prefab": { - "__id__": 92 + "__id__": 188 }, "_contentSize": { "__type__": "cc.Size", - "width": 100, - "height": 60 + "width": 120, + "height": 70 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1831,11 +3951,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 82 + "__id__": 178 }, "_enabled": true, "__prefab": { - "__id__": 94 + "__id__": 190 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1876,15 +3996,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 82 + "__id__": 178 }, "_enabled": true, "__prefab": { - "__id__": 96 + "__id__": 192 }, "clickEvents": [ { - "__id__": 97 + "__id__": 193 } ], "_interactable": true, @@ -1936,7 +4056,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 82 + "__id__": 178 }, "_id": "" }, @@ -1960,17 +4080,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 82 + "__id__": 178 }, "_enabled": true, "__prefab": { - "__id__": 99 + "__id__": 195 }, "_alignFlags": 1, "_target": null, "_left": 0, "_right": 0, - "_top": 130.30599999999998, + "_top": 150, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -2013,31 +4133,31 @@ }, "_children": [ { - "__id__": 102 + "__id__": 198 } ], "_active": true, "_components": [ { - "__id__": 110 + "__id__": 206 }, { - "__id__": 112 + "__id__": 208 }, { - "__id__": 114 + "__id__": 210 }, { - "__id__": 117 + "__id__": 213 } ], "_prefab": { - "__id__": 119 + "__id__": 215 }, "_lpos": { "__type__": "cc.Vec3", - "x": 269.181, - "y": 520.668, + "x": -157.609, + "y": 395, "z": 0 }, "_lrot": { @@ -2069,23 +4189,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 101 + "__id__": 197 }, "_children": [], "_active": true, "_components": [ { - "__id__": 103 + "__id__": 199 }, { - "__id__": 105 + "__id__": 201 }, { - "__id__": 107 + "__id__": 203 } ], "_prefab": { - "__id__": 109 + "__id__": 205 }, "_lpos": { "__type__": "cc.Vec3", @@ -2122,11 +4242,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 102 + "__id__": 198 }, "_enabled": true, "__prefab": { - "__id__": 104 + "__id__": 200 }, "_contentSize": { "__type__": "cc.Size", @@ -2150,11 +4270,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 102 + "__id__": 198 }, "_enabled": true, "__prefab": { - "__id__": 106 + "__id__": 202 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2169,8 +4289,8 @@ "_string": "排行榜 ♛", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 20, - "_fontSize": 20, + "_actualFontSize": 18, + "_fontSize": 18, "_fontFamily": "Arial", "_lineHeight": 40, "_overflow": 1, @@ -2195,11 +4315,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 102 + "__id__": 198 }, "_enabled": true, "__prefab": { - "__id__": 108 + "__id__": 204 }, "_color": { "__type__": "cc.Color", @@ -2234,15 +4354,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 101 + "__id__": 197 }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 207 }, "_contentSize": { "__type__": "cc.Size", - "width": 140, + "width": 120, "height": 70 }, "_anchorPoint": { @@ -2262,11 +4382,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 101 + "__id__": 197 }, "_enabled": true, "__prefab": { - "__id__": 113 + "__id__": 209 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2307,15 +4427,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 101 + "__id__": 197 }, "_enabled": true, "__prefab": { - "__id__": 115 + "__id__": 211 }, "clickEvents": [ { - "__id__": 116 + "__id__": 212 } ], "_interactable": true, @@ -2367,7 +4487,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 101 + "__id__": 197 }, "_id": "" }, @@ -2391,17 +4511,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 101 + "__id__": 197 }, "_enabled": true, "__prefab": { - "__id__": 118 + "__id__": 214 }, "_alignFlags": 1, "_target": null, "_left": 0, "_right": 0, - "_top": 24.332, + "_top": 150, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -2444,7 +4564,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 121 + "__id__": 217 }, "_contentSize": { "__type__": "cc.Size", @@ -2472,7 +4592,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 219 }, "_alignFlags": 45, "_target": null, @@ -2521,32 +4641,32 @@ }, "_children": [ { - "__id__": 126 + "__id__": 222 }, { - "__id__": 150 + "__id__": 246 }, { - "__id__": 294 + "__id__": 390 }, { - "__id__": 302 + "__id__": 398 } ], "_active": true, "_components": [ { - "__id__": 314 + "__id__": 410 }, { - "__id__": 316 + "__id__": 412 }, { - "__id__": 318 + "__id__": 414 } ], "_prefab": { - "__id__": 320 + "__id__": 416 }, "_lpos": { "__type__": "cc.Vec3", @@ -2581,17 +4701,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 125 + "__id__": 221 }, "_prefab": { - "__id__": 127 + "__id__": 223 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 126 + "__id__": 222 }, "asset": { "__uuid__": "a9053170-1055-4272-b3fd-ad6fa75b5f25", @@ -2599,7 +4719,7 @@ }, "fileId": "cfqtEvOKpHO7NzoHh8DAIM", "instance": { - "__id__": 128 + "__id__": 224 }, "targetOverrides": null }, @@ -2613,43 +4733,43 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 129 + "__id__": 225 }, { - "__id__": 131 + "__id__": 227 }, { - "__id__": 132 + "__id__": 228 }, { - "__id__": 133 + "__id__": 229 }, { - "__id__": 134 + "__id__": 230 }, { - "__id__": 136 + "__id__": 232 }, { - "__id__": 138 + "__id__": 234 }, { - "__id__": 140 + "__id__": 236 }, { - "__id__": 142 + "__id__": 238 }, { - "__id__": 144 + "__id__": 240 }, { - "__id__": 146 + "__id__": 242 }, { - "__id__": 148 + "__id__": 244 }, { - "__id__": 149 + "__id__": 245 } ], "removedComponents": [] @@ -2657,7 +4777,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 130 + "__id__": 226 }, "propertyPath": [ "_name" @@ -2673,7 +4793,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 130 + "__id__": 226 }, "propertyPath": [ "_lpos" @@ -2688,7 +4808,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 130 + "__id__": 226 }, "propertyPath": [ "_lrot" @@ -2704,7 +4824,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 130 + "__id__": 226 }, "propertyPath": [ "_euler" @@ -2719,7 +4839,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 135 + "__id__": 231 }, "propertyPath": [ "_right" @@ -2735,7 +4855,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 137 + "__id__": 233 }, "propertyPath": [ "_contentSize" @@ -2755,7 +4875,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 139 + "__id__": 235 }, "propertyPath": [ "_lpos" @@ -2776,7 +4896,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 141 + "__id__": 237 }, "propertyPath": [ "_contentSize" @@ -2796,7 +4916,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 143 + "__id__": 239 }, "propertyPath": [ "_contentSize" @@ -2816,7 +4936,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 145 + "__id__": 241 }, "propertyPath": [ "_lpos" @@ -2837,7 +4957,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 147 + "__id__": 243 }, "propertyPath": [ "_lpos" @@ -2858,7 +4978,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 135 + "__id__": 231 }, "propertyPath": [ "_alignFlags" @@ -2868,7 +4988,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 135 + "__id__": 231 }, "propertyPath": [ "_top" @@ -2881,36 +5001,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 125 + "__id__": 221 }, "_children": [ { - "__id__": 151 + "__id__": 247 }, { - "__id__": 277 + "__id__": 373 } ], "_active": true, "_components": [ { - "__id__": 283 + "__id__": 379 }, { - "__id__": 285 + "__id__": 381 }, { - "__id__": 287 + "__id__": 383 }, { - "__id__": 289 + "__id__": 385 }, { - "__id__": 291 + "__id__": 387 } ], "_prefab": { - "__id__": 293 + "__id__": 389 }, "_lpos": { "__type__": "cc.Vec3", @@ -2947,36 +5067,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 150 + "__id__": 246 }, "_children": [ { - "__id__": 152 + "__id__": 248 }, { - "__id__": 230 + "__id__": 326 }, { - "__id__": 249 + "__id__": 345 } ], "_active": true, "_components": [ { - "__id__": 268 + "__id__": 364 }, { - "__id__": 270 + "__id__": 366 }, { - "__id__": 272 + "__id__": 368 }, { - "__id__": 274 + "__id__": 370 } ], "_prefab": { - "__id__": 276 + "__id__": 372 }, "_lpos": { "__type__": "cc.Vec3", @@ -3013,27 +5133,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 151 + "__id__": 247 }, "_children": [ { - "__id__": 153 + "__id__": 249 }, { - "__id__": 214 + "__id__": 310 } ], "_active": true, "_components": [ { - "__id__": 225 + "__id__": 321 }, { - "__id__": 227 + "__id__": 323 } ], "_prefab": { - "__id__": 229 + "__id__": 325 }, "_lpos": { "__type__": "cc.Vec3", @@ -3070,27 +5190,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 152 + "__id__": 248 }, "_children": [ { - "__id__": 154 + "__id__": 250 }, { - "__id__": 167 + "__id__": 263 } ], "_active": true, "_components": [ { - "__id__": 209 + "__id__": 305 }, { - "__id__": 211 + "__id__": 307 } ], "_prefab": { - "__id__": 213 + "__id__": 309 }, "_lpos": { "__type__": "cc.Vec3", @@ -3125,17 +5245,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 153 + "__id__": 249 }, "_prefab": { - "__id__": 155 + "__id__": 251 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 154 + "__id__": 250 }, "asset": { "__uuid__": "9d7eeadb-58f6-4c42-aaed-bc402f272c84", @@ -3143,7 +5263,7 @@ }, "fileId": "a8T0NC/KpNY7MMbRkPRuwY", "instance": { - "__id__": 156 + "__id__": 252 }, "targetOverrides": null }, @@ -3157,19 +5277,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 157 + "__id__": 253 }, { - "__id__": 159 + "__id__": 255 }, { - "__id__": 161 + "__id__": 257 }, { - "__id__": 163 + "__id__": 259 }, { - "__id__": 165 + "__id__": 261 } ], "removedComponents": [] @@ -3177,7 +5297,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 158 + "__id__": 254 }, "propertyPath": [ "_name" @@ -3193,7 +5313,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 160 + "__id__": 256 }, "propertyPath": [ "_lpos" @@ -3214,7 +5334,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 162 + "__id__": 258 }, "propertyPath": [ "_lrot" @@ -3236,7 +5356,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 164 + "__id__": 260 }, "propertyPath": [ "_euler" @@ -3257,7 +5377,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 166 + "__id__": 262 }, "propertyPath": [ "_active" @@ -3276,30 +5396,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 153 + "__id__": 249 }, "_children": [ { - "__id__": 168 + "__id__": 264 }, { - "__id__": 185 + "__id__": 281 } ], "_active": true, "_components": [ { - "__id__": 202 + "__id__": 298 }, { - "__id__": 204 + "__id__": 300 }, { - "__id__": 206 + "__id__": 302 } ], "_prefab": { - "__id__": 208 + "__id__": 304 }, "_lpos": { "__type__": "cc.Vec3", @@ -3336,27 +5456,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 167 + "__id__": 263 }, "_children": [ { - "__id__": 169 + "__id__": 265 } ], "_active": true, "_components": [ { - "__id__": 177 + "__id__": 273 }, { - "__id__": 179 + "__id__": 275 }, { - "__id__": 181 + "__id__": 277 } ], "_prefab": { - "__id__": 184 + "__id__": 280 }, "_lpos": { "__type__": "cc.Vec3", @@ -3393,23 +5513,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 168 + "__id__": 264 }, "_children": [], "_active": true, "_components": [ { - "__id__": 170 + "__id__": 266 }, { - "__id__": 172 + "__id__": 268 }, { - "__id__": 174 + "__id__": 270 } ], "_prefab": { - "__id__": 176 + "__id__": 272 }, "_lpos": { "__type__": "cc.Vec3", @@ -3446,11 +5566,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 169 + "__id__": 265 }, "_enabled": true, "__prefab": { - "__id__": 171 + "__id__": 267 }, "_contentSize": { "__type__": "cc.Size", @@ -3474,11 +5594,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 169 + "__id__": 265 }, "_enabled": true, "__prefab": { - "__id__": 173 + "__id__": 269 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3519,11 +5639,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 169 + "__id__": 265 }, "_enabled": true, "__prefab": { - "__id__": 175 + "__id__": 271 }, "_color": { "__type__": "cc.Color", @@ -3558,11 +5678,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 168 + "__id__": 264 }, "_enabled": true, "__prefab": { - "__id__": 178 + "__id__": 274 }, "_contentSize": { "__type__": "cc.Size", @@ -3586,11 +5706,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 168 + "__id__": 264 }, "_enabled": true, "__prefab": { - "__id__": 180 + "__id__": 276 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3631,15 +5751,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 168 + "__id__": 264 }, "_enabled": true, "__prefab": { - "__id__": 182 + "__id__": 278 }, "clickEvents": [ { - "__id__": 183 + "__id__": 279 } ], "_interactable": true, @@ -3691,7 +5811,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 168 + "__id__": 264 }, "_id": "" }, @@ -3728,27 +5848,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 167 + "__id__": 263 }, "_children": [ { - "__id__": 186 + "__id__": 282 } ], "_active": true, "_components": [ { - "__id__": 194 + "__id__": 290 }, { - "__id__": 196 + "__id__": 292 }, { - "__id__": 198 + "__id__": 294 } ], "_prefab": { - "__id__": 201 + "__id__": 297 }, "_lpos": { "__type__": "cc.Vec3", @@ -3785,23 +5905,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 185 + "__id__": 281 }, "_children": [], "_active": true, "_components": [ { - "__id__": 187 + "__id__": 283 }, { - "__id__": 189 + "__id__": 285 }, { - "__id__": 191 + "__id__": 287 } ], "_prefab": { - "__id__": 193 + "__id__": 289 }, "_lpos": { "__type__": "cc.Vec3", @@ -3838,11 +5958,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 186 + "__id__": 282 }, "_enabled": true, "__prefab": { - "__id__": 188 + "__id__": 284 }, "_contentSize": { "__type__": "cc.Size", @@ -3866,11 +5986,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 186 + "__id__": 282 }, "_enabled": true, "__prefab": { - "__id__": 190 + "__id__": 286 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3911,11 +6031,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 186 + "__id__": 282 }, "_enabled": true, "__prefab": { - "__id__": 192 + "__id__": 288 }, "_color": { "__type__": "cc.Color", @@ -3950,11 +6070,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 185 + "__id__": 281 }, "_enabled": true, "__prefab": { - "__id__": 195 + "__id__": 291 }, "_contentSize": { "__type__": "cc.Size", @@ -3978,11 +6098,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 185 + "__id__": 281 }, "_enabled": true, "__prefab": { - "__id__": 197 + "__id__": 293 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4023,15 +6143,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 185 + "__id__": 281 }, "_enabled": true, "__prefab": { - "__id__": 199 + "__id__": 295 }, "clickEvents": [ { - "__id__": 200 + "__id__": 296 } ], "_interactable": true, @@ -4083,7 +6203,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 185 + "__id__": 281 }, "_id": "" }, @@ -4120,11 +6240,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 263 }, "_enabled": true, "__prefab": { - "__id__": 203 + "__id__": 299 }, "_contentSize": { "__type__": "cc.Size", @@ -4148,11 +6268,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 263 }, "_enabled": true, "__prefab": { - "__id__": 205 + "__id__": 301 }, "_resizeMode": 1, "_layoutType": 2, @@ -4186,11 +6306,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 167 + "__id__": 263 }, "_enabled": true, "__prefab": { - "__id__": 207 + "__id__": 303 }, "_alignFlags": 4, "_target": null, @@ -4235,11 +6355,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 153 + "__id__": 249 }, "_enabled": true, "__prefab": { - "__id__": 210 + "__id__": 306 }, "_contentSize": { "__type__": "cc.Size", @@ -4263,11 +6383,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 153 + "__id__": 249 }, "_enabled": true, "__prefab": { - "__id__": 212 + "__id__": 308 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4319,17 +6439,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 152 + "__id__": 248 }, "_prefab": { - "__id__": 215 + "__id__": 311 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 214 + "__id__": 310 }, "asset": { "__uuid__": "060c67fc-087c-45b5-8a09-ee63c3ebdd25", @@ -4337,11 +6457,11 @@ }, "fileId": "bdtesuqqNGPpKG+sSNpvIP", "instance": { - "__id__": 216 + "__id__": 312 }, "targetOverrides": [ { - "__id__": 222 + "__id__": 318 } ] }, @@ -4355,16 +6475,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 217 + "__id__": 313 }, { - "__id__": 219 + "__id__": 315 }, { - "__id__": 220 + "__id__": 316 }, { - "__id__": 221 + "__id__": 317 } ], "removedComponents": [] @@ -4372,7 +6492,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 218 + "__id__": 314 }, "propertyPath": [ "_name" @@ -4388,7 +6508,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 218 + "__id__": 314 }, "propertyPath": [ "_lpos" @@ -4403,7 +6523,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 218 + "__id__": 314 }, "propertyPath": [ "_lrot" @@ -4419,7 +6539,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 218 + "__id__": 314 }, "propertyPath": [ "_euler" @@ -4439,10 +6559,10 @@ "petView" ], "target": { - "__id__": 223 + "__id__": 319 }, "targetInfo": { - "__id__": 224 + "__id__": 320 } }, { @@ -4461,11 +6581,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 152 + "__id__": 248 }, "_enabled": true, "__prefab": { - "__id__": 226 + "__id__": 322 }, "_contentSize": { "__type__": "cc.Size", @@ -4489,11 +6609,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 152 + "__id__": 248 }, "_enabled": true, "__prefab": { - "__id__": 228 + "__id__": 324 }, "_resizeMode": 1, "_layoutType": 1, @@ -4540,30 +6660,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 151 + "__id__": 247 }, "_children": [ { - "__id__": 231 + "__id__": 327 } ], "_active": true, "_components": [ { - "__id__": 239 + "__id__": 335 }, { - "__id__": 241 + "__id__": 337 }, { - "__id__": 243 + "__id__": 339 }, { - "__id__": 246 + "__id__": 342 } ], "_prefab": { - "__id__": 248 + "__id__": 344 }, "_lpos": { "__type__": "cc.Vec3", @@ -4600,23 +6720,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 230 + "__id__": 326 }, "_children": [], "_active": true, "_components": [ { - "__id__": 232 + "__id__": 328 }, { - "__id__": 234 + "__id__": 330 }, { - "__id__": 236 + "__id__": 332 } ], "_prefab": { - "__id__": 238 + "__id__": 334 }, "_lpos": { "__type__": "cc.Vec3", @@ -4653,11 +6773,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 231 + "__id__": 327 }, "_enabled": true, "__prefab": { - "__id__": 233 + "__id__": 329 }, "_contentSize": { "__type__": "cc.Size", @@ -4681,11 +6801,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 231 + "__id__": 327 }, "_enabled": true, "__prefab": { - "__id__": 235 + "__id__": 331 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4726,11 +6846,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 231 + "__id__": 327 }, "_enabled": true, "__prefab": { - "__id__": 237 + "__id__": 333 }, "_color": { "__type__": "cc.Color", @@ -4765,11 +6885,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 230 + "__id__": 326 }, "_enabled": true, "__prefab": { - "__id__": 240 + "__id__": 336 }, "_contentSize": { "__type__": "cc.Size", @@ -4793,24 +6913,24 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 230 + "__id__": 326 }, "_enabled": true, "__prefab": { - "__id__": 242 + "__id__": 338 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 226, + "g": 226, + "b": 226, "a": 255 }, "_spriteFrame": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -4838,15 +6958,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 230 + "__id__": 326 }, "_enabled": true, "__prefab": { - "__id__": 244 + "__id__": 340 }, "clickEvents": [ { - "__id__": 245 + "__id__": 341 } ], "_interactable": true, @@ -4879,26 +6999,14 @@ "b": 124, "a": 255 }, - "_normalSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_hoverSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_pressedSprite": { - "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_disabledSprite": { - "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", - "__expectedType__": "cc.SpriteFrame" - }, + "_normalSprite": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 230 + "__id__": 326 }, "_id": "" }, @@ -4909,7 +7017,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 150 + "__id__": 246 }, "component": "", "_componentId": "00caayqUBZPVo/wpuvrmR6W", @@ -4922,11 +7030,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 230 + "__id__": 326 }, "_enabled": true, "__prefab": { - "__id__": 247 + "__id__": 343 }, "_alignFlags": 13, "_target": null, @@ -4971,30 +7079,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 151 + "__id__": 247 }, "_children": [ { - "__id__": 250 + "__id__": 346 } ], "_active": true, "_components": [ { - "__id__": 258 + "__id__": 354 }, { - "__id__": 260 + "__id__": 356 }, { - "__id__": 262 + "__id__": 358 }, { - "__id__": 265 + "__id__": 361 } ], "_prefab": { - "__id__": 267 + "__id__": 363 }, "_lpos": { "__type__": "cc.Vec3", @@ -5031,23 +7139,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 249 + "__id__": 345 }, "_children": [], "_active": true, "_components": [ { - "__id__": 251 + "__id__": 347 }, { - "__id__": 253 + "__id__": 349 }, { - "__id__": 255 + "__id__": 351 } ], "_prefab": { - "__id__": 257 + "__id__": 353 }, "_lpos": { "__type__": "cc.Vec3", @@ -5084,11 +7192,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 250 + "__id__": 346 }, "_enabled": true, "__prefab": { - "__id__": 252 + "__id__": 348 }, "_contentSize": { "__type__": "cc.Size", @@ -5112,11 +7220,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 250 + "__id__": 346 }, "_enabled": true, "__prefab": { - "__id__": 254 + "__id__": 350 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5157,11 +7265,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 250 + "__id__": 346 }, "_enabled": true, "__prefab": { - "__id__": 256 + "__id__": 352 }, "_color": { "__type__": "cc.Color", @@ -5196,11 +7304,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 249 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 259 + "__id__": 355 }, "_contentSize": { "__type__": "cc.Size", @@ -5224,24 +7332,24 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 249 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 261 + "__id__": 357 }, "_customMaterial": null, "_srcBlendFactor": 2, "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 226, + "g": 226, + "b": 226, "a": 255 }, "_spriteFrame": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__uuid__": "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941", "__expectedType__": "cc.SpriteFrame" }, "_type": 1, @@ -5269,15 +7377,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 249 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 263 + "__id__": 359 }, "clickEvents": [ { - "__id__": 264 + "__id__": 360 } ], "_interactable": true, @@ -5310,26 +7418,14 @@ "b": 124, "a": 255 }, - "_normalSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_hoverSprite": { - "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_pressedSprite": { - "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", - "__expectedType__": "cc.SpriteFrame" - }, - "_disabledSprite": { - "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", - "__expectedType__": "cc.SpriteFrame" - }, + "_normalSprite": null, + "_hoverSprite": null, + "_pressedSprite": null, + "_disabledSprite": null, "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 249 + "__id__": 345 }, "_id": "" }, @@ -5340,7 +7436,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 150 + "__id__": 246 }, "component": "", "_componentId": "00caayqUBZPVo/wpuvrmR6W", @@ -5353,11 +7449,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 249 + "__id__": 345 }, "_enabled": true, "__prefab": { - "__id__": 266 + "__id__": 362 }, "_alignFlags": 37, "_target": null, @@ -5402,11 +7498,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 151 + "__id__": 247 }, "_enabled": true, "__prefab": { - "__id__": 269 + "__id__": 365 }, "_contentSize": { "__type__": "cc.Size", @@ -5430,11 +7526,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 151 + "__id__": 247 }, "_enabled": true, "__prefab": { - "__id__": 271 + "__id__": 367 }, "_type": 0, "_inverted": false, @@ -5452,11 +7548,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 151 + "__id__": 247 }, "_enabled": true, "__prefab": { - "__id__": 273 + "__id__": 369 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5498,11 +7594,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 151 + "__id__": 247 }, "_enabled": true, "__prefab": { - "__id__": 275 + "__id__": 371 }, "_alignFlags": 45, "_target": null, @@ -5547,20 +7643,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 150 + "__id__": 246 }, "_children": [], "_active": false, "_components": [ { - "__id__": 278 + "__id__": 374 }, { - "__id__": 280 + "__id__": 376 } ], "_prefab": { - "__id__": 282 + "__id__": 378 }, "_lpos": { "__type__": "cc.Vec3", @@ -5597,11 +7693,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 277 + "__id__": 373 }, "_enabled": true, "__prefab": { - "__id__": 279 + "__id__": 375 }, "_contentSize": { "__type__": "cc.Size", @@ -5625,11 +7721,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 277 + "__id__": 373 }, "_enabled": true, "__prefab": { - "__id__": 281 + "__id__": 377 }, "spacing": 10, "_spriteFrame": { @@ -5667,11 +7763,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 150 + "__id__": 246 }, "_enabled": true, "__prefab": { - "__id__": 284 + "__id__": 380 }, "_contentSize": { "__type__": "cc.Size", @@ -5695,11 +7791,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 150 + "__id__": 246 }, "_enabled": true, "__prefab": { - "__id__": 286 + "__id__": 382 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5740,11 +7836,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 150 + "__id__": 246 }, "_enabled": true, "__prefab": { - "__id__": 288 + "__id__": 384 }, "_alignFlags": 45, "_target": null, @@ -5776,11 +7872,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 150 + "__id__": 246 }, "_enabled": true, "__prefab": { - "__id__": 290 + "__id__": 386 }, "bounceDuration": 1, "brake": 0.5, @@ -5791,7 +7887,7 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 152 + "__id__": 248 }, "_horizontalScrollBar": null, "_verticalScrollBar": null, @@ -5803,7 +7899,7 @@ "_scrollThreshold": 0.5, "_pageTurningEventTiming": 0.1, "_indicator": { - "__id__": 280 + "__id__": 376 }, "isStopMove": true, "_id": "" @@ -5818,17 +7914,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 150 + "__id__": 246 }, "_enabled": true, "__prefab": { - "__id__": 292 + "__id__": 388 }, "leftButton": { - "__id__": 243 + "__id__": 339 }, "rightButton": { - "__id__": 262 + "__id__": 358 }, "_id": "" }, @@ -5855,23 +7951,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 125 + "__id__": 221 }, "_children": [], "_active": true, "_components": [ { - "__id__": 295 + "__id__": 391 }, { - "__id__": 297 + "__id__": 393 }, { - "__id__": 299 + "__id__": 395 } ], "_prefab": { - "__id__": 301 + "__id__": 397 }, "_lpos": { "__type__": "cc.Vec3", @@ -5908,11 +8004,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 294 + "__id__": 390 }, "_enabled": true, "__prefab": { - "__id__": 296 + "__id__": 392 }, "_contentSize": { "__type__": "cc.Size", @@ -5936,11 +8032,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 294 + "__id__": 390 }, "_enabled": true, "__prefab": { - "__id__": 298 + "__id__": 394 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5981,11 +8077,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 294 + "__id__": 390 }, "_enabled": true, "__prefab": { - "__id__": 300 + "__id__": 396 }, "_color": { "__type__": "cc.Color", @@ -6018,17 +8114,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 125 + "__id__": 221 }, "_prefab": { - "__id__": 303 + "__id__": 399 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 302 + "__id__": 398 }, "asset": { "__uuid__": "1368ab11-4f76-480d-852f-639c290c2446", @@ -6036,7 +8132,7 @@ }, "fileId": "0dwM6BvXxAIb2ADj9Thh37", "instance": { - "__id__": 304 + "__id__": 400 }, "targetOverrides": null }, @@ -6050,25 +8146,25 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 305 + "__id__": 401 }, { - "__id__": 307 + "__id__": 403 }, { - "__id__": 308 + "__id__": 404 }, { - "__id__": 309 + "__id__": 405 }, { - "__id__": 310 + "__id__": 406 }, { - "__id__": 312 + "__id__": 408 }, { - "__id__": 313 + "__id__": 409 } ], "removedComponents": [] @@ -6076,7 +8172,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 306 + "__id__": 402 }, "propertyPath": [ "_name" @@ -6092,7 +8188,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 306 + "__id__": 402 }, "propertyPath": [ "_lpos" @@ -6107,7 +8203,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 306 + "__id__": 402 }, "propertyPath": [ "_lrot" @@ -6123,7 +8219,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 306 + "__id__": 402 }, "propertyPath": [ "_euler" @@ -6138,7 +8234,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 311 + "__id__": 407 }, "propertyPath": [ "clickEvents", @@ -6158,7 +8254,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 311 + "__id__": 407 }, "propertyPath": [ "clickEvents", @@ -6170,7 +8266,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 311 + "__id__": 407 }, "propertyPath": [ "clickEvents", @@ -6185,11 +8281,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 125 + "__id__": 221 }, "_enabled": true, "__prefab": { - "__id__": 315 + "__id__": 411 }, "_contentSize": { "__type__": "cc.Size", @@ -6213,11 +8309,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 125 + "__id__": 221 }, "_enabled": true, "__prefab": { - "__id__": 317 + "__id__": 413 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6258,11 +8354,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 125 + "__id__": 221 }, "_enabled": true, "__prefab": { - "__id__": 319 + "__id__": 415 }, "_alignFlags": 44, "_target": null, @@ -6311,23 +8407,23 @@ }, "_children": [ { - "__id__": 322 + "__id__": 418 } ], "_active": true, "_components": [ { - "__id__": 478 + "__id__": 574 }, { - "__id__": 480 + "__id__": 576 }, { - "__id__": 482 + "__id__": 578 } ], "_prefab": { - "__id__": 484 + "__id__": 580 }, "_lpos": { "__type__": "cc.Vec3", @@ -6364,39 +8460,39 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 321 + "__id__": 417 }, "_children": [ { - "__id__": 323 + "__id__": 419 }, { - "__id__": 348 + "__id__": 444 }, { - "__id__": 373 + "__id__": 469 }, { - "__id__": 398 + "__id__": 494 }, { - "__id__": 423 + "__id__": 519 }, { - "__id__": 448 + "__id__": 544 } ], "_active": true, "_components": [ { - "__id__": 473 + "__id__": 569 }, { - "__id__": 475 + "__id__": 571 } ], "_prefab": { - "__id__": 477 + "__id__": 573 }, "_lpos": { "__type__": "cc.Vec3", @@ -6433,33 +8529,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 322 + "__id__": 418 }, "_children": [ { - "__id__": 324 + "__id__": 420 }, { - "__id__": 330 + "__id__": 426 } ], "_active": true, "_components": [ { - "__id__": 338 + "__id__": 434 }, { - "__id__": 340 + "__id__": 436 }, { - "__id__": 342 + "__id__": 438 }, { - "__id__": 344 + "__id__": 440 } ], "_prefab": { - "__id__": 347 + "__id__": 443 }, "_lpos": { "__type__": "cc.Vec3", @@ -6496,20 +8592,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 323 + "__id__": 419 }, "_children": [], "_active": true, "_components": [ { - "__id__": 325 + "__id__": 421 }, { - "__id__": 327 + "__id__": 423 } ], "_prefab": { - "__id__": 329 + "__id__": 425 }, "_lpos": { "__type__": "cc.Vec3", @@ -6546,11 +8642,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 324 + "__id__": 420 }, "_enabled": true, "__prefab": { - "__id__": 326 + "__id__": 422 }, "_contentSize": { "__type__": "cc.Size", @@ -6574,11 +8670,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 324 + "__id__": 420 }, "_enabled": true, "__prefab": { - "__id__": 328 + "__id__": 424 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6632,23 +8728,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 323 + "__id__": 419 }, "_children": [], "_active": true, "_components": [ { - "__id__": 331 + "__id__": 427 }, { - "__id__": 333 + "__id__": 429 }, { - "__id__": 335 + "__id__": 431 } ], "_prefab": { - "__id__": 337 + "__id__": 433 }, "_lpos": { "__type__": "cc.Vec3", @@ -6685,11 +8781,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 330 + "__id__": 426 }, "_enabled": true, "__prefab": { - "__id__": 332 + "__id__": 428 }, "_contentSize": { "__type__": "cc.Size", @@ -6713,11 +8809,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 330 + "__id__": 426 }, "_enabled": true, "__prefab": { - "__id__": 334 + "__id__": 430 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6758,11 +8854,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 330 + "__id__": 426 }, "_enabled": true, "__prefab": { - "__id__": 336 + "__id__": 432 }, "_color": { "__type__": "cc.Color", @@ -6797,11 +8893,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 323 + "__id__": 419 }, "_enabled": true, "__prefab": { - "__id__": 339 + "__id__": 435 }, "_contentSize": { "__type__": "cc.Size", @@ -6825,11 +8921,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 323 + "__id__": 419 }, "_enabled": true, "__prefab": { - "__id__": 341 + "__id__": 437 }, "_type": 1, "_inverted": false, @@ -6847,11 +8943,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 323 + "__id__": 419 }, "_enabled": true, "__prefab": { - "__id__": 343 + "__id__": 439 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6893,15 +8989,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 323 + "__id__": 419 }, "_enabled": true, "__prefab": { - "__id__": 345 + "__id__": 441 }, "clickEvents": [ { - "__id__": 346 + "__id__": 442 } ], "_interactable": true, @@ -6976,33 +9072,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 322 + "__id__": 418 }, "_children": [ { - "__id__": 349 + "__id__": 445 }, { - "__id__": 355 + "__id__": 451 } ], "_active": true, "_components": [ { - "__id__": 363 + "__id__": 459 }, { - "__id__": 365 + "__id__": 461 }, { - "__id__": 367 + "__id__": 463 }, { - "__id__": 369 + "__id__": 465 } ], "_prefab": { - "__id__": 372 + "__id__": 468 }, "_lpos": { "__type__": "cc.Vec3", @@ -7039,20 +9135,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 348 + "__id__": 444 }, "_children": [], "_active": true, "_components": [ { - "__id__": 350 + "__id__": 446 }, { - "__id__": 352 + "__id__": 448 } ], "_prefab": { - "__id__": 354 + "__id__": 450 }, "_lpos": { "__type__": "cc.Vec3", @@ -7089,11 +9185,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 349 + "__id__": 445 }, "_enabled": true, "__prefab": { - "__id__": 351 + "__id__": 447 }, "_contentSize": { "__type__": "cc.Size", @@ -7117,11 +9213,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 349 + "__id__": 445 }, "_enabled": true, "__prefab": { - "__id__": 353 + "__id__": 449 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7175,23 +9271,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 348 + "__id__": 444 }, "_children": [], "_active": true, "_components": [ { - "__id__": 356 + "__id__": 452 }, { - "__id__": 358 + "__id__": 454 }, { - "__id__": 360 + "__id__": 456 } ], "_prefab": { - "__id__": 362 + "__id__": 458 }, "_lpos": { "__type__": "cc.Vec3", @@ -7228,11 +9324,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 355 + "__id__": 451 }, "_enabled": true, "__prefab": { - "__id__": 357 + "__id__": 453 }, "_contentSize": { "__type__": "cc.Size", @@ -7256,11 +9352,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 355 + "__id__": 451 }, "_enabled": true, "__prefab": { - "__id__": 359 + "__id__": 455 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7301,11 +9397,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 355 + "__id__": 451 }, "_enabled": true, "__prefab": { - "__id__": 361 + "__id__": 457 }, "_color": { "__type__": "cc.Color", @@ -7340,11 +9436,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 348 + "__id__": 444 }, "_enabled": true, "__prefab": { - "__id__": 364 + "__id__": 460 }, "_contentSize": { "__type__": "cc.Size", @@ -7368,11 +9464,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 348 + "__id__": 444 }, "_enabled": true, "__prefab": { - "__id__": 366 + "__id__": 462 }, "_type": 1, "_inverted": false, @@ -7390,11 +9486,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 348 + "__id__": 444 }, "_enabled": true, "__prefab": { - "__id__": 368 + "__id__": 464 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7436,15 +9532,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 348 + "__id__": 444 }, "_enabled": true, "__prefab": { - "__id__": 370 + "__id__": 466 }, "clickEvents": [ { - "__id__": 371 + "__id__": 467 } ], "_interactable": true, @@ -7519,33 +9615,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 322 + "__id__": 418 }, "_children": [ { - "__id__": 374 + "__id__": 470 }, { - "__id__": 380 + "__id__": 476 } ], "_active": true, "_components": [ { - "__id__": 388 + "__id__": 484 }, { - "__id__": 390 + "__id__": 486 }, { - "__id__": 392 + "__id__": 488 }, { - "__id__": 394 + "__id__": 490 } ], "_prefab": { - "__id__": 397 + "__id__": 493 }, "_lpos": { "__type__": "cc.Vec3", @@ -7582,20 +9678,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 373 + "__id__": 469 }, "_children": [], "_active": true, "_components": [ { - "__id__": 375 + "__id__": 471 }, { - "__id__": 377 + "__id__": 473 } ], "_prefab": { - "__id__": 379 + "__id__": 475 }, "_lpos": { "__type__": "cc.Vec3", @@ -7632,11 +9728,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 374 + "__id__": 470 }, "_enabled": true, "__prefab": { - "__id__": 376 + "__id__": 472 }, "_contentSize": { "__type__": "cc.Size", @@ -7660,11 +9756,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 374 + "__id__": 470 }, "_enabled": true, "__prefab": { - "__id__": 378 + "__id__": 474 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7718,23 +9814,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 373 + "__id__": 469 }, "_children": [], "_active": true, "_components": [ { - "__id__": 381 + "__id__": 477 }, { - "__id__": 383 + "__id__": 479 }, { - "__id__": 385 + "__id__": 481 } ], "_prefab": { - "__id__": 387 + "__id__": 483 }, "_lpos": { "__type__": "cc.Vec3", @@ -7771,11 +9867,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 380 + "__id__": 476 }, "_enabled": true, "__prefab": { - "__id__": 382 + "__id__": 478 }, "_contentSize": { "__type__": "cc.Size", @@ -7799,11 +9895,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 380 + "__id__": 476 }, "_enabled": true, "__prefab": { - "__id__": 384 + "__id__": 480 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7844,11 +9940,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 380 + "__id__": 476 }, "_enabled": true, "__prefab": { - "__id__": 386 + "__id__": 482 }, "_color": { "__type__": "cc.Color", @@ -7883,11 +9979,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 373 + "__id__": 469 }, "_enabled": true, "__prefab": { - "__id__": 389 + "__id__": 485 }, "_contentSize": { "__type__": "cc.Size", @@ -7911,11 +10007,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 373 + "__id__": 469 }, "_enabled": true, "__prefab": { - "__id__": 391 + "__id__": 487 }, "_type": 1, "_inverted": false, @@ -7933,11 +10029,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 373 + "__id__": 469 }, "_enabled": true, "__prefab": { - "__id__": 393 + "__id__": 489 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7979,15 +10075,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 373 + "__id__": 469 }, "_enabled": true, "__prefab": { - "__id__": 395 + "__id__": 491 }, "clickEvents": [ { - "__id__": 396 + "__id__": 492 } ], "_interactable": true, @@ -8062,33 +10158,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 322 + "__id__": 418 }, "_children": [ { - "__id__": 399 + "__id__": 495 }, { - "__id__": 405 + "__id__": 501 } ], "_active": true, "_components": [ { - "__id__": 413 + "__id__": 509 }, { - "__id__": 415 + "__id__": 511 }, { - "__id__": 417 + "__id__": 513 }, { - "__id__": 419 + "__id__": 515 } ], "_prefab": { - "__id__": 422 + "__id__": 518 }, "_lpos": { "__type__": "cc.Vec3", @@ -8125,20 +10221,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 398 + "__id__": 494 }, "_children": [], "_active": true, "_components": [ { - "__id__": 400 + "__id__": 496 }, { - "__id__": 402 + "__id__": 498 } ], "_prefab": { - "__id__": 404 + "__id__": 500 }, "_lpos": { "__type__": "cc.Vec3", @@ -8175,11 +10271,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 399 + "__id__": 495 }, "_enabled": true, "__prefab": { - "__id__": 401 + "__id__": 497 }, "_contentSize": { "__type__": "cc.Size", @@ -8203,11 +10299,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 399 + "__id__": 495 }, "_enabled": true, "__prefab": { - "__id__": 403 + "__id__": 499 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8261,23 +10357,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 398 + "__id__": 494 }, "_children": [], "_active": true, "_components": [ { - "__id__": 406 + "__id__": 502 }, { - "__id__": 408 + "__id__": 504 }, { - "__id__": 410 + "__id__": 506 } ], "_prefab": { - "__id__": 412 + "__id__": 508 }, "_lpos": { "__type__": "cc.Vec3", @@ -8314,11 +10410,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 405 + "__id__": 501 }, "_enabled": true, "__prefab": { - "__id__": 407 + "__id__": 503 }, "_contentSize": { "__type__": "cc.Size", @@ -8342,11 +10438,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 405 + "__id__": 501 }, "_enabled": true, "__prefab": { - "__id__": 409 + "__id__": 505 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8387,11 +10483,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 405 + "__id__": 501 }, "_enabled": true, "__prefab": { - "__id__": 411 + "__id__": 507 }, "_color": { "__type__": "cc.Color", @@ -8426,11 +10522,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 398 + "__id__": 494 }, "_enabled": true, "__prefab": { - "__id__": 414 + "__id__": 510 }, "_contentSize": { "__type__": "cc.Size", @@ -8454,11 +10550,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 398 + "__id__": 494 }, "_enabled": true, "__prefab": { - "__id__": 416 + "__id__": 512 }, "_type": 1, "_inverted": false, @@ -8476,11 +10572,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 398 + "__id__": 494 }, "_enabled": true, "__prefab": { - "__id__": 418 + "__id__": 514 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8522,15 +10618,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 398 + "__id__": 494 }, "_enabled": true, "__prefab": { - "__id__": 420 + "__id__": 516 }, "clickEvents": [ { - "__id__": 421 + "__id__": 517 } ], "_interactable": true, @@ -8605,33 +10701,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 322 + "__id__": 418 }, "_children": [ { - "__id__": 424 + "__id__": 520 }, { - "__id__": 430 + "__id__": 526 } ], "_active": true, "_components": [ { - "__id__": 438 + "__id__": 534 }, { - "__id__": 440 + "__id__": 536 }, { - "__id__": 442 + "__id__": 538 }, { - "__id__": 444 + "__id__": 540 } ], "_prefab": { - "__id__": 447 + "__id__": 543 }, "_lpos": { "__type__": "cc.Vec3", @@ -8668,20 +10764,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 423 + "__id__": 519 }, "_children": [], "_active": true, "_components": [ { - "__id__": 425 + "__id__": 521 }, { - "__id__": 427 + "__id__": 523 } ], "_prefab": { - "__id__": 429 + "__id__": 525 }, "_lpos": { "__type__": "cc.Vec3", @@ -8718,11 +10814,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 424 + "__id__": 520 }, "_enabled": true, "__prefab": { - "__id__": 426 + "__id__": 522 }, "_contentSize": { "__type__": "cc.Size", @@ -8746,11 +10842,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 424 + "__id__": 520 }, "_enabled": true, "__prefab": { - "__id__": 428 + "__id__": 524 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8804,23 +10900,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 423 + "__id__": 519 }, "_children": [], "_active": true, "_components": [ { - "__id__": 431 + "__id__": 527 }, { - "__id__": 433 + "__id__": 529 }, { - "__id__": 435 + "__id__": 531 } ], "_prefab": { - "__id__": 437 + "__id__": 533 }, "_lpos": { "__type__": "cc.Vec3", @@ -8857,11 +10953,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 430 + "__id__": 526 }, "_enabled": true, "__prefab": { - "__id__": 432 + "__id__": 528 }, "_contentSize": { "__type__": "cc.Size", @@ -8885,11 +10981,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 430 + "__id__": 526 }, "_enabled": true, "__prefab": { - "__id__": 434 + "__id__": 530 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8930,11 +11026,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 430 + "__id__": 526 }, "_enabled": true, "__prefab": { - "__id__": 436 + "__id__": 532 }, "_color": { "__type__": "cc.Color", @@ -8969,11 +11065,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 423 + "__id__": 519 }, "_enabled": true, "__prefab": { - "__id__": 439 + "__id__": 535 }, "_contentSize": { "__type__": "cc.Size", @@ -8997,11 +11093,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 423 + "__id__": 519 }, "_enabled": true, "__prefab": { - "__id__": 441 + "__id__": 537 }, "_type": 1, "_inverted": false, @@ -9019,11 +11115,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 423 + "__id__": 519 }, "_enabled": true, "__prefab": { - "__id__": 443 + "__id__": 539 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9065,15 +11161,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 423 + "__id__": 519 }, "_enabled": true, "__prefab": { - "__id__": 445 + "__id__": 541 }, "clickEvents": [ { - "__id__": 446 + "__id__": 542 } ], "_interactable": true, @@ -9148,33 +11244,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 322 + "__id__": 418 }, "_children": [ { - "__id__": 449 + "__id__": 545 }, { - "__id__": 455 + "__id__": 551 } ], "_active": true, "_components": [ { - "__id__": 463 + "__id__": 559 }, { - "__id__": 465 + "__id__": 561 }, { - "__id__": 467 + "__id__": 563 }, { - "__id__": 469 + "__id__": 565 } ], "_prefab": { - "__id__": 472 + "__id__": 568 }, "_lpos": { "__type__": "cc.Vec3", @@ -9211,20 +11307,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 448 + "__id__": 544 }, "_children": [], "_active": true, "_components": [ { - "__id__": 450 + "__id__": 546 }, { - "__id__": 452 + "__id__": 548 } ], "_prefab": { - "__id__": 454 + "__id__": 550 }, "_lpos": { "__type__": "cc.Vec3", @@ -9261,11 +11357,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 449 + "__id__": 545 }, "_enabled": true, "__prefab": { - "__id__": 451 + "__id__": 547 }, "_contentSize": { "__type__": "cc.Size", @@ -9289,11 +11385,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 449 + "__id__": 545 }, "_enabled": true, "__prefab": { - "__id__": 453 + "__id__": 549 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9347,23 +11443,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 448 + "__id__": 544 }, "_children": [], "_active": true, "_components": [ { - "__id__": 456 + "__id__": 552 }, { - "__id__": 458 + "__id__": 554 }, { - "__id__": 460 + "__id__": 556 } ], "_prefab": { - "__id__": 462 + "__id__": 558 }, "_lpos": { "__type__": "cc.Vec3", @@ -9400,11 +11496,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 455 + "__id__": 551 }, "_enabled": true, "__prefab": { - "__id__": 457 + "__id__": 553 }, "_contentSize": { "__type__": "cc.Size", @@ -9428,11 +11524,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 455 + "__id__": 551 }, "_enabled": true, "__prefab": { - "__id__": 459 + "__id__": 555 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9473,11 +11569,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 455 + "__id__": 551 }, "_enabled": true, "__prefab": { - "__id__": 461 + "__id__": 557 }, "_color": { "__type__": "cc.Color", @@ -9512,11 +11608,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 448 + "__id__": 544 }, "_enabled": true, "__prefab": { - "__id__": 464 + "__id__": 560 }, "_contentSize": { "__type__": "cc.Size", @@ -9540,11 +11636,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 448 + "__id__": 544 }, "_enabled": true, "__prefab": { - "__id__": 466 + "__id__": 562 }, "_type": 1, "_inverted": false, @@ -9562,11 +11658,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 448 + "__id__": 544 }, "_enabled": true, "__prefab": { - "__id__": 468 + "__id__": 564 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9608,15 +11704,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 448 + "__id__": 544 }, "_enabled": true, "__prefab": { - "__id__": 470 + "__id__": 566 }, "clickEvents": [ { - "__id__": 471 + "__id__": 567 } ], "_interactable": true, @@ -9691,11 +11787,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 322 + "__id__": 418 }, "_enabled": true, "__prefab": { - "__id__": 474 + "__id__": 570 }, "_contentSize": { "__type__": "cc.Size", @@ -9719,11 +11815,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 322 + "__id__": 418 }, "_enabled": true, "__prefab": { - "__id__": 476 + "__id__": 572 }, "_resizeMode": 1, "_layoutType": 1, @@ -9770,11 +11866,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 321 + "__id__": 417 }, "_enabled": true, "__prefab": { - "__id__": 479 + "__id__": 575 }, "_contentSize": { "__type__": "cc.Size", @@ -9798,11 +11894,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 321 + "__id__": 417 }, "_enabled": true, "__prefab": { - "__id__": 481 + "__id__": 577 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9843,11 +11939,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 321 + "__id__": 417 }, "_enabled": true, "__prefab": { - "__id__": 483 + "__id__": 579 }, "_alignFlags": 44, "_target": null, @@ -9896,26 +11992,26 @@ }, "_children": [ { - "__id__": 486 + "__id__": 582 } ], "_active": true, "_components": [ { - "__id__": 492 + "__id__": 588 }, { - "__id__": 494 + "__id__": 590 }, { - "__id__": 496 + "__id__": 592 }, { - "__id__": 499 + "__id__": 595 } ], "_prefab": { - "__id__": 501 + "__id__": 597 }, "_lpos": { "__type__": "cc.Vec3", @@ -9952,20 +12048,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 485 + "__id__": 581 }, "_children": [], "_active": true, "_components": [ { - "__id__": 487 + "__id__": 583 }, { - "__id__": 489 + "__id__": 585 } ], "_prefab": { - "__id__": 491 + "__id__": 587 }, "_lpos": { "__type__": "cc.Vec3", @@ -10002,11 +12098,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 486 + "__id__": 582 }, "_enabled": true, "__prefab": { - "__id__": 488 + "__id__": 584 }, "_contentSize": { "__type__": "cc.Size", @@ -10030,11 +12126,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 486 + "__id__": 582 }, "_enabled": true, "__prefab": { - "__id__": 490 + "__id__": 586 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10088,11 +12184,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 485 + "__id__": 581 }, "_enabled": true, "__prefab": { - "__id__": 493 + "__id__": 589 }, "_contentSize": { "__type__": "cc.Size", @@ -10116,11 +12212,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 485 + "__id__": 581 }, "_enabled": true, "__prefab": { - "__id__": 495 + "__id__": 591 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10161,15 +12257,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 485 + "__id__": 581 }, "_enabled": true, "__prefab": { - "__id__": 497 + "__id__": 593 }, "clickEvents": [ { - "__id__": 498 + "__id__": 594 } ], "_interactable": true, @@ -10221,7 +12317,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 485 + "__id__": 581 }, "_id": "" }, @@ -10245,11 +12341,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 485 + "__id__": 581 }, "_enabled": true, "__prefab": { - "__id__": 500 + "__id__": 596 }, "_alignFlags": 8, "_target": null, @@ -10298,7 +12394,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 503 + "__id__": 599 }, "_contentSize": { "__type__": "cc.Size", @@ -10326,7 +12422,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 505 + "__id__": 601 }, "_alignFlags": 45, "_target": null, @@ -10362,19 +12458,19 @@ }, "_enabled": true, "__prefab": { - "__id__": 507 + "__id__": 603 }, "mask": false, "maskOpcity": 80, "isClickMaskeClose": false, "playerNameLabel": { - "__id__": 28 + "__id__": 106 }, "onHookLabel": { - "__id__": 172 + "__id__": 268 }, "nextLevelBtn": { - "__id__": 95 + "__id__": 191 }, "_id": "" }, @@ -10395,22 +12491,19 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 302 + "__id__": 398 }, { - "__id__": 214 + "__id__": 310 }, { - "__id__": 154 + "__id__": 250 }, { - "__id__": 126 + "__id__": 222 }, { - "__id__": 71 - }, - { - "__id__": 40 + "__id__": 165 }, { "__id__": 11 diff --git a/JisolGameCocos/assets/resources/prefab/ui/主页/锻造台/锻造台.prefab b/JisolGameCocos/assets/resources/prefab/ui/主页/锻造台/锻造台.prefab index 71589947..f203b168 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/主页/锻造台/锻造台.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/主页/锻造台/锻造台.prefab @@ -28,23 +28,23 @@ "__id__": 109 }, { - "__id__": 126 + "__id__": 152 } ], "_active": true, "_components": [ { - "__id__": 143 + "__id__": 169 }, { - "__id__": 145 + "__id__": 171 }, { - "__id__": 147 + "__id__": 173 } ], "_prefab": { - "__id__": 149 + "__id__": 175 }, "_lpos": { "__type__": "cc.Vec3", @@ -1689,22 +1689,28 @@ "_children": [ { "__id__": 110 + }, + { + "__id__": 118 + }, + { + "__id__": 126 } ], "_active": true, "_components": [ { - "__id__": 118 + "__id__": 144 }, { - "__id__": 120 + "__id__": 146 }, { - "__id__": 122 + "__id__": 148 } ], "_prefab": { - "__id__": 125 + "__id__": 151 }, "_lpos": { "__type__": "cc.Vec3", @@ -1762,7 +1768,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 12.701, "z": 0 }, "_lrot": { @@ -1803,7 +1809,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 76, - "height": 159.2 + "height": 58.4 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1844,7 +1850,7 @@ "_actualFontSize": 34, "_fontSize": 34, "_fontFamily": "Arial", - "_lineHeight": 120, + "_lineHeight": 40, "_overflow": 0, "_enableWrapText": false, "_font": null, @@ -1900,6 +1906,568 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.Node", + "_name": "Label-001", + "_objFlags": 512, + "__editorExtras__": {}, + "_parent": { + "__id__": 109 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 119 + }, + { + "__id__": 121 + }, + { + "__id__": 123 + } + ], + "_prefab": { + "__id__": 125 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -25.402, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 118 + }, + "_enabled": true, + "__prefab": { + "__id__": 120 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 126.216796875, + "height": 54.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d2J5fsfE1Cq5D3n3dxiNZF" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 118 + }, + "_enabled": true, + "__prefab": { + "__id__": 122 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "(锻造等级: 1 )", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 20, + "_fontSize": 20, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": false, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8ce7qpW/lOcbG+f/uVGBGS" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 118 + }, + "_enabled": true, + "__prefab": { + "__id__": 124 + }, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "55vlps5RBCC6k8s3PF7w9w" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "7cAKB5f9RI2IEFbj3a+6qM", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "Button", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 109 + }, + "_children": [ + { + "__id__": 127 + } + ], + "_active": true, + "_components": [ + { + "__id__": 135 + }, + { + "__id__": 137 + }, + { + "__id__": 139 + }, + { + "__id__": 141 + } + ], + "_prefab": { + "__id__": 143 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -124.631, + "y": 23.566, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "Label", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 126 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 128 + }, + { + "__id__": 130 + }, + { + "__id__": 132 + } + ], + "_prefab": { + "__id__": 134 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -5.028, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 127 + }, + "_enabled": true, + "__prefab": { + "__id__": 129 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 30.86328125, + "height": 61.96 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "bahCSRZaZM8pq0s2KP+lGl" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 127 + }, + "_enabled": true, + "__prefab": { + "__id__": 131 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_string": "^", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 46, + "_fontSize": 46, + "_fontFamily": "Arial", + "_lineHeight": 46, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7413dQ3ZtBorXpid+edDe4" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 127 + }, + "_enabled": true, + "__prefab": { + "__id__": 133 + }, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_width": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "d0TCHBBmxJr7sQpfzYqRVO" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "f7l1O1NSJIyqaTx4ZhrX+I", + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 126 + }, + "_enabled": true, + "__prefab": { + "__id__": 136 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 50, + "height": 50 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "25vBklfIVIvL0rfhhe2LI/" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 126 + }, + "_enabled": true, + "__prefab": { + "__id__": 138 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 105, + "g": 105, + "b": 105, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 1, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "2dahwdyopDRooLQM7/D6LL" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 126 + }, + "_enabled": true, + "__prefab": { + "__id__": 140 + }, + "clickEvents": [], + "_interactable": true, + "_transition": 3, + "_normalColor": { + "__type__": "cc.Color", + "r": 214, + "g": 214, + "b": 214, + "a": 255 + }, + "_hoverColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_pressedColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_normalSprite": { + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_hoverSprite": { + "__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_pressedSprite": { + "__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_disabledSprite": { + "__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_duration": 0.1, + "_zoomScale": 1.2, + "_target": { + "__id__": 126 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b7lvydUiJKCLmbPfX3P0H1" + }, + { + "__type__": "cc.BlockInputEvents", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 126 + }, + "_enabled": true, + "__prefab": { + "__id__": 142 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "e0UISHT75LJK4Jlo/8Hcnb" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "598oGp5hlF0ZM0pl8FabVd", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -1910,7 +2478,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 145 }, "_contentSize": { "__type__": "cc.Size", @@ -1938,7 +2506,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 121 + "__id__": 147 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1983,11 +2551,11 @@ }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 149 }, "clickEvents": [ { - "__id__": 124 + "__id__": 150 } ], "_interactable": true, @@ -2066,8 +2634,6 @@ "__id__": 0 }, "fileId": "51PZvcuWZIko9Ta8D+mTRP", - "instance": null, - "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -2080,23 +2646,23 @@ }, "_children": [ { - "__id__": 127 + "__id__": 153 } ], "_active": true, "_components": [ { - "__id__": 135 + "__id__": 161 }, { - "__id__": 137 + "__id__": 163 }, { - "__id__": 139 + "__id__": 165 } ], "_prefab": { - "__id__": 142 + "__id__": 168 }, "_lpos": { "__type__": "cc.Vec3", @@ -2133,23 +2699,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 126 + "__id__": 152 }, "_children": [], "_active": true, "_components": [ { - "__id__": 128 + "__id__": 154 }, { - "__id__": 130 + "__id__": 156 }, { - "__id__": 132 + "__id__": 158 } ], "_prefab": { - "__id__": 134 + "__id__": 160 }, "_lpos": { "__type__": "cc.Vec3", @@ -2186,11 +2752,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 129 + "__id__": 155 }, "_contentSize": { "__type__": "cc.Size", @@ -2214,11 +2780,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 131 + "__id__": 157 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2259,11 +2825,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 153 }, "_enabled": true, "__prefab": { - "__id__": 133 + "__id__": 159 }, "_color": { "__type__": "cc.Color", @@ -2298,11 +2864,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 126 + "__id__": 152 }, "_enabled": true, "__prefab": { - "__id__": 136 + "__id__": 162 }, "_contentSize": { "__type__": "cc.Size", @@ -2326,11 +2892,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 126 + "__id__": 152 }, "_enabled": true, "__prefab": { - "__id__": 138 + "__id__": 164 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2371,15 +2937,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 126 + "__id__": 152 }, "_enabled": true, "__prefab": { - "__id__": 140 + "__id__": 166 }, "clickEvents": [ { - "__id__": 141 + "__id__": 167 } ], "_interactable": true, @@ -2431,7 +2997,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 126 + "__id__": 152 }, "_id": "" }, @@ -2470,7 +3036,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 144 + "__id__": 170 }, "_contentSize": { "__type__": "cc.Size", @@ -2498,7 +3064,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 146 + "__id__": 172 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2543,7 +3109,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 148 + "__id__": 174 }, "petView": null, "equips": { @@ -2567,7 +3133,7 @@ "instance": null, "targetOverrides": [ { - "__id__": 150 + "__id__": 176 } ], "nestedPrefabInstanceRoots": [ @@ -2609,7 +3175,7 @@ { "__type__": "cc.TargetOverrideInfo", "source": { - "__id__": 147 + "__id__": 173 }, "sourceInfo": null, "propertyPath": [ @@ -2619,7 +3185,7 @@ "__id__": 89 }, "targetInfo": { - "__id__": 151 + "__id__": 177 } }, { diff --git a/JisolGameCocos/assets/script/App.ts b/JisolGameCocos/assets/script/App.ts index 8a659b31..8f9a4044 100644 --- a/JisolGameCocos/assets/script/App.ts +++ b/JisolGameCocos/assets/script/App.ts @@ -30,12 +30,12 @@ import { Component } from "cc"; // let APIPath = `http://localhost:8080` // let WsPath = `ws://localhost:8080/websocket` -// let APIPath = `http://192.168.1.23:8080` -// let WsPath = `ws://192.168.1.23:8080/websocket` +let APIPath = `http://192.168.1.23:8080` +let WsPath = `ws://192.168.1.23:8080/websocket` // let APIPath = `http://192.168.0.119:8080` // let WsPath = `ws://192.168.0.119:8080/websocket` -let APIPath = `https://api.pet.jisol.cn` -let WsPath = `wss://api.pet.jisol.cn/websocket` +// let APIPath = `https://api.pet.jisol.cn` +// let WsPath = `wss://api.pet.jisol.cn/websocket` //重写UI class JNGLayer extends JNLayer{ diff --git a/JisolGameCocos/assets/script/battle/base/role/GRoleDefault.ts b/JisolGameCocos/assets/script/battle/base/role/GRoleDefault.ts index 4b176826..d5fae2ee 100644 --- a/JisolGameCocos/assets/script/battle/base/role/GRoleDefault.ts +++ b/JisolGameCocos/assets/script/battle/base/role/GRoleDefault.ts @@ -106,12 +106,7 @@ export default class GRoleDefault extends GRoleBase<{}>{ //设置血条位置 if(this.spine){ - let runtimeData = this.spine.skeletonData.getRuntimeData(); - let height = Math.abs(runtimeData.height); - let y = Math.abs(runtimeData.y); - let x = Math.abs(this.spine.node.scale.x); - let headY = (height + y + 20) * x; - this.headInfo.setPosition(v3(this.headInfo.position.x,headY,this.headInfo.position.z)) + this.headInfo.setPosition(v3(this.headInfo.position.x,role.roleHight,this.headInfo.position.z)) } } diff --git a/JisolGameCocos/assets/script/config/data/schema.ts b/JisolGameCocos/assets/script/config/data/schema.ts index ff2c9bf7..d18844f9 100644 --- a/JisolGameCocos/assets/script/config/data/schema.ts +++ b/JisolGameCocos/assets/script/config/data/schema.ts @@ -59,6 +59,8 @@ export class TbGRole { { this.roleSkillIds = []; for(let _ele of _json_.roleSkillIds) { let _e; _e = _ele; this.roleSkillIds.push(_e);}} if (_json_.roleAttackRange === undefined) { throw new Error() } this.roleAttackRange = _json_.roleAttackRange + if (_json_.roleHight === undefined) { throw new Error() } + this.roleHight = _json_.roleHight } /** @@ -81,6 +83,10 @@ export class TbGRole { * 角色攻击范围 */ readonly roleAttackRange: number + /** + * 角色高度 + */ + readonly roleHight: number resolve(tables:Tables) { @@ -844,6 +850,10 @@ export class TbGRoleEquipQuality { { this.odds = []; for(let _ele of _json_.odds) { let _e; _e = _ele; this.odds.push(_e);}} if (_json_.total === undefined) { throw new Error() } this.total = _json_.total + if (_json_.materials === undefined) { throw new Error() } + { this.materials = []; for(let _ele of _json_.materials) { let _e; _e = new TbGEntity.TResource(_ele); this.materials.push(_e);}} + if (_json_.upTime === undefined) { throw new Error() } + this.upTime = _json_.upTime } /** @@ -858,6 +868,14 @@ export class TbGRoleEquipQuality { * 总概率 */ readonly total: number + /** + * 升级消耗的材料 + */ + readonly materials: TbGEntity.TResource[] + /** + * 升级所需时间(s) + */ + readonly upTime: number resolve(tables:Tables) { diff --git a/JisolGameCocos/assets/script/tools/NumberTools.ts b/JisolGameCocos/assets/script/tools/NumberTools.ts index 34e88831..8c1b665b 100644 --- a/JisolGameCocos/assets/script/tools/NumberTools.ts +++ b/JisolGameCocos/assets/script/tools/NumberTools.ts @@ -2,9 +2,18 @@ export default class NumberTools { //随机 - public GetRank(min, max) { + public static GetRank(min, max) { return Math.round(Math.random() * (max - min)) + min; } + + //显示文本数字 + public static NumberStr(value:number){ + if(Math.floor(value / 1000000)) + return `${(value / 1000000).toFixed(1)}M` + if(Math.floor(value / 1000)) + return `${(value / 1000).toFixed(1)}K` + return value; + } } diff --git a/JisolGameCocos/assets/script/ui/Consts/Resource/PlayerResourceShow.ts b/JisolGameCocos/assets/script/ui/Consts/Resource/PlayerResourceShow.ts index 48ccc998..c7098ed7 100644 --- a/JisolGameCocos/assets/script/ui/Consts/Resource/PlayerResourceShow.ts +++ b/JisolGameCocos/assets/script/ui/Consts/Resource/PlayerResourceShow.ts @@ -3,6 +3,7 @@ import { _decorator, Component, Node } from 'cc'; import ResourceData, { ResourceEvent, ResourceType } from '../../../data/ResourceData'; import { Enum } from 'cc'; import { app } from '../../../App'; +import NumberTools from '../../../tools/NumberTools'; const { ccclass, property } = _decorator; @ccclass('PlayerResourceShow') @@ -34,7 +35,7 @@ export class PlayerResourceShow extends Component { onUpdateView(){ //更新资源数量 - this.show.string = `${ResourceData.getIns().getValue(this.type)}`; + this.show.string = `${NumberTools.NumberStr(ResourceData.getIns().getValue(this.type))}`; } diff --git a/JisolGameCocos/assets/script/ui/Home/MainView.ts b/JisolGameCocos/assets/script/ui/Home/MainView.ts index c3b1c6c4..043c2699 100644 --- a/JisolGameCocos/assets/script/ui/Home/MainView.ts +++ b/JisolGameCocos/assets/script/ui/Home/MainView.ts @@ -60,7 +60,7 @@ export class MainView extends JNGLayerBase { //更新UI界面 onUpdateView(){ - this.playerNameLabel.string = `${PlayerData.getIns().getInfo().playerId}`; + this.playerNameLabel.string = `${PlayerData.getIns().getInfo().playerName}`; this.onUpdateOnHookInfo(); this.onUpdateOnHook(); } diff --git a/JisolGameServer/Main/src/main/java/cfg/TB/TbGRole.java b/JisolGameServer/Main/src/main/java/cfg/TB/TbGRole.java index d343aa0c..68f77f58 100644 --- a/JisolGameServer/Main/src/main/java/cfg/TB/TbGRole.java +++ b/JisolGameServer/Main/src/main/java/cfg/TB/TbGRole.java @@ -21,6 +21,7 @@ public final class TbGRole extends AbstractBean { spine = _buf.get("spine").getAsInt(); { com.google.gson.JsonArray _json0_ = _buf.get("roleSkillIds").getAsJsonArray(); int __n0 = _json0_.size(); roleSkillIds = new int[__n0]; int __index0=0; for(JsonElement __e0 : _json0_) { int __v0; __v0 = __e0.getAsInt(); roleSkillIds[__index0++] = __v0; } } roleAttackRange = _buf.get("roleAttackRange").getAsInt(); + roleHight = _buf.get("roleHight").getAsInt(); } public static TbGRole deserialize(JsonObject _buf) { @@ -47,6 +48,10 @@ public final class TbGRole extends AbstractBean { * 角色攻击范围 */ public final int roleAttackRange; + /** + * 角色高度 + */ + public final int roleHight; public static final int __ID__ = 319398927; @@ -61,6 +66,7 @@ public final class TbGRole extends AbstractBean { + "(format_field_name __code_style field.name):" + spine + "," + "(format_field_name __code_style field.name):" + roleSkillIds + "," + "(format_field_name __code_style field.name):" + roleAttackRange + "," + + "(format_field_name __code_style field.name):" + roleHight + "," + "}"; } } diff --git a/JisolGameServer/Main/src/main/java/cfg/TB/TbGRoleEquipQuality.java b/JisolGameServer/Main/src/main/java/cfg/TB/TbGRoleEquipQuality.java index 77ab19f4..a63adc92 100644 --- a/JisolGameServer/Main/src/main/java/cfg/TB/TbGRoleEquipQuality.java +++ b/JisolGameServer/Main/src/main/java/cfg/TB/TbGRoleEquipQuality.java @@ -19,6 +19,8 @@ public final class TbGRoleEquipQuality extends AbstractBean { id = _buf.get("id").getAsInt(); { com.google.gson.JsonArray _json0_ = _buf.get("odds").getAsJsonArray(); int __n0 = _json0_.size(); odds = new int[__n0]; int __index0=0; for(JsonElement __e0 : _json0_) { int __v0; __v0 = __e0.getAsInt(); odds[__index0++] = __v0; } } total = _buf.get("total").getAsInt(); + { com.google.gson.JsonArray _json0_ = _buf.get("materials").getAsJsonArray(); int __n0 = _json0_.size(); materials = new cfg.TbGEntity.TResource[__n0]; int __index0=0; for(JsonElement __e0 : _json0_) { cfg.TbGEntity.TResource __v0; __v0 = cfg.TbGEntity.TResource.deserialize(__e0.getAsJsonObject()); materials[__index0++] = __v0; } } + upTime = _buf.get("upTime").getAsInt(); } public static TbGRoleEquipQuality deserialize(JsonObject _buf) { @@ -37,6 +39,14 @@ public final class TbGRoleEquipQuality extends AbstractBean { * 总概率 */ public final int total; + /** + * 升级消耗的材料 + */ + public final cfg.TbGEntity.TResource[] materials; + /** + * 升级所需时间(s) + */ + public final int upTime; public static final int __ID__ = -177949602; @@ -49,6 +59,8 @@ public final class TbGRoleEquipQuality extends AbstractBean { + "(format_field_name __code_style field.name):" + id + "," + "(format_field_name __code_style field.name):" + odds + "," + "(format_field_name __code_style field.name):" + total + "," + + "(format_field_name __code_style field.name):" + materials + "," + + "(format_field_name __code_style field.name):" + upTime + "," + "}"; } } diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerEquipController.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerEquipController.java index 1e47b412..df9a7dbc 100644 --- a/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerEquipController.java +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerEquipController.java @@ -16,6 +16,7 @@ import cn.jisol.game.service.PetEquipService; import cn.jisol.game.service.PlayerPetService; import cn.jisol.game.service.ResourceService; import cn.jisol.game.util.GRandomUtil; +import cn.jisol.game.vo.pet.equip.EquipForgingBenchOV; import cn.jisol.ngame.util.NewsContext; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import io.swagger.annotations.Api; @@ -60,7 +61,7 @@ public class GPlayerEquipController { resourceService.addResourceValue(player.getPlayerId(), ResourceId.ForgedStones.id, -1L); //获取锻造台 - EquipForgingBench forgingInfo = this.forgingInfo(player).data; + EquipForgingBenchOV forgingInfo = this.forgingInfo(player).data; //随机取一个部位 TbGRoleEquipType position = GRandomUtil.randomArray(TD.DATA.getTbGRoleEquipType().getDataList()); @@ -127,7 +128,7 @@ public class GPlayerEquipController { @ApiImplicitParams({}) @ApiOperation(value = "获取锻造台") @GetMapping("/forging/info") - public NewsContext forgingInfo(@CurrentPlayer Player player){ + public NewsContext forgingInfo(@CurrentPlayer Player player){ EquipForgingBench info = equipForgingBenchService.getOne(Wrappers.lambdaQuery(EquipForgingBench.class).eq(EquipForgingBench::getPlayerId,player.getPlayerId())); @@ -143,7 +144,7 @@ public class GPlayerEquipController { info = equipForgingBenchService.getOne(Wrappers.lambdaQuery(EquipForgingBench.class).eq(EquipForgingBench::getPlayerId,player.getPlayerId())); } - return NewsContext.onSuccess("获取成功",info); + return NewsContext.onSuccess("获取成功",EquipForgingBenchOV.create(info)); } @@ -151,7 +152,7 @@ public class GPlayerEquipController { @ApiImplicitParams({}) @ApiOperation(value = "设置锻造宠") @PostMapping("/forging/petId/{petId}") - public NewsContext setForgingPetId(@CurrentPlayer Player player, @PathVariable Integer petId){ + public NewsContext setForgingPetId(@CurrentPlayer Player player, @PathVariable Integer petId){ EquipForgingBench info = equipForgingBenchService.getOne(Wrappers.lambdaQuery(EquipForgingBench.class).eq(EquipForgingBench::getPlayerId,player.getPlayerId())); @@ -162,7 +163,7 @@ public class GPlayerEquipController { info.setForgingPetId(petId); equipForgingBenchService.saveOrUpdate(info); - return NewsContext.onSuccess("设置成功",info); + return NewsContext.onSuccess("设置成功",EquipForgingBenchOV.create(info)); } @@ -201,5 +202,13 @@ public class GPlayerEquipController { return NewsContext.onSuccess("穿戴成功",info); } + //升级锻造台 + @ApiImplicitParams({}) + @ApiOperation(value = "锻造台升级") + @PostMapping("/forging/up") + public NewsContext wear(@CurrentPlayer Player player){ + return NewsContext.onFail("升级成功"); + } + } diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/table/EquipForgingBench.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/table/EquipForgingBench.java index faabeac3..5e149b97 100644 --- a/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/table/EquipForgingBench.java +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/entity/table/EquipForgingBench.java @@ -5,13 +5,19 @@ import cn.jisol.game.data.TD; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; +import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import java.util.Date; import java.util.List; import java.util.stream.Collectors; -@Builder +@SuperBuilder +@AllArgsConstructor +@NoArgsConstructor @Data @TableName("`equip_forging_bench`") public class EquipForgingBench { @@ -22,6 +28,7 @@ public class EquipForgingBench { private Integer forgingExp; //锻造等级经验 private Integer forgingQuality; //锻造品质等级 private Integer forgingPetId; //当前占用宠物Id + private Long forgingUpTime; //升级结束时间(服务器) //获取锻造等级 public Integer getForgingLevel() { diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/service/ResourceService.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/service/ResourceService.java index 5bc1c4f4..0a377993 100644 --- a/JisolGameServer/Main/src/main/java/cn/jisol/game/service/ResourceService.java +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/service/ResourceService.java @@ -9,7 +9,7 @@ public interface ResourceService extends IService { public Resource addResourceValue(Long playerId, int type, Long value); //初始化某个资源 - public Resource initResource(Long playerId, int type); + public Resource initResource(Long playerId, int type, Long value); public Resource initResource(Resource resource); } diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/ResourceServiceImpl.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/ResourceServiceImpl.java index 6b8bb43d..590ebfad 100644 --- a/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/ResourceServiceImpl.java +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/ResourceServiceImpl.java @@ -56,8 +56,11 @@ public class ResourceServiceImpl extends ServiceImpl i //并且重试 if(value > 0){ //没有资源信息 创建初始资源 - res = this.initResource(playerId,type); - this.addResourceValue(playerId,type,value); + try{ + res = this.initResource(playerId,type,value); + }catch (Exception e){ + return this.addResourceValue(playerId,type,value); + } }else{ throw new ResourceNotException("资源不够"); } @@ -77,8 +80,8 @@ public class ResourceServiceImpl extends ServiceImpl i //初始化某个资源 @Override - public Resource initResource(Long playerId, int type) { - Resource resource = Resource.builder().playerId(playerId).resourceTbId(type).resourceValue(0L).build(); + public Resource initResource(Long playerId, int type, Long value) { + Resource resource = Resource.builder().playerId(playerId).resourceTbId(type).resourceValue(value).build(); this.initResource(resource); return resource; } diff --git a/JisolGameServer/Main/src/main/java/cn/jisol/game/vo/pet/equip/EquipForgingBenchOV.java b/JisolGameServer/Main/src/main/java/cn/jisol/game/vo/pet/equip/EquipForgingBenchOV.java new file mode 100644 index 00000000..daddb88b --- /dev/null +++ b/JisolGameServer/Main/src/main/java/cn/jisol/game/vo/pet/equip/EquipForgingBenchOV.java @@ -0,0 +1,29 @@ +package cn.jisol.game.vo.pet.equip; + +import cn.hutool.json.JSONUtil; +import cn.jisol.game.entity.table.EquipForgingBench; + +import java.util.Date; + +public class EquipForgingBenchOV extends EquipForgingBench { + + //获取当前品质等级 + @Override + public Integer getForgingQuality() { + if(this.getForgingUpTimeExcess() > 0){ + return super.getForgingQuality() - 1; + }else{ + return super.getForgingQuality(); + } + } + + //获取升级剩余时间 + public Long getForgingUpTimeExcess(){ + return Math.max(this.getForgingUpTime() - (new Date()).getTime(),0); + } + + public static EquipForgingBenchOV create(EquipForgingBench info){ + return JSONUtil.toBean(JSONUtil.toJsonStr(info),EquipForgingBenchOV.class); + } + +} diff --git a/JisolGameServer/Main/src/main/resources/application.yml b/JisolGameServer/Main/src/main/resources/application.yml index 26fc9772..c9a856f9 100644 --- a/JisolGameServer/Main/src/main/resources/application.yml +++ b/JisolGameServer/Main/src/main/resources/application.yml @@ -4,8 +4,8 @@ spring: datasource: username: pet_jisol_cn password: sThsBwjfDcaw2wJR -# url: jdbc:mysql://kyu.jisol.cn:3306/pet_jisol_cn?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&allowMultiQueries=true - url: jdbc:mysql://localhost:3306/pet_jisol_cn?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&allowMultiQueries=true + url: jdbc:mysql://kyu.jisol.cn:3306/pet_jisol_cn?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&allowMultiQueries=true +# url: jdbc:mysql://localhost:3306/pet_jisol_cn?useSSL=false&useUnicode=true&characterEncoding=utf-8&serverTimezone=GMT%2B8&allowMultiQueries=true driver-class-name: com.mysql.cj.jdbc.Driver jackson: serialization: diff --git a/JisolGameServer/Main/src/main/resources/json/tbgrole.json b/JisolGameServer/Main/src/main/resources/json/tbgrole.json index 3699866f..0bb8e179 100644 --- a/JisolGameServer/Main/src/main/resources/json/tbgrole.json +++ b/JisolGameServer/Main/src/main/resources/json/tbgrole.json @@ -4,14 +4,16 @@ "roleName": "小石头", "spine": 130001, "roleSkillIds": [], - "roleAttackRange": 100 + "roleAttackRange": 100, + "roleHight": 140 }, { "id": 10002, "roleName": "坚强小石", "spine": 130002, "roleSkillIds": [], - "roleAttackRange": 100 + "roleAttackRange": 100, + "roleHight": 140 }, { "id": 10003, @@ -20,7 +22,8 @@ "roleSkillIds": [ 40001 ], - "roleAttackRange": 500 + "roleAttackRange": 500, + "roleHight": 140 }, { "id": 10004, @@ -29,21 +32,24 @@ "roleSkillIds": [ 40002 ], - "roleAttackRange": 350 + "roleAttackRange": 350, + "roleHight": 140 }, { "id": 10005, "roleName": "雷吉艾斯", "spine": 130005, "roleSkillIds": [], - "roleAttackRange": 350 + "roleAttackRange": 350, + "roleHight": 140 }, { "id": 10006, "roleName": "星球杯", "spine": 130006, "roleSkillIds": [], - "roleAttackRange": 500 + "roleAttackRange": 500, + "roleHight": 140 }, { "id": 10007, @@ -52,6 +58,7 @@ "roleSkillIds": [ 40003 ], - "roleAttackRange": 100 + "roleAttackRange": 100, + "roleHight": 140 } ] \ No newline at end of file diff --git a/JisolGameServer/Main/src/main/resources/json/tbgroleequipquality.json b/JisolGameServer/Main/src/main/resources/json/tbgroleequipquality.json index 4a8578b4..72f53c24 100644 --- a/JisolGameServer/Main/src/main/resources/json/tbgroleequipquality.json +++ b/JisolGameServer/Main/src/main/resources/json/tbgroleequipquality.json @@ -13,7 +13,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 100 + } + ], + "upTime": 60 }, { "id": 2, @@ -29,7 +36,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 400 + } + ], + "upTime": 240 }, { "id": 3, @@ -45,7 +59,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 900 + } + ], + "upTime": 540 }, { "id": 4, @@ -61,7 +82,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 1600 + } + ], + "upTime": 960 }, { "id": 5, @@ -77,7 +105,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 2500 + } + ], + "upTime": 1500 }, { "id": 6, @@ -93,7 +128,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 3600 + } + ], + "upTime": 2160 }, { "id": 7, @@ -109,7 +151,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 4900 + } + ], + "upTime": 2940 }, { "id": 8, @@ -125,7 +174,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 6400 + } + ], + "upTime": 3840 }, { "id": 9, @@ -141,7 +197,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 8100 + } + ], + "upTime": 4860 }, { "id": 10, @@ -157,7 +220,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 10000 + } + ], + "upTime": 6000 }, { "id": 11, @@ -173,7 +243,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 12100 + } + ], + "upTime": 7260 }, { "id": 12, @@ -189,7 +266,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 14400 + } + ], + "upTime": 8640 }, { "id": 13, @@ -205,7 +289,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 16900 + } + ], + "upTime": 10140 }, { "id": 14, @@ -221,7 +312,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 19600 + } + ], + "upTime": 11760 }, { "id": 15, @@ -237,7 +335,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 22500 + } + ], + "upTime": 13500 }, { "id": 16, @@ -253,7 +358,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 25600 + } + ], + "upTime": 15360 }, { "id": 17, @@ -269,7 +381,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 28900 + } + ], + "upTime": 17340 }, { "id": 18, @@ -285,7 +404,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 32400 + } + ], + "upTime": 19440 }, { "id": 19, @@ -301,7 +427,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 36100 + } + ], + "upTime": 21660 }, { "id": 20, @@ -317,7 +450,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 40000 + } + ], + "upTime": 24000 }, { "id": 21, @@ -333,7 +473,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 44100 + } + ], + "upTime": 26460 }, { "id": 22, @@ -349,7 +496,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 48400 + } + ], + "upTime": 29040 }, { "id": 23, @@ -365,7 +519,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 52900 + } + ], + "upTime": 31740 }, { "id": 24, @@ -381,7 +542,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 57600 + } + ], + "upTime": 34560 }, { "id": 25, @@ -397,7 +565,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 62500 + } + ], + "upTime": 37500 }, { "id": 26, @@ -413,7 +588,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 67600 + } + ], + "upTime": 40560 }, { "id": 27, @@ -429,7 +611,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 72900 + } + ], + "upTime": 43740 }, { "id": 28, @@ -445,7 +634,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 78400 + } + ], + "upTime": 47040 }, { "id": 29, @@ -461,7 +657,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 84100 + } + ], + "upTime": 50460 }, { "id": 30, @@ -477,7 +680,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 90000 + } + ], + "upTime": 54000 }, { "id": 31, @@ -493,7 +703,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 96100 + } + ], + "upTime": 57660 }, { "id": 32, @@ -509,7 +726,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 102400 + } + ], + "upTime": 61440 }, { "id": 33, @@ -525,7 +749,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 108900 + } + ], + "upTime": 65340 }, { "id": 34, @@ -541,7 +772,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 115600 + } + ], + "upTime": 69360 }, { "id": 35, @@ -557,7 +795,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 122500 + } + ], + "upTime": 73500 }, { "id": 36, @@ -573,7 +818,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 129600 + } + ], + "upTime": 77760 }, { "id": 37, @@ -589,7 +841,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 136900 + } + ], + "upTime": 82140 }, { "id": 38, @@ -605,7 +864,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 144400 + } + ], + "upTime": 86640 }, { "id": 39, @@ -621,7 +887,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 152100 + } + ], + "upTime": 91260 }, { "id": 40, @@ -637,7 +910,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 160000 + } + ], + "upTime": 96000 }, { "id": 41, @@ -653,7 +933,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 168100 + } + ], + "upTime": 100860 }, { "id": 42, @@ -669,7 +956,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 176400 + } + ], + "upTime": 105840 }, { "id": 43, @@ -685,7 +979,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 184900 + } + ], + "upTime": 110940 }, { "id": 44, @@ -701,7 +1002,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 193600 + } + ], + "upTime": 116160 }, { "id": 45, @@ -717,7 +1025,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 202500 + } + ], + "upTime": 121500 }, { "id": 46, @@ -733,7 +1048,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 211600 + } + ], + "upTime": 126960 }, { "id": 47, @@ -749,7 +1071,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 220900 + } + ], + "upTime": 132540 }, { "id": 48, @@ -765,7 +1094,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 230400 + } + ], + "upTime": 138240 }, { "id": 49, @@ -781,7 +1117,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 240100 + } + ], + "upTime": 144060 }, { "id": 50, @@ -797,7 +1140,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 250000 + } + ], + "upTime": 150000 }, { "id": 51, @@ -813,7 +1163,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 260100 + } + ], + "upTime": 156060 }, { "id": 52, @@ -829,7 +1186,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 270400 + } + ], + "upTime": 162240 }, { "id": 53, @@ -845,7 +1209,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 280900 + } + ], + "upTime": 168540 }, { "id": 54, @@ -861,7 +1232,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 291600 + } + ], + "upTime": 174960 }, { "id": 55, @@ -877,7 +1255,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 302500 + } + ], + "upTime": 181500 }, { "id": 56, @@ -893,7 +1278,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 313600 + } + ], + "upTime": 188160 }, { "id": 57, @@ -909,7 +1301,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 324900 + } + ], + "upTime": 194940 }, { "id": 58, @@ -925,7 +1324,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 336400 + } + ], + "upTime": 201840 }, { "id": 59, @@ -941,7 +1347,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 348100 + } + ], + "upTime": 208860 }, { "id": 60, @@ -957,7 +1370,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 360000 + } + ], + "upTime": 216000 }, { "id": 61, @@ -973,7 +1393,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 372100 + } + ], + "upTime": 223260 }, { "id": 62, @@ -989,7 +1416,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 384400 + } + ], + "upTime": 230640 }, { "id": 63, @@ -1005,7 +1439,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 396900 + } + ], + "upTime": 238140 }, { "id": 64, @@ -1021,7 +1462,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 409600 + } + ], + "upTime": 245760 }, { "id": 65, @@ -1037,7 +1485,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 422500 + } + ], + "upTime": 253500 }, { "id": 66, @@ -1053,7 +1508,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 435600 + } + ], + "upTime": 261360 }, { "id": 67, @@ -1069,7 +1531,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 448900 + } + ], + "upTime": 269340 }, { "id": 68, @@ -1085,7 +1554,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 462400 + } + ], + "upTime": 277440 }, { "id": 69, @@ -1101,7 +1577,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 476100 + } + ], + "upTime": 285660 }, { "id": 70, @@ -1117,7 +1600,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 490000 + } + ], + "upTime": 294000 }, { "id": 71, @@ -1133,7 +1623,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 504100 + } + ], + "upTime": 302460 }, { "id": 72, @@ -1149,7 +1646,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 518400 + } + ], + "upTime": 311040 }, { "id": 73, @@ -1165,7 +1669,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 532900 + } + ], + "upTime": 319740 }, { "id": 74, @@ -1181,7 +1692,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 547600 + } + ], + "upTime": 328560 }, { "id": 75, @@ -1197,7 +1715,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 562500 + } + ], + "upTime": 337500 }, { "id": 76, @@ -1213,7 +1738,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 577600 + } + ], + "upTime": 346560 }, { "id": 77, @@ -1229,7 +1761,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 592900 + } + ], + "upTime": 355740 }, { "id": 78, @@ -1245,7 +1784,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 608400 + } + ], + "upTime": 365040 }, { "id": 79, @@ -1261,7 +1807,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 624100 + } + ], + "upTime": 374460 }, { "id": 80, @@ -1277,7 +1830,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 640000 + } + ], + "upTime": 384000 }, { "id": 81, @@ -1293,7 +1853,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 656100 + } + ], + "upTime": 393660 }, { "id": 82, @@ -1309,7 +1876,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 672400 + } + ], + "upTime": 403440 }, { "id": 83, @@ -1325,7 +1899,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 688900 + } + ], + "upTime": 413340 }, { "id": 84, @@ -1341,7 +1922,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 705600 + } + ], + "upTime": 423360 }, { "id": 85, @@ -1357,7 +1945,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 722500 + } + ], + "upTime": 433500 }, { "id": 86, @@ -1373,7 +1968,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 739600 + } + ], + "upTime": 443760 }, { "id": 87, @@ -1389,7 +1991,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 756900 + } + ], + "upTime": 454140 }, { "id": 88, @@ -1405,7 +2014,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 774400 + } + ], + "upTime": 464640 }, { "id": 89, @@ -1421,7 +2037,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 792100 + } + ], + "upTime": 475260 }, { "id": 90, @@ -1437,7 +2060,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 810000 + } + ], + "upTime": 486000 }, { "id": 91, @@ -1453,7 +2083,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 828100 + } + ], + "upTime": 496860 }, { "id": 92, @@ -1469,7 +2106,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 846400 + } + ], + "upTime": 507840 }, { "id": 93, @@ -1485,7 +2129,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 864900 + } + ], + "upTime": 518940 }, { "id": 94, @@ -1501,7 +2152,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 883600 + } + ], + "upTime": 530160 }, { "id": 95, @@ -1517,7 +2175,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 902500 + } + ], + "upTime": 541500 }, { "id": 96, @@ -1533,7 +2198,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 921600 + } + ], + "upTime": 552960 }, { "id": 97, @@ -1549,7 +2221,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 940900 + } + ], + "upTime": 564540 }, { "id": 98, @@ -1565,7 +2244,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 960400 + } + ], + "upTime": 576240 }, { "id": 99, @@ -1581,7 +2267,14 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 980100 + } + ], + "upTime": 588060 }, { "id": 100, @@ -1597,6 +2290,13 @@ 0, 0 ], - "total": 100 + "total": 100, + "materials": [ + { + "id": 90001, + "value": 1000000 + } + ], + "upTime": 600000 } ] \ No newline at end of file