Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
YM5-6
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
YM5-6
Commits
c0b350e3
Commit
c0b350e3
authored
Jan 14, 2021
by
李维
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug fix
parent
162bdb0c
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
9 deletions
+9
-9
form.component.html
src/app/form/form.component.html
+2
-2
play.component.ts
src/app/play/play.component.ts
+7
-7
No files found.
src/app/form/form.component.html
View file @
c0b350e3
...
...
@@ -177,7 +177,7 @@
</div>
</nz-form-control>
<nz-form-control
[
nzSpan
]="
20
"
nzOffset=
"2"
>
<
!-- <
nz-form-control [nzSpan]="20" nzOffset="2">
<div class="card-item">
<nz-divider nzText="背景色" nzOrientation="left" style="width: 100%;" ></nz-divider>
<nz-form-item>
...
...
@@ -227,7 +227,7 @@
</nz-form-control>
</nz-form-item>
</div>
</nz-form-control>
</nz-form-control>
-->
</nz-form-item>
<div>
<nz-divider
nzText=
"单词组"
nzOrientation=
"left"
></nz-divider>
...
...
src/app/play/play.component.ts
View file @
c0b350e3
...
...
@@ -759,14 +759,14 @@ export class PlayComponent implements OnInit, OnDestroy {
let
colorBlock_left
=
new
ShapeRoundRect
()
colorBlock_left
.
x
=
0
;
colorBlock_left
.
y
=
0
;
colorBlock_left
.
fillColor
=
`#
${
this
.
saveData
.
blockColor
}
`
;
colorBlock_left
.
fillColor
=
"
#eef1f3
"
//
`#${this.saveData.blockColor}`;
colorBlock_left
.
setSize
(
640
*
this
.
mapScale
,
500
*
this
.
mapScale
,
30
)
this
.
body_bg
.
addChild
(
colorBlock_left
)
let
colorBlock_right
=
new
ShapeRoundRect
()
colorBlock_right
.
x
=
680
*
this
.
mapScale
;
colorBlock_right
.
y
=
0
;
colorBlock_right
.
fillColor
=
`#
${
this
.
saveData
.
blockColor
}
`
;
colorBlock_right
.
fillColor
=
"
#eef1f3
"
//
`#${this.saveData.blockColor}`;
colorBlock_right
.
setSize
(
640
*
this
.
mapScale
,
500
*
this
.
mapScale
,
30
);
this
.
body_bg
.
addChild
(
colorBlock_right
);
...
...
@@ -784,11 +784,11 @@ export class PlayComponent implements OnInit, OnDestroy {
cricleNumber
(
num
){
const
bg
=
new
ShapeCircle
();
bg
.
setRadius
(
23
);
bg
.
fillColor
=
`#
${
this
.
saveData
.
indexColor
?
this
.
saveData
.
indexColor
:
'
f2a14d
'
}
`
;
bg
.
fillColor
=
"
#efb87e
"
//
`#${this.saveData.indexColor?this.saveData.indexColor:'f2a14d'}`;
const
bg_1
=
new
ShapeCircle
();
bg_1
.
setRadius
(
22
);
bg_1
.
fillColor
=
`#
${
this
.
saveData
.
indexColor
?
this
.
saveData
.
indexColor
:
'
f2a14d
'
}
`
;
bg_1
.
fillColor
=
"
#efb87e
"
//
`#${this.saveData.indexColor?this.saveData.indexColor:'f2a14d'}`;
bg
.
addChild
(
bg_1
);
const
words_content
=
new
Label
();
...
...
@@ -824,7 +824,7 @@ export class PlayComponent implements OnInit, OnDestroy {
word_bg_group
.
x
=
x
*
this
.
mapScale
;
word_bg_group
.
y
=
y
*
this
.
mapScale
;
word_bg_group
.
fillColor
=
"
#FFFF00
"
word_bg_group
.
alpha
=
1
;
word_bg_group
.
alpha
=
0
;
let
startWidth
=
80
;
//单词
...
...
@@ -937,7 +937,7 @@ export class PlayComponent implements OnInit, OnDestroy {
let
bgLeft
=
new
ShapeRoundRect
()
bgLeft
.
x
=
baseX
;
bgLeft
.
y
=
0
;
bgLeft
.
fillColor
=
`#
${
this
.
saveData
.
optionColor_left
?
this
.
saveData
.
optionColor_left
:
"
FFFFFF
"
}
`
;
bgLeft
.
fillColor
=
"
#a1b4c1
"
//
`#${this.saveData.optionColor_left?this.saveData.optionColor_left:"FFFFFF"}`;
bgLeft
.
setSize
(
99
,
57
,
0
);
bgLeft
[
"
index
"
]
=
index
bgLeft
[
"
correct
"
]
=
correctOption
==
"
left
"
?
true
:
false
;
...
...
@@ -956,7 +956,7 @@ export class PlayComponent implements OnInit, OnDestroy {
let
bgRight
=
new
ShapeRoundRect
()
bgRight
.
x
=
baseX
+
99
;
bgRight
.
y
=
0
;
bgRight
.
fillColor
=
`#
${
this
.
saveData
.
optionColor_right
?
this
.
saveData
.
optionColor_right
:
"
FFFFFF
"
}
`
;
bgRight
.
fillColor
=
"
#93a7b7
"
//
`#${this.saveData.optionColor_right?this.saveData.optionColor_right:"FFFFFF"}`;
bgRight
.
setSize
(
99
,
57
,
0
)
bgRight
[
"
index
"
]
=
index
bgRight
[
"
correct
"
]
=
correctOption
==
"
left
"
?
false
:
true
;
...
...
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