Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
N
new_taobao
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
wildfirecode13
new_taobao
Commits
cf414373
Commit
cf414373
authored
Oct 12, 2020
by
AU-Pro-mac
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change
parent
3170eebe
Changes
8
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
134 additions
and
21 deletions
+134
-21
output.js
project/src/canvas/game/output.js
+9
-3
output.js.map
project/src/canvas/game/output.js.map
+1
-1
output.js
project/src/canvas/game/released/output.js
+9
-3
Root.ts
project/src/canvas/game/src/chuansongdai/Root.ts
+11
-1
homePage.acss
taobao_mini/client/pages/homePage/homePage.acss
+1
-1
output.js
taobao_mini/client/pages/pagecanvas/output.js
+100
-6
pagecanvas.js
taobao_mini/client/pages/pagecanvas/pagecanvas.js
+1
-4
constants.js
taobao_mini/client/tbcc-sdk/lib/constants.js
+2
-2
No files found.
project/src/canvas/game/output.js
View file @
cf414373
...
...
@@ -2556,7 +2556,9 @@ var Root = (function (_super) {
var
userInfoRes
;
return
__generator
(
this
,
function
(
_a
)
{
switch
(
_a
.
label
)
{
case
0
:
return
[
4
,
TaoBaoNet_1
.
sendTbNet
(
TaoBaoNet_1
.
TbNetName
.
getUserInfo
,
{})];
case
0
:
Main_1
.
GDispatcher
.
removeEventListener
(
'gameReset'
,
this
.
gameAgain
,
this
);
return
[
4
,
TaoBaoNet_1
.
sendTbNet
(
TaoBaoNet_1
.
TbNetName
.
getUserInfo
,
{})];
case
1
:
userInfoRes
=
_a
.
sent
();
this
.
userInfo
=
userInfoRes
.
data
;
...
...
@@ -2594,6 +2596,7 @@ var Root = (function (_super) {
TaoBaoNet_1
.
sendTbNet
(
TaoBaoNet_1
.
TbNetName
.
backToPage
,
{},
function
(
s
,
res
)
{
console
.
log
(
'backToPage'
);
});
return
[
2
];
}
Main_1
.
GDispatcher
.
addEventListener
(
'gameReset'
,
this
.
gameAgain
,
this
);
if
(
!
(
this
.
userInfo
.
win
&&
this
.
scoreBoard
.
scoreLeft
))
return
[
3
,
2
];
return
[
4
,
TaoBaoNet_1
.
sendTbNet
(
TaoBaoNet_1
.
TbNetName
.
getPrizeInfo
)];
case
1
:
...
...
@@ -2671,10 +2674,13 @@ var Root = (function (_super) {
this
.
initUi
();
};
Root
.
prototype
.
dispose
=
function
()
{
var
_this
=
this
;
this
.
goodsContainer
.
destroy
();
this
.
scoreBoard
.
destroy
();
this
.
touchArea
.
removeEventListener
(
FYGE
.
MouseEvent
.
MOUSE_DOWN
,
this
.
onMouseDownArea
,
this
);
this
.
touchArea
.
removeEventListener
(
FYGE
.
MouseEvent
.
MOUSE_UP
,
this
.
onMouseUpArea
,
this
);
this
.
backBtn
.
removeEventListener
(
FYGE
.
MouseEvent
.
MOUSE_DOWN
,
function
()
{
_this
.
gameOver
(
'back'
);
},
this
);
Main_1
.
GDispatcher
.
removeEventListener
(
'gameReset'
,
this
.
gameAgain
,
this
);
};
return
Root
;
}(
FYGE
.
Container
));
...
...
@@ -15094,11 +15100,11 @@ exports.Star = Star;
Object
.
defineProperty
(
exports
,
"__esModule"
,
{
value
:
true
});
exports
.
config
=
void
0
;
exports
.
config
=
{
time
:
12
0
,
time
:
12
,
first
:
1000
,
second
:
2000
,
third
:
3000
,
score
:
[
10
,
10
,
10
,
10
,
10
],
score
:
[
10
00
,
10
,
10
,
10
,
10
],
difficulty
:
3
,
circleRes
:
[
'2a747211-0210-4215-86a2-a6955b37c45b'
,
'7d1ec658-9371-4d52-b4d7-e75d04037daf'
,
'6a1345f6-969c-4969-8bfb-f4de637df34d'
,
'2e12a9ec-46be-487f-a9cd-550dd0af3746'
,
'b022fbdd-8607-435a-a205-19fc3b5123eb'
]
};
...
...
project/src/canvas/game/output.js.map
View file @
cf414373
project/src/canvas/game/released/output.js
View file @
cf414373
...
...
@@ -2558,7 +2558,9 @@ var Root = (function (_super) {
var
userInfoRes
;
return
__generator
(
this
,
function
(
_a
)
{
switch
(
_a
.
label
)
{
case
0
:
return
[
4
,
TaoBaoNet_1
.
sendTbNet
(
TaoBaoNet_1
.
TbNetName
.
getUserInfo
,
{})];
case
0
:
Main_1
.
GDispatcher
.
removeEventListener
(
'gameReset'
,
this
.
gameAgain
,
this
);
return
[
4
,
TaoBaoNet_1
.
sendTbNet
(
TaoBaoNet_1
.
TbNetName
.
getUserInfo
,
{})];
case
1
:
userInfoRes
=
_a
.
sent
();
this
.
userInfo
=
userInfoRes
.
data
;
...
...
@@ -2596,6 +2598,7 @@ var Root = (function (_super) {
TaoBaoNet_1
.
sendTbNet
(
TaoBaoNet_1
.
TbNetName
.
backToPage
,
{},
function
(
s
,
res
)
{
console
.
log
(
'backToPage'
);
});
return
[
2
];
}
Main_1
.
GDispatcher
.
addEventListener
(
'gameReset'
,
this
.
gameAgain
,
this
);
if
(
!
(
this
.
userInfo
.
win
&&
this
.
scoreBoard
.
scoreLeft
))
return
[
3
,
2
];
return
[
4
,
TaoBaoNet_1
.
sendTbNet
(
TaoBaoNet_1
.
TbNetName
.
getPrizeInfo
)];
case
1
:
...
...
@@ -2673,10 +2676,13 @@ var Root = (function (_super) {
this
.
initUi
();
};
Root
.
prototype
.
dispose
=
function
()
{
var
_this
=
this
;
this
.
goodsContainer
.
destroy
();
this
.
scoreBoard
.
destroy
();
this
.
touchArea
.
removeEventListener
(
FYGE
.
MouseEvent
.
MOUSE_DOWN
,
this
.
onMouseDownArea
,
this
);
this
.
touchArea
.
removeEventListener
(
FYGE
.
MouseEvent
.
MOUSE_UP
,
this
.
onMouseUpArea
,
this
);
this
.
backBtn
.
removeEventListener
(
FYGE
.
MouseEvent
.
MOUSE_DOWN
,
function
()
{
_this
.
gameOver
(
'back'
);
},
this
);
Main_1
.
GDispatcher
.
removeEventListener
(
'gameReset'
,
this
.
gameAgain
,
this
);
};
return
Root
;
}(
FYGE
.
Container
));
...
...
@@ -15096,11 +15102,11 @@ exports.Star = Star;
Object
.
defineProperty
(
exports
,
"__esModule"
,
{
value
:
true
});
exports
.
config
=
void
0
;
exports
.
config
=
{
time
:
12
0
,
time
:
12
,
first
:
1000
,
second
:
2000
,
third
:
3000
,
score
:
[
10
,
10
,
10
,
10
,
10
],
score
:
[
10
00
,
10
,
10
,
10
,
10
],
difficulty
:
3
,
circleRes
:
[
'2a747211-0210-4215-86a2-a6955b37c45b'
,
'7d1ec658-9371-4d52-b4d7-e75d04037daf'
,
'6a1345f6-969c-4969-8bfb-f4de637df34d'
,
'2e12a9ec-46be-487f-a9cd-550dd0af3746'
,
'b022fbdd-8607-435a-a205-19fc3b5123eb'
]
};
...
...
project/src/canvas/game/src/chuansongdai/Root.ts
View file @
cf414373
...
...
@@ -124,6 +124,9 @@ export default class Root extends FYGE.Container {
// 再来一局
async
gameAgain
()
{
// 取消监听再来一局
GDispatcher
.
removeEventListener
(
'gameReset'
,
this
.
gameAgain
,
this
)
const
userInfoRes
=
await
sendTbNet
(
TbNetName
.
getUserInfo
,
{})
this
.
userInfo
=
userInfoRes
.
data
console
.
log
(
'CSD-GAME this.userInfo:'
,
userInfoRes
.
data
)
...
...
@@ -159,7 +162,11 @@ export default class Root extends FYGE.Container {
return
}
// 正常结束 - 由自组建调用
// 正常结束 - 由子组件调用
// 监听再来一局
GDispatcher
.
addEventListener
(
'gameReset'
,
this
.
gameAgain
,
this
)
if
(
this
.
userInfo
.
win
&&
this
.
scoreBoard
.
scoreLeft
)
{
//胜利
const
prizeInfo
=
await
sendTbNet
(
TbNetName
.
getPrizeInfo
)
...
...
@@ -244,6 +251,9 @@ export default class Root extends FYGE.Container {
this
.
scoreBoard
.
destroy
()
this
.
touchArea
.
removeEventListener
(
FYGE
.
MouseEvent
.
MOUSE_DOWN
,
this
.
onMouseDownArea
,
this
)
this
.
touchArea
.
removeEventListener
(
FYGE
.
MouseEvent
.
MOUSE_UP
,
this
.
onMouseUpArea
,
this
)
this
.
backBtn
.
removeEventListener
(
FYGE
.
MouseEvent
.
MOUSE_DOWN
,
()
=>
{
this
.
gameOver
(
'back'
)
},
this
)
// 取消监听再来一局
GDispatcher
.
removeEventListener
(
'gameReset'
,
this
.
gameAgain
,
this
)
// throw new Error("Method not implemented.")
}
}
taobao_mini/client/pages/homePage/homePage.acss
View file @
cf414373
...
...
@@ -144,7 +144,7 @@
width: 176rpx;
height: 77rpx;
position: absolute;
top: -
40
rpx;
top: -
56
rpx;
left: 7rpx;
}
...
...
taobao_mini/client/pages/pagecanvas/output.js
View file @
cf414373
This diff is collapsed.
Click to expand it.
taobao_mini/client/pages/pagecanvas/pagecanvas.js
View file @
cf414373
...
...
@@ -180,7 +180,6 @@ Component({
content
:
'门票消耗完了!
\
n快去做任务吧~'
,
confirmCallback
:
()
=>
{
this
.
closeCommonModalT1
()
this
.
back
()
},
btnImg
:
'//yun.duiba.com.cn/spark/assets/好的按钮.948e42751245099e12fef8ad2617d746f6370863.png'
})
return
...
...
@@ -368,7 +367,6 @@ Component({
commonModalDataT1
:
{
title
,
content
,
btnImg
},
confirmCommonModalT1
:
()
=>
{
confirmCallback
()
this
.
closeCommonModalT1
()
}
})
},
...
...
@@ -376,7 +374,7 @@ Component({
// 通用弹层 - 关闭 - T1
closeCommonModalT1
()
{
this
.
setData
({
commonModalVisibleT1
:
false
});
this
.
getGameInfo
()
this
.
back
()
},
gameStartInfo_test
(){
...
...
@@ -398,7 +396,6 @@ Component({
content
:
'门票消耗完了!
\
n快去做任务吧~'
,
confirmCallback
:
()
=>
{
this
.
closeCommonModalT1
()
this
.
back
()
},
btnImg
:
'//yun.duiba.com.cn/spark/assets/好的按钮.948e42751245099e12fef8ad2617d746f6370863.png'
})
return
...
...
taobao_mini/client/tbcc-sdk/lib/constants.js
View file @
cf414373
// 分享配置
export
let
SHARE_CONFIG
=
{
title
:
'【集美!一起
去雅顿乐园赢伊丽莎白金胶
】'
,
desc
:
'
【集美!一起去雅顿乐园赢伊丽莎白金胶】
'
,
title
:
'【集美!一起
赢清空购物车大奖了
】'
,
desc
:
'
快来雅顿乐园玩游戏赢大奖
'
,
imageUrl
:
'https://isv.alibabausercontent.com/00000000/imgextra/i2/676606897/O1CN01eNrwLl20osHoB4Y7d_!!676606897-2-isvtu-00000000.png'
,
// 分享图片URL
path
:
'/pages/homePage/homePage'
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment