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
26f44727
Commit
26f44727
authored
Dec 10, 2019
by
wangzhujun
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
123
parent
d8e876cd
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
21 deletions
+19
-21
default.thm.json
egret/resource/default.thm.json
+0
-1
PKSCoreSkin.exml
egret/resource/skins/PKSCoreSkin.exml
+1
-1
Main.ts
egret/src/Main.ts
+17
-17
NetConst.ts
egret/src/NetConst.ts
+1
-2
No files found.
egret/resource/default.thm.json
View file @
26f44727
...
@@ -32,7 +32,6 @@
...
@@ -32,7 +32,6 @@
"resource/skins/FinishSkin.exml"
,
"resource/skins/FinishSkin.exml"
,
"resource/skins/RankSkin.exml"
,
"resource/skins/RankSkin.exml"
,
"resource/skins/RankItemSkin.exml"
,
"resource/skins/RankItemSkin.exml"
,
"resource/skins/ConfirmSkin.exml"
,
"resource/skins/ConfirmSkin.exml"
,
"resource/skins/JoinShareSkin.exml"
,
"resource/skins/JoinShareSkin.exml"
,
"resource/skins/PKScoreSkin.exml"
,
"resource/skins/PKScoreSkin.exml"
,
...
...
egret/resource/skins/PKSCoreSkin.exml
View file @
26f44727
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<e:Skin
class=
"PKS
C
oreSkin"
width=
"750"
height=
"1624"
xmlns:e=
"http://ns.egret.com/eui"
xmlns:w=
"http://ns.egret.com/wing"
>
<e:Skin
class=
"PKS
c
oreSkin"
width=
"750"
height=
"1624"
xmlns:e=
"http://ns.egret.com/eui"
xmlns:w=
"http://ns.egret.com/wing"
>
<w:Config
id=
"16eeaea9839"
/>
<w:Config
id=
"16eeaea9839"
/>
<e:Group
width=
"750"
height=
"1206"
horizontalCenter=
"0"
verticalCenter=
"-209"
>
<e:Group
width=
"750"
height=
"1206"
horizontalCenter=
"0"
verticalCenter=
"-209"
>
...
...
egret/src/Main.ts
View file @
26f44727
...
@@ -122,7 +122,7 @@ class Main extends MainBase {
...
@@ -122,7 +122,7 @@ class Main extends MainBase {
//PanelCtrl.instance.show(ModuleTypes.MSG_PANEL, msgData)
//PanelCtrl.instance.show(ModuleTypes.MSG_PANEL, msgData)
},
this
);
},
this
);
// 监听当预加载资源加载完毕
// 监听当预加载资源加载完毕
GDispatcher
.
addEvent
(
'
Preload
Loaded'
,
()
=>
{
GDispatcher
.
addEvent
(
'
Delay
Loaded'
,
()
=>
{
Waiting
.
instance
.
show
()
Waiting
.
instance
.
show
()
this
.
createGameScene
()
this
.
createGameScene
()
// Waiting.instance.hide()
// Waiting.instance.hide()
...
@@ -171,15 +171,15 @@ class Main extends MainBase {
...
@@ -171,15 +171,15 @@ class Main extends MainBase {
// return;
// return;
if
(
window
[
'pageID'
])
{
if
(
window
[
'pageID'
])
{
if
(
GameConst
.
getQueryString
(
"InviteSource"
))
{
//
if (GameConst.getQueryString("InviteSource")) {
yzwNet
.
homeBaseInfo
((
s
)
=>
{
yzwNet
.
homeBaseInfo
((
s
)
=>
{
if
(
!
s
)
{
if
(
!
s
)
{
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"homeBaseInfo"
).
message
)
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"homeBaseInfo"
).
message
)
// ToastCtrl.instance.show("网络异常请重试~");
// ToastCtrl.instance.show("网络异常请重试~");
return
;
return
;
}
}
},
window
[
'projectId'
]
,
GameConst
.
getQueryString
(
"InviteSource"
)
)
},
window
[
'projectId'
])
}
//
}
Waiting
.
instance
.
hide
();
Waiting
.
instance
.
hide
();
if
(
window
[
'pageID'
]
==
'JoinShareScene'
)
{
if
(
window
[
'pageID'
]
==
'JoinShareScene'
)
{
...
@@ -214,20 +214,20 @@ class Main extends MainBase {
...
@@ -214,20 +214,20 @@ class Main extends MainBase {
Buried
.
init
();
Buried
.
init
();
// 端内发接口
// 端内发接口
if
(
GameConst
.
getQueryString
(
"InviteSource"
))
{
//
if (GameConst.getQueryString("InviteSource")) {
yzwNet
.
homeBaseInfo
((
s
)
=>
{
//
yzwNet.homeBaseInfo((s) => {
if
(
!
s
)
{
//
if (!s) {
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"homeBaseInfo"
).
message
)
//
ToastCtrl.instance.show(DataManager.ins.getData("homeBaseInfo").message)
// ToastCtrl.instance.show("网络异常请重试~");
//
// ToastCtrl.instance.show("网络异常请重试~");
return
;
//
return;
}
//
}
Waiting
.
instance
.
hide
();
//
Waiting.instance.hide();
let
data
=
DataManager
.
ins
.
getData
(
"homeBaseInfo"
).
data
;
//
let data = DataManager.ins.getData("homeBaseInfo").data;
SceneCtrl
.
instance
.
change
(
ModuleTypes
.
START_SCENE
,
data
);
//
SceneCtrl.instance.change(ModuleTypes.START_SCENE, data);
},
window
[
'projectId'
],
GameConst
.
getQueryString
(
"InviteSource"
))
//
}, window['projectId'], GameConst.getQueryString("InviteSource"))
}
else
{
//
} else {
yzwNet
.
homeBaseInfo
((
s
)
=>
{
yzwNet
.
homeBaseInfo
((
s
)
=>
{
if
(
!
s
)
{
if
(
!
s
)
{
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"homeBaseInfo"
).
message
)
ToastCtrl
.
instance
.
show
(
DataManager
.
ins
.
getData
(
"homeBaseInfo"
).
message
)
...
@@ -239,7 +239,7 @@ class Main extends MainBase {
...
@@ -239,7 +239,7 @@ class Main extends MainBase {
SceneCtrl
.
instance
.
change
(
ModuleTypes
.
START_SCENE
,
data
);
SceneCtrl
.
instance
.
change
(
ModuleTypes
.
START_SCENE
,
data
);
},
window
[
'projectId'
])
},
window
[
'projectId'
])
}
//
}
...
...
egret/src/NetConst.ts
View file @
26f44727
...
@@ -30,7 +30,7 @@ export class yzwNet{
...
@@ -30,7 +30,7 @@ export class yzwNet{
* 1.1首页基础信息
* 1.1首页基础信息
* @param callback 回调
* @param callback 回调
*/
*/
public
static
homeBaseInfo
(
callback
,
projectId
,
InviteSource
?
){
public
static
homeBaseInfo
(
callback
,
projectId
){
const
net
:
INetData
=
{
const
net
:
INetData
=
{
name
:
'homeBaseInfo'
,
name
:
'homeBaseInfo'
,
uri
:
`/projectx/
${
projectId
}
/join_1/homeBaseInfo.do`
,
uri
:
`/projectx/
${
projectId
}
/join_1/homeBaseInfo.do`
,
...
@@ -38,7 +38,6 @@ export class yzwNet{
...
@@ -38,7 +38,6 @@ export class yzwNet{
dataType
:
'json'
,
dataType
:
'json'
,
hideMsg
:
true
,
hideMsg
:
true
,
param
:
{
param
:
{
InviteSource
:
InviteSource
},
},
callback
:
callback
callback
:
callback
};
};
...
...
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