Skip to content

T
taobaominiDemo
Commit d6db0394 authored by lujinlei's avatar lujinlei
Browse files
Options

-a

parent 5bc36eea
Hide whitespace changes
Inline Side-by-side
Showing with 677 additions and 219 deletions
client/package.json
View file @ d6db0394
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
"@mrkwon/svga-player": "^1.0.3", "@mrkwon/svga-player": "^1.0.3",
"@tbminiapp/lottie-miniapp": "0.0.3", "@tbminiapp/lottie-miniapp": "0.0.3",
"@tbmp/mp-cloud-sdk": "^1.3.8", "@tbmp/mp-cloud-sdk": "^1.3.8",
"fyge-tbmini": "^1.0.9", "fyge-tbmini": "^1.2.0",
"svga-parser": "^1.1.0" "svga-parser": "^1.1.0"
} }
} }
client/pages/index/index.js
View file @ d6db0394
...@@ -19,6 +19,7 @@ Page({ ...@@ -19,6 +19,7 @@ Page({
console.info(`Page onLoad with query: ${JSON.stringify(query)}`); console.info(`Page onLoad with query: ${JSON.stringify(query)}`);
//带参数的 //带参数的
if (query.inviteId) this.inviteId = query.inviteId if (query.inviteId) this.inviteId = query.inviteId
console.warn('邀请码',this.inviteId);
}, },
onReady() { onReady() {
...@@ -202,7 +203,7 @@ Page({ ...@@ -202,7 +203,7 @@ Page({
inviteId: app.inviteId, inviteId: app.inviteId,
isNewUser: app.isNewUser, isNewUser: app.isNewUser,
isFocusShop: app.isFollow || false, isFocusShop: app.isFollow || false,
shareCode: this.shareCode, //判断是否要发助力用 shareCode: this.inviteId, //判断是否要发助力用
} }
} }
break break
......
client/pages/index/output.js
View file @ d6db0394
...@@ -1942,6 +1942,7 @@ var Main = (function () { ...@@ -1942,6 +1942,7 @@ var Main = (function () {
return [4, TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.filaStarGetActivityBaseInfoById, { activityId: global_1.getActivityId() })]; return [4, TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.filaStarGetActivityBaseInfoById, { activityId: global_1.getActivityId() })];
case 6: case 6:
_a.sent(); _a.sent();
console.log('邀请测试', global_1.getShareCode());
if (global_1.getShareCode()) { if (global_1.getShareCode()) {
ctrls_1.changeScene(AssistScene_1.AssistScene); ctrls_1.changeScene(AssistScene_1.AssistScene);
} }
...@@ -3257,7 +3258,7 @@ exports.ResJson = { ...@@ -3257,7 +3258,7 @@ exports.ResJson = {
} }
}, },
{ {
"keys": "rankPanelBg.png,rankPanelIcon.png,rankPanelIcon1.png,rankPanelIcon2.png,rankPanelIcon3.png,rankPanelLine.png", "keys": "rankPanelBg.png,rankPanelIcon.png,rankPanelIcon1.png,rankPanelIcon2.png,rankPanelIcon3.png,rankPanelLine.png,rank_placeholder.png",
"name": "rankPanel", "name": "rankPanel",
"atlas": { "atlas": {
"rankPanelBg.png": { "rankPanelBg.png": {
...@@ -3325,27 +3326,38 @@ exports.ResJson = { ...@@ -3325,27 +3326,38 @@ exports.ResJson = {
"sw": 590, "sw": 590,
"sh": 3, "sh": 3,
"ro": false "ro": false
},
"rank_placeholder.png": {
"x": 624,
"y": 2,
"w": 120,
"h": 119,
"ox": 0,
"oy": 0,
"sw": 120,
"sh": 119,
"ro": false
} }
} }
}, },
{ {
"keys": "addressBtn.png,againGetBtn.png,awaitGetBtn.png,failBtn.png,getBtn.png,invalidBtn.png,prizePanelBack.png,receivedBtn.png,recordSceneLine.png", "keys": "addressBtn.png,againGetBtn.png,awaitGetBtn.png,failBtn.png,getBtn.png,invalidBtn.png,prizePanelBack.png,receivedBtn.png,recordSceneLine.png,titleBG.png",
"name": "recordScene", "name": "recordScene",
"atlas": { "atlas": {
"addressBtn.png": { "addressBtn.png": {
"x": 2, "x": 445,
"y": 312, "y": 204,
"w": 200, "w": 200,
"h": 60, "h": 60,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 200, "sw": 200,
"sh": 60, "sh": 60,
"ro": false "ro": true
}, },
"againGetBtn.png": { "againGetBtn.png": {
"x": 2, "x": 243,
"y": 250, "y": 188,
"w": 200, "w": 200,
"h": 60, "h": 60,
"ox": 0, "ox": 0,
...@@ -3355,8 +3367,8 @@ exports.ResJson = { ...@@ -3355,8 +3367,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"awaitGetBtn.png": { "awaitGetBtn.png": {
"x": 2, "x": 243,
"y": 374, "y": 250,
"w": 174, "w": 174,
"h": 60, "h": 60,
"ox": 0, "ox": 0,
...@@ -3366,8 +3378,8 @@ exports.ResJson = { ...@@ -3366,8 +3378,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"failBtn.png": { "failBtn.png": {
"x": 2, "x": 243,
"y": 188, "y": 126,
"w": 200, "w": 200,
"h": 60, "h": 60,
"ox": 0, "ox": 0,
...@@ -3377,8 +3389,8 @@ exports.ResJson = { ...@@ -3377,8 +3389,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"getBtn.png": { "getBtn.png": {
"x": 2, "x": 243,
"y": 126, "y": 64,
"w": 200, "w": 200,
"h": 60, "h": 60,
"ox": 0, "ox": 0,
...@@ -3388,19 +3400,19 @@ exports.ResJson = { ...@@ -3388,19 +3400,19 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"invalidBtn.png": { "invalidBtn.png": {
"x": 2, "x": 445,
"y": 64, "y": 2,
"w": 200, "w": 200,
"h": 60, "h": 60,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 200, "sw": 200,
"sh": 60, "sh": 60,
"ro": false "ro": true
}, },
"prizePanelBack.png": { "prizePanelBack.png": {
"x": 204, "x": 243,
"y": 2, "y": 312,
"w": 35, "w": 35,
"h": 35, "h": 35,
"ox": 0, "ox": 0,
...@@ -3410,7 +3422,7 @@ exports.ResJson = { ...@@ -3410,7 +3422,7 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"receivedBtn.png": { "receivedBtn.png": {
"x": 2, "x": 243,
"y": 2, "y": 2,
"w": 200, "w": 200,
"h": 60, "h": 60,
...@@ -3421,7 +3433,7 @@ exports.ResJson = { ...@@ -3421,7 +3433,7 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"recordSceneLine.png": { "recordSceneLine.png": {
"x": 241, "x": 507,
"y": 2, "y": 2,
"w": 688, "w": 688,
"h": 1, "h": 1,
...@@ -3430,6 +3442,17 @@ exports.ResJson = { ...@@ -3430,6 +3442,17 @@ exports.ResJson = {
"sw": 688, "sw": 688,
"sh": 1, "sh": 1,
"ro": true "ro": true
},
"titleBG.png": {
"x": 2,
"y": 2,
"w": 750,
"h": 239,
"ox": 0,
"oy": 0,
"sw": 750,
"sh": 239,
"ro": true
} }
} }
}, },
...@@ -3462,23 +3485,34 @@ exports.ResJson = { ...@@ -3462,23 +3485,34 @@ exports.ResJson = {
} }
}, },
{ {
"keys": "drawBtn.png,music_Close.png,music_Open.png,rankBtn.png,recordBtn.png,ruleBtn.png,startBg.jpg,startBtn.png,task_Btn.png", "keys": "drawBtn.png,drawBtn2.png,music_Close.png,music_Open.png,newbieBtn.png,rankBtn.png,recordBtn.png,ruleBtn.png,startBg.jpg,startBtn.png,task_Btn.png",
"name": "startScene", "name": "startScene",
"atlas": { "atlas": {
"drawBtn.png": { "drawBtn.png": {
"x": 2, "x": 2,
"y": 106, "y": 279,
"w": 154, "w": 165,
"h": 142, "h": 142,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 154, "sw": 165,
"sh": 142,
"ro": true
},
"drawBtn2.png": {
"x": 284,
"y": 2,
"w": 165,
"h": 142,
"ox": 0,
"oy": 0,
"sw": 165,
"sh": 142, "sh": 142,
"ro": false "ro": false
}, },
"music_Close.png": { "music_Close.png": {
"x": 2, "x": 451,
"y": 348, "y": 61,
"w": 57, "w": 57,
"h": 57, "h": 57,
"ox": 0, "ox": 0,
...@@ -3488,8 +3522,8 @@ exports.ResJson = { ...@@ -3488,8 +3522,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"music_Open.png": { "music_Open.png": {
"x": 2, "x": 451,
"y": 418, "y": 2,
"w": 57, "w": 57,
"h": 57, "h": 57,
"ox": 0, "ox": 0,
...@@ -3498,20 +3532,31 @@ exports.ResJson = { ...@@ -3498,20 +3532,31 @@ exports.ResJson = {
"sh": 57, "sh": 57,
"ro": false "ro": false
}, },
"rankBtn.png": { "newbieBtn.png": {
"x": 136, "x": 146,
"y": 284, "y": 187,
"w": 96, "w": 96,
"h": 132, "h": 132,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 96, "sw": 96,
"sh": 132, "sh": 132,
"ro": false "ro": true
},
"rankBtn.png": {
"x": 146,
"y": 85,
"w": 100,
"h": 132,
"ox": 0,
"oy": 0,
"sw": 100,
"sh": 132,
"ro": true
}, },
"recordBtn.png": { "recordBtn.png": {
"x": 2, "x": 280,
"y": 54, "y": 146,
"w": 157, "w": 157,
"h": 50, "h": 50,
"ox": 0, "ox": 0,
...@@ -3521,18 +3566,18 @@ exports.ResJson = { ...@@ -3521,18 +3566,18 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"ruleBtn.png": { "ruleBtn.png": {
"x": 2, "x": 451,
"y": 2, "y": 120,
"w": 157, "w": 157,
"h": 50, "h": 50,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 157, "sw": 157,
"sh": 50, "sh": 50,
"ro": false "ro": true
}, },
"startBtn.png": { "startBtn.png": {
"x": 161, "x": 2,
"y": 2, "y": 2,
"w": 280, "w": 280,
"h": 81, "h": 81,
...@@ -3540,11 +3585,11 @@ exports.ResJson = { ...@@ -3540,11 +3585,11 @@ exports.ResJson = {
"oy": 0, "oy": 0,
"sw": 280, "sw": 280,
"sh": 81, "sh": 81,
"ro": true "ro": false
}, },
"task_Btn.png": { "task_Btn.png": {
"x": 2, "x": 2,
"y": 250, "y": 85,
"w": 96, "w": 96,
"h": 132, "h": 132,
"ox": 0, "ox": 0,
...@@ -3594,13 +3639,13 @@ exports.ResJson = { ...@@ -3594,13 +3639,13 @@ exports.ResJson = {
}, },
"follow.png": { "follow.png": {
"x": 868, "x": 868,
"y": 166, "y": 126,
"w": 38, "w": 38,
"h": 37, "h": 38,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 38, "sw": 38,
"sh": 37, "sh": 38,
"ro": false "ro": false
}, },
"invites.png": { "invites.png": {
...@@ -3616,13 +3661,13 @@ exports.ResJson = { ...@@ -3616,13 +3661,13 @@ exports.ResJson = {
}, },
"member.png": { "member.png": {
"x": 868, "x": 868,
"y": 126, "y": 166,
"w": 38, "w": 38,
"h": 38, "h": 37,
"ox": 0, "ox": 0,
"oy": 0, "oy": 0,
"sw": 38, "sw": 38,
"sh": 38, "sh": 37,
"ro": false "ro": false
}, },
"taskBG.png": { "taskBG.png": {
...@@ -3801,7 +3846,7 @@ exports.ResJson = { ...@@ -3801,7 +3846,7 @@ exports.ResJson = {
} }
} }
], ],
"path": "https://yun.duiba.com.cn/db_games/activity/kickball-feile/1593163138/resource/" "path": "https://yun.duiba.com.cn/db_games/activity/kickball-feile/1593331345/resource/"
}; };
...@@ -3886,6 +3931,7 @@ var TbNetName; ...@@ -3886,6 +3931,7 @@ var TbNetName;
TbNetName["filaStarGetInviteInfo"] = "filaStar.getInviteInfo"; TbNetName["filaStarGetInviteInfo"] = "filaStar.getInviteInfo";
TbNetName["filaStar2ReceivePrize"] = "filaStar2.receivePrize"; TbNetName["filaStar2ReceivePrize"] = "filaStar2.receivePrize";
TbNetName["filaStarReceiveTaskRewards"] = "filaStar.receiveTaskRewards"; TbNetName["filaStarReceiveTaskRewards"] = "filaStar.receiveTaskRewards";
TbNetName["filaStarGetVipInfo"] = "filaStar.getVipInfo";
})(TbNetName = exports.TbNetName || (exports.TbNetName = {})); })(TbNetName = exports.TbNetName || (exports.TbNetName = {}));
var dataRecord = {}; var dataRecord = {};
var fc; var fc;
...@@ -4517,6 +4563,27 @@ exports.default = (function (type) { return __awaiter(_this, void 0, void 0, fun ...@@ -4517,6 +4563,27 @@ exports.default = (function (type) { return __awaiter(_this, void 0, void 0, fun
}); }); }); });
/***/ }),
/***/ "./src/ctrls/getCaixukunTime.ts":
/*!**************************************!*\
!*** ./src/ctrls/getCaixukunTime.ts ***!
\**************************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var time = 1594178400000;
exports.default = (function () {
return time;
});
exports.getCaixukunName = function () {
return Date.now() > time ? '蔡徐坤' : '代言人';
};
/***/ }), /***/ }),
/***/ "./src/ctrls/getExtraPrize.ts": /***/ "./src/ctrls/getExtraPrize.ts":
...@@ -4976,6 +5043,71 @@ exports.default = (function () { return __awaiter(_this, void 0, void 0, functio ...@@ -4976,6 +5043,71 @@ exports.default = (function () { return __awaiter(_this, void 0, void 0, functio
}); }); }); });
/***/ }),
/***/ "./src/ctrls/getVipInfo.ts":
/*!*********************************!*\
!*** ./src/ctrls/getVipInfo.ts ***!
\*********************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
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 };
}
};
var _this = this;
Object.defineProperty(exports, "__esModule", { value: true });
var TaoBaoNet_1 = __webpack_require__(/*! ../TaoBaoNet */ "./src/TaoBaoNet.ts");
var global_1 = __webpack_require__(/*! ../datas/global */ "./src/datas/global.ts");
exports.default = (function () { return __awaiter(_this, void 0, void 0, function () {
var params;
return __generator(this, function (_a) {
switch (_a.label) {
case 0:
params = {
activityId: global_1.getActivityId(),
};
return [4, TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.filaStarGetVipInfo, params)];
case 1: return [2, _a.sent()];
}
});
}); });
/***/ }), /***/ }),
/***/ "./src/ctrls/receiveObjectPrize.ts": /***/ "./src/ctrls/receiveObjectPrize.ts":
...@@ -5339,6 +5471,17 @@ var LogType; ...@@ -5339,6 +5471,17 @@ var LogType;
LogType["visit"] = "visit"; LogType["visit"] = "visit";
LogType["startGameSuccess"] = "startGameSuccess"; LogType["startGameSuccess"] = "startGameSuccess";
LogType["clickNewbieIcon"] = "clickNewbieIcon"; LogType["clickNewbieIcon"] = "clickNewbieIcon";
LogType["addNewMember"] = "addNewMember";
LogType["clickInvitation"] = "clickInvitation";
LogType["sharePageVisit"] = "sharePageVisit";
LogType["clickAssistBtn"] = "clickAssistBtn";
LogType["assisSuccess"] = "assisSuccess";
LogType["visitFavorShop"] = "visitFavorShop";
LogType["favorShop"] = "favorShop";
LogType["completeTaskJionMember"] = "completeTaskJionMember";
LogType["browseGoods"] = "browseGoods";
LogType["visitOldMember"] = "visitOldMember";
LogType["playGameMember"] = "playGameMember";
})(LogType || (LogType = {})); })(LogType || (LogType = {}));
exports.default = LogType; exports.default = LogType;
...@@ -5449,6 +5592,37 @@ exports.getNewbieLink = function () { ...@@ -5449,6 +5592,37 @@ exports.getNewbieLink = function () {
}; };
/***/ }),
/***/ "./src/datas/rankFlag.ts":
/*!*******************************!*\
!*** ./src/datas/rankFlag.ts ***!
\*******************************/
/*! no static exports found */
/***/ (function(module, exports, __webpack_require__) {
"use strict";
Object.defineProperty(exports, "__esModule", { value: true });
var key = 'rankFlagKey';
exports.getRankFlag = function () {
return my ?
my.getStorageSync({ key: key }).data != "false" :
localStorage.getItem(key) != "false";
};
exports.setRankFlag = function (v) {
if (my) {
my.setStorageSync({
key: key,
data: v ? "true" : "false"
});
}
else {
localStorage.setItem(key, v ? "true" : "false");
}
};
/***/ }), /***/ }),
/***/ "./src/datas/transRank.ts": /***/ "./src/datas/transRank.ts":
...@@ -7910,6 +8084,7 @@ var Panel_1 = __webpack_require__(/*! ../../module/views/Panel */ "./module/view ...@@ -7910,6 +8084,7 @@ var Panel_1 = __webpack_require__(/*! ../../module/views/Panel */ "./module/view
var transRank_1 = __webpack_require__(/*! ../datas/transRank */ "./src/datas/transRank.ts"); var transRank_1 = __webpack_require__(/*! ../datas/transRank */ "./src/datas/transRank.ts");
var Tools_1 = __webpack_require__(/*! ../Tools */ "./src/Tools.ts"); var Tools_1 = __webpack_require__(/*! ../Tools */ "./src/Tools.ts");
var TipPanel_1 = __webpack_require__(/*! ./TipPanel */ "./src/panels/TipPanel.ts"); var TipPanel_1 = __webpack_require__(/*! ./TipPanel */ "./src/panels/TipPanel.ts");
var TaoBaoNet_1 = __webpack_require__(/*! ../TaoBaoNet */ "./src/TaoBaoNet.ts");
var GameOverPanel = (function (_super) { var GameOverPanel = (function (_super) {
__extends(GameOverPanel, _super); __extends(GameOverPanel, _super);
function GameOverPanel() { function GameOverPanel() {
...@@ -7920,12 +8095,28 @@ var GameOverPanel = (function (_super) { ...@@ -7920,12 +8095,28 @@ var GameOverPanel = (function (_super) {
this.addChild(bg); this.addChild(bg);
TipPanel_1.centerImage(bg); TipPanel_1.centerImage(bg);
var _a = this.data, score = _a.score, totalScore = _a.totalScore, rank = _a.rank; var _a = this.data, score = _a.score, totalScore = _a.totalScore, rank = _a.rank;
var scoreTxt = new FYGE.TextField(); var scoreTxt = Tools_1.Tool.getText("", 45, '#091631', FYGE.TEXT_ALIGN.CENTER, 287 + 100);
scoreTxt.text = "score:" + score + " totalScore:" + totalScore + " rank:" + transRank_1.default(rank) + " "; scoreTxt.text = score + "\u5206";
scoreTxt.size = 30;
scoreTxt.fillColor = "#000";
bg.addChild(scoreTxt); bg.addChild(scoreTxt);
scoreTxt.y = 300; scoreTxt.bold = true;
scoreTxt.y = 217;
scoreTxt.x = 0 - 50;
var score2Txt = Tools_1.Tool.getText("", 45, '#b30000', FYGE.TEXT_ALIGN.CENTER, 301 + 100);
score2Txt.text = totalScore + "\u5206";
bg.addChild(score2Txt);
score2Txt.bold = true;
score2Txt.y = 217;
score2Txt.x = 316 - 50;
var rankLimit = TaoBaoNet_1.getTbData(TaoBaoNet_1.TbNetName.filaStarGetActivityBaseInfoById).data.rankLimit;
var rankTxt = Tools_1.Tool.getText("", 80, '#091631', FYGE.TEXT_ALIGN.CENTER, bg.width);
rankTxt.text = "" + transRank_1.default(rank);
rankTxt.bold = true;
bg.addChild(rankTxt);
rankTxt.y = 424;
var tips = Tools_1.Tool.getText("", 34, '#091631', FYGE.TEXT_ALIGN.CENTER, bg.width);
tips.text = "\u699C\u5355\u6392\u540D\u524D" + rankLimit + "\u540D\uFF0C\u5747\u53EF\u83B7\u5F97\u5956\u52B1\u54E6~ ";
bg.addChild(tips);
tips.y = 521;
this.closeBtn = new FYGE.Button(RES_1.RES.getRes("comCloseBtn.png")); this.closeBtn = new FYGE.Button(RES_1.RES.getRes("comCloseBtn.png"));
bg.addChild(this.closeBtn); bg.addChild(this.closeBtn);
TipPanel_1.posImage(this.closeBtn, 0, -74); TipPanel_1.posImage(this.closeBtn, 0, -74);
...@@ -7982,10 +8173,46 @@ var __extends = (this && this.__extends) || (function () { ...@@ -7982,10 +8173,46 @@ var __extends = (this && this.__extends) || (function () {
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); 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 }); Object.defineProperty(exports, "__esModule", { value: true });
var Tools_1 = __webpack_require__(/*! ../Tools */ "./src/Tools.ts"); var Tools_1 = __webpack_require__(/*! ../Tools */ "./src/Tools.ts");
var Panel_1 = __webpack_require__(/*! ../../module/views/Panel */ "./module/views/Panel.ts"); var Panel_1 = __webpack_require__(/*! ../../module/views/Panel */ "./module/views/Panel.ts");
var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts"); var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts");
var receiveTaskRewards_1 = __webpack_require__(/*! ../ctrls/receiveTaskRewards */ "./src/ctrls/receiveTaskRewards.ts");
var InviteInfoPanel = (function (_super) { var InviteInfoPanel = (function (_super) {
__extends(InviteInfoPanel, _super); __extends(InviteInfoPanel, _super);
function InviteInfoPanel() { function InviteInfoPanel() {
...@@ -7999,25 +8226,37 @@ var InviteInfoPanel = (function (_super) { ...@@ -7999,25 +8226,37 @@ var InviteInfoPanel = (function (_super) {
configurable: true configurable: true
}); });
InviteInfoPanel.prototype.initUi = function () { InviteInfoPanel.prototype.initUi = function () {
var inviteInfoBG = this._inviteInfoBG = Tools_1.Tool.getSprite("inviteInfoBG.png"); return __awaiter(this, void 0, void 0, function () {
inviteInfoBG.position.set((750 - inviteInfoBG.width) / 2, 430); var inviteInfoBG, peopleText, timeText, _a, success, message, data;
var peopleText = this._peopleText = Tools_1.Tool.getText("", 36, '#091631'); return __generator(this, function (_b) {
peopleText.textWidth = inviteInfoBG.width; switch (_b.label) {
peopleText.textAlign = FYGE.TEXT_ALIGN.CENTER; case 0:
peopleText.position.set(0, 200); inviteInfoBG = this._inviteInfoBG = Tools_1.Tool.getSprite("inviteInfoBG.png");
inviteInfoBG.addChild(peopleText); inviteInfoBG.position.set((750 - inviteInfoBG.width) / 2, 430);
var timeText = this._timeText = Tools_1.Tool.getText("", 36, '#091631'); peopleText = this._peopleText = Tools_1.Tool.getText("", 36, '#091631');
timeText.textWidth = inviteInfoBG.width; peopleText.textWidth = inviteInfoBG.width;
timeText.textAlign = FYGE.TEXT_ALIGN.CENTER; peopleText.textAlign = FYGE.TEXT_ALIGN.CENTER;
timeText.position.set(0, 260); peopleText.position.set(0, 200);
inviteInfoBG.addChild(timeText); inviteInfoBG.addChild(peopleText);
this.addChild(inviteInfoBG); timeText = this._timeText = Tools_1.Tool.getText("", 36, '#091631');
this.closeBtn = new FYGE.Button(RES_1.RES.getRes("comCloseBtn.png")); timeText.textWidth = inviteInfoBG.width;
this.closeBtn.position.set(625, 360); timeText.textAlign = FYGE.TEXT_ALIGN.CENTER;
this.addChild(this.closeBtn); timeText.position.set(0, 260);
this.knowBtn = new FYGE.Button(RES_1.RES.getRes("iKnowBtn.png")); inviteInfoBG.addChild(timeText);
this.knowBtn.position.set((inviteInfoBG.width - this.knowBtn.width) / 2, 400); this.addChild(inviteInfoBG);
inviteInfoBG.addChild(this.knowBtn); this.closeBtn = new FYGE.Button(RES_1.RES.getRes("comCloseBtn.png"));
this.closeBtn.position.set(625, 360);
this.addChild(this.closeBtn);
this.knowBtn = new FYGE.Button(RES_1.RES.getRes("iKnowBtn.png"));
this.knowBtn.position.set((inviteInfoBG.width - this.knowBtn.width) / 2, 400);
inviteInfoBG.addChild(this.knowBtn);
return [4, receiveTaskRewards_1.default('invites')];
case 1:
_a = _b.sent(), success = _a.success, message = _a.message, data = _a.data;
return [2];
}
});
});
}; };
InviteInfoPanel.prototype.start = function (data) { InviteInfoPanel.prototype.start = function (data) {
_super.prototype.start.call(this); _super.prototype.start.call(this);
...@@ -8077,12 +8316,12 @@ var NoPrizePanel = (function (_super) { ...@@ -8077,12 +8316,12 @@ var NoPrizePanel = (function (_super) {
var bg = Tools_1.Tool.getSprite("noprizePanelBg.png"); var bg = Tools_1.Tool.getSprite("noprizePanelBg.png");
TipPanel_1.centerImage(bg); TipPanel_1.centerImage(bg);
this.addChild(bg); this.addChild(bg);
var content = "my rank:" + transRank_1.default(rank); var content = "" + transRank_1.default(rank);
var text = Tools_1.Tool.getText(content, 30, '#091631', FYGE.TEXT_ALIGN.CENTER); var text = Tools_1.Tool.getText(content, 80, '#091631', FYGE.TEXT_ALIGN.CENTER, bg.width);
text.lineType = FYGE.TEXT_lINETYPE.MULTI;
bg.addChild(text); bg.addChild(text);
text.bold = true;
text.y = 163 + 70; text.y = 163 + 70;
text.x = 82; text.x = 0;
this.closeBtn = new FYGE.Button(RES_1.RES.getRes("comCloseBtn.png")); this.closeBtn = new FYGE.Button(RES_1.RES.getRes("comCloseBtn.png"));
bg.addChild(this.closeBtn); bg.addChild(this.closeBtn);
TipPanel_1.posImage(this.closeBtn, 0, -74); TipPanel_1.posImage(this.closeBtn, 0, -74);
...@@ -8163,22 +8402,25 @@ var PrizePanel = (function (_super) { ...@@ -8163,22 +8402,25 @@ var PrizePanel = (function (_super) {
var bg = Tools_1.Tool.getSprite("prizePanelBg.png"); var bg = Tools_1.Tool.getSprite("prizePanelBg.png");
TipPanel_1.centerImage(bg); TipPanel_1.centerImage(bg);
this.addChild(bg); this.addChild(bg);
var content = "my rank:" + rank + " prize name:" + name; var rankText = Tools_1.Tool.getText("" + rank, 80, '#091631', FYGE.TEXT_ALIGN.CENTER, bg.width);
var text = Tools_1.Tool.getText(content, 30, '#091631', FYGE.TEXT_ALIGN.CENTER); bg.addChild(rankText);
text.lineType = FYGE.TEXT_lINETYPE.MULTI; rankText.bold = true;
bg.addChild(text); rankText.y = 186;
text.y = 163 + 30; rankText.x = 0;
text.x = 82; var awardText = Tools_1.Tool.getText("\u83B7\u5F97" + name, 24, '#091631', FYGE.TEXT_ALIGN.CENTER, bg.width);
var text2 = Tools_1.Tool.getText('可在”我的奖品“中查看并领取', 20, '#091631', FYGE.TEXT_ALIGN.CENTER); bg.addChild(awardText);
awardText.y = 271;
awardText.x = 0;
var text2 = Tools_1.Tool.getText('可在”我的奖品“中查看并领取', 24, '#091631', FYGE.TEXT_ALIGN.CENTER, bg.width);
text2.lineType = FYGE.TEXT_lINETYPE.MULTI; text2.lineType = FYGE.TEXT_lINETYPE.MULTI;
bg.addChild(text2); bg.addChild(text2);
text2.y = 163 + 80; text2.y = 597;
text2.x = 82; text2.x = 0;
var award = new FYGE.Sprite(); var award = new FYGE.Sprite();
award.texture = FYGE.Texture.fromUrl(image + ("?" + Date.now())); award.texture = FYGE.Texture.fromUrl(image + ("?" + Date.now()));
award.texture.baseTexture.once('update', function () { award.texture.baseTexture.once('update', function () {
award.x = bg.width / 2 - award.texture.baseTexture.source.width / 2; award.x = bg.width / 2 - award.texture.baseTexture.source.width / 2;
award.y = 261; award.y = 314;
}, this); }, this);
bg.addChild(award); bg.addChild(award);
this.closeBtn = new FYGE.Button(RES_1.RES.getRes("comCloseBtn.png")); this.closeBtn = new FYGE.Button(RES_1.RES.getRes("comCloseBtn.png"));
...@@ -8187,14 +8429,21 @@ var PrizePanel = (function (_super) { ...@@ -8187,14 +8429,21 @@ var PrizePanel = (function (_super) {
var imgKey = rank <= getDrawLimit() ? 'prizePanelBtn.png' : 'prizePanelBtnRecord.png'; var imgKey = rank <= getDrawLimit() ? 'prizePanelBtn.png' : 'prizePanelBtnRecord.png';
this.btn = new FYGE.Button(RES_1.RES.getRes(imgKey)); this.btn = new FYGE.Button(RES_1.RES.getRes(imgKey));
bg.addChild(this.btn); bg.addChild(this.btn);
TipPanel_1.posImage(this.btn, 'center', 539); TipPanel_1.posImage(this.btn, 'center', 644);
};
PrizePanel.prototype.onclick_closeBtn = function () {
var rank = this.data.rank;
this.hidePanel();
if (rank <= getDrawLimit()) {
ctrls_1.showPanel(Tip2Panel_1.Tip2Panel);
}
}; };
PrizePanel.prototype.initEvents = function () { PrizePanel.prototype.initEvents = function () {
_super.prototype.initEvents.call(this); this.closeBtn.addEventListener(FYGE.MouseEvent.CLICK, this.onclick_closeBtn, this);
this.btn.addEventListener(FYGE.MouseEvent.CLICK, this.onclick_btn, this); this.btn.addEventListener(FYGE.MouseEvent.CLICK, this.onclick_btn, this);
}; };
PrizePanel.prototype.removeEvents = function () { PrizePanel.prototype.removeEvents = function () {
_super.prototype.removeEvents.call(this); this.closeBtn.removeEventListener(FYGE.MouseEvent.CLICK, this.onclick_closeBtn, this);
this.btn.removeEventListener(FYGE.MouseEvent.CLICK, this.onclick_btn, this); this.btn.removeEventListener(FYGE.MouseEvent.CLICK, this.onclick_btn, this);
}; };
Object.defineProperty(PrizePanel.prototype, "groupNames", { Object.defineProperty(PrizePanel.prototype, "groupNames", {
...@@ -8279,11 +8528,17 @@ var TASK_TYPE_1 = __webpack_require__(/*! ../datas/TASK_TYPE */ "./src/datas/TAS ...@@ -8279,11 +8528,17 @@ var TASK_TYPE_1 = __webpack_require__(/*! ../datas/TASK_TYPE */ "./src/datas/TAS
var Main_1 = __webpack_require__(/*! ../Main */ "./src/Main.ts"); var Main_1 = __webpack_require__(/*! ../Main */ "./src/Main.ts");
var doRecord_1 = __webpack_require__(/*! ../ctrls/doRecord */ "./src/ctrls/doRecord.ts"); var doRecord_1 = __webpack_require__(/*! ../ctrls/doRecord */ "./src/ctrls/doRecord.ts");
var receiveTaskRewards_1 = __webpack_require__(/*! ../ctrls/receiveTaskRewards */ "./src/ctrls/receiveTaskRewards.ts"); var receiveTaskRewards_1 = __webpack_require__(/*! ../ctrls/receiveTaskRewards */ "./src/ctrls/receiveTaskRewards.ts");
var sendLog_1 = __webpack_require__(/*! ../ctrls/sendLog */ "./src/ctrls/sendLog.ts");
var LogType_1 = __webpack_require__(/*! ../datas/LogType */ "./src/datas/LogType.ts");
var TaskPanel = (function (_super) { var TaskPanel = (function (_super) {
__extends(TaskPanel, _super); __extends(TaskPanel, _super);
function TaskPanel() { function TaskPanel() {
var _this = _super !== null && _super.apply(this, arguments) || this; var _this = _super !== null && _super.apply(this, arguments) || this;
_this._itemArray = []; _this._itemArray = [];
_this.memberState = {
initState: false,
changeState: false,
};
_this.taskImg = ["task1.png", "task2.png", "task3.png"]; _this.taskImg = ["task1.png", "task2.png", "task3.png"];
return _this; return _this;
} }
...@@ -8300,7 +8555,6 @@ var TaskPanel = (function (_super) { ...@@ -8300,7 +8555,6 @@ var TaskPanel = (function (_super) {
return __generator(this, function (_b) { return __generator(this, function (_b) {
switch (_b.label) { switch (_b.label) {
case 0: case 0:
this._mthis = this;
container = new FYGE.Container(); container = new FYGE.Container();
this.closeBtn = new FYGE.Button(RES_1.RES.getRes("comCloseBtn.png")); this.closeBtn = new FYGE.Button(RES_1.RES.getRes("comCloseBtn.png"));
this.closeBtn.position.set(650, -80); this.closeBtn.position.set(650, -80);
...@@ -8330,6 +8584,9 @@ var TaskPanel = (function (_super) { ...@@ -8330,6 +8584,9 @@ var TaskPanel = (function (_super) {
var tmpData = this.mData[index]; var tmpData = this.mData[index];
if (!tmpData) if (!tmpData)
return; return;
if (tmpData.taskType == TASK_TYPE_1.TASK_TYPE.MEMBER) {
this.memberState.initState = tmpData.isComplete;
}
var task = new TaskItem_1.TaskItem(this.mData[index], this.taskClick, this); var task = new TaskItem_1.TaskItem(this.mData[index], this.taskClick, this);
task.x = (this._taskBG.width - 700) / 2; task.x = (this._taskBG.width - 700) / 2;
task.y = index * 125 + 200; task.y = index * 125 + 200;
...@@ -8348,7 +8605,8 @@ var TaskPanel = (function (_super) { ...@@ -8348,7 +8605,8 @@ var TaskPanel = (function (_super) {
TaskPanel.prototype.favorShopBack = function (success) { TaskPanel.prototype.favorShopBack = function (success) {
Main_1.GDispatcher.removeEventListener(TaoBaoNet_1.TbNetName.favorShop, this.favorShopBack, this); Main_1.GDispatcher.removeEventListener(TaoBaoNet_1.TbNetName.favorShop, this.favorShopBack, this);
if (success) { if (success) {
this.clickComplete(TASK_TYPE_1.TASK_TYPE.MEMBER); sendLog_1.default(LogType_1.default.favorShop);
this.clickComplete(TASK_TYPE_1.TASK_TYPE.FOLLOW);
} }
else { else {
ctrls_1.showToast('关注店铺失败'); ctrls_1.showToast('关注店铺失败');
...@@ -8373,7 +8631,7 @@ var TaskPanel = (function (_super) { ...@@ -8373,7 +8631,7 @@ var TaskPanel = (function (_super) {
return [3, 7]; return [3, 7];
case 2: return [3, 7]; case 2: return [3, 7];
case 3: case 3:
if (taskData.taskType == TASK_TYPE_1.TASK_TYPE.FOLLOW) { if (taskData.taskType == TASK_TYPE_1.TASK_TYPE.MEMBER) {
ctrls_1.showToast('入会后记得返回领取哦~'); ctrls_1.showToast('入会后记得返回领取哦~');
Main_1.GDispatcher.addEventListener('onShow', tmpThis.followBack, tmpThis); Main_1.GDispatcher.addEventListener('onShow', tmpThis.followBack, tmpThis);
setTimeout(function () { setTimeout(function () {
...@@ -8381,14 +8639,16 @@ var TaskPanel = (function (_super) { ...@@ -8381,14 +8639,16 @@ var TaskPanel = (function (_super) {
}, 1000); }, 1000);
} }
if (taskData.taskType == TASK_TYPE_1.TASK_TYPE.BROWSE_GOOGS) { if (taskData.taskType == TASK_TYPE_1.TASK_TYPE.BROWSE_GOOGS) {
sendLog_1.default(LogType_1.default.browseGoods);
tmpThis.clickComplete(taskData.taskType); tmpThis.clickComplete(taskData.taskType);
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.navigateToOutside, { url: taskData.value }); TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.navigateToOutside, { url: taskData.value });
} }
if (taskData.taskType == TASK_TYPE_1.TASK_TYPE.MEMBER) { if (taskData.taskType == TASK_TYPE_1.TASK_TYPE.FOLLOW) {
Main_1.GDispatcher.addEventListener(TaoBaoNet_1.TbNetName.favorShop, tmpThis.favorShopBack, tmpThis); Main_1.GDispatcher.addEventListener(TaoBaoNet_1.TbNetName.favorShop, tmpThis.favorShopBack, tmpThis);
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.favorShop); TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.favorShop);
} }
if (!(taskData.taskType == TASK_TYPE_1.TASK_TYPE.INVITE)) return [3, 5]; if (!(taskData.taskType == TASK_TYPE_1.TASK_TYPE.INVITE)) return [3, 5];
sendLog_1.default(LogType_1.default.clickInvitation);
return [4, doRecord_1.default("share")]; return [4, doRecord_1.default("share")];
case 4: case 4:
_b.sent(); _b.sent();
...@@ -8423,6 +8683,14 @@ var TaskPanel = (function (_super) { ...@@ -8423,6 +8683,14 @@ var TaskPanel = (function (_super) {
tmpTaskData = data[index_1]; tmpTaskData = data[index_1];
if (tmpTaskData.taskType == tmpTask.getData().taskType) { if (tmpTaskData.taskType == tmpTask.getData().taskType) {
tmpTask.updateData(tmpTaskData); tmpTask.updateData(tmpTaskData);
if (tmpTaskData.taskType == TASK_TYPE_1.TASK_TYPE.MEMBER) {
this.memberState.changeState = tmpTaskData.isComplete;
if (!this.memberState.initState && this.memberState.changeState) {
sendLog_1.default(LogType_1.default.completeTaskJionMember);
sendLog_1.default(LogType_1.default.addNewMember);
this.memberState.initState = tmpTaskData.isComplete;
}
}
} }
} }
} }
...@@ -8516,6 +8784,41 @@ var __extends = (this && this.__extends) || (function () { ...@@ -8516,6 +8784,41 @@ var __extends = (this && this.__extends) || (function () {
d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __()); 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 }); Object.defineProperty(exports, "__esModule", { value: true });
var TaskPanel_1 = __webpack_require__(/*! ./TaskPanel */ "./src/panels/TaskPanel.ts"); var TaskPanel_1 = __webpack_require__(/*! ./TaskPanel */ "./src/panels/TaskPanel.ts");
var index_1 = __webpack_require__(/*! ./../../module/ctrls/index */ "./module/ctrls/index.ts"); var index_1 = __webpack_require__(/*! ./../../module/ctrls/index */ "./module/ctrls/index.ts");
...@@ -8535,15 +8838,21 @@ var TimePanel = (function (_super) { ...@@ -8535,15 +8838,21 @@ var TimePanel = (function (_super) {
configurable: true configurable: true
}); });
TimePanel.prototype.initUi = function () { TimePanel.prototype.initUi = function () {
var bg = Tools_1.Tool.getSprite("noTime.png"); return __awaiter(this, void 0, void 0, function () {
bg.position.set((750 - bg.width) / 2, 430); var bg;
this.addChild(bg); return __generator(this, function (_a) {
this.closeBtn = new FYGE.Button(RES_1.RES.getRes("comCloseBtn.png")); bg = Tools_1.Tool.getSprite("noTime.png");
this.closeBtn.position.set(625, 360); bg.position.set((750 - bg.width) / 2, 430);
this.addChild(this.closeBtn); this.addChild(bg);
this.goTaskBtn = new FYGE.Button(RES_1.RES.getRes("goTaskBtn.png")); this.closeBtn = new FYGE.Button(RES_1.RES.getRes("comCloseBtn.png"));
this.goTaskBtn.position.set((bg.width - this.goTaskBtn.width) / 2, 400); this.closeBtn.position.set(625, 360);
bg.addChild(this.goTaskBtn); this.addChild(this.closeBtn);
this.goTaskBtn = new FYGE.Button(RES_1.RES.getRes("goTaskBtn.png"));
this.goTaskBtn.position.set((bg.width - this.goTaskBtn.width) / 2, 400);
bg.addChild(this.goTaskBtn);
return [2];
});
});
}; };
TimePanel.prototype.start = function (data) { TimePanel.prototype.start = function (data) {
_super.prototype.start.call(this); _super.prototype.start.call(this);
...@@ -8642,16 +8951,16 @@ var Tip2Panel = (function (_super) { ...@@ -8642,16 +8951,16 @@ var Tip2Panel = (function (_super) {
this.addChild(ruleBg); this.addChild(ruleBg);
var _a = TaoBaoNet_1.getTbData(TaoBaoNet_1.TbNetName.filaStarGetActivityBaseInfoById).data, drawLimit = _a.drawLimit, image = _a.drawPrize.image; var _a = TaoBaoNet_1.getTbData(TaoBaoNet_1.TbNetName.filaStarGetActivityBaseInfoById).data, drawLimit = _a.drawLimit, image = _a.drawPrize.image;
var content = "\u6392\u540D\u524D" + drawLimit + "\uFF0C\u989D\u5916\u83B7\u5F97\u62BD\u53D6\u5764\u5764\u4EB2\u7B14\u7B7E\u540D\u673A\u4F1A\uFF01"; var content = "\u6392\u540D\u524D" + drawLimit + "\uFF0C\u989D\u5916\u83B7\u5F97\u62BD\u53D6\u5764\u5764\u4EB2\u7B14\u7B7E\u540D\u673A\u4F1A\uFF01";
var text = Tools_1.Tool.getText(content, 30, '#091631', FYGE.TEXT_ALIGN.CENTER); var text = Tools_1.Tool.getText(content, 30, '#091631', FYGE.TEXT_ALIGN.LEFT, 493);
text.lineType = FYGE.TEXT_lINETYPE.MULTI; text.lineType = FYGE.TEXT_lINETYPE.MULTI;
ruleBg.addChild(text); ruleBg.addChild(text);
text.y = 163; text.y = 163;
text.x = 82; text.x = 67;
var award = new FYGE.Sprite(); var award = new FYGE.Sprite();
award.texture = FYGE.Texture.fromUrl(image + ("?" + Date.now())); award.texture = FYGE.Texture.fromUrl(image + ("?" + Date.now()));
award.texture.baseTexture.once('update', function () { award.texture.baseTexture.once('update', function () {
award.x = ruleBg.width / 2 - award.texture.baseTexture.source.width / 2; award.x = ruleBg.width / 2 - award.texture.baseTexture.source.width / 2;
award.y = 261; award.y = 265;
}, this); }, this);
ruleBg.addChild(award); ruleBg.addChild(award);
this.closeBtn = new FYGE.Button(RES_1.RES.getRes("comCloseBtn.png")); this.closeBtn = new FYGE.Button(RES_1.RES.getRes("comCloseBtn.png"));
...@@ -8718,6 +9027,7 @@ var Tools_1 = __webpack_require__(/*! ../Tools */ "./src/Tools.ts"); ...@@ -8718,6 +9027,7 @@ var Tools_1 = __webpack_require__(/*! ../Tools */ "./src/Tools.ts");
var TipPanel_1 = __webpack_require__(/*! ./TipPanel */ "./src/panels/TipPanel.ts"); var TipPanel_1 = __webpack_require__(/*! ./TipPanel */ "./src/panels/TipPanel.ts");
var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts"); var ctrls_1 = __webpack_require__(/*! ../../module/ctrls */ "./module/ctrls/index.ts");
var rankPanel_1 = __webpack_require__(/*! ./rankPanel */ "./src/panels/rankPanel.ts"); var rankPanel_1 = __webpack_require__(/*! ./rankPanel */ "./src/panels/rankPanel.ts");
var getCaixukunTime_1 = __webpack_require__(/*! ../ctrls/getCaixukunTime */ "./src/ctrls/getCaixukunTime.ts");
var TipFailPanel = (function (_super) { var TipFailPanel = (function (_super) {
__extends(TipFailPanel, _super); __extends(TipFailPanel, _super);
function TipFailPanel() { function TipFailPanel() {
...@@ -8727,12 +9037,12 @@ var TipFailPanel = (function (_super) { ...@@ -8727,12 +9037,12 @@ var TipFailPanel = (function (_super) {
var ruleBg = Tools_1.Tool.getSprite("tipFailPanelBg.png"); var ruleBg = Tools_1.Tool.getSprite("tipFailPanelBg.png");
TipPanel_1.centerImage(ruleBg); TipPanel_1.centerImage(ruleBg);
this.addChild(ruleBg); this.addChild(ruleBg);
var content = "\u8FD0\u6C14\u5DEE\u4E86\u4E00\u4E22\u4E22\n\u4F60\u4E0E\u4EE3\u8A00\u4EBA\u4EB2\u7B14\u7B7E\u540D\u64E6\u80A9\u800C\u8FC7"; var content = "\u8FD0\u6C14\u5DEE\u4E86\u4E00\u4E22\u4E22\n\u4F60\u4E0E" + getCaixukunTime_1.getCaixukunName() + "\u4EB2\u7B14\u7B7E\u540D\u64E6\u80A9\u800C\u8FC7";
var text = Tools_1.Tool.getText(content, 30, '#091631', FYGE.TEXT_ALIGN.CENTER); var text = Tools_1.Tool.getText(content, 30, '#091631', FYGE.TEXT_ALIGN.CENTER, ruleBg.width);
text.lineType = FYGE.TEXT_lINETYPE.MULTI; text.lineType = FYGE.TEXT_lINETYPE.MULTI;
ruleBg.addChild(text); ruleBg.addChild(text);
text.y = 227; text.y = 227;
text.x = 121; text.x = 0;
this.closeBtn = new FYGE.Button(RES_1.RES.getRes("comCloseBtn.png")); this.closeBtn = new FYGE.Button(RES_1.RES.getRes("comCloseBtn.png"));
ruleBg.addChild(this.closeBtn); ruleBg.addChild(this.closeBtn);
TipPanel_1.posImage(this.closeBtn, 0, -74); TipPanel_1.posImage(this.closeBtn, 0, -74);
...@@ -8796,6 +9106,7 @@ var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts"); ...@@ -8796,6 +9106,7 @@ var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts");
var Panel_1 = __webpack_require__(/*! ../../module/views/Panel */ "./module/views/Panel.ts"); var Panel_1 = __webpack_require__(/*! ../../module/views/Panel */ "./module/views/Panel.ts");
var TaoBaoNet_1 = __webpack_require__(/*! ../TaoBaoNet */ "./src/TaoBaoNet.ts"); var TaoBaoNet_1 = __webpack_require__(/*! ../TaoBaoNet */ "./src/TaoBaoNet.ts");
var Tools_1 = __webpack_require__(/*! ../Tools */ "./src/Tools.ts"); var Tools_1 = __webpack_require__(/*! ../Tools */ "./src/Tools.ts");
var getCaixukunTime_1 = __webpack_require__(/*! ../ctrls/getCaixukunTime */ "./src/ctrls/getCaixukunTime.ts");
exports.centerImage = function (img) { exports.centerImage = function (img) {
img.x = 750 / 2 - img.width / 2; img.x = 750 / 2 - img.width / 2;
img.y = 1624 / 2 - img.height / 2; img.y = 1624 / 2 - img.height / 2;
...@@ -8818,12 +9129,12 @@ var TipPanel = (function (_super) { ...@@ -8818,12 +9129,12 @@ var TipPanel = (function (_super) {
exports.centerImage(ruleBg); exports.centerImage(ruleBg);
this.addChild(ruleBg); this.addChild(ruleBg);
var _a = TaoBaoNet_1.getTbData(TaoBaoNet_1.TbNetName.filaStarGetActivityBaseInfoById).data, drawLimit = _a.drawLimit, image = _a.drawPrize.image; var _a = TaoBaoNet_1.getTbData(TaoBaoNet_1.TbNetName.filaStarGetActivityBaseInfoById).data, drawLimit = _a.drawLimit, image = _a.drawPrize.image;
var content = "\u6D3B\u52A8\u7ED3\u675F\u6392\u540D\u8FBE\u5230\u524D" + drawLimit + "\u540D\u7684\u7528\u6237\uFF0C\n\u6709\u673A\u4F1A\u62BD\u53D6\u4EE3\u8A00\u4EBA\u4EB2\u7B14\u7B7E\u540D\uFF01"; var content = "\u6D3B\u52A8\u7ED3\u675F\u6392\u540D\u8FBE\u5230\u524D" + drawLimit + "\u540D\u7684\u7528\u6237\uFF0C\n\u6709\u673A\u4F1A\u62BD\u53D6" + getCaixukunTime_1.getCaixukunName() + "\u4EB2\u7B14\u7B7E\u540D\uFF01";
var text = Tools_1.Tool.getText(content, 30, '#091631', FYGE.TEXT_ALIGN.CENTER); var text = Tools_1.Tool.getText(content, 30, '#091631', FYGE.TEXT_ALIGN.CENTER, ruleBg.width);
text.lineType = FYGE.TEXT_lINETYPE.MULTI; text.lineType = FYGE.TEXT_lINETYPE.MULTI;
ruleBg.addChild(text); ruleBg.addChild(text);
text.y = 163; text.y = 163;
text.x = 82; text.x = 0;
var award = new FYGE.Sprite(); var award = new FYGE.Sprite();
award.texture = FYGE.Texture.fromUrl(image + ("?" + Date.now())); award.texture = FYGE.Texture.fromUrl(image + ("?" + Date.now()));
award.texture.baseTexture.once('update', function () { award.texture.baseTexture.once('update', function () {
...@@ -8961,25 +9272,34 @@ var __extends = (this && this.__extends) || (function () { ...@@ -8961,25 +9272,34 @@ var __extends = (this && this.__extends) || (function () {
})(); })();
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
var Tools_1 = __webpack_require__(/*! ../../Tools */ "./src/Tools.ts"); var Tools_1 = __webpack_require__(/*! ../../Tools */ "./src/Tools.ts");
var getRankStr = function (str) {
var list = str.split('-');
if (list[0] == list[1])
return list[0];
return str;
};
var PrizeItem = (function (_super) { var PrizeItem = (function (_super) {
__extends(PrizeItem, _super); __extends(PrizeItem, _super);
function PrizeItem() { function PrizeItem() {
var _this = _super.call(this) || this; var _this = _super.call(this) || this;
var container = new FYGE.Container(); _this.prizeImg = Tools_1.Tool.getSprite("rank_placeholder.png");
container.y = 5; _this.prizeImg.width = 120;
_this.rank = Tools_1.Tool.getText("", 20, "#000"); _this.prizeImg.height = 120;
_this.rank.lineType = FYGE.TEXT_lINETYPE.MULTI; _this.addChild(_this.prizeImg);
container.addChild(_this.rank); _this.rank = Tools_1.Tool.getText("", 22, "#000", FYGE.TEXT_ALIGN.CENTER, 120);
_this.rank.x = 25; _this.addChild(_this.rank);
_this.rank.y = 110; _this.rank.x = 0;
_this.addChild(container); _this.rank.y = 133;
return _this; return _this;
} }
PrizeItem.prototype.initData = function (id, data) { PrizeItem.prototype.initData = function (id, data) {
if (data) { if (data) {
this.rank.text = data.name + " \n" + data.rank; this.prizeImg.texture = FYGE.Texture.from(data.image);
this.rank.text = "\u7B2C" + getRankStr(data.rank) + "\u540D";
} }
}; };
PrizeItem.W = 140;
PrizeItem.H = 183;
return PrizeItem; return PrizeItem;
}(FYGE.Sprite)); }(FYGE.Sprite));
exports.default = PrizeItem; exports.default = PrizeItem;
...@@ -9008,31 +9328,67 @@ var __extends = (this && this.__extends) || (function () { ...@@ -9008,31 +9328,67 @@ var __extends = (this && this.__extends) || (function () {
})(); })();
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
var Tools_1 = __webpack_require__(/*! ../../Tools */ "./src/Tools.ts"); var Tools_1 = __webpack_require__(/*! ../../Tools */ "./src/Tools.ts");
var RES_1 = __webpack_require__(/*! ../../../module/RES */ "./module/RES.ts");
var RankItem = (function (_super) { var RankItem = (function (_super) {
__extends(RankItem, _super); __extends(RankItem, _super);
function RankItem() { function RankItem() {
var _this = _super.call(this) || this; var _this = _super.call(this) || this;
_this.resRankIcon = ["numIcon1.png", "numIcon2.png", "numIcon3.png", "numIconOther.png"]; _this.resRankIcon = ["numIcon1.png", "numIcon2.png", "numIcon3.png", "numIconOther.png"];
var container = new FYGE.Container(); var line = Tools_1.Tool.getSprite("rankPanelLine.png");
container.y = 5; _this.addChild(line);
_this.rankText = Tools_1.Tool.getText("", 20, "#000"); line.y = RankItem.HEIGHT - line.height;
_this.rankText.x = 10; line.x = 16;
_this.rankText.y = 5; _this.createRankSprite(1);
_this.nickname = Tools_1.Tool.getText("", 20, "#000"); _this.createRankSprite(2);
_this.nickname.x = 50; _this.createRankSprite(3);
_this.score = Tools_1.Tool.getText("", 20, "#000"); _this.rankText = Tools_1.Tool.getText("", 27, "#091631", FYGE.TEXT_ALIGN.CENTER, 95);
_this.score.x = 320; _this.rankText.x = 12;
container.addChild(_this.rankText); _this.rankText.y = 35;
container.addChild(_this.nickname); _this.addChild(_this.rankText);
container.addChild(_this.score); _this.rankText.visible = false;
_this.addChild(container); _this.rankText.bold = true;
_this.nickname = Tools_1.Tool.getText("", 30, "#000", FYGE.TEXT_ALIGN.LEFT, 400);
_this.nickname.position.set(108, 27);
_this.score = Tools_1.Tool.getText("", 34, "#000", FYGE.TEXT_ALIGN.RIGHT, 580);
_this.score.position.set(0, 27);
_this.score.bold = true;
_this.addChild(_this.nickname);
_this.addChild(_this.score);
return _this; return _this;
} }
RankItem.prototype.createRankSprite = function (n) {
var s = new FYGE.Sprite(RES_1.RES.getRes("rankPanelIcon" + n + ".png"));
this.addChild(s);
s.x = 44;
s.y = RankItem.HEIGHT / 2 - 52 / 2;
s.visible = false;
this['s' + n] = s;
};
RankItem.prototype.updateIcon = function (rank) {
this["s1"].visible = false;
this["s2"].visible = false;
this["s3"].visible = false;
this["rankText"].visible = false;
if (rank <= 3) {
this.nickname.fillColor = this.score.fillColor = '#930001';
this["s" + rank].visible = true;
}
else {
this.nickname.fillColor = this.score.fillColor = '#091631';
this.rankText.visible = true;
}
};
RankItem.prototype.initData = function (id, data) { RankItem.prototype.initData = function (id, data) {
if (data) { if (data) {
this.rankText.text = "id:" + id + " userNick:" + data.userNick + " totalScore:" + data.totalScore + " "; var rank = id + 1;
this.updateIcon(rank);
this.rankText.text = rank + '';
this.score.text = data.totalScore + "\u5206";
this.nickname.text = "" + data.userNick;
} }
}; };
RankItem.WIDTH = 620;
RankItem.HEIGHT = 85;
return RankItem; return RankItem;
}(FYGE.Sprite)); }(FYGE.Sprite));
exports.default = RankItem; exports.default = RankItem;
...@@ -9098,52 +9454,76 @@ Object.defineProperty(exports, "__esModule", { value: true }); ...@@ -9098,52 +9454,76 @@ Object.defineProperty(exports, "__esModule", { value: true });
var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts"); var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts");
var Panel_1 = __webpack_require__(/*! ../../module/views/Panel */ "./module/views/Panel.ts"); var Panel_1 = __webpack_require__(/*! ../../module/views/Panel */ "./module/views/Panel.ts");
var getRankList_1 = __webpack_require__(/*! ../ctrls/getRankList */ "./src/ctrls/getRankList.ts"); var getRankList_1 = __webpack_require__(/*! ../ctrls/getRankList */ "./src/ctrls/getRankList.ts");
var global_1 = __webpack_require__(/*! ../datas/global */ "./src/datas/global.ts");
var Tools_1 = __webpack_require__(/*! ../Tools */ "./src/Tools.ts"); var Tools_1 = __webpack_require__(/*! ../Tools */ "./src/Tools.ts");
var RankItem_1 = __webpack_require__(/*! ./rank/RankItem */ "./src/panels/rank/RankItem.ts");
var PrizeItem_1 = __webpack_require__(/*! ./rank/PrizeItem */ "./src/panels/rank/PrizeItem.ts"); var PrizeItem_1 = __webpack_require__(/*! ./rank/PrizeItem */ "./src/panels/rank/PrizeItem.ts");
var RankItem_1 = __webpack_require__(/*! ./rank/RankItem */ "./src/panels/rank/RankItem.ts");
var TipPanel_1 = __webpack_require__(/*! ./TipPanel */ "./src/panels/TipPanel.ts"); var TipPanel_1 = __webpack_require__(/*! ./TipPanel */ "./src/panels/TipPanel.ts");
var global_1 = __webpack_require__(/*! ../datas/global */ "./src/datas/global.ts"); var transRank_1 = __webpack_require__(/*! ../datas/transRank */ "./src/datas/transRank.ts");
var getTimeNum = function (n) {
return n >= 10 ? n : "0" + n;
};
var getDateStr = function () {
var date = new Date(global_1.getEndTime());
var yy = date.getFullYear();
var mm = date.getMonth() + 1;
var dd = date.getDate();
var h = date.getHours();
var m = date.getMinutes();
var s = date.getSeconds();
return getTimeNum(mm) + "\u6708" + getTimeNum(dd) + "\u65E5" + getTimeNum(h) + "\u65F6" + getTimeNum(m) + "\u5206" + getTimeNum(s) + "\u79D2";
};
var RankPanel = (function (_super) { var RankPanel = (function (_super) {
__extends(RankPanel, _super); __extends(RankPanel, _super);
function RankPanel() { function RankPanel() {
return _super !== null && _super.apply(this, arguments) || this; return _super !== null && _super.apply(this, arguments) || this;
} }
RankPanel.prototype.initUi = function () { RankPanel.prototype.initUi = function () {
var ruleBg = Tools_1.Tool.getSprite("rankPanelBg.png");
TipPanel_1.centerImage(ruleBg);
this.addChild(ruleBg);
var text = Tools_1.Tool.getText('', 24, '#091631', FYGE.TEXT_ALIGN.LEFT, 540);
text.lineType = FYGE.TEXT_lINETYPE.MULTI;
text.y = 150;
text.x = 20;
ruleBg.addChild(text);
this.myInfoTxt = text;
var text2 = Tools_1.Tool.getText('', 24, '#091631', FYGE.TEXT_ALIGN.LEFT);
text2.y = 250;
text2.x = 20;
ruleBg.addChild(text2);
text2.text = "\u6392\u884C\u699C\u5956\u52B1" + new Date(global_1.getEndTime()).toLocaleString() + "\u5F00\u5956";
this.list = new FYGE.ScrollList(RankItem_1.default, 405, 50, 450, 250);
this.list.y = 300;
ruleBg.addChild(this.list);
this.prizeList = new FYGE.ScrollList(PrizeItem_1.default, 220, 240, 220 * 2, 240, false);
this.prizeList.position.set(0, 700);
ruleBg.addChild(this.prizeList);
this.closeBtn = new FYGE.Button(RES_1.RES.getRes("comCloseBtn.png"));
this.closeBtn.position.set(625, 360);
this.addChild(this.closeBtn);
};
RankPanel.prototype.start = function (data) {
return __awaiter(this, void 0, void 0, function () { return __awaiter(this, void 0, void 0, function () {
var _a, totalScore, userNick, rank, list, prizeList; var ruleBg, nick, score, tips, _a, totalScore, userNick, rank, list, prizeList;
return __generator(this, function (_b) { return __generator(this, function (_b) {
switch (_b.label) { switch (_b.label) {
case 0: case 0:
_super.prototype.start.call(this); ruleBg = Tools_1.Tool.getSprite("rankPanelBg.png");
TipPanel_1.centerImage(ruleBg);
this.addChild(ruleBg);
nick = Tools_1.Tool.getText('', 30, '#091631', FYGE.TEXT_ALIGN.LEFT, 500);
nick.y = 173;
nick.x = 50;
nick.bold = true;
ruleBg.addChild(nick);
score = Tools_1.Tool.getText('', 34, '#091631', FYGE.TEXT_ALIGN.RIGHT, 580);
score.bold = true;
score.y = 173;
score.x = 0;
ruleBg.addChild(score);
tips = Tools_1.Tool.getText('', 30, '#091631', FYGE.TEXT_ALIGN.CENTER, ruleBg.width);
tips.y = 710;
tips.x = 0;
ruleBg.addChild(tips);
tips.text = "\u6392\u884C\u699C\u5956\u52B1" + getDateStr() + "\u5F00\u5956";
this.list = new FYGE.ScrollList(RankItem_1.default, RankItem_1.default.WIDTH, RankItem_1.default.HEIGHT, RankItem_1.default.WIDTH, RankItem_1.default.HEIGHT * 5);
this.list.y = 245;
ruleBg.addChild(this.list);
this.closeBtn = new FYGE.Button(RES_1.RES.getRes("comCloseBtn.png"));
ruleBg.addChild(this.closeBtn);
TipPanel_1.posImage(this.closeBtn, 0, -74);
return [4, getRankList_1.default()]; return [4, getRankList_1.default()];
case 1: case 1:
_a = (_b.sent()).data, totalScore = _a.totalScore, userNick = _a.userNick, rank = _a.rank, list = _a.list, prizeList = _a.prizeList; _a = (_b.sent()).data, totalScore = _a.totalScore, userNick = _a.userNick, rank = _a.rank, list = _a.list, prizeList = _a.prizeList;
this.myInfoTxt.text = "rank:" + rank + " userNick:" + userNick + " totalScore:" + totalScore; nick.text = transRank_1.default(rank) + " " + userNick;
score.text = totalScore + "\u5206";
this.prizeList = new FYGE.ScrollList(PrizeItem_1.default, PrizeItem_1.default.W, PrizeItem_1.default.H, 590, PrizeItem_1.default.H, false);
this.prizeList.position.set(30, 768);
ruleBg.addChild(this.prizeList);
if (prizeList.length == 1)
this.prizeList.x = 200 + 30 + 15;
if (prizeList.length == 2)
this.prizeList.x = 200 - 15;
if (prizeList.length == 3)
this.prizeList.x = 200 - 15 - 70;
if (prizeList.length == 4)
this.prizeList.x = 200 - 15 - 70 - 70;
this.list.updateData(list, true); this.list.updateData(list, true);
this.prizeList.updateData(prizeList, true); this.prizeList.updateData(prizeList, true);
return [2]; return [2];
...@@ -9151,6 +9531,14 @@ var RankPanel = (function (_super) { ...@@ -9151,6 +9531,14 @@ var RankPanel = (function (_super) {
}); });
}); });
}; };
RankPanel.prototype.start = function (data) {
return __awaiter(this, void 0, void 0, function () {
return __generator(this, function (_a) {
_super.prototype.start.call(this);
return [2];
});
});
};
RankPanel.prototype.initEvents = function () { RankPanel.prototype.initEvents = function () {
this.closeBtn.addEventListener(FYGE.MouseEvent.CLICK, this.onClick_closeBtn, this); this.closeBtn.addEventListener(FYGE.MouseEvent.CLICK, this.onClick_closeBtn, this);
}; };
...@@ -9341,6 +9729,7 @@ var TaskItem = (function (_super) { ...@@ -9341,6 +9729,7 @@ var TaskItem = (function (_super) {
return this.mData; return this.mData;
}; };
TaskItem.prototype.getResBtnName = function () { TaskItem.prototype.getResBtnName = function () {
console.log('任务Item处理', this.mData);
if (this.mData.isComplete && this.mData.waitReceive > 0) { if (this.mData.isComplete && this.mData.waitReceive > 0) {
this.mData.state = 'await'; this.mData.state = 'await';
return 'awaitGetBtn.png'; return 'awaitGetBtn.png';
...@@ -9361,7 +9750,7 @@ var TaskItem = (function (_super) { ...@@ -9361,7 +9750,7 @@ var TaskItem = (function (_super) {
parm.title = '邀请好友助力'; parm.title = '邀请好友助力';
parm.desc = '每邀请1位，游戏次数+1'; parm.desc = '每邀请1位，游戏次数+1';
break; break;
case TASK_TYPE_1.TASK_TYPE.MEMBER: case TASK_TYPE_1.TASK_TYPE.FOLLOW:
parm.title = '关注店铺'; parm.title = '关注店铺';
parm.desc = '游戏次数+1'; parm.desc = '游戏次数+1';
break; break;
...@@ -9369,7 +9758,7 @@ var TaskItem = (function (_super) { ...@@ -9369,7 +9758,7 @@ var TaskItem = (function (_super) {
parm.title = '浏览商品'; parm.title = '浏览商品';
parm.desc = '游戏次数+1'; parm.desc = '游戏次数+1';
break; break;
case TASK_TYPE_1.TASK_TYPE.FOLLOW: case TASK_TYPE_1.TASK_TYPE.MEMBER:
parm.title = '加入会员'; parm.title = '加入会员';
parm.desc = '游戏次数+1'; parm.desc = '游戏次数+1';
break; break;
...@@ -9444,12 +9833,18 @@ var __generator = (this && this.__generator) || function (thisArg, body) { ...@@ -9444,12 +9833,18 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
Object.defineProperty(exports, "__esModule", { value: true }); Object.defineProperty(exports, "__esModule", { value: true });
var toastCtrl_1 = __webpack_require__(/*! ./../../module/ctrls/toastCtrl */ "./module/ctrls/toastCtrl.ts"); var toastCtrl_1 = __webpack_require__(/*! ./../../module/ctrls/toastCtrl */ "./module/ctrls/toastCtrl.ts");
var Scene_1 = __webpack_require__(/*! ../../module/views/Scene */ "./module/views/Scene.ts"); var Scene_1 = __webpack_require__(/*! ../../module/views/Scene */ "./module/views/Scene.ts");
var Tools_1 = __webpack_require__(/*! ../Tools */ "./src/Tools.ts");
var layers_1 = __webpack_require__(/*! ../../module/views/layers */ "./module/views/layers.ts"); var layers_1 = __webpack_require__(/*! ../../module/views/layers */ "./module/views/layers.ts");
var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts"); var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts");
var doHelp_1 = __webpack_require__(/*! ../ctrls/doHelp */ "./src/ctrls/doHelp.ts"); var doHelp_1 = __webpack_require__(/*! ../ctrls/doHelp */ "./src/ctrls/doHelp.ts");
var TaoBaoNet_1 = __webpack_require__(/*! ../TaoBaoNet */ "./src/TaoBaoNet.ts"); var TaoBaoNet_1 = __webpack_require__(/*! ../TaoBaoNet */ "./src/TaoBaoNet.ts");
var Main_1 = __webpack_require__(/*! ../Main */ "./src/Main.ts");
var global_1 = __webpack_require__(/*! ../datas/global */ "./src/datas/global.ts"); var global_1 = __webpack_require__(/*! ../datas/global */ "./src/datas/global.ts");
var doRecord_1 = __webpack_require__(/*! ../ctrls/doRecord */ "./src/ctrls/doRecord.ts"); var doRecord_1 = __webpack_require__(/*! ../ctrls/doRecord */ "./src/ctrls/doRecord.ts");
var sendLog_1 = __webpack_require__(/*! ../ctrls/sendLog */ "./src/ctrls/sendLog.ts");
var LogType_1 = __webpack_require__(/*! ../datas/LogType */ "./src/datas/LogType.ts");
var getVipInfo_1 = __webpack_require__(/*! ../ctrls/getVipInfo */ "./src/ctrls/getVipInfo.ts");
var getCaixukunTime_1 = __webpack_require__(/*! ../ctrls/getCaixukunTime */ "./src/ctrls/getCaixukunTime.ts");
var AssistScene = (function (_super) { var AssistScene = (function (_super) {
__extends(AssistScene, _super); __extends(AssistScene, _super);
function AssistScene() { function AssistScene() {
...@@ -9462,11 +9857,16 @@ var AssistScene = (function (_super) { ...@@ -9462,11 +9857,16 @@ var AssistScene = (function (_super) {
}); });
AssistScene.prototype.initUi = function () { AssistScene.prototype.initUi = function () {
var _this = this; var _this = this;
sendLog_1.default(LogType_1.default.sharePageVisit);
this.y = -(1624 - layers_1.layers.stageHeight) / 2; this.y = -(1624 - layers_1.layers.stageHeight) / 2;
var assistBG = new FYGE.Sprite(RES_1.RES.getRes("assistBG.jpg")); var assistBG = new FYGE.Sprite(RES_1.RES.getRes("assistBG.jpg"));
assistBG.x = 0; assistBG.x = 0;
assistBG.y = 0; assistBG.y = 0;
this.addChild(assistBG); this.addChild(assistBG);
var hintTxt = Tools_1.Tool.getText("", 40, "#ffffff");
hintTxt.text = "\u52A9\u6211\u8D62" + getCaixukunTime_1.getCaixukunName() + "\u4EB2\u7B14\u7B7E\u540D";
hintTxt.position.set((750 - hintTxt.textWidth) / 2, 610);
this.addChild(hintTxt);
var assistBtn = this._assistBtn = new FYGE.Sprite(RES_1.RES.getRes("assistBtn.png")); var assistBtn = this._assistBtn = new FYGE.Sprite(RES_1.RES.getRes("assistBtn.png"));
assistBtn.anchorTexture.set(0.5, 0.5); assistBtn.anchorTexture.set(0.5, 0.5);
assistBtn.position.set(750 / 2, 1050); assistBtn.position.set(750 / 2, 1050);
...@@ -9491,15 +9891,23 @@ var AssistScene = (function (_super) { ...@@ -9491,15 +9891,23 @@ var AssistScene = (function (_super) {
}; };
AssistScene.prototype.assistClick = function () { AssistScene.prototype.assistClick = function () {
return __awaiter(this, void 0, void 0, function () { return __awaiter(this, void 0, void 0, function () {
var _a, success, data, code; var _a, success, data, code, message;
return __generator(this, function (_b) { return __generator(this, function (_b) {
switch (_b.label) { switch (_b.label) {
case 0: return [4, doRecord_1.default('help')]; case 0:
if (global_1.getBeforeStartTime()) {
return [2, toastCtrl_1.showToast('活动未开始')];
}
if (global_1.getAfterEndTime()) {
return [2, toastCtrl_1.showToast('活动已结束')];
}
sendLog_1.default(LogType_1.default.clickAssistBtn);
return [4, doRecord_1.default('help')];
case 1: case 1:
_b.sent(); _b.sent();
return [4, doHelp_1.default()]; return [4, doHelp_1.default()];
case 2: case 2:
_a = _b.sent(), success = _a.success, data = _a.data, code = _a.code; _a = _b.sent(), success = _a.success, data = _a.data, code = _a.code, message = _a.message;
if (success) { if (success) {
this.assistSuccessShow(); this.assistSuccessShow();
} }
...@@ -9512,10 +9920,10 @@ var AssistScene = (function (_super) { ...@@ -9512,10 +9920,10 @@ var AssistScene = (function (_super) {
toastCtrl_1.showToast('邀请码无效'); toastCtrl_1.showToast('邀请码无效');
} }
else if (code == "930003") { else if (code == "930003") {
toastCtrl_1.showToast('新入会会员才能助力哦'); this.assistFailShow();
} }
else { else {
this.assistFailShow(); toastCtrl_1.showToast(message);
} }
} }
return [2]; return [2];
...@@ -9546,14 +9954,31 @@ var AssistScene = (function (_super) { ...@@ -9546,14 +9954,31 @@ var AssistScene = (function (_super) {
joinMemberBtn.position.set((memberBG.width - joinMemberBtn.width) / 2, 300); joinMemberBtn.position.set((memberBG.width - joinMemberBtn.width) / 2, 300);
joinMemberBtn.addEventListener(FYGE.MouseEvent.CLICK, function () { joinMemberBtn.addEventListener(FYGE.MouseEvent.CLICK, function () {
console.log('加入会员'); console.log('加入会员');
Main_1.GDispatcher.addEventListener('onShow', _this.onShow, _this);
_this._joinVIPNode.visible = false; _this._joinVIPNode.visible = false;
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.navigateToOutside, { url: vipUrl }); TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.navigateToOutside, { url: vipUrl });
}, this); }, this);
memberBG.addChild(joinMemberBtn); memberBG.addChild(joinMemberBtn);
}; };
AssistScene.prototype.onShow = function () { AssistScene.prototype.onShow = function () {
return __awaiter(this, void 0, void 0, function () {
var _a, success, code, isVip;
return __generator(this, function (_b) {
switch (_b.label) {
case 0: return [4, getVipInfo_1.default()];
case 1:
_a = _b.sent(), success = _a.success, code = _a.code, isVip = _a.data.isVip;
if (isVip) {
this.assistClick();
}
return [2];
}
});
});
}; };
AssistScene.prototype.assistSuccessShow = function () { AssistScene.prototype.assistSuccessShow = function () {
toastCtrl_1.showToast("助力成功");
sendLog_1.default(LogType_1.default.assisSuccess);
this._goPlayBtn.visible = true; this._goPlayBtn.visible = true;
this._assistBtn.visible = false; this._assistBtn.visible = false;
var assistSuccess = new FYGE.Sprite(RES_1.RES.getRes("assistSuccess.png")); var assistSuccess = new FYGE.Sprite(RES_1.RES.getRes("assistSuccess.png"));
...@@ -9655,17 +10080,19 @@ var RecordScene = (function (_super) { ...@@ -9655,17 +10080,19 @@ var RecordScene = (function (_super) {
}); });
RecordScene.prototype.initUi = function () { RecordScene.prototype.initUi = function () {
return __awaiter(this, void 0, void 0, function () { return __awaiter(this, void 0, void 0, function () {
var startBg, title, tip, titleText, timeText, backBtn, _a, success, code, data, message, prizeList; var startBg, titleBG, tip, titleText, timeText, backBtn, _a, success, code, data, message, prizeList;
return __generator(this, function (_b) { return __generator(this, function (_b) {
switch (_b.label) { switch (_b.label) {
case 0: case 0:
_super.prototype.initUi.call(this); _super.prototype.initUi.call(this);
startBg = Tools_1.Tool.getRect(layers_1.layers.stageWidth, layers_1.layers.stageHeight, 0xe1eded); startBg = Tools_1.Tool.getRect(layers_1.layers.stageWidth, layers_1.layers.stageHeight, 0xe1eded);
title = Tools_1.Tool.getRect(layers_1.layers.stageWidth, 140, 0xc5d1d5); titleBG = new FYGE.Sprite(RES_1.RES.getRes('titleBG.png'));
titleBG.x = 0;
titleBG.y = -100;
this.addChild(startBg);
this.addChild(titleBG);
tip = Tools_1.Tool.getText("您还未中奖，快去游戏赢取大奖", 40); tip = Tools_1.Tool.getText("您还未中奖，快去游戏赢取大奖", 40);
titleText = Tools_1.Tool.getText("我的奖品", 48, "#091631"); titleText = Tools_1.Tool.getText("我的奖品", 48, "#091631");
this.addChild(startBg);
this.addChild(title);
this.addChild(tip); this.addChild(tip);
this.addChild(titleText); this.addChild(titleText);
titleText.x = 375 - titleText.textWidth / 2; titleText.x = 375 - titleText.textWidth / 2;
...@@ -9742,7 +10169,6 @@ var PrizeListItem = (function (_super) { ...@@ -9742,7 +10169,6 @@ var PrizeListItem = (function (_super) {
container.addChild(_this.img); container.addChild(_this.img);
container.addChild(_this.tip); container.addChild(_this.tip);
container.addChild(_this.btnImg); container.addChild(_this.btnImg);
container.addChild(_this.prizeTime);
container.addChild(_this.recordSceneLine); container.addChild(_this.recordSceneLine);
_this.addChild(container); _this.addChild(container);
_this.btnImg.once(FYGE.MouseEvent.CLICK, _this.onTap, _this); _this.btnImg.once(FYGE.MouseEvent.CLICK, _this.onTap, _this);
...@@ -9753,8 +10179,9 @@ var PrizeListItem = (function (_super) { ...@@ -9753,8 +10179,9 @@ var PrizeListItem = (function (_super) {
this.id = id; this.id = id;
this.itemData = data; this.itemData = data;
this.title.text = data.name; this.title.text = data.name;
this.tip.text = data.remark || ''; if (data.drawStatus == 4) {
this.prizeTime.text = data.exchangeDay; this.tip.text = data.remark || '';
}
this.tip.position.set(750 - this.tip.textWidth - 30, 160); this.tip.position.set(750 - this.tip.textWidth - 30, 160);
switch (data.drawStatus) { switch (data.drawStatus) {
case 1: case 1:
...@@ -9784,11 +10211,11 @@ var PrizeListItem = (function (_super) { ...@@ -9784,11 +10211,11 @@ var PrizeListItem = (function (_super) {
PrizeListItem.prototype.addRess = function (res) { PrizeListItem.prototype.addRess = function (res) {
if (res && res.data && res.data.success) { if (res && res.data && res.data.success) {
ctrls_1.showToast('领取成功'); ctrls_1.showToast('领取成功');
this.updatePrizeData();
} }
else { else {
ctrls_1.showToast('领取失败,请稍稍重试~'); ctrls_1.showToast('领取失败,请稍稍重试~');
} }
this.updatePrizeData();
}; };
PrizeListItem.prototype.onTap = function () { PrizeListItem.prototype.onTap = function () {
return __awaiter(this, void 0, void 0, function () { return __awaiter(this, void 0, void 0, function () {
...@@ -9811,11 +10238,11 @@ var PrizeListItem = (function (_super) { ...@@ -9811,11 +10238,11 @@ var PrizeListItem = (function (_super) {
result = _b.sent(); result = _b.sent();
if (result.success) { if (result.success) {
ctrls_1.showToast('领取成功'); ctrls_1.showToast('领取成功');
this.updatePrizeData();
} }
else { else {
ctrls_1.showToast(result.message); ctrls_1.showToast(result.message);
} }
this.updatePrizeData();
return [3, 5]; return [3, 5];
case 3: case 3:
Main_1.GDispatcher.addEventListener(TaoBaoNet_1.TbNetName.getUserAddress, this.addRess, this); Main_1.GDispatcher.addEventListener(TaoBaoNet_1.TbNetName.getUserAddress, this.addRess, this);
...@@ -9861,7 +10288,8 @@ function getDateTimeCH(shijianchuo) { ...@@ -9861,7 +10288,8 @@ function getDateTimeCH(shijianchuo) {
var d = time.getDate(); var d = time.getDate();
var h = time.getHours(); var h = time.getHours();
var mm = time.getMinutes(); var mm = time.getMinutes();
return "" + y + '.' + add0(m) + '.' + add0(d) + ' ' + add0(h) + ':' + add0(mm); var s = time.getSeconds();
return "" + y + '.' + add0(m) + '.' + add0(d) + ' ' + add0(h) + ':' + add0(mm) + ':' + add0(s);
} }
function add0(m) { function add0(m) {
return m < 10 ? '0' + m : m; return m < 10 ? '0' + m : m;
...@@ -10055,6 +10483,7 @@ var TaskPanel_1 = __webpack_require__(/*! ../panels/TaskPanel */ "./src/panels/T ...@@ -10055,6 +10483,7 @@ var TaskPanel_1 = __webpack_require__(/*! ../panels/TaskPanel */ "./src/panels/T
var rankPanel_1 = __webpack_require__(/*! ../panels/rankPanel */ "./src/panels/rankPanel.ts"); var rankPanel_1 = __webpack_require__(/*! ../panels/rankPanel */ "./src/panels/rankPanel.ts");
var getMyRankPrize_1 = __webpack_require__(/*! ../ctrls/getMyRankPrize */ "./src/ctrls/getMyRankPrize.ts"); var getMyRankPrize_1 = __webpack_require__(/*! ../ctrls/getMyRankPrize */ "./src/ctrls/getMyRankPrize.ts");
var TipPanel_1 = __webpack_require__(/*! ../panels/TipPanel */ "./src/panels/TipPanel.ts"); var TipPanel_1 = __webpack_require__(/*! ../panels/TipPanel */ "./src/panels/TipPanel.ts");
var TaoBaoNet_1 = __webpack_require__(/*! ../TaoBaoNet */ "./src/TaoBaoNet.ts");
var sendLog_1 = __webpack_require__(/*! ../ctrls/sendLog */ "./src/ctrls/sendLog.ts"); var sendLog_1 = __webpack_require__(/*! ../ctrls/sendLog */ "./src/ctrls/sendLog.ts");
var LogType_1 = __webpack_require__(/*! ../datas/LogType */ "./src/datas/LogType.ts"); var LogType_1 = __webpack_require__(/*! ../datas/LogType */ "./src/datas/LogType.ts");
var getInviteInfo_1 = __webpack_require__(/*! ../ctrls/getInviteInfo */ "./src/ctrls/getInviteInfo.ts"); var getInviteInfo_1 = __webpack_require__(/*! ../ctrls/getInviteInfo */ "./src/ctrls/getInviteInfo.ts");
...@@ -10063,13 +10492,15 @@ var getRankList_1 = __webpack_require__(/*! ../ctrls/getRankList */ "./src/ctrls ...@@ -10063,13 +10492,15 @@ var getRankList_1 = __webpack_require__(/*! ../ctrls/getRankList */ "./src/ctrls
var PrizePanel_1 = __webpack_require__(/*! ../panels/PrizePanel */ "./src/panels/PrizePanel.ts"); var PrizePanel_1 = __webpack_require__(/*! ../panels/PrizePanel */ "./src/panels/PrizePanel.ts");
var NoPrizePanel_1 = __webpack_require__(/*! ../panels/NoPrizePanel */ "./src/panels/NoPrizePanel.ts"); var NoPrizePanel_1 = __webpack_require__(/*! ../panels/NoPrizePanel */ "./src/panels/NoPrizePanel.ts");
var doGetExtraPrize_1 = __webpack_require__(/*! ../ctrls/doGetExtraPrize */ "./src/ctrls/doGetExtraPrize.ts"); var doGetExtraPrize_1 = __webpack_require__(/*! ../ctrls/doGetExtraPrize */ "./src/ctrls/doGetExtraPrize.ts");
var getVipInfo_1 = __webpack_require__(/*! ../ctrls/getVipInfo */ "./src/ctrls/getVipInfo.ts");
var rankFlag_1 = __webpack_require__(/*! ../datas/rankFlag */ "./src/datas/rankFlag.ts");
var getCaixukunTime_1 = __webpack_require__(/*! ../ctrls/getCaixukunTime */ "./src/ctrls/getCaixukunTime.ts");
exports.svgaPool = {}; exports.svgaPool = {};
var StartScene = (function (_super) { var StartScene = (function (_super) {
__extends(StartScene, _super); __extends(StartScene, _super);
function StartScene() { function StartScene() {
var _this = _super !== null && _super.apply(this, arguments) || this; var _this = _super !== null && _super.apply(this, arguments) || this;
_this.list = ['1000.png', '2000.png', '8000.png', 'revive.png']; _this.list = ['1000.png', '2000.png', '8000.png', 'revive.png'];
_this.isMusicPlay = true;
_this.onStartBtnClick = function () { return __awaiter(_this, void 0, void 0, function () { _this.onStartBtnClick = function () { return __awaiter(_this, void 0, void 0, function () {
var _a, success, code, id, message; var _a, success, code, id, message;
return __generator(this, function (_b) { return __generator(this, function (_b) {
...@@ -10090,6 +10521,7 @@ var StartScene = (function (_super) { ...@@ -10090,6 +10521,7 @@ var StartScene = (function (_super) {
case 1: case 1:
_a = _b.sent(), success = _a.success, code = _a.code, id = _a.data.id, message = _a.message; _a = _b.sent(), success = _a.success, code = _a.code, id = _a.data.id, message = _a.message;
if (success) { if (success) {
this.getVipInfo("playGame");
ctrls_1.changeScene(ShootPlanet_1.ShootPlanet); ctrls_1.changeScene(ShootPlanet_1.ShootPlanet);
sendLog_1.default(LogType_1.default.startGameSuccess); sendLog_1.default(LogType_1.default.startGameSuccess);
} }
...@@ -10098,6 +10530,10 @@ var StartScene = (function (_super) { ...@@ -10098,6 +10530,10 @@ var StartScene = (function (_super) {
}); });
}); }; }); };
_this.onRankBtnClick = function () { _this.onRankBtnClick = function () {
if (global_1.getBeforeStartTime()) {
ctrls_1.showToast('活动未开始');
return;
}
ctrls_1.showPanel(rankPanel_1.RankPanel); ctrls_1.showPanel(rankPanel_1.RankPanel);
}; };
_this.onDrawBtnClick = function () { return __awaiter(_this, void 0, void 0, function () { _this.onDrawBtnClick = function () { return __awaiter(_this, void 0, void 0, function () {
...@@ -10117,10 +10553,13 @@ var StartScene = (function (_super) { ...@@ -10117,10 +10553,13 @@ var StartScene = (function (_super) {
}); }; }); };
_this.onNewbieBtnClick = function () { return __awaiter(_this, void 0, void 0, function () { _this.onNewbieBtnClick = function () { return __awaiter(_this, void 0, void 0, function () {
return __generator(this, function (_a) { return __generator(this, function (_a) {
if (global_1.getBeforeStartTime()) {
return [2, ctrls_1.showToast('活动未开始')];
}
console.log('跳转新人礼链接'); console.log('跳转新人礼链接');
sendLog_1.default(LogType_1.default.clickNewbieIcon); sendLog_1.default(LogType_1.default.clickNewbieIcon);
setTimeout(function () { setTimeout(function () {
window.location.href = global_1.getNewbieLink(); TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.navigateToOutside, { url: global_1.getNewbieLink() });
}, 200); }, 200);
return [2]; return [2];
}); });
...@@ -10140,26 +10579,47 @@ var StartScene = (function (_super) { ...@@ -10140,26 +10579,47 @@ var StartScene = (function (_super) {
}; };
StartScene.prototype.start = function () { StartScene.prototype.start = function () {
return __awaiter(this, void 0, void 0, function () { return __awaiter(this, void 0, void 0, function () {
var btn, timeString, ruleBtn, recordBtn, musicBtn_Open, musicBtn_Close, rankBtn, drawBtn, newbieBtn, taskBtn, result; var btn, timeString, namestr, ruleBtn, recordBtn, rankBtn, drawbtnName, drawBtn, newbieBtn, taskBtn, result;
var _this = this;
return __generator(this, function (_a) { return __generator(this, function (_a) {
switch (_a.label) { switch (_a.label) {
case 0: case 0:
_super.prototype.start.call(this); _super.prototype.start.call(this);
if (global_1.getBeforeStartTime()) {
ctrls_1.showToast('活动未开始');
}
this.inviteInfoPanl(); this.inviteInfoPanl();
this.checkRankPrize(); this.checkRankPrize();
this.getVipInfo("visit");
if (global_1.getIsFocusShop()) {
sendLog_1.default(LogType_1.default.visitFavorShop);
}
btn = new FYGE.Button(RES_1.RES.getRes("startBtn.png")); btn = new FYGE.Button(RES_1.RES.getRes("startBtn.png"));
timeString = Tools_1.Tool.getText("", 26, "#ffffff"); timeString = Tools_1.Tool.getText("", 26, "#ffffff");
timeString.text = "免费次数:"; timeString.text = "免费次数:";
timeString.position.set(380, 925); timeString.position.set(380, 925);
this.addChild(timeString); this.addChild(timeString);
namestr = Tools_1.Tool.getText("", 40, "#ffffff", FYGE.TEXT_ALIGN.CENTER, 384);
namestr.lineType = FYGE.TEXT_lINETYPE.MULTI;
namestr.text = "\u950B\u5C1A\u529BMAX\n- \u8D62" + getCaixukunTime_1.getCaixukunName() + "\u7B7E\u540D -";
namestr.position.set(257, 777);
this.addChild(namestr);
this.times = Tools_1.Tool.getText("", 26, "#ffffff"); this.times = Tools_1.Tool.getText("", 26, "#ffffff");
this.times.text = "0次"; this.times.text = "0次";
btn.position.set(315, 970); btn.anchorY = btn.height / 2;
btn.anchorX = btn.width / 2;
btn.position.set(310, 970);
this.times.position.set(500, 925); this.times.position.set(500, 925);
this.addChild(this.times); this.addChild(this.times);
this.addChild(btn); this.addChild(btn);
btn.addEventListener(FYGE.MouseEvent.CLICK, this.onStartBtnClick, this); btn.addEventListener(FYGE.MouseEvent.CLICK, this.onStartBtnClick, this);
FYGE.Tween.get(btn, { loop: true })
.to({ scaleX: 1.2, scaleY: 1.2 }, 500)
.wait(200)
.to({ scaleX: 1, scaleY: 1 }, 300, FYGE.Ease.backIn)
.to({ scaleX: 1.1, scaleY: 1.1 }, 100)
.to({ scaleX: 0.9, scaleY: 0.9 }, 100)
.to({ scaleX: 1, scaleY: 1 }, 100)
.wait(500);
ruleBtn = new FYGE.Button(RES_1.RES.getRes("ruleBtn.png")); ruleBtn = new FYGE.Button(RES_1.RES.getRes("ruleBtn.png"));
ruleBtn.position.set(0, 235); ruleBtn.position.set(0, 235);
this.addChild(ruleBtn); this.addChild(ruleBtn);
...@@ -10178,39 +10638,21 @@ var StartScene = (function (_super) { ...@@ -10178,39 +10638,21 @@ var StartScene = (function (_super) {
} }
ctrls_1.changeScene(RecordScene_1.RecordScene); ctrls_1.changeScene(RecordScene_1.RecordScene);
}); });
musicBtn_Open = this._musicBtnOpen = new FYGE.Button(RES_1.RES.getRes("music_Open.png"));
musicBtn_Open.position.set(675, 235);
musicBtn_Open.visible = this.isMusicPlay;
musicBtn_Open.addEventListener(FYGE.MouseEvent.CLICK, function () {
console.log("关闭音乐");
_this.isMusicPlay = false;
_this.setMusicBtnState();
});
musicBtn_Close = this._musicBtnClose = new FYGE.Button(RES_1.RES.getRes("music_Close.png"));
musicBtn_Close.position.set(675, 235);
musicBtn_Close.visible = !this.isMusicPlay;
musicBtn_Close.addEventListener(FYGE.MouseEvent.CLICK, function () {
console.log("开启音乐");
_this.isMusicPlay = true;
_this.setMusicBtnState();
});
this.setMusicBtnState();
this.addChild(musicBtn_Close);
this.addChild(musicBtn_Open);
rankBtn = new FYGE.Button(RES_1.RES.getRes("rankBtn.png")); rankBtn = new FYGE.Button(RES_1.RES.getRes("rankBtn.png"));
rankBtn.position.set(160, 1255); rankBtn.position.set(83, 1255);
this.addChild(rankBtn); this.addChild(rankBtn);
rankBtn.addEventListener(FYGE.MouseEvent.CLICK, this.onRankBtnClick); rankBtn.addEventListener(FYGE.MouseEvent.CLICK, this.onRankBtnClick);
drawBtn = new FYGE.Button(RES_1.RES.getRes("drawBtn.png")); drawbtnName = Date.now() > getCaixukunTime_1.default() ? "drawBtn2.png" : "drawBtn.png";
drawBtn.position.set(300, 1255); drawBtn = new FYGE.Button(RES_1.RES.getRes(drawbtnName));
drawBtn.position.set(219, 1255);
this.addChild(drawBtn); this.addChild(drawBtn);
drawBtn.addEventListener(FYGE.MouseEvent.CLICK, this.onDrawBtnClick); drawBtn.addEventListener(FYGE.MouseEvent.CLICK, this.onDrawBtnClick);
newbieBtn = new FYGE.Button(RES_1.RES.getRes("drawBtn.png")); newbieBtn = new FYGE.Button(RES_1.RES.getRes("newbieBtn.png"));
newbieBtn.position.set(300, 1455); newbieBtn.position.set(568, 1255);
this.addChild(newbieBtn); this.addChild(newbieBtn);
newbieBtn.addEventListener(FYGE.MouseEvent.CLICK, this.onNewbieBtnClick); newbieBtn.addEventListener(FYGE.MouseEvent.CLICK, this.onNewbieBtnClick);
taskBtn = new FYGE.Button(RES_1.RES.getRes("task_Btn.png")); taskBtn = new FYGE.Button(RES_1.RES.getRes("task_Btn.png"));
taskBtn.position.set(490, 1255); taskBtn.position.set(417, 1255);
this.addChild(taskBtn); this.addChild(taskBtn);
taskBtn.addEventListener(FYGE.MouseEvent.CLICK, function () { taskBtn.addEventListener(FYGE.MouseEvent.CLICK, function () {
console.log("任务按钮"); console.log("任务按钮");
...@@ -10222,7 +10664,6 @@ var StartScene = (function (_super) { ...@@ -10222,7 +10664,6 @@ var StartScene = (function (_super) {
} }
ctrls_1.showPanel(TaskPanel_1.TaskPanel); ctrls_1.showPanel(TaskPanel_1.TaskPanel);
}); });
this.times.visible = btn.visible = timeString.visible = false;
return [4, getGameInfo_1.default()]; return [4, getGameInfo_1.default()];
case 1: case 1:
result = _a.sent(); result = _a.sent();
...@@ -10235,17 +10676,18 @@ var StartScene = (function (_super) { ...@@ -10235,17 +10676,18 @@ var StartScene = (function (_super) {
}; };
StartScene.prototype.onGetMyRankPrize = function (result) { StartScene.prototype.onGetMyRankPrize = function (result) {
var getMyRankPrizeData = result[0], getRankListData = result[1]; var getMyRankPrizeData = result[0], getRankListData = result[1];
if (getMyRankPrizeData.success) { if (getMyRankPrizeData.success && getRankListData.data.rank != '-') {
ctrls_1.showPanel(PrizePanel_1.PrizePanel, { prize: getMyRankPrizeData.data, rank: getRankListData.data.rank }); ctrls_1.showPanel(PrizePanel_1.PrizePanel, { prize: getMyRankPrizeData.data, rank: getRankListData.data.rank });
} }
else { else {
ctrls_1.showPanel(NoPrizePanel_1.NoPrizePanel, { rank: getRankListData.data.rank }); ctrls_1.showPanel(NoPrizePanel_1.NoPrizePanel, { rank: getRankListData.data.rank });
console.log('没有中奖', '我的排名', getRankListData.data.rank); console.log('没有中奖', '我的排名', getRankListData.data.rank);
} }
rankFlag_1.setRankFlag(false);
}; };
StartScene.prototype.checkRankPrize = function () { StartScene.prototype.checkRankPrize = function () {
var _this = this; var _this = this;
if (global_1.getAfterEndTime()) { if (global_1.getAfterEndTime() && rankFlag_1.getRankFlag()) {
Promise.all([ Promise.all([
getMyRankPrize_1.default(), getMyRankPrize_1.default(),
getRankList_1.default() getRankList_1.default()
...@@ -10274,10 +10716,6 @@ var StartScene = (function (_super) { ...@@ -10274,10 +10716,6 @@ var StartScene = (function (_super) {
this.times.text = gameTimes + "\u6B21"; this.times.text = gameTimes + "\u6B21";
this._timesCount = gameTimes; this._timesCount = gameTimes;
}; };
StartScene.prototype.setMusicBtnState = function () {
this._musicBtnClose.visible = !this.isMusicPlay;
this._musicBtnOpen.visible = this.isMusicPlay;
};
StartScene.prototype.initEvents = function () { StartScene.prototype.initEvents = function () {
FYGE.GDispatcher.addEventListener("signPrizeMoving", this.signPrizeMoving, this); FYGE.GDispatcher.addEventListener("signPrizeMoving", this.signPrizeMoving, this);
}; };
...@@ -10357,6 +10795,25 @@ var StartScene = (function (_super) { ...@@ -10357,6 +10795,25 @@ var StartScene = (function (_super) {
list.updateData([1, 2, 3, 4, 5, 6]); list.updateData([1, 2, 3, 4, 5, 6]);
this.addChild(list); this.addChild(list);
}; };
StartScene.prototype.getVipInfo = function (type) {
return __awaiter(this, void 0, void 0, function () {
var _a, success, code, isVip;
return __generator(this, function (_b) {
switch (_b.label) {
case 0: return [4, getVipInfo_1.default()];
case 1:
_a = _b.sent(), success = _a.success, code = _a.code, isVip = _a.data.isVip;
if (isVip && type == 'visit') {
sendLog_1.default(LogType_1.default.visitOldMember);
}
if (isVip && type == 'playGame') {
sendLog_1.default(LogType_1.default.playGameMember);
}
return [2];
}
});
});
};
return StartScene; return StartScene;
}(Scene_1.Scene)); }(Scene_1.Scene));
exports.StartScene = StartScene; exports.StartScene = StartScene;
......
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