diff --git a/assets/resources/game/heros/a1.prefab b/assets/resources/game/heros/a1.prefab
index ec0dac61..79a78aa1 100644
--- a/assets/resources/game/heros/a1.prefab
+++ b/assets/resources/game/heros/a1.prefab
@@ -25,50 +25,59 @@
"__id__": 8
},
{
- "__id__": 19
+ "__id__": 17
},
{
- "__id__": 32
+ "__id__": 25
},
{
- "__id__": 40
+ "__id__": 37
},
{
- "__id__": 52
+ "__id__": 50
},
{
- "__id__": 65
+ "__id__": 59
},
{
- "__id__": 74
+ "__id__": 69
},
{
- "__id__": 84
+ "__id__": 78
+ },
+ {
+ "__id__": 86
+ },
+ {
+ "__id__": 94
+ },
+ {
+ "__id__": 102
}
],
"_active": true,
"_components": [
{
- "__id__": 93
+ "__id__": 110
},
{
- "__id__": 95
+ "__id__": 112
},
{
- "__id__": 97
+ "__id__": 114
},
{
- "__id__": 99
+ "__id__": 116
},
{
- "__id__": 101
+ "__id__": 118
},
{
- "__id__": 103
+ "__id__": 120
}
],
"_prefab": {
- "__id__": 105
+ "__id__": 122
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -284,9 +293,6 @@
},
{
"__id__": 16
- },
- {
- "__id__": 17
}
],
"removedComponents": []
@@ -363,177 +369,6 @@
],
"value": false
},
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 18
- },
- "propertyPath": [
- "_color"
- ],
- "value": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "73D0ZuTQdMDqn/pimi7d34"
- ]
- },
- {
- "__type__": "cc.Node",
- "_objFlags": 0,
- "_parent": {
- "__id__": 1
- },
- "_prefab": {
- "__id__": 20
- },
- "__editorExtras__": {}
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 19
- },
- "asset": {
- "__uuid__": "198e9c93-3ac9-4564-9d0e-63c9836e509a",
- "__expectedType__": "cc.Prefab"
- },
- "fileId": "54R/aYBglLI4Jn5pm++Jx8",
- "instance": {
- "__id__": 21
- },
- "targetOverrides": null
- },
- {
- "__type__": "cc.PrefabInstance",
- "fileId": "12VQAe3ilGPam5hokpA0Jl",
- "prefabRootNode": {
- "__id__": 1
- },
- "mountedChildren": [],
- "mountedComponents": [],
- "propertyOverrides": [
- {
- "__id__": 22
- },
- {
- "__id__": 24
- },
- {
- "__id__": 26
- },
- {
- "__id__": 28
- },
- {
- "__id__": 30
- }
- ],
- "removedComponents": []
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 23
- },
- "propertyPath": [
- "_name"
- ],
- "value": "buff"
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 25
- },
- "propertyPath": [
- "_lpos"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": -5.532,
- "z": 0
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 27
- },
- "propertyPath": [
- "_lrot"
- ],
- "value": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 29
- },
- "propertyPath": [
- "_euler"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 31
- },
- "propertyPath": [
- "_active"
- ],
- "value": false
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
{
"__type__": "cc.Node",
"_name": "anm",
@@ -546,17 +381,17 @@
"_active": true,
"_components": [
{
- "__id__": 33
+ "__id__": 18
},
{
- "__id__": 35
+ "__id__": 20
},
{
- "__id__": 37
+ "__id__": 22
}
],
"_prefab": {
- "__id__": 39
+ "__id__": 24
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -593,11 +428,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 34
+ "__id__": 19
},
"_contentSize": {
"__type__": "cc.Size",
@@ -621,11 +456,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 36
+ "__id__": 21
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -666,11 +501,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 38
+ "__id__": 23
},
"_id": ""
},
@@ -698,14 +533,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 41
+ "__id__": 26
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 40
+ "__id__": 25
},
"asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -713,7 +548,7 @@
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
- "__id__": 42
+ "__id__": 27
},
"targetOverrides": null
},
@@ -727,25 +562,25 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 43
+ "__id__": 28
},
{
- "__id__": 45
+ "__id__": 30
},
{
- "__id__": 46
+ "__id__": 31
},
{
- "__id__": 47
+ "__id__": 32
},
{
- "__id__": 48
+ "__id__": 33
},
{
- "__id__": 49
+ "__id__": 34
},
{
- "__id__": 51
+ "__id__": 36
}
],
"removedComponents": []
@@ -753,7 +588,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_name"
@@ -769,7 +604,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lpos"
@@ -784,7 +619,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lrot"
@@ -800,7 +635,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_euler"
@@ -815,7 +650,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_active"
@@ -825,7 +660,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 50
+ "__id__": 35
},
"propertyPath": [
"_contentSize"
@@ -845,7 +680,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lscale"
@@ -864,14 +699,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 53
+ "__id__": 38
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 52
+ "__id__": 37
},
"asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -879,7 +714,7 @@
},
"fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": {
- "__id__": 54
+ "__id__": 39
},
"targetOverrides": null
},
@@ -893,25 +728,25 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 55
+ "__id__": 40
},
{
- "__id__": 57
+ "__id__": 42
},
{
- "__id__": 58
+ "__id__": 43
},
{
- "__id__": 59
+ "__id__": 44
},
{
- "__id__": 60
+ "__id__": 45
},
{
- "__id__": 62
+ "__id__": 47
},
{
- "__id__": 63
+ "__id__": 48
}
],
"removedComponents": []
@@ -919,7 +754,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_name"
@@ -935,7 +770,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lpos"
@@ -950,7 +785,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lrot"
@@ -966,7 +801,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_euler"
@@ -981,7 +816,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 61
+ "__id__": 46
},
"propertyPath": [
"_lpos"
@@ -1002,7 +837,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lscale"
@@ -1017,7 +852,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 64
+ "__id__": 49
},
"propertyPath": [
"_active"
@@ -1037,14 +872,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 66
+ "__id__": 51
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 65
+ "__id__": 50
},
"asset": {
"__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -1052,7 +887,7 @@
},
"fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": {
- "__id__": 67
+ "__id__": 52
},
"targetOverrides": null
},
@@ -1066,19 +901,19 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 68
+ "__id__": 53
},
{
- "__id__": 70
+ "__id__": 55
},
{
- "__id__": 71
+ "__id__": 56
},
{
- "__id__": 72
+ "__id__": 57
},
{
- "__id__": 73
+ "__id__": 58
}
],
"removedComponents": []
@@ -1086,7 +921,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 69
+ "__id__": 54
},
"propertyPath": [
"_name"
@@ -1102,7 +937,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 69
+ "__id__": 54
},
"propertyPath": [
"_lpos"
@@ -1117,7 +952,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 69
+ "__id__": 54
},
"propertyPath": [
"_lrot"
@@ -1133,7 +968,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 69
+ "__id__": 54
},
"propertyPath": [
"_euler"
@@ -1148,7 +983,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 69
+ "__id__": 54
},
"propertyPath": [
"_active"
@@ -1162,14 +997,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 75
+ "__id__": 60
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 74
+ "__id__": 59
},
"asset": {
"__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a",
@@ -1177,7 +1012,7 @@
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
- "__id__": 76
+ "__id__": 61
},
"targetOverrides": null
},
@@ -1191,22 +1026,22 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 77
+ "__id__": 62
},
{
- "__id__": 79
+ "__id__": 64
},
{
- "__id__": 80
+ "__id__": 65
},
{
- "__id__": 81
+ "__id__": 66
},
{
- "__id__": 82
+ "__id__": 67
},
{
- "__id__": 83
+ "__id__": 68
}
],
"removedComponents": []
@@ -1214,7 +1049,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 78
+ "__id__": 63
},
"propertyPath": [
"_name"
@@ -1230,7 +1065,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 78
+ "__id__": 63
},
"propertyPath": [
"_lpos"
@@ -1245,7 +1080,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 78
+ "__id__": 63
},
"propertyPath": [
"_lrot"
@@ -1261,7 +1096,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 78
+ "__id__": 63
},
"propertyPath": [
"_euler"
@@ -1276,7 +1111,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 78
+ "__id__": 63
},
"propertyPath": [
"_lscale"
@@ -1291,7 +1126,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 78
+ "__id__": 63
},
"propertyPath": [
"_active"
@@ -1305,14 +1140,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 85
+ "__id__": 70
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 84
+ "__id__": 69
},
"asset": {
"__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -1320,7 +1155,7 @@
},
"fileId": "91yoyAQGNDm5ziI7NUChZ+",
"instance": {
- "__id__": 86
+ "__id__": 71
},
"targetOverrides": null
},
@@ -1334,19 +1169,19 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 87
+ "__id__": 72
},
{
- "__id__": 89
+ "__id__": 74
},
{
- "__id__": 90
+ "__id__": 75
},
{
- "__id__": 91
+ "__id__": 76
},
{
- "__id__": 92
+ "__id__": 77
}
],
"removedComponents": []
@@ -1354,7 +1189,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 88
+ "__id__": 73
},
"propertyPath": [
"_name"
@@ -1370,7 +1205,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 88
+ "__id__": 73
},
"propertyPath": [
"_lpos"
@@ -1385,7 +1220,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 88
+ "__id__": 73
},
"propertyPath": [
"_lrot"
@@ -1401,7 +1236,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 88
+ "__id__": 73
},
"propertyPath": [
"_euler"
@@ -1416,13 +1251,461 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 88
+ "__id__": 73
},
"propertyPath": [
"_active"
],
"value": false
},
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 79
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 78
+ },
+ "asset": {
+ "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "733PKzwANLyJWD2ume4u5f",
+ "instance": {
+ "__id__": 80
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "bceoX0Ix5CUKCNnNIdZKmo",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 81
+ },
+ {
+ "__id__": 83
+ },
+ {
+ "__id__": 84
+ },
+ {
+ "__id__": 85
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 82
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "wind"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "733PKzwANLyJWD2ume4u5f"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 82
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 82
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 82
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 87
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 86
+ },
+ "asset": {
+ "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "65v9q/98dMjafRlb094Ctr",
+ "instance": {
+ "__id__": 88
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "99lGu+sOZDjaBpcxSAxHlP",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 89
+ },
+ {
+ "__id__": 91
+ },
+ {
+ "__id__": 92
+ },
+ {
+ "__id__": 93
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 90
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "buff"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "65v9q/98dMjafRlb094Ctr"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 90
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 90
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 90
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 95
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 94
+ },
+ "asset": {
+ "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "d9UYSvjCpD24d1H7HhaHEv",
+ "instance": {
+ "__id__": 96
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "0ewDiapJpAYLaWH2R6lXxr",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 97
+ },
+ {
+ "__id__": 99
+ },
+ {
+ "__id__": 100
+ },
+ {
+ "__id__": 101
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 98
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "iced"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "d9UYSvjCpD24d1H7HhaHEv"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 98
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 98
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 98
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 103
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 102
+ },
+ "asset": {
+ "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "afovdb7bBEUpz+8xJHMv4X",
+ "instance": {
+ "__id__": 104
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "6b9aHiCxROPbUBWUnq7xb+",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 105
+ },
+ {
+ "__id__": 107
+ },
+ {
+ "__id__": 108
+ },
+ {
+ "__id__": 109
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 106
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "yun"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "afovdb7bBEUpz+8xJHMv4X"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 106
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 87.398,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 106
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 106
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
{
"__type__": "cc.UITransform",
"_name": "",
@@ -1433,7 +1716,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 94
+ "__id__": 111
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1461,7 +1744,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 96
+ "__id__": 113
},
"enabledContactListener": true,
"bullet": true,
@@ -1495,7 +1778,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 98
+ "__id__": 115
},
"tag": 0,
"_group": 4,
@@ -1529,10 +1812,10 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 100
+ "__id__": 117
},
"anm": {
- "__id__": 37
+ "__id__": 22
},
"_id": ""
},
@@ -1550,7 +1833,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 102
+ "__id__": 119
},
"_id": ""
},
@@ -1568,7 +1851,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 104
+ "__id__": 121
},
"_id": ""
},
@@ -1589,22 +1872,31 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
{
- "__id__": 84
+ "__id__": 102
},
{
- "__id__": 74
+ "__id__": 94
},
{
- "__id__": 65
+ "__id__": 86
},
{
- "__id__": 52
+ "__id__": 78
},
{
- "__id__": 40
+ "__id__": 69
},
{
- "__id__": 19
+ "__id__": 59
+ },
+ {
+ "__id__": 50
+ },
+ {
+ "__id__": 37
+ },
+ {
+ "__id__": 25
},
{
"__id__": 8
diff --git a/assets/resources/game/heros/a2.prefab b/assets/resources/game/heros/a2.prefab
index 56ef548d..c6379130 100644
--- a/assets/resources/game/heros/a2.prefab
+++ b/assets/resources/game/heros/a2.prefab
@@ -25,50 +25,59 @@
"__id__": 8
},
{
- "__id__": 19
+ "__id__": 17
},
{
- "__id__": 32
+ "__id__": 25
},
{
- "__id__": 40
+ "__id__": 37
},
{
- "__id__": 52
+ "__id__": 48
},
{
- "__id__": 63
+ "__id__": 57
},
{
- "__id__": 72
+ "__id__": 67
},
{
- "__id__": 82
+ "__id__": 76
+ },
+ {
+ "__id__": 84
+ },
+ {
+ "__id__": 92
+ },
+ {
+ "__id__": 100
}
],
"_active": true,
"_components": [
{
- "__id__": 91
+ "__id__": 108
},
{
- "__id__": 93
+ "__id__": 110
},
{
- "__id__": 95
+ "__id__": 112
},
{
- "__id__": 97
+ "__id__": 114
},
{
- "__id__": 99
+ "__id__": 116
},
{
- "__id__": 101
+ "__id__": 118
}
],
"_prefab": {
- "__id__": 103
+ "__id__": 120
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -284,9 +293,6 @@
},
{
"__id__": 16
- },
- {
- "__id__": 17
}
],
"removedComponents": []
@@ -363,177 +369,6 @@
],
"value": false
},
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 18
- },
- "propertyPath": [
- "_color"
- ],
- "value": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "73D0ZuTQdMDqn/pimi7d34"
- ]
- },
- {
- "__type__": "cc.Node",
- "_objFlags": 0,
- "_parent": {
- "__id__": 1
- },
- "_prefab": {
- "__id__": 20
- },
- "__editorExtras__": {}
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 19
- },
- "asset": {
- "__uuid__": "198e9c93-3ac9-4564-9d0e-63c9836e509a",
- "__expectedType__": "cc.Prefab"
- },
- "fileId": "54R/aYBglLI4Jn5pm++Jx8",
- "instance": {
- "__id__": 21
- },
- "targetOverrides": null
- },
- {
- "__type__": "cc.PrefabInstance",
- "fileId": "12VQAe3ilGPam5hokpA0Jl",
- "prefabRootNode": {
- "__id__": 1
- },
- "mountedChildren": [],
- "mountedComponents": [],
- "propertyOverrides": [
- {
- "__id__": 22
- },
- {
- "__id__": 24
- },
- {
- "__id__": 26
- },
- {
- "__id__": 28
- },
- {
- "__id__": 30
- }
- ],
- "removedComponents": []
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 23
- },
- "propertyPath": [
- "_name"
- ],
- "value": "buff"
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 25
- },
- "propertyPath": [
- "_lpos"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": -5.532,
- "z": 0
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 27
- },
- "propertyPath": [
- "_lrot"
- ],
- "value": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 29
- },
- "propertyPath": [
- "_euler"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 31
- },
- "propertyPath": [
- "_active"
- ],
- "value": false
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
{
"__type__": "cc.Node",
"_name": "anm",
@@ -546,17 +381,17 @@
"_active": true,
"_components": [
{
- "__id__": 33
+ "__id__": 18
},
{
- "__id__": 35
+ "__id__": 20
},
{
- "__id__": 37
+ "__id__": 22
}
],
"_prefab": {
- "__id__": 39
+ "__id__": 24
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -593,11 +428,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 34
+ "__id__": 19
},
"_contentSize": {
"__type__": "cc.Size",
@@ -621,11 +456,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 36
+ "__id__": 21
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -666,11 +501,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 38
+ "__id__": 23
},
"_id": ""
},
@@ -698,14 +533,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 41
+ "__id__": 26
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 40
+ "__id__": 25
},
"asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -713,7 +548,7 @@
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
- "__id__": 42
+ "__id__": 27
},
"targetOverrides": null
},
@@ -727,25 +562,25 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 43
+ "__id__": 28
},
{
- "__id__": 45
+ "__id__": 30
},
{
- "__id__": 46
+ "__id__": 31
},
{
- "__id__": 47
+ "__id__": 32
},
{
- "__id__": 48
+ "__id__": 33
},
{
- "__id__": 49
+ "__id__": 34
},
{
- "__id__": 51
+ "__id__": 36
}
],
"removedComponents": []
@@ -753,7 +588,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_name"
@@ -769,7 +604,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lpos"
@@ -784,7 +619,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lrot"
@@ -800,7 +635,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_euler"
@@ -815,7 +650,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_active"
@@ -825,7 +660,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 50
+ "__id__": 35
},
"propertyPath": [
"_contentSize"
@@ -845,7 +680,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lscale"
@@ -864,14 +699,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 53
+ "__id__": 38
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 52
+ "__id__": 37
},
"asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -879,7 +714,7 @@
},
"fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": {
- "__id__": 54
+ "__id__": 39
},
"targetOverrides": null
},
@@ -893,22 +728,22 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 55
+ "__id__": 40
},
{
- "__id__": 57
+ "__id__": 42
},
{
- "__id__": 58
+ "__id__": 43
},
{
- "__id__": 59
+ "__id__": 44
},
{
- "__id__": 60
+ "__id__": 45
},
{
- "__id__": 62
+ "__id__": 47
}
],
"removedComponents": []
@@ -916,7 +751,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_name"
@@ -932,7 +767,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lpos"
@@ -947,7 +782,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lrot"
@@ -963,7 +798,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_euler"
@@ -978,7 +813,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 61
+ "__id__": 46
},
"propertyPath": [
"_lpos"
@@ -999,7 +834,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lscale"
@@ -1018,14 +853,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 64
+ "__id__": 49
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 63
+ "__id__": 48
},
"asset": {
"__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -1033,7 +868,7 @@
},
"fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": {
- "__id__": 65
+ "__id__": 50
},
"targetOverrides": null
},
@@ -1047,19 +882,19 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 66
+ "__id__": 51
},
{
- "__id__": 68
+ "__id__": 53
},
{
- "__id__": 69
+ "__id__": 54
},
{
- "__id__": 70
+ "__id__": 55
},
{
- "__id__": 71
+ "__id__": 56
}
],
"removedComponents": []
@@ -1067,7 +902,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_name"
@@ -1083,7 +918,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_lpos"
@@ -1098,7 +933,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_lrot"
@@ -1114,7 +949,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_euler"
@@ -1129,7 +964,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_active"
@@ -1143,14 +978,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 73
+ "__id__": 58
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 72
+ "__id__": 57
},
"asset": {
"__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a",
@@ -1158,7 +993,7 @@
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
- "__id__": 74
+ "__id__": 59
},
"targetOverrides": null
},
@@ -1172,22 +1007,22 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 75
+ "__id__": 60
},
{
- "__id__": 77
+ "__id__": 62
},
{
- "__id__": 78
+ "__id__": 63
},
{
- "__id__": 79
+ "__id__": 64
},
{
- "__id__": 80
+ "__id__": 65
},
{
- "__id__": 81
+ "__id__": 66
}
],
"removedComponents": []
@@ -1195,7 +1030,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_name"
@@ -1211,7 +1046,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_lpos"
@@ -1226,7 +1061,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_lrot"
@@ -1242,7 +1077,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_euler"
@@ -1257,7 +1092,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_lscale"
@@ -1272,7 +1107,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_active"
@@ -1286,14 +1121,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 83
+ "__id__": 68
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 82
+ "__id__": 67
},
"asset": {
"__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -1301,7 +1136,7 @@
},
"fileId": "91yoyAQGNDm5ziI7NUChZ+",
"instance": {
- "__id__": 84
+ "__id__": 69
},
"targetOverrides": null
},
@@ -1315,19 +1150,19 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 85
+ "__id__": 70
},
{
- "__id__": 87
+ "__id__": 72
},
{
- "__id__": 88
+ "__id__": 73
},
{
- "__id__": 89
+ "__id__": 74
},
{
- "__id__": 90
+ "__id__": 75
}
],
"removedComponents": []
@@ -1335,7 +1170,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_name"
@@ -1351,7 +1186,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_lpos"
@@ -1366,7 +1201,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_lrot"
@@ -1382,7 +1217,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_euler"
@@ -1397,13 +1232,461 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_active"
],
"value": false
},
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 77
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 76
+ },
+ "asset": {
+ "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "733PKzwANLyJWD2ume4u5f",
+ "instance": {
+ "__id__": 78
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "dcjZtPbqhLd7LRI5Ofdtr7",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 79
+ },
+ {
+ "__id__": 81
+ },
+ {
+ "__id__": 82
+ },
+ {
+ "__id__": 83
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "wind"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "733PKzwANLyJWD2ume4u5f"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 85
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 84
+ },
+ "asset": {
+ "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "65v9q/98dMjafRlb094Ctr",
+ "instance": {
+ "__id__": 86
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "19j1Knx7tMJYHZs6Vpx2Et",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 87
+ },
+ {
+ "__id__": 89
+ },
+ {
+ "__id__": 90
+ },
+ {
+ "__id__": 91
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "buff"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "65v9q/98dMjafRlb094Ctr"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 93
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 92
+ },
+ "asset": {
+ "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "d9UYSvjCpD24d1H7HhaHEv",
+ "instance": {
+ "__id__": 94
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "19vIMfRaJFYqJrmnPMgqT7",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 95
+ },
+ {
+ "__id__": 97
+ },
+ {
+ "__id__": 98
+ },
+ {
+ "__id__": 99
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "iced"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "d9UYSvjCpD24d1H7HhaHEv"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 101
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 100
+ },
+ "asset": {
+ "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "afovdb7bBEUpz+8xJHMv4X",
+ "instance": {
+ "__id__": 102
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "ec2znuxyxNpKybyUExk/2a",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 103
+ },
+ {
+ "__id__": 105
+ },
+ {
+ "__id__": 106
+ },
+ {
+ "__id__": 107
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "yun"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "afovdb7bBEUpz+8xJHMv4X"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 87.398,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
{
"__type__": "cc.UITransform",
"_name": "",
@@ -1414,7 +1697,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 92
+ "__id__": 109
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1442,7 +1725,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 94
+ "__id__": 111
},
"enabledContactListener": true,
"bullet": true,
@@ -1476,7 +1759,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 96
+ "__id__": 113
},
"tag": 0,
"_group": 4,
@@ -1510,10 +1793,10 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 98
+ "__id__": 115
},
"anm": {
- "__id__": 37
+ "__id__": 22
},
"_id": ""
},
@@ -1531,7 +1814,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 100
+ "__id__": 117
},
"_id": ""
},
@@ -1549,7 +1832,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 102
+ "__id__": 119
},
"_id": ""
},
@@ -1570,22 +1853,31 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
{
- "__id__": 82
+ "__id__": 100
},
{
- "__id__": 72
+ "__id__": 92
},
{
- "__id__": 63
+ "__id__": 84
},
{
- "__id__": 52
+ "__id__": 76
},
{
- "__id__": 40
+ "__id__": 67
},
{
- "__id__": 19
+ "__id__": 57
+ },
+ {
+ "__id__": 48
+ },
+ {
+ "__id__": 37
+ },
+ {
+ "__id__": 25
},
{
"__id__": 8
diff --git a/assets/resources/game/heros/a3.prefab b/assets/resources/game/heros/a3.prefab
index ddf46de5..558c3164 100644
--- a/assets/resources/game/heros/a3.prefab
+++ b/assets/resources/game/heros/a3.prefab
@@ -25,50 +25,59 @@
"__id__": 8
},
{
- "__id__": 19
+ "__id__": 17
},
{
- "__id__": 32
+ "__id__": 25
},
{
- "__id__": 40
+ "__id__": 37
},
{
- "__id__": 52
+ "__id__": 48
},
{
- "__id__": 63
+ "__id__": 57
},
{
- "__id__": 72
+ "__id__": 67
},
{
- "__id__": 82
- }
- ],
- "_active": true,
- "_components": [
+ "__id__": 76
+ },
{
- "__id__": 91
+ "__id__": 84
},
{
"__id__": 93
},
{
- "__id__": 95
+ "__id__": 102
+ }
+ ],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 111
},
{
- "__id__": 97
+ "__id__": 113
},
{
- "__id__": 99
+ "__id__": 115
},
{
- "__id__": 101
+ "__id__": 117
+ },
+ {
+ "__id__": 119
+ },
+ {
+ "__id__": 121
}
],
"_prefab": {
- "__id__": 103
+ "__id__": 123
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -284,9 +293,6 @@
},
{
"__id__": 16
- },
- {
- "__id__": 17
}
],
"removedComponents": []
@@ -363,177 +369,6 @@
],
"value": false
},
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 18
- },
- "propertyPath": [
- "_color"
- ],
- "value": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "73D0ZuTQdMDqn/pimi7d34"
- ]
- },
- {
- "__type__": "cc.Node",
- "_objFlags": 0,
- "_parent": {
- "__id__": 1
- },
- "_prefab": {
- "__id__": 20
- },
- "__editorExtras__": {}
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 19
- },
- "asset": {
- "__uuid__": "198e9c93-3ac9-4564-9d0e-63c9836e509a",
- "__expectedType__": "cc.Prefab"
- },
- "fileId": "54R/aYBglLI4Jn5pm++Jx8",
- "instance": {
- "__id__": 21
- },
- "targetOverrides": null
- },
- {
- "__type__": "cc.PrefabInstance",
- "fileId": "12VQAe3ilGPam5hokpA0Jl",
- "prefabRootNode": {
- "__id__": 1
- },
- "mountedChildren": [],
- "mountedComponents": [],
- "propertyOverrides": [
- {
- "__id__": 22
- },
- {
- "__id__": 24
- },
- {
- "__id__": 26
- },
- {
- "__id__": 28
- },
- {
- "__id__": 30
- }
- ],
- "removedComponents": []
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 23
- },
- "propertyPath": [
- "_name"
- ],
- "value": "buff"
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 25
- },
- "propertyPath": [
- "_lpos"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": -5.532,
- "z": 0
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 27
- },
- "propertyPath": [
- "_lrot"
- ],
- "value": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 29
- },
- "propertyPath": [
- "_euler"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 31
- },
- "propertyPath": [
- "_active"
- ],
- "value": false
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
{
"__type__": "cc.Node",
"_name": "anm",
@@ -546,17 +381,17 @@
"_active": true,
"_components": [
{
- "__id__": 33
+ "__id__": 18
},
{
- "__id__": 35
+ "__id__": 20
},
{
- "__id__": 37
+ "__id__": 22
}
],
"_prefab": {
- "__id__": 39
+ "__id__": 24
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -593,11 +428,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 34
+ "__id__": 19
},
"_contentSize": {
"__type__": "cc.Size",
@@ -621,11 +456,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 36
+ "__id__": 21
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -666,11 +501,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 38
+ "__id__": 23
},
"_id": ""
},
@@ -698,14 +533,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 41
+ "__id__": 26
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 40
+ "__id__": 25
},
"asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -713,7 +548,7 @@
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
- "__id__": 42
+ "__id__": 27
},
"targetOverrides": null
},
@@ -727,25 +562,25 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 43
+ "__id__": 28
},
{
- "__id__": 45
+ "__id__": 30
},
{
- "__id__": 46
+ "__id__": 31
},
{
- "__id__": 47
+ "__id__": 32
},
{
- "__id__": 48
+ "__id__": 33
},
{
- "__id__": 49
+ "__id__": 34
},
{
- "__id__": 51
+ "__id__": 36
}
],
"removedComponents": []
@@ -753,7 +588,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_name"
@@ -769,7 +604,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lpos"
@@ -784,7 +619,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lrot"
@@ -800,7 +635,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_euler"
@@ -815,7 +650,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_active"
@@ -825,7 +660,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 50
+ "__id__": 35
},
"propertyPath": [
"_contentSize"
@@ -845,7 +680,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lscale"
@@ -864,14 +699,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 53
+ "__id__": 38
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 52
+ "__id__": 37
},
"asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -879,7 +714,7 @@
},
"fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": {
- "__id__": 54
+ "__id__": 39
},
"targetOverrides": null
},
@@ -893,22 +728,22 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 55
+ "__id__": 40
},
{
- "__id__": 57
+ "__id__": 42
},
{
- "__id__": 58
+ "__id__": 43
},
{
- "__id__": 59
+ "__id__": 44
},
{
- "__id__": 60
+ "__id__": 45
},
{
- "__id__": 62
+ "__id__": 47
}
],
"removedComponents": []
@@ -916,7 +751,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_name"
@@ -932,7 +767,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lpos"
@@ -947,7 +782,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lrot"
@@ -963,7 +798,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_euler"
@@ -978,7 +813,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 61
+ "__id__": 46
},
"propertyPath": [
"_lpos"
@@ -999,7 +834,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lscale"
@@ -1018,14 +853,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 64
+ "__id__": 49
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 63
+ "__id__": 48
},
"asset": {
"__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -1033,7 +868,7 @@
},
"fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": {
- "__id__": 65
+ "__id__": 50
},
"targetOverrides": null
},
@@ -1047,19 +882,19 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 66
+ "__id__": 51
},
{
- "__id__": 68
+ "__id__": 53
},
{
- "__id__": 69
+ "__id__": 54
},
{
- "__id__": 70
+ "__id__": 55
},
{
- "__id__": 71
+ "__id__": 56
}
],
"removedComponents": []
@@ -1067,7 +902,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_name"
@@ -1083,7 +918,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_lpos"
@@ -1098,7 +933,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_lrot"
@@ -1114,7 +949,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_euler"
@@ -1129,7 +964,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_active"
@@ -1143,14 +978,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 73
+ "__id__": 58
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 72
+ "__id__": 57
},
"asset": {
"__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a",
@@ -1158,7 +993,7 @@
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
- "__id__": 74
+ "__id__": 59
},
"targetOverrides": null
},
@@ -1172,22 +1007,22 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 75
+ "__id__": 60
},
{
- "__id__": 77
+ "__id__": 62
},
{
- "__id__": 78
+ "__id__": 63
},
{
- "__id__": 79
+ "__id__": 64
},
{
- "__id__": 80
+ "__id__": 65
},
{
- "__id__": 81
+ "__id__": 66
}
],
"removedComponents": []
@@ -1195,7 +1030,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_name"
@@ -1211,7 +1046,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_lpos"
@@ -1226,7 +1061,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_lrot"
@@ -1242,7 +1077,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_euler"
@@ -1257,7 +1092,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_lscale"
@@ -1272,7 +1107,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_active"
@@ -1286,14 +1121,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 83
+ "__id__": 68
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 82
+ "__id__": 67
},
"asset": {
"__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -1301,7 +1136,7 @@
},
"fileId": "91yoyAQGNDm5ziI7NUChZ+",
"instance": {
- "__id__": 84
+ "__id__": 69
},
"targetOverrides": null
},
@@ -1315,19 +1150,19 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 85
+ "__id__": 70
},
{
- "__id__": 87
+ "__id__": 72
},
{
- "__id__": 88
+ "__id__": 73
},
{
- "__id__": 89
+ "__id__": 74
},
{
- "__id__": 90
+ "__id__": 75
}
],
"removedComponents": []
@@ -1335,7 +1170,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_name"
@@ -1351,7 +1186,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_lpos"
@@ -1366,7 +1201,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_lrot"
@@ -1382,7 +1217,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_euler"
@@ -1397,8 +1232,495 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
+ "__id__": 71
+ },
+ "propertyPath": [
+ "_active"
+ ],
+ "value": false
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 77
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 76
+ },
+ "asset": {
+ "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "733PKzwANLyJWD2ume4u5f",
+ "instance": {
+ "__id__": 78
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "bberDW5uVI9LIIaIMnA/2E",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 79
+ },
+ {
+ "__id__": 81
+ },
+ {
+ "__id__": 82
+ },
+ {
+ "__id__": 83
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "wind"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "733PKzwANLyJWD2ume4u5f"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 85
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 84
+ },
+ "asset": {
+ "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "65v9q/98dMjafRlb094Ctr",
+ "instance": {
"__id__": 86
},
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "e2pEwe/wJPEp3j+VexsgH9",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 87
+ },
+ {
+ "__id__": 89
+ },
+ {
+ "__id__": 90
+ },
+ {
+ "__id__": 91
+ },
+ {
+ "__id__": 92
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "buff"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "65v9q/98dMjafRlb094Ctr"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_active"
+ ],
+ "value": false
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 94
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 93
+ },
+ "asset": {
+ "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "d9UYSvjCpD24d1H7HhaHEv",
+ "instance": {
+ "__id__": 95
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "12NBcnkm1MCJPEHzAM2nRn",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 96
+ },
+ {
+ "__id__": 98
+ },
+ {
+ "__id__": 99
+ },
+ {
+ "__id__": 100
+ },
+ {
+ "__id__": 101
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 97
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "iced"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "d9UYSvjCpD24d1H7HhaHEv"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 97
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 97
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 97
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 97
+ },
+ "propertyPath": [
+ "_active"
+ ],
+ "value": false
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 103
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 102
+ },
+ "asset": {
+ "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "afovdb7bBEUpz+8xJHMv4X",
+ "instance": {
+ "__id__": 104
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "4aLAZnmcZAM7K1Wqp9ZP8J",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 105
+ },
+ {
+ "__id__": 107
+ },
+ {
+ "__id__": 108
+ },
+ {
+ "__id__": 109
+ },
+ {
+ "__id__": 110
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 106
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "yun"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "afovdb7bBEUpz+8xJHMv4X"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 106
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 87.398,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 106
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 106
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 106
+ },
"propertyPath": [
"_active"
],
@@ -1414,7 +1736,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 92
+ "__id__": 112
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1442,7 +1764,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 94
+ "__id__": 114
},
"enabledContactListener": true,
"bullet": true,
@@ -1476,7 +1798,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 96
+ "__id__": 116
},
"tag": 0,
"_group": 4,
@@ -1510,10 +1832,10 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 98
+ "__id__": 118
},
"anm": {
- "__id__": 37
+ "__id__": 22
},
"_id": ""
},
@@ -1531,7 +1853,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 100
+ "__id__": 120
},
"_id": ""
},
@@ -1549,7 +1871,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 102
+ "__id__": 122
},
"_id": ""
},
@@ -1570,22 +1892,31 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
{
- "__id__": 82
+ "__id__": 102
},
{
- "__id__": 72
+ "__id__": 93
},
{
- "__id__": 63
+ "__id__": 84
},
{
- "__id__": 52
+ "__id__": 76
},
{
- "__id__": 40
+ "__id__": 67
},
{
- "__id__": 19
+ "__id__": 57
+ },
+ {
+ "__id__": 48
+ },
+ {
+ "__id__": 37
+ },
+ {
+ "__id__": 25
},
{
"__id__": 8
diff --git a/assets/resources/game/heros/k1.prefab b/assets/resources/game/heros/k1.prefab
index 66f4bf66..454b7dda 100644
--- a/assets/resources/game/heros/k1.prefab
+++ b/assets/resources/game/heros/k1.prefab
@@ -25,53 +25,59 @@
"__id__": 8
},
{
- "__id__": 19
+ "__id__": 17
},
{
- "__id__": 32
+ "__id__": 25
},
{
- "__id__": 40
+ "__id__": 37
},
{
- "__id__": 52
+ "__id__": 48
},
{
- "__id__": 63
+ "__id__": 57
},
{
- "__id__": 72
+ "__id__": 67
},
{
- "__id__": 82
+ "__id__": 76
},
{
- "__id__": 91
+ "__id__": 84
+ },
+ {
+ "__id__": 92
+ },
+ {
+ "__id__": 100
}
],
"_active": true,
"_components": [
{
- "__id__": 99
+ "__id__": 108
},
{
- "__id__": 101
+ "__id__": 110
},
{
- "__id__": 103
+ "__id__": 112
},
{
- "__id__": 105
+ "__id__": 114
},
{
- "__id__": 107
+ "__id__": 116
},
{
- "__id__": 109
+ "__id__": 118
}
],
"_prefab": {
- "__id__": 111
+ "__id__": 120
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -287,9 +293,6 @@
},
{
"__id__": 16
- },
- {
- "__id__": 17
}
],
"removedComponents": []
@@ -366,177 +369,6 @@
],
"value": false
},
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 18
- },
- "propertyPath": [
- "_color"
- ],
- "value": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "73D0ZuTQdMDqn/pimi7d34"
- ]
- },
- {
- "__type__": "cc.Node",
- "_objFlags": 0,
- "_parent": {
- "__id__": 1
- },
- "_prefab": {
- "__id__": 20
- },
- "__editorExtras__": {}
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 19
- },
- "asset": {
- "__uuid__": "198e9c93-3ac9-4564-9d0e-63c9836e509a",
- "__expectedType__": "cc.Prefab"
- },
- "fileId": "54R/aYBglLI4Jn5pm++Jx8",
- "instance": {
- "__id__": 21
- },
- "targetOverrides": null
- },
- {
- "__type__": "cc.PrefabInstance",
- "fileId": "12VQAe3ilGPam5hokpA0Jl",
- "prefabRootNode": {
- "__id__": 1
- },
- "mountedChildren": [],
- "mountedComponents": [],
- "propertyOverrides": [
- {
- "__id__": 22
- },
- {
- "__id__": 24
- },
- {
- "__id__": 26
- },
- {
- "__id__": 28
- },
- {
- "__id__": 30
- }
- ],
- "removedComponents": []
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 23
- },
- "propertyPath": [
- "_name"
- ],
- "value": "buff"
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 25
- },
- "propertyPath": [
- "_lpos"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": -5.532,
- "z": 0
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 27
- },
- "propertyPath": [
- "_lrot"
- ],
- "value": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 29
- },
- "propertyPath": [
- "_euler"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 31
- },
- "propertyPath": [
- "_active"
- ],
- "value": false
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
{
"__type__": "cc.Node",
"_name": "anm",
@@ -549,17 +381,17 @@
"_active": true,
"_components": [
{
- "__id__": 33
+ "__id__": 18
},
{
- "__id__": 35
+ "__id__": 20
},
{
- "__id__": 37
+ "__id__": 22
}
],
"_prefab": {
- "__id__": 39
+ "__id__": 24
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -596,11 +428,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 34
+ "__id__": 19
},
"_contentSize": {
"__type__": "cc.Size",
@@ -624,11 +456,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 36
+ "__id__": 21
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -669,11 +501,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 38
+ "__id__": 23
},
"_id": ""
},
@@ -701,14 +533,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 41
+ "__id__": 26
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 40
+ "__id__": 25
},
"asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -716,7 +548,7 @@
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
- "__id__": 42
+ "__id__": 27
},
"targetOverrides": null
},
@@ -730,25 +562,25 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 43
+ "__id__": 28
},
{
- "__id__": 45
+ "__id__": 30
},
{
- "__id__": 46
+ "__id__": 31
},
{
- "__id__": 47
+ "__id__": 32
},
{
- "__id__": 48
+ "__id__": 33
},
{
- "__id__": 49
+ "__id__": 34
},
{
- "__id__": 51
+ "__id__": 36
}
],
"removedComponents": []
@@ -756,7 +588,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_name"
@@ -772,7 +604,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lpos"
@@ -787,7 +619,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lrot"
@@ -803,7 +635,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_euler"
@@ -818,7 +650,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_active"
@@ -828,7 +660,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 50
+ "__id__": 35
},
"propertyPath": [
"_contentSize"
@@ -848,7 +680,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lscale"
@@ -867,14 +699,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 53
+ "__id__": 38
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 52
+ "__id__": 37
},
"asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -882,7 +714,7 @@
},
"fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": {
- "__id__": 54
+ "__id__": 39
},
"targetOverrides": null
},
@@ -896,22 +728,22 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 55
+ "__id__": 40
},
{
- "__id__": 57
+ "__id__": 42
},
{
- "__id__": 58
+ "__id__": 43
},
{
- "__id__": 59
+ "__id__": 44
},
{
- "__id__": 60
+ "__id__": 45
},
{
- "__id__": 62
+ "__id__": 47
}
],
"removedComponents": []
@@ -919,7 +751,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_name"
@@ -935,7 +767,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lpos"
@@ -950,7 +782,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lrot"
@@ -966,7 +798,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_euler"
@@ -981,7 +813,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 61
+ "__id__": 46
},
"propertyPath": [
"_lpos"
@@ -1002,7 +834,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lscale"
@@ -1021,14 +853,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 64
+ "__id__": 49
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 63
+ "__id__": 48
},
"asset": {
"__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -1036,7 +868,7 @@
},
"fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": {
- "__id__": 65
+ "__id__": 50
},
"targetOverrides": null
},
@@ -1050,19 +882,19 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 66
+ "__id__": 51
},
{
- "__id__": 68
+ "__id__": 53
},
{
- "__id__": 69
+ "__id__": 54
},
{
- "__id__": 70
+ "__id__": 55
},
{
- "__id__": 71
+ "__id__": 56
}
],
"removedComponents": []
@@ -1070,7 +902,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_name"
@@ -1086,7 +918,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_lpos"
@@ -1101,7 +933,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_lrot"
@@ -1117,7 +949,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_euler"
@@ -1132,7 +964,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_active"
@@ -1146,14 +978,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 73
+ "__id__": 58
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 72
+ "__id__": 57
},
"asset": {
"__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a",
@@ -1161,7 +993,7 @@
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
- "__id__": 74
+ "__id__": 59
},
"targetOverrides": null
},
@@ -1175,22 +1007,22 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 75
+ "__id__": 60
},
{
- "__id__": 77
+ "__id__": 62
},
{
- "__id__": 78
+ "__id__": 63
},
{
- "__id__": 79
+ "__id__": 64
},
{
- "__id__": 80
+ "__id__": 65
},
{
- "__id__": 81
+ "__id__": 66
}
],
"removedComponents": []
@@ -1198,7 +1030,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_name"
@@ -1214,7 +1046,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_lpos"
@@ -1229,7 +1061,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_lrot"
@@ -1245,7 +1077,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_euler"
@@ -1260,7 +1092,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_lscale"
@@ -1275,7 +1107,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_active"
@@ -1289,14 +1121,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 83
+ "__id__": 68
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 82
+ "__id__": 67
},
"asset": {
"__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -1304,7 +1136,7 @@
},
"fileId": "91yoyAQGNDm5ziI7NUChZ+",
"instance": {
- "__id__": 84
+ "__id__": 69
},
"targetOverrides": null
},
@@ -1318,19 +1150,19 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 85
+ "__id__": 70
},
{
- "__id__": 87
+ "__id__": 72
},
{
- "__id__": 88
+ "__id__": 73
},
{
- "__id__": 89
+ "__id__": 74
},
{
- "__id__": 90
+ "__id__": 75
}
],
"removedComponents": []
@@ -1338,7 +1170,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_name"
@@ -1354,7 +1186,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_lpos"
@@ -1369,7 +1201,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_lrot"
@@ -1385,7 +1217,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_euler"
@@ -1400,7 +1232,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_active"
@@ -1409,171 +1241,451 @@
},
{
"__type__": "cc.Node",
- "_name": "buff_add",
"_objFlags": 0,
- "__editorExtras__": {},
"_parent": {
"__id__": 1
},
- "_children": [],
- "_active": false,
- "_components": [
+ "_prefab": {
+ "__id__": 77
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 76
+ },
+ "asset": {
+ "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "733PKzwANLyJWD2ume4u5f",
+ "instance": {
+ "__id__": 78
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "6e93Sa8IZKKa8Fw7xWs/I6",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
{
- "__id__": 92
+ "__id__": 79
},
{
- "__id__": 94
+ "__id__": 81
},
{
- "__id__": 96
+ "__id__": 82
+ },
+ {
+ "__id__": 83
}
],
- "_prefab": {
- "__id__": 98
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
},
- "_lpos": {
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "wind"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "733PKzwANLyJWD2ume4u5f"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
},
- "_lrot": {
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
},
- "_lscale": {
- "__type__": "cc.Vec3",
- "x": 0.7,
- "y": 1,
- "z": 1
- },
- "_mobility": 0,
- "_layer": 1,
- "_euler": {
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
- },
- "_id": ""
+ }
},
{
- "__type__": "cc.UITransform",
- "_name": "",
+ "__type__": "cc.Node",
"_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 91
+ "_parent": {
+ "__id__": 1
},
- "_enabled": true,
- "__prefab": {
- "__id__": 93
+ "_prefab": {
+ "__id__": 85
},
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 106.70999908447266,
- "height": 108
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5000468659746804,
- "y": 0.11898148501360858
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "92iyOUSpROt5I/Qbr0n0VR"
- },
- {
- "__type__": "sp.Skeleton",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 91
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 95
- },
- "_customMaterial": null,
- "_srcBlendFactor": 2,
- "_dstBlendFactor": 4,
- "_color": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- },
- "_skeletonData": {
- "__uuid__": "af716091-7de8-4a09-9f4e-bb7c9c40d0db",
- "__expectedType__": "sp.SkeletonData"
- },
- "defaultSkin": "default",
- "defaultAnimation": "show",
- "_premultipliedAlpha": true,
- "_timeScale": 1,
- "_preCacheMode": 0,
- "_cacheMode": 0,
- "_sockets": [],
- "_useTint": false,
- "_debugMesh": false,
- "_debugBones": false,
- "_debugSlots": false,
- "_enableBatch": false,
- "loop": true,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "a32g1O2bxLI6D28EOYFjld"
- },
- {
- "__type__": "cc.Animation",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 91
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 97
- },
- "playOnLoad": false,
- "_clips": [
- {
- "__uuid__": "00cf1b0a-8952-433d-87a0-7f3dc167cbef",
- "__expectedType__": "cc.AnimationClip"
- }
- ],
- "_defaultClip": {
- "__uuid__": "00cf1b0a-8952-433d-87a0-7f3dc167cbef",
- "__expectedType__": "cc.AnimationClip"
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "20Q1ZTb3VN+IH3gAk13P9s"
+ "__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 1
+ "__id__": 84
},
"asset": {
- "__id__": 0
+ "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c",
+ "__expectedType__": "cc.Prefab"
},
- "fileId": "733PKzwANLyJWD2ume4u5f",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
+ "fileId": "65v9q/98dMjafRlb094Ctr",
+ "instance": {
+ "__id__": 86
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "526SUDeQZOCbXYj7Jb2Rfx",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 87
+ },
+ {
+ "__id__": 89
+ },
+ {
+ "__id__": 90
+ },
+ {
+ "__id__": 91
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "buff"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "65v9q/98dMjafRlb094Ctr"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 93
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 92
+ },
+ "asset": {
+ "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "d9UYSvjCpD24d1H7HhaHEv",
+ "instance": {
+ "__id__": 94
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "1aOY3KPddI9JOm97ykUtTp",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 95
+ },
+ {
+ "__id__": 97
+ },
+ {
+ "__id__": 98
+ },
+ {
+ "__id__": 99
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "iced"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "d9UYSvjCpD24d1H7HhaHEv"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 101
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 100
+ },
+ "asset": {
+ "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "afovdb7bBEUpz+8xJHMv4X",
+ "instance": {
+ "__id__": 102
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "04y4Hn4IZHuaXO4Pcjf6QL",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 103
+ },
+ {
+ "__id__": 105
+ },
+ {
+ "__id__": 106
+ },
+ {
+ "__id__": 107
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "yun"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "afovdb7bBEUpz+8xJHMv4X"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 87.398,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
},
{
"__type__": "cc.UITransform",
@@ -1585,7 +1697,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 100
+ "__id__": 109
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1613,7 +1725,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 102
+ "__id__": 111
},
"enabledContactListener": true,
"bullet": true,
@@ -1647,7 +1759,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 104
+ "__id__": 113
},
"tag": 0,
"_group": 4,
@@ -1681,10 +1793,10 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 106
+ "__id__": 115
},
"anm": {
- "__id__": 37
+ "__id__": 22
},
"_id": ""
},
@@ -1702,7 +1814,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 108
+ "__id__": 117
},
"_id": ""
},
@@ -1720,7 +1832,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 110
+ "__id__": 119
},
"_id": ""
},
@@ -1741,22 +1853,31 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
{
- "__id__": 82
+ "__id__": 100
},
{
- "__id__": 72
+ "__id__": 92
},
{
- "__id__": 63
+ "__id__": 84
},
{
- "__id__": 52
+ "__id__": 76
},
{
- "__id__": 40
+ "__id__": 67
},
{
- "__id__": 19
+ "__id__": 57
+ },
+ {
+ "__id__": 48
+ },
+ {
+ "__id__": 37
+ },
+ {
+ "__id__": 25
},
{
"__id__": 8
diff --git a/assets/resources/game/heros/k2.prefab b/assets/resources/game/heros/k2.prefab
index 68ea6ce6..fbbe8673 100644
--- a/assets/resources/game/heros/k2.prefab
+++ b/assets/resources/game/heros/k2.prefab
@@ -25,50 +25,59 @@
"__id__": 8
},
{
- "__id__": 19
+ "__id__": 17
},
{
- "__id__": 32
+ "__id__": 25
},
{
- "__id__": 40
+ "__id__": 37
},
{
- "__id__": 52
+ "__id__": 48
},
{
- "__id__": 63
+ "__id__": 57
},
{
- "__id__": 72
+ "__id__": 67
},
{
- "__id__": 82
+ "__id__": 76
+ },
+ {
+ "__id__": 84
+ },
+ {
+ "__id__": 92
+ },
+ {
+ "__id__": 100
}
],
"_active": true,
"_components": [
{
- "__id__": 91
+ "__id__": 108
},
{
- "__id__": 93
+ "__id__": 110
},
{
- "__id__": 95
+ "__id__": 112
},
{
- "__id__": 97
+ "__id__": 114
},
{
- "__id__": 99
+ "__id__": 116
},
{
- "__id__": 101
+ "__id__": 118
}
],
"_prefab": {
- "__id__": 103
+ "__id__": 120
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -284,9 +293,6 @@
},
{
"__id__": 16
- },
- {
- "__id__": 17
}
],
"removedComponents": []
@@ -363,177 +369,6 @@
],
"value": false
},
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 18
- },
- "propertyPath": [
- "_color"
- ],
- "value": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "73D0ZuTQdMDqn/pimi7d34"
- ]
- },
- {
- "__type__": "cc.Node",
- "_objFlags": 0,
- "_parent": {
- "__id__": 1
- },
- "_prefab": {
- "__id__": 20
- },
- "__editorExtras__": {}
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 19
- },
- "asset": {
- "__uuid__": "198e9c93-3ac9-4564-9d0e-63c9836e509a",
- "__expectedType__": "cc.Prefab"
- },
- "fileId": "54R/aYBglLI4Jn5pm++Jx8",
- "instance": {
- "__id__": 21
- },
- "targetOverrides": null
- },
- {
- "__type__": "cc.PrefabInstance",
- "fileId": "12VQAe3ilGPam5hokpA0Jl",
- "prefabRootNode": {
- "__id__": 1
- },
- "mountedChildren": [],
- "mountedComponents": [],
- "propertyOverrides": [
- {
- "__id__": 22
- },
- {
- "__id__": 24
- },
- {
- "__id__": 26
- },
- {
- "__id__": 28
- },
- {
- "__id__": 30
- }
- ],
- "removedComponents": []
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 23
- },
- "propertyPath": [
- "_name"
- ],
- "value": "buff"
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 25
- },
- "propertyPath": [
- "_lpos"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": -5.532,
- "z": 0
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 27
- },
- "propertyPath": [
- "_lrot"
- ],
- "value": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 29
- },
- "propertyPath": [
- "_euler"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 31
- },
- "propertyPath": [
- "_active"
- ],
- "value": false
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
{
"__type__": "cc.Node",
"_name": "anm",
@@ -546,17 +381,17 @@
"_active": true,
"_components": [
{
- "__id__": 33
+ "__id__": 18
},
{
- "__id__": 35
+ "__id__": 20
},
{
- "__id__": 37
+ "__id__": 22
}
],
"_prefab": {
- "__id__": 39
+ "__id__": 24
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -593,11 +428,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 34
+ "__id__": 19
},
"_contentSize": {
"__type__": "cc.Size",
@@ -621,11 +456,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 36
+ "__id__": 21
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -666,11 +501,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 38
+ "__id__": 23
},
"_id": ""
},
@@ -698,14 +533,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 41
+ "__id__": 26
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 40
+ "__id__": 25
},
"asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -713,7 +548,7 @@
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
- "__id__": 42
+ "__id__": 27
},
"targetOverrides": null
},
@@ -727,25 +562,25 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 43
+ "__id__": 28
},
{
- "__id__": 45
+ "__id__": 30
},
{
- "__id__": 46
+ "__id__": 31
},
{
- "__id__": 47
+ "__id__": 32
},
{
- "__id__": 48
+ "__id__": 33
},
{
- "__id__": 49
+ "__id__": 34
},
{
- "__id__": 51
+ "__id__": 36
}
],
"removedComponents": []
@@ -753,7 +588,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_name"
@@ -769,7 +604,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lpos"
@@ -784,7 +619,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lrot"
@@ -800,7 +635,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_euler"
@@ -815,7 +650,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_active"
@@ -825,7 +660,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 50
+ "__id__": 35
},
"propertyPath": [
"_contentSize"
@@ -845,7 +680,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lscale"
@@ -864,14 +699,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 53
+ "__id__": 38
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 52
+ "__id__": 37
},
"asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -879,7 +714,7 @@
},
"fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": {
- "__id__": 54
+ "__id__": 39
},
"targetOverrides": null
},
@@ -893,22 +728,22 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 55
+ "__id__": 40
},
{
- "__id__": 57
+ "__id__": 42
},
{
- "__id__": 58
+ "__id__": 43
},
{
- "__id__": 59
+ "__id__": 44
},
{
- "__id__": 60
+ "__id__": 45
},
{
- "__id__": 62
+ "__id__": 47
}
],
"removedComponents": []
@@ -916,7 +751,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_name"
@@ -932,7 +767,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lpos"
@@ -947,7 +782,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lrot"
@@ -963,7 +798,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_euler"
@@ -978,7 +813,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 61
+ "__id__": 46
},
"propertyPath": [
"_lpos"
@@ -999,7 +834,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lscale"
@@ -1018,14 +853,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 64
+ "__id__": 49
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 63
+ "__id__": 48
},
"asset": {
"__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -1033,7 +868,7 @@
},
"fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": {
- "__id__": 65
+ "__id__": 50
},
"targetOverrides": null
},
@@ -1047,19 +882,19 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 66
+ "__id__": 51
},
{
- "__id__": 68
+ "__id__": 53
},
{
- "__id__": 69
+ "__id__": 54
},
{
- "__id__": 70
+ "__id__": 55
},
{
- "__id__": 71
+ "__id__": 56
}
],
"removedComponents": []
@@ -1067,7 +902,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_name"
@@ -1083,7 +918,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_lpos"
@@ -1098,7 +933,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_lrot"
@@ -1114,7 +949,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_euler"
@@ -1129,7 +964,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_active"
@@ -1143,14 +978,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 73
+ "__id__": 58
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 72
+ "__id__": 57
},
"asset": {
"__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a",
@@ -1158,7 +993,7 @@
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
- "__id__": 74
+ "__id__": 59
},
"targetOverrides": null
},
@@ -1172,22 +1007,22 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 75
+ "__id__": 60
},
{
- "__id__": 77
+ "__id__": 62
},
{
- "__id__": 78
+ "__id__": 63
},
{
- "__id__": 79
+ "__id__": 64
},
{
- "__id__": 80
+ "__id__": 65
},
{
- "__id__": 81
+ "__id__": 66
}
],
"removedComponents": []
@@ -1195,7 +1030,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_name"
@@ -1211,7 +1046,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_lpos"
@@ -1226,7 +1061,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_lrot"
@@ -1242,7 +1077,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_euler"
@@ -1257,7 +1092,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_lscale"
@@ -1272,7 +1107,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_active"
@@ -1286,14 +1121,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 83
+ "__id__": 68
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 82
+ "__id__": 67
},
"asset": {
"__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -1301,7 +1136,7 @@
},
"fileId": "91yoyAQGNDm5ziI7NUChZ+",
"instance": {
- "__id__": 84
+ "__id__": 69
},
"targetOverrides": null
},
@@ -1315,19 +1150,19 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 85
+ "__id__": 70
},
{
- "__id__": 87
+ "__id__": 72
},
{
- "__id__": 88
+ "__id__": 73
},
{
- "__id__": 89
+ "__id__": 74
},
{
- "__id__": 90
+ "__id__": 75
}
],
"removedComponents": []
@@ -1335,7 +1170,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_name"
@@ -1351,7 +1186,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_lpos"
@@ -1366,7 +1201,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_lrot"
@@ -1382,7 +1217,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_euler"
@@ -1397,13 +1232,461 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_active"
],
"value": false
},
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 77
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 76
+ },
+ "asset": {
+ "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "733PKzwANLyJWD2ume4u5f",
+ "instance": {
+ "__id__": 78
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "80tB6E5YxMoZd/h5I/+SwX",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 79
+ },
+ {
+ "__id__": 81
+ },
+ {
+ "__id__": 82
+ },
+ {
+ "__id__": 83
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "wind"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "733PKzwANLyJWD2ume4u5f"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 85
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 84
+ },
+ "asset": {
+ "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "65v9q/98dMjafRlb094Ctr",
+ "instance": {
+ "__id__": 86
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "47vmIuoClIUbU88vgdbfyX",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 87
+ },
+ {
+ "__id__": 89
+ },
+ {
+ "__id__": 90
+ },
+ {
+ "__id__": 91
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "buff"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "65v9q/98dMjafRlb094Ctr"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 93
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 92
+ },
+ "asset": {
+ "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "d9UYSvjCpD24d1H7HhaHEv",
+ "instance": {
+ "__id__": 94
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "e6llDYf3dMMJcAq5ztcTqd",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 95
+ },
+ {
+ "__id__": 97
+ },
+ {
+ "__id__": 98
+ },
+ {
+ "__id__": 99
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "iced"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "d9UYSvjCpD24d1H7HhaHEv"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 101
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 100
+ },
+ "asset": {
+ "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "afovdb7bBEUpz+8xJHMv4X",
+ "instance": {
+ "__id__": 102
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "b1RN6YNJZHF7aCZEs/6AA+",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 103
+ },
+ {
+ "__id__": 105
+ },
+ {
+ "__id__": 106
+ },
+ {
+ "__id__": 107
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "yun"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "afovdb7bBEUpz+8xJHMv4X"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 87.398,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
{
"__type__": "cc.UITransform",
"_name": "",
@@ -1414,7 +1697,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 92
+ "__id__": 109
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1442,7 +1725,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 94
+ "__id__": 111
},
"enabledContactListener": true,
"bullet": true,
@@ -1476,7 +1759,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 96
+ "__id__": 113
},
"tag": 0,
"_group": 4,
@@ -1510,10 +1793,10 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 98
+ "__id__": 115
},
"anm": {
- "__id__": 37
+ "__id__": 22
},
"_id": ""
},
@@ -1531,7 +1814,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 100
+ "__id__": 117
},
"_id": ""
},
@@ -1549,7 +1832,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 102
+ "__id__": 119
},
"_id": ""
},
@@ -1570,22 +1853,31 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
{
- "__id__": 82
+ "__id__": 100
},
{
- "__id__": 72
+ "__id__": 92
},
{
- "__id__": 63
+ "__id__": 84
},
{
- "__id__": 52
+ "__id__": 76
},
{
- "__id__": 40
+ "__id__": 67
},
{
- "__id__": 19
+ "__id__": 57
+ },
+ {
+ "__id__": 48
+ },
+ {
+ "__id__": 37
+ },
+ {
+ "__id__": 25
},
{
"__id__": 8
diff --git a/assets/resources/game/heros/k3.prefab b/assets/resources/game/heros/k3.prefab
index ae009a0a..3c236016 100644
--- a/assets/resources/game/heros/k3.prefab
+++ b/assets/resources/game/heros/k3.prefab
@@ -25,50 +25,59 @@
"__id__": 8
},
{
- "__id__": 19
+ "__id__": 17
},
{
- "__id__": 32
+ "__id__": 25
},
{
"__id__": 40
},
{
- "__id__": 55
+ "__id__": 51
},
{
- "__id__": 66
+ "__id__": 60
},
{
- "__id__": 75
+ "__id__": 70
},
{
- "__id__": 85
+ "__id__": 79
+ },
+ {
+ "__id__": 87
+ },
+ {
+ "__id__": 95
+ },
+ {
+ "__id__": 103
}
],
"_active": true,
"_components": [
{
- "__id__": 94
+ "__id__": 111
},
{
- "__id__": 96
+ "__id__": 113
},
{
- "__id__": 98
+ "__id__": 115
},
{
- "__id__": 100
+ "__id__": 117
},
{
- "__id__": 102
+ "__id__": 119
},
{
- "__id__": 104
+ "__id__": 121
}
],
"_prefab": {
- "__id__": 106
+ "__id__": 123
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -284,9 +293,6 @@
},
{
"__id__": 16
- },
- {
- "__id__": 17
}
],
"removedComponents": []
@@ -363,177 +369,6 @@
],
"value": false
},
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 18
- },
- "propertyPath": [
- "_color"
- ],
- "value": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "73D0ZuTQdMDqn/pimi7d34"
- ]
- },
- {
- "__type__": "cc.Node",
- "_objFlags": 0,
- "_parent": {
- "__id__": 1
- },
- "_prefab": {
- "__id__": 20
- },
- "__editorExtras__": {}
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 19
- },
- "asset": {
- "__uuid__": "198e9c93-3ac9-4564-9d0e-63c9836e509a",
- "__expectedType__": "cc.Prefab"
- },
- "fileId": "54R/aYBglLI4Jn5pm++Jx8",
- "instance": {
- "__id__": 21
- },
- "targetOverrides": null
- },
- {
- "__type__": "cc.PrefabInstance",
- "fileId": "12VQAe3ilGPam5hokpA0Jl",
- "prefabRootNode": {
- "__id__": 1
- },
- "mountedChildren": [],
- "mountedComponents": [],
- "propertyOverrides": [
- {
- "__id__": 22
- },
- {
- "__id__": 24
- },
- {
- "__id__": 26
- },
- {
- "__id__": 28
- },
- {
- "__id__": 30
- }
- ],
- "removedComponents": []
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 23
- },
- "propertyPath": [
- "_name"
- ],
- "value": "buff"
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 25
- },
- "propertyPath": [
- "_lpos"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": -5.532,
- "z": 0
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 27
- },
- "propertyPath": [
- "_lrot"
- ],
- "value": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 29
- },
- "propertyPath": [
- "_euler"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 31
- },
- "propertyPath": [
- "_active"
- ],
- "value": false
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
{
"__type__": "cc.Node",
"_name": "anm",
@@ -546,17 +381,17 @@
"_active": true,
"_components": [
{
- "__id__": 33
+ "__id__": 18
},
{
- "__id__": 35
+ "__id__": 20
},
{
- "__id__": 37
+ "__id__": 22
}
],
"_prefab": {
- "__id__": 39
+ "__id__": 24
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -593,11 +428,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 34
+ "__id__": 19
},
"_contentSize": {
"__type__": "cc.Size",
@@ -621,11 +456,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 36
+ "__id__": 21
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -666,11 +501,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 38
+ "__id__": 23
},
"_id": ""
},
@@ -691,6 +526,204 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 26
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 25
+ },
+ "asset": {
+ "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+ "instance": {
+ "__id__": 27
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "3a1pwLAh1NkYnlDVrAFcnS",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 28
+ },
+ {
+ "__id__": 30
+ },
+ {
+ "__id__": 31
+ },
+ {
+ "__id__": 32
+ },
+ {
+ "__id__": 33
+ },
+ {
+ "__id__": 34
+ },
+ {
+ "__id__": 36
+ },
+ {
+ "__id__": 37
+ },
+ {
+ "__id__": 38
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 29
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "shielded"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "c46/YsCPVOJYA4mWEpNYRx"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 29
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": -0.057,
+ "y": -39.46,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 29
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 29
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 29
+ },
+ "propertyPath": [
+ "_active"
+ ],
+ "value": false
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 35
+ },
+ "propertyPath": [
+ "_contentSize"
+ ],
+ "value": {
+ "__type__": "cc.Size",
+ "width": 120,
+ "height": 100
+ }
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "63NP9yq3hEUKD/OZZZ5t7x"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 29
+ },
+ "propertyPath": [
+ "_lscale"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 1.2,
+ "y": 1.1,
+ "z": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 29
+ },
+ "propertyPath": [
+ "_layer"
+ ],
+ "value": 1
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 39
+ },
+ "propertyPath": [
+ "_layer"
+ ],
+ "value": 1
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "7a5LvbdlxEc6FKa7cun2oB"
+ ]
+ },
{
"__type__": "cc.Node",
"_objFlags": 0,
@@ -708,10 +741,10 @@
"__id__": 40
},
"asset": {
- "__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
+ "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
"__expectedType__": "cc.Prefab"
},
- "fileId": "c46/YsCPVOJYA4mWEpNYRx",
+ "fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": {
"__id__": 42
},
@@ -719,7 +752,7 @@
},
{
"__type__": "cc.PrefabInstance",
- "fileId": "3a1pwLAh1NkYnlDVrAFcnS",
+ "fileId": "69IAw7dThHvIlVtTfXOVMZ",
"prefabRootNode": {
"__id__": 1
},
@@ -742,16 +775,7 @@
"__id__": 48
},
{
- "__id__": 49
- },
- {
- "__id__": 51
- },
- {
- "__id__": 52
- },
- {
- "__id__": 53
+ "__id__": 50
}
],
"removedComponents": []
@@ -764,195 +788,6 @@
"propertyPath": [
"_name"
],
- "value": "shielded"
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "c46/YsCPVOJYA4mWEpNYRx"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 44
- },
- "propertyPath": [
- "_lpos"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": -0.057,
- "y": -39.46,
- "z": 0
- }
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 44
- },
- "propertyPath": [
- "_lrot"
- ],
- "value": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- }
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 44
- },
- "propertyPath": [
- "_euler"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- }
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 44
- },
- "propertyPath": [
- "_active"
- ],
- "value": false
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 50
- },
- "propertyPath": [
- "_contentSize"
- ],
- "value": {
- "__type__": "cc.Size",
- "width": 120,
- "height": 100
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "63NP9yq3hEUKD/OZZZ5t7x"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 44
- },
- "propertyPath": [
- "_lscale"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 1.2,
- "y": 1.1,
- "z": 1
- }
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 44
- },
- "propertyPath": [
- "_layer"
- ],
- "value": 1
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 54
- },
- "propertyPath": [
- "_layer"
- ],
- "value": 1
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "7a5LvbdlxEc6FKa7cun2oB"
- ]
- },
- {
- "__type__": "cc.Node",
- "_objFlags": 0,
- "_parent": {
- "__id__": 1
- },
- "_prefab": {
- "__id__": 56
- },
- "__editorExtras__": {}
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 55
- },
- "asset": {
- "__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
- "__expectedType__": "cc.Prefab"
- },
- "fileId": "5fqU0L3/FOhKaco5UkHuWT",
- "instance": {
- "__id__": 57
- },
- "targetOverrides": null
- },
- {
- "__type__": "cc.PrefabInstance",
- "fileId": "69IAw7dThHvIlVtTfXOVMZ",
- "prefabRootNode": {
- "__id__": 1
- },
- "mountedChildren": [],
- "mountedComponents": [],
- "propertyOverrides": [
- {
- "__id__": 58
- },
- {
- "__id__": 60
- },
- {
- "__id__": 61
- },
- {
- "__id__": 62
- },
- {
- "__id__": 63
- },
- {
- "__id__": 65
- }
- ],
- "removedComponents": []
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 59
- },
- "propertyPath": [
- "_name"
- ],
"value": "top"
},
{
@@ -964,7 +799,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 59
+ "__id__": 44
},
"propertyPath": [
"_lpos"
@@ -979,7 +814,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 59
+ "__id__": 44
},
"propertyPath": [
"_lrot"
@@ -995,7 +830,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 59
+ "__id__": 44
},
"propertyPath": [
"_euler"
@@ -1010,7 +845,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 64
+ "__id__": 49
},
"propertyPath": [
"_lpos"
@@ -1031,7 +866,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 59
+ "__id__": 44
},
"propertyPath": [
"_lscale"
@@ -1050,14 +885,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 67
+ "__id__": 52
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 66
+ "__id__": 51
},
"asset": {
"__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -1065,7 +900,7 @@
},
"fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": {
- "__id__": 68
+ "__id__": 53
},
"targetOverrides": null
},
@@ -1079,19 +914,19 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 69
+ "__id__": 54
},
{
- "__id__": 71
+ "__id__": 56
},
{
- "__id__": 72
+ "__id__": 57
},
{
- "__id__": 73
+ "__id__": 58
},
{
- "__id__": 74
+ "__id__": 59
}
],
"removedComponents": []
@@ -1099,7 +934,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 70
+ "__id__": 55
},
"propertyPath": [
"_name"
@@ -1115,7 +950,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 70
+ "__id__": 55
},
"propertyPath": [
"_lpos"
@@ -1130,7 +965,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 70
+ "__id__": 55
},
"propertyPath": [
"_lrot"
@@ -1146,7 +981,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 70
+ "__id__": 55
},
"propertyPath": [
"_euler"
@@ -1161,7 +996,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 70
+ "__id__": 55
},
"propertyPath": [
"_active"
@@ -1175,14 +1010,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 76
+ "__id__": 61
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 75
+ "__id__": 60
},
"asset": {
"__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a",
@@ -1190,7 +1025,7 @@
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
- "__id__": 77
+ "__id__": 62
},
"targetOverrides": null
},
@@ -1204,22 +1039,22 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 78
+ "__id__": 63
},
{
- "__id__": 80
+ "__id__": 65
},
{
- "__id__": 81
+ "__id__": 66
},
{
- "__id__": 82
+ "__id__": 67
},
{
- "__id__": 83
+ "__id__": 68
},
{
- "__id__": 84
+ "__id__": 69
}
],
"removedComponents": []
@@ -1227,7 +1062,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 79
+ "__id__": 64
},
"propertyPath": [
"_name"
@@ -1243,7 +1078,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 79
+ "__id__": 64
},
"propertyPath": [
"_lpos"
@@ -1258,7 +1093,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 79
+ "__id__": 64
},
"propertyPath": [
"_lrot"
@@ -1274,7 +1109,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 79
+ "__id__": 64
},
"propertyPath": [
"_euler"
@@ -1289,7 +1124,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 79
+ "__id__": 64
},
"propertyPath": [
"_lscale"
@@ -1304,7 +1139,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 79
+ "__id__": 64
},
"propertyPath": [
"_active"
@@ -1318,14 +1153,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 86
+ "__id__": 71
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 85
+ "__id__": 70
},
"asset": {
"__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -1333,7 +1168,7 @@
},
"fileId": "91yoyAQGNDm5ziI7NUChZ+",
"instance": {
- "__id__": 87
+ "__id__": 72
},
"targetOverrides": null
},
@@ -1347,19 +1182,19 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 88
+ "__id__": 73
},
{
- "__id__": 90
+ "__id__": 75
},
{
- "__id__": 91
+ "__id__": 76
},
{
- "__id__": 92
+ "__id__": 77
},
{
- "__id__": 93
+ "__id__": 78
}
],
"removedComponents": []
@@ -1367,7 +1202,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 89
+ "__id__": 74
},
"propertyPath": [
"_name"
@@ -1383,7 +1218,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 89
+ "__id__": 74
},
"propertyPath": [
"_lpos"
@@ -1398,7 +1233,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 89
+ "__id__": 74
},
"propertyPath": [
"_lrot"
@@ -1414,7 +1249,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 89
+ "__id__": 74
},
"propertyPath": [
"_euler"
@@ -1429,13 +1264,461 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 89
+ "__id__": 74
},
"propertyPath": [
"_active"
],
"value": false
},
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 80
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 79
+ },
+ "asset": {
+ "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "733PKzwANLyJWD2ume4u5f",
+ "instance": {
+ "__id__": 81
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "2a6EAsEgNMjJ9Ca3v2o3HM",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 82
+ },
+ {
+ "__id__": 84
+ },
+ {
+ "__id__": 85
+ },
+ {
+ "__id__": 86
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 83
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "wind"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "733PKzwANLyJWD2ume4u5f"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 83
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 83
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 83
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 88
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 87
+ },
+ "asset": {
+ "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "65v9q/98dMjafRlb094Ctr",
+ "instance": {
+ "__id__": 89
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "86BuJqvxtDJK/e/RGph1cW",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 90
+ },
+ {
+ "__id__": 92
+ },
+ {
+ "__id__": 93
+ },
+ {
+ "__id__": 94
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 91
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "buff"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "65v9q/98dMjafRlb094Ctr"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 91
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 91
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 91
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 96
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 95
+ },
+ "asset": {
+ "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "d9UYSvjCpD24d1H7HhaHEv",
+ "instance": {
+ "__id__": 97
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "84huy4k/VOL5ykMOpg0H5B",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 98
+ },
+ {
+ "__id__": 100
+ },
+ {
+ "__id__": 101
+ },
+ {
+ "__id__": 102
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 99
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "iced"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "d9UYSvjCpD24d1H7HhaHEv"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 99
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 99
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 99
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 104
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 103
+ },
+ "asset": {
+ "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "afovdb7bBEUpz+8xJHMv4X",
+ "instance": {
+ "__id__": 105
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "61izU9WRVJ255b6c6Hu27c",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 106
+ },
+ {
+ "__id__": 108
+ },
+ {
+ "__id__": 109
+ },
+ {
+ "__id__": 110
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 107
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "yun"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "afovdb7bBEUpz+8xJHMv4X"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 107
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 87.398,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 107
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 107
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
{
"__type__": "cc.UITransform",
"_name": "",
@@ -1446,7 +1729,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 95
+ "__id__": 112
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1474,7 +1757,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 97
+ "__id__": 114
},
"enabledContactListener": true,
"bullet": true,
@@ -1508,7 +1791,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 99
+ "__id__": 116
},
"tag": 0,
"_group": 4,
@@ -1542,10 +1825,10 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 101
+ "__id__": 118
},
"anm": {
- "__id__": 37
+ "__id__": 22
},
"_id": ""
},
@@ -1563,7 +1846,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 103
+ "__id__": 120
},
"_id": ""
},
@@ -1581,7 +1864,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 105
+ "__id__": 122
},
"_id": ""
},
@@ -1602,22 +1885,31 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
{
- "__id__": 85
+ "__id__": 103
},
{
- "__id__": 75
+ "__id__": 95
},
{
- "__id__": 66
+ "__id__": 87
},
{
- "__id__": 55
+ "__id__": 79
+ },
+ {
+ "__id__": 70
+ },
+ {
+ "__id__": 60
+ },
+ {
+ "__id__": 51
},
{
"__id__": 40
},
{
- "__id__": 19
+ "__id__": 25
},
{
"__id__": 8
diff --git a/assets/resources/game/heros/mor1.prefab b/assets/resources/game/heros/mor1.prefab
index e5fb094c..77461a28 100644
--- a/assets/resources/game/heros/mor1.prefab
+++ b/assets/resources/game/heros/mor1.prefab
@@ -25,50 +25,59 @@
"__id__": 8
},
{
- "__id__": 19
+ "__id__": 17
},
{
- "__id__": 32
+ "__id__": 25
},
{
- "__id__": 40
+ "__id__": 37
},
{
- "__id__": 52
+ "__id__": 48
},
{
- "__id__": 63
+ "__id__": 57
},
{
- "__id__": 72
+ "__id__": 67
},
{
- "__id__": 82
+ "__id__": 76
+ },
+ {
+ "__id__": 84
+ },
+ {
+ "__id__": 92
+ },
+ {
+ "__id__": 100
}
],
"_active": true,
"_components": [
{
- "__id__": 91
+ "__id__": 108
},
{
- "__id__": 93
+ "__id__": 110
},
{
- "__id__": 95
+ "__id__": 112
},
{
- "__id__": 97
+ "__id__": 114
},
{
- "__id__": 99
+ "__id__": 116
},
{
- "__id__": 101
+ "__id__": 118
}
],
"_prefab": {
- "__id__": 103
+ "__id__": 120
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -284,9 +293,6 @@
},
{
"__id__": 16
- },
- {
- "__id__": 17
}
],
"removedComponents": []
@@ -363,177 +369,6 @@
],
"value": false
},
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 18
- },
- "propertyPath": [
- "_color"
- ],
- "value": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "73D0ZuTQdMDqn/pimi7d34"
- ]
- },
- {
- "__type__": "cc.Node",
- "_objFlags": 0,
- "_parent": {
- "__id__": 1
- },
- "_prefab": {
- "__id__": 20
- },
- "__editorExtras__": {}
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 19
- },
- "asset": {
- "__uuid__": "198e9c93-3ac9-4564-9d0e-63c9836e509a",
- "__expectedType__": "cc.Prefab"
- },
- "fileId": "54R/aYBglLI4Jn5pm++Jx8",
- "instance": {
- "__id__": 21
- },
- "targetOverrides": null
- },
- {
- "__type__": "cc.PrefabInstance",
- "fileId": "12VQAe3ilGPam5hokpA0Jl",
- "prefabRootNode": {
- "__id__": 1
- },
- "mountedChildren": [],
- "mountedComponents": [],
- "propertyOverrides": [
- {
- "__id__": 22
- },
- {
- "__id__": 24
- },
- {
- "__id__": 26
- },
- {
- "__id__": 28
- },
- {
- "__id__": 30
- }
- ],
- "removedComponents": []
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 23
- },
- "propertyPath": [
- "_name"
- ],
- "value": "buff"
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 25
- },
- "propertyPath": [
- "_lpos"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": -5.532,
- "z": 0
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 27
- },
- "propertyPath": [
- "_lrot"
- ],
- "value": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 29
- },
- "propertyPath": [
- "_euler"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 31
- },
- "propertyPath": [
- "_active"
- ],
- "value": false
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
{
"__type__": "cc.Node",
"_name": "anm",
@@ -546,17 +381,17 @@
"_active": true,
"_components": [
{
- "__id__": 33
+ "__id__": 18
},
{
- "__id__": 35
+ "__id__": 20
},
{
- "__id__": 37
+ "__id__": 22
}
],
"_prefab": {
- "__id__": 39
+ "__id__": 24
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -593,11 +428,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 34
+ "__id__": 19
},
"_contentSize": {
"__type__": "cc.Size",
@@ -621,11 +456,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 36
+ "__id__": 21
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -666,11 +501,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 38
+ "__id__": 23
},
"_id": ""
},
@@ -698,14 +533,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 41
+ "__id__": 26
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 40
+ "__id__": 25
},
"asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -713,7 +548,7 @@
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
- "__id__": 42
+ "__id__": 27
},
"targetOverrides": null
},
@@ -727,25 +562,25 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 43
+ "__id__": 28
},
{
- "__id__": 45
+ "__id__": 30
},
{
- "__id__": 46
+ "__id__": 31
},
{
- "__id__": 47
+ "__id__": 32
},
{
- "__id__": 48
+ "__id__": 33
},
{
- "__id__": 49
+ "__id__": 34
},
{
- "__id__": 51
+ "__id__": 36
}
],
"removedComponents": []
@@ -753,7 +588,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_name"
@@ -769,7 +604,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lpos"
@@ -784,7 +619,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lrot"
@@ -800,7 +635,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_euler"
@@ -815,7 +650,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_active"
@@ -825,7 +660,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 50
+ "__id__": 35
},
"propertyPath": [
"_contentSize"
@@ -845,7 +680,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lscale"
@@ -853,7 +688,7 @@
"value": {
"__type__": "cc.Vec3",
"x": 1.2,
- "y": 1.1,
+ "y": 1.3,
"z": 1
}
},
@@ -864,14 +699,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 53
+ "__id__": 38
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 52
+ "__id__": 37
},
"asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -879,7 +714,7 @@
},
"fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": {
- "__id__": 54
+ "__id__": 39
},
"targetOverrides": null
},
@@ -893,22 +728,22 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 55
+ "__id__": 40
},
{
- "__id__": 57
+ "__id__": 42
},
{
- "__id__": 58
+ "__id__": 43
},
{
- "__id__": 59
+ "__id__": 44
},
{
- "__id__": 60
+ "__id__": 45
},
{
- "__id__": 62
+ "__id__": 47
}
],
"removedComponents": []
@@ -916,7 +751,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_name"
@@ -932,7 +767,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lpos"
@@ -947,7 +782,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lrot"
@@ -963,7 +798,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_euler"
@@ -978,7 +813,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 61
+ "__id__": 46
},
"propertyPath": [
"_lpos"
@@ -999,7 +834,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lscale"
@@ -1018,14 +853,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 64
+ "__id__": 49
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 63
+ "__id__": 48
},
"asset": {
"__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -1033,7 +868,7 @@
},
"fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": {
- "__id__": 65
+ "__id__": 50
},
"targetOverrides": null
},
@@ -1047,19 +882,19 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 66
+ "__id__": 51
},
{
- "__id__": 68
+ "__id__": 53
},
{
- "__id__": 69
+ "__id__": 54
},
{
- "__id__": 70
+ "__id__": 55
},
{
- "__id__": 71
+ "__id__": 56
}
],
"removedComponents": []
@@ -1067,7 +902,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_name"
@@ -1083,7 +918,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_lpos"
@@ -1098,7 +933,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_lrot"
@@ -1114,7 +949,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_euler"
@@ -1129,7 +964,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_active"
@@ -1143,14 +978,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 73
+ "__id__": 58
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 72
+ "__id__": 57
},
"asset": {
"__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a",
@@ -1158,7 +993,7 @@
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
- "__id__": 74
+ "__id__": 59
},
"targetOverrides": null
},
@@ -1172,22 +1007,22 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 75
+ "__id__": 60
},
{
- "__id__": 77
+ "__id__": 62
},
{
- "__id__": 78
+ "__id__": 63
},
{
- "__id__": 79
+ "__id__": 64
},
{
- "__id__": 80
+ "__id__": 65
},
{
- "__id__": 81
+ "__id__": 66
}
],
"removedComponents": []
@@ -1195,7 +1030,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_name"
@@ -1211,7 +1046,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_lpos"
@@ -1226,7 +1061,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_lrot"
@@ -1242,7 +1077,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_euler"
@@ -1257,7 +1092,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_lscale"
@@ -1272,7 +1107,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_active"
@@ -1286,14 +1121,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 83
+ "__id__": 68
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 82
+ "__id__": 67
},
"asset": {
"__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -1301,7 +1136,7 @@
},
"fileId": "91yoyAQGNDm5ziI7NUChZ+",
"instance": {
- "__id__": 84
+ "__id__": 69
},
"targetOverrides": null
},
@@ -1315,19 +1150,19 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 85
+ "__id__": 70
},
{
- "__id__": 87
+ "__id__": 72
},
{
- "__id__": 88
+ "__id__": 73
},
{
- "__id__": 89
+ "__id__": 74
},
{
- "__id__": 90
+ "__id__": 75
}
],
"removedComponents": []
@@ -1335,7 +1170,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_name"
@@ -1351,7 +1186,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_lpos"
@@ -1366,7 +1201,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_lrot"
@@ -1382,7 +1217,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_euler"
@@ -1397,13 +1232,461 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_active"
],
"value": false
},
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 77
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 76
+ },
+ "asset": {
+ "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "733PKzwANLyJWD2ume4u5f",
+ "instance": {
+ "__id__": 78
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "8dMxfXW29LapYAhVMD3iJD",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 79
+ },
+ {
+ "__id__": 81
+ },
+ {
+ "__id__": 82
+ },
+ {
+ "__id__": 83
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "wind"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "733PKzwANLyJWD2ume4u5f"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 85
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 84
+ },
+ "asset": {
+ "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "65v9q/98dMjafRlb094Ctr",
+ "instance": {
+ "__id__": 86
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "84wm4N4CBFzqAatxxGHhf1",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 87
+ },
+ {
+ "__id__": 89
+ },
+ {
+ "__id__": 90
+ },
+ {
+ "__id__": 91
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "buff"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "65v9q/98dMjafRlb094Ctr"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 93
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 92
+ },
+ "asset": {
+ "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "d9UYSvjCpD24d1H7HhaHEv",
+ "instance": {
+ "__id__": 94
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "69OKMBf75O2LnuusCy37FF",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 95
+ },
+ {
+ "__id__": 97
+ },
+ {
+ "__id__": 98
+ },
+ {
+ "__id__": 99
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "iced"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "d9UYSvjCpD24d1H7HhaHEv"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 101
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 100
+ },
+ "asset": {
+ "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "afovdb7bBEUpz+8xJHMv4X",
+ "instance": {
+ "__id__": 102
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "1fLKKb9s9L6JlwgxtnCbax",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 103
+ },
+ {
+ "__id__": 105
+ },
+ {
+ "__id__": 106
+ },
+ {
+ "__id__": 107
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "yun"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "afovdb7bBEUpz+8xJHMv4X"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 87.398,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
{
"__type__": "cc.UITransform",
"_name": "",
@@ -1414,7 +1697,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 92
+ "__id__": 109
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1442,7 +1725,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 94
+ "__id__": 111
},
"enabledContactListener": true,
"bullet": true,
@@ -1476,7 +1759,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 96
+ "__id__": 113
},
"tag": 0,
"_group": 4,
@@ -1510,10 +1793,10 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 98
+ "__id__": 115
},
"anm": {
- "__id__": 37
+ "__id__": 22
},
"_id": ""
},
@@ -1531,7 +1814,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 100
+ "__id__": 117
},
"_id": ""
},
@@ -1549,7 +1832,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 102
+ "__id__": 119
},
"_id": ""
},
@@ -1570,22 +1853,31 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
{
- "__id__": 82
+ "__id__": 100
},
{
- "__id__": 72
+ "__id__": 92
},
{
- "__id__": 63
+ "__id__": 84
},
{
- "__id__": 52
+ "__id__": 76
},
{
- "__id__": 40
+ "__id__": 67
},
{
- "__id__": 19
+ "__id__": 57
+ },
+ {
+ "__id__": 48
+ },
+ {
+ "__id__": 37
+ },
+ {
+ "__id__": 25
},
{
"__id__": 8
diff --git a/assets/resources/game/heros/mor2.prefab b/assets/resources/game/heros/mor2.prefab
index c9e7073a..435e0f91 100644
--- a/assets/resources/game/heros/mor2.prefab
+++ b/assets/resources/game/heros/mor2.prefab
@@ -25,50 +25,59 @@
"__id__": 8
},
{
- "__id__": 19
+ "__id__": 17
},
{
- "__id__": 32
+ "__id__": 25
},
{
- "__id__": 40
+ "__id__": 37
},
{
- "__id__": 52
+ "__id__": 48
},
{
- "__id__": 63
+ "__id__": 57
},
{
- "__id__": 72
+ "__id__": 67
},
{
- "__id__": 82
+ "__id__": 76
+ },
+ {
+ "__id__": 84
+ },
+ {
+ "__id__": 92
+ },
+ {
+ "__id__": 100
}
],
"_active": true,
"_components": [
{
- "__id__": 91
+ "__id__": 108
},
{
- "__id__": 93
+ "__id__": 110
},
{
- "__id__": 95
+ "__id__": 112
},
{
- "__id__": 97
+ "__id__": 114
},
{
- "__id__": 99
+ "__id__": 116
},
{
- "__id__": 101
+ "__id__": 118
}
],
"_prefab": {
- "__id__": 103
+ "__id__": 120
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -284,9 +293,6 @@
},
{
"__id__": 16
- },
- {
- "__id__": 17
}
],
"removedComponents": []
@@ -363,177 +369,6 @@
],
"value": false
},
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 18
- },
- "propertyPath": [
- "_color"
- ],
- "value": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "73D0ZuTQdMDqn/pimi7d34"
- ]
- },
- {
- "__type__": "cc.Node",
- "_objFlags": 0,
- "_parent": {
- "__id__": 1
- },
- "_prefab": {
- "__id__": 20
- },
- "__editorExtras__": {}
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 19
- },
- "asset": {
- "__uuid__": "198e9c93-3ac9-4564-9d0e-63c9836e509a",
- "__expectedType__": "cc.Prefab"
- },
- "fileId": "54R/aYBglLI4Jn5pm++Jx8",
- "instance": {
- "__id__": 21
- },
- "targetOverrides": null
- },
- {
- "__type__": "cc.PrefabInstance",
- "fileId": "12VQAe3ilGPam5hokpA0Jl",
- "prefabRootNode": {
- "__id__": 1
- },
- "mountedChildren": [],
- "mountedComponents": [],
- "propertyOverrides": [
- {
- "__id__": 22
- },
- {
- "__id__": 24
- },
- {
- "__id__": 26
- },
- {
- "__id__": 28
- },
- {
- "__id__": 30
- }
- ],
- "removedComponents": []
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 23
- },
- "propertyPath": [
- "_name"
- ],
- "value": "buff"
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 25
- },
- "propertyPath": [
- "_lpos"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": -5.532,
- "z": 0
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 27
- },
- "propertyPath": [
- "_lrot"
- ],
- "value": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 29
- },
- "propertyPath": [
- "_euler"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 31
- },
- "propertyPath": [
- "_active"
- ],
- "value": false
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
{
"__type__": "cc.Node",
"_name": "anm",
@@ -546,17 +381,17 @@
"_active": true,
"_components": [
{
- "__id__": 33
+ "__id__": 18
},
{
- "__id__": 35
+ "__id__": 20
},
{
- "__id__": 37
+ "__id__": 22
}
],
"_prefab": {
- "__id__": 39
+ "__id__": 24
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -593,11 +428,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 34
+ "__id__": 19
},
"_contentSize": {
"__type__": "cc.Size",
@@ -621,11 +456,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 36
+ "__id__": 21
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -666,11 +501,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 38
+ "__id__": 23
},
"_id": ""
},
@@ -698,14 +533,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 41
+ "__id__": 26
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 40
+ "__id__": 25
},
"asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -713,7 +548,7 @@
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
- "__id__": 42
+ "__id__": 27
},
"targetOverrides": null
},
@@ -727,25 +562,25 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 43
+ "__id__": 28
},
{
- "__id__": 45
+ "__id__": 30
},
{
- "__id__": 46
+ "__id__": 31
},
{
- "__id__": 47
+ "__id__": 32
},
{
- "__id__": 48
+ "__id__": 33
},
{
- "__id__": 49
+ "__id__": 34
},
{
- "__id__": 51
+ "__id__": 36
}
],
"removedComponents": []
@@ -753,7 +588,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_name"
@@ -769,7 +604,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lpos"
@@ -784,7 +619,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lrot"
@@ -800,7 +635,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_euler"
@@ -815,7 +650,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_active"
@@ -825,7 +660,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 50
+ "__id__": 35
},
"propertyPath": [
"_contentSize"
@@ -845,7 +680,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lscale"
@@ -864,14 +699,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 53
+ "__id__": 38
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 52
+ "__id__": 37
},
"asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -879,7 +714,7 @@
},
"fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": {
- "__id__": 54
+ "__id__": 39
},
"targetOverrides": null
},
@@ -893,22 +728,22 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 55
+ "__id__": 40
},
{
- "__id__": 57
+ "__id__": 42
},
{
- "__id__": 58
+ "__id__": 43
},
{
- "__id__": 59
+ "__id__": 44
},
{
- "__id__": 60
+ "__id__": 45
},
{
- "__id__": 62
+ "__id__": 47
}
],
"removedComponents": []
@@ -916,7 +751,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_name"
@@ -932,7 +767,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lpos"
@@ -947,7 +782,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lrot"
@@ -963,7 +798,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_euler"
@@ -978,7 +813,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 61
+ "__id__": 46
},
"propertyPath": [
"_lpos"
@@ -999,7 +834,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lscale"
@@ -1018,14 +853,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 64
+ "__id__": 49
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 63
+ "__id__": 48
},
"asset": {
"__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -1033,7 +868,7 @@
},
"fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": {
- "__id__": 65
+ "__id__": 50
},
"targetOverrides": null
},
@@ -1047,19 +882,19 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 66
+ "__id__": 51
},
{
- "__id__": 68
+ "__id__": 53
},
{
- "__id__": 69
+ "__id__": 54
},
{
- "__id__": 70
+ "__id__": 55
},
{
- "__id__": 71
+ "__id__": 56
}
],
"removedComponents": []
@@ -1067,7 +902,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_name"
@@ -1083,7 +918,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_lpos"
@@ -1098,7 +933,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_lrot"
@@ -1114,7 +949,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_euler"
@@ -1129,7 +964,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_active"
@@ -1143,14 +978,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 73
+ "__id__": 58
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 72
+ "__id__": 57
},
"asset": {
"__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a",
@@ -1158,7 +993,7 @@
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
- "__id__": 74
+ "__id__": 59
},
"targetOverrides": null
},
@@ -1172,22 +1007,22 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 75
+ "__id__": 60
},
{
- "__id__": 77
+ "__id__": 62
},
{
- "__id__": 78
+ "__id__": 63
},
{
- "__id__": 79
+ "__id__": 64
},
{
- "__id__": 80
+ "__id__": 65
},
{
- "__id__": 81
+ "__id__": 66
}
],
"removedComponents": []
@@ -1195,7 +1030,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_name"
@@ -1211,7 +1046,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_lpos"
@@ -1226,7 +1061,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_lrot"
@@ -1242,7 +1077,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_euler"
@@ -1257,7 +1092,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_lscale"
@@ -1272,7 +1107,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_active"
@@ -1286,14 +1121,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 83
+ "__id__": 68
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 82
+ "__id__": 67
},
"asset": {
"__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -1301,7 +1136,7 @@
},
"fileId": "91yoyAQGNDm5ziI7NUChZ+",
"instance": {
- "__id__": 84
+ "__id__": 69
},
"targetOverrides": null
},
@@ -1315,19 +1150,19 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 85
+ "__id__": 70
},
{
- "__id__": 87
+ "__id__": 72
},
{
- "__id__": 88
+ "__id__": 73
},
{
- "__id__": 89
+ "__id__": 74
},
{
- "__id__": 90
+ "__id__": 75
}
],
"removedComponents": []
@@ -1335,7 +1170,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_name"
@@ -1351,7 +1186,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_lpos"
@@ -1366,7 +1201,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_lrot"
@@ -1382,7 +1217,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_euler"
@@ -1397,13 +1232,461 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_active"
],
"value": false
},
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 77
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 76
+ },
+ "asset": {
+ "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "733PKzwANLyJWD2ume4u5f",
+ "instance": {
+ "__id__": 78
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "a6p8o4U8hA4rbk9GzmvxpL",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 79
+ },
+ {
+ "__id__": 81
+ },
+ {
+ "__id__": 82
+ },
+ {
+ "__id__": 83
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "wind"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "733PKzwANLyJWD2ume4u5f"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 85
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 84
+ },
+ "asset": {
+ "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "65v9q/98dMjafRlb094Ctr",
+ "instance": {
+ "__id__": 86
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "5eDNt/WNNLQLMu5w0OCVSC",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 87
+ },
+ {
+ "__id__": 89
+ },
+ {
+ "__id__": 90
+ },
+ {
+ "__id__": 91
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "buff"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "65v9q/98dMjafRlb094Ctr"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 93
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 92
+ },
+ "asset": {
+ "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "d9UYSvjCpD24d1H7HhaHEv",
+ "instance": {
+ "__id__": 94
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "5bdvKKcMZLsq2rcJ27QpHF",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 95
+ },
+ {
+ "__id__": 97
+ },
+ {
+ "__id__": 98
+ },
+ {
+ "__id__": 99
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "iced"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "d9UYSvjCpD24d1H7HhaHEv"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 101
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 100
+ },
+ "asset": {
+ "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "afovdb7bBEUpz+8xJHMv4X",
+ "instance": {
+ "__id__": 102
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "8cIYP8bmJESbqNX/IpaLk3",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 103
+ },
+ {
+ "__id__": 105
+ },
+ {
+ "__id__": 106
+ },
+ {
+ "__id__": 107
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "yun"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "afovdb7bBEUpz+8xJHMv4X"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 87.398,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
{
"__type__": "cc.UITransform",
"_name": "",
@@ -1414,7 +1697,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 92
+ "__id__": 109
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1442,7 +1725,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 94
+ "__id__": 111
},
"enabledContactListener": true,
"bullet": true,
@@ -1476,7 +1759,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 96
+ "__id__": 113
},
"tag": 0,
"_group": 4,
@@ -1510,10 +1793,10 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 98
+ "__id__": 115
},
"anm": {
- "__id__": 37
+ "__id__": 22
},
"_id": ""
},
@@ -1531,7 +1814,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 100
+ "__id__": 117
},
"_id": ""
},
@@ -1549,7 +1832,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 102
+ "__id__": 119
},
"_id": ""
},
@@ -1570,22 +1853,31 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
{
- "__id__": 82
+ "__id__": 100
},
{
- "__id__": 72
+ "__id__": 92
},
{
- "__id__": 63
+ "__id__": 84
},
{
- "__id__": 52
+ "__id__": 76
},
{
- "__id__": 40
+ "__id__": 67
},
{
- "__id__": 19
+ "__id__": 57
+ },
+ {
+ "__id__": 48
+ },
+ {
+ "__id__": 37
+ },
+ {
+ "__id__": 25
},
{
"__id__": 8
diff --git a/assets/resources/game/heros/mor3.prefab b/assets/resources/game/heros/mor3.prefab
index 147ad4f0..1ec44c68 100644
--- a/assets/resources/game/heros/mor3.prefab
+++ b/assets/resources/game/heros/mor3.prefab
@@ -25,50 +25,59 @@
"__id__": 8
},
{
- "__id__": 19
+ "__id__": 17
},
{
- "__id__": 32
+ "__id__": 25
},
{
- "__id__": 40
+ "__id__": 37
},
{
- "__id__": 52
+ "__id__": 48
},
{
- "__id__": 63
+ "__id__": 57
},
{
- "__id__": 72
+ "__id__": 67
},
{
- "__id__": 82
+ "__id__": 76
+ },
+ {
+ "__id__": 84
+ },
+ {
+ "__id__": 92
+ },
+ {
+ "__id__": 100
}
],
"_active": true,
"_components": [
{
- "__id__": 91
+ "__id__": 108
},
{
- "__id__": 93
+ "__id__": 110
},
{
- "__id__": 95
+ "__id__": 112
},
{
- "__id__": 97
+ "__id__": 114
},
{
- "__id__": 99
+ "__id__": 116
},
{
- "__id__": 101
+ "__id__": 118
}
],
"_prefab": {
- "__id__": 103
+ "__id__": 120
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -284,9 +293,6 @@
},
{
"__id__": 16
- },
- {
- "__id__": 17
}
],
"removedComponents": []
@@ -363,177 +369,6 @@
],
"value": false
},
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 18
- },
- "propertyPath": [
- "_color"
- ],
- "value": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "73D0ZuTQdMDqn/pimi7d34"
- ]
- },
- {
- "__type__": "cc.Node",
- "_objFlags": 0,
- "_parent": {
- "__id__": 1
- },
- "_prefab": {
- "__id__": 20
- },
- "__editorExtras__": {}
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 19
- },
- "asset": {
- "__uuid__": "198e9c93-3ac9-4564-9d0e-63c9836e509a",
- "__expectedType__": "cc.Prefab"
- },
- "fileId": "54R/aYBglLI4Jn5pm++Jx8",
- "instance": {
- "__id__": 21
- },
- "targetOverrides": null
- },
- {
- "__type__": "cc.PrefabInstance",
- "fileId": "12VQAe3ilGPam5hokpA0Jl",
- "prefabRootNode": {
- "__id__": 1
- },
- "mountedChildren": [],
- "mountedComponents": [],
- "propertyOverrides": [
- {
- "__id__": 22
- },
- {
- "__id__": 24
- },
- {
- "__id__": 26
- },
- {
- "__id__": 28
- },
- {
- "__id__": 30
- }
- ],
- "removedComponents": []
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 23
- },
- "propertyPath": [
- "_name"
- ],
- "value": "buff"
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 25
- },
- "propertyPath": [
- "_lpos"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": -5.532,
- "z": 0
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 27
- },
- "propertyPath": [
- "_lrot"
- ],
- "value": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 29
- },
- "propertyPath": [
- "_euler"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 31
- },
- "propertyPath": [
- "_active"
- ],
- "value": false
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
{
"__type__": "cc.Node",
"_name": "anm",
@@ -546,17 +381,17 @@
"_active": true,
"_components": [
{
- "__id__": 33
+ "__id__": 18
},
{
- "__id__": 35
+ "__id__": 20
},
{
- "__id__": 37
+ "__id__": 22
}
],
"_prefab": {
- "__id__": 39
+ "__id__": 24
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -593,11 +428,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 34
+ "__id__": 19
},
"_contentSize": {
"__type__": "cc.Size",
@@ -621,11 +456,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 36
+ "__id__": 21
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -666,11 +501,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 38
+ "__id__": 23
},
"_id": ""
},
@@ -698,14 +533,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 41
+ "__id__": 26
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 40
+ "__id__": 25
},
"asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -713,7 +548,7 @@
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
- "__id__": 42
+ "__id__": 27
},
"targetOverrides": null
},
@@ -727,25 +562,25 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 43
+ "__id__": 28
},
{
- "__id__": 45
+ "__id__": 30
},
{
- "__id__": 46
+ "__id__": 31
},
{
- "__id__": 47
+ "__id__": 32
},
{
- "__id__": 48
+ "__id__": 33
},
{
- "__id__": 49
+ "__id__": 34
},
{
- "__id__": 51
+ "__id__": 36
}
],
"removedComponents": []
@@ -753,7 +588,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_name"
@@ -769,7 +604,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lpos"
@@ -784,7 +619,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lrot"
@@ -800,7 +635,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_euler"
@@ -815,7 +650,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_active"
@@ -825,7 +660,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 50
+ "__id__": 35
},
"propertyPath": [
"_contentSize"
@@ -845,7 +680,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lscale"
@@ -864,14 +699,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 53
+ "__id__": 38
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 52
+ "__id__": 37
},
"asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -879,7 +714,7 @@
},
"fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": {
- "__id__": 54
+ "__id__": 39
},
"targetOverrides": null
},
@@ -893,22 +728,22 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 55
+ "__id__": 40
},
{
- "__id__": 57
+ "__id__": 42
},
{
- "__id__": 58
+ "__id__": 43
},
{
- "__id__": 59
+ "__id__": 44
},
{
- "__id__": 60
+ "__id__": 45
},
{
- "__id__": 62
+ "__id__": 47
}
],
"removedComponents": []
@@ -916,7 +751,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_name"
@@ -932,7 +767,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lpos"
@@ -947,7 +782,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lrot"
@@ -963,7 +798,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_euler"
@@ -978,7 +813,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 61
+ "__id__": 46
},
"propertyPath": [
"_lpos"
@@ -999,7 +834,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lscale"
@@ -1018,14 +853,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 64
+ "__id__": 49
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 63
+ "__id__": 48
},
"asset": {
"__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -1033,7 +868,7 @@
},
"fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": {
- "__id__": 65
+ "__id__": 50
},
"targetOverrides": null
},
@@ -1047,19 +882,19 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 66
+ "__id__": 51
},
{
- "__id__": 68
+ "__id__": 53
},
{
- "__id__": 69
+ "__id__": 54
},
{
- "__id__": 70
+ "__id__": 55
},
{
- "__id__": 71
+ "__id__": 56
}
],
"removedComponents": []
@@ -1067,7 +902,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_name"
@@ -1083,7 +918,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_lpos"
@@ -1098,7 +933,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_lrot"
@@ -1114,7 +949,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_euler"
@@ -1129,7 +964,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_active"
@@ -1143,14 +978,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 73
+ "__id__": 58
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 72
+ "__id__": 57
},
"asset": {
"__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a",
@@ -1158,7 +993,7 @@
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
- "__id__": 74
+ "__id__": 59
},
"targetOverrides": null
},
@@ -1172,22 +1007,22 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 75
+ "__id__": 60
},
{
- "__id__": 77
+ "__id__": 62
},
{
- "__id__": 78
+ "__id__": 63
},
{
- "__id__": 79
+ "__id__": 64
},
{
- "__id__": 80
+ "__id__": 65
},
{
- "__id__": 81
+ "__id__": 66
}
],
"removedComponents": []
@@ -1195,7 +1030,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_name"
@@ -1211,7 +1046,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_lpos"
@@ -1226,7 +1061,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_lrot"
@@ -1242,7 +1077,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_euler"
@@ -1257,7 +1092,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_lscale"
@@ -1272,7 +1107,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_active"
@@ -1286,14 +1121,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 83
+ "__id__": 68
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 82
+ "__id__": 67
},
"asset": {
"__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -1301,7 +1136,7 @@
},
"fileId": "91yoyAQGNDm5ziI7NUChZ+",
"instance": {
- "__id__": 84
+ "__id__": 69
},
"targetOverrides": null
},
@@ -1315,19 +1150,19 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 85
+ "__id__": 70
},
{
- "__id__": 87
+ "__id__": 72
},
{
- "__id__": 88
+ "__id__": 73
},
{
- "__id__": 89
+ "__id__": 74
},
{
- "__id__": 90
+ "__id__": 75
}
],
"removedComponents": []
@@ -1335,7 +1170,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_name"
@@ -1351,7 +1186,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_lpos"
@@ -1366,7 +1201,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_lrot"
@@ -1382,7 +1217,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_euler"
@@ -1397,13 +1232,461 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_active"
],
"value": false
},
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 77
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 76
+ },
+ "asset": {
+ "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "733PKzwANLyJWD2ume4u5f",
+ "instance": {
+ "__id__": 78
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "47KQOpvWFHbaGv93Q6KG6I",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 79
+ },
+ {
+ "__id__": 81
+ },
+ {
+ "__id__": 82
+ },
+ {
+ "__id__": 83
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "wind"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "733PKzwANLyJWD2ume4u5f"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 85
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 84
+ },
+ "asset": {
+ "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "65v9q/98dMjafRlb094Ctr",
+ "instance": {
+ "__id__": 86
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "ffJnb68N5GLo4rlQEHVfYl",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 87
+ },
+ {
+ "__id__": 89
+ },
+ {
+ "__id__": 90
+ },
+ {
+ "__id__": 91
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "buff"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "65v9q/98dMjafRlb094Ctr"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 93
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 92
+ },
+ "asset": {
+ "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "d9UYSvjCpD24d1H7HhaHEv",
+ "instance": {
+ "__id__": 94
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "99zRQcosxLt6p2085sDxGH",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 95
+ },
+ {
+ "__id__": 97
+ },
+ {
+ "__id__": 98
+ },
+ {
+ "__id__": 99
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "iced"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "d9UYSvjCpD24d1H7HhaHEv"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 101
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 100
+ },
+ "asset": {
+ "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "afovdb7bBEUpz+8xJHMv4X",
+ "instance": {
+ "__id__": 102
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "e0uy6G8clHppu/v8RCjoAT",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 103
+ },
+ {
+ "__id__": 105
+ },
+ {
+ "__id__": 106
+ },
+ {
+ "__id__": 107
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "yun"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "afovdb7bBEUpz+8xJHMv4X"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 87.398,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
{
"__type__": "cc.UITransform",
"_name": "",
@@ -1414,7 +1697,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 92
+ "__id__": 109
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1442,7 +1725,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 94
+ "__id__": 111
},
"enabledContactListener": true,
"bullet": true,
@@ -1476,7 +1759,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 96
+ "__id__": 113
},
"tag": 0,
"_group": 4,
@@ -1510,10 +1793,10 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 98
+ "__id__": 115
},
"anm": {
- "__id__": 37
+ "__id__": 22
},
"_id": ""
},
@@ -1531,7 +1814,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 100
+ "__id__": 117
},
"_id": ""
},
@@ -1549,7 +1832,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 102
+ "__id__": 119
},
"_id": ""
},
@@ -1570,22 +1853,31 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
{
- "__id__": 82
+ "__id__": 100
},
{
- "__id__": 72
+ "__id__": 92
},
{
- "__id__": 63
+ "__id__": 84
},
{
- "__id__": 52
+ "__id__": 76
},
{
- "__id__": 40
+ "__id__": 67
},
{
- "__id__": 19
+ "__id__": 57
+ },
+ {
+ "__id__": 48
+ },
+ {
+ "__id__": 37
+ },
+ {
+ "__id__": 25
},
{
"__id__": 8
diff --git a/assets/resources/game/heros/pd1.prefab b/assets/resources/game/heros/pd1.prefab
index abf3b30e..f837fe50 100644
--- a/assets/resources/game/heros/pd1.prefab
+++ b/assets/resources/game/heros/pd1.prefab
@@ -25,50 +25,59 @@
"__id__": 8
},
{
- "__id__": 19
+ "__id__": 17
},
{
- "__id__": 32
+ "__id__": 25
},
{
- "__id__": 40
+ "__id__": 37
},
{
- "__id__": 52
+ "__id__": 48
},
{
- "__id__": 63
+ "__id__": 57
},
{
- "__id__": 72
+ "__id__": 67
},
{
- "__id__": 82
+ "__id__": 76
+ },
+ {
+ "__id__": 84
+ },
+ {
+ "__id__": 92
+ },
+ {
+ "__id__": 100
}
],
"_active": true,
"_components": [
{
- "__id__": 91
+ "__id__": 108
},
{
- "__id__": 93
+ "__id__": 110
},
{
- "__id__": 95
+ "__id__": 112
},
{
- "__id__": 97
+ "__id__": 114
},
{
- "__id__": 99
+ "__id__": 116
},
{
- "__id__": 101
+ "__id__": 118
}
],
"_prefab": {
- "__id__": 103
+ "__id__": 120
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -284,9 +293,6 @@
},
{
"__id__": 16
- },
- {
- "__id__": 17
}
],
"removedComponents": []
@@ -363,177 +369,6 @@
],
"value": false
},
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 18
- },
- "propertyPath": [
- "_color"
- ],
- "value": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "73D0ZuTQdMDqn/pimi7d34"
- ]
- },
- {
- "__type__": "cc.Node",
- "_objFlags": 0,
- "_parent": {
- "__id__": 1
- },
- "_prefab": {
- "__id__": 20
- },
- "__editorExtras__": {}
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 19
- },
- "asset": {
- "__uuid__": "198e9c93-3ac9-4564-9d0e-63c9836e509a",
- "__expectedType__": "cc.Prefab"
- },
- "fileId": "54R/aYBglLI4Jn5pm++Jx8",
- "instance": {
- "__id__": 21
- },
- "targetOverrides": null
- },
- {
- "__type__": "cc.PrefabInstance",
- "fileId": "12VQAe3ilGPam5hokpA0Jl",
- "prefabRootNode": {
- "__id__": 1
- },
- "mountedChildren": [],
- "mountedComponents": [],
- "propertyOverrides": [
- {
- "__id__": 22
- },
- {
- "__id__": 24
- },
- {
- "__id__": 26
- },
- {
- "__id__": 28
- },
- {
- "__id__": 30
- }
- ],
- "removedComponents": []
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 23
- },
- "propertyPath": [
- "_name"
- ],
- "value": "buff"
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 25
- },
- "propertyPath": [
- "_lpos"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": -5.532,
- "z": 0
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 27
- },
- "propertyPath": [
- "_lrot"
- ],
- "value": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 29
- },
- "propertyPath": [
- "_euler"
- ],
- "value": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- }
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
- {
- "__type__": "CCPropertyOverrideInfo",
- "targetInfo": {
- "__id__": 31
- },
- "propertyPath": [
- "_active"
- ],
- "value": false
- },
- {
- "__type__": "cc.TargetInfo",
- "localID": [
- "54R/aYBglLI4Jn5pm++Jx8"
- ]
- },
{
"__type__": "cc.Node",
"_name": "anm",
@@ -546,17 +381,17 @@
"_active": true,
"_components": [
{
- "__id__": 33
+ "__id__": 18
},
{
- "__id__": 35
+ "__id__": 20
},
{
- "__id__": 37
+ "__id__": 22
}
],
"_prefab": {
- "__id__": 39
+ "__id__": 24
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -593,11 +428,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 34
+ "__id__": 19
},
"_contentSize": {
"__type__": "cc.Size",
@@ -621,11 +456,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 36
+ "__id__": 21
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -666,11 +501,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 32
+ "__id__": 17
},
"_enabled": true,
"__prefab": {
- "__id__": 38
+ "__id__": 23
},
"_id": ""
},
@@ -698,14 +533,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 41
+ "__id__": 26
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 40
+ "__id__": 25
},
"asset": {
"__uuid__": "e1b8a315-ece3-41a2-941e-a66861753f1b",
@@ -713,7 +548,7 @@
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
- "__id__": 42
+ "__id__": 27
},
"targetOverrides": null
},
@@ -727,25 +562,25 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 43
+ "__id__": 28
},
{
- "__id__": 45
+ "__id__": 30
},
{
- "__id__": 46
+ "__id__": 31
},
{
- "__id__": 47
+ "__id__": 32
},
{
- "__id__": 48
+ "__id__": 33
},
{
- "__id__": 49
+ "__id__": 34
},
{
- "__id__": 51
+ "__id__": 36
}
],
"removedComponents": []
@@ -753,7 +588,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_name"
@@ -769,7 +604,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lpos"
@@ -784,7 +619,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lrot"
@@ -800,7 +635,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_euler"
@@ -815,7 +650,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_active"
@@ -825,7 +660,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 50
+ "__id__": 35
},
"propertyPath": [
"_contentSize"
@@ -845,7 +680,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 44
+ "__id__": 29
},
"propertyPath": [
"_lscale"
@@ -864,14 +699,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 53
+ "__id__": 38
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 52
+ "__id__": 37
},
"asset": {
"__uuid__": "50c3d5e4-49f8-4bd7-a15b-cda359a0ae5c",
@@ -879,7 +714,7 @@
},
"fileId": "5fqU0L3/FOhKaco5UkHuWT",
"instance": {
- "__id__": 54
+ "__id__": 39
},
"targetOverrides": null
},
@@ -893,22 +728,22 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 55
+ "__id__": 40
},
{
- "__id__": 57
+ "__id__": 42
},
{
- "__id__": 58
+ "__id__": 43
},
{
- "__id__": 59
+ "__id__": 44
},
{
- "__id__": 60
+ "__id__": 45
},
{
- "__id__": 62
+ "__id__": 47
}
],
"removedComponents": []
@@ -916,7 +751,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_name"
@@ -932,7 +767,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lpos"
@@ -947,7 +782,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lrot"
@@ -963,7 +798,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_euler"
@@ -978,7 +813,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 61
+ "__id__": 46
},
"propertyPath": [
"_lpos"
@@ -999,7 +834,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 56
+ "__id__": 41
},
"propertyPath": [
"_lscale"
@@ -1018,14 +853,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 64
+ "__id__": 49
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 63
+ "__id__": 48
},
"asset": {
"__uuid__": "5b4ca49e-0f12-4478-b56d-bf8198b36b90",
@@ -1033,7 +868,7 @@
},
"fileId": "0d6ZXmA5dHkZxoGONDL2sE",
"instance": {
- "__id__": 65
+ "__id__": 50
},
"targetOverrides": null
},
@@ -1047,19 +882,19 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 66
+ "__id__": 51
},
{
- "__id__": 68
+ "__id__": 53
},
{
- "__id__": 69
+ "__id__": 54
},
{
- "__id__": 70
+ "__id__": 55
},
{
- "__id__": 71
+ "__id__": 56
}
],
"removedComponents": []
@@ -1067,7 +902,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_name"
@@ -1083,7 +918,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_lpos"
@@ -1098,7 +933,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_lrot"
@@ -1114,7 +949,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_euler"
@@ -1129,7 +964,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 67
+ "__id__": 52
},
"propertyPath": [
"_active"
@@ -1143,14 +978,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 73
+ "__id__": 58
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 72
+ "__id__": 57
},
"asset": {
"__uuid__": "ec11e9f5-3347-4d5e-8ed8-f98a6ac7963a",
@@ -1158,7 +993,7 @@
},
"fileId": "c46/YsCPVOJYA4mWEpNYRx",
"instance": {
- "__id__": 74
+ "__id__": 59
},
"targetOverrides": null
},
@@ -1172,22 +1007,22 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 75
+ "__id__": 60
},
{
- "__id__": 77
+ "__id__": 62
},
{
- "__id__": 78
+ "__id__": 63
},
{
- "__id__": 79
+ "__id__": 64
},
{
- "__id__": 80
+ "__id__": 65
},
{
- "__id__": 81
+ "__id__": 66
}
],
"removedComponents": []
@@ -1195,7 +1030,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_name"
@@ -1211,7 +1046,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_lpos"
@@ -1226,7 +1061,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_lrot"
@@ -1242,7 +1077,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_euler"
@@ -1257,7 +1092,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_lscale"
@@ -1272,7 +1107,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 76
+ "__id__": 61
},
"propertyPath": [
"_active"
@@ -1286,14 +1121,14 @@
"__id__": 1
},
"_prefab": {
- "__id__": 83
+ "__id__": 68
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
- "__id__": 82
+ "__id__": 67
},
"asset": {
"__uuid__": "ae4493bd-cbcc-4392-921c-3e2b0fcd5338",
@@ -1301,7 +1136,7 @@
},
"fileId": "91yoyAQGNDm5ziI7NUChZ+",
"instance": {
- "__id__": 84
+ "__id__": 69
},
"targetOverrides": null
},
@@ -1315,19 +1150,19 @@
"mountedComponents": [],
"propertyOverrides": [
{
- "__id__": 85
+ "__id__": 70
},
{
- "__id__": 87
+ "__id__": 72
},
{
- "__id__": 88
+ "__id__": 73
},
{
- "__id__": 89
+ "__id__": 74
},
{
- "__id__": 90
+ "__id__": 75
}
],
"removedComponents": []
@@ -1335,7 +1170,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_name"
@@ -1351,7 +1186,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_lpos"
@@ -1366,7 +1201,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_lrot"
@@ -1382,7 +1217,7 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_euler"
@@ -1397,13 +1232,461 @@
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
- "__id__": 86
+ "__id__": 71
},
"propertyPath": [
"_active"
],
"value": false
},
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 77
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 76
+ },
+ "asset": {
+ "__uuid__": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "733PKzwANLyJWD2ume4u5f",
+ "instance": {
+ "__id__": 78
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "b48pfmgsRG4I+QahEpIi26",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 79
+ },
+ {
+ "__id__": 81
+ },
+ {
+ "__id__": 82
+ },
+ {
+ "__id__": 83
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "wind"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "733PKzwANLyJWD2ume4u5f"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 80
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 85
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 84
+ },
+ "asset": {
+ "__uuid__": "3899fa6a-77a8-4809-b34b-64e0daa5674c",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "65v9q/98dMjafRlb094Ctr",
+ "instance": {
+ "__id__": 86
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "5aeK6+f4BBzpZd7GzPVm+M",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 87
+ },
+ {
+ "__id__": 89
+ },
+ {
+ "__id__": 90
+ },
+ {
+ "__id__": 91
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "buff"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "65v9q/98dMjafRlb094Ctr"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 88
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 93
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 92
+ },
+ "asset": {
+ "__uuid__": "b9f0b656-fc60-43f6-bf8b-c3efa8997408",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "d9UYSvjCpD24d1H7HhaHEv",
+ "instance": {
+ "__id__": 94
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "5dQX+bIJBO9pQ0tafL2OvS",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 95
+ },
+ {
+ "__id__": 97
+ },
+ {
+ "__id__": 98
+ },
+ {
+ "__id__": 99
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "iced"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "d9UYSvjCpD24d1H7HhaHEv"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 96
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "cc.Node",
+ "_objFlags": 0,
+ "_parent": {
+ "__id__": 1
+ },
+ "_prefab": {
+ "__id__": 101
+ },
+ "__editorExtras__": {}
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 100
+ },
+ "asset": {
+ "__uuid__": "59df223f-5afb-41e7-a006-4cef8441130d",
+ "__expectedType__": "cc.Prefab"
+ },
+ "fileId": "afovdb7bBEUpz+8xJHMv4X",
+ "instance": {
+ "__id__": 102
+ },
+ "targetOverrides": null
+ },
+ {
+ "__type__": "cc.PrefabInstance",
+ "fileId": "5dYGeRIQBP0bRtIccOVkWQ",
+ "prefabRootNode": {
+ "__id__": 1
+ },
+ "mountedChildren": [],
+ "mountedComponents": [],
+ "propertyOverrides": [
+ {
+ "__id__": 103
+ },
+ {
+ "__id__": 105
+ },
+ {
+ "__id__": 106
+ },
+ {
+ "__id__": 107
+ }
+ ],
+ "removedComponents": []
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_name"
+ ],
+ "value": "yun"
+ },
+ {
+ "__type__": "cc.TargetInfo",
+ "localID": [
+ "afovdb7bBEUpz+8xJHMv4X"
+ ]
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_lpos"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 87.398,
+ "z": 0
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_lrot"
+ ],
+ "value": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ }
+ },
+ {
+ "__type__": "CCPropertyOverrideInfo",
+ "targetInfo": {
+ "__id__": 104
+ },
+ "propertyPath": [
+ "_euler"
+ ],
+ "value": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ }
+ },
{
"__type__": "cc.UITransform",
"_name": "",
@@ -1414,7 +1697,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 92
+ "__id__": 109
},
"_contentSize": {
"__type__": "cc.Size",
@@ -1442,7 +1725,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 94
+ "__id__": 111
},
"enabledContactListener": true,
"bullet": true,
@@ -1476,7 +1759,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 96
+ "__id__": 113
},
"tag": 0,
"_group": 4,
@@ -1510,10 +1793,10 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 98
+ "__id__": 115
},
"anm": {
- "__id__": 37
+ "__id__": 22
},
"_id": ""
},
@@ -1531,7 +1814,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 100
+ "__id__": 117
},
"_id": ""
},
@@ -1549,7 +1832,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 102
+ "__id__": 119
},
"_id": ""
},
@@ -1570,22 +1853,31 @@
"targetOverrides": null,
"nestedPrefabInstanceRoots": [
{
- "__id__": 82
+ "__id__": 100
},
{
- "__id__": 72
+ "__id__": 92
},
{
- "__id__": 63
+ "__id__": 84
},
{
- "__id__": 52
+ "__id__": 76
},
{
- "__id__": 40
+ "__id__": 67
},
{
- "__id__": 19
+ "__id__": 57
+ },
+ {
+ "__id__": 48
+ },
+ {
+ "__id__": 37
+ },
+ {
+ "__id__": 25
},
{
"__id__": 8
diff --git a/assets/resources/game/skills/buff.prefab b/assets/resources/game/skills/buff.prefab
index a873e28a..5691a937 100644
--- a/assets/resources/game/skills/buff.prefab
+++ b/assets/resources/game/skills/buff.prefab
@@ -22,19 +22,19 @@
"__id__": 2
}
],
- "_active": true,
+ "_active": false,
"_components": [
{
- "__id__": 10
+ "__id__": 8
}
],
"_prefab": {
- "__id__": 12
+ "__id__": 10
},
"_lpos": {
"__type__": "cc.Vec3",
- "x": 3.317,
- "y": 48.724,
+ "x": 0,
+ "y": 0,
"z": 0
},
"_lrot": {
@@ -62,7 +62,7 @@
},
{
"__type__": "cc.Node",
- "_name": "buff-n-0",
+ "_name": "anm",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
@@ -76,13 +76,10 @@
},
{
"__id__": 5
- },
- {
- "__id__": 7
}
],
"_prefab": {
- "__id__": 9
+ "__id__": 7
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -127,22 +124,22 @@
},
"_contentSize": {
"__type__": "cc.Size",
- "width": 84,
- "height": 84
+ "width": 187.1199951171875,
+ "height": 208.8300018310547
},
"_anchorPoint": {
"__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
+ "x": 0.4559106444245401,
+ "y": 0.37767563115949476
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "d7b/DUpjJNSKVX7O8hzniN"
+ "fileId": "efXM7jZYFDhaaMfRXZDS5R"
},
{
- "__type__": "cc.Sprite",
+ "__type__": "sp.Skeleton",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
@@ -163,57 +160,28 @@
"b": 255,
"a": 255
},
- "_spriteFrame": {
- "__uuid__": "2e272fb5-0f2a-459c-853d-e312e14693d0@cc2a3",
- "__expectedType__": "cc.SpriteFrame"
+ "_skeletonData": {
+ "__uuid__": "eed43344-9f16-4c12-b68c-3030b6734470",
+ "__expectedType__": "sp.SkeletonData"
},
- "_type": 0,
- "_fillType": 0,
- "_sizeMode": 0,
- "_fillCenter": {
- "__type__": "cc.Vec2",
- "x": 0,
- "y": 0
- },
- "_fillStart": 0,
- "_fillRange": 0,
- "_isTrimmedMode": true,
- "_useGrayscale": false,
- "_atlas": null,
+ "defaultSkin": "default",
+ "defaultAnimation": "show",
+ "_premultipliedAlpha": true,
+ "_timeScale": 1,
+ "_preCacheMode": 0,
+ "_cacheMode": 0,
+ "_sockets": [],
+ "_useTint": false,
+ "_debugMesh": false,
+ "_debugBones": false,
+ "_debugSlots": false,
+ "_enableBatch": false,
+ "loop": true,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "8ccnp8T85P15Gy83fQ6GoY"
- },
- {
- "__type__": "cc.Animation",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 2
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 8
- },
- "playOnLoad": true,
- "_clips": [
- {
- "__uuid__": "00cf1b0a-8952-433d-87a0-7f3dc167cbef",
- "__expectedType__": "cc.AnimationClip"
- }
- ],
- "_defaultClip": {
- "__uuid__": "00cf1b0a-8952-433d-87a0-7f3dc167cbef",
- "__expectedType__": "cc.AnimationClip"
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "48GVh3ehlMqKFFeTGwLsiP"
+ "fileId": "27wZFnwTNOgYxEqhxBqo4v"
},
{
"__type__": "cc.PrefabInfo",
@@ -223,7 +191,7 @@
"asset": {
"__id__": 0
},
- "fileId": "5fgTcBE1hGQ7BzL0V9k+AN",
+ "fileId": "104XmOXdJEOY1f8nMgyyWG",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
@@ -238,7 +206,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 11
+ "__id__": 9
},
"_contentSize": {
"__type__": "cc.Size",
@@ -254,7 +222,7 @@
},
{
"__type__": "cc.CompPrefabInfo",
- "fileId": "2bHSCaSYdP1L1hw6n74Vml"
+ "fileId": "89ju37xNVPJJOPezJpA7XB"
},
{
"__type__": "cc.PrefabInfo",
@@ -264,8 +232,7 @@
"asset": {
"__id__": 0
},
- "fileId": "2e1WXUIxlLWLT5zBlbV6nF",
- "instance": null,
+ "fileId": "65v9q/98dMjafRlb094Ctr",
"targetOverrides": null
}
]
\ No newline at end of file
diff --git a/assets/resources/game/skills/buff.prefab.meta b/assets/resources/game/skills/buff.prefab.meta
index 3f02ca91..cb530cea 100644
--- a/assets/resources/game/skills/buff.prefab.meta
+++ b/assets/resources/game/skills/buff.prefab.meta
@@ -2,7 +2,7 @@
"ver": "1.1.50",
"importer": "prefab",
"imported": true,
- "uuid": "b895acca-b187-4167-8c4f-de81511c8d55",
+ "uuid": "3899fa6a-77a8-4809-b34b-64e0daa5674c",
"files": [
".json"
],
diff --git a/assets/resources/game/skills/buff/buffshow.atlas b/assets/resources/game/skills/buff/buffshow.atlas
new file mode 100644
index 00000000..8869ad98
--- /dev/null
+++ b/assets/resources/game/skills/buff/buffshow.atlas
@@ -0,0 +1,27 @@
+
+buffshow.png
+size: 266,244
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+BUFF/buff/1/baodian3
+ rotate: false
+ xy: 2, 55
+ size: 187, 187
+ orig: 205, 205
+ offset: 9, 9
+ index: -1
+BUFF/buff/1/hfgt_0
+ rotate: false
+ xy: 191, 109
+ size: 14, 133
+ orig: 400, 400
+ offset: 193, 134
+ index: -1
+BUFF/buff/1/lt_0
+ rotate: true
+ xy: 2, 2
+ size: 51, 262
+ orig: 400, 400
+ offset: 189, 69
+ index: -1
diff --git a/assets/resources/game/skills/buff/buffshow.atlas.meta b/assets/resources/game/skills/buff/buffshow.atlas.meta
new file mode 100644
index 00000000..bfcd09cf
--- /dev/null
+++ b/assets/resources/game/skills/buff/buffshow.atlas.meta
@@ -0,0 +1,12 @@
+{
+ "ver": "1.0.1",
+ "importer": "*",
+ "imported": true,
+ "uuid": "65609628-808a-4e49-ac00-445a2994a9b7",
+ "files": [
+ ".atlas",
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/resources/game/skills/buff/buffshow.json b/assets/resources/game/skills/buff/buffshow.json
new file mode 100644
index 00000000..6ea73f89
--- /dev/null
+++ b/assets/resources/game/skills/buff/buffshow.json
@@ -0,0 +1,140 @@
+{
+"skeleton": {
+ "hash": "UwPpyWm/KRY+cZe2aPxnbNKZWY0=",
+ "spine": "3.8.75",
+ "x": -85.31,
+ "y": -36.62,
+ "width": 187.12,
+ "height": 166.59,
+ "images": "./images/",
+ "audio": "D:/Game/games/未整理/SP388+Q版特效_3.8.75/SP388 Q版特效_3.8.75/buff_3"
+},
+"bones": [
+ { "name": "root", "rotation": -0.03 },
+ { "name": "all", "parent": "root", "y": -62.2, "scaleX": 0.4, "scaleY": 0.4 },
+ { "name": "bd", "parent": "root", "y": 55.48, "scaleX": 0.7263, "scaleY": 0.7263 },
+ { "name": "all2", "parent": "all", "x": 101.57, "y": 216.94, "scaleX": 0.7643, "scaleY": 0.7643 },
+ { "name": "all3", "parent": "all", "x": -88.03, "y": 215.31, "scaleX": 0.6106, "scaleY": 0.6106 },
+ { "name": "lt1", "parent": "all", "x": -60.93, "y": 176.71, "scaleX": 0.7001, "scaleY": 0.7001 },
+ { "name": "lt2", "parent": "all", "x": -4.31, "y": 146.54, "scaleX": 0.7001, "scaleY": 0.9049 },
+ { "name": "lt3", "parent": "all", "x": 52.98, "y": 172, "scaleX": 0.7001, "scaleY": 0.7593 }
+],
+"slots": [
+ { "name": "BUFF/buff/1/baodian3", "bone": "bd", "color": "ffffff00", "attachment": "BUFF/buff/1/baodian3", "blend": "additive" },
+ { "name": "BUFF/buff/1/hfgt_0", "bone": "all2", "color": "000000ff", "attachment": "BUFF/buff/1/hfgt_0", "blend": "additive" },
+ { "name": "BUFF/buff/1/hfgt_1", "bone": "all3", "color": "ffffff00", "attachment": "BUFF/buff/1/hfgt_0", "blend": "additive" },
+ { "name": "BUFF/buff/1/lt_0", "bone": "lt1", "color": "7bf1fb00", "attachment": "BUFF/buff/1/lt_0", "blend": "additive" },
+ { "name": "BUFF/buff/1/lt_1", "bone": "lt2", "color": "fffc0000", "attachment": "BUFF/buff/1/lt_0", "blend": "additive" },
+ { "name": "BUFF/buff/1/lt_2", "bone": "lt3", "color": "fffc0000", "attachment": "BUFF/buff/1/lt_0", "blend": "additive" }
+],
+"skins": [
+ {
+ "name": "default",
+ "attachments": {
+ "BUFF/buff/1/baodian3": {
+ "BUFF/buff/1/baodian3": { "width": 205, "height": 205 }
+ },
+ "BUFF/buff/1/lt_0": {
+ "BUFF/buff/1/lt_0": { "x": -17.39, "y": 131.99, "rotation": -0.05, "width": 400, "height": 400 }
+ },
+ "BUFF/buff/1/lt_1": {
+ "BUFF/buff/1/lt_0": { "x": -17.39, "y": 145.29, "width": 400, "height": 400 }
+ },
+ "BUFF/buff/1/lt_2": {
+ "BUFF/buff/1/lt_0": { "x": -17.39, "y": 131.99, "width": 400, "height": 400 }
+ },
+ "BUFF/buff/1/hfgt_0": {
+ "BUFF/buff/1/hfgt_0": { "width": 400, "height": 400 }
+ },
+ "BUFF/buff/1/hfgt_1": {
+ "BUFF/buff/1/hfgt_0": { "width": 400, "height": 400 }
+ }
+ }
+ }
+],
+"animations": {
+ "show": {
+ "slots": {
+ "BUFF/buff/1/lt_1": {
+ "color": [
+ { "time": 0.1667, "color": "fffc0095", "curve": "stepped" },
+ { "time": 0.5, "color": "fffc0095" },
+ { "time": 0.8333, "color": "fffc0000" }
+ ]
+ },
+ "BUFF/buff/1/hfgt_0": {
+ "color": [
+ { "time": 0.4333, "color": "ffffff00" },
+ { "time": 0.6, "color": "ffffff79", "curve": "stepped" },
+ { "time": 0.8667, "color": "ffffff79" },
+ { "time": 1.1, "color": "ffffff00" }
+ ]
+ },
+ "BUFF/buff/1/baodian3": {
+ "color": [
+ { "color": "ffffff00", "curve": 0.25, "c3": 0.75 },
+ { "time": 0.2333, "color": "ffffff5f", "curve": 0.25, "c3": 0.75 },
+ { "time": 0.6, "color": "ffffff4f", "curve": 0.25, "c3": 0.75 },
+ { "time": 0.9333, "color": "ffffff00" }
+ ]
+ },
+ "BUFF/buff/1/lt_0": {
+ "color": [
+ { "color": "fffc0095", "curve": "stepped" },
+ { "time": 0.3333, "color": "fffc0095" },
+ { "time": 0.6667, "color": "fffc0000" }
+ ]
+ },
+ "BUFF/buff/1/hfgt_1": {
+ "color": [
+ { "color": "ffffff65", "curve": "stepped" },
+ { "time": 0.3333, "color": "ffffff65" },
+ { "time": 0.6, "color": "ffffff00" }
+ ]
+ },
+ "BUFF/buff/1/lt_2": {
+ "color": [
+ { "time": 0.3333, "color": "fffc0095", "curve": "stepped" },
+ { "time": 0.6667, "color": "fffc0095" },
+ { "time": 1, "color": "fffc0000" }
+ ]
+ }
+ },
+ "bones": {
+ "all2": {
+ "translate": [
+ { "time": 0.4333, "curve": 0.126, "c2": 0.16, "c3": 0.75 },
+ { "time": 1.1, "y": 45.87 }
+ ]
+ },
+ "all3": {
+ "translate": [
+ { "y": 13.54 },
+ { "time": 0.6, "y": 55.27 }
+ ]
+ },
+ "lt1": {
+ "scale": [
+ { "x": 1.086, "y": 0.343, "curve": 0.111, "c2": 0.14, "c3": 0.75 },
+ { "time": 0.3333, "x": 0.337, "y": 1.034 },
+ { "time": 0.6667, "x": 0, "y": 1.034 }
+ ]
+ },
+ "lt2": {
+ "scale": [
+ { "time": 0.1667, "x": 1.055, "y": 0.316, "curve": 0.111, "c2": 0.14, "c3": 0.75 },
+ { "time": 0.5, "x": 0.337, "y": 1.034 },
+ { "time": 0.8333, "x": 0, "y": 1.034 }
+ ]
+ },
+ "lt3": {
+ "scale": [
+ { "time": 0.3333, "x": 0.984, "y": 0.493, "curve": 0.111, "c2": 0.14, "c3": 0.75 },
+ { "time": 0.6667, "x": 0.233, "y": 1.237 },
+ { "time": 1, "x": 0, "y": 1.034 }
+ ]
+ }
+ }
+ }
+}
+}
\ No newline at end of file
diff --git a/assets/resources/game/skills/buff/buffshow.json.meta b/assets/resources/game/skills/buff/buffshow.json.meta
new file mode 100644
index 00000000..13a44db5
--- /dev/null
+++ b/assets/resources/game/skills/buff/buffshow.json.meta
@@ -0,0 +1,11 @@
+{
+ "ver": "1.2.6",
+ "importer": "spine-data",
+ "imported": true,
+ "uuid": "eed43344-9f16-4c12-b68c-3030b6734470",
+ "files": [
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/resources/game/skills/buff/buffshow.png b/assets/resources/game/skills/buff/buffshow.png
new file mode 100644
index 00000000..0cd08c96
Binary files /dev/null and b/assets/resources/game/skills/buff/buffshow.png differ
diff --git a/assets/resources/game/skills/buff/buffshow.png.meta b/assets/resources/game/skills/buff/buffshow.png.meta
new file mode 100644
index 00000000..02d7898f
--- /dev/null
+++ b/assets/resources/game/skills/buff/buffshow.png.meta
@@ -0,0 +1,42 @@
+{
+ "ver": "1.0.26",
+ "importer": "image",
+ "imported": true,
+ "uuid": "6101d894-90d7-4edf-a9a5-e80cf9f16606",
+ "files": [
+ ".json",
+ ".png"
+ ],
+ "subMetas": {
+ "6c48a": {
+ "importer": "texture",
+ "uuid": "6101d894-90d7-4edf-a9a5-e80cf9f16606@6c48a",
+ "displayName": "buffshow",
+ "id": "6c48a",
+ "name": "texture",
+ "userData": {
+ "wrapModeS": "repeat",
+ "wrapModeT": "repeat",
+ "minfilter": "linear",
+ "magfilter": "linear",
+ "mipfilter": "none",
+ "anisotropy": 0,
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "6101d894-90d7-4edf-a9a5-e80cf9f16606",
+ "visible": false
+ },
+ "ver": "1.0.22",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ }
+ },
+ "userData": {
+ "hasAlpha": true,
+ "type": "texture",
+ "fixAlphaTransparencyArtifacts": false,
+ "redirect": "6101d894-90d7-4edf-a9a5-e80cf9f16606@6c48a"
+ }
+}
diff --git a/assets/resources/game/skills/buff/yun.atlas b/assets/resources/game/skills/buff/yun.atlas
new file mode 100644
index 00000000..7b476c87
--- /dev/null
+++ b/assets/resources/game/skills/buff/yun.atlas
@@ -0,0 +1,216 @@
+
+yun.png
+size: 1290,89
+format: RGBA8888
+filter: Linear,Linear
+repeat: none
+BUFF/debuff/buff4_ (1)
+ rotate: false
+ xy: 1122, 47
+ size: 84, 40
+ orig: 154, 93
+ offset: 37, 23
+ index: -1
+BUFF/debuff/buff4_ (10)
+ rotate: false
+ xy: 525, 44
+ size: 85, 43
+ orig: 154, 93
+ offset: 36, 23
+ index: -1
+BUFF/debuff/buff4_ (11)
+ rotate: false
+ xy: 784, 44
+ size: 81, 43
+ orig: 154, 93
+ offset: 36, 23
+ index: -1
+BUFF/debuff/buff4_ (12)
+ rotate: false
+ xy: 1041, 45
+ size: 79, 42
+ orig: 154, 93
+ offset: 36, 23
+ index: -1
+BUFF/debuff/buff4_ (13)
+ rotate: false
+ xy: 612, 44
+ size: 84, 43
+ orig: 154, 93
+ offset: 36, 23
+ index: -1
+BUFF/debuff/buff4_ (14)
+ rotate: false
+ xy: 349, 43
+ size: 85, 44
+ orig: 154, 93
+ offset: 36, 23
+ index: -1
+BUFF/debuff/buff4_ (15)
+ rotate: false
+ xy: 2, 42
+ size: 87, 45
+ orig: 154, 93
+ offset: 34, 23
+ index: -1
+BUFF/debuff/buff4_ (16)
+ rotate: false
+ xy: 91, 42
+ size: 84, 45
+ orig: 154, 93
+ offset: 37, 23
+ index: -1
+BUFF/debuff/buff4_ (17)
+ rotate: false
+ xy: 177, 42
+ size: 84, 45
+ orig: 154, 93
+ offset: 37, 23
+ index: -1
+BUFF/debuff/buff4_ (18)
+ rotate: false
+ xy: 263, 42
+ size: 84, 45
+ orig: 154, 93
+ offset: 37, 23
+ index: -1
+BUFF/debuff/buff4_ (19)
+ rotate: false
+ xy: 698, 44
+ size: 84, 43
+ orig: 154, 93
+ offset: 37, 24
+ index: -1
+BUFF/debuff/buff4_ (2)
+ rotate: true
+ xy: 1248, 3
+ size: 84, 40
+ orig: 154, 93
+ offset: 37, 23
+ index: -1
+BUFF/debuff/buff4_ (20)
+ rotate: false
+ xy: 955, 45
+ size: 84, 42
+ orig: 154, 93
+ offset: 37, 25
+ index: -1
+BUFF/debuff/buff4_ (21)
+ rotate: false
+ xy: 607, 4
+ size: 84, 38
+ orig: 154, 93
+ offset: 36, 28
+ index: -1
+BUFF/debuff/buff4_ (22)
+ rotate: false
+ xy: 522, 3
+ size: 83, 39
+ orig: 154, 93
+ offset: 36, 25
+ index: -1
+BUFF/debuff/buff4_ (23)
+ rotate: false
+ xy: 2, 2
+ size: 81, 38
+ orig: 154, 93
+ offset: 33, 24
+ index: -1
+BUFF/debuff/buff4_ (24)
+ rotate: false
+ xy: 436, 3
+ size: 84, 39
+ orig: 154, 93
+ offset: 30, 23
+ index: -1
+BUFF/debuff/buff4_ (25)
+ rotate: false
+ xy: 1039, 4
+ size: 81, 39
+ orig: 154, 93
+ offset: 33, 23
+ index: -1
+BUFF/debuff/buff4_ (26)
+ rotate: false
+ xy: 249, 2
+ size: 79, 38
+ orig: 154, 93
+ offset: 36, 23
+ index: -1
+BUFF/debuff/buff4_ (27)
+ rotate: false
+ xy: 693, 4
+ size: 84, 38
+ orig: 154, 93
+ offset: 36, 23
+ index: -1
+BUFF/debuff/buff4_ (28)
+ rotate: true
+ xy: 1208, 2
+ size: 85, 38
+ orig: 154, 93
+ offset: 36, 23
+ index: -1
+BUFF/debuff/buff4_ (29)
+ rotate: false
+ xy: 349, 2
+ size: 84, 39
+ orig: 154, 93
+ offset: 37, 23
+ index: -1
+BUFF/debuff/buff4_ (3)
+ rotate: false
+ xy: 1122, 5
+ size: 84, 40
+ orig: 154, 93
+ offset: 37, 24
+ index: -1
+BUFF/debuff/buff4_ (30)
+ rotate: false
+ xy: 953, 3
+ size: 84, 40
+ orig: 154, 93
+ offset: 37, 23
+ index: -1
+BUFF/debuff/buff4_ (4)
+ rotate: false
+ xy: 867, 3
+ size: 84, 40
+ orig: 154, 93
+ offset: 37, 25
+ index: -1
+BUFF/debuff/buff4_ (5)
+ rotate: false
+ xy: 779, 4
+ size: 82, 38
+ orig: 154, 93
+ offset: 38, 28
+ index: -1
+BUFF/debuff/buff4_ (6)
+ rotate: false
+ xy: 85, 2
+ size: 80, 38
+ orig: 154, 93
+ offset: 39, 29
+ index: -1
+BUFF/debuff/buff4_ (7)
+ rotate: false
+ xy: 167, 2
+ size: 80, 38
+ orig: 154, 93
+ offset: 36, 29
+ index: -1
+BUFF/debuff/buff4_ (8)
+ rotate: false
+ xy: 867, 45
+ size: 86, 42
+ orig: 154, 93
+ offset: 36, 25
+ index: -1
+BUFF/debuff/buff4_ (9)
+ rotate: false
+ xy: 436, 44
+ size: 87, 43
+ orig: 154, 93
+ offset: 36, 24
+ index: -1
diff --git a/assets/resources/game/skills/buff/yun.atlas.meta b/assets/resources/game/skills/buff/yun.atlas.meta
new file mode 100644
index 00000000..5b49b1ed
--- /dev/null
+++ b/assets/resources/game/skills/buff/yun.atlas.meta
@@ -0,0 +1,12 @@
+{
+ "ver": "1.0.1",
+ "importer": "*",
+ "imported": true,
+ "uuid": "1cd32ee6-7839-4bc2-bf0c-d7f4c6a80ac9",
+ "files": [
+ ".atlas",
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/resources/game/skills/buff/yun.json b/assets/resources/game/skills/buff/yun.json
new file mode 100644
index 00000000..753c7c4d
--- /dev/null
+++ b/assets/resources/game/skills/buff/yun.json
@@ -0,0 +1,107 @@
+{
+"skeleton": {
+ "hash": "SmmzMkrAi/Nx9uWZ5QMwLnApexQ=",
+ "spine": "3.8.75",
+ "x": -61.86,
+ "y": -37.06,
+ "width": 123.2,
+ "height": 74.4,
+ "images": "./images/",
+ "audio": ""
+},
+"bones": [
+ { "name": "root", "x": -0.26, "y": -0.26 },
+ { "name": "bone", "parent": "root", "scaleX": 0.8, "scaleY": 0.8 }
+],
+"slots": [
+ { "name": "BUFF/debuff/buff4_ (1)", "bone": "bone", "attachment": "BUFF/debuff/buff4_ (1)" }
+],
+"skins": [
+ {
+ "name": "default",
+ "attachments": {
+ "BUFF/debuff/buff4_ (1)": {
+ "BUFF/debuff/buff4_ (1)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (2)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (3)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (4)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (5)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (6)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (7)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (8)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (9)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (10)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (11)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (12)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (13)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (14)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (15)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (16)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (17)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (18)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (19)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (20)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (21)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (22)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (23)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (24)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (25)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (26)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (27)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (28)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (29)": { "y": 0.5, "width": 154, "height": 93 },
+ "BUFF/debuff/buff4_ (30)": { "y": 0.5, "width": 154, "height": 93 }
+ }
+ }
+ }
+],
+"animations": {
+ "loop": {
+ "slots": {
+ "BUFF/debuff/buff4_ (1)": {
+ "attachment": [
+ { "time": 0.0333, "name": "BUFF/debuff/buff4_ (2)" },
+ { "time": 0.0667, "name": "BUFF/debuff/buff4_ (3)" },
+ { "time": 0.1, "name": "BUFF/debuff/buff4_ (4)" },
+ { "time": 0.1333, "name": "BUFF/debuff/buff4_ (5)" },
+ { "time": 0.1667, "name": "BUFF/debuff/buff4_ (6)" },
+ { "time": 0.2, "name": "BUFF/debuff/buff4_ (7)" },
+ { "time": 0.2333, "name": "BUFF/debuff/buff4_ (8)" },
+ { "time": 0.2667, "name": "BUFF/debuff/buff4_ (9)" },
+ { "time": 0.3, "name": "BUFF/debuff/buff4_ (10)" },
+ { "time": 0.3333, "name": "BUFF/debuff/buff4_ (11)" },
+ { "time": 0.3667, "name": "BUFF/debuff/buff4_ (12)" },
+ { "time": 0.4, "name": "BUFF/debuff/buff4_ (13)" },
+ { "time": 0.4333, "name": "BUFF/debuff/buff4_ (14)" },
+ { "time": 0.4667, "name": "BUFF/debuff/buff4_ (15)" },
+ { "time": 0.5, "name": "BUFF/debuff/buff4_ (16)" },
+ { "time": 0.5333, "name": "BUFF/debuff/buff4_ (17)" },
+ { "time": 0.5667, "name": "BUFF/debuff/buff4_ (18)" },
+ { "time": 0.6, "name": "BUFF/debuff/buff4_ (19)" },
+ { "time": 0.6333, "name": "BUFF/debuff/buff4_ (20)" },
+ { "time": 0.6667, "name": "BUFF/debuff/buff4_ (21)" },
+ { "time": 0.7, "name": "BUFF/debuff/buff4_ (22)" },
+ { "time": 0.7333, "name": "BUFF/debuff/buff4_ (23)" },
+ { "time": 0.7667, "name": "BUFF/debuff/buff4_ (24)" },
+ { "time": 0.8, "name": "BUFF/debuff/buff4_ (25)" },
+ { "time": 0.8333, "name": "BUFF/debuff/buff4_ (26)" },
+ { "time": 0.8667, "name": "BUFF/debuff/buff4_ (27)" },
+ { "time": 0.9, "name": "BUFF/debuff/buff4_ (28)" },
+ { "time": 0.9333, "name": "BUFF/debuff/buff4_ (29)" },
+ { "time": 0.9667, "name": "BUFF/debuff/buff4_ (30)" },
+ { "time": 1, "name": "BUFF/debuff/buff4_ (1)" }
+ ]
+ }
+ },
+ "bones": {
+ "bone": {
+ "rotate": [
+ { "angle": 6.36, "curve": 0.25, "c3": 0.75 },
+ { "time": 0.5, "angle": -4.73, "curve": 0.25, "c3": 0.75 },
+ { "time": 1, "angle": 6.36 }
+ ]
+ }
+ }
+ }
+}
+}
\ No newline at end of file
diff --git a/assets/resources/game/skills/buff/yun.json.meta b/assets/resources/game/skills/buff/yun.json.meta
new file mode 100644
index 00000000..b31fc3dd
--- /dev/null
+++ b/assets/resources/game/skills/buff/yun.json.meta
@@ -0,0 +1,11 @@
+{
+ "ver": "1.2.6",
+ "importer": "spine-data",
+ "imported": true,
+ "uuid": "b844bc27-04c6-48be-a55f-2bb3b6fad15e",
+ "files": [
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/resources/game/skills/buff/yun.png b/assets/resources/game/skills/buff/yun.png
new file mode 100644
index 00000000..cb0af84a
Binary files /dev/null and b/assets/resources/game/skills/buff/yun.png differ
diff --git a/assets/resources/game/skills/buff/yun.png.meta b/assets/resources/game/skills/buff/yun.png.meta
new file mode 100644
index 00000000..33e064a8
--- /dev/null
+++ b/assets/resources/game/skills/buff/yun.png.meta
@@ -0,0 +1,42 @@
+{
+ "ver": "1.0.26",
+ "importer": "image",
+ "imported": true,
+ "uuid": "7f285f4d-ebb1-45ac-a31d-5a2345f9e457",
+ "files": [
+ ".json",
+ ".png"
+ ],
+ "subMetas": {
+ "6c48a": {
+ "importer": "texture",
+ "uuid": "7f285f4d-ebb1-45ac-a31d-5a2345f9e457@6c48a",
+ "displayName": "yun",
+ "id": "6c48a",
+ "name": "texture",
+ "userData": {
+ "wrapModeS": "repeat",
+ "wrapModeT": "repeat",
+ "minfilter": "linear",
+ "magfilter": "linear",
+ "mipfilter": "none",
+ "anisotropy": 0,
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "7f285f4d-ebb1-45ac-a31d-5a2345f9e457",
+ "visible": false
+ },
+ "ver": "1.0.22",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ }
+ },
+ "userData": {
+ "hasAlpha": true,
+ "type": "texture",
+ "fixAlphaTransparencyArtifacts": false,
+ "redirect": "7f285f4d-ebb1-45ac-a31d-5a2345f9e457@6c48a"
+ }
+}
diff --git a/assets/resources/game/skills/buff2.prefab b/assets/resources/game/skills/buff2.prefab
new file mode 100644
index 00000000..40230881
--- /dev/null
+++ b/assets/resources/game/skills/buff2.prefab
@@ -0,0 +1,271 @@
+[
+ {
+ "__type__": "cc.Prefab",
+ "_name": "buff2",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_native": "",
+ "data": {
+ "__id__": 1
+ },
+ "optimizationPolicy": 0,
+ "persistent": false
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "buff2",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": null,
+ "_children": [
+ {
+ "__id__": 2
+ }
+ ],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 10
+ }
+ ],
+ "_prefab": {
+ "__id__": 12
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 3.317,
+ "y": 48.724,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "buff-n-0",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 1
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 3
+ },
+ {
+ "__id__": 5
+ },
+ {
+ "__id__": 7
+ }
+ ],
+ "_prefab": {
+ "__id__": 9
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 2
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 4
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 84,
+ "height": 84
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "d7b/DUpjJNSKVX7O8hzniN"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 2
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 6
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "2e272fb5-0f2a-459c-853d-e312e14693d0@cc2a3",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 0,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "8ccnp8T85P15Gy83fQ6GoY"
+ },
+ {
+ "__type__": "cc.Animation",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 2
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 8
+ },
+ "playOnLoad": true,
+ "_clips": [
+ {
+ "__uuid__": "00cf1b0a-8952-433d-87a0-7f3dc167cbef",
+ "__expectedType__": "cc.AnimationClip"
+ }
+ ],
+ "_defaultClip": {
+ "__uuid__": "00cf1b0a-8952-433d-87a0-7f3dc167cbef",
+ "__expectedType__": "cc.AnimationClip"
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "48GVh3ehlMqKFFeTGwLsiP"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "5fgTcBE1hGQ7BzL0V9k+AN",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 11
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 100,
+ "height": 100
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "2bHSCaSYdP1L1hw6n74Vml"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "2e1WXUIxlLWLT5zBlbV6nF",
+ "instance": null,
+ "targetOverrides": null
+ }
+]
\ No newline at end of file
diff --git a/assets/resources/game/skills/buff2.prefab.meta b/assets/resources/game/skills/buff2.prefab.meta
new file mode 100644
index 00000000..154ea3de
--- /dev/null
+++ b/assets/resources/game/skills/buff2.prefab.meta
@@ -0,0 +1,13 @@
+{
+ "ver": "1.1.50",
+ "importer": "prefab",
+ "imported": true,
+ "uuid": "b895acca-b187-4167-8c4f-de81511c8d55",
+ "files": [
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {
+ "syncNodeName": "buff2"
+ }
+}
diff --git a/assets/resources/game/skills/iced.prefab b/assets/resources/game/skills/iced.prefab
new file mode 100644
index 00000000..13af3f98
--- /dev/null
+++ b/assets/resources/game/skills/iced.prefab
@@ -0,0 +1,608 @@
+[
+ {
+ "__type__": "cc.Prefab",
+ "_name": "iced",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_native": "",
+ "data": {
+ "__id__": 1
+ },
+ "optimizationPolicy": 0,
+ "persistent": false
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "iced",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": null,
+ "_children": [
+ {
+ "__id__": 2
+ }
+ ],
+ "_active": false,
+ "_components": [
+ {
+ "__id__": 24
+ }
+ ],
+ "_prefab": {
+ "__id__": 26
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "Node",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 1
+ },
+ "_children": [
+ {
+ "__id__": 3
+ },
+ {
+ "__id__": 9
+ },
+ {
+ "__id__": 15
+ }
+ ],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 21
+ }
+ ],
+ "_prefab": {
+ "__id__": 23
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "9001",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 2
+ },
+ "_children": [],
+ "_active": false,
+ "_components": [
+ {
+ "__id__": 4
+ },
+ {
+ "__id__": 6
+ }
+ ],
+ "_prefab": {
+ "__id__": 8
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 10.023,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 0.3,
+ "y": 0.3,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 3
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 5
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 201,
+ "height": 104
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "60jeqqJp1PdJ5FimlCYl1L"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 3
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 7
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@c8366",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 1,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "d3pqnBwllKF65+2m4tq4m/"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "5b9SeBfLJOj7WtxLEndykb",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "i1",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 2
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 10
+ },
+ {
+ "__id__": 12
+ }
+ ],
+ "_prefab": {
+ "__id__": 14
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": -1.994,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 0.35,
+ "y": -0.3,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 9
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 11
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 292,
+ "height": 71
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "72u0zIvCtKKIW9P7yPT8//"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 9
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 13
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@90c11",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 1,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "b3toU+AtFO154IExtRlTC7"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "e4OG2xQ5hKo5bScRHWnDV5",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "b1",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 2
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 16
+ },
+ {
+ "__id__": 18
+ }
+ ],
+ "_prefab": {
+ "__id__": 20
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 38.194,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 0.5,
+ "y": 0.5,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 15
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 17
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 174,
+ "height": 166
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "68HyC7bchAiYuZML4HXsMg"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 15
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 19
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@e59c0",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 1,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "4979P11uhDx6hpOKaQJ9vm"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "73YVZqF21BPZK9DnKXX7XW",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 2
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 22
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 100,
+ "height": 100
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "0frDOGiGhPzZUd2vVcT6Qh"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "23OyeRNFRDaKriZ+wlf9uj",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 25
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 100,
+ "height": 100
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "fd5StMVq1NU7YtkzF260om"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "d9UYSvjCpD24d1H7HhaHEv",
+ "targetOverrides": null
+ }
+]
\ No newline at end of file
diff --git a/assets/resources/game/skills/iced.prefab.meta b/assets/resources/game/skills/iced.prefab.meta
new file mode 100644
index 00000000..1c254fe2
--- /dev/null
+++ b/assets/resources/game/skills/iced.prefab.meta
@@ -0,0 +1,13 @@
+{
+ "ver": "1.1.50",
+ "importer": "prefab",
+ "imported": true,
+ "uuid": "b9f0b656-fc60-43f6-bf8b-c3efa8997408",
+ "files": [
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {
+ "syncNodeName": "iced"
+ }
+}
diff --git a/assets/resources/game/skills/imges.meta b/assets/resources/game/skills/imges.meta
new file mode 100644
index 00000000..86aa7bac
--- /dev/null
+++ b/assets/resources/game/skills/imges.meta
@@ -0,0 +1,9 @@
+{
+ "ver": "1.2.0",
+ "importer": "directory",
+ "imported": true,
+ "uuid": "90c5d4db-6527-4b2e-a26b-bd747ffb8d78",
+ "files": [],
+ "subMetas": {},
+ "userData": {}
+}
diff --git a/assets/resources/game/skills/max.prefab b/assets/resources/game/skills/max.prefab
index d13ff5ba..fe75bb97 100644
--- a/assets/resources/game/skills/max.prefab
+++ b/assets/resources/game/skills/max.prefab
@@ -20,22 +20,16 @@
"_children": [
{
"__id__": 2
- },
- {
- "__id__": 8
}
],
"_active": true,
"_components": [
{
- "__id__": 14
- },
- {
- "__id__": 16
+ "__id__": 8
}
],
"_prefab": {
- "__id__": 18
+ "__id__": 10
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -68,14 +62,14 @@
},
{
"__type__": "cc.Node",
- "_name": "tx",
+ "_name": "anm",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 1
},
"_children": [],
- "_active": false,
+ "_active": true,
"_components": [
{
"__id__": 3
@@ -90,7 +84,7 @@
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
- "y": 6.803,
+ "y": 0,
"z": 0
},
"_lrot": {
@@ -103,7 +97,7 @@
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
- "y": 0.5,
+ "y": 1,
"z": 1
},
"_mobility": 0,
@@ -128,142 +122,6 @@
"__prefab": {
"__id__": 4
},
- "_contentSize": {
- "__type__": "cc.Size",
- "width": 84,
- "height": 50
- },
- "_anchorPoint": {
- "__type__": "cc.Vec2",
- "x": 0.5,
- "y": 0.5
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "d6ARW7++NF/aa6Mb68oWuQ"
- },
- {
- "__type__": "cc.Sprite",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 2
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 6
- },
- "_customMaterial": null,
- "_srcBlendFactor": 2,
- "_dstBlendFactor": 4,
- "_color": {
- "__type__": "cc.Color",
- "r": 255,
- "g": 255,
- "b": 255,
- "a": 255
- },
- "_spriteFrame": {
- "__uuid__": "2e272fb5-0f2a-459c-853d-e312e14693d0@b1e25",
- "__expectedType__": "cc.SpriteFrame"
- },
- "_type": 0,
- "_fillType": 0,
- "_sizeMode": 0,
- "_fillCenter": {
- "__type__": "cc.Vec2",
- "x": 0,
- "y": 0
- },
- "_fillStart": 0,
- "_fillRange": 0,
- "_isTrimmedMode": true,
- "_useGrayscale": false,
- "_atlas": null,
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "73D0ZuTQdMDqn/pimi7d34"
- },
- {
- "__type__": "cc.PrefabInfo",
- "root": {
- "__id__": 1
- },
- "asset": {
- "__id__": 0
- },
- "fileId": "ecM59gi31F0o+1I412RI9T",
- "instance": null,
- "targetOverrides": null,
- "nestedPrefabInstanceRoots": null
- },
- {
- "__type__": "cc.Node",
- "_name": "anm",
- "_objFlags": 0,
- "__editorExtras__": {},
- "_parent": {
- "__id__": 1
- },
- "_children": [],
- "_active": true,
- "_components": [
- {
- "__id__": 9
- },
- {
- "__id__": 11
- }
- ],
- "_prefab": {
- "__id__": 13
- },
- "_lpos": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_lrot": {
- "__type__": "cc.Quat",
- "x": 0,
- "y": 0,
- "z": 0,
- "w": 1
- },
- "_lscale": {
- "__type__": "cc.Vec3",
- "x": 1,
- "y": 1,
- "z": 1
- },
- "_mobility": 0,
- "_layer": 1,
- "_euler": {
- "__type__": "cc.Vec3",
- "x": 0,
- "y": 0,
- "z": 0
- },
- "_id": ""
- },
- {
- "__type__": "cc.UITransform",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 8
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 10
- },
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
@@ -286,11 +144,11 @@
"_objFlags": 0,
"__editorExtras__": {},
"node": {
- "__id__": 8
+ "__id__": 2
},
"_enabled": true,
"__prefab": {
- "__id__": 12
+ "__id__": 6
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -348,7 +206,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 15
+ "__id__": 9
},
"_contentSize": {
"__type__": "cc.Size",
@@ -366,35 +224,6 @@
"__type__": "cc.CompPrefabInfo",
"fileId": "77z0467LpD9JrxJ4yirYik"
},
- {
- "__type__": "cc.Animation",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 1
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 17
- },
- "playOnLoad": true,
- "_clips": [
- {
- "__uuid__": "aad6cf63-5eb6-4e5f-9ff5-d798558e99a0",
- "__expectedType__": "cc.AnimationClip"
- }
- ],
- "_defaultClip": {
- "__uuid__": "aad6cf63-5eb6-4e5f-9ff5-d798558e99a0",
- "__expectedType__": "cc.AnimationClip"
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "00ZGUe04VE4ope4coXwd55"
- },
{
"__type__": "cc.PrefabInfo",
"root": {
diff --git a/assets/resources/game/skills/shielded.prefab b/assets/resources/game/skills/shielded.prefab
index e771023b..4e108095 100644
--- a/assets/resources/game/skills/shielded.prefab
+++ b/assets/resources/game/skills/shielded.prefab
@@ -25,14 +25,14 @@
"_active": true,
"_components": [
{
- "__id__": 10
+ "__id__": 26
},
{
- "__id__": 12
+ "__id__": 28
}
],
"_prefab": {
- "__id__": 14
+ "__id__": 30
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -71,21 +71,28 @@
"_parent": {
"__id__": 1
},
- "_children": [],
- "_active": true,
- "_components": [
+ "_children": [
{
"__id__": 3
},
{
- "__id__": 5
+ "__id__": 9
},
{
- "__id__": 7
+ "__id__": 15
+ }
+ ],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 21
+ },
+ {
+ "__id__": 23
}
],
"_prefab": {
- "__id__": 9
+ "__id__": 25
},
"_lpos": {
"__type__": "cc.Vec3",
@@ -116,6 +123,412 @@
},
"_id": ""
},
+ {
+ "__type__": "cc.Node",
+ "_name": "gd",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 2
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 4
+ },
+ {
+ "__id__": 6
+ }
+ ],
+ "_prefab": {
+ "__id__": 8
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 53.879,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 0.9,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 3
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 5
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 83,
+ "height": 81
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "d3y+cyEe9NDI27l0exjRQZ"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 3
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 7
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@a3f8b",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 1,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "41/Q5MP4lPwIqf54akEHlt"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "01wcwMAERIK4ZFFFMjDMWt",
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "OK_ult_2_0001",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 2
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 10
+ },
+ {
+ "__id__": 12
+ }
+ ],
+ "_prefab": {
+ "__id__": 14
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 57.141,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 0.9,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 9
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 11
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 104,
+ "height": 94
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "66GGP31KBH54vNy29wK4Wd"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 9
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 13
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@accaf",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 1,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "98WjpD6sFCzrxReMeikSQN"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "75K4z+0QBOMq4sdx/s8g4i",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "zhao",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 2
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 16
+ },
+ {
+ "__id__": 18
+ }
+ ],
+ "_prefab": {
+ "__id__": 20
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 53.879,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 0.9,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 15
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 17
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 82,
+ "height": 82
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "bbS5E6Hz5Cnow7ZqFTnB9V"
+ },
+ {
+ "__type__": "cc.Sprite",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 15
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 19
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_spriteFrame": {
+ "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@79dcd",
+ "__expectedType__": "cc.SpriteFrame"
+ },
+ "_type": 0,
+ "_fillType": 0,
+ "_sizeMode": 1,
+ "_fillCenter": {
+ "__type__": "cc.Vec2",
+ "x": 0,
+ "y": 0
+ },
+ "_fillStart": 0,
+ "_fillRange": 0,
+ "_isTrimmedMode": true,
+ "_useGrayscale": false,
+ "_atlas": null,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "4ch3h/kcNMpoieZ4BRPmxC"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "769SBvJpJDsKfC3h45rlH5",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
{
"__type__": "cc.UITransform",
"_name": "",
@@ -126,7 +539,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 4
+ "__id__": 22
},
"_contentSize": {
"__type__": "cc.Size",
@@ -152,9 +565,9 @@
"node": {
"__id__": 2
},
- "_enabled": true,
+ "_enabled": false,
"__prefab": {
- "__id__": 6
+ "__id__": 24
},
"_customMaterial": null,
"_srcBlendFactor": 2,
@@ -189,35 +602,6 @@
"__type__": "cc.CompPrefabInfo",
"fileId": "9a+65VIghBm4HQxuHPQ/mg"
},
- {
- "__type__": "cc.Animation",
- "_name": "",
- "_objFlags": 0,
- "__editorExtras__": {},
- "node": {
- "__id__": 2
- },
- "_enabled": true,
- "__prefab": {
- "__id__": 8
- },
- "playOnLoad": true,
- "_clips": [
- {
- "__uuid__": "6200a523-2e29-480c-a2bb-2189a23daf16",
- "__expectedType__": "cc.AnimationClip"
- }
- ],
- "_defaultClip": {
- "__uuid__": "6200a523-2e29-480c-a2bb-2189a23daf16",
- "__expectedType__": "cc.AnimationClip"
- },
- "_id": ""
- },
- {
- "__type__": "cc.CompPrefabInfo",
- "fileId": "cc1FBbHhlBirJkBcBIHROd"
- },
{
"__type__": "cc.PrefabInfo",
"root": {
@@ -241,7 +625,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 11
+ "__id__": 27
},
"_contentSize": {
"__type__": "cc.Size",
@@ -269,7 +653,7 @@
},
"_enabled": true,
"__prefab": {
- "__id__": 13
+ "__id__": 29
},
"playOnLoad": true,
"_clips": [
diff --git a/assets/resources/game/skills/skills.plist b/assets/resources/game/skills/skills.plist
index 3669b8ed..d5877c4b 100644
--- a/assets/resources/game/skills/skills.plist
+++ b/assets/resources/game/skills/skills.plist
@@ -17,7 +17,7 @@
spriteSourceSize
{150,100}
textureRect
- {{699,743},{114,58}}
+ {{324,1092},{114,58}}
textureRotated
@@ -34,7 +34,7 @@
spriteSourceSize
{150,100}
textureRect
- {{902,1833},{96,60}}
+ {{804,521},{96,60}}
textureRotated
@@ -51,9 +51,9 @@
spriteSourceSize
{150,100}
textureRect
- {{553,1478},{90,54}}
+ {{791,772},{90,54}}
textureRotated
-
+
4.png
@@ -68,9 +68,9 @@
spriteSourceSize
{150,100}
textureRect
- {{845,429},{100,58}}
+ {{758,1154},{100,58}}
textureRotated
-
+
9001.png
@@ -81,11 +81,11 @@
spriteOffset
{0,0}
spriteSize
- {402,207}
+ {201,104}
spriteSourceSize
- {402,207}
+ {201,104}
textureRect
- {{1,1317},{402,207}}
+ {{219,592},{201,104}}
textureRotated
@@ -102,7 +102,7 @@
spriteSourceSize
{229,212}
textureRect
- {{905,429},{85,84}}
+ {{497,1115},{85,84}}
textureRotated
@@ -119,7 +119,7 @@
spriteSourceSize
{229,212}
textureRect
- {{1,1898},{93,90}}
+ {{791,677},{93,90}}
textureRotated
@@ -136,7 +136,7 @@
spriteSourceSize
{229,212}
textureRect
- {{93,1898},{101,92}}
+ {{758,1060},{101,92}}
textureRotated
@@ -153,9 +153,9 @@
spriteSourceSize
{229,212}
textureRect
- {{716,1861},{111,102}}
+ {{384,1115},{111,102}}
textureRotated
-
+
Fx05_04.png
@@ -170,7 +170,7 @@
spriteSourceSize
{229,212}
textureRect
- {{473,1165},{119,110}}
+ {{203,1092},{119,110}}
textureRotated
@@ -187,9 +187,9 @@
spriteSourceSize
{229,212}
textureRect
- {{562,743},{135,126}}
+ {{763,135},{135,126}}
textureRotated
-
+
Fx05_06.png
@@ -204,9 +204,9 @@
spriteSourceSize
{229,212}
textureRect
- {{203,1820},{157,152}}
+ {{609,130},{157,152}}
textureRotated
-
+
Fx05_07.png
@@ -221,7 +221,7 @@
spriteSourceSize
{229,212}
textureRect
- {{808,906},{173,170}}
+ {{583,1014},{173,170}}
textureRotated
@@ -238,7 +238,7 @@
spriteSourceSize
{229,212}
textureRect
- {{806,1659},{177,172}}
+ {{612,672},{177,172}}
textureRotated
@@ -255,7 +255,7 @@
spriteSourceSize
{229,212}
textureRect
- {{808,728},{181,176}}
+ {{400,937},{181,176}}
textureRotated
@@ -272,7 +272,7 @@
spriteSourceSize
{229,212}
textureRect
- {{806,1477},{183,180}}
+ {{402,755},{183,180}}
textureRotated
@@ -289,9 +289,9 @@
spriteSourceSize
{229,212}
textureRect
- {{805,1078},{185,184}}
+ {{425,569},{185,184}}
textureRotated
-
+
Fx05_12.png
@@ -306,7 +306,7 @@
spriteSourceSize
{229,212}
textureRect
- {{614,1673},{189,186}}
+ {{613,484},{189,186}}
textureRotated
@@ -323,7 +323,7 @@
spriteSourceSize
{229,212}
textureRect
- {{614,1478},{193,190}}
+ {{613,289},{193,190}}
textureRotated
@@ -340,7 +340,7 @@
spriteSourceSize
{229,212}
textureRect
- {{405,1797},{195,194}}
+ {{203,896},{195,194}}
textureRotated
@@ -357,7 +357,7 @@
spriteSourceSize
{229,212}
textureRect
- {{553,1280},{197,196}}
+ {{203,698},{197,196}}
textureRotated
@@ -374,9 +374,9 @@
spriteSourceSize
{229,212}
textureRect
- {{602,1078},{201,200}}
+ {{1,975},{201,200}}
textureRotated
-
+
Fx05_17.png
@@ -391,7 +391,7 @@
spriteSourceSize
{229,212}
textureRect
- {{602,871},{205,204}}
+ {{219,385},{205,204}}
textureRotated
@@ -408,7 +408,7 @@
spriteSourceSize
{229,212}
textureRect
- {{405,1587},{207,208}}
+ {{212,175},{207,208}}
textureRotated
@@ -425,7 +425,24 @@
spriteSourceSize
{229,212}
textureRect
- {{562,531},{209,210}}
+ {{1,175},{209,210}}
+ textureRotated
+
+
+ OK_ult_2_0001.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,5}
+ spriteSize
+ {104,94}
+ spriteSourceSize
+ {110,110}
+ textureRect
+ {{763,964},{104,94}}
textureRotated
@@ -442,10 +459,27 @@
spriteSourceSize
{64,64}
textureRect
- {{820,1918},{56,64}}
+ {{804,619},{56,64}}
textureRotated
+ b1.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {174,166}
+ spriteSourceSize
+ {174,166}
+ textureRect
+ {{587,846},{174,166}}
+ textureRotated
+
+
baohushijian.png
aliases
@@ -459,9 +493,9 @@
spriteSourceSize
{82,85}
textureRect
- {{820,1833},{80,83}}
+ {{805,439},{80,83}}
textureRotated
-
+
f1.png
@@ -476,7 +510,7 @@
spriteSourceSize
{186,195}
textureRect
- {{773,531},{186,195}}
+ {{421,175},{186,195}}
textureRotated
@@ -493,7 +527,7 @@
spriteSourceSize
{186,195}
textureRect
- {{752,1280},{186,195}}
+ {{425,372},{186,195}}
textureRotated
@@ -510,7 +544,7 @@
spriteSourceSize
{132,122}
textureRect
- {{845,295},{132,122}}
+ {{767,1},{132,122}}
textureRotated
@@ -527,7 +561,24 @@
spriteSourceSize
{112,116}
textureRect
- {{602,1861},{112,116}}
+ {{763,846},{112,116}}
+ textureRotated
+
+
+ gd.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {83,81}
+ spriteSourceSize
+ {83,81}
+ textureRect
+ {{805,272},{83,81}}
textureRotated
@@ -544,7 +595,7 @@
spriteSourceSize
{334,185}
textureRect
- {{332,1526},{292,71}}
+ {{130,681},{292,71}}
textureRotated
@@ -561,7 +612,7 @@
spriteSourceSize
{334,185}
textureRect
- {{473,577},{292,87}}
+ {{130,387},{292,87}}
textureRotated
@@ -578,9 +629,9 @@
spriteSourceSize
{334,185}
textureRect
- {{845,1},{292,127}}
+ {{473,1},{292,127}}
textureRotated
-
+
i4.png
@@ -595,7 +646,7 @@
spriteSourceSize
{334,185}
textureRect
- {{203,1526},{292,127}}
+ {{1,387},{292,127}}
textureRotated
@@ -612,95 +663,10 @@
spriteSourceSize
{334,185}
textureRect
- {{473,871},{292,127}}
+ {{1,681},{292,127}}
textureRotated
- l1.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {194,155}
- spriteSize
- {146,268}
- spriteSourceSize
- {590,602}
- textureRect
- {{405,1317},{146,268}}
- textureRotated
-
-
- l2.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {167,104}
- spriteSize
- {200,370}
- spriteSourceSize
- {590,602}
- textureRect
- {{1,1526},{200,370}}
- textureRotated
-
-
- l3.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {121,26}
- spriteSize
- {292,528}
- spriteSourceSize
- {590,602}
- textureRect
- {{551,1},{292,528}}
- textureRotated
-
-
- l4.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {32,8}
- spriteSize
- {470,564}
- spriteSourceSize
- {590,602}
- textureRect
- {{1,577},{470,564}}
- textureRotated
-
-
- l5.png
-
- aliases
-
- anchor
- {0.5,0.5}
- spriteOffset
- {-7,3}
- spriteSize
- {548,574}
- spriteSourceSize
- {590,602}
- textureRect
- {{1,1},{548,574}}
- textureRotated
-
-
tx.png
aliases
@@ -714,7 +680,24 @@
spriteSourceSize
{470,172}
textureRect
- {{1,1143},{470,172}}
+ {{1,1},{470,172}}
+ textureRotated
+
+
+ zhao.png
+
+ aliases
+
+ anchor
+ {0.5,0.5}
+ spriteOffset
+ {0,0}
+ spriteSize
+ {82,82}
+ spriteSourceSize
+ {82,82}
+ textureRect
+ {{805,355},{82,82}}
textureRotated
@@ -730,9 +713,9 @@
realTextureFileName
skills.png
size
- {990,1992}
+ {890,1218}
smartupdate
- $TexturePacker:SmartUpdate:0691efb7333071da6850dfd8eaf3a436:c402a475f842571dcbe1ad86de4c88d0:37e596914ac459dbdf00101432af5e18$
+ $TexturePacker:SmartUpdate:560ebd44222e4f73d738b29c9f563f2b:3b4ef14f1d165c3568e1c99aefba9b65:37e596914ac459dbdf00101432af5e18$
textureFileName
skills.png
diff --git a/assets/resources/game/skills/skills.plist.meta b/assets/resources/game/skills/skills.plist.meta
index 0d317bf3..b4058345 100644
--- a/assets/resources/game/skills/skills.plist.meta
+++ b/assets/resources/game/skills/skills.plist.meta
@@ -19,8 +19,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 699,
- "trimY": 743,
+ "trimX": 324,
+ "trimY": 1092,
"width": 114,
"height": 58,
"rawWidth": 150,
@@ -65,8 +65,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 902,
- "trimY": 1833,
+ "trimX": 804,
+ "trimY": 521,
"width": 96,
"height": 60,
"rawWidth": 150,
@@ -108,11 +108,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 1,
"offsetY": 1,
- "trimX": 553,
- "trimY": 1478,
+ "trimX": 791,
+ "trimY": 772,
"width": 90,
"height": 54,
"rawWidth": 150,
@@ -154,11 +154,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 1,
"offsetY": 0,
- "trimX": 845,
- "trimY": 429,
+ "trimX": 758,
+ "trimY": 1154,
"width": 100,
"height": 58,
"rawWidth": 150,
@@ -203,12 +203,12 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 1,
- "trimY": 1317,
- "width": 402,
- "height": 207,
- "rawWidth": 402,
- "rawHeight": 207,
+ "trimX": 219,
+ "trimY": 592,
+ "width": 201,
+ "height": 104,
+ "rawWidth": 201,
+ "rawHeight": 104,
"borderTop": 0,
"borderBottom": 0,
"borderLeft": 0,
@@ -249,8 +249,8 @@
"rotated": true,
"offsetX": 6,
"offsetY": -3,
- "trimX": 905,
- "trimY": 429,
+ "trimX": 497,
+ "trimY": 1115,
"width": 85,
"height": 84,
"rawWidth": 229,
@@ -295,8 +295,8 @@
"rotated": true,
"offsetX": 6,
"offsetY": -6,
- "trimX": 1,
- "trimY": 1898,
+ "trimX": 791,
+ "trimY": 677,
"width": 93,
"height": 90,
"rawWidth": 229,
@@ -341,8 +341,8 @@
"rotated": false,
"offsetX": 6,
"offsetY": -5,
- "trimX": 93,
- "trimY": 1898,
+ "trimX": 758,
+ "trimY": 1060,
"width": 101,
"height": 92,
"rawWidth": 229,
@@ -384,11 +384,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 5,
"offsetY": -3,
- "trimX": 716,
- "trimY": 1861,
+ "trimX": 384,
+ "trimY": 1115,
"width": 111,
"height": 102,
"rawWidth": 229,
@@ -433,8 +433,8 @@
"rotated": false,
"offsetX": 5,
"offsetY": -1,
- "trimX": 473,
- "trimY": 1165,
+ "trimX": 203,
+ "trimY": 1092,
"width": 119,
"height": 110,
"rawWidth": 229,
@@ -476,11 +476,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 4,
"offsetY": 1,
- "trimX": 562,
- "trimY": 743,
+ "trimX": 763,
+ "trimY": 135,
"width": 135,
"height": 126,
"rawWidth": 229,
@@ -522,11 +522,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 3,
"offsetY": 3,
- "trimX": 203,
- "trimY": 1820,
+ "trimX": 609,
+ "trimY": 130,
"width": 157,
"height": 152,
"rawWidth": 229,
@@ -571,8 +571,8 @@
"rotated": false,
"offsetX": 3,
"offsetY": 4,
- "trimX": 808,
- "trimY": 906,
+ "trimX": 583,
+ "trimY": 1014,
"width": 173,
"height": 170,
"rawWidth": 229,
@@ -617,8 +617,8 @@
"rotated": false,
"offsetX": 2,
"offsetY": 3,
- "trimX": 806,
- "trimY": 1659,
+ "trimX": 612,
+ "trimY": 672,
"width": 177,
"height": 172,
"rawWidth": 229,
@@ -663,8 +663,8 @@
"rotated": false,
"offsetX": 2,
"offsetY": 3,
- "trimX": 808,
- "trimY": 728,
+ "trimX": 400,
+ "trimY": 937,
"width": 181,
"height": 176,
"rawWidth": 229,
@@ -709,8 +709,8 @@
"rotated": false,
"offsetX": 2,
"offsetY": 3,
- "trimX": 806,
- "trimY": 1477,
+ "trimX": 402,
+ "trimY": 755,
"width": 183,
"height": 180,
"rawWidth": 229,
@@ -752,11 +752,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": 2,
"offsetY": 3,
- "trimX": 805,
- "trimY": 1078,
+ "trimX": 425,
+ "trimY": 569,
"width": 185,
"height": 184,
"rawWidth": 229,
@@ -801,8 +801,8 @@
"rotated": false,
"offsetX": 1,
"offsetY": 2,
- "trimX": 614,
- "trimY": 1673,
+ "trimX": 613,
+ "trimY": 484,
"width": 189,
"height": 186,
"rawWidth": 229,
@@ -847,8 +847,8 @@
"rotated": true,
"offsetX": 1,
"offsetY": 2,
- "trimX": 614,
- "trimY": 1478,
+ "trimX": 613,
+ "trimY": 289,
"width": 193,
"height": 190,
"rawWidth": 229,
@@ -893,8 +893,8 @@
"rotated": false,
"offsetX": 1,
"offsetY": 2,
- "trimX": 405,
- "trimY": 1797,
+ "trimX": 203,
+ "trimY": 896,
"width": 195,
"height": 194,
"rawWidth": 229,
@@ -939,8 +939,8 @@
"rotated": false,
"offsetX": 1,
"offsetY": 1,
- "trimX": 553,
- "trimY": 1280,
+ "trimX": 203,
+ "trimY": 698,
"width": 197,
"height": 196,
"rawWidth": 229,
@@ -982,11 +982,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 1,
"offsetY": 1,
- "trimX": 602,
- "trimY": 1078,
+ "trimX": 1,
+ "trimY": 975,
"width": 201,
"height": 200,
"rawWidth": 229,
@@ -1031,8 +1031,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 1,
- "trimX": 602,
- "trimY": 871,
+ "trimX": 219,
+ "trimY": 385,
"width": 205,
"height": 204,
"rawWidth": 229,
@@ -1077,8 +1077,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 1,
- "trimX": 405,
- "trimY": 1587,
+ "trimX": 212,
+ "trimY": 175,
"width": 207,
"height": 208,
"rawWidth": 229,
@@ -1123,8 +1123,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 562,
- "trimY": 531,
+ "trimX": 1,
+ "trimY": 175,
"width": 209,
"height": 210,
"rawWidth": 229,
@@ -1157,6 +1157,52 @@
],
"subMetas": {}
},
+ "accaf": {
+ "importer": "sprite-frame",
+ "uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@accaf",
+ "displayName": "",
+ "id": "accaf",
+ "name": "OK_ult_2_0001",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 5,
+ "trimX": 763,
+ "trimY": 964,
+ "width": 104,
+ "height": 94,
+ "rawWidth": 110,
+ "rawHeight": 110,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd104e76-5215-49fe-a074-e65ffa26583e@6c48a",
+ "atlasUuid": "45af5702-7585-4d72-85cf-d7b8da02d832"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
"aa3e6": {
"importer": "sprite-frame",
"uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@aa3e6",
@@ -1169,8 +1215,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 820,
- "trimY": 1918,
+ "trimX": 804,
+ "trimY": 619,
"width": 56,
"height": 64,
"rawWidth": 64,
@@ -1203,6 +1249,52 @@
],
"subMetas": {}
},
+ "e59c0": {
+ "importer": "sprite-frame",
+ "uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@e59c0",
+ "displayName": "",
+ "id": "e59c0",
+ "name": "b1",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 587,
+ "trimY": 846,
+ "width": 174,
+ "height": 166,
+ "rawWidth": 174,
+ "rawHeight": 166,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd104e76-5215-49fe-a074-e65ffa26583e@6c48a",
+ "atlasUuid": "45af5702-7585-4d72-85cf-d7b8da02d832"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
"97bba": {
"importer": "sprite-frame",
"uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@97bba",
@@ -1212,11 +1304,11 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": false,
+ "rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 820,
- "trimY": 1833,
+ "trimX": 805,
+ "trimY": 439,
"width": 80,
"height": 83,
"rawWidth": 82,
@@ -1261,8 +1353,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 773,
- "trimY": 531,
+ "trimX": 421,
+ "trimY": 175,
"width": 186,
"height": 195,
"rawWidth": 186,
@@ -1307,8 +1399,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 752,
- "trimY": 1280,
+ "trimX": 425,
+ "trimY": 372,
"width": 186,
"height": 195,
"rawWidth": 186,
@@ -1353,8 +1445,8 @@
"rotated": true,
"offsetX": 0,
"offsetY": 0,
- "trimX": 845,
- "trimY": 295,
+ "trimX": 767,
+ "trimY": 1,
"width": 132,
"height": 122,
"rawWidth": 132,
@@ -1399,8 +1491,8 @@
"rotated": false,
"offsetX": 0,
"offsetY": 0,
- "trimX": 602,
- "trimY": 1861,
+ "trimX": 763,
+ "trimY": 846,
"width": 112,
"height": 116,
"rawWidth": 112,
@@ -1433,6 +1525,52 @@
],
"subMetas": {}
},
+ "a3f8b": {
+ "importer": "sprite-frame",
+ "uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@a3f8b",
+ "displayName": "",
+ "id": "a3f8b",
+ "name": "gd",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 805,
+ "trimY": 272,
+ "width": 83,
+ "height": 81,
+ "rawWidth": 83,
+ "rawHeight": 81,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd104e76-5215-49fe-a074-e65ffa26583e@6c48a",
+ "atlasUuid": "45af5702-7585-4d72-85cf-d7b8da02d832"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
+ },
"90c11": {
"importer": "sprite-frame",
"uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@90c11",
@@ -1445,8 +1583,8 @@
"rotated": true,
"offsetX": -3,
"offsetY": -35,
- "trimX": 332,
- "trimY": 1526,
+ "trimX": 130,
+ "trimY": 681,
"width": 292,
"height": 71,
"rawWidth": 334,
@@ -1491,8 +1629,8 @@
"rotated": true,
"offsetX": -3,
"offsetY": -27,
- "trimX": 473,
- "trimY": 577,
+ "trimX": 130,
+ "trimY": 387,
"width": 292,
"height": 87,
"rawWidth": 334,
@@ -1534,10 +1672,10 @@
"userData": {
"trimType": "auto",
"trimThreshold": 1,
- "rotated": true,
+ "rotated": false,
"offsetX": -3,
"offsetY": -7,
- "trimX": 845,
+ "trimX": 473,
"trimY": 1,
"width": 292,
"height": 127,
@@ -1583,8 +1721,8 @@
"rotated": true,
"offsetX": -3,
"offsetY": -7,
- "trimX": 203,
- "trimY": 1526,
+ "trimX": 1,
+ "trimY": 387,
"width": 292,
"height": 127,
"rawWidth": 334,
@@ -1629,8 +1767,8 @@
"rotated": true,
"offsetX": -3,
"offsetY": -7,
- "trimX": 473,
- "trimY": 871,
+ "trimX": 1,
+ "trimY": 681,
"width": 292,
"height": 127,
"rawWidth": 334,
@@ -1663,236 +1801,6 @@
],
"subMetas": {}
},
- "36a3a": {
- "importer": "sprite-frame",
- "uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@36a3a",
- "displayName": "",
- "id": "36a3a",
- "name": "l1",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": false,
- "offsetX": 194,
- "offsetY": 155,
- "trimX": 405,
- "trimY": 1317,
- "width": 146,
- "height": 268,
- "rawWidth": 590,
- "rawHeight": 602,
- "borderTop": 0,
- "borderBottom": 0,
- "borderLeft": 0,
- "borderRight": 0,
- "packable": true,
- "pixelsToUnit": 100,
- "pivotX": 0.5,
- "pivotY": 0.5,
- "meshType": 0,
- "vertices": {
- "rawPosition": [],
- "indexes": [],
- "uv": [],
- "nuv": [],
- "minPos": [],
- "maxPos": []
- },
- "isUuid": true,
- "imageUuidOrDatabaseUri": "cd104e76-5215-49fe-a074-e65ffa26583e@6c48a",
- "atlasUuid": "45af5702-7585-4d72-85cf-d7b8da02d832"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
- "b7083": {
- "importer": "sprite-frame",
- "uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@b7083",
- "displayName": "",
- "id": "b7083",
- "name": "l2",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": false,
- "offsetX": 167,
- "offsetY": 104,
- "trimX": 1,
- "trimY": 1526,
- "width": 200,
- "height": 370,
- "rawWidth": 590,
- "rawHeight": 602,
- "borderTop": 0,
- "borderBottom": 0,
- "borderLeft": 0,
- "borderRight": 0,
- "packable": true,
- "pixelsToUnit": 100,
- "pivotX": 0.5,
- "pivotY": 0.5,
- "meshType": 0,
- "vertices": {
- "rawPosition": [],
- "indexes": [],
- "uv": [],
- "nuv": [],
- "minPos": [],
- "maxPos": []
- },
- "isUuid": true,
- "imageUuidOrDatabaseUri": "cd104e76-5215-49fe-a074-e65ffa26583e@6c48a",
- "atlasUuid": "45af5702-7585-4d72-85cf-d7b8da02d832"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
- "7d8f9": {
- "importer": "sprite-frame",
- "uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@7d8f9",
- "displayName": "",
- "id": "7d8f9",
- "name": "l3",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": false,
- "offsetX": 121,
- "offsetY": 26,
- "trimX": 551,
- "trimY": 1,
- "width": 292,
- "height": 528,
- "rawWidth": 590,
- "rawHeight": 602,
- "borderTop": 0,
- "borderBottom": 0,
- "borderLeft": 0,
- "borderRight": 0,
- "packable": true,
- "pixelsToUnit": 100,
- "pivotX": 0.5,
- "pivotY": 0.5,
- "meshType": 0,
- "vertices": {
- "rawPosition": [],
- "indexes": [],
- "uv": [],
- "nuv": [],
- "minPos": [],
- "maxPos": []
- },
- "isUuid": true,
- "imageUuidOrDatabaseUri": "cd104e76-5215-49fe-a074-e65ffa26583e@6c48a",
- "atlasUuid": "45af5702-7585-4d72-85cf-d7b8da02d832"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
- "b44d2": {
- "importer": "sprite-frame",
- "uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@b44d2",
- "displayName": "",
- "id": "b44d2",
- "name": "l4",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": false,
- "offsetX": 32,
- "offsetY": 8,
- "trimX": 1,
- "trimY": 577,
- "width": 470,
- "height": 564,
- "rawWidth": 590,
- "rawHeight": 602,
- "borderTop": 0,
- "borderBottom": 0,
- "borderLeft": 0,
- "borderRight": 0,
- "packable": true,
- "pixelsToUnit": 100,
- "pivotX": 0.5,
- "pivotY": 0.5,
- "meshType": 0,
- "vertices": {
- "rawPosition": [],
- "indexes": [],
- "uv": [],
- "nuv": [],
- "minPos": [],
- "maxPos": []
- },
- "isUuid": true,
- "imageUuidOrDatabaseUri": "cd104e76-5215-49fe-a074-e65ffa26583e@6c48a",
- "atlasUuid": "45af5702-7585-4d72-85cf-d7b8da02d832"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
- "c360a": {
- "importer": "sprite-frame",
- "uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@c360a",
- "displayName": "",
- "id": "c360a",
- "name": "l5",
- "userData": {
- "trimType": "auto",
- "trimThreshold": 1,
- "rotated": false,
- "offsetX": -7,
- "offsetY": 3,
- "trimX": 1,
- "trimY": 1,
- "width": 548,
- "height": 574,
- "rawWidth": 590,
- "rawHeight": 602,
- "borderTop": 0,
- "borderBottom": 0,
- "borderLeft": 0,
- "borderRight": 0,
- "packable": true,
- "pixelsToUnit": 100,
- "pivotX": 0.5,
- "pivotY": 0.5,
- "meshType": 0,
- "vertices": {
- "rawPosition": [],
- "indexes": [],
- "uv": [],
- "nuv": [],
- "minPos": [],
- "maxPos": []
- },
- "isUuid": true,
- "imageUuidOrDatabaseUri": "cd104e76-5215-49fe-a074-e65ffa26583e@6c48a",
- "atlasUuid": "45af5702-7585-4d72-85cf-d7b8da02d832"
- },
- "ver": "1.0.12",
- "imported": true,
- "files": [
- ".json"
- ],
- "subMetas": {}
- },
"70a0d": {
"importer": "sprite-frame",
"uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@70a0d",
@@ -1906,7 +1814,7 @@
"offsetX": 0,
"offsetY": 0,
"trimX": 1,
- "trimY": 1143,
+ "trimY": 1,
"width": 470,
"height": 172,
"rawWidth": 470,
@@ -1938,6 +1846,52 @@
".json"
],
"subMetas": {}
+ },
+ "79dcd": {
+ "importer": "sprite-frame",
+ "uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@79dcd",
+ "displayName": "",
+ "id": "79dcd",
+ "name": "zhao",
+ "userData": {
+ "trimType": "auto",
+ "trimThreshold": 1,
+ "rotated": false,
+ "offsetX": 0,
+ "offsetY": 0,
+ "trimX": 805,
+ "trimY": 355,
+ "width": 82,
+ "height": 82,
+ "rawWidth": 82,
+ "rawHeight": 82,
+ "borderTop": 0,
+ "borderBottom": 0,
+ "borderLeft": 0,
+ "borderRight": 0,
+ "packable": true,
+ "pixelsToUnit": 100,
+ "pivotX": 0.5,
+ "pivotY": 0.5,
+ "meshType": 0,
+ "vertices": {
+ "rawPosition": [],
+ "indexes": [],
+ "uv": [],
+ "nuv": [],
+ "minPos": [],
+ "maxPos": []
+ },
+ "isUuid": true,
+ "imageUuidOrDatabaseUri": "cd104e76-5215-49fe-a074-e65ffa26583e@6c48a",
+ "atlasUuid": "45af5702-7585-4d72-85cf-d7b8da02d832"
+ },
+ "ver": "1.0.12",
+ "imported": true,
+ "files": [
+ ".json"
+ ],
+ "subMetas": {}
}
},
"userData": {
diff --git a/assets/resources/game/skills/skills.png b/assets/resources/game/skills/skills.png
index 22d042bc..d4feffa5 100644
Binary files a/assets/resources/game/skills/skills.png and b/assets/resources/game/skills/skills.png differ
diff --git a/assets/resources/game/skills/wind.prefab b/assets/resources/game/skills/wind.prefab
new file mode 100644
index 00000000..2d807628
--- /dev/null
+++ b/assets/resources/game/skills/wind.prefab
@@ -0,0 +1,146 @@
+[
+ {
+ "__type__": "cc.Prefab",
+ "_name": "wind",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_native": "",
+ "data": {
+ "__id__": 1
+ },
+ "optimizationPolicy": 0,
+ "persistent": false
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "wind",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": null,
+ "_children": [],
+ "_active": false,
+ "_components": [
+ {
+ "__id__": 2
+ },
+ {
+ "__id__": 4
+ }
+ ],
+ "_prefab": {
+ "__id__": 6
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 0.7,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 3
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 106.70999908447266,
+ "height": 108
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5000468659746804,
+ "y": 0.11898148501360858
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "92iyOUSpROt5I/Qbr0n0VR"
+ },
+ {
+ "__type__": "sp.Skeleton",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 5
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_skeletonData": {
+ "__uuid__": "af716091-7de8-4a09-9f4e-bb7c9c40d0db",
+ "__expectedType__": "sp.SkeletonData"
+ },
+ "defaultSkin": "default",
+ "defaultAnimation": "show",
+ "_premultipliedAlpha": true,
+ "_timeScale": 1,
+ "_preCacheMode": 0,
+ "_cacheMode": 0,
+ "_sockets": [],
+ "_useTint": false,
+ "_debugMesh": false,
+ "_debugBones": false,
+ "_debugSlots": false,
+ "_enableBatch": false,
+ "loop": true,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "a32g1O2bxLI6D28EOYFjld"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "733PKzwANLyJWD2ume4u5f",
+ "targetOverrides": null
+ }
+]
\ No newline at end of file
diff --git a/assets/resources/game/skills/wind.prefab.meta b/assets/resources/game/skills/wind.prefab.meta
new file mode 100644
index 00000000..e725fd5e
--- /dev/null
+++ b/assets/resources/game/skills/wind.prefab.meta
@@ -0,0 +1,13 @@
+{
+ "ver": "1.1.50",
+ "importer": "prefab",
+ "imported": true,
+ "uuid": "afb84e4d-b478-4ab6-8f14-4f69d7a2c57f",
+ "files": [
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {
+ "syncNodeName": "wind"
+ }
+}
diff --git a/assets/resources/game/skills/yun.prefab b/assets/resources/game/skills/yun.prefab
new file mode 100644
index 00000000..79a11c0f
--- /dev/null
+++ b/assets/resources/game/skills/yun.prefab
@@ -0,0 +1,238 @@
+[
+ {
+ "__type__": "cc.Prefab",
+ "_name": "yun",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_native": "",
+ "data": {
+ "__id__": 1
+ },
+ "optimizationPolicy": 0,
+ "persistent": false
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "yun",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": null,
+ "_children": [
+ {
+ "__id__": 2
+ }
+ ],
+ "_active": false,
+ "_components": [
+ {
+ "__id__": 8
+ }
+ ],
+ "_prefab": {
+ "__id__": 10
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 87.398,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.Node",
+ "_name": "Node",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "_parent": {
+ "__id__": 1
+ },
+ "_children": [],
+ "_active": true,
+ "_components": [
+ {
+ "__id__": 3
+ },
+ {
+ "__id__": 5
+ }
+ ],
+ "_prefab": {
+ "__id__": 7
+ },
+ "_lpos": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_lrot": {
+ "__type__": "cc.Quat",
+ "x": 0,
+ "y": 0,
+ "z": 0,
+ "w": 1
+ },
+ "_lscale": {
+ "__type__": "cc.Vec3",
+ "x": 1,
+ "y": 1,
+ "z": 1
+ },
+ "_mobility": 0,
+ "_layer": 1,
+ "_euler": {
+ "__type__": "cc.Vec3",
+ "x": 0,
+ "y": 0,
+ "z": 0
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 2
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 4
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 123.19999694824219,
+ "height": 74.4000015258789
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.502110407002199,
+ "y": 0.4981182878121348
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "46ze94mstAirkRCaha2Pvg"
+ },
+ {
+ "__type__": "sp.Skeleton",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 2
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 6
+ },
+ "_customMaterial": null,
+ "_srcBlendFactor": 2,
+ "_dstBlendFactor": 4,
+ "_color": {
+ "__type__": "cc.Color",
+ "r": 255,
+ "g": 255,
+ "b": 255,
+ "a": 255
+ },
+ "_skeletonData": {
+ "__uuid__": "b844bc27-04c6-48be-a55f-2bb3b6fad15e",
+ "__expectedType__": "sp.SkeletonData"
+ },
+ "defaultSkin": "default",
+ "defaultAnimation": "loop",
+ "_premultipliedAlpha": true,
+ "_timeScale": 1,
+ "_preCacheMode": 0,
+ "_cacheMode": 0,
+ "_sockets": [],
+ "_useTint": false,
+ "_debugMesh": false,
+ "_debugBones": false,
+ "_debugSlots": false,
+ "_enableBatch": false,
+ "loop": true,
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "3aiPrNzb1PrpvcOCPAlM/j"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "36qt7iJvhPXqMLjtqv+eWt",
+ "instance": null,
+ "targetOverrides": null,
+ "nestedPrefabInstanceRoots": null
+ },
+ {
+ "__type__": "cc.UITransform",
+ "_name": "",
+ "_objFlags": 0,
+ "__editorExtras__": {},
+ "node": {
+ "__id__": 1
+ },
+ "_enabled": true,
+ "__prefab": {
+ "__id__": 9
+ },
+ "_contentSize": {
+ "__type__": "cc.Size",
+ "width": 100,
+ "height": 100
+ },
+ "_anchorPoint": {
+ "__type__": "cc.Vec2",
+ "x": 0.5,
+ "y": 0.5
+ },
+ "_id": ""
+ },
+ {
+ "__type__": "cc.CompPrefabInfo",
+ "fileId": "63bY561g5Pp5tBRMU/0Oeu"
+ },
+ {
+ "__type__": "cc.PrefabInfo",
+ "root": {
+ "__id__": 1
+ },
+ "asset": {
+ "__id__": 0
+ },
+ "fileId": "afovdb7bBEUpz+8xJHMv4X",
+ "targetOverrides": null
+ }
+]
\ No newline at end of file
diff --git a/assets/resources/game/skills/yun.prefab.meta b/assets/resources/game/skills/yun.prefab.meta
new file mode 100644
index 00000000..be6f9975
--- /dev/null
+++ b/assets/resources/game/skills/yun.prefab.meta
@@ -0,0 +1,13 @@
+{
+ "ver": "1.1.50",
+ "importer": "prefab",
+ "imported": true,
+ "uuid": "59df223f-5afb-41e7-a006-4cef8441130d",
+ "files": [
+ ".json"
+ ],
+ "subMetas": {},
+ "userData": {
+ "syncNodeName": "yun"
+ }
+}