diff --git a/assets/resources/game/hero/arc1.prefab b/assets/resources/game/hero/arc1.prefab index 996e980e..a5be8ca1 100644 --- a/assets/resources/game/hero/arc1.prefab +++ b/assets/resources/game/hero/arc1.prefab @@ -25,17 +25,20 @@ "__id__": 12 }, { - "__id__": 16 + "__id__": 20 }, { - "__id__": 24 - }, - { - "__id__": 66 + "__id__": 62 } ], "_active": true, "_components": [ + { + "__id__": 112 + }, + { + "__id__": 114 + }, { "__id__": 116 }, @@ -47,16 +50,10 @@ }, { "__id__": 122 - }, - { - "__id__": 124 - }, - { - "__id__": 126 } ], "_prefab": { - "__id__": 128 + "__id__": 124 }, "_lpos": { "__type__": "cc.Vec3", @@ -272,7 +269,7 @@ }, { "__type__": "cc.Node", - "_name": "buff_icons", + "_name": "anm", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -283,15 +280,21 @@ "_components": [ { "__id__": 13 + }, + { + "__id__": 15 + }, + { + "__id__": 17 } ], "_prefab": { - "__id__": 15 + "__id__": 19 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 0, + "y": 5.725, "z": 0 }, "_lrot": { @@ -331,102 +334,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 100, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b4Dy2iOhdGNIRklJZWrCG/" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "63odueI6BBfZ9G4QIJALMy", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "anm", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 17 - }, - { - "__id__": 19 - }, - { - "__id__": 21 - } - ], - "_prefab": { - "__id__": 23 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 5.725, - "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__": 16 - }, - "_enabled": true, - "__prefab": { - "__id__": 18 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 44, - "height": 52 + "width": 80, + "height": 64 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -445,11 +354,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 12 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 16 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -490,11 +399,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 12 }, "_enabled": true, "__prefab": { - "__id__": 22 + "__id__": 18 }, "playOnLoad": true, "_clips": [ @@ -548,35 +457,35 @@ }, "_children": [ { - "__id__": 25 + "__id__": 21 }, { - "__id__": 31 + "__id__": 27 }, { - "__id__": 37 + "__id__": 33 }, { - "__id__": 43 + "__id__": 39 }, { - "__id__": 49 + "__id__": 45 }, { - "__id__": 55 + "__id__": 51 } ], "_active": true, "_components": [ { - "__id__": 61 + "__id__": 57 }, { - "__id__": 63 + "__id__": 59 } ], "_prefab": { - "__id__": 65 + "__id__": 61 }, "_lpos": { "__type__": "cc.Vec3", @@ -613,20 +522,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 24 + "__id__": 20 }, "_children": [], "_active": false, "_components": [ { - "__id__": 26 + "__id__": 22 }, { - "__id__": 28 + "__id__": 24 } ], "_prefab": { - "__id__": 30 + "__id__": 26 }, "_lpos": { "__type__": "cc.Vec3", @@ -663,11 +572,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 21 }, "_enabled": true, "__prefab": { - "__id__": 27 + "__id__": 23 }, "_contentSize": { "__type__": "cc.Size", @@ -691,11 +600,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 21 }, "_enabled": true, "__prefab": { - "__id__": 29 + "__id__": 25 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -749,20 +658,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 24 + "__id__": 20 }, "_children": [], "_active": false, "_components": [ { - "__id__": 32 + "__id__": 28 }, { - "__id__": 34 + "__id__": 30 } ], "_prefab": { - "__id__": 36 + "__id__": 32 }, "_lpos": { "__type__": "cc.Vec3", @@ -799,11 +708,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 31 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 29 }, "_contentSize": { "__type__": "cc.Size", @@ -827,11 +736,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 31 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 35 + "__id__": 31 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -885,20 +794,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 24 + "__id__": 20 }, "_children": [], "_active": false, "_components": [ { - "__id__": 38 + "__id__": 34 }, { - "__id__": 40 + "__id__": 36 } ], "_prefab": { - "__id__": 42 + "__id__": 38 }, "_lpos": { "__type__": "cc.Vec3", @@ -935,11 +844,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 37 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 35 }, "_contentSize": { "__type__": "cc.Size", @@ -963,11 +872,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 37 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 41 + "__id__": 37 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1021,20 +930,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 24 + "__id__": 20 }, "_children": [], "_active": false, "_components": [ { - "__id__": 44 + "__id__": 40 }, { - "__id__": 46 + "__id__": 42 } ], "_prefab": { - "__id__": 48 + "__id__": 44 }, "_lpos": { "__type__": "cc.Vec3", @@ -1071,11 +980,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 43 + "__id__": 39 }, "_enabled": true, "__prefab": { - "__id__": 45 + "__id__": 41 }, "_contentSize": { "__type__": "cc.Size", @@ -1099,11 +1008,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 43 + "__id__": 39 }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 43 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1157,20 +1066,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 24 + "__id__": 20 }, "_children": [], "_active": false, "_components": [ { - "__id__": 50 + "__id__": 46 }, { - "__id__": 52 + "__id__": 48 } ], "_prefab": { - "__id__": 54 + "__id__": 50 }, "_lpos": { "__type__": "cc.Vec3", @@ -1207,11 +1116,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 49 + "__id__": 45 }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -1235,11 +1144,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 49 + "__id__": 45 }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 49 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1293,20 +1202,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 24 + "__id__": 20 }, "_children": [], "_active": false, "_components": [ { - "__id__": 56 + "__id__": 52 }, { - "__id__": 58 + "__id__": 54 } ], "_prefab": { - "__id__": 60 + "__id__": 56 }, "_lpos": { "__type__": "cc.Vec3", @@ -1343,11 +1252,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 55 + "__id__": 51 }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 53 }, "_contentSize": { "__type__": "cc.Size", @@ -1371,11 +1280,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 55 + "__id__": 51 }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 55 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1429,11 +1338,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 24 + "__id__": 20 }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 58 }, "_contentSize": { "__type__": "cc.Size", @@ -1457,11 +1366,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 24 + "__id__": 20 }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 60 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1516,26 +1425,26 @@ }, "_children": [ { - "__id__": 67 + "__id__": 63 }, { - "__id__": 81 + "__id__": 77 }, { - "__id__": 95 + "__id__": 91 }, { - "__id__": 109 + "__id__": 105 } ], "_active": true, "_components": [ { - "__id__": 113 + "__id__": 109 } ], "_prefab": { - "__id__": 115 + "__id__": 111 }, "_lpos": { "__type__": "cc.Vec3", @@ -1572,27 +1481,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 66 + "__id__": 62 }, "_children": [ { - "__id__": 68 + "__id__": 64 } ], "_active": true, "_components": [ + { + "__id__": 70 + }, + { + "__id__": 72 + }, { "__id__": 74 - }, - { - "__id__": 76 - }, - { - "__id__": 78 } ], "_prefab": { - "__id__": 80 + "__id__": 76 }, "_lpos": { "__type__": "cc.Vec3", @@ -1629,20 +1538,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 67 + "__id__": 63 }, "_children": [], "_active": true, "_components": [ { - "__id__": 69 + "__id__": 65 }, { - "__id__": 71 + "__id__": 67 } ], "_prefab": { - "__id__": 73 + "__id__": 69 }, "_lpos": { "__type__": "cc.Vec3", @@ -1679,11 +1588,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 68 + "__id__": 64 }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 66 }, "_contentSize": { "__type__": "cc.Size", @@ -1707,11 +1616,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 68 + "__id__": 64 }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 68 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1765,11 +1674,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 67 + "__id__": 63 }, "_enabled": true, "__prefab": { - "__id__": 75 + "__id__": 71 }, "_contentSize": { "__type__": "cc.Size", @@ -1793,11 +1702,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 67 + "__id__": 63 }, "_enabled": true, "__prefab": { - "__id__": 77 + "__id__": 73 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1835,14 +1744,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 67 + "__id__": 63 }, "_enabled": true, "__prefab": { - "__id__": 79 + "__id__": 75 }, "_barSprite": { - "__id__": 71 + "__id__": 67 }, "_mode": 0, "_totalLength": 40, @@ -1873,27 +1782,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 66 + "__id__": 62 }, "_children": [ { - "__id__": 82 + "__id__": 78 } ], "_active": true, "_components": [ + { + "__id__": 84 + }, + { + "__id__": 86 + }, { "__id__": 88 - }, - { - "__id__": 90 - }, - { - "__id__": 92 } ], "_prefab": { - "__id__": 94 + "__id__": 90 }, "_lpos": { "__type__": "cc.Vec3", @@ -1930,20 +1839,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 81 + "__id__": 77 }, "_children": [], "_active": true, "_components": [ { - "__id__": 83 + "__id__": 79 }, { - "__id__": 85 + "__id__": 81 } ], "_prefab": { - "__id__": 87 + "__id__": 83 }, "_lpos": { "__type__": "cc.Vec3", @@ -1980,11 +1889,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 82 + "__id__": 78 }, "_enabled": true, "__prefab": { - "__id__": 84 + "__id__": 80 }, "_contentSize": { "__type__": "cc.Size", @@ -2008,11 +1917,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 82 + "__id__": 78 }, "_enabled": true, "__prefab": { - "__id__": 86 + "__id__": 82 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2066,11 +1975,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 77 }, "_enabled": true, "__prefab": { - "__id__": 89 + "__id__": 85 }, "_contentSize": { "__type__": "cc.Size", @@ -2094,11 +2003,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 77 }, "_enabled": true, "__prefab": { - "__id__": 91 + "__id__": 87 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2139,14 +2048,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 77 }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 89 }, "_barSprite": { - "__id__": 85 + "__id__": 81 }, "_mode": 0, "_totalLength": 40, @@ -2177,27 +2086,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 66 + "__id__": 62 }, "_children": [ { - "__id__": 96 + "__id__": 92 } ], "_active": true, "_components": [ + { + "__id__": 98 + }, + { + "__id__": 100 + }, { "__id__": 102 - }, - { - "__id__": 104 - }, - { - "__id__": 106 } ], "_prefab": { - "__id__": 108 + "__id__": 104 }, "_lpos": { "__type__": "cc.Vec3", @@ -2234,20 +2143,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 95 + "__id__": 91 }, "_children": [], "_active": true, "_components": [ { - "__id__": 97 + "__id__": 93 }, { - "__id__": 99 + "__id__": 95 } ], "_prefab": { - "__id__": 101 + "__id__": 97 }, "_lpos": { "__type__": "cc.Vec3", @@ -2284,11 +2193,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 96 + "__id__": 92 }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 94 }, "_contentSize": { "__type__": "cc.Size", @@ -2312,11 +2221,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 96 + "__id__": 92 }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 96 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2370,11 +2279,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 95 + "__id__": 91 }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 99 }, "_contentSize": { "__type__": "cc.Size", @@ -2398,11 +2307,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 95 + "__id__": 91 }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 101 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2443,14 +2352,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 95 + "__id__": 91 }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 103 }, "_barSprite": { - "__id__": 99 + "__id__": 95 }, "_mode": 0, "_totalLength": 40, @@ -2481,17 +2390,17 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 66 + "__id__": 62 }, "_children": [], "_active": true, "_components": [ { - "__id__": 110 + "__id__": 106 } ], "_prefab": { - "__id__": 112 + "__id__": 108 }, "_lpos": { "__type__": "cc.Vec3", @@ -2528,11 +2437,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 105 }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 107 }, "_contentSize": { "__type__": "cc.Size", @@ -2569,11 +2478,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 62 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 110 }, "_contentSize": { "__type__": "cc.Size", @@ -2614,7 +2523,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 113 }, "_contentSize": { "__type__": "cc.Size", @@ -2642,7 +2551,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 115 }, "enabledContactListener": true, "bullet": true, @@ -2676,7 +2585,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 121 + "__id__": 117 }, "tag": 0, "_group": 4, @@ -2710,7 +2619,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 119 }, "hitFlashMaterial": { "__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264", @@ -2735,10 +2644,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 125 + "__id__": 121 }, "animator": { - "__id__": 21 + "__id__": 17 }, "_id": "" }, @@ -2756,7 +2665,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 127 + "__id__": 123 }, "_id": "" }, diff --git a/assets/resources/game/hero/arc2.prefab b/assets/resources/game/hero/arc2.prefab index 02888e62..3fbf9bc9 100644 --- a/assets/resources/game/hero/arc2.prefab +++ b/assets/resources/game/hero/arc2.prefab @@ -25,17 +25,20 @@ "__id__": 12 }, { - "__id__": 16 + "__id__": 20 }, { - "__id__": 24 - }, - { - "__id__": 66 + "__id__": 62 } ], "_active": true, "_components": [ + { + "__id__": 112 + }, + { + "__id__": 114 + }, { "__id__": 116 }, @@ -47,16 +50,10 @@ }, { "__id__": 122 - }, - { - "__id__": 124 - }, - { - "__id__": 126 } ], "_prefab": { - "__id__": 128 + "__id__": 124 }, "_lpos": { "__type__": "cc.Vec3", @@ -272,7 +269,7 @@ }, { "__type__": "cc.Node", - "_name": "buff_icons", + "_name": "anm", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -283,15 +280,21 @@ "_components": [ { "__id__": 13 + }, + { + "__id__": 15 + }, + { + "__id__": 17 } ], "_prefab": { - "__id__": 15 + "__id__": 19 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, - "y": 0, + "x": -3.171, + "y": 5.725, "z": 0 }, "_lrot": { @@ -331,102 +334,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 100, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "b4Dy2iOhdGNIRklJZWrCG/" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "63odueI6BBfZ9G4QIJALMy", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "anm", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 17 - }, - { - "__id__": 19 - }, - { - "__id__": 21 - } - ], - "_prefab": { - "__id__": 23 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 5.725, - "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__": 16 - }, - "_enabled": true, - "__prefab": { - "__id__": 18 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 44, - "height": 54 + "width": 80, + "height": 64 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -445,11 +354,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 12 }, "_enabled": true, "__prefab": { - "__id__": 20 + "__id__": 16 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -462,7 +371,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@5d58e", + "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@0b063", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -490,11 +399,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 16 + "__id__": 12 }, "_enabled": true, "__prefab": { - "__id__": 22 + "__id__": 18 }, "playOnLoad": true, "_clips": [ @@ -548,35 +457,35 @@ }, "_children": [ { - "__id__": 25 + "__id__": 21 }, { - "__id__": 31 + "__id__": 27 }, { - "__id__": 37 + "__id__": 33 }, { - "__id__": 43 + "__id__": 39 }, { - "__id__": 49 + "__id__": 45 }, { - "__id__": 55 + "__id__": 51 } ], "_active": true, "_components": [ { - "__id__": 61 + "__id__": 57 }, { - "__id__": 63 + "__id__": 59 } ], "_prefab": { - "__id__": 65 + "__id__": 61 }, "_lpos": { "__type__": "cc.Vec3", @@ -613,20 +522,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 24 + "__id__": 20 }, "_children": [], "_active": false, "_components": [ { - "__id__": 26 + "__id__": 22 }, { - "__id__": 28 + "__id__": 24 } ], "_prefab": { - "__id__": 30 + "__id__": 26 }, "_lpos": { "__type__": "cc.Vec3", @@ -663,11 +572,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 21 }, "_enabled": true, "__prefab": { - "__id__": 27 + "__id__": 23 }, "_contentSize": { "__type__": "cc.Size", @@ -691,11 +600,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 25 + "__id__": 21 }, "_enabled": true, "__prefab": { - "__id__": 29 + "__id__": 25 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -749,20 +658,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 24 + "__id__": 20 }, "_children": [], "_active": false, "_components": [ { - "__id__": 32 + "__id__": 28 }, { - "__id__": 34 + "__id__": 30 } ], "_prefab": { - "__id__": 36 + "__id__": 32 }, "_lpos": { "__type__": "cc.Vec3", @@ -799,11 +708,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 31 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 33 + "__id__": 29 }, "_contentSize": { "__type__": "cc.Size", @@ -827,11 +736,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 31 + "__id__": 27 }, "_enabled": true, "__prefab": { - "__id__": 35 + "__id__": 31 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -885,20 +794,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 24 + "__id__": 20 }, "_children": [], "_active": false, "_components": [ { - "__id__": 38 + "__id__": 34 }, { - "__id__": 40 + "__id__": 36 } ], "_prefab": { - "__id__": 42 + "__id__": 38 }, "_lpos": { "__type__": "cc.Vec3", @@ -935,11 +844,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 37 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 39 + "__id__": 35 }, "_contentSize": { "__type__": "cc.Size", @@ -963,11 +872,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 37 + "__id__": 33 }, "_enabled": true, "__prefab": { - "__id__": 41 + "__id__": 37 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1021,20 +930,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 24 + "__id__": 20 }, "_children": [], "_active": false, "_components": [ { - "__id__": 44 + "__id__": 40 }, { - "__id__": 46 + "__id__": 42 } ], "_prefab": { - "__id__": 48 + "__id__": 44 }, "_lpos": { "__type__": "cc.Vec3", @@ -1071,11 +980,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 43 + "__id__": 39 }, "_enabled": true, "__prefab": { - "__id__": 45 + "__id__": 41 }, "_contentSize": { "__type__": "cc.Size", @@ -1099,11 +1008,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 43 + "__id__": 39 }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 43 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1157,20 +1066,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 24 + "__id__": 20 }, "_children": [], "_active": false, "_components": [ { - "__id__": 50 + "__id__": 46 }, { - "__id__": 52 + "__id__": 48 } ], "_prefab": { - "__id__": 54 + "__id__": 50 }, "_lpos": { "__type__": "cc.Vec3", @@ -1207,11 +1116,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 49 + "__id__": 45 }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 47 }, "_contentSize": { "__type__": "cc.Size", @@ -1235,11 +1144,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 49 + "__id__": 45 }, "_enabled": true, "__prefab": { - "__id__": 53 + "__id__": 49 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1293,20 +1202,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 24 + "__id__": 20 }, "_children": [], "_active": false, "_components": [ { - "__id__": 56 + "__id__": 52 }, { - "__id__": 58 + "__id__": 54 } ], "_prefab": { - "__id__": 60 + "__id__": 56 }, "_lpos": { "__type__": "cc.Vec3", @@ -1343,11 +1252,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 55 + "__id__": 51 }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 53 }, "_contentSize": { "__type__": "cc.Size", @@ -1371,11 +1280,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 55 + "__id__": 51 }, "_enabled": true, "__prefab": { - "__id__": 59 + "__id__": 55 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1429,11 +1338,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 24 + "__id__": 20 }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 58 }, "_contentSize": { "__type__": "cc.Size", @@ -1457,11 +1366,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 24 + "__id__": 20 }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 60 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1516,26 +1425,26 @@ }, "_children": [ { - "__id__": 67 + "__id__": 63 }, { - "__id__": 81 + "__id__": 77 }, { - "__id__": 95 + "__id__": 91 }, { - "__id__": 109 + "__id__": 105 } ], "_active": true, "_components": [ { - "__id__": 113 + "__id__": 109 } ], "_prefab": { - "__id__": 115 + "__id__": 111 }, "_lpos": { "__type__": "cc.Vec3", @@ -1572,27 +1481,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 66 + "__id__": 62 }, "_children": [ { - "__id__": 68 + "__id__": 64 } ], "_active": true, "_components": [ + { + "__id__": 70 + }, + { + "__id__": 72 + }, { "__id__": 74 - }, - { - "__id__": 76 - }, - { - "__id__": 78 } ], "_prefab": { - "__id__": 80 + "__id__": 76 }, "_lpos": { "__type__": "cc.Vec3", @@ -1629,20 +1538,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 67 + "__id__": 63 }, "_children": [], "_active": true, "_components": [ { - "__id__": 69 + "__id__": 65 }, { - "__id__": 71 + "__id__": 67 } ], "_prefab": { - "__id__": 73 + "__id__": 69 }, "_lpos": { "__type__": "cc.Vec3", @@ -1679,11 +1588,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 68 + "__id__": 64 }, "_enabled": true, "__prefab": { - "__id__": 70 + "__id__": 66 }, "_contentSize": { "__type__": "cc.Size", @@ -1707,11 +1616,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 68 + "__id__": 64 }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 68 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1765,11 +1674,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 67 + "__id__": 63 }, "_enabled": true, "__prefab": { - "__id__": 75 + "__id__": 71 }, "_contentSize": { "__type__": "cc.Size", @@ -1793,11 +1702,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 67 + "__id__": 63 }, "_enabled": true, "__prefab": { - "__id__": 77 + "__id__": 73 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1835,14 +1744,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 67 + "__id__": 63 }, "_enabled": true, "__prefab": { - "__id__": 79 + "__id__": 75 }, "_barSprite": { - "__id__": 71 + "__id__": 67 }, "_mode": 0, "_totalLength": 40, @@ -1873,27 +1782,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 66 + "__id__": 62 }, "_children": [ { - "__id__": 82 + "__id__": 78 } ], "_active": true, "_components": [ + { + "__id__": 84 + }, + { + "__id__": 86 + }, { "__id__": 88 - }, - { - "__id__": 90 - }, - { - "__id__": 92 } ], "_prefab": { - "__id__": 94 + "__id__": 90 }, "_lpos": { "__type__": "cc.Vec3", @@ -1930,20 +1839,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 81 + "__id__": 77 }, "_children": [], "_active": true, "_components": [ { - "__id__": 83 + "__id__": 79 }, { - "__id__": 85 + "__id__": 81 } ], "_prefab": { - "__id__": 87 + "__id__": 83 }, "_lpos": { "__type__": "cc.Vec3", @@ -1980,11 +1889,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 82 + "__id__": 78 }, "_enabled": true, "__prefab": { - "__id__": 84 + "__id__": 80 }, "_contentSize": { "__type__": "cc.Size", @@ -2008,11 +1917,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 82 + "__id__": 78 }, "_enabled": true, "__prefab": { - "__id__": 86 + "__id__": 82 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2066,11 +1975,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 77 }, "_enabled": true, "__prefab": { - "__id__": 89 + "__id__": 85 }, "_contentSize": { "__type__": "cc.Size", @@ -2094,11 +2003,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 77 }, "_enabled": true, "__prefab": { - "__id__": 91 + "__id__": 87 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2139,14 +2048,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 81 + "__id__": 77 }, "_enabled": true, "__prefab": { - "__id__": 93 + "__id__": 89 }, "_barSprite": { - "__id__": 85 + "__id__": 81 }, "_mode": 0, "_totalLength": 40, @@ -2177,27 +2086,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 66 + "__id__": 62 }, "_children": [ { - "__id__": 96 + "__id__": 92 } ], "_active": true, "_components": [ + { + "__id__": 98 + }, + { + "__id__": 100 + }, { "__id__": 102 - }, - { - "__id__": 104 - }, - { - "__id__": 106 } ], "_prefab": { - "__id__": 108 + "__id__": 104 }, "_lpos": { "__type__": "cc.Vec3", @@ -2234,20 +2143,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 95 + "__id__": 91 }, "_children": [], "_active": true, "_components": [ { - "__id__": 97 + "__id__": 93 }, { - "__id__": 99 + "__id__": 95 } ], "_prefab": { - "__id__": 101 + "__id__": 97 }, "_lpos": { "__type__": "cc.Vec3", @@ -2284,11 +2193,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 96 + "__id__": 92 }, "_enabled": true, "__prefab": { - "__id__": 98 + "__id__": 94 }, "_contentSize": { "__type__": "cc.Size", @@ -2312,11 +2221,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 96 + "__id__": 92 }, "_enabled": true, "__prefab": { - "__id__": 100 + "__id__": 96 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2370,11 +2279,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 95 + "__id__": 91 }, "_enabled": true, "__prefab": { - "__id__": 103 + "__id__": 99 }, "_contentSize": { "__type__": "cc.Size", @@ -2398,11 +2307,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 95 + "__id__": 91 }, "_enabled": true, "__prefab": { - "__id__": 105 + "__id__": 101 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2443,14 +2352,14 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 95 + "__id__": 91 }, "_enabled": true, "__prefab": { - "__id__": 107 + "__id__": 103 }, "_barSprite": { - "__id__": 99 + "__id__": 95 }, "_mode": 0, "_totalLength": 40, @@ -2481,17 +2390,17 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 66 + "__id__": 62 }, "_children": [], "_active": true, "_components": [ { - "__id__": 110 + "__id__": 106 } ], "_prefab": { - "__id__": 112 + "__id__": 108 }, "_lpos": { "__type__": "cc.Vec3", @@ -2528,11 +2437,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 105 }, "_enabled": true, "__prefab": { - "__id__": 111 + "__id__": 107 }, "_contentSize": { "__type__": "cc.Size", @@ -2569,11 +2478,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 66 + "__id__": 62 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 110 }, "_contentSize": { "__type__": "cc.Size", @@ -2614,7 +2523,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 117 + "__id__": 113 }, "_contentSize": { "__type__": "cc.Size", @@ -2642,7 +2551,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 115 }, "enabledContactListener": true, "bullet": true, @@ -2676,7 +2585,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 121 + "__id__": 117 }, "tag": 0, "_group": 4, @@ -2710,7 +2619,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 119 }, "hitFlashMaterial": { "__uuid__": "a8f34051-ccff-4050-b9d9-234f62977264", @@ -2735,7 +2644,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 125 + "__id__": 121 }, "_id": "" }, @@ -2753,10 +2662,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 127 + "__id__": 123 }, "animator": { - "__id__": 21 + "__id__": 17 }, "_id": "" }, diff --git a/assets/resources/game/hero/archer/a2/idle.anim b/assets/resources/game/hero/archer/a2/idle.anim index 92eeaa8d..a57ab994 100644 --- a/assets/resources/game/hero/archer/a2/idle.anim +++ b/assets/resources/game/hero/archer/a2/idle.anim @@ -76,51 +76,51 @@ ], "_values": [ { - "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@5d58e", + "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@0b063", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@55628", + "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@f98b1", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@ffb7f", + "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@4ece0", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@4b666", + "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@e3f09", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@4dcb3", + "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@b7085", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@51cbc", + "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@a0cbd", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@11bc6", + "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@4925e", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@b2558", + "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@fe16c", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@d6d4a", + "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@968f5", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@1b51c", + "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@eba27", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@d437a", + "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@0ec63", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@cd5d5", + "__uuid__": "f4eeed12-f2f3-42f8-bf03-4f00f22cd193@ec089", "__expectedType__": "cc.SpriteFrame" } ] diff --git a/assets/resources/game/hero/k1.prefab b/assets/resources/game/hero/k1.prefab index f74233c5..d5908208 100644 --- a/assets/resources/game/hero/k1.prefab +++ b/assets/resources/game/hero/k1.prefab @@ -425,8 +425,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 60, - "height": 66 + "width": 104, + "height": 76 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/resources/game/hero/k2.prefab b/assets/resources/game/hero/k2.prefab index 9b394c9e..7d673877 100644 --- a/assets/resources/game/hero/k2.prefab +++ b/assets/resources/game/hero/k2.prefab @@ -425,8 +425,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 60, - "height": 66 + "width": 104, + "height": 76 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/resources/game/hero/knight/k1/idle.anim b/assets/resources/game/hero/knight/k1/idle.anim index 5fa377fd..b2c17d69 100644 --- a/assets/resources/game/hero/knight/k1/idle.anim +++ b/assets/resources/game/hero/knight/k1/idle.anim @@ -76,51 +76,51 @@ ], "_values": [ { - "__uuid__": "b3f76ae2-2f7f-403e-9952-a60d57b1e6e9@0b063", + "__uuid__": "b3f76ae2-2f7f-403e-9952-a60d57b1e6e9@ce6cb", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "b3f76ae2-2f7f-403e-9952-a60d57b1e6e9@f98b1", + "__uuid__": "b3f76ae2-2f7f-403e-9952-a60d57b1e6e9@2d977", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "b3f76ae2-2f7f-403e-9952-a60d57b1e6e9@4ece0", + "__uuid__": "b3f76ae2-2f7f-403e-9952-a60d57b1e6e9@731b5", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "b3f76ae2-2f7f-403e-9952-a60d57b1e6e9@e3f09", + "__uuid__": "b3f76ae2-2f7f-403e-9952-a60d57b1e6e9@d4e2e", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "b3f76ae2-2f7f-403e-9952-a60d57b1e6e9@b7085", + "__uuid__": "b3f76ae2-2f7f-403e-9952-a60d57b1e6e9@76883", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "b3f76ae2-2f7f-403e-9952-a60d57b1e6e9@a0cbd", + "__uuid__": "b3f76ae2-2f7f-403e-9952-a60d57b1e6e9@7a6f3", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "b3f76ae2-2f7f-403e-9952-a60d57b1e6e9@4925e", + "__uuid__": "b3f76ae2-2f7f-403e-9952-a60d57b1e6e9@1f897", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "b3f76ae2-2f7f-403e-9952-a60d57b1e6e9@fe16c", + "__uuid__": "b3f76ae2-2f7f-403e-9952-a60d57b1e6e9@bd0c9", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "b3f76ae2-2f7f-403e-9952-a60d57b1e6e9@968f5", + "__uuid__": "b3f76ae2-2f7f-403e-9952-a60d57b1e6e9@99866", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "b3f76ae2-2f7f-403e-9952-a60d57b1e6e9@eba27", + "__uuid__": "b3f76ae2-2f7f-403e-9952-a60d57b1e6e9@dc5bd", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "b3f76ae2-2f7f-403e-9952-a60d57b1e6e9@0ec63", + "__uuid__": "b3f76ae2-2f7f-403e-9952-a60d57b1e6e9@d91dd", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "b3f76ae2-2f7f-403e-9952-a60d57b1e6e9@ec089", + "__uuid__": "b3f76ae2-2f7f-403e-9952-a60d57b1e6e9@1e0b9", "__expectedType__": "cc.SpriteFrame" } ] diff --git a/assets/resources/game/hero/knight/k2/max.anim b/assets/resources/game/hero/knight/k2/max.anim index 2f379485..3c39f87a 100644 --- a/assets/resources/game/hero/knight/k2/max.anim +++ b/assets/resources/game/hero/knight/k2/max.anim @@ -11,7 +11,7 @@ "speed": 1, "wrapMode": 1, "enableTrsBlending": false, - "_duration": 0.5, + "_duration": 0.75, "_hash": 500763545, "_tracks": [ { @@ -72,55 +72,85 @@ 0.3333333333333333, 0.375, 0.4166666666666667, - 0.4583333333333333 + 0.4583333333333333, + 0.5, + 0.5416666666666666, + 0.5833333333333334, + 0.625, + 0.6666666666666666, + 0.7083333333333334 ], "_values": [ { - "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@9a470", + "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@60799", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@c4ce3", + "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@26428", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@eb99c", + "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@daa98", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@548da", + "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@0779a", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@8401f", + "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@5eb28", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@cc0e6", + "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@1a538", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@d3762", + "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@fe61e", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@ebb52", + "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@d1415", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@78440", + "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@6823d", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@c8b49", + "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@50949", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@d4d3e", + "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@e496c", "__expectedType__": "cc.SpriteFrame" }, { - "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@310ee", + "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@648f3", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@9e4e1", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@f27c8", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@fce75", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@a12c4", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@956e1", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "668cb87e-e7d4-4d94-ae45-0e5e2335ddaa@d0912", "__expectedType__": "cc.SpriteFrame" } ] diff --git a/assets/resources/game/hero/m1.prefab b/assets/resources/game/hero/m1.prefab index 0bef6e37..98b04ba9 100644 --- a/assets/resources/game/hero/m1.prefab +++ b/assets/resources/game/hero/m1.prefab @@ -425,8 +425,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 52, - "height": 54 + "width": 88, + "height": 68 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/resources/game/hero/m2.prefab b/assets/resources/game/hero/m2.prefab index 4e933d4f..c062aaf4 100644 --- a/assets/resources/game/hero/m2.prefab +++ b/assets/resources/game/hero/m2.prefab @@ -425,8 +425,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 52, - "height": 54 + "width": 88, + "height": 68 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/resources/game/hero/m3.prefab b/assets/resources/game/hero/m3.prefab index 97c9bb0c..c105d26f 100644 --- a/assets/resources/game/hero/m3.prefab +++ b/assets/resources/game/hero/m3.prefab @@ -425,8 +425,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 52, - "height": 54 + "width": 88, + "height": 68 }, "_anchorPoint": { "__type__": "cc.Vec2", diff --git a/assets/resources/game/skills/buff/atk.prefab b/assets/resources/game/skills/buff/atk.prefab index 2f4258e3..6e7a2d63 100644 --- a/assets/resources/game/skills/buff/atk.prefab +++ b/assets/resources/game/skills/buff/atk.prefab @@ -26,13 +26,10 @@ "_components": [ { "__id__": 8 - }, - { - "__id__": 10 } ], "_prefab": { - "__id__": 12 + "__id__": 10 }, "_lpos": { "__type__": "cc.Vec3", @@ -65,7 +62,7 @@ }, { "__type__": "cc.Node", - "_name": "buff", + "_name": "Cartoon RPG UI_Game Icon - Attack", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -127,8 +124,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 146, - "height": 56 + "width": 14, + "height": 14 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -139,7 +136,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "7d9hAuJaxPyaFcYyfE0Pn7" + "fileId": "e65xj3nrRILqRAqturKhHp" }, { "__type__": "cc.Sprite", @@ -164,12 +161,12 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@fecfb", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@360cc", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -184,7 +181,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "0927yVBnNH8a5NS+/msmIp" + "fileId": "bajfk57dZBYqejL8q2V5+3" }, { "__type__": "cc.PrefabInfo", @@ -194,40 +191,11 @@ "asset": { "__id__": 0 }, - "fileId": "71yEycK4BN9Irl2Q0zVRXV", + "fileId": "06h8KSrMJG9bW3+9zl/nWR", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Animation", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 9 - }, - "playOnLoad": false, - "_clips": [ - { - "__uuid__": "647482df-ef45-4492-ab0e-c3177ebe3564", - "__expectedType__": "cc.AnimationClip" - } - ], - "_defaultClip": { - "__uuid__": "647482df-ef45-4492-ab0e-c3177ebe3564", - "__expectedType__": "cc.AnimationClip" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "f77H/gVBJHkKFQM7lP5UkJ" - }, { "__type__": "cc.UITransform", "_name": "", @@ -238,7 +206,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 9 }, "_contentSize": { "__type__": "cc.Size", @@ -254,7 +222,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "5864ijbSpCXYBUJN82xPLp" + "fileId": "81ULXUpuxIvZ3yj/tj37CQ" }, { "__type__": "cc.PrefabInfo", diff --git a/assets/resources/game/skills/buff/atk.prefab.meta b/assets/resources/game/skills/buff/atk.prefab.meta index 4ef32eb1..263bf810 100644 --- a/assets/resources/game/skills/buff/atk.prefab.meta +++ b/assets/resources/game/skills/buff/atk.prefab.meta @@ -2,7 +2,7 @@ "ver": "1.1.50", "importer": "prefab", "imported": true, - "uuid": "41a9c779-29df-4efc-aecf-5311834753f7", + "uuid": "dc3b1216-071a-4cbb-8506-009a2d884f3a", "files": [ ".json" ], diff --git a/assets/resources/game/skills/buff/atk2.anim b/assets/resources/game/skills/buff/atk2.anim deleted file mode 100644 index 97d08c79..00000000 --- a/assets/resources/game/skills/buff/atk2.anim +++ /dev/null @@ -1,120 +0,0 @@ -[ - { - "__type__": "cc.AnimationClip", - "_name": "atk2", - "_objFlags": 0, - "__editorExtras__": { - "embeddedPlayerGroups": [] - }, - "_native": "", - "sample": 60, - "speed": 1, - "wrapMode": 2, - "enableTrsBlending": false, - "_duration": 0.36666666666666664, - "_hash": 500763545, - "_tracks": [ - { - "__id__": 1 - } - ], - "_exoticAnimation": null, - "_events": [], - "_embeddedPlayers": [], - "_additiveSettings": { - "__id__": 7 - }, - "_auxiliaryCurveEntries": [] - }, - { - "__type__": "cc.animation.ObjectTrack", - "_binding": { - "__type__": "cc.animation.TrackBinding", - "path": { - "__id__": 2 - }, - "proxy": null - }, - "_channel": { - "__id__": 5 - } - }, - { - "__type__": "cc.animation.TrackPath", - "_paths": [ - { - "__id__": 3 - }, - { - "__id__": 4 - }, - "spriteFrame" - ] - }, - { - "__type__": "cc.animation.HierarchyPath", - "path": "buff" - }, - { - "__type__": "cc.animation.ComponentPath", - "component": "cc.Sprite" - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 6 - } - }, - { - "__type__": "cc.ObjectCurve", - "_times": [ - 0, - 0.05, - 0.1, - 0.15, - 0.2, - 0.25, - 0.3, - 0.35 - ], - "_values": [ - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@4ee48", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@18561", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@c6107", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@791eb", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@a4cbe", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@dcb10", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@cb5c1", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@ba364", - "__expectedType__": "cc.SpriteFrame" - } - ] - }, - { - "__type__": "cc.AnimationClipAdditiveSettings", - "enabled": false, - "refClip": null - } -] \ No newline at end of file diff --git a/assets/resources/game/skills/buff/atk2.anim.meta b/assets/resources/game/skills/buff/atk2.anim.meta deleted file mode 100644 index a1994a6f..00000000 --- a/assets/resources/game/skills/buff/atk2.anim.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "2.0.3", - "importer": "animation-clip", - "imported": true, - "uuid": "d500d6bb-ae10-42bc-84dc-1503b4bf6d1a", - "files": [ - ".cconb" - ], - "subMetas": {}, - "userData": { - "name": "atk2" - } -} diff --git a/assets/resources/game/skills/buff/atk2.prefab.meta b/assets/resources/game/skills/buff/atk2.prefab.meta deleted file mode 100644 index cfac8a82..00000000 --- a/assets/resources/game/skills/buff/atk2.prefab.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.50", - "importer": "prefab", - "imported": true, - "uuid": "62888008-8e73-49b6-98bf-265d3ff8bdfa", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": { - "syncNodeName": "atk2" - } -} diff --git a/assets/resources/game/skills/buff/buff.anim b/assets/resources/game/skills/buff/buff.anim deleted file mode 100644 index 0d5b387c..00000000 --- a/assets/resources/game/skills/buff/buff.anim +++ /dev/null @@ -1,100 +0,0 @@ -[ - { - "__type__": "cc.AnimationClip", - "_name": "buff", - "_objFlags": 0, - "__editorExtras__": { - "embeddedPlayerGroups": [] - }, - "_native": "", - "sample": 60, - "speed": 1, - "wrapMode": 2, - "enableTrsBlending": false, - "_duration": 0.26666666666666666, - "_hash": 500763545, - "_tracks": [ - { - "__id__": 1 - } - ], - "_exoticAnimation": null, - "_events": [], - "_embeddedPlayers": [], - "_additiveSettings": { - "__id__": 7 - }, - "_auxiliaryCurveEntries": [] - }, - { - "__type__": "cc.animation.ObjectTrack", - "_binding": { - "__type__": "cc.animation.TrackBinding", - "path": { - "__id__": 2 - }, - "proxy": null - }, - "_channel": { - "__id__": 5 - } - }, - { - "__type__": "cc.animation.TrackPath", - "_paths": [ - { - "__id__": 3 - }, - { - "__id__": 4 - }, - "spriteFrame" - ] - }, - { - "__type__": "cc.animation.HierarchyPath", - "path": "buff" - }, - { - "__type__": "cc.animation.ComponentPath", - "component": "cc.Sprite" - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 6 - } - }, - { - "__type__": "cc.ObjectCurve", - "_times": [ - 0, - 0.08333333333333333, - 0.16666666666666666, - 0.25 - ], - "_values": [ - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@fecfb", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@0fc4e", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@ae735", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@fecfb", - "__expectedType__": "cc.SpriteFrame" - } - ] - }, - { - "__type__": "cc.AnimationClipAdditiveSettings", - "enabled": false, - "refClip": null - } -] \ No newline at end of file diff --git a/assets/resources/game/skills/buff/buff.anim.meta b/assets/resources/game/skills/buff/buff.anim.meta deleted file mode 100644 index 8fb3aa3d..00000000 --- a/assets/resources/game/skills/buff/buff.anim.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "2.0.3", - "importer": "animation-clip", - "imported": true, - "uuid": "647482df-ef45-4492-ab0e-c3177ebe3564", - "files": [ - ".cconb" - ], - "subMetas": {}, - "userData": { - "name": "buff" - } -} diff --git a/assets/resources/game/skills/buff/buff_atk.anim b/assets/resources/game/skills/buff/buff_atk.anim deleted file mode 100644 index 1d31009e..00000000 --- a/assets/resources/game/skills/buff/buff_atk.anim +++ /dev/null @@ -1,120 +0,0 @@ -[ - { - "__type__": "cc.AnimationClip", - "_name": "buff_atk", - "_objFlags": 0, - "__editorExtras__": { - "embeddedPlayerGroups": [] - }, - "_native": "", - "sample": 24, - "speed": 1, - "wrapMode": 2, - "enableTrsBlending": false, - "_duration": 0.625, - "_hash": 500763545, - "_tracks": [ - { - "__id__": 1 - } - ], - "_exoticAnimation": null, - "_events": [], - "_embeddedPlayers": [], - "_additiveSettings": { - "__id__": 7 - }, - "_auxiliaryCurveEntries": [] - }, - { - "__type__": "cc.animation.ObjectTrack", - "_binding": { - "__type__": "cc.animation.TrackBinding", - "path": { - "__id__": 2 - }, - "proxy": null - }, - "_channel": { - "__id__": 5 - } - }, - { - "__type__": "cc.animation.TrackPath", - "_paths": [ - { - "__id__": 3 - }, - { - "__id__": 4 - }, - "spriteFrame" - ] - }, - { - "__type__": "cc.animation.HierarchyPath", - "path": "buff" - }, - { - "__type__": "cc.animation.ComponentPath", - "component": "cc.Sprite" - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 6 - } - }, - { - "__type__": "cc.ObjectCurve", - "_times": [ - 0, - 0.08333333333333333, - 0.16666666666666666, - 0.25, - 0.3333333333333333, - 0.4166666666666667, - 0.5, - 0.5833333333333334 - ], - "_values": [ - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@90ba4", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@ec38b", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@2ada0", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@f70ba", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@a001a", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@b6ec6", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@1b5b3", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@f5094", - "__expectedType__": "cc.SpriteFrame" - } - ] - }, - { - "__type__": "cc.AnimationClipAdditiveSettings", - "enabled": false, - "refClip": null - } -] \ No newline at end of file diff --git a/assets/resources/game/skills/buff/buff_atk.anim.meta b/assets/resources/game/skills/buff/buff_atk.anim.meta deleted file mode 100644 index effdfafe..00000000 --- a/assets/resources/game/skills/buff/buff_atk.anim.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "2.0.3", - "importer": "animation-clip", - "imported": true, - "uuid": "fa883949-eafe-4df7-bc81-ad2ec2d2f613", - "files": [ - ".cconb" - ], - "subMetas": {}, - "userData": { - "name": "buff_atk" - } -} diff --git a/assets/resources/game/skills/buff/dun.anim b/assets/resources/game/skills/buff/dun.anim deleted file mode 100644 index 797d0964..00000000 --- a/assets/resources/game/skills/buff/dun.anim +++ /dev/null @@ -1,105 +0,0 @@ -[ - { - "__type__": "cc.AnimationClip", - "_name": "dun", - "_objFlags": 0, - "__editorExtras__": { - "embeddedPlayerGroups": [] - }, - "_native": "", - "sample": 24, - "speed": 1, - "wrapMode": 2, - "enableTrsBlending": false, - "_duration": 0.875, - "_hash": 500763545, - "_tracks": [ - { - "__id__": 1 - } - ], - "_exoticAnimation": null, - "_events": [], - "_embeddedPlayers": [], - "_additiveSettings": { - "__id__": 7 - }, - "_auxiliaryCurveEntries": [] - }, - { - "__type__": "cc.animation.ObjectTrack", - "_binding": { - "__type__": "cc.animation.TrackBinding", - "path": { - "__id__": 2 - }, - "proxy": null - }, - "_channel": { - "__id__": 5 - } - }, - { - "__type__": "cc.animation.TrackPath", - "_paths": [ - { - "__id__": 3 - }, - { - "__id__": 4 - }, - "spriteFrame" - ] - }, - { - "__type__": "cc.animation.HierarchyPath", - "path": "buff" - }, - { - "__type__": "cc.animation.ComponentPath", - "component": "cc.Sprite" - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 6 - } - }, - { - "__type__": "cc.ObjectCurve", - "_times": [ - 0, - 0.20833333333333334, - 0.4166666666666667, - 0.625, - 0.8333333333333334 - ], - "_values": [ - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@3889c", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@3ceb8", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@8c9d6", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@a5fb6", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@4641f", - "__expectedType__": "cc.SpriteFrame" - } - ] - }, - { - "__type__": "cc.AnimationClipAdditiveSettings", - "enabled": false, - "refClip": null - } -] \ No newline at end of file diff --git a/assets/resources/game/skills/buff/dun.anim.meta b/assets/resources/game/skills/buff/dun.anim.meta deleted file mode 100644 index f6ea561b..00000000 --- a/assets/resources/game/skills/buff/dun.anim.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "2.0.3", - "importer": "animation-clip", - "imported": true, - "uuid": "4d787780-adea-45ff-961a-5339778cc0a5", - "files": [ - ".cconb" - ], - "subMetas": {}, - "userData": { - "name": "dun" - } -} diff --git a/assets/resources/game/skills/buff/dun.prefab b/assets/resources/game/skills/buff/dun.prefab deleted file mode 100644 index 04b032e8..00000000 --- a/assets/resources/game/skills/buff/dun.prefab +++ /dev/null @@ -1,295 +0,0 @@ -[ - { - "__type__": "cc.Prefab", - "_name": "dun", - "_objFlags": 0, - "__editorExtras__": {}, - "_native": "", - "data": { - "__id__": 1 - }, - "optimizationPolicy": 0, - "persistent": false - }, - { - "__type__": "cc.Node", - "_name": "dun", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": null, - "_children": [ - { - "__id__": 2 - } - ], - "_active": true, - "_components": [ - { - "__id__": 10 - }, - { - "__id__": 12 - } - ], - "_prefab": { - "__id__": 14 - }, - "_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": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "buff", - "_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": 1073741824, - "_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": 62, - "height": 58 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "76UvR5kcJL87cIQHP4kRPL" - }, - { - "__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__": "d6bb5233-8098-41a3-89c5-9cb570683600@3889c", - "__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": "69yunlzzxDMYtQ5vwMRvuf" - }, - { - "__type__": "cc.Animation", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 8 - }, - "playOnLoad": false, - "_clips": [], - "_defaultClip": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d9IDS6kBhDkLpl8p/3pE1B" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "adCtRc2ulOUY1DdT1Bmt//", - "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": "7chH9W93hN6LXSKGgy73ED" - }, - { - "__type__": "cc.Animation", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "playOnLoad": false, - "_clips": [ - { - "__uuid__": "4d787780-adea-45ff-961a-5339778cc0a5", - "__expectedType__": "cc.AnimationClip" - } - ], - "_defaultClip": { - "__uuid__": "4d787780-adea-45ff-961a-5339778cc0a5", - "__expectedType__": "cc.AnimationClip" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "20+zWW9y5OWYzQLgLXs7md" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", - "instance": null, - "targetOverrides": null - } -] \ No newline at end of file diff --git a/assets/resources/game/skills/buff/atk2.prefab b/assets/resources/game/skills/buff/shield.prefab similarity index 78% rename from assets/resources/game/skills/buff/atk2.prefab rename to assets/resources/game/skills/buff/shield.prefab index 306b6003..8830b66c 100644 --- a/assets/resources/game/skills/buff/atk2.prefab +++ b/assets/resources/game/skills/buff/shield.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "atk2", + "_name": "shield", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,7 +13,7 @@ }, { "__type__": "cc.Node", - "_name": "atk2", + "_name": "shield", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, @@ -26,13 +26,10 @@ "_components": [ { "__id__": 8 - }, - { - "__id__": 10 } ], "_prefab": { - "__id__": 12 + "__id__": 10 }, "_lpos": { "__type__": "cc.Vec3", @@ -65,7 +62,7 @@ }, { "__type__": "cc.Node", - "_name": "buff", + "_name": "Cartoon RPG UI_Game Icon - Defense", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -127,8 +124,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 274, - "height": 128 + "width": 14, + "height": 14 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -139,7 +136,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "29tAeUFqdPfK1ub1P/ZeSI" + "fileId": "92y5A9GmdC3YqWXakOk+Dt" }, { "__type__": "cc.Sprite", @@ -164,12 +161,12 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "d6bb5233-8098-41a3-89c5-9cb570683600@4ee48", + "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@a018f", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, "_fillType": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillCenter": { "__type__": "cc.Vec2", "x": 0, @@ -184,7 +181,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "d3K3f61N5Ia6VThNrRWkoV" + "fileId": "71N2ScG5NGYZ7cctMzdCwo" }, { "__type__": "cc.PrefabInfo", @@ -194,40 +191,11 @@ "asset": { "__id__": 0 }, - "fileId": "79aVOQw9ZMo5Xye7MLZXP1", + "fileId": "8bAUZ3X4dEoY+FJWosklUw", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null }, - { - "__type__": "cc.Animation", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 9 - }, - "playOnLoad": false, - "_clips": [ - { - "__uuid__": "d500d6bb-ae10-42bc-84dc-1503b4bf6d1a", - "__expectedType__": "cc.AnimationClip" - } - ], - "_defaultClip": { - "__uuid__": "d500d6bb-ae10-42bc-84dc-1503b4bf6d1a", - "__expectedType__": "cc.AnimationClip" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "edOZS8/TJJzJn2jHL/ojWY" - }, { "__type__": "cc.UITransform", "_name": "", @@ -238,7 +206,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 9 }, "_contentSize": { "__type__": "cc.Size", @@ -254,7 +222,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "13NLWZmQdNK6MfSU5fHVA7" + "fileId": "81ULXUpuxIvZ3yj/tj37CQ" }, { "__type__": "cc.PrefabInfo", diff --git a/assets/resources/game/skills/buff/dun.prefab.meta b/assets/resources/game/skills/buff/shield.prefab.meta similarity index 63% rename from assets/resources/game/skills/buff/dun.prefab.meta rename to assets/resources/game/skills/buff/shield.prefab.meta index 03155836..cc7407f6 100644 --- a/assets/resources/game/skills/buff/dun.prefab.meta +++ b/assets/resources/game/skills/buff/shield.prefab.meta @@ -2,12 +2,12 @@ "ver": "1.1.50", "importer": "prefab", "imported": true, - "uuid": "e5ff0807-8082-45db-a862-5c5ce454be2e", + "uuid": "f228c341-e9c0-483c-96e8-377c9e89234b", "files": [ ".json" ], "subMetas": {}, "userData": { - "syncNodeName": "dun" + "syncNodeName": "shield" } } diff --git a/assets/resources/game/skills/buff/shieldfx.prefab b/assets/resources/game/skills/buff/shieldfx.prefab deleted file mode 100644 index 72eed9a1..00000000 --- a/assets/resources/game/skills/buff/shieldfx.prefab +++ /dev/null @@ -1,271 +0,0 @@ -[ - { - "__type__": "cc.Prefab", - "_name": "shieldfx", - "_objFlags": 0, - "__editorExtras__": {}, - "_native": "", - "data": { - "__id__": 1 - }, - "optimizationPolicy": 0, - "persistent": false - }, - { - "__type__": "cc.Node", - "_name": "shieldfx", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": null, - "_children": [ - { - "__id__": 2 - } - ], - "_active": true, - "_components": [ - { - "__id__": 8 - }, - { - "__id__": 10 - } - ], - "_prefab": { - "__id__": 12 - }, - "_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.5, - "y": 0.2, - "z": 1 - }, - "_mobility": 0, - "_layer": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "buff", - "_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": 1073741824, - "_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": 470, - "height": 172 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d7SP9U5ZBCFqgprFUGxWQP" - }, - { - "__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__": "d6bb5233-8098-41a3-89c5-9cb570683600@04cec", - "__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": "67N56Bp1pNPovCe64SHLK+" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "39fgX0q5dMsoscrUOSEwzz", - "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": "baiK9/dZZA645vovKryJIc" - }, - { - "__type__": "cc.Animation", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "playOnLoad": false, - "_clips": [ - { - "__uuid__": "c3370e4a-8d89-4af4-98c6-01bdc09d1ffc", - "__expectedType__": "cc.AnimationClip" - } - ], - "_defaultClip": { - "__uuid__": "c3370e4a-8d89-4af4-98c6-01bdc09d1ffc", - "__expectedType__": "cc.AnimationClip" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "75EIadnrlIM5h6oRPWbNfW" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", - "instance": null, - "targetOverrides": null - } -] \ No newline at end of file diff --git a/assets/resources/game/skills/buff/shieldfx.prefab.meta b/assets/resources/game/skills/buff/shieldfx.prefab.meta deleted file mode 100644 index b8af96dd..00000000 --- a/assets/resources/game/skills/buff/shieldfx.prefab.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.50", - "importer": "prefab", - "imported": true, - "uuid": "def2237a-b450-44a9-8f40-3a55c4fbc4d7", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": { - "syncNodeName": "shieldfx" - } -} diff --git a/assets/resources/game/skills/buff/shiled.anim b/assets/resources/game/skills/buff/shiled.anim deleted file mode 100644 index 18869df0..00000000 --- a/assets/resources/game/skills/buff/shiled.anim +++ /dev/null @@ -1,220 +0,0 @@ -[ - { - "__type__": "cc.AnimationClip", - "_name": "shiled", - "_objFlags": 0, - "__editorExtras__": { - "embeddedPlayerGroups": [] - }, - "_native": "", - "sample": 60, - "speed": 1, - "wrapMode": 2, - "enableTrsBlending": false, - "_duration": 0.3333333333333333, - "_hash": 500763545, - "_tracks": [ - { - "__id__": 1 - } - ], - "_exoticAnimation": null, - "_events": [], - "_embeddedPlayers": [], - "_additiveSettings": { - "__id__": 12 - }, - "_auxiliaryCurveEntries": [] - }, - { - "__type__": "cc.animation.VectorTrack", - "_binding": { - "__type__": "cc.animation.TrackBinding", - "path": { - "__id__": 2 - }, - "proxy": null - }, - "_channels": [ - { - "__id__": 4 - }, - { - "__id__": 6 - }, - { - "__id__": 8 - }, - { - "__id__": 10 - } - ], - "_nComponents": 3 - }, - { - "__type__": "cc.animation.TrackPath", - "_paths": [ - { - "__id__": 3 - }, - "scale" - ] - }, - { - "__type__": "cc.animation.HierarchyPath", - "path": "buff" - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 5 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [ - 0, - 0.3333333333333333 - ], - "_values": [ - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0.2, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 1, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } - } - ], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 7 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [ - 0, - 0.3333333333333333 - ], - "_values": [ - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0.1, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0.5, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } - } - ], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 9 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [ - 0, - 0.3333333333333333 - ], - "_values": [ - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 1, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 1, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } - } - ], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 11 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [], - "_values": [], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, - { - "__type__": "cc.AnimationClipAdditiveSettings", - "enabled": false, - "refClip": null - } -] \ No newline at end of file diff --git a/assets/resources/game/skills/buff/shiled.anim.meta b/assets/resources/game/skills/buff/shiled.anim.meta deleted file mode 100644 index 5775231e..00000000 --- a/assets/resources/game/skills/buff/shiled.anim.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "2.0.3", - "importer": "animation-clip", - "imported": true, - "uuid": "c3370e4a-8d89-4af4-98c6-01bdc09d1ffc", - "files": [ - ".cconb" - ], - "subMetas": {}, - "userData": { - "name": "shiled" - } -} diff --git a/assets/resources/game/skills/buff/speed.prefab b/assets/resources/game/skills/buff/speed.prefab deleted file mode 100644 index c73ebf50..00000000 --- a/assets/resources/game/skills/buff/speed.prefab +++ /dev/null @@ -1,271 +0,0 @@ -[ - { - "__type__": "cc.Prefab", - "_name": "speed", - "_objFlags": 0, - "__editorExtras__": {}, - "_native": "", - "data": { - "__id__": 1 - }, - "optimizationPolicy": 0, - "persistent": false - }, - { - "__type__": "cc.Node", - "_name": "speed", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": null, - "_children": [ - { - "__id__": 2 - } - ], - "_active": true, - "_components": [ - { - "__id__": 8 - }, - { - "__id__": 10 - } - ], - "_prefab": { - "__id__": 12 - }, - "_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": 1073741824, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "buff", - "_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": 1073741824, - "_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": 208, - "height": 99 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "48TnUNGMdCBovd6U6YELib" - }, - { - "__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__": "d6bb5233-8098-41a3-89c5-9cb570683600@90ba4", - "__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": "acegZIsIBGM4J8sLUHcLUt" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "52JsZCdG9E0aLI7Gna+l9o", - "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": "61wndvK3VMtbbVYf6SUdWb" - }, - { - "__type__": "cc.Animation", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "playOnLoad": true, - "_clips": [ - { - "__uuid__": "fa883949-eafe-4df7-bc81-ad2ec2d2f613", - "__expectedType__": "cc.AnimationClip" - } - ], - "_defaultClip": { - "__uuid__": "fa883949-eafe-4df7-bc81-ad2ec2d2f613", - "__expectedType__": "cc.AnimationClip" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "7do/cMK/NP0Yicp4xOCHAM" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "c46/YsCPVOJYA4mWEpNYRx", - "instance": null, - "targetOverrides": null - } -] \ No newline at end of file diff --git a/assets/resources/game/skills/buff/speed.prefab.meta b/assets/resources/game/skills/buff/speed.prefab.meta deleted file mode 100644 index c0fd8c2c..00000000 --- a/assets/resources/game/skills/buff/speed.prefab.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.50", - "importer": "prefab", - "imported": true, - "uuid": "023d1dc1-af98-4903-9d00-986c2f16b982", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": { - "syncNodeName": "speed" - } -} diff --git a/assets/resources/game/skills/buffs.plist b/assets/resources/game/skills/buffs.plist deleted file mode 100644 index e06d9cc7..00000000 --- a/assets/resources/game/skills/buffs.plist +++ /dev/null @@ -1,581 +0,0 @@ - - - - - frames - - HalloweenBoss Fx_1.png - - aliases - - spriteOffset - {0,0} - spriteSize - {274,128} - spriteSourceSize - {276,132} - textureRect - {{175,1},{274,128}} - textureRotated - - - HalloweenBoss Fx_2.png - - aliases - - spriteOffset - {0,0} - spriteSize - {274,128} - spriteSourceSize - {276,132} - textureRect - {{305,1},{274,128}} - textureRotated - - - HalloweenBoss Fx_3.png - - aliases - - spriteOffset - {0,0} - spriteSize - {274,128} - spriteSourceSize - {276,132} - textureRect - {{435,1},{274,128}} - textureRotated - - - HalloweenBoss Fx_4.png - - aliases - - spriteOffset - {0,0} - spriteSize - {274,128} - spriteSourceSize - {276,132} - textureRect - {{565,1},{274,128}} - textureRotated - - - HalloweenBoss Fx_5.png - - aliases - - spriteOffset - {0,0} - spriteSize - {274,128} - spriteSourceSize - {276,132} - textureRect - {{695,1},{274,128}} - textureRotated - - - HalloweenBoss Fx_6.png - - aliases - - spriteOffset - {0,0} - spriteSize - {274,128} - spriteSourceSize - {276,132} - textureRect - {{825,1},{274,128}} - textureRotated - - - HalloweenBoss Fx_7.png - - aliases - - spriteOffset - {0,0} - spriteSize - {274,128} - spriteSourceSize - {276,132} - textureRect - {{955,1},{274,128}} - textureRotated - - - HalloweenBoss Fx_8.png - - aliases - - spriteOffset - {0,0} - spriteSize - {274,128} - spriteSourceSize - {276,132} - textureRect - {{1085,1},{274,128}} - textureRotated - - - battleAttack_60001.png - - aliases - - spriteOffset - {0,0} - spriteSize - {146,56} - spriteSourceSize - {146,56} - textureRect - {{1515,209},{146,56}} - textureRotated - - - battleAttack_60002.png - - aliases - - spriteOffset - {0,0} - spriteSize - {166,68} - spriteSourceSize - {166,68} - textureRect - {{1621,364},{166,68}} - textureRotated - - - battleAttack_60003.png - - aliases - - spriteOffset - {0,0} - spriteSize - {188,72} - spriteSourceSize - {188,72} - textureRect - {{1521,434},{188,72}} - textureRotated - - - battleshow_60001.png - - aliases - - spriteOffset - {0,0} - spriteSize - {208,99} - spriteSourceSize - {208,99} - textureRect - {{1316,277},{208,99}} - textureRotated - - - battleshow_60002.png - - aliases - - spriteOffset - {0,0} - spriteSize - {214,101} - spriteSourceSize - {214,101} - textureRect - {{1213,277},{214,101}} - textureRotated - - - battleshow_60003.png - - aliases - - spriteOffset - {0,0} - spriteSize - {214,109} - spriteSourceSize - {214,109} - textureRect - {{1102,277},{214,109}} - textureRotated - - - battleshow_60004.png - - aliases - - spriteOffset - {0,0} - spriteSize - {230,115} - spriteSourceSize - {230,115} - textureRect - {{414,277},{230,115}} - textureRotated - - - battleshow_60005.png - - aliases - - spriteOffset - {0,0} - spriteSize - {232,117} - spriteSourceSize - {232,117} - textureRect - {{295,277},{232,117}} - textureRotated - - - battleshow_60006.png - - aliases - - spriteOffset - {0,0} - spriteSize - {222,115} - spriteSourceSize - {222,115} - textureRect - {{767,277},{222,115}} - textureRotated - - - battleshow_60007.png - - aliases - - spriteOffset - {0,0} - spriteSize - {206,99} - spriteSourceSize - {206,99} - textureRect - {{1423,1},{206,99}} - textureRotated - - - battleshow_60008.png - - aliases - - spriteOffset - {0,0} - spriteSize - {202,99} - spriteSourceSize - {202,99} - textureRect - {{1524,1},{202,99}} - textureRotated - - - beijiguang_004@2x.png - - aliases - - spriteOffset - {0,0} - spriteSize - {470,172} - spriteSourceSize - {470,172} - textureRect - {{1,1},{470,172}} - textureRotated - - - curse_big_00011.png - - aliases - - spriteOffset - {-3,0} - spriteSize - {62,58} - spriteSourceSize - {80,92} - textureRect - {{1279,213},{62,58}} - textureRotated - - - curse_big_00012.png - - aliases - - spriteOffset - {-3,-1} - spriteSize - {54,62} - spriteSourceSize - {80,92} - textureRect - {{1339,211},{54,62}} - textureRotated - - - curse_big_00013.png - - aliases - - spriteOffset - {2,-2} - spriteSize - {60,58} - spriteSourceSize - {80,92} - textureRect - {{1455,209},{60,58}} - textureRotated - - - curse_big_00014.png - - aliases - - spriteOffset - {4,2} - spriteSize - {58,60} - spriteSourceSize - {80,92} - textureRect - {{1395,211},{58,60}} - textureRotated - - - curse_big_00015.png - - aliases - - spriteOffset - {-1,1} - spriteSize - {62,62} - spriteSourceSize - {80,92} - textureRect - {{1215,213},{62,62}} - textureRotated - - - effect_b07_01.png - - aliases - - spriteOffset - {1,-41} - spriteSize - {169,98} - spriteSourceSize - {175,180} - textureRect - {{1625,1},{169,98}} - textureRotated - - - effect_b07_02.png - - aliases - - spriteOffset - {1,-41} - spriteSize - {165,98} - spriteSourceSize - {175,180} - textureRect - {{1663,197},{165,98}} - textureRotated - - - effect_b07_03.png - - aliases - - spriteOffset - {0,-41} - spriteSize - {163,98} - spriteSourceSize - {175,180} - textureRect - {{1521,267},{163,98}} - textureRotated - - - effect_b07_04.png - - aliases - - spriteOffset - {2,-39} - spriteSize - {169,94} - spriteSourceSize - {175,180} - textureRect - {{1625,101},{169,94}} - textureRotated - - - heroShow0001.png - - aliases - - spriteOffset - {0,0} - spriteSize - {210,102} - spriteSourceSize - {210,102} - textureRect - {{1215,1},{210,102}} - textureRotated - - - heroShow0002.png - - aliases - - spriteOffset - {0,0} - spriteSize - {216,102} - spriteSourceSize - {216,102} - textureRect - {{998,277},{216,102}} - textureRotated - - - heroShow0003.png - - aliases - - spriteOffset - {0,0} - spriteSize - {218,112} - spriteSourceSize - {218,112} - textureRect - {{884,277},{218,112}} - textureRotated - - - heroShow0004.png - - aliases - - spriteOffset - {0,0} - spriteSize - {232,118} - spriteSourceSize - {232,118} - textureRect - {{175,277},{232,118}} - textureRotated - - - heroShow0005.png - - aliases - - spriteOffset - {0,0} - spriteSize - {230,114} - spriteSourceSize - {230,114} - textureRect - {{531,277},{230,114}} - textureRotated - - - heroShow0006.png - - aliases - - spriteOffset - {0,0} - spriteSize - {224,118} - spriteSourceSize - {224,118} - textureRect - {{647,277},{224,118}} - textureRotated - - - heroShow0007.png - - aliases - - spriteOffset - {0,0} - spriteSize - {208,102} - spriteSourceSize - {208,102} - textureRect - {{1319,1},{208,102}} - textureRotated - - - heroShow0008.png - - aliases - - spriteOffset - {0,0} - spriteSize - {204,102} - spriteSourceSize - {204,102} - textureRect - {{1417,273},{204,102}} - textureRotated - - - - metadata - - format - 3 - pixelFormat - RGBA8888 - premultiplyAlpha - - realTextureFileName - buffs.png - size - {1795,510} - smartupdate - $TexturePacker:SmartUpdate:1d39d296d4aee7a7d326bb6ab5c40df0:9266e3dfb87c8f72c086bf2304dc85ec:e4138b563957c1b7dbde716529a505f2$ - textureFileName - buffs.png - - - diff --git a/assets/resources/game/skills/buffs.plist.meta b/assets/resources/game/skills/buffs.plist.meta deleted file mode 100644 index 48803b4b..00000000 --- a/assets/resources/game/skills/buffs.plist.meta +++ /dev/null @@ -1,1719 +0,0 @@ -{ - "ver": "1.0.8", - "importer": "sprite-atlas", - "imported": true, - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600", - "files": [ - ".json" - ], - "subMetas": { - "18561": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@18561", - "displayName": "", - "id": "18561", - "name": "HalloweenBoss Fx_2", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 305, - "trimY": 1, - "width": 274, - "height": 128, - "rawWidth": 276, - "rawHeight": 132, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "35343": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@35343", - "displayName": "", - "id": "35343", - "name": "heroShow0002", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 998, - "trimY": 277, - "width": 216, - "height": 102, - "rawWidth": 216, - "rawHeight": 102, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "4ee48": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@4ee48", - "displayName": "", - "id": "4ee48", - "name": "HalloweenBoss Fx_1", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 175, - "trimY": 1, - "width": 274, - "height": 128, - "rawWidth": 276, - "rawHeight": 132, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "c6107": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@c6107", - "displayName": "", - "id": "c6107", - "name": "HalloweenBoss Fx_3", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 435, - "trimY": 1, - "width": 274, - "height": 128, - "rawWidth": 276, - "rawHeight": 132, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "791eb": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@791eb", - "displayName": "", - "id": "791eb", - "name": "HalloweenBoss Fx_4", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 565, - "trimY": 1, - "width": 274, - "height": 128, - "rawWidth": 276, - "rawHeight": 132, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "a4cbe": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@a4cbe", - "displayName": "", - "id": "a4cbe", - "name": "HalloweenBoss Fx_5", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 695, - "trimY": 1, - "width": 274, - "height": 128, - "rawWidth": 276, - "rawHeight": 132, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "dcb10": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@dcb10", - "displayName": "", - "id": "dcb10", - "name": "HalloweenBoss Fx_6", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 825, - "trimY": 1, - "width": 274, - "height": 128, - "rawWidth": 276, - "rawHeight": 132, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "cb5c1": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@cb5c1", - "displayName": "", - "id": "cb5c1", - "name": "HalloweenBoss Fx_7", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 955, - "trimY": 1, - "width": 274, - "height": 128, - "rawWidth": 276, - "rawHeight": 132, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "ba364": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@ba364", - "displayName": "", - "id": "ba364", - "name": "HalloweenBoss Fx_8", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 1085, - "trimY": 1, - "width": 274, - "height": 128, - "rawWidth": 276, - "rawHeight": 132, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "fecfb": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@fecfb", - "displayName": "", - "id": "fecfb", - "name": "battleAttack_60001", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 1515, - "trimY": 209, - "width": 146, - "height": 56, - "rawWidth": 146, - "rawHeight": 56, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "0fc4e": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@0fc4e", - "displayName": "", - "id": "0fc4e", - "name": "battleAttack_60002", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 1621, - "trimY": 364, - "width": 166, - "height": 68, - "rawWidth": 166, - "rawHeight": 68, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "ae735": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@ae735", - "displayName": "", - "id": "ae735", - "name": "battleAttack_60003", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 1521, - "trimY": 434, - "width": 188, - "height": 72, - "rawWidth": 188, - "rawHeight": 72, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "90ba4": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@90ba4", - "displayName": "", - "id": "90ba4", - "name": "battleshow_60001", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 1316, - "trimY": 277, - "width": 208, - "height": 99, - "rawWidth": 208, - "rawHeight": 99, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "ec38b": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@ec38b", - "displayName": "", - "id": "ec38b", - "name": "battleshow_60002", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 1213, - "trimY": 277, - "width": 214, - "height": 101, - "rawWidth": 214, - "rawHeight": 101, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "2ada0": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@2ada0", - "displayName": "", - "id": "2ada0", - "name": "battleshow_60003", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 1102, - "trimY": 277, - "width": 214, - "height": 109, - "rawWidth": 214, - "rawHeight": 109, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f70ba": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@f70ba", - "displayName": "", - "id": "f70ba", - "name": "battleshow_60004", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 414, - "trimY": 277, - "width": 230, - "height": 115, - "rawWidth": 230, - "rawHeight": 115, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "a001a": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@a001a", - "displayName": "", - "id": "a001a", - "name": "battleshow_60005", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 295, - "trimY": 277, - "width": 232, - "height": 117, - "rawWidth": 232, - "rawHeight": 117, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "b6ec6": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@b6ec6", - "displayName": "", - "id": "b6ec6", - "name": "battleshow_60006", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 767, - "trimY": 277, - "width": 222, - "height": 115, - "rawWidth": 222, - "rawHeight": 115, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "1b5b3": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@1b5b3", - "displayName": "", - "id": "1b5b3", - "name": "battleshow_60007", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 1423, - "trimY": 1, - "width": 206, - "height": 99, - "rawWidth": 206, - "rawHeight": 99, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "f5094": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@f5094", - "displayName": "", - "id": "f5094", - "name": "battleshow_60008", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 1524, - "trimY": 1, - "width": 202, - "height": 99, - "rawWidth": 202, - "rawHeight": 99, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "04cec": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@04cec", - "displayName": "", - "id": "04cec", - "name": "beijiguang_004@2x", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 1, - "trimY": 1, - "width": 470, - "height": 172, - "rawWidth": 470, - "rawHeight": 172, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "3889c": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@3889c", - "displayName": "", - "id": "3889c", - "name": "curse_big_00011", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": -3, - "offsetY": 0, - "trimX": 1279, - "trimY": 213, - "width": 62, - "height": 58, - "rawWidth": 80, - "rawHeight": 92, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "3ceb8": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@3ceb8", - "displayName": "", - "id": "3ceb8", - "name": "curse_big_00012", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": -3, - "offsetY": -1, - "trimX": 1339, - "trimY": 211, - "width": 54, - "height": 62, - "rawWidth": 80, - "rawHeight": 92, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "8c9d6": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@8c9d6", - "displayName": "", - "id": "8c9d6", - "name": "curse_big_00013", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 2, - "offsetY": -2, - "trimX": 1455, - "trimY": 209, - "width": 60, - "height": 58, - "rawWidth": 80, - "rawHeight": 92, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "a5fb6": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@a5fb6", - "displayName": "", - "id": "a5fb6", - "name": "curse_big_00014", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 4, - "offsetY": 2, - "trimX": 1395, - "trimY": 211, - "width": 58, - "height": 60, - "rawWidth": 80, - "rawHeight": 92, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "4641f": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@4641f", - "displayName": "", - "id": "4641f", - "name": "curse_big_00015", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": -1, - "offsetY": 1, - "trimX": 1215, - "trimY": 213, - "width": 62, - "height": 62, - "rawWidth": 80, - "rawHeight": 92, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "5db1e": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@5db1e", - "displayName": "", - "id": "5db1e", - "name": "effect_b07_01", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 1, - "offsetY": -41, - "trimX": 1625, - "trimY": 1, - "width": 169, - "height": 98, - "rawWidth": 175, - "rawHeight": 180, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "15af5": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@15af5", - "displayName": "", - "id": "15af5", - "name": "effect_b07_02", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 1, - "offsetY": -41, - "trimX": 1663, - "trimY": 197, - "width": 165, - "height": 98, - "rawWidth": 175, - "rawHeight": 180, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "73abb": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@73abb", - "displayName": "", - "id": "73abb", - "name": "effect_b07_03", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": -41, - "trimX": 1521, - "trimY": 267, - "width": 163, - "height": 98, - "rawWidth": 175, - "rawHeight": 180, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "04931": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@04931", - "displayName": "", - "id": "04931", - "name": "effect_b07_04", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 2, - "offsetY": -39, - "trimX": 1625, - "trimY": 101, - "width": 169, - "height": 94, - "rawWidth": 175, - "rawHeight": 180, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "ba964": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@ba964", - "displayName": "", - "id": "ba964", - "name": "heroShow0001", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 1215, - "trimY": 1, - "width": 210, - "height": 102, - "rawWidth": 210, - "rawHeight": 102, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "589f9": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@589f9", - "displayName": "", - "id": "589f9", - "name": "heroShow0003", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 884, - "trimY": 277, - "width": 218, - "height": 112, - "rawWidth": 218, - "rawHeight": 112, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "faeba": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@faeba", - "displayName": "", - "id": "faeba", - "name": "heroShow0004", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 175, - "trimY": 277, - "width": 232, - "height": 118, - "rawWidth": 232, - "rawHeight": 118, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "5a961": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@5a961", - "displayName": "", - "id": "5a961", - "name": "heroShow0005", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 531, - "trimY": 277, - "width": 230, - "height": 114, - "rawWidth": 230, - "rawHeight": 114, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "d8eeb": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@d8eeb", - "displayName": "", - "id": "d8eeb", - "name": "heroShow0006", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 647, - "trimY": 277, - "width": 224, - "height": 118, - "rawWidth": 224, - "rawHeight": 118, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "834f6": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@834f6", - "displayName": "", - "id": "834f6", - "name": "heroShow0007", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 1319, - "trimY": 1, - "width": 208, - "height": 102, - "rawWidth": 208, - "rawHeight": 102, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "60d02": { - "importer": "sprite-frame", - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600@60d02", - "displayName": "", - "id": "60d02", - "name": "heroShow0008", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 1417, - "trimY": 273, - "width": 204, - "height": 102, - "rawWidth": 204, - "rawHeight": 102, - "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": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "atlasUuid": "d6bb5233-8098-41a3-89c5-9cb570683600" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "atlasTextureName": "buffs.png", - "format": 3, - "uuid": "d6bb5233-8098-41a3-89c5-9cb570683600", - "textureUuid": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a" - } -} diff --git a/assets/resources/game/skills/buffs.png b/assets/resources/game/skills/buffs.png deleted file mode 100644 index b27bb6e4..00000000 Binary files a/assets/resources/game/skills/buffs.png and /dev/null differ diff --git a/assets/resources/game/skills/buffs.png.meta b/assets/resources/game/skills/buffs.png.meta deleted file mode 100644 index b69a7034..00000000 --- a/assets/resources/game/skills/buffs.png.meta +++ /dev/null @@ -1,42 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "383f61b8-31ea-4457-971c-b21f5c311723", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a", - "displayName": "buffs", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "383f61b8-31ea-4457-971c-b21f5c311723", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "texture", - "fixAlphaTransparencyArtifacts": false, - "redirect": "383f61b8-31ea-4457-971c-b21f5c311723@6c48a" - } -} diff --git a/assets/script/game/Role/RoleSpine.ts b/assets/script/game/Role/RoleSpine.ts index e18559b1..4db94315 100644 --- a/assets/script/game/Role/RoleSpine.ts +++ b/assets/script/game/Role/RoleSpine.ts @@ -40,7 +40,7 @@ export class RoleSpine extends Component { /** 初始化动画 */ protected initAnimator() { this.animator=this.node.getChildByName("hero").getComponent(Animation); - console.log("role view comp init",this.animator); + // console.log("role view comp init",this.animator); } onAnimationEvent(type: Animation.EventType, state: AnimationState){ diff --git a/assets/script/game/hero/BoxRangComp.ts b/assets/script/game/hero/BoxRangComp.ts index d5bcc77e..c349980f 100644 --- a/assets/script/game/hero/BoxRangComp.ts +++ b/assets/script/game/hero/BoxRangComp.ts @@ -48,6 +48,8 @@ export class BoxRangComp extends CCComp { // console.log(this.node.name+"onEndContact: seft:"+selfCollider.group+"|other:"+otherCollider.group+"| tag: seft:"+selfCollider.tag+"|other:"+otherCollider.tag); this.HeroViewComp.is_atking = false; this.HeroViewComp.enemy = null; + this.HeroViewComp.as.change_default("move"); + this.HeroViewComp.as.move(); } } onPreSolve (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) { @@ -66,6 +68,7 @@ export class BoxRangComp extends CCComp { if(Math.abs(other_pos.x-self_pos.x) < this.HeroViewComp.atk_dis){ this.HeroViewComp.is_atking = true; this.HeroViewComp.stop_cd = 0.1 + this.HeroViewComp.as.change_default("idle"); } } diff --git a/assets/script/game/hero/HeroBuffComp.ts b/assets/script/game/hero/HeroBuffComp.ts index 5d00c98c..9bf77986 100644 --- a/assets/script/game/hero/HeroBuffComp.ts +++ b/assets/script/game/hero/HeroBuffComp.ts @@ -5,7 +5,7 @@ * @LastEditTime: 2022-08-17 12:36:18 */ -import { _decorator,Sprite,Color} from "cc"; +import { _decorator,Sprite,Color, Prefab, instantiate} from "cc"; import { ecs } from "../../../../extensions/oops-plugin-framework/assets/libs/ecs/ECS"; import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/module/common/CCComp"; import { HeroSpine } from "./HeroSpine"; @@ -33,6 +33,7 @@ export class HeroBuffComp extends CCComp { timer:Timer = new Timer(0.1); buffs:any=[]; group:number=BoxSet.HERO; + /** skill_uuid:number=0; atk:number=0; @@ -77,7 +78,12 @@ export class HeroBuffComp extends CCComp { this.node.destroy(); } - + show_buff_atk(){ + var path = "game/skills/buff/atk" + var prefab: Prefab = oops.res.get(path, Prefab)!; + var node = instantiate(prefab); + node.setPosition(this.node.position.x,this.node.position.y+40,this.node.position.z); + } buff_add(buff:any){ if(!this.node.isValid){ return } let i = 0 @@ -106,6 +112,7 @@ export class HeroBuffComp extends CCComp { this.buffs.push(buff); if(buff.atk>0){ this.mv.atk+=(buff.atk+buff.args.atk); + this.show_buff_atk(); } if(buff.hp>0){ this.mv.hp+=(buff.hp+buff.args.hp); diff --git a/assets/script/game/hero/HeroSpine.ts b/assets/script/game/hero/HeroSpine.ts index af372098..652859c8 100644 --- a/assets/script/game/hero/HeroSpine.ts +++ b/assets/script/game/hero/HeroSpine.ts @@ -52,10 +52,12 @@ export class HeroSpine extends Component { } change_default(value:string){ this.default_clip=value; - this.animator.play(this.default_clip); } default() { - this.animator.play(this.default_clip); + if(!this.animator.getState(this.default_clip).isPlaying){ + this.animator.play(this.default_clip); + } + } idle(){ if(!this.animator.getState(this.idle_clip.name).isPlaying){ diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index 23235a94..b3b761c5 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -84,6 +84,8 @@ export class HeroViewComp extends CCComp { is_stop:boolean = false; is_atking:boolean = false; + buffs:any=[]; + onLoad() { this.as = this.getComponent(HeroSpine); this.buff=this.node.getComponent(HeroBuffComp); @@ -346,6 +348,14 @@ export class HeroViewComp extends CCComp { let hp_progress= this.hp/this.hp_max; this.node.getChildByName("top").getChildByName("hp").getComponent(ProgressBar)!.progress = hp_progress; } + add_atk(atk: number,time:number=0){ + if(time > 0){ + let buff={atk:atk,time:time} + this.buffs.push(buff); + }else{ + this.atk += atk; + } + } shield_change(hp: number){ let ls=this.shield - hp; if(ls <= 0){ @@ -356,6 +366,17 @@ export class HeroViewComp extends CCComp { return 0; } } + check_buffs(dt: number){ + for(let i=0;i 0)this.atk -= buff.atk; + if(buff.shield > 0)this.shield=this.shield_max=0; + this.buffs.splice(i,1); + } + } + } tooltip(type:number=1,value:string="",s_uuid:number=1001){ // console.log("tooltip",type); let tip =ecs.getEntity(Tooltip); diff --git a/assets/script/game/initialize/Initialize.ts b/assets/script/game/initialize/Initialize.ts index 68e51f1b..719a9456 100644 --- a/assets/script/game/initialize/Initialize.ts +++ b/assets/script/game/initialize/Initialize.ts @@ -51,7 +51,7 @@ export class Initialize extends ecs.Entity { // 加载多语言对应字体 oops.res.load("language/font/" + oops.language.current, next); //加载精灵配置表 - oops.res.load("config/game/heros", next); + // oops.res.load("config/game/heros", next); }); } diff --git a/assets/script/game/map/MapMonsterComp.ts b/assets/script/game/map/MapMonsterComp.ts index 2603139b..ce4d4755 100644 --- a/assets/script/game/map/MapMonsterComp.ts +++ b/assets/script/game/map/MapMonsterComp.ts @@ -125,7 +125,7 @@ export class MapMonsterComp extends CCComp { let pos = v3(BoxSet.HERO_START,BoxSet.GAME_LINE) role.load(pos,109) smc.Role=role - console.log("加载玩家",role) + // console.log("加载玩家",role) } private on_do_add_hero(event: string, args: any) { this.addHero(args.uuid) diff --git a/assets/script/game/mon/BoxRangComp.ts b/assets/script/game/mon/BoxRangComp.ts index 8ece71db..2b980fdf 100644 --- a/assets/script/game/mon/BoxRangComp.ts +++ b/assets/script/game/mon/BoxRangComp.ts @@ -48,6 +48,8 @@ export class BoxRangComp extends CCComp { // console.log(this.node.name+"onEndContact: seft:"+selfCollider.group+"|other:"+otherCollider.group+"| tag: seft:"+selfCollider.tag+"|other:"+otherCollider.tag); this.MonViewComp.is_atking = false; this.MonViewComp.enemy = null; + this.MonViewComp.as.change_default("move"); + this.MonViewComp.as.move(); } } onPreSolve (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) { @@ -66,6 +68,8 @@ export class BoxRangComp extends CCComp { if(Math.abs(other_pos.x-self_pos.x) < this.MonViewComp.atk_dis){ this.MonViewComp.is_atking = true; this.MonViewComp.stop_cd = 0.1 + this.MonViewComp.as.change_default("idle"); + } } diff --git a/assets/script/game/mon/MonSpine.ts b/assets/script/game/mon/MonSpine.ts index 611bb8ff..e6de6d34 100644 --- a/assets/script/game/mon/MonSpine.ts +++ b/assets/script/game/mon/MonSpine.ts @@ -50,10 +50,11 @@ export class MonSpine extends Component { } change_default(value:string){ this.default_clip=value; - this.animator.play(this.default_clip); } default() { - this.animator.play(this.default_clip); + if(!this.animator.getState(this.default_clip).isPlaying){ + this.animator.play(this.default_clip); + } } idle(){ if(!this.animator.getState(this.idle_clip.name).isPlaying){ diff --git a/assets/script/game/skills/CSkillComp.ts b/assets/script/game/skills/CSkillComp.ts index 6d523e53..b32a50e5 100644 --- a/assets/script/game/skills/CSkillComp.ts +++ b/assets/script/game/skills/CSkillComp.ts @@ -127,6 +127,16 @@ export class CSkillComp extends CCComp { } // oops.message.dispatchEvent("add_buff",{uuid:this.skill_uuid,eid:0,group:BoxSet.HERO}) } + single_least_add_buff(target:any,uuid:number,args:any) { + let buff = SkillSet[uuid] + if(buff.hp > 0 ){ + target.HeroView.add_hp(buff.hp+args.hp) + } + if(buff.atk > 0 ){ + target.HeroView.add_atk(buff.atk+args.atk,buff.bsd) + } + + } /** 全局消息逻辑处理 */ // private onHandler(event: string, args: any) { // switch (event) {