Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
DF-L204
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
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
template admin
DF-L204
Commits
6d421345
Commit
6d421345
authored
Mar 23, 2020
by
Chen Jiping
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
完善
parent
d8d8e21a
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
11 deletions
+14
-11
play.component.ts
src/app/play/play.component.ts
+14
-11
playing.mp3
src/assets/play/music/playing.mp3
+0
-0
No files found.
src/app/play/play.component.ts
View file @
6d421345
...
...
@@ -1169,6 +1169,8 @@ export class PlayComponent implements OnInit, OnDestroy {
this
.
choic_shadow_pic
.
alpha
=
0
;
this
.
curContent
.
card_choice
.
alpha
=
0
;
this
.
choic_shadow_pic
.
setScaleXY
(
0
);
//产生转速倍数
...
...
@@ -1176,6 +1178,8 @@ export class PlayComponent implements OnInit, OnDestroy {
//当前内容存在,则旋转回去
if
(
this
.
curContent
){
//旋转
let
card_rotation
=
this
.
curContent
.
card
.
rotation
;
...
...
@@ -1322,7 +1326,7 @@ export class PlayComponent implements OnInit, OnDestroy {
//转动角度
let
rotation
=
this
.
rotaryTable
.
rotation
;
let
newStartAngle
=
rotation
+
content
.
startAngle
+
180
;
let
newStartAngle
=
content
.
startAngle
-
rotation
;
console
.
log
(
'
rotation
'
,
rotation
,
'
content startAngle
'
,
content
.
startAngle
,
'
new content startAngle
'
,
newStartAngle
);
...
...
@@ -1347,16 +1351,9 @@ export class PlayComponent implements OnInit, OnDestroy {
this
.
curContent
.
card_choice
.
alpha
=
1
;
//this.curContent.card_show.alpha = 0;
this
.
playAudio
(
'
stop
'
,
false
,
()
=>
{
this
.
curContent
.
card_choice
.
alpha
=
0
;
//this.curContent.card_show.alpha = 1;
//抽取卡片
this
.
drawCard
();
});
})
...
...
@@ -1394,6 +1391,8 @@ export class PlayComponent implements OnInit, OnDestroy {
*/
drawCard
(){
this
.
playAudio
(
'
pop-up
'
);
//新坐标
...
...
@@ -1458,7 +1457,11 @@ export class PlayComponent implements OnInit, OnDestroy {
let
residue_rotation
=
table_rotation
%
360
;
rotateItem
(
this
.
curContent
.
card
,
360
-
residue_rotation
,
0.5
);
rotateItem
(
this
.
curContent
.
card
,
360
-
residue_rotation
,
0.5
,
()
=>
{
this
.
playAudio
(
'
stop
'
,
false
,
()
=>
{
});
});
}
/**
...
...
src/assets/play/music/playing.mp3
View file @
6d421345
No preview for this file type
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