Skip to content

N
new_taobao
Commit 078d9f48 authored by AU-Pro-mac's avatar AU-Pro-mac
Browse files
Options

new request code --hy --02

parent b048b50a
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 380 additions and 117 deletions
project/src/canvas/game/mock/miniTb/mine.getUserInfo.json
View file @ 078d9f48
......@@ -6,7 +6,7 @@
"win": true,
"userName": "xxxxxxxxxxx",
"userImgUrl": "https://yun.duiba.com.cn/spark-dev/assets/白色.41dae4fd01f4750aea58f694b40d97a9da8f23ca.png",
"isNewUser": true
"isNewUser": false
},
"success": true,
"message": "成功"
......
project/src/canvas/game/output.js
View file @ 078d9f48
......@@ -1554,12 +1554,12 @@ const resCanvasListCsd = {
url: 'https://yun.duiba.com.cn/spark/assets/lightTexture.dae8dbc3cb6445863531557ca3b90b1b185eb995.png',
uuid: 'e2adae2c-ac89-49cc-a200-8daec42da146'
},
// '334aff33-1a9e-4277-aafe-3d9f22eab3d5': {
// name: '传送带返回',
// ext: '.png',
// url: 'https://yun.duiba.com.cn/spark/assets/传送带返回.2311961239a4cec1102cbaef694bcfa96e8e813d.png',
// uuid: '334aff33-1a9e-4277-aafe-3d9f22eab3d5'
// },
'334aff33-1a9e-4277-aafe-3d9f22eab3d5': {
name: '传送带返回',
ext: '.png',
url: 'https://yun.duiba.com.cn/spark/assets/传送带返回.2311961239a4cec1102cbaef694bcfa96e8e813d.png',
uuid: '334aff33-1a9e-4277-aafe-3d9f22eab3d5'
},
'ad20a814-c0d4-4010-a76d-8e9114778580': {
name: '传送带棍子',
ext: '.png',
......@@ -1921,9 +1921,15 @@ var Main = (function () {
_a.sent();
ctrls_1.changeScene(MainScene_2.OpenAni);
resCanvasList = Object.assign(resCanvasList_1.default, resCanvasListCsd_1.default);
RES_1.RES.loadSparkAssets(resCanvasList);
this.loadImageTexturesCsd01(resCanvasList);
this.loadImageTexturesCsd02(resCanvasList);
return [4, RES_1.RES.loadSparkAssets(resCanvasList)];
case 2:
_a.sent();
return [4, this.loadImageTexturesCsd01(resCanvasList)];
case 3:
_a.sent();
return [4, this.loadImageTexturesCsd02(resCanvasList)];
case 4:
_a.sent();
console.log('resloadingList 加载完毕');
FYGE.GDispatcher.dispatchEvent("loadEnd");
return [2];
......@@ -2494,6 +2500,7 @@ var Root = (function (_super) {
Root.prototype.initUi = function () {
return __awaiter(this, void 0, void 0, function () {
var leftCsd, userInfoRes;
var _this = this;
return __generator(this, function (_a) {
switch (_a.label) {
case 0:
......@@ -2510,6 +2517,10 @@ var Root = (function (_super) {
this.addChild(leftCsd);
this.goodsContainer = new goodsContainer_1.default(this);
this.addChild(this.goodsContainer);
this.backBtn = Tools_1.Tools.getSprite(resCanvasList_1.default['334aff33-1a9e-4277-aafe-3d9f22eab3d5'].url, 0, 40 + 1624 / 2 - this.stage.viewRect.height / 2);
this.backBtn.mouseEnable = true;
this.backBtn.addEventListener(FYGE.MouseEvent.MOUSE_DOWN, function () { _this.gameOver('back'); }, this);
this.addChild(this.backBtn);
return [4, TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getUserInfo, {})];
case 1:
userInfoRes = _a.sent();
......@@ -2540,7 +2551,33 @@ var Root = (function (_super) {
this.gameStartFlag = true;
this.touchArea.mouseEnable = true;
};
Root.prototype.gameOver = function () {
Root.prototype.gameAgain = function () {
return __awaiter(this, void 0, void 0, function () {
var userInfoRes;
return __generator(this, function (_a) {
switch (_a.label) {
case 0: return [4, TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getUserInfo, {})];
case 1:
userInfoRes = _a.sent();
this.userInfo = userInfoRes.data;
console.log('CSD-GAME this.userInfo:', userInfoRes.data);
if (this.userInfo.noGameTime && this.userInfo.noGameTime === 1) {
return [2];
}
else {
Main_1.GDispatcher.addEventListener('MatchCompelete', this.gameStart, this);
this.time = 60;
this.scoreBoard.scoreRight = 0;
this.scoreBoard.scoreRight = 0;
ctrls_1.showPanel(MatchingPanel_1.MatchingPanel, this.userInfo);
}
return [2];
}
});
});
};
Root.prototype.gameOver = function (type) {
if (type === void 0) { type = ''; }
return __awaiter(this, void 0, void 0, function () {
var prizeInfo, prize;
return __generator(this, function (_a) {
......@@ -2553,9 +2590,9 @@ var Root = (function (_super) {
this.scoreBoard.scoreRight += 3;
this.goodsContainer.removeAllGoods();
this.scoreBoard.stopTime();
if (this.userInfo.win) {
}
else {
if (type === 'back') {
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.backToPage, {}, function (s, res) { console.log('backToPage'); });
return [2];
}
if (!(this.userInfo.win && this.scoreBoard.scoreLeft)) return [3, 2];
return [4, TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getPrizeInfo)];
......
project/src/canvas/game/output.js.map
View file @ 078d9f48
This diff is collapsed.
project/src/canvas/game/released/output.js
View file @ 078d9f48
......@@ -1556,12 +1556,12 @@ const resCanvasListCsd = {
url: 'https://yun.duiba.com.cn/spark/assets/lightTexture.dae8dbc3cb6445863531557ca3b90b1b185eb995.png',
uuid: 'e2adae2c-ac89-49cc-a200-8daec42da146'
},
// '334aff33-1a9e-4277-aafe-3d9f22eab3d5': {
// name: '传送带返回',
// ext: '.png',
// url: 'https://yun.duiba.com.cn/spark/assets/传送带返回.2311961239a4cec1102cbaef694bcfa96e8e813d.png',
// uuid: '334aff33-1a9e-4277-aafe-3d9f22eab3d5'
// },
'334aff33-1a9e-4277-aafe-3d9f22eab3d5': {
name: '传送带返回',
ext: '.png',
url: 'https://yun.duiba.com.cn/spark/assets/传送带返回.2311961239a4cec1102cbaef694bcfa96e8e813d.png',
uuid: '334aff33-1a9e-4277-aafe-3d9f22eab3d5'
},
'ad20a814-c0d4-4010-a76d-8e9114778580': {
name: '传送带棍子',
ext: '.png',
......@@ -1923,9 +1923,15 @@ var Main = (function () {
_a.sent();
ctrls_1.changeScene(MainScene_2.OpenAni);
resCanvasList = Object.assign(resCanvasList_1.default, resCanvasListCsd_1.default);
RES_1.RES.loadSparkAssets(resCanvasList);
this.loadImageTexturesCsd01(resCanvasList);
this.loadImageTexturesCsd02(resCanvasList);
return [4, RES_1.RES.loadSparkAssets(resCanvasList)];
case 2:
_a.sent();
return [4, this.loadImageTexturesCsd01(resCanvasList)];
case 3:
_a.sent();
return [4, this.loadImageTexturesCsd02(resCanvasList)];
case 4:
_a.sent();
console.log('resloadingList 加载完毕');
FYGE.GDispatcher.dispatchEvent("loadEnd");
return [2];
......@@ -2496,6 +2502,7 @@ var Root = (function (_super) {
Root.prototype.initUi = function () {
return __awaiter(this, void 0, void 0, function () {
var leftCsd, userInfoRes;
var _this = this;
return __generator(this, function (_a) {
switch (_a.label) {
case 0:
......@@ -2512,6 +2519,10 @@ var Root = (function (_super) {
this.addChild(leftCsd);
this.goodsContainer = new goodsContainer_1.default(this);
this.addChild(this.goodsContainer);
this.backBtn = Tools_1.Tools.getSprite(resCanvasList_1.default['334aff33-1a9e-4277-aafe-3d9f22eab3d5'].url, 0, 40 + 1624 / 2 - this.stage.viewRect.height / 2);
this.backBtn.mouseEnable = true;
this.backBtn.addEventListener(FYGE.MouseEvent.MOUSE_DOWN, function () { _this.gameOver('back'); }, this);
this.addChild(this.backBtn);
return [4, TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getUserInfo, {})];
case 1:
userInfoRes = _a.sent();
......@@ -2542,7 +2553,33 @@ var Root = (function (_super) {
this.gameStartFlag = true;
this.touchArea.mouseEnable = true;
};
Root.prototype.gameOver = function () {
Root.prototype.gameAgain = function () {
return __awaiter(this, void 0, void 0, function () {
var userInfoRes;
return __generator(this, function (_a) {
switch (_a.label) {
case 0: return [4, TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getUserInfo, {})];
case 1:
userInfoRes = _a.sent();
this.userInfo = userInfoRes.data;
console.log('CSD-GAME this.userInfo:', userInfoRes.data);
if (this.userInfo.noGameTime && this.userInfo.noGameTime === 1) {
return [2];
}
else {
Main_1.GDispatcher.addEventListener('MatchCompelete', this.gameStart, this);
this.time = 60;
this.scoreBoard.scoreRight = 0;
this.scoreBoard.scoreRight = 0;
ctrls_1.showPanel(MatchingPanel_1.MatchingPanel, this.userInfo);
}
return [2];
}
});
});
};
Root.prototype.gameOver = function (type) {
if (type === void 0) { type = ''; }
return __awaiter(this, void 0, void 0, function () {
var prizeInfo, prize;
return __generator(this, function (_a) {
......@@ -2555,9 +2592,9 @@ var Root = (function (_super) {
this.scoreBoard.scoreRight += 3;
this.goodsContainer.removeAllGoods();
this.scoreBoard.stopTime();
if (this.userInfo.win) {
}
else {
if (type === 'back') {
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.backToPage, {}, function (s, res) { console.log('backToPage'); });
return [2];
}
if (!(this.userInfo.win && this.scoreBoard.scoreLeft)) return [3, 2];
return [4, TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getPrizeInfo)];
......
project/src/canvas/game/resCanvasListCsd.js
View file @ 078d9f48
......@@ -17,12 +17,12 @@ const resCanvasListCsd = {
url: 'https://yun.duiba.com.cn/spark/assets/lightTexture.dae8dbc3cb6445863531557ca3b90b1b185eb995.png',
uuid: 'e2adae2c-ac89-49cc-a200-8daec42da146'
},
// '334aff33-1a9e-4277-aafe-3d9f22eab3d5': {
// name: '传送带返回',
// ext: '.png',
// url: 'https://yun.duiba.com.cn/spark/assets/传送带返回.2311961239a4cec1102cbaef694bcfa96e8e813d.png',
// uuid: '334aff33-1a9e-4277-aafe-3d9f22eab3d5'
// },
'334aff33-1a9e-4277-aafe-3d9f22eab3d5': {
name: '传送带返回',
ext: '.png',
url: 'https://yun.duiba.com.cn/spark/assets/传送带返回.2311961239a4cec1102cbaef694bcfa96e8e813d.png',
uuid: '334aff33-1a9e-4277-aafe-3d9f22eab3d5'
},
'ad20a814-c0d4-4010-a76d-8e9114778580': {
name: '传送带棍子',
ext: '.png',
......
project/src/canvas/game/src/Main.ts
View file @ 078d9f48
......@@ -166,9 +166,9 @@ export class Main {
let resCanvasList = Object.assign(resCanvasList_, resCanvasListCsd)
RES.loadSparkAssets(resCanvasList)
this.loadImageTexturesCsd01(resCanvasList)
this.loadImageTexturesCsd02(resCanvasList)
await RES.loadSparkAssets(resCanvasList)
await this.loadImageTexturesCsd01(resCanvasList)
await this.loadImageTexturesCsd02(resCanvasList)
console.log('resloadingList 加载完毕')
FYGE.GDispatcher.dispatchEvent("loadEnd");
......
project/src/canvas/game/src/chuansongdai/Root.ts
View file @ 078d9f48
......@@ -78,6 +78,14 @@ export default class Root extends FYGE.Container {
this.addChild(this.goodsContainer)
// --  返回
this.backBtn = Tools.getSprite(resCanvasList['334aff33-1a9e-4277-aafe-3d9f22eab3d5'].url, 0, 40 + 1624 / 2 - this.stage.viewRect.height / 2)
this.backBtn.mouseEnable = true
this.backBtn.addEventListener(FYGE.MouseEvent.MOUSE_DOWN, () => { this.gameOver('back') }, this)
this.addChild(this.backBtn)
// --  返回
const userInfoRes = await sendTbNet(TbNetName.getUserInfo, {})
this.userInfo = userInfoRes.data
console.log('CSD-GAME this.userInfo:', userInfoRes.data)
......@@ -94,13 +102,6 @@ export default class Root extends FYGE.Container {
// this.gameStart()
GDispatcher.addEventListener('MatchCompelete', this.gameStart, this)
// -- 取消
// this.backBtn = Tools.getSprite(resCanvasList['334aff33-1a9e-4277-aafe-3d9f22eab3d5'].url, 0, 40 + 1624 / 2 - this.stage.viewRect.height / 2)
// this.backBtn.mouseEnable = true
// this.backBtn.addEventListener(FYGE.MouseEvent.MOUSE_DOWN, this.backToPage, this)
// this.addChild(this.backBtn)
// -- 取消
this.createTouchRect()
......@@ -121,8 +122,29 @@ export default class Root extends FYGE.Container {
this.touchArea.mouseEnable = true
}
// 再来一局
async gameAgain () {
const userInfoRes = await sendTbNet(TbNetName.getUserInfo, {})
this.userInfo = userInfoRes.data
console.log('CSD-GAME this.userInfo:', userInfoRes.data)
// 若返回信息中 显示没有游戏次数
if (this.userInfo.noGameTime && this.userInfo.noGameTime === 1) {
return
// 否则 执行正常开始逻辑
} else {
GDispatcher.addEventListener('MatchCompelete', this.gameStart, this)
this.time = 60
this.scoreBoard.scoreRight = 0
this.scoreBoard.scoreRight = 0
showPanel(MatchingPanel, this.userInfo)
}
}
// 结束游戏
async gameOver () {
async gameOver (type = '') {
this.time = 60
this.gameStartFlag = false
this.touchArea.mouseEnable = false
......@@ -131,12 +153,13 @@ export default class Root extends FYGE.Container {
this.goodsContainer.removeAllGoods()
this.scoreBoard.stopTime()
if (this.userInfo.win) {
} else {
// 游戏中途返回
if (type === 'back') {
sendTbNet(TbNetName.backToPage, {}, (s, res) => { console.log('backToPage') })
return
}
// 正常结束 - 由自组建调用
if (this.userInfo.win && this.scoreBoard.scoreLeft) {
//胜利
const prizeInfo = await sendTbNet(TbNetName.getPrizeInfo)
......
taobao_mini/client/components/comMissionModal/comMissionModal.js
View file @ 078d9f48
......@@ -95,6 +95,13 @@ Component({
}
})
arr3.push(...arr2, ...arr1)
// 观看直播 放在最下面
let liveIndex
arr3.forEach((it, idx) => {
if (it.taskType === 'jumpLink') liveIndex = idx
})
let jl = arr3.splice(liveIndex, 1)
arr3.push(...jl)
this.setData({ missionsList: arr3 })
}
})
......
taobao_mini/client/components/ruleModal/ruleModal.axml
View file @ 078d9f48
......@@ -6,7 +6,7 @@
<image class="rule-modal__close_image" src="//yun.duiba.com.cn/spark/assets/弹窗2关闭.478515dc464257d3f3e7c09b760b30e35d439a20.png" mode="aspectFill" />
</view>
<view class="rule-modal__bd">
<view class="rule-modal__bd_title">活动规则</view>
<view class="rule-modal__bd_title">{{title}}</view>
<view class="rule-modal__bd_content">
<text decode="ture">{{text}}</text>
</view>
......
taobao_mini/client/components/ruleModal/ruleModal.js
View file @ 078d9f48
Component({
data: {
text: ''
text: '',
title: ''
},
props: {
text: ''
text: '' ,
title: ''
},
didMount () {
this.setData({text: this.props.text})
this.setData({text: this.props.text, title: this.props.title ? this.props.title : '活动规则' })
},
didUpdate() {
this.setData({text: this.props.text})
this.setData({text: this.props.text, title: this.props.title ? this.props.title : '活动规则' })
},
methods: {
onModalClose() {
......
taobao_mini/client/pages/homePage/homePage.acss
View file @ 078d9f48
......@@ -140,6 +140,13 @@
opacity: 1;
position: absolute;
}
.bottom_turntable_block_pop {
width: 176rpx;
height: 77rpx;
position: absolute;
top: -40rpx;
left: 7rpx;
}
.gamechoose_block {
......@@ -280,10 +287,10 @@
.video_hide {
position: fixed;
z-index: 40;
width: 94rpx;
width: 120rpx;
height: 48rpx;
top: 80rpx;
right: 50rpx;
right: 40rpx;
overflow: hidden;
z-index: 120;
}
......@@ -362,20 +369,35 @@
text-decoration: underline;
}
.video_btn_left {
display: block;
width: 83rpx;
height: 84rpx;
opacity: 1;
top: 158rpx;
left: -93rpx;
top: 128rpx;
left: -123rpx;
position: absolute;
padding: 30rpx;
box-sizing: content-box;
}
.video_btn_right {
display: block;
width: 83rpx;
height: 84rpx;
opacity: 1;
top: 158rpx;
right: -93rpx;
top: 128rpx;
right: -123rpx;
position: absolute;
padding: 30rpx;
box-sizing: content-box;
z-index: 99;
}
.video_btn_left_img {
width: 100%;
height: 100%;
}
.video_btn_right_img {
width: 100%;
height: 100%;
}
......
taobao_mini/client/pages/homePage/homePage.axml
View file @ 078d9f48
......@@ -13,8 +13,7 @@
<view class="transMask-noStart" a:if="{{noStart}}"></view>
<view class="transMask-end" a:if="{{end}}"></view>
<!-- 头部 规则-奖品 按钮 -->
<!-- style='top: {{headTop}}rpx' -->
<view class="head">
<view class="head" style='top: {{headTop}}px'>
<image class="head_ruler" onTap="showRuleModal" src="{{resList['ee8882be-4b1d-43eb-bad7-8d96318c5022'].url}}" />
<!-- <image class="head_ruler" onTap="showCommonMoadalT1" src="{{resList['ee8882be-4b1d-43eb-bad7-8d96318c5022'].url}}" /> -->
<image class="head_rewards" onTap="gotoMyPrizePage" src="{{resList['74a63fd3-6776-44a2-990e-fadac00fb757'].url}}" />
......@@ -51,7 +50,7 @@
</view>
<view a:if="{{videoShow}}" class="video_hide" onTap="videoHideFunc">
<image class="video_hide_img" src="{{resList['ed0d1c0b-722b-4fbd-806f-ed061c228566'].url}}" mode="aspectFill" />
<image class="video_hide_img" src="{{resList['1410be2a-7ab5-4c3b-bada-3541bdeeeb0a'].url}}" mode="aspectFill" />
</view>
<!-- 视频部分 -->
......@@ -71,8 +70,12 @@
</view>
<!-- 按钮组 左-右 -->
<image a:if="{{videoActiveIndex > 0}}" class="video_btn_left" onTap="videoTurnLeft" src="{{resList['70006ad9-e7aa-4121-8493-c3c0afa94608'].url}}" />
<image a:if="{{videoActiveIndex < videoSrcArrLength - 1}}" class="video_btn_right" onTap="videoTurnRight" src="{{resList['cf73af84-5751-4aee-a754-9106162786d9'].url}}" />
<view a:if="{{videoActiveIndex > 0}}" class="video_btn_left" onTap="videoTurnLeft">
<image class='video_btn_left_img' src="{{resList['70006ad9-e7aa-4121-8493-c3c0afa94608'].url}}" />
</view>
<view a:if="{{videoActiveIndex < videoSrcArrLength - 1}}" class="video_btn_right" onTap="videoTurnRight">
<image class='video_btn_right_img' src="{{resList['cf73af84-5751-4aee-a754-9106162786d9'].url}}" />
</view>
</view>
<!--
......@@ -88,6 +91,7 @@
<view class="bottom">
<view class="bottom_turntable_block" onTap="gotoTurnTable">
<image class="bottom_turntable_block_image" src="{{resList['44b8923b-c9f9-4246-a4ff-4093ff97ca33'].url}}" />
<image class="bottom_turntable_block_pop" src="{{resList['d8ae79e1-971e-4e78-a365-553656128915'].url}}" />
<view class="bottom_ydgame_block_coin">抽奖次数 X{{drawNum}}</view>
</view>
......
taobao_mini/client/pages/homePage/homePage.js
View file @ 078d9f48
......@@ -88,7 +88,8 @@ Page({
ticketNum: 0,
drawNum: 0,
todayFirstLogin: true
todayFirstLogin: true,
headTop: 10
},
async onLoad (query) {
......@@ -124,6 +125,13 @@ Page({
// cover: getAuth login init checkDohelp
this.onAnimationLoadOver()
// 设置 导航栏
if (this.inviteId) {
let sysInfo = await getSystemInfo()
console.log('%csysInfo', ConsoleStyle, sysInfo)
this.setData({ headTop: sysInfo.statusBarHeight + sysInfo.titleBarHeight + 10 })
}
},
openAnimationTimeout: null,
......
taobao_mini/client/pages/pagecanvas/output.js
View file @ 078d9f48
......@@ -1556,12 +1556,12 @@ const resCanvasListCsd = {
url: 'https://yun.duiba.com.cn/spark/assets/lightTexture.dae8dbc3cb6445863531557ca3b90b1b185eb995.png',
uuid: 'e2adae2c-ac89-49cc-a200-8daec42da146'
},
// '334aff33-1a9e-4277-aafe-3d9f22eab3d5': {
// name: '传送带返回',
// ext: '.png',
// url: 'https://yun.duiba.com.cn/spark/assets/传送带返回.2311961239a4cec1102cbaef694bcfa96e8e813d.png',
// uuid: '334aff33-1a9e-4277-aafe-3d9f22eab3d5'
// },
'334aff33-1a9e-4277-aafe-3d9f22eab3d5': {
name: '传送带返回',
ext: '.png',
url: 'https://yun.duiba.com.cn/spark/assets/传送带返回.2311961239a4cec1102cbaef694bcfa96e8e813d.png',
uuid: '334aff33-1a9e-4277-aafe-3d9f22eab3d5'
},
'ad20a814-c0d4-4010-a76d-8e9114778580': {
name: '传送带棍子',
ext: '.png',
......@@ -1923,9 +1923,15 @@ var Main = (function () {
_a.sent();
ctrls_1.changeScene(MainScene_2.OpenAni);
resCanvasList = Object.assign(resCanvasList_1.default, resCanvasListCsd_1.default);
RES_1.RES.loadSparkAssets(resCanvasList);
this.loadImageTexturesCsd01(resCanvasList);
this.loadImageTexturesCsd02(resCanvasList);
return [4, RES_1.RES.loadSparkAssets(resCanvasList)];
case 2:
_a.sent();
return [4, this.loadImageTexturesCsd01(resCanvasList)];
case 3:
_a.sent();
return [4, this.loadImageTexturesCsd02(resCanvasList)];
case 4:
_a.sent();
console.log('resloadingList 加载完毕');
FYGE.GDispatcher.dispatchEvent("loadEnd");
return [2];
......@@ -2496,6 +2502,7 @@ var Root = (function (_super) {
Root.prototype.initUi = function () {
return __awaiter(this, void 0, void 0, function () {
var leftCsd, userInfoRes;
var _this = this;
return __generator(this, function (_a) {
switch (_a.label) {
case 0:
......@@ -2512,6 +2519,10 @@ var Root = (function (_super) {
this.addChild(leftCsd);
this.goodsContainer = new goodsContainer_1.default(this);
this.addChild(this.goodsContainer);
this.backBtn = Tools_1.Tools.getSprite(resCanvasList_1.default['334aff33-1a9e-4277-aafe-3d9f22eab3d5'].url, 0, 40 + 1624 / 2 - this.stage.viewRect.height / 2);
this.backBtn.mouseEnable = true;
this.backBtn.addEventListener(FYGE.MouseEvent.MOUSE_DOWN, function () { _this.gameOver('back'); }, this);
this.addChild(this.backBtn);
return [4, TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getUserInfo, {})];
case 1:
userInfoRes = _a.sent();
......@@ -2542,7 +2553,33 @@ var Root = (function (_super) {
this.gameStartFlag = true;
this.touchArea.mouseEnable = true;
};
Root.prototype.gameOver = function () {
Root.prototype.gameAgain = function () {
return __awaiter(this, void 0, void 0, function () {
var userInfoRes;
return __generator(this, function (_a) {
switch (_a.label) {
case 0: return [4, TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getUserInfo, {})];
case 1:
userInfoRes = _a.sent();
this.userInfo = userInfoRes.data;
console.log('CSD-GAME this.userInfo:', userInfoRes.data);
if (this.userInfo.noGameTime && this.userInfo.noGameTime === 1) {
return [2];
}
else {
Main_1.GDispatcher.addEventListener('MatchCompelete', this.gameStart, this);
this.time = 60;
this.scoreBoard.scoreRight = 0;
this.scoreBoard.scoreRight = 0;
ctrls_1.showPanel(MatchingPanel_1.MatchingPanel, this.userInfo);
}
return [2];
}
});
});
};
Root.prototype.gameOver = function (type) {
if (type === void 0) { type = ''; }
return __awaiter(this, void 0, void 0, function () {
var prizeInfo, prize;
return __generator(this, function (_a) {
......@@ -2555,9 +2592,9 @@ var Root = (function (_super) {
this.scoreBoard.scoreRight += 3;
this.goodsContainer.removeAllGoods();
this.scoreBoard.stopTime();
if (this.userInfo.win) {
}
else {
if (type === 'back') {
TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.backToPage, {}, function (s, res) { console.log('backToPage'); });
return [2];
}
if (!(this.userInfo.win && this.scoreBoard.scoreLeft)) return [3, 2];
return [4, TaoBaoNet_1.sendTbNet(TaoBaoNet_1.TbNetName.getPrizeInfo)];
......
taobao_mini/client/pages/pagecanvas/pagecanvas.acss
View file @ 078d9f48
......@@ -32,3 +32,7 @@
background: transparent;
}
.page-pop {
z-index: 99;
}
taobao_mini/client/pages/pagecanvas/pagecanvas.axml
View file @ 078d9f48
......@@ -3,6 +3,7 @@
<view a:if="{{gameType === 0}}" class="page-game-cover"></view>
<canvas disable-scroll="true" id="canvas" type="2d" class="canvas" onTouchStart="onMouseEvent" onTouchMove="onMouseEvent" onTouchEnd="onMouseEvent" onReady="onCanvasReady">
</canvas>
<common-modal-t1 class="page-pop" a:if="{{commonModalVisibleT1}}" data="{{commonModalDataT1}}" onModalClose="closeCommonModalT1" onModalConfirm="confirmCommonModalT1" />
</view>
<!-- <rule-modal a:if="{{ruleModalVisible}}" onModalClose="closeRuleModal"><text>{{rule}}</text></rule-modal> -->
\ No newline at end of file
taobao_mini/client/pages/pagecanvas/pagecanvas.js
View file @ 078d9f48
......@@ -26,8 +26,10 @@ Component({
back: false
},
isWin: false,
commonModalVisibleT1: false,
gamePrize: null,
gameData: null,
gameStartTime: 0,
didMount() {
this.setData({ gameType: this.props.gameType })
......@@ -139,6 +141,7 @@ Component({
this.props.onBackPage()
this.gameData = null
this.gamePrize = null
this.gameStartTime = 0
this.setData({gameType: 0})
},
......@@ -152,13 +155,41 @@ Component({
},
// 游戏开始 获取用户信息
gameStartInfo () {
async gameStartInfo () {
// test - code
// this.gameStartInfo_test()
// return
this.gameStartInfo_test()
return
// 游戏重新开始 获取游戏次数
let gt = true
if (this.gameStartTime !== 0) {
const { success, message, data } = await API.getGameInfo({ activityId: app.activityId })
.catch(res => { console.warn(res); commonToast(res && res.message); reject('fail') }) || {};
if (!success) { console.warn(res); commonToast(res && res.message) }
else {
console.log('%c-----获取游戏信息\n' + '-----yd.getGameInfo\n', ConsoleStyle, data)
if (data.gameTimes == '0' || data.gameTimes == 0) gt = false
}
}
// 没有游戏次数
if (!gt) {
this.postMessage('mine.getUserInfo', { data:{noGameTime: 1}} )
this.showCommonMoadalT1({
title: '门票不足',
content: '门票消耗完了！\n快去做任务吧～',
confirmCallback: () => {
this.closeCommonModalT1()
this.back()
},
btnImg: '//yun.duiba.com.cn/spark/assets/好的按钮.948e42751245099e12fef8ad2617d746f6370863.png' })
return
}
// 请求后端 开始游戏
API.doJoin({activityId: app.activityId, type: this.data.gameType === 1 ? 'slide' : 'timeline'})
.then(res => {
this.gameStartTime += 1
const { data, success } = res
console.log('%c-----开始游戏\n' + '-----yd.doJoin\n', ConsoleStyle, data)
if (success) {
......@@ -169,6 +200,7 @@ Component({
let favatar = this.getFakeAvatar()
let firstIn = this.checkFirstInFromStorage()
// 获取用户信息
this.gameData = {
win: win,
fakeUserName: fname,
......@@ -219,8 +251,8 @@ Component({
// 游戏结束 获取开奖
getGameOverPrize () {
// test - code
// this.getGameOverPrize_test()
// return
this.getGameOverPrize_test()
return
API.gameOver({activityId: app.activityId, type: this.data.gameType === 1 ? 'slide' : 'timeline', isWin: this.isWin})
.then(res => {
......@@ -314,30 +346,6 @@ Component({
}
},
// async getAuth() {
// const userInfo = await getAuthUserInfo().catch(err => {
// console.log('未授权成功', err);
// });
// if (userInfo) {
// console.log('userInfo', userInfo);
// const { nickName, avatar } = userInfo;
// app.nickName = nickName;
// app.avatar = avatar;
// this.login();
// }
// },
// async login() {
// const { nickName, avatar } = app;
// const { success } = await API.login({ userNick: nickName, avatar }).catch(res => {
// commonToast(res && res.message);
// }) || {};
// if (success) {
// this.init();
// }
// },
closeRuleModal() {
this.setData({ ruleModalVisible: false })
},
......@@ -349,9 +357,53 @@ Component({
},
// 显示通用弹层
showCommonMoadalT1 ({
title = 'test- title',
content = 'test- content',
confirmCallback = () => {},
btnImg = '//yun.duiba.com.cn/spark/assets/32d8536184c3539c0d9655d03c1b60f3d5e1f60a.png' }) {
this.setData({
commonModalVisibleT1: true,
commonModalDataT1: { title, content, btnImg },
confirmCommonModalT1: () => {
confirmCallback()
this.closeCommonModalT1()
}
})
},
// 通用弹层 - 关闭 - T1
closeCommonModalT1() {
this.setData({ commonModalVisibleT1: false });
this.getGameInfo()
},
gameStartInfo_test (){
// 游戏重新开始 获取游戏次数
let gt = true
if (this.gameStartTime !== 0) {
// 设置没有次数
gt = false
// 设置有次数
gt = true
}
// 没有游戏次数
if (!gt) {
this.postMessage('mine.getUserInfo', { data:{noGameTime: 1}} )
this.showCommonMoadalT1({
title: '门票不足',
content: '门票消耗完了！\n快去做任务吧～',
confirmCallback: () => {
this.closeCommonModalT1()
this.back()
},
btnImg: '//yun.duiba.com.cn/spark/assets/好的按钮.948e42751245099e12fef8ad2617d746f6370863.png' })
return
}
let win = this.countWinRange(this.data.gameType)
this.isWin = win
let fname = this.getFakeUserName()
......@@ -366,6 +418,7 @@ Component({
}
console.log('%cgameData:', ConsoleStyle, this.gameData)
this.postMessage('mine.getUserInfo', {data: this.gameData})
this.gameStartTime += 1
return
},
......
taobao_mini/client/pages/pagecanvas/pagecanvas.json
View file @ 078d9f48
{
"component": true,
"usingComponents": {}
"usingComponents": {
"common-modal-t1": "/components/commonModalT1/commonModalT1"
}
}
\ No newline at end of file
taobao_mini/client/pages/turnTablePage/turnTablePage.axml
View file @ 078d9f48
......@@ -39,7 +39,7 @@
<image class="bottom_bg" src="{{resList['738011dd-8cdc-455e-8dfa-2f17f5112bdf'].url}}" mode="aspectFill" />
<view class="bottom_btn_wrapper">
<view class="bottom_btn" onTap="gotoMyPrize"><image class="bottom_btn_image" src="{{resList['050b07b7-255a-4118-9221-0d4f1d45c296'].url}}" mode="aspectFill" /></view>
<view class="bottom_btn" onTap="handdlerStartButton"><image class="bottom_btn_image" src="{{resList['18cbbf52-1bc5-4109-b60c-59de1d06a1e7'].url}}" mode="aspectFill" /></view>
<view class="bottom_btn" onTap="seePrizeInfo"><image class="bottom_btn_image" src="{{resList['bafcfdad-0886-43ee-876e-c410d917192a'].url}}" mode="aspectFill" /></view>
</view>
</view>
......@@ -60,6 +60,7 @@
<rewards-modal a:if='{{rewardsModalShow}}' modalData='{{rewardsModalData}}' onModalClose='onModalClose' onModalConfirm='onModalConfirm' data-modalType='rewards' />
-->
<!-- 弹窗部分 -->
<rule-modal a:if="{{ruleModalVisible}}" onModalClose="closePrizeInfo" text="{{prizeInfo}}" title="{{prizeInfoTitle}}"></rule-modal>
<common-modal-t1 a:if="{{commonModalVisibleT1}}" data="{{commonModalDataT1}}" onModalClose="closeCommonModalT1" onModalConfirm="confirmCommonModalT1" />
<common-modal-t2 a:if="{{commonModalVisibleT2}}" data="{{commonModalDataT2}}" onModalClose="closeCommonModalT2" onModalOne="onModalT2One" onModalTwo="onModalT2Two"/>
<!-- 抽奖次数不足，快去雅顿乐园玩游戏赢抽奖次数吧 -->
......
taobao_mini/client/pages/turnTablePage/turnTablePage.js
View file @ 078d9f48
......@@ -18,6 +18,12 @@ Page({
prizesModalVisible: false,
missionModalVisible: false,
prizeInfo: `一等奖：清空购物车大奖，上限5000元，每日1个名额；
二等奖：时空焕活透亮润泽胶囊精华液约30粒（VC胶囊），共8件；
三等奖：时空焕活胶囊精华液约30粒（金胶），共8件；
四等奖：时空焕活透亮润泽胶囊精华液约7粒（VC胶囊7粒），共1724份；
五等奖：面额为1100-150的雅顿店铺优惠券，共14000份；`,
prizeInfoTitle: '奖品介绍',
resList: resList,
......@@ -271,12 +277,12 @@ Page({
// 页面被拉到底部
},
// 显示规则弹层
showRuleModal() {
this.setData({
ruleModalVisible: true
})
},
// 奖品介绍
seePrizeInfo () { this.setData({ruleModalVisible: true}) },
// 关闭 奖品介绍
closePrizeInfo() { this.setData({ ruleModalVisible: false }) },
// 通用弹出确认按钮回调
confirmCommonModal() {
const { commonModalConfirm } = this.data
......
taobao_mini/client/pages/turnTablePage/turnTablePage.json
View file @ 078d9f48
{
"usingComponents": {
"common-modal-t1": "/components/commonModalT1/commonModalT1",
"common-modal-t2": "/components/commonModalT2/commonModalT2"
"common-modal-t2": "/components/commonModalT2/commonModalT2",
"rule-modal": "/components/ruleModal/ruleModal"
}
}
\ No newline at end of file
taobao_mini/client/resconfig/resList.js
View file @ 078d9f48
......@@ -802,6 +802,24 @@ const resList = {
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/a1s成为会员_np.77d27373763893f523837acd535078cddbd6a93a.png',
uuid: '97149330-6828-4c41-8e5f-ab61dd811bcf'
},
'bafcfdad-0886-43ee-876e-c410d917192a': {
name: '奖品介绍按钮',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/奖品介绍按钮.187e953fc74c6be7e78a22729feea54df6595658.png',
uuid: 'bafcfdad-0886-43ee-876e-c410d917192a'
},
'd8ae79e1-971e-4e78-a365-553656128915': {
name: '赢清空购物车气泡',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/赢清空购物车气泡.3789e50cf354d457ff87b93ee1772a52337a5b66.png',
uuid: 'd8ae79e1-971e-4e78-a365-553656128915'
},
'1410be2a-7ab5-4c3b-bada-3541bdeeeb0a': {
name: '关闭视频新',
ext: '.png',
url: '//yun.duiba.com.cn/spark/assets/关闭视频新.79bbc2ff9ec51c07cfb3fcb9bc1af26bb71f2231.png',
uuid: '1410be2a-7ab5-4c3b-bada-3541bdeeeb0a'
}
};
export default resList;
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