Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
X
xiaoxiaole
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
xiaoxiaole
Commits
c24d798f
Commit
c24d798f
authored
Oct 24, 2019
by
邱旭
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
75755348
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
23 additions
and
23 deletions
+23
-23
MapScene.ts
egret/src/mapScene/MapScene.ts
+20
-18
InvitePanel.ts
egret/src/panels/InvitePanel.ts
+0
-1
ScratchPanel.ts
egret/src/panels/ScratchPanel.ts
+3
-4
No files found.
egret/src/mapScene/MapScene.ts
View file @
c24d798f
...
@@ -70,12 +70,14 @@ export default class MapScene extends Scene {
...
@@ -70,12 +70,14 @@ export default class MapScene extends Scene {
async
start
(
data
?)
{
async
start
(
data
?)
{
// NetManager.ins.getInviteInfo((success, res)=>{
// setTimeout(() => {
// if(!success){
// NetManager.ins.getInviteInfo((success, res) => {
// if(!success) {
//
//
// }
// }
// PanelCtrl.instance.show('scratch', res.data);
// PanelCtrl.instance.show('scratch', res.data);
// });
// });
// }, 1000);
super
.
start
();
super
.
start
();
...
@@ -112,17 +114,17 @@ export default class MapScene extends Scene {
...
@@ -112,17 +114,17 @@ export default class MapScene extends Scene {
noticeAdvert
=
{
enable
:
false
}
noticeAdvert
=
{
enable
:
false
}
}
}
if
(
noticeAdvert
&&
noticeAdvert
.
enable
&&
nowTimerStr2
!=
oldTimerStr2
)
{
if
(
noticeAdvert
&&
noticeAdvert
.
enable
&&
nowTimerStr2
!=
oldTimerStr2
)
{
// if (!adTag) {
// if (!adTag) {
panels
.
push
(
'ad'
);
panels
.
push
(
'ad'
);
// adTag = true;
// adTag = true;
// }
// }
localStorage
.
setItem
(
'nowTimer2Str'
+
window
[
'CFG'
].
consumerId
,
nowTimerStr2
);
localStorage
.
setItem
(
'nowTimer2Str'
+
window
[
'CFG'
].
consumerId
,
nowTimerStr2
);
}
}
const
{
signInfoVO
}
=
DataManager
.
ins
.
getData
(
'getSignInfo'
);
const
{
signInfoVO
}
=
DataManager
.
ins
.
getData
(
'getSignInfo'
);
if
(
signInfoVO
.
continueDay
<
7
)
{
//表示明天还可以签到
if
(
signInfoVO
.
continueDay
<
7
)
{
//表示明天还可以签到
if
(
signInfoVO
.
todaySigned
==
0
&&
oldTimerStr
!=
nowTimerStr
)
{
if
(
signInfoVO
.
todaySigned
==
0
&&
oldTimerStr
!=
nowTimerStr
)
{
panels
.
push
(
'sign'
);
panels
.
push
(
'sign'
);
localStorage
.
setItem
(
'nowTimerStr'
+
window
[
'CFG'
].
consumerId
,
nowTimerStr
);
localStorage
.
setItem
(
'nowTimerStr'
+
window
[
'CFG'
].
consumerId
,
nowTimerStr
);
}
}
...
@@ -267,13 +269,13 @@ export default class MapScene extends Scene {
...
@@ -267,13 +269,13 @@ export default class MapScene extends Scene {
}
}
updateSign
(){
updateSign
()
{
const
{
signInfoVO
}
=
DataManager
.
ins
.
getData
(
'getSignInfo'
);
const
{
signInfoVO
}
=
DataManager
.
ins
.
getData
(
'getSignInfo'
);
if
(
signInfoVO
.
continueDay
<
7
)
{
//表示明天还可以签到
if
(
signInfoVO
.
continueDay
<
7
)
{
//表示明天还可以签到
this
[
'sign_s1'
].
visible
=
signInfoVO
.
todaySigned
==
0
;
this
[
'sign_s1'
].
visible
=
signInfoVO
.
todaySigned
==
0
;
this
[
'sign_s2'
].
visible
=
!
this
[
'sign_s1'
].
visible
;
this
[
'sign_s2'
].
visible
=
!
this
[
'sign_s1'
].
visible
;
}
else
{
}
else
{
this
[
'sign_s2'
].
visible
=
true
;
this
[
'sign_s2'
].
visible
=
true
;
}
}
}
}
...
...
egret/src/panels/InvitePanel.ts
View file @
c24d798f
...
@@ -199,7 +199,6 @@ class InviteItem extends eui.ItemRenderer {
...
@@ -199,7 +199,6 @@ class InviteItem extends eui.ItemRenderer {
}
}
dataChanged
()
{
dataChanged
()
{
console
.
log
(
this
.
data
);
this
.
img
.
source
=
this
.
data
.
avatar
||
"http://yun.duiba.com.cn/db_games/default_avatar.png"
;
this
.
img
.
source
=
this
.
data
.
avatar
||
"http://yun.duiba.com.cn/db_games/default_avatar.png"
;
this
.
img
.
addEventListener
(
egret
.
TouchEvent
.
TOUCH_TAP
,
()
=>
{
this
.
img
.
addEventListener
(
egret
.
TouchEvent
.
TOUCH_TAP
,
()
=>
{
if
(
this
.
data
.
callFun
)
{
if
(
this
.
data
.
callFun
)
{
...
...
egret/src/panels/ScratchPanel.ts
View file @
c24d798f
...
@@ -166,8 +166,8 @@ export default class ScratchPanel extends Panel {
...
@@ -166,8 +166,8 @@ export default class ScratchPanel extends Panel {
}
}
private
hongbaoEffect
(){
private
hongbaoEffect
(){
egret
.
Tween
.
get
(
this
[
"hongbao"
]).
to
({
scaleX
:
0.8
,
scaleY
:
0.8
},
3
00
,
egret
.
Ease
.
quadInOut
).
call
(()
=>
{
egret
.
Tween
.
get
(
this
[
"hongbao"
]).
to
({
scaleX
:
0.8
,
scaleY
:
0.8
},
2
00
,
egret
.
Ease
.
quadInOut
).
call
(()
=>
{
egret
.
Tween
.
get
(
this
[
"hongbao"
]).
to
({
scaleX
:
1
,
scaleY
:
1
},
2
00
,
egret
.
Ease
.
quadInOut
).
wait
(
1500
).
call
(()
=>
{
egret
.
Tween
.
get
(
this
[
"hongbao"
]).
to
({
scaleX
:
1
,
scaleY
:
1
},
1
00
,
egret
.
Ease
.
quadInOut
).
wait
(
1500
).
call
(()
=>
{
this
.
hongbaoEffect
();
this
.
hongbaoEffect
();
});
});
});
});
...
@@ -201,8 +201,7 @@ class ScratchItem extends eui.ItemRenderer {
...
@@ -201,8 +201,7 @@ class ScratchItem extends eui.ItemRenderer {
}
}
dataChanged
()
{
dataChanged
()
{
this
.
img
.
mask
=
this
.
mask
this
.
img
.
mask
=
this
.
mask
;
console
.
log
(
this
.
data
);
this
.
img
.
source
=
this
.
data
.
avatar
||
"http://yun.duiba.com.cn/db_games/default_avatar.png"
;
this
.
img
.
source
=
this
.
data
.
avatar
||
"http://yun.duiba.com.cn/db_games/default_avatar.png"
;
this
.
img
.
addEventListener
(
egret
.
TouchEvent
.
TOUCH_TAP
,
()
=>
{
this
.
img
.
addEventListener
(
egret
.
TouchEvent
.
TOUCH_TAP
,
()
=>
{
if
(
this
.
data
.
callFun
)
{
if
(
this
.
data
.
callFun
)
{
...
...
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