Skip to content

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

1

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