Commit 095ffe42 authored by 李维's avatar 李维

dev commit

parent b3fd9cc8
......@@ -27,17 +27,17 @@
"__id__": 17
},
{
"__id__": 82
"__id__": 88
}
],
"_active": true,
"_components": [
{
"__id__": 92
"__id__": 98
}
],
"_prefab": {
"__id__": 93
"__id__": 99
},
"_opacity": 255,
"_color": {
......@@ -693,12 +693,18 @@
},
{
"__id__": 78
},
{
"__id__": 81
},
{
"__id__": 84
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 81
"__id__": 87
},
"_opacity": 255,
"_color": {
......@@ -2926,8 +2932,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
196.003,
-275.341,
59.104,
-118.396,
0,
0,
0,
......@@ -2983,6 +2989,113 @@
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "b4c5d143-107d-475f-b4ad-5a33353cf432"
},
"fileId": "f1Yb+nzbtIILUk5VP0gQ7U",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "NodePos_1_2",
"_objFlags": 0,
"_parent": {
"__id__": 17
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 82
}
],
"_prefab": {
"__id__": 83
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 53,
"height": 53
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
140.483,
-207.054,
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__": 81
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "d7334742-bf52-402e-9edd-34ec180bf4cb"
},
"_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": {
......@@ -2994,6 +3107,113 @@
"fileId": "c7V/Z6N0dMg7oeIBEPHi/J",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "NodePos_1_3",
"_objFlags": 0,
"_parent": {
"__id__": 17
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 85
}
],
"_prefab": {
"__id__": 86
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 53,
"height": 53
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
186.861,
-256.86,
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__": 84
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "d7334742-bf52-402e-9edd-34ec180bf4cb"
},
"_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__": "b4c5d143-107d-475f-b4ad-5a33353cf432"
},
"fileId": "b6SVzkfcNJPI5Idg4x2/ya",
"sync": false
},
{
"__type__": "cc.PrefabInfo",
"root": {
......@@ -3014,17 +3234,17 @@
},
"_children": [
{
"__id__": 83
"__id__": 89
}
],
"_active": true,
"_components": [
{
"__id__": 90
"__id__": 96
}
],
"_prefab": {
"__id__": 91
"__id__": 97
},
"_opacity": 255,
"_color": {
......@@ -3078,24 +3298,24 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 82
"__id__": 88
},
"_children": [
{
"__id__": 84
"__id__": 90
}
],
"_active": true,
"_components": [
{
"__id__": 87
"__id__": 93
},
{
"__id__": 88
"__id__": 94
}
],
"_prefab": {
"__id__": 89
"__id__": 95
},
"_opacity": 255,
"_color": {
......@@ -3149,17 +3369,17 @@
"_name": "Label",
"_objFlags": 512,
"_parent": {
"__id__": 83
"__id__": 89
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 85
"__id__": 91
}
],
"_prefab": {
"__id__": 86
"__id__": 92
},
"_opacity": 255,
"_color": {
......@@ -3213,7 +3433,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 90
},
"_enabled": true,
"_materials": [
......@@ -3258,7 +3478,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 83
"__id__": 89
},
"_enabled": true,
"_materials": [
......@@ -3290,7 +3510,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 83
"__id__": 89
},
"_enabled": true,
"alignMode": 0,
......@@ -3328,7 +3548,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 82
"__id__": 88
},
"_enabled": true,
"_normalMaterial": null,
......@@ -3401,7 +3621,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
"__id__": 83
"__id__": 89
},
"_id": ""
},
......
......@@ -27,17 +27,17 @@
"__id__": 17
},
{
"__id__": 61
"__id__": 85
}
],
"_active": true,
"_components": [
{
"__id__": 71
"__id__": 95
}
],
"_prefab": {
"__id__": 72
"__id__": 96
},
"_opacity": 255,
"_color": {
......@@ -672,12 +672,36 @@
},
{
"__id__": 57
},
{
"__id__": 60
},
{
"__id__": 63
},
{
"__id__": 66
},
{
"__id__": 69
},
{
"__id__": 72
},
{
"__id__": 75
},
{
"__id__": 78
},
{
"__id__": 81
}
],
"_active": true,
"_components": [],
"_prefab": {
"__id__": 60
"__id__": 84
},
"_opacity": 255,
"_color": {
......@@ -872,8 +896,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
122.48,
145.268,
123.178,
123.618,
0,
0,
0,
......@@ -979,8 +1003,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
60.672,
190.702,
83.718,
171.148,
0,
0,
0,
......@@ -1086,8 +1110,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-18.602,
202.158,
25.395,
203.555,
0,
0,
0,
......@@ -1193,8 +1217,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-89.731,
169.995,
-43.639,
195.835,
0,
0,
0,
......@@ -1300,8 +1324,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-126.567,
104.17,
-99.331,
155.849,
0,
0,
0,
......@@ -1407,8 +1431,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-131.363,
24.397,
-129.966,
99.122,
0,
0,
0,
......@@ -1514,8 +1538,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-88.53,
-42.094,
-131.829,
38.917,
0,
0,
0,
......@@ -1621,8 +1645,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-10.437,
-76.668,
-104.018,
-18.704,
0,
0,
0,
......@@ -1728,8 +1752,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
67.221,
-57.175,
-56.39,
-62.762,
0,
0,
0,
......@@ -1835,8 +1859,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
124.768,
-11.977,
10.934,
-73.433,
0,
0,
0,
......@@ -1942,8 +1966,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
137.978,
67.51,
79.315,
-48.419,
0,
0,
0,
......@@ -2012,7 +2036,7 @@
},
{
"__type__": "cc.Node",
"_name": "NodePos_1_0",
"_name": "NodePos_0_12",
"_objFlags": 0,
"_parent": {
"__id__": 17
......@@ -2049,8 +2073,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
137.791,
216.933,
121.217,
-5.121,
0,
0,
0,
......@@ -2114,12 +2138,12 @@
"asset": {
"__uuid__": "3b58d995-4002-4991-a56c-41c0c9e08714"
},
"fileId": "faysiK3ohI/rxWQRMALdka",
"fileId": "02ckfT93BOQ7pGFpGX1LmT",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "NodePos_1_1",
"_name": "NodePos_0_13",
"_objFlags": 0,
"_parent": {
"__id__": 17
......@@ -2156,8 +2180,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
137.791,
-212.541,
137.279,
47.955,
0,
0,
0,
......@@ -2221,40 +2245,25 @@
"asset": {
"__uuid__": "3b58d995-4002-4991-a56c-41c0c9e08714"
},
"fileId": "1aePQpZk5H4r8RZ1ME9Jlo",
"sync": false
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "3b58d995-4002-4991-a56c-41c0c9e08714"
},
"fileId": "a4wt4S6ttPrKRwgLvFnBFy",
"fileId": "a5TAjkL4BH2KWdgLG2QvdS",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "BtnUpdate",
"_name": "NodePos_1_0",
"_objFlags": 0,
"_parent": {
"__id__": 1
"__id__": 17
},
"_children": [
{
"__id__": 62
}
],
"_children": [],
"_active": true,
"_components": [
{
"__id__": 69
"__id__": 61
}
],
"_prefab": {
"__id__": 70
"__id__": 62
},
"_opacity": 255,
"_color": {
......@@ -2266,8 +2275,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 40
"width": 53,
"height": 53
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -2278,8 +2287,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
392.552,
157.323,
137.791,
216.933,
0,
0,
0,
......@@ -2304,28 +2313,64 @@
"_id": ""
},
{
"__type__": "cc.Node",
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 61
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 60
},
"_children": [
"_enabled": true,
"_materials": [
{
"__id__": 63
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "d7334742-bf52-402e-9edd-34ec180bf4cb"
},
"_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__": "3b58d995-4002-4991-a56c-41c0c9e08714"
},
"fileId": "faysiK3ohI/rxWQRMALdka",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "NodePos_1_1",
"_objFlags": 0,
"_parent": {
"__id__": 17
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 66
},
{
"__id__": 67
"__id__": 64
}
],
"_prefab": {
"__id__": 68
"__id__": 65
},
"_opacity": 255,
"_color": {
......@@ -2337,8 +2382,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 40
"width": 53,
"height": 53
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -2349,8 +2394,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
137.791,
159.667,
0,
0,
0,
......@@ -2374,35 +2419,78 @@
"groupIndex": 0,
"_id": ""
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 63
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "d7334742-bf52-402e-9edd-34ec180bf4cb"
},
"_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__": "3b58d995-4002-4991-a56c-41c0c9e08714"
},
"fileId": "dcxY3fI+1JR4783xMpVFiM",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "Label",
"_objFlags": 512,
"_name": "NodePos_1_2",
"_objFlags": 0,
"_parent": {
"__id__": 62
"__id__": 17
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 64
"__id__": 67
}
],
"_prefab": {
"__id__": 65
"__id__": 68
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 40
"width": 53,
"height": 53
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -2413,8 +2501,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
0,
0,
137.791,
107.289,
0,
0,
0,
......@@ -2439,11 +2527,11 @@
"_id": ""
},
{
"__type__": "cc.Label",
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 63
"__id__": 66
},
"_enabled": true,
"_materials": [
......@@ -2453,23 +2541,21 @@
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": false,
"_string": "button",
"_N$string": "button",
"_fontSize": 20,
"_lineHeight": 40,
"_enableWrapText": false,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 1,
"_N$cacheMode": 1,
"_spriteFrame": {
"__uuid__": "d7334742-bf52-402e-9edd-34ec180bf4cb"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": ""
},
{
......@@ -2480,36 +2566,830 @@
"asset": {
"__uuid__": "3b58d995-4002-4991-a56c-41c0c9e08714"
},
"fileId": "78Bd25ap1AparHYPiOyRXP",
"fileId": "9bXuT0yuxKbZkXrGBb54wf",
"sync": false
},
{
"__type__": "cc.Sprite",
"_name": "",
"__type__": "cc.Node",
"_name": "NodePos_1_3",
"_objFlags": 0,
"node": {
"__id__": 62
"_parent": {
"__id__": 17
},
"_enabled": true,
"_materials": [
"_children": [],
"_active": true,
"_components": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
"__id__": 70
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
},
"_type": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
"_prefab": {
"__id__": 71
},
"_fillStart": 0,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 53,
"height": 53
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
139.843,
19.593,
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__": 69
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "d7334742-bf52-402e-9edd-34ec180bf4cb"
},
"_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__": "3b58d995-4002-4991-a56c-41c0c9e08714"
},
"fileId": "ec/wY6sCRG6ILHjmmV3HO/",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "NodePos_1_4",
"_objFlags": 0,
"_parent": {
"__id__": 17
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 73
}
],
"_prefab": {
"__id__": 74
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 53,
"height": 53
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
139.023,
-37.124,
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__": 72
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "d7334742-bf52-402e-9edd-34ec180bf4cb"
},
"_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__": "3b58d995-4002-4991-a56c-41c0c9e08714"
},
"fileId": "22Lvtglg9K7J7RjXXQdtJo",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "NodePos_1_5",
"_objFlags": 0,
"_parent": {
"__id__": 17
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 76
}
],
"_prefab": {
"__id__": 77
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 53,
"height": 53
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
139.056,
-94.158,
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__": 75
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "d7334742-bf52-402e-9edd-34ec180bf4cb"
},
"_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__": "3b58d995-4002-4991-a56c-41c0c9e08714"
},
"fileId": "41D6qe2qNH+ZBYAycMadlO",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "NodePos_1_6",
"_objFlags": 0,
"_parent": {
"__id__": 17
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 79
}
],
"_prefab": {
"__id__": 80
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 53,
"height": 53
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
138.792,
-153.958,
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__": 78
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "d7334742-bf52-402e-9edd-34ec180bf4cb"
},
"_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__": "3b58d995-4002-4991-a56c-41c0c9e08714"
},
"fileId": "1aePQpZk5H4r8RZ1ME9Jlo",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "NodePos_1_7",
"_objFlags": 0,
"_parent": {
"__id__": 17
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 82
}
],
"_prefab": {
"__id__": 83
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 53,
"height": 53
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
137.791,
-212.541,
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__": 81
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "d7334742-bf52-402e-9edd-34ec180bf4cb"
},
"_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__": "3b58d995-4002-4991-a56c-41c0c9e08714"
},
"fileId": "2cOTjhuQxC555yIuUxF3H5",
"sync": false
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "3b58d995-4002-4991-a56c-41c0c9e08714"
},
"fileId": "a4wt4S6ttPrKRwgLvFnBFy",
"sync": false
},
{
"__type__": "cc.Node",
"_name": "BtnUpdate",
"_objFlags": 0,
"_parent": {
"__id__": 1
},
"_children": [
{
"__id__": 86
}
],
"_active": true,
"_components": [
{
"__id__": 93
}
],
"_prefab": {
"__id__": 94
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 40
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
392.552,
157.323,
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.Node",
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 85
},
"_children": [
{
"__id__": 87
}
],
"_active": true,
"_components": [
{
"__id__": 90
},
{
"__id__": 91
}
],
"_prefab": {
"__id__": 92
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 40
},
"_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.Node",
"_name": "Label",
"_objFlags": 512,
"_parent": {
"__id__": 86
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 88
}
],
"_prefab": {
"__id__": 89
},
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 40
},
"_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.Label",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 87
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_useOriginalSize": false,
"_string": "button",
"_N$string": "button",
"_fontSize": 20,
"_lineHeight": 40,
"_enableWrapText": false,
"_N$file": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_batchAsBitmap": false,
"_styleFlags": 0,
"_underlineHeight": 0,
"_N$horizontalAlign": 1,
"_N$verticalAlign": 1,
"_N$fontFamily": "Arial",
"_N$overflow": 1,
"_N$cacheMode": 1,
"_id": ""
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__uuid__": "3b58d995-4002-4991-a56c-41c0c9e08714"
},
"fileId": "78Bd25ap1AparHYPiOyRXP",
"sync": false
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 86
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "f0048c10-f03e-4c97-b9d3-3506e1d58952"
},
"_type": 1,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
......@@ -2520,7 +3400,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 62
"__id__": 86
},
"_enabled": true,
"alignMode": 0,
......@@ -2558,7 +3438,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 61
"__id__": 85
},
"_enabled": true,
"_normalMaterial": null,
......@@ -2631,7 +3511,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
"__id__": 62
"__id__": 86
},
"_id": ""
},
......
......@@ -279,6 +279,7 @@ cc.Class({
ctor() {
this._imageResList = [];
this._audioResList = [];
this._lastDrawPos = -1;
},
start() {
......@@ -543,7 +544,6 @@ cc.Class({
letterNodeBase.zIndex = -1
const btnUpdate = letterNodeBase.getChildByName('BtnUpdate');
btnUpdate.on('click', () => {
this.fireworks()
this.drawCompleteLine(this._status.currentStrokeIdx);
this._status.currentStrokeIdx++;
if (this._status.currentStrokeIdx >= 4) {
......@@ -1037,14 +1037,43 @@ cc.Class({
.start();
}
},
drawCompleteLine(strokeIdx, ) {
const drawGraphyNode = cc.find('Canvas/letterNodeBase/DrawMaskNode/DrawGraphyNodeBase');
this.drawLines(drawGraphyNode, this.getPosListByStrokeIdx(strokeIdx));
},
drawCompleteLine_new(strokeIdx, location) {
const drawGraphyNode = cc.find('Canvas/letterNodeBase/DrawMaskNode/DrawGraphyNodeBase');
const pos = this.getPosListByStrokeIdx(strokeIdx)
const index = this.checkNearPosIndex(pos, location)
if(index>=1) {
this.drawLines(drawGraphyNode, pos.slice(0, index));
}
},
checkNearPosIndex(posList, location) {
let minIndex = -1
let minDis = 10000
posList.forEach((p, index)=>{
let p1 = cc.v2(p.x, p.y)
let p2 = cc.v2(location.x, location.y)
let dis = p1.sub(p2).mag()
if(dis<minDis) {
minDis = dis
minIndex = index
}
})
if((this._lastDrawPos+3) >= minIndex) {
this._lastDrawPos = minIndex;
}
return this._lastDrawPos;
},
drawLines(drawNode, posList) {
const graph = drawNode.getComponent(cc.Graphics);
graph.strokeColor = "#ffd02f"
posList.forEach((pos, idx) => {
if (idx == 0) {
graph.moveTo(pos.x, pos.y);
......@@ -1060,6 +1089,7 @@ cc.Class({
const graph = drawGraphyNode.getComponent(cc.Graphics);
const location = event.getLocation();
const pos = drawGraphyNode.convertToNodeSpaceAR(location);
this._lastDrawPos = -1;
graph.moveTo(pos.x, pos.y);
},
......@@ -1072,18 +1102,21 @@ cc.Class({
return;
}
this._moveCount = 0
const drawGraphyNode = cc.find('Canvas/letterNodeBase/DrawMaskNode/DrawGraphyNodeCurrent')
const graph = drawGraphyNode.getComponent(cc.Graphics);
// const graph = drawGraphyNode.getComponent(cc.Graphics);
const location = event.getLocation();
const pos = drawGraphyNode.convertToNodeSpaceAR(location);
graph.lineTo(pos.x, pos.y);
graph.stroke();
this.drawCompleteLine_new(this._status.currentStrokeIdx, pos)
// graph.lineTo(pos.x, pos.y);
// graph.stroke();
},
onDrawEnd(event) {
const drawGraphyNode = cc.find('Canvas/letterNodeBase/DrawMaskNode/DrawGraphyNodeCurrent')
const graph = drawGraphyNode.getComponent(cc.Graphics);
graph.clear();
console.log("Clear")
},
addDrawListeners() {
......
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