client/pubgv3
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'zhuguoqing/dev-v4' into JIJI-0.4.0

Browse Source
This commit is contained in:
guoqing.zhu 2022-06-09 14:47:03 +08:00
commit 9e32a172db
11 changed files with 21 additions and 299 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

286
assets/LoginScene.fire
View File

@ -47,8 +47,8 @@
},
"_scale": {
"__type__": "cc.Vec3",
"x": 0.49544213482442406,
"y": 0.49544213482442406,
"x": 0.583953857421875,
"y": 0.583953857421875,
"z": 1
},
"_quat": {
@ -491,9 +491,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "66WOHv7Z9NGJJxwNOOc5iq"
},
{
@ -560,9 +557,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "fbPw1yUVNGh64Lp+G66xmD"
},
{
@ -771,9 +765,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "3at4zjfftGNaFXPnYF+vAF"
},
{
@ -873,9 +864,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "balxbChUpAfqjXi06ZkiWV"
},
{
@ -1058,9 +1046,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "46UQod0JFHapyoDHXAu4zm"
},
{
@ -1180,23 +1165,6 @@
"a": 255
},
"_width": 4,
"_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": "04YY93bJtKY4Z83aFagB12"
},
{
@ -1298,9 +1266,6 @@
"_isTrimmedMode": false,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "a8xUxEWOtL253SoiD1GUSe"
},
{
@ -1402,9 +1367,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "46OLMjer9LfZj3bGuT6CBh"
},
{
@ -1442,9 +1404,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "00LvxyXKFNPrrbQg1+M6U1"
},
{
@ -1746,9 +1705,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "45x4X1r/5Kjqej8xjEzJY5"
},
{
@ -1850,9 +1806,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "e4diNJi6FJpbqxym6bTnf3"
},
{
@ -1954,9 +1907,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "1fDlTVbw9IlbDCDXQk5XAa"
},
{
@ -2058,9 +2008,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "ba9UNC2vlPJL44H3cVMvzM"
},
{
@ -2162,9 +2109,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "35I+9tdiZHl7o2bHVW7LTE"
},
{
@ -2266,9 +2210,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "f11t5emiVLa5eDrYN2veg/"
},
{
@ -2368,9 +2309,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "e1SL3intxFjp91u3n8eyeh"
},
{
@ -2508,9 +2446,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "99dIVbo95B26zo+RccmGoD"
},
{
@ -3037,9 +2972,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "e0B4kSkGJGdahvsIuES/Zk"
},
{
@ -3413,9 +3345,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "a8Z99uFiNJHawa9EjlBgaT"
},
{
@ -3592,9 +3521,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "158/6vMr9N9KB++KhxtXCt"
},
{
@ -3696,9 +3622,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "00sX7byD1OAJ1phERwTuzF"
},
{
@ -3898,9 +3821,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "a8Y1+zxMVNoqW5UiebrDan"
},
{
@ -4376,9 +4296,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "a8piUOKXJB+rR+0bgDUTpW"
},
{
@ -4480,9 +4397,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "3e76tqzlpKnKKvJPUnFl/6"
},
{
@ -4682,9 +4596,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "54BrphMc5DPJMYFl3GCmDy"
},
{
@ -4815,9 +4726,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "32HBEWdZ9GB5Qn+ppRHPM2"
},
{
@ -4857,9 +4765,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "f7g3+pMYlBEbvO8AyNEeHt"
},
{
@ -5113,9 +5018,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "b71jZwFt5ALKR6WzTIwZ+t"
},
{
@ -5253,9 +5155,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "9eLG3dCF1KJI9LbzFJvrok"
},
{
@ -5509,9 +5408,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "10mkais/BHrKyNoMAFQ4uh"
},
{
@ -5855,9 +5751,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "d2VUsXtexG87wnGeW5vYnP"
},
{
@ -6273,9 +6166,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "9dVWuo5LRDKZfNV46InMsK"
},
{
@ -6315,9 +6205,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "59t/t6OlRBppLbW/1NQxMl"
},
{
@ -6460,9 +6347,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "63wtCL7WdLErd85kA1GfLK"
},
{
@ -6799,9 +6683,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "c3arnWEcVKlrRK0Td+fqeo"
},
{
@ -6903,9 +6784,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "30As83xHVBhowfBOGAkj2c"
},
{
@ -7007,9 +6885,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "9csgY6nSxIbLbKe7gJmOsp"
},
{
@ -7111,9 +6986,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "77Lx5r73xAqYHnLrjZ8wXv"
},
{
@ -7396,9 +7268,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "6b1ns0D1FKFqLXTMNk6OdN"
},
{
@ -7649,9 +7518,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "0dPCAkA9pHPr2JlLqna3Kn"
},
{
@ -7851,9 +7717,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "6a7WyXuBtLDIdfMOe0gMiJ"
},
{
@ -8556,9 +8419,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "04GDwxYtBNoYHSwzg6tcZs"
},
{
@ -8758,9 +8618,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "eb+59Uzi9EO5cjtzjuhK0Q"
},
{
@ -9463,9 +9320,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "deLrW7VdNOBrqct0kvPvO0"
},
{
@ -9665,9 +9519,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "54HxiDyuVLhLnQBpfYX6ZQ"
},
{
@ -10370,9 +10221,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "81A+yrjh1N+5pyx3PxUSYr"
},
{
@ -10572,9 +10420,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "775+6huZNJd7qGRBd5unD+"
},
{
@ -11369,9 +11214,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "68ede8iu5G2LKkgb0CFRl5"
},
{
@ -11422,9 +11264,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "95Mfu2MG1AXLcs1LWPLIF7"
},
{
@ -11462,9 +11301,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "1fstNcUV1FbKK6MYBWhG5k"
},
{
@ -11584,9 +11420,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "102bEkyuJDMaJTLguor/iJ"
},
{
@ -11756,9 +11589,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "1ezgUMIQBMPb90u5YTikUT"
},
{
@ -12034,9 +11864,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "e83D7+eOxJf4YWkhrdPlUG"
},
{
@ -12174,9 +12001,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "11NWU3+m5KYafLtlKwnaT6"
},
{
@ -12430,9 +12254,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "cfob+hVjdD+oTeQ+rCrzUe"
},
{
@ -12570,9 +12391,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "20ONqvhD5PP5Rws3cpQtt4"
},
{
@ -12826,9 +12644,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "5aTexi5fpIbqcpah3yAMF/"
},
{
@ -12966,9 +12781,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "f1VvSYhuJAO6U4THP14VWO"
},
{
@ -13222,9 +13034,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "67q+EKyfNExLMwhbeflTIh"
},
{
@ -13362,9 +13171,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "1e7bNixihF56YJBvDGHAAR"
},
{
@ -13615,9 +13421,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "99guRErctH3J81I5eROpNF"
},
{
@ -13802,9 +13605,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "27ULbVbnZPXauHzs8MXtiV"
},
{
@ -14141,9 +13941,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "15OoE/+fVDPYGguKe6Hw9D"
},
{
@ -14338,9 +14135,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "6e+DrrrllAl46iqSkHYr72"
},
{
@ -14447,23 +14241,6 @@
"a": 255
},
"_width": 4,
"_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": "90OvUycklCi5j005p0wLqk"
},
{
@ -14552,9 +14329,6 @@
"_isTrimmedMode": false,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "55LVLcyztHvqXOIxp68M88"
},
{
@ -14643,9 +14417,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "69jSOnp2FNGbqcs0/qEste"
},
{
@ -14672,9 +14443,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "cbRFDjMyZPKba0xmByxGEU"
},
{
@ -15210,9 +14978,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "adJOIBhKdCxbyQXccXIJC5"
},
{
@ -15423,9 +15188,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "1aws+1W7ROrrpQ0UuOugV6"
},
{
@ -15599,9 +15361,6 @@
"_isTrimmedMode": false,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "08nTIy+stL/oP+JYcP24IQ"
},
{
@ -15703,9 +15462,6 @@
"_isTrimmedMode": false,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "2bZtdScNNDBq4RO7MeWm8L"
},
{
@ -15807,9 +15563,6 @@
"_isTrimmedMode": false,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "fa6JYB7MBAjJ6sIhVnJGkh"
},
{
@ -15941,9 +15694,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "37gHJ0+31NDrDqAK65xNMG"
},
{
@ -16279,9 +16029,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "d6tuJIT2BGSq82a5pC+JoH"
},
{
@ -16447,9 +16194,6 @@
"_isTrimmedMode": false,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "abUwhoQNJI7aswLYigYa4E"
},
{
@ -16556,23 +16300,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": "7c5PsbVHVCxphSwuGbiIi8"
},
{
@ -16601,9 +16328,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "fcUVXWZ3FJdbZsnfBpaT3u"
},
{
@ -16758,9 +16482,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "75Zy1YmH9NQplHLzJcDgQV"
},
{
@ -16871,9 +16592,6 @@
"_isTrimmedMode": true,
"_state": 0,
"_atlas": null,
"_tilecount": 1,
"_tileoffx": 0,
"_tileoffy": 0,
"_id": "62m2mgYfBKQbzMEwcaYjAZ"
},
{

2
assets/project.manifest
View File

File diff suppressed because one or more lines are too long

12
assets/res/prefabs/NUI/UIMain.prefab
View File

@ -32118,8 +32118,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 502.52,
"height": 280
"width": 664.69,
"height": 360
},
"_anchorPoint": {
"__type__": "cc.Vec2",
@ -32128,8 +32128,8 @@
},
"_position": {
"__type__": "cc.Vec3",
"x": -182,
"y": -7.4,
"x": -149,
"y": -28,
"z": 0
},
"_scale": {
@ -32161,8 +32161,8 @@
},
"_enabled": true,
"_useOriginalSize": false,
"_string": "The June 7th update\n\n1. Daily mission open.\n\n2. Reward mission open.\n\n3. Update related interfaces.",
"_N$string": "The June 7th update\n\n1. Daily mission open.\n\n2. Reward mission open.\n\n3. Update related interfaces.",
"_string": "The June 9th update\n\n1. Daily mission open.\n\n2. Reward mission open.\n\n3. Update related interfaces.\n\nThe maximum daily activeness is 10 .",
"_N$string": "The June 9th update\n\n1. Daily mission open.\n\n2. Reward mission open.\n\n3. Update related interfaces.\n\nThe maximum daily activeness is 10 .",
"_fontSize": 40,
"_lineHeight": 40,
"_enableWrapText": true,

2
assets/scripts/BaseNet.js
View File

@ -11,7 +11,7 @@ isDevEnv();
isExamining();
function isDevEnv() {
return true;
return false;
}
function isExamining() {

2
assets/scripts/Config.js
View File

@ -19,7 +19,7 @@ var MainConfig = {
version: '0.2.0',
isoffical: false,
viewscale: 0.5,
packageid: 1, //0 apk 1 googleplay aab 2 ios
packageid: 0, //0 apk 1 googleplay aab 2 ios
hotfixVersion: '0.7.0',
};

4
assets/scripts/UI/UIMain.js
View File

@ -502,6 +502,10 @@ cc.Class({
},
calltask() {
if (!window.hasWallet) {
uimanger.showUI(GuestLoginTip.prefabPath);
return;
}
NetManage.missionList(1, (data) => {
var nd = cc.instantiate(this.pb_task);
nd.getComponent('UITask').initdata(data);

2
assets/scripts/UI/season/cellTaskSeason.js
View File

@ -64,7 +64,7 @@ cc.Class({
}
var items = cc.playerData.getDrop(cfg.reward);
this.lb_count.string = items[0].num;
this.lb_count.string = '1';
this.jump = cfg.jump_value;
},

2
assets/scripts/UI/task/singleWanted.js
View File

@ -205,7 +205,7 @@ cc.Class({
let num = rewards[i].num;
var tmp = this.allRewardNode.children[i];
tmp.active = true;
tmp.children[0].getComponent(cc.Label).string = `x${num}`;
tmp.children[0].getComponent(cc.Label).string = `x${1}`;
// Utils.setitem(this, id, tmp.children[1]);
}
},

2
hotupdate/project.manifest
View File

File diff suppressed because one or more lines are too long

2
hotupdate/version.manifest
View File

@ -1 +1 @@
{"packageUrl":"https://www.cebg.games/pubgv4/","remoteManifestUrl":"https://www.cebg.games/pubgv4/project.manifest","remoteVersionUrl":"https://www.cebg.games/pubgv4/version.manifest","version":"0.6.0"}
{"packageUrl":"https://www.cebg.games/pubgv4/","remoteManifestUrl":"https://www.cebg.games/pubgv4/project.manifest","remoteVersionUrl":"https://www.cebg.games/pubgv4/version.manifest","version":"0.7.0"}

4
version_generator.js
View File

@ -2,8 +2,8 @@ var fs = require('fs');
var path = require('path');
var crypto = require('crypto');
// var url = 'https://www.cebg.games/pubgv4/';
var url = 'https://test.kingsome.cn/game2006/test/';
var url = 'https://www.cebg.games/pubgv4/';
// var url = 'https://test.kingsome.cn/game2006/test/';
var manifest = {
packageUrl: url,