Skip to content

T
taobaominiDemo
Commit 5d4ed155 authored by wildfirecode's avatar wildfirecode
Browse files
Options

1

parent ec1fce2d
Show whitespace changes
Inline Side-by-side
Showing with 85 additions and 281 deletions
client/pages/index/output.js
View file @ 5d4ed155
...@@ -2732,19 +2732,19 @@ exports.ResJson = { ...@@ -2732,19 +2732,19 @@ exports.ResJson = {
"name": "assistScene", "name": "assistScene",
"atlas": { "atlas": {
"assistBtn.png": { "assistBtn.png": {
"x": 624, "x": 315,
"y": 166, "y": 785,
"w": 350, "w": 350,
"h": 80, "h": 80,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 350, "sw": 350,
"sh": 80, "sh": 80,
"ro": false "ro": true
}, },
"assistFail.png": { "assistFail.png": {
"x": 2, "x": 2,
"y": 442, "y": 624,
"w": 507, "w": 507,
"h": 147, "h": 147,
"ox": 0, "ox": 0,
...@@ -2754,8 +2754,8 @@ exports.ResJson = { ...@@ -2754,8 +2754,8 @@ exports.ResJson = {
"ro": true "ro": true
}, },
"assistSuccess.png": { "assistSuccess.png": {
"x": 624, "x": 151,
"y": 248, "y": 624,
"w": 259, "w": 259,
"h": 159, "h": 159,
"ox": 0, "ox": 0,
...@@ -2765,26 +2765,26 @@ exports.ResJson = { ...@@ -2765,26 +2765,26 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"goPlayBtn.png": { "goPlayBtn.png": {
"x": 624, "x": 233,
"y": 84, "y": 785,
"w": 350, "w": 350,
"h": 80, "h": 80,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 350, "sw": 350,
"sh": 80, "sh": 80,
"ro": false "ro": true
}, },
"joinMemberBtn.png": { "joinMemberBtn.png": {
"x": 624, "x": 151,
"y": 2, "y": 785,
"w": 350, "w": 350,
"h": 80, "h": 80,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 350, "sw": 350,
"sh": 80, "sh": 80,
"ro": false "ro": true
}, },
"memberBG.png": { "memberBG.png": {
"x": 2, "x": 2,
...@@ -2795,7 +2795,7 @@ exports.ResJson = { ...@@ -2795,7 +2795,7 @@ exports.ResJson = {
"oy": 0, "oy": 0,
"sw": 620, "sw": 620,
"sh": 438, "sh": 438,
"ro": false "ro": true
} }
} }
}, },
...@@ -2804,8 +2804,8 @@ exports.ResJson = { ...@@ -2804,8 +2804,8 @@ exports.ResJson = {
"name": "common", "name": "common",
"atlas": { "atlas": {
"comCloseBtn.png": { "comCloseBtn.png": {
"x": 2, "x": 646,
"y": 374, "y": 60,
"w": 54, "w": 54,
"h": 54, "h": 54,
"ox": 0, "ox": 0,
...@@ -2815,7 +2815,7 @@ exports.ResJson = { ...@@ -2815,7 +2815,7 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"toastBg.png": { "toastBg.png": {
"x": 2, "x": 184,
"y": 2, "y": 2,
"w": 460, "w": 460,
"h": 130, "h": 130,
...@@ -2827,18 +2827,18 @@ exports.ResJson = { ...@@ -2827,18 +2827,18 @@ exports.ResJson = {
}, },
"waitingBg.png": { "waitingBg.png": {
"x": 2, "x": 2,
"y": 134, "y": 2,
"w": 160, "w": 160,
"h": 180, "h": 180,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 160, "sw": 160,
"sh": 180, "sh": 180,
"ro": false "ro": true
}, },
"waitingRot.png": { "waitingRot.png": {
"x": 2, "x": 646,
"y": 316, "y": 2,
"w": 56, "w": 56,
"h": 56, "h": 56,
"ox": 0, "ox": 0,
...@@ -2915,28 +2915,6 @@ exports.ResJson = { ...@@ -2915,28 +2915,6 @@ exports.ResJson = {
"h": 254, "h": 254,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
<<<<<<< HEAD
"sw": 235,
"sh": 225,
"ro": false
},
"ball_2.png": {
"x": 239,
"y": 902,
"w": 234,
"h": 225,
"ox": 0,
"oy": 0,
"sw": 234,
"sh": 225,
"ro": false
},
"ball_3.png": {
"x": 603,
"y": 715,
"w": 235,
"h": 224,
=======
"sw": 254, "sw": 254,
"sh": 254, "sh": 254,
"ro": false "ro": false
...@@ -2979,7 +2957,6 @@ exports.ResJson = { ...@@ -2979,7 +2957,6 @@ exports.ResJson = {
"y": 243, "y": 243,
"w": 40, "w": 40,
"h": 69, "h": 69,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 40, "sw": 40,
...@@ -3052,19 +3029,11 @@ exports.ResJson = { ...@@ -3052,19 +3029,11 @@ exports.ResJson = {
"sh": 68, "sh": 68,
"ro": false "ro": false
}, },
<<<<<<< HEAD
"ball_5.png": {
"x": 239,
"y": 676,
"w": 235,
"h": 224,
=======
"ball_num_black_0.png": { "ball_num_black_0.png": {
"x": 799, "x": 799,
"y": 582, "y": 582,
"w": 38, "w": 38,
"h": 69, "h": 69,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 38, "sw": 38,
...@@ -3082,18 +3051,6 @@ exports.ResJson = { ...@@ -3082,18 +3051,6 @@ exports.ResJson = {
"sh": 68, "sh": 68,
"ro": false "ro": false
}, },
<<<<<<< HEAD
"bullet.png": {
"x": 1002,
"y": 80,
"w": 12,
"h": 28,
"ox": 0,
"oy": 0,
"sw": 12,
"sh": 28,
"ro": false
=======
"ball_num_black_2.png": { "ball_num_black_2.png": {
"x": 717, "x": 717,
"y": 541, "y": 541,
...@@ -3115,7 +3072,6 @@ exports.ResJson = { ...@@ -3115,7 +3072,6 @@ exports.ResJson = {
"sw": 40, "sw": 40,
"sh": 69, "sh": 69,
"ro": true "ro": true
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
}, },
"ball_num_black_4.png": { "ball_num_black_4.png": {
"x": 857, "x": 857,
...@@ -3217,13 +3173,8 @@ exports.ResJson = { ...@@ -3217,13 +3173,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"car.png": { "car.png": {
<<<<<<< HEAD
"x": 476,
"y": 676,
=======
"x": 1042, "x": 1042,
"y": 134, "y": 134,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 124, "w": 124,
"h": 125, "h": 125,
"ox": 0, "ox": 0,
...@@ -3233,13 +3184,8 @@ exports.ResJson = { ...@@ -3233,13 +3184,8 @@ exports.ResJson = {
"ro": true "ro": true
}, },
"car_particle.png": { "car_particle.png": {
<<<<<<< HEAD
"x": 948,
"y": 188,
=======
"x": 676, "x": 676,
"y": 2, "y": 2,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 87, "w": 87,
"h": 35, "h": 35,
"ox": 0, "ox": 0,
...@@ -3249,17 +3195,10 @@ exports.ResJson = { ...@@ -3249,17 +3195,10 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"drop_bullet_0.png": { "drop_bullet_0.png": {
<<<<<<< HEAD
"x": 913,
"y": 260,
"w": 25,
"h": 26,
=======
"x": 916, "x": 916,
"y": 889, "y": 889,
"w": 30, "w": 30,
"h": 30, "h": 30,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 30, "sw": 30,
...@@ -3267,17 +3206,10 @@ exports.ResJson = { ...@@ -3267,17 +3206,10 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"drop_bullet_1.png": { "drop_bullet_1.png": {
<<<<<<< HEAD
"x": 985,
"y": 188,
"w": 25,
"h": 27,
=======
"x": 916, "x": 916,
"y": 889, "y": 889,
"w": 30, "w": 30,
"h": 30, "h": 30,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 30, "sw": 30,
...@@ -3285,17 +3217,10 @@ exports.ResJson = { ...@@ -3285,17 +3217,10 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"drop_power_0.png": { "drop_power_0.png": {
<<<<<<< HEAD
"x": 985,
"y": 215,
"w": 26,
"h": 26,
=======
"x": 947, "x": 947,
"y": 802, "y": 802,
"w": 28, "w": 28,
"h": 27, "h": 27,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 28, "sw": 28,
...@@ -3303,17 +3228,10 @@ exports.ResJson = { ...@@ -3303,17 +3228,10 @@ exports.ResJson = {
"ro": true "ro": true
}, },
"drop_power_1.png": { "drop_power_1.png": {
<<<<<<< HEAD
"x": 985,
"y": 270,
"w": 25,
"h": 26,
=======
"x": 947, "x": 947,
"y": 772, "y": 772,
"w": 28, "w": 28,
"h": 27, "h": 27,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 28, "sw": 28,
...@@ -3321,17 +3239,10 @@ exports.ResJson = { ...@@ -3321,17 +3239,10 @@ exports.ResJson = {
"ro": true "ro": true
}, },
"drop_power_2.png": { "drop_power_2.png": {
<<<<<<< HEAD
"x": 985,
"y": 243,
"w": 25,
"h": 26,
=======
"x": 948, "x": 948,
"y": 889, "y": 889,
"w": 28, "w": 28,
"h": 27, "h": 27,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 28, "sw": 28,
...@@ -3339,13 +3250,8 @@ exports.ResJson = { ...@@ -3339,13 +3250,8 @@ exports.ResJson = {
"ro": true "ro": true
}, },
"main_bullet.png": { "main_bullet.png": {
<<<<<<< HEAD
"x": 948,
"y": 134,
=======
"x": 916, "x": 916,
"y": 835, "y": 835,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 52, "w": 52,
"h": 52, "h": 52,
"ox": 0, "ox": 0,
...@@ -3377,13 +3283,8 @@ exports.ResJson = { ...@@ -3377,13 +3283,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"main_power.png": { "main_power.png": {
<<<<<<< HEAD
"x": 948,
"y": 80,
=======
"x": 893, "x": 893,
"y": 781, "y": 781,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 52, "w": 52,
"h": 52, "h": 52,
"ox": 0, "ox": 0,
...@@ -3525,13 +3426,8 @@ exports.ResJson = { ...@@ -3525,13 +3426,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"star.png": { "star.png": {
<<<<<<< HEAD
"x": 948,
"y": 2,
=======
"x": 676, "x": 676,
"y": 39, "y": 39,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 76, "w": 76,
"h": 72, "h": 72,
"ox": 0, "ox": 0,
...@@ -3558,8 +3454,8 @@ exports.ResJson = { ...@@ -3558,8 +3454,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"gameoverPanelBtn.png": { "gameoverPanelBtn.png": {
"x": 624, "x": 2,
"y": 2, "y": 746,
"w": 350, "w": 350,
"h": 80, "h": 80,
"ox": 0, "ox": 0,
...@@ -3583,7 +3479,7 @@ exports.ResJson = { ...@@ -3583,7 +3479,7 @@ exports.ResJson = {
"oy": 0, "oy": 0,
"sw": 350, "sw": 350,
"sh": 80, "sh": 80,
"ro": false "ro": true
}, },
"inviteInfoBG.png": { "inviteInfoBG.png": {
"x": 2, "x": 2,
...@@ -3603,26 +3499,26 @@ exports.ResJson = { ...@@ -3603,26 +3499,26 @@ exports.ResJson = {
"name": "loading", "name": "loading",
"atlas": { "atlas": {
"adIamge.png": { "adIamge.png": {
"x": 42, "x": 2,
"y": 2, "y": 42,
"w": 198, "w": 198,
"h": 79, "h": 79,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 198, "sw": 198,
"sh": 79, "sh": 79,
"ro": true "ro": false
}, },
"bar1.png": { "bar1.png": {
"x": 22, "x": 2,
"y": 2, "y": 22,
"w": 502, "w": 502,
"h": 18, "h": 18,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 502, "sw": 502,
"sh": 18, "sh": 18,
"ro": true "ro": false
}, },
"bar2.png": { "bar2.png": {
"x": 2, "x": 2,
...@@ -3633,18 +3529,18 @@ exports.ResJson = { ...@@ -3633,18 +3529,18 @@ exports.ResJson = {
"oy": 29, "oy": 29,
"sw": 551, "sw": 551,
"sh": 92, "sh": 92,
"ro": true "ro": false
}, },
"loadtex.png": { "loadtex.png": {
"x": 42, "x": 202,
"y": 202, "y": 42,
"w": 190, "w": 190,
"h": 24, "h": 24,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 190, "sw": 190,
"sh": 24, "sh": 24,
"ro": true "ro": false
} }
} }
}, },
...@@ -3672,7 +3568,7 @@ exports.ResJson = { ...@@ -3672,7 +3568,7 @@ exports.ResJson = {
"oy": 0, "oy": 0,
"sw": 350, "sw": 350,
"sh": 80, "sh": 80,
"ro": false "ro": true
} }
} }
}, },
...@@ -3692,8 +3588,8 @@ exports.ResJson = { ...@@ -3692,8 +3588,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"prizePanelBtn.png": { "prizePanelBtn.png": {
"x": 624, "x": 2,
"y": 166, "y": 928,
"w": 350, "w": 350,
"h": 80, "h": 80,
"ox": 0, "ox": 0,
...@@ -3703,8 +3599,8 @@ exports.ResJson = { ...@@ -3703,8 +3599,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"prizePanelBtnGo.png": { "prizePanelBtnGo.png": {
"x": 624, "x": 2,
"y": 84, "y": 846,
"w": 350, "w": 350,
"h": 80, "h": 80,
"ox": 0, "ox": 0,
...@@ -3714,8 +3610,8 @@ exports.ResJson = { ...@@ -3714,8 +3610,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"prizePanelBtnRecord.png": { "prizePanelBtnRecord.png": {
"x": 624, "x": 2,
"y": 2, "y": 764,
"w": 350, "w": 350,
"h": 80, "h": 80,
"ox": 0, "ox": 0,
...@@ -3739,11 +3635,11 @@ exports.ResJson = { ...@@ -3739,11 +3635,11 @@ exports.ResJson = {
"oy": 0, "oy": 0,
"sw": 620, "sw": 620,
"sh": 960, "sh": 960,
"ro": false "ro": true
}, },
"rankPanelIcon.png": { "rankPanelIcon.png": {
"x": 113, "x": 161,
"y": 964, "y": 678,
"w": 35, "w": 35,
"h": 36, "h": 36,
"ox": 0, "ox": 0,
...@@ -3753,8 +3649,8 @@ exports.ResJson = { ...@@ -3753,8 +3649,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"rankPanelIcon1.png": { "rankPanelIcon1.png": {
"x": 76, "x": 161,
"y": 964, "y": 624,
"w": 35, "w": 35,
"h": 52, "h": 52,
"ox": 0, "ox": 0,
...@@ -3764,8 +3660,8 @@ exports.ResJson = { ...@@ -3764,8 +3660,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"rankPanelIcon2.png": { "rankPanelIcon2.png": {
"x": 39, "x": 124,
"y": 964, "y": 678,
"w": 35, "w": 35,
"h": 52, "h": 52,
"ox": 0, "ox": 0,
...@@ -3775,8 +3671,8 @@ exports.ResJson = { ...@@ -3775,8 +3671,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"rankPanelIcon3.png": { "rankPanelIcon3.png": {
"x": 2, "x": 124,
"y": 964, "y": 624,
"w": 35, "w": 35,
"h": 52, "h": 52,
"ox": 0, "ox": 0,
...@@ -3786,8 +3682,8 @@ exports.ResJson = { ...@@ -3786,8 +3682,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"rankPanelLine.png": { "rankPanelLine.png": {
"x": 2, "x": 124,
"y": 1018, "y": 732,
"w": 590, "w": 590,
"h": 3, "h": 3,
"ox": 0, "ox": 0,
...@@ -3797,13 +3693,8 @@ exports.ResJson = { ...@@ -3797,13 +3693,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"rank_placeholder.png": { "rank_placeholder.png": {
<<<<<<< HEAD
"x": 624,
"y": 2,
=======
"x": 2, "x": 2,
"y": 624, "y": 624,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 120, "w": 120,
"h": 119, "h": 119,
"ox": 0, "ox": 0,
...@@ -3819,13 +3710,8 @@ exports.ResJson = { ...@@ -3819,13 +3710,8 @@ exports.ResJson = {
"name": "recordScene", "name": "recordScene",
"atlas": { "atlas": {
"addressBtn.png": { "addressBtn.png": {
<<<<<<< HEAD
"x": 445,
"y": 204,
=======
"x": 126, "x": 126,
"y": 940, "y": 940,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 200, "w": 200,
"h": 60, "h": 60,
"ox": 0, "ox": 0,
...@@ -3835,13 +3721,8 @@ exports.ResJson = { ...@@ -3835,13 +3721,8 @@ exports.ResJson = {
"ro": true "ro": true
}, },
"againGetBtn.png": { "againGetBtn.png": {
<<<<<<< HEAD
"x": 243,
"y": 188,
=======
"x": 64, "x": 64,
"y": 940, "y": 940,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 200, "w": 200,
"h": 60, "h": 60,
"ox": 0, "ox": 0,
...@@ -3851,13 +3732,8 @@ exports.ResJson = { ...@@ -3851,13 +3732,8 @@ exports.ResJson = {
"ro": true "ro": true
}, },
"awaitGetBtn.png": { "awaitGetBtn.png": {
<<<<<<< HEAD
"x": 243,
"y": 250,
=======
"x": 188, "x": 188,
"y": 940, "y": 940,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 174, "w": 174,
"h": 60, "h": 60,
"ox": 0, "ox": 0,
...@@ -3867,13 +3743,8 @@ exports.ResJson = { ...@@ -3867,13 +3743,8 @@ exports.ResJson = {
"ro": true "ro": true
}, },
"failBtn.png": { "failBtn.png": {
<<<<<<< HEAD
"x": 243,
"y": 126,
=======
"x": 2, "x": 2,
"y": 940, "y": 940,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 200, "w": 200,
"h": 60, "h": 60,
"ox": 0, "ox": 0,
...@@ -3883,13 +3754,8 @@ exports.ResJson = { ...@@ -3883,13 +3754,8 @@ exports.ResJson = {
"ro": true "ro": true
}, },
"getBtn.png": { "getBtn.png": {
<<<<<<< HEAD
"x": 243,
"y": 64,
=======
"x": 2, "x": 2,
"y": 878, "y": 878,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 200, "w": 200,
"h": 60, "h": 60,
"ox": 0, "ox": 0,
...@@ -3899,13 +3765,8 @@ exports.ResJson = { ...@@ -3899,13 +3765,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"invalidBtn.png": { "invalidBtn.png": {
<<<<<<< HEAD
"x": 445,
"y": 2,
=======
"x": 2, "x": 2,
"y": 816, "y": 816,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 200, "w": 200,
"h": 60, "h": 60,
"ox": 0, "ox": 0,
...@@ -3915,13 +3776,8 @@ exports.ResJson = { ...@@ -3915,13 +3776,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"prizePanelBack.png": { "prizePanelBack.png": {
<<<<<<< HEAD
"x": 243,
"y": 312,
=======
"x": 204, "x": 204,
"y": 754, "y": 754,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 35, "w": 35,
"h": 35, "h": 35,
"ox": 0, "ox": 0,
...@@ -3942,11 +3798,7 @@ exports.ResJson = { ...@@ -3942,11 +3798,7 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"recordSceneLine.png": { "recordSceneLine.png": {
<<<<<<< HEAD
"x": 507,
=======
"x": 243, "x": 243,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"y": 2, "y": 2,
"w": 688, "w": 688,
"h": 1, "h": 1,
...@@ -3982,7 +3834,7 @@ exports.ResJson = { ...@@ -3982,7 +3834,7 @@ exports.ResJson = {
"oy": 0, "oy": 0,
"sw": 350, "sw": 350,
"sh": 80, "sh": 80,
"ro": true "ro": false
}, },
"ruleBg.png": { "ruleBg.png": {
"x": 2, "x": 2,
...@@ -4002,30 +3854,18 @@ exports.ResJson = { ...@@ -4002,30 +3854,18 @@ exports.ResJson = {
"name": "startScene", "name": "startScene",
"atlas": { "atlas": {
"drawBtn.png": { "drawBtn.png": {
<<<<<<< HEAD
"x": 2,
"y": 279,
=======
"x": 85, "x": 85,
"y": 146, "y": 146,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 165, "w": 165,
"h": 142, "h": 142,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 165, "sw": 165,
"sh": 142, "sh": 142,
<<<<<<< HEAD
"ro": true
},
"drawBtn2.png": {
"x": 284,
=======
"ro": false "ro": false
}, },
"drawBtn2.png": { "drawBtn2.png": {
"x": 85, "x": 85,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"y": 2, "y": 2,
"w": 165, "w": 165,
"h": 142, "h": 142,
...@@ -4036,13 +3876,8 @@ exports.ResJson = { ...@@ -4036,13 +3876,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"music_Close.png": { "music_Close.png": {
<<<<<<< HEAD
"x": 451,
"y": 61,
=======
"x": 156, "x": 156,
"y": 349, "y": 349,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 57, "w": 57,
"h": 57, "h": 57,
"ox": 0, "ox": 0,
...@@ -4052,13 +3887,8 @@ exports.ResJson = { ...@@ -4052,13 +3887,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"music_Open.png": { "music_Open.png": {
<<<<<<< HEAD
"x": 451,
"y": 2,
=======
"x": 156, "x": 156,
"y": 290, "y": 290,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 57, "w": 57,
"h": 57, "h": 57,
"ox": 0, "ox": 0,
...@@ -4068,13 +3898,8 @@ exports.ResJson = { ...@@ -4068,13 +3898,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"newbieBtn.png": { "newbieBtn.png": {
<<<<<<< HEAD
"x": 146,
"y": 187,
=======
"x": 152, "x": 152,
"y": 424, "y": 424,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 96, "w": 96,
"h": 132, "h": 132,
"ox": 0, "ox": 0,
...@@ -4083,30 +3908,31 @@ exports.ResJson = { ...@@ -4083,30 +3908,31 @@ exports.ResJson = {
"sh": 132, "sh": 132,
"ro": false "ro": false
}, },
"rankBtn.png": {
"x": 54,
"y": 290,
"w": 100,
"h": 132,
"ox": 0,
"oy": 0,
"sw": 100,
"sh": 132,
"ro": false
},
"recordBtn.png": { "recordBtn.png": {
<<<<<<< HEAD
"x": 280,
"y": 146,
=======
"x": 100, "x": 100,
"y": 424, "y": 424,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 157, "w": 157,
"h": 50, "h": 50,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 157, "sw": 157,
"sh": 50, "sh": 50,
"ro": false "ro": true
}, },
"ruleBtn.png": { "ruleBtn.png": {
<<<<<<< HEAD
"x": 451,
"y": 120,
=======
"x": 2, "x": 2,
"y": 284, "y": 284,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 157, "w": 157,
"h": 50, "h": 50,
"ox": 0, "ox": 0,
...@@ -4128,18 +3954,14 @@ exports.ResJson = { ...@@ -4128,18 +3954,14 @@ exports.ResJson = {
}, },
"task_Btn.png": { "task_Btn.png": {
"x": 2, "x": 2,
<<<<<<< HEAD
"y": 85,
=======
"y": 443, "y": 443,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 96, "w": 96,
"h": 132, "h": 132,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 96, "sw": 96,
"sh": 132, "sh": 132,
"ro": true "ro": false
} }
} }
}, },
...@@ -4148,8 +3970,8 @@ exports.ResJson = { ...@@ -4148,8 +3970,8 @@ exports.ResJson = {
"name": "taskPanel", "name": "taskPanel",
"atlas": { "atlas": {
"awaitGetBtn.png": { "awaitGetBtn.png": {
"x": 754, "x": 354,
"y": 64, "y": 868,
"w": 174, "w": 174,
"h": 60, "h": 60,
"ox": 0, "ox": 0,
...@@ -4159,8 +3981,8 @@ exports.ResJson = { ...@@ -4159,8 +3981,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"browseGoods.png": { "browseGoods.png": {
"x": 868, "x": 647,
"y": 205, "y": 868,
"w": 33, "w": 33,
"h": 33, "h": 33,
"ox": 0, "ox": 0,
...@@ -4170,24 +3992,19 @@ exports.ResJson = { ...@@ -4170,24 +3992,19 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"finishBtn.png": { "finishBtn.png": {
"x": 930, "x": 178,
"y": 2, "y": 868,
"w": 174, "w": 174,
"h": 60, "h": 60,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 174, "sw": 174,
"sh": 60, "sh": 60,
"ro": true "ro": false
}, },
"follow.png": { "follow.png": {
<<<<<<< HEAD
"x": 868,
"y": 126,
=======
"x": 530, "x": 530,
"y": 868, "y": 868,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 38, "w": 38,
"h": 38, "h": 38,
"ox": 0, "ox": 0,
...@@ -4197,8 +4014,8 @@ exports.ResJson = { ...@@ -4197,8 +4014,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"invites.png": { "invites.png": {
"x": 908, "x": 610,
"y": 178, "y": 868,
"w": 35, "w": 35,
"h": 31, "h": 31,
"ox": 0, "ox": 0,
...@@ -4208,13 +4025,8 @@ exports.ResJson = { ...@@ -4208,13 +4025,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"member.png": { "member.png": {
<<<<<<< HEAD
"x": 868,
"y": 166,
=======
"x": 570, "x": 570,
"y": 868, "y": 868,
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
"w": 38, "w": 38,
"h": 37, "h": 37,
"ox": 0, "ox": 0,
...@@ -4232,22 +4044,22 @@ exports.ResJson = { ...@@ -4232,22 +4044,22 @@ exports.ResJson = {
"oy": 0, "oy": 0,
"sw": 750, "sw": 750,
"sh": 716, "sh": 716,
"ro": false "ro": true
}, },
"taskItemBG.png": { "taskItemBG.png": {
"x": 754, "x": 2,
"y": 126, "y": 754,
"w": 700, "w": 700,
"h": 112, "h": 112,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 700, "sw": 700,
"sh": 112, "sh": 112,
"ro": true "ro": false
}, },
"toFinishBtn.png": { "toFinishBtn.png": {
"x": 754, "x": 2,
"y": 2, "y": 868,
"w": 174, "w": 174,
"h": 60, "h": 60,
"ox": 0, "ox": 0,
...@@ -4271,7 +4083,7 @@ exports.ResJson = { ...@@ -4271,7 +4083,7 @@ exports.ResJson = {
"oy": 0, "oy": 0,
"sw": 350, "sw": 350,
"sh": 80, "sh": 80,
"ro": false "ro": true
}, },
"noTime.png": { "noTime.png": {
"x": 2, "x": 2,
...@@ -4310,7 +4122,7 @@ exports.ResJson = { ...@@ -4310,7 +4122,7 @@ exports.ResJson = {
"oy": 0, "oy": 0,
"sw": 350, "sw": 350,
"sh": 80, "sh": 80,
"ro": false "ro": true
} }
} }
}, },
...@@ -4338,7 +4150,7 @@ exports.ResJson = { ...@@ -4338,7 +4150,7 @@ exports.ResJson = {
"oy": 0, "oy": 0,
"sw": 350, "sw": 350,
"sh": 80, "sh": 80,
"ro": true "ro": false
} }
} }
}, },
...@@ -4366,7 +4178,7 @@ exports.ResJson = { ...@@ -4366,7 +4178,7 @@ exports.ResJson = {
"oy": 0, "oy": 0,
"sw": 350, "sw": 350,
"sh": 80, "sh": 80,
"ro": true "ro": false
} }
} }
}, },
...@@ -4394,20 +4206,12 @@ exports.ResJson = { ...@@ -4394,20 +4206,12 @@ exports.ResJson = {
"oy": 0, "oy": 0,
"sw": 350, "sw": 350,
"sh": 80, "sh": 80,
"ro": true "ro": false
} }
} }
} }
], ],
<<<<<<< HEAD
"path": "https://yun.duiba.com.cn/db_games/activity/kickball-feile/1593417124/resource/" "path": "https://yun.duiba.com.cn/db_games/activity/kickball-feile/1593417124/resource/"
=======
<<<<<<< HEAD
"path": "https://yun.duiba.com.cn/db_games/activity/kickball-feile/1593331345/resource/"
=======
"path": "https://yun.duiba.com.cn/db_games/activity/kickball-feile/1593395168/resource/"
>>>>>>> 699099cc94171ed20d87496bf35efdd28696258a
>>>>>>> e0d432ee2dea7cffd00cd6c24fa21a289f532d9c
}; };
......
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