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
2fc53343
Commit
2fc53343
authored
Oct 15, 2020
by
zhangjinzhou
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
代码暂存
parent
9b79369c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
17 additions
and
12 deletions
+17
-12
pagegamemain.acss
taobao_jn/client/pages/pagegamemain/pagegamemain.acss
+1
-1
pagegamemain.js
taobao_jn/client/pages/pagegamemain/pagegamemain.js
+15
-10
resList.js
taobao_jn/client/resconfig/resList.js
+1
-1
No files found.
taobao_jn/client/pages/pagegamemain/pagegamemain.acss
View file @
2fc53343
...
@@ -684,7 +684,7 @@ letter-spacing: 3rpx;
...
@@ -684,7 +684,7 @@ letter-spacing: 3rpx;
.gamemain .gamemguide .gamemguidecont .gamemguide2 {
.gamemain .gamemguide .gamemguidecont .gamemguide2 {
width: 482rpx;
width: 482rpx;
height: 290rpx;
height: 290rpx;
opacity:
0.5
;
opacity:
1
;
display: block;
display: block;
left: 96rpx;
left: 96rpx;
top: 310rpx;
top: 310rpx;
...
...
taobao_jn/client/pages/pagegamemain/pagegamemain.js
View file @
2fc53343
...
@@ -48,8 +48,8 @@ Page({
...
@@ -48,8 +48,8 @@ Page({
],
//实际展示的list
],
//实际展示的list
iswin
:
false
,
//
iswin
:
false
,
//
step
:
1
,
//阶段
step
:
1
,
//阶段
startime
:
0
,
startime
:
0
,
endtime
:
0
,
endtime
:
0
,
//我的消息通知
//我的消息通知
linvite
:
{
linvite
:
{
count
:
0
,
count
:
0
,
...
@@ -117,10 +117,11 @@ Page({
...
@@ -117,10 +117,11 @@ Page({
key
:
'jn_'
+
app
.
openId
+
'_new'
key
:
'jn_'
+
app
.
openId
+
'_new'
});
});
let
isnew
=
isnewdata
.
data
?
0
:
1
;
let
isnew
=
isnewdata
.
data
?
0
:
1
;
isnew
=
1
;
this
.
setData
({
this
.
setData
({
isnew
:
isnew
isnew
:
isnew
});
});
if
(
isnew
!=
0
)
{
if
(
isnew
!=
0
)
{
my
.
setStorageSync
({
my
.
setStorageSync
({
key
:
'jn_'
+
app
.
openId
+
'_new'
,
key
:
'jn_'
+
app
.
openId
+
'_new'
,
data
:
1
data
:
1
...
@@ -128,9 +129,9 @@ Page({
...
@@ -128,9 +129,9 @@ Page({
}
}
console
.
log
(
"新手"
,
isnew
,
query
);
console
.
log
(
"新手"
,
isnew
,
query
);
let
{
end
,
gl
,
start
,
step
,
toolcd
}
=
query
;
let
{
end
,
gl
,
start
,
step
,
toolcd
}
=
query
;
step
=
Number
(
step
);
step
=
Number
(
step
);
gameatime
=
Math
.
floor
((
Number
(
end
)
-
Number
(
start
))
/
1000
);
gameatime
=
Math
.
floor
((
Number
(
end
)
-
Number
(
start
))
/
1000
);
gtoolcd
=
Number
(
toolcd
);
gtoolcd
=
Number
(
toolcd
);
let
sucgl
=
Number
(
gl
);
let
sucgl
=
Number
(
gl
);
let
nranksuc
=
Math
.
random
()
*
100
;
let
nranksuc
=
Math
.
random
()
*
100
;
...
@@ -163,12 +164,16 @@ Page({
...
@@ -163,12 +164,16 @@ Page({
showattionlist
:
[],
showattionlist
:
[],
canwin
:
canwin
,
canwin
:
canwin
,
isfirst
:
true
,
isfirst
:
true
,
gametime
:
gameatime
,
gametime
:
gameatime
,
tooltime
:
0
,
tooltime
:
0
,
startime
:
Number
(
start
),
startime
:
Number
(
start
),
endtime
:
Number
(
end
),
endtime
:
Number
(
end
),
});
});
this
.
changePashow
();
this
.
changePashow
();
my
.
__updateWarms
=
()
=>
{
this
.
updateActInfo
();
}
console
.
log
(
"my======>"
,
my
);
},
},
startGame
()
{
startGame
()
{
if
(
this
.
data
.
isnew
>
0
&&
this
.
data
.
isnew
<
7
)
{
if
(
this
.
data
.
isnew
>
0
&&
this
.
data
.
isnew
<
7
)
{
...
@@ -322,7 +327,7 @@ Page({
...
@@ -322,7 +327,7 @@ Page({
}
}
},
},
onShow
()
{
onShow
()
{
if
((
this
.
data
.
isnew
>
0
&&
this
.
data
.
isnew
<
7
)
||
this
.
data
.
show_v
!=
2
)
{
if
((
this
.
data
.
isnew
>
0
&&
this
.
data
.
isnew
<
7
)
||
this
.
data
.
show_v
!=
2
)
{
return
;
return
;
}
}
this
.
updateActInfo
();
this
.
updateActInfo
();
...
...
taobao_jn/client/resconfig/resList.js
View file @
2fc53343
...
@@ -422,7 +422,7 @@ const resList = {
...
@@ -422,7 +422,7 @@ const resList = {
'7e075ada-3bc1-4890-aa53-f0b3eb11c0bd'
:
{
'7e075ada-3bc1-4890-aa53-f0b3eb11c0bd'
:
{
name
:
'新手引导页3'
,
name
:
'新手引导页3'
,
ext
:
'.png'
,
ext
:
'.png'
,
url
:
'//yun.duiba.com.cn/spark/assets/新手引导页3
.5914916fd7de9eaf741fc45c2a916ec966535b35
.png'
,
url
:
'//yun.duiba.com.cn/spark/assets/新手引导页3
1.37457d8f9b581a6ee9c6d86e37f55389097f9e0f
.png'
,
uuid
:
'7e075ada-3bc1-4890-aa53-f0b3eb11c0bd'
,
uuid
:
'7e075ada-3bc1-4890-aa53-f0b3eb11c0bd'
,
},
},
'fd40efdd-8da6-4e1f-be5e-f920c917593e'
:
{
'fd40efdd-8da6-4e1f-be5e-f920c917593e'
:
{
...
...
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