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
351dd6cb
Commit
351dd6cb
authored
Sep 05, 2019
by
wildfirecode
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
5b1737e8
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
7 deletions
+8
-7
panelCtrl.ts
egret/libs/new_wx/ctrls/panelCtrl.ts
+3
-1
magicLion.png
egret/resource/assets/mainScene/magicLion.png
+0
-0
StartPanel.ts
egret/src/panels/StartPanel.ts
+5
-6
No files found.
egret/libs/new_wx/ctrls/panelCtrl.ts
View file @
351dd6cb
...
@@ -13,13 +13,15 @@ export default class PanelCtrl {
...
@@ -13,13 +13,15 @@ export default class PanelCtrl {
this
.
_parent
=
parent
;
this
.
_parent
=
parent
;
}
}
private
noLoadingList
=
[
'StartPanel'
,
'failed'
,
'prize2'
,
ModuleTypes
.
PRIZE_PANEL
,
ModuleTypes
.
NO_PRIZE_PANEL
];
show
(
type
:
any
,
data
?)
{
show
(
type
:
any
,
data
?)
{
this
.
closeCurrent
(
true
);
this
.
closeCurrent
(
true
);
const
cls
=
this
.
_panelClassMap
[
type
];
const
cls
=
this
.
_panelClassMap
[
type
];
const
panel
:
Panel
=
new
cls
(
data
);
const
panel
:
Panel
=
new
cls
(
data
);
this
.
addMask
();
this
.
addMask
();
if
(
!
window
[
'development'
])
{
if
(
!
window
[
'development'
])
{
Loading
.
instace
.
show
();
if
(
this
.
noLoadingList
.
indexOf
(
type
)
==
-
1
)
Loading
.
instace
.
show
();
const
key
=
panel
.
skinKey
.
toLowerCase
();
const
key
=
panel
.
skinKey
.
toLowerCase
();
const
reskey
=
panel
.
skinResKey
||
key
;
const
reskey
=
panel
.
skinResKey
||
key
;
const
p
=
Promise
.
all
([
RES
.
getResAsync
(
`
${
reskey
}
_json`
),
RES
.
getResAsync
(
`
${
reskey
}
_png`
)]);
const
p
=
Promise
.
all
([
RES
.
getResAsync
(
`
${
reskey
}
_json`
),
RES
.
getResAsync
(
`
${
reskey
}
_png`
)]);
...
...
egret/resource/assets/mainScene/magicLion.png
View replaced file @
5b1737e8
View file @
351dd6cb
13.8 KB
|
W:
|
H:
11.1 KB
|
W:
|
H:
2-up
Swipe
Onion skin
egret/src/panels/StartPanel.ts
View file @
351dd6cb
...
@@ -8,7 +8,6 @@ import { PassType } from "../something/enum/PassType";
...
@@ -8,7 +8,6 @@ import { PassType } from "../something/enum/PassType";
import
{
getPropNums
}
from
"../getHomeData"
;
import
{
getPropNums
}
from
"../getHomeData"
;
import
PropType
from
"../PropType"
;
import
PropType
from
"../PropType"
;
import
hdGameDoDojoin
from
"../../libs/new_tw/ctrls/hdGameDoDojoin"
;
import
hdGameDoDojoin
from
"../../libs/new_tw/ctrls/hdGameDoDojoin"
;
import
Loading
from
"../../libs/new_wx/components/Loading"
;
import
TargetItemRenderer
from
"./TargetItemRenderer"
;
import
TargetItemRenderer
from
"./TargetItemRenderer"
;
export
default
class
StartPanel
extends
Panel
{
export
default
class
StartPanel
extends
Panel
{
...
@@ -19,7 +18,7 @@ export default class StartPanel extends Panel {
...
@@ -19,7 +18,7 @@ export default class StartPanel extends Panel {
setGlow
(
this
[
'levelTxt'
],
0xfa4b09
,
1
);
setGlow
(
this
[
'levelTxt'
],
0xfa4b09
,
1
);
this
[
'levelTxt'
].
text
=
`第
${
data
}
关`
;
this
[
'levelTxt'
].
text
=
`第
${
data
}
关`
;
this
.
_level
=
data
;
this
.
_level
=
data
;
var
mapDataIndex
=
data
;
let
mapDataIndex
=
data
;
if
(
data
>=
56
)
{
if
(
data
>=
56
)
{
//循环36到50
//循环36到50
mapDataIndex
=
data
-
20
mapDataIndex
=
data
-
20
...
@@ -58,7 +57,7 @@ export default class StartPanel extends Panel {
...
@@ -58,7 +57,7 @@ export default class StartPanel extends Panel {
}
}
onTap_startBtn
()
{
onTap_startBtn
()
{
Loading
.
instace
.
show
();
//
Loading.instace.show();
this
.
touchChildren
=
false
;
this
.
touchChildren
=
false
;
this
.
touchEnabled
=
false
;
this
.
touchEnabled
=
false
;
try
{
try
{
...
@@ -68,11 +67,11 @@ export default class StartPanel extends Panel {
...
@@ -68,11 +67,11 @@ export default class StartPanel extends Panel {
}
}
hdGameDoDojoin
(
async
(
success
)
=>
{
hdGameDoDojoin
(
async
(
success
)
=>
{
Loading
.
instace
.
hide
();
//
Loading.instace.hide();
this
.
touchChildren
=
true
;
this
.
touchChildren
=
true
;
this
.
touchEnabled
=
true
;
this
.
touchEnabled
=
true
;
if
(
success
)
{
if
(
success
)
{
Loading
.
instace
.
show
();
//
Loading.instace.show();
try
{
try
{
const
key
=
'main2'
;
const
key
=
'main2'
;
await
Promise
.
all
([
await
Promise
.
all
([
...
@@ -82,7 +81,7 @@ export default class StartPanel extends Panel {
...
@@ -82,7 +81,7 @@ export default class StartPanel extends Panel {
}
}
Loading
.
instace
.
hide
();
//
Loading.instace.hide();
this
.
hidePanel
();
this
.
hidePanel
();
SceneCtrl
.
instance
.
change
(
ModuleTypes
.
MAIN_SCENE
,
{
chapter
:
this
.
_level
});
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