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
3d2302de
Commit
3d2302de
authored
Aug 31, 2019
by
wildfirecode
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
6188fd65
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
21 additions
and
1 deletion
+21
-1
MapScene.ts
egret/src/mapScene/MapScene.ts
+9
-0
StartPanel.ts
egret/src/panels/StartPanel.ts
+12
-1
No files found.
egret/src/mapScene/MapScene.ts
View file @
3d2302de
...
...
@@ -134,6 +134,15 @@ export default class MapScene extends Scene {
this
.
scroll
.
viewport
.
scrollV
=
this
.
getScrollV
(
lastOrder
,
this
.
stage
.
stageHeight
);
// console.warn(this.getScrollV(lastOrder, this.stage.stageHeight))
try
{
const
key
=
'main2'
;
Promise
.
all
([
RES
.
getResAsync
(
`
${
key
}
_json`
),
RES
.
getResAsync
(
`
${
key
}
_png`
)]);
}
catch
(
error
)
{
}
}
destroy
()
{
...
...
egret/src/panels/StartPanel.ts
View file @
3d2302de
...
...
@@ -54,11 +54,22 @@ export default class StartPanel extends Panel {
console
.
warn
(
error
)
}
hdGameDoDojoin
((
success
)
=>
{
hdGameDoDojoin
(
async
(
success
)
=>
{
Loading
.
instace
.
hide
();
this
.
touchChildren
=
true
;
this
.
touchEnabled
=
true
;
if
(
success
)
{
Loading
.
instace
.
show
();
try
{
const
key
=
'main2'
;
await
Promise
.
all
([
RES
.
getResAsync
(
`
${
key
}
_json`
),
RES
.
getResAsync
(
`
${
key
}
_png`
)]);
}
catch
(
error
)
{
}
Loading
.
instace
.
hide
();
this
.
hidePanel
();
SceneCtrl
.
instance
.
change
(
ModuleTypes
.
MAIN_SCENE
,
{
chapter
:
this
.
_level
});
}
...
...
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