Commit 44cd843d authored by wildfirecode's avatar wildfirecode

1

parent 03b8765c
......@@ -1545,7 +1545,7 @@ var MConfigs;
0: {
mask: "guide_mask_0_png",
text: {
str: "左右移动炮车进行射击和躲避",
str: "",
offsetToMask: {
x: 8,
y: 290
......@@ -1555,7 +1555,7 @@ var MConfigs;
1: {
mask: "guide_mask_1_png",
text: {
str: "拾取金币可获得更多的炮弹输出和得分加成",
str: "",
offsetToMask: {
x: -65,
y: 290
......@@ -2806,12 +2806,12 @@ exports.ResJson = {
}
},
{
"keys": "ball_0.png,ball_1.png,ball_2.png,ball_3.png,ball_4.png,ball_5.png,ball_num_0.png,ball_num_1.png,ball_num_2.png,ball_num_3.png,ball_num_4.png,ball_num_5.png,ball_num_6.png,ball_num_7.png,ball_num_8.png,ball_num_9.png,ball_num_black_0.png,ball_num_black_1.png,ball_num_black_2.png,ball_num_black_3.png,ball_num_black_4.png,ball_num_black_5.png,ball_num_black_6.png,ball_num_black_7.png,ball_num_black_8.png,ball_num_black_9.png,ball_num_black_k.png,ball_num_k.png,bomb_1.png,bomb_2.png,bomb_3.png,bomb_4.png,bomb_5.png,bullet.png,drop_bullet_0.png,drop_bullet_1.png,drop_power_0.png,drop_power_1.png,drop_power_2.png,img_UFO_00.png,img_UFO_01.png,img_UFO_02.png,img_UFO_03.png,img_UFO_04.png,img_UFO_05.png,img_UFO_06.png,img_UFO_07.png,main_bg.jpg,main_bullet.png,main_countdown.png,main_countdown2.png,main_power.png,mask.png,ring.png,score_num_0.png,score_num_1.png,score_num_2.png,score_num_3.png,score_num_4.png,score_num_5.png,score_num_6.png,score_num_7.png,score_num_8.png,score_num_9.png,star.png",
"keys": "ball_0.png,ball_1.png,ball_2.png,ball_3.png,ball_4.png,ball_5.png,ball_num_0.png,ball_num_1.png,ball_num_2.png,ball_num_3.png,ball_num_4.png,ball_num_5.png,ball_num_6.png,ball_num_7.png,ball_num_8.png,ball_num_9.png,ball_num_black_0.png,ball_num_black_1.png,ball_num_black_2.png,ball_num_black_3.png,ball_num_black_4.png,ball_num_black_5.png,ball_num_black_6.png,ball_num_black_7.png,ball_num_black_8.png,ball_num_black_9.png,ball_num_black_k.png,ball_num_k.png,bomb_1.png,bomb_2.png,bomb_3.png,bomb_4.png,bomb_5.png,bullet.png,drop_bullet_0.png,drop_bullet_1.png,drop_power_0.png,drop_power_1.png,drop_power_2.png,img_UFO_00.png,img_UFO_01.png,img_UFO_02.png,img_UFO_03.png,img_UFO_04.png,img_UFO_05.png,img_UFO_06.png,img_UFO_07.png,main_bg.jpg,main_bullet.png,main_countdown.png,main_countdown2.png,main_power.png,mask0.png,mask1.png,ring.png,score_num_0.png,score_num_1.png,score_num_2.png,score_num_3.png,score_num_4.png,score_num_5.png,score_num_6.png,score_num_7.png,score_num_8.png,score_num_9.png,star.png",
"name": "dxqPlayScene",
"atlas": {
"ball_0.png": {
"x": 1214,
"y": 516,
"x": 387,
"y": 1382,
"w": 254,
"h": 254,
"ox": 0,
......@@ -2821,8 +2821,8 @@ exports.ResJson = {
"ro": false
},
"ball_1.png": {
"x": 1228,
"y": 2,
"x": 634,
"y": 1052,
"w": 254,
"h": 254,
"ox": 0,
......@@ -2832,8 +2832,8 @@ exports.ResJson = {
"ro": false
},
"ball_2.png": {
"x": 1214,
"y": 260,
"x": 658,
"y": 796,
"w": 254,
"h": 254,
"ox": 0,
......@@ -2844,7 +2844,7 @@ exports.ResJson = {
},
"ball_3.png": {
"x": 676,
"y": 544,
"y": 540,
"w": 254,
"h": 254,
"ox": 0,
......@@ -2854,8 +2854,8 @@ exports.ResJson = {
"ro": false
},
"ball_4.png": {
"x": 958,
"y": 538,
"x": 676,
"y": 284,
"w": 254,
"h": 254,
"ox": 0,
......@@ -2865,8 +2865,8 @@ exports.ResJson = {
"ro": false
},
"ball_5.png": {
"x": 958,
"y": 282,
"x": 378,
"y": 964,
"w": 254,
"h": 254,
"ox": 0,
......@@ -2876,30 +2876,30 @@ exports.ResJson = {
"ro": false
},
"ball_num_0.png": {
"x": 586,
"y": 747,
"x": 890,
"y": 1123,
"w": 38,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 38,
"sh": 69,
"ro": true
"ro": false
},
"ball_num_1.png": {
"x": 932,
"y": 544,
"x": 2,
"y": 2024,
"w": 20,
"h": 68,
"ox": 0,
"oy": 0,
"sw": 20,
"sh": 68,
"ro": false
"ro": true
},
"ball_num_2.png": {
"x": 586,
"y": 676,
"x": 763,
"y": 1862,
"w": 39,
"h": 69,
"ox": 0,
......@@ -2909,8 +2909,8 @@ exports.ResJson = {
"ro": false
},
"ball_num_3.png": {
"x": 1452,
"y": 843,
"x": 867,
"y": 1501,
"w": 40,
"h": 69,
"ox": 0,
......@@ -2920,8 +2920,8 @@ exports.ResJson = {
"ro": false
},
"ball_num_4.png": {
"x": 766,
"y": 941,
"x": 791,
"y": 1769,
"w": 44,
"h": 68,
"ox": 0,
......@@ -2931,8 +2931,8 @@ exports.ResJson = {
"ro": true
},
"ball_num_5.png": {
"x": 1470,
"y": 398,
"x": 804,
"y": 1926,
"w": 39,
"h": 68,
"ox": 0,
......@@ -2942,8 +2942,8 @@ exports.ResJson = {
"ro": false
},
"ball_num_6.png": {
"x": 202,
"y": 908,
"x": 890,
"y": 1194,
"w": 39,
"h": 69,
"ox": 0,
......@@ -2953,8 +2953,8 @@ exports.ResJson = {
"ro": false
},
"ball_num_7.png": {
"x": 1470,
"y": 328,
"x": 804,
"y": 1856,
"w": 39,
"h": 68,
"ox": 0,
......@@ -2964,63 +2964,63 @@ exports.ResJson = {
"ro": false
},
"ball_num_8.png": {
"x": 1363,
"y": 952,
"x": 558,
"y": 1220,
"w": 42,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 42,
"sh": 69,
"ro": true
"ro": false
},
"ball_num_9.png": {
"x": 1470,
"y": 258,
"x": 791,
"y": 1815,
"w": 39,
"h": 68,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 68,
"ro": false
"ro": true
},
"ball_num_black_0.png": {
"x": 124,
"y": 982,
"x": 890,
"y": 1052,
"w": 38,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 38,
"sh": 69,
"ro": true
"ro": false
},
"ball_num_black_1.png": {
"x": 956,
"y": 260,
"x": 634,
"y": 964,
"w": 20,
"h": 68,
"ox": 0,
"oy": 0,
"sw": 20,
"sh": 68,
"ro": true
"ro": false
},
"ball_num_black_2.png": {
"x": 1183,
"y": 956,
"x": 722,
"y": 1933,
"w": 39,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 69,
"ro": true
"ro": false
},
"ball_num_black_3.png": {
"x": 1452,
"y": 772,
"x": 867,
"y": 1430,
"w": 40,
"h": 69,
"ox": 0,
......@@ -3030,19 +3030,19 @@ exports.ResJson = {
"ro": false
},
"ball_num_black_4.png": {
"x": 627,
"y": 676,
"x": 631,
"y": 1818,
"w": 44,
"h": 68,
"ox": 0,
"oy": 0,
"sw": 44,
"sh": 68,
"ro": false
"ro": true
},
"ball_num_black_5.png": {
"x": 976,
"y": 960,
"x": 861,
"y": 1810,
"w": 39,
"h": 68,
"ox": 0,
......@@ -3052,41 +3052,41 @@ exports.ResJson = {
"ro": true
},
"ball_num_black_6.png": {
"x": 1112,
"y": 956,
"x": 722,
"y": 1862,
"w": 39,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 69,
"ro": true
"ro": false
},
"ball_num_black_7.png": {
"x": 906,
"y": 960,
"x": 763,
"y": 1933,
"w": 39,
"h": 68,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 68,
"ro": true
"ro": false
},
"ball_num_black_8.png": {
"x": 1292,
"y": 952,
"x": 823,
"y": 1430,
"w": 42,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 42,
"sh": 69,
"ro": true
"ro": false
},
"ball_num_black_9.png": {
"x": 656,
"y": 956,
"x": 861,
"y": 1769,
"w": 39,
"h": 68,
"ox": 0,
......@@ -3096,19 +3096,19 @@ exports.ResJson = {
"ro": true
},
"ball_num_black_k.png": {
"x": 586,
"y": 956,
"x": 823,
"y": 1501,
"w": 42,
"h": 68,
"ox": 8,
"oy": 0,
"sw": 50,
"sh": 68,
"ro": true
"ro": false
},
"ball_num_k.png": {
"x": 836,
"y": 941,
"x": 701,
"y": 1818,
"w": 42,
"h": 68,
"ox": 8,
......@@ -3118,19 +3118,19 @@ exports.ResJson = {
"ro": true
},
"bomb_1.png": {
"x": 2,
"y": 908,
"x": 823,
"y": 1308,
"w": 120,
"h": 112,
"ox": 90,
"oy": 92,
"sw": 300,
"sh": 300,
"ro": false
"ro": true
},
"bomb_2.png": {
"x": 2,
"y": 676,
"x": 387,
"y": 1638,
"w": 242,
"h": 230,
"ox": 25,
......@@ -3140,8 +3140,8 @@ exports.ResJson = {
"ro": false
},
"bomb_3.png": {
"x": 676,
"y": 2,
"x": 378,
"y": 676,
"w": 278,
"h": 286,
"ox": 15,
......@@ -3152,29 +3152,29 @@ exports.ResJson = {
},
"bomb_4.png": {
"x": 676,
"y": 290,
"y": 2,
"w": 280,
"h": 252,
"ox": 15,
"oy": 18,
"sw": 300,
"sh": 300,
"ro": false
"ro": true
},
"bomb_5.png": {
"x": 1452,
"y": 914,
"x": 722,
"y": 2004,
"w": 42,
"h": 36,
"ox": 77,
"oy": 31,
"sw": 300,
"sh": 300,
"ro": false
"ro": true
},
"bullet.png": {
"x": 932,
"y": 674,
"x": 928,
"y": 1430,
"w": 11,
"h": 43,
"ox": 0,
......@@ -3184,8 +3184,8 @@ exports.ResJson = {
"ro": false
},
"drop_bullet_0.png": {
"x": 202,
"y": 979,
"x": 602,
"y": 1220,
"w": 30,
"h": 30,
"ox": 0,
......@@ -3195,8 +3195,8 @@ exports.ResJson = {
"ro": false
},
"drop_bullet_1.png": {
"x": 202,
"y": 979,
"x": 602,
"y": 1220,
"w": 30,
"h": 30,
"ox": 0,
......@@ -3206,8 +3206,8 @@ exports.ResJson = {
"ro": false
},
"drop_power_0.png": {
"x": 898,
"y": 860,
"x": 240,
"y": 2018,
"w": 28,
"h": 27,
"ox": 0,
......@@ -3217,8 +3217,8 @@ exports.ResJson = {
"ro": true
},
"drop_power_1.png": {
"x": 898,
"y": 830,
"x": 211,
"y": 2018,
"w": 28,
"h": 27,
"ox": 0,
......@@ -3228,8 +3228,8 @@ exports.ResJson = {
"ro": true
},
"drop_power_2.png": {
"x": 898,
"y": 800,
"x": 182,
"y": 2018,
"w": 28,
"h": 27,
"ox": 0,
......@@ -3239,8 +3239,8 @@ exports.ResJson = {
"ro": true
},
"img_UFO_00.png": {
"x": 932,
"y": 794,
"x": 2,
"y": 1858,
"w": 178,
"h": 164,
"ox": 6,
......@@ -3250,8 +3250,8 @@ exports.ResJson = {
"ro": false
},
"img_UFO_01.png": {
"x": 246,
"y": 836,
"x": 631,
"y": 1638,
"w": 178,
"h": 158,
"ox": 6,
......@@ -3261,8 +3261,8 @@ exports.ResJson = {
"ro": true
},
"img_UFO_02.png": {
"x": 406,
"y": 856,
"x": 542,
"y": 1870,
"w": 178,
"h": 154,
"ox": 6,
......@@ -3272,19 +3272,19 @@ exports.ResJson = {
"ro": false
},
"img_UFO_03.png": {
"x": 426,
"y": 676,
"x": 643,
"y": 1468,
"w": 178,
"h": 158,
"ox": 6,
"oy": 16,
"sw": 190,
"sh": 180,
"ro": true
"ro": false
},
"img_UFO_04.png": {
"x": 1112,
"y": 794,
"x": 378,
"y": 1220,
"w": 178,
"h": 160,
"ox": 6,
......@@ -3294,8 +3294,8 @@ exports.ResJson = {
"ro": false
},
"img_UFO_05.png": {
"x": 246,
"y": 676,
"x": 643,
"y": 1308,
"w": 178,
"h": 158,
"ox": 6,
......@@ -3305,8 +3305,8 @@ exports.ResJson = {
"ro": false
},
"img_UFO_06.png": {
"x": 586,
"y": 800,
"x": 362,
"y": 1870,
"w": 178,
"h": 154,
"ox": 6,
......@@ -3316,19 +3316,19 @@ exports.ResJson = {
"ro": false
},
"img_UFO_07.png": {
"x": 1292,
"y": 772,
"x": 182,
"y": 1858,
"w": 178,
"h": 158,
"ox": 6,
"oy": 16,
"sw": 190,
"sh": 180,
"ro": true
"ro": false
},
"main_bullet.png": {
"x": 1046,
"y": 960,
"x": 877,
"y": 1572,
"w": 52,
"h": 52,
"ox": 0,
......@@ -3338,8 +3338,8 @@ exports.ResJson = {
"ro": false
},
"main_countdown.png": {
"x": 766,
"y": 800,
"x": 791,
"y": 1628,
"w": 139,
"h": 130,
"ox": 0,
......@@ -3349,19 +3349,19 @@ exports.ResJson = {
"ro": true
},
"main_countdown2.png": {
"x": 932,
"y": 719,
"x": 634,
"y": 1034,
"w": 12,
"h": 22,
"ox": 0,
"oy": 0,
"sw": 12,
"sh": 22,
"ro": false
"ro": true
},
"main_power.png": {
"x": 1434,
"y": 952,
"x": 823,
"y": 1572,
"w": 52,
"h": 52,
"ox": 0,
......@@ -3370,15 +3370,26 @@ exports.ResJson = {
"sh": 52,
"ro": false
},
"mask.png": {
"x": 956,
"y": 2,
"w": 270,
"h": 256,
"mask0.png": {
"x": 2,
"y": 1406,
"w": 450,
"h": 383,
"ox": 0,
"oy": 0,
"sw": 450,
"sh": 383,
"ro": true
},
"mask1.png": {
"x": 2,
"y": 676,
"w": 374,
"h": 728,
"ox": 0,
"oy": 0,
"sw": 270,
"sh": 256,
"sw": 374,
"sh": 728,
"ro": false
},
"ring.png": {
......@@ -3393,8 +3404,8 @@ exports.ResJson = {
"ro": false
},
"score_num_0.png": {
"x": 1470,
"y": 468,
"x": 845,
"y": 1917,
"w": 33,
"h": 59,
"ox": 0,
......@@ -3404,8 +3415,8 @@ exports.ResJson = {
"ro": false
},
"score_num_1.png": {
"x": 932,
"y": 614,
"x": 909,
"y": 1430,
"w": 17,
"h": 58,
"ox": 0,
......@@ -3415,19 +3426,19 @@ exports.ResJson = {
"ro": false
},
"score_num_2.png": {
"x": 762,
"y": 987,
"x": 845,
"y": 1856,
"w": 33,
"h": 59,
"ox": 0,
"oy": 0,
"sw": 33,
"sh": 59,
"ro": true
"ro": false
},
"score_num_3.png": {
"x": 836,
"y": 985,
"x": 880,
"y": 1925,
"w": 34,
"h": 59,
"ox": 0,
......@@ -3437,63 +3448,63 @@ exports.ResJson = {
"ro": true
},
"score_num_4.png": {
"x": 1470,
"y": 529,
"x": 880,
"y": 1961,
"w": 37,
"h": 58,
"ox": 0,
"oy": 0,
"sw": 37,
"sh": 58,
"ro": false
"ro": true
},
"score_num_5.png": {
"x": 1470,
"y": 709,
"x": 763,
"y": 2003,
"w": 33,
"h": 58,
"ox": 0,
"oy": 0,
"sw": 33,
"sh": 58,
"ro": false
"ro": true
},
"score_num_6.png": {
"x": 726,
"y": 956,
"x": 880,
"y": 1889,
"w": 34,
"h": 59,
"ox": 0,
"oy": 0,
"sw": 34,
"sh": 59,
"ro": false
"ro": true
},
"score_num_7.png": {
"x": 1470,
"y": 649,
"x": 880,
"y": 2000,
"w": 33,
"h": 58,
"ox": 0,
"oy": 0,
"sw": 33,
"sh": 58,
"ro": false
"ro": true
},
"score_num_8.png": {
"x": 1254,
"y": 956,
"x": 880,
"y": 1851,
"w": 36,
"h": 59,
"ox": 0,
"oy": 0,
"sw": 36,
"sh": 59,
"ro": false
"ro": true
},
"score_num_9.png": {
"x": 1470,
"y": 589,
"x": 845,
"y": 1978,
"w": 33,
"h": 58,
"ox": 0,
......@@ -3503,8 +3514,8 @@ exports.ResJson = {
"ro": false
},
"star.png": {
"x": 124,
"y": 908,
"x": 558,
"y": 1308,
"w": 76,
"h": 72,
"ox": 0,
......@@ -4288,7 +4299,7 @@ exports.ResJson = {
}
}
],
"path": "https://yun.duiba.com.cn/db_games/activity/kickball-feile/1593496647/resource/"
"path": "https://yun.duiba.com.cn/db_games/activity/kickball-feile/1593501022/resource/"
};
......@@ -6522,9 +6533,11 @@ var Car = (function (_super) {
for (var index = 0; index <= 7; index++) {
textures.push(RES_1.RES.getRes("img_UFO_0" + index + ".png"));
}
var sprite = new MyMovieClip_1.default(textures);
var sprite = new MyMovieClip_1.default(textures, 1, -1, false);
sprite.frameInterval = 2;
sprite.goto(0);
_this.addChild(sprite);
_this.carMc = sprite;
MTimer_1.default.onFrame("Car", _this.onUpdate, _this);
var collider = _this.collider = _this.addComponent(Collider_1.RectCollider);
collider.setData(carCollidePaddingX, carCollidePaddingY, sprite.width - carCollidePaddingX * 2, sprite.height - carCollidePaddingY * 2);
......@@ -6532,6 +6545,9 @@ var Car = (function (_super) {
return _this;
}
Car.prototype.fire = function () {
if (!this.carMc._isPlaying) {
this.carMc.play();
}
new Bullet_1.BulletGroup(new FYGE.Point(this.x + this.width / 2, this.y), this.rowBulletNum);
};
Car.prototype.die = function () {
......@@ -6598,8 +6614,10 @@ var Car = (function (_super) {
}
};
Car.prototype.onUpdate = function () {
if (DataMgr_1.DataMgr.game.pause)
if (DataMgr_1.DataMgr.game.pause) {
this.carMc.stop();
return;
}
var score = DataMgr_1.DataMgr.game.bulletScore;
if (score <= 20) {
var max = MConst_1.MConst.BulletFireSpeed.max;
......@@ -7289,6 +7307,7 @@ var DxqPlayScene = (function (_super) {
case 0:
this.timer == 0;
this.gamePause();
this._car.carMc.stop();
return [4, submitGame_1.default(this.score)];
case 1:
result = _a.sent();
......@@ -7601,7 +7620,7 @@ var GuideMask = (function (_super) {
function GuideMask(index, x1, y1) {
var _this = _super.call(this) || this;
var config = MConfigs_1.MConfigs.guide[index];
var mask = new FYGE.Sprite(RES_1.RES.getRes("mask.png"));
var mask = new FYGE.Sprite(RES_1.RES.getRes("mask" + index + ".png"));
var w = mask.width, h = mask.height;
x1 = Math.floor(x1);
y1 = Math.floor(y1);
......@@ -7612,7 +7631,7 @@ var GuideMask = (function (_super) {
_this.addChild(mask);
var sw = MConst_1.MConst.DesignResolution.width, sh = MConst_1.MConst.DesignResolution.height;
var color = 0x000000;
var alpha = 0.7;
var alpha = 0.8;
var top = new FYGE.Graphics();
top.beginFill(color, alpha);
top.drawRect(0, -sh, sw, y + sh);
......@@ -8345,6 +8364,7 @@ var MyMovieClip = (function (_super) {
if (loop === void 0) { loop = true; }
if (frameInterval === void 0) { frameInterval = 1; }
var _this = _super.call(this) || this;
_this._isPlaying = 0;
_this.onTick = function () {
_this.counter++;
if (_this.counter == _this.frameInterval) {
......@@ -8383,6 +8403,7 @@ var MyMovieClip = (function (_super) {
}
MyMovieClip.prototype.play = function (start) {
if (start === void 0) { start = 0; }
this._isPlaying = 1;
this.goto(start);
this.currentFrame = 0;
this.counter = 0;
......@@ -8392,6 +8413,7 @@ var MyMovieClip = (function (_super) {
this.texture = this.textures[frame];
};
MyMovieClip.prototype.stop = function () {
this._isPlaying = 0;
this.currentFrame = 0;
layers_1.layers.removeEventListener(FYGE.Event.ENTER_FRAME, this.onTick, this);
};
......
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