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
e73267bb
Commit
e73267bb
authored
Oct 26, 2019
by
wjf
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev' of gitlab2.dui88.com:wanghongyuan/xiaoxiaole into dev
parents
21aa9141
b89cd1a2
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
Turntable.ts
egret/src/panels/TurntablePanel/Turntable.ts
+4
-3
No files found.
egret/src/panels/TurntablePanel/Turntable.ts
View file @
e73267bb
...
...
@@ -40,9 +40,6 @@ export default class Turntable extends Panel {
async
start
(
data
?)
{
super
.
start
();
if
(
data
.
onceAgain
)
{
// 再抽一次
this
.
onTapStart
();
}
this
[
'container'
].
addChild
(
this
.
data
.
mv
);
this
.
hand
=
await
loadSvga
(
getResPath
()
+
'resource/assets/svgas/hand.svga'
,
this
[
'container2'
])
this
[
'container2'
].
touchEnabled
=
false
;
...
...
@@ -292,6 +289,10 @@ export default class Turntable extends Panel {
RotaryData
.
key
.
push
(
v
.
categoryType
);
RotaryData
.
data
[
v
.
categoryType
]
=
[{
start
:
i
*
60
-
20
,
end
:
i
*
60
+
20
}];
this
[
`img
${
i
}
`
].
source
=
v
.
prizeImg
;
if
(
this
.
data
.
onceAgain
)
{
// 再抽一次
this
.
onTapStart
();
}
}
});
...
...
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