Commit 5b24d02f authored by Tt's avatar Tt

修改完成

parent 30e0d1ae
......@@ -17,10 +17,10 @@
"__id__": 2
},
{
"__id__": 209
"__id__": 210
},
{
"__id__": 222
"__id__": 223
}
],
"_active": false,
......@@ -87,19 +87,19 @@
"__id__": 21
},
{
"__id__": 191
"__id__": 192
}
],
"_active": true,
"_components": [
{
"__id__": 206
},
{
"__id__": 207
},
{
"__id__": 208
},
{
"__id__": 209
}
],
"_prefab": null,
......@@ -1037,37 +1037,34 @@
"__id__": 33
},
{
"__id__": 90
},
{
"__id__": 109
"__id__": 93
},
{
"__id__": 128
"__id__": 112
},
{
"__id__": 130
"__id__": 131
},
{
"__id__": 133
"__id__": 134
},
{
"__id__": 140
"__id__": 141
},
{
"__id__": 164
"__id__": 165
},
{
"__id__": 166
"__id__": 167
},
{
"__id__": 168
"__id__": 169
}
],
"_active": true,
"_components": [
{
"__id__": 190
"__id__": 191
}
],
"_prefab": null,
......@@ -1162,7 +1159,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
996,
1086.371,
281.643,
0,
0,
......@@ -1231,8 +1228,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-825.092,
709.92,
-874.521,
671.976,
0,
0,
0,
......@@ -1500,9 +1497,9 @@
"_target": null,
"_alignFlags": 36,
"_left": 0,
"_right": -170.90800000000002,
"_right": -121.47900000000004,
"_top": 0,
"_bottom": -139.08000000000004,
"_bottom": -177.024,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
......@@ -1559,7 +1556,7 @@
"_target": null,
"_alignFlags": 34,
"_left": 0,
"_right": 0,
"_right": -90.3710000000001,
"_top": 0,
"_bottom": 0,
"_verticalCenter": 281.643,
......@@ -1690,10 +1687,17 @@
},
{
"__id__": 88
},
{
"__id__": 90
}
],
"_active": true,
"_components": [],
"_components": [
{
"__id__": 92
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
......@@ -1718,14 +1722,14 @@
"ctor": "Float64Array",
"array": [
0,
0,
54.296,
0,
0,
0,
0,
1,
1,
1,
1.25,
1.25,
1
]
},
......@@ -4310,8 +4314,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
928.148,
-790.304,
575.171,
-285.658,
0,
0,
0,
......@@ -4404,8 +4408,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-931.901,
-783.786,
504.824,
-298.443,
0,
0,
0,
......@@ -4463,29 +4467,150 @@
},
{
"__type__": "cc.Node",
"_name": "Lifeblue",
"_name": "arrow",
"_objFlags": 0,
"_parent": {
"__id__": 33
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 91
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 232,
"height": 217
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-271.316,
344.797,
0,
0,
0,
0,
1,
1,
1,
0.8
]
},
"_eulerAngles": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_skewX": 0,
"_skewY": 0,
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "cd02DJ7ItBoKQfIxmkaZNN"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 90
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "18fae3f3-8ecf-42f7-9f72-1b50ddb96da8"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "47xlmwBVVPkJFPk/clvOXG"
},
{
"__type__": "cc.Widget",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 33
},
"_enabled": true,
"alignMode": 2,
"_target": null,
"_alignFlags": 0,
"_left": 848,
"_right": 848,
"_top": 448,
"_bottom": 448,
"_verticalCenter": 0,
"_horizontalCenter": 0,
"_isAbsLeft": true,
"_isAbsRight": true,
"_isAbsTop": true,
"_isAbsBottom": true,
"_isAbsHorizontalCenter": true,
"_isAbsVerticalCenter": true,
"_originalWidth": 864,
"_originalHeight": 1024,
"_id": "e2CaG7y0VFgoYqhPuSM8iV"
},
{
"__type__": "cc.Node",
"_name": "Lifered",
"_objFlags": 0,
"_parent": {
"__id__": 21
},
"_children": [
{
"__id__": 91
"__id__": 94
},
{
"__id__": 97
"__id__": 100
},
{
"__id__": 99
"__id__": 102
},
{
"__id__": 101
"__id__": 104
},
{
"__id__": 105
"__id__": 108
},
{
"__id__": 107
"__id__": 110
}
],
"_active": true,
......@@ -4513,7 +4638,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
971.853,
-978.3,
-694.898,
0,
0,
......@@ -4536,24 +4661,24 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "85XU9mV75ENb8dqaJ9Lz1l"
"_id": "b3sc/SYB1IIo+CUFqqmkFY"
},
{
"__type__": "cc.Node",
"_name": "life_blue",
"_name": "life_red",
"_objFlags": 0,
"_parent": {
"__id__": 90
"__id__": 93
},
"_children": [
{
"__id__": 92
"__id__": 95
}
],
"_active": true,
"_components": [
{
"__id__": 96
"__id__": 99
}
],
"_prefab": null,
......@@ -4602,24 +4727,24 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "2bYBrsxKJMs66tAHj+Hv/K"
"_id": "d8FGmpF7ZJEJxEJQCH+SmP"
},
{
"__type__": "cc.Node",
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 91
"__id__": 94
},
"_children": [
{
"__id__": 93
"__id__": 96
}
],
"_active": true,
"_components": [
{
"__id__": 95
"__id__": 98
}
],
"_prefab": null,
......@@ -4668,20 +4793,20 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "27Y4AMX1BAraalOzyUEjCS"
"_id": "a2/hOlkldKB7MB2NWB3338"
},
{
"__type__": "cc.Node",
"_name": "prograssbar",
"_objFlags": 0,
"_parent": {
"__id__": 92
"__id__": 95
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 94
"__id__": 97
}
],
"_prefab": null,
......@@ -4730,14 +4855,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "74T8dF9EpLa5xUKUTZ0gwe"
"_id": "35fylcorpNIJlgQu/B0D3I"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 93
"__id__": 96
},
"_enabled": true,
"_materials": [
......@@ -4762,14 +4887,14 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "515RVOdhhBOIsMLRMhenf+"
"_id": "450NThGzhJRLWVl3QdTNXS"
},
{
"__type__": "cc.Mask",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 92
"__id__": 95
},
"_enabled": true,
"_materials": [
......@@ -4782,14 +4907,14 @@
"_segments": 64,
"_N$alphaThreshold": 0.1,
"_N$inverted": false,
"_id": "3e9npWZu5Jwb5TRCZqc7bn"
"_id": "5fPj9Z0XNOu70EKY2nUVTA"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 91
"__id__": 94
},
"_enabled": true,
"_materials": [
......@@ -4814,20 +4939,20 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "5a9AWfbWVJ5IINAfbscgaP"
"_id": "b3IXvIvMpP1rhoDG8YH262"
},
{
"__type__": "cc.Node",
"_name": "dice_bg",
"_objFlags": 0,
"_parent": {
"__id__": 90
"__id__": 93
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 98
"__id__": 101
}
],
"_prefab": null,
......@@ -4876,14 +5001,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "d2Yu/pRERL9Jh950nc6S8O"
"_id": "80FmcNCPhFJbJYe+jCNPaO"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 97
"__id__": 100
},
"_enabled": true,
"_materials": [
......@@ -4908,20 +5033,20 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "5fwNEoTkpN06wTZo+9ba+T"
"_id": "beKF2Y3NFC2qdusIQtUQQE"
},
{
"__type__": "cc.Node",
"_name": "faceBlue",
"_name": "faceRed",
"_objFlags": 0,
"_parent": {
"__id__": 90
"__id__": 93
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 100
"__id__": 103
}
],
"_prefab": null,
......@@ -4970,14 +5095,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "b4bgEyW3tPGraly4CK2lax"
"_id": "ccd5BzEURK153i++vQb4yn"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 99
"__id__": 102
},
"_enabled": true,
"_materials": [
......@@ -4988,7 +5113,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "4a62317a-d797-4af3-ba92-2b0d183d92cd"
"__uuid__": "f5d2a731-80b1-4dc5-a474-c0d07e18cf57"
},
"_type": 0,
"_sizeMode": 1,
......@@ -5002,24 +5127,24 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "b5hWiemHtFOqUhQH+0co3i"
"_id": "75hgWconBOOL7XbsBNHyOy"
},
{
"__type__": "cc.Node",
"_name": "faceMask",
"_objFlags": 0,
"_parent": {
"__id__": 90
"__id__": 93
},
"_children": [
{
"__id__": 102
"__id__": 105
}
],
"_active": true,
"_components": [
{
"__id__": 104
"__id__": 107
}
],
"_prefab": null,
......@@ -5068,20 +5193,20 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "3cFKrgqe9KBYKch168zasB"
"_id": "abQ8YplIhHV74yY4GuP8Tp"
},
{
"__type__": "cc.Node",
"_name": "New Sprite(Splash)",
"_objFlags": 0,
"_parent": {
"__id__": 101
"__id__": 104
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 103
"__id__": 106
}
],
"_prefab": null,
......@@ -5130,14 +5255,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "3exHB55JZDpadYuflZOI70"
"_id": "10DWBAbGJNfLHMAWzXACw8"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 102
"__id__": 105
},
"_enabled": true,
"_materials": [
......@@ -5162,14 +5287,14 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "58xYtZfydDuZLh5dFJs6iN"
"_id": "e20pK1cHFAeJQMTasjVasq"
},
{
"__type__": "cc.Mask",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 101
"__id__": 104
},
"_enabled": true,
"_materials": [
......@@ -5182,20 +5307,20 @@
"_segments": 64,
"_N$alphaThreshold": 0,
"_N$inverted": false,
"_id": "6beu4+k2hAeZkPFgYuVnqN"
"_id": "b8LVUpvi5HEJgERO8nJGJU"
},
{
"__type__": "cc.Node",
"_name": "faceFrame",
"_objFlags": 0,
"_parent": {
"__id__": 90
"__id__": 93
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 106
"__id__": 109
}
],
"_prefab": null,
......@@ -5221,8 +5346,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
3.46,
8.011000000000003,
4.109,
7.18,
0,
0,
0,
......@@ -5244,14 +5369,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "0bfyX/nTdPJIpfRKUryv4/"
"_id": "81ZHP6D99B8LMITFwVAYJd"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 105
"__id__": 108
},
"_enabled": true,
"_materials": [
......@@ -5262,7 +5387,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "47d7f91f-d35b-49ff-b4fe-fd69efa815e9"
"__uuid__": "cf5dc06c-5f89-49b9-82a1-cd66b3c6ddee"
},
"_type": 0,
"_sizeMode": 1,
......@@ -5276,20 +5401,20 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "06teYaEQRIa5GjLPZjiTIu"
"_id": "edAsFxZ/FGAasLXSBFMn7B"
},
{
"__type__": "cc.Node",
"_name": "effect",
"_objFlags": 0,
"_parent": {
"__id__": 90
"__id__": 93
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 108
"__id__": 111
}
],
"_prefab": null,
......@@ -5338,14 +5463,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "6bmesBm/NDjYU8brnqziZx"
"_id": "f4die5TupKzIPop7bU348s"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 107
"__id__": 110
},
"_enabled": true,
"_materials": [
......@@ -5378,33 +5503,33 @@
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "44en35fsdPF50lT9mygaDw"
"_id": "9alGKpfZRGXIfysO3kq4uo"
},
{
"__type__": "cc.Node",
"_name": "Lifered",
"_name": "Lifeblue",
"_objFlags": 0,
"_parent": {
"__id__": 21
},
"_children": [
{
"__id__": 110
"__id__": 113
},
{
"__id__": 116
"__id__": 119
},
{
"__id__": 118
"__id__": 121
},
{
"__id__": 120
"__id__": 123
},
{
"__id__": 124
"__id__": 127
},
{
"__id__": 126
"__id__": 129
}
],
"_active": true,
......@@ -5432,7 +5557,7 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-978.3,
971.853,
-694.898,
0,
0,
......@@ -5455,24 +5580,24 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "b3sc/SYB1IIo+CUFqqmkFY"
"_id": "85XU9mV75ENb8dqaJ9Lz1l"
},
{
"__type__": "cc.Node",
"_name": "life_red",
"_name": "life_blue",
"_objFlags": 0,
"_parent": {
"__id__": 109
"__id__": 112
},
"_children": [
{
"__id__": 111
"__id__": 114
}
],
"_active": true,
"_components": [
{
"__id__": 115
"__id__": 118
}
],
"_prefab": null,
......@@ -5521,24 +5646,24 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "d8FGmpF7ZJEJxEJQCH+SmP"
"_id": "2bYBrsxKJMs66tAHj+Hv/K"
},
{
"__type__": "cc.Node",
"_name": "mask",
"_objFlags": 0,
"_parent": {
"__id__": 110
"__id__": 113
},
"_children": [
{
"__id__": 112
"__id__": 115
}
],
"_active": true,
"_components": [
{
"__id__": 114
"__id__": 117
}
],
"_prefab": null,
......@@ -5587,20 +5712,20 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "a2/hOlkldKB7MB2NWB3338"
"_id": "27Y4AMX1BAraalOzyUEjCS"
},
{
"__type__": "cc.Node",
"_name": "prograssbar",
"_objFlags": 0,
"_parent": {
"__id__": 111
"__id__": 114
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 113
"__id__": 116
}
],
"_prefab": null,
......@@ -5649,14 +5774,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "35fylcorpNIJlgQu/B0D3I"
"_id": "74T8dF9EpLa5xUKUTZ0gwe"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 112
"__id__": 115
},
"_enabled": true,
"_materials": [
......@@ -5681,14 +5806,14 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "450NThGzhJRLWVl3QdTNXS"
"_id": "515RVOdhhBOIsMLRMhenf+"
},
{
"__type__": "cc.Mask",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 111
"__id__": 114
},
"_enabled": true,
"_materials": [
......@@ -5701,14 +5826,14 @@
"_segments": 64,
"_N$alphaThreshold": 0.1,
"_N$inverted": false,
"_id": "5fPj9Z0XNOu70EKY2nUVTA"
"_id": "3e9npWZu5Jwb5TRCZqc7bn"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 110
"__id__": 113
},
"_enabled": true,
"_materials": [
......@@ -5733,20 +5858,20 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "b3IXvIvMpP1rhoDG8YH262"
"_id": "5a9AWfbWVJ5IINAfbscgaP"
},
{
"__type__": "cc.Node",
"_name": "dice_bg",
"_objFlags": 0,
"_parent": {
"__id__": 109
"__id__": 112
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 117
"__id__": 120
}
],
"_prefab": null,
......@@ -5795,14 +5920,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "80FmcNCPhFJbJYe+jCNPaO"
"_id": "d2Yu/pRERL9Jh950nc6S8O"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 116
"__id__": 119
},
"_enabled": true,
"_materials": [
......@@ -5827,20 +5952,20 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "beKF2Y3NFC2qdusIQtUQQE"
"_id": "5fwNEoTkpN06wTZo+9ba+T"
},
{
"__type__": "cc.Node",
"_name": "faceRed",
"_name": "faceBlue",
"_objFlags": 0,
"_parent": {
"__id__": 109
"__id__": 112
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 119
"__id__": 122
}
],
"_prefab": null,
......@@ -5889,14 +6014,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "ccd5BzEURK153i++vQb4yn"
"_id": "b4bgEyW3tPGraly4CK2lax"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 118
"__id__": 121
},
"_enabled": true,
"_materials": [
......@@ -5907,7 +6032,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "f5d2a731-80b1-4dc5-a474-c0d07e18cf57"
"__uuid__": "4a62317a-d797-4af3-ba92-2b0d183d92cd"
},
"_type": 0,
"_sizeMode": 1,
......@@ -5921,24 +6046,24 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "75hgWconBOOL7XbsBNHyOy"
"_id": "b5hWiemHtFOqUhQH+0co3i"
},
{
"__type__": "cc.Node",
"_name": "faceMask",
"_objFlags": 0,
"_parent": {
"__id__": 109
"__id__": 112
},
"_children": [
{
"__id__": 121
"__id__": 124
}
],
"_active": true,
"_components": [
{
"__id__": 123
"__id__": 126
}
],
"_prefab": null,
......@@ -5987,20 +6112,20 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "abQ8YplIhHV74yY4GuP8Tp"
"_id": "3cFKrgqe9KBYKch168zasB"
},
{
"__type__": "cc.Node",
"_name": "New Sprite(Splash)",
"_objFlags": 0,
"_parent": {
"__id__": 120
"__id__": 123
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 122
"__id__": 125
}
],
"_prefab": null,
......@@ -6049,14 +6174,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "10DWBAbGJNfLHMAWzXACw8"
"_id": "3exHB55JZDpadYuflZOI70"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 121
"__id__": 124
},
"_enabled": true,
"_materials": [
......@@ -6081,14 +6206,14 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "e20pK1cHFAeJQMTasjVasq"
"_id": "58xYtZfydDuZLh5dFJs6iN"
},
{
"__type__": "cc.Mask",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 120
"__id__": 123
},
"_enabled": true,
"_materials": [
......@@ -6101,20 +6226,20 @@
"_segments": 64,
"_N$alphaThreshold": 0,
"_N$inverted": false,
"_id": "b8LVUpvi5HEJgERO8nJGJU"
"_id": "6beu4+k2hAeZkPFgYuVnqN"
},
{
"__type__": "cc.Node",
"_name": "faceFrame",
"_objFlags": 0,
"_parent": {
"__id__": 109
"__id__": 112
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 125
"__id__": 128
}
],
"_prefab": null,
......@@ -6140,8 +6265,8 @@
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
4.109,
7.18,
3.46,
8.011000000000003,
0,
0,
0,
......@@ -6163,14 +6288,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "81ZHP6D99B8LMITFwVAYJd"
"_id": "0bfyX/nTdPJIpfRKUryv4/"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 124
"__id__": 127
},
"_enabled": true,
"_materials": [
......@@ -6181,7 +6306,7 @@
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "cf5dc06c-5f89-49b9-82a1-cd66b3c6ddee"
"__uuid__": "47d7f91f-d35b-49ff-b4fe-fd69efa815e9"
},
"_type": 0,
"_sizeMode": 1,
......@@ -6195,20 +6320,20 @@
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "edAsFxZ/FGAasLXSBFMn7B"
"_id": "06teYaEQRIa5GjLPZjiTIu"
},
{
"__type__": "cc.Node",
"_name": "effect",
"_objFlags": 0,
"_parent": {
"__id__": 109
"__id__": 112
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 127
"__id__": 130
}
],
"_prefab": null,
......@@ -6257,14 +6382,14 @@
"_is3DNode": false,
"_groupIndex": 0,
"groupIndex": 0,
"_id": "f4die5TupKzIPop7bU348s"
"_id": "6bmesBm/NDjYU8brnqziZx"
},
{
"__type__": "dragonBones.ArmatureDisplay",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 126
"__id__": 129
},
"_enabled": true,
"_materials": [
......@@ -6297,101 +6422,7 @@
"_N$timeScale": 1,
"_N$debugBones": false,
"_N$enableBatch": false,
"_id": "9alGKpfZRGXIfysO3kq4uo"
},
{
"__type__": "cc.Node",
"_name": "arrow",
"_objFlags": 0,
"_parent": {
"__id__": 21
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 129
}
],
"_prefab": null,
"_opacity": 255,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_contentSize": {
"__type__": "cc.Size",
"width": 232,
"height": 217
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_trs": {
"__type__": "TypedArray",
"ctor": "Float64Array",
"array": [
-310.794,
396.693,
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": "cd02DJ7ItBoKQfIxmkaZNN"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 128
},
"_enabled": true,
"_materials": [
{
"__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432"
}
],
"_srcBlendFactor": 770,
"_dstBlendFactor": 771,
"_spriteFrame": {
"__uuid__": "18fae3f3-8ecf-42f7-9f72-1b50ddb96da8"
},
"_type": 0,
"_sizeMode": 0,
"_fillType": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_atlas": null,
"_id": "47xlmwBVVPkJFPk/clvOXG"
"_id": "44en35fsdPF50lT9mygaDw"
},
{
"__type__": "cc.Node",
......@@ -6402,7 +6433,7 @@
},
"_children": [
{
"__id__": 131
"__id__": 132
}
],
"_active": true,
......@@ -6460,13 +6491,13 @@
"_name": "L2BG3天监树林落叶_ske",
"_objFlags": 0,
"_parent": {
"__id__": 130
"__id__": 131
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 132
"__id__": 133
}
],
"_prefab": null,
......@@ -6522,7 +6553,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 131
"__id__": 132
},
"_enabled": true,
"_materials": [
......@@ -6566,13 +6597,13 @@
},
"_children": [
{
"__id__": 134
"__id__": 135
}
],
"_active": false,
"_components": [
{
"__id__": 139
"__id__": 140
}
],
"_prefab": null,
......@@ -6628,20 +6659,20 @@
"_name": "Background",
"_objFlags": 512,
"_parent": {
"__id__": 133
"__id__": 134
},
"_children": [
{
"__id__": 135
"__id__": 136
}
],
"_active": true,
"_components": [
{
"__id__": 137
"__id__": 138
},
{
"__id__": 138
"__id__": 139
}
],
"_prefab": null,
......@@ -6697,13 +6728,13 @@
"_name": "Label",
"_objFlags": 512,
"_parent": {
"__id__": 134
"__id__": 135
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 136
"__id__": 137
}
],
"_prefab": null,
......@@ -6759,7 +6790,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 135
"__id__": 136
},
"_enabled": true,
"_materials": [
......@@ -6792,7 +6823,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 134
"__id__": 135
},
"_enabled": true,
"_materials": [
......@@ -6824,7 +6855,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 134
"__id__": 135
},
"_enabled": true,
"alignMode": 0,
......@@ -6851,7 +6882,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 133
"__id__": 134
},
"_enabled": true,
"_normalMaterial": null,
......@@ -6924,7 +6955,7 @@
"__uuid__": "29158224-f8dd-4661-a796-1ffab537140e"
},
"_N$target": {
"__id__": 134
"__id__": 135
},
"_id": "72uh6FFMhPZJXe9I3tJ4Qt"
},
......@@ -6937,34 +6968,34 @@
},
"_children": [
{
"__id__": 141
"__id__": 142
},
{
"__id__": 143
"__id__": 144
},
{
"__id__": 145
"__id__": 146
},
{
"__id__": 151
"__id__": 152
},
{
"__id__": 152
"__id__": 153
},
{
"__id__": 157
"__id__": 158
},
{
"__id__": 159
"__id__": 160
},
{
"__id__": 161
"__id__": 162
}
],
"_active": false,
"_components": [
{
"__id__": 163
"__id__": 164
}
],
"_prefab": null,
......@@ -7020,13 +7051,13 @@
"_name": "gray",
"_objFlags": 0,
"_parent": {
"__id__": 140
"__id__": 141
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 142
"__id__": 143
}
],
"_prefab": null,
......@@ -7082,7 +7113,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 141
"__id__": 142
},
"_enabled": true,
"_materials": [
......@@ -7114,13 +7145,13 @@
"_name": "voice_bg",
"_objFlags": 0,
"_parent": {
"__id__": 140
"__id__": 141
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 144
"__id__": 145
}
],
"_prefab": null,
......@@ -7176,7 +7207,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 143
"__id__": 144
},
"_enabled": true,
"_materials": [
......@@ -7208,20 +7239,20 @@
"_name": "catBase",
"_objFlags": 0,
"_parent": {
"__id__": 140
"__id__": 141
},
"_children": [
{
"__id__": 146
"__id__": 147
},
{
"__id__": 148
"__id__": 149
}
],
"_active": false,
"_components": [
{
"__id__": 150
"__id__": 151
}
],
"_prefab": null,
......@@ -7277,13 +7308,13 @@
"_name": "cat",
"_objFlags": 0,
"_parent": {
"__id__": 145
"__id__": 146
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 147
"__id__": 148
}
],
"_prefab": null,
......@@ -7339,7 +7370,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 146
"__id__": 147
},
"_enabled": true,
"_materials": [
......@@ -7379,13 +7410,13 @@
"_name": "catBtn",
"_objFlags": 0,
"_parent": {
"__id__": 145
"__id__": 146
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 149
"__id__": 150
}
],
"_prefab": null,
......@@ -7441,7 +7472,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 148
"__id__": 149
},
"_enabled": true,
"_normalMaterial": null,
......@@ -7509,7 +7540,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 145
"__id__": 146
},
"_enabled": true,
"alignMode": 1,
......@@ -7536,7 +7567,7 @@
"_name": "img",
"_objFlags": 0,
"_parent": {
"__id__": 140
"__id__": 141
},
"_children": [],
"_active": false,
......@@ -7594,20 +7625,20 @@
"_name": "progress",
"_objFlags": 0,
"_parent": {
"__id__": 140
"__id__": 141
},
"_children": [
{
"__id__": 153
"__id__": 154
}
],
"_active": false,
"_components": [
{
"__id__": 155
"__id__": 156
},
{
"__id__": 156
"__id__": 157
}
],
"_prefab": null,
......@@ -7663,13 +7694,13 @@
"_name": "bar",
"_objFlags": 0,
"_parent": {
"__id__": 152
"__id__": 153
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 154
"__id__": 155
}
],
"_prefab": null,
......@@ -7725,7 +7756,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 153
"__id__": 154
},
"_enabled": true,
"_materials": [
......@@ -7757,7 +7788,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 152
"__id__": 153
},
"_enabled": true,
"_materials": [
......@@ -7789,12 +7820,12 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 152
"__id__": 153
},
"_enabled": true,
"_N$totalLength": 787,
"_N$barSprite": {
"__id__": 154
"__id__": 155
},
"_N$mode": 0,
"_N$progress": 1,
......@@ -7806,13 +7837,13 @@
"_name": "bg_light",
"_objFlags": 0,
"_parent": {
"__id__": 140
"__id__": 141
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 158
"__id__": 159
}
],
"_prefab": null,
......@@ -7868,7 +7899,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 157
"__id__": 158
},
"_enabled": true,
"_materials": [
......@@ -7900,13 +7931,13 @@
"_name": "good",
"_objFlags": 0,
"_parent": {
"__id__": 140
"__id__": 141
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 160
"__id__": 161
}
],
"_prefab": null,
......@@ -7962,7 +7993,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 159
"__id__": 160
},
"_enabled": true,
"_materials": [
......@@ -7994,13 +8025,13 @@
"_name": "try",
"_objFlags": 0,
"_parent": {
"__id__": 140
"__id__": 141
},
"_children": [],
"_active": false,
"_components": [
{
"__id__": 162
"__id__": 163
}
],
"_prefab": null,
......@@ -8056,7 +8087,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 161
"__id__": 162
},
"_enabled": true,
"_materials": [
......@@ -8088,7 +8119,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 140
"__id__": 141
},
"_enabled": true,
"alignMode": 1,
......@@ -8121,7 +8152,7 @@
"_active": true,
"_components": [
{
"__id__": 165
"__id__": 166
}
],
"_prefab": null,
......@@ -8177,7 +8208,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 164
"__id__": 165
},
"_enabled": true,
"alignMode": 2,
......@@ -8210,7 +8241,7 @@
"_active": false,
"_components": [
{
"__id__": 167
"__id__": 168
}
],
"_prefab": null,
......@@ -8266,7 +8297,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 166
"__id__": 167
},
"_enabled": true,
"_materials": [
......@@ -8302,23 +8333,23 @@
},
"_children": [
{
"__id__": 169
"__id__": 170
},
{
"__id__": 174
"__id__": 175
}
],
"_active": false,
"_components": [
{
"__id__": 187
"__id__": 188
},
{
"__id__": 188
"__id__": 189
}
],
"_prefab": {
"__id__": 189
"__id__": 190
},
"_opacity": 255,
"_color": {
......@@ -8372,23 +8403,23 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 168
"__id__": 169
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 170
},
{
"__id__": 171
},
{
"__id__": 172
},
{
"__id__": 173
}
],
"_prefab": {
"__id__": 173
"__id__": 174
},
"_opacity": 100,
"_color": {
......@@ -8442,7 +8473,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 169
"__id__": 170
},
"_enabled": true,
"_materials": [
......@@ -8474,7 +8505,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 169
"__id__": 170
},
"_enabled": true,
"alignMode": 2,
......@@ -8501,7 +8532,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 169
"__id__": 170
},
"_enabled": true,
"_normalMaterial": null,
......@@ -8567,7 +8598,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 168
"__id__": 169
},
"asset": {
"__uuid__": "359db7a9-6c66-4325-a51f-831118e6405f"
......@@ -8580,24 +8611,24 @@
"_name": "BtnFrame",
"_objFlags": 0,
"_parent": {
"__id__": 168
"__id__": 169
},
"_children": [
{
"__id__": 175
"__id__": 176
},
{
"__id__": 180
"__id__": 181
}
],
"_active": true,
"_components": [
{
"__id__": 185
"__id__": 186
}
],
"_prefab": {
"__id__": 186
"__id__": 187
},
"_opacity": 255,
"_color": {
......@@ -8651,23 +8682,23 @@
"_name": "BtnExit",
"_objFlags": 0,
"_parent": {
"__id__": 174
"__id__": 175
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 176
},
{
"__id__": 177
},
{
"__id__": 178
},
{
"__id__": 179
}
],
"_prefab": {
"__id__": 179
"__id__": 180
},
"_opacity": 255,
"_color": {
......@@ -8721,7 +8752,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 175
"__id__": 176
},
"_enabled": true,
"_materials": [
......@@ -8753,7 +8784,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 175
"__id__": 176
},
"_enabled": true,
"alignMode": 1,
......@@ -8780,7 +8811,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 175
"__id__": 176
},
"_enabled": true,
"_normalMaterial": null,
......@@ -8846,7 +8877,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 168
"__id__": 169
},
"asset": {
"__uuid__": "359db7a9-6c66-4325-a51f-831118e6405f"
......@@ -8859,23 +8890,23 @@
"_name": "BtnPlayAgain",
"_objFlags": 0,
"_parent": {
"__id__": 174
"__id__": 175
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 181
},
{
"__id__": 182
},
{
"__id__": 183
},
{
"__id__": 184
}
],
"_prefab": {
"__id__": 184
"__id__": 185
},
"_opacity": 255,
"_color": {
......@@ -8929,7 +8960,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 180
"__id__": 181
},
"_enabled": true,
"_materials": [
......@@ -8961,7 +8992,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 180
"__id__": 181
},
"_enabled": true,
"alignMode": 1,
......@@ -8988,7 +9019,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 180
"__id__": 181
},
"_enabled": true,
"_normalMaterial": null,
......@@ -9054,7 +9085,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 168
"__id__": 169
},
"asset": {
"__uuid__": "359db7a9-6c66-4325-a51f-831118e6405f"
......@@ -9067,7 +9098,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 174
"__id__": 175
},
"_enabled": true,
"_materials": [
......@@ -9097,7 +9128,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 168
"__id__": 169
},
"asset": {
"__uuid__": "359db7a9-6c66-4325-a51f-831118e6405f"
......@@ -9110,7 +9141,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 168
"__id__": 169
},
"_enabled": true,
"alignMode": 2,
......@@ -9137,7 +9168,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 168
"__id__": 169
},
"_enabled": true,
"_id": "f1HtC+YZ9Jq7qaM4EidkGP"
......@@ -9145,7 +9176,7 @@
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 168
"__id__": 169
},
"asset": {
"__uuid__": "359db7a9-6c66-4325-a51f-831118e6405f"
......@@ -9189,19 +9220,19 @@
},
"_children": [
{
"__id__": 192
"__id__": 193
},
{
"__id__": 195
"__id__": 196
}
],
"_active": false,
"_components": [
{
"__id__": 204
"__id__": 205
},
{
"__id__": 205
"__id__": 206
}
],
"_prefab": null,
......@@ -9257,16 +9288,16 @@
"_name": "bg",
"_objFlags": 0,
"_parent": {
"__id__": 191
"__id__": 192
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 193
"__id__": 194
},
{
"__id__": 194
"__id__": 195
}
],
"_prefab": null,
......@@ -9322,7 +9353,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 192
"__id__": 193
},
"_enabled": true,
"_materials": [
......@@ -9354,7 +9385,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 192
"__id__": 193
},
"_enabled": true,
"alignMode": 2,
......@@ -9381,23 +9412,23 @@
"_name": "labelBg",
"_objFlags": 0,
"_parent": {
"__id__": 191
"__id__": 192
},
"_children": [
{
"__id__": 196
"__id__": 197
},
{
"__id__": 199
"__id__": 200
}
],
"_active": true,
"_components": [
{
"__id__": 202
"__id__": 203
},
{
"__id__": 203
"__id__": 204
}
],
"_prefab": null,
......@@ -9453,16 +9484,16 @@
"_name": "labelLoss",
"_objFlags": 0,
"_parent": {
"__id__": 195
"__id__": 196
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 197
"__id__": 198
},
{
"__id__": 198
"__id__": 199
}
],
"_prefab": null,
......@@ -9518,7 +9549,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 196
"__id__": 197
},
"_enabled": true,
"_materials": [
......@@ -9550,7 +9581,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 196
"__id__": 197
},
"_enabled": true,
"alignMode": 1,
......@@ -9577,16 +9608,16 @@
"_name": "labelWin",
"_objFlags": 0,
"_parent": {
"__id__": 195
"__id__": 196
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 200
"__id__": 201
},
{
"__id__": 201
"__id__": 202
}
],
"_prefab": null,
......@@ -9642,7 +9673,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 199
"__id__": 200
},
"_enabled": true,
"_materials": [
......@@ -9674,7 +9705,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 199
"__id__": 200
},
"_enabled": true,
"alignMode": 1,
......@@ -9701,7 +9732,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 195
"__id__": 196
},
"_enabled": true,
"_materials": [
......@@ -9733,7 +9764,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 195
"__id__": 196
},
"_enabled": true,
"alignMode": 2,
......@@ -9760,7 +9791,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 191
"__id__": 192
},
"_enabled": true,
"alignMode": 2,
......@@ -9787,7 +9818,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 191
"__id__": 192
},
"_enabled": true,
"_normalMaterial": null,
......@@ -9916,22 +9947,22 @@
},
"_children": [
{
"__id__": 210
"__id__": 211
},
{
"__id__": 212
"__id__": 213
},
{
"__id__": 214
"__id__": 215
},
{
"__id__": 216
"__id__": 217
},
{
"__id__": 218
"__id__": 219
},
{
"__id__": 220
"__id__": 221
}
],
"_active": true,
......@@ -9989,13 +10020,13 @@
"_name": "落子",
"_objFlags": 0,
"_parent": {
"__id__": 209
"__id__": 210
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 211
"__id__": 212
}
],
"_prefab": null,
......@@ -10051,7 +10082,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 210
"__id__": 211
},
"_enabled": true,
"_clip": {
......@@ -10070,13 +10101,13 @@
"_name": "正确",
"_objFlags": 0,
"_parent": {
"__id__": 209
"__id__": 210
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 213
"__id__": 214
}
],
"_prefab": null,
......@@ -10132,7 +10163,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 212
"__id__": 213
},
"_enabled": true,
"_clip": {
......@@ -10151,13 +10182,13 @@
"_name": "失败",
"_objFlags": 0,
"_parent": {
"__id__": 209
"__id__": 210
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 215
"__id__": 216
}
],
"_prefab": null,
......@@ -10213,7 +10244,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 214
"__id__": 215
},
"_enabled": true,
"_clip": {
......@@ -10232,13 +10263,13 @@
"_name": "错误弹回",
"_objFlags": 0,
"_parent": {
"__id__": 209
"__id__": 210
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 217
"__id__": 218
}
],
"_prefab": null,
......@@ -10294,7 +10325,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 216
"__id__": 217
},
"_enabled": true,
"_clip": {
......@@ -10313,13 +10344,13 @@
"_name": "进度条升高",
"_objFlags": 0,
"_parent": {
"__id__": 209
"__id__": 210
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 219
"__id__": 220
}
],
"_prefab": null,
......@@ -10375,7 +10406,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 218
"__id__": 219
},
"_enabled": true,
"_clip": {
......@@ -10394,13 +10425,13 @@
"_name": "胜利",
"_objFlags": 0,
"_parent": {
"__id__": 209
"__id__": 210
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 221
"__id__": 222
}
],
"_prefab": null,
......@@ -10456,7 +10487,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 220
"__id__": 221
},
"_enabled": true,
"_clip": {
......@@ -10479,10 +10510,10 @@
},
"_children": [
{
"__id__": 223
"__id__": 224
},
{
"__id__": 225
"__id__": 226
}
],
"_active": true,
......@@ -10540,13 +10571,13 @@
"_name": "light",
"_objFlags": 0,
"_parent": {
"__id__": 222
"__id__": 223
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 224
"__id__": 225
}
],
"_prefab": null,
......@@ -10602,7 +10633,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 223
"__id__": 224
},
"_enabled": true,
"_materials": [
......@@ -10634,13 +10665,13 @@
"_name": "star",
"_objFlags": 0,
"_parent": {
"__id__": 222
"__id__": 223
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 226
"__id__": 227
}
],
"_prefab": null,
......@@ -10696,7 +10727,7 @@
"_name": "",
"_objFlags": 0,
"node": {
"__id__": 225
"__id__": 226
},
"_enabled": true,
"_materials": [
......
......@@ -588,17 +588,8 @@ export default class SceneComponent extends MyCocosSceneComponent {
}
async pieceFindRightBlock(rightBlock, idx) {
const board = cc.find("Canvas/bg/chessBoard/boardItems");
const color = this._status.current;
const piece = cc.find(`Canvas/bg/chessBoard/piece${color}`);
const prograssbar = cc.find(
`Canvas/bg/Life${color.toLowerCase()}/life_${color.toLowerCase()}/mask/prograssbar`
);
const mask = cc.find(
`Canvas/bg/Life${color.toLowerCase()}/life_${color.toLowerCase()}/mask`
);
let targetHeight =
(idx / (board.children.length - 2)) * prograssbar.height;
// console.log(idx + "_进度条高:" + targetHeight);
const offsetX = { Red: -45, Blue: 45 };
......@@ -643,13 +634,28 @@ export default class SceneComponent extends MyCocosSceneComponent {
piece.stopAllActions();
await this.playLocalAudio("落子");
piece.zIndex = 0;
}
updateProgress(idx) {
const color = this._status.current;
return new Promise(async (resolve, reject) => {
const board = cc.find("Canvas/bg/chessBoard/boardItems");
const prograssbar = cc.find(
`Canvas/bg/Life${color.toLowerCase()}/life_${color.toLowerCase()}/mask/prograssbar`
);
const mask = cc.find(
`Canvas/bg/Life${color.toLowerCase()}/life_${color.toLowerCase()}/mask`
);
let targetHeight =
(idx / (board.children.length - 2)) * prograssbar.height;
const effectNode = cc.find(`Canvas/bg/Life${color.toLowerCase()}/effect`);
effectNode.active = true;
asyncTweenTo(mask, 1, { height: targetHeight }, { easing: "cubicInOut" });
this.playLocalAudio("进度条升高");
await asyncPlayDragonBoneAnimation(effectNode, "normal", 1);
effectNode.active = false;
resolve('');
});
}
updateStatus(status = null) {
......@@ -841,7 +847,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
this.updateStatus(item.data.status);
} else if (item.data.type == "SERVER_playerRoll") {
// console.log("SERVER_playerRoll: " + JSON.stringify(item.data));
const status = this._status;
const status = JSON.parse(JSON.stringify(this._status));
status.letter = item.data.letter;
console.log("status.letter = " + status.letter);
// console.log("item.data.letter = " + item.data.letter);
......@@ -851,7 +857,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
if (idx == -1) {
console.log("error")
}
const startIdx = this._status[this._status.current];
const startIdx = status[status.current];
let nextIdx = startIdx + idx + 1;
// const idx = ["G", "H", "I", "J", "K", "L"].findIndex(
// (letter) => letter == status.letter
......@@ -875,13 +881,13 @@ export default class SceneComponent extends MyCocosSceneComponent {
// const idx = this.getNextRightIdx();
const playerMe = this.allPlayerList.find((player) => player.uuid == this.playerId);
// console.log("idx->" + idx);
if (this._status.current == playerMe.color) {
if (status.current == playerMe.color) {
let rightBlock = this.getRightBlock();
let idx = this.getNextRightIdx();
const pieceRed = cc.find("Canvas/bg/chessBoard/pieceRed");
const pieceBlue = cc.find("Canvas/bg/chessBoard/pieceBlue");
const node = cc.find(
`Canvas/bg/chessBoard/piece${this._status.current}`
`Canvas/bg/chessBoard/piece${status.current}`
);
node["touchStartPos"] = {
nodeX: node.x,
......@@ -889,13 +895,14 @@ export default class SceneComponent extends MyCocosSceneComponent {
touchX: node.x,
touchY: node.y,
};
let lastIdx = this._status[playerMe.color];
let lastIdx = status[playerMe.color];
pieceRed["cantMove"] = false;
pieceBlue["cantMove"] = false;
await this.pieceFindRightBlock(rightBlock, idx);
let isSuccess = await this.showVoice(rightBlock);
this.hideVoice();
if (isSuccess) {
this.updateProgress(idx);
this.networkHelper.sendFrame({
type: "right",
idx: nextIdx,
......@@ -912,6 +919,7 @@ export default class SceneComponent extends MyCocosSceneComponent {
}
}
} else if (item.data.type == "SERVER_playerRight") {
console.log("SERVER_playerRight: " + JSON.stringify(item.data));
const playerMe = this.allPlayerList.find((player) => player.uuid == this.playerId);
if (this._status.current == playerMe.color) {
// let rightBlock = this.getRightBlock();
......@@ -1282,47 +1290,47 @@ export default class SceneComponent extends MyCocosSceneComponent {
});
}
async movePiece(letter, color) {
const offsetX = { Red: -45, Blue: 45 };
const offsetY = { Red: -90, Blue: -90 };
const pieceNode = cc.find(`Canvas/bg/chessBoard/piece${color}`);
const board = cc.find("Canvas/bg/chessBoard/boardItems");
const startIdx = this._status[color];
// async movePiece(letter, color) {
// const offsetX = { Red: -45, Blue: 45 };
// const offsetY = { Red: -90, Blue: -90 };
// const pieceNode = cc.find(`Canvas/bg/chessBoard/piece${color}`);
// const board = cc.find("Canvas/bg/chessBoard/boardItems");
// const startIdx = this._status[color];
for (let i = startIdx + 1; i < board.children.length; i++) {
const targetNode = board.children[i];
const itemData = targetNode.getComponent("BoardGame2_ItemData");
// for (let i = startIdx + 1; i < board.children.length; i++) {
// const targetNode = board.children[i];
// const itemData = targetNode.getComponent("BoardGame2_ItemData");
const prograssbar = cc.find(
`Canvas/bg/Life${color.toLowerCase()}/life_${color.toLowerCase()}/mask/prograssbar`
);
const mask = cc.find(
`Canvas/bg/Life${color.toLowerCase()}/life_${color.toLowerCase()}/mask`
);
const targetHeight = (i / board.children.length) * prograssbar.height;
this.playLocalAudio("movePiece 进度条升高");
cc.tween(mask)
.to(1, { height: targetHeight }, { easing: "cubicInOut" })
.start();
// const prograssbar = cc.find(
// `Canvas/bg/Life${color.toLowerCase()}/life_${color.toLowerCase()}/mask/prograssbar`
// );
// const mask = cc.find(
// `Canvas/bg/Life${color.toLowerCase()}/life_${color.toLowerCase()}/mask`
// );
// const targetHeight = (i / board.children.length) * prograssbar.height;
// this.playLocalAudio("movePiece 进度条升高");
// cc.tween(mask)
// .to(1, { height: targetHeight }, { easing: "cubicInOut" })
// .start();
await asyncTweenTo(
pieceNode,
1,
{
x: targetNode.x + offsetX[color],
y: targetNode.y + offsetY[color],
},
{ easing: "cubicInOut" }
);
// await asyncTweenTo(
// pieceNode,
// 1,
// {
// x: targetNode.x + offsetX[color],
// y: targetNode.y + offsetY[color],
// },
// { easing: "cubicInOut" }
// );
if (itemData.letter.toLowerCase() == letter.toLowerCase()) {
this._status[color] = i;
// if (itemData.letter.toLowerCase() == letter.toLowerCase()) {
// this._status[color] = i;
return;
}
}
this.finish();
}
// return;
// }
// }
// this.finish();
// }
finish() {
// onHomeworkFinish();
......
......@@ -47,10 +47,10 @@ export class AI {
});
} else {
//调试加速 2 Math.random() * 3 + 4
await asyncDelay(Math.random() * 3 + 4);
await asyncDelay(Math.random() * 1 + 10);
const idx = this.getNextRightIdx();
if (Math.random() < 0.8) {
if (Math.random() < 0) {
this.networkHelper.sendFrame({
type: "right",
idx: idx,
......
......@@ -114,7 +114,7 @@ export class GameServer {
this.addPlayer(playerInfo);
}
//TODO:调试加速
}, 10000)//RandomInt(10000, 15000)
}, 1000)//RandomInt(10000, 15000)
);
}
}
......@@ -125,7 +125,7 @@ export class GameServer {
}
if (data.type == "roll") {
const letterList = this.getLetterList();
console.log('letterList: ', letterList);
console.log('server letterList: ', letterList);
if (letterList.length > 0) {
if (this.gameStatus.letter == "") {
// let max = Math.max(9, 0);
......
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