Commit de9b5760 authored by limingzhe's avatar limingzhe

fix: debug

parent bfa89f37
{
"ver": "2.0.1",
"uuid": "9dd19adb-a357-41a2-9003-80aa26328cd2",
"downloadMode": 0,
"duration": 0.600816,
"subMetas": {}
}
\ No newline at end of file
No preview for this file type
...@@ -2,6 +2,6 @@ ...@@ -2,6 +2,6 @@
"ver": "2.0.1", "ver": "2.0.1",
"uuid": "361b2d4a-7d66-4cdb-ac33-0ebc2e1c6aaf", "uuid": "361b2d4a-7d66-4cdb-ac33-0ebc2e1c6aaf",
"downloadMode": 0, "downloadMode": 0,
"duration": 9.932, "duration": 4.04898,
"subMetas": {} "subMetas": {}
} }
\ No newline at end of file
{
"ver": "2.0.1",
"uuid": "8257fa4f-1b5d-4669-9a37-b3a38b9f5306",
"downloadMode": 0,
"duration": 1.906939,
"subMetas": {}
}
\ No newline at end of file
This diff is collapsed.
This diff is collapsed.
export const defaultData = {"title":"Choose your favorite color and paint it.","audio_url":"http://staging-teach.cdn.ireadabc.com/555083b19cc70078d2ece421b0619520.mp3","picArr":[{"pic_url":"http://staging-teach.cdn.ireadabc.com/47cbc362bdda20a5a15a5c9012174e8f.png"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/d1f337cde81bbe6570e3c4c6989d64fd.png"}],"pic_url":"http://staging-teach.cdn.ireadabc.com/c30eef64a4d7d75972e7bd9ffa8e71cf.png"} export const defaultData = {"title":"Choose your favorite color and paint it.","audio_url":"http://staging-teach.cdn.ireadabc.com/555083b19cc70078d2ece421b0619520.mp3","picArr":[{"pic_url":"http://staging-teach.cdn.ireadabc.com/90ce5433218c53cb580a57a04ce696f8.png","colorData":{"key":"Blue","value":"蓝色","code":"#3988FF"}},{"pic_url":"http://staging-teach.cdn.ireadabc.com/223b1e8fc317bd435397347f6756c79b.png","colorData":{"key":"Yellow","value":"黄色","code":"#FAFF04"}},{"pic_url":"http://staging-teach.cdn.ireadabc.com/2c4061df2a7d91590b17580d6a426e7b.png","colorData":{"key":"Pink","value":"粉色","code":"#FFC6EC"}},{"pic_url":"http://staging-teach.cdn.ireadabc.com/a89d9738d55bd7373e34141f4c1c3e65.png","colorData":{"key":"Purple","value":"紫色","code":"#9E00FF"}},{"pic_url":"http://staging-teach.cdn.ireadabc.com/ee942a82682b6d5929c7f0b7c9b2c071.png","colorData":{"key":"Green","value":"绿色","code":"#AAF50A"}}],"pic_url":"http://staging-teach.cdn.ireadabc.com/f4d9c566c17699ff7af21ec3beaa7d97.png","bgItem":{"url":"http://staging-teach.cdn.ireadabc.com/f4d9c566c17699ff7af21ec3beaa7d97.png","rect":{"x":405.12,"y":0,"width":1066.76,"height":717}},"hotZoneItemArr":[{"id":"1716804401017","index":0,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":612.5,"posY":657.5,"labelArr":[{"key":"number","title":"序号","value":"1"}],"sizeW":56.99999999999999,"sizeH":56.99999999999999,"rect":{"x":178.88,"y":629,"width":57,"height":57}},{"id":"1716804410047","index":1,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":872.5011925785761,"posY":576.4975947226569,"labelArr":[{"key":"number","title":"序号","value":"2"}],"sizeW":56.99979148165999,"sizeH":56.99979148165999,"rect":{"x":438.88,"y":548,"width":57,"height":57}},{"id":"1716804421092","index":2,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":619.5002414422884,"posY":386.49789103819273,"labelArr":[{"key":"number","title":"序号","value":"3"}],"sizeW":56.99979148165999,"sizeH":56.99979148165999,"rect":{"x":185.88,"y":358,"width":57,"height":57}},{"id":"1716804428169","index":3,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":1142.5011669710607,"posY":512.4985860993261,"labelArr":[{"key":"number","title":"序号","value":"4"}],"sizeW":56.99979148165999,"sizeH":56.99979148165999,"rect":{"x":708.88,"y":484,"width":57,"height":57}},{"id":"1716804439994","index":4,"itemType":"rect","fontScaleX":1.46640625,"fontScaleY":1.46640625,"imgScale":1,"imgSizeW":0,"imgSizeH":0,"mapScale":1.46640625,"dragDot":{"x":938.5,"y":358.5},"gIdx":"0","posX":1228.4992537238356,"posY":270.49812516404813,"labelArr":[{"key":"number","title":"序号","value":"5"}],"sizeW":56.99979148165999,"sizeH":56.99979148165999,"rect":{"x":794.88,"y":242,"width":57,"height":57}}]}
// {"title":"Choose your favorite color and paint it.","audio_url":"http://staging-teach.cdn.ireadabc.com/555083b19cc70078d2ece421b0619520.mp3","picArr":[{"pic_url":"http://staging-teach.cdn.ireadabc.com/47cbc362bdda20a5a15a5c9012174e8f.png"},{"pic_url":"http://staging-teach.cdn.ireadabc.com/d1f337cde81bbe6570e3c4c6989d64fd.png"}],"pic_url":"http://staging-teach.cdn.ireadabc.com/c30eef64a4d7d75972e7bd9ffa8e71cf.png"}
// { // {
// // "items": [ // // "items": [
......
...@@ -162,7 +162,8 @@ export function getSpriteFrimeByUrl(url, cb) { ...@@ -162,7 +162,8 @@ export function getSpriteFrimeByUrl(url, cb) {
} }
export function getSprNode(resName) { export function getSprNode(resName) {
const sf = cc.find('Canvas/res/img/' + resName).getComponent(cc.Sprite).spriteFrame; console.log('resName: ' + resName);
const sf = cc.find('res/img/' + resName).getComponent(cc.Sprite).spriteFrame;
const node = new cc.Node(); const node = new cc.Node();
node.addComponent(cc.Sprite).spriteFrame = sf; node.addComponent(cc.Sprite).spriteFrame = sf;
return node; return node;
......
{
"ver": "2.3.5",
"uuid": "5deb08e9-f192-4a77-97ec-e44183c425f4",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 29,
"height": 29,
"platformSettings": {},
"subMetas": {
"Img_paper": {
"ver": "1.0.4",
"uuid": "c1b0727d-67a2-484a-9f9b-7267bb45e532",
"rawTextureUuid": "5deb08e9-f192-4a77-97ec-e44183c425f4",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 29,
"height": 29,
"rawWidth": 29,
"rawHeight": 29,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "37006322-be4a-4813-8289-b3a9d70dddde",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 36,
"height": 24,
"platformSettings": {},
"subMetas": {
"bg_sahua": {
"ver": "1.0.4",
"uuid": "b927b837-bf0a-4b15-800a-d11e25ed43ff",
"rawTextureUuid": "37006322-be4a-4813-8289-b3a9d70dddde",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 36,
"height": 24,
"rawWidth": 36,
"rawHeight": 24,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "59f73ffe-c9a7-4773-85a9-4d101b5e15a8",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": true,
"genMipmaps": false,
"packable": true,
"width": 76,
"height": 76,
"platformSettings": {},
"subMetas": {
"color_btn": {
"ver": "1.0.4",
"uuid": "55d5b422-4d5b-4f21-971d-58d287c5fcf5",
"rawTextureUuid": "59f73ffe-c9a7-4773-85a9-4d101b5e15a8",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 76,
"height": 76,
"rawWidth": 76,
"rawHeight": 76,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "7dc90fed-f3be-42d5-8579-74f35f451e04",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 66,
"height": 66,
"platformSettings": {},
"subMetas": {
"input_bg": {
"ver": "1.0.4",
"uuid": "dee360d4-ee85-47e0-8013-f07e0ab7da06",
"rawTextureUuid": "7dc90fed-f3be-42d5-8579-74f35f451e04",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 66,
"height": 66,
"rawWidth": 66,
"rawHeight": 66,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
...@@ -43,6 +43,32 @@ ...@@ -43,6 +43,32 @@
<button style="margin-left: 0px;" nz-button nzType="danger" (click)="deleteOptionBtnClick(item.picArr, i)"> <button style="margin-left: 0px;" nz-button nzType="danger" (click)="deleteOptionBtnClick(item.picArr, i)">
x x
</button> </button>
<div style=" margin-left: 50px; margin-top: 90px;">
<span>颜色:</span>
<a nz-dropdown [nzDropdownMenu]="menu">
{{img?.colorData?.value || '选择颜色'}}
<i nz-icon nzType="down"></i>
</a>
<nz-dropdown-menu #menu="nzDropdownMenu">
<ul nz-menu nzSelectable>
<div nz-menu-item *ngFor="let color of colorArr;" align="center" (click)="clickColor(img,color)">
{{color.value}}
</div>
<!-- <li nz-menu-item>1st menu item</li>
<li nz-menu-item>1st menu item</li>
<li nz-menu-item>2nd menu item</li>
<li nz-menu-item>3rd menu item</li> -->
</ul>
</nz-dropdown-menu>
</div>
</div> </div>
<div style="margin-top: 30px"> <div style="margin-top: 30px">
...@@ -53,6 +79,20 @@ ...@@ -53,6 +79,20 @@
</div> </div>
</div> </div>
<div>
<h4> 序号标注: </h4>
<app-custom-hot-zone
[bgItem]="item.bgItem"
[hotZoneItemArr]="item.hotZoneItemArr"
[customTypeGroupArr]="customTypeGroupArr"
(save)="saveHotZone(item, $event)"
>
</app-custom-hot-zone>
</div>
<div style="height: 30px;"></div> <div style="height: 30px;"></div>
......
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