Commit c3b52237 authored by WangFan's avatar WangFan

修复部分问题

parent f015f5ad
...@@ -24,11 +24,11 @@ ...@@ -24,11 +24,11 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 30 "__id__": 33
} }
], ],
"_prefab": { "_prefab": {
"__id__": 31 "__id__": 34
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -102,12 +102,15 @@ ...@@ -102,12 +102,15 @@
}, },
{ {
"__id__": 17 "__id__": 17
},
{
"__id__": 20
} }
], ],
"_active": false, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 29 "__id__": 32
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -258,7 +261,7 @@ ...@@ -258,7 +261,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__id__": 0 "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
}, },
"fileId": "1cfNdHF9FH3KbwZyC/Rw6p", "fileId": "1cfNdHF9FH3KbwZyC/Rw6p",
"sync": false "sync": false
...@@ -329,7 +332,7 @@ ...@@ -329,7 +332,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__id__": 0 "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
}, },
"fileId": "05udCU1VdI/agyYkkywj7D", "fileId": "05udCU1VdI/agyYkkywj7D",
"sync": false "sync": false
...@@ -436,14 +439,14 @@ ...@@ -436,14 +439,14 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__id__": 0 "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
}, },
"fileId": "64JkLZPOJB45Eawytu4dgS", "fileId": "64JkLZPOJB45Eawytu4dgS",
"sync": false "sync": false
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "finish_cat", "_name": "bg_light",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 2 "__id__": 2
...@@ -466,6 +469,113 @@ ...@@ -466,6 +469,113 @@
"b": 255, "b": 255,
"a": 255 "a": 255
}, },
"_contentSize": {
"__type__": "cc.Size",
"width": 1104,
"height": 1109
},
"_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": ""
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 11
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "25fb3f92-bcc7-4131-9799-223ffe697b15"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
},
"fileId": "06ZiT3YYpCj6mdNSxdYMvD",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "finish_cat",
"_objFlags": 0,
"_parent": {
"__id__": 2
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 15
}
],
"_prefab": {
"__id__": 16
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 512, "width": 512,
...@@ -510,7 +620,7 @@ ...@@ -510,7 +620,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 11 "__id__": 14
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -551,7 +661,7 @@ ...@@ -551,7 +661,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__id__": 0 "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
}, },
"fileId": "15OJA0Q/JIlJbDN8f4ukZN", "fileId": "15OJA0Q/JIlJbDN8f4ukZN",
"sync": false "sync": false
...@@ -567,11 +677,11 @@ ...@@ -567,11 +677,11 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 15 "__id__": 18
} }
], ],
"_prefab": { "_prefab": {
"__id__": 16 "__id__": 19
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -625,7 +735,7 @@ ...@@ -625,7 +735,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 14 "__id__": 17
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -658,7 +768,7 @@ ...@@ -658,7 +768,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__id__": 0 "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
}, },
"fileId": "e68b5eJphElLrpxtQEdyxG", "fileId": "e68b5eJphElLrpxtQEdyxG",
"sync": false "sync": false
...@@ -671,24 +781,24 @@ ...@@ -671,24 +781,24 @@
"__id__": 2 "__id__": 2
}, },
"_children": [ "_children": [
{
"__id__": 18
},
{ {
"__id__": 21 "__id__": 21
}, },
{ {
"__id__": 24 "__id__": 24
},
{
"__id__": 27
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 27 "__id__": 30
} }
], ],
"_prefab": { "_prefab": {
"__id__": 28 "__id__": 31
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -742,17 +852,17 @@ ...@@ -742,17 +852,17 @@
"_name": "result_text", "_name": "result_text",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 17 "__id__": 20
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 19 "__id__": 22
} }
], ],
"_prefab": { "_prefab": {
"__id__": 20 "__id__": 23
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -806,7 +916,7 @@ ...@@ -806,7 +916,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 18 "__id__": 21
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -842,7 +952,7 @@ ...@@ -842,7 +952,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__id__": 0 "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
}, },
"fileId": "eaTaVhDcBEkqwz8ACtP7x3", "fileId": "eaTaVhDcBEkqwz8ACtP7x3",
"sync": false "sync": false
...@@ -852,17 +962,17 @@ ...@@ -852,17 +962,17 @@
"_name": "coin", "_name": "coin",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 17 "__id__": 20
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 22 "__id__": 25
} }
], ],
"_prefab": { "_prefab": {
"__id__": 23 "__id__": 26
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -916,7 +1026,7 @@ ...@@ -916,7 +1026,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 21 "__id__": 24
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -949,7 +1059,7 @@ ...@@ -949,7 +1059,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__id__": 0 "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
}, },
"fileId": "13IYbTThlC5rDXn6k7swYV", "fileId": "13IYbTThlC5rDXn6k7swYV",
"sync": false "sync": false
...@@ -959,17 +1069,17 @@ ...@@ -959,17 +1069,17 @@
"_name": "coin_num", "_name": "coin_num",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 17 "__id__": 20
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 25 "__id__": 28
} }
], ],
"_prefab": { "_prefab": {
"__id__": 26 "__id__": 29
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
...@@ -1023,7 +1133,7 @@ ...@@ -1023,7 +1133,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 24 "__id__": 27
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1057,7 +1167,7 @@ ...@@ -1057,7 +1167,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__id__": 0 "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
}, },
"fileId": "52Z0lpksxE1JprOrhHgdow", "fileId": "52Z0lpksxE1JprOrhHgdow",
"sync": false "sync": false
...@@ -1067,7 +1177,7 @@ ...@@ -1067,7 +1177,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 17 "__id__": 20
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -1100,7 +1210,7 @@ ...@@ -1100,7 +1210,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__id__": 0 "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
}, },
"fileId": "911Shrt8NB/ZWFA9u7l/SL", "fileId": "911Shrt8NB/ZWFA9u7l/SL",
"sync": false "sync": false
...@@ -1111,7 +1221,7 @@ ...@@ -1111,7 +1221,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__id__": 0 "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
}, },
"fileId": "7cG7U7lH9Ie5/sK83LZUCP", "fileId": "7cG7U7lH9Ie5/sK83LZUCP",
"sync": false "sync": false
...@@ -1132,7 +1242,7 @@ ...@@ -1132,7 +1242,7 @@
"__id__": 1 "__id__": 1
}, },
"asset": { "asset": {
"__id__": 0 "__uuid__": "8944c192-3675-466f-9f94-8f824c68e822"
}, },
"fileId": "", "fileId": "",
"sync": false "sync": false
......
...@@ -31,6 +31,8 @@ export default class LayerEnding extends cc.Component { ...@@ -31,6 +31,8 @@ export default class LayerEnding extends cc.Component {
let finish_cat = pg.view.find(this.layer_center, "finish_cat") let finish_cat = pg.view.find(this.layer_center, "finish_cat")
pg.view.playDBAnimation(finish_cat, "finish", 1); pg.view.playDBAnimation(finish_cat, "finish", 1);
let bg_light = pg.view.find(this.layer_center, "bg_light")
cc.tween(bg_light).by(2, { angle: 360 }).repeatForever().start();
pg.view.visible(this.layer_center, true) pg.view.visible(this.layer_center, true)
} }
......
This diff is collapsed.
export const defaultData = export const defaultData =
{ {
"recordFlag": false, "title": "", "questionText": "", "questionTextAudio": "", "questions": [ "recordFlag": false, "title": "", "questionText": "", "questionTextAudio": "", "questions": [
{ "text": "this is info", "time": 2 }, { "text": "apple", "time": 2 },
{ "text": "test some thing.", "time": 2 }], "bgAudio": "", "bgAudioName": "", "audioName": "" { "text": "While there is life there is hope", "time": 2 }], "bgAudio": "", "bgAudioName": "", "audioName": ""
} }
// { // {
// "recordFlag": true, // "recordFlag": true,
......
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