Commit 9613e171 authored by 李维's avatar 李维

dev commit

parent 1bd9f9b8
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
<nz-form-control [nzSpan]="6"> <nz-form-control [nzSpan]="6">
<nz-select [(ngModel)]="contentObj.theme" (ngModelChange)="saveItem()" style="width: 70%;"> <nz-select [(ngModel)]="contentObj.theme" (ngModelChange)="saveItem()" style="width: 70%;">
<nz-option nzValue="A" nzLabel="A"></nz-option> <nz-option nzValue="A" nzLabel="A"></nz-option>
<nz-option nzValue="B" nzLabel="B"></nz-option> <!-- <nz-option nzValue="B" nzLabel="B"></nz-option> -->
<nz-option nzValue="C" nzLabel="C"></nz-option> <!-- <nz-option nzValue="C" nzLabel="C"></nz-option> -->
<nz-option nzValue="D" nzLabel="自定义"></nz-option> <nz-option nzValue="D" nzLabel="自定义"></nz-option>
</nz-select> </nz-select>
</nz-form-control> </nz-form-control>
...@@ -28,21 +28,21 @@ ...@@ -28,21 +28,21 @@
<div style="flex: 1; display: flex; padding: 0 5px;"> <div style="flex: 1; display: flex; padding: 0 5px;">
<div style="flex:1">外框</div> <div style="flex:1">外框</div>
<div style="flex:5"> <div style="flex:5">
<app-upload-image-with-preview style="width: 100%;" [picUrl]="contentObj.border_image_url" (imageUploaded)="onImageUploadSuccessByItem($event, item, 'border_image_url')"></app-upload-image-with-preview> <app-upload-image-with-preview style="width: 100%;" [picUrl]="contentObj.border_image_url" (imageUploaded)="onImageUploadSuccessByItem($event, contentObj, 'border_image_url')"></app-upload-image-with-preview>
</div> </div>
</div> </div>
<div style="flex: 1; display: flex; padding: 0 5px;"> <div style="flex: 1; display: flex; padding: 0 5px;">
<div style="flex:1">视频背景</div> <div style="flex:1">视频背景</div>
<div style="flex:5"> <div style="flex:5">
<app-upload-image-with-preview style="width: 100%;" [picUrl]="contentObj.video_image_url" (imageUploaded)="onImageUploadSuccessByItem($event, item, 'video_image_url')"></app-upload-image-with-preview> <app-upload-image-with-preview style="width: 100%;" [picUrl]="contentObj.video_image_url" (imageUploaded)="onImageUploadSuccessByItem($event, contentObj, 'video_image_url')"></app-upload-image-with-preview>
</div> </div>
</div> </div>
<div style="flex: 1; display: flex; padding: 0 5px;"> <div style="flex: 1; display: flex; padding: 0 5px;">
<div style="flex:1">文字背景</div> <div style="flex:1">文字背景</div>
<div style="flex:5"> <div style="flex:5">
<app-upload-image-with-preview style="width: 100%;" [picUrl]="contentObj.text_image_url" (imageUploaded)="onImageUploadSuccessByItem($event, item, 'text_image_url')"></app-upload-image-with-preview> <app-upload-image-with-preview style="width: 100%;" [picUrl]="contentObj.text_image_url" (imageUploaded)="onImageUploadSuccessByItem($event, contentObj, 'text_image_url')"></app-upload-image-with-preview>
</div> </div>
</div> </div>
</div> </div>
......
{
"ver": "1.0.1",
"uuid": "015a6ea2-d63c-48eb-9f92-dcb9eea6e754",
"subMetas": {}
}
\ No newline at end of file
...@@ -79,7 +79,7 @@ export default class GameLogic { ...@@ -79,7 +79,7 @@ export default class GameLogic {
initBg() { initBg() {
console.log(this.g_formData.theme) console.log(this.g_formData.theme)
const bgNode_A = cc.find('Canvas/bgMain/bg_A'); const bgNode_A = cc.find('Canvas/bgMain/bg_A');
bgNode_A.scale = this.g_systemOption.mapScaleMax; bgNode_A.scale = this.g_systemOption.mapScaleMin;
if(this.g_formData.theme == "A") { if(this.g_formData.theme == "A") {
bgNode_A.active = true; bgNode_A.active = true;
} else { } else {
...@@ -87,7 +87,7 @@ export default class GameLogic { ...@@ -87,7 +87,7 @@ export default class GameLogic {
} }
const bgNode_D = cc.find('Canvas/bgMain/bg_D'); const bgNode_D = cc.find('Canvas/bgMain/bg_D');
bgNode_D.scale = this.g_systemOption.mapScaleMax; bgNode_D.scale = this.g_systemOption.mapScaleMin;
if(this.g_formData.theme == "A") { if(this.g_formData.theme == "A") {
bgNode_D.active = true; bgNode_D.active = true;
} else { } else {
......
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