Commit 20448722 authored by limingzhe's avatar limingzhe

fix: debug

parent 86785793
No preview for this file type
......@@ -6,8 +6,8 @@
// - https://docs.cocos.com/creator/manual/en/scripting/life-cycle-callbacks.html
// import { getSprNode } from "./util";
import { getDefalutData } from "../script/JJ21_defaultData";
import { getSprNode, playAudioByUrl, showBtnAnima, getScaleRateBy2Node, localPosTolocalPos, randomSortByArr, loadDragonBones, playAudio, showTrebleFirework, getSprNodeByUrl, setSprNodeMaxLen, delayCall, asyncDelay, RandomInt, exchangeNodePos, onHomeworkFinish, roundNum, getAngleByPos, getPosByAngle, jellyShake} from "../script/JJ21_util";
import { getDefalutData } from "../script/Zhe_Creator_defaultData";
import { getSprNode, playAudioByUrl, showBtnAnima, getScaleRateBy2Node, localPosTolocalPos, randomSortByArr, loadDragonBones, playAudio, showTrebleFirework, getSprNodeByUrl, setSprNodeMaxLen, delayCall, asyncDelay, RandomInt, exchangeNodePos, onHomeworkFinish, roundNum, getAngleByPos, getPosByAngle, jellyShake} from "../script/Zhe_Creator_util";
cc.Class({
extends: cc.Component,
......@@ -8474,6 +8474,7 @@ cc.Class({
this.dataTextArr = [];
this.pageDotAreaArr = [];
this.multResAreaArr = [];
hotZoneItemArr.forEach((item) => {
// console.log('item: ', item);
......@@ -8550,6 +8551,10 @@ cc.Class({
case "翻页小点区":
this.setPageDotArea(item, bgItem);
break;
case "多类型区域":
this.setMultResArea(item, bgItem);
break;
}
return;
......@@ -9179,6 +9184,24 @@ cc.Class({
this.pageDotAreaArr.push(rectNode);
},
setMultResArea(data, bg) {
console.log(" in setMultResArea", data);
const rectNode = this.setOneRect(data, bg, cc.Color.BLUE);
const labelData = this.findOneLabelByKey(data.labelArr, 'key');
const key = labelData.value; // tempItem中的关键key获取
rectNode.key = key;
if(data.checkbox && data.checkbox.list[0].label == '自动换行' && data.checkbox.list[0].value == true) {
//多行
rectNode.warp = true;
}
this.multResAreaArr.push(rectNode);
},
getListPicItem(data, callback=null) {
......@@ -9518,26 +9541,32 @@ cc.Class({
if (inputData) {
this.setLabelNodeByLabelArr(node.data.labelArr, inputData[key], node);
}
})
},
setLabelNodeByLabelArr(labelArr, text, node) {
// console.log('inputText data: ', inputData);
// console.log('node.data.labelArr: ', node.data.labelArr);
const fontNameLabelData = this.findOneLabelByKey(node.data.labelArr, 'fontName');
const fontNameLabelData = this.findOneLabelByKey(labelArr, 'fontName');
let fontName, fontSize, fontColor;
if (fontNameLabelData || fontNameLabelData.value) {
fontName = fontNameLabelData.value;
}
const fontSizeLabelData = this.findOneLabelByKey(node.data.labelArr, 'fontSize');
const fontSizeLabelData = this.findOneLabelByKey(labelArr, 'fontSize');
if (fontSizeLabelData || fontSizeLabelData.value) {
fontSize = fontSizeLabelData.value;
}
const fontColorLabelData = this.findOneLabelByKey(node.data.labelArr, 'fontColor');
const fontColorLabelData = this.findOneLabelByKey(labelArr, 'fontColor');
if (fontColorLabelData || fontColorLabelData.value) {
fontColor = cc.Color.fromHEX(new cc.Color(), fontColorLabelData.value);
}
const text = inputData[key];
// const text = inputData[key];
const labelNode = this.getLabel(text, fontSize, fontColor, fontName);
if (node.warp) {
......@@ -9564,10 +9593,9 @@ cc.Class({
labelNode.x = node.width / 2;
labelNode.y = node.height / 2;
node.addChild(labelNode);
}
})
},
refreshDataText() {
this.curAnswerText = '';
......@@ -9621,17 +9649,15 @@ cc.Class({
this.refreshDataText();
this.refreshRecordGroup();
if (this.data.templateType == 'select') {
this.refreshTextOptionArr();
this.refreshPicOptionArr();
}
this.refreshListArea();
this.refreshPageDotArea();
this.refreshMultResArea();
},
refreshAudioAnim() {
......@@ -9855,6 +9881,72 @@ cc.Class({
},
refreshMultResArea() {
this.multResAreaArr.forEach((node) => {
node.removeAllChildren();
const key = node.key;
const inputData = this.curQues.find(it => {
if (!it.labelArr) {
return false;
}
const labelData = this.findOneLabelByKey(it.labelArr, 'key');
return labelData && labelData.value == key
});
if (inputData) {
console.log('inputData~ ', inputData);
switch(inputData.multResType) {
case "text":
this.setLabelNodeByLabelArr(inputData.labelArr, inputData.multResText, node);
break;
case "audio":
break;
case "pic":
const picUrl = inputData.multResPic;
getSprNodeByUrl(picUrl, (spr) => {
setSprNodeMaxLen(spr.node, node.width, node.height);
node.addChild(spr.node);
spr.node.x = node.width / 2;
spr.node.y = node.height / 2;
})
break;
}
// const picUrl = inputData[key];
// getSprNodeByUrl(picUrl, (spr) => {
// setSprNodeMaxLen(spr.node, node.width, node.height);
// node.addChild(spr.node);
// spr.node.x = node.width / 2;
// spr.node.y = node.height / 2;
// })
} else {
console.log(' this.curQues: ', this.curQues);
}
})
},
refreshPageDotState() {
const pageDotArr = this.curPageDotArea.pageDotArr;
......
......@@ -112,7 +112,7 @@
></app-audio-recorder>
</div>
<div *ngIf="getItemHasInputPic(it)" style="margin: 20px; display: flex; align-items: center;">
<div *ngIf="getItemHasInputPic(it)" style="margin: 20px; display: flex; align-items:flex-start;">
<span style="margin-left:20px;">{{it.labelArr[0]?.value}}:</span>
<div style="width: 300px;">
<app-upload-image-with-preview
......@@ -120,6 +120,11 @@
(imageUploaded)="onItemImgUploadSuccess($event, it, it.labelArr[1].value)">
</app-upload-image-with-preview>
</div>
<div style="display: flex; align-items: center; justify-content: space-between;">
<button style="float: right;" nz-button (click)="onDeleteImage(it, it.labelArr[1].value)">
x
</button>
</div>
<div *ngIf="it.isOption" style="margin-left: 30px;">
<nz-radio-group [ngModel]="it.optionValue" (ngModelChange)="radioChange($event, it, 'optionValue')">
......@@ -131,6 +136,46 @@
</div>
</div>
<div *ngIf="getItemHasTargetType(it, 'multResRect')" style="margin-left: 30px; ">
<div style="display: flex; margin-bottom: 15px; ">
<span style="margin-left:0px;">{{it.labelArr[0].value}}:</span>
<nz-radio-group [ngModel]="it.multResType" (ngModelChange)="radioChange($event, it, 'multResType')">
<div style="display: flex; flex-wrap: wrap; width: 100%;">
<label style="margin-left: 5px;" nz-radio [nzValue]="'text'">文本</label>
<!-- <label style="margin-left: 5px;" nz-radio [nzValue]="'audio'">音频</label> -->
<label style="margin-left: 5px;" nz-radio [nzValue]="'pic'">图片</label>
</div>
</nz-radio-group>
</div>
<div *ngIf="it.multResType == 'text'">
<input type="text" nz-input [(ngModel)]="it.multResText" (blur)="saveItemText(it, 'multResText')" style=" width: 500px;">
</div>
<div *ngIf="it.multResType == 'audio'">
<app-audio-recorder
[audioUrl]="it.multResAudio"
(audioUploaded)="onItemAudioUploadSuccess($event, it, 'multResAudio')"
></app-audio-recorder>
</div>
<div *ngIf="it.multResType == 'pic'" style="display: flex;">
<div style="width: 300px;">
<app-upload-image-with-preview
[picUrl]="it.multResPic"
(imageUploaded)="onItemImgUploadSuccess($event, it, 'multResPic')">
</app-upload-image-with-preview>
</div>
<button style="" nz-button (click)="onDeleteImage(it, 'multResPic')">
x
</button>
</div>
</div>
<div *ngIf="getItemHasTargetType(it, 'listInputPic')">
<div *ngFor="let pic of it[it.labelArr[1].value]||[]; let j = index" style="margin-top: 5px;" >
......
This diff is collapsed.
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