diff --git a/assets/res/fonts/font3.fnt b/assets/res/fonts/font3.fnt deleted file mode 100644 index a83386b7..00000000 --- a/assets/res/fonts/font3.fnt +++ /dev/null @@ -1,210 +0,0 @@ -info face="明黑等宽" size=32 bold=1 italic=0 charset="" unicode=1 stretchH=100 smooth=1 aa=1 padding=2,2,2,2 spacing=2,2 outline=0 -common lineHeight=33 base=28 scaleW=512 scaleH=512 pages=1 packed=0 alphaChnl=1 redChnl=0 greenChnl=0 blueChnl=0 -page id=0 file="font3.png" -chars count=206 -char id=32 x=503 y=35 width=7 height=5 xoffset=-3 yoffset=30 xadvance=16 page=0 chnl=15 -char id=43 x=483 y=491 width=20 height=19 xoffset=-2 yoffset=10 xadvance=16 page=0 chnl=15 -char id=45 x=106 y=501 width=20 height=8 xoffset=-2 yoffset=15 xadvance=16 page=0 chnl=15 -char id=46 x=494 y=133 width=10 height=9 xoffset=3 yoffset=22 xadvance=16 page=0 chnl=15 -char id=47 x=487 y=0 width=20 height=33 xoffset=-2 yoffset=1 xadvance=16 page=0 chnl=15 -char id=48 x=378 y=466 width=20 height=26 xoffset=-2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=49 x=494 y=105 width=14 height=26 xoffset=0 yoffset=5 xadvance=16 page=0 chnl=15 -char id=50 x=463 y=466 width=18 height=26 xoffset=-1 yoffset=5 xadvance=16 page=0 chnl=15 -char id=51 x=422 y=466 width=19 height=26 xoffset=-2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=52 x=400 y=466 width=20 height=26 xoffset=-2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=53 x=358 y=467 width=18 height=27 xoffset=-1 yoffset=5 xadvance=16 page=0 chnl=15 -char id=54 x=337 y=467 width=19 height=27 xoffset=-1 yoffset=5 xadvance=16 page=0 chnl=15 -char id=55 x=443 y=466 width=18 height=26 xoffset=-1 yoffset=5 xadvance=16 page=0 chnl=15 -char id=56 x=487 y=396 width=20 height=27 xoffset=-2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=57 x=316 y=467 width=19 height=27 xoffset=-2 yoffset=5 xadvance=16 page=0 chnl=15 -char id=58 x=495 y=466 width=10 height=21 xoffset=3 yoffset=10 xadvance=16 page=0 chnl=15 -char id=8544 x=494 y=73 width=10 height=30 xoffset=11 yoffset=1 xadvance=32 page=0 chnl=15 -char id=8545 x=481 y=213 width=20 height=30 xoffset=6 yoffset=1 xadvance=32 page=0 chnl=15 -char id=8546 x=481 y=181 width=28 height=30 xoffset=2 yoffset=1 xadvance=32 page=0 chnl=15 -char id=8547 x=214 y=468 width=32 height=30 xoffset=1 yoffset=1 xadvance=32 page=0 chnl=15 -char id=8548 x=248 y=467 width=30 height=30 xoffset=1 yoffset=1 xadvance=32 page=0 chnl=15 -char id=19968 x=70 y=501 width=34 height=9 xoffset=-1 yoffset=11 xadvance=32 page=0 chnl=15 -char id=19971 x=376 y=397 width=35 height=33 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=19975 x=252 y=432 width=34 height=33 xoffset=-1 yoffset=0 xadvance=32 page=0 chnl=15 -char id=19977 x=178 y=468 width=34 height=30 xoffset=-1 yoffset=1 xadvance=32 page=0 chnl=15 -char id=19981 x=0 y=398 width=36 height=33 xoffset=-2 yoffset=0 xadvance=32 page=0 chnl=15 -char id=19982 x=438 y=362 width=36 height=33 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=20037 x=74 y=218 width=35 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=20108 x=280 y=467 width=34 height=27 xoffset=-1 yoffset=2 xadvance=32 page=0 chnl=15 -char id=20116 x=433 y=432 width=34 height=32 xoffset=-1 yoffset=0 xadvance=32 page=0 chnl=15 -char id=20139 x=108 y=37 width=34 height=35 xoffset=-1 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=20154 x=468 y=289 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=20170 x=190 y=74 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=20219 x=228 y=74 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=20237 x=266 y=74 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=20260 x=222 y=218 width=35 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=20301 x=342 y=74 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=20493 x=380 y=73 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=20551 x=114 y=0 width=36 height=35 xoffset=-2 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=20803 x=288 y=432 width=34 height=33 xoffset=-1 yoffset=0 xadvance=32 page=0 chnl=15 -char id=20805 x=36 y=326 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=20813 x=0 y=37 width=34 height=35 xoffset=-1 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=20837 x=72 y=326 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=20845 x=370 y=218 width=35 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=20987 x=108 y=326 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=20998 x=190 y=110 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=21033 x=105 y=362 width=33 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=21040 x=396 y=254 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=21069 x=180 y=37 width=34 height=35 xoffset=-1 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=21097 x=360 y=254 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=21152 x=38 y=146 width=35 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=21153 x=180 y=254 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=21160 x=72 y=254 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=21169 x=444 y=217 width=35 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=21191 x=35 y=362 width=33 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=21253 x=75 y=146 width=35 height=34 xoffset=-2 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=21270 x=112 y=146 width=35 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=21319 x=396 y=290 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=21326 x=216 y=290 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=21442 x=38 y=0 width=36 height=35 xoffset=-2 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=21451 x=0 y=74 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=21452 x=152 y=398 width=36 height=33 xoffset=-2 yoffset=0 xadvance=32 page=0 chnl=15 -char id=21457 x=38 y=110 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=21462 x=450 y=397 width=35 height=33 xoffset=-1 yoffset=0 xadvance=32 page=0 chnl=15 -char id=21507 x=413 y=397 width=35 height=33 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=21517 x=287 y=37 width=32 height=35 xoffset=-1 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=21551 x=108 y=290 width=34 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=21608 x=72 y=433 width=34 height=33 xoffset=-2 yoffset=0 xadvance=32 page=0 chnl=15 -char id=21629 x=76 y=0 width=36 height=35 xoffset=-2 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=21688 x=380 y=109 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=21830 x=36 y=37 width=34 height=35 xoffset=-1 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=22120 x=114 y=398 width=36 height=33 xoffset=-2 yoffset=0 xadvance=32 page=0 chnl=15 -char id=22235 x=143 y=468 width=33 height=31 xoffset=0 yoffset=1 xadvance=32 page=0 chnl=15 -char id=22307 x=360 y=432 width=35 height=32 xoffset=-1 yoffset=0 xadvance=32 page=0 chnl=15 -char id=22330 x=149 y=146 width=35 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=22343 x=144 y=254 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=22810 x=252 y=37 width=33 height=35 xoffset=0 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=22825 x=70 y=468 width=35 height=31 xoffset=-1 yoffset=1 xadvance=32 page=0 chnl=15 -char id=22841 x=288 y=326 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=22870 x=223 y=146 width=35 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=22871 x=465 y=37 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=22909 x=260 y=146 width=35 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=22987 x=38 y=74 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=23395 x=297 y=146 width=35 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=23450 x=432 y=326 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=23453 x=252 y=326 width=34 height=34 xoffset=-1 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=23475 x=216 y=326 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=23545 x=0 y=110 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=23556 x=152 y=0 width=36 height=35 xoffset=-2 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=23562 x=468 y=253 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=23567 x=152 y=110 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=23624 x=108 y=433 width=34 height=33 xoffset=-2 yoffset=0 xadvance=32 page=0 chnl=15 -char id=24050 x=36 y=468 width=32 height=32 xoffset=1 yoffset=0 xadvance=32 page=0 chnl=15 -char id=24211 x=228 y=0 width=35 height=35 xoffset=-2 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=24215 x=376 y=0 width=35 height=35 xoffset=-2 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=24320 x=36 y=433 width=34 height=33 xoffset=-1 yoffset=0 xadvance=32 page=0 chnl=15 -char id=24335 x=334 y=146 width=35 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=24377 x=371 y=146 width=35 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=24378 x=228 y=397 width=35 height=33 xoffset=-1 yoffset=0 xadvance=32 page=0 chnl=15 -char id=24405 x=476 y=361 width=34 height=33 xoffset=-1 yoffset=0 xadvance=32 page=0 chnl=15 -char id=24448 x=408 y=145 width=35 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=24471 x=445 y=145 width=35 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=24635 x=396 y=326 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=25103 x=186 y=146 width=35 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=25105 x=37 y=182 width=35 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=25112 x=74 y=182 width=35 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=25163 x=144 y=433 width=34 height=33 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=25277 x=432 y=290 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=25454 x=180 y=326 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=25490 x=266 y=110 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=25915 x=427 y=37 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=25968 x=76 y=74 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=26007 x=144 y=290 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=26032 x=389 y=37 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=26085 x=482 y=145 width=28 height=33 xoffset=2 yoffset=0 xadvance=32 page=0 chnl=15 -char id=26102 x=111 y=182 width=35 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=26143 x=469 y=432 width=34 height=32 xoffset=-1 yoffset=0 xadvance=32 page=0 chnl=15 -char id=26356 x=216 y=432 width=34 height=33 xoffset=-1 yoffset=0 xadvance=32 page=0 chnl=15 -char id=26368 x=0 y=290 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=26412 x=114 y=74 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=26432 x=148 y=182 width=35 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=26700 x=0 y=326 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=27036 x=450 y=0 width=35 height=35 xoffset=-2 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=27169 x=114 y=110 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=27425 x=144 y=326 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=27494 x=185 y=182 width=35 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=27573 x=456 y=73 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=27704 x=304 y=74 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=27760 x=0 y=218 width=35 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=27963 x=324 y=326 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=28040 x=70 y=362 width=33 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=28120 x=222 y=182 width=35 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=28155 x=152 y=74 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=28216 x=351 y=37 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=28385 x=259 y=182 width=35 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=28857 x=36 y=254 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=29579 x=107 y=468 width=34 height=31 xoffset=-1 yoffset=0 xadvance=32 page=0 chnl=15 -char id=29824 x=108 y=254 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=29864 x=456 y=109 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=29983 x=339 y=397 width=35 height=33 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=29992 x=0 y=433 width=34 height=33 xoffset=-2 yoffset=0 xadvance=32 page=0 chnl=15 -char id=30331 x=38 y=398 width=36 height=33 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=30333 x=140 y=362 width=30 height=34 xoffset=1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=30340 x=0 y=362 width=33 height=34 xoffset=0 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=30475 x=72 y=37 width=34 height=35 xoffset=-1 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=30707 x=265 y=397 width=35 height=33 xoffset=-2 yoffset=0 xadvance=32 page=0 chnl=15 -char id=30830 x=296 y=182 width=35 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=31036 x=339 y=0 width=35 height=35 xoffset=-2 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=31070 x=302 y=0 width=35 height=35 xoffset=-2 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=31119 x=413 y=0 width=35 height=35 xoffset=-2 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=31192 x=304 y=110 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=31215 x=333 y=182 width=35 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=31532 x=370 y=182 width=35 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=31614 x=228 y=110 width=36 height=34 xoffset=-2 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=31665 x=407 y=182 width=35 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=31934 x=444 y=181 width=35 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=32047 x=180 y=433 width=34 height=33 xoffset=-1 yoffset=0 xadvance=32 page=0 chnl=15 -char id=32423 x=76 y=110 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=32452 x=190 y=397 width=36 height=33 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=32487 x=400 y=362 width=36 height=33 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=32493 x=37 y=218 width=35 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=32622 x=0 y=468 width=34 height=32 xoffset=-1 yoffset=0 xadvance=32 page=0 chnl=15 -char id=32768 x=111 y=218 width=35 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=32773 x=148 y=218 width=35 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=32972 x=180 y=290 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=32988 x=418 y=73 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=33258 x=321 y=37 width=28 height=35 xoffset=2 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=33267 x=397 y=432 width=34 height=32 xoffset=-1 yoffset=0 xadvance=32 page=0 chnl=15 -char id=33410 x=252 y=290 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=33521 x=288 y=290 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=33635 x=324 y=290 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=33719 x=360 y=290 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=34892 x=185 y=218 width=35 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=34917 x=265 y=0 width=35 height=35 xoffset=-1 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=35013 x=259 y=218 width=35 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=35266 x=76 y=398 width=36 height=33 xoffset=-2 yoffset=0 xadvance=32 page=0 chnl=15 -char id=35270 x=0 y=0 width=36 height=35 xoffset=-2 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=35745 x=296 y=218 width=35 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=35774 x=360 y=326 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=35797 x=302 y=397 width=35 height=33 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=35831 x=0 y=182 width=35 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=36149 x=468 y=325 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=36153 x=0 y=254 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=36187 x=190 y=0 width=36 height=35 xoffset=-2 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=36215 x=172 y=362 width=36 height=33 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=36817 x=362 y=362 width=36 height=33 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=36827 x=324 y=362 width=36 height=33 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=36865 x=248 y=362 width=36 height=33 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=36895 x=210 y=362 width=36 height=33 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=36992 x=286 y=362 width=36 height=33 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=37329 x=418 y=109 width=36 height=34 xoffset=-2 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=38075 x=72 y=290 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=38082 x=216 y=254 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=38108 x=252 y=254 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=38134 x=333 y=218 width=35 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=38431 x=288 y=254 width=34 height=34 xoffset=0 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=38454 x=216 y=37 width=34 height=35 xoffset=0 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=38738 x=324 y=254 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=38754 x=324 y=432 width=34 height=33 xoffset=-1 yoffset=0 xadvance=32 page=0 chnl=15 -char id=39046 x=342 y=110 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=39057 x=0 y=146 width=36 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=39640 x=144 y=37 width=34 height=35 xoffset=-1 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=40060 x=432 y=254 width=34 height=34 xoffset=-1 yoffset=-2 xadvance=32 page=0 chnl=15 -char id=40481 x=407 y=218 width=35 height=34 xoffset=-2 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=40644 x=36 y=290 width=34 height=34 xoffset=-1 yoffset=-1 xadvance=32 page=0 chnl=15 -char id=65306 x=483 y=466 width=10 height=23 xoffset=3 yoffset=8 xadvance=32 page=0 chnl=15 diff --git a/assets/res/fonts/font3.fnt.meta b/assets/res/fonts/font3.fnt.meta deleted file mode 100644 index 3441b742..00000000 --- a/assets/res/fonts/font3.fnt.meta +++ /dev/null @@ -1,7 +0,0 @@ -{ - "ver": "2.1.0", - "uuid": "574a7a0b-a749-4ee9-b9d8-9189f91ca931", - "textureUuid": "cf0fde37-77c3-47d2-9bb7-372ff76ebb99", - "fontSize": 32, - "subMetas": {} -} \ No newline at end of file diff --git a/assets/res/fonts/font3.png b/assets/res/fonts/font3.png deleted file mode 100644 index 98c8b993..00000000 Binary files a/assets/res/fonts/font3.png and /dev/null differ diff --git a/assets/res/fonts/font3.png.meta b/assets/res/fonts/font3.png.meta deleted file mode 100644 index 1be960ea..00000000 --- a/assets/res/fonts/font3.png.meta +++ /dev/null @@ -1,31 +0,0 @@ -{ - "ver": "2.2.0", - "uuid": "cf0fde37-77c3-47d2-9bb7-372ff76ebb99", - "type": "sprite", - "wrapMode": "clamp", - "filterMode": "bilinear", - "premultiplyAlpha": false, - "subMetas": { - "font3": { - "ver": "1.0.4", - "uuid": "f56edaee-90f2-41c1-bbf7-39d96615e2b5", - "rawTextureUuid": "cf0fde37-77c3-47d2-9bb7-372ff76ebb99", - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": -1, - "offsetY": 1, - "trimX": 0, - "trimY": 0, - "width": 510, - "height": 510, - "rawWidth": 512, - "rawHeight": 512, - "borderTop": 0, - "borderBottom": 0, - "borderLeft": 0, - "borderRight": 0, - "subMetas": {} - } - } -} \ No newline at end of file diff --git a/assets/res/login/fakestart.png b/assets/res/login/fakestart.png index 6d81a020..04b92f6f 100644 Binary files a/assets/res/login/fakestart.png and b/assets/res/login/fakestart.png differ diff --git a/assets/res/login/fakestart.png.meta b/assets/res/login/fakestart.png.meta index bf66913e..93379daf 100644 --- a/assets/res/login/fakestart.png.meta +++ b/assets/res/login/fakestart.png.meta @@ -17,10 +17,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 189, - "height": 64, - "rawWidth": 189, - "rawHeight": 64, + "width": 30, + "height": 30, + "rawWidth": 30, + "rawHeight": 30, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/res/prefabs/NUI/UIManualAdvanced.prefab b/assets/res/prefabs/NUI/UIManualAdvanced.prefab index 4d31bb0f..52c140b0 100644 --- a/assets/res/prefabs/NUI/UIManualAdvanced.prefab +++ b/assets/res/prefabs/NUI/UIManualAdvanced.prefab @@ -186,9 +186,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -398,9 +395,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -502,9 +496,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -606,9 +597,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -710,9 +698,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -861,9 +846,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -1067,9 +1049,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -1171,9 +1150,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -1275,9 +1251,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -1399,23 +1372,6 @@ "a": 255 }, "_width": 2, - "_color2": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_width2": 0, - "_isUnderline": false, - "_UnderlineColor": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_UnderlineWidth": 0, "_id": "" }, { @@ -1630,9 +1586,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -1761,9 +1714,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -2138,9 +2088,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -2280,8 +2227,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 81.25, - "height": 75 + "width": 88.98, + "height": 60 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2328,10 +2275,8 @@ "_fontSize": 40, "_lineHeight": 60, "_enableWrapText": true, - "_N$file": { - "__uuid__": "574a7a0b-a749-4ee9-b9d8-9189f91ca931" - }, - "_isSystemFontUsed": false, + "_N$file": null, + "_isSystemFontUsed": true, "_spacingX": 0, "_batchAsBitmap": false, "_N$horizontalAlign": 0, @@ -2506,9 +2451,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -2536,9 +2478,7 @@ "_fontSize": 40, "_lineHeight": 60, "_enableWrapText": true, - "_N$file": { - "__uuid__": "574a7a0b-a749-4ee9-b9d8-9189f91ca931" - }, + "_N$file": null, "_isSystemFontUsed": false, "_spacingX": 0, "_batchAsBitmap": false, @@ -2648,9 +2588,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -2770,23 +2707,6 @@ "a": 255 }, "_width": 1, - "_color2": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_width2": 0, - "_isUnderline": false, - "_UnderlineColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_UnderlineWidth": 0, "_id": "" }, { @@ -3286,9 +3206,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -3390,9 +3307,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -3494,9 +3408,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -3778,9 +3689,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -3882,9 +3790,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -3986,9 +3891,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -4270,9 +4172,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -4374,9 +4273,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -4478,9 +4374,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -4827,9 +4720,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { diff --git a/assets/res/prefabs/NUI/UISeasonmanual.prefab b/assets/res/prefabs/NUI/UISeasonmanual.prefab index b7eca5fb..f5ec73d1 100644 --- a/assets/res/prefabs/NUI/UISeasonmanual.prefab +++ b/assets/res/prefabs/NUI/UISeasonmanual.prefab @@ -9856,8 +9856,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 64.31, - "height": 52.5 + "width": 70.08, + "height": 40 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -9904,10 +9904,8 @@ "_fontSize": 42, "_lineHeight": 40, "_enableWrapText": true, - "_N$file": { - "__uuid__": "574a7a0b-a749-4ee9-b9d8-9189f91ca931" - }, - "_isSystemFontUsed": false, + "_N$file": null, + "_isSystemFontUsed": true, "_spacingX": 0, "_batchAsBitmap": false, "_N$horizontalAlign": 0, @@ -10841,8 +10839,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 64.31, - "height": 52.5 + "width": 70.08, + "height": 40 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -10889,10 +10887,8 @@ "_fontSize": 42, "_lineHeight": 40, "_enableWrapText": true, - "_N$file": { - "__uuid__": "574a7a0b-a749-4ee9-b9d8-9189f91ca931" - }, - "_isSystemFontUsed": false, + "_N$file": null, + "_isSystemFontUsed": true, "_spacingX": 0, "_batchAsBitmap": false, "_N$horizontalAlign": 0, @@ -14525,9 +14521,7 @@ "_fontSize": 42, "_lineHeight": 32, "_enableWrapText": true, - "_N$file": { - "__uuid__": "574a7a0b-a749-4ee9-b9d8-9189f91ca931" - }, + "_N$file": null, "_isSystemFontUsed": false, "_spacingX": 0, "_batchAsBitmap": false, @@ -14888,9 +14882,7 @@ "_fontSize": 42, "_lineHeight": 32, "_enableWrapText": true, - "_N$file": { - "__uuid__": "574a7a0b-a749-4ee9-b9d8-9189f91ca931" - }, + "_N$file": null, "_isSystemFontUsed": false, "_spacingX": 0, "_batchAsBitmap": false, diff --git a/assets/res/prefabs/NUI/UIhaoyou.prefab b/assets/res/prefabs/NUI/UIhaoyou.prefab index 4a9349d5..14cce00c 100644 --- a/assets/res/prefabs/NUI/UIhaoyou.prefab +++ b/assets/res/prefabs/NUI/UIhaoyou.prefab @@ -5116,9 +5116,7 @@ "_fontSize": 96, "_lineHeight": 40, "_enableWrapText": false, - "_N$file": { - "__uuid__": "574a7a0b-a749-4ee9-b9d8-9189f91ca931" - }, + "_N$file": null, "_isSystemFontUsed": false, "_spacingX": 0, "_batchAsBitmap": false, diff --git a/assets/res/prefabs/NUI/cell_HeroItemGroup.prefab b/assets/res/prefabs/NUI/cell_HeroItemGroup.prefab index d2fa10d7..c3e421f8 100644 --- a/assets/res/prefabs/NUI/cell_HeroItemGroup.prefab +++ b/assets/res/prefabs/NUI/cell_HeroItemGroup.prefab @@ -423,9 +423,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -726,9 +723,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -910,9 +904,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -957,7 +948,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 106, + "width": 71.05, "height": 50 }, "_anchorPoint": { @@ -1000,8 +991,8 @@ }, "_enabled": true, "_useOriginalSize": true, - "_string": "米拉米", - "_N$string": "米拉米", + "_string": "hero", + "_N$string": "hero", "_fontSize": 35, "_lineHeight": 50, "_enableWrapText": true, @@ -1032,23 +1023,6 @@ "a": 255 }, "_width": 0.5, - "_color2": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_width2": 0, - "_isUnderline": false, - "_UnderlineColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_UnderlineWidth": 0, "_id": "" }, { @@ -1215,9 +1189,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -1319,9 +1290,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -1434,9 +1402,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -1616,9 +1581,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -1720,9 +1682,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -1824,9 +1783,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -1928,9 +1884,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -2032,9 +1985,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -2248,9 +2198,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -2421,9 +2368,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -2463,9 +2407,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -2906,9 +2847,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -3010,9 +2948,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -3234,9 +3169,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -3702,9 +3634,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -3886,9 +3815,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -3933,7 +3859,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 106, + "width": 71.05, "height": 50 }, "_anchorPoint": { @@ -3976,8 +3902,8 @@ }, "_enabled": true, "_useOriginalSize": true, - "_string": "米拉米", - "_N$string": "米拉米", + "_string": "hero", + "_N$string": "hero", "_fontSize": 35, "_lineHeight": 50, "_enableWrapText": true, @@ -4008,23 +3934,6 @@ "a": 255 }, "_width": 0.5, - "_color2": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_width2": 0, - "_isUnderline": false, - "_UnderlineColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_UnderlineWidth": 0, "_id": "" }, { @@ -4191,9 +4100,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -4295,9 +4201,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -4410,9 +4313,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -4592,9 +4492,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -4696,9 +4593,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -4800,9 +4694,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -4904,9 +4795,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -5008,9 +4896,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -5224,9 +5109,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -5397,9 +5279,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -5439,9 +5318,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -5882,9 +5758,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -5986,9 +5859,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -6210,9 +6080,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -6678,9 +6545,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -6862,9 +6726,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -6909,7 +6770,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 106, + "width": 71.05, "height": 50 }, "_anchorPoint": { @@ -6952,8 +6813,8 @@ }, "_enabled": true, "_useOriginalSize": true, - "_string": "米拉米", - "_N$string": "米拉米", + "_string": "hero", + "_N$string": "hero", "_fontSize": 35, "_lineHeight": 50, "_enableWrapText": true, @@ -6984,23 +6845,6 @@ "a": 255 }, "_width": 0.5, - "_color2": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_width2": 0, - "_isUnderline": false, - "_UnderlineColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_UnderlineWidth": 0, "_id": "" }, { @@ -7167,9 +7011,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -7271,9 +7112,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -7386,9 +7224,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -7568,9 +7403,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -7672,9 +7504,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -7776,9 +7605,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -7880,9 +7706,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -7984,9 +7807,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -8200,9 +8020,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -8373,9 +8190,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -8415,9 +8229,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -8858,9 +8669,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -8962,9 +8770,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -9186,9 +8991,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -9654,9 +9456,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -9838,9 +9637,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -9885,7 +9681,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 106, + "width": 71.05, "height": 50 }, "_anchorPoint": { @@ -9928,8 +9724,8 @@ }, "_enabled": true, "_useOriginalSize": true, - "_string": "米拉米", - "_N$string": "米拉米", + "_string": "hero", + "_N$string": "hero", "_fontSize": 35, "_lineHeight": 50, "_enableWrapText": true, @@ -9960,23 +9756,6 @@ "a": 255 }, "_width": 0.5, - "_color2": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_width2": 0, - "_isUnderline": false, - "_UnderlineColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_UnderlineWidth": 0, "_id": "" }, { @@ -10143,9 +9922,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -10247,9 +10023,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -10362,9 +10135,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -10544,9 +10314,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -10648,9 +10415,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -10752,9 +10516,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -10856,9 +10617,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -10960,9 +10718,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -11176,9 +10931,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -11349,9 +11101,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -11391,9 +11140,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -11834,9 +11580,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -11938,9 +11681,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { diff --git a/assets/res/prefabs/NUI/chat/pb_friendlist.prefab b/assets/res/prefabs/NUI/chat/pb_friendlist.prefab index f69866bb..55ac9fc6 100644 --- a/assets/res/prefabs/NUI/chat/pb_friendlist.prefab +++ b/assets/res/prefabs/NUI/chat/pb_friendlist.prefab @@ -844,7 +844,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 106, + "width": 1, "height": 40 }, "_anchorPoint": { @@ -887,8 +887,8 @@ }, "_enabled": true, "_useOriginalSize": false, - "_string": "名字五个字...", - "_N$string": "名字五个字...", + "_string": "", + "_N$string": "", "_fontSize": 18, "_lineHeight": 40, "_enableWrapText": true, @@ -1399,7 +1399,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 50, + "width": 66.72, "height": 40 }, "_anchorPoint": { @@ -1442,8 +1442,8 @@ }, "_enabled": true, "_useOriginalSize": false, - "_string": "在线", - "_N$string": "在线", + "_string": "online", + "_N$string": "online", "_fontSize": 25, "_lineHeight": 40, "_enableWrapText": true, diff --git a/assets/res/prefabs/NUI/chat/pb_talk.prefab b/assets/res/prefabs/NUI/chat/pb_talk.prefab index 634bd356..22c951e9 100644 --- a/assets/res/prefabs/NUI/chat/pb_talk.prefab +++ b/assets/res/prefabs/NUI/chat/pb_talk.prefab @@ -3127,7 +3127,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 176, + "width": 76.04, "height": 70 }, "_anchorPoint": { @@ -3170,8 +3170,8 @@ }, "_enabled": true, "_useOriginalSize": false, - "_string": "名字五个字...", - "_N$string": "名字五个字...", + "_string": "name", + "_N$string": "name", "_fontSize": 30, "_lineHeight": 70, "_enableWrapText": true, diff --git a/assets/res/prefabs/NUI/chat/pb_talk3.prefab b/assets/res/prefabs/NUI/chat/pb_talk3.prefab index cf58f167..a7cabb95 100644 --- a/assets/res/prefabs/NUI/chat/pb_talk3.prefab +++ b/assets/res/prefabs/NUI/chat/pb_talk3.prefab @@ -26,18 +26,18 @@ "__id__": 43 }, { - "__id__": 53 + "__id__": 50 } ], "_active": true, "_level": 1, "_components": [ { - "__id__": 67 + "__id__": 64 } ], "_prefab": { - "__id__": 68 + "__id__": 65 }, "_opacity": 255, "_color": { @@ -225,7 +225,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 222.79999999999998, + "width": 172.82, "height": 62.3 }, "_anchorPoint": { @@ -1063,7 +1063,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 87.9, + "width": 37.92, "height": 40 }, "_anchorPoint": { @@ -1106,8 +1106,8 @@ }, "_enabled": true, "_useOriginalSize": false, - "_string": "名字五个字...", - "_N$string": "名字五个字...", + "_string": "name", + "_N$string": "name", "_fontSize": 15, "_lineHeight": 40, "_enableWrapText": true, @@ -1196,7 +1196,7 @@ }, "_position": { "__type__": "cc.Vec3", - "x": 463.656, + "x": 413.67600000000004, "y": -1, "z": 0 }, @@ -1474,7 +1474,7 @@ "_enabled": true, "_layoutSize": { "__type__": "cc.Size", - "width": 222.79999999999998, + "width": 172.82, "height": 62.3 }, "_resize": 1, @@ -1518,23 +1518,20 @@ "_children": [ { "__id__": 44 - }, - { - "__id__": 47 } ], "_active": true, "_level": 2, "_components": [ { - "__id__": 50 + "__id__": 47 }, { - "__id__": 51 + "__id__": 48 } ], "_prefab": { - "__id__": 52 + "__id__": 49 }, "_opacity": 255, "_color": { @@ -1547,7 +1544,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 240, - "height": 40 + "height": 20 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1608,7 +1605,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 240, + "width": 26.7, "height": 20 }, "_anchorPoint": { @@ -1651,8 +1648,8 @@ }, "_enabled": true, "_useOriginalSize": true, - "_string": "和法国恢复规划法规发鬼地方个冈和法国恢复", - "_N$string": "和法国恢复规划法规发鬼地方个冈和法国恢复", + "_string": "ahhh", + "_N$string": "ahhh", "_fontSize": 12, "_lineHeight": 20, "_enableWrapText": true, @@ -1675,105 +1672,7 @@ "asset": { "__uuid__": "20f74d71-39a1-4319-a165-4272efc4b91c" }, - "fileId": "f2yu51ZH1ABJ/ADsGvjokc", - "sync": false - }, - { - "__type__": "cc.PrivateNode", - "_name": "RICHTEXT_CHILD", - "_objFlags": 0, - "_parent": { - "__id__": 43 - }, - "_children": [], - "_active": true, - "_level": 3, - "_components": [ - { - "__id__": 48 - } - ], - "_prefab": { - "__id__": 49 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 228, - "height": 20 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_position": { - "__type__": "cc.Vec3", - "x": 0, - "y": -40, - "z": 0 - }, - "_scale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_rotationX": 0, - "_rotationY": 0, - "_quat": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_skewX": 0, - "_skewY": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 47 - }, - "_enabled": true, - "_useOriginalSize": true, - "_string": "规划法规发鬼地方个冈和法国恢复规划法规", - "_N$string": "规划法规发鬼地方个冈和法国恢复规划法规", - "_fontSize": 12, - "_lineHeight": 20, - "_enableWrapText": true, - "_N$file": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_batchAsBitmap": false, - "_N$horizontalAlign": 0, - "_N$verticalAlign": 1, - "_N$fontFamily": "Arial", - "_N$overflow": 0, - "_N$cacheMode": 0, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__uuid__": "20f74d71-39a1-4319-a165-4272efc4b91c" - }, - "fileId": "6bPPNp7qpDn6+YafQm1ER8", + "fileId": "080kXabVFFyp9b2HLt6Qe2", "sync": false }, { @@ -1786,7 +1685,7 @@ "_enabled": true, "_fontFamily": "Arial", "_isSystemFontUsed": true, - "_N$string": "和法国恢复规划法规发鬼地方个冈和法国恢复规划法规发鬼地方个冈和法国恢复规划法规", + "_N$string": "ahhh", "_N$horizontalAlign": 0, "_N$fontSize": 12, "_N$font": null, @@ -1828,21 +1727,21 @@ }, "_children": [ { - "__id__": 54 + "__id__": 51 }, { - "__id__": 57 + "__id__": 54 } ], "_active": false, "_level": 2, "_components": [ { - "__id__": 64 + "__id__": 61 } ], "_prefab": { - "__id__": 66 + "__id__": 63 }, "_opacity": 255, "_color": { @@ -1893,18 +1792,18 @@ "_name": "ui_chat_bg1", "_objFlags": 0, "_parent": { - "__id__": 53 + "__id__": 50 }, "_children": [], "_active": true, "_level": 3, "_components": [ { - "__id__": 55 + "__id__": 52 } ], "_prefab": { - "__id__": 56 + "__id__": 53 }, "_opacity": 255, "_color": { @@ -1955,7 +1854,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 54 + "__id__": 51 }, "_enabled": true, "_srcBlendFactor": 770, @@ -1994,25 +1893,25 @@ "_name": "lb", "_objFlags": 0, "_parent": { - "__id__": 53 + "__id__": 50 }, "_children": [ { - "__id__": 58 + "__id__": 55 } ], "_active": true, "_level": 3, "_components": [ { - "__id__": 61 + "__id__": 58 }, { - "__id__": 62 + "__id__": 59 } ], "_prefab": { - "__id__": 63 + "__id__": 60 }, "_opacity": 255, "_color": { @@ -2063,18 +1962,18 @@ "_name": "RICHTEXT_CHILD", "_objFlags": 0, "_parent": { - "__id__": 57 + "__id__": 54 }, "_children": [], "_active": false, "_level": 4, "_components": [ { - "__id__": 59 + "__id__": 56 } ], "_prefab": { - "__id__": 60 + "__id__": 57 }, "_opacity": 255, "_color": { @@ -2125,7 +2024,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 58 + "__id__": 55 }, "_enabled": true, "_useOriginalSize": true, @@ -2161,7 +2060,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 57 + "__id__": 54 }, "_enabled": true, "_fontFamily": "Arial", @@ -2183,7 +2082,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 57 + "__id__": 54 }, "_enabled": true, "_id": "" @@ -2204,14 +2103,14 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 53 + "__id__": 50 }, "_enabled": true, "duration": 0.1, "zoomScale": 1.2, "clickEvents": [ { - "__id__": 65 + "__id__": 62 } ], "_N$interactable": true, @@ -2267,7 +2166,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 53 + "__id__": 50 }, "_id": "" }, @@ -2310,8 +2209,9 @@ "__id__": 29 }, "lb_talk": { - "__id__": 50 + "__id__": 47 }, + "lb_zone": null, "lb_talkNode": { "__id__": 43 }, @@ -2334,7 +2234,7 @@ "__id__": 37 }, "btn_join": { - "__id__": 53 + "__id__": 50 }, "nd_talkbg": { "__id__": 2 diff --git a/assets/res/prefabs/NUI/chat/uichatText_prefab.prefab b/assets/res/prefabs/NUI/chat/uichatText_prefab.prefab index 9c325998..680ea2d7 100644 --- a/assets/res/prefabs/NUI/chat/uichatText_prefab.prefab +++ b/assets/res/prefabs/NUI/chat/uichatText_prefab.prefab @@ -36,14 +36,14 @@ "_level": 1, "_components": [ { - "__id__": 50 + "__id__": 47 }, { - "__id__": 51 + "__id__": 48 } ], "_prefab": { - "__id__": 53 + "__id__": 50 }, "_opacity": 255, "_color": { @@ -229,7 +229,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 200.67000000000002, + "width": 134.03, "height": 80 }, "_anchorPoint": { @@ -768,7 +768,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 116.67, + "width": 50.03, "height": 20 }, "_anchorPoint": { @@ -811,8 +811,8 @@ }, "_enabled": true, "_useOriginalSize": false, - "_string": "名字五个字...", - "_N$string": "名字五个字...", + "_string": "name", + "_N$string": "name", "_fontSize": 20, "_lineHeight": 20, "_enableWrapText": true, @@ -1159,7 +1159,7 @@ "_enabled": true, "_layoutSize": { "__type__": "cc.Size", - "width": 200.67000000000002, + "width": 134.03, "height": 80 }, "_resize": 1, @@ -1403,23 +1403,20 @@ "_children": [ { "__id__": 41 - }, - { - "__id__": 44 } ], "_active": true, "_level": 2, "_components": [ { - "__id__": 47 + "__id__": 44 }, { - "__id__": 48 + "__id__": 45 } ], "_prefab": { - "__id__": 49 + "__id__": 46 }, "_opacity": 255, "_color": { @@ -1432,7 +1429,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 500, - "height": 52 + "height": 26 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1493,7 +1490,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 484.16, + "width": 73.41, "height": 26 }, "_anchorPoint": { @@ -1536,8 +1533,8 @@ }, "_enabled": true, "_useOriginalSize": true, - "_string": "1234567891111的发生发生范德萨大大师傅大师傅", - "_N$string": "1234567891111的发生发生范德萨大大师傅大师傅", + "_string": "ahhhhh", + "_N$string": "ahhhhh", "_fontSize": 22, "_lineHeight": 26, "_enableWrapText": true, @@ -1560,105 +1557,7 @@ "asset": { "__uuid__": "a821bd41-1ffc-488c-aa0e-4a7f3001127d" }, - "fileId": "9cpEMK+ihC3rhb6ANCumwN", - "sync": false - }, - { - "__type__": "cc.PrivateNode", - "_name": "RICHTEXT_CHILD", - "_objFlags": 0, - "_parent": { - "__id__": 40 - }, - "_children": [], - "_active": true, - "_level": 3, - "_components": [ - { - "__id__": 45 - } - ], - "_prefab": { - "__id__": 46 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 255, - "b": 0, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 198.88, - "height": 26 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_position": { - "__type__": "cc.Vec3", - "x": 0, - "y": -52, - "z": 0 - }, - "_scale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_rotationX": 0, - "_rotationY": 0, - "_quat": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_skewX": 0, - "_skewY": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 44 - }, - "_enabled": true, - "_useOriginalSize": true, - "_string": "11大师傅大师傅1111", - "_N$string": "11大师傅大师傅1111", - "_fontSize": 22, - "_lineHeight": 26, - "_enableWrapText": true, - "_N$file": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_batchAsBitmap": false, - "_N$horizontalAlign": 0, - "_N$verticalAlign": 1, - "_N$fontFamily": "Arial", - "_N$overflow": 0, - "_N$cacheMode": 0, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__uuid__": "a821bd41-1ffc-488c-aa0e-4a7f3001127d" - }, - "fileId": "79OYTC0Y5JZL/gCzA7HqaI", + "fileId": "445d084D9N9YBP1bGuRJxv", "sync": false }, { @@ -1671,7 +1570,7 @@ "_enabled": true, "_fontFamily": "Arial", "_isSystemFontUsed": true, - "_N$string": "1234567891111的发生发生范德萨大大师傅大师傅11大师傅大师傅1111", + "_N$string": "ahhhhh", "_N$horizontalAlign": 0, "_N$fontSize": 22, "_N$font": null, @@ -1719,7 +1618,7 @@ "__id__": 21 }, "lb_talk": { - "__id__": 47 + "__id__": 44 }, "sp_head": { "__id__": 8 @@ -1756,7 +1655,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 52 + "__id__": 49 } ], "_N$interactable": true, diff --git a/assets/res/prefabs/NUI/heroInfoSkillItem.prefab b/assets/res/prefabs/NUI/heroInfoSkillItem.prefab index 109024a4..dfd7a475 100644 --- a/assets/res/prefabs/NUI/heroInfoSkillItem.prefab +++ b/assets/res/prefabs/NUI/heroInfoSkillItem.prefab @@ -305,9 +305,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -409,9 +406,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -467,7 +461,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 242, + "width": 101.99, "height": 70 }, "_anchorPoint": { @@ -510,8 +504,8 @@ }, "_enabled": true, "_useOriginalSize": true, - "_string": "火力全开", - "_N$string": "火力全开", + "_string": "skill", + "_N$string": "skill", "_fontSize": 60, "_lineHeight": 70, "_enableWrapText": true, @@ -542,23 +536,6 @@ "a": 255 }, "_width": 1, - "_color2": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_width2": 0, - "_isUnderline": false, - "_UnderlineColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_UnderlineWidth": 0, "_id": "" }, { @@ -604,7 +581,7 @@ "_contentSize": { "__type__": "cc.Size", "width": 535.1, - "height": 200 + "height": 50 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -646,8 +623,8 @@ }, "_enabled": true, "_useOriginalSize": true, - "_string": "4过分过分的4过分过分的4过分过分的4过分过分的4过分过分的4过分过分的4过分过分的4过分过分的4过分过分的4过分过分的", - "_N$string": "4过分过分的4过分过分的4过分过分的4过分过分的4过分过分的4过分过分的4过分过分的4过分过分的4过分过分的4过分过分的", + "_string": "", + "_N$string": "", "_fontSize": 30, "_lineHeight": 50, "_enableWrapText": true, @@ -678,23 +655,6 @@ "a": 255 }, "_width": 0.5, - "_color2": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_width2": 0, - "_isUnderline": false, - "_UnderlineColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_UnderlineWidth": 0, "_id": "" }, { @@ -796,9 +756,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -838,9 +795,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { diff --git a/assets/res/prefabs/NUI/pb_changelayout.prefab b/assets/res/prefabs/NUI/pb_changelayout.prefab index 1883a1b2..b50155cf 100644 --- a/assets/res/prefabs/NUI/pb_changelayout.prefab +++ b/assets/res/prefabs/NUI/pb_changelayout.prefab @@ -180,9 +180,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -307,7 +304,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 122, + "width": 77.04, "height": 75 }, "_anchorPoint": { @@ -350,8 +347,8 @@ }, "_enabled": true, "_useOriginalSize": false, - "_string": "笑面藏狐", - "_N$string": "笑面藏狐", + "_string": "name", + "_N$string": "name", "_fontSize": 30, "_lineHeight": 75, "_enableWrapText": true, @@ -382,23 +379,6 @@ "a": 255 }, "_width": 1, - "_color2": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_width2": 0, - "_isUnderline": false, - "_UnderlineColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_UnderlineWidth": 0, "_id": "" }, { @@ -675,9 +655,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -918,9 +895,6 @@ "_isTrimmedMode": false, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -960,9 +934,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -1203,9 +1174,6 @@ "_isTrimmedMode": false, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -1245,9 +1213,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -1529,9 +1494,6 @@ "_isTrimmedMode": false, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -1721,23 +1683,6 @@ "a": 255 }, "_width": 0.5, - "_color2": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_width2": 0, - "_isUnderline": false, - "_UnderlineColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_UnderlineWidth": 0, "_id": "" }, { diff --git a/assets/res/prefabs/NUI/pb_chip_icon.prefab b/assets/res/prefabs/NUI/pb_chip_icon.prefab index 72f61976..cacd1628 100644 --- a/assets/res/prefabs/NUI/pb_chip_icon.prefab +++ b/assets/res/prefabs/NUI/pb_chip_icon.prefab @@ -177,9 +177,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -281,9 +278,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -548,9 +542,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -832,9 +823,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -874,9 +862,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { @@ -987,7 +972,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 33.96, + "width": 33.21, "height": 16 }, "_anchorPoint": { @@ -1088,7 +1073,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 94, + "width": 148.25, "height": 80 }, "_anchorPoint": { @@ -1131,8 +1116,8 @@ }, "_enabled": true, "_useOriginalSize": false, - "_string": "射击", - "_N$string": "射击", + "_string": "shoot", + "_N$string": "shoot", "_fontSize": 50, "_lineHeight": 80, "_enableWrapText": true, @@ -1165,23 +1150,6 @@ "a": 255 }, "_width": 1, - "_color2": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_width2": 0, - "_isUnderline": false, - "_UnderlineColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_UnderlineWidth": 0, "_id": "" }, { @@ -1221,9 +1189,6 @@ "_isTrimmedMode": true, "_state": 0, "_atlas": null, - "_tilecount": 1, - "_tileoffx": 0, - "_tileoffy": 0, "_id": "" }, { diff --git a/assets/res/prefabs/NUI/pb_chooseName.prefab b/assets/res/prefabs/NUI/pb_chooseName.prefab index 0f3dda49..43aa4522 100644 --- a/assets/res/prefabs/NUI/pb_chooseName.prefab +++ b/assets/res/prefabs/NUI/pb_chooseName.prefab @@ -418,9 +418,7 @@ "_enabled": true, "_srcBlendFactor": 770, "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "4d004d38-a635-4580-9526-6c3a82fe943f" - }, + "_spriteFrame": null, "_type": 1, "_sizeMode": 0, "_fillType": 0, diff --git a/assets/res/prefabs/NUI/rankRewardItem.prefab b/assets/res/prefabs/NUI/rankRewardItem.prefab index 88bd0b61..f3524009 100644 --- a/assets/res/prefabs/NUI/rankRewardItem.prefab +++ b/assets/res/prefabs/NUI/rankRewardItem.prefab @@ -924,8 +924,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 64.31, - "height": 52.5 + "width": 70.08, + "height": 40 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -972,10 +972,8 @@ "_fontSize": 42, "_lineHeight": 40, "_enableWrapText": true, - "_N$file": { - "__uuid__": "574a7a0b-a749-4ee9-b9d8-9189f91ca931" - }, - "_isSystemFontUsed": false, + "_N$file": null, + "_isSystemFontUsed": true, "_spacingX": 0, "_batchAsBitmap": false, "_N$horizontalAlign": 0, @@ -2236,8 +2234,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 64.31, - "height": 52.5 + "width": 70.08, + "height": 40 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2284,10 +2282,8 @@ "_fontSize": 42, "_lineHeight": 40, "_enableWrapText": true, - "_N$file": { - "__uuid__": "574a7a0b-a749-4ee9-b9d8-9189f91ca931" - }, - "_isSystemFontUsed": false, + "_N$file": null, + "_isSystemFontUsed": true, "_spacingX": 0, "_batchAsBitmap": false, "_N$horizontalAlign": 0, diff --git a/assets/scripts/UI/battlematch/cellbattlelefticon.js b/assets/scripts/UI/battlematch/cellbattlelefticon.js index 3770e24b..d0f112c3 100644 --- a/assets/scripts/UI/battlematch/cellbattlelefticon.js +++ b/assets/scripts/UI/battlematch/cellbattlelefticon.js @@ -27,7 +27,7 @@ cc.Class({ // onLoad () {}, init: function(index, data, reload, group) { - if (index >= data.array.length) { //越界 + if (index >= data.array.length) { // this.node.active = false return; } diff --git a/assets/scripts/UI/chip/UIChips.js b/assets/scripts/UI/chip/UIChips.js index 0a628c84..d742dc77 100644 --- a/assets/scripts/UI/chip/UIChips.js +++ b/assets/scripts/UI/chip/UIChips.js @@ -170,7 +170,7 @@ cc.Class({ } else { this.nd_suoding.active = true this.lb_opendes.string = v.nowdata.des - this.lb_opencondtion.string = "角色等级达到" + v.nowdata.need_user_level + "级解锁" + this.lb_opencondtion.string = "" + v.nowdata.need_user_level + "" } this.lb_lv1.string = v.nowdata.talent_lv diff --git a/assets/scripts/UI/season/UISeason.js b/assets/scripts/UI/season/UISeason.js index d615453c..2d190c77 100644 --- a/assets/scripts/UI/season/UISeason.js +++ b/assets/scripts/UI/season/UISeason.js @@ -86,9 +86,7 @@ cc.Class({ } this.nd_states[mission.state].active = true - // this.lb_condtion.string = "匹配" + mission.target + "场 " + mission.current + "/" + mission.target + "\n" + "达到" + gameConfig.rank[mission.target_rank].desc + "段位" - // this.lb_condtion2.string = "S" + cfg.season_id + "赛季奖励\n赛季结束可领取" - + if(cfg.noshow_score_bar){ this.nd_bar.active = false }else{ diff --git a/assets/scripts/game/GameUI.js b/assets/scripts/game/GameUI.js index 5e65871b..d30268b5 100644 --- a/assets/scripts/game/GameUI.js +++ b/assets/scripts/game/GameUI.js @@ -2835,13 +2835,13 @@ cc.Class({ this.skilldown(); break; case cc.macro.KEY.r: - // 换弹 + if (this.selfPlayer) { this.selfPlayer.pushBullet(); } break; case cc.macro.KEY.t: - // 空投 + break; case cc.macro.KEY.e: if (!this.nd_offtank.active) { diff --git a/assets/scripts/game/clientbattle/clientserver.js b/assets/scripts/game/clientbattle/clientserver.js index 5915fc1e..aabd197b 100644 --- a/assets/scripts/game/clientbattle/clientserver.js +++ b/assets/scripts/game/clientbattle/clientserver.js @@ -365,7 +365,7 @@ var clientserver = function(bcount) { map_height: 2432, map_id: 1000, map_mode: 99, - map_name: "新手战", + map_name: "map", map_pic: 2, map_width: 2432, player: 10, diff --git a/assets/scripts/game/clientbattle/playerobj.js b/assets/scripts/game/clientbattle/playerobj.js index 0f114854..38d232ed 100644 --- a/assets/scripts/game/clientbattle/playerobj.js +++ b/assets/scripts/game/clientbattle/playerobj.js @@ -409,7 +409,7 @@ var playerobj = function(uuid) { needclosefake = true } - if (data.aiming && !this.tiaosan) { //瞄准 + if (data.aiming && !this.tiaosan) { // this.aiming = true needclosefake = true } @@ -1258,7 +1258,7 @@ var playerobj = function(uuid) { value: 5 }]) this.doprepar(cfg.prepare_items) - console.log("测试数据555====", cfg); + var s1 = cfg.skill_list[0].key var s2 = cfg.skill_list[1].key diff --git a/assets/scripts/game/gameManage.js b/assets/scripts/game/gameManage.js index c352312d..899496e3 100644 --- a/assets/scripts/game/gameManage.js +++ b/assets/scripts/game/gameManage.js @@ -481,7 +481,7 @@ cc.Class({ this.uic.nd_efftioasna.active = false; this.uic.teamarrnode.active = true; this.tiaosaning = false; - // for (var i = 0; i < this.playerarr.length; i++) {//待修改 + // for (var i = 0; i < this.playerarr.length; i++) {// // this.playerarr[i].removeFromParent(false) // this.ndplayer.addChild(this.playerarr[i]) // } diff --git a/assets/scripts/game/playerCtrl.js b/assets/scripts/game/playerCtrl.js index cbebc11c..e3d1e835 100644 --- a/assets/scripts/game/playerCtrl.js +++ b/assets/scripts/game/playerCtrl.js @@ -1796,7 +1796,7 @@ cc.Class({ this.mstate = mstate; var self = this; - //self.setpFrame(self.sp_face, faceArr[mstate], "avatar/face") 换脸 + //self.setpFrame(self.sp_face, faceArr[mstate], "avatar/face") } }, lerpv(fromv, tov, ratio) { @@ -2120,7 +2120,7 @@ cc.Class({ if (this.isBoom) { return; } - this.autoangle = 300; //测试 + this.autoangle = 300; // if (this.autoangle == 0) { return; } diff --git a/assets/scripts/jcfw/jcfw.js b/assets/scripts/jcfw/jcfw.js index e0219c53..4a7cb534 100644 --- a/assets/scripts/jcfw/jcfw.js +++ b/assets/scripts/jcfw/jcfw.js @@ -75,7 +75,6 @@ module.exports = { }, /** - * 登陆函数 * @param {object} successcb : * @param {object} failcb : * @param {string} ex_param : diff --git a/assets/scripts/jcfw/service/jclogin.js b/assets/scripts/jcfw/service/jclogin.js index b4c6ee9e..9ce525c7 100644 --- a/assets/scripts/jcfw/service/jclogin.js +++ b/assets/scripts/jcfw/service/jclogin.js @@ -169,7 +169,7 @@ module.exports = { window.account ); - console.log('用户不在白名单中'); + uimanger.showUI(WhitelistTip.prefabPath); if (localStorage.getItem('walletaccount')) { localStorage.removeItem('walletaccount'); diff --git a/assets/scripts/language.js b/assets/scripts/language.js index fc354d0a..bd1d1a83 100644 --- a/assets/scripts/language.js +++ b/assets/scripts/language.js @@ -257,7 +257,7 @@ var lgcfg = { }, kickoutguildma: { - cn: "踢出战队吗?", + cn: "", en: "Kick out the team?", }, @@ -342,7 +342,7 @@ var lgcfg = { }, upweizhuangmax: { - cn: "上阵伪装道具已满,请先下阵", + cn: "", en: "The equipment position is full, please remove it first", }, diff --git a/assets/scripts/newbie/newbieConfig.js b/assets/scripts/newbie/newbieConfig.js index 45b76fcc..c2341f61 100644 --- a/assets/scripts/newbie/newbieConfig.js +++ b/assets/scripts/newbie/newbieConfig.js @@ -209,7 +209,6 @@ var NewbieConfig = { newbieflag:1 }, step:[ - //主界面 [NewbieEnum.bindUI,'UIMain'], [NewbieEnum.bgOpacity,1],/////////////////////////////////////////////////// [NewbieEnum.delay,0.1], diff --git a/assets/scripts/shaders/grass.js b/assets/scripts/shaders/grass.js index caff0701..0daea9e3 100644 --- a/assets/scripts/shaders/grass.js +++ b/assets/scripts/shaders/grass.js @@ -18,7 +18,7 @@ const shader = { material.setParamValue('u_dis', params.distance); material.setParamValue('u_plus', params.plus); - // material.setParamValue('u_mPos', cc.v2(params.pos.x,params.pos.y));//左下 + // material.setParamValue('u_mPos', cc.v2(params.pos.x,params.pos.y));// // material.setParamValue('u_width', params.width); // material.setParamValue('u_height', params.height); diff --git a/build-templates/wechatgame/utils/moka-game-conf.js b/build-templates/wechatgame/utils/moka-game-conf.js index 257c1f0f..11203b5c 100644 --- a/build-templates/wechatgame/utils/moka-game-conf.js +++ b/build-templates/wechatgame/utils/moka-game-conf.js @@ -1,2 +1,2 @@ -exports.mt_url = "https://sdk.mokatyper.com/games"; //此行不需要修改 -exports.app_key = "db07e482fcd10ea95ddea9493f8f04d3"; //请在此行填写appkey +exports.mt_url = "https://sdk.mokatyper.com/games"; +exports.app_key = "db07e482fcd10ea95ddea9493f8f04d3"; diff --git a/build-templates/wechatgame/utils/moka-game.js b/build-templates/wechatgame/utils/moka-game.js index 4cf14821..c603ce2d 100644 --- a/build-templates/wechatgame/utils/moka-game.js +++ b/build-templates/wechatgame/utils/moka-game.js @@ -1 +1 @@ -!function(){var e,n=require("./moka-game-conf"),r=0,i=0,u="",o="1.0.6",s=Date.now(),a=0,m=""+Date.now()+Math.floor(1e7*Math.random()),_=""+Date.now()+Math.floor(1e7*Math.random()),d=!1,t=wx.getStorageSync("mt_uuid"),c=t||function(){function e(){return(65536*(1+Math.random())|0).toString(16).substring(1)}d=!0;var t=e()+e()+e()+e()+e()+e()+e()+e();return wx.setStorageSync("mt_uuid",t),t}(),f="",p="",w="",y=wx.getLaunchOptionsSync(),h=!1;y.query.shared_uuid_route&&(h=!0);try{wx.getNetworkType({success:function(e){p=e.networkType}})}catch(e){}function l(e){r++,p&&(e.net=p),e.it=m,e.rt=_,e.st=Date.now(),e.uuid=c,e.ver=o,e.akey=n.app_key.replace(/(\t)|(\s)/g,""),e.wsr=y,e.ifo=d,e.rqn=r,e.ec=i,e.ifs=h,e.opid=n.use_openid&&f?f:"",e.imgKey=w||"","init"==e.env&&(d=!1),h&&(h=!1),wx.request({url:n.mt_url+"/"+n.app_key.replace(/(\t)|(\s)/g,""),data:e,header:{imgKey:w},method:"GET"}),u||wx.getSetting({success:function(e){e.authSetting["scope.userInfo"]&&wx.getUserInfo({success:function(e){var t={env:"ufo"};u=e.userInfo,t.ufo=e.userInfo,w=function(e){for(var t=(e.avatarUrl||"").split("/"),n="",r=0;rn.length&&(n=t[r]);return n}(e.userInfo),t.it=m,t.rt=_,t.st=Date.now(),t.uuid=c,t.ver=o,t.akey=n.app_key.replace(/(\t)|(\s)/g,""),t.wsr=y,t.ifo=d,r++,t.rqn=r,t.ec=i,t.ifs=h,t.opid=n.use_openid&&f?f:"",t.imgKey=w||"",wx.request({url:n.mt_url+"/"+n.app_key.replace(/(\t)|(\s)/g,""),data:t,header:{imgKey:w},method:"GET"})}})}})}e={},a=Date.now(),e.sm=a-s,e.sys=wx.getSystemInfoSync(),e.env="init",l(e),wx.onShow(function(e){var t={};a=Date.now(),t.sm=a-s,t.sys=wx.getSystemInfoSync(),_=""+Date.now()+Math.floor(1e7*Math.random()),t.env="show",l(t)}),wx.onHide(function(){var e={env:"hide"};e.dt=Date.now()-a,l(e)}),wx.onError(function(e){i++;var t={};t.sys=wx.getSystemInfoSync(),t.env="event",t.tp="mt_error_message",t.ct=e}),wx.mtSendEvent=function(e,t,n){var r={};if("string"==typeof e&&e.length<=254){if(!t)return r.tp=e,void l(r);if("string"==typeof t&&t.length<=254)r.tp=e,r.ct=t,n||(r.env="self"),l(r);else if("object"==typeof t){if(254<=JSON.stringify(t).length)return void console.error("自定义事件参数不能超过255个字符");r.tp=e,r.ct=JSON.stringify(t),n||(r.env="self"),l(r)}}else console.error("事件名称必须为String类型且不能超过254个字符")},wx.mtBannerShowEvent=function(e){wx.mtSendEvent("mt_banner_show",e,"self")},wx.mtVideoShowEvent=function(e){wx.mtSendEvent("mt_video_show",e,"self")},wx.mtVideoPlayEvent=function(e){wx.mtSendEvent("mt_video_play",e,"self")},wx.mtShowJumpMiniProgramEvent=function(e){wx.mtSendEvent("mt_show_jump_miniprogram",e,"self")},wx.mtJumpMiniProgramEvent=function(e){wx.mtSendEvent("mt_jump_miniprogram",e,"self")},wx.mtDrawerSpreadEvent=function(e){wx.mtSendEvent("mt_drawer_show",e,"self")},wx.mtOnShareAppMessage=function(i){wx.updateShareMenu({withShareTicket:!0,complete:function(){wx.onShareAppMessage(function(){var e=i(),t=e.success?e.success:"",n=e.fail?e.fail:"",r=y.query.shared_uuid_route?y.query.shared_uuid_route+","+c:c;return e.query?e.query+="&shared_uuid_route="+r:e.query="shared_uuid_route="+r,y.query.mt_media_id&&(e.query+="&mt_media_id="+y.query.mt_media_id),y.query.mt_link_id&&(e.query+="&mt_link_id="+y.query.mt_link_id),y.query.mt_position_id&&(e.query+="&mt_position_id="+y.query.mt_position_id),l({tp:"mt_share_chain",ct:e}),e.success=function(e){l({tp:"mt_share_success"}),t&&t(e)},e.fail=function(e){l({tp:"mt_share_fail"}),n&&n(e)},e})}})},wx.mtShareAppMessage=function(e){var r=e;return wx.updateShareMenu({withShareTicket:!0,complete:function(){var t=r.success?r.success:"",n=r.fail?r.fail:"",e=y.query.shared_uuid_route?y.query.shared_uuid_route+","+c:c;r.query?r.query+="&shared_uuid_route="+e:r.query="shared_uuid_route="+e,y.query.mt_media_id&&(r.query+="&mt_media_id="+y.query.mt_media_id),y.query.mt_link_id&&(r.query+="&mt_link_id="+y.query.mt_link_id),y.query.mt_position_id&&(r.query+="&mt_position_id="+y.query.mt_position_id),l({tp:"mt_share_chain",ct:r}),r.success=function(e){l({tp:"mt_share_success"}),t&&t(e)},r.fail=function(e){l({tp:"mt_share_fail"}),n&&n(e)},wx.shareAppMessage(r)}}),r},wx.mtSendOpenid=function(e){n.use_openid&&e&&(f=e,wx.mtSendEvent("mt_send_openid",{openid:e},"self"))},wx.mtSendPaymentInfo=function(e){var t={userId:e.userId||"",nickName:e.nickName||"",amount:e.amount||"",date:e.date||"",result:e.result||"",errMsg:e.errMsg||""};wx.mtSendEvent("mt_send_payment_info",t,"self")}}(); \ No newline at end of file +!function(){var e,n=require("./moka-game-conf"),r=0,i=0,u="",o="1.0.6",s=Date.now(),a=0,m=""+Date.now()+Math.floor(1e7*Math.random()),_=""+Date.now()+Math.floor(1e7*Math.random()),d=!1,t=wx.getStorageSync("mt_uuid"),c=t||function(){function e(){return(65536*(1+Math.random())|0).toString(16).substring(1)}d=!0;var t=e()+e()+e()+e()+e()+e()+e()+e();return wx.setStorageSync("mt_uuid",t),t}(),f="",p="",w="",y=wx.getLaunchOptionsSync(),h=!1;y.query.shared_uuid_route&&(h=!0);try{wx.getNetworkType({success:function(e){p=e.networkType}})}catch(e){}function l(e){r++,p&&(e.net=p),e.it=m,e.rt=_,e.st=Date.now(),e.uuid=c,e.ver=o,e.akey=n.app_key.replace(/(\t)|(\s)/g,""),e.wsr=y,e.ifo=d,e.rqn=r,e.ec=i,e.ifs=h,e.opid=n.use_openid&&f?f:"",e.imgKey=w||"","init"==e.env&&(d=!1),h&&(h=!1),wx.request({url:n.mt_url+"/"+n.app_key.replace(/(\t)|(\s)/g,""),data:e,header:{imgKey:w},method:"GET"}),u||wx.getSetting({success:function(e){e.authSetting["scope.userInfo"]&&wx.getUserInfo({success:function(e){var t={env:"ufo"};u=e.userInfo,t.ufo=e.userInfo,w=function(e){for(var t=(e.avatarUrl||"").split("/"),n="",r=0;rn.length&&(n=t[r]);return n}(e.userInfo),t.it=m,t.rt=_,t.st=Date.now(),t.uuid=c,t.ver=o,t.akey=n.app_key.replace(/(\t)|(\s)/g,""),t.wsr=y,t.ifo=d,r++,t.rqn=r,t.ec=i,t.ifs=h,t.opid=n.use_openid&&f?f:"",t.imgKey=w||"",wx.request({url:n.mt_url+"/"+n.app_key.replace(/(\t)|(\s)/g,""),data:t,header:{imgKey:w},method:"GET"})}})}})}e={},a=Date.now(),e.sm=a-s,e.sys=wx.getSystemInfoSync(),e.env="init",l(e),wx.onShow(function(e){var t={};a=Date.now(),t.sm=a-s,t.sys=wx.getSystemInfoSync(),_=""+Date.now()+Math.floor(1e7*Math.random()),t.env="show",l(t)}),wx.onHide(function(){var e={env:"hide"};e.dt=Date.now()-a,l(e)}),wx.onError(function(e){i++;var t={};t.sys=wx.getSystemInfoSync(),t.env="event",t.tp="mt_error_message",t.ct=e}),wx.mtSendEvent=function(e,t,n){var r={};if("string"==typeof e&&e.length<=254){if(!t)return r.tp=e,void l(r);if("string"==typeof t&&t.length<=254)r.tp=e,r.ct=t,n||(r.env="self"),l(r);else if("object"==typeof t){if(254<=JSON.stringify(t).length)return void console.error("");r.tp=e,r.ct=JSON.stringify(t),n||(r.env="self"),l(r)}}else console.error("")},wx.mtBannerShowEvent=function(e){wx.mtSendEvent("mt_banner_show",e,"self")},wx.mtVideoShowEvent=function(e){wx.mtSendEvent("mt_video_show",e,"self")},wx.mtVideoPlayEvent=function(e){wx.mtSendEvent("mt_video_play",e,"self")},wx.mtShowJumpMiniProgramEvent=function(e){wx.mtSendEvent("mt_show_jump_miniprogram",e,"self")},wx.mtJumpMiniProgramEvent=function(e){wx.mtSendEvent("mt_jump_miniprogram",e,"self")},wx.mtDrawerSpreadEvent=function(e){wx.mtSendEvent("mt_drawer_show",e,"self")},wx.mtOnShareAppMessage=function(i){wx.updateShareMenu({withShareTicket:!0,complete:function(){wx.onShareAppMessage(function(){var e=i(),t=e.success?e.success:"",n=e.fail?e.fail:"",r=y.query.shared_uuid_route?y.query.shared_uuid_route+","+c:c;return e.query?e.query+="&shared_uuid_route="+r:e.query="shared_uuid_route="+r,y.query.mt_media_id&&(e.query+="&mt_media_id="+y.query.mt_media_id),y.query.mt_link_id&&(e.query+="&mt_link_id="+y.query.mt_link_id),y.query.mt_position_id&&(e.query+="&mt_position_id="+y.query.mt_position_id),l({tp:"mt_share_chain",ct:e}),e.success=function(e){l({tp:"mt_share_success"}),t&&t(e)},e.fail=function(e){l({tp:"mt_share_fail"}),n&&n(e)},e})}})},wx.mtShareAppMessage=function(e){var r=e;return wx.updateShareMenu({withShareTicket:!0,complete:function(){var t=r.success?r.success:"",n=r.fail?r.fail:"",e=y.query.shared_uuid_route?y.query.shared_uuid_route+","+c:c;r.query?r.query+="&shared_uuid_route="+e:r.query="shared_uuid_route="+e,y.query.mt_media_id&&(r.query+="&mt_media_id="+y.query.mt_media_id),y.query.mt_link_id&&(r.query+="&mt_link_id="+y.query.mt_link_id),y.query.mt_position_id&&(r.query+="&mt_position_id="+y.query.mt_position_id),l({tp:"mt_share_chain",ct:r}),r.success=function(e){l({tp:"mt_share_success"}),t&&t(e)},r.fail=function(e){l({tp:"mt_share_fail"}),n&&n(e)},wx.shareAppMessage(r)}}),r},wx.mtSendOpenid=function(e){n.use_openid&&e&&(f=e,wx.mtSendEvent("mt_send_openid",{openid:e},"self"))},wx.mtSendPaymentInfo=function(e){var t={userId:e.userId||"",nickName:e.nickName||"",amount:e.amount||"",date:e.date||"",result:e.result||"",errMsg:e.errMsg||""};wx.mtSendEvent("mt_send_payment_info",t,"self")}}(); \ No newline at end of file diff --git a/build-templates/wechatgame/wx-open-data-project/index.js b/build-templates/wechatgame/wx-open-data-project/index.js index 4b838ca7..957f4a29 100644 --- a/build-templates/wechatgame/wx-open-data-project/index.js +++ b/build-templates/wechatgame/wx-open-data-project/index.js @@ -69,11 +69,9 @@ var RANK_STRING = "stage" this.oldwidth = this.canvas.width this.avatarImages2 = [] this.nodeplayfriendlist = [] - //this.getMyselfInfo(); 排行榜相关 暂时屏蔽 - // this.cleantodaykey(); 排行榜相关 暂时屏蔽 - // console.log('111111111111111111') - this.refreshnotplaylist();//获取没玩过列表 - // console.log('22222222222222222222') + + this.refreshnotplaylist(); + }; RankListRenderer.prototype.refreshnotplaylist = function(){ var self = this @@ -111,10 +109,10 @@ var RANK_STRING = "stage" RankListRenderer.prototype.listen = function () { - this.statu = 0;/*0:指正在游戏,1:显示排行榜,2:显示群排行,3:显示短排行榜,4:显示单人排行*/ + this.statu = 0; wx.onMessage(msg => { switch (msg.type) { - case 'displayinfo'://渲染 + case 'displayinfo': this.ctx.clearRect(0, 0, 1024, 512); this.drawinvitelist() break; @@ -122,10 +120,10 @@ var RANK_STRING = "stage" this.statu = 0; this.showFriendRank = false; this.clearAll(); - this.refreshnotplaylist();//刷新玩家列表 + this.refreshnotplaylist(); break; case 'sharetofriend': - this.dosharetofriend(msg.idx)//邀请 + this.dosharetofriend(msg.idx) break; case 'sharepic': this.shareurl = msg.url @@ -135,7 +133,7 @@ var RANK_STRING = "stage" this.updaterank(msg.num); break; default: - console.log("未知消息类型:msg.type=" + msg.type); + console.log("undefined msg.type=" + msg.type); break; } }); @@ -194,9 +192,9 @@ var RANK_STRING = "stage" ctx.drawImage(this.avatarImages2[i], 20, 10+i*60, 40, 40); } - //名字 + ctx.fillStyle = "#FFFFFF"; - ctx.font = "bold 24px 黑体, sans-serif"; + ctx.font = "bold 24px , sans-serif"; var nick = dt.nickname.length <= 5 ? dt.nickname : dt.nickname.substr(0, 5) + "..."; @@ -204,10 +202,10 @@ var RANK_STRING = "stage" ctx.drawImage(assets.btn,240, 12+i*60, 80, 40); ctx.fillStyle = "#FFFFFF"; - ctx.font = "bold 24px 黑体, sans-serif"; + ctx.font = "bold 24px , sans-serif"; ctx.strokeStyle = "#000000"; - ctx.strokeText("邀请",255, 30+i*60); - ctx.fillText("邀请", 255, 30+i*60); + ctx.strokeText("",255, 30+i*60); + ctx.fillText("", 255, 30+i*60); //avatarUrl nickname openid diff --git a/tinypng.js b/tinypng.js index d395b955..f6c0f5ca 100644 --- a/tinypng.js +++ b/tinypng.js @@ -30,30 +30,30 @@ function getRandomIP() { function fileDisplay(filePath) { fs.readdir(filePath, function (err, files) { if (err) { - console.warn(err, '读取文件夹错误!'); + console.warn(err); } else { files.forEach(function (filename) { var filedir = path.join(filePath, filename); fs.stat(filedir, function (eror, stats) { if (eror) { - console.warn('获取文件stats失败'); + } else { - var isFile = stats.isFile(); //是文件 - var isDir = stats.isDirectory(); //是文件夹 + var isFile = stats.isFile(); + var isDir = stats.isDirectory(); if (isFile) { if ( filedir.includes('.png') && !filedir.includes('.meta') ) { - // 通过 X-Forwarded-For 头部伪造客户端IP + options.headers['X-Forwarded-For'] = getRandomIP(); fileUpload(filedir); } } if (isDir) { - fileDisplay(filedir); //递归,如果是文件夹,就继续遍历该文件夹下面的文件 + fileDisplay(filedir); } } }); @@ -67,7 +67,7 @@ function fileUpload(img) { res.on('data', (buf) => { let obj = JSON.parse(buf.toString()); if (obj.error) { - console.log(`[${img}]:压缩失败!报错:${obj.message}`); + } else { fileUpdate(img, obj); } @@ -80,7 +80,7 @@ function fileUpload(img) { }); req.end(); } -// 该方法被循环调用,请求图片数据 + function fileUpdate(imgpath, obj) { console.log('update img' + imgpath); let options = new URL(obj.output.url); @@ -94,9 +94,7 @@ function fileUpdate(imgpath, obj) { res.on('end', function () { fs.writeFile(imgpath, body, 'binary', (err) => { if (err) return console.error(err); - console.log( - `[${imgpath}] \n 压缩成功,原始大小-${obj.input.size},压缩大小-${obj.output.size},优化比例-${obj.output.ratio}` - ); + }); }); }); diff --git a/version_generator.js b/version_generator.js index fd599c0c..db826c76 100644 --- a/version_generator.js +++ b/version_generator.js @@ -2,7 +2,7 @@ var fs = require('fs'); var path = require('path'); var crypto = require('crypto'); -//远程服务器所在的url + var url = 'https://www.cebg.games/pubgv4/'; var manifest = { @@ -14,10 +14,9 @@ var manifest = { searchPaths: [], }; -//下面2个定义根据自己项目属性自行修改 -var dest = './hotupdate/'; //生成热更包的路径 -var src = './build/jsb-link/'; //构建之后的资源文件所在的路径 +var dest = './hotupdate/'; +var src = './build/jsb-link/'; // Parse arguments var i = 2; while (i < process.argv.length) { @@ -34,7 +33,7 @@ while (i < process.argv.length) { break; case '--version': case '-v': - // url中加入版本号 + manifest.version = process.argv[i + 1]; // manifest.packageUrl = url + manifest.version + "/"; // manifest.remoteManifestUrl =