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
e0ef2f4c
Commit
e0ef2f4c
authored
Oct 26, 2019
by
邱旭
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1
parent
568e10bd
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
3 deletions
+6
-3
ScratchIcon.ts
egret/src/mapScene/icon/ScratchIcon.ts
+4
-2
ScratchPanel.ts
egret/src/panels/ScratchPanel.ts
+2
-1
No files found.
egret/src/mapScene/icon/ScratchIcon.ts
View file @
e0ef2f4c
...
@@ -6,6 +6,7 @@ import { GDispatcher } from "../../../libs/tc/util/GDispatcher";
...
@@ -6,6 +6,7 @@ import { GDispatcher } from "../../../libs/tc/util/GDispatcher";
import
{
ModuleTypes
}
from
"../../../libs/new_wx/types/sceneTypes"
;
import
{
ModuleTypes
}
from
"../../../libs/new_wx/types/sceneTypes"
;
import
{
loadSvga
}
from
"../../loadSvga"
;
import
{
loadSvga
}
from
"../../loadSvga"
;
import
getResPath
from
"../../../libs/new_tc/getResPath"
;
import
getResPath
from
"../../../libs/new_tc/getResPath"
;
import
Utils
from
"../../Utils"
;
export
default
class
ScratchIcon
extends
IconBase
{
export
default
class
ScratchIcon
extends
IconBase
{
private
cutTimer
:
CutTimer
=
null
;
private
cutTimer
:
CutTimer
=
null
;
...
@@ -72,8 +73,9 @@ export default class ScratchIcon extends IconBase {
...
@@ -72,8 +73,9 @@ export default class ScratchIcon extends IconBase {
case
(
status
==
1
):
// 当前任务进行中 打开任务面板
case
(
status
==
1
):
// 当前任务进行中 打开任务面板
loadSvga
(
getResPath
()
+
'resource/assets/svgas/sprize.svga'
).
then
(
async
(
mv
:
any
)
=>
{
loadSvga
(
getResPath
()
+
'resource/assets/svgas/sprize.svga'
).
then
(
async
(
mv
:
any
)
=>
{
// await wait(100);
// await wait(100);
res
.
data
.
mv
=
mv
;
let
data
=
Utils
.
deepClone
(
res
.
data
);
PanelCtrl
.
instance
.
show
(
'scratch'
,
res
.
data
)
data
.
mv
=
mv
;
PanelCtrl
.
instance
.
show
(
'scratch'
,
data
);
});
});
// PanelCtrl.instance.show('scratch', res.data);
// PanelCtrl.instance.show('scratch', res.data);
break
;
break
;
...
...
egret/src/panels/ScratchPanel.ts
View file @
e0ef2f4c
...
@@ -3,9 +3,9 @@ import getSkinPath from "../../libs/new_wx/utils/getSkinPath";
...
@@ -3,9 +3,9 @@ import getSkinPath from "../../libs/new_wx/utils/getSkinPath";
import
{
GDispatcher
}
from
"../../libs/tc/util/GDispatcher"
;
import
{
GDispatcher
}
from
"../../libs/tc/util/GDispatcher"
;
import
{
NetManager
}
from
"../../libs/tw/manager/NetManager"
;
import
{
NetManager
}
from
"../../libs/tw/manager/NetManager"
;
import
{
iswx
}
from
"../iswx"
;
import
{
iswx
}
from
"../iswx"
;
import
Utils
from
"../Utils"
;
import
ScratchRulePanel
from
"./ScratchRulePanel"
;
import
ScratchRulePanel
from
"./ScratchRulePanel"
;
import
CutTimer
from
"../CutTimer"
;
import
CutTimer
from
"../CutTimer"
;
import
Utils
from
"../Utils"
;
export
default
class
ScratchPanel
extends
Panel
{
export
default
class
ScratchPanel
extends
Panel
{
private
cutTimer
:
CutTimer
;
private
cutTimer
:
CutTimer
;
...
@@ -82,6 +82,7 @@ export default class ScratchPanel extends Panel {
...
@@ -82,6 +82,7 @@ export default class ScratchPanel extends Panel {
this
[
"progressGroup"
].
mask
=
this
[
"progressMask"
];
this
[
"progressGroup"
].
mask
=
this
[
"progressMask"
];
this
[
"prizeImg"
].
source
=
this
.
data
.
prizeImage
;
this
[
"prizeImg"
].
source
=
this
.
data
.
prizeImage
;
if
(
!
this
.
data
.
avatarList
)
{
if
(
!
this
.
data
.
avatarList
)
{
this
.
data
.
avatarList
=
[];
this
.
data
.
avatarList
=
[];
}
}
...
...
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