Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Y
YM4-13
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
YM4-13
Commits
9ea25660
Commit
9ea25660
authored
Oct 12, 2020
by
李维
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
sit feedback
parent
ed421e7b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
15 deletions
+12
-15
audio-recorder.component.scss
src/app/common/audio-recorder/audio-recorder.component.scss
+1
-1
custom-hot-zone.component.html
...app/common/custom-hot-zone/custom-hot-zone.component.html
+1
-1
play.component.ts
src/app/play/play.component.ts
+10
-13
bg_50_20.png
src/assets/play/bg_50_20.png
+0
-0
No files found.
src/app/common/audio-recorder/audio-recorder.component.scss
View file @
9ea25660
...
...
@@ -108,5 +108,5 @@
}
.anticon
{
vertical-align
:
0
;
vertical-align
:
2px
;
}
\ No newline at end of file
src/app/common/custom-hot-zone/custom-hot-zone.component.html
View file @
9ea25660
...
...
@@ -18,7 +18,7 @@
</button>
</div>
<h5
*
ngIf=
"customBackground"
style=
"border-top: 2px solid #ddd;"
>
选区字母图:
</h5>
<div
*
ngIf=
"customBackground"
style=
"width: 200px;
margin: auto;
"
>
<div
*
ngIf=
"customBackground"
style=
"width: 200px;"
>
<div
class=
"bg-box"
>
<app-upload-image-with-preview
[
picUrl
]="
bgItem
.
url
"
(
imageUploaded
)="
onBackgroundUploadSuccess
($
event
)"
>
</app-upload-image-with-preview>
...
...
src/app/play/play.component.ts
View file @
9ea25660
...
...
@@ -334,22 +334,20 @@ export class PlayComponent implements OnInit, OnDestroy {
y
:
(
65
*
this
.
g_mapScale
)
/
2
}
})
element
.
ref
.
x
=
this
.
g_partTitle_x
-
12
*
this
.
g_mapScale
+
(
57
*
this
.
g_mapScale
)
/
2
;
let
text
=
this
.
g_cartoon
.
createLabel
(
this
.
g_formData
.
title
.
NO
,
"
BerlinSansFBDemi-Bold
"
,
"
#FFFFFF
"
,
48
)
element
.
ref
.
addChild
(
text
)
let
text
=
this
.
g_cartoon
.
createLabel
(
this
.
g_formData
.
title
.
NO
,
"
BerlinSansFBDemi-Bold
"
,
"
#FFFFFF
"
,
48
,
35
,
0
)
let
partBG
=
this
.
g_cartoon
.
createCartoonElementImageFunc
(
"
part-title-background
"
,
"
part_number_bg
"
,
(
w
,
h
)
=>
{
return
{
sx
:
1
21
*
this
.
g_mapScale
/
w
,
sy
:
6
9
*
this
.
g_mapScale
/
h
,
sx
:
1
17
*
this
.
g_mapScale
/
w
,
sy
:
6
5
*
this
.
g_mapScale
/
h
,
}
},
(
w
,
h
)
=>
{
return
{
x
:
(
121
*
this
.
g_mapScale
)
/
2
,
y
:
(
69
*
this
.
g_mapScale
)
/
2
x
:
117
*
this
.
g_mapScale
/
2
,
y
:
65
*
this
.
g_mapScale
/
2
}
})
partBG
.
ref
.
addChild
(
text
)
this
.
render
(
partBG
.
ref
)
this
.
render
(
element
.
ref
)
}
...
...
@@ -357,9 +355,9 @@ export class PlayComponent implements OnInit, OnDestroy {
initTitle_Main
(){
let
labelWidth
=
0
let
text
=
this
.
g_cartoon
.
createCartoonElementLabelFunc
(
"
main-title
"
,
this
.
g_formData
.
title
.
mainText
,
"
FuturaBT-Medium
"
,
"
#000000
"
,
36
*
this
.
g_mapScale
,
(
w
,
h
)
=>
{
labelWidth
=
w
/
2
labelWidth
=
w
return
{
x
:
this
.
g_partTitle_x
-
20
*
this
.
g_mapScale
+
labelWidth
*
this
.
g_mapScale
,
x
:
128
*
this
.
g_mapScale
,
y
:
5
*
this
.
g_mapScale
+
(
65
*
this
.
g_mapScale
)
/
2
}
})
...
...
@@ -367,17 +365,16 @@ export class PlayComponent implements OnInit, OnDestroy {
let
background
=
this
.
g_cartoon
.
createCartoonElementImageFunc
(
"
main-title-background
"
,
"
bg_50_20
"
,
(
w
,
h
)
=>
{
return
{
sx
:
labelWidth
*
2
/
w
,
sx
:
labelWidth
/
w
,
sy
:
50
*
this
.
g_mapScale
/
h
,
}
},
(
w
,
h
)
=>
{
return
{
x
:
this
.
g_partTitle_x
+
labelWidth
+
60
*
this
.
g_mapScale
,
x
:
128
*
this
.
g_mapScale
+
(
labelWidth
/
2
)
,
y
:
5
*
this
.
g_mapScale
+
(
65
*
this
.
g_mapScale
)
/
2
}
})
text
.
ref
.
x
=
this
.
g_partTitle_x
+
60
*
this
.
g_mapScale
text
.
ref
.
textAlign
=
"
left
"
this
.
subscribeMapDownEvent
(
background
.
id
,
()
=>
{
...
...
src/assets/play/bg_50_20.png
View replaced file @
ed421e7b
View file @
9ea25660
1.62 KB
|
W:
|
H:
1.82 KB
|
W:
|
H:
2-up
Swipe
Onion skin
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