Commit aa67e6d5 authored by 李维's avatar 李维

Bug fix

parent 02378b93
...@@ -16,7 +16,7 @@ import {LessonTitleConfigComponent} from './common/lesson-title-config/lesson-ti ...@@ -16,7 +16,7 @@ import {LessonTitleConfigComponent} from './common/lesson-title-config/lesson-ti
import {BackgroundImagePipe} from './pipes/background-image.pipe'; import {BackgroundImagePipe} from './pipes/background-image.pipe';
import {UploadImageWithPreviewComponent} from './common/upload-image-with-preview/upload-image-with-preview.component'; 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 {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 {BackgroundUploadComponent} from './common/background-upload/background-upload.component';
import {UploadVideoComponent} from './common/upload-video/upload-video.component'; import {UploadVideoComponent} from './common/upload-video/upload-video.component';
import {TimePipe} from './pipes/time.pipe'; import {TimePipe} from './pipes/time.pipe';
......
...@@ -71,5 +71,5 @@ nz-select { ...@@ -71,5 +71,5 @@ nz-select {
@font-face{ @font-face{
font-family: 'FuturaBT-Medium'; font-family: 'FuturaBT-Medium';
src: url("../../../assets/play/font/Futura.ttc") ; src: url("../../../assets/default/font/Futura.ttc") ;
} }
...@@ -42,8 +42,8 @@ ...@@ -42,8 +42,8 @@
zoneWidth = "330" zoneWidth = "330"
zoneHeight = "168" zoneHeight = "168"
[customBackground] = "true" [customBackground] = "true"
defaultBGImage = "assets/play/bg_330_168.png" defaultBGImage = "assets/default/images/bg_330_168.png"
defaultItemBG = "assets/play/default_itemBG.png" defaultItemBG = "assets/default/images/default_itemBG.png"
[itemWidth] = "240" [itemWidth] = "240"
[itemHeight] = "114" [itemHeight] = "114"
[bgItem]="bgItemLeft" [bgItem]="bgItemLeft"
...@@ -191,8 +191,8 @@ ...@@ -191,8 +191,8 @@
zoneWidth = "330" zoneWidth = "330"
zoneHeight = "168" zoneHeight = "168"
[customBackground] = "true" [customBackground] = "true"
defaultBGImage = "assets/play/bg_330_168.png" defaultBGImage = "assets/default/images/bg_330_168.png"
defaultItemBG = "assets/play/default_itemBG.png" defaultItemBG = "assets/default/images/default_itemBG.png"
[itemWidth] = "240" [itemWidth] = "240"
[itemHeight] = "114" [itemHeight] = "114"
[(bgItem)]="bgItemMiddle" [(bgItem)]="bgItemMiddle"
...@@ -340,8 +340,8 @@ ...@@ -340,8 +340,8 @@
zoneWidth = "330" zoneWidth = "330"
zoneHeight = "168" zoneHeight = "168"
[customBackground] = "true" [customBackground] = "true"
defaultBGImage = "assets/play/bg_330_168.png" defaultBGImage = "assets/default/images/bg_330_168.png"
defaultItemBG = "assets/play/default_itemBG.png" defaultItemBG = "assets/default/images/default_itemBG.png"
[itemWidth] = "240" [itemWidth] = "240"
[itemHeight] = "114" [itemHeight] = "114"
[(bgItem)]="bgItemRight" [(bgItem)]="bgItemRight"
......
import {Component, EventEmitter, Input, OnDestroy, OnChanges, OnInit, Output, ApplicationRef, ElementRef, ViewChild} from '@angular/core'; 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({ @Component({
selector: 'app-form', selector: 'app-form',
......
...@@ -98,11 +98,11 @@ ...@@ -98,11 +98,11 @@
@font-face{ @font-face{
font-family: 'FuturaBT-Medium'; font-family: 'FuturaBT-Medium';
src: url("../../assets/play/font/Futura.ttc") ; src: url("../../assets/default/font/Futura.ttc") ;
} }
@font-face{ @font-face{
font-family: 'TCB___'; font-family: 'TCB___';
src: url("../../assets/play/font/TCB___.TTF") ; src: url("../../assets/default/font/TCB___.TTF") ;
} }
...@@ -41,7 +41,7 @@ import { Subject } from "rxjs"; ...@@ -41,7 +41,7 @@ import { Subject } from "rxjs";
import { debounceTime, map, takeWhile, retry } from "rxjs/operators"; import { debounceTime, map, takeWhile, retry } from "rxjs/operators";
import * as _ from "lodash"; import * as _ from "lodash";
import TWEEN from "@tweenjs/tween.js"; 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 = { const zIndexMap = {
mainBackground: 0, mainBackground: 0,
...@@ -170,6 +170,7 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -170,6 +170,7 @@ export class PlayComponent implements OnInit, OnDestroy {
mapToImageArray(contentObj){ mapToImageArray(contentObj){
let array = [] let array = []
array.push(contentObj.bgItemLeft.url) array.push(contentObj.bgItemLeft.url)
array.push(contentObj.bgItemMiddle.url)
array.push(contentObj.bgItemRight.url) array.push(contentObj.bgItemRight.url)
contentObj.bgImages.leftTop && array.push(contentObj.bgImages.leftTop) contentObj.bgImages.leftTop && array.push(contentObj.bgImages.leftTop)
...@@ -441,7 +442,7 @@ export class PlayComponent implements OnInit, OnDestroy { ...@@ -441,7 +442,7 @@ export class PlayComponent implements OnInit, OnDestroy {
}) })
contentImageWidth = 0 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) let s = Math.min( hotZoneWidth / w, hotZoneHeight / h)
contentImageWidth = (w * s) / 2 contentImageWidth = (w * s) / 2
contentImageHeight = (h * s) / 2 contentImageHeight = (h * s) / 2
......
...@@ -53,6 +53,8 @@ const localImages = { ...@@ -53,6 +53,8 @@ const localImages = {
'bg_title_part': 'assets/play/bg_title_part.png', 'bg_title_part': 'assets/play/bg_title_part.png',
'icon_paly': 'assets/play/icon_paly.png', 'icon_paly': 'assets/play/icon_paly.png',
'icon_pause': 'assets/play/icon_pause.png', 'icon_pause': 'assets/play/icon_pause.png',
'default_itemBG': 'assets/play/default_itemBG.png',
'defalut_bg': 'assets/play/defalut_bg.png'
}; };
......
...@@ -12,7 +12,7 @@ export const defaultData = { ...@@ -12,7 +12,7 @@ export const defaultData = {
hotZoneItemArrLeft: [], hotZoneItemArrLeft: [],
questionsLeft: [], questionsLeft: [],
bgItemLeft: { bgItemLeft: {
url: "assets/play/hotZooCard/defalut_bg.png", url: "defalut_bg",
rect: { rect: {
x: 0, x: 0,
y: 0, y: 0,
...@@ -26,7 +26,7 @@ export const defaultData = { ...@@ -26,7 +26,7 @@ export const defaultData = {
hotZoneItemArrMiddle: [], hotZoneItemArrMiddle: [],
questionsMiddle: [], questionsMiddle: [],
bgItemMiddle: { bgItemMiddle: {
url: "assets/play/hotZooCard/defalut_bg.png", url: "defalut_bg",
rect: { rect: {
x: 0, x: 0,
y: 0, y: 0,
...@@ -40,7 +40,7 @@ export const defaultData = { ...@@ -40,7 +40,7 @@ export const defaultData = {
hotZoneItemArrRight: [], hotZoneItemArrRight: [],
questionsRight: [], questionsRight: [],
bgItemRight: { bgItemRight: {
url: "assets/play/hotZooCard/defalut_bg.png", url: "defalut_bg",
rect: { rect: {
x: 0, x: 0,
y: 0, y: 0,
...@@ -83,7 +83,7 @@ export const demoData = { ...@@ -83,7 +83,7 @@ export const demoData = {
}, },
uid: "2ea9d699-a27a-4316-b67f-911ea7f79ce6", uid: "2ea9d699-a27a-4316-b67f-911ea7f79ce6",
media: { media: {
image_url: "assets/play/default_itemBG.png", image_url: "default_itemBG",
text: "d", text: "d",
type: "Text", type: "Text",
audio_url: "", audio_url: "",
...@@ -100,7 +100,7 @@ export const demoData = { ...@@ -100,7 +100,7 @@ export const demoData = {
}, },
uid: "eab8f3d6-9cbc-4956-b240-c858b2678476", uid: "eab8f3d6-9cbc-4956-b240-c858b2678476",
media: { media: {
image_url: "assets/play/default_itemBG.png", image_url: "default_itemBG",
text: "mi", text: "mi",
type: "Text", type: "Text",
audio_url: "", audio_url: "",
...@@ -117,7 +117,7 @@ export const demoData = { ...@@ -117,7 +117,7 @@ export const demoData = {
}, },
uid: "aa2310bc-ff1c-4c8e-b2f6-e884ecdddf88", uid: "aa2310bc-ff1c-4c8e-b2f6-e884ecdddf88",
media: { media: {
image_url: "assets/play/default_itemBG.png", image_url: "default_itemBG",
text: "p", text: "p",
type: "Text", type: "Text",
audio_url: "", audio_url: "",
...@@ -134,7 +134,7 @@ export const demoData = { ...@@ -134,7 +134,7 @@ export const demoData = {
}, },
uid: "5a91f31e-9e37-4d7c-a6e6-255c8e2dd1df", uid: "5a91f31e-9e37-4d7c-a6e6-255c8e2dd1df",
media: { media: {
image_url: "assets/play/default_itemBG.png", image_url: "default_itemBG",
text: "w", text: "w",
type: "Text", type: "Text",
audio_url: "", audio_url: "",
...@@ -151,7 +151,7 @@ export const demoData = { ...@@ -151,7 +151,7 @@ export const demoData = {
}, },
uid: "a4bdec5b-3659-4f70-bdf0-5a7029e73c67", uid: "a4bdec5b-3659-4f70-bdf0-5a7029e73c67",
media: { media: {
image_url: "assets/play/default_itemBG.png", image_url: "default_itemBG",
text: "go", text: "go",
type: "Text", type: "Text",
audio_url: "", audio_url: "",
...@@ -165,7 +165,7 @@ export const demoData = { ...@@ -165,7 +165,7 @@ export const demoData = {
{ number: 2, combin: [0, -1], _combin: [0, -1] }, { number: 2, combin: [0, -1], _combin: [0, -1] },
], ],
bgItemLeft: { bgItemLeft: {
url: "assets/play/hotZooCard/defalut_bg.png", url: "defalut_bg",
rect: { x: 0, y: 89.51538825757572, width: 515, height: 83.15104166666667 }, rect: { x: 0, y: 89.51538825757572, width: 515, height: 83.15104166666667 },
questions: [], questions: [],
}, },
...@@ -182,7 +182,7 @@ export const demoData = { ...@@ -182,7 +182,7 @@ export const demoData = {
}, },
uid: "bffbcc62-44bf-4336-b9a2-28b9c57a23dd", uid: "bffbcc62-44bf-4336-b9a2-28b9c57a23dd",
media: { media: {
image_url: "assets/play/default_itemBG.png", image_url: "default_itemBG",
text: "d", text: "d",
type: "Text", type: "Text",
audio_url: "", audio_url: "",
...@@ -199,7 +199,7 @@ export const demoData = { ...@@ -199,7 +199,7 @@ export const demoData = {
}, },
uid: "7a9a60fd-da42-4adc-92b2-ea44144e3c85", uid: "7a9a60fd-da42-4adc-92b2-ea44144e3c85",
media: { media: {
image_url: "assets/play/default_itemBG.png", image_url: "default_itemBG",
text: "mi", text: "mi",
type: "Text", type: "Text",
audio_url: "", audio_url: "",
...@@ -216,7 +216,7 @@ export const demoData = { ...@@ -216,7 +216,7 @@ export const demoData = {
}, },
uid: "33260665-7cbb-4d66-b50f-35cb27bb232e", uid: "33260665-7cbb-4d66-b50f-35cb27bb232e",
media: { media: {
image_url: "assets/play/default_itemBG.png", image_url: "default_itemBG",
text: "p", text: "p",
type: "Text", type: "Text",
audio_url: "", audio_url: "",
...@@ -233,7 +233,7 @@ export const demoData = { ...@@ -233,7 +233,7 @@ export const demoData = {
}, },
uid: "6691ef34-6d56-4704-9fc0-945bf929e4d6", uid: "6691ef34-6d56-4704-9fc0-945bf929e4d6",
media: { media: {
image_url: "assets/play/default_itemBG.png", image_url: "default_itemBG",
text: "w", text: "w",
type: "Text", type: "Text",
audio_url: "", audio_url: "",
...@@ -250,7 +250,7 @@ export const demoData = { ...@@ -250,7 +250,7 @@ export const demoData = {
}, },
uid: "e8a50b81-cdca-40fd-886d-2a07e6263c9d", uid: "e8a50b81-cdca-40fd-886d-2a07e6263c9d",
media: { media: {
image_url: "assets/play/default_itemBG.png", image_url: "default_itemBG",
text: "go", text: "go",
type: "Text", type: "Text",
audio_url: "", audio_url: "",
...@@ -264,7 +264,7 @@ export const demoData = { ...@@ -264,7 +264,7 @@ export const demoData = {
{ number: 2, combin: [2, -1], _combin: [2, -1] }, { number: 2, combin: [2, -1], _combin: [2, -1] },
], ],
bgItemMiddle: { bgItemMiddle: {
url: "assets/play/hotZooCard/defalut_bg.png", url: "defalut_bg",
rect: { x: 0, y: 89.16775568181816, width: 513, height: 82.828125 }, rect: { x: 0, y: 89.16775568181816, width: 513, height: 82.828125 },
questions: [], questions: [],
}, },
...@@ -281,7 +281,7 @@ export const demoData = { ...@@ -281,7 +281,7 @@ export const demoData = {
}, },
uid: "b7943632-7a5b-4ada-b640-81b758712a61", uid: "b7943632-7a5b-4ada-b640-81b758712a61",
media: { media: {
image_url: "assets/play/default_itemBG.png", image_url: "default_itemBG",
text: "d", text: "d",
type: "Text", type: "Text",
audio_url: "", audio_url: "",
...@@ -298,7 +298,7 @@ export const demoData = { ...@@ -298,7 +298,7 @@ export const demoData = {
}, },
uid: "54e395b1-5d90-4f4b-afe4-dacea3711fad", uid: "54e395b1-5d90-4f4b-afe4-dacea3711fad",
media: { media: {
image_url: "assets/play/default_itemBG.png", image_url: "default_itemBG",
text: "mi", text: "mi",
type: "Text", type: "Text",
audio_url: "", audio_url: "",
...@@ -315,7 +315,7 @@ export const demoData = { ...@@ -315,7 +315,7 @@ export const demoData = {
}, },
uid: "2669a94f-b66d-483a-9a49-a71042ad7e02", uid: "2669a94f-b66d-483a-9a49-a71042ad7e02",
media: { media: {
image_url: "assets/play/default_itemBG.png", image_url: "default_itemBG",
text: "p", text: "p",
type: "Text", type: "Text",
audio_url: "", audio_url: "",
...@@ -332,7 +332,7 @@ export const demoData = { ...@@ -332,7 +332,7 @@ export const demoData = {
}, },
uid: "6a6fcbc7-84e9-4cad-b380-d78e74a24c33", uid: "6a6fcbc7-84e9-4cad-b380-d78e74a24c33",
media: { media: {
image_url: "assets/play/default_itemBG.png", image_url: "default_itemBG",
text: "w", text: "w",
type: "Text", type: "Text",
audio_url: "", audio_url: "",
...@@ -349,7 +349,7 @@ export const demoData = { ...@@ -349,7 +349,7 @@ export const demoData = {
}, },
uid: "41165693-b5ca-4b7d-b7db-6f643259dac6", uid: "41165693-b5ca-4b7d-b7db-6f643259dac6",
media: { media: {
image_url: "assets/play/default_itemBG.png", image_url: "default_itemBG",
text: "go", text: "go",
type: "Text", type: "Text",
audio_url: "", audio_url: "",
...@@ -363,7 +363,7 @@ export const demoData = { ...@@ -363,7 +363,7 @@ export const demoData = {
{ number: 2, combin: [3, -1], _combin: [3, -1] }, { number: 2, combin: [3, -1], _combin: [3, -1] },
], ],
bgItemRight: { bgItemRight: {
url: "assets/play/hotZooCard/defalut_bg.png", url: "defalut_bg",
rect: { x: 0, y: 89.16775568181816, width: 513, height: 82.828125 }, rect: { x: 0, y: 89.16775568181816, width: 513, height: 82.828125 },
questions: [], questions: [],
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment