Commit 26d09179 authored by wildfirecode's avatar wildfirecode

1

parent 6095daf0
...@@ -3473,10 +3473,21 @@ exports.ResJson = { ...@@ -3473,10 +3473,21 @@ exports.ResJson = {
} }
}, },
{ {
"keys": "drawBtn.png,music_Close.png,music_Open.png,newbieBtn.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": 85,
"y": 146,
"w": 165,
"h": 142,
"ox": 0,
"oy": 0,
"sw": 165,
"sh": 142,
"ro": false
},
"drawBtn2.png": {
"x": 85, "x": 85,
"y": 2, "y": 2,
"w": 165, "w": 165,
...@@ -3488,8 +3499,8 @@ exports.ResJson = { ...@@ -3488,8 +3499,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"music_Close.png": { "music_Close.png": {
"x": 187, "x": 156,
"y": 146, "y": 349,
"w": 57, "w": 57,
"h": 57, "h": 57,
"ox": 0, "ox": 0,
...@@ -3499,8 +3510,8 @@ exports.ResJson = { ...@@ -3499,8 +3510,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"music_Open.png": { "music_Open.png": {
"x": 161, "x": 156,
"y": 414, "y": 290,
"w": 57, "w": 57,
"h": 57, "h": 57,
"ox": 0, "ox": 0,
...@@ -3510,8 +3521,8 @@ exports.ResJson = { ...@@ -3510,8 +3521,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"newbieBtn.png": { "newbieBtn.png": {
"x": 100, "x": 152,
"y": 280, "y": 424,
"w": 96, "w": 96,
"h": 132, "h": 132,
"ox": 0, "ox": 0,
...@@ -3521,8 +3532,8 @@ exports.ResJson = { ...@@ -3521,8 +3532,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"rankBtn.png": { "rankBtn.png": {
"x": 85, "x": 54,
"y": 146, "y": 290,
"w": 100, "w": 100,
"h": 132, "h": 132,
"ox": 0, "ox": 0,
...@@ -3532,8 +3543,8 @@ exports.ResJson = { ...@@ -3532,8 +3543,8 @@ exports.ResJson = {
"ro": false "ro": false
}, },
"recordBtn.png": { "recordBtn.png": {
"x": 198, "x": 100,
"y": 205, "y": 424,
"w": 157, "w": 157,
"h": 50, "h": 50,
"ox": 0, "ox": 0,
...@@ -3544,14 +3555,14 @@ exports.ResJson = { ...@@ -3544,14 +3555,14 @@ exports.ResJson = {
}, },
"ruleBtn.png": { "ruleBtn.png": {
"x": 2, "x": 2,
"y": 418, "y": 284,
"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": 2, "x": 2,
...@@ -3566,7 +3577,7 @@ exports.ResJson = { ...@@ -3566,7 +3577,7 @@ exports.ResJson = {
}, },
"task_Btn.png": { "task_Btn.png": {
"x": 2, "x": 2,
"y": 284, "y": 443,
"w": 96, "w": 96,
"h": 132, "h": 132,
"ox": 0, "ox": 0,
...@@ -3823,7 +3834,7 @@ exports.ResJson = { ...@@ -3823,7 +3834,7 @@ exports.ResJson = {
} }
} }
], ],
"path": "https://yun.duiba.com.cn/db_games/activity/kickball-feile/1593327405/resource/" "path": "https://yun.duiba.com.cn/db_games/activity/kickball-feile/1593328402/resource/"
}; };
...@@ -9810,6 +9821,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) { ...@@ -9810,6 +9821,7 @@ 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");
...@@ -9820,6 +9832,7 @@ var doRecord_1 = __webpack_require__(/*! ../ctrls/doRecord */ "./src/ctrls/doRec ...@@ -9820,6 +9832,7 @@ var doRecord_1 = __webpack_require__(/*! ../ctrls/doRecord */ "./src/ctrls/doRec
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 getVipInfo_1 = __webpack_require__(/*! ../ctrls/getVipInfo */ "./src/ctrls/getVipInfo.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() {
...@@ -9838,6 +9851,10 @@ var AssistScene = (function (_super) { ...@@ -9838,6 +9851,10 @@ var AssistScene = (function (_super) {
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);
...@@ -10463,6 +10480,7 @@ var NoPrizePanel_1 = __webpack_require__(/*! ../panels/NoPrizePanel */ "./src/pa ...@@ -10463,6 +10480,7 @@ var NoPrizePanel_1 = __webpack_require__(/*! ../panels/NoPrizePanel */ "./src/pa
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 getVipInfo_1 = __webpack_require__(/*! ../ctrls/getVipInfo */ "./src/ctrls/getVipInfo.ts");
var rankFlag_1 = __webpack_require__(/*! ../datas/rankFlag */ "./src/datas/rankFlag.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);
...@@ -10544,7 +10562,7 @@ var StartScene = (function (_super) { ...@@ -10544,7 +10562,7 @@ 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, rankBtn, drawBtn, newbieBtn, taskBtn, result; var btn, timeString, namestr, ruleBtn, recordBtn, rankBtn, drawbtnName, drawBtn, newbieBtn, taskBtn, result;
return __generator(this, function (_a) { return __generator(this, function (_a) {
switch (_a.label) { switch (_a.label) {
case 0: case 0:
...@@ -10560,6 +10578,11 @@ var StartScene = (function (_super) { ...@@ -10560,6 +10578,11 @@ var StartScene = (function (_super) {
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.anchorY = btn.height / 2; btn.anchorY = btn.height / 2;
...@@ -10599,7 +10622,8 @@ var StartScene = (function (_super) { ...@@ -10599,7 +10622,8 @@ var StartScene = (function (_super) {
rankBtn.position.set(83, 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 = new FYGE.Button(RES_1.RES.getRes(drawbtnName));
drawBtn.position.set(219, 1255); 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);
......
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