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
aa67e6d5
Commit
aa67e6d5
authored
Oct 29, 2020
by
李维
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Bug fix
parent
02378b93
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
37 additions
and
34 deletions
+37
-34
app.module.ts
src/app/app.module.ts
+1
-1
Unit.ts
src/app/common/custom-hot-zone-ym413/Unit.ts
+0
-0
custom-hot-zone.component.html
...mmon/custom-hot-zone-ym413/custom-hot-zone.component.html
+0
-0
custom-hot-zone.component.scss
...mmon/custom-hot-zone-ym413/custom-hot-zone.component.scss
+1
-1
custom-hot-zone.component.ts
...common/custom-hot-zone-ym413/custom-hot-zone.component.ts
+0
-0
form.component.html
src/app/form/form.component.html
+6
-6
form.component.ts
src/app/form/form.component.ts
+1
-1
play.component.scss
src/app/play/play.component.scss
+2
-2
play.component.ts
src/app/play/play.component.ts
+3
-2
resources.js
src/app/play/resources.js
+2
-0
Futura.ttc
src/assets/default/font/Futura.ttc
+0
-0
TCB___.TTF
src/assets/default/font/TCB___.TTF
+0
-0
defaultData_ym413.js
src/assets/default/formData/defaultData_ym413.js
+21
-21
bg_320_168.png
src/assets/default/images/bg_320_168.png
+0
-0
default_itemBG.png
src/assets/default/images/default_itemBG.png
+0
-0
No files found.
src/app/app.module.ts
View file @
aa67e6d5
...
...
@@ -16,7 +16,7 @@ import {LessonTitleConfigComponent} from './common/lesson-title-config/lesson-ti
import
{
BackgroundImagePipe
}
from
'
./pipes/background-image.pipe
'
;
import
{
UploadImageWithPreviewComponent
}
from
'
./common/upload-image-with-preview/upload-image-with-preview.component
'
;
import
{
PlayerContentWrapperComponent
}
from
'
./common/player-content-wrapper/player-content-wrapper.component
'
;
import
{
CustomHotZoneComponent
}
from
'
./common/custom-hot-zone/custom-hot-zone.component
'
;
import
{
CustomHotZoneComponent
}
from
'
./common/custom-hot-zone
-ym413
/custom-hot-zone.component
'
;
import
{
BackgroundUploadComponent
}
from
'
./common/background-upload/background-upload.component
'
;
import
{
UploadVideoComponent
}
from
'
./common/upload-video/upload-video.component
'
;
import
{
TimePipe
}
from
'
./pipes/time.pipe
'
;
...
...
src/app/common/custom-hot-zone/Unit.ts
→
src/app/common/custom-hot-zone
-ym413
/Unit.ts
View file @
aa67e6d5
File moved
src/app/common/custom-hot-zone/custom-hot-zone.component.html
→
src/app/common/custom-hot-zone
-ym413
/custom-hot-zone.component.html
View file @
aa67e6d5
File moved
src/app/common/custom-hot-zone/custom-hot-zone.component.scss
→
src/app/common/custom-hot-zone
-ym413
/custom-hot-zone.component.scss
View file @
aa67e6d5
...
...
@@ -71,5 +71,5 @@ nz-select {
@font-face
{
font-family
:
'FuturaBT-Medium'
;
src
:
url("../../../assets/
play
/font/Futura.ttc")
;
src
:
url("../../../assets/
default
/font/Futura.ttc")
;
}
src/app/common/custom-hot-zone/custom-hot-zone.component.ts
→
src/app/common/custom-hot-zone
-ym413
/custom-hot-zone.component.ts
View file @
aa67e6d5
File moved
src/app/form/form.component.html
View file @
aa67e6d5
...
...
@@ -42,8 +42,8 @@
zoneWidth =
"330"
zoneHeight =
"168"
[
customBackground
]
=
"
true
"
defaultBGImage =
"assets/
play
/bg_330_168.png"
defaultItemBG =
"assets/
play
/default_itemBG.png"
defaultBGImage =
"assets/
default/images
/bg_330_168.png"
defaultItemBG =
"assets/
default/images
/default_itemBG.png"
[
itemWidth
]
=
"
240
"
[
itemHeight
]
=
"
114
"
[
bgItem
]="
bgItemLeft
"
...
...
@@ -191,8 +191,8 @@
zoneWidth =
"330"
zoneHeight =
"168"
[
customBackground
]
=
"
true
"
defaultBGImage =
"assets/
play
/bg_330_168.png"
defaultItemBG =
"assets/
play
/default_itemBG.png"
defaultBGImage =
"assets/
default/images
/bg_330_168.png"
defaultItemBG =
"assets/
default/images
/default_itemBG.png"
[
itemWidth
]
=
"
240
"
[
itemHeight
]
=
"
114
"
[(
bgItem
)]="
bgItemMiddle
"
...
...
@@ -340,8 +340,8 @@
zoneWidth =
"330"
zoneHeight =
"168"
[
customBackground
]
=
"
true
"
defaultBGImage =
"assets/
play
/bg_330_168.png"
defaultItemBG =
"assets/
play
/default_itemBG.png"
defaultBGImage =
"assets/
default/images
/bg_330_168.png"
defaultItemBG =
"assets/
default/images
/default_itemBG.png"
[
itemWidth
]
=
"
240
"
[
itemHeight
]
=
"
114
"
[(
bgItem
)]="
bgItemRight
"
...
...
src/app/form/form.component.ts
View file @
aa67e6d5
import
{
Component
,
EventEmitter
,
Input
,
OnDestroy
,
OnChanges
,
OnInit
,
Output
,
ApplicationRef
,
ElementRef
,
ViewChild
}
from
'
@angular/core
'
;
import
{
defaultData
}
from
'
../../assets/default/formData/defaultData.js
'
import
{
defaultData
}
from
'
../../assets/default/formData/defaultData
_ym413
.js
'
@
Component
({
selector
:
'
app-form
'
,
...
...
src/app/play/play.component.scss
View file @
aa67e6d5
...
...
@@ -98,11 +98,11 @@
@font-face
{
font-family
:
'FuturaBT-Medium'
;
src
:
url("../../assets/
play
/font/Futura.ttc")
;
src
:
url("../../assets/
default
/font/Futura.ttc")
;
}
@font-face
{
font-family
:
'TCB___'
;
src
:
url("../../assets/
play
/font/TCB___.TTF")
;
src
:
url("../../assets/
default
/font/TCB___.TTF")
;
}
src/app/play/play.component.ts
View file @
aa67e6d5
...
...
@@ -41,7 +41,7 @@ import { Subject } from "rxjs";
import
{
debounceTime
,
map
,
takeWhile
,
retry
}
from
"
rxjs/operators
"
;
import
*
as
_
from
"
lodash
"
;
import
TWEEN
from
"
@tweenjs/tween.js
"
;
import
{
demoData
as
defaultData
}
from
'
../../assets/default/formData/defaultData.js
'
import
{
demoData
as
defaultData
}
from
'
../../assets/default/formData/defaultData
_ym413
.js
'
const
zIndexMap
=
{
mainBackground
:
0
,
...
...
@@ -170,6 +170,7 @@ export class PlayComponent implements OnInit, OnDestroy {
mapToImageArray
(
contentObj
){
let
array
=
[]
array
.
push
(
contentObj
.
bgItemLeft
.
url
)
array
.
push
(
contentObj
.
bgItemMiddle
.
url
)
array
.
push
(
contentObj
.
bgItemRight
.
url
)
contentObj
.
bgImages
.
leftTop
&&
array
.
push
(
contentObj
.
bgImages
.
leftTop
)
...
...
@@ -441,7 +442,7 @@ export class PlayComponent implements OnInit, OnDestroy {
})
contentImageWidth
=
0
let
element_middle
=
this
.
g_cartoon
.
createCartoonElementImageFunc
(
"
window-image-container-
right
"
,
this
.
g_formData
.
bgItemRight
.
url
,
(
w
,
h
)
=>
{
let
element_middle
=
this
.
g_cartoon
.
createCartoonElementImageFunc
(
"
window-image-container-
middle
"
,
this
.
g_formData
.
bgItemMiddle
.
url
,
(
w
,
h
)
=>
{
let
s
=
Math
.
min
(
hotZoneWidth
/
w
,
hotZoneHeight
/
h
)
contentImageWidth
=
(
w
*
s
)
/
2
contentImageHeight
=
(
h
*
s
)
/
2
...
...
src/app/play/resources.js
View file @
aa67e6d5
...
...
@@ -53,6 +53,8 @@ const localImages = {
'
bg_title_part
'
:
'
assets/play/bg_title_part.png
'
,
'
icon_paly
'
:
'
assets/play/icon_paly.png
'
,
'
icon_pause
'
:
'
assets/play/icon_pause.png
'
,
'
default_itemBG
'
:
'
assets/play/default_itemBG.png
'
,
'
defalut_bg
'
:
'
assets/play/defalut_bg.png
'
};
...
...
src/assets/default/font/Futura.ttc
0 → 100644
View file @
aa67e6d5
File added
src/assets/default/font/TCB___.TTF
0 → 100644
View file @
aa67e6d5
File added
src/assets/default/formData/defaultData.js
→
src/assets/default/formData/defaultData
_ym413
.js
View file @
aa67e6d5
...
...
@@ -12,7 +12,7 @@ export const defaultData = {
hotZoneItemArrLeft
:
[],
questionsLeft
:
[],
bgItemLeft
:
{
url
:
"
assets/play/hotZooCard/defalut_bg.pn
g
"
,
url
:
"
defalut_b
g
"
,
rect
:
{
x
:
0
,
y
:
0
,
...
...
@@ -26,7 +26,7 @@ export const defaultData = {
hotZoneItemArrMiddle
:
[],
questionsMiddle
:
[],
bgItemMiddle
:
{
url
:
"
assets/play/hotZooCard/defalut_bg.pn
g
"
,
url
:
"
defalut_b
g
"
,
rect
:
{
x
:
0
,
y
:
0
,
...
...
@@ -40,7 +40,7 @@ export const defaultData = {
hotZoneItemArrRight
:
[],
questionsRight
:
[],
bgItemRight
:
{
url
:
"
assets/play/hotZooCard/defalut_bg.pn
g
"
,
url
:
"
defalut_b
g
"
,
rect
:
{
x
:
0
,
y
:
0
,
...
...
@@ -83,7 +83,7 @@ export const demoData = {
},
uid
:
"
2ea9d699-a27a-4316-b67f-911ea7f79ce6
"
,
media
:
{
image_url
:
"
assets/play/default_itemBG.png
"
,
image_url
:
"
default_itemBG
"
,
text
:
"
d
"
,
type
:
"
Text
"
,
audio_url
:
""
,
...
...
@@ -100,7 +100,7 @@ export const demoData = {
},
uid
:
"
eab8f3d6-9cbc-4956-b240-c858b2678476
"
,
media
:
{
image_url
:
"
assets/play/default_itemBG.png
"
,
image_url
:
"
default_itemBG
"
,
text
:
"
mi
"
,
type
:
"
Text
"
,
audio_url
:
""
,
...
...
@@ -117,7 +117,7 @@ export const demoData = {
},
uid
:
"
aa2310bc-ff1c-4c8e-b2f6-e884ecdddf88
"
,
media
:
{
image_url
:
"
assets/play/default_itemBG.png
"
,
image_url
:
"
default_itemBG
"
,
text
:
"
p
"
,
type
:
"
Text
"
,
audio_url
:
""
,
...
...
@@ -134,7 +134,7 @@ export const demoData = {
},
uid
:
"
5a91f31e-9e37-4d7c-a6e6-255c8e2dd1df
"
,
media
:
{
image_url
:
"
assets/play/default_itemBG.png
"
,
image_url
:
"
default_itemBG
"
,
text
:
"
w
"
,
type
:
"
Text
"
,
audio_url
:
""
,
...
...
@@ -151,7 +151,7 @@ export const demoData = {
},
uid
:
"
a4bdec5b-3659-4f70-bdf0-5a7029e73c67
"
,
media
:
{
image_url
:
"
assets/play/default_itemBG.png
"
,
image_url
:
"
default_itemBG
"
,
text
:
"
go
"
,
type
:
"
Text
"
,
audio_url
:
""
,
...
...
@@ -165,7 +165,7 @@ export const demoData = {
{
number
:
2
,
combin
:
[
0
,
-
1
],
_combin
:
[
0
,
-
1
]
},
],
bgItemLeft
:
{
url
:
"
assets/play/hotZooCard/defalut_bg.pn
g
"
,
url
:
"
defalut_b
g
"
,
rect
:
{
x
:
0
,
y
:
89.51538825757572
,
width
:
515
,
height
:
83.15104166666667
},
questions
:
[],
},
...
...
@@ -182,7 +182,7 @@ export const demoData = {
},
uid
:
"
bffbcc62-44bf-4336-b9a2-28b9c57a23dd
"
,
media
:
{
image_url
:
"
assets/play/default_itemBG.png
"
,
image_url
:
"
default_itemBG
"
,
text
:
"
d
"
,
type
:
"
Text
"
,
audio_url
:
""
,
...
...
@@ -199,7 +199,7 @@ export const demoData = {
},
uid
:
"
7a9a60fd-da42-4adc-92b2-ea44144e3c85
"
,
media
:
{
image_url
:
"
assets/play/default_itemBG.png
"
,
image_url
:
"
default_itemBG
"
,
text
:
"
mi
"
,
type
:
"
Text
"
,
audio_url
:
""
,
...
...
@@ -216,7 +216,7 @@ export const demoData = {
},
uid
:
"
33260665-7cbb-4d66-b50f-35cb27bb232e
"
,
media
:
{
image_url
:
"
assets/play/default_itemBG.png
"
,
image_url
:
"
default_itemBG
"
,
text
:
"
p
"
,
type
:
"
Text
"
,
audio_url
:
""
,
...
...
@@ -233,7 +233,7 @@ export const demoData = {
},
uid
:
"
6691ef34-6d56-4704-9fc0-945bf929e4d6
"
,
media
:
{
image_url
:
"
assets/play/default_itemBG.png
"
,
image_url
:
"
default_itemBG
"
,
text
:
"
w
"
,
type
:
"
Text
"
,
audio_url
:
""
,
...
...
@@ -250,7 +250,7 @@ export const demoData = {
},
uid
:
"
e8a50b81-cdca-40fd-886d-2a07e6263c9d
"
,
media
:
{
image_url
:
"
assets/play/default_itemBG.png
"
,
image_url
:
"
default_itemBG
"
,
text
:
"
go
"
,
type
:
"
Text
"
,
audio_url
:
""
,
...
...
@@ -264,7 +264,7 @@ export const demoData = {
{
number
:
2
,
combin
:
[
2
,
-
1
],
_combin
:
[
2
,
-
1
]
},
],
bgItemMiddle
:
{
url
:
"
assets/play/hotZooCard/defalut_bg.pn
g
"
,
url
:
"
defalut_b
g
"
,
rect
:
{
x
:
0
,
y
:
89.16775568181816
,
width
:
513
,
height
:
82.828125
},
questions
:
[],
},
...
...
@@ -281,7 +281,7 @@ export const demoData = {
},
uid
:
"
b7943632-7a5b-4ada-b640-81b758712a61
"
,
media
:
{
image_url
:
"
assets/play/default_itemBG.png
"
,
image_url
:
"
default_itemBG
"
,
text
:
"
d
"
,
type
:
"
Text
"
,
audio_url
:
""
,
...
...
@@ -298,7 +298,7 @@ export const demoData = {
},
uid
:
"
54e395b1-5d90-4f4b-afe4-dacea3711fad
"
,
media
:
{
image_url
:
"
assets/play/default_itemBG.png
"
,
image_url
:
"
default_itemBG
"
,
text
:
"
mi
"
,
type
:
"
Text
"
,
audio_url
:
""
,
...
...
@@ -315,7 +315,7 @@ export const demoData = {
},
uid
:
"
2669a94f-b66d-483a-9a49-a71042ad7e02
"
,
media
:
{
image_url
:
"
assets/play/default_itemBG.png
"
,
image_url
:
"
default_itemBG
"
,
text
:
"
p
"
,
type
:
"
Text
"
,
audio_url
:
""
,
...
...
@@ -332,7 +332,7 @@ export const demoData = {
},
uid
:
"
6a6fcbc7-84e9-4cad-b380-d78e74a24c33
"
,
media
:
{
image_url
:
"
assets/play/default_itemBG.png
"
,
image_url
:
"
default_itemBG
"
,
text
:
"
w
"
,
type
:
"
Text
"
,
audio_url
:
""
,
...
...
@@ -349,7 +349,7 @@ export const demoData = {
},
uid
:
"
41165693-b5ca-4b7d-b7db-6f643259dac6
"
,
media
:
{
image_url
:
"
assets/play/default_itemBG.png
"
,
image_url
:
"
default_itemBG
"
,
text
:
"
go
"
,
type
:
"
Text
"
,
audio_url
:
""
,
...
...
@@ -363,7 +363,7 @@ export const demoData = {
{
number
:
2
,
combin
:
[
3
,
-
1
],
_combin
:
[
3
,
-
1
]
},
],
bgItemRight
:
{
url
:
"
assets/play/hotZooCard/defalut_bg.pn
g
"
,
url
:
"
defalut_b
g
"
,
rect
:
{
x
:
0
,
y
:
89.16775568181816
,
width
:
513
,
height
:
82.828125
},
questions
:
[],
},
...
...
src/assets/default/images/bg_320_168.png
0 → 100644
View file @
aa67e6d5
2.12 KB
src/assets/default/images/default_itemBG.png
0 → 100644
View file @
aa67e6d5
2.12 KB
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