Commit 7707e51a authored by limingzhe's avatar limingzhe

fix: 渐变bug active异常

parent 07775f31
No preview for this file type
......@@ -17,10 +17,10 @@
"__id__": 2
},
{
"__id__": 51
"__id__": 65
},
{
"__id__": 72
"__id__": 86
}
],
"_active": false,
......@@ -81,19 +81,19 @@
"__id__": 6
},
{
"__id__": 45
"__id__": 59
}
],
"_active": true,
"_components": [
{
"__id__": 48
"__id__": 62
},
{
"__id__": 49
"__id__": 63
},
{
"__id__": 50
"__id__": 64
}
],
"_prefab": null,
......@@ -284,13 +284,13 @@
"__id__": 7
},
{
"__id__": 10
"__id__": 24
},
{
"__id__": 13
"__id__": 27
},
{
"__id__": 28
"__id__": 42
}
],
"_active": false,
......@@ -353,6 +353,27 @@
"_children": [
{
"__id__": 8
},
{
"__id__": 10
},
{
"__id__": 12
},
{
"__id__": 14
},
{
"__id__": 16
},
{
"__id__": 18
},
{
"__id__": 20
},
{
"__id__": 22
}
],
"_active": true,
......@@ -497,18 +518,108 @@
},
{
"__type__": "cc.Node",
"_name": "font",
"_name": "loading",
"_objFlags": 0,
"_parent": {
"__id__": 6
"__id__": 7
},
"_children": [
"_children": [],
"_active": true,
"_components": [
{
"__id__": 11
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 1624,
"height": 1624
},
"_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,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "2fM2iWFJZKS7LuBUvMa95b"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 10
},
"_enabled": true,
"_materials": [],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "b56b79be-e05f-4506-a23d-62ece7277aef"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "465f5cNzNDFqwc2+iQEh4F"
},
{
"__type__": "cc.Node",
"_name": "black",
"_objFlags": 0,
"_parent": {
"__id__": 7
},
"_children": [],
"_active": true,
"_components": [],
"_components": [
{
"__id__": 13
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -520,8 +631,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 0
"width": 10,
"height": 10
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -555,20 +666,560 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "feQPrUp4hHIIF9kRjSFXiq"
"_id": "1dKe7xoJhGdpA1fjq2hUmr"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 12
},
"_enabled": true,
"_materials": [],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "4dfdc5eb-c3be-44bd-8145-5bc8bc2f757c"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "2aLqmkr4xJ8a5OQ6lWKDIH"
},
{
"__type__": "cc.Node",
"_name": "Berlin-Sans-FB",
"_name": "blue",
"_objFlags": 0,
"_parent": {
"__id__": 10
"__id__": 7
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 15
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 10,
"height": 10
},
"_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,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "d0BU5ljAdLzrBhOfOONlVe"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 14
},
"_enabled": true,
"_materials": [],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "324fdb51-8f39-487a-8631-cf019cc5dfc2"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "51RbSjKsdAxaARsedNv9Eo"
},
{
"__type__": "cc.Node",
"_name": "green",
"_objFlags": 0,
"_parent": {
"__id__": 7
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 17
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 10,
"height": 10
},
"_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,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "d8xY42DJRL1YTDCIUmIlFe"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
},
"_enabled": true,
"_materials": [],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "1fa7798d-5c9a-4a73-89e6-1a2d3020e699"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "5dUgLiEFhCmbz8z/bLXvYf"
},
{
"__type__": "cc.Node",
"_name": "purple",
"_objFlags": 0,
"_parent": {
"__id__": 7
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 19
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 10,
"height": 10
},
"_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,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "a1v5hxi+xPtIDR1yeqEJ7a"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
},
"_enabled": true,
"_materials": [],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "bb48b646-4af7-4ddd-9fbc-4c708caa2ecf"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "da8QrlPCRI8rDE5ivFTl72"
},
{
"__type__": "cc.Node",
"_name": "red",
"_objFlags": 0,
"_parent": {
"__id__": 7
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 21
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 10,
"height": 10
},
"_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,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "8f6xPfVt9CJIzqUmkyby9C"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 20
},
"_enabled": true,
"_materials": [],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "22453446-6564-48c4-9ed4-7c25df08f71c"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "a7erZ+8PdDPKPKLsMARxgS"
},
{
"__type__": "cc.Node",
"_name": "yellow",
"_objFlags": 0,
"_parent": {
"__id__": 7
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 23
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 10,
"height": 10
},
"_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,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "56SUtxd7dFPpMBc8YsfO9n"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 22
},
"_enabled": true,
"_materials": [],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "e32a6279-b68d-4d2a-9172-9a64a7408976"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "deBPsT84pJWahqWT+j0Waq"
},
{
"__type__": "cc.Node",
"_name": "font",
"_objFlags": 0,
"_parent": {
"__id__": 6
},
"_children": [
{
"__id__": 25
}
],
"_active": true,
"_components": [],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 0,
"height": 0
},
"_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,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "feQPrUp4hHIIF9kRjSFXiq"
},
{
"__type__": "cc.Node",
"_name": "Berlin-Sans-FB",
"_objFlags": 0,
"_parent": {
"__id__": 24
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 12
"__id__": 26
}
],
"_prefab": null,
......@@ -624,7 +1275,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 11
"__id__": 25
},
"_enabled": true,
"_materials": [
......@@ -663,25 +1314,25 @@
},
"_children": [
{
"__id__": 14
"__id__": 28
},
{
"__id__": 16
"__id__": 30
},
{
"__id__": 18
"__id__": 32
},
{
"__id__": 20
"__id__": 34
},
{
"__id__": 22
"__id__": 36
},
{
"__id__": 24
"__id__": 38
},
{
"__id__": 26
"__id__": 40
}
],
"_active": true,
......@@ -739,13 +1390,13 @@
"_name": "btn",
"_objFlags": 0,
"_parent": {
"__id__": 13
"__id__": 27
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 15
"__id__": 29
}
],
"_prefab": null,
......@@ -801,7 +1452,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 14
"__id__": 28
},
"_enabled": true,
"_clip": {
......@@ -820,13 +1471,13 @@
"_name": "select",
"_objFlags": 0,
"_parent": {
"__id__": 13
"__id__": 27
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 17
"__id__": 31
}
],
"_prefab": null,
......@@ -882,7 +1533,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 16
"__id__": 30
},
"_enabled": true,
"_clip": {
......@@ -901,13 +1552,13 @@
"_name": "star_count",
"_objFlags": 0,
"_parent": {
"__id__": 13
"__id__": 27
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 19
"__id__": 33
}
],
"_prefab": null,
......@@ -963,7 +1614,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 18
"__id__": 32
},
"_enabled": true,
"_clip": {
......@@ -982,13 +1633,13 @@
"_name": "finish",
"_objFlags": 0,
"_parent": {
"__id__": 13
"__id__": 27
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 21
"__id__": 35
}
],
"_prefab": null,
......@@ -1044,7 +1695,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 20
"__id__": 34
},
"_enabled": true,
"_clip": {
......@@ -1063,13 +1714,13 @@
"_name": "big_star",
"_objFlags": 0,
"_parent": {
"__id__": 13
"__id__": 27
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 23
"__id__": 37
}
],
"_prefab": null,
......@@ -1125,7 +1776,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 22
"__id__": 36
},
"_enabled": true,
"_clip": {
......@@ -1144,13 +1795,13 @@
"_name": "wrong",
"_objFlags": 0,
"_parent": {
"__id__": 13
"__id__": 27
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 25
"__id__": 39
}
],
"_prefab": null,
......@@ -1206,7 +1857,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 38
},
"_enabled": true,
"_clip": {
......@@ -1225,13 +1876,13 @@
"_name": "right",
"_objFlags": 0,
"_parent": {
"__id__": 13
"__id__": 27
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 27
"__id__": 41
}
],
"_prefab": null,
......@@ -1287,7 +1938,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 26
"__id__": 40
},
"_enabled": true,
"_clip": {
......@@ -1310,22 +1961,22 @@
},
"_children": [
{
"__id__": 29
"__id__": 43
},
{
"__id__": 32
"__id__": 46
},
{
"__id__": 35
"__id__": 49
},
{
"__id__": 38
"__id__": 52
},
{
"__id__": 41
"__id__": 55
},
{
"__id__": 43
"__id__": 57
}
],
"_active": true,
......@@ -1383,16 +2034,16 @@
"_name": "audio_big",
"_objFlags": 0,
"_parent": {
"__id__": 28
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 30
"__id__": 44
},
{
"__id__": 31
"__id__": 45
}
],
"_prefab": null,
......@@ -1448,7 +2099,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 29
"__id__": 43
},
"_enabled": true,
"_materials": [
......@@ -1480,7 +2131,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 29
"__id__": 43
},
"_enabled": true,
"_defaultClip": {
......@@ -1499,16 +2150,16 @@
"_name": "laba",
"_objFlags": 0,
"_parent": {
"__id__": 28
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 33
"__id__": 47
},
{
"__id__": 34
"__id__": 48
}
],
"_prefab": null,
......@@ -1564,7 +2215,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 32
"__id__": 46
},
"_enabled": true,
"_materials": [
......@@ -1596,7 +2247,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 32
"__id__": 46
},
"_enabled": true,
"_defaultClip": {
......@@ -1615,16 +2266,16 @@
"_name": "ques_audio",
"_objFlags": 0,
"_parent": {
"__id__": 28
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 36
"__id__": 50
},
{
"__id__": 37
"__id__": 51
}
],
"_prefab": null,
......@@ -1680,7 +2331,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 49
},
"_enabled": true,
"_materials": [
......@@ -1712,7 +2363,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 35
"__id__": 49
},
"_enabled": true,
"_defaultClip": {
......@@ -1731,16 +2382,16 @@
"_name": "op_audio",
"_objFlags": 0,
"_parent": {
"__id__": 28
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 39
"__id__": 53
},
{
"__id__": 40
"__id__": 54
}
],
"_prefab": null,
......@@ -1796,7 +2447,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 38
"__id__": 52
},
"_enabled": true,
"_materials": [
......@@ -1828,7 +2479,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 38
"__id__": 52
},
"_enabled": true,
"_defaultClip": {
......@@ -1847,13 +2498,13 @@
"_name": "right",
"_objFlags": 0,
"_parent": {
"__id__": 28
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 42
"__id__": 56
}
],
"_prefab": null,
......@@ -1909,7 +2560,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 41
"__id__": 55
},
"_enabled": true,
"_materials": [
......@@ -1949,13 +2600,13 @@
"_name": "correct",
"_objFlags": 0,
"_parent": {
"__id__": 28
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 44
"__id__": 58
}
],
"_prefab": null,
......@@ -2011,7 +2662,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 43
"__id__": 57
},
"_enabled": true,
"_materials": [
......@@ -2057,10 +2708,10 @@
"_active": true,
"_components": [
{
"__id__": 46
"__id__": 60
},
{
"__id__": 47
"__id__": 61
}
],
"_prefab": null,
......@@ -2116,7 +2767,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 45
"__id__": 59
},
"_enabled": true,
"_materials": [
......@@ -2148,7 +2799,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 45
"__id__": 59
},
"_enabled": true,
"alignMode": 1,
......@@ -2235,19 +2886,19 @@
},
"_children": [
{
"__id__": 52
"__id__": 66
},
{
"__id__": 56
"__id__": 70
},
{
"__id__": 60
"__id__": 74
},
{
"__id__": 64
"__id__": 78
},
{
"__id__": 68
"__id__": 82
}
],
"_active": false,
......@@ -2305,11 +2956,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 51
"__id__": 65
},
"_children": [
{
"__id__": 53
"__id__": 67
}
],
"_active": true,
......@@ -2367,11 +3018,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 52
"__id__": 66
},
"_children": [
{
"__id__": 54
"__id__": 68
}
],
"_active": true,
......@@ -2429,13 +3080,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 53
"__id__": 67
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 55
"__id__": 69
}
],
"_prefab": null,
......@@ -2491,7 +3142,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
"__id__": 68
},
"_enabled": true,
"_materials": [
......@@ -2523,11 +3174,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 51
"__id__": 65
},
"_children": [
{
"__id__": 57
"__id__": 71
}
],
"_active": true,
......@@ -2585,11 +3236,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 56
"__id__": 70
},
"_children": [
{
"__id__": 58
"__id__": 72
}
],
"_active": true,
......@@ -2647,13 +3298,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 57
"__id__": 71
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 59
"__id__": 73
}
],
"_prefab": null,
......@@ -2709,7 +3360,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 58
"__id__": 72
},
"_enabled": true,
"_materials": [
......@@ -2741,11 +3392,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 51
"__id__": 65
},
"_children": [
{
"__id__": 61
"__id__": 75
}
],
"_active": true,
......@@ -2803,11 +3454,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 60
"__id__": 74
},
"_children": [
{
"__id__": 62
"__id__": 76
}
],
"_active": true,
......@@ -2865,13 +3516,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 61
"__id__": 75
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 63
"__id__": 77
}
],
"_prefab": null,
......@@ -2927,7 +3578,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 62
"__id__": 76
},
"_enabled": true,
"_materials": [
......@@ -2959,11 +3610,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 51
"__id__": 65
},
"_children": [
{
"__id__": 65
"__id__": 79
}
],
"_active": true,
......@@ -3021,11 +3672,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 64
"__id__": 78
},
"_children": [
{
"__id__": 66
"__id__": 80
}
],
"_active": true,
......@@ -3083,13 +3734,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 65
"__id__": 79
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 67
"__id__": 81
}
],
"_prefab": null,
......@@ -3145,7 +3796,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 66
"__id__": 80
},
"_enabled": true,
"_materials": [
......@@ -3177,11 +3828,11 @@
"_name": "quadBase",
"_objFlags": 0,
"_parent": {
"__id__": 51
"__id__": 65
},
"_children": [
{
"__id__": 69
"__id__": 83
}
],
"_active": true,
......@@ -3239,11 +3890,11 @@
"_name": "quad",
"_objFlags": 0,
"_parent": {
"__id__": 68
"__id__": 82
},
"_children": [
{
"__id__": 70
"__id__": 84
}
],
"_active": true,
......@@ -3301,13 +3952,13 @@
"_name": "paper",
"_objFlags": 0,
"_parent": {
"__id__": 69
"__id__": 83
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 71
"__id__": 85
}
],
"_prefab": null,
......@@ -3363,7 +4014,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 70
"__id__": 84
},
"_enabled": true,
"_materials": [
......@@ -3399,28 +4050,28 @@
},
"_children": [
{
"__id__": 73
"__id__": 87
},
{
"__id__": 75
"__id__": 89
},
{
"__id__": 77
"__id__": 91
},
{
"__id__": 79
"__id__": 93
},
{
"__id__": 81
"__id__": 95
},
{
"__id__": 83
"__id__": 97
},
{
"__id__": 85
"__id__": 99
},
{
"__id__": 87
"__id__": 101
}
],
"_active": false,
......@@ -3478,13 +4129,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 72
"__id__": 86
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 74
"__id__": 88
}
],
"_prefab": null,
......@@ -3540,7 +4191,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 73
"__id__": 87
},
"_enabled": true,
"_materials": [
......@@ -3572,13 +4223,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 72
"__id__": 86
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 76
"__id__": 90
}
],
"_prefab": null,
......@@ -3634,7 +4285,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 75
"__id__": 89
},
"_enabled": true,
"_materials": [
......@@ -3666,13 +4317,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 72
"__id__": 86
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 78
"__id__": 92
}
],
"_prefab": null,
......@@ -3728,7 +4379,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 77
"__id__": 91
},
"_enabled": true,
"_materials": [
......@@ -3760,13 +4411,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 72
"__id__": 86
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 80
"__id__": 94
}
],
"_prefab": null,
......@@ -3822,7 +4473,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 79
"__id__": 93
},
"_enabled": true,
"_materials": [
......@@ -3854,13 +4505,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 72
"__id__": 86
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 82
"__id__": 96
}
],
"_prefab": null,
......@@ -3916,7 +4567,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 81
"__id__": 95
},
"_enabled": true,
"_materials": [
......@@ -3948,13 +4599,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 72
"__id__": 86
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 84
"__id__": 98
}
],
"_prefab": null,
......@@ -4010,7 +4661,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 83
"__id__": 97
},
"_enabled": true,
"_materials": [
......@@ -4042,13 +4693,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 72
"__id__": 86
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 86
"__id__": 100
}
],
"_prefab": null,
......@@ -4104,7 +4755,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 85
"__id__": 99
},
"_enabled": true,
"_materials": [
......@@ -4136,13 +4787,13 @@
"_name": "bg_sahua",
"_objFlags": 0,
"_parent": {
"__id__": 72
"__id__": 86
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 88
"__id__": 102
}
],
"_prefab": null,
......@@ -4198,7 +4849,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 87
"__id__": 101
},
"_enabled": true,
"_materials": [
......
......@@ -117,7 +117,7 @@ cc.Class({
getDefaultData() {
return {"aiClassData":{"time":60,"startTime":0,"itemArr":[{"gId":"0","data":{"name":"镜头","camera":true,"copy":true,"color":"#84f466"},"nickName":"镜头"},{"gId":"2","data":{"name":"龙骨","anima":true,"commonProp":true,"copy":true,"color":"#ffa4e6"},"nickName":"龙骨","skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/e3ab840baf83c0b0d571e2420536286f.json","name":"鱼_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/d181f59eb6a4ad6cf124587ca6b34c0e.json","name":"鱼_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/f566cca10fd83f62a465b144ac73d483.png","name":"鱼_tex.png"},"keyArrData":[{"panelGroup":[],"time":1,"x":"","anchorX":"","anchorY":"","scaleX":"0.5","scaleY":"0.5"},{"panelGroup":[],"time":4.375,"x":"","anchorX":"","anchorY":"","scaleX":"0.5","scaleY":"0.5","times":"","active":"false"}]},{"gId":"4","data":{"name":"按钮","pic":true,"commonProp":true},"nickName":"按钮","keyArrData":[{"panelGroup":[],"time":2.037,"x":"0","y":"0"}],"pic_url":"http://staging-teach.cdn.ireadabc.com/790525a2e3b223339c8dfcd6a97361ba.png"},{"gId":"2","data":{"name":"龙骨","anima":true,"commonProp":true,"copy":true,"color":"#ffa4e6"},"nickName":"龙骨","keyArrData":[{"panelGroup":[],"time":2.975,"x":"","y":"","times":"1","anchorX":"","anchorY":"","scaleX":"0.5","scaleY":"0.5"}],"skeJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/bd29690a750530cf6e822f6e418ed1ae.json","name":"小汽车_ske.json"},"texJsonData":{"url":"http://staging-teach.cdn.ireadabc.com/bb18572d3c4bb94f8a9afc8ea726c90d.json","name":"小汽车_tex.json"},"texPngData":{"url":"http://staging-teach.cdn.ireadabc.com/84bce64cd4259e604a458d08ddd75bec.png","name":"小汽车_tex.png"}},{"gId":"1","data":{"name":"图片","pic":true,"fill":true,"commonProp":true,"copy":true,"color":"#ffde00"},"nickName":"图片","keyArrData":[{"panelGroup":[],"time":0.012}],"isFill":true,"pic_url":"http://staging-teach.cdn.ireadabc.com/35f003bb6d0e410494d606fd4055ddb4.png"},{"gId":"5","data":{"name":"重玩按钮","pic":true,"commonProp":true},"nickName":"重玩按钮","keyArrData":[{"panelGroup":[],"time":5,"y":"0"}],"pic_url":"http://staging-teach.cdn.ireadabc.com/3a552c7843003f6803267a03546db24b.png"},{"gId":"1","data":{"name":"图片","pic":true,"fill":true,"commonProp":true,"copy":true,"color":"#ffde00"},"nickName":"图片","pic_url":"http://staging-teach.cdn.ireadabc.com/c8abf7383d65bcbdba8f390785cece60.png","keyArrData":[{"panelGroup":[],"time":0.637,"x":"-0.2"},{"panelGroup":[],"time":2.25,"x":"-0.2","active":"false"}]}]}}
return {"aiClassData":{"time":80,"startTime":"70","itemArr":[{"gId":"0","data":{"name":"镜头","camera":true,"copy":true,"color":"#84f466"},"nickName":"镜头"},{"gId":"1","data":{"name":"图片","pic":true,"fill":true,"commonProp":true,"copy":true,"color":"#ffde00"},"nickName":"整体背景","pic_url":"http://teach.cdn.ireadabc.com/7284f3b597d66682fb8445e1b35d3d2e.png","keyArrData":[{"panelGroup":[],"time":0,"active":"false"}],"isFill":true},{"gId":"1","data":{"name":"图片","pic":true,"fill":true,"commonProp":true,"copy":true,"color":"#ffde00"},"nickName":"动画框","pic_url":"http://teach.cdn.ireadabc.com/c1d1d13f98bac263a8e5372c63c8953a.png","keyArrData":[{"panelGroup":[],"time":0,"anchorX":"","x":"-0.154"}]},{"gId":"1","data":{"name":"图片","pic":true,"fill":true,"commonProp":true,"copy":true,"color":"#ffde00"},"nickName":"课文背景","pic_url":"http://teach.cdn.ireadabc.com/2fa5f7b71e8f9db53dff63a15c4b5dac.png","keyArrData":[{"panelGroup":[],"time":0,"x":"-0.154","anchorX":""}]},{"gId":"2","data":{"name":"龙骨","anima":true,"commonProp":true,"copy":true,"color":"#ffa4e6"},"nickName":"","skeJsonData":{"url":"http://teach.cdn.ireadabc.com/62eb732be39e0a514dcd61b2f215141c.json","name":"niao_ske.json"},"texJsonData":{"url":"http://teach.cdn.ireadabc.com/9e789079ec5355fb1ee28e362e9cb92d.json","name":"niao_tex.json"},"texPngData":{"url":"http://teach.cdn.ireadabc.com/609b0aba832294d17fafdb7587773bc3.png","name":"niao_tex.png"},"keyArrData":[{"panelGroup":[],"time":"1","anchorX":"","anchorY":"","x":"0.42","y":"-0.35","scaleX":"0.3","scaleY":"0.3","opacity":"","zIndex":"6"},{"panelGroup":[],"time":"7.95","active":"false","animation":"","times":""}]},{"gId":"3","data":{"name":"音频","audio":true,"color":"#0beffd"},"nickName":"鸟开始音频","audio_url":"http://teach.cdn.ireadabc.com/1fc907c9f4cd3f80ebe47f8e6b6a4bb2.mp3","keyArrData":[{"panelGroup":[],"time":1}]},{"gId":"1","data":{"name":"图片","pic":true,"fill":true,"commonProp":true,"copy":true,"color":"#ffde00"},"nickName":"标题","pic_url":"http://teach.cdn.ireadabc.com/3bfdec1c0df1b5f7b2e5beeccea8bfcb.png","keyArrData":[{"panelGroup":[],"time":0,"x":"0.34","y":"0.2","zIndex":"6"}]},{"gId":"4","data":{"name":"按钮","pic":true,"commonProp":true},"nickName":"播放按钮","pic_url":"http://teach.cdn.ireadabc.com/f3dca982dae5dd40b59ac11a1e2d89dc.png","keyArrData":[{"panelGroup":[],"time":7.962,"x":"0.34","y":"-0.2","zIndex":"6"}]},{"gId":"2","data":{"name":"龙骨","anima":true,"commonProp":true,"copy":true,"color":"#ffa4e6"},"nickName":"动画1","skeJsonData":{"url":"http://teach.cdn.ireadabc.com/3677d019980adbf503ad778d55b902cd.json","name":"711_ske.json"},"texJsonData":{"url":"http://teach.cdn.ireadabc.com/3c2bd5fd747c9e27ff828cffead1ea42.json","name":"711_tex.json"},"texPngData":{"url":"http://teach.cdn.ireadabc.com/890d0149fbe6433c858ac747a5386dc3.png","name":"711_tex.png"},"keyArrData":[{"panelGroup":[],"time":8,"x":"-0.154","anchorX":"","scaleX":"0.83","scaleY":"0.83","zIndex":"2","active":"","times":"1"},{"panelGroup":[],"time":20.987,"active":"false"}]},{"gId":"1","data":{"name":"图片","pic":true,"fill":true,"commonProp":true,"copy":true,"color":"#ffde00"},"nickName":"播放器","keyArrData":[{"panelGroup":[],"time":0.037,"zIndex":"5","x":""}],"pic_url":"http://teach.cdn.ireadabc.com/3efabd7ddd1d2802f76a53f9b2e4128f.png"},{"gId":"3","data":{"name":"音频","audio":true,"color":"#0beffd"},"nickName":"动画1-音频1","keyArrData":[{"panelGroup":[],"time":"13"}],"audio_url":"http://teach.cdn.ireadabc.com/214aea45454933bc3898b7f3afed5b1a.mp3"},{"gId":"3","data":{"name":"音频","audio":true,"color":"#0beffd"},"nickName":"动画1-音频2","audio_url":"http://teach.cdn.ireadabc.com/6ce8c03efea97b26b771bbf0c01a1a05.mp3","keyArrData":[{"panelGroup":[],"time":"17"}]},{"gId":"2","data":{"name":"龙骨","anima":true,"commonProp":true,"copy":true,"color":"#ffa4e6"},"nickName":"动画2","skeJsonData":{"url":"http://teach.cdn.ireadabc.com/90982db9b2fe68a2daead6fa4d39bd5f.json","name":"712_ske.json"},"texJsonData":{"url":"http://teach.cdn.ireadabc.com/a2b6cd269e9d29b6ed276774ca3f666a.json","name":"712_tex.json"},"texPngData":{"url":"http://teach.cdn.ireadabc.com/199e69cf8fef52151991e7d2f820d0a7.png","name":"712_tex.png"},"keyArrData":[{"panelGroup":[],"time":21,"x":"-0.154","anchorX":"","scaleX":"0.83","scaleY":"0.83","zIndex":"2","active":"","times":"1"},{"panelGroup":[],"time":50.3,"active":"false"}]},{"gId":"2","data":{"name":"龙骨","anima":true,"commonProp":true,"copy":true,"color":"#ffa4e6"},"nickName":"动画3","skeJsonData":{"url":"http://teach.cdn.ireadabc.com/6a499aebc92ad61271407d716c37d6b1.json","name":"713_ske.json"},"texJsonData":{"url":"http://teach.cdn.ireadabc.com/9284dd1615d2444b8b20a3e1277f948f.json","name":"713_tex.json"},"texPngData":{"url":"http://teach.cdn.ireadabc.com/138d51147e6ffab485528c007d64f434.png","name":"713_tex.png"},"keyArrData":[{"panelGroup":[],"time":"50.3","x":"-0.154","anchorX":"","scaleX":"0.83","scaleY":"0.83","zIndex":"2","active":"","times":"1"},{"panelGroup":[],"time":61.05,"active":"false"}]},{"gId":"2","data":{"name":"龙骨","anima":true,"commonProp":true,"copy":true,"color":"#ffa4e6"},"nickName":"动画4","skeJsonData":{"url":"http://teach.cdn.ireadabc.com/a5591dccd3313deb33ccdc3b4e687385.json","name":"714_ske.json"},"texJsonData":{"url":"http://teach.cdn.ireadabc.com/29d4b32b96cb1fc4de42d5951018da1c.json","name":"714_tex.json"},"texPngData":{"url":"http://teach.cdn.ireadabc.com/dc9a654e76dfa2ec575ea66c61058446.png","name":"714_tex.png"},"keyArrData":[{"panelGroup":[],"time":"61","x":"-0.154","anchorX":"","scaleX":"0.83","scaleY":"0.83","zIndex":"2","active":"","times":"1"},{"panelGroup":[],"time":71.05,"active":"false"}]},{"gId":"2","data":{"name":"龙骨","anima":true,"commonProp":true,"copy":true,"color":"#ffa4e6"},"nickName":"动画5","skeJsonData":{"url":"http://teach.cdn.ireadabc.com/6e91efa9cd60c03483c2eb6650abe83f.json","name":"715_ske.json"},"texJsonData":{"url":"http://teach.cdn.ireadabc.com/af5483ac4387d628684f356c454a142c.json","name":"715_tex.json"},"texPngData":{"url":"http://teach.cdn.ireadabc.com/6ac080b8c9583b1b98d6548ecf4e1398.png","name":"715_tex.png"},"keyArrData":[{"panelGroup":[],"time":71,"x":"-0.154","anchorX":"","scaleX":"0.83","scaleY":"0.83","zIndex":"2","active":"","times":"1"},{"panelGroup":[],"time":78.975,"active":"false"}]},{"gId":"4","data":{"name":"按钮","pic":true,"commonProp":true},"nickName":"控制动画2按钮","keyArrData":[{"panelGroup":[],"time":20.912,"x":"0.34","y":"-0.2","zIndex":"6"}],"pic_url":"http://teach.cdn.ireadabc.com/f3dca982dae5dd40b59ac11a1e2d89dc.png"},{"gId":"3","data":{"name":"音频","audio":true,"color":"#0beffd"},"nickName":"动画2 音频1","keyArrData":[{"panelGroup":[],"time":"35"}],"audio_url":"http://teach.cdn.ireadabc.com/e8da089ce8477dcada89e0fcb1d213dc.mp3"},{"gId":"3","data":{"name":"音频","audio":true,"color":"#0beffd"},"nickName":"动画2 音频2","audio_url":"http://teach.cdn.ireadabc.com/4eebc8b31c68461c280b77a4155c6285.mp3","keyArrData":[{"panelGroup":[],"time":"43"}]},{"gId":"3","data":{"name":"音频","audio":true,"color":"#0beffd"},"nickName":"动画2 音频3","audio_url":"http://teach.cdn.ireadabc.com/a76309950926e1ac71a5b44ce88dba2a.mp3","keyArrData":[{"panelGroup":[],"time":46}]},{"gId":"4","data":{"name":"按钮","pic":true,"commonProp":true},"nickName":"按钮控制动画3","pic_url":"http://teach.cdn.ireadabc.com/f3dca982dae5dd40b59ac11a1e2d89dc.png","keyArrData":[{"panelGroup":[],"time":50,"x":"0.34","y":"-0.2","zIndex":"6"}]},{"gId":"3","data":{"name":"音频","audio":true,"color":"#0beffd"},"nickName":"背景音乐","audio_url":"http://teach.cdn.ireadabc.com/d604af2ebf795786c98b2193ce7848cc.mp3","keyArrData":[{"panelGroup":[],"time":9}]},{"gId":"4","data":{"name":"按钮","pic":true,"commonProp":true},"nickName":"按钮控制动画4","pic_url":"http://teach.cdn.ireadabc.com/f3dca982dae5dd40b59ac11a1e2d89dc.png","keyArrData":[{"panelGroup":[],"time":60.98,"x":"0.34","y":"-0.2","zIndex":"6"}]},{"gId":"4","data":{"name":"按钮","pic":true,"commonProp":true},"nickName":"按钮控制动画5","pic_url":"http://teach.cdn.ireadabc.com/f3dca982dae5dd40b59ac11a1e2d89dc.png","keyArrData":[{"panelGroup":[],"time":70.98,"x":"0.34","y":"-0.2","zIndex":"6"}]},{"gId":"5","data":{"name":"重玩按钮","pic":true,"commonProp":true},"nickName":"按钮控制循环播放","pic_url":"http://teach.cdn.ireadabc.com/28cc0faa3f617d0ce2b0a1cf42cb7567.png","keyArrData":[{"panelGroup":[],"time":79,"x":"0.34","y":"-0.2","zIndex":"6"}]},{"gId":"3","data":{"name":"音频","audio":true,"color":"#0beffd"},"nickName":"动画3音频1","audio_url":"http://teach.cdn.ireadabc.com/f8926f6962376f5b26d3d6b5a82b1b60.mp3","keyArrData":[{"panelGroup":[],"time":"53"}]},{"gId":"3","data":{"name":"音频","audio":true,"color":"#0beffd"},"nickName":"动画3音频2","audio_url":"http://teach.cdn.ireadabc.com/a1f4d9794bcad694ede795c491bc6d11.mp3","keyArrData":[{"panelGroup":[],"time":"57"}]},{"gId":"3","data":{"name":"音频","audio":true,"color":"#0beffd"},"nickName":"动画4音频1","audio_url":"http://teach.cdn.ireadabc.com/29378cfb869a0fa9c8c9e2915d84ed99.mp3","keyArrData":[{"panelGroup":[],"time":"64"}]},{"gId":"3","data":{"name":"音频","audio":true,"color":"#0beffd"},"nickName":"动画5音频1","audio_url":"http://teach.cdn.ireadabc.com/3b379b908d9745458cb7fd741abf19ad.mp3","keyArrData":[{"panelGroup":[],"time":74}]},{"gId":"1","data":{"name":"图片","pic":true,"fill":true,"commonProp":true,"copy":true,"color":"#ffde00"},"nickName":"课文结束语法汇总","pic_url":"http://teach.cdn.ireadabc.com/9f63cf99ff30d9cd10429c5ae54b4749.png","keyArrData":[{"panelGroup":[],"time":76.962,"x":"-0.154","opacity":"100","zIndex":"3"},{"panelGroup":[],"time":78.937,"x":"","opacity":"255"}]},{"gId":"1","data":{"name":"图片","pic":true,"fill":true,"commonProp":true,"copy":true,"color":"#ffde00"},"nickName":"替代按钮 鸟","keyArrData":[{"panelGroup":[],"time":8.112,"x":"0.34","y":"-0.2","zIndex":"6"},{"panelGroup":[],"time":20.762,"active":"false"},{"panelGroup":[],"time":21.112,"active":""},{"panelGroup":[],"time":49.85,"active":"false"},{"panelGroup":[],"time":50.225,"active":""},{"panelGroup":[],"time":60.85,"active":"false"},{"panelGroup":[],"time":61.137,"active":""},{"panelGroup":[],"time":70.825,"active":"false"},{"panelGroup":[],"time":71.137,"active":""},{"panelGroup":[],"time":78.887,"active":"false"}],"pic_url":"http://teach.cdn.ireadabc.com/f6a204368e71328bdf19560a2fdbf822.png"}]}}
},
preload() {
......@@ -298,11 +298,11 @@ cc.Class({
},
showMask() {
return;
// return;
const mask = getSprNode('lianzi');
mask.anchorY = 0;
mask.y = -this.canvas.height / 2;
const mask = getSprNode('loading');
// mask.anchorY = 0;
// mask.y = -this.canvas.height / 2;
const sx = this.canvas.width / mask.width;
const sy = this.canvas.height / mask.height;
......@@ -314,12 +314,13 @@ cc.Class({
hideMask() {
this.aiClassStart();
return;
// return;
if (this.mask) {
cc.tween(this.mask)
.to(0.7, {y: this.canvas.height / 2})
// .to(0.7, {y: this.canvas.height / 2})
.to(0.5, {opacity: 0}, {easing: 'sineIn'})
.call(() => {
this.aiClassStart();
this.mask.active = false;
......@@ -1030,6 +1031,7 @@ cc.Class({
showItemKeyData(item, keyData) {
console.log('in showItemKeyData');
console.log('gid: ', item?.data?.gId);
switch(item.data.gId.toString()) {
case '0':
......@@ -1100,11 +1102,32 @@ cc.Class({
data *= (item.baseS || 1);
break;
case 'active':
data = JSON.parse(data);
console.log(' active - item key: ', key)
console.log(' active - item data: ', data)
if (data == 'false') {
data = false;
} else {
return;
}
// case 'zIndex':
// data += 10.0001 * item.itemIndex;
}
switch(key) {
case 'x':
case 'y':
case 'anchorX':
case 'anchorY':
case 'scaleX':
case 'scaleY':
case 'opacity':
data = Number(data);
break;
}
item[key] = data;
},
......@@ -1148,15 +1171,19 @@ cc.Class({
if (nextKeyData) {
// 动作变化
for( let key in keyData ) {
if (item[key] != null && nextKeyData[key] && (nextKeyData[key] != keyData[key])) {
if (item[key] != null && nextKeyData[key] != '' && nextKeyData[key] != null && (nextKeyData[key] != keyData[key]) && keyData[key] != '') {
const changeTime = nextKeyData.time - keyData.time;
const changeData = {};
changeData[key] = nextKeyData[key];
const action = this.addMyAction(item, changeTime, changeData);
actionArr.push(action);
}
}
......@@ -1170,10 +1197,12 @@ cc.Class({
showPicKeyData(item, keyData) {
console.log(' in showPicKeyData', keyData);
if (item.curKeyActionArr) {
this.cleanCurKeyActionArr(item);
}
item.active = true;
for( let key in keyData ) {
if (item[key] != null && keyData[key] != null && keyData[key] != '') {
......@@ -1181,6 +1210,7 @@ cc.Class({
}
}
// if (item.opacity > 0) {
// item.active = true;
// } else {
......@@ -1195,21 +1225,29 @@ cc.Class({
if (nextKeyData) {
// 动作变化
for( let key in keyData ) {
if (item[key] != null && nextKeyData[key] && (nextKeyData[key] != keyData[key])) {
if (item[key] != null && nextKeyData[key] != '' && nextKeyData[key] != null && (nextKeyData[key] != keyData[key] && keyData[key] != '')) {
const changeTime = nextKeyData.time - keyData.time;
const changeData = {};
changeData[key] = nextKeyData[key];
const action = this.addMyAction(item, changeTime, changeData);
actionArr.push(action);
}
}
item.curKeyActionArr = actionArr;
}
console.log(' in showPicKeyData end');
},
showAnimaKeyData(item, keyData) {
......@@ -1251,15 +1289,19 @@ cc.Class({
if (nextKeyData) {
// 动作变化
for( let key in keyData ) {
if (item[key] != null && nextKeyData[key] && keyData[key] != null && keyData[key] != '' && (nextKeyData[key] != keyData[key])) {
if (item[key] != null && nextKeyData[key] != '' && nextKeyData[key] != null && keyData[key] != null && keyData[key] != '' && (nextKeyData[key] != keyData[key] )) {
const changeTime = nextKeyData.time - keyData.time;
const changeData = {};
changeData[key] = nextKeyData[key];
const action = this.addMyAction(item, changeTime, changeData);
actionArr.push(action);
}
}
......@@ -1896,6 +1938,10 @@ cc.Class({
addMyAction(item, changeTime, changeData) {
console.log(' in addMyAction item: ', item);
console.log(' in addMyAction changeTime: ', changeTime);
console.log(' in addMyAction changeData: ', changeData);
const frameChangeData = {};
for (let key in changeData) {
......
{
"ver": "2.3.5",
"uuid": "de8d70ca-9d26-4896-8efc-db585b49017b",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 1624,
"height": 1624,
"platformSettings": {},
"subMetas": {
"loading": {
"ver": "1.0.4",
"uuid": "b56b79be-e05f-4506-a23d-62ece7277aef",
"rawTextureUuid": "de8d70ca-9d26-4896-8efc-db585b49017b",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 1624,
"height": 1624,
"rawWidth": 1624,
"rawHeight": 1624,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "1.1.2",
"uuid": "9bc2f257-0cd7-470c-aacd-94abded14d1d",
"isBundle": false,
"bundleName": "",
"priority": 1,
"compressionType": {},
"optimizeHotUpdate": {},
"inlineSpriteFrames": {},
"isRemoteBundle": {},
"subMetas": {}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "2fe00cb4-7e4f-4f0e-992c-62513fec5da3",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 10,
"height": 10,
"platformSettings": {},
"subMetas": {
"black": {
"ver": "1.0.4",
"uuid": "4dfdc5eb-c3be-44bd-8145-5bc8bc2f757c",
"rawTextureUuid": "2fe00cb4-7e4f-4f0e-992c-62513fec5da3",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 10,
"height": 10,
"rawWidth": 10,
"rawHeight": 10,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "edc041e1-365b-4982-90c8-61653e847569",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 10,
"height": 10,
"platformSettings": {},
"subMetas": {
"blue": {
"ver": "1.0.4",
"uuid": "324fdb51-8f39-487a-8631-cf019cc5dfc2",
"rawTextureUuid": "edc041e1-365b-4982-90c8-61653e847569",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 10,
"height": 10,
"rawWidth": 10,
"rawHeight": 10,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "afcf02b5-dab2-4c96-b4d9-a02fb51e6a84",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 10,
"height": 10,
"platformSettings": {},
"subMetas": {
"green": {
"ver": "1.0.4",
"uuid": "1fa7798d-5c9a-4a73-89e6-1a2d3020e699",
"rawTextureUuid": "afcf02b5-dab2-4c96-b4d9-a02fb51e6a84",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 10,
"height": 10,
"rawWidth": 10,
"rawHeight": 10,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "68068527-ca98-446b-a4a6-52afa9d28040",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 10,
"height": 10,
"platformSettings": {},
"subMetas": {
"purple": {
"ver": "1.0.4",
"uuid": "bb48b646-4af7-4ddd-9fbc-4c708caa2ecf",
"rawTextureUuid": "68068527-ca98-446b-a4a6-52afa9d28040",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 10,
"height": 10,
"rawWidth": 10,
"rawHeight": 10,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "ffd3c0f9-a699-4de5-a82b-fe6c5e85e3fe",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 10,
"height": 10,
"platformSettings": {},
"subMetas": {
"red": {
"ver": "1.0.4",
"uuid": "22453446-6564-48c4-9ed4-7c25df08f71c",
"rawTextureUuid": "ffd3c0f9-a699-4de5-a82b-fe6c5e85e3fe",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 10,
"height": 10,
"rawWidth": 10,
"rawHeight": 10,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
{
"ver": "2.3.5",
"uuid": "69d6b246-7e67-4d48-8017-c6094870cf36",
"type": "sprite",
"wrapMode": "clamp",
"filterMode": "bilinear",
"premultiplyAlpha": false,
"genMipmaps": false,
"packable": true,
"width": 10,
"height": 10,
"platformSettings": {},
"subMetas": {
"yellow": {
"ver": "1.0.4",
"uuid": "e32a6279-b68d-4d2a-9172-9a64a7408976",
"rawTextureUuid": "69d6b246-7e67-4d48-8017-c6094870cf36",
"trimType": "auto",
"trimThreshold": 1,
"rotated": false,
"offsetX": 0,
"offsetY": 0,
"trimX": 0,
"trimY": 0,
"width": 10,
"height": 10,
"rawWidth": 10,
"rawHeight": 10,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
"borderRight": 0,
"subMetas": {}
}
}
}
\ No newline at end of file
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