Commit 03d46a73 authored by lujinlei's avatar lujinlei

-a

parent 396cca47
......@@ -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
......@@ -2372,6 +2372,55 @@ var GuideMgr = (function () {
exports.default = GuideMgr;
/***/ }),
/***/ "./src/Mgr/SoundMgr.ts":
/*!*****************************!*\
!*** ./src/Mgr/SoundMgr.ts ***!
\*****************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var SoundMgr = (function () {
function SoundMgr() {
}
Object.defineProperty(SoundMgr, "instance", {
get: function () {
if (!this._instance) {
this._instance = new SoundMgr();
}
return this._instance;
},
enumerable: true,
configurable: true
});
Object.defineProperty(SoundMgr.prototype, "enabled", {
get: function () {
return true;
},
enumerable: true,
configurable: true
});
SoundMgr.prototype.playEffect = function (name, loop) {
if (loop === void 0) { loop = false; }
if (!this.enabled)
return;
};
SoundMgr._instance = null;
return SoundMgr;
}());
exports.default = SoundMgr;
var nameToUuid = {
shoot: "b01dc39a-2886-4887-b3bb-0f8c801003a9",
collect: "7004616a-0aba-4826-9245-895e7fdf8d31",
dong: "7fc04e43-1465-4336-92a3-d6039ee88cb3",
boom: "ca6b799f-be85-4e94-99df-812f31801490"
};
/***/ }),
/***/ "./src/Mgr/TextureMgr.ts":
......@@ -2688,19 +2737,19 @@ exports.ResJson = {
"name": "assistScene",
"atlas": {
"assistBtn.png": {
"x": 315,
"y": 785,
"x": 624,
"y": 166,
"w": 350,
"h": 80,
"ox": 0,
"oy": 0,
"sw": 350,
"sh": 80,
"ro": true
"ro": false
},
"assistFail.png": {
"x": 2,
"y": 624,
"y": 442,
"w": 507,
"h": 147,
"ox": 0,
......@@ -2710,8 +2759,8 @@ exports.ResJson = {
"ro": true
},
"assistSuccess.png": {
"x": 151,
"y": 624,
"x": 624,
"y": 248,
"w": 259,
"h": 159,
"ox": 0,
......@@ -2721,26 +2770,26 @@ exports.ResJson = {
"ro": false
},
"goPlayBtn.png": {
"x": 233,
"y": 785,
"x": 624,
"y": 84,
"w": 350,
"h": 80,
"ox": 0,
"oy": 0,
"sw": 350,
"sh": 80,
"ro": true
"ro": false
},
"joinMemberBtn.png": {
"x": 151,
"y": 785,
"x": 624,
"y": 2,
"w": 350,
"h": 80,
"ox": 0,
"oy": 0,
"sw": 350,
"sh": 80,
"ro": true
"ro": false
},
"memberBG.png": {
"x": 2,
......@@ -2751,7 +2800,7 @@ exports.ResJson = {
"oy": 0,
"sw": 620,
"sh": 438,
"ro": true
"ro": false
}
}
},
......@@ -2760,8 +2809,8 @@ exports.ResJson = {
"name": "common",
"atlas": {
"comCloseBtn.png": {
"x": 646,
"y": 60,
"x": 2,
"y": 374,
"w": 54,
"h": 54,
"ox": 0,
......@@ -2771,7 +2820,7 @@ exports.ResJson = {
"ro": false
},
"toastBg.png": {
"x": 184,
"x": 2,
"y": 2,
"w": 460,
"h": 130,
......@@ -2783,18 +2832,18 @@ exports.ResJson = {
},
"waitingBg.png": {
"x": 2,
"y": 2,
"y": 134,
"w": 160,
"h": 180,
"ox": 0,
"oy": 0,
"sw": 160,
"sh": 180,
"ro": true
"ro": false
},
"waitingRot.png": {
"x": 646,
"y": 2,
"x": 2,
"y": 316,
"w": 56,
"h": 56,
"ox": 0,
......@@ -2806,12 +2855,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,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",
"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,bullet.png,car.png,car_particle.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",
"name": "dxqPlayScene",
"atlas": {
"ball_0.png": {
"x": 387,
"y": 1382,
"x": 674,
"y": 1028,
"w": 254,
"h": 254,
"ox": 0,
......@@ -2821,8 +2870,8 @@ exports.ResJson = {
"ro": false
},
"ball_1.png": {
"x": 634,
"y": 1052,
"x": 676,
"y": 772,
"w": 254,
"h": 254,
"ox": 0,
......@@ -2832,8 +2881,8 @@ exports.ResJson = {
"ro": false
},
"ball_2.png": {
"x": 658,
"y": 796,
"x": 258,
"y": 676,
"w": 254,
"h": 254,
"ox": 0,
......@@ -2843,8 +2892,8 @@ exports.ResJson = {
"ro": false
},
"ball_3.png": {
"x": 676,
"y": 540,
"x": 2,
"y": 676,
"w": 254,
"h": 254,
"ox": 0,
......@@ -2855,7 +2904,7 @@ exports.ResJson = {
},
"ball_4.png": {
"x": 676,
"y": 284,
"y": 516,
"w": 254,
"h": 254,
"ox": 0,
......@@ -2865,8 +2914,8 @@ exports.ResJson = {
"ro": false
},
"ball_5.png": {
"x": 378,
"y": 964,
"x": 676,
"y": 260,
"w": 254,
"h": 254,
"ox": 0,
......@@ -2876,52 +2925,52 @@ exports.ResJson = {
"ro": false
},
"ball_num_0.png": {
"x": 890,
"y": 1123,
"x": 932,
"y": 493,
"w": 38,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 38,
"sh": 69,
"ro": false
"ro": true
},
"ball_num_1.png": {
"x": 2,
"y": 2024,
"x": 1002,
"y": 603,
"w": 20,
"h": 68,
"ox": 0,
"oy": 0,
"sw": 20,
"sh": 68,
"ro": true
"ro": false
},
"ball_num_2.png": {
"x": 763,
"y": 1862,
"x": 932,
"y": 412,
"w": 39,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 69,
"ro": false
"ro": true
},
"ball_num_3.png": {
"x": 867,
"y": 1501,
"x": 948,
"y": 210,
"w": 40,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 40,
"sh": 69,
"ro": false
"ro": true
},
"ball_num_4.png": {
"x": 791,
"y": 1769,
"x": 932,
"y": 579,
"w": 44,
"h": 68,
"ox": 0,
......@@ -2931,52 +2980,52 @@ exports.ResJson = {
"ro": true
},
"ball_num_5.png": {
"x": 804,
"y": 1926,
"x": 932,
"y": 918,
"w": 39,
"h": 68,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 68,
"ro": false
"ro": true
},
"ball_num_6.png": {
"x": 890,
"y": 1194,
"x": 932,
"y": 371,
"w": 39,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 69,
"ro": false
"ro": true
},
"ball_num_7.png": {
"x": 804,
"y": 1856,
"x": 932,
"y": 877,
"w": 39,
"h": 68,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 68,
"ro": false
"ro": true
},
"ball_num_8.png": {
"x": 558,
"y": 1220,
"x": 948,
"y": 124,
"w": 42,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 42,
"sh": 69,
"ro": false
"ro": true
},
"ball_num_9.png": {
"x": 791,
"y": 1815,
"x": 932,
"y": 836,
"w": 39,
"h": 68,
"ox": 0,
......@@ -2986,19 +3035,19 @@ exports.ResJson = {
"ro": true
},
"ball_num_black_0.png": {
"x": 890,
"y": 1052,
"x": 932,
"y": 453,
"w": 38,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 38,
"sh": 69,
"ro": false
"ro": true
},
"ball_num_black_1.png": {
"x": 634,
"y": 964,
"x": 1002,
"y": 533,
"w": 20,
"h": 68,
"ox": 0,
......@@ -3008,30 +3057,30 @@ exports.ResJson = {
"ro": false
},
"ball_num_black_2.png": {
"x": 722,
"y": 1933,
"x": 932,
"y": 330,
"w": 39,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 69,
"ro": false
"ro": true
},
"ball_num_black_3.png": {
"x": 867,
"y": 1430,
"x": 948,
"y": 168,
"w": 40,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 40,
"sh": 69,
"ro": false
"ro": true
},
"ball_num_black_4.png": {
"x": 631,
"y": 1818,
"x": 932,
"y": 533,
"w": 44,
"h": 68,
"ox": 0,
......@@ -3041,8 +3090,8 @@ exports.ResJson = {
"ro": true
},
"ball_num_black_5.png": {
"x": 861,
"y": 1810,
"x": 932,
"y": 795,
"w": 39,
"h": 68,
"ox": 0,
......@@ -3052,41 +3101,41 @@ exports.ResJson = {
"ro": true
},
"ball_num_black_6.png": {
"x": 722,
"y": 1862,
"x": 948,
"y": 252,
"w": 39,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 69,
"ro": false
"ro": true
},
"ball_num_black_7.png": {
"x": 763,
"y": 1933,
"x": 932,
"y": 754,
"w": 39,
"h": 68,
"ox": 0,
"oy": 0,
"sw": 39,
"sh": 68,
"ro": false
"ro": true
},
"ball_num_black_8.png": {
"x": 823,
"y": 1430,
"x": 948,
"y": 80,
"w": 42,
"h": 69,
"ox": 0,
"oy": 0,
"sw": 42,
"sh": 69,
"ro": false
"ro": true
},
"ball_num_black_9.png": {
"x": 861,
"y": 1769,
"x": 932,
"y": 713,
"w": 39,
"h": 68,
"ox": 0,
......@@ -3096,19 +3145,19 @@ exports.ResJson = {
"ro": true
},
"ball_num_black_k.png": {
"x": 823,
"y": 1501,
"x": 932,
"y": 669,
"w": 42,
"h": 68,
"ox": 8,
"oy": 0,
"sw": 50,
"sh": 68,
"ro": false
"ro": true
},
"ball_num_k.png": {
"x": 701,
"y": 1818,
"x": 932,
"y": 625,
"w": 42,
"h": 68,
"ox": 8,
......@@ -3117,64 +3166,9 @@ exports.ResJson = {
"sh": 68,
"ro": true
},
"bomb_1.png": {
"x": 823,
"y": 1308,
"w": 120,
"h": 112,
"ox": 90,
"oy": 92,
"sw": 300,
"sh": 300,
"ro": true
},
"bomb_2.png": {
"x": 387,
"y": 1638,
"w": 242,
"h": 230,
"ox": 25,
"oy": 32,
"sw": 300,
"sh": 300,
"ro": false
},
"bomb_3.png": {
"x": 378,
"y": 676,
"w": 278,
"h": 286,
"ox": 15,
"oy": 8,
"sw": 300,
"sh": 300,
"ro": false
},
"bomb_4.png": {
"x": 676,
"y": 2,
"w": 280,
"h": 252,
"ox": 15,
"oy": 18,
"sw": 300,
"sh": 300,
"ro": true
},
"bomb_5.png": {
"x": 722,
"y": 2004,
"w": 42,
"h": 36,
"ox": 77,
"oy": 31,
"sw": 300,
"sh": 300,
"ro": true
},
"bullet.png": {
"x": 928,
"y": 1430,
"x": 1003,
"y": 390,
"w": 11,
"h": 43,
"ox": 0,
......@@ -3183,9 +3177,31 @@ exports.ResJson = {
"sh": 43,
"ro": false
},
"car.png": {
"x": 362,
"y": 1064,
"w": 124,
"h": 125,
"ox": 0,
"oy": 0,
"sw": 124,
"sh": 125,
"ro": true
},
"car_particle.png": {
"x": 932,
"y": 293,
"w": 87,
"h": 35,
"ox": 0,
"oy": 0,
"sw": 87,
"sh": 35,
"ro": false
},
"drop_bullet_0.png": {
"x": 602,
"y": 1220,
"x": 991,
"y": 1046,
"w": 30,
"h": 30,
"ox": 0,
......@@ -3195,8 +3211,8 @@ exports.ResJson = {
"ro": false
},
"drop_bullet_1.png": {
"x": 602,
"y": 1220,
"x": 991,
"y": 1046,
"w": 30,
"h": 30,
"ox": 0,
......@@ -3206,41 +3222,41 @@ exports.ResJson = {
"ro": false
},
"drop_power_0.png": {
"x": 240,
"y": 2018,
"x": 993,
"y": 1017,
"w": 28,
"h": 27,
"ox": 0,
"oy": 0,
"sw": 28,
"sh": 27,
"ro": true
"ro": false
},
"drop_power_1.png": {
"x": 211,
"y": 2018,
"x": 993,
"y": 988,
"w": 28,
"h": 27,
"ox": 0,
"oy": 0,
"sw": 28,
"sh": 27,
"ro": true
"ro": false
},
"drop_power_2.png": {
"x": 182,
"y": 2018,
"x": 993,
"y": 959,
"w": 28,
"h": 27,
"ox": 0,
"oy": 0,
"sw": 28,
"sh": 27,
"ro": true
"ro": false
},
"img_UFO_00.png": {
"x": 2,
"y": 1858,
"y": 932,
"w": 178,
"h": 164,
"ox": 6,
......@@ -3250,19 +3266,19 @@ exports.ResJson = {
"ro": false
},
"img_UFO_01.png": {
"x": 631,
"y": 1638,
"x": 182,
"y": 1092,
"w": 178,
"h": 158,
"ox": 6,
"oy": 16,
"sw": 190,
"sh": 180,
"ro": true
"ro": false
},
"img_UFO_02.png": {
"x": 542,
"y": 1870,
"x": 416,
"y": 1216,
"w": 178,
"h": 154,
"ox": 6,
......@@ -3272,30 +3288,30 @@ exports.ResJson = {
"ro": false
},
"img_UFO_03.png": {
"x": 643,
"y": 1468,
"x": 503,
"y": 1036,
"w": 178,
"h": 158,
"ox": 6,
"oy": 16,
"sw": 190,
"sh": 180,
"ro": false
"ro": true
},
"img_UFO_04.png": {
"x": 378,
"y": 1220,
"x": 514,
"y": 676,
"w": 178,
"h": 160,
"ox": 6,
"oy": 14,
"sw": 190,
"sh": 180,
"ro": false
"ro": true
},
"img_UFO_05.png": {
"x": 643,
"y": 1308,
"x": 182,
"y": 932,
"w": 178,
"h": 158,
"ox": 6,
......@@ -3305,8 +3321,8 @@ exports.ResJson = {
"ro": false
},
"img_UFO_06.png": {
"x": 362,
"y": 1870,
"x": 2,
"y": 1098,
"w": 178,
"h": 154,
"ox": 6,
......@@ -3316,19 +3332,19 @@ exports.ResJson = {
"ro": false
},
"img_UFO_07.png": {
"x": 182,
"y": 1858,
"x": 514,
"y": 856,
"w": 178,
"h": 158,
"ox": 6,
"oy": 16,
"sw": 190,
"sh": 180,
"ro": false
"ro": true
},
"main_bullet.png": {
"x": 877,
"y": 1572,
"x": 362,
"y": 1190,
"w": 52,
"h": 52,
"ox": 0,
......@@ -3338,30 +3354,30 @@ exports.ResJson = {
"ro": false
},
"main_countdown.png": {
"x": 791,
"y": 1628,
"x": 362,
"y": 932,
"w": 139,
"h": 130,
"ox": 0,
"oy": 0,
"sw": 139,
"sh": 130,
"ro": true
"ro": false
},
"main_countdown2.png": {
"x": 634,
"y": 1034,
"x": 932,
"y": 260,
"w": 12,
"h": 22,
"ox": 0,
"oy": 0,
"sw": 12,
"sh": 22,
"ro": true
"ro": false
},
"main_power.png": {
"x": 823,
"y": 1572,
"x": 930,
"y": 1283,
"w": 52,
"h": 52,
"ox": 0,
......@@ -3370,26 +3386,15 @@ exports.ResJson = {
"sh": 52,
"ro": false
},
"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,
"mask.png": {
"x": 676,
"y": 2,
"w": 270,
"h": 256,
"ox": 0,
"oy": 0,
"sw": 374,
"sh": 728,
"sw": 270,
"sh": 256,
"ro": false
},
"ring.png": {
......@@ -3404,19 +3409,19 @@ exports.ResJson = {
"ro": false
},
"score_num_0.png": {
"x": 845,
"y": 1917,
"x": 930,
"y": 1104,
"w": 33,
"h": 59,
"ox": 0,
"oy": 0,
"sw": 33,
"sh": 59,
"ro": false
"ro": true
},
"score_num_1.png": {
"x": 909,
"y": 1430,
"x": 1003,
"y": 330,
"w": 17,
"h": 58,
"ox": 0,
......@@ -3426,19 +3431,19 @@ exports.ResJson = {
"ro": false
},
"score_num_2.png": {
"x": 845,
"y": 1856,
"x": 930,
"y": 1069,
"w": 33,
"h": 59,
"ox": 0,
"oy": 0,
"sw": 33,
"sh": 59,
"ro": false
"ro": true
},
"score_num_3.png": {
"x": 880,
"y": 1925,
"x": 930,
"y": 1033,
"w": 34,
"h": 59,
"ox": 0,
......@@ -3448,8 +3453,8 @@ exports.ResJson = {
"ro": true
},
"score_num_4.png": {
"x": 880,
"y": 1961,
"x": 930,
"y": 1139,
"w": 37,
"h": 58,
"ox": 0,
......@@ -3459,8 +3464,8 @@ exports.ResJson = {
"ro": true
},
"score_num_5.png": {
"x": 763,
"y": 2003,
"x": 930,
"y": 1248,
"w": 33,
"h": 58,
"ox": 0,
......@@ -3470,8 +3475,8 @@ exports.ResJson = {
"ro": true
},
"score_num_6.png": {
"x": 880,
"y": 1889,
"x": 932,
"y": 997,
"w": 34,
"h": 59,
"ox": 0,
......@@ -3481,8 +3486,8 @@ exports.ResJson = {
"ro": true
},
"score_num_7.png": {
"x": 880,
"y": 2000,
"x": 930,
"y": 1213,
"w": 33,
"h": 58,
"ox": 0,
......@@ -3492,8 +3497,8 @@ exports.ResJson = {
"ro": true
},
"score_num_8.png": {
"x": 880,
"y": 1851,
"x": 932,
"y": 959,
"w": 36,
"h": 59,
"ox": 0,
......@@ -3503,26 +3508,26 @@ exports.ResJson = {
"ro": true
},
"score_num_9.png": {
"x": 845,
"y": 1978,
"x": 930,
"y": 1178,
"w": 33,
"h": 58,
"ox": 0,
"oy": 0,
"sw": 33,
"sh": 58,
"ro": false
"ro": true
},
"star.png": {
"x": 558,
"y": 1308,
"x": 948,
"y": 2,
"w": 76,
"h": 72,
"ox": 0,
"oy": 0,
"sw": 76,
"sh": 72,
"ro": false
"ro": true
}
}
},
......@@ -3542,8 +3547,8 @@ exports.ResJson = {
"ro": false
},
"gameoverPanelBtn.png": {
"x": 2,
"y": 746,
"x": 624,
"y": 2,
"w": 350,
"h": 80,
"ox": 0,
......@@ -3567,7 +3572,7 @@ exports.ResJson = {
"oy": 0,
"sw": 350,
"sh": 80,
"ro": true
"ro": false
},
"inviteInfoBG.png": {
"x": 2,
......@@ -3587,26 +3592,26 @@ exports.ResJson = {
"name": "loading",
"atlas": {
"adIamge.png": {
"x": 2,
"y": 42,
"x": 42,
"y": 2,
"w": 198,
"h": 79,
"ox": 0,
"oy": 0,
"sw": 198,
"sh": 79,
"ro": false
"ro": true
},
"bar1.png": {
"x": 2,
"y": 22,
"x": 22,
"y": 2,
"w": 502,
"h": 18,
"ox": 0,
"oy": 0,
"sw": 502,
"sh": 18,
"ro": false
"ro": true
},
"bar2.png": {
"x": 2,
......@@ -3617,18 +3622,18 @@ exports.ResJson = {
"oy": 29,
"sw": 551,
"sh": 92,
"ro": false
"ro": true
},
"loadtex.png": {
"x": 202,
"y": 42,
"x": 42,
"y": 202,
"w": 190,
"h": 24,
"ox": 0,
"oy": 0,
"sw": 190,
"sh": 24,
"ro": false
"ro": true
}
}
},
......@@ -3656,7 +3661,7 @@ exports.ResJson = {
"oy": 0,
"sw": 350,
"sh": 80,
"ro": true
"ro": false
}
}
},
......@@ -3676,8 +3681,8 @@ exports.ResJson = {
"ro": false
},
"prizePanelBtn.png": {
"x": 2,
"y": 928,
"x": 624,
"y": 166,
"w": 350,
"h": 80,
"ox": 0,
......@@ -3687,8 +3692,8 @@ exports.ResJson = {
"ro": false
},
"prizePanelBtnGo.png": {
"x": 2,
"y": 846,
"x": 624,
"y": 84,
"w": 350,
"h": 80,
"ox": 0,
......@@ -3698,8 +3703,8 @@ exports.ResJson = {
"ro": false
},
"prizePanelBtnRecord.png": {
"x": 2,
"y": 764,
"x": 624,
"y": 2,
"w": 350,
"h": 80,
"ox": 0,
......@@ -3723,11 +3728,11 @@ exports.ResJson = {
"oy": 0,
"sw": 620,
"sh": 960,
"ro": true
"ro": false
},
"rankPanelIcon.png": {
"x": 161,
"y": 678,
"x": 113,
"y": 964,
"w": 35,
"h": 36,
"ox": 0,
......@@ -3737,8 +3742,8 @@ exports.ResJson = {
"ro": false
},
"rankPanelIcon1.png": {
"x": 161,
"y": 624,
"x": 76,
"y": 964,
"w": 35,
"h": 52,
"ox": 0,
......@@ -3748,8 +3753,8 @@ exports.ResJson = {
"ro": false
},
"rankPanelIcon2.png": {
"x": 124,
"y": 678,
"x": 39,
"y": 964,
"w": 35,
"h": 52,
"ox": 0,
......@@ -3759,8 +3764,8 @@ exports.ResJson = {
"ro": false
},
"rankPanelIcon3.png": {
"x": 124,
"y": 624,
"x": 2,
"y": 964,
"w": 35,
"h": 52,
"ox": 0,
......@@ -3770,8 +3775,8 @@ exports.ResJson = {
"ro": false
},
"rankPanelLine.png": {
"x": 124,
"y": 732,
"x": 2,
"y": 1018,
"w": 590,
"h": 3,
"ox": 0,
......@@ -3781,8 +3786,8 @@ exports.ResJson = {
"ro": false
},
"rank_placeholder.png": {
"x": 2,
"y": 624,
"x": 624,
"y": 2,
"w": 120,
"h": 119,
"ox": 0,
......@@ -3798,8 +3803,8 @@ exports.ResJson = {
"name": "recordScene",
"atlas": {
"addressBtn.png": {
"x": 126,
"y": 940,
"x": 445,
"y": 204,
"w": 200,
"h": 60,
"ox": 0,
......@@ -3809,41 +3814,41 @@ exports.ResJson = {
"ro": true
},
"againGetBtn.png": {
"x": 64,
"y": 940,
"x": 243,
"y": 188,
"w": 200,
"h": 60,
"ox": 0,
"oy": 0,
"sw": 200,
"sh": 60,
"ro": true
"ro": false
},
"awaitGetBtn.png": {
"x": 188,
"y": 940,
"x": 243,
"y": 250,
"w": 174,
"h": 60,
"ox": 0,
"oy": 0,
"sw": 174,
"sh": 60,
"ro": true
"ro": false
},
"failBtn.png": {
"x": 2,
"y": 940,
"x": 243,
"y": 126,
"w": 200,
"h": 60,
"ox": 0,
"oy": 0,
"sw": 200,
"sh": 60,
"ro": true
"ro": false
},
"getBtn.png": {
"x": 2,
"y": 878,
"x": 243,
"y": 64,
"w": 200,
"h": 60,
"ox": 0,
......@@ -3853,19 +3858,19 @@ exports.ResJson = {
"ro": false
},
"invalidBtn.png": {
"x": 2,
"y": 816,
"x": 445,
"y": 2,
"w": 200,
"h": 60,
"ox": 0,
"oy": 0,
"sw": 200,
"sh": 60,
"ro": false
"ro": true
},
"prizePanelBack.png": {
"x": 204,
"y": 754,
"x": 243,
"y": 312,
"w": 35,
"h": 35,
"ox": 0,
......@@ -3875,8 +3880,8 @@ exports.ResJson = {
"ro": false
},
"receivedBtn.png": {
"x": 2,
"y": 754,
"x": 243,
"y": 2,
"w": 200,
"h": 60,
"ox": 0,
......@@ -3886,7 +3891,7 @@ exports.ResJson = {
"ro": false
},
"recordSceneLine.png": {
"x": 243,
"x": 507,
"y": 2,
"w": 688,
"h": 1,
......@@ -3922,7 +3927,7 @@ exports.ResJson = {
"oy": 0,
"sw": 350,
"sh": 80,
"ro": false
"ro": true
},
"ruleBg.png": {
"x": 2,
......@@ -3942,18 +3947,18 @@ exports.ResJson = {
"name": "startScene",
"atlas": {
"drawBtn.png": {
"x": 85,
"y": 146,
"x": 2,
"y": 279,
"w": 165,
"h": 142,
"ox": 0,
"oy": 0,
"sw": 165,
"sh": 142,
"ro": false
"ro": true
},
"drawBtn2.png": {
"x": 85,
"x": 284,
"y": 2,
"w": 165,
"h": 142,
......@@ -3964,8 +3969,8 @@ exports.ResJson = {
"ro": false
},
"music_Close.png": {
"x": 156,
"y": 349,
"x": 451,
"y": 61,
"w": 57,
"h": 57,
"ox": 0,
......@@ -3975,8 +3980,8 @@ exports.ResJson = {
"ro": false
},
"music_Open.png": {
"x": 156,
"y": 290,
"x": 451,
"y": 2,
"w": 57,
"h": 57,
"ox": 0,
......@@ -3986,41 +3991,41 @@ exports.ResJson = {
"ro": false
},
"newbieBtn.png": {
"x": 152,
"y": 424,
"x": 146,
"y": 187,
"w": 96,
"h": 132,
"ox": 0,
"oy": 0,
"sw": 96,
"sh": 132,
"ro": false
"ro": true
},
"rankBtn.png": {
"x": 54,
"y": 290,
"x": 146,
"y": 85,
"w": 100,
"h": 132,
"ox": 0,
"oy": 0,
"sw": 100,
"sh": 132,
"ro": false
"ro": true
},
"recordBtn.png": {
"x": 100,
"y": 424,
"x": 280,
"y": 146,
"w": 157,
"h": 50,
"ox": 0,
"oy": 0,
"sw": 157,
"sh": 50,
"ro": true
"ro": false
},
"ruleBtn.png": {
"x": 2,
"y": 284,
"x": 451,
"y": 120,
"w": 157,
"h": 50,
"ox": 0,
......@@ -4038,18 +4043,18 @@ exports.ResJson = {
"oy": 0,
"sw": 280,
"sh": 81,
"ro": true
"ro": false
},
"task_Btn.png": {
"x": 2,
"y": 443,
"y": 85,
"w": 96,
"h": 132,
"ox": 0,
"oy": 0,
"sw": 96,
"sh": 132,
"ro": false
"ro": true
}
}
},
......@@ -4058,8 +4063,8 @@ exports.ResJson = {
"name": "taskPanel",
"atlas": {
"awaitGetBtn.png": {
"x": 354,
"y": 868,
"x": 754,
"y": 64,
"w": 174,
"h": 60,
"ox": 0,
......@@ -4069,8 +4074,8 @@ exports.ResJson = {
"ro": false
},
"browseGoods.png": {
"x": 647,
"y": 868,
"x": 868,
"y": 205,
"w": 33,
"h": 33,
"ox": 0,
......@@ -4080,19 +4085,19 @@ exports.ResJson = {
"ro": false
},
"finishBtn.png": {
"x": 178,
"y": 868,
"x": 930,
"y": 2,
"w": 174,
"h": 60,
"ox": 0,
"oy": 0,
"sw": 174,
"sh": 60,
"ro": false
"ro": true
},
"follow.png": {
"x": 530,
"y": 868,
"x": 868,
"y": 126,
"w": 38,
"h": 38,
"ox": 0,
......@@ -4102,8 +4107,8 @@ exports.ResJson = {
"ro": false
},
"invites.png": {
"x": 610,
"y": 868,
"x": 908,
"y": 178,
"w": 35,
"h": 31,
"ox": 0,
......@@ -4113,8 +4118,8 @@ exports.ResJson = {
"ro": false
},
"member.png": {
"x": 570,
"y": 868,
"x": 868,
"y": 166,
"w": 38,
"h": 37,
"ox": 0,
......@@ -4132,22 +4137,22 @@ exports.ResJson = {
"oy": 0,
"sw": 750,
"sh": 716,
"ro": true
"ro": false
},
"taskItemBG.png": {
"x": 2,
"y": 754,
"x": 754,
"y": 126,
"w": 700,
"h": 112,
"ox": 0,
"oy": 0,
"sw": 700,
"sh": 112,
"ro": false
"ro": true
},
"toFinishBtn.png": {
"x": 2,
"y": 868,
"x": 754,
"y": 2,
"w": 174,
"h": 60,
"ox": 0,
......@@ -4171,7 +4176,7 @@ exports.ResJson = {
"oy": 0,
"sw": 350,
"sh": 80,
"ro": true
"ro": false
},
"noTime.png": {
"x": 2,
......@@ -4210,7 +4215,7 @@ exports.ResJson = {
"oy": 0,
"sw": 350,
"sh": 80,
"ro": true
"ro": false
}
}
},
......@@ -4238,7 +4243,7 @@ exports.ResJson = {
"oy": 0,
"sw": 350,
"sh": 80,
"ro": false
"ro": true
}
}
},
......@@ -4266,7 +4271,7 @@ exports.ResJson = {
"oy": 0,
"sw": 350,
"sh": 80,
"ro": false
"ro": true
}
}
},
......@@ -4294,12 +4299,12 @@ exports.ResJson = {
"oy": 0,
"sw": 350,
"sh": 80,
"ro": false
"ro": true
}
}
}
],
"path": "https://yun.duiba.com.cn/db_games/activity/kickball-feile/1593508630/resource/"
"path": "https://yun.duiba.com.cn/db_games/activity/kickball-feile/1593509273/resource/"
};
......@@ -6055,11 +6060,11 @@ var MTimer_1 = __webpack_require__(/*! ../Global/MTimer */ "./src/Global/MTimer.
var MUtils_1 = __webpack_require__(/*! ../Global/MUtils */ "./src/Global/MUtils.ts");
var DataMgr_1 = __webpack_require__(/*! ../Mgr/DataMgr */ "./src/Mgr/DataMgr.ts");
var GuideMgr_1 = __webpack_require__(/*! ../Mgr/GuideMgr */ "./src/Mgr/GuideMgr.ts");
var SoundMgr_1 = __webpack_require__(/*! ../Mgr/SoundMgr */ "./src/Mgr/SoundMgr.ts");
var TextureMgr_1 = __webpack_require__(/*! ../Mgr/TextureMgr */ "./src/Mgr/TextureMgr.ts");
var Collider_1 = __webpack_require__(/*! ./Collider */ "./src/game/Collider.ts");
var MoveObject_1 = __webpack_require__(/*! ./MoveObject */ "./src/game/MoveObject.ts");
var DxqPlayScene_1 = __webpack_require__(/*! ./DxqPlayScene */ "./src/game/DxqPlayScene.ts");
var BoomEffect_1 = __webpack_require__(/*! ./dxq/BoomEffect */ "./src/game/dxq/BoomEffect.ts");
var tempPower = null;
var tempIndexOffset = null;
var imageNames = [
......@@ -6159,6 +6164,7 @@ var Ball = (function (_super) {
}
}
this.playBoomEffect();
SoundMgr_1.default.instance.playEffect("boom");
DataMgr_1.DataMgr.game._pool.ball.recycle(this.poolKey, this);
};
Ball.prototype.init = function (colorIndex, direction, score) {
......@@ -6223,8 +6229,8 @@ var Ball = (function (_super) {
if (other.group == Collider_1.ColliderGroup.Ground) {
this.physics.velocity.y = -(MConst_1.MConst.BallVelocityY * (1 + ((1 / this.scaleRatio) - 1) * MUtils_1.MUtils.random(0, MConst_1.MConst.BallVelocityYRandomFactor)));
var clip = DataMgr_1.DataMgr.game._createAnimation("duang");
clip.x = this.x - this.width / 2;
clip.y = this.y - 30 * this.scaleRatio;
clip.x = this.x - 140 * this.scaleRatio;
clip.y = this.y - 50 * this.scaleRatio;
clip.scaleX = clip.scaleY = this.scaleRatio;
clip.play();
if (this.sizeIndex >= MConfigs_1.MConfigs.size.length - 2) {
......@@ -6331,9 +6337,52 @@ var Ball = (function (_super) {
}
};
Ball.prototype.playBoomEffect = function () {
var _this = this;
var color = MUtils_1.MUtils.randomInt(0, 5);
var scaleRatio = this.scaleRatio;
BoomEffect_1.createBoomEffect(this.parent, this.x, this.y, this.scaleRatio);
var range = MConst_1.MConst.DefaultBallWidth * 1.5 * this.scaleRatio;
var _loop_2 = function (i) {
var star = this_2.starPool.spwan("star", color);
var randomMax = 0.5 + (scaleRatio - 0.3125) / 2;
var scale = MUtils_1.MUtils.random(randomMax - 0.64 * scaleRatio, randomMax);
star.width = MConst_1.MConst.DefaultStarSize.width * scale;
star.height = MConst_1.MConst.DefaultStarSize.height * scale;
star.x = this_2.x - star.width / 2;
star.y = this_2.y - star.height / 2;
FYGE.Tween.get(star)
.to({
x: this_2.x + MUtils_1.MUtils.random(-1, 1) * range - star.width / 2,
y: this_2.y + MUtils_1.MUtils.random(-1, 1) * range - star.height / 2,
alpha: 0
}, BoomEffectDuration)
.call(function () {
_this.starPool.recycle(star);
});
};
var this_2 = this;
for (var i = 0; i <= 7; i++) {
_loop_2(i);
}
var _loop_3 = function (i) {
var ring = this_3.ringPool.spwan("ring", color);
ring.x = this_3.x;
ring.y = this_3.y;
ring.anchorTexture.set(0.5, 0.5);
ring.scaleX = ring.scaleY = 0.1 * (i + 1);
FYGE.Tween.get(ring)
.to({
scaleX: ring.scaleX * 1.792,
scaleY: ring.scaleY * 1.792,
alpha: 0
}, BoomEffectDuration + (i - 1) * BoomEffectDuration * 0.33)
.call(function () {
_this.ringPool.recycle(ring);
});
};
var this_3 = this;
for (var i = 0; i <= 2; i++) {
_loop_3(i);
}
};
Ball.textures = [];
return Ball;
......@@ -6507,14 +6556,13 @@ var __extends = (this && this.__extends) || (function () {
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
var GameObject_1 = __webpack_require__(/*! ./GameObject */ "./src/game/GameObject.ts");
var Collider_1 = __webpack_require__(/*! ./Collider */ "./src/game/Collider.ts");
var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts");
var DataMgr_1 = __webpack_require__(/*! ../Mgr/DataMgr */ "./src/Mgr/DataMgr.ts");
var MConst_1 = __webpack_require__(/*! ../Global/MConst */ "./src/Global/MConst.ts");
var MTimer_1 = __webpack_require__(/*! ../Global/MTimer */ "./src/Global/MTimer.ts");
var DataMgr_1 = __webpack_require__(/*! ../Mgr/DataMgr */ "./src/Mgr/DataMgr.ts");
var Bullet_1 = __webpack_require__(/*! ./Bullet */ "./src/game/Bullet.ts");
var Collider_1 = __webpack_require__(/*! ./Collider */ "./src/game/Collider.ts");
var MyMovieClip_1 = __webpack_require__(/*! ./dxq/MyMovieClip */ "./src/game/dxq/MyMovieClip.ts");
var GameObject_1 = __webpack_require__(/*! ./GameObject */ "./src/game/GameObject.ts");
var Car = (function (_super) {
__extends(Car, _super);
function Car() {
......@@ -6529,15 +6577,10 @@ var Car = (function (_super) {
_this.globalcarCollidePaddingX = 0;
_this.globalcarCollidePaddingY = 0;
var carCollidePaddingX = _this.globalcarCollidePaddingX, carCollidePaddingY = _this.globalcarCollidePaddingY;
var textures = [];
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, 1, -1, false);
sprite.frameInterval = 2;
sprite.goto(0);
var sprite = new FYGE.Sprite(RES_1.RES.getRes("car.png"));
sprite.x = 0;
sprite.y = 16;
_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);
......@@ -6545,9 +6588,6 @@ 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 () {
......@@ -6614,10 +6654,8 @@ var Car = (function (_super) {
}
};
Car.prototype.onUpdate = function () {
if (DataMgr_1.DataMgr.game.pause) {
this.carMc.stop();
if (DataMgr_1.DataMgr.game.pause)
return;
}
var score = DataMgr_1.DataMgr.game.bulletScore;
if (score <= 20) {
var max = MConst_1.MConst.BulletFireSpeed.max;
......@@ -7307,7 +7345,6 @@ 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();
......@@ -7620,7 +7657,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" + index + ".png"));
var mask = new FYGE.Sprite(RES_1.RES.getRes("mask.png"));
var w = mask.width, h = mask.height;
x1 = Math.floor(x1);
y1 = Math.floor(y1);
......@@ -7631,7 +7668,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.8;
var alpha = 0.7;
var top = new FYGE.Graphics();
top.beginFill(color, alpha);
top.drawRect(0, -sh, sw, y + sh);
......@@ -8301,127 +8338,6 @@ var SpBoomEffectPoolGroup = (function (_super) {
exports.default = SpBoomEffectPoolGroup;
/***/ }),
/***/ "./src/game/dxq/BoomEffect.ts":
/*!************************************!*\
!*** ./src/game/dxq/BoomEffect.ts ***!
\************************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var _this = this;
Object.defineProperty(exports, "__esModule", { value: true });
var RES_1 = __webpack_require__(/*! ../../../module/RES */ "./module/RES.ts");
var MyMovieClip_1 = __webpack_require__(/*! ./MyMovieClip */ "./src/game/dxq/MyMovieClip.ts");
exports.createBoomEffect = function (parent, x, y, scaleRatio) {
var textures = [];
for (var index = 1; index <= 5; index++) {
textures.push(RES_1.RES.getRes("bomb_" + index + ".png"));
}
console.log(scaleRatio);
var sprite = new MyMovieClip_1.default(textures, scaleRatio * 1.2, [150, 150], true, false);
sprite.position.set(x - 150, y - 150);
sprite.frameInterval = 4;
parent.addChild(sprite);
sprite.once(FYGE.Event.COMPLETE, function () {
parent.removeChild(sprite);
}, _this);
};
/***/ }),
/***/ "./src/game/dxq/MyMovieClip.ts":
/*!*************************************!*\
!*** ./src/game/dxq/MyMovieClip.ts ***!
\*************************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
var __extends = (this && this.__extends) || (function () {
var extendStatics = Object.setPrototypeOf ||
({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
function (d, b) { for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p]; };
return function (d, b) {
extendStatics(d, b);
function __() { this.constructor = d; }
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
};
})();
Object.defineProperty(exports, "__esModule", { value: true });
var layers_1 = __webpack_require__(/*! ../../../module/views/layers */ "./module/views/layers.ts");
var MyMovieClip = (function (_super) {
__extends(MyMovieClip, _super);
function MyMovieClip(textures, scale, anchor, autoplay, loop, frameInterval) {
if (scale === void 0) { scale = 1; }
if (anchor === void 0) { anchor = -1; }
if (autoplay === void 0) { autoplay = true; }
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) {
_this.counter = 0;
_this.currentFrame++;
_this.goto(_this.currentFrame);
if (_this.currentFrame == _this.textures.length - 1) {
if (_this.loop) {
_this.currentFrame = 0;
}
else {
_this.stop();
_this.dispatchEvent(new FYGE.Event(FYGE.Event.COMPLETE));
}
}
}
return false;
};
_this.textures = textures;
_this.autoplay = autoplay;
_this.loop = loop;
_this.frameInterval = frameInterval;
if (anchor != -1) {
_this.anchorX = anchor;
_this.anchorY = anchor;
if (Array.isArray(anchor)) {
_this.anchorX = anchor[0];
_this.anchorY = anchor[1];
}
}
_this.scaleX = _this.scaleY = scale;
if (_this.autoplay) {
_this.play();
}
return _this;
}
MyMovieClip.prototype.play = function (start) {
if (start === void 0) { start = 0; }
this._isPlaying = 1;
this.goto(start);
this.currentFrame = 0;
this.counter = 0;
layers_1.layers.addEventListener(FYGE.Event.ENTER_FRAME, this.onTick, this);
};
MyMovieClip.prototype.goto = function (frame) {
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);
};
return MyMovieClip;
}(FYGE.Sprite));
exports.default = MyMovieClip;
/***/ }),
/***/ "./src/game/dxq/loadDuangRes.ts":
......
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