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
07320d5e
Commit
07320d5e
authored
Oct 09, 2020
by
李维
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of
http://vcs.ireadabc.com/template/YM4-13
parents
57043176
47a7a43b
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
398 additions
and
397 deletions
+398
-397
custom-hot-zone.component.ts
src/app/common/custom-hot-zone/custom-hot-zone.component.ts
+1
-2
form.component.html
src/app/form/form.component.html
+395
-394
play.component.ts
src/app/play/play.component.ts
+2
-1
default_itemBG.png
src/assets/play/default_itemBG.png
+0
-0
No files found.
src/app/common/custom-hot-zone/custom-hot-zone.component.ts
View file @
07320d5e
...
@@ -193,7 +193,6 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy {
...
@@ -193,7 +193,6 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy {
item
.
x
=
saveRect
.
x
/
saveData
.
scale
+
newRect
.
x
item
.
x
=
saveRect
.
x
/
saveData
.
scale
+
newRect
.
x
item
.
y
=
saveRect
.
y
/
saveData
.
scale
+
newRect
.
y
item
.
y
=
saveRect
.
y
/
saveData
.
scale
+
newRect
.
y
if
(
saveData
.
media
.
type
==
"
Text
"
)
{
if
(
saveData
.
media
.
type
==
"
Text
"
)
{
return
{
width
:
this
.
itemWidth
,
height
:
this
.
itemHeight
}
return
{
width
:
this
.
itemWidth
,
height
:
this
.
itemHeight
}
}
}
});
});
...
@@ -204,7 +203,7 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy {
...
@@ -204,7 +203,7 @@ export class CustomHotZoneComponent implements OnInit, OnDestroy {
item
.
audio_url
=
saveData
.
media
.
audio_url
?
saveData
.
media
.
audio_url
:
""
item
.
audio_url
=
saveData
.
media
.
audio_url
?
saveData
.
media
.
audio_url
:
""
}
else
{
}
else
{
item
.
uid
=
uuid
.
v4
()
item
.
uid
=
uuid
.
v4
()
item
.
initFont
(
Number
(
this
.
fontSize
)
*
this
.
scal
e
,
this
.
fontName
,
this
.
fontColor
)
item
.
initFont
(
this
.
fontSiz
e
,
this
.
fontName
,
this
.
fontColor
)
item
.
init
(
this
.
defaultItemBG
,
"
Text
"
,
"
Text
"
,
()
=>
{
item
.
init
(
this
.
defaultItemBG
,
"
Text
"
,
"
Text
"
,
()
=>
{
item
.
x
=
this
.
canvasWidth
/
2
-
this
.
itemWidth
/
2
;
item
.
x
=
this
.
canvasWidth
/
2
-
this
.
itemWidth
/
2
;
item
.
y
=
this
.
canvasHeight
/
2
-
20
;
item
.
y
=
this
.
canvasHeight
/
2
-
20
;
...
...
src/app/form/form.component.html
View file @
07320d5e
This diff is collapsed.
Click to expand it.
src/app/play/play.component.ts
View file @
07320d5e
...
@@ -466,7 +466,7 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -466,7 +466,7 @@ export class PlayComponent implements OnInit, OnDestroy {
containerMiddle
.
ref
.
addChild
(
element_middle
.
ref
)
containerMiddle
.
ref
.
addChild
(
element_middle
.
ref
)
this
.
render
(
containerMiddle
.
ref
)
this
.
render
(
containerMiddle
.
ref
)
this
.
initHotZooes
(
this
.
g_formData
.
hotZoneItemArr
Right
,
containerMiddle
,
"
middle
"
)
this
.
initHotZooes
(
this
.
g_formData
.
hotZoneItemArr
Middle
,
containerMiddle
,
"
middle
"
)
// 右侧
// 右侧
let
containerRight
=
this
.
g_cartoon
.
createCartoonElementImageFunc
(
"
select-container-right
"
,
"
bg_330_168
"
,
(
w
,
h
)
=>
{
let
containerRight
=
this
.
g_cartoon
.
createCartoonElementImageFunc
(
"
select-container-right
"
,
"
bg_330_168
"
,
(
w
,
h
)
=>
{
...
@@ -513,6 +513,7 @@ export class PlayComponent implements OnInit, OnDestroy {
...
@@ -513,6 +513,7 @@ export class PlayComponent implements OnInit, OnDestroy {
let
element
=
null
let
element
=
null
element
=
this
.
g_cartoon
.
createCartoonElement
(
"
image-puzzle-
"
+
index
+
"
_
"
+
side
,
"
MySprite
"
)
element
=
this
.
g_cartoon
.
createCartoonElement
(
"
image-puzzle-
"
+
index
+
"
_
"
+
side
,
"
MySprite
"
)
console
.
log
(
item
.
media
.
image_url
)
element
.
ref
.
init
(
this
.
g_cartoon
.
images
.
get
(
item
.
media
.
image_url
))
element
.
ref
.
init
(
this
.
g_cartoon
.
images
.
get
(
item
.
media
.
image_url
))
element
.
ref
.
scaleX
=
(
item
.
rect
.
width
/
element
.
ref
.
width
)
*
parent
.
ref
.
scaleX
element
.
ref
.
scaleX
=
(
item
.
rect
.
width
/
element
.
ref
.
width
)
*
parent
.
ref
.
scaleX
element
.
ref
.
scaleY
=
(
item
.
rect
.
height
/
element
.
ref
.
height
)
*
parent
.
ref
.
scaleY
element
.
ref
.
scaleY
=
(
item
.
rect
.
height
/
element
.
ref
.
height
)
*
parent
.
ref
.
scaleY
...
...
src/assets/play/default_itemBG.png
View replaced file @
57043176
View file @
07320d5e
1.7 KB
|
W:
|
H:
2.12 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