Commit 2cff6957 by 李楚霏

调整移动;调整触碰逻辑

parent b8bf8c22
......@@ -78,22 +78,22 @@
"__id__": 7
},
{
"__id__": 35
"__id__": 42
},
{
"__id__": 157
"__id__": 164
}
],
"_active": true,
"_components": [
{
"__id__": 159
"__id__": 166
},
{
"__id__": 160
"__id__": 167
},
{
"__id__": 161
"__id__": 168
}
],
"_prefab": null,
......@@ -183,7 +183,7 @@
"array": [
0,
0,
369.84697400369186,
600.155604822616,
0,
0,
0,
......@@ -348,16 +348,19 @@
"__id__": 8
},
{
"__id__": 13
"__id__": 12
},
{
"__id__": 19
"__id__": 18
},
{
"__id__": 24
"__id__": 23
},
{
"__id__": 30
},
{
"__id__": 36
}
],
"_active": true,
......@@ -428,9 +431,6 @@
},
{
"__id__": 11
},
{
"__id__": 12
}
],
"_prefab": null,
......@@ -547,7 +547,7 @@
},
"_enabled": true,
"tag": 0,
"_density": 1000,
"_density": 100000,
"_sensor": false,
"_friction": 1,
"_restitution": 0,
......@@ -722,16 +722,6 @@
"_id": "c5jEzfFyVJj4dk/9cVPobw"
},
{
"__type__": "554acE3G1pCNrN4/0aHxvon",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 8
},
"_enabled": true,
"_id": "16QfTiUSlEyqhvFalARe0K"
},
{
"__type__": "cc.Node",
"_name": "dynamicGear2",
"_objFlags": 0,
......@@ -742,6 +732,9 @@
"_active": true,
"_components": [
{
"__id__": 13
},
{
"__id__": 14
},
{
......@@ -752,9 +745,6 @@
},
{
"__id__": 17
},
{
"__id__": 18
}
],
"_prefab": null,
......@@ -780,8 +770,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-170.902,
473.654,
293.432,
-21.498,
0,
0,
0,
......@@ -810,7 +800,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 13
"__id__": 12
},
"_enabled": true,
"_materials": [
......@@ -842,7 +832,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 13
"__id__": 12
},
"_enabled": true,
"_type": 1,
......@@ -867,7 +857,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 13
"__id__": 12
},
"_enabled": true,
"_normalMaterial": null,
......@@ -928,7 +918,7 @@
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 13
"__id__": 12
},
"_id": "f4JiP96rFH2J8IGeFS609V"
},
......@@ -937,7 +927,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 13
"__id__": 12
},
"_enabled": true,
"tag": 0,
......@@ -1120,7 +1110,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 13
"__id__": 12
},
"_enabled": true,
"target": null,
......@@ -1137,6 +1127,9 @@
"_active": false,
"_components": [
{
"__id__": 19
},
{
"__id__": 20
},
{
......@@ -1144,9 +1137,6 @@
},
{
"__id__": 22
},
{
"__id__": 23
}
],
"_prefab": null,
......@@ -1202,7 +1192,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 19
"__id__": 18
},
"_enabled": true,
"_materials": [
......@@ -1234,7 +1224,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 19
"__id__": 18
},
"_enabled": true,
"_type": 1,
......@@ -1259,7 +1249,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 19
"__id__": 18
},
"_enabled": true,
"tag": 0,
......@@ -1422,7 +1412,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 19
"__id__": 18
},
"_enabled": true,
"_id": "f1yMyd4RJEWYKqpqa+UGXO"
......@@ -1438,6 +1428,9 @@
"_active": true,
"_components": [
{
"__id__": 24
},
{
"__id__": 25
},
{
......@@ -1506,7 +1499,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 23
},
"_enabled": true,
"_materials": [
......@@ -1538,12 +1531,12 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 23
},
"_enabled": true,
"_type": 1,
"_type": 2,
"_allowSleep": true,
"_gravityScale": 1,
"_gravityScale": 0,
"_linearDamping": 0,
"_angularDamping": 0,
"_linearVelocity": {
......@@ -1559,15 +1552,85 @@
"_id": "8fsRLIib9D0qw9vfrYzVTL"
},
{
"__type__": "cc.Button",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 23
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 0,
"transition": 0,
"_N$normalColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"_N$hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$disabledColor": {
"__type__": "cc.Color",
"r": 124,
"g": 124,
"b": 124,
"a": 255
},
"_N$normalSprite": null,
"_N$pressedSprite": null,
"pressedSprite": null,
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 23
},
"_id": "88ANXEoDhIH4HO8EE4oG0b"
},
{
"__type__": "cc.PhysicsPolygonCollider",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 23
},
"_enabled": true,
"tag": 0,
"_density": 1,
"_density": 100000,
"_sensor": false,
"_friction": 1,
"_restitution": 0,
......@@ -1739,92 +1802,47 @@
"y": -5.8
}
],
"_id": "36pm6GESVGkYV8RbhfNyZ3"
"_id": "46taUFd+JPhqK0FtSQ61rL"
},
{
"__type__": "cc.Button",
"__type__": "9f879YGuoROFrLJrd9nEcLA",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 23
},
"_enabled": true,
"_normalMaterial": null,
"_grayMaterial": null,
"duration": 0.1,
"zoomScale": 1.2,
"clickEvents": [],
"_N$interactable": true,
"_N$enableAutoGrayEffect": false,
"_N$transition": 0,
"transition": 0,
"_N$normalColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"pressedColor": {
"__type__": "cc.Color",
"r": 211,
"g": 211,
"b": 211,
"a": 255
},
"_N$hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"hoverColor": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_N$disabledColor": {
"__type__": "cc.Color",
"r": 124,
"g": 124,
"b": 124,
"a": 255
},
"_N$normalSprite": null,
"_N$pressedSprite": null,
"pressedSprite": null,
"_N$hoverSprite": null,
"hoverSprite": null,
"_N$disabledSprite": null,
"_N$target": {
"__id__": 24
},
"_id": "88ANXEoDhIH4HO8EE4oG0b"
"target": null,
"_id": "50JHFGkF1ALI58dIjkQVsO"
},
{
"__type__": "9f879YGuoROFrLJrd9nEcLA",
"__type__": "cc.WeldJoint",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 24
"__id__": 23
},
"_enabled": true,
"target": null,
"_id": "50JHFGkF1ALI58dIjkQVsO"
"anchor": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"connectedAnchor": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"connectedBody": null,
"collideConnected": false,
"referenceAngle": 0,
"_frequency": 0,
"_dampingRatio": 0,
"_id": "b3cZxBwuNPdbtjKpFo5hyX"
},
{
"__type__": "cc.Node",
"_name": "rope",
"_name": "stone",
"_objFlags": 0,
"_parent": {
"__id__": 7
......@@ -1856,8 +1874,8 @@
},
"_contentSize": {
"__type__": "cc.Size",
"width": 111,
"height": 649
"width": 187,
"height": 182
},
"_anchorPoint": {
"__type__": "cc.Vec2",
......@@ -1868,8 +1886,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-199.188,
0,
-191.075,
-397.685,
0,
0,
0,
......@@ -1891,7 +1909,7 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "4c972fFCNEtJB37dlYOP9f"
"_id": "06CG3hj4BCyYRydXgSoQRt"
},
{
"__type__": "cc.Sprite",
......@@ -1909,7 +1927,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "7884c6b0-ce6a-438b-a8db-6755ad7552e7"
"__uuid__": "7806237a-ea95-49fe-9236-b1098e4ef4cb"
},
"_type": 0,
"_sizeMode": 1,
......@@ -1923,7 +1941,7 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "94MJZyMOtNuasZJIubPN/d"
"_id": "7ead3Glq1EsLGN2YQG/VYH"
},
{
"__type__": "cc.RigidBody",
......@@ -1933,7 +1951,7 @@
"__id__": 30
},
"_enabled": true,
"_type": 1,
"_type": 2,
"_allowSleep": true,
"_gravityScale": 1,
"_linearDamping": 0,
......@@ -1945,13 +1963,13 @@
},
"_angularVelocity": 0,
"_fixedRotation": false,
"enabledContactListener": true,
"enabledContactListener": false,
"bullet": false,
"awakeOnLoad": true,
"_id": "f4pyloeoFLn6TqD4uwjpQy"
"_id": "67lJibx8lFfI/f838FfWSl"
},
{
"__type__": "cc.PhysicsBoxCollider",
"__type__": "cc.PhysicsPolygonCollider",
"_name": "",
"_objFlags": 0,
"node": {
......@@ -1969,26 +1987,401 @@
"x": 0,
"y": 0
},
"_size": {
"__type__": "cc.Size",
"width": 111,
"height": 649
},
"_id": "d4uA7n5KBNI6L0ksG0PQY0"
"points": [
{
"__type__": "cc.Vec2",
"x": -73.7,
"y": -37.5
},
{
"__type__": "0a49by9EpRC1KDzTww1GyH5",
"__type__": "cc.Vec2",
"x": -64.4,
"y": -55.7
},
{
"__type__": "cc.Vec2",
"x": -40,
"y": -76.9
},
{
"__type__": "cc.Vec2",
"x": -16.4,
"y": -85.5
},
{
"__type__": "cc.Vec2",
"x": 14.6,
"y": -89.6
},
{
"__type__": "cc.Vec2",
"x": 42.1,
"y": -72.9
},
{
"__type__": "cc.Vec2",
"x": 68.3,
"y": -51
},
{
"__type__": "cc.Vec2",
"x": 85.2,
"y": -40.3
},
{
"__type__": "cc.Vec2",
"x": 92.7,
"y": -14.8
},
{
"__type__": "cc.Vec2",
"x": 86.6,
"y": 24.7
},
{
"__type__": "cc.Vec2",
"x": 69.3,
"y": 49.9
},
{
"__type__": "cc.Vec2",
"x": 57.4,
"y": 59.7
},
{
"__type__": "cc.Vec2",
"x": -0.7,
"y": 91.3
},
{
"__type__": "cc.Vec2",
"x": -73.7,
"y": 74.9
},
{
"__type__": "cc.Vec2",
"x": -90.4,
"y": 8.4
},
{
"__type__": "cc.Vec2",
"x": -91.2,
"y": -19.1
}
],
"_id": "7cZC42hoNIHLp3LbdpoPsf"
},
{
"__type__": "cc.WeldJoint",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 30
},
"_enabled": true,
"label": null,
"text": "hello",
"anchor": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"connectedAnchor": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"connectedBody": {
"__id__": 35
},
"collideConnected": false,
"referenceAngle": 0,
"_frequency": 0,
"_dampingRatio": 0,
"_id": "d9+PdOVBVAYpLnZMNsCH21"
},
{
"__type__": "cc.RigidBody",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
},
"_enabled": true,
"_type": 2,
"_allowSleep": true,
"_gravityScale": 0,
"_linearDamping": 0,
"_angularDamping": 0,
"_linearVelocity": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_angularVelocity": 0,
"_fixedRotation": false,
"enabledContactListener": true,
"bullet": false,
"awakeOnLoad": true,
"_id": "f4pyloeoFLn6TqD4uwjpQy"
},
{
"__type__": "cc.Node",
"_name": "rope",
"_objFlags": 0,
"_parent": {
"__id__": 7
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 37
},
{
"__id__": 35
},
{
"__id__": 38
},
{
"__id__": 39
},
{
"__id__": 40
},
{
"__id__": 41
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 111,
"height": 649
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-199.188,
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": "4c972fFCNEtJB37dlYOP9f"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "7884c6b0-ce6a-438b-a8db-6755ad7552e7"
},
"_type": 0,
"_sizeMode": 1,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "94MJZyMOtNuasZJIubPN/d"
},
{
"__type__": "0a49by9EpRC1KDzTww1GyH5",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
},
"_enabled": true,
"_id": "a87n4hhbRAuIbBkCN8SUGE"
},
{
"__type__": "cc.WeldJoint",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
},
"_enabled": true,
"anchor": {
"__type__": "cc.Vec2",
"x": 1,
"y": -371
},
"connectedAnchor": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"connectedBody": {
"__id__": 32
},
"collideConnected": false,
"referenceAngle": 0,
"_frequency": 0,
"_dampingRatio": 0,
"_id": "723m2h4rdCJLJhm0CRjc+v"
},
{
"__type__": "cc.PrismaticJoint",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
},
"_enabled": false,
"anchor": {
"__type__": "cc.Vec2",
"x": 164,
"y": -3
},
"connectedAnchor": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"connectedBody": null,
"collideConnected": false,
"localAxisA": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"referenceAngle": 0,
"enableLimit": true,
"enableMotor": false,
"lowerLimit": 0.1,
"upperLimit": 0,
"_maxMotorForce": 0.01,
"_motorSpeed": 0,
"_id": "e0IzQPysxJnJKUIoMhZ6vG"
},
{
"__type__": "cc.PhysicsPolygonCollider",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
},
"_enabled": true,
"tag": 0,
"_density": 1000000,
"_sensor": false,
"_friction": 0.2,
"_restitution": 0,
"body": null,
"_offset": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"points": [
{
"__type__": "cc.Vec2",
"x": -14.7,
"y": -172.5
},
{
"__type__": "cc.Vec2",
"x": -14.6,
"y": -192.9
},
{
"__type__": "cc.Vec2",
"x": 14.4,
"y": -193.5
},
{
"__type__": "cc.Vec2",
"x": 14.4,
"y": -173.4
},
{
"__type__": "cc.Vec2",
"x": 42.2,
"y": -173.6
},
{
"__type__": "cc.Vec2",
"x": 41.7,
"y": 177.3
},
{
"__type__": "cc.Vec2",
"x": 42.7,
"y": 242.9
},
{
"__type__": "cc.Vec2",
"x": 13.7,
"y": 242.8
},
{
"__type__": "cc.Vec2",
"x": 15.7,
"y": 264.5
},
{
"__type__": "cc.Vec2",
"x": 2.8,
"y": 323.8
},
{
"__type__": "cc.Vec2",
"x": -14.1,
"y": 323.8
}
],
"_id": "32OCMfCYFDOrm0cHLkG23/"
},
{
"__type__": "cc.Node",
"_name": "scene1",
"_objFlags": 0,
......@@ -1997,64 +2390,64 @@
},
"_children": [
{
"__id__": 36
"__id__": 43
},
{
"__id__": 41
"__id__": 48
},
{
"__id__": 48
"__id__": 55
},
{
"__id__": 54
"__id__": 61
},
{
"__id__": 60
"__id__": 67
},
{
"__id__": 66
"__id__": 73
},
{
"__id__": 72
"__id__": 79
},
{
"__id__": 78
"__id__": 85
},
{
"__id__": 84
"__id__": 91
},
{
"__id__": 90
"__id__": 97
},
{
"__id__": 96
"__id__": 103
},
{
"__id__": 102
"__id__": 109
},
{
"__id__": 108
"__id__": 115
},
{
"__id__": 114
"__id__": 121
},
{
"__id__": 120
"__id__": 127
},
{
"__id__": 126
"__id__": 133
},
{
"__id__": 132
"__id__": 139
},
{
"__id__": 138
"__id__": 145
},
{
"__id__": 144
"__id__": 151
},
{
"__id__": 154
"__id__": 161
}
],
"_active": false,
......@@ -2112,22 +2505,22 @@
"_name": "disk",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 37
"__id__": 44
},
{
"__id__": 38
"__id__": 45
},
{
"__id__": 39
"__id__": 46
},
{
"__id__": 40
"__id__": 47
}
],
"_prefab": null,
......@@ -2183,7 +2576,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
"__id__": 43
},
"_enabled": true,
"_materials": [
......@@ -2215,7 +2608,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
"__id__": 43
},
"_enabled": true,
"_type": 1,
......@@ -2240,7 +2633,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
"__id__": 43
},
"_enabled": true,
"tag": 0,
......@@ -2262,7 +2655,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 36
"__id__": 43
},
"_enabled": true,
"label": null,
......@@ -2274,28 +2667,28 @@
"_name": "hook",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 42
"__id__": 49
},
{
"__id__": 43
"__id__": 50
},
{
"__id__": 44
"__id__": 51
},
{
"__id__": 45
"__id__": 52
},
{
"__id__": 46
"__id__": 53
},
{
"__id__": 153
"__id__": 160
}
],
"_prefab": null,
......@@ -2351,7 +2744,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 41
"__id__": 48
},
"_enabled": true,
"_materials": [
......@@ -2383,7 +2776,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 41
"__id__": 48
},
"_enabled": true,
"_type": 2,
......@@ -2408,7 +2801,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 41
"__id__": 48
},
"_enabled": true,
"tag": 0,
......@@ -2434,7 +2827,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 41
"__id__": 48
},
"_enabled": true,
"_id": "a7LuEyw79BAYxThj2PaotL"
......@@ -2444,7 +2837,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 41
"__id__": 48
},
"_enabled": true,
"anchor": {
......@@ -2458,7 +2851,7 @@
"y": 0
},
"connectedBody": {
"__id__": 47
"__id__": 54
},
"collideConnected": false,
"_distance": 10,
......@@ -2471,7 +2864,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
"__id__": 55
},
"_enabled": true,
"_type": 2,
......@@ -2496,25 +2889,25 @@
"_name": "ball2",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 49
"__id__": 56
},
{
"__id__": 47
"__id__": 54
},
{
"__id__": 50
"__id__": 57
},
{
"__id__": 51
"__id__": 58
},
{
"__id__": 52
"__id__": 59
}
],
"_prefab": null,
......@@ -2570,7 +2963,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
"__id__": 55
},
"_enabled": true,
"_materials": [
......@@ -2602,7 +2995,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
"__id__": 55
},
"_enabled": true,
"tag": 0,
......@@ -2624,7 +3017,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
"__id__": 55
},
"_enabled": true,
"anchor": {
......@@ -2638,7 +3031,7 @@
"y": 0
},
"connectedBody": {
"__id__": 43
"__id__": 50
},
"collideConnected": false,
"_distance": 20,
......@@ -2651,7 +3044,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 48
"__id__": 55
},
"_enabled": true,
"anchor": {
......@@ -2665,7 +3058,7 @@
"y": 0
},
"connectedBody": {
"__id__": 53
"__id__": 60
},
"collideConnected": false,
"_distance": 20,
......@@ -2678,7 +3071,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
"__id__": 61
},
"_enabled": true,
"_type": 2,
......@@ -2703,25 +3096,25 @@
"_name": "ball3",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 55
"__id__": 62
},
{
"__id__": 53
"__id__": 60
},
{
"__id__": 56
"__id__": 63
},
{
"__id__": 57
"__id__": 64
},
{
"__id__": 58
"__id__": 65
}
],
"_prefab": null,
......@@ -2777,7 +3170,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
"__id__": 61
},
"_enabled": true,
"_materials": [
......@@ -2809,7 +3202,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
"__id__": 61
},
"_enabled": true,
"tag": 0,
......@@ -2831,7 +3224,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
"__id__": 61
},
"_enabled": true,
"anchor": {
......@@ -2845,7 +3238,7 @@
"y": 0
},
"connectedBody": {
"__id__": 47
"__id__": 54
},
"collideConnected": false,
"_distance": 20,
......@@ -2858,7 +3251,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 54
"__id__": 61
},
"_enabled": true,
"anchor": {
......@@ -2872,7 +3265,7 @@
"y": 0
},
"connectedBody": {
"__id__": 59
"__id__": 66
},
"collideConnected": false,
"_distance": 20,
......@@ -2885,7 +3278,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 60
"__id__": 67
},
"_enabled": true,
"_type": 2,
......@@ -2910,25 +3303,25 @@
"_name": "ball4",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 61
"__id__": 68
},
{
"__id__": 59
"__id__": 66
},
{
"__id__": 62
"__id__": 69
},
{
"__id__": 63
"__id__": 70
},
{
"__id__": 64
"__id__": 71
}
],
"_prefab": null,
......@@ -2984,7 +3377,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 60
"__id__": 67
},
"_enabled": true,
"_materials": [
......@@ -3016,7 +3409,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 60
"__id__": 67
},
"_enabled": true,
"tag": 0,
......@@ -3038,7 +3431,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 60
"__id__": 67
},
"_enabled": true,
"anchor": {
......@@ -3052,7 +3445,7 @@
"y": 0
},
"connectedBody": {
"__id__": 53
"__id__": 60
},
"collideConnected": false,
"_distance": 20,
......@@ -3065,7 +3458,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 60
"__id__": 67
},
"_enabled": true,
"anchor": {
......@@ -3079,7 +3472,7 @@
"y": 0
},
"connectedBody": {
"__id__": 65
"__id__": 72
},
"collideConnected": false,
"_distance": 20,
......@@ -3092,7 +3485,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 66
"__id__": 73
},
"_enabled": true,
"_type": 2,
......@@ -3117,25 +3510,25 @@
"_name": "ball5",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 67
"__id__": 74
},
{
"__id__": 65
"__id__": 72
},
{
"__id__": 68
"__id__": 75
},
{
"__id__": 69
"__id__": 76
},
{
"__id__": 70
"__id__": 77
}
],
"_prefab": null,
......@@ -3191,7 +3584,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 66
"__id__": 73
},
"_enabled": true,
"_materials": [
......@@ -3223,7 +3616,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 66
"__id__": 73
},
"_enabled": true,
"tag": 0,
......@@ -3245,7 +3638,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 66
"__id__": 73
},
"_enabled": true,
"anchor": {
......@@ -3259,7 +3652,7 @@
"y": 0
},
"connectedBody": {
"__id__": 59
"__id__": 66
},
"collideConnected": false,
"_distance": 20,
......@@ -3272,7 +3665,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 66
"__id__": 73
},
"_enabled": true,
"anchor": {
......@@ -3286,7 +3679,7 @@
"y": 0
},
"connectedBody": {
"__id__": 71
"__id__": 78
},
"collideConnected": false,
"_distance": 20,
......@@ -3299,7 +3692,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 79
},
"_enabled": true,
"_type": 2,
......@@ -3324,25 +3717,25 @@
"_name": "ball6",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 73
"__id__": 80
},
{
"__id__": 71
"__id__": 78
},
{
"__id__": 74
"__id__": 81
},
{
"__id__": 75
"__id__": 82
},
{
"__id__": 76
"__id__": 83
}
],
"_prefab": null,
......@@ -3398,7 +3791,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 79
},
"_enabled": true,
"_materials": [
......@@ -3430,7 +3823,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 79
},
"_enabled": true,
"tag": 0,
......@@ -3452,7 +3845,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 79
},
"_enabled": true,
"anchor": {
......@@ -3466,7 +3859,7 @@
"y": 0
},
"connectedBody": {
"__id__": 65
"__id__": 72
},
"collideConnected": false,
"_distance": 20,
......@@ -3479,7 +3872,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 72
"__id__": 79
},
"_enabled": true,
"anchor": {
......@@ -3493,7 +3886,7 @@
"y": 0
},
"connectedBody": {
"__id__": 77
"__id__": 84
},
"collideConnected": false,
"_distance": 20,
......@@ -3506,7 +3899,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
"__id__": 85
},
"_enabled": true,
"_type": 2,
......@@ -3531,25 +3924,25 @@
"_name": "ball7",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 79
"__id__": 86
},
{
"__id__": 77
"__id__": 84
},
{
"__id__": 80
"__id__": 87
},
{
"__id__": 81
"__id__": 88
},
{
"__id__": 82
"__id__": 89
}
],
"_prefab": null,
......@@ -3605,7 +3998,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
"__id__": 85
},
"_enabled": true,
"_materials": [
......@@ -3637,7 +4030,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
"__id__": 85
},
"_enabled": true,
"tag": 0,
......@@ -3659,7 +4052,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
"__id__": 85
},
"_enabled": true,
"anchor": {
......@@ -3673,7 +4066,7 @@
"y": 0
},
"connectedBody": {
"__id__": 71
"__id__": 78
},
"collideConnected": false,
"_distance": 20,
......@@ -3686,7 +4079,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 78
"__id__": 85
},
"_enabled": true,
"anchor": {
......@@ -3700,7 +4093,7 @@
"y": 0
},
"connectedBody": {
"__id__": 83
"__id__": 90
},
"collideConnected": false,
"_distance": 20,
......@@ -3713,7 +4106,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 91
},
"_enabled": true,
"_type": 2,
......@@ -3738,25 +4131,25 @@
"_name": "ball8",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 85
"__id__": 92
},
{
"__id__": 83
"__id__": 90
},
{
"__id__": 86
"__id__": 93
},
{
"__id__": 87
"__id__": 94
},
{
"__id__": 88
"__id__": 95
}
],
"_prefab": null,
......@@ -3812,7 +4205,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 91
},
"_enabled": true,
"_materials": [
......@@ -3844,7 +4237,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 91
},
"_enabled": true,
"tag": 0,
......@@ -3866,7 +4259,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 91
},
"_enabled": true,
"anchor": {
......@@ -3880,7 +4273,7 @@
"y": 0
},
"connectedBody": {
"__id__": 77
"__id__": 84
},
"collideConnected": false,
"_distance": 20,
......@@ -3893,7 +4286,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 84
"__id__": 91
},
"_enabled": true,
"anchor": {
......@@ -3907,7 +4300,7 @@
"y": 0
},
"connectedBody": {
"__id__": 89
"__id__": 96
},
"collideConnected": false,
"_distance": 20,
......@@ -3920,7 +4313,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
"__id__": 97
},
"_enabled": true,
"_type": 2,
......@@ -3945,25 +4338,25 @@
"_name": "ball9",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 91
"__id__": 98
},
{
"__id__": 89
"__id__": 96
},
{
"__id__": 92
"__id__": 99
},
{
"__id__": 93
"__id__": 100
},
{
"__id__": 94
"__id__": 101
}
],
"_prefab": null,
......@@ -4019,7 +4412,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
"__id__": 97
},
"_enabled": true,
"_materials": [
......@@ -4051,7 +4444,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
"__id__": 97
},
"_enabled": true,
"tag": 0,
......@@ -4073,7 +4466,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
"__id__": 97
},
"_enabled": true,
"anchor": {
......@@ -4087,7 +4480,7 @@
"y": 0
},
"connectedBody": {
"__id__": 83
"__id__": 90
},
"collideConnected": false,
"_distance": 20,
......@@ -4100,7 +4493,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
"__id__": 97
},
"_enabled": true,
"anchor": {
......@@ -4114,7 +4507,7 @@
"y": 0
},
"connectedBody": {
"__id__": 95
"__id__": 102
},
"collideConnected": false,
"_distance": 20,
......@@ -4127,7 +4520,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 96
"__id__": 103
},
"_enabled": true,
"_type": 2,
......@@ -4152,25 +4545,25 @@
"_name": "ball10",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 97
"__id__": 104
},
{
"__id__": 95
"__id__": 102
},
{
"__id__": 98
"__id__": 105
},
{
"__id__": 99
"__id__": 106
},
{
"__id__": 100
"__id__": 107
}
],
"_prefab": null,
......@@ -4226,7 +4619,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 96
"__id__": 103
},
"_enabled": true,
"_materials": [
......@@ -4258,7 +4651,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 96
"__id__": 103
},
"_enabled": true,
"tag": 0,
......@@ -4280,7 +4673,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 96
"__id__": 103
},
"_enabled": true,
"anchor": {
......@@ -4294,7 +4687,7 @@
"y": 0
},
"connectedBody": {
"__id__": 89
"__id__": 96
},
"collideConnected": false,
"_distance": 20,
......@@ -4307,7 +4700,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 96
"__id__": 103
},
"_enabled": true,
"anchor": {
......@@ -4321,7 +4714,7 @@
"y": 0
},
"connectedBody": {
"__id__": 101
"__id__": 108
},
"collideConnected": false,
"_distance": 20,
......@@ -4334,7 +4727,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 102
"__id__": 109
},
"_enabled": true,
"_type": 2,
......@@ -4359,25 +4752,25 @@
"_name": "ball11",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 103
"__id__": 110
},
{
"__id__": 101
"__id__": 108
},
{
"__id__": 104
"__id__": 111
},
{
"__id__": 105
"__id__": 112
},
{
"__id__": 106
"__id__": 113
}
],
"_prefab": null,
......@@ -4433,7 +4826,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 102
"__id__": 109
},
"_enabled": true,
"_materials": [
......@@ -4465,7 +4858,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 102
"__id__": 109
},
"_enabled": true,
"tag": 0,
......@@ -4487,7 +4880,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 102
"__id__": 109
},
"_enabled": true,
"anchor": {
......@@ -4501,7 +4894,7 @@
"y": 0
},
"connectedBody": {
"__id__": 95
"__id__": 102
},
"collideConnected": false,
"_distance": 20,
......@@ -4514,7 +4907,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 102
"__id__": 109
},
"_enabled": true,
"anchor": {
......@@ -4528,7 +4921,7 @@
"y": 0
},
"connectedBody": {
"__id__": 107
"__id__": 114
},
"collideConnected": false,
"_distance": 20,
......@@ -4541,7 +4934,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 108
"__id__": 115
},
"_enabled": true,
"_type": 2,
......@@ -4566,25 +4959,25 @@
"_name": "ball12",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 109
"__id__": 116
},
{
"__id__": 107
"__id__": 114
},
{
"__id__": 110
"__id__": 117
},
{
"__id__": 111
"__id__": 118
},
{
"__id__": 112
"__id__": 119
}
],
"_prefab": null,
......@@ -4640,7 +5033,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 108
"__id__": 115
},
"_enabled": true,
"_materials": [
......@@ -4672,7 +5065,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 108
"__id__": 115
},
"_enabled": true,
"tag": 0,
......@@ -4694,7 +5087,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 108
"__id__": 115
},
"_enabled": true,
"anchor": {
......@@ -4708,7 +5101,7 @@
"y": 0
},
"connectedBody": {
"__id__": 101
"__id__": 108
},
"collideConnected": false,
"_distance": 20,
......@@ -4721,7 +5114,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 108
"__id__": 115
},
"_enabled": true,
"anchor": {
......@@ -4735,7 +5128,7 @@
"y": 0
},
"connectedBody": {
"__id__": 113
"__id__": 120
},
"collideConnected": false,
"_distance": 20,
......@@ -4748,7 +5141,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 114
"__id__": 121
},
"_enabled": true,
"_type": 2,
......@@ -4773,25 +5166,25 @@
"_name": "ball13",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 115
"__id__": 122
},
{
"__id__": 113
"__id__": 120
},
{
"__id__": 116
"__id__": 123
},
{
"__id__": 117
"__id__": 124
},
{
"__id__": 118
"__id__": 125
}
],
"_prefab": null,
......@@ -4847,7 +5240,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 114
"__id__": 121
},
"_enabled": true,
"_materials": [
......@@ -4879,7 +5272,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 114
"__id__": 121
},
"_enabled": true,
"tag": 0,
......@@ -4901,7 +5294,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 114
"__id__": 121
},
"_enabled": true,
"anchor": {
......@@ -4915,7 +5308,7 @@
"y": 0
},
"connectedBody": {
"__id__": 107
"__id__": 114
},
"collideConnected": false,
"_distance": 20,
......@@ -4928,7 +5321,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 114
"__id__": 121
},
"_enabled": true,
"anchor": {
......@@ -4942,7 +5335,7 @@
"y": 0
},
"connectedBody": {
"__id__": 119
"__id__": 126
},
"collideConnected": false,
"_distance": 20,
......@@ -4955,7 +5348,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 120
"__id__": 127
},
"_enabled": true,
"_type": 2,
......@@ -4980,25 +5373,25 @@
"_name": "ball14",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 121
"__id__": 128
},
{
"__id__": 119
"__id__": 126
},
{
"__id__": 122
"__id__": 129
},
{
"__id__": 123
"__id__": 130
},
{
"__id__": 124
"__id__": 131
}
],
"_prefab": null,
......@@ -5054,7 +5447,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 120
"__id__": 127
},
"_enabled": true,
"_materials": [
......@@ -5086,7 +5479,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 120
"__id__": 127
},
"_enabled": true,
"tag": 0,
......@@ -5108,7 +5501,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 120
"__id__": 127
},
"_enabled": true,
"anchor": {
......@@ -5122,7 +5515,7 @@
"y": 0
},
"connectedBody": {
"__id__": 113
"__id__": 120
},
"collideConnected": false,
"_distance": 20,
......@@ -5135,7 +5528,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 120
"__id__": 127
},
"_enabled": true,
"anchor": {
......@@ -5149,7 +5542,7 @@
"y": 0
},
"connectedBody": {
"__id__": 125
"__id__": 132
},
"collideConnected": false,
"_distance": 20,
......@@ -5162,7 +5555,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 126
"__id__": 133
},
"_enabled": true,
"_type": 2,
......@@ -5187,25 +5580,25 @@
"_name": "ball15",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 127
"__id__": 134
},
{
"__id__": 125
"__id__": 132
},
{
"__id__": 128
"__id__": 135
},
{
"__id__": 129
"__id__": 136
},
{
"__id__": 130
"__id__": 137
}
],
"_prefab": null,
......@@ -5261,7 +5654,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 126
"__id__": 133
},
"_enabled": true,
"_materials": [
......@@ -5293,7 +5686,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 126
"__id__": 133
},
"_enabled": true,
"tag": 0,
......@@ -5315,7 +5708,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 126
"__id__": 133
},
"_enabled": true,
"anchor": {
......@@ -5329,7 +5722,7 @@
"y": 0
},
"connectedBody": {
"__id__": 119
"__id__": 126
},
"collideConnected": false,
"_distance": 20,
......@@ -5342,7 +5735,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 126
"__id__": 133
},
"_enabled": true,
"anchor": {
......@@ -5356,7 +5749,7 @@
"y": 0
},
"connectedBody": {
"__id__": 131
"__id__": 138
},
"collideConnected": false,
"_distance": 20,
......@@ -5369,7 +5762,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 132
"__id__": 139
},
"_enabled": true,
"_type": 2,
......@@ -5394,25 +5787,25 @@
"_name": "ball16",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 133
"__id__": 140
},
{
"__id__": 131
"__id__": 138
},
{
"__id__": 134
"__id__": 141
},
{
"__id__": 135
"__id__": 142
},
{
"__id__": 136
"__id__": 143
}
],
"_prefab": null,
......@@ -5468,7 +5861,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 132
"__id__": 139
},
"_enabled": true,
"_materials": [
......@@ -5500,7 +5893,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 132
"__id__": 139
},
"_enabled": true,
"tag": 0,
......@@ -5522,7 +5915,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 132
"__id__": 139
},
"_enabled": true,
"anchor": {
......@@ -5536,7 +5929,7 @@
"y": 0
},
"connectedBody": {
"__id__": 125
"__id__": 132
},
"collideConnected": false,
"_distance": 20,
......@@ -5549,7 +5942,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 132
"__id__": 139
},
"_enabled": true,
"anchor": {
......@@ -5563,7 +5956,7 @@
"y": 0
},
"connectedBody": {
"__id__": 137
"__id__": 144
},
"collideConnected": false,
"_distance": 20,
......@@ -5576,7 +5969,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 138
"__id__": 145
},
"_enabled": true,
"_type": 2,
......@@ -5601,25 +5994,25 @@
"_name": "backhook",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 139
"__id__": 146
},
{
"__id__": 137
"__id__": 144
},
{
"__id__": 140
"__id__": 147
},
{
"__id__": 141
"__id__": 148
},
{
"__id__": 142
"__id__": 149
}
],
"_prefab": null,
......@@ -5675,7 +6068,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 138
"__id__": 145
},
"_enabled": true,
"_materials": [
......@@ -5707,7 +6100,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 138
"__id__": 145
},
"_enabled": true,
"tag": 0,
......@@ -5733,7 +6126,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 138
"__id__": 145
},
"_enabled": true,
"anchor": {
......@@ -5747,7 +6140,7 @@
"y": 0
},
"connectedBody": {
"__id__": 131
"__id__": 138
},
"collideConnected": false,
"_distance": 20,
......@@ -5760,7 +6153,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 138
"__id__": 145
},
"_enabled": true,
"anchor": {
......@@ -5774,7 +6167,7 @@
"y": 0
},
"connectedBody": {
"__id__": 143
"__id__": 150
},
"collideConnected": false,
"_distance": 20,
......@@ -5787,7 +6180,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 144
"__id__": 151
},
"_enabled": true,
"_type": 2,
......@@ -5812,29 +6205,29 @@
"_name": "stone",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 42
},
"_children": [
{
"__id__": 145
"__id__": 152
},
{
"__id__": 147
"__id__": 154
},
{
"__id__": 149
"__id__": 156
}
],
"_active": true,
"_components": [
{
"__id__": 151
"__id__": 158
},
{
"__id__": 143
"__id__": 150
},
{
"__id__": 152
"__id__": 159
}
],
"_prefab": null,
......@@ -5890,13 +6283,13 @@
"_name": "circleback",
"_objFlags": 0,
"_parent": {
"__id__": 144
"__id__": 151
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 146
"__id__": 153
}
],
"_prefab": null,
......@@ -5952,7 +6345,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 145
"__id__": 152
},
"_enabled": true,
"_materials": [
......@@ -5984,13 +6377,13 @@
"_name": "stone",
"_objFlags": 0,
"_parent": {
"__id__": 144
"__id__": 151
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 148
"__id__": 155
}
],
"_prefab": null,
......@@ -6046,7 +6439,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 147
"__id__": 154
},
"_enabled": true,
"_materials": [
......@@ -6078,13 +6471,13 @@
"_name": "circlefront",
"_objFlags": 0,
"_parent": {
"__id__": 144
"__id__": 151
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 150
"__id__": 157
}
],
"_prefab": null,
......@@ -6140,7 +6533,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 149
"__id__": 156
},
"_enabled": true,
"_materials": [
......@@ -6172,7 +6565,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 144
"__id__": 151
},
"_enabled": true,
"tag": 0,
......@@ -6290,7 +6683,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 144
"__id__": 151
},
"_enabled": true,
"anchor": {
......@@ -6304,7 +6697,7 @@
"y": 47
},
"connectedBody": {
"__id__": 137
"__id__": 144
},
"collideConnected": false,
"_distance": 25,
......@@ -6317,7 +6710,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 41
"__id__": 48
},
"_enabled": true,
"anchor": {
......@@ -6342,16 +6735,16 @@
"_name": "ground",
"_objFlags": 0,
"_parent": {
"__id__": 35
"__id__": 42
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 155
"__id__": 162
},
{
"__id__": 156
"__id__": 163
}
],
"_prefab": null,
......@@ -6407,7 +6800,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 154
"__id__": 161
},
"_enabled": true,
"_type": 0,
......@@ -6432,7 +6825,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 154
"__id__": 161
},
"_enabled": true,
"tag": 0,
......@@ -6464,7 +6857,7 @@
"_active": false,
"_components": [
{
"__id__": 158
"__id__": 165
}
],
"_prefab": null,
......@@ -6520,7 +6913,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 157
"__id__": 164
},
"_enabled": true,
"_materials": [
......
......@@ -21,7 +21,8 @@ export default class NewClass extends cc.Component {
points:cc.Vec3;
startCollision: boolean =false;
relativeVelocity: any;
dir: cc.Vec3;
startMove: boolean = false;
// LIFE-CYCLE CALLBACKS:
onBeginContact(contact, selfCollider, otherCollider) {
......@@ -31,7 +32,6 @@ export default class NewClass extends cc.Component {
}
onPreSolve(contact, selfCollider, otherCollider) {
if (otherCollider.node.name.includes('staticGear')) {
this.rigidBody.angularVelocity = - otherCollider.node.getComponent(cc.RigidBody).angularVelocity;
// this.node.position = otherCollider.node.position;
var worldManifold = contact.getWorldManifold();
var vel1 = selfCollider.node.getComponent(cc.RigidBody).getLinearVelocityFromWorldPoint(worldManifold.points[0]);
......@@ -41,7 +41,8 @@ export default class NewClass extends cc.Component {
this.rigidBody.linearVelocity = this.relativeVelocity;
setTimeout(() => {
this.rigidBody.linearVelocity = cc.v2(0,0);
}, 300);
this.rigidBody.angularVelocity = - otherCollider.node.getComponent(cc.RigidBody).angularVelocity;
}, 100);
}, 0);
}
}
......@@ -70,48 +71,38 @@ export default class NewClass extends cc.Component {
this.startPoint = event.getStartLocation();
}
_touchMoveEvent(event: cc.Event.EventTouch) {
// this.points.push(event.getLocation());
// if (this.points.length > 20) {
// this.points.shift();
// }
// const averagePoint = new cc.Vec2(0, 0);
// this.points.forEach((point) => {
// averagePoint.x += point.x;
// averagePoint.y += point.y;
// })
// averagePoint.multiplyScalar(1 / this.points.length);
// const delta = new cc.Vec2(event.getLocation().x - averagePoint.x, event.getLocation().y - averagePoint.y);
// let dir = delta;
let dir = cc.v2(event.getLocation().x - this.startPoint.x, event.getLocation().y - this.startPoint.y);
// clientEvent.dispatchEvent('move', dir);
this.move(dir);
var touches = event.getTouches();
let newPos = this.node.parent.convertToNodeSpaceAR(touches[0].getLocation());
// let subPos = oldPos.sub(newPos);
// let dir = cc.v3(this.nodePos.x - subPos.x, this.nodePos.y - subPos.y, 0);
this.dir = cc.v3(newPos.x, newPos.y, 0);
this.startMove = true;
}
_touchEndEvent(event: cc.Event.EventTouch) {
// this.points = [];
// clientEvent.dispatchEvent('moveEnd');
}
_touchCancelEvent(event: cc.Event.EventTouch) {
// clientEvent.dispatchEvent('moveEnd');
this.moveEnd();
}
move(dir) {
this.node.position = dir;
// this.rigidBody.awake = true;
cc.director.getPhysicsManager().enabled = false;
_touchCancelEvent(event: cc.Event.EventTouch) {
this.startMove = false;
}
moveEnd() {
cc.director.getPhysicsManager().enabled = true;
}
start () {
}
update (dt) {
if(!this.startMove){
return;
}
const oldPos = cc.v3 (this.node.position.x, this.node.position.y, 0);
let targetPos = this.dir.clone();
let subPos = targetPos.sub(oldPos);
let distance = subPos.mag();
if (distance > 100) {
targetPos = oldPos.clone().add(targetPos.sub(oldPos.clone()).normalizeSelf().mul(100));
}
this.node.position = this.node.position.clone().lerp(targetPos, 4*dt);
}
}
......@@ -9,37 +9,24 @@ const {ccclass, property} = cc._decorator;
@ccclass
export default class NewClass extends cc.Component {
@property(cc.Label)
label: cc.Label = null;
@property
text: string = 'hello';
rigidBody: cc.RigidBody;
// LIFE-CYCLE CALLBACKS:
onPreSolve(contact, selfCollider, otherCollider) {
// console.error(otherCollider.node.name);
// if (otherCollider && otherCollider.node.getComponent(cc.MotorJoint)) {
// // this.rigidBody.awake = false;
// console.error(selfCollider.name);
// otherCollider.node.addComponent(cc.MotorJoint);
// const motor = otherCollider.node.getComponent(cc.MotorJoint);
// motor.connectedBody = this.node;
// motor.maxTorque = -200;
// }
// const motorJoint =this.node.getComponent(cc.MotorJoint);
// motorJoint.connectedBody = otherCollider.node;
// console.error(motorJoint.connectedBody.name);
this.rigidBody.linearVelocity = cc.v2(0, -otherCollider.node.getComponent(cc.RigidBody).angularVelocity * 3);
this.scheduleOnce(() => {
this.rigidBody.type = cc.RigidBodyType.Kinematic;
}, 0);
this.rigidBody.linearVelocity = cc.v2(0, -otherCollider.node.getComponent(cc.RigidBody).angularVelocity);
}
onPostSolve(contact, selfCollider, otherCollider) {
this.rigidBody.linearVelocity = cc.v2(0, 0);
// this.rigidBody.linearVelocity = cc.v2(0, 0);
}
onLoad () {
this.rigidBody = this.node.getComponent(cc.RigidBody);
this.rigidBody.type = cc.RigidBodyType.Dynamic;
}
start () {
......
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 sign in to comment