diff --git a/assets/resources/game/heros/hero.prefab b/assets/resources/game/heros/hero.prefab index bb9c08e2..267f4eb2 100644 --- a/assets/resources/game/heros/hero.prefab +++ b/assets/resources/game/heros/hero.prefab @@ -59,10 +59,13 @@ }, { "__id__": 89 + }, + { + "__id__": 91 } ], "_prefab": { - "__id__": 91 + "__id__": 93 }, "_lpos": { "__type__": "cc.Vec3", @@ -1971,13 +1974,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 2.6, - "y": 34.5 + "x": 1.9, + "y": 34.8 }, "_size": { "__type__": "cc.Size", - "width": 81.9, - "height": 73.4 + "width": 74.5, + "height": 71.6 }, "_id": "" }, @@ -1985,6 +1988,40 @@ "__type__": "cc.CompPrefabInfo", "fileId": "b2Dt9lJI9FyJCDezkDBPBl" }, + { + "__type__": "cc.BoxCollider2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 92 + }, + "tag": 4, + "_group": 4, + "_density": 1, + "_sensor": true, + "_friction": 0.2, + "_restitution": 0, + "_offset": { + "__type__": "cc.Vec2", + "x": 0.6, + "y": 34.9 + }, + "_size": { + "__type__": "cc.Size", + "width": 152.8, + "height": 69.9 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "1d3plX+d1OE42XB2BpU876" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/map/map_rpg.prefab b/assets/resources/game/map/map_rpg.prefab index 43f53c24..63ec65f5 100644 --- a/assets/resources/game/map/map_rpg.prefab +++ b/assets/resources/game/map/map_rpg.prefab @@ -27,18 +27,18 @@ ], "_active": true, "_components": [ - { - "__id__": 66 - }, - { - "__id__": 68 - }, { "__id__": 70 + }, + { + "__id__": 72 + }, + { + "__id__": 74 } ], "_prefab": { - "__id__": 72 + "__id__": 76 }, "_lpos": { "__type__": "cc.Vec3", @@ -196,18 +196,18 @@ ], "_active": true, "_components": [ - { - "__id__": 59 - }, - { - "__id__": 61 - }, { "__id__": 63 + }, + { + "__id__": 65 + }, + { + "__id__": 67 } ], "_prefab": { - "__id__": 65 + "__id__": 69 }, "_lpos": { "__type__": "cc.Vec3", @@ -250,24 +250,24 @@ { "__id__": 8 }, - { - "__id__": 30 - }, { "__id__": 34 }, { - "__id__": 40 + "__id__": 38 + }, + { + "__id__": 44 } ], "_active": true, "_components": [ { - "__id__": 56 + "__id__": 60 } ], "_prefab": { - "__id__": 58 + "__id__": 62 }, "_lpos": { "__type__": "cc.Vec3", @@ -313,21 +313,21 @@ ], "_active": true, "_components": [ - { - "__id__": 21 - }, - { - "__id__": 23 - }, { "__id__": 25 }, { "__id__": 27 + }, + { + "__id__": 29 + }, + { + "__id__": 31 } ], "_prefab": { - "__id__": 29 + "__id__": 33 }, "_lpos": { "__type__": "cc.Vec3", @@ -374,14 +374,14 @@ "_active": true, "_components": [ { - "__id__": 16 + "__id__": 20 }, { - "__id__": 18 + "__id__": 22 } ], "_prefab": { - "__id__": 20 + "__id__": 24 }, "_lpos": { "__type__": "cc.Vec3", @@ -428,10 +428,16 @@ }, { "__id__": 13 + }, + { + "__id__": 15 + }, + { + "__id__": 17 } ], "_prefab": { - "__id__": 15 + "__id__": 19 }, "_lpos": { "__type__": "cc.Vec3", @@ -535,6 +541,74 @@ "__type__": "cc.CompPrefabInfo", "fileId": "66D90QlYtEvKkAU6KcReVW" }, + { + "__type__": "cc.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": { + "__id__": 16 + }, + "enabledContactListener": true, + "bullet": true, + "awakeOnLoad": true, + "_group": 1, + "_type": 1, + "_allowSleep": true, + "_gravityScale": 1, + "_linearDamping": 0, + "_angularDamping": 0, + "_linearVelocity": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_angularVelocity": 0, + "_fixedRotation": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "ecdGKWzdRP0rBH3uhPVyE9" + }, + { + "__type__": "cc.BoxCollider2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 10 + }, + "_enabled": true, + "__prefab": { + "__id__": 18 + }, + "tag": 0, + "_group": 1, + "_density": 1, + "_sensor": true, + "_friction": 0.2, + "_restitution": 0, + "_offset": { + "__type__": "cc.Vec2", + "x": 0, + "y": -386.5 + }, + "_size": { + "__type__": "cc.Size", + "width": 3182.4, + "height": 827 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "a3TPeHnrtB97468bJdHi1x" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -558,7 +632,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 21 }, "_contentSize": { "__type__": "cc.Size", @@ -586,7 +660,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 23 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -644,7 +718,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 22 + "__id__": 26 }, "_contentSize": { "__type__": "cc.Size", @@ -672,10 +746,10 @@ }, "_enabled": true, "__prefab": { - "__id__": 24 + "__id__": 28 }, "bgImg": { - "__id__": 18 + "__id__": 22 }, "_id": "" }, @@ -693,7 +767,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 26 + "__id__": 30 }, "light": { "__uuid__": "319c7eb8-9826-48b6-81e4-82559dbf82a8", @@ -715,7 +789,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 28 + "__id__": 32 }, "_id": "" }, @@ -746,104 +820,13 @@ }, "_children": [], "_active": true, - "_components": [ - { - "__id__": 31 - } - ], - "_prefab": { - "__id__": 33 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 30 - }, - "_enabled": true, - "__prefab": { - "__id__": 32 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 100, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "31oHtMbJVMArMbwqigKTMo" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "dcwiHpOeZB4rB8JR5Z9iTM", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.Node", - "_name": "EntityLayer", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 7 - }, - "_children": [], - "_active": true, "_components": [ { "__id__": 35 - }, - { - "__id__": 37 } ], "_prefab": { - "__id__": 39 + "__id__": 37 }, "_lpos": { "__type__": "cc.Vec3", @@ -898,6 +881,97 @@ }, "_id": "" }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "31oHtMbJVMArMbwqigKTMo" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "dcwiHpOeZB4rB8JR5Z9iTM", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "EntityLayer", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 7 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 39 + }, + { + "__id__": 41 + } + ], + "_prefab": { + "__id__": 43 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 38 + }, + "_enabled": true, + "__prefab": { + "__id__": 40 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_id": "" + }, { "__type__": "cc.CompPrefabInfo", "fileId": "f91Y4OCX1NFKfSWOAvmdSa" @@ -908,11 +982,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 34 + "__id__": 38 }, "_enabled": true, "__prefab": { - "__id__": 38 + "__id__": 42 }, "_id": "" }, @@ -943,20 +1017,20 @@ }, "_children": [ { - "__id__": 41 + "__id__": 45 } ], "_active": true, "_components": [ { - "__id__": 51 + "__id__": 55 }, { - "__id__": 53 + "__id__": 57 } ], "_prefab": { - "__id__": 55 + "__id__": 59 }, "_lpos": { "__type__": "cc.Vec3", @@ -991,17 +1065,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 40 + "__id__": 44 }, "_prefab": { - "__id__": 42 + "__id__": 46 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 41 + "__id__": 45 }, "asset": { "__uuid__": "63c02880-bda6-4370-bb22-46bf4f49bbfe", @@ -1009,7 +1083,7 @@ }, "fileId": "fdklpBwCBM/qJ4WFlQF3kT", "instance": { - "__id__": 43 + "__id__": 47 }, "targetOverrides": null }, @@ -1022,23 +1096,23 @@ "mountedChildren": [], "mountedComponents": [], "propertyOverrides": [ - { - "__id__": 44 - }, - { - "__id__": 46 - }, - { - "__id__": 47 - }, { "__id__": 48 }, { - "__id__": 49 + "__id__": 50 }, { - "__id__": 50 + "__id__": 51 + }, + { + "__id__": 52 + }, + { + "__id__": 53 + }, + { + "__id__": 54 } ], "removedComponents": [] @@ -1046,7 +1120,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 45 + "__id__": 49 }, "propertyPath": [ "_name" @@ -1062,7 +1136,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 45 + "__id__": 49 }, "propertyPath": [ "_lpos" @@ -1077,7 +1151,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 45 + "__id__": 49 }, "propertyPath": [ "_lrot" @@ -1093,7 +1167,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 45 + "__id__": 49 }, "propertyPath": [ "_euler" @@ -1108,7 +1182,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 45 + "__id__": 49 }, "propertyPath": [ "_active" @@ -1118,7 +1192,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 45 + "__id__": 49 }, "propertyPath": [ "_lscale" @@ -1136,11 +1210,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 44 }, "_enabled": true, "__prefab": { - "__id__": 52 + "__id__": 56 }, "_contentSize": { "__type__": "cc.Size", @@ -1164,11 +1238,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 40 + "__id__": 44 }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 58 }, "light": { "__uuid__": "319c7eb8-9826-48b6-81e4-82559dbf82a8", @@ -1203,7 +1277,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 57 + "__id__": 61 }, "_contentSize": { "__type__": "cc.Size", @@ -1244,7 +1318,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 60 + "__id__": 64 }, "_contentSize": { "__type__": "cc.Size", @@ -1272,7 +1346,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 62 + "__id__": 66 }, "camera": { "__id__": 3 @@ -1281,16 +1355,16 @@ "__id__": 7 }, "mapLayer": { - "__id__": 23 + "__id__": 27 }, "floorLayer": { - "__id__": 30 + "__id__": 34 }, "entityLayer": { - "__id__": 37 + "__id__": 41 }, "SkillLayer": { - "__id__": 53 + "__id__": 57 }, "isFollowPlayer": true, "_id": "" @@ -1309,7 +1383,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 68 }, "_id": "" }, @@ -1340,7 +1414,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 67 + "__id__": 71 }, "_contentSize": { "__type__": "cc.Size", @@ -1368,7 +1442,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 69 + "__id__": 73 }, "_cameraComponent": { "__id__": 3 @@ -1390,7 +1464,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 71 + "__id__": 75 }, "_alignFlags": 45, "_target": null, @@ -1429,7 +1503,7 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 41 + "__id__": 45 } ] } diff --git a/assets/resources/game/skills/atk/1902112.atlas b/assets/resources/game/skills/atk/1902112.atlas deleted file mode 100644 index da025efa..00000000 --- a/assets/resources/game/skills/atk/1902112.atlas +++ /dev/null @@ -1,41 +0,0 @@ - -1902112.png -size: 254,52 -format: RGBA8888 -filter: Linear,Linear -repeat: none -zhaozi_dg_00000 - rotate: true - xy: 187, 6 - size: 44, 41 - orig: 50, 48 - offset: 3, 3 - index: -1 -zhaozi_dg_00001 - rotate: false - xy: 71, 11 - size: 65, 39 - orig: 71, 47 - offset: 2, 3 - index: -1 -zhaozi_dg_00003 - rotate: false - xy: 2, 2 - size: 67, 48 - orig: 76, 54 - offset: 3, 3 - index: -1 -zhaozi_dg_00004 - rotate: true - xy: 138, 2 - size: 48, 47 - orig: 53, 55 - offset: 3, 5 - index: -1 -zhaozi_dg_00005 - rotate: false - xy: 230, 4 - size: 22, 46 - orig: 26, 50 - offset: 3, 0 - index: -1 diff --git a/assets/resources/game/skills/atk/1902112.atlas.meta b/assets/resources/game/skills/atk/1902112.atlas.meta deleted file mode 100644 index 21c22e98..00000000 --- a/assets/resources/game/skills/atk/1902112.atlas.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.0.1", - "importer": "*", - "imported": true, - "uuid": "7ab419d0-1103-43a2-9b41-fcc2bbf6a0d9", - "files": [ - ".atlas", - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/resources/game/skills/atk/1902112.json b/assets/resources/game/skills/atk/1902112.json deleted file mode 100644 index 74d106fe..00000000 --- a/assets/resources/game/skills/atk/1902112.json +++ /dev/null @@ -1,155 +0,0 @@ -{ -"skeleton": { "hash": "RzuY2KsGY/h8RnqhMkr1C6zecD0", "spine": "3.8.99", "images": "./0/", "audio": "" }, -"bones": [ - { "name": "root" }, - { "name": "baodian", "parent": "root" }, - { "name": "hitzhaozi_dg_a1", "parent": "baodian" }, - { "name": "hitzhaozi_dg_b1", "parent": "hitzhaozi_dg_a1" }, - { "name": "hitzhaozi_dg_a2", "parent": "baodian" }, - { "name": "hitzhaozi_dg_b2", "parent": "hitzhaozi_dg_a2" }, - { "name": "hitzhaozi_dg_a3", "parent": "baodian" }, - { "name": "hitzhaozi_dg_b3", "parent": "hitzhaozi_dg_a3" } -], -"slots": [ - { "name": "hitzhaozi_dg_a3", "bone": "hitzhaozi_dg_b3" }, - { "name": "hitzhaozi_dg_a1", "bone": "hitzhaozi_dg_b1" }, - { "name": "hitzhaozi_dg_a2", "bone": "hitzhaozi_dg_b2" } -], -"skins": [ - { - "name": "default", - "attachments": { - "hitzhaozi_dg_a1": { - "zhaozi_dg_00000": { "x": 8.44, "y": -9.34, "width": 50, "height": 48 }, - "zhaozi_dg_00001": { "x": 2.7, "y": -9.94, "width": 71, "height": 47 }, - "zhaozi_dg_00003": { "x": -1.18, "y": -7.92, "width": 76, "height": 54 }, - "zhaozi_dg_00004": { "x": -7.92, "y": -6.1, "width": 53, "height": 55 }, - "zhaozi_dg_00005": { "x": -14.69, "y": -2.06, "width": 26, "height": 50 } - }, - "hitzhaozi_dg_a2": { - "zhaozi_dg_00000": { "x": 8.44, "y": -9.34, "width": 50, "height": 48 }, - "zhaozi_dg_00001": { "x": 2.7, "y": -9.94, "width": 71, "height": 47 }, - "zhaozi_dg_00003": { "x": -1.18, "y": -7.92, "width": 76, "height": 54 }, - "zhaozi_dg_00004": { "x": -7.92, "y": -6.1, "width": 53, "height": 55 }, - "zhaozi_dg_00005": { "x": -14.69, "y": -2.06, "width": 26, "height": 50 } - }, - "hitzhaozi_dg_a3": { - "zhaozi_dg_00000": { "x": 8.44, "y": -9.34, "width": 50, "height": 48 }, - "zhaozi_dg_00001": { "x": 2.7, "y": -9.94, "width": 71, "height": 47 }, - "zhaozi_dg_00003": { "x": -1.18, "y": -7.92, "width": 76, "height": 54 }, - "zhaozi_dg_00004": { "x": -7.92, "y": -6.1, "width": 53, "height": 55 }, - "zhaozi_dg_00005": { "x": -14.69, "y": -2.06, "width": 26, "height": 50 } - } - } - } -], -"events": { - "OnCreateMagicHarm": {}, - "Skill_Complete": {} -}, -"animations": { - "animation": { - "slots": { - "hitzhaozi_dg_a1": { - "attachment": [ - { "time": 0.1667, "name": "zhaozi_dg_00000" }, - { "time": 0.2, "name": "zhaozi_dg_00001" }, - { "time": 0.2667, "name": "zhaozi_dg_00003" }, - { "time": 0.3, "name": "zhaozi_dg_00004" }, - { "time": 0.3667, "name": "zhaozi_dg_00005" }, - { "time": 0.4333, "name": null } - ] - }, - "hitzhaozi_dg_a2": { - "attachment": [ - { "time": 0.1667, "name": "zhaozi_dg_00000" }, - { "time": 0.2, "name": "zhaozi_dg_00001" }, - { "time": 0.2667, "name": "zhaozi_dg_00003" }, - { "time": 0.3, "name": "zhaozi_dg_00004" }, - { "time": 0.3667, "name": "zhaozi_dg_00005" }, - { "time": 0.4333, "name": null } - ] - }, - "hitzhaozi_dg_a3": { - "attachment": [ - { "time": 0.1667, "name": "zhaozi_dg_00000" }, - { "time": 0.2, "name": "zhaozi_dg_00001" }, - { "time": 0.2667, "name": "zhaozi_dg_00003" }, - { "time": 0.3, "name": "zhaozi_dg_00004" }, - { "time": 0.3667, "name": "zhaozi_dg_00005" }, - { "time": 0.4333, "name": null } - ] - } - }, - "bones": { - "hitzhaozi_dg_b1": { - "rotate": [ - { "curve": "stepped" }, - { "time": 0.1667, "angle": 39.65 }, - { "time": 0.2, "angle": -25.3 } - ] - }, - "hitzhaozi_dg_b2": { - "rotate": [ - { "curve": "stepped" }, - { "time": 0.1667, "angle": 39.65 }, - { "time": 0.2, "angle": -25.3 } - ] - }, - "hitzhaozi_dg_b3": { - "rotate": [ - { "curve": "stepped" }, - { "time": 0.1667, "angle": 39.65 }, - { "time": 0.2, "angle": -25.3 } - ] - }, - "hitzhaozi_dg_a1": { - "translate": [ - { "curve": "stepped" }, - { "time": 0.1667, "x": 3.98, "y": 38.73 } - ], - "scale": [ - { "curve": "stepped" }, - { "time": 0.1667, "x": 2.4, "y": 2.4 } - ], - "shear": [ - { "curve": "stepped" }, - { "time": 0.1667, "x": -179.82, "y": -154.19 } - ] - }, - "hitzhaozi_dg_a2": { - "translate": [ - { "curve": "stepped" }, - { "time": 0.1667, "x": 2.39, "y": 26.84 } - ], - "scale": [ - { "curve": "stepped" }, - { "time": 0.1667, "x": 2, "y": 2 } - ], - "shear": [ - { "curve": "stepped" }, - { "time": 0.1667, "x": -175.44, "y": -141.53 } - ] - }, - "hitzhaozi_dg_a3": { - "translate": [ - { "curve": "stepped" }, - { "time": 0.1667, "x": 18.68, "y": 46.94 } - ], - "scale": [ - { "curve": "stepped" }, - { "time": 0.1667, "x": 2, "y": 2 } - ], - "shear": [ - { "curve": "stepped" }, - { "time": 0.1667, "x": 176.79, "y": -165.1 } - ] - } - }, - "events": [ - { "time": 0.2333, "name": "OnCreateMagicHarm" }, - { "time": 0.8, "name": "Skill_Complete" } - ] - } -} -} \ No newline at end of file diff --git a/assets/resources/game/skills/atk/1902112.json.meta b/assets/resources/game/skills/atk/1902112.json.meta deleted file mode 100644 index e490795e..00000000 --- a/assets/resources/game/skills/atk/1902112.json.meta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ver": "1.2.6", - "importer": "spine-data", - "imported": true, - "uuid": "781779c5-9961-43c5-87b7-9c76157a87dd", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/resources/game/skills/atk/1902112.png b/assets/resources/game/skills/atk/1902112.png deleted file mode 100644 index 0134658c..00000000 Binary files a/assets/resources/game/skills/atk/1902112.png and /dev/null differ diff --git a/assets/resources/game/skills/atk/1902112.png.meta b/assets/resources/game/skills/atk/1902112.png.meta deleted file mode 100644 index 58832d97..00000000 --- a/assets/resources/game/skills/atk/1902112.png.meta +++ /dev/null @@ -1,42 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "5fd46aaf-0281-4b00-baae-151d72d42084", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "5fd46aaf-0281-4b00-baae-151d72d42084@6c48a", - "displayName": "1902112", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "5fd46aaf-0281-4b00-baae-151d72d42084", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "texture", - "fixAlphaTransparencyArtifacts": false, - "redirect": "5fd46aaf-0281-4b00-baae-151d72d42084@6c48a" - } -} diff --git a/assets/resources/game/skills/atk/atk.anim b/assets/resources/game/skills/atk/atk.anim deleted file mode 100644 index b951581d..00000000 --- a/assets/resources/game/skills/atk/atk.anim +++ /dev/null @@ -1,454 +0,0 @@ -[ - { - "__type__": "cc.AnimationClip", - "_name": "atk", - "_objFlags": 0, - "__editorExtras__": { - "embeddedPlayerGroups": [ - { - "key": "1724256974260", - "name": "particle-system", - "type": "particle-system" - }, - { - "key": "1724256980173", - "name": "animation-clip", - "type": "animation-clip" - } - ] - }, - "_native": "", - "sample": 24, - "speed": 1, - "wrapMode": 2, - "enableTrsBlending": false, - "_duration": 0.4583333333333333, - "_hash": 500763545, - "_tracks": [ - { - "__id__": 1 - }, - { - "__id__": 6 - }, - { - "__id__": 16 - } - ], - "_exoticAnimation": null, - "_events": [], - "_embeddedPlayers": [], - "_additiveSettings": { - "__id__": 26 - }, - "_auxiliaryCurveEntries": [] - }, - { - "__type__": "cc.animation.ObjectTrack", - "_binding": { - "__type__": "cc.animation.TrackBinding", - "path": { - "__id__": 2 - }, - "proxy": null - }, - "_channel": { - "__id__": 4 - } - }, - { - "__type__": "cc.animation.TrackPath", - "_paths": [ - { - "__id__": 3 - }, - "spriteFrame" - ] - }, - { - "__type__": "cc.animation.ComponentPath", - "component": "cc.Sprite" - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 5 - } - }, - { - "__type__": "cc.ObjectCurve", - "_times": [ - 0, - 0.08333333333333333, - 0.16666666666666666, - 0.25, - 0.3333333333333333, - 0.4166666666666667 - ], - "_values": [ - { - "__uuid__": "2e21a159-09af-47d0-b8f3-92f814f4a38a@869e3", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2e21a159-09af-47d0-b8f3-92f814f4a38a@41d52", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2e21a159-09af-47d0-b8f3-92f814f4a38a@b3fb8", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2e21a159-09af-47d0-b8f3-92f814f4a38a@08fc9", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2e21a159-09af-47d0-b8f3-92f814f4a38a@c3b0a", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2e21a159-09af-47d0-b8f3-92f814f4a38a@0fb0c", - "__expectedType__": "cc.SpriteFrame" - } - ] - }, - { - "__type__": "cc.animation.VectorTrack", - "_binding": { - "__type__": "cc.animation.TrackBinding", - "path": { - "__id__": 7 - }, - "proxy": null - }, - "_channels": [ - { - "__id__": 8 - }, - { - "__id__": 10 - }, - { - "__id__": 12 - }, - { - "__id__": 14 - } - ], - "_nComponents": 3 - }, - { - "__type__": "cc.animation.TrackPath", - "_paths": [ - "eulerAngles" - ] - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 9 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [ - 0, - 0.4166666567325592 - ], - "_values": [ - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - } - ], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 11 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [ - 0, - 0.4166666567325592 - ], - "_values": [ - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - } - ], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 13 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [ - 0, - 0.4166666567325592 - ], - "_values": [ - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": -20, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": -60, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - } - ], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 15 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [], - "_values": [], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, - { - "__type__": "cc.animation.VectorTrack", - "_binding": { - "__type__": "cc.animation.TrackBinding", - "path": { - "__id__": 17 - }, - "proxy": null - }, - "_channels": [ - { - "__id__": 18 - }, - { - "__id__": 20 - }, - { - "__id__": 22 - }, - { - "__id__": 24 - } - ], - "_nComponents": 3 - }, - { - "__type__": "cc.animation.TrackPath", - "_paths": [ - "position" - ] - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 19 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [ - 0, - 0.4166666567325592 - ], - "_values": [ - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - } - ], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 21 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [ - 0, - 0.4166666567325592 - ], - "_values": [ - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": -60, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - } - ], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 23 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [ - 0, - 0.4166666567325592 - ], - "_values": [ - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 0, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - } - ], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 25 - } - }, - { - "__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/atk/atk.anim.meta b/assets/resources/game/skills/atk/atk.anim.meta deleted file mode 100644 index 025014ac..00000000 --- a/assets/resources/game/skills/atk/atk.anim.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "2.0.3", - "importer": "animation-clip", - "imported": true, - "uuid": "2637ec46-d70c-465f-aeac-e2af494b681e", - "files": [ - ".cconb" - ], - "subMetas": {}, - "userData": { - "name": "atk" - } -} diff --git a/assets/resources/game/skills/atk/atk.plist b/assets/resources/game/skills/atk/atk.plist deleted file mode 100644 index 5a483a5d..00000000 --- a/assets/resources/game/skills/atk/atk.plist +++ /dev/null @@ -1,116 +0,0 @@ - - - - - frames - - atk1_05.png - - aliases - - spriteOffset - {-8,12} - spriteSize - {185,97} - spriteSourceSize - {213,177} - textureRect - {{1,150},{185,97}} - textureRotated - - - atk1_06.png - - aliases - - spriteOffset - {0,0} - spriteSize - {80,96} - spriteSourceSize - {96,96} - textureRect - {{317,146},{80,96}} - textureRotated - - - atk1_07.png - - aliases - - spriteOffset - {1,-8} - spriteSize - {195,147} - spriteSourceSize - {213,177} - textureRect - {{1,1},{195,147}} - textureRotated - - - atk1_08.png - - aliases - - spriteOffset - {16,-10} - spriteSize - {139,143} - spriteSourceSize - {213,177} - textureRect - {{198,1},{139,143}} - textureRotated - - - atk1_09.png - - aliases - - spriteOffset - {16,-10} - spriteSize - {139,143} - spriteSourceSize - {213,177} - textureRect - {{198,1},{139,143}} - textureRotated - - - atk1_10.png - - aliases - - spriteOffset - {30,-19} - spriteSize - {77,117} - spriteSourceSize - {213,177} - textureRect - {{198,146},{77,117}} - textureRotated - - - - metadata - - format - 3 - pixelFormat - RGBA8888 - premultiplyAlpha - - realTextureFileName - atk.png - size - {398,248} - smartupdate - $TexturePacker:SmartUpdate:3e0511483edf68981a91ef9247b7d6e4:8194b129ee2d5e6800b1df21a2ee7d85:161bb8e8e5d13d624c660b9bcb3183a7$ - textureFileName - atk.png - - - diff --git a/assets/resources/game/skills/atk/atk.plist.meta b/assets/resources/game/skills/atk/atk.plist.meta deleted file mode 100644 index 50af08fc..00000000 --- a/assets/resources/game/skills/atk/atk.plist.meta +++ /dev/null @@ -1,293 +0,0 @@ -{ - "ver": "1.0.8", - "importer": "sprite-atlas", - "imported": true, - "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a", - "files": [ - ".json" - ], - "subMetas": { - "869e3": { - "importer": "sprite-frame", - "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a@869e3", - "displayName": "", - "id": "869e3", - "name": "atk1_05", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": -8, - "offsetY": 12, - "trimX": 1, - "trimY": 150, - "width": 185, - "height": 97, - "rawWidth": 213, - "rawHeight": 177, - "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": "080612ff-048b-45e7-b7d1-383a7fa73063@6c48a", - "atlasUuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "41d52": { - "importer": "sprite-frame", - "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a@41d52", - "displayName": "", - "id": "41d52", - "name": "atk1_06", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 317, - "trimY": 146, - "width": 80, - "height": 96, - "rawWidth": 96, - "rawHeight": 96, - "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": "080612ff-048b-45e7-b7d1-383a7fa73063@6c48a", - "atlasUuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "b3fb8": { - "importer": "sprite-frame", - "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a@b3fb8", - "displayName": "", - "id": "b3fb8", - "name": "atk1_07", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 1, - "offsetY": -8, - "trimX": 1, - "trimY": 1, - "width": 195, - "height": 147, - "rawWidth": 213, - "rawHeight": 177, - "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": "080612ff-048b-45e7-b7d1-383a7fa73063@6c48a", - "atlasUuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "08fc9": { - "importer": "sprite-frame", - "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a@08fc9", - "displayName": "", - "id": "08fc9", - "name": "atk1_08", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 16, - "offsetY": -10, - "trimX": 198, - "trimY": 1, - "width": 139, - "height": 143, - "rawWidth": 213, - "rawHeight": 177, - "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": "080612ff-048b-45e7-b7d1-383a7fa73063@6c48a", - "atlasUuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "c3b0a": { - "importer": "sprite-frame", - "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a@c3b0a", - "displayName": "", - "id": "c3b0a", - "name": "atk1_09", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 16, - "offsetY": -10, - "trimX": 198, - "trimY": 1, - "width": 139, - "height": 143, - "rawWidth": 213, - "rawHeight": 177, - "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": "080612ff-048b-45e7-b7d1-383a7fa73063@6c48a", - "atlasUuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "0fb0c": { - "importer": "sprite-frame", - "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a@0fb0c", - "displayName": "", - "id": "0fb0c", - "name": "atk1_10", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 30, - "offsetY": -19, - "trimX": 198, - "trimY": 146, - "width": 77, - "height": 117, - "rawWidth": 213, - "rawHeight": 177, - "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": "080612ff-048b-45e7-b7d1-383a7fa73063@6c48a", - "atlasUuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "atlasTextureName": "atk.png", - "format": 3, - "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a", - "textureUuid": "080612ff-048b-45e7-b7d1-383a7fa73063@6c48a" - } -} diff --git a/assets/resources/game/skills/atk/atk.png b/assets/resources/game/skills/atk/atk.png deleted file mode 100644 index da5e2a50..00000000 Binary files a/assets/resources/game/skills/atk/atk.png and /dev/null differ diff --git a/assets/resources/game/skills/atk/longzhua.atlas b/assets/resources/game/skills/atk/longzhua.atlas deleted file mode 100644 index 4558f417..00000000 --- a/assets/resources/game/skills/atk/longzhua.atlas +++ /dev/null @@ -1,132 +0,0 @@ - -longzhua.png -size: 425,789 -format: RGBA8888 -filter: Linear,Linear -repeat: none -lz0001 - rotate: false - xy: 291, 178 - size: 112, 51 - orig: 400, 104 - offset: 5, 52 - index: -1 -lz0002 - rotate: false - xy: 2, 164 - size: 268, 61 - orig: 400, 104 - offset: 21, 32 - index: -1 -lz0003 - rotate: true - xy: 330, 286 - size: 314, 88 - orig: 400, 104 - offset: 7, 13 - index: -1 -lz0004 - rotate: false - xy: 2, 465 - size: 317, 86 - orig: 400, 104 - offset: 23, 5 - index: -1 -lz0005 - rotate: false - xy: 2, 708 - size: 347, 79 - orig: 400, 104 - offset: 16, 6 - index: -1 -lz0006 - rotate: false - xy: 2, 630 - size: 338, 76 - orig: 400, 104 - offset: 32, 5 - index: -1 -lz0007 - rotate: false - xy: 2, 553 - size: 326, 75 - orig: 400, 104 - offset: 55, 6 - index: -1 -lz0008 - rotate: false - xy: 2, 386 - size: 314, 77 - orig: 400, 104 - offset: 69, 6 - index: -1 -lz0009 - rotate: false - xy: 2, 307 - size: 301, 77 - orig: 400, 104 - offset: 89, 7 - index: -1 -lz0010 - rotate: false - xy: 2, 227 - size: 287, 78 - orig: 400, 104 - offset: 103, 7 - index: -1 -lz0011 - rotate: false - xy: 2, 87 - size: 225, 75 - orig: 400, 104 - offset: 165, 10 - index: -1 -lz0012 - rotate: true - xy: 351, 602 - size: 185, 72 - orig: 400, 104 - offset: 205, 14 - index: -1 -lz0013 - rotate: false - xy: 229, 30 - size: 190, 74 - orig: 400, 104 - offset: 205, 14 - index: -1 -lz0014 - rotate: false - xy: 2, 16 - size: 148, 69 - orig: 400, 104 - offset: 247, 19 - index: -1 -lz0015 - rotate: false - xy: 272, 106 - size: 151, 70 - orig: 400, 104 - offset: 247, 19 - index: -1 -lz0016 - rotate: true - xy: 152, 2 - size: 83, 52 - orig: 400, 104 - offset: 310, 35 - index: -1 -lz0017 - rotate: false - xy: 325, 231 - size: 86, 53 - orig: 400, 104 - offset: 310, 35 - index: -1 -lz0018 - rotate: true - xy: 291, 252 - size: 53, 32 - orig: 400, 104 - offset: 319, 40 - index: -1 diff --git a/assets/resources/game/skills/atk/longzhua.atlas.meta b/assets/resources/game/skills/atk/longzhua.atlas.meta deleted file mode 100644 index a4ce7995..00000000 --- a/assets/resources/game/skills/atk/longzhua.atlas.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.0.1", - "importer": "*", - "imported": true, - "uuid": "4260781d-f8c0-4c0a-b903-fde132f31a95", - "files": [ - ".atlas", - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/resources/game/skills/atk/longzhua.json b/assets/resources/game/skills/atk/longzhua.json deleted file mode 100644 index 86efde80..00000000 --- a/assets/resources/game/skills/atk/longzhua.json +++ /dev/null @@ -1,89 +0,0 @@ -{ -"skeleton": { - "hash": "50ApuVV80PrEQ4k+NPuD0/5Uy2o", - "spine": "3.8.99", - "x": -201.16, - "y": -224.35, - "width": 760.53, - "height": 954.29, - "images": "./0/", - "audio": "G:/游戏素材收集/英灵召唤师/effect/skilleffect/eff92-longzhua" -}, -"bones": [ - { "name": "root", "y": 106.65 }, - { - "name": "down2", - "parent": "root", - "length": 477.07, - "rotation": 55.44, - "x": 179.11, - "y": 146.15, - "scaleX": -2.45, - "scaleY": 2.45 - } -], -"slots": [ - { "name": "zj2", "bone": "down2", "attachment": "lz0009", "blend": "additive" } -], -"skins": [ - { - "name": "default", - "attachments": { - "zj2": { - "lz0001": { "rotation": -0.45, "width": 400, "height": 104 }, - "lz0002": { "rotation": -0.45, "width": 400, "height": 104 }, - "lz0003": { "rotation": -0.45, "width": 400, "height": 104 }, - "lz0004": { "rotation": -0.45, "width": 400, "height": 104 }, - "lz0005": { "rotation": -0.45, "width": 400, "height": 104 }, - "lz0006": { "rotation": -0.45, "width": 400, "height": 104 }, - "lz0007": { "rotation": -0.45, "width": 400, "height": 104 }, - "lz0008": { "rotation": -0.45, "width": 400, "height": 104 }, - "lz0009": { "rotation": -0.45, "width": 400, "height": 104 }, - "lz0010": { "rotation": -0.45, "width": 400, "height": 104 }, - "lz0011": { "rotation": -0.45, "width": 400, "height": 104 }, - "lz0012": { "rotation": -0.45, "width": 400, "height": 104 }, - "lz0013": { "rotation": -0.45, "width": 400, "height": 104 }, - "lz0014": { "rotation": -0.45, "width": 400, "height": 104 }, - "lz0015": { "rotation": -0.45, "width": 400, "height": 104 }, - "lz0016": { "rotation": -0.45, "width": 400, "height": 104 }, - "lz0017": { "rotation": -0.45, "width": 400, "height": 104 }, - "lz0018": { "rotation": -0.45, "width": 400, "height": 104 } - } - } - } -], -"animations": { - "down": { - "slots": { - "zj2": { - "color": [ - { "color": "ffffff00" }, - { "time": 0.0333, "color": "ffffffff", "curve": "stepped" }, - { "time": 0.6, "color": "ffffffff" }, - { "time": 0.6333, "color": "ffffff00" } - ], - "attachment": [ - { "name": "lz0001" }, - { "time": 0.0667, "name": "lz0002" }, - { "time": 0.1, "name": "lz0003" }, - { "time": 0.1333, "name": "lz0004" }, - { "time": 0.1667, "name": "lz0005" }, - { "time": 0.2, "name": "lz0006" }, - { "time": 0.2333, "name": "lz0007" }, - { "time": 0.2667, "name": "lz0008" }, - { "time": 0.3, "name": "lz0009" }, - { "time": 0.3333, "name": "lz0010" }, - { "time": 0.3667, "name": "lz0011" }, - { "time": 0.4, "name": "lz0012" }, - { "time": 0.4333, "name": "lz0013" }, - { "time": 0.4667, "name": "lz0014" }, - { "time": 0.5, "name": "lz0015" }, - { "time": 0.5333, "name": "lz0016" }, - { "time": 0.5667, "name": "lz0017" }, - { "time": 0.6, "name": "lz0018" } - ] - } - } - } -} -} \ No newline at end of file diff --git a/assets/resources/game/skills/atk/longzhua.json.meta b/assets/resources/game/skills/atk/longzhua.json.meta deleted file mode 100644 index 56abbc57..00000000 --- a/assets/resources/game/skills/atk/longzhua.json.meta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ver": "1.2.6", - "importer": "spine-data", - "imported": true, - "uuid": "9233af8c-254c-4f70-b157-f9c1c80ba17a", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/resources/game/skills/atk/longzhua.png b/assets/resources/game/skills/atk/longzhua.png deleted file mode 100644 index d782117e..00000000 Binary files a/assets/resources/game/skills/atk/longzhua.png and /dev/null differ diff --git a/assets/resources/game/skills/atk/longzhua.png.meta b/assets/resources/game/skills/atk/longzhua.png.meta deleted file mode 100644 index d6d20758..00000000 --- a/assets/resources/game/skills/atk/longzhua.png.meta +++ /dev/null @@ -1,42 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "b5287bf0-4614-4034-bd0a-4c7ed9334ade", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "b5287bf0-4614-4034-bd0a-4c7ed9334ade@6c48a", - "displayName": "longzhua", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "b5287bf0-4614-4034-bd0a-4c7ed9334ade", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "texture", - "fixAlphaTransparencyArtifacts": false, - "redirect": "b5287bf0-4614-4034-bd0a-4c7ed9334ade@6c48a" - } -} diff --git a/assets/resources/game/skills/atk.meta b/assets/resources/game/skills/atk1.meta similarity index 100% rename from assets/resources/game/skills/atk.meta rename to assets/resources/game/skills/atk1.meta diff --git a/assets/resources/game/skills/atk1/atk.plist b/assets/resources/game/skills/atk1/atk.plist new file mode 100644 index 00000000..f4bbfc79 --- /dev/null +++ b/assets/resources/game/skills/atk1/atk.plist @@ -0,0 +1,56 @@ + + + + + frames + + atk1_06.png + + aliases + + spriteOffset + {0,0} + spriteSize + {80,96} + spriteSourceSize + {96,96} + textureRect + {{96,1},{80,96}} + textureRotated + + + atk1_07.png + + aliases + + spriteOffset + {0,0} + spriteSize + {96,93} + spriteSourceSize + {96,93} + textureRect + {{1,1},{96,93}} + textureRotated + + + + metadata + + format + 3 + pixelFormat + RGBA8888 + premultiplyAlpha + + realTextureFileName + atk.png + size + {177,98} + smartupdate + $TexturePacker:SmartUpdate:921ca90a772281d8370d52dcd03d69bb:e98751142a1edb6198b7f9d055c0661a:161bb8e8e5d13d624c660b9bcb3183a7$ + textureFileName + atk.png + + + diff --git a/assets/resources/game/skills/atk1/atk.plist.meta b/assets/resources/game/skills/atk1/atk.plist.meta new file mode 100644 index 00000000..df3daf2f --- /dev/null +++ b/assets/resources/game/skills/atk1/atk.plist.meta @@ -0,0 +1,109 @@ +{ + "ver": "1.0.8", + "importer": "sprite-atlas", + "imported": true, + "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a", + "files": [ + ".json" + ], + "subMetas": { + "41d52": { + "importer": "sprite-frame", + "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a@41d52", + "displayName": "", + "id": "41d52", + "name": "atk1_06", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 96, + "trimY": 1, + "width": 80, + "height": 96, + "rawWidth": 96, + "rawHeight": 96, + "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": "080612ff-048b-45e7-b7d1-383a7fa73063@6c48a", + "atlasUuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "b3fb8": { + "importer": "sprite-frame", + "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a@b3fb8", + "displayName": "", + "id": "b3fb8", + "name": "atk1_07", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 1, + "width": 96, + "height": 93, + "rawWidth": 96, + "rawHeight": 93, + "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": "080612ff-048b-45e7-b7d1-383a7fa73063@6c48a", + "atlasUuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "atlasTextureName": "atk.png", + "format": 3, + "uuid": "2e21a159-09af-47d0-b8f3-92f814f4a38a", + "textureUuid": "080612ff-048b-45e7-b7d1-383a7fa73063@6c48a" + } +} diff --git a/assets/resources/game/skills/atk1/atk.png b/assets/resources/game/skills/atk1/atk.png new file mode 100644 index 00000000..285a1065 Binary files /dev/null and b/assets/resources/game/skills/atk1/atk.png differ diff --git a/assets/resources/game/skills/atk/atk.png.meta b/assets/resources/game/skills/atk1/atk.png.meta similarity index 100% rename from assets/resources/game/skills/atk/atk.png.meta rename to assets/resources/game/skills/atk1/atk.png.meta diff --git a/assets/resources/game/skills/base.prefab b/assets/resources/game/skills/base.prefab index 0726ee1c..59f0c3ad 100644 --- a/assets/resources/game/skills/base.prefab +++ b/assets/resources/game/skills/base.prefab @@ -108,8 +108,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": -0.5, - "y": 0.5, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -136,8 +136,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 139, - "height": 128 + "width": 80, + "height": 96 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -173,7 +173,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "930f41c2-9ec2-4b26-a832-35e40bdf3afe@c30fb", + "__uuid__": "2e21a159-09af-47d0-b8f3-92f814f4a38a@41d52", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -188,10 +188,7 @@ "_fillRange": 0, "_isTrimmedMode": true, "_useGrayscale": false, - "_atlas": { - "__uuid__": "930f41c2-9ec2-4b26-a832-35e40bdf3afe", - "__expectedType__": "cc.SpriteAtlas" - }, + "_atlas": null, "_id": "" }, { @@ -206,7 +203,7 @@ "node": { "__id__": 2 }, - "_enabled": true, + "_enabled": false, "__prefab": { "__id__": 8 }, @@ -283,7 +280,7 @@ "enabledContactListener": true, "bullet": true, "awakeOnLoad": true, - "_group": 16, + "_group": 4, "_type": 2, "_allowSleep": false, "_gravityScale": 0, @@ -314,21 +311,21 @@ "__prefab": { "__id__": 15 }, - "tag": 0, - "_group": 16, + "tag": 8, + "_group": 4, "_density": 1, - "_sensor": false, + "_sensor": true, "_friction": 0.2, "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 14.3, - "y": -0.9 + "x": 1.1, + "y": -0.1 }, "_size": { "__type__": "cc.Size", - "width": 27.2, - "height": 44.7 + "width": 61.5, + "height": 80.8 }, "_id": "" }, @@ -363,6 +360,7 @@ "__id__": 0 }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", - "instance": null + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/resources/game/skills/atk.prefab b/assets/resources/game/skills/base2.prefab similarity index 55% rename from assets/resources/game/skills/atk.prefab rename to assets/resources/game/skills/base2.prefab index 311533f2..dcbd0e0f 100644 --- a/assets/resources/game/skills/atk.prefab +++ b/assets/resources/game/skills/base2.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "atk", + "_name": "base2", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,31 +13,85 @@ }, { "__type__": "cc.Node", - "_name": "atk", + "_name": "base2", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, + "_children": [ + { + "__id__": 2 + } + ], + "_active": true, + "_components": [ + { + "__id__": 10 + }, + { + "__id__": 12 + }, + { + "__id__": 14 + }, + { + "__id__": 16 + } + ], + "_prefab": { + "__id__": 18 + }, + "_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": "skill", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, "_children": [], "_active": true, "_components": [ { - "__id__": 2 + "__id__": 3 }, { - "__id__": 4 + "__id__": 5 }, { - "__id__": 6 - }, - { - "__id__": 8 - }, - { - "__id__": 10 + "__id__": 7 } ], "_prefab": { - "__id__": 12 + "__id__": 9 }, "_lpos": { "__type__": "cc.Vec3", @@ -74,16 +128,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1 + "__id__": 2 }, "_enabled": true, "__prefab": { - "__id__": 3 + "__id__": 4 }, "_contentSize": { "__type__": "cc.Size", - "width": 80, - "height": 96 + "width": 96, + "height": 93 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -94,93 +148,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "deG52Z3NdHtYuvrYleDnLK" - }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 5 - }, - "enabledContactListener": true, - "bullet": false, - "awakeOnLoad": true, - "_group": 16, - "_type": 2, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "774JH1Xt1GfLXpUa0g7EQP" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 7 - }, - "tag": 0, - "_group": 16, - "_density": 1, - "_sensor": false, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 4.2, - "y": 1.7 - }, - "_size": { - "__type__": "cc.Size", - "width": 90.5, - "height": 92.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d6FlnvRK1P35VdKduwosNP" - }, - { - "__type__": "45646oIyIdA24W+0c5rdELD", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 9 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "4bC8P0yqtCQ56KoL1NqAl7" + "fileId": "43ucwKXvZIjpuRMb6AMdcx" }, { "__type__": "cc.Sprite", @@ -188,11 +156,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 1 + "__id__": 2 }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 6 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -205,7 +173,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "2e21a159-09af-47d0-b8f3-92f814f4a38a@41d52", + "__uuid__": "2e21a159-09af-47d0-b8f3-92f814f4a38a@b3fb8", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -225,7 +193,163 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "76ytJ6bcRJvagyxOFdZddO" + "fileId": "57hoD/3wpHU7ipwKMwKD/k" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": false, + "__prefab": { + "__id__": 8 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "7a6518aa-87b0-4d48-9460-1ae110cc860f", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "7a6518aa-87b0-4d48-9460-1ae110cc860f", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "71+bR9yIFIpJpY4muGx9bf" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b05wpkPXFJqK6/PzoIxCfr", + "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": 286, + "height": 90 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.49664333316829656, + "y": 0.5156666649712457 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "63NP9yq3hEUKD/OZZZ5t7x" + }, + { + "__type__": "cc.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "enabledContactListener": true, + "bullet": true, + "awakeOnLoad": true, + "_group": 4, + "_type": 2, + "_allowSleep": false, + "_gravityScale": 0, + "_linearDamping": 0, + "_angularDamping": 0, + "_linearVelocity": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_angularVelocity": 0, + "_fixedRotation": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f1VxV09PdOkofzgGv1tsZE" + }, + { + "__type__": "cc.BoxCollider2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 15 + }, + "tag": 8, + "_group": 4, + "_density": 1, + "_sensor": true, + "_friction": 0.2, + "_restitution": 0, + "_offset": { + "__type__": "cc.Vec2", + "x": 1.1, + "y": -0.1 + }, + "_size": { + "__type__": "cc.Size", + "width": 61.5, + "height": 80.8 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "23eik112JPZYGiI8mJalTK" + }, + { + "__type__": "45646oIyIdA24W+0c5rdELD", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8ahZv91itPcYJm8S0veHYl" }, { "__type__": "cc.PrefabInfo", diff --git a/assets/resources/game/skills/atk.prefab.meta b/assets/resources/game/skills/base2.prefab.meta similarity index 63% rename from assets/resources/game/skills/atk.prefab.meta rename to assets/resources/game/skills/base2.prefab.meta index 47e74f8f..082e3b41 100644 --- a/assets/resources/game/skills/atk.prefab.meta +++ b/assets/resources/game/skills/base2.prefab.meta @@ -2,12 +2,12 @@ "ver": "1.1.50", "importer": "prefab", "imported": true, - "uuid": "e19cbf15-33ee-48ae-89f9-a5f8323cdf66", + "uuid": "ea6b167f-b399-4ec2-81f1-bc3510bf124d", "files": [ ".json" ], "subMetas": {}, "userData": { - "syncNodeName": "atk" + "syncNodeName": "base2" } } diff --git a/assets/resources/game/skills/fire.prefab b/assets/resources/game/skills/fire.prefab index 5129f589..a97c6a04 100644 --- a/assets/resources/game/skills/fire.prefab +++ b/assets/resources/game/skills/fire.prefab @@ -248,7 +248,7 @@ "enabledContactListener": true, "bullet": true, "awakeOnLoad": true, - "_group": 16, + "_group": 4, "_type": 2, "_allowSleep": false, "_gravityScale": 0, @@ -279,10 +279,10 @@ "__prefab": { "__id__": 13 }, - "tag": 0, - "_group": 16, + "tag": 8, + "_group": 4, "_density": 1, - "_sensor": false, + "_sensor": true, "_friction": 0.2, "_restitution": 0, "_offset": { @@ -328,6 +328,7 @@ "__id__": 0 }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", - "instance": null + "instance": null, + "targetOverrides": null } ] \ No newline at end of file diff --git a/assets/resources/game/skills/ice.prefab b/assets/resources/game/skills/ice.prefab index 63c17254..a2a4d2f3 100644 --- a/assets/resources/game/skills/ice.prefab +++ b/assets/resources/game/skills/ice.prefab @@ -248,7 +248,7 @@ "enabledContactListener": true, "bullet": true, "awakeOnLoad": true, - "_group": 16, + "_group": 4, "_type": 2, "_allowSleep": false, "_gravityScale": 0, @@ -279,10 +279,10 @@ "__prefab": { "__id__": 13 }, - "tag": 0, - "_group": 16, + "tag": 8, + "_group": 4, "_density": 1, - "_sensor": false, + "_sensor": true, "_friction": 0.2, "_restitution": 0, "_offset": { diff --git a/assets/script/game/common/config/BoxSet.ts b/assets/script/game/common/config/BoxSet.ts index 7ed6c1dd..541b06be 100644 --- a/assets/script/game/common/config/BoxSet.ts +++ b/assets/script/game/common/config/BoxSet.ts @@ -8,6 +8,8 @@ /** 碰撞分组 */ export enum BoxSet { //物理碰撞tag + SKILL_TAG=8, + ATK_RANGE = 4, DEFAULT = 1, MONSTER = 2, HERO = 4, diff --git a/assets/script/game/map/MapMonsterComp.ts b/assets/script/game/map/MapMonsterComp.ts index a0284c71..6394e09d 100644 --- a/assets/script/game/map/MapMonsterComp.ts +++ b/assets/script/game/map/MapMonsterComp.ts @@ -29,7 +29,7 @@ export class MapMonsterComp extends CCComp { cur_mission:number = 1; //当前关卡方案 mission_list:any = [] setp_timer: Timer = new Timer(0.5); - setp_num:number = 2; + setp_num:number = 5; onLoad(){ // 监听全局事件 oops.message.on("do_add_monster", this.on_do_add_monster, this); @@ -49,7 +49,7 @@ export class MapMonsterComp extends CCComp { this.monster_refresh() } if (this.refresh_timer.update(dt)) { - this.setp_num = RandomManager.instance.getRandomInt(this.min_monster_num,this.max_monster_num,2) + // this.setp_num = RandomManager.instance.getRandomInt(this.min_monster_num,this.max_monster_num,2) } if (this.mission_up_timer.update(dt)) { // 刷新怪物定时器 diff --git a/assets/script/game/monster/Monster.ts b/assets/script/game/monster/Monster.ts index e8f6eadd..72875106 100644 --- a/assets/script/game/monster/Monster.ts +++ b/assets/script/game/monster/Monster.ts @@ -67,6 +67,8 @@ export class Monster extends ecs.Entity { mv.atk_cd = smc.heros[uuid].atk_cd; mv.power = smc.heros[uuid].power; mv.type = smc.heros[uuid].type; + mv.skill_name = "base2"; + mv.max_skill_name = "fire"; mv.scale = -1; mv.Tpos = v3(0,0,0); mv.change_name(smc.heros[uuid].name,-1) diff --git a/assets/script/game/monster/MonsterViewComp.ts b/assets/script/game/monster/MonsterViewComp.ts index 6e2a152f..b7e1a73f 100644 --- a/assets/script/game/monster/MonsterViewComp.ts +++ b/assets/script/game/monster/MonsterViewComp.ts @@ -47,7 +47,7 @@ export class MonsterViewComp extends CCComp { power_max: number = 100; /** 能量最大值 */ power_speed: number = 1; //能量回复速度每0.1秒回复量 - skill_name: string = "atk"; //技能名称 + skill_name: string = "base"; //技能名称 max_skill_name: string = "base"; //大技能名称 atk: number = 10; /**攻击力 */ @@ -67,6 +67,7 @@ export class MonsterViewComp extends CCComp { private timer:Timer = new Timer(0.1); //计时器 is_dead:boolean = false; //是否摧毁 is_stop:boolean = false; + is_atking:boolean = false; onLoad() { this.as = this.getComponent(MonsterSpine); @@ -93,29 +94,35 @@ export class MonsterViewComp extends CCComp { } onBeginContact (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) { + } onEndContact (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) { - // 只在两个碰撞体结束接触时被调用一次 - // console.log('onEndContact'); - } - onPreSolve (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) { - if(selfCollider.group != otherCollider.group){ - if(otherCollider.tag != 8){ - this.stop_cd = 0.5; + if(otherCollider.tag==BoxSet.SKILL_TAG &&selfCollider.tag!=BoxSet.SKILL_TAG){ + if(selfCollider.group != otherCollider.group){ + let skill = otherCollider.node.getComponent(SkillCom)!; + // console.log('onPostSolve',skill); + this.in_atked(); + this.hp_change(skill.atk); } } } - onPostSolve (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) { - if(otherCollider.group== BoxSet.HERO_SKILL || otherCollider.group== BoxSet.MONSTER_SKILL){ - let skill = otherCollider.node.getComponent(SkillCom)!; - // console.log('onPostSolve',skill); - this.in_atked(); - this.hp_change(skill.atk); + onPreSolve (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) { + if(selfCollider.group != otherCollider.group&&otherCollider.tag != BoxSet.ATK_RANGE){ + if(otherCollider.tag != BoxSet.SKILL_TAG&&selfCollider.tag != BoxSet.ATK_RANGE){ + this.stop_cd = 0.1; + } } + if(selfCollider.group != otherCollider.group&&otherCollider.tag != BoxSet.ATK_RANGE){ + this.is_atking = true; + } + + } + onPostSolve (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) { + if(selfCollider.group == otherCollider.group){ - console.log('group 相同'); - if(otherCollider.tag != 8){ + // console.log('monster view group 相同'); + if(otherCollider.tag != BoxSet.SKILL_TAG){ let self_pos=selfCollider.node.getPosition(); let other_pos=otherCollider.node.getPosition(); if(selfCollider.group == BoxSet.HERO){ @@ -191,23 +198,26 @@ export class MonsterViewComp extends CCComp { power_change(power: number){ this.power += power; if(this.power >= this.power_max){ - this.load_skill(this.max_skill_name); + this.shoot(this.max_skill_name); this.power = 0 } let power_progress= this.power/this.power_max; this.node.getChildByName("power").getComponent(ProgressBar)!.progress = power_progress; } in_act(dt: number) { + if(this.atk_time >= this.atk_cd){ - this.atk_time = 0; - // console.log("atk_cd:"+this.atk_cd); - this.as.atk(); - this.scheduleOnce(()=>{ - this.load_skill(this.skill_name); - },0.2) - + if(this.is_atking){ + this.atk_time = 0; + // console.log("atk_cd:"+this.atk_cd); + this.as.atk(); + this.scheduleOnce(()=>{ + this.shoot(this.skill_name); + },0.2) + } + }else{ + this.atk_time += dt; } - this.atk_time += dt; } hp_change(hp: number){ if(this.is_dead){ @@ -220,9 +230,10 @@ export class MonsterViewComp extends CCComp { let hp_progress= this.hp/this.hp_max; this.node.getChildByName("hp").getComponent(ProgressBar)!.progress = hp_progress; if(this.hp <= 0){ + this.dead(); this.is_dead = true; setTimeout(() => { - this.toDestroy(); + this.ent.destroy(); }, 15); } @@ -232,8 +243,8 @@ export class MonsterViewComp extends CCComp { if(this.stop_cd > 0){ this.stop_cd -= dt; if(this.stop_cd <= 0){ - // this.speed = this.ospeed; this.stop_cd = 0; + this.is_atking = false; } } } @@ -258,19 +269,19 @@ export class MonsterViewComp extends CCComp { } }); } - load_skill(skill_name:string){ - console.log("load_skill"); + shoot(skill_name:string){ + console.log("monster shoot"); let skill = ecs.getEntity(Skill); let x=30 if(this.scale==1){ - x=40 + x=0 }else{ - x=-20 + x=-0 } - let pos = v3(x,50) + let pos = v3(x,40) let speed =350 let scale = this.scale - let dis = 30; + let dis = 50; console.log(speed); skill.load(pos,speed,dis,scale,this.node,skill_name,this.atk); } @@ -294,9 +305,7 @@ export class MonsterViewComp extends CCComp { node.parent = this.node.parent; } toDestroy(){ - this.dead(); - - this.ent.destroy(); + } reset() { this.is_dead = false; diff --git a/assets/script/game/skills/Skill.ts b/assets/script/game/skills/Skill.ts index a87addad..f8598b99 100644 --- a/assets/script/game/skills/Skill.ts +++ b/assets/script/game/skills/Skill.ts @@ -44,10 +44,11 @@ export class Skill extends ecs.Entity { sv.atk = atk; sv.angle = angle; sv.t_pos = t_pos; + sv.box_tag= BoxSet.SKILL_TAG; if(scale == 1){ - sv.box_group=BoxSet.HERO_SKILL + sv.box_group=BoxSet.HERO }else{ - sv.box_group=BoxSet.MONSTER_SKILL + sv.box_group=BoxSet.MONSTER } this.add(sv); } diff --git a/assets/script/game/skills/SkillCom.ts b/assets/script/game/skills/SkillCom.ts index cd415bb1..ca4504ae 100644 --- a/assets/script/game/skills/SkillCom.ts +++ b/assets/script/game/skills/SkillCom.ts @@ -25,14 +25,17 @@ export class SkillCom extends CCComp { t_pos:Vec3 = null; is_destroy:boolean = false; box_group:number = 0; + box_tag:number=0; start() { this.node.active=true this.node.angle = this.angle; let collider = this.getComponent(Collider2D); collider.group = this.box_group; + collider.tag = this.box_tag; + collider.sensor = true; if (collider) { - // collider.on(Contact2DType.BEGIN_CONTACT, this.onBeginContact, this); + collider.on(Contact2DType.END_CONTACT, this.onEndContact, this); collider.on(Contact2DType.POST_SOLVE, this.onPostSolve, this); } if(this.t_pos){ @@ -57,41 +60,45 @@ export class SkillCom extends CCComp { } } - onPostSolve (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) { - switch (selfCollider.group) { - - case BoxSet.HERO_SKILL: - switch (otherCollider.group){ - case BoxSet.MONSTER: - case BoxSet.DEFAULT: - setTimeout(() => { - this.toDestroy() - }, 10); - break - } - break; - case BoxSet.MONSTER_SKILL: - switch (otherCollider.group){ - case BoxSet.PLAYER: - case BoxSet.HERO: - case BoxSet.DEFAULT: - setTimeout(() => { - this.toDestroy() - }, 10); - break - } + onEndContact (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) { + if(otherCollider.group != selfCollider.group){ + console.log("skill end contact") + setTimeout(() => { + this.toDestroy() + }, 10); } + } + onPostSolve (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) { + // console.log("skill post contact") + // switch (selfCollider.group) { + // case BoxSet.HERO: + // switch (otherCollider.group){ + // case BoxSet.MONSTER: + // case BoxSet.DEFAULT: + // setTimeout(() => { + // this.toDestroy() + // }, 10); + // break + // } + // break; + // case BoxSet.MONSTER: + // switch (otherCollider.group){ + // case BoxSet.PLAYER: + // case BoxSet.HERO: + // case BoxSet.DEFAULT: + // setTimeout(() => { + // this.toDestroy() + // }, 10); + // break + // } + // } } - update(deltaTime: number) { + update(deltaTime: number) { // this.node.setScale(v3(this.scale,this.node.scale.y,this.node.scale.z)) - this.move(deltaTime) - // if(Math.abs(this.node.position.x) > this.dis) - // { - // this.toDestroy() - - // } + // this.move(deltaTime) + } move(dt: number) {