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
14ca95b8
Commit
14ca95b8
authored
Oct 17, 2019
by
邱旭
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of
http://gitlab2.dui88.com/wanghongyuan/xiaoxiaole
into dev
parents
1e87ca3b
c04c8a03
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
2 deletions
+6
-2
sharefriendwx.jpg
egret/resource/assets/sharefriendwx.jpg
+0
-0
MapScene.ts
egret/src/mapScene/MapScene.ts
+4
-0
InvitePanel.ts
egret/src/panels/InvitePanel.ts
+1
-1
mapRank.json
mock/happyclear/mapRank.json
+1
-1
No files found.
egret/resource/assets/sharefriendwx.jpg
View replaced file @
1e87ca3b
View file @
14ca95b8
286 KB
|
W:
|
H:
287 KB
|
W:
|
H:
2-up
Swipe
Onion skin
egret/src/mapScene/MapScene.ts
View file @
14ca95b8
...
@@ -364,7 +364,11 @@ export default class MapScene extends Scene {
...
@@ -364,7 +364,11 @@ export default class MapScene extends Scene {
NetManager
.
ins
.
hc_mapRank
(()
=>
{
NetManager
.
ins
.
hc_mapRank
(()
=>
{
const
hc_mapRank
=
DataManager
.
ins
.
getData
(
'hc_mapRank'
).
data
;
const
hc_mapRank
=
DataManager
.
ins
.
getData
(
'hc_mapRank'
).
data
;
if
(
!
hc_mapRank
)
return
;
if
(
!
hc_mapRank
)
return
;
const
{
data
}
=
DataManager
.
ins
.
getData
(
'hc_userInfo'
);
hc_mapRank
.
forEach
((
ele
)
=>
{
hc_mapRank
.
forEach
((
ele
)
=>
{
if
(
ele
.
levelNum
==
getHomeData
().
levels
.
length
+
1
){
ele
.
rank
[
0
].
avatar
=
data
.
avatar
;
}
this
.
addAvatar
(
ele
.
levelNum
,
ele
.
rank
[
0
]);
this
.
addAvatar
(
ele
.
levelNum
,
ele
.
rank
[
0
]);
});
});
});
});
...
...
egret/src/panels/InvitePanel.ts
View file @
14ca95b8
...
@@ -87,7 +87,7 @@ export default class InvitePanel extends Panel {
...
@@ -87,7 +87,7 @@ export default class InvitePanel extends Panel {
return
;
return
;
}
}
let
shareCode
=
res
.
data
;
// 分享码
let
shareCode
=
res
.
data
;
// 分享码
CFG
.
wxShareLink
=
"https://gameact.suning.com/duiba/customShare/share?id=3531"
+
"&shareCode="
+
shareCode
;
// 分享链接
CFG
.
wxShareLink
=
window
[
'h5URL'
]
+
"&shareCode="
+
shareCode
;
// 分享链接
if
(
iswx
())
{
//微信端
if
(
iswx
())
{
//微信端
this
.
wxShareTip
.
visible
=
true
;
this
.
wxShareTip
.
visible
=
true
;
window
[
"invokeWX"
]();
window
[
"invokeWX"
]();
...
...
mock/happyclear/mapRank.json
View file @
14ca95b8
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
"code"
:
"0000000000"
,
"code"
:
"0000000000"
,
"data"
:
[
"data"
:
[
{
{
"levelNum"
:
7
2
,
"levelNum"
:
7
1
,
"rank"
:
[
"rank"
:
[
{
{
"levelNum"
:
null
,
"levelNum"
:
null
,
...
...
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