Skip to content

B
babycare_xiaoxiao
Commit dcc7f8af authored by haiyoucuv's avatar haiyoucuv
Browse files
Options

Merge branch 'master' of http://gitlab2.dui88.com/MrKwon/babycare_xiaoxiao

parents efc9cfcc f35c4a9c
Show whitespace changes
Inline Side-by-side
Showing with 9163 additions and 208 deletions
mock/miniTb/babycare.getPrizesByLevel.json
View file @ dcc7f8af
......@@ -22,12 +22,12 @@
"name": "60关奖品3",
"useStock": 1,
"rank": "",
"_id": "5f08084e0cb7338a0a377c8e",
"_id": "123",
"id": "",
"stock": 200
},
{
"image": "https://img.alicdn.com/imgextra/i2/2275046294/O1CN01c4rCs11wMhRrsjEep_!!2275046294-2-miniprogram.png",
"image": "https://source.unsplash.com/user/erondu/80x80",
"isBackUp": true,
"properiodto": 10000,
"level": 2,
......@@ -42,10 +42,10 @@
"deleteStatus": 1,
"name": "谢谢参与",
"useStock": 0,
"_id": "5f0c043852bbde91d1ca5682"
"_id": "456"
},
{
"image": "https://img.alicdn.com/imgextra/i2/2275046294/O1CN01c4rCs11wMhRrsjEep_!!2275046294-2-miniprogram.png",
"image": "https://source.unsplash.com/user/erondu/90x90",
"isBackUp": true,
"properiodto": 10000,
"level": 2,
......@@ -60,10 +60,46 @@
"deleteStatus": 1,
"name": "谢谢参与",
"useStock": 0,
"_id": "5f0c043852bbde91d1ca5682"
"_id": "789"
},
{
"image": "https://img.alicdn.com/imgextra/i2/2275046294/O1CN01c4rCs11wMhRrsjEep_!!2275046294-2-miniprogram.png",
"image": "https://source.unsplash.com/user/erondu/100x100",
"isBackUp": true,
"properiodto": 10000,
"level": 2,
"probability": "84",
"prizeType": 60,
"updateTime": 1594623032197,
"type": 5,
"properiodfrom": 1601,
"activityId": "5f08084ec3ad3494b9201c0e",
"lockStatus": 1,
"createTime": 1594623032197,
"deleteStatus": 1,
"name": "谢谢参与",
"useStock": 0,
"_id": "1213"
},
{
"image": "https://source.unsplash.com/user/erondu/110x110",
"isBackUp": true,
"properiodto": 10000,
"level": 2,
"probability": "84",
"prizeType": 60,
"updateTime": 1594623032197,
"type": 5,
"properiodfrom": 1601,
"activityId": "5f08084ec3ad3494b9201c0e",
"lockStatus": 1,
"createTime": 1594623032197,
"deleteStatus": 1,
"name": "谢谢参与",
"useStock": 0,
"_id": "9898"
},
{
"image": "https://source.unsplash.com/user/erondu/120x120",
"isBackUp": true,
"properiodto": 10000,
"level": 2,
......@@ -78,7 +114,7 @@
"deleteStatus": 1,
"name": "谢谢参与",
"useStock": 0,
"_id": "5f0c043852bbde91d1ca5682"
"_id": "9654"
}
],
"success": true,
......
mock/miniTb/babycare.luckyDraw.json 0 → 100644
View file @ dcc7f8af
{
"code": "000000",
"data": {
"image": "https://img.alicdn.com/imgextra/i1/2275046294/O1CN01TrcMYF1wMhRuCphHI_!!2275046294-2-miniprogram.png",
"level": 90,
"drawStatus": 1,
"openId": "AAHuCvE-ALiIWXYsJuTb5S4W",
"createDay": "2020/07/14",
"avatar": "sdfwerwerwer",
"type": 3,
"prizeId": "5f08084e0cb7338a0a377c8d",
"activityId": "5f08084ec3ad3494b9201c0e",
"ename": "",
"userNick": "wmmmmm",
"name": "90关奖品4",
"_id": "AAHuCvE-ALiIWXYsJuTb5S4W1594715684002"
},
"success": true,
"message": "成功"
}
\ No newline at end of file
module/tools/GTool.ts
View file @ dcc7f8af
......@@ -155,6 +155,11 @@ export class GTool {
return (0.5 - Math.random());
});
}
public static disturbArr(arr: any[]) {
return arr.sort(function () {
return (0.5 - Math.random());
});
}
/**
* 其实打乱数组取前几个就行
......
output.js
View file @ dcc7f8af
......@@ -1007,6 +1007,11 @@ var GTool = (function () {
return (0.5 - Math.random());
});
};
GTool.disturbArr = function (arr) {
return arr.sort(function () {
return (0.5 - Math.random());
});
};
GTool.getRandomArrayElements = function (arr, count) {
var shuffled = arr.slice(0), i = arr.length, min = i - count, temp, index;
if (min <= 0)
......@@ -6046,7 +6051,7 @@ exports.ResJson = {
}
},
{
"keys": "lotteryBtn.png,lotteryItemBg.png,lotteryMachineBg.jpg,prizeItemBg.png,shadowMask.png",
"keys": "lotteryBtn.png,lotteryItemBg.png,lotteryMachineBg.jpg,lotteryReturnBtn.png,prizeItemBg.png,shadowMask.png",
"name": "lotteryScene",
"atlas": {
"lotteryBtn.png": {
......@@ -6061,8 +6066,8 @@ exports.ResJson = {
"ro": false
},
"lotteryItemBg.png": {
"x": 342,
"y": 113,
"x": 199,
"y": 84,
"w": 103,
"h": 108,
"ox": 0,
......@@ -6071,9 +6076,20 @@ exports.ResJson = {
"sh": 108,
"ro": true
},
"prizeItemBg.png": {
"lotteryReturnBtn.png": {
"x": 354,
"y": 2,
"w": 124,
"h": 56,
"ox": 0,
"oy": 0,
"sw": 124,
"sh": 56,
"ro": false
},
"prizeItemBg.png": {
"x": 354,
"y": 60,
"w": 109,
"h": 109,
"ox": 0,
......@@ -6084,14 +6100,14 @@ exports.ResJson = {
},
"shadowMask.png": {
"x": 2,
"y": 84,
"y": 171,
"w": 338,
"h": 195,
"ox": 0,
"oy": 0,
"sw": 338,
"sh": 195,
"ro": false
"ro": true
}
}
},
......@@ -10175,7 +10191,7 @@ exports.ResJson = {
}
}
],
"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1595570101/resource/"
"path": "https://yun.duiba.com.cn/db_games/activity/babycare_xiaoxiao/1595819916/resource/"
};
......@@ -10875,7 +10891,7 @@ exports.SkinJson = {
"alpha": 1,
"type": "text",
"props": {
"text": "+\t15",
"text": "+\t1",
"size": 36,
"fillColor": "#ffffff",
"textAlpha": 1
......@@ -11370,6 +11386,7 @@ var TbNetName;
TbNetName["dojoin"] = "babycare.dojoin";
TbNetName["completeTask"] = "babycare.completeTask";
TbNetName["getTaskList"] = "babycare.getTaskList";
TbNetName["luckyDraw"] = "babycare.luckyDraw";
TbNetName["authorize"] = "mine.authorize";
TbNetName["favorShop"] = "mine.favorShop";
TbNetName["getUserAddress"] = "mine.getUserAddress";
......@@ -16515,7 +16532,7 @@ var BuyPowerPanel = (function (_super) {
});
BuyPowerPanel.prototype.initUi = function () {
var _this = this;
var btnTxt = this.exchangeBtn.addChild(Tools_1.Tools.getText('30店铺积分', 36, '#ffffff', TEXT_ALIGN.CENTER, this.exchangeBtn.width, 0, -3));
var btnTxt = this.exchangeBtn.addChild(Tools_1.Tools.getText('10店铺积分', 36, '#ffffff', TEXT_ALIGN.CENTER, this.exchangeBtn.width, 0, -6));
btnTxt.textHeight = this.exchangeBtn.height;
btnTxt.verticalAlign = VERTICAL_ALIGN.MIDDLE;
btnTxt.bold = true;
......@@ -16938,6 +16955,54 @@ var NoEnergyPanel = (function (_super) {
exports.NoEnergyPanel = NoEnergyPanel;
/***/ }),
/***/ "./src/panels/NoPrizePanel.ts":
/*!************************************!*\
!*** ./src/panels/NoPrizePanel.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 Panel_1 = __webpack_require__(/*! ../../module/views/Panel */ "./module/views/Panel.ts");
var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts");
var NoPrizePanel = (function (_super) {
__extends(NoPrizePanel, _super);
function NoPrizePanel() {
return _super !== null && _super.apply(this, arguments) || this;
}
Object.defineProperty(NoPrizePanel.prototype, "groupNames", {
get: function () { return ["NoPrizePanel"]; },
enumerable: true,
configurable: true
});
NoPrizePanel.prototype.initUi = function () {
this.addChild(new FYGE.Sprite(RES_1.RES.getRes("noPrizeBg.png")));
this.addChild(new FYGE.Button(RES_1.RES.getRes("关闭按钮.png")))
.addEventListener(FYGE.MouseEvent.CLICK, this.hidePanel, this)
.position.set(633, 468);
this.addChild(new FYGE.Button(RES_1.RES.getRes("知道了.png")))
.addEventListener(FYGE.MouseEvent.CLICK, this.hidePanel, this)
.position.set(165, 759);
};
return NoPrizePanel;
}(Panel_1.Panel));
exports.NoPrizePanel = NoPrizePanel;
/***/ }),
/***/ "./src/panels/NoStepPanel.ts":
......@@ -17256,9 +17321,9 @@ var StartPanel = (function (_super) {
this.checkTex.textAlign = TEXT_ALIGN.CENTER;
this.checkTex.x = 0;
this.checkTex.text = "\u7B2C\t" + this.data.level + "\t\u5173";
this.startBtn.visible = (this.data.stars < 3);
this.startBtn2.visible = (this.data.stars >= 3);
this.tipsTex.visible = (this.data.stars < 3);
this.startBtn.visible = !this.data.isPlayed;
this.startBtn2.visible = this.data.isPlayed;
this.tipsTex.visible = !this.data.isPlayed;
this.addChild(new StartTarget(this.data.level))
.position.set(0, 682);
};
......@@ -17267,7 +17332,7 @@ var StartPanel = (function (_super) {
};
StartPanel.prototype.startGame = function () {
var _this = this;
if (this.data.stars < 3 && Tools_1.Tools.gameData.power <= 0) {
if (!this.data.isPlayed && Tools_1.Tools.gameData.power <= 0) {
ctrls_1.showPanel(NoEnergyPanel_1.NoEnergyPanel);
return;
}
......@@ -17276,8 +17341,8 @@ var StartPanel = (function (_super) {
return;
Tools_1.Tools.gameData.power = res.data.power;
ctrls_1.changeScene(PlayScene_1.PlayScene, { chapter: _this.data.level });
_this.hidePanel();
});
this.hidePanel();
};
StartPanel.prototype.initEvents = function () {
_super.prototype.initEvents.call(this);
......@@ -17412,8 +17477,8 @@ var StartPanelPrize = (function (_super) {
this.checkTex.textAlign = TEXT_ALIGN.CENTER;
this.checkTex.x = 0;
this.checkTex.text = "\u7B2C\t" + this.data.level + "\t\u5173";
this.startBtn.visible = (this.data.stars < 3);
this.startBtn2.visible = (this.data.stars >= 3);
this.startBtn.visible = !this.data.isPlayed;
this.startBtn2.visible = this.data.isPlayed;
this.addChild(new StartPanel_1.StartTarget(this.data.level))
.position.set(0, 682);
this.prizeImg.texture = Texture.fromUrl(Tools_1.Tools.baseInfo.levelPrize["level_" + this.data.level]);
......@@ -17425,7 +17490,7 @@ var StartPanelPrize = (function (_super) {
};
StartPanelPrize.prototype.startGame = function () {
var _this = this;
if (this.data.stars < 3 && Tools_1.Tools.gameData.power <= 0) {
if (!this.data.isPlayed && Tools_1.Tools.gameData.power <= 0) {
ctrls_1.showPanel(NoEnergyPanel_1.NoEnergyPanel);
return;
}
......@@ -17434,8 +17499,8 @@ var StartPanelPrize = (function (_super) {
return;
Tools_1.Tools.gameData.power = res.data.power;
ctrls_1.changeScene(PlayScene_1.PlayScene, { chapter: _this.data.level });
_this.hidePanel();
});
this.hidePanel();
};
StartPanelPrize.prototype.initEvents = function () {
_super.prototype.initEvents.call(this);
......@@ -17548,10 +17613,10 @@ var SuccessNoPrizePanel = (function (_super) {
if (curLevel_1 <= value && d >= 0 && d <= dLevel_1) {
upLevel_1 = value;
if (curLevel_1 == _this.data.level) {
dLevel_1 = d + 1;
dLevel_1 = d;
}
else {
dLevel_1 = d;
dLevel_1 = d + 1;
}
}
});
......@@ -17591,7 +17656,12 @@ var SuccessNoPrizePanel = (function (_super) {
_super.prototype.hidePanel.call(this);
};
SuccessNoPrizePanel.prototype.continue = function () {
if (this.data.level == 120) {
ctrls_1.changeScene(MapScene_1.MapScene);
}
else {
ctrls_1.changeScene(MapScene_1.MapScene, { level: this.data.level + 1 });
}
_super.prototype.hidePanel.call(this);
};
SuccessNoPrizePanel.prototype.hidePanel = function () {
......@@ -17745,6 +17815,7 @@ var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts");
var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts");
var MapScene_1 = __webpack_require__(/*! ../scene/map/MapScene */ "./src/scene/map/MapScene.ts");
var MouseEvent = FYGE.MouseEvent;
var LotteryScene_1 = __webpack_require__(/*! ../scene/LotteryScene */ "./src/scene/LotteryScene.ts");
var SuccessPrizePanel = (function (_super) {
__extends(SuccessPrizePanel, _super);
function SuccessPrizePanel() {
......@@ -17837,11 +17908,17 @@ var SuccessPrizePanel = (function (_super) {
_super.prototype.hidePanel.call(this);
};
SuccessPrizePanel.prototype.continue = function () {
console.log(1);
if (this.data.level == 120) {
ctrls_1.changeScene(MapScene_1.MapScene);
}
else {
ctrls_1.changeScene(MapScene_1.MapScene, { level: this.data.level + 1 });
}
_super.prototype.hidePanel.call(this);
};
SuccessPrizePanel.prototype.goPrize = function () {
ctrls_1.changeScene(LotteryScene_1.LotteryScene, { level: this.data.level });
this.hidePanel();
};
SuccessPrizePanel.prototype.hidePanel = function () {
ctrls_1.changeScene(MapScene_1.MapScene);
......@@ -18067,7 +18144,7 @@ var CusButton = (function (_super) {
}
if (this.type == TaskType.browseGoods || this.type == TaskType.member) {
Main_1.GDispatcher.once(G_EVENT_1.G_EVENT.ON_SHOW, function () {
Main_1.GDispatcher.dispatchEvent(G_EVENT_1.G_EVENT.ON_SHOW);
Main_1.GDispatcher.dispatchEvent(G_EVENT_1.G_EVENT.UPDATE_TASK);
}, this);
}
}
......@@ -18361,6 +18438,7 @@ var LoadingScene = (function (_super) {
if (!getIndexSuccesss)
return [2];
this.dispatchEvent(FYGE.Event.PROGRESS, 0.3);
Tools_1.Tools.globalData.openId = TaoBaoNet_1.getTbData(TaoBaoNet_1.TbNetName.getIndex).data.openId;
return [4, TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getActivityBaseInfoById)];
case 3:
baseInfo = _a.sent();
......@@ -18472,6 +18550,315 @@ var Title = (function (_super) {
}(FYGE.Container));
/***/ }),
/***/ "./src/scene/LotteryScene.ts":
/*!***********************************!*\
!*** ./src/scene/LotteryScene.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 __());
};
})();
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
return new (P || (P = Promise))(function (resolve, reject) {
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
function step(result) { result.done ? resolve(result.value) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
step((generator = generator.apply(thisArg, _arguments || [])).next());
});
};
var __generator = (this && this.__generator) || function (thisArg, body) {
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
function verb(n) { return function (v) { return step([n, v]); }; }
function step(op) {
if (f) throw new TypeError("Generator is already executing.");
while (_) try {
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
if (y = 0, t) op = [op[0] & 2, t.value];
switch (op[0]) {
case 0: case 1: t = op; break;
case 4: _.label++; return { value: op[1], done: false };
case 5: _.label++; y = op[1]; op = [0]; continue;
case 7: op = _.ops.pop(); _.trys.pop(); continue;
default:
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
if (t[2]) _.ops.pop();
_.trys.pop(); continue;
}
op = body.call(thisArg, _);
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
}
};
Object.defineProperty(exports, "__esModule", { value: true });
var Scene_1 = __webpack_require__(/*! ../../module/views/Scene */ "./module/views/Scene.ts");
var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts");
var layers_1 = __webpack_require__(/*! ../../module/views/layers */ "./module/views/layers.ts");
var Tools_1 = __webpack_require__(/*! ../Tools */ "./src/Tools.ts");
var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts");
var TaoBaoNet_1 = __webpack_require__(/*! ../TaoBaoNet */ "./src/TaoBaoNet.ts");
var GTool_1 = __webpack_require__(/*! ../../module/tools/GTool */ "./module/tools/GTool.ts");
var MapScene_1 = __webpack_require__(/*! ./map/MapScene */ "./src/scene/map/MapScene.ts");
var PrizePanel_1 = __webpack_require__(/*! ../panels/PrizePanel */ "./src/panels/PrizePanel.ts");
var NoPrizePanel_1 = __webpack_require__(/*! ../panels/NoPrizePanel */ "./src/panels/NoPrizePanel.ts");
var LotteryScene = (function (_super) {
__extends(LotteryScene, _super);
function LotteryScene() {
return _super !== null && _super.apply(this, arguments) || this;
}
Object.defineProperty(LotteryScene.prototype, "groupNames", {
get: function () { return ["lotteryScene"]; },
enumerable: true,
configurable: true
});
LotteryScene.prototype.initUi = function () {
var _this = this;
this.y = -layers_1.layers.stageOffsetY;
this.addChild(new FYGE.Sprite(RES_1.RES.getRes("lotteryMachineBg.jpg")));
var upLevel = 120;
var dLevel = 120;
Tools_1.Tools.baseInfo.prizeLevels.forEach(function (value, index) {
var d = value - _this.data.level;
if (_this.data.level <= value && d >= 0 && d <= dLevel) {
upLevel = value;
dLevel = d + 1;
}
});
this.addChild(Tools_1.Tools.getText(this.data.level + "关抽奖奖励", 53.19, "#ffffff", FYGE.TEXT_ALIGN.CENTER, 488, (750 - 488) / 2, 360)).bold = true;
this.addChild(Tools_1.Tools.getText("下一奖励关卡：" + upLevel + "关", 32.54, "#ffffff", FYGE.TEXT_ALIGN.CENTER, 488, (750 - 488) / 2, 420));
this.addChild(new FYGE.Button(RES_1.RES.getRes("lotteryBtn.png")))
.addEventListener(FYGE.MouseEvent.CLICK, this.lottery, this)
.position.set((750 - RES_1.RES.getRes("lotteryBtn.png").width) / 2, 797);
this.addChild(new FYGE.Button(RES_1.RES.getRes("lotteryReturnBtn.png")))
.addEventListener(FYGE.MouseEvent.CLICK, function () { ctrls_1.changeScene(MapScene_1.MapScene); }, this)
.position.set(0, 300);
this.updatePrizes();
};
LotteryScene.prototype.updatePrizes = function () {
return __awaiter(this, void 0, void 0, function () {
var prizeList, scroll, p;
return __generator(this, function (_a) {
switch (_a.label) {
case 0:
ctrls_1.showWaiting();
return [4, TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getPrizesByLevel, { level: this.data.level })];
case 1:
prizeList = (_a.sent()).data;
scroll = this.addChild(new FYGE.ScrollList(PrizeItem, 122, 140, 345, 152, false));
scroll.position.set(195, 1013);
scroll.updateData(prizeList || []);
p = [201, 620];
this.lotScroll = this.addChild(new LotteryScroll(prizeList));
this.lotScroll.position.set(p[0], p[1]);
return [2];
}
});
});
};
LotteryScene.prototype.lottery = function () {
var _this = this;
ctrls_1.showWaiting();
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.luckyDraw)
.then(function (res) {
ctrls_1.hideWaiting();
if (!res.success)
return;
var id;
if (res.data && res.data._id)
id = res.data._id;
_this.enableMouseEvt(false);
_this.lotScroll.lot(id, function () {
_this.enableMouseEvt(true);
ctrls_1.showPanel(id ? PrizePanel_1.PrizePanel : NoPrizePanel_1.NoPrizePanel, id ? res.data : null);
});
});
};
return LotteryScene;
}(Scene_1.Scene));
exports.LotteryScene = LotteryScene;
var PrizeItem = (function (_super) {
__extends(PrizeItem, _super);
function PrizeItem() {
var _this = _super.call(this) || this;
_this.addChild(new FYGE.Sprite(RES_1.RES.getRes("prizeItemBg.png")));
_this.prizeImage = _this.addChild(new FYGE.Sprite());
_this.prizeImage.width = _this.prizeImage.height = 101;
_this.prizeImage.position.set(4, 4);
_this.nameTxt = _this.addChild(Tools_1.Tools.getText("", 19.23, "#317f7f", FYGE.TEXT_ALIGN.CENTER, 109, 0, 112));
return _this;
}
PrizeItem.prototype.initData = function (id, data) {
if (id < 0 || !data)
return;
this.prizeImage.texture = FYGE.Texture.from(data.image);
this.nameTxt.text = data.name;
};
return PrizeItem;
}(FYGE.Container));
var LotteryItem = (function (_super) {
__extends(LotteryItem, _super);
function LotteryItem(data) {
var _this = _super.call(this) || this;
_this.id = data._id;
_this.addChild(new FYGE.Sprite(RES_1.RES.getRes("lotteryItemBg.png")));
_this.showImage = _this.addChild(new FYGE.Sprite(FYGE.Texture.from(data.image)));
_this.showImage.width = _this.showImage.height = 88;
_this.showImage.position.set((103 - 88) / 2, 6);
var mask = _this.addChild(new FYGE.Shape());
mask.beginFill(0);
mask.drawRoundedRect((103 - 88) / 2, 6, 88, 88, 10);
mask.endFill();
_this.showImage.mask = mask;
return _this;
}
LotteryItem.prototype.reset = function (data) {
this.showImage.texture = FYGE.Texture.from(data.image);
this.id = data._id;
};
return LotteryItem;
}(FYGE.Container));
var HEIGHT = 123;
var LotteryScrollItem = (function (_super) {
__extends(LotteryScrollItem, _super);
function LotteryScrollItem(datas) {
var _this = _super.call(this) || this;
datas.forEach(function (d) {
_this.addChild(new LotteryItem(d));
});
_this.cusP = 0;
_this.updatePosition();
_this.addEventListener(FYGE.Event.ENTER_FRAME, _this.updatePosition, _this);
return _this;
}
Object.defineProperty(LotteryScrollItem.prototype, "currentIndex", {
get: function () {
var a = 1 - this.cusP;
var l = this.children.length;
return a < 0 ? a % l + l : a % l;
},
enumerable: true,
configurable: true
});
;
LotteryScrollItem.prototype.scrollTo = function (id, callback) {
var child, curIndex;
for (var i = 0; i < this.children.length; i++) {
if (this.children[i].id == id) {
child = this.children[i];
curIndex = i;
break;
}
}
var delta = this.currentIndex - curIndex;
if (delta < 0)
delta += this.children.length;
var cusP = this.cusP + delta + 10 * this.children.length;
FYGE.Tween.get(this)
.to({ cusP: cusP }, 5000, FYGE.Ease.quadInOut)
.call(function () {
callback && callback();
});
};
LotteryScrollItem.prototype.reset = function () {
};
LotteryScrollItem.prototype.updatePosition = function () {
var _this = this;
this.children.forEach(function (c, j) {
c.y = ((_this.cusP + j) % _this.children.length) * HEIGHT - HEIGHT;
if (c.y > HEIGHT * 1.5) {
c.y = c.y - _this.children.length * HEIGHT;
}
});
};
LotteryScrollItem.prototype.destroy = function () {
FYGE.Tween.removeTweens(this);
_super.prototype.destroy.call(this);
};
return LotteryScrollItem;
}(FYGE.Container));
var LotteryScroll = (function (_super) {
__extends(LotteryScroll, _super);
function LotteryScroll(datas) {
var _this = _super.call(this) || this;
_this.scrollItems = [];
for (var i = 0; i < 3; i++) {
var s = _this.addChild(new LotteryScrollItem(GTool_1.GTool.disturbArr(datas.slice())));
s.position.set(116 * i, 0);
_this.scrollItems.push(s);
}
_this.ids = [];
datas.forEach(function (d) { _this.ids.push(d._id); });
var h = -50;
var mask = _this.addChild(new FYGE.Shape());
mask.beginFill(0);
mask.drawRect(0, h + 3, 350, 195 - 5);
mask.endFill();
_this.mask = mask;
_this.addChild(new FYGE.Sprite(RES_1.RES.getRes("shadowMask.png")))
.position.set(0, h);
return _this;
}
LotteryScroll.prototype.lot = function (id, callback) {
var _this = this;
if (id) {
if (this.ids.indexOf(id) == -1) {
console.error("中奖id不存在");
return;
}
var count_1 = 0;
var countAll_1 = this.scrollItems.length;
this.scrollItems.forEach(function (c, i) {
ctrls_1.wait(function () {
c.scrollTo(id, function () {
if (++count_1 == countAll_1 && callback)
callback();
});
}, 400 * i);
});
}
else {
var ids = [
GTool_1.GTool.randomT(this.ids),
GTool_1.GTool.randomT(this.ids),
];
ids[0] === ids[1] ? ids.push(GTool_1.GTool.randomT((function () {
var arr = _this.ids.slice();
arr.splice(_this.ids.indexOf(ids[0]), 1);
return arr;
})())) : ids.push(GTool_1.GTool.randomT(this.ids));
console.log(ids);
var count_2 = 0;
var countAll_2 = this.scrollItems.length;
this.scrollItems.forEach(function (c, i) {
ctrls_1.wait(function () {
c.scrollTo(ids[i], function () {
if (++count_2 == countAll_2 && callback)
callback();
});
}, 400 * i);
});
}
};
return LotteryScroll;
}(FYGE.Container));
/***/ }),
/***/ "./src/scene/PlayScene.ts":
......@@ -21374,7 +21761,6 @@ var MapScene = (function (_super) {
_super.prototype.initUi.call(this);
this.scrollPage = this.addChild(new ScrollPage(750, layers_1.layers.stageHeight, 888, true, true));
this.mapContainer = this.scrollPage.view.addChild(new Container());
this.uiLayer = this.addChild(new MapUI_1.default());
this.initMap();
this.updateMapCheck();
if (Tools_1.Tools.gameData.loginAddPower && !Tools_1.Tools.gameData.isFristLogin) {
......@@ -21384,12 +21770,14 @@ var MapScene = (function (_super) {
var openPrize = GTool_1.GTool.readCache('openPrize');
if (Tools_1.Tools.gameData.topAward && Tools_1.Tools.gameData.topAward._id && openPrize !== 'true') {
GTool_1.GTool.writeCache('openPrize', 'true');
ctrls_1.showPanel(PrizePanel_1.PrizePanel, Tools_1.Tools.gameData.topAward);
ctrls_1.showPanel(PrizePanel_1.PrizePanel, JSON.parse(JSON.stringify(Tools_1.Tools.gameData.topAward)));
Tools_1.Tools.gameData.topAward = null;
}
};
MapScene.prototype.updateMapCheck = function () {
var _this = this;
if (this.data && this.data.from == 'loading') {
this.uiLayer = this.addChild(new MapUI_1.default());
this.initMapByData(Tools_1.Tools.gameData);
if (Tools_1.Tools.gameData.isFristLogin) {
this.initGuide();
......@@ -21398,6 +21786,7 @@ var MapScene = (function (_super) {
else {
Tools_1.Tools.getGameInfo().then(function (success) {
if (success) {
_this.uiLayer = _this.addChild(new MapUI_1.default());
_this.initMapByData(Tools_1.Tools.gameData);
}
});
......@@ -21683,6 +22072,7 @@ var BuyPowerPanel_1 = __webpack_require__(/*! ../../panels/BuyPowerPanel */ "./s
var TaskPanel_1 = __webpack_require__(/*! ../../panels/TaskPanel */ "./src/panels/TaskPanel.ts");
var TaoBaoNet_1 = __webpack_require__(/*! ../../TaoBaoNet */ "./src/TaoBaoNet.ts");
var Texture = FYGE.Texture;
var LotteryScene_1 = __webpack_require__(/*! ../LotteryScene */ "./src/scene/LotteryScene.ts");
var MapUI = (function (_super) {
__extends(MapUI, _super);
function MapUI() {
......@@ -21831,10 +22221,7 @@ var CreditsBox = (function (_super) {
case 1:
creditsData = _a.sent();
jfLabel = '积分:0';
if (!creditsData || !creditsData.data) {
jfLabel = '积分:0';
}
else {
if (creditsData.success && creditsData.data && creditsData.data.credits) {
jfLabel = "\u79EF\u5206:" + creditsData.data.credits;
}
this.countLabel.text = jfLabel;
......@@ -21857,6 +22244,7 @@ var PrizeBox = (function (_super) {
return _this;
}
PrizeBox.prototype.initUi = function (data) {
var _this = this;
this.position.set(558, 269);
this.checkTip = this.addChild(Tools_1.Tools.getText('再闯XXX关', 22, '#ffffff', TEXT_ALIGN.CENTER, 158, 0, 64));
this.tip = this.addChild(Tools_1.Tools.getText('参与红包抽奖\n赢XXX优惠券', 17, '#ec5a5a', TEXT_ALIGN.CENTER, 158, 0, 112));
......@@ -21880,11 +22268,18 @@ var PrizeBox = (function (_super) {
this.checkTip.text = "\u518D\u95EF" + dLevel_1 + "\u5173";
this.tip.text = '';
this.prizeImg.texture = Texture.fromUrl(Tools_1.Tools.baseInfo.levelPrize["level_" + upLevel_1]);
this.prizeImg.y -= 20;
this.addEventListener(FYGE.MouseEvent.CLICK, function () {
ctrls_1.showToast(_this.checkTip.text + "才可以抽奖哦");
}, this);
}
else if (prizes.length == 1 && +prizes[0].level == 120) {
this.checkTip.text = "\u7B49\u5F85\u5F00\u5956";
this.tip.text = "8\u670828\u65E510\u70B9\n\u5F00\u542F\u5927\u5956";
this.prizeImg.texture = Texture.fromUrl(Tools_1.Tools.baseInfo.levelPrize['level_120']);
this.addEventListener(FYGE.MouseEvent.CLICK, function () {
ctrls_1.showToast(_this.tip.text);
}, this);
}
else {
var lowerLevel_1 = 120;
......@@ -21897,6 +22292,9 @@ var PrizeBox = (function (_super) {
this.tip.text = "\u62BD\u53D6" + lowerLevel_1 + "\u5173\u5956\u52B1";
this.tip.y += 10;
this.prizeImg.texture = Texture.fromUrl(Tools_1.Tools.baseInfo.levelPrize["level_" + lowerLevel_1]);
this.addEventListener(FYGE.MouseEvent.CLICK, function () {
ctrls_1.changeScene(LotteryScene_1.LotteryScene, { level: lowerLevel_1 });
}, this);
}
};
PrizeBox.prototype.initEvent = function () {
......@@ -33734,7 +34132,7 @@ var PropGuide = (function (_super) {
text.fillColor = "#ffffff";
text.size = 20;
text.x = (750 - 500) / 2;
text.y = offsetY - 92;
text.y = offsetY - 30;
text.textAlign = FYGE.TEXT_ALIGN.CENTER;
text.textWidth = 500;
_this.addChild(text);
......@@ -33770,7 +34168,7 @@ var PropGuide = (function (_super) {
this.bg.moveTo(BonusShootAni_1.stepPosition[0] + 50, BonusShootAni_1.stepPosition[1]);
this.bg.drawCircle(BonusShootAni_1.stepPosition[0], BonusShootAni_1.stepPosition[1], 50, false);
this.bg.endFill();
this.msgTxt.text = "点击左上方步数，可为闯关时增加额外5次步数";
this.msgTxt.text = "点击上方步数，可为闯关时增加额外5次步数";
}
};
PropGuide.prototype.setRect = function () {
output.js.map
View file @ dcc7f8af
This source diff could not be displayed because it is too large. You can view the blob instead.
record.txt
View file @ dcc7f8af
......@@ -19,4 +19,6 @@ RES修改成与FYGE独立的贴图缓存，否则FYGE多页面应该会有同名
多page上的canvas，destroy最好别执行removeAllTweens，
多page上的canvas，对于相同资源是否考虑，还有公用弹框，（还是不考虑吧，多page只在活动相互独立的情况下使用）
\ No newline at end of file
多page上的canvas，对于相同资源是否考虑，还有公用弹框（可以考虑用dom的component），
（多page最好只在活动相互独立的情况下使用）
\ No newline at end of file
resource/res.json
View file @ dcc7f8af
{
"groups": [
{
"keys": "amazing.png,great.png,img_0.png,img_1.png,img_10.png,img_11.png,img_12.png,img_13.png,img_14.png,img_15.png,img_16.png,img_17.png,img_18.png,img_19.png,img_2.png,img_3.png,img_4.png,img_5.png,img_6.png,img_7.png,img_8.png,img_9.png,wonderful.png",
"name": "bonusTime"
},
{
"keys": "增加体力背景.png,无字按钮底.png",
"name": "BuyPowerPanel"
},
{
"keys": "boomBtn.png,comCloseBtn.png,comm_light.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,hammerBtn.png,star.png,stepBtn.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,开始闯关不要能量.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common"
},
{
"keys": "积分不足背景.png,赚取积分.png",
"name": "CreditsOutPanel"
......@@ -16,6 +24,14 @@
"keys": "失败Bg.png,失败重新闯关.png",
"name": "FailedPanel"
},
{
"keys": "fesEleSmallDis1.png,fesEleSmallDis10.png,fesEleSmallDis2.png,fesEleSmallDis3.png,fesEleSmallDis4.png,fesEleSmallDis5.png,fesEleSmallDis6.png,fesEleSmallDis7.png,fesEleSmallDis8.png,fesEleSmallDis9.png,fesRedBigLight.png,fesRedBombSta1.png,fesRedCap.png,fesRedDown.png,fesRedSmallLight.png,fesRedUp.png,festivalTargetBg.png,lineLight1.png,lineLight10.png,lineLight11.png,lineLight12.png,lineLight13.png,lineLight2.png,lineLight3.png,lineLight4.png,lineLight5.png,lineLight6.png,lineLight7.png,lineLight8.png,lineLight9.png,xingxingbi.png",
"name": "festival"
},
{
"keys": "dis_ele0_0.png,dis_ele0_1.png,dis_ele0_10.png,dis_ele0_11.png,dis_ele0_12.png,dis_ele0_13.png,dis_ele0_14.png,dis_ele0_2.png,dis_ele0_3.png,dis_ele0_4.png,dis_ele0_5.png,dis_ele0_6.png,dis_ele0_7.png,dis_ele0_8.png,dis_ele0_9.png,dis_ele1_0.png,dis_ele1_1.png,dis_ele1_10.png,dis_ele1_11.png,dis_ele1_12.png,dis_ele1_13.png,dis_ele1_14.png,dis_ele1_2.png,dis_ele1_3.png,dis_ele1_4.png,dis_ele1_5.png,dis_ele1_6.png,dis_ele1_7.png,dis_ele1_8.png,dis_ele1_9.png,dis_ele2_0.png,dis_ele2_1.png,dis_ele2_10.png,dis_ele2_11.png,dis_ele2_12.png,dis_ele2_13.png,dis_ele2_14.png,dis_ele2_2.png,dis_ele2_3.png,dis_ele2_4.png,dis_ele2_5.png,dis_ele2_6.png,dis_ele2_7.png,dis_ele2_8.png,dis_ele2_9.png,dis_ele3_.png,dis_ele3_0.png,dis_ele3_1.png,dis_ele3_10.png,dis_ele3_11.png,dis_ele3_12.png,dis_ele3_13.png,dis_ele3_14.png,dis_ele3_2.png,dis_ele3_3.png,dis_ele3_4.png,dis_ele3_6.png,dis_ele3_7.png,dis_ele3_8.png,dis_ele3_9.png,dis_ele4_0.png,dis_ele4_1.png,dis_ele4_10.png,dis_ele4_11.png,dis_ele4_12.png,dis_ele4_13.png,dis_ele4_14.png,dis_ele4_2.png,dis_ele4_3.png,dis_ele4_4.png,dis_ele4_5.png,dis_ele4_6.png,dis_ele4_7.png,dis_ele4_8.png,dis_ele4_9.png,hor_ele0_0.png,hor_ele0_1.png,hor_ele0_10.png,hor_ele0_11.png,hor_ele0_12.png,hor_ele0_13.png,hor_ele0_14.png,hor_ele0_15.png,hor_ele0_2.png,hor_ele0_3.png,hor_ele0_4.png,hor_ele0_5.png,hor_ele0_6.png,hor_ele0_7.png,hor_ele0_8.png,hor_ele0_9.png,hor_ele1_0.png,hor_ele1_1.png,hor_ele1_10.png,hor_ele1_11.png,hor_ele1_12.png,hor_ele1_13.png,hor_ele1_14.png,hor_ele1_15.png,hor_ele1_2.png,hor_ele1_3.png,hor_ele1_4.png,hor_ele1_5.png,hor_ele1_6.png,hor_ele1_7.png,hor_ele1_8.png,hor_ele1_9.png,hor_ele2_0.png,hor_ele2_1.png,hor_ele2_10.png,hor_ele2_11.png,hor_ele2_12.png,hor_ele2_13.png,hor_ele2_14.png,hor_ele2_15.png,hor_ele2_2.png,hor_ele2_3.png,hor_ele2_4.png,hor_ele2_5.png,hor_ele2_6.png,hor_ele2_7.png,hor_ele2_8.png,hor_ele2_9.png,hor_ele3_0.png,hor_ele3_1.png,hor_ele3_10.png,hor_ele3_11.png,hor_ele3_12.png,hor_ele3_13.png,hor_ele3_14.png,hor_ele3_15.png,hor_ele3_2.png,hor_ele3_3.png,hor_ele3_4.png,hor_ele3_5.png,hor_ele3_6.png,hor_ele3_7.png,hor_ele3_8.png,hor_ele3_9.png,hor_ele4_0.png,hor_ele4_1.png,hor_ele4_10.png,hor_ele4_11.png,hor_ele4_12.png,hor_ele4_13.png,hor_ele4_14.png,hor_ele4_15.png,hor_ele4_2.png,hor_ele4_3.png,hor_ele4_4.png,hor_ele4_5.png,hor_ele4_6.png,hor_ele4_7.png,hor_ele4_8.png,hor_ele4_9.png,ver_ele0_0.png,ver_ele0_1.png,ver_ele0_10.png,ver_ele0_11.png,ver_ele0_12.png,ver_ele0_13.png,ver_ele0_14.png,ver_ele0_15.png,ver_ele0_2.png,ver_ele0_3.png,ver_ele0_4.png,ver_ele0_5.png,ver_ele0_6.png,ver_ele0_7.png,ver_ele0_8.png,ver_ele0_9.png,ver_ele1_0.png,ver_ele1_1.png,ver_ele1_10.png,ver_ele1_11.png,ver_ele1_12.png,ver_ele1_13.png,ver_ele1_14.png,ver_ele1_15.png,ver_ele1_2.png,ver_ele1_3.png,ver_ele1_4.png,ver_ele1_5.png,ver_ele1_6.png,ver_ele1_7.png,ver_ele1_8.png,ver_ele1_9.png,ver_ele2_0.png,ver_ele2_1.png,ver_ele2_10.png,ver_ele2_11.png,ver_ele2_12.png,ver_ele2_13.png,ver_ele2_14.png,ver_ele2_15.png,ver_ele2_2.png,ver_ele2_3.png,ver_ele2_4.png,ver_ele2_5.png,ver_ele2_6.png,ver_ele2_7.png,ver_ele2_8.png,ver_ele2_9.png,ver_ele3_0.png,ver_ele3_1.png,ver_ele3_10.png,ver_ele3_11.png,ver_ele3_12.png,ver_ele3_13.png,ver_ele3_14.png,ver_ele3_15.png,ver_ele3_2.png,ver_ele3_3.png,ver_ele3_4.png,ver_ele3_5.png,ver_ele3_6.png,ver_ele3_7.png,ver_ele3_8.png,ver_ele3_9.png,ver_ele4_0.png,ver_ele4_1.png,ver_ele4_10.png,ver_ele4_11.png,ver_ele4_12.png,ver_ele4_13.png,ver_ele4_14.png,ver_ele4_15.png,ver_ele4_2.png,ver_ele4_3.png,ver_ele4_4.png,ver_ele4_5.png,ver_ele4_6.png,ver_ele4_7.png,ver_ele4_8.png,ver_ele4_9.png",
"name": "fiveVerHorDis"
},
{
"keys": "圆圈.png,开心收下.png",
"name": "FreePowerPanel"
......@@ -24,6 +40,34 @@
"keys": "joinBg.png,joinBtn.png",
"name": "JoinPanel"
},
{
"keys": "carb_arm.png,carb_body.png,carb_hand_l.png,carb_hand_r.png,fox_arm_l.png,fox_body.png,fox_head.png,fox_tail0.png,fox_tail1.png,fox_tail10.png,fox_tail11.png,fox_tail12.png,fox_tail13.png,fox_tail14.png,fox_tail2.png,fox_tail3.png,fox_tail4.png,fox_tail5.png,fox_tail6.png,fox_tail7.png,fox_tail8.png,fox_tail9.png,hommer.png,img_line1.png,img_line2.png,img_line3.png,img_line4.png,img_line5.png,img_owl.png,img_tree.png,lighting_1.png,lighting_2.png,loadingBg.jpg,loadingBg2.png,loadingPro0.png,loadingPro1.png,loadingPro10.png,loadingPro11.png,loadingPro2.png,loadingPro3.png,loadingPro4.png,loadingPro5.png,loadingPro6.png,loadingPro7.png,loadingPro8.png,loadingPro9.png,loadingTitle.png,owl_sleep.png,proDown.png,wheel.png",
"name": "loadingScene"
},
{
"keys": "lotteryBtn.png,lotteryItemBg.png,lotteryMachineBg.jpg,lotteryReturnBtn.png,prizeItemBg.png,shadowMask.png",
"name": "lotteryScene"
},
{
"keys": "cur_light_1.png,cur_light_2.png,guide_fox.png,guide_hand.png,guide_light.png,guide_tip.png,map_avatar_bg.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_disable.png,map_check_disable_prize.png,map_check_enable.png,map_check_enable_cur.png,map_creditsBg.png,map_energyAdd.png,map_energyBg.png,map_prizeBox.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png,map_推车.png,map_狐狸气球.png,water1.png,water2.png",
"name": "map"
},
{
"keys": "prize_check_0.png,prize_check_1.png,prize_check_10.png,prize_check_11.png,prize_check_12.png,prize_check_13.png,prize_check_14.png,prize_check_15.png,prize_check_16.png,prize_check_2.png,prize_check_3.png,prize_check_4.png,prize_check_5.png,prize_check_6.png,prize_check_7.png,prize_check_8.png,prize_check_9.png",
"name": "mapCheckPrizeEffect"
},
{
"keys": "map_crab_0.png,map_crab_1.png,map_crab_10.png,map_crab_11.png,map_crab_12.png,map_crab_13.png,map_crab_14.png,map_crab_15.png,map_crab_16.png,map_crab_17.png,map_crab_18.png,map_crab_19.png,map_crab_2.png,map_crab_20.png,map_crab_21.png,map_crab_22.png,map_crab_23.png,map_crab_24.png,map_crab_25.png,map_crab_26.png,map_crab_27.png,map_crab_28.png,map_crab_29.png,map_crab_3.png,map_crab_30.png,map_crab_4.png,map_crab_5.png,map_crab_6.png,map_crab_7.png,map_crab_8.png,map_crab_9.png",
"name": "mapCrabEffect"
},
{
"keys": "map_owl_0.png,map_owl_1.png,map_owl_10.png,map_owl_11.png,map_owl_12.png,map_owl_13.png,map_owl_14.png,map_owl_15.png,map_owl_2.png,map_owl_3.png,map_owl_4.png,map_owl_5.png,map_owl_6.png,map_owl_7.png,map_owl_8.png,map_owl_9.png",
"name": "mapOwlEffect"
},
{
"keys": "map_whale_0.png,map_whale_1.png,map_whale_10.png,map_whale_11.png,map_whale_12.png,map_whale_2.png,map_whale_3.png,map_whale_4.png,map_whale_5.png,map_whale_6.png,map_whale_7.png,map_whale_8.png,map_whale_9.png",
"name": "mapWhaleEffect"
},
{
"keys": "体力不足Bg.png,体力不足按钮.png",
"name": "NoEnergyPanel"
......@@ -36,6 +80,10 @@
"keys": "步数耗尽Bg.png,步数耗尽复活.png,步数耗尽结束按钮.png",
"name": "NoStepPanel"
},
{
"keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum关.png,scoreNum冒号.png,scoreNum分.png,scoreNum数.png,scoreNum通.png,settingBg.png,settingBtn.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene"
},
{
"keys": "prizePanel.png,prizePanelBtn.png",
"name": "PrizePanel"
......@@ -44,6 +92,10 @@
"keys": "活动规则背景.png",
"name": "RulePanel"
},
{
"keys": "star_light_0.png,star_light_1.png,star_light_10.png,star_light_11.png,star_light_12.png,star_light_13.png,star_light_14.png,star_light_15.png,star_light_2.png,star_light_3.png,star_light_4.png,star_light_5.png,star_light_6.png,star_light_7.png,star_light_8.png,star_light_9.png",
"name": "starLight"
},
{
"keys": "开始闯关Bg.png",
"name": "StartPanel"
......@@ -67,58 +119,6 @@
{
"keys": "使用道具背景.png",
"name": "UseToolPanel"
},
{
"keys": "amazing.png,great.png,img_0.png,img_1.png,img_10.png,img_11.png,img_12.png,img_13.png,img_14.png,img_15.png,img_16.png,img_17.png,img_18.png,img_19.png,img_2.png,img_3.png,img_4.png,img_5.png,img_6.png,img_7.png,img_8.png,img_9.png,wonderful.png",
"name": "bonusTime"
},
{
"keys": "boomBtn.png,comCloseBtn.png,comm_light.png,ele0.png,ele1.png,ele10.png,ele11.png,ele12.png,ele13.png,ele14.png,ele2.png,ele3.png,ele4.png,ele5.png,ele6.png,ele7.png,ele8.png,ele9.png,hammerBtn.png,star.png,stepBtn.png,toastBg.png,waitingBg.png,waitingRot.png,关闭按钮.png,再想想.png,开始闯关不要能量.png,开始闯关要能量.png,确定.png,继续闯关大.png,继续闯关小.png",
"name": "common"
},
{
"keys": "fesEleSmallDis1.png,fesEleSmallDis10.png,fesEleSmallDis2.png,fesEleSmallDis3.png,fesEleSmallDis4.png,fesEleSmallDis5.png,fesEleSmallDis6.png,fesEleSmallDis7.png,fesEleSmallDis8.png,fesEleSmallDis9.png,fesRedBigLight.png,fesRedBombSta1.png,fesRedCap.png,fesRedDown.png,fesRedSmallLight.png,fesRedUp.png,festivalTargetBg.png,lineLight1.png,lineLight10.png,lineLight11.png,lineLight12.png,lineLight13.png,lineLight2.png,lineLight3.png,lineLight4.png,lineLight5.png,lineLight6.png,lineLight7.png,lineLight8.png,lineLight9.png,xingxingbi.png",
"name": "festival"
},
{
"keys": "dis_ele0_0.png,dis_ele0_1.png,dis_ele0_10.png,dis_ele0_11.png,dis_ele0_12.png,dis_ele0_13.png,dis_ele0_14.png,dis_ele0_2.png,dis_ele0_3.png,dis_ele0_4.png,dis_ele0_5.png,dis_ele0_6.png,dis_ele0_7.png,dis_ele0_8.png,dis_ele0_9.png,dis_ele1_0.png,dis_ele1_1.png,dis_ele1_10.png,dis_ele1_11.png,dis_ele1_12.png,dis_ele1_13.png,dis_ele1_14.png,dis_ele1_2.png,dis_ele1_3.png,dis_ele1_4.png,dis_ele1_5.png,dis_ele1_6.png,dis_ele1_7.png,dis_ele1_8.png,dis_ele1_9.png,dis_ele2_0.png,dis_ele2_1.png,dis_ele2_10.png,dis_ele2_11.png,dis_ele2_12.png,dis_ele2_13.png,dis_ele2_14.png,dis_ele2_2.png,dis_ele2_3.png,dis_ele2_4.png,dis_ele2_5.png,dis_ele2_6.png,dis_ele2_7.png,dis_ele2_8.png,dis_ele2_9.png,dis_ele3_.png,dis_ele3_0.png,dis_ele3_1.png,dis_ele3_10.png,dis_ele3_11.png,dis_ele3_12.png,dis_ele3_13.png,dis_ele3_14.png,dis_ele3_2.png,dis_ele3_3.png,dis_ele3_4.png,dis_ele3_6.png,dis_ele3_7.png,dis_ele3_8.png,dis_ele3_9.png,dis_ele4_0.png,dis_ele4_1.png,dis_ele4_10.png,dis_ele4_11.png,dis_ele4_12.png,dis_ele4_13.png,dis_ele4_14.png,dis_ele4_2.png,dis_ele4_3.png,dis_ele4_4.png,dis_ele4_5.png,dis_ele4_6.png,dis_ele4_7.png,dis_ele4_8.png,dis_ele4_9.png,hor_ele0_0.png,hor_ele0_1.png,hor_ele0_10.png,hor_ele0_11.png,hor_ele0_12.png,hor_ele0_13.png,hor_ele0_14.png,hor_ele0_15.png,hor_ele0_2.png,hor_ele0_3.png,hor_ele0_4.png,hor_ele0_5.png,hor_ele0_6.png,hor_ele0_7.png,hor_ele0_8.png,hor_ele0_9.png,hor_ele1_0.png,hor_ele1_1.png,hor_ele1_10.png,hor_ele1_11.png,hor_ele1_12.png,hor_ele1_13.png,hor_ele1_14.png,hor_ele1_15.png,hor_ele1_2.png,hor_ele1_3.png,hor_ele1_4.png,hor_ele1_5.png,hor_ele1_6.png,hor_ele1_7.png,hor_ele1_8.png,hor_ele1_9.png,hor_ele2_0.png,hor_ele2_1.png,hor_ele2_10.png,hor_ele2_11.png,hor_ele2_12.png,hor_ele2_13.png,hor_ele2_14.png,hor_ele2_15.png,hor_ele2_2.png,hor_ele2_3.png,hor_ele2_4.png,hor_ele2_5.png,hor_ele2_6.png,hor_ele2_7.png,hor_ele2_8.png,hor_ele2_9.png,hor_ele3_0.png,hor_ele3_1.png,hor_ele3_10.png,hor_ele3_11.png,hor_ele3_12.png,hor_ele3_13.png,hor_ele3_14.png,hor_ele3_15.png,hor_ele3_2.png,hor_ele3_3.png,hor_ele3_4.png,hor_ele3_5.png,hor_ele3_6.png,hor_ele3_7.png,hor_ele3_8.png,hor_ele3_9.png,hor_ele4_0.png,hor_ele4_1.png,hor_ele4_10.png,hor_ele4_11.png,hor_ele4_12.png,hor_ele4_13.png,hor_ele4_14.png,hor_ele4_15.png,hor_ele4_2.png,hor_ele4_3.png,hor_ele4_4.png,hor_ele4_5.png,hor_ele4_6.png,hor_ele4_7.png,hor_ele4_8.png,hor_ele4_9.png,ver_ele0_0.png,ver_ele0_1.png,ver_ele0_10.png,ver_ele0_11.png,ver_ele0_12.png,ver_ele0_13.png,ver_ele0_14.png,ver_ele0_15.png,ver_ele0_2.png,ver_ele0_3.png,ver_ele0_4.png,ver_ele0_5.png,ver_ele0_6.png,ver_ele0_7.png,ver_ele0_8.png,ver_ele0_9.png,ver_ele1_0.png,ver_ele1_1.png,ver_ele1_10.png,ver_ele1_11.png,ver_ele1_12.png,ver_ele1_13.png,ver_ele1_14.png,ver_ele1_15.png,ver_ele1_2.png,ver_ele1_3.png,ver_ele1_4.png,ver_ele1_5.png,ver_ele1_6.png,ver_ele1_7.png,ver_ele1_8.png,ver_ele1_9.png,ver_ele2_0.png,ver_ele2_1.png,ver_ele2_10.png,ver_ele2_11.png,ver_ele2_12.png,ver_ele2_13.png,ver_ele2_14.png,ver_ele2_15.png,ver_ele2_2.png,ver_ele2_3.png,ver_ele2_4.png,ver_ele2_5.png,ver_ele2_6.png,ver_ele2_7.png,ver_ele2_8.png,ver_ele2_9.png,ver_ele3_0.png,ver_ele3_1.png,ver_ele3_10.png,ver_ele3_11.png,ver_ele3_12.png,ver_ele3_13.png,ver_ele3_14.png,ver_ele3_15.png,ver_ele3_2.png,ver_ele3_3.png,ver_ele3_4.png,ver_ele3_5.png,ver_ele3_6.png,ver_ele3_7.png,ver_ele3_8.png,ver_ele3_9.png,ver_ele4_0.png,ver_ele4_1.png,ver_ele4_10.png,ver_ele4_11.png,ver_ele4_12.png,ver_ele4_13.png,ver_ele4_14.png,ver_ele4_15.png,ver_ele4_2.png,ver_ele4_3.png,ver_ele4_4.png,ver_ele4_5.png,ver_ele4_6.png,ver_ele4_7.png,ver_ele4_8.png,ver_ele4_9.png",
"name": "fiveVerHorDis"
},
{
"keys": "carb_arm.png,carb_body.png,carb_hand_l.png,carb_hand_r.png,fox_arm_l.png,fox_body.png,fox_head.png,fox_tail0.png,fox_tail1.png,fox_tail10.png,fox_tail11.png,fox_tail12.png,fox_tail13.png,fox_tail14.png,fox_tail2.png,fox_tail3.png,fox_tail4.png,fox_tail5.png,fox_tail6.png,fox_tail7.png,fox_tail8.png,fox_tail9.png,hommer.png,img_line1.png,img_line2.png,img_line3.png,img_line4.png,img_line5.png,img_owl.png,img_tree.png,lighting_1.png,lighting_2.png,loadingBg.jpg,loadingBg2.png,loadingPro0.png,loadingPro1.png,loadingPro10.png,loadingPro11.png,loadingPro2.png,loadingPro3.png,loadingPro4.png,loadingPro5.png,loadingPro6.png,loadingPro7.png,loadingPro8.png,loadingPro9.png,loadingTitle.png,owl_sleep.png,proDown.png,wheel.png",
"name": "loadingScene"
},
{
"keys": "lotteryBtn.png,lotteryItemBg.png,lotteryMachineBg.jpg,prizeItemBg.png,shadowMask.png",
"name": "lotteryScene"
},
{
"keys": "cur_light_1.png,cur_light_2.png,guide_fox.png,guide_hand.png,guide_light.png,guide_tip.png,map_avatar_bg.png,map_bg1.jpg,map_bg2.jpg,map_bg3.jpg,map_check_disable.png,map_check_disable_prize.png,map_check_enable.png,map_check_enable_cur.png,map_creditsBg.png,map_energyAdd.png,map_energyBg.png,map_prizeBox.png,map_prizeBtn.png,map_ruleBtn.png,map_star_disable.png,map_star_enable.png,map_taskBtn.png,map_推车.png,map_狐狸气球.png,water1.png,water2.png",
"name": "map"
},
{
"keys": "prize_check_0.png,prize_check_1.png,prize_check_10.png,prize_check_11.png,prize_check_12.png,prize_check_13.png,prize_check_14.png,prize_check_15.png,prize_check_16.png,prize_check_2.png,prize_check_3.png,prize_check_4.png,prize_check_5.png,prize_check_6.png,prize_check_7.png,prize_check_8.png,prize_check_9.png",
"name": "mapCheckPrizeEffect"
},
{
"keys": "map_crab_0.png,map_crab_1.png,map_crab_10.png,map_crab_11.png,map_crab_12.png,map_crab_13.png,map_crab_14.png,map_crab_15.png,map_crab_16.png,map_crab_17.png,map_crab_18.png,map_crab_19.png,map_crab_2.png,map_crab_20.png,map_crab_21.png,map_crab_22.png,map_crab_23.png,map_crab_24.png,map_crab_25.png,map_crab_26.png,map_crab_27.png,map_crab_28.png,map_crab_29.png,map_crab_3.png,map_crab_30.png,map_crab_4.png,map_crab_5.png,map_crab_6.png,map_crab_7.png,map_crab_8.png,map_crab_9.png",
"name": "mapCrabEffect"
},
{
"keys": "map_owl_0.png,map_owl_1.png,map_owl_10.png,map_owl_11.png,map_owl_12.png,map_owl_13.png,map_owl_14.png,map_owl_15.png,map_owl_2.png,map_owl_3.png,map_owl_4.png,map_owl_5.png,map_owl_6.png,map_owl_7.png,map_owl_8.png,map_owl_9.png",
"name": "mapOwlEffect"
},
{
"keys": "map_whale_0.png,map_whale_1.png,map_whale_10.png,map_whale_11.png,map_whale_12.png,map_whale_2.png,map_whale_3.png,map_whale_4.png,map_whale_5.png,map_whale_6.png,map_whale_7.png,map_whale_8.png,map_whale_9.png",
"name": "mapWhaleEffect"
},
{
"keys": "blueDoorBg.png,bonusFra0.png,bonusFra1.png,bonusFra10.png,bonusFra11.png,bonusFra2.png,bonusFra3.png,bonusFra4.png,bonusFra5.png,bonusFra6.png,bonusFra7.png,bonusFra8.png,bonusFra9.png,bonusShoot.png,boom0.png,boom1.png,boom10.png,boom11.png,boom12.png,boom13.png,boom14.png,boom15.png,boom16.png,boom17.png,boom18.png,boom19.png,boom2.png,boom20.png,boom3.png,boom4.png,boom5.png,boom6.png,boom7.png,boom8.png,boom9.png,brownBallFace.png,bubbleStar1.png,bubbleStar10.png,bubbleStar11.png,bubbleStar12.png,bubbleStar13.png,bubbleStar14.png,bubbleStar15.png,bubbleStar16.png,bubbleStar17.png,bubbleStar18.png,bubbleStar19.png,bubbleStar2.png,bubbleStar3.png,bubbleStar4.png,bubbleStar5.png,bubbleStar6.png,bubbleStar7.png,bubbleStar8.png,bubbleStar9.png,bubleEle0.png,bubleEle1.png,bubleEle2.png,bubleEle3.png,bubleEle4.png,chapterNum0.png,chapterNum1.png,chapterNum2.png,chapterNum3.png,chapterNum4.png,chapterNum5.png,chapterNum6.png,chapterNum7.png,chapterNum8.png,chapterNum9.png,chapterNum关.png,chapterNum第.png,chooseRect.png,doorClosed.png,doorOpen.png,eggPiece1.png,eggPiece2.png,eggPiece3.png,eggPiece4.png,eggPiece5.png,eggStatus0.png,eggStatus1.png,eggStatus2.png,ele0Exp.png,ele1Exp.png,ele2Exp.png,ele3Exp.png,ele4Exp.png,exLighting0.png,exLighting10.png,exLighting13.png,exLighting15.png,exLighting17.png,exLighting18.png,exLighting2.png,exLighting20.png,exLighting22.png,exLighting24.png,exLighting26.png,exLighting28.png,exLighting31.png,exLighting33.png,exLighting4.png,exLighting6.png,exLighting8.png,eyeDownLeft.png,eyeDownRight.png,eyeSingle.png,gameGuideBoard.png,greenCircleDown.png,greenCircleUp.png,greyBallFace.png,guidePropBoom.png,guidePropCow.png,guidePropHammer.png,guidePropHand.png,guidePropMsgPanel.png,guidePropShoe.png,hairballDisBg.png,hairballPiece1.png,hairballPiece2.png,hairballPiece3.png,hairballPiece4.png,hairballPiece5.png,hairballPiece6.png,hairballPiece7.png,hairballPiece8.png,hairballPiece9.png,ice2.png,ice3.png,ice4.png,ice5.png,ice6.png,jellyArrow.png,leftArrow.png,lightedStar.png,lineLight.png,lockVine.png,magicLion.png,magicLionBg.png,main_mapbottom.png,musicOff.png,musicOn.png,playBg.jpg,propNum0.png,propNum1.png,propNum2.png,propNum3.png,propNum4.png,propNum5.png,propNum6.png,propNum7.png,propNum8.png,propNum9.png,rectLat.png,rectLatWhite.png,redDoorBg.png,rightArrow.png,rightMark.png,rock2.png,rock3.png,rock4.png,rock5.png,rock6.png,scoreNum0.png,scoreNum1.png,scoreNum2.png,scoreNum3.png,scoreNum4.png,scoreNum5.png,scoreNum6.png,scoreNum7.png,scoreNum8.png,scoreNum9.png,scoreNum关.png,scoreNum冒号.png,scoreNum分.png,scoreNum数.png,scoreNum通.png,settingBg.png,settingBtn.png,starProgress.png,stepAni1.png,stepAni10.png,stepAni11.png,stepAni2.png,stepAni3.png,stepAni4.png,stepAni5.png,stepAni6.png,stepAni7.png,stepAni8.png,stepAni9.png,stepNum0.png,stepNum1.png,stepNum2.png,stepNum3.png,stepNum4.png,stepNum5.png,stepNum6.png,stepNum7.png,stepNum8.png,stepNum9.png,table.png,tarNum0.png,tarNum1.png,tarNum2.png,tarNum3.png,tarNum4.png,tarNum5.png,tarNum6.png,tarNum7.png,tarNum8.png,tarNum9.png,topBg.png,unlightedStar.png,yellowCircleDown.png,yellowCircleUp.png,yellowDoorBg.png",
"name": "playScene"
},
{
"keys": "star_light_0.png,star_light_1.png,star_light_10.png,star_light_11.png,star_light_12.png,star_light_13.png,star_light_14.png,star_light_15.png,star_light_2.png,star_light_3.png,star_light_4.png,star_light_5.png,star_light_6.png,star_light_7.png,star_light_8.png,star_light_9.png",
"name": "starLight"
}
],
"path": "./resource/"
......
scripts/egretTmToFyge.js 0 → 100644
View file @ dcc7f8af
var fs = require("fs");
//测试脚本，白鹭的图集格式转fyge的图集格式
var readPath = "./scripts/";
var writePath = "./psd/"
//取指令后的参数
let arg = process.argv.splice(2);
//json名字
var jsonName = arg[0];
var data = fs.readFileSync(readPath + jsonName + ".json");
//反序列化
data = JSON.parse(data);
let frames = data.frames;
var obj = {};
for (var key in frames) {
let f = frames[key];
obj[jsonName + key + ".png"] = {
"x": f.x,
"y": f.y,
"w": f.w,
"h": f.h,
"ox": f.offX,
"oy": f.offY,
"sw": f.sourceW,
"sh": f.sourceH,
"ro": false,
}
}
//写入
fs.writeFileSync(writePath + jsonName + ".json", JSON.stringify(obj, "", "\t"));
//例子json
// {"file":"coin.png","frames":{
// "8":{"x":0,"y":0,"w":109,"h":112,"offX":3,"offY":1,"sourceW":115,"sourceH":115},
// "4":{"x":67,"y":340,"w":65,"h":113,"offX":25,"offY":1,"sourceW":115,"sourceH":115},
// "5":{"x":222,"y":0,"w":24,"h":108,"offX":45,"offY":3,"sourceW":115,"sourceH":115},
// "7":{"x":0,"y":114,"w":94,"h":113,"offX":10,"offY":1,"sourceW":115,"sourceH":115},
// "6":{"x":0,"y":229,"w":65,"h":114,"offX":25,"offY":0,"sourceW":115,"sourceH":115},
// "2":{"x":111,"y":0,"w":109,"h":111,"offX":3,"offY":2,"sourceW":115,"sourceH":115},
// "3":{"x":96,"y":225,"w":94,"h":113,"offX":10,"offY":1,"sourceW":115,"sourceH":115},
// "1":{"x":111,"y":113,"w":109,"h":110,"offX":3,"offY":2,"sourceW":115,"sourceH":115}}}
\ No newline at end of file
src/ResJson.ts
View file @ dcc7f8af
This source diff could not be displayed because it is too large. You can view the blob instead.
src/TaoBaoNet.ts
View file @ dcc7f8af
......@@ -76,6 +76,11 @@ export enum TbNetName {
* activityId
*/
getTaskList = "babycare.getTaskList",
/**
* 抽奖
* activityId
*/
luckyDraw = "babycare.luckyDraw",
///////////////////前端调用接口都加个mine
......
src/panels/StartPanel.ts
View file @ dcc7f8af
......@@ -69,9 +69,9 @@ export class StartPanel extends Panel {
if (!success) return;
Tools.gameData.power = res.data.power;
changeScene(PlayScene, { chapter: this.data.level });
this.hidePanel();
}
);
this.hidePanel();
}
initEvents() {
......
src/panels/StartPanelPrize.ts
View file @ dcc7f8af
......@@ -71,9 +71,9 @@ export class StartPanelPrize extends Panel {
if (!success) return;
Tools.gameData.power = res.data.power;
changeScene(PlayScene, {chapter: this.data.level});
this.hidePanel();
}
);
this.hidePanel();
}
initEvents() {
......
src/panels/SuccessPrizePanel.ts
View file @ dcc7f8af
......@@ -12,6 +12,7 @@ import TextField = FYGE.TextField;
import { changeScene } from "../../module/ctrls";
import { MapScene } from "../scene/map/MapScene";
import MouseEvent = FYGE.MouseEvent;
import { LotteryScene } from "../scene/LotteryScene";
export class SuccessPrizePanel extends Panel {
get groupNames() {
......@@ -27,8 +28,8 @@ export class SuccessPrizePanel extends Panel {
this.isShowing = true;
this.anchor.set(375, 812);
Tween.get(this)
.set({scaleX: 0, scaleY: 0})
.to({scaleX: 1, scaleY: 1}, 400, Ease.backOut)
.set({ scaleX: 0, scaleY: 0 })
.to({ scaleX: 1, scaleY: 1 }, 400, Ease.backOut)
.call(() => {
this.isShowing = false;
});
......@@ -100,13 +101,13 @@ export class SuccessPrizePanel extends Panel {
}
private lightEffect() {
Tween.get(this.light1, {loop: true})
.set({anchorX: 219.5, anchorY: 219.5})
.to({rotation: 360}, 12000);
Tween.get(this.light1, { loop: true })
.set({ anchorX: 219.5, anchorY: 219.5 })
.to({ rotation: 360 }, 12000);
Tween.get(this.light2, {loop: true})
.set({anchorX: 219.5, anchorY: 219.5})
.to({rotation: -360}, 12000);
Tween.get(this.light2, { loop: true })
.set({ anchorX: 219.5, anchorY: 219.5 })
.to({ rotation: -360 }, 12000);
}
start(data) {
......@@ -117,7 +118,7 @@ export class SuccessPrizePanel extends Panel {
* 挑战满星
*/
private again() {
changeScene(MapScene, {level: this.data.level});
changeScene(MapScene, { level: this.data.level });
super.hidePanel();
}
......@@ -128,14 +129,16 @@ export class SuccessPrizePanel extends Panel {
if (this.data.level == 120) {
changeScene(MapScene);
} else {
changeScene(MapScene, {level: this.data.level + 1});
changeScene(MapScene, { level: this.data.level + 1 });
}
super.hidePanel();
}
public goPrize(){
/// TODO 去抽奖
public goPrize() {
// 去抽奖
changeScene(LotteryScene, { level: this.data.level })
super.hidePanel();
}
......
src/panels/TaskPanel.ts
View file @ dcc7f8af
......@@ -245,7 +245,7 @@ class CusButton extends Button {
if (this.type == TaskType.browseGoods || this.type == TaskType.member) {
//都需要添加事件，回来时，派发事件刷任务接口
GDispatcher.once(G_EVENT.ON_SHOW, () => {
GDispatcher.dispatchEvent(G_EVENT.ON_SHOW)
GDispatcher.dispatchEvent(G_EVENT.UPDATE_TASK)
}, this)
}
}
......
src/scene/LoadingScene.ts
View file @ dcc7f8af
......@@ -2,7 +2,7 @@ import { Scene } from "../../module/views/Scene";
import { Tools } from "../Tools";
import { ProgressBarS } from "../common/ProgressBarS";
import { RES } from "../../module/RES";
import { sendTbNet, TbNetName } from "../TaoBaoNet";
import { sendTbNet, TbNetName, getTbData } from "../TaoBaoNet";
import { changeScene } from "../../module/ctrls";
import { MapScene } from "./map/MapScene";
import { layers } from "../../module/views/layers";
......@@ -106,10 +106,12 @@ export class LoadingScene extends Scene {
//获取首页数据
var getIndexSuccesss = await Tools.getIndex()
//失败不进入
if (!getIndexSuccesss) return;
this.dispatchEvent(FYGE.Event.PROGRESS, 0.3);
//赋值openId，取getIndex里的数据
Tools.globalData.openId = getTbData(TbNetName.getIndex).data.openId;
// 游戏基本信息
const baseInfo = await sendTbNet(TbNetName.getActivityBaseInfoById);
Tools.baseInfo = baseInfo.data;
......
src/scene/LotteryScene.ts
View file @ dcc7f8af
......@@ -2,14 +2,20 @@ import { Scene } from "../../module/views/Scene";
import { RES } from "../../module/RES";
import { layers } from "../../module/views/layers";
import { Tools } from "../Tools";
import { showWaiting } from "../../module/ctrls";
import { showWaiting, wait, changeScene, hideWaiting, showPanel } from "../../module/ctrls";
import { sendTbNet, TbNetName } from "../TaoBaoNet";
import { GTool } from "../../module/tools/GTool";
import { MapScene } from "./map/MapScene";
import { PrizePanel } from "../panels/PrizePanel";
import { NoPrizePanel } from "../panels/NoPrizePanel";
/**
* 摇奖机弹框
*/
export class LotteryScene extends Scene {
get groupNames() { return ["lotteryScene"] }
lotScroll: LotteryScroll;
data: {
level: number,
}
......@@ -46,12 +52,16 @@ export class LotteryScene extends Scene {
FYGE.TEXT_ALIGN.CENTER,
488,
(750 - 488) / 2,
360
420
))
//抽奖按钮
this.addChild(new FYGE.Button(RES.getRes("lotteryBtn.png")))
.addEventListener(FYGE.MouseEvent.CLICK, this.lottery, this)
.position.set((750 - RES.getRes("lotteryBtn.png").width) / 2, 797);
//返回按钮，回到地图页
this.addChild(new FYGE.Button(RES.getRes("lotteryReturnBtn.png")))
.addEventListener(FYGE.MouseEvent.CLICK, () => { changeScene(MapScene) }, this)
.position.set(0, 300)
//刷新奖品列表和摇奖列表
this.updatePrizes();
}
......@@ -59,15 +69,31 @@ export class LotteryScene extends Scene {
showWaiting();
const { data: prizeList } = await sendTbNet(TbNetName.getPrizesByLevel, { level: this.data.level });
//滚动列表
console.log(prizeList)
// console.log(prizeList)
var scroll = this.addChild(new FYGE.ScrollList(PrizeItem, 122, 140, 345, 152, false))
scroll.position.set(195, 1013);
scroll.updateData(prizeList || [])
//摇奖部分
var p = [201, 620]
this.lotScroll = this.addChild(new LotteryScroll(prizeList))
this.lotScroll.position.set(p[0], p[1]);
}
lottery() {
showWaiting()
sendTbNet(TbNetName.luckyDraw)
.then((res) => {
hideWaiting();
//如果是失败
if (!res.success) return;
let id;
if (res.data && res.data._id) id = res.data._id;
this.enableMouseEvt(false);
this.lotScroll.lot(id, () => {
this.enableMouseEvt(true)
//弹框
showPanel(id ? PrizePanel : NoPrizePanel, id ? res.data : null)
})
})
}
}
interface PrizeInt {
......@@ -104,48 +130,169 @@ class PrizeItem extends FYGE.Container implements FYGE.IScrollListItem {
}
class LotteryItem extends FYGE.Container {
private showImage: FYGE.Sprite;
private cusPosition: number;
constructor(tex?: FYGE.Texture) {
id: string
constructor(data: PrizeInt) {
super();
this.id = data._id;
this.addChild(new FYGE.Sprite(RES.getRes("lotteryItemBg.png")));
this.showImage = this.addChild(new FYGE.Sprite(tex));
this.showImage = this.addChild(new FYGE.Sprite(FYGE.Texture.from(data.image)));
this.showImage.width = this.showImage.height = 88;
this.showImage.position.set((103 - 88) / 2, 6);
var mask = this.addChild(new FYGE.Shape())
mask.beginFill(0);
mask.drawRoundedRect((103 - 88) / 2, 6, 88, 88, 10);
mask.endFill();
this.showImage.mask = mask
}
changeShowImage(tex: FYGE.Texture) {
this.showImage.texture = tex;
reset(data: PrizeInt) {
this.showImage.texture = FYGE.Texture.from(data.image);
this.id = data._id;
}
}
const HEIGHT = 123;
/**
* 滚动条
* 功能可以滚动到指定的图
*/
class LotteryScroll extends FYGE.Container {
private currentIndex: number;
constructor(textures: FYGE.Texture[]) {
class LotteryScrollItem extends FYGE.Container {
/**
* 当前childre的中位索引
*/
get currentIndex(): number {
var a = 1 - this.cusP;
var l = this.children.length
return a < 0 ? a % l + l : a % l
};
private cusP: number
constructor(datas: PrizeInt[]) {
super();
textures.forEach((t, i) => {
this.addChild(new LotteryItem(t))
.position.set(0, i * 123)
datas.forEach((d) => {
this.addChild(new LotteryItem(d))
})
this.cusP = 0;
this.updatePosition();
//修改位置
this.addEventListener(FYGE.Event.ENTER_FRAME, () => {
this.children.forEach((c) => {
// if () { }
})
}, this)
this.addEventListener(FYGE.Event.ENTER_FRAME, this.updatePosition, this)
}
scrollTo(index: number, time: number, callback: () => void) {
scrollTo(id: string, callback: () => void) {
//找出目标图
let child, curIndex;
for (var i = 0; i < this.children.length; i++) {
if (this.children[i].id == id) {
child = this.children[i];
curIndex = i;
break
}
}
var delta = this.currentIndex - curIndex;
if (delta < 0) delta += this.children.length;
//目标图的位置必须是，多加几圈
var cusP = this.cusP + delta + 10 * this.children.length;
FYGE.Tween.get(this)
.to({ cusP }, 5000, FYGE.Ease.quadInOut)
.call(() => {
callback && callback();
})
}
reset() {
}
updatePosition() {
this.children.forEach((c) => {
// if () { }
this.children.forEach((c: LotteryItem, j) => {
c.y = ((this.cusP + j) % this.children.length) * HEIGHT - HEIGHT;
//超过一定距离，移到上面
if (c.y > HEIGHT * 1.5) {
c.y = c.y - this.children.length * HEIGHT
}
})
}
// 0 0- 10 21 1
// 1 00 11 2- 0
// 2 01 1- 20 2
// 3 0- 10 21 1
destroy() {
FYGE.Tween.removeTweens(this);
super.destroy()
}
}
/**
* 暂时固定3列，宽高
*/
class LotteryScroll extends FYGE.Container {
ids: string[]
scrollItems: LotteryScrollItem[];
constructor(datas: PrizeInt[]) {
super();
this.scrollItems = []
for (var i = 0; i < 3; i++) {
var s = this.addChild(new LotteryScrollItem(GTool.disturbArr(datas.slice())))
s.position.set(116 * i, 0);
this.scrollItems.push(s)
}
this.ids = [];
datas.forEach((d) => { this.ids.push(d._id) });
var h = -50
//遮罩
var mask = this.addChild(new FYGE.Shape())
mask.beginFill(0)
mask.drawRect(0, h + 3, 350, 195 - 5)
mask.endFill();
this.mask = mask;
//蒙层
this.addChild(new FYGE.Sprite(RES.getRes("shadowMask.png")))
.position.set(0, h)
}
lot(id?: string, callback?: () => void) {
if (id) {
//确保得是ids里的id。否则无效
if (this.ids.indexOf(id) == -1) {
console.error("中奖id不存在")
return;
}
let count = 0;
let countAll = this.scrollItems.length;
this.scrollItems.forEach((c: LotteryScrollItem, i) => {
wait(() => {
c.scrollTo(id, () => {
if (++count == countAll && callback) callback();
})
}, 400 * i)
})
} else {
//保证几个id不能一致
var ids = [
GTool.randomT(this.ids),
GTool.randomT(this.ids),
];
//如果都相同
// if(!ids.some(function (value, index) { return value !== ids[0];})){
// ids.push()
// }
//才两个，直接判断
ids[0] === ids[1] ? ids.push(
GTool.randomT((() => {
var arr = this.ids.slice();
arr.splice(this.ids.indexOf(ids[0]), 1)
return arr
})())
) : ids.push(GTool.randomT(this.ids));
console.log(ids)
let count = 0;
let countAll = this.scrollItems.length;
this.scrollItems.forEach((c: LotteryScrollItem, i) => {
wait(() => {
c.scrollTo(ids[i], () => {
if (++count == countAll && callback) callback();
})
}, 400 * i)
})
}
}
}
\ No newline at end of file
src/scene/map/MapScene.ts
View file @ dcc7f8af
......@@ -50,7 +50,7 @@ export class MapScene extends Scene {
888, true, true
));
this.mapContainer = this.scrollPage.view.addChild(new Container());
this.uiLayer = this.addChild(new MapUI());
// this.uiLayer = this.addChild(new MapUI());//待测试，在下面updateMapCheck里再初始化
this.initMap();
this.updateMapCheck();
......@@ -79,13 +79,15 @@ export class MapScene extends Scene {
private updateMapCheck() {
if (this.data && this.data.from == 'loading') {
this.uiLayer = this.addChild(new MapUI());
this.initMapByData(Tools.gameData);
if (Tools.gameData.isFristLogin) {
this.initGuide();
}
} else {
Tools.getGameInfo().then((success) => {
if (success) {
if (success) {//不考虑失败的情况
this.uiLayer = this.addChild(new MapUI());
this.initMapByData(Tools.gameData);
}
});
......@@ -101,7 +103,7 @@ export class MapScene extends Scene {
g.beginFill(0, 0.6);
g.drawRect(0, 0, layers.stageWidth, layers.stageHeight);
g.endFill();
const guide_check = guide.addChild(new CheckBtn({check: 1}));
const guide_check = guide.addChild(new CheckBtn({ check: 1 }));
guide_check.enabled = true;
guide_check.type = CHECK_TYPE.CUR;
guide_check.position.set(MapScene.checkArr[1].x, layers.stageHeight - 162);
......@@ -128,15 +130,15 @@ export class MapScene extends Scene {
guide.alpha = 0;
Tween.get(guide)
.to({alpha: 1}, 600, Ease.quadInOut);
.to({ alpha: 1 }, 600, Ease.quadInOut);
Tween.get(guide_fox)
.wait(300)
.to({y: guide_check.y - 345, alpha: 1}, 300, Ease.quadInOut)
.to({ y: guide_check.y - 345, alpha: 1 }, 300, Ease.quadInOut)
.wait(100)
.call(() => {
Tween.get(guide_tip)
.to({scaleX: 1, scaleY: 1}, 300, Ease.quadInOut);
.to({ scaleX: 1, scaleY: 1 }, 300, Ease.quadInOut);
});
}
......
src/scene/map/MapUI.ts
View file @ dcc7f8af
......@@ -6,12 +6,13 @@ import TEXT_ALIGN = FYGE.TEXT_ALIGN;
import { RES } from "../../../module/RES";
import { Tools } from "../../Tools";
import MouseEvent = FYGE.MouseEvent;
import { showPanel } from "../../../module/ctrls";
import { showPanel, changeScene, showToast } from "../../../module/ctrls";
import { RulePanel } from "../../panels/RulePanel";
import { BuyPowerPanel } from "../../panels/BuyPowerPanel";
import { TaskPanel } from "../../panels/TaskPanel";
import { sendTbNet, TbNetName } from "../../TaoBaoNet";
import Texture = FYGE.Texture;
import { LotteryScene } from "../LotteryScene";
export default class MapUI extends Container {
public energyBox: EnergyBox = null;
......@@ -61,7 +62,7 @@ export default class MapUI extends Container {
break;
case this.prizeBox:
/// TODO 奖励盒子
/// TODO 奖励盒子，有条件的吧，放在类里了prizeBox
console.log('奖励盒子');
break;
......@@ -247,11 +248,18 @@ class PrizeBox extends Button {
this.tip.text = '';
this.prizeImg.texture = Texture.fromUrl(Tools.baseInfo.levelPrize[`level_${upLevel}`]);
this.prizeImg.y -= 20;
this.addEventListener(FYGE.MouseEvent.CLICK, () => {
//有需要，到时再改
showToast(this.checkTip.text + "才可以抽奖哦")
}, this)
} else if (prizes.length == 1 && +prizes[0].level == 120) {
this.checkTip.text = `等待开奖`;
this.tip.text = `8月28日10点\n开启大奖`;
this.prizeImg.texture = Texture.fromUrl(Tools.baseInfo.levelPrize['level_120']);
this.addEventListener(FYGE.MouseEvent.CLICK, () => {
//有需要，到时再改
showToast(this.tip.text)
}, this)
} else {
let lowerLevel = 120;
prizes.forEach((value) => {
......@@ -263,11 +271,12 @@ class PrizeBox extends Button {
this.tip.text = `抽取${lowerLevel}关奖励`;
this.tip.y += 10;
this.prizeImg.texture = Texture.fromUrl(Tools.baseInfo.levelPrize[`level_${lowerLevel}`]);
this.addEventListener(FYGE.MouseEvent.CLICK, () => {
changeScene(LotteryScene, { level: lowerLevel })
}, this)
}
}
initEvent() {
}
}
src/something/uis/PropGuide.ts
View file @ dcc7f8af
......@@ -38,7 +38,7 @@ export class PropGuide extends FYGE.Container {
text.fillColor = "#ffffff";
text.size = 20;
text.x = (750 - 500) / 2;
text.y = offsetY - 92;
text.y = offsetY - 30;
text.textAlign = FYGE.TEXT_ALIGN.CENTER;
text.textWidth = 500;
this.addChild(text);
......@@ -75,7 +75,7 @@ export class PropGuide extends FYGE.Container {
this.bg.moveTo(stepPosition[0] + 50, stepPosition[1])
this.bg.drawCircle(stepPosition[0], stepPosition[1], 50, false)
this.bg.endFill();
this.msgTxt.text = "点击左上方步数，可为闯关时增加额外5次步数";
this.msgTxt.text = "点击上方步数，可为闯关时增加额外5次步数";
// this.msgTxt.x = 320;
}
}
......
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