Commit 3c6d8738 authored by wildfirecode's avatar wildfirecode

11

parent 7665d18a
......@@ -2867,51 +2867,51 @@ exports.ResJson = {
"name": "assistScene",
"atlas": {
"assistBtn.png": {
"x": 624,
"y": 166,
"x": 1330,
"y": 2,
"w": 350,
"h": 80,
"ox": 0,
"oy": 0,
"sw": 350,
"sh": 80,
"ro": false
"ro": true
},
"assistFail.png": {
"x": 211,
"y": 442,
"x": 624,
"y": 211,
"w": 540,
"h": 207,
"ox": 0,
"oy": 0,
"sw": 540,
"sh": 207,
"ro": true
"ro": false
},
"assistSuccess.png": {
"x": 2,
"y": 442,
"x": 624,
"y": 2,
"w": 540,
"h": 207,
"ox": 0,
"oy": 0,
"sw": 540,
"sh": 207,
"ro": true
"ro": false
},
"goPlayBtn.png": {
"x": 624,
"y": 84,
"x": 1248,
"y": 2,
"w": 350,
"h": 80,
"ox": 0,
"oy": 0,
"sw": 350,
"sh": 80,
"ro": false
"ro": true
},
"joinMemberBtn.png": {
"x": 624,
"x": 1166,
"y": 2,
"w": 350,
"h": 80,
......@@ -2919,7 +2919,7 @@ exports.ResJson = {
"oy": 0,
"sw": 350,
"sh": 80,
"ro": false
"ro": true
},
"memberBG.png": {
"x": 2,
......@@ -2939,8 +2939,8 @@ exports.ResJson = {
"name": "common",
"atlas": {
"comCloseBtn.png": {
"x": 2,
"y": 374,
"x": 646,
"y": 60,
"w": 54,
"h": 54,
"ox": 0,
......@@ -2950,7 +2950,7 @@ exports.ResJson = {
"ro": false
},
"toastBg.png": {
"x": 2,
"x": 184,
"y": 2,
"w": 460,
"h": 130,
......@@ -2962,18 +2962,18 @@ exports.ResJson = {
},
"waitingBg.png": {
"x": 2,
"y": 134,
"y": 2,
"w": 160,
"h": 180,
"ox": 0,
"oy": 0,
"sw": 160,
"sh": 180,
"ro": false
"ro": true
},
"waitingRot.png": {
"x": 2,
"y": 316,
"x": 646,
"y": 2,
"w": 56,
"h": 56,
"ox": 0,
......@@ -2989,8 +2989,8 @@ exports.ResJson = {
"name": "dxqPlayScene",
"atlas": {
"ball_0.png": {
"x": 438,
"y": 890,
"x": 2758,
"y": 2,
"w": 254,
"h": 254,
"ox": 0,
......@@ -3000,8 +3000,8 @@ exports.ResJson = {
"ro": false
},
"ball_1.png": {
"x": 2,
"y": 763,
"x": 2502,
"y": 2,
"w": 254,
"h": 254,
"ox": 0,
......@@ -3011,8 +3011,8 @@ exports.ResJson = {
"ro": false
},
"ball_2.png": {
"x": 710,
"y": 792,
"x": 2246,
"y": 2,
"w": 254,
"h": 254,
"ox": 0,
......@@ -3022,8 +3022,8 @@ exports.ResJson = {
"ro": false
},
"ball_3.png": {
"x": 454,
"y": 634,
"x": 1990,
"y": 2,
"w": 254,
"h": 254,
"ox": 0,
......@@ -3033,8 +3033,8 @@ exports.ResJson = {
"ro": false
},
"ball_4.png": {
"x": 729,
"y": 536,
"x": 1720,
"y": 256,
"w": 254,
"h": 254,
"ox": 0,
......@@ -3044,8 +3044,8 @@ exports.ResJson = {
"ro": false
},
"ball_5.png": {
"x": 454,
"y": 378,
"x": 1464,
"y": 256,
"w": 254,
"h": 254,
"ox": 0,
......@@ -3055,8 +3055,8 @@ exports.ResJson = {
"ro": false
},
"ball_num_0.png": {
"x": 496,
"y": 1346,
"x": 474,
"y": 378,
"w": 38,
"h": 69,
"ox": 0,
......@@ -3066,19 +3066,19 @@ exports.ResJson = {
"ro": true
},
"ball_num_1.png": {
"x": 710,
"y": 448,
"x": 1816,
"y": 234,
"w": 20,
"h": 68,
"ox": 0,
"oy": 0,
"sw": 20,
"sh": 68,
"ro": false
"ro": true
},
"ball_num_2.png": {
"x": 425,
"y": 1306,
"x": 214,
"y": 449,
"w": 39,
"h": 69,
"ox": 0,
......@@ -3088,8 +3088,8 @@ exports.ResJson = {
"ro": true
},
"ball_num_3.png": {
"x": 606,
"y": 1276,
"x": 143,
"y": 449,
"w": 40,
"h": 69,
"ox": 0,
......@@ -3099,8 +3099,8 @@ exports.ResJson = {
"ro": true
},
"ball_num_4.png": {
"x": 966,
"y": 1001,
"x": 1364,
"y": 290,
"w": 44,
"h": 68,
"ox": 0,
......@@ -3110,8 +3110,8 @@ exports.ResJson = {
"ro": false
},
"ball_num_5.png": {
"x": 742,
"y": 1409,
"x": 285,
"y": 449,
"w": 39,
"h": 68,
"ox": 0,
......@@ -3121,19 +3121,19 @@ exports.ResJson = {
"ro": true
},
"ball_num_6.png": {
"x": 324,
"y": 1251,
"x": 270,
"y": 378,
"w": 39,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 69,
"ro": true
"ro": false
},
"ball_num_7.png": {
"x": 672,
"y": 1409,
"x": 615,
"y": 378,
"w": 39,
"h": 68,
"ox": 0,
......@@ -3143,8 +3143,8 @@ exports.ResJson = {
"ro": true
},
"ball_num_8.png": {
"x": 606,
"y": 1190,
"x": 2876,
"y": 372,
"w": 42,
"h": 69,
"ox": 0,
......@@ -3154,63 +3154,63 @@ exports.ResJson = {
"ro": true
},
"ball_num_9.png": {
"x": 812,
"y": 1368,
"x": 545,
"y": 378,
"w": 39,
"h": 68,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 68,
"ro": false
"ro": true
},
"ball_num_black_0.png": {
"x": 496,
"y": 1306,
"x": 311,
"y": 378,
"w": 38,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 38,
"sh": 69,
"ro": true
"ro": false
},
"ball_num_black_1.png": {
"x": 710,
"y": 378,
"x": 1746,
"y": 234,
"w": 20,
"h": 68,
"ox": 0,
"oy": 0,
"sw": 20,
"sh": 68,
"ro": false
"ro": true
},
"ball_num_black_2.png": {
"x": 253,
"y": 1251,
"x": 229,
"y": 378,
"w": 39,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 69,
"ro": true
"ro": false
},
"ball_num_black_3.png": {
"x": 606,
"y": 1234,
"x": 187,
"y": 378,
"w": 40,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 40,
"sh": 69,
"ro": true
"ro": false
},
"ball_num_black_4.png": {
"x": 966,
"y": 931,
"x": 1976,
"y": 424,
"w": 44,
"h": 68,
"ox": 0,
......@@ -3220,19 +3220,19 @@ exports.ResJson = {
"ro": false
},
"ball_num_black_5.png": {
"x": 742,
"y": 1368,
"x": 433,
"y": 378,
"w": 39,
"h": 68,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 68,
"ro": true
"ro": false
},
"ball_num_black_6.png": {
"x": 182,
"y": 1251,
"x": 2066,
"y": 424,
"w": 39,
"h": 69,
"ox": 0,
......@@ -3242,63 +3242,63 @@ exports.ResJson = {
"ro": true
},
"ball_num_black_7.png": {
"x": 602,
"y": 1406,
"x": 392,
"y": 378,
"w": 39,
"h": 68,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 68,
"ro": true
"ro": false
},
"ball_num_black_8.png": {
"x": 606,
"y": 1146,
"x": 143,
"y": 378,
"w": 42,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 42,
"sh": 69,
"ro": true
"ro": false
},
"ball_num_black_9.png": {
"x": 672,
"y": 1368,
"x": 351,
"y": 378,
"w": 39,
"h": 68,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 68,
"ro": true
"ro": false
},
"ball_num_black_k.png": {
"x": 602,
"y": 1362,
"x": 1364,
"y": 360,
"w": 42,
"h": 68,
"ox": 8,
"oy": 0,
"sw": 50,
"sh": 68,
"ro": true
"ro": false
},
"ball_num_k.png": {
"x": 602,
"y": 1318,
"x": 2022,
"y": 424,
"w": 42,
"h": 68,
"ox": 8,
"oy": 0,
"sw": 50,
"sh": 68,
"ro": true
"ro": false
},
"bomb_1.png": {
"x": 874,
"y": 1203,
"x": 2876,
"y": 258,
"w": 120,
"h": 112,
"ox": 90,
......@@ -3308,8 +3308,8 @@ exports.ResJson = {
"ro": false
},
"bomb_2.png": {
"x": 2,
"y": 1019,
"x": 1746,
"y": 2,
"w": 242,
"h": 230,
"ox": 25,
......@@ -3319,7 +3319,7 @@ exports.ResJson = {
"ro": false
},
"bomb_3.png": {
"x": 732,
"x": 1184,
"y": 2,
"w": 278,
"h": 286,
......@@ -3327,11 +3327,11 @@ exports.ResJson = {
"oy": 8,
"sw": 300,
"sh": 300,
"ro": true
"ro": false
},
"bomb_4.png": {
"x": 732,
"y": 282,
"x": 1464,
"y": 2,
"w": 280,
"h": 252,
"ox": 15,
......@@ -3341,30 +3341,30 @@ exports.ResJson = {
"ro": false
},
"bomb_5.png": {
"x": 985,
"y": 657,
"x": 685,
"y": 378,
"w": 42,
"h": 36,
"ox": 77,
"oy": 31,
"sw": 300,
"sh": 300,
"ro": true
"ro": false
},
"bullet.png": {
"x": 710,
"y": 602,
"x": 143,
"y": 491,
"w": 11,
"h": 43,
"ox": 0,
"oy": 0,
"sw": 11,
"sh": 43,
"ro": false
"ro": true
},
"drop_bullet_0.png": {
"x": 967,
"y": 1497,
"x": 1031,
"y": 387,
"w": 30,
"h": 30,
"ox": 0,
......@@ -3374,8 +3374,8 @@ exports.ResJson = {
"ro": false
},
"drop_bullet_1.png": {
"x": 967,
"y": 1497,
"x": 1031,
"y": 387,
"w": 30,
"h": 30,
"ox": 0,
......@@ -3385,8 +3385,8 @@ exports.ResJson = {
"ro": false
},
"drop_power_0.png": {
"x": 967,
"y": 1529,
"x": 503,
"y": 418,
"w": 28,
"h": 27,
"ox": 0,
......@@ -3396,8 +3396,8 @@ exports.ResJson = {
"ro": false
},
"drop_power_1.png": {
"x": 395,
"y": 1280,
"x": 1063,
"y": 387,
"w": 28,
"h": 27,
"ox": 0,
......@@ -3407,19 +3407,19 @@ exports.ResJson = {
"ro": false
},
"drop_power_2.png": {
"x": 395,
"y": 1251,
"x": 474,
"y": 418,
"w": 28,
"h": 27,
"ox": 0,
"oy": 0,
"sw": 28,
"sh": 27,
"ro": false
"ro": true
},
"img_UFO_00.png": {
"x": 258,
"y": 763,
"x": 1976,
"y": 258,
"w": 178,
"h": 164,
"ox": 6,
......@@ -3429,8 +3429,8 @@ exports.ResJson = {
"ro": false
},
"img_UFO_01.png": {
"x": 677,
"y": 1208,
"x": 1184,
"y": 290,
"w": 178,
"h": 158,
"ox": 6,
......@@ -3440,19 +3440,19 @@ exports.ResJson = {
"ro": false
},
"img_UFO_02.png": {
"x": 2,
"y": 1251,
"x": 3014,
"y": 182,
"w": 178,
"h": 154,
"ox": 6,
"oy": 20,
"sw": 190,
"sh": 180,
"ro": false
"ro": true
},
"img_UFO_03.png": {
"x": 426,
"y": 1146,
"x": 2696,
"y": 258,
"w": 178,
"h": 158,
"ox": 6,
......@@ -3462,8 +3462,8 @@ exports.ResJson = {
"ro": false
},
"img_UFO_04.png": {
"x": 258,
"y": 929,
"x": 2156,
"y": 258,
"w": 178,
"h": 160,
"ox": 6,
......@@ -3473,8 +3473,8 @@ exports.ResJson = {
"ro": false
},
"img_UFO_05.png": {
"x": 694,
"y": 1048,
"x": 2516,
"y": 258,
"w": 178,
"h": 158,
"ox": 6,
......@@ -3484,8 +3484,8 @@ exports.ResJson = {
"ro": false
},
"img_UFO_06.png": {
"x": 857,
"y": 1317,
"x": 3014,
"y": 2,
"w": 178,
"h": 154,
"ox": 6,
......@@ -3495,8 +3495,8 @@ exports.ResJson = {
"ro": true
},
"img_UFO_07.png": {
"x": 246,
"y": 1091,
"x": 2336,
"y": 258,
"w": 178,
"h": 158,
"ox": 6,
......@@ -3506,8 +3506,8 @@ exports.ResJson = {
"ro": false
},
"main_bullet.png": {
"x": 966,
"y": 877,
"x": 1410,
"y": 344,
"w": 52,
"h": 52,
"ox": 0,
......@@ -3517,8 +3517,8 @@ exports.ResJson = {
"ro": false
},
"main_countdown.png": {
"x": 874,
"y": 1071,
"x": 2,
"y": 378,
"w": 139,
"h": 130,
"ox": 0,
......@@ -3528,8 +3528,8 @@ exports.ResJson = {
"ro": false
},
"main_countdown2.png": {
"x": 710,
"y": 578,
"x": 1976,
"y": 234,
"w": 12,
"h": 22,
"ox": 0,
......@@ -3539,8 +3539,8 @@ exports.ResJson = {
"ro": false
},
"main_power.png": {
"x": 966,
"y": 823,
"x": 1410,
"y": 290,
"w": 52,
"h": 52,
"ox": 0,
......@@ -3550,8 +3550,8 @@ exports.ResJson = {
"ro": false
},
"mask0.png": {
"x": 2,
"y": 378,
"x": 732,
"y": 2,
"w": 450,
"h": 383,
"ox": 0,
......@@ -3572,63 +3572,63 @@ exports.ResJson = {
"ro": true
},
"score_num_0.png": {
"x": 567,
"y": 1367,
"x": 729,
"y": 387,
"w": 33,
"h": 59,
"ox": 0,
"oy": 0,
"sw": 33,
"sh": 59,
"ro": false
"ro": true
},
"score_num_1.png": {
"x": 710,
"y": 518,
"x": 1886,
"y": 234,
"w": 17,
"h": 58,
"ox": 0,
"oy": 0,
"sw": 17,
"sh": 58,
"ro": false
"ro": true
},
"score_num_2.png": {
"x": 567,
"y": 1306,
"x": 2066,
"y": 465,
"w": 33,
"h": 59,
"ox": 0,
"oy": 0,
"sw": 33,
"sh": 59,
"ro": false
"ro": true
},
"score_num_3.png": {
"x": 985,
"y": 762,
"x": 790,
"y": 387,
"w": 34,
"h": 59,
"ox": 0,
"oy": 0,
"sw": 34,
"sh": 59,
"ro": false
"ro": true
},
"score_num_4.png": {
"x": 985,
"y": 536,
"x": 355,
"y": 448,
"w": 37,
"h": 58,
"ox": 0,
"oy": 0,
"sw": 37,
"sh": 58,
"ro": false
"ro": true
},
"score_num_5.png": {
"x": 907,
"y": 1497,
"x": 971,
"y": 387,
"w": 33,
"h": 58,
"ox": 0,
......@@ -3638,19 +3638,19 @@ exports.ResJson = {
"ro": true
},
"score_num_6.png": {
"x": 985,
"y": 701,
"x": 2947,
"y": 372,
"w": 34,
"h": 59,
"ox": 0,
"oy": 0,
"sw": 34,
"sh": 59,
"ro": false
"ro": true
},
"score_num_7.png": {
"x": 847,
"y": 1497,
"x": 911,
"y": 387,
"w": 33,
"h": 58,
"ox": 0,
......@@ -3660,26 +3660,26 @@ exports.ResJson = {
"ro": true
},
"score_num_8.png": {
"x": 985,
"y": 596,
"x": 415,
"y": 448,
"w": 36,
"h": 59,
"ox": 0,
"oy": 0,
"sw": 36,
"sh": 59,
"ro": false
"ro": true
},
"score_num_9.png": {
"x": 812,
"y": 1438,
"x": 851,
"y": 387,
"w": 33,
"h": 58,
"ox": 0,
"oy": 0,
"sw": 33,
"sh": 58,
"ro": false
"ro": true
}
}
},
......@@ -3699,8 +3699,8 @@ exports.ResJson = {
"ro": false
},
"gameoverPanelBtn.png": {
"x": 624,
"y": 2,
"x": 2,
"y": 746,
"w": 350,
"h": 80,
"ox": 0,
......@@ -3724,7 +3724,7 @@ exports.ResJson = {
"oy": 0,
"sw": 350,
"sh": 80,
"ro": false
"ro": true
},
"inviteInfoBG.png": {
"x": 2,
......@@ -3744,26 +3744,26 @@ exports.ResJson = {
"name": "loading",
"atlas": {
"adIamge.png": {
"x": 42,
"y": 2,
"x": 2,
"y": 42,
"w": 198,
"h": 79,
"ox": 0,
"oy": 0,
"sw": 198,
"sh": 79,
"ro": true
"ro": false
},
"bar1.png": {
"x": 22,
"y": 2,
"x": 2,
"y": 22,
"w": 502,
"h": 18,
"ox": 0,
"oy": 0,
"sw": 502,
"sh": 18,
"ro": true
"ro": false
},
"bar2.png": {
"x": 2,
......@@ -3774,18 +3774,18 @@ exports.ResJson = {
"oy": 29,
"sw": 551,
"sh": 92,
"ro": true
"ro": false
},
"loadtex.png": {
"x": 42,
"y": 202,
"x": 202,
"y": 42,
"w": 190,
"h": 24,
"ox": 0,
"oy": 0,
"sw": 190,
"sh": 24,
"ro": true
"ro": false
}
}
},
......@@ -3813,7 +3813,7 @@ exports.ResJson = {
"oy": 0,
"sw": 350,
"sh": 80,
"ro": false
"ro": true
}
}
},
......@@ -3833,8 +3833,8 @@ exports.ResJson = {
"ro": false
},
"prizePanelBtn.png": {
"x": 624,
"y": 166,
"x": 2,
"y": 928,
"w": 350,
"h": 80,
"ox": 0,
......@@ -3844,8 +3844,8 @@ exports.ResJson = {
"ro": false
},
"prizePanelBtnGo.png": {
"x": 624,
"y": 84,
"x": 2,
"y": 846,
"w": 350,
"h": 80,
"ox": 0,
......@@ -3855,8 +3855,8 @@ exports.ResJson = {
"ro": false
},
"prizePanelBtnRecord.png": {
"x": 624,
"y": 2,
"x": 2,
"y": 764,
"w": 350,
"h": 80,
"ox": 0,
......@@ -3880,11 +3880,11 @@ exports.ResJson = {
"oy": 0,
"sw": 620,
"sh": 960,
"ro": false
"ro": true
},
"rankPanelIcon.png": {
"x": 113,
"y": 964,
"x": 161,
"y": 678,
"w": 35,
"h": 36,
"ox": 0,
......@@ -3894,8 +3894,8 @@ exports.ResJson = {
"ro": false
},
"rankPanelIcon1.png": {
"x": 76,
"y": 964,
"x": 161,
"y": 624,
"w": 35,
"h": 52,
"ox": 0,
......@@ -3905,8 +3905,8 @@ exports.ResJson = {
"ro": false
},
"rankPanelIcon2.png": {
"x": 39,
"y": 964,
"x": 124,
"y": 678,
"w": 35,
"h": 52,
"ox": 0,
......@@ -3916,8 +3916,8 @@ exports.ResJson = {
"ro": false
},
"rankPanelIcon3.png": {
"x": 2,
"y": 964,
"x": 124,
"y": 624,
"w": 35,
"h": 52,
"ox": 0,
......@@ -3927,8 +3927,8 @@ exports.ResJson = {
"ro": false
},
"rankPanelLine.png": {
"x": 2,
"y": 1018,
"x": 124,
"y": 732,
"w": 590,
"h": 3,
"ox": 0,
......@@ -3938,8 +3938,8 @@ exports.ResJson = {
"ro": false
},
"rank_placeholder.png": {
"x": 624,
"y": 2,
"x": 2,
"y": 624,
"w": 120,
"h": 119,
"ox": 0,
......@@ -3955,8 +3955,8 @@ exports.ResJson = {
"name": "recordScene",
"atlas": {
"addressBtn.png": {
"x": 445,
"y": 204,
"x": 126,
"y": 940,
"w": 200,
"h": 60,
"ox": 0,
......@@ -3966,41 +3966,41 @@ exports.ResJson = {
"ro": true
},
"againGetBtn.png": {
"x": 243,
"y": 188,
"x": 64,
"y": 940,
"w": 200,
"h": 60,
"ox": 0,
"oy": 0,
"sw": 200,
"sh": 60,
"ro": false
"ro": true
},
"awaitGetBtn.png": {
"x": 243,
"y": 250,
"x": 188,
"y": 940,
"w": 174,
"h": 60,
"ox": 0,
"oy": 0,
"sw": 174,
"sh": 60,
"ro": false
"ro": true
},
"failBtn.png": {
"x": 243,
"y": 126,
"x": 2,
"y": 940,
"w": 200,
"h": 60,
"ox": 0,
"oy": 0,
"sw": 200,
"sh": 60,
"ro": false
"ro": true
},
"getBtn.png": {
"x": 243,
"y": 64,
"x": 2,
"y": 878,
"w": 200,
"h": 60,
"ox": 0,
......@@ -4010,19 +4010,19 @@ exports.ResJson = {
"ro": false
},
"invalidBtn.png": {
"x": 445,
"y": 2,
"x": 2,
"y": 816,
"w": 200,
"h": 60,
"ox": 0,
"oy": 0,
"sw": 200,
"sh": 60,
"ro": true
"ro": false
},
"prizePanelBack.png": {
"x": 243,
"y": 312,
"x": 204,
"y": 754,
"w": 35,
"h": 35,
"ox": 0,
......@@ -4032,8 +4032,8 @@ exports.ResJson = {
"ro": false
},
"receivedBtn.png": {
"x": 243,
"y": 2,
"x": 2,
"y": 754,
"w": 200,
"h": 60,
"ox": 0,
......@@ -4043,7 +4043,7 @@ exports.ResJson = {
"ro": false
},
"recordSceneLine.png": {
"x": 507,
"x": 243,
"y": 2,
"w": 688,
"h": 1,
......@@ -4079,7 +4079,7 @@ exports.ResJson = {
"oy": 0,
"sw": 350,
"sh": 80,
"ro": true
"ro": false
},
"ruleBg.png": {
"x": 2,
......@@ -4099,18 +4099,18 @@ exports.ResJson = {
"name": "startScene",
"atlas": {
"drawBtn.png": {
"x": 2,
"y": 279,
"x": 85,
"y": 146,
"w": 165,
"h": 142,
"ox": 0,
"oy": 0,
"sw": 165,
"sh": 142,
"ro": true
"ro": false
},
"drawBtn2.png": {
"x": 284,
"x": 85,
"y": 2,
"w": 165,
"h": 142,
......@@ -4121,8 +4121,8 @@ exports.ResJson = {
"ro": false
},
"music_Close.png": {
"x": 451,
"y": 61,
"x": 156,
"y": 349,
"w": 57,
"h": 57,
"ox": 0,
......@@ -4132,8 +4132,8 @@ exports.ResJson = {
"ro": false
},
"music_Open.png": {
"x": 451,
"y": 2,
"x": 156,
"y": 290,
"w": 57,
"h": 57,
"ox": 0,
......@@ -4143,41 +4143,41 @@ exports.ResJson = {
"ro": false
},
"newbieBtn.png": {
"x": 146,
"y": 187,
"x": 152,
"y": 424,
"w": 96,
"h": 132,
"ox": 0,
"oy": 0,
"sw": 96,
"sh": 132,
"ro": true
"ro": false
},
"rankBtn.png": {
"x": 146,
"y": 85,
"x": 54,
"y": 290,
"w": 100,
"h": 132,
"ox": 0,
"oy": 0,
"sw": 100,
"sh": 132,
"ro": true
"ro": false
},
"recordBtn.png": {
"x": 280,
"y": 146,
"x": 100,
"y": 424,
"w": 157,
"h": 50,
"ox": 0,
"oy": 0,
"sw": 157,
"sh": 50,
"ro": false
"ro": true
},
"ruleBtn.png": {
"x": 451,
"y": 120,
"x": 2,
"y": 284,
"w": 157,
"h": 50,
"ox": 0,
......@@ -4195,18 +4195,18 @@ exports.ResJson = {
"oy": 0,
"sw": 280,
"sh": 81,
"ro": false
"ro": true
},
"task_Btn.png": {
"x": 2,
"y": 85,
"y": 443,
"w": 96,
"h": 132,
"ox": 0,
"oy": 0,
"sw": 96,
"sh": 132,
"ro": true
"ro": false
}
}
},
......@@ -4215,8 +4215,8 @@ exports.ResJson = {
"name": "taskPanel",
"atlas": {
"awaitGetBtn.png": {
"x": 754,
"y": 64,
"x": 354,
"y": 868,
"w": 174,
"h": 60,
"ox": 0,
......@@ -4226,8 +4226,8 @@ exports.ResJson = {
"ro": false
},
"browseGoods.png": {
"x": 868,
"y": 205,
"x": 647,
"y": 868,
"w": 33,
"h": 33,
"ox": 0,
......@@ -4237,19 +4237,19 @@ exports.ResJson = {
"ro": false
},
"finishBtn.png": {
"x": 930,
"y": 2,
"x": 178,
"y": 868,
"w": 174,
"h": 60,
"ox": 0,
"oy": 0,
"sw": 174,
"sh": 60,
"ro": true
"ro": false
},
"follow.png": {
"x": 868,
"y": 126,
"x": 530,
"y": 868,
"w": 38,
"h": 38,
"ox": 0,
......@@ -4259,8 +4259,8 @@ exports.ResJson = {
"ro": false
},
"invites.png": {
"x": 908,
"y": 178,
"x": 610,
"y": 868,
"w": 35,
"h": 31,
"ox": 0,
......@@ -4270,8 +4270,8 @@ exports.ResJson = {
"ro": false
},
"member.png": {
"x": 868,
"y": 166,
"x": 570,
"y": 868,
"w": 38,
"h": 37,
"ox": 0,
......@@ -4289,22 +4289,22 @@ exports.ResJson = {
"oy": 0,
"sw": 750,
"sh": 716,
"ro": false
"ro": true
},
"taskItemBG.png": {
"x": 754,
"y": 126,
"x": 2,
"y": 754,
"w": 700,
"h": 112,
"ox": 0,
"oy": 0,
"sw": 700,
"sh": 112,
"ro": true
"ro": false
},
"toFinishBtn.png": {
"x": 754,
"y": 2,
"x": 2,
"y": 868,
"w": 174,
"h": 60,
"ox": 0,
......@@ -4328,7 +4328,7 @@ exports.ResJson = {
"oy": 0,
"sw": 350,
"sh": 80,
"ro": false
"ro": true
},
"noTime.png": {
"x": 2,
......@@ -4367,7 +4367,7 @@ exports.ResJson = {
"oy": 0,
"sw": 350,
"sh": 80,
"ro": false
"ro": true
}
}
},
......@@ -4395,7 +4395,7 @@ exports.ResJson = {
"oy": 0,
"sw": 350,
"sh": 80,
"ro": true
"ro": false
}
}
},
......@@ -4423,7 +4423,7 @@ exports.ResJson = {
"oy": 0,
"sw": 350,
"sh": 80,
"ro": true
"ro": false
}
}
},
......@@ -4451,7 +4451,7 @@ exports.ResJson = {
"oy": 0,
"sw": 350,
"sh": 80,
"ro": true
"ro": false
}
}
}
......@@ -5097,13 +5097,14 @@ exports.default = (function () { return __awaiter(_this, void 0, void 0, functio
return __generator(this, function (_a) {
switch (_a.label) {
case 0:
global_1.getAppData().data.shareCode = "1abc";
if (!global_1.getShareCode())
return [2];
params = {
inviteId: global_1.getShareCode(),
activityId: global_1.getActivityId()
};
return [4, TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.filaStarDoHelp, params, function () { }, true)];
return [4, TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.filaStarDoHelp, params)];
case 1: return [2, _a.sent()];
}
});
......@@ -10612,6 +10613,12 @@ var AssistScene = (function (_super) {
return __generator(this, function (_b) {
switch (_b.label) {
case 0:
if (global_1.getBeforeStartTime()) {
return [2, toastCtrl_1.showToast('活动未开始')];
}
if (global_1.getAfterEndTime()) {
return [2, toastCtrl_1.showToast('活动已结束')];
}
sendLog_1.default(LogType_1.default.clickAssistBtn);
return [4, doRecord_1.default('help')];
case 1:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment