Commit 3f4fa24e authored by Lwd's avatar Lwd

commit

parent 844169bc
...@@ -17,10 +17,10 @@ ...@@ -17,10 +17,10 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 54 "__id__": 55
}, },
{ {
"__id__": 80 "__id__": 81
} }
], ],
"_active": false, "_active": false,
...@@ -92,9 +92,6 @@ ...@@ -92,9 +92,6 @@
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 49
},
{ {
"__id__": 50 "__id__": 50
}, },
...@@ -106,6 +103,9 @@ ...@@ -106,6 +103,9 @@
}, },
{ {
"__id__": 53 "__id__": 53
},
{
"__id__": 54
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -119,8 +119,8 @@ ...@@ -119,8 +119,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 2176, "width": 1280,
"height": 1600 "height": 720
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -131,8 +131,8 @@ ...@@ -131,8 +131,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
1088, 640,
800, 360,
0, 0,
0, 0,
0, 0,
...@@ -184,8 +184,8 @@ ...@@ -184,8 +184,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 2176, "width": 1280,
"height": 1600 "height": 720
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -309,8 +309,8 @@ ...@@ -309,8 +309,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 2176, "width": 1280,
"height": 1600 "height": 720
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -421,8 +421,8 @@ ...@@ -421,8 +421,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 2176, "width": 1280,
"height": 1600 "height": 720
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -486,8 +486,8 @@ ...@@ -486,8 +486,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 2176, "width": 1280,
"height": 950 "height": 465
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -499,7 +499,7 @@ ...@@ -499,7 +499,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
-325, -127.5,
0, 0,
0, 0,
0, 0,
...@@ -623,7 +623,7 @@ ...@@ -623,7 +623,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
0, 154.93200000000002,
0, 0,
0, 0,
0, 0,
...@@ -697,7 +697,7 @@ ...@@ -697,7 +697,7 @@
"_left": 0, "_left": 0,
"_right": 0, "_right": 0,
"_top": 0, "_top": 0,
"_bottom": 412.67, "_bottom": 127.60200000000003,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
...@@ -738,7 +738,7 @@ ...@@ -738,7 +738,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1765, "width": 160,
"height": 150 "height": 150
}, },
"_anchorPoint": { "_anchorPoint": {
...@@ -751,7 +751,7 @@ ...@@ -751,7 +751,7 @@
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 0,
513.927, 215,
0, 0,
0, 0,
0, 0,
...@@ -785,7 +785,7 @@ ...@@ -785,7 +785,7 @@
"_enabled": true, "_enabled": true,
"_layoutSize": { "_layoutSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 1765, "width": 160,
"height": 150 "height": 150
}, },
"_resize": 1, "_resize": 1,
...@@ -818,9 +818,9 @@ ...@@ -818,9 +818,9 @@
"alignMode": 1, "alignMode": 1,
"_target": null, "_target": null,
"_alignFlags": 41, "_alignFlags": 41,
"_left": 205.5, "_left": 560,
"_right": 205.5, "_right": 560,
"_top": 211.07299999999998, "_top": 70,
"_bottom": 0, "_bottom": 0,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
...@@ -963,8 +963,8 @@ ...@@ -963,8 +963,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 2176, "width": 1280,
"height": 1600 "height": 720
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1028,8 +1028,8 @@ ...@@ -1028,8 +1028,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 2176, "width": 1280,
"height": 1600 "height": 720
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1470,15 +1470,15 @@ ...@@ -1470,15 +1470,15 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
5.684341886080802e-14, -68.783,
2.842170943040401e-14, 125.06799999999998,
0, 0,
0, 0,
0, 0,
0, 0,
1, 1,
1, 0.6,
1, 0.6,
1 1
] ]
}, },
...@@ -1691,9 +1691,9 @@ ...@@ -1691,9 +1691,9 @@
"_target": null, "_target": null,
"_alignFlags": 36, "_alignFlags": 36,
"_left": 0, "_left": 0,
"_right": 906.6949999999999, "_right": 600,
"_top": 0, "_top": 0,
"_bottom": 558.22, "_bottom": 340,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,
...@@ -1734,8 +1734,8 @@ ...@@ -1734,8 +1734,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 2176, "width": 1280,
"height": 1600 "height": 720
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1937,8 +1937,8 @@ ...@@ -1937,8 +1937,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 269, "width": 160,
"height": 280 "height": 168
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -1992,7 +1992,7 @@ ...@@ -1992,7 +1992,7 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 48 "__id__": 49
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2006,8 +2006,8 @@ ...@@ -2006,8 +2006,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 269, "width": 160,
"height": 280 "height": 168
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2068,8 +2068,8 @@ ...@@ -2068,8 +2068,8 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 269, "width": 160,
"height": 280 "height": 168
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2147,21 +2147,24 @@ ...@@ -2147,21 +2147,24 @@
"_components": [ "_components": [
{ {
"__id__": 47 "__id__": 47
},
{
"__id__": 48
} }
], ],
"_prefab": null, "_prefab": null,
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 255, "r": 16,
"g": 255, "g": 130,
"b": 255, "b": 55,
"a": 255 "a": 255
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 0, "width": 12,
"height": 194.04 "height": 138
}, },
"_anchorPoint": { "_anchorPoint": {
"__type__": "cc.Vec2", "__type__": "cc.Vec2",
...@@ -2214,8 +2217,8 @@ ...@@ -2214,8 +2217,8 @@
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_string": "", "_string": "",
"_N$string": "", "_N$string": "",
"_fontSize": 150, "_fontSize": 96,
"_lineHeight": 154, "_lineHeight": 100,
"_enableWrapText": true, "_enableWrapText": true,
"_N$file": { "_N$file": {
"__uuid__": "e012dbb9-b2af-4912-928a-4c116ab481a2" "__uuid__": "e012dbb9-b2af-4912-928a-4c116ab481a2"
...@@ -2232,6 +2235,24 @@ ...@@ -2232,6 +2235,24 @@
"_N$cacheMode": 0, "_N$cacheMode": 0,
"_id": "20+AOKsEpDILUmZhByKjOv" "_id": "20+AOKsEpDILUmZhByKjOv"
}, },
{
"__type__": "cc.LabelOutline",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 46
},
"_enabled": true,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_width": 6,
"_id": "b1pyIp0vBLB4zIBXRBEiMT"
},
{ {
"__type__": "e729bOHnRpHpJ09B2/R3cNg", "__type__": "e729bOHnRpHpJ09B2/R3cNg",
"_name": "", "_name": "",
...@@ -2258,8 +2279,8 @@ ...@@ -2258,8 +2279,8 @@
"_enabled": true, "_enabled": true,
"_designResolution": { "_designResolution": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 2176, "width": 1280,
"height": 1600 "height": 720
}, },
"_fitWidth": true, "_fitWidth": true,
"_fitHeight": true, "_fitHeight": true,
...@@ -2345,7 +2366,7 @@ ...@@ -2345,7 +2366,7 @@
} }
], ],
"canvasView": { "canvasView": {
"__id__": 49 "__id__": 50
}, },
"isCanvas": true, "isCanvas": true,
"_id": "5eOVDDzARGnoMLcNXyk5ml" "_id": "5eOVDDzARGnoMLcNXyk5ml"
...@@ -2369,19 +2390,19 @@ ...@@ -2369,19 +2390,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 55 "__id__": 56
}, },
{ {
"__id__": 60 "__id__": 61
}, },
{ {
"__id__": 65 "__id__": 66
}, },
{ {
"__id__": 70 "__id__": 71
}, },
{ {
"__id__": 75 "__id__": 76
} }
], ],
"_active": true, "_active": true,
...@@ -2439,11 +2460,11 @@ ...@@ -2439,11 +2460,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 54 "__id__": 55
}, },
"_children": [ "_children": [
{ {
"__id__": 56 "__id__": 57
} }
], ],
"_active": true, "_active": true,
...@@ -2501,17 +2522,17 @@ ...@@ -2501,17 +2522,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 55 "__id__": 56
}, },
"_children": [ "_children": [
{ {
"__id__": 57 "__id__": 58
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 59 "__id__": 60
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2567,13 +2588,13 @@ ...@@ -2567,13 +2588,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 56 "__id__": 57
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 58 "__id__": 59
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2629,7 +2650,7 @@ ...@@ -2629,7 +2650,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 57 "__id__": 58
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2659,7 +2680,7 @@ ...@@ -2659,7 +2680,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 56 "__id__": 57
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2681,11 +2702,11 @@ ...@@ -2681,11 +2702,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 54 "__id__": 55
}, },
"_children": [ "_children": [
{ {
"__id__": 61 "__id__": 62
} }
], ],
"_active": true, "_active": true,
...@@ -2743,17 +2764,17 @@ ...@@ -2743,17 +2764,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 60 "__id__": 61
}, },
"_children": [ "_children": [
{ {
"__id__": 62 "__id__": 63
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 64 "__id__": 65
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2809,13 +2830,13 @@ ...@@ -2809,13 +2830,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 61 "__id__": 62
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 63 "__id__": 64
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -2871,7 +2892,7 @@ ...@@ -2871,7 +2892,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 62 "__id__": 63
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2901,7 +2922,7 @@ ...@@ -2901,7 +2922,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 61 "__id__": 62
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -2923,11 +2944,11 @@ ...@@ -2923,11 +2944,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 54 "__id__": 55
}, },
"_children": [ "_children": [
{ {
"__id__": 66 "__id__": 67
} }
], ],
"_active": true, "_active": true,
...@@ -2985,17 +3006,17 @@ ...@@ -2985,17 +3006,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 65 "__id__": 66
}, },
"_children": [ "_children": [
{ {
"__id__": 67 "__id__": 68
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 69 "__id__": 70
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3051,13 +3072,13 @@ ...@@ -3051,13 +3072,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 66 "__id__": 67
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 68 "__id__": 69
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3113,7 +3134,7 @@ ...@@ -3113,7 +3134,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 67 "__id__": 68
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3143,7 +3164,7 @@ ...@@ -3143,7 +3164,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 66 "__id__": 67
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3165,11 +3186,11 @@ ...@@ -3165,11 +3186,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 54 "__id__": 55
}, },
"_children": [ "_children": [
{ {
"__id__": 71 "__id__": 72
} }
], ],
"_active": true, "_active": true,
...@@ -3227,17 +3248,17 @@ ...@@ -3227,17 +3248,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 70 "__id__": 71
}, },
"_children": [ "_children": [
{ {
"__id__": 72 "__id__": 73
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 74 "__id__": 75
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3293,13 +3314,13 @@ ...@@ -3293,13 +3314,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 71 "__id__": 72
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 73 "__id__": 74
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3355,7 +3376,7 @@ ...@@ -3355,7 +3376,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 72 "__id__": 73
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3385,7 +3406,7 @@ ...@@ -3385,7 +3406,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 71 "__id__": 72
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3407,11 +3428,11 @@ ...@@ -3407,11 +3428,11 @@
"_name": "quadBase", "_name": "quadBase",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 54 "__id__": 55
}, },
"_children": [ "_children": [
{ {
"__id__": 76 "__id__": 77
} }
], ],
"_active": true, "_active": true,
...@@ -3469,17 +3490,17 @@ ...@@ -3469,17 +3490,17 @@
"_name": "quad", "_name": "quad",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 75 "__id__": 76
}, },
"_children": [ "_children": [
{ {
"__id__": 77 "__id__": 78
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 79 "__id__": 80
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3535,13 +3556,13 @@ ...@@ -3535,13 +3556,13 @@
"_name": "paper", "_name": "paper",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 76 "__id__": 77
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 78 "__id__": 79
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3597,7 +3618,7 @@ ...@@ -3597,7 +3618,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 77 "__id__": 78
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3627,7 +3648,7 @@ ...@@ -3627,7 +3648,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 76 "__id__": 77
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3653,19 +3674,19 @@ ...@@ -3653,19 +3674,19 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 81 "__id__": 82
}, },
{ {
"__id__": 83 "__id__": 84
}, },
{ {
"__id__": 85 "__id__": 86
}, },
{ {
"__id__": 87 "__id__": 88
}, },
{ {
"__id__": 89 "__id__": 90
} }
], ],
"_active": true, "_active": true,
...@@ -3723,13 +3744,13 @@ ...@@ -3723,13 +3744,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 80 "__id__": 81
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 82 "__id__": 83
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3785,7 +3806,7 @@ ...@@ -3785,7 +3806,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 81 "__id__": 82
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3815,13 +3836,13 @@ ...@@ -3815,13 +3836,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 80 "__id__": 81
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 84 "__id__": 85
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3877,7 +3898,7 @@ ...@@ -3877,7 +3898,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 83 "__id__": 84
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3907,13 +3928,13 @@ ...@@ -3907,13 +3928,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 80 "__id__": 81
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 86 "__id__": 87
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -3969,7 +3990,7 @@ ...@@ -3969,7 +3990,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 85 "__id__": 86
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -3999,13 +4020,13 @@ ...@@ -3999,13 +4020,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 80 "__id__": 81
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 88 "__id__": 89
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4061,7 +4082,7 @@ ...@@ -4061,7 +4082,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 87 "__id__": 88
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
...@@ -4091,13 +4112,13 @@ ...@@ -4091,13 +4112,13 @@
"_name": "bg_sahua", "_name": "bg_sahua",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 80 "__id__": 81
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 90 "__id__": 91
} }
], ],
"_prefab": null, "_prefab": null,
...@@ -4153,7 +4174,7 @@ ...@@ -4153,7 +4174,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 89 "__id__": 90
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
......
...@@ -95,8 +95,8 @@ var game = cc.Class({ ...@@ -95,8 +95,8 @@ var game = cc.Class({
// 求出 ScrollView 可视区域在世界坐标系中的矩形(碰撞盒) // 求出 ScrollView 可视区域在世界坐标系中的矩形(碰撞盒)
let svBBoxRect = cc.rect( let svBBoxRect = cc.rect(
svLeftBottomPoint.x - 300, svLeftBottomPoint.x,
svLeftBottomPoint.y - 500, svLeftBottomPoint.y,
node.width, node.width,
node.height node.height
); );
...@@ -215,7 +215,7 @@ var game = cc.Class({ ...@@ -215,7 +215,7 @@ var game = cc.Class({
//播放猫动画 //播放猫动画
playLionDragon(name) { playLionDragon(name) {
this.dragonLion.armatureName = "armatureName"; this.dragonLion.armatureName = "Armature";
this.dragonLion.playAnimation(name); this.dragonLion.playAnimation(name);
}, },
...@@ -296,7 +296,7 @@ var game = cc.Class({ ...@@ -296,7 +296,7 @@ var game = cc.Class({
//传入当前点击的节点坐标,移动至中心点 //传入当前点击的节点坐标,移动至中心点
var beginPos = cc.v2(node.x, node.y + this.contentArr.y); var beginPos = cc.v2(node.x, node.y + this.contentArr.y);
//50偏移量到嘴巴 //50偏移量到嘴巴
var EndPos = cc.v2(this.dragonLion.node.x, this.dragonLion.node.y - 300); var EndPos = cc.v2(this.dragonLion.node.x, this.dragonLion.node.y);
this.handTween && this.handTween.stop(); this.handTween && this.handTween.stop();
this.handTween = cc.tween(this.handTip) this.handTween = cc.tween(this.handTip)
.call(() => { .call(() => {
......
const WIDTH = 2176; const WIDTH = 1280;
const HEIGTH = 1600; const HEIGTH = 720;
/** /**
* 适配 * 适配
......
...@@ -40,7 +40,7 @@ cc.Class({ ...@@ -40,7 +40,7 @@ cc.Class({
LWD_3.game.inst.handTween && LWD_3.game.inst.handTween.stop() && (LWD_3.game.inst.handTip.active = false); LWD_3.game.inst.handTween && LWD_3.game.inst.handTween.stop() && (LWD_3.game.inst.handTip.active = false);
//狮子猫动画 //狮子猫动画
LWD_3.game.inst.playLionDragon("openmouth"); LWD_3.game.inst.playLionDragon("waiting");
LWD_3.res_mgr.playAudioByUrl(this.itemInfo.audio_url, (url) => { LWD_3.res_mgr.playAudioByUrl(this.itemInfo.audio_url, (url) => {
LWD_3.snd_mgr.playEffect(url, null); LWD_3.snd_mgr.playEffect(url, null);
...@@ -110,8 +110,8 @@ cc.Class({ ...@@ -110,8 +110,8 @@ cc.Class({
// 获取 ScrollView Node 的左下角坐标在世界坐标系中的坐标 // 获取 ScrollView Node 的左下角坐标在世界坐标系中的坐标
let svLeftBottomPoint = this.node.parent.convertToWorldSpaceAR( let svLeftBottomPoint = this.node.parent.convertToWorldSpaceAR(
cc.v2( cc.v2(
this.node.x - this.node.anchorX * this.node.width, this.node.x,
this.node.y - this.node.anchorY * this.node.height this.node.y
) )
); );
...@@ -143,7 +143,7 @@ cc.Class({ ...@@ -143,7 +143,7 @@ cc.Class({
LWD_3.data_mgr.nowNum -= 1; LWD_3.data_mgr.nowNum -= 1;
//狮子猫动画 //狮子猫动画
LWD_3.game.inst.playLionDragon("chew"); LWD_3.game.inst.playLionDragon("right");
//先播放错误声音 //先播放错误声音
LWD_3.speaker.inst.playEffect(LWD_3.enum.E_Audio.Right); LWD_3.speaker.inst.playEffect(LWD_3.enum.E_Audio.Right);
...@@ -187,7 +187,7 @@ cc.Class({ ...@@ -187,7 +187,7 @@ cc.Class({
errorEffect: function () { errorEffect: function () {
//狮子猫动画 //狮子猫动画
LWD_3.game.inst.playCatDragon("wrong"); LWD_3.game.inst.playCatDragon("wrong");
LWD_3.game.inst.playLionDragon("no"); LWD_3.game.inst.playLionDragon("wrong");
//先播放错误声音 //先播放错误声音
LWD_3.speaker.inst.playEffect(LWD_3.enum.E_Audio.Error); LWD_3.speaker.inst.playEffect(LWD_3.enum.E_Audio.Error);
...@@ -279,7 +279,7 @@ cc.Class({ ...@@ -279,7 +279,7 @@ cc.Class({
//图片适配 //图片适配
photoScare: function (node, type) { photoScare: function (node, type) {
var maxNum = type == 0 ? 50 : 280; var maxNum = type == 0 ? 50 : 200;
let maxSize = Math.min(maxNum / node.height, maxNum / node.width); let maxSize = Math.min(maxNum / node.height, maxNum / node.width);
if (node.perScale == undefined) { if (node.perScale == undefined) {
node.perScale = node.scaleX; node.perScale = node.scaleX;
......
...@@ -36,12 +36,12 @@ LWD_3.data_mgr = { ...@@ -36,12 +36,12 @@ LWD_3.data_mgr = {
{ "pic_url": "http://staging-teach.cdn.ireadabc.com/3134325b66d1b8ecf2f83db853195da5.png", "audio_url": "http://staging-teach.cdn.ireadabc.com/e3921a16a8313df274d8bc4e3f2bedd8.mp3", "is_right": true, "text": "a" }, { "pic_url": "http://staging-teach.cdn.ireadabc.com/3134325b66d1b8ecf2f83db853195da5.png", "audio_url": "http://staging-teach.cdn.ireadabc.com/e3921a16a8313df274d8bc4e3f2bedd8.mp3", "is_right": true, "text": "a" },
{ "pic_url": "http://staging-teach.cdn.ireadabc.com/3134325b66d1b8ecf2f83db853195da5.png", "audio_url": "http://staging-teach.cdn.ireadabc.com/58eec304909298176bde6c408c9dac1b.mp3", "is_right": false, "text": "b" }] { "pic_url": "http://staging-teach.cdn.ireadabc.com/3134325b66d1b8ecf2f83db853195da5.png", "audio_url": "http://staging-teach.cdn.ireadabc.com/58eec304909298176bde6c408c9dac1b.mp3", "is_right": false, "text": "b" }]
}], }],
"ske_json": "http://staging-teach.cdn.ireadabc.com/7355648029551e6848a2cf36ea8a6ba6.json", "ske_json": "http://staging-teach.cdn.ireadabc.com/343192141e9dfca91571a7208c68d365.json",
"ske_json_name": "lion_ske.json", "ske_json_name": "queen_ske.json",
"tex_json": "http://staging-teach.cdn.ireadabc.com/511fe163f2df10925e3da82f0f69590b.json", "tex_json": "http://staging-teach.cdn.ireadabc.com/e53670138a8dc28727528948bffe0854.json",
"tex_json_name": "lion_tex.json", "tex_json_name": "queen_tex.json",
"tex_png": "http://staging-teach.cdn.ireadabc.com/2fd2a53fcb36d36281a6ded9500dd54f.png", "tex_png": "http://staging-teach.cdn.ireadabc.com/9bde7212f4aa705a52e73a23d2902023.png",
"tex_png_name": "lion_tex.png", "tex_png_name": "queen_tex.png",
"guideBegin_audio_url": "http://staging-teach.cdn.ireadabc.com/bd6e2b3a870ef3f9ee9ad9c0fda79228.mp3", "guideBegin_audio_url": "http://staging-teach.cdn.ireadabc.com/bd6e2b3a870ef3f9ee9ad9c0fda79228.mp3",
"guideEnd_audio_url": "http://staging-teach.cdn.ireadabc.com/bd6e2b3a870ef3f9ee9ad9c0fda79228.mp3", "guideEnd_audio_url": "http://staging-teach.cdn.ireadabc.com/bd6e2b3a870ef3f9ee9ad9c0fda79228.mp3",
"guideRestart_audio_url": "http://staging-teach.cdn.ireadabc.com/bd6e2b3a870ef3f9ee9ad9c0fda79228.mp3", "guideRestart_audio_url": "http://staging-teach.cdn.ireadabc.com/bd6e2b3a870ef3f9ee9ad9c0fda79228.mp3",
......
assets/LWD_3/textures/bg_back.png

152 KB | W: | H:

assets/LWD_3/textures/bg_back.png

141 KB | W: | H:

assets/LWD_3/textures/bg_back.png
assets/LWD_3/textures/bg_back.png
assets/LWD_3/textures/bg_back.png
assets/LWD_3/textures/bg_back.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 2176, "width": 1280,
"height": 1600, "height": 720,
"rawWidth": 2176, "rawWidth": 1280,
"rawHeight": 1600, "rawHeight": 720,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
assets/LWD_3/textures/bg_grass.png

1.32 MB | W: | H:

assets/LWD_3/textures/bg_grass.png

613 KB | W: | H:

assets/LWD_3/textures/bg_grass.png
assets/LWD_3/textures/bg_grass.png
assets/LWD_3/textures/bg_grass.png
assets/LWD_3/textures/bg_grass.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 0,
"trimY": 0, "trimY": 0,
"width": 2176, "width": 1280,
"height": 950, "height": 465,
"rawWidth": 2176, "rawWidth": 1280,
"rawHeight": 950, "rawHeight": 465,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 88, "width": 142,
"height": 185, "height": 160,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"icon_hand": { "icon_hand": {
......
...@@ -19,8 +19,8 @@ ...@@ -19,8 +19,8 @@
"3D Particle" "3D Particle"
], ],
"preview-port": 7456, "preview-port": 7456,
"design-resolution-width": 2176, "design-resolution-width": 1280,
"design-resolution-height": 1600, "design-resolution-height": 720,
"fit-width": false, "fit-width": false,
"fit-height": true, "fit-height": true,
"use-project-simulator-setting": false, "use-project-simulator-setting": false,
......
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