Commit c9b8f250 authored by Tt's avatar Tt

调整1

parent 4f707d8e
......@@ -4,7 +4,7 @@
<div style="width:100%;vertical-align:middle; padding-top: 10px; padding-bottom: 10px; text-align: left;">
<span style="font-weight: 700; font-size: 30px; vertical-align:middle;">标题:</span>
<input [(ngModel)]="biaoti.title" type="text"
<input (blur)="saveItem()" [(ngModel)]="biaoti.title" type="text"
style="width: 1000px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;" />
</div>
......@@ -16,7 +16,7 @@
<div style="width:100%;vertical-align:middle; padding-top: 10px; padding-bottom: 10px; text-align: left;">
<span style="font-weight: 700; font-size: 30px; vertical-align:middle;">主类:</span>
<input [(ngModel)]="zhulei.title" type="text"
<input (blur)="saveItem()" [(ngModel)]="zhulei.title" type="text"
style="width: 1000px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;" />
</div>
......@@ -28,7 +28,7 @@
<div style="width:100%;vertical-align:middle; padding-top: 10px; padding-bottom: 10px; text-align: left;">
<span style="font-weight: 700; font-size: 30px; vertical-align:middle;">分类{{c+1}}:</span>
<input [(ngModel)]="fenlei.title" type="text"
<input (blur)="saveItem()" [(ngModel)]="fenlei.title" type="text"
style="width: 1000px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;" />
</div>
......@@ -44,7 +44,7 @@
<button style="margin-left: 30px;" nz-button nzType="danger" (click)="deleteSon(a, b, c,d)">
<span>删除</span>
</button>
<input [(ngModel)]="sonlei.title" type="text"
<input (blur)="saveItem()" [(ngModel)]="sonlei.title" type="text"
style="width: 1000px;height:35px;margin-left: 30px; vertical-align:middle;font-size: 30px; border: 1px solid #ccc; border-radius: 10px;" />
</div>
......
......@@ -11,11 +11,11 @@ function retData() {
"child":
[
{
"title": "sub1",
"title": "sub1sqinalaa",
"child": [
{
"title": "son11",
"child": [ { "cardId": "", "title": "dd", "pic_url": "http://staging-teach.cdn.ireadabc.com/021d3b3904cb6e675286ac8fcb60da2b.png", "audio_url": "" }]//{ "cardId": "", "title": "aa", "pic_url": "http://staging-teach.cdn.ireadabc.com/88b1cd55a3e2ff70447331078c0e2941.png", "audio_url": "" }, { "cardId": "", "title": "bb", "pic_url": "http://staging-teach.cdn.ireadabc.com/26524d3fa6a060d80664b40cfb6105f6.png", "audio_url": "" }, { "cardId": "", "title": "cc", "pic_url": "http://staging-teach.cdn.ireadabc.com/0cd859af88f946a66313cc06e4628fd2.png", "audio_url": "" },
"title": "aaaaaadda",
"child": [{ "cardId": "", "title": "aaaaaadda", "pic_url": "http://staging-teach.cdn.ireadabc.com/021d3b3904cb6e675286ac8fcb60da2b.png", "audio_url": "" }]//{ "cardId": "", "title": "aa", "pic_url": "http://staging-teach.cdn.ireadabc.com/88b1cd55a3e2ff70447331078c0e2941.png", "audio_url": "" }, { "cardId": "", "title": "bb", "pic_url": "http://staging-teach.cdn.ireadabc.com/26524d3fa6a060d80664b40cfb6105f6.png", "audio_url": "" }, { "cardId": "", "title": "cc", "pic_url": "http://staging-teach.cdn.ireadabc.com/0cd859af88f946a66313cc06e4628fd2.png", "audio_url": "" },
},
// {
// "title": "son12",
......@@ -34,7 +34,7 @@ function retData() {
"title": "sub2",
"child": [{
"title": "son21",
"child": [ { "cardId": "", "title": "e1", "pic_url": "http://staging-teach.cdn.ireadabc.com/021d3b3904cb6e675286ac8fcb60da2b.png", "audio_url": "" }]//{ "cardId": "", "title": "q1", "pic_url": "http://staging-teach.cdn.ireadabc.com/fde35aaec618529b0b2b6cb3a18d1f85.png", "audio_url": "" }, { "cardId": "", "title": "w1", "pic_url": "http://staging-teach.cdn.ireadabc.com/0cd859af88f946a66313cc06e4628fd2.png", "audio_url": "" },
"child": [{ "cardId": "", "title": "e1", "pic_url": "http://staging-teach.cdn.ireadabc.com/021d3b3904cb6e675286ac8fcb60da2b.png", "audio_url": "" }]//{ "cardId": "", "title": "q1", "pic_url": "http://staging-teach.cdn.ireadabc.com/fde35aaec618529b0b2b6cb3a18d1f85.png", "audio_url": "" }, { "cardId": "", "title": "w1", "pic_url": "http://staging-teach.cdn.ireadabc.com/0cd859af88f946a66313cc06e4628fd2.png", "audio_url": "" },
},
// {
// "title": "son22",
......
......@@ -98,53 +98,53 @@
{
"__id__": 75
},
{
"__id__": 93
},
{
"__id__": 95
},
{
"__id__": 98
"__id__": 97
},
{
"__id__": 101
},
{
"__id__": 102
"__id__": 104
},
{
"__id__": 103
"__id__": 105
},
{
"__id__": 105
"__id__": 106
},
{
"__id__": 111
"__id__": 108
},
{
"__id__": 124
"__id__": 114
},
{
"__id__": 150
"__id__": 127
},
{
"__id__": 152
"__id__": 153
},
{
"__id__": 154
"__id__": 155
},
{
"__id__": 157
}
],
"_active": true,
"_components": [
{
"__id__": 156
"__id__": 159
},
{
"__id__": 157
"__id__": 160
},
{
"__id__": 158
"__id__": 161
}
],
"_prefab": null,
......@@ -841,7 +841,7 @@
"_N$string": "",
"_fontSize": 27,
"_lineHeight": 40,
"_enableWrapText": true,
"_enableWrapText": false,
"_N$file": {
"__uuid__": "f0adf7cd-b2db-4a5a-87fe-4d818a6a6b89"
},
......@@ -2611,7 +2611,7 @@
"_N$string": "animal",
"_fontSize": 42,
"_lineHeight": 45,
"_enableWrapText": true,
"_enableWrapText": false,
"_N$file": {
"__uuid__": "f792997f-f029-4df1-9adb-5e28c3e1a1c4"
},
......@@ -2903,7 +2903,7 @@
"_N$string": "plant",
"_fontSize": 42,
"_lineHeight": 40,
"_enableWrapText": true,
"_enableWrapText": false,
"_N$file": {
"__uuid__": "f792997f-f029-4df1-9adb-5e28c3e1a1c4"
},
......@@ -3191,7 +3191,7 @@
"_N$string": "food",
"_fontSize": 42,
"_lineHeight": 45,
"_enableWrapText": true,
"_enableWrapText": false,
"_N$file": {
"__uuid__": "f792997f-f029-4df1-9adb-5e28c3e1a1c4"
},
......@@ -3696,7 +3696,7 @@
"_N$string": "Compare",
"_fontSize": 28,
"_lineHeight": 40,
"_enableWrapText": true,
"_enableWrapText": false,
"_N$file": {
"__uuid__": "f792997f-f029-4df1-9adb-5e28c3e1a1c4"
},
......@@ -3794,13 +3794,13 @@
"__id__": 84
},
{
"__id__": 86
"__id__": 88
}
],
"_active": false,
"_components": [
{
"__id__": 92
"__id__": 94
}
],
"_prefab": null,
......@@ -3953,7 +3953,7 @@
"__id__": 75
},
"_children": [],
"_active": false,
"_active": true,
"_components": [
{
"__id__": 79
......@@ -4041,7 +4041,7 @@
},
{
"__type__": "cc.Node",
"_name": "fail",
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 75
......@@ -4064,8 +4064,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 154,
"height": 86
"width": 120,
"height": 52
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -4099,7 +4099,7 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "4btWg51LBA9awol/+5kis7"
"_id": "6dMNKekbZKlpng9zUAK1sr"
},
{
"__type__": "cc.Sprite",
......@@ -4117,10 +4117,10 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "104f34e0-1777-4bd6-ba34-c0c1da5a0882"
"__uuid__": "405a5ae7-9f20-4d23-8681-455a17ac3514"
},
"_type": 0,
"_sizeMode": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
......@@ -4131,17 +4131,17 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "d3Q3fGaodBqJankZdCl+Qq"
"_id": "belfGTj4lBpZ54PY9vpEKB"
},
{
"__type__": "cc.Node",
"_name": "icon",
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 75
},
"_children": [],
"_active": false,
"_active": true,
"_components": [
{
"__id__": 83
......@@ -4151,15 +4151,15 @@
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"r": 150,
"g": 89,
"b": 37,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 120,
"height": 52
"width": 127.61,
"height": 40
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -4193,10 +4193,10 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "6dMNKekbZKlpng9zUAK1sr"
"_id": "f5dJjeSjdIIbwGVJe5nusN"
},
{
"__type__": "cc.Sprite",
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
......@@ -4210,50 +4210,119 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "405a5ae7-9f20-4d23-8681-455a17ac3514"
"_string": "assadfasdf",
"_N$string": "assadfasdf",
"_fontSize": 38,
"_lineHeight": 38,
"_enableWrapText": false,
"_N$file": {
"__uuid__": "5d8c6a7f-89af-4150-a1e1-c687492e05c3"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"_isSystemFontUsed": false,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 2,
"_N$cacheMode": 0,
"_id": "702hWty75DUbyT8g9hK7qe"
},
{
"__type__": "cc.Node",
"_name": "fail",
"_objFlags": 0,
"_parent": {
"__id__": 75
},
"_children": [
{
"__id__": 85
}
],
"_active": true,
"_components": [
{
"__id__": 87
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 154,
"height": 86
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
0,
0,
0,
0,
1,
1,
1,
1
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0
"y": 0,
"z": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "belfGTj4lBpZ54PY9vpEKB"
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "4btWg51LBA9awol/+5kis7"
},
{
"__type__": "cc.Node",
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 75
"__id__": 84
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 85
"__id__": 86
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 150,
"g": 89,
"b": 37,
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 127.61,
"height": 50.4
"height": 40
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -4287,14 +4356,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "f5dJjeSjdIIbwGVJe5nusN"
"_id": "32T8ANQSVKposfDOdLNhXS"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 85
},
"_enabled": true,
"_materials": [
......@@ -4304,11 +4373,11 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_string": "qabfsss",
"_N$string": "qabfsss",
"_string": "assadfasdf",
"_N$string": "assadfasdf",
"_fontSize": 38,
"_lineHeight": 40,
"_enableWrapText": true,
"_lineHeight": 38,
"_enableWrapText": false,
"_N$file": {
"__uuid__": "5d8c6a7f-89af-4150-a1e1-c687492e05c3"
},
......@@ -4322,7 +4391,39 @@
"_N$fontFamily": "Arial",
"_N$overflow": 2,
"_N$cacheMode": 0,
"_id": "702hWty75DUbyT8g9hK7qe"
"_id": "daf51TUvVJxZTpDEWsA7w4"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "104f34e0-1777-4bd6-ba34-c0c1da5a0882"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "d3Q3fGaodBqJankZdCl+Qq"
},
{
"__type__": "cc.Node",
......@@ -4333,16 +4434,16 @@
},
"_children": [
{
"__id__": 87
"__id__": 89
},
{
"__id__": 89
"__id__": 91
}
],
"_active": false,
"_components": [
{
"__id__": 91
"__id__": 93
}
],
"_prefab": null,
......@@ -4398,13 +4499,13 @@
"_name": "txt",
"_objFlags": 0,
"_parent": {
"__id__": 86
"__id__": 88
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 88
"__id__": 90
}
],
"_prefab": null,
......@@ -4460,7 +4561,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 87
"__id__": 89
},
"_enabled": true,
"_materials": [
......@@ -4474,7 +4575,7 @@
"_N$string": "qabf",
"_fontSize": 30,
"_lineHeight": 43,
"_enableWrapText": true,
"_enableWrapText": false,
"_N$file": {
"__uuid__": "5d8c6a7f-89af-4150-a1e1-c687492e05c3"
},
......@@ -4495,13 +4596,13 @@
"_name": "icon",
"_objFlags": 0,
"_parent": {
"__id__": 86
"__id__": 88
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 90
"__id__": 92
}
],
"_prefab": null,
......@@ -4557,7 +4658,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 89
"__id__": 91
},
"_enabled": true,
"_materials": [
......@@ -4589,7 +4690,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
"__id__": 88
},
"_enabled": true,
"_materials": [
......@@ -4697,7 +4798,7 @@
"_active": true,
"_components": [
{
"__id__": 94
"__id__": 96
}
],
"_prefab": null,
......@@ -4753,7 +4854,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 93
"__id__": 95
},
"_enabled": true,
"r_width": 0,
......@@ -4777,13 +4878,16 @@
"__id__": 2
},
"_children": [],
"_active": false,
"_active": true,
"_components": [
{
"__id__": 96
"__id__": 98
},
{
"__id__": 97
"__id__": 99
},
{
"__id__": 100
}
],
"_prefab": null,
......@@ -4797,8 +4901,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 303,
"height": 132
"width": 36,
"height": 42
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -4809,8 +4913,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
-241.046,
595,
-322.046,
0,
0,
0,
......@@ -4839,7 +4943,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 95
"__id__": 97
},
"_enabled": true,
"_materials": [
......@@ -4871,7 +4975,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 95
"__id__": 97
},
"_enabled": true,
"_normalMaterial": null,
......@@ -4932,10 +5036,31 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 95
"__id__": 97
},
"_id": "86ErSTSUhP26kFUGhhqqPn"
},
{
"__type__": "85b1fp6d6BIEYtigmp8p3x+",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
},
"_enabled": true,
"r_width": 0,
"r_height": 0,
"r_top": 0,
"r_bottom": 0,
"p_left": 0,
"p_right": 0,
"p_top": 0,
"p_bottom": 1,
"black": 0,
"noHead": 0,
"debug": 0,
"_id": "bag+W8tmtDzpqX/Hm+/x8i"
},
{
"__type__": "cc.Node",
"_name": "layout_stars",
......@@ -4947,10 +5072,10 @@
"_active": true,
"_components": [
{
"__id__": 99
"__id__": 102
},
{
"__id__": 100
"__id__": 103
}
],
"_prefab": null,
......@@ -5006,7 +5131,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
"__id__": 101
},
"_enabled": true,
"_layoutSize": {
......@@ -5038,7 +5163,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 98
"__id__": 101
},
"_enabled": true,
"alignMode": 1,
......@@ -5187,7 +5312,7 @@
"_active": true,
"_components": [
{
"__id__": 104
"__id__": 107
}
],
"_prefab": null,
......@@ -5243,7 +5368,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 103
"__id__": 106
},
"_enabled": true,
"_materials": [
......@@ -5287,13 +5412,13 @@
},
"_children": [
{
"__id__": 106
"__id__": 109
}
],
"_active": true,
"_components": [
{
"__id__": 110
"__id__": 113
}
],
"_prefab": null,
......@@ -5349,17 +5474,17 @@
"_name": "Star",
"_objFlags": 0,
"_parent": {
"__id__": 105
"__id__": 108
},
"_children": [
{
"__id__": 107
"__id__": 110
}
],
"_active": false,
"_components": [
{
"__id__": 109
"__id__": 112
}
],
"_prefab": null,
......@@ -5415,13 +5540,13 @@
"_name": "StarBig",
"_objFlags": 0,
"_parent": {
"__id__": 106
"__id__": 109
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 108
"__id__": 111
}
],
"_prefab": null,
......@@ -5477,7 +5602,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 107
"__id__": 110
},
"_enabled": true,
"_materials": [
......@@ -5509,7 +5634,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 106
"__id__": 109
},
"_enabled": true,
"_materials": [
......@@ -5541,7 +5666,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 105
"__id__": 108
},
"_enabled": true,
"_materials": [
......@@ -5577,22 +5702,22 @@
},
"_children": [
{
"__id__": 112
"__id__": 115
},
{
"__id__": 114
"__id__": 117
},
{
"__id__": 116
"__id__": 119
},
{
"__id__": 118
"__id__": 121
},
{
"__id__": 120
"__id__": 123
},
{
"__id__": 122
"__id__": 125
}
],
"_active": true,
......@@ -5650,13 +5775,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 111
"__id__": 114
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 113
"__id__": 116
}
],
"_prefab": null,
......@@ -5712,7 +5837,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 112
"__id__": 115
},
"_enabled": true,
"_materials": [
......@@ -5744,22 +5869,22 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 111
"__id__": 114
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 115
"__id__": 118
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 255,
"b": 0,
"r": 121,
"g": 200,
"b": 68,
"a": 255
},
"_contentSize": {
......@@ -5806,7 +5931,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 114
"__id__": 117
},
"_enabled": true,
"_materials": [
......@@ -5838,13 +5963,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 111
"__id__": 114
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 117
"__id__": 120
}
],
"_prefab": null,
......@@ -5900,7 +6025,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 116
"__id__": 119
},
"_enabled": true,
"_materials": [
......@@ -5932,22 +6057,22 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 111
"__id__": 114
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 119
"__id__": 122
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 255,
"b": 255,
"r": 16,
"g": 167,
"b": 219,
"a": 255
},
"_contentSize": {
......@@ -5994,7 +6119,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 118
"__id__": 121
},
"_enabled": true,
"_materials": [
......@@ -6026,22 +6151,22 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 111
"__id__": 114
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 121
"__id__": 124
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 0,
"b": 255,
"r": 195,
"g": 115,
"b": 213,
"a": 255
},
"_contentSize": {
......@@ -6088,7 +6213,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 120
"__id__": 123
},
"_enabled": true,
"_materials": [
......@@ -6120,13 +6245,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 111
"__id__": 114
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 123
"__id__": 126
}
],
"_prefab": null,
......@@ -6134,8 +6259,8 @@
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 0,
"g": 183,
"b": 4,
"a": 255
},
"_contentSize": {
......@@ -6182,7 +6307,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 122
"__id__": 125
},
"_enabled": true,
"_materials": [
......@@ -6218,19 +6343,19 @@
},
"_children": [
{
"__id__": 125
"__id__": 128
},
{
"__id__": 130
"__id__": 133
},
{
"__id__": 135
"__id__": 138
},
{
"__id__": 140
"__id__": 143
},
{
"__id__": 145
"__id__": 148
}
],
"_active": true,
......@@ -6288,11 +6413,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 124
"__id__": 127
},
"_children": [
{
"__id__": 126
"__id__": 129
}
],
"_active": true,
......@@ -6350,17 +6475,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 125
"__id__": 128
},
"_children": [
{
"__id__": 127
"__id__": 130
}
],
"_active": true,
"_components": [
{
"__id__": 129
"__id__": 132
}
],
"_prefab": null,
......@@ -6416,13 +6541,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 126
"__id__": 129
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 128
"__id__": 131
}
],
"_prefab": null,
......@@ -6478,7 +6603,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 127
"__id__": 130
},
"_enabled": true,
"_materials": [
......@@ -6510,7 +6635,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 126
"__id__": 129
},
"_enabled": true,
"_materials": [
......@@ -6532,11 +6657,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 124
"__id__": 127
},
"_children": [
{
"__id__": 131
"__id__": 134
}
],
"_active": true,
......@@ -6594,17 +6719,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 130
"__id__": 133
},
"_children": [
{
"__id__": 132
"__id__": 135
}
],
"_active": true,
"_components": [
{
"__id__": 134
"__id__": 137
}
],
"_prefab": null,
......@@ -6660,13 +6785,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 131
"__id__": 134
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 133
"__id__": 136
}
],
"_prefab": null,
......@@ -6722,7 +6847,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 132
"__id__": 135
},
"_enabled": true,
"_materials": [
......@@ -6754,7 +6879,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 131
"__id__": 134
},
"_enabled": true,
"_materials": [
......@@ -6776,11 +6901,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 124
"__id__": 127
},
"_children": [
{
"__id__": 136
"__id__": 139
}
],
"_active": true,
......@@ -6838,17 +6963,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 135
"__id__": 138
},
"_children": [
{
"__id__": 137
"__id__": 140
}
],
"_active": true,
"_components": [
{
"__id__": 139
"__id__": 142
}
],
"_prefab": null,
......@@ -6904,13 +7029,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 136
"__id__": 139
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 138
"__id__": 141
}
],
"_prefab": null,
......@@ -6966,7 +7091,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 137
"__id__": 140
},
"_enabled": true,
"_materials": [
......@@ -6998,7 +7123,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 136
"__id__": 139
},
"_enabled": true,
"_materials": [
......@@ -7020,11 +7145,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 124
"__id__": 127
},
"_children": [
{
"__id__": 141
"__id__": 144
}
],
"_active": true,
......@@ -7082,17 +7207,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 140
"__id__": 143
},
"_children": [
{
"__id__": 142
"__id__": 145
}
],
"_active": true,
"_components": [
{
"__id__": 144
"__id__": 147
}
],
"_prefab": null,
......@@ -7148,13 +7273,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 141
"__id__": 144
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 143
"__id__": 146
}
],
"_prefab": null,
......@@ -7210,7 +7335,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 142
"__id__": 145
},
"_enabled": true,
"_materials": [
......@@ -7242,7 +7367,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 141
"__id__": 144
},
"_enabled": true,
"_materials": [
......@@ -7264,11 +7389,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 124
"__id__": 127
},
"_children": [
{
"__id__": 146
"__id__": 149
}
],
"_active": true,
......@@ -7326,17 +7451,17 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 145
"__id__": 148
},
"_children": [
{
"__id__": 147
"__id__": 150
}
],
"_active": true,
"_components": [
{
"__id__": 149
"__id__": 152
}
],
"_prefab": null,
......@@ -7392,13 +7517,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 146
"__id__": 149
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 148
"__id__": 151
}
],
"_prefab": null,
......@@ -7454,7 +7579,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 147
"__id__": 150
},
"_enabled": true,
"_materials": [
......@@ -7486,7 +7611,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 146
"__id__": 149
},
"_enabled": true,
"_materials": [
......@@ -7514,7 +7639,7 @@
"_active": true,
"_components": [
{
"__id__": 151
"__id__": 154
}
],
"_prefab": null,
......@@ -7570,7 +7695,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 150
"__id__": 153
},
"_enabled": true,
"_clip": {
......@@ -7595,7 +7720,7 @@
"_active": true,
"_components": [
{
"__id__": 153
"__id__": 156
}
],
"_prefab": null,
......@@ -7651,7 +7776,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 152
"__id__": 155
},
"_enabled": true,
"_clip": {
......@@ -7676,7 +7801,7 @@
"_active": true,
"_components": [
{
"__id__": 155
"__id__": 158
}
],
"_prefab": null,
......@@ -7732,7 +7857,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 154
"__id__": 157
},
"_enabled": true,
"_clip": {
......
......@@ -174,7 +174,7 @@ cc.Class({
initView() {
this.btn_replay = pg.view.find(this, "btn_replay");
pg.view.visible(this.btn_replay, false);
// pg.view.visible(this.btn_replay, false);
pg.view.touchOn(this.btn_replay, this.onTouchReplay, this);
this.initLayout();
},
......@@ -190,11 +190,27 @@ cc.Class({
//刷新分类
pg.view.setString(pg.view.find(this, "main/sub_0/txt"), this._zhuClass.child[0].title);
pg.view.setString(pg.view.find(this, "main/sub_1/txt"), this._zhuClass.child[1].title);
setTimeout(() => {
this.fixTxtSize([pg.view.find(this, "main/sub_0/txt"), pg.view.find(this, "main/sub_1/txt")])
}, 30);
this.initSon();
this.initLine();
this.initBox();
this.initItems();
},
fixTxtSize(items) {
let minSize = 100;
items.forEach(it => {
let lb = it.getComponent(cc.Label);
lb.fontSize;
minSize = minSize > lb.actualFontSize ? lb.actualFontSize : minSize;
})
items.forEach(it => {
let lb = it.getComponent(cc.Label);
lb.actualFontSize = minSize
lb.fontSize = minSize
})
},
initSon() {
//刷新子类
let item = pg.view.find(this, "son");
......@@ -226,6 +242,7 @@ cc.Class({
let x = -480;//-291.057
let addX = 190;
let y = 75;
let txtArr = [];
for (let i = 0; i < list.length; i++) {
let data = list[i];
let itemClone = cc.instantiate(item);
......@@ -236,10 +253,14 @@ cc.Class({
itemClone.y = posY;
itemClone.data = data;
pg.view.setString(pg.view.find(itemClone, "txt"), data.title);
txtArr.push(pg.view.find(itemClone, 'txt'));
pg.view.visible(pg.view.find(itemClone, "bg_blue"), data.type == 0);
pg.view.visible(pg.view.find(itemClone, "bg_green"), data.type == 1);
parent.addChild(itemClone);
}
setTimeout(() => {
this.fixTxtSize(txtArr);
}, 30);
},
initLine() {
//刷新子类
......@@ -452,6 +473,7 @@ cc.Class({
pg.view.setString(txt, data.txt);
pg.view.setString(pg.view.find(success, "txt"), data.txt);
pg.view.setString(pg.view.find(fail, "txt"), data.txt);
pg.view.setNetImg(icon, data.img);
pg.view.setNetImg(pg.view.find(success, "icon"), data.img);
......@@ -655,7 +677,7 @@ cc.Class({
// 游戏结束时需要调用这个方法通知系统作业完成
onHomeworkFinish();
pg.view.visible(this.btn_replay, true);
// pg.view.visible(this.btn_replay, true);
})
},
......@@ -682,9 +704,10 @@ cc.Class({
onTouchReplay() {
this.initData();
this.initSingleData();
pg.view.visible(this.btn_replay, false);
// pg.view.visible(this.btn_replay, false);
// this.initStars();
this.initLayout();
// this.initLayout();
this.initItems();
},
createRightAni(pos) {
let right = pg.view.find(this, 'right');
......@@ -706,28 +729,28 @@ cc.Class({
},
createFireworkAni() {
return new Promise((resolve, reject) => {
this.showAllFirework(cc.find('Canvas/firework_ani'), cc.find('Canvas/paperBase').children);
setTimeout(() => {
resolve('');
}, 1000);
// showFireworks(
// cc.find('Canvas/firework_ani'),
// cc.find('Canvas/RibbonNodeBase').children,
// cc.v2(0, -400), cc.v2(0, 1000), 200, 200
// );
// showFireworks(
// cc.find('Canvas/firework_ani'),
// cc.find('Canvas/RibbonNodeBase').children,
// cc.v2(-600, -400), cc.v2(200, 1000), 200, 200
// );
// showFireworks(
// cc.find('Canvas/firework_ani'),
// cc.find('Canvas/RibbonNodeBase').children,
// cc.v2(600, -400), cc.v2(-200, 1000), 200, 200
// );
// this.showAllFirework(cc.find('Canvas/firework_ani'), cc.find('Canvas/paperBase').children);
// setTimeout(() => {
// resolve('');
// }, 1000);
showFireworks(
cc.find('Canvas/firework_ani'),
cc.find('Canvas/RibbonNodeBase').children,
cc.v2(0, -400), cc.v2(0, 1000), 200, 200
);
showFireworks(
cc.find('Canvas/firework_ani'),
cc.find('Canvas/RibbonNodeBase').children,
cc.v2(-600, -400), cc.v2(200, 1000), 200, 200
);
showFireworks(
cc.find('Canvas/firework_ani'),
cc.find('Canvas/RibbonNodeBase').children,
cc.v2(600, -400), cc.v2(-200, 1000), 200, 200
);
setTimeout(() => {
resolve('');
}, 1000);
});
},
playSFX(name) {
......
......@@ -22,10 +22,10 @@
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 303,
"height": 132,
"rawWidth": 303,
"rawHeight": 132,
"width": 36,
"height": 42,
"rawWidth": 36,
"rawHeight": 42,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
......
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