Commit 3c45be53 authored by lujinlei's avatar lujinlei

-a

parent fce28fa1
......@@ -9,6 +9,8 @@
bottom: 0;
right: 0;
min-height: 100vh; */
width:100%;
height:100vh;
flex: 1;
display: flex;
flex-direction: column;
......
import { Main, GDispatcher } from './output';
import { getUserAddress, favorShop, getAuthUserInfo, checkShopFavoredStatus } from '../../utils/utils';
import { getUserAddress, favorShop, getAuthUserInfo, checkShopFavoredStatus ,getCaixukunName} from '../../utils/utils';
const app = getApp()
const descString = `玩游戏赢${getCaixukunName()}同款老爹鞋`;
const SHARE_CONFIG = { //待写
title: '斐乐打星球分享标题',
desc: '斐乐打星球分享副标题!',
imageUrl: "https://yun.duiba.com.cn/db_games/activity/kickball-feile/feile.png",
title: '致锋尚者',
desc: descString,
imageUrl: "https://yun.duiba.com.cn/db_games/activity/kickball-feile/share.png",
path: 'pages/index/index'
}
......
......@@ -905,6 +905,7 @@ var Module = (function (_super) {
this.mouseChildren = enable;
};
Module.prototype.destroy = function () {
removeTweens(this);
this.data = null;
this.removeEvents();
this.dispatchEvent("onDestroy");
......@@ -913,6 +914,17 @@ var Module = (function (_super) {
return Module;
}(FYGE.Container));
exports.Module = Module;
function removeTweens(obj, isRecursive) {
if (isRecursive === void 0) { isRecursive = true; }
if (!obj)
return;
FYGE.Tween.removeTweens(obj);
if (!isRecursive || !obj.children || !obj.children.length)
return;
obj.children.forEach(function (child) {
removeTweens(child);
});
}
/***/ }),
......@@ -4456,7 +4468,7 @@ exports.ResJson = {
}
}
],
"path": "https://yun.duiba.com.cn/db_games/activity/kickball-feile/1593607919/resource/"
"path": "https://yun.duiba.com.cn/db_games/activity/kickball-feile/1593615468/resource/"
};
......@@ -8930,7 +8942,6 @@ var Tools_1 = __webpack_require__(/*! ../Tools */ "./src/Tools.ts");
var Panel_1 = __webpack_require__(/*! ../../module/views/Panel */ "./module/views/Panel.ts");
var RES_1 = __webpack_require__(/*! ../../module/RES */ "./module/RES.ts");
var receiveTaskRewards_1 = __webpack_require__(/*! ../ctrls/receiveTaskRewards */ "./src/ctrls/receiveTaskRewards.ts");
var Main_1 = __webpack_require__(/*! ../Main */ "./src/Main.ts");
var InviteInfoPanel = (function (_super) {
__extends(InviteInfoPanel, _super);
function InviteInfoPanel() {
......@@ -8962,9 +8973,9 @@ var InviteInfoPanel = (function (_super) {
timeText.position.set(0, 260);
inviteInfoBG.addChild(timeText);
this.addChild(inviteInfoBG);
this.closeBtn = new FYGE.Button(RES_1.RES.getRes("comCloseBtn.png"));
this.closeBtn.position.set(625, 360);
this.addChild(this.closeBtn);
this.closeBtn1 = new FYGE.Button(RES_1.RES.getRes("comCloseBtn.png"));
this.closeBtn1.position.set(625, 360);
this.addChild(this.closeBtn1);
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);
......@@ -8982,15 +8993,16 @@ var InviteInfoPanel = (function (_super) {
this._timeText.text = "\u6B21\u6570+" + data.rewardGameCount;
};
InviteInfoPanel.prototype.initEvents = function () {
this.closeBtn.addEventListener(FYGE.MouseEvent.CLICK, this.onClick_closeBtn, this);
this.closeBtn1.addEventListener(FYGE.MouseEvent.CLICK, this.onClick_closeBtn, this);
this.knowBtn.addEventListener(FYGE.MouseEvent.CLICK, this.onClick_closeBtn, this);
};
InviteInfoPanel.prototype.onClick_closeBtn = function () {
Main_1.GDispatcher.dispatchEvent('completeTaskUpdate');
console.log("阿萨十大");
FYGE.GDispatcher.dispatchEvent('completeTaskUpdate');
this.hidePanel();
};
InviteInfoPanel.prototype.removeEvents = function () {
this.closeBtn.removeEventListener(FYGE.MouseEvent.CLICK, this.onClick_closeBtn, this);
this.closeBtn1.removeEventListener(FYGE.MouseEvent.CLICK, this.onClick_closeBtn, this);
this.knowBtn.removeEventListener(FYGE.MouseEvent.CLICK, this.onClick_closeBtn, this);
};
return InviteInfoPanel;
......@@ -10603,7 +10615,7 @@ var AssistScene = (function (_super) {
assistBG.y = 0;
this.addChild(assistBG);
var hintTxt = Tools_1.Tool.getText("", 24, "#ffffff");
hintTxt.text = getCaixukunTime_1.getCaixukunName() + "\u4EE3\u8A00\u4EBA\u4EB2\u7B14\u7B7E\u540D\u3001\u8001\u7239\u978B\u3001T\u6064";
hintTxt.text = getCaixukunTime_1.getCaixukunName() + "\u4EB2\u7B14\u7B7E\u540D\u3001\u8001\u7239\u978B\u3001T\u6064";
hintTxt.position.set((750 - hintTxt.textWidth) / 2, 570);
this.addChild(hintTxt);
var assistBtn = this._assistBtn = new FYGE.Sprite(RES_1.RES.getRes("assistBtn.png"));
......@@ -10713,7 +10725,7 @@ var AssistScene = (function (_super) {
joinMemberBtn.position.set((memberBG.width - joinMemberBtn.width) / 2, 300);
joinMemberBtn.addEventListener(FYGE.MouseEvent.CLICK, function () {
console.log('加入会员');
Main_1.GDispatcher.addEventListener('onShow', _this.onShow, _this);
Main_1.GDispatcher.once('onShow', _this.onShow, _this);
_this._joinVIPNode.visible = false;
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.navigateToOutside, { url: vipUrl });
}, this);
......@@ -10724,9 +10736,7 @@ var AssistScene = (function (_super) {
var _a, success, code, isVip;
return __generator(this, function (_b) {
switch (_b.label) {
case 0:
Main_1.GDispatcher.dispatchEvent('onShow');
return [4, getVipInfo_1.default()];
case 0: return [4, getVipInfo_1.default()];
case 1:
_a = _b.sent(), success = _a.success, code = _a.code, isVip = _a.data.isVip;
if (isVip) {
......@@ -11457,7 +11467,7 @@ var StartScene = (function (_super) {
};
StartScene.prototype.start = function () {
return __awaiter(this, void 0, void 0, function () {
var btn, timeString, namestr, adstr, ruleBtn, recordBtn, musicBtn_Open, musicBtn_Close, rankBtn, drawbtnName, drawBtn, newbieBtn, taskBtn, result;
var btn, timeString, namestr, adstr, ruleBtn, ruleBtnY, recordBtn, musicBtn_Open, musicBtn_OpenY, musicBtn_Close, musicBtn_CloseY, rankBtn, rankBtnY, drawbtnName, drawBtn, drawBtnY, newbieBtn, newbieBtnY, taskBtn, taskBtnY, result;
var _this = this;
return __generator(this, function (_a) {
switch (_a.label) {
......@@ -11508,14 +11518,18 @@ var StartScene = (function (_super) {
.to({ scaleX: 1, scaleY: 1 }, 100)
.wait(300);
ruleBtn = new FYGE.Button(RES_1.RES.getRes("ruleBtn.png"));
ruleBtn.position.set(-1, 235);
ruleBtnY = 235;
if (layers_1.layers.stageHeight < 1206) {
ruleBtnY = layers_1.layers.stageOffsetY + 235;
}
ruleBtn.position.set(-1, ruleBtnY);
this.addChild(ruleBtn);
ruleBtn.addEventListener(FYGE.MouseEvent.CLICK, function () {
ctrls_1.showPanel(rulePanel_1.RulePanel);
console.log("我是规则");
});
recordBtn = new FYGE.Button(RES_1.RES.getRes("recordBtn.png"));
recordBtn.position.set(-1, 235 + ruleBtn.height + 20);
recordBtn.position.set(-1, ruleBtnY + ruleBtn.height + 20);
this.addChild(recordBtn);
recordBtn.addEventListener(FYGE.MouseEvent.CLICK, function () {
console.log("我是我的奖品");
......@@ -11526,7 +11540,11 @@ var StartScene = (function (_super) {
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_OpenY = 235;
if (layers_1.layers.stageHeight < 1206) {
musicBtn_OpenY = layers_1.layers.stageOffsetY + 235;
}
musicBtn_Open.position.set(675, musicBtn_OpenY);
musicBtn_Open.visible = musicFlag_1.getMusicOpen();
musicBtn_Open.addEventListener(FYGE.MouseEvent.CLICK, function () {
console.log("关闭音乐");
......@@ -11535,7 +11553,11 @@ var StartScene = (function (_super) {
_this.setMusicBtnState();
});
musicBtn_Close = this._musicBtnClose = new FYGE.Button(RES_1.RES.getRes("music_Close.png"));
musicBtn_Close.position.set(675, 235);
musicBtn_CloseY = 235;
if (layers_1.layers.stageHeight < 1206) {
musicBtn_CloseY = layers_1.layers.stageOffsetY + 235;
}
musicBtn_Close.position.set(675, musicBtn_CloseY);
musicBtn_Close.visible = !musicFlag_1.getMusicOpen();
musicBtn_Close.addEventListener(FYGE.MouseEvent.CLICK, function () {
console.log("开启音乐");
......@@ -11547,20 +11569,36 @@ var StartScene = (function (_super) {
this.addChild(musicBtn_Close);
this.addChild(musicBtn_Open);
rankBtn = new FYGE.Button(RES_1.RES.getRes("rankBtn.png"));
rankBtn.position.set(83, 1255);
rankBtnY = 1255;
if (layers_1.layers.stageHeight < 1206) {
rankBtnY = layers_1.layers.stageHeight + layers_1.layers.stageOffsetY - 160;
}
rankBtn.position.set(83, rankBtnY);
this.addChild(rankBtn);
rankBtn.addEventListener(FYGE.MouseEvent.CLICK, this.onRankBtnClick);
drawbtnName = Date.now() > getCaixukunTime_1.default() ? "drawBtn2.png" : "drawBtn.png";
drawBtn = new FYGE.Button(RES_1.RES.getRes(drawbtnName));
drawBtn.position.set(219, 1255);
drawBtnY = 1255;
if (layers_1.layers.stageHeight < 1206) {
drawBtnY = layers_1.layers.stageHeight + layers_1.layers.stageOffsetY - 160;
}
drawBtn.position.set(219, drawBtnY);
this.addChild(drawBtn);
drawBtn.addEventListener(FYGE.MouseEvent.CLICK, this.onDrawBtnClick);
newbieBtn = new FYGE.Button(RES_1.RES.getRes("newbieBtn.png"));
newbieBtn.position.set(568, 1255);
newbieBtnY = 1255;
if (layers_1.layers.stageHeight < 1206) {
newbieBtnY = layers_1.layers.stageHeight + layers_1.layers.stageOffsetY - 160;
}
newbieBtn.position.set(568, newbieBtnY);
this.addChild(newbieBtn);
newbieBtn.addEventListener(FYGE.MouseEvent.CLICK, this.onNewbieBtnClick);
taskBtn = new FYGE.Button(RES_1.RES.getRes("task_Btn.png"));
taskBtn.position.set(417, 1255);
taskBtnY = 1255;
if (layers_1.layers.stageHeight < 1206) {
taskBtnY = layers_1.layers.stageHeight + layers_1.layers.stageOffsetY - 160;
}
taskBtn.position.set(417, taskBtnY);
this.addChild(taskBtn);
taskBtn.addEventListener(FYGE.MouseEvent.CLICK, function () {
console.log("任务按钮");
......
......@@ -175,6 +175,12 @@ export const checkGoodsCollectedStatus = (id) => {
});
};
export const getCaixukunName = () => {
var time = 1594178400000;
let nowDate =+ new Date();
//return getServerTime() > time ? '蔡徐坤' : '代言人';
return nowDate > time ? '蔡徐坤' : '代言人';
}
/**
* 获取淘宝用户收货地址
*/
......
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