Commit c68428e2 authored by 李维's avatar 李维

Bug fix

parent 2c0d217e
......@@ -754,7 +754,7 @@
"ctor": "Float64Array",
"array": [
107.723,
232.27,
239.27,
0,
0,
0,
......@@ -860,8 +860,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
109.101,
159.236,
110.101,
163.236,
0,
0,
0,
......@@ -967,8 +967,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
113.235,
77.935,
111.235,
87.935,
0,
0,
0,
......@@ -1181,7 +1181,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
111.857,
112.857,
-61.242,
0,
0,
......@@ -1288,8 +1288,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
107.723,
-142.543,
105.723,
-141.543,
0,
0,
0,
......@@ -1395,8 +1395,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
72.582,
-208.947,
69.582,
-206.947,
0,
0,
0,
......@@ -1503,7 +1503,7 @@
"ctor": "Float64Array",
"array": [
-4.877,
-232.779,
-229.779,
0,
0,
0,
......@@ -1609,8 +1609,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-73.171,
-202.681,
-75.171,
-201.681,
0,
0,
0,
......@@ -1716,7 +1716,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-112.943,
-113.943,
-140.639,
0,
0,
......
......@@ -269,7 +269,7 @@
},
{
"__type__": "cc.Node",
"_name": "DrawGraphyNodeBase",
"_name": "DrawGraphyNodeBase_0",
"_objFlags": 0,
"_parent": {
"__id__": 5
......@@ -348,8 +348,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -357,8 +357,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -351,8 +351,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -360,8 +360,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -269,7 +269,7 @@
},
{
"__type__": "cc.Node",
"_name": "DrawGraphyNodeBase",
"_name": "DrawGraphyNodeBase_0",
"_objFlags": 0,
"_parent": {
"__id__": 5
......@@ -348,8 +348,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -357,8 +357,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -269,7 +269,7 @@
},
{
"__type__": "cc.Node",
"_name": "DrawGraphyNodeBase",
"_name": "DrawGraphyNodeBase_0",
"_objFlags": 0,
"_parent": {
"__id__": 5
......@@ -348,8 +348,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -357,8 +357,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -1525,8 +1525,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
157.328,
253.053,
154.328,
247.053,
0,
0,
0,
......@@ -1632,8 +1632,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
123.121,
184.008,
119.12099999999998,
183.008,
0,
0,
0,
......@@ -1739,8 +1739,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
88.914,
113.414,
79.914,
116.414,
0,
0,
0,
......@@ -1846,8 +1846,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
51.873,
47.084,
44.873,
50.084,
0,
0,
0,
......@@ -2167,7 +2167,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
2.558,
0.5579999999999998,
-78.331,
0,
0,
......@@ -2274,7 +2274,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
2.623,
0.6230000000000002,
-138.022,
0,
0,
......@@ -2381,7 +2381,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
2.817,
0.8170000000000002,
-197.453,
0,
0,
......@@ -2488,7 +2488,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
1.924,
-0.07600000000000007,
-254.853,
0,
0,
......
......@@ -1644,7 +1644,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
90.686,
88.686,
174.24,
0,
0,
......@@ -1751,7 +1751,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
56.534,
53.534,
113.354,
0,
0,
......@@ -1858,7 +1858,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
21.286,
18.286,
56.866,
0,
0,
......@@ -1965,7 +1965,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-12.376,
-15.376,
-0.622,
0,
0,
......@@ -2072,7 +2072,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-47.418,
-53.418,
-61.508,
0,
0,
......@@ -2179,7 +2179,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-82.294,
-86.294,
-116.793,
0,
0,
......@@ -2891,7 +2891,7 @@
},
{
"__type__": "cc.Node",
"_name": "NodePos_2_1",
"_name": "NodePos_2_4",
"_objFlags": 0,
"_parent": {
"__id__": 23
......
......@@ -351,8 +351,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -360,8 +360,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......@@ -459,8 +459,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -468,8 +468,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -1556,7 +1556,7 @@
"ctor": "Float64Array",
"array": [
-226.554,
163.09,
-163.86,
0,
0,
0,
......
......@@ -351,8 +351,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -360,8 +360,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......@@ -459,8 +459,8 @@
"_strokeColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_lineJoin": 1,
......@@ -468,8 +468,8 @@
"_fillColor": {
"__type__": "cc.Color",
"r": 255,
"g": 105,
"b": 158,
"g": 208,
"b": 47,
"a": 255
},
"_miterLimit": 60,
......
......@@ -186,7 +186,7 @@
"array": [
0,
0,
527.4094709047232,
525.6701448892809,
0,
0,
0,
......@@ -5221,7 +5221,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "6eeRcpNLhAjoz3ljEI1O9r"
"_id": "ecsuSvkLtI64IZFtMwx092"
},
{
"__type__": "cc.Label",
......@@ -5257,7 +5257,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "45gwg1zndPDJFOvyCtCfIe"
"_id": "f3eoQc0z9NgZyHen4wK5J6"
},
{
"__type__": "cc.PrivateNode",
......@@ -5320,7 +5320,7 @@
"_groupIndex": 0,
"groupIndex": 0,
"showInEditor": false,
"_id": "25DbxVFI9OJrSk88JxZB8G"
"_id": "c7SUujrB1EvLW7VLrBAmTZ"
},
{
"__type__": "cc.Label",
......@@ -5356,7 +5356,7 @@
"_N$fontFamily": "Arial",
"_N$overflow": 0,
"_N$cacheMode": 0,
"_id": "e4DRltzhpOfYXjnrXl5OOH"
"_id": "3aJtAtiYVDcKJTsZI5lOuK"
},
{
"__type__": "cc.RichText",
......@@ -7404,9 +7404,9 @@
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 0,
"b": 0,
"r": 251,
"g": 197,
"b": 13,
"a": 255
},
"_contentSize": {
......@@ -7498,9 +7498,9 @@
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 255,
"b": 0,
"r": 255,
"g": 82,
"b": 82,
"a": 255
},
"_contentSize": {
......@@ -7592,9 +7592,9 @@
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 255,
"r": 83,
"g": 212,
"b": 244,
"a": 255
},
"_contentSize": {
......@@ -7686,9 +7686,9 @@
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 255,
"b": 255,
"r": 157,
"g": 250,
"b": 36,
"a": 255
},
"_contentSize": {
......@@ -7781,8 +7781,8 @@
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 0,
"b": 255,
"g": 82,
"b": 82,
"a": 255
},
"_contentSize": {
......@@ -7874,9 +7874,9 @@
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 0,
"r": 83,
"g": 212,
"b": 244,
"a": 255
},
"_contentSize": {
......
......@@ -733,7 +733,6 @@ cc.Class({
},
createArrows(endNode, lastNode, skipIdx, stepIdx, idx) {
let letterNodeBase = cc.find(`Canvas/letterNodeBase`)
const lineVec2 = cc.v2(endNode.x - lastNode.x, endNode.y - lastNode.y);
const lineLength = lineVec2.mag();
......@@ -742,7 +741,11 @@ cc.Class({
if (skipIdx != idx) {
continue;
}
const arrowPrefab = cc.instantiate(this.arrowPrefab);
if(stepIdx%2==1) {
arrowPrefab.active = false;
}
arrowPrefab.x = lastNode.x + lineVec2.x * (k + 1) / (arrowNumber + 1);
arrowPrefab.y = lastNode.y + lineVec2.y * (k + 1) / (arrowNumber + 1);
arrowPrefab.angle = cc.v2(1, 0).signAngle(lineVec2) * 180 / Math.PI;
......
module.exports = {
letterList: [
'K',
'L'
'a', 'b', 'c'
]
}
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