Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Y
yyh
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
yyh
Commits
9d0ac511
Commit
9d0ac511
authored
Dec 10, 2019
by
wangzhujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
3333123
parent
37bb27ed
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
70 additions
and
29 deletions
+70
-29
Main.ts
egret/src/Main.ts
+6
-3
RankPanel.ts
egret/src/rankPanel/RankPanel.ts
+7
-1
StartScene.ts
egret/src/startScene/StartScene.ts
+44
-19
PKScene.ts
egret/src/yazuwei/PKScene.ts
+6
-3
PKScorePanel.ts
egret/src/yazuwei/PKScorePanel.ts
+2
-1
RecordMapScene.ts
egret/src/yazuwei/RecordMapScene.ts
+3
-1
RecordScene.ts
egret/src/yazuwei/RecordScene.ts
+2
-1
No files found.
egret/src/Main.ts
View file @
9d0ac511
...
...
@@ -174,7 +174,8 @@ class Main extends MainBase {
if
(
GameConst
.
getQueryString
(
"InviteSource"
))
{
yzwNet
.
homeBaseInfo
((
s
)
=>
{
if
(
!
s
)
{
ToastCtrl
.
instance
.
show
(
"网络异常请重试~"
);
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"homeBaseInfo"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~");
return
;
}
},
window
[
'projectId'
],
GameConst
.
getQueryString
(
"InviteSource"
))
...
...
@@ -216,7 +217,8 @@ class Main extends MainBase {
if
(
GameConst
.
getQueryString
(
"InviteSource"
))
{
yzwNet
.
homeBaseInfo
((
s
)
=>
{
if
(
!
s
)
{
ToastCtrl
.
instance
.
show
(
"网络异常请重试~"
);
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"homeBaseInfo"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~");
return
;
}
},
window
[
'projectId'
],
GameConst
.
getQueryString
(
"InviteSource"
))
...
...
@@ -227,7 +229,8 @@ class Main extends MainBase {
}
else
{
yzwNet
.
homeBaseInfo
((
s
)
=>
{
if
(
!
s
)
{
ToastCtrl
.
instance
.
show
(
"网络异常请重试~"
);
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"homeBaseInfo"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~");
return
;
}
Waiting
.
instance
.
hide
();
...
...
egret/src/rankPanel/RankPanel.ts
View file @
9d0ac511
...
...
@@ -45,6 +45,11 @@ export default class RankPanel extends Panel{
this
.
myRank
[
'rankid'
].
text
=
"我"
;
this
.
myRank
[
'ranknum'
].
text
=
data
.
currentUserInfo
.
count
;
this
.
myRank
[
'rankBG'
].
source
=
"rankmybg_png"
}
else
{
this
.
myRank
[
'rankid'
].
text
=
"我"
;
this
.
myRank
[
'ranklab'
].
text
=
"未上榜"
this
.
myRank
[
'ranknum'
].
text
=
"0"
;
this
.
myRank
[
'rankBG'
].
source
=
"rankmybg_png"
}
}
}
...
...
@@ -58,7 +63,8 @@ export default class RankPanel extends Panel{
Waiting
.
instance
.
show
();
yzwNet
.
homeBaseInfo
((
s
)
=>
{
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
"网络异常请重试~"
);
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"homeBaseInfo"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~");
return
;
}
Waiting
.
instance
.
hide
();
...
...
egret/src/startScene/StartScene.ts
View file @
9d0ac511
...
...
@@ -141,9 +141,19 @@ export default class StartScene extends Scene {
GuideFive
(){
yzwNet
.
doStart
((
s
)
=>
{
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
"网络异常请重试~"
);
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"doStart"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~");
return
;
}
yzwNet
.
unlockArea
((
ss
)
=>
{
if
(
!
ss
){
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"unlockArea"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~");
return
}
// this[this.arr[this.level]].source = this[this.arr[this.level]].source.substring(2);
// PanelCtrl.instance.show(ModuleTypes.PLACE_PANEL,this.level+1);
let
startdata
=
DataManager
.
ins
.
getData
(
"doStart"
).
data
;
let
data
=
{
startdata
:
startdata
,
type
:
3
};
this
.
hz
.
source
=
"CHNhangzhou_png"
...
...
@@ -151,6 +161,7 @@ export default class StartScene extends Scene {
this
.
clearTap
(
this
.
unlockBtn
,
this
.
GuideFive
);
this
.
onTap
(
this
.
unlockBtn
,
this
.
unlockArea
);
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
GUIDE_PANEL
,
data
);
},
window
[
'projectId'
]);
},
window
[
'projectId'
])
}
...
...
@@ -158,7 +169,8 @@ export default class StartScene extends Scene {
onTap_rankBtn
(){
yzwNet
.
rankInfo
((
s
)
=>
{
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
"网络异常请重试~"
);
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"rankInfo"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~");
return
;
}
let
data
=
DataManager
.
ins
.
getData
(
"rankInfo"
).
data
;
...
...
@@ -175,9 +187,18 @@ export default class StartScene extends Scene {
if
(
this
.
level
==
0
){
yzwNet
.
doStart
((
s
)
=>
{
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
"网络异常请重试~"
);
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"doStart"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~");
return
;
}
yzwNet
.
unlockArea
((
ss
)
=>
{
if
(
!
ss
){
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"unlockArea"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~");
return
}
// this[this.arr[this.level]].source = this[this.arr[this.level]].source.substring(2);
// PanelCtrl.instance.show(ModuleTypes.PLACE_PANEL,this.level+1);
let
startdata
=
DataManager
.
ins
.
getData
(
"doStart"
).
data
;
let
data
=
{
startdata
:
startdata
,
type
:
3
};
this
.
hz
.
source
=
"CHNhangzhou_png"
...
...
@@ -185,11 +206,14 @@ export default class StartScene extends Scene {
this
.
clearTap
(
this
.
unlockBtn
,
this
.
GuideFive
);
this
.
onTap
(
this
.
unlockBtn
,
this
.
unlockArea
);
PanelCtrl
.
instance
.
show
(
ModuleTypes
.
GUIDE_PANEL
,
data
);
},
window
[
'projectId'
]);
},
window
[
'projectId'
])
}
else
{
yzwNet
.
unlockArea
((
s
)
=>
{
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
"网络异常请重试~"
);
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"unlockArea"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~");
return
}
this
[
this
.
arr
[
this
.
level
]].
source
=
this
[
this
.
arr
[
this
.
level
]].
source
.
substring
(
2
);
...
...
@@ -214,7 +238,8 @@ export default class StartScene extends Scene {
onTap_PKBtn
(){
yzwNet
.
getPkBaseInfo
((
s
)
=>
{
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
"网络异常请重试~"
);
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"getPkBaseInfo"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~");
return
}
let
data
=
DataManager
.
ins
.
getData
(
"getPkBaseInfo"
).
data
;
...
...
egret/src/yazuwei/PKScene.ts
View file @
9d0ac511
...
...
@@ -176,7 +176,8 @@ export default class PKScene extends Scene{
addTeam
(){
yzwNet
.
genInvite
((
s
)
=>
{
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
"网络异常请重试~"
)
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"genInvite"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~")
return
}
let
data
=
DataManager
.
ins
.
getData
(
'genInvite'
).
data
;
...
...
@@ -187,7 +188,8 @@ export default class PKScene extends Scene{
askTeam
(){
yzwNet
.
genInvite
((
s
)
=>
{
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
"网络异常请重试~"
)
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"genInvite"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~")
return
}
let
data
=
DataManager
.
ins
.
getData
(
'genInvite'
).
data
;
...
...
@@ -198,7 +200,8 @@ export default class PKScene extends Scene{
askOnline
(){
yzwNet
.
genInvite
((
s
)
=>
{
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
"网络异常请重试~"
)
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"genInvite"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~")
return
}
let
data
=
DataManager
.
ins
.
getData
(
'genInvite'
).
data
;
...
...
egret/src/yazuwei/PKScorePanel.ts
View file @
9d0ac511
...
...
@@ -95,7 +95,8 @@ export default class PKScorePanel extends Panel{
onTap_PKBtn
(){
yzwNet
.
getPkBaseInfo
((
s
)
=>
{
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
"网络异常请重试~"
);
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"getPkBaseInfo"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~");
return
}
let
data
=
DataManager
.
ins
.
getData
(
"getPkBaseInfo"
).
data
;
...
...
egret/src/yazuwei/RecordMapScene.ts
View file @
9d0ac511
import
Scene
from
"../views/Scene"
;
import
{
yzwNet
}
from
"../NetConst"
;
import
ToastCtrl
from
"../ctrls/toastCtrl"
;
import
{
DataManager
}
from
"../../libs/tw/manager/DataManager"
;
export
default
class
RecordMapScene
extends
Scene
{
protected
get
skinKey
(){
return
'RecordMap'
}
...
...
@@ -53,7 +54,8 @@ export default class RecordMapScene extends Scene{
const
arr
=
[
"HZ"
,
"AM"
,
"XG"
,
"TB"
,
"RB"
,
"HG"
,
"CX"
,
"MG"
];
yzwNet
.
shareFootprint
((
s
)
=>
{
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
"网络异常请重新分享~"
)
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"shareFootprint"
).
message
)
// ToastCtrl.instance.show("网络异常请重新分享~")
return
}
// ToastCtrl.instance.show()
...
...
egret/src/yazuwei/RecordScene.ts
View file @
9d0ac511
...
...
@@ -39,7 +39,8 @@ export default class RecordScene extends Scene{
showMap
(
num
){
yzwNet
.
shareFootprintList
((
s
)
=>
{
if
(
!
s
){
ToastCtrl
.
instance
.
show
(
"网路异常请重试~"
);
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"shareFootprintList"
).
message
)
// ToastCtrl.instance.show("网路异常请重试~");
return
}
let
data
=
DataManager
.
ins
.
getData
(
"shareFootprintList"
).
data
;
...
...
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