diff --git a/assets/resources/game/heros/wp.plist b/assets/resources/game/heros/wp.plist new file mode 100644 index 00000000..2e744961 --- /dev/null +++ b/assets/resources/game/heros/wp.plist @@ -0,0 +1,86 @@ + + + + + frames + + Kunai.png + + aliases + + spriteOffset + {0,-88} + spriteSize + {48,144} + spriteSourceSize + {256,512} + textureRect + {{1,189},{48,144}} + textureRotated + + + NobleKingSword.png + + aliases + + spriteOffset + {0,-25} + spriteSize + {104,292} + spriteSourceSize + {256,512} + textureRect + {{1,1},{104,292}} + textureRotated + + + SaintPatrickAxe.png + + aliases + + spriteOffset + {-1,-69} + spriteSize + {156,228} + spriteSourceSize + {256,512} + textureRect + {{295,1},{156,228}} + textureRotated + + + Weapon.png + + aliases + + spriteOffset + {-1,0} + spriteSize + {238,80} + spriteSourceSize + {240,80} + textureRect + {{1,107},{238,80}} + textureRotated + + + + metadata + + format + 3 + pixelFormat + RGBA8888 + premultiplyAlpha + + realTextureFileName + wp.png + size + {452,238} + smartupdate + $TexturePacker:SmartUpdate:8702b4ff529fb5709b12b73788cc0069:2a3b12b07b3f21e9c303c615d6f08953:b36bdae8689144aa199a9bff479bbccf$ + textureFileName + wp.png + + + diff --git a/assets/resources/game/heros/wp.plist.meta b/assets/resources/game/heros/wp.plist.meta new file mode 100644 index 00000000..822300b0 --- /dev/null +++ b/assets/resources/game/heros/wp.plist.meta @@ -0,0 +1,201 @@ +{ + "ver": "1.0.8", + "importer": "sprite-atlas", + "imported": true, + "uuid": "bacd2847-dd53-4572-9d68-c78c06a4eecc", + "files": [ + ".json" + ], + "subMetas": { + "5852c": { + "importer": "sprite-frame", + "uuid": "bacd2847-dd53-4572-9d68-c78c06a4eecc@5852c", + "displayName": "", + "id": "5852c", + "name": "Kunai", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": -88, + "trimX": 1, + "trimY": 189, + "width": 48, + "height": 144, + "rawWidth": 256, + "rawHeight": 512, + "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": "db035da2-17ca-4877-9579-1ea97b5d8443@6c48a", + "atlasUuid": "bacd2847-dd53-4572-9d68-c78c06a4eecc" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "9a153": { + "importer": "sprite-frame", + "uuid": "bacd2847-dd53-4572-9d68-c78c06a4eecc@9a153", + "displayName": "", + "id": "9a153", + "name": "NobleKingSword", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": -25, + "trimX": 1, + "trimY": 1, + "width": 104, + "height": 292, + "rawWidth": 256, + "rawHeight": 512, + "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": "db035da2-17ca-4877-9579-1ea97b5d8443@6c48a", + "atlasUuid": "bacd2847-dd53-4572-9d68-c78c06a4eecc" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "adff2": { + "importer": "sprite-frame", + "uuid": "bacd2847-dd53-4572-9d68-c78c06a4eecc@adff2", + "displayName": "", + "id": "adff2", + "name": "SaintPatrickAxe", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": -1, + "offsetY": -69, + "trimX": 295, + "trimY": 1, + "width": 156, + "height": 228, + "rawWidth": 256, + "rawHeight": 512, + "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": "db035da2-17ca-4877-9579-1ea97b5d8443@6c48a", + "atlasUuid": "bacd2847-dd53-4572-9d68-c78c06a4eecc" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "1615b": { + "importer": "sprite-frame", + "uuid": "bacd2847-dd53-4572-9d68-c78c06a4eecc@1615b", + "displayName": "", + "id": "1615b", + "name": "Weapon", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": -1, + "offsetY": 0, + "trimX": 1, + "trimY": 107, + "width": 238, + "height": 80, + "rawWidth": 240, + "rawHeight": 80, + "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": "db035da2-17ca-4877-9579-1ea97b5d8443@6c48a", + "atlasUuid": "bacd2847-dd53-4572-9d68-c78c06a4eecc" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "atlasTextureName": "wp.png", + "format": 3, + "uuid": "bacd2847-dd53-4572-9d68-c78c06a4eecc", + "textureUuid": "db035da2-17ca-4877-9579-1ea97b5d8443@6c48a" + } +} diff --git a/assets/resources/game/heros/wp.png b/assets/resources/game/heros/wp.png new file mode 100644 index 00000000..0d20765b Binary files /dev/null and b/assets/resources/game/heros/wp.png differ diff --git a/assets/resources/game/skills/buff/b1.png.meta b/assets/resources/game/heros/wp.png.meta similarity index 72% rename from assets/resources/game/skills/buff/b1.png.meta rename to assets/resources/game/heros/wp.png.meta index ad6a1f47..34987f2d 100644 --- a/assets/resources/game/skills/buff/b1.png.meta +++ b/assets/resources/game/heros/wp.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.26", "importer": "image", "imported": true, - "uuid": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34", + "uuid": "db035da2-17ca-4877-9579-1ea97b5d8443", "files": [ ".json", ".png" @@ -10,8 +10,8 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "displayName": "b1", + "uuid": "db035da2-17ca-4877-9579-1ea97b5d8443@6c48a", + "displayName": "wp", "id": "6c48a", "name": "texture", "userData": { @@ -22,7 +22,7 @@ "mipfilter": "none", "anisotropy": 0, "isUuid": true, - "imageUuidOrDatabaseUri": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34", + "imageUuidOrDatabaseUri": "db035da2-17ca-4877-9579-1ea97b5d8443", "visible": false }, "ver": "1.0.22", @@ -37,6 +37,6 @@ "hasAlpha": true, "type": "texture", "fixAlphaTransparencyArtifacts": false, - "redirect": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a" + "redirect": "db035da2-17ca-4877-9579-1ea97b5d8443@6c48a" } } diff --git a/assets/resources/game/skills/mball.prefab b/assets/resources/game/skills/ball_blue.prefab similarity index 86% rename from assets/resources/game/skills/mball.prefab rename to assets/resources/game/skills/ball_blue.prefab index 7e61b6e0..bf02f713 100644 --- a/assets/resources/game/skills/mball.prefab +++ b/assets/resources/game/skills/ball_blue.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "mball", + "_name": "ball_blue", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,7 +13,7 @@ }, { "__type__": "cc.Node", - "_name": "mball", + "_name": "ball_blue", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, @@ -24,6 +24,9 @@ ], "_active": true, "_components": [ + { + "__id__": 8 + }, { "__id__": 10 }, @@ -35,10 +38,13 @@ }, { "__id__": 16 + }, + { + "__id__": 18 } ], "_prefab": { - "__id__": 18 + "__id__": 20 }, "_lpos": { "__type__": "cc.Vec3", @@ -85,13 +91,10 @@ }, { "__id__": 5 - }, - { - "__id__": 7 } ], "_prefab": { - "__id__": 9 + "__id__": 7 }, "_lpos": { "__type__": "cc.Vec3", @@ -103,12 +106,12 @@ "__type__": "cc.Quat", "x": 0, "y": 0, - "z": 0, - "w": 1 + "z": -0.7095707365365209, + "w": 0.7046342099635946 }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, + "x": 1, "y": 1, "z": 1 }, @@ -118,7 +121,7 @@ "__type__": "cc.Vec3", "x": 0, "y": 0, - "z": 0 + "z": -90.4 }, "_id": "" }, @@ -136,8 +139,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 20, - "height": 20 + "width": 40, + "height": 40 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -167,13 +170,13 @@ "_dstBlendFactor": 4, "_color": { "__type__": "cc.Color", - "r": 250, - "g": 250, - "b": 250, + "r": 255, + "g": 255, + "b": 255, "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@c454b", + "__uuid__": "3c4eece6-9dcd-4e67-8c40-69c4879720bd@c86cc", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -195,35 +198,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "57hoD/3wpHU7ipwKMwKD/k" }, - { - "__type__": "cc.Animation", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__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": { @@ -247,7 +221,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 9 }, "_contentSize": { "__type__": "cc.Size", @@ -275,7 +249,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 13 + "__id__": 11 }, "enabledContactListener": true, "bullet": true, @@ -309,7 +283,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 13 }, "tag": 8, "_group": 4, @@ -320,12 +294,12 @@ "_offset": { "__type__": "cc.Vec2", "x": -4.5, - "y": 0.1 + "y": -2 }, "_size": { "__type__": "cc.Size", "width": 20, - "height": 15.4 + "height": 30.1 }, "_id": "" }, @@ -343,7 +317,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 15 }, "_id": "" }, @@ -351,6 +325,53 @@ "__type__": "cc.CompPrefabInfo", "fileId": "8ahZv91itPcYJm8S0veHYl" }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "1370e21b-8f13-4b72-959d-ee766507af99", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "1370e21b-8f13-4b72-959d-ee766507af99", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0cIZpMAklNUpGWSkPm4J6y" + }, + { + "__type__": "5ebc6Z5KnFCT7rPSPIJSfvT", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 19 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "30Z4lGtPtNRK+v4W55Fdpp" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/atkup.prefab.meta b/assets/resources/game/skills/ball_blue.prefab.meta similarity index 62% rename from assets/resources/game/skills/atkup.prefab.meta rename to assets/resources/game/skills/ball_blue.prefab.meta index 7bffbe4c..df42b47c 100644 --- a/assets/resources/game/skills/atkup.prefab.meta +++ b/assets/resources/game/skills/ball_blue.prefab.meta @@ -2,12 +2,12 @@ "ver": "1.1.50", "importer": "prefab", "imported": true, - "uuid": "5e5dbfee-998d-4243-a9a8-c186fe3e3bd4", + "uuid": "6656d91b-eded-485c-b043-13b9dfdfb92e", "files": [ ".json" ], "subMetas": {}, "userData": { - "syncNodeName": "atkup" + "syncNodeName": "ball_blue" } } diff --git a/assets/resources/game/skills/sword1.prefab b/assets/resources/game/skills/ball_green.prefab similarity index 78% rename from assets/resources/game/skills/sword1.prefab rename to assets/resources/game/skills/ball_green.prefab index cb3fbabf..abb48203 100644 --- a/assets/resources/game/skills/sword1.prefab +++ b/assets/resources/game/skills/ball_green.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "sword1", + "_name": "ball_green", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,7 +13,7 @@ }, { "__type__": "cc.Node", - "_name": "sword1", + "_name": "ball_green", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, @@ -35,10 +35,16 @@ }, { "__id__": 14 + }, + { + "__id__": 16 + }, + { + "__id__": 18 } ], "_prefab": { - "__id__": 16 + "__id__": 20 }, "_lpos": { "__type__": "cc.Vec3", @@ -71,7 +77,7 @@ }, { "__type__": "cc.Node", - "_name": "sword", + "_name": "skill", "_objFlags": 0, "__editorExtras__": {}, "_parent": { @@ -100,8 +106,8 @@ "__type__": "cc.Quat", "x": 0, "y": 0, - "z": -0.7071067811865475, - "w": 0.7071067811865476 + "z": -0.7095707365365209, + "w": 0.7046342099635946 }, "_lscale": { "__type__": "cc.Vec3", @@ -115,7 +121,7 @@ "__type__": "cc.Vec3", "x": 0, "y": 0, - "z": -90 + "z": -90.4 }, "_id": "" }, @@ -133,8 +139,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 32, - "height": 64 + "width": 40, + "height": 40 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -145,7 +151,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "des5LQKnNFipsYaveZ+yLA" + "fileId": "43ucwKXvZIjpuRMb6AMdcx" }, { "__type__": "cc.Sprite", @@ -170,7 +176,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "5768242f-b913-4e53-aa0e-b276de0f77f4@b091f", + "__uuid__": "3c4eece6-9dcd-4e67-8c40-69c4879720bd@a795c", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -190,7 +196,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "e7idakxsFNHbWorTlfj9ga" + "fileId": "57hoD/3wpHU7ipwKMwKD/k" }, { "__type__": "cc.PrefabInfo", @@ -200,7 +206,7 @@ "asset": { "__id__": 0 }, - "fileId": "2dknS10uFFm5hkyR07Sxrb", + "fileId": "b05wpkPXFJqK6/PzoIxCfr", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -287,13 +293,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": -2.1, - "y": 0.4 + "x": -4.5, + "y": -2 }, "_size": { "__type__": "cc.Size", - "width": 11.4, - "height": 7.8 + "width": 20, + "height": 30.1 }, "_id": "" }, @@ -319,6 +325,53 @@ "__type__": "cc.CompPrefabInfo", "fileId": "8ahZv91itPcYJm8S0veHYl" }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "1370e21b-8f13-4b72-959d-ee766507af99", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "1370e21b-8f13-4b72-959d-ee766507af99", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0cIZpMAklNUpGWSkPm4J6y" + }, + { + "__type__": "5ebc6Z5KnFCT7rPSPIJSfvT", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 19 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "9aKyMeHsJGhJcXRvCDys4m" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/buff2.prefab.meta b/assets/resources/game/skills/ball_green.prefab.meta similarity index 61% rename from assets/resources/game/skills/buff2.prefab.meta rename to assets/resources/game/skills/ball_green.prefab.meta index 154ea3de..9aa515cc 100644 --- a/assets/resources/game/skills/buff2.prefab.meta +++ b/assets/resources/game/skills/ball_green.prefab.meta @@ -2,12 +2,12 @@ "ver": "1.1.50", "importer": "prefab", "imported": true, - "uuid": "b895acca-b187-4167-8c4f-de81511c8d55", + "uuid": "352489cb-440e-428a-9c1a-8ad7447f39f2", "files": [ ".json" ], "subMetas": {}, "userData": { - "syncNodeName": "buff2" + "syncNodeName": "ball_green" } } diff --git a/assets/resources/game/skills/bm_ball.prefab b/assets/resources/game/skills/ball_red.prefab similarity index 87% rename from assets/resources/game/skills/bm_ball.prefab rename to assets/resources/game/skills/ball_red.prefab index 73a5feae..15a30053 100644 --- a/assets/resources/game/skills/bm_ball.prefab +++ b/assets/resources/game/skills/ball_red.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "bm_ball", + "_name": "ball_red", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,7 +13,7 @@ }, { "__type__": "cc.Node", - "_name": "bm_ball", + "_name": "ball_red", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, @@ -24,6 +24,9 @@ ], "_active": true, "_components": [ + { + "__id__": 8 + }, { "__id__": 10 }, @@ -35,10 +38,13 @@ }, { "__id__": 16 + }, + { + "__id__": 18 } ], "_prefab": { - "__id__": 18 + "__id__": 20 }, "_lpos": { "__type__": "cc.Vec3", @@ -85,13 +91,10 @@ }, { "__id__": 5 - }, - { - "__id__": 7 } ], "_prefab": { - "__id__": 9 + "__id__": 7 }, "_lpos": { "__type__": "cc.Vec3", @@ -103,12 +106,12 @@ "__type__": "cc.Quat", "x": 0, "y": 0, - "z": 0, - "w": 1 + "z": -0.7095707365365209, + "w": 0.7046342099635946 }, "_lscale": { "__type__": "cc.Vec3", - "x": -1, + "x": 1, "y": 1, "z": 1 }, @@ -118,7 +121,7 @@ "__type__": "cc.Vec3", "x": 0, "y": 0, - "z": 0 + "z": -90.4 }, "_id": "" }, @@ -173,7 +176,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "930f41c2-9ec2-4b26-a832-35e40bdf3afe@c30fb", + "__uuid__": "3c4eece6-9dcd-4e67-8c40-69c4879720bd@e7223", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -195,35 +198,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "57hoD/3wpHU7ipwKMwKD/k" }, - { - "__type__": "cc.Animation", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__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": { @@ -247,7 +221,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 11 + "__id__": 9 }, "_contentSize": { "__type__": "cc.Size", @@ -275,7 +249,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 13 + "__id__": 11 }, "enabledContactListener": true, "bullet": true, @@ -309,7 +283,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 15 + "__id__": 13 }, "tag": 8, "_group": 4, @@ -343,7 +317,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 15 }, "_id": "" }, @@ -351,6 +325,53 @@ "__type__": "cc.CompPrefabInfo", "fileId": "8ahZv91itPcYJm8S0veHYl" }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "1370e21b-8f13-4b72-959d-ee766507af99", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "1370e21b-8f13-4b72-959d-ee766507af99", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0cIZpMAklNUpGWSkPm4J6y" + }, + { + "__type__": "5ebc6Z5KnFCT7rPSPIJSfvT", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 19 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f0IdZYZi5FqJJILtmzcqSS" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -360,6 +381,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/bm_ball.prefab.meta b/assets/resources/game/skills/ball_red.prefab.meta similarity index 62% rename from assets/resources/game/skills/bm_ball.prefab.meta rename to assets/resources/game/skills/ball_red.prefab.meta index 4d106ee7..1c2b88ae 100644 --- a/assets/resources/game/skills/bm_ball.prefab.meta +++ b/assets/resources/game/skills/ball_red.prefab.meta @@ -2,12 +2,12 @@ "ver": "1.1.50", "importer": "prefab", "imported": true, - "uuid": "dd003dfb-e79a-43ac-99e1-ba978616348c", + "uuid": "a21ef1a0-a1e9-43cf-a762-91631dbd96da", "files": [ ".json" ], "subMetas": {}, "userData": { - "syncNodeName": "bm_ball" + "syncNodeName": "ball_red" } } diff --git a/assets/resources/game/skills/atkup.prefab b/assets/resources/game/skills/ball_yellow.prefab similarity index 78% rename from assets/resources/game/skills/atkup.prefab rename to assets/resources/game/skills/ball_yellow.prefab index cd34725c..14387fbc 100644 --- a/assets/resources/game/skills/atkup.prefab +++ b/assets/resources/game/skills/ball_yellow.prefab @@ -1,7 +1,7 @@ [ { "__type__": "cc.Prefab", - "_name": "atkup", + "_name": "ball_yellow", "_objFlags": 0, "__editorExtras__": {}, "_native": "", @@ -13,7 +13,7 @@ }, { "__type__": "cc.Node", - "_name": "atkup", + "_name": "ball_yellow", "_objFlags": 0, "__editorExtras__": {}, "_parent": null, @@ -35,10 +35,16 @@ }, { "__id__": 14 + }, + { + "__id__": 16 + }, + { + "__id__": 18 } ], "_prefab": { - "__id__": 16 + "__id__": 20 }, "_lpos": { "__type__": "cc.Vec3", @@ -100,8 +106,8 @@ "__type__": "cc.Quat", "x": 0, "y": 0, - "z": 0, - "w": 1 + "z": -0.7095707365365209, + "w": 0.7046342099635946 }, "_lscale": { "__type__": "cc.Vec3", @@ -115,7 +121,7 @@ "__type__": "cc.Vec3", "x": 0, "y": 0, - "z": 0 + "z": -90.4 }, "_id": "" }, @@ -133,8 +139,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 32, - "height": 32 + "width": 40, + "height": 40 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -145,7 +151,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "b4sNQPJWFKha7x75SWXmRj" + "fileId": "43ucwKXvZIjpuRMb6AMdcx" }, { "__type__": "cc.Sprite", @@ -170,7 +176,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "f87f53f9-2fba-4a5b-968a-79a593311ab2@57b31", + "__uuid__": "3c4eece6-9dcd-4e67-8c40-69c4879720bd@c30fb", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -190,7 +196,7 @@ }, { "__type__": "cc.CompPrefabInfo", - "fileId": "9a+65VIghBm4HQxuHPQ/mg" + "fileId": "57hoD/3wpHU7ipwKMwKD/k" }, { "__type__": "cc.PrefabInfo", @@ -200,7 +206,7 @@ "asset": { "__id__": 0 }, - "fileId": "7a5LvbdlxEc6FKa7cun2oB", + "fileId": "b05wpkPXFJqK6/PzoIxCfr", "instance": null, "targetOverrides": null, "nestedPrefabInstanceRoots": null @@ -219,8 +225,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 120, - "height": 80 + "width": 40, + "height": 40 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -287,13 +293,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 0, - "y": 0 + "x": -4.5, + "y": -2 }, "_size": { "__type__": "cc.Size", - "width": 30, - "height": 30 + "width": 20, + "height": 30.1 }, "_id": "" }, @@ -319,6 +325,53 @@ "__type__": "cc.CompPrefabInfo", "fileId": "8ahZv91itPcYJm8S0veHYl" }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "playOnLoad": true, + "_clips": [ + { + "__uuid__": "1370e21b-8f13-4b72-959d-ee766507af99", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "1370e21b-8f13-4b72-959d-ee766507af99", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "0cIZpMAklNUpGWSkPm4J6y" + }, + { + "__type__": "5ebc6Z5KnFCT7rPSPIJSfvT", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 19 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "edWGjGlW1Nb5g+gtMl/YzU" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/resources/game/skills/mball.prefab.meta b/assets/resources/game/skills/ball_yellow.prefab.meta similarity index 61% rename from assets/resources/game/skills/mball.prefab.meta rename to assets/resources/game/skills/ball_yellow.prefab.meta index 57181d59..4d95164b 100644 --- a/assets/resources/game/skills/mball.prefab.meta +++ b/assets/resources/game/skills/ball_yellow.prefab.meta @@ -2,12 +2,12 @@ "ver": "1.1.50", "importer": "prefab", "imported": true, - "uuid": "ea6b167f-b399-4ec2-81f1-bc3510bf124d", + "uuid": "48079561-e1d2-4c77-8c49-deb615692a5c", "files": [ ".json" ], "subMetas": {}, "userData": { - "syncNodeName": "mball" + "syncNodeName": "ball_yellow" } } diff --git a/assets/resources/game/skills/skill_tx.anim b/assets/resources/game/skills/base/ball.anim similarity index 60% rename from assets/resources/game/skills/skill_tx.anim rename to assets/resources/game/skills/base/ball.anim index 1db3e3b2..4e0bf420 100644 --- a/assets/resources/game/skills/skill_tx.anim +++ b/assets/resources/game/skills/base/ball.anim @@ -1,7 +1,7 @@ [ { "__type__": "cc.AnimationClip", - "_name": "skill_tx", + "_name": "bigsmall", "_objFlags": 0, "__editorExtras__": { "embeddedPlayerGroups": [] @@ -11,7 +11,7 @@ "speed": 1, "wrapMode": 2, "enableTrsBlending": false, - "_duration": 0.625, + "_duration": 0.6666666666666666, "_hash": 500763545, "_tracks": [ { @@ -19,16 +19,13 @@ }, { "__id__": 12 - }, - { - "__id__": 24 } ], "_exoticAnimation": null, "_events": [], "_embeddedPlayers": [], "_additiveSettings": { - "__id__": 30 + "__id__": 23 }, "_auxiliaryCurveEntries": [] }, @@ -68,7 +65,7 @@ }, { "__type__": "cc.animation.HierarchyPath", - "path": "tx" + "path": "skill" }, { "__type__": "cc.animation.Channel", @@ -80,14 +77,17 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.625 + 0.16666666666666666, + 0.3333333333333333, + 0.5, + 0.6666666666666666 ], "_values": [ { "__type__": "cc.RealKeyframeValue", "interpolationMode": 0, "tangentWeightMode": 0, - "value": 0, + "value": 1, "rightTangent": 0, "rightTangentWeight": 1, "leftTangent": 0, @@ -99,13 +99,53 @@ "__type__": "cc.RealKeyframeValue", "interpolationMode": 0, "tangentWeightMode": 0, - "value": 2, + "value": 1.2000000476837158, "rightTangent": 0, "rightTangentWeight": 1, "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 1, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__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, @@ -121,14 +161,17 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.625 + 0.16666666666666666, + 0.3333333333333333, + 0.5, + 0.6666666666666666 ], "_values": [ { "__type__": "cc.RealKeyframeValue", "interpolationMode": 0, "tangentWeightMode": 0, - "value": 0, + "value": 1, "rightTangent": 0, "rightTangentWeight": 1, "leftTangent": 0, @@ -140,13 +183,53 @@ "__type__": "cc.RealKeyframeValue", "interpolationMode": 0, "tangentWeightMode": 0, - "value": 0.5, + "value": 1.2000000476837158, "rightTangent": 0, "rightTangentWeight": 1, "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 1, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__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, @@ -162,7 +245,10 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.625 + 0.16666666666666666, + 0.3333333333333333, + 0.5, + 0.6666666666666666 ], "_values": [ { @@ -188,6 +274,46 @@ "leftTangentWeight": 1, "easingMethod": 0, "__editorExtras__": null + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 1, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": null + }, + { + "__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, @@ -207,7 +333,7 @@ "postExtrapolation": 1 }, { - "__type__": "cc.animation.ColorTrack", + "__type__": "cc.animation.VectorTrack", "_binding": { "__type__": "cc.animation.TrackBinding", "path": { @@ -217,18 +343,19 @@ }, "_channels": [ { - "__id__": 16 + "__id__": 15 }, { - "__id__": 18 + "__id__": 17 }, { - "__id__": 20 + "__id__": 19 }, { - "__id__": 22 + "__id__": 21 } - ] + ], + "_nComponents": 3 }, { "__type__": "cc.animation.TrackPath", @@ -236,219 +363,42 @@ { "__id__": 14 }, - { - "__id__": 15 - }, - "color" + "eulerAngles" ] }, { "__type__": "cc.animation.HierarchyPath", - "path": "tx" - }, - { - "__type__": "cc.animation.ComponentPath", - "component": "cc.Sprite" + "path": "skill" }, { "__type__": "cc.animation.Channel", "_curve": { - "__id__": 17 + "__id__": 16 } }, { "__type__": "cc.RealCurve", "_times": [ 0, - 0.4166666567325592, - 0.625 + 0.16666666666666666, + 0.3333333333333333, + 0.5, + 0.6666666666666666 ], "_values": [ { "__type__": "cc.RealKeyframeValue", "interpolationMode": 0, "tangentWeightMode": 0, - "value": 255, + "value": 0, "rightTangent": 0, "rightTangentWeight": 1, "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": null - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 255, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 255, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - } - ], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 19 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [ - 0, - 0.4166666567325592, - 0.625 - ], - "_values": [ - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 255, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 255, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 255, - "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, - 0.625 - ], - "_values": [ - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 255, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 255, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 255, - "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, - 0.625 - ], - "_values": [ - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 255, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 255, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null + "__editorExtras__": { + "tangentMode": 0 + } }, { "__type__": "cc.RealKeyframeValue", @@ -460,127 +410,248 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": null + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } } ], "preExtrapolation": 1, "postExtrapolation": 1 }, { - "__type__": "cc.animation.ObjectTrack", - "_binding": { - "__type__": "cc.animation.TrackBinding", - "path": { - "__id__": 25 - }, - "proxy": null - }, - "_channel": { - "__id__": 28 + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 18 } }, { - "__type__": "cc.animation.TrackPath", - "_paths": [ + "__type__": "cc.RealCurve", + "_times": [ + 0, + 0.16666666666666666, + 0.3333333333333333, + 0.5, + 0.6666666666666666 + ], + "_values": [ { - "__id__": 26 + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } }, { - "__id__": 27 + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } }, - "spriteFrame" - ] - }, - { - "__type__": "cc.animation.HierarchyPath", - "path": "tx" - }, - { - "__type__": "cc.animation.ComponentPath", - "component": "cc.Sprite" + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + }, + { + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": 0, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } + } + ], + "preExtrapolation": 1, + "postExtrapolation": 1 }, { "__type__": "cc.animation.Channel", "_curve": { - "__id__": 29 + "__id__": 20 } }, { - "__type__": "cc.ObjectCurve", + "__type__": "cc.RealCurve", "_times": [ 0, - 0.041666666666666664, - 0.08333333333333333, - 0.125, 0.16666666666666666, - 0.20833333333333334, - 0.25, 0.3333333333333333, - 0.375, - 0.4166666666666667, - 0.4583333333333333, 0.5, - 0.5416666666666666, - 0.5833333333333334 + 0.6666666666666666 ], "_values": [ { - "__uuid__": "2e272fb5-0f2a-459c-853d-e312e14693d0@b1e25", - "__expectedType__": "cc.SpriteFrame" + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": -90.4, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } }, { - "__uuid__": "2e272fb5-0f2a-459c-853d-e312e14693d0@c6e3b", - "__expectedType__": "cc.SpriteFrame" + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": -180, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } }, { - "__uuid__": "2e272fb5-0f2a-459c-853d-e312e14693d0@74f0a", - "__expectedType__": "cc.SpriteFrame" + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": -270, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } }, { - "__uuid__": "2e272fb5-0f2a-459c-853d-e312e14693d0@a824d", - "__expectedType__": "cc.SpriteFrame" + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": -360, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } }, { - "__uuid__": "2e272fb5-0f2a-459c-853d-e312e14693d0@43a27", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2e272fb5-0f2a-459c-853d-e312e14693d0@798c8", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2e272fb5-0f2a-459c-853d-e312e14693d0@8fbc1", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2e272fb5-0f2a-459c-853d-e312e14693d0@b1e25", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2e272fb5-0f2a-459c-853d-e312e14693d0@c6e3b", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2e272fb5-0f2a-459c-853d-e312e14693d0@74f0a", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2e272fb5-0f2a-459c-853d-e312e14693d0@a824d", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2e272fb5-0f2a-459c-853d-e312e14693d0@43a27", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2e272fb5-0f2a-459c-853d-e312e14693d0@798c8", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2e272fb5-0f2a-459c-853d-e312e14693d0@8fbc1", - "__expectedType__": "cc.SpriteFrame" + "__type__": "cc.RealKeyframeValue", + "interpolationMode": 0, + "tangentWeightMode": 0, + "value": -450, + "rightTangent": 0, + "rightTangentWeight": 1, + "leftTangent": 0, + "leftTangentWeight": 1, + "easingMethod": 0, + "__editorExtras__": { + "tangentMode": 0 + } } - ] + ], + "preExtrapolation": 1, + "postExtrapolation": 1 + }, + { + "__type__": "cc.animation.Channel", + "_curve": { + "__id__": 22 + } + }, + { + "__type__": "cc.RealCurve", + "_times": [], + "_values": [], + "preExtrapolation": 1, + "postExtrapolation": 1 }, { "__type__": "cc.AnimationClipAdditiveSettings", diff --git a/assets/resources/game/skills/base/base.anim.meta b/assets/resources/game/skills/base/ball.anim.meta similarity index 67% rename from assets/resources/game/skills/base/base.anim.meta rename to assets/resources/game/skills/base/ball.anim.meta index 8f4f5262..0f7969ce 100644 --- a/assets/resources/game/skills/base/base.anim.meta +++ b/assets/resources/game/skills/base/ball.anim.meta @@ -2,12 +2,12 @@ "ver": "2.0.3", "importer": "animation-clip", "imported": true, - "uuid": "7a6518aa-87b0-4d48-9460-1ae110cc860f", + "uuid": "1370e21b-8f13-4b72-959d-ee766507af99", "files": [ ".cconb" ], "subMetas": {}, "userData": { - "name": "base" + "name": "ball" } } diff --git a/assets/resources/game/skills/base/base.anim b/assets/resources/game/skills/base/base.anim deleted file mode 100644 index 3a306c08..00000000 --- a/assets/resources/game/skills/base/base.anim +++ /dev/null @@ -1,83 +0,0 @@ -[ - { - "__type__": "cc.AnimationClip", - "_name": "base", - "_objFlags": 0, - "__editorExtras__": { - "embeddedPlayerGroups": [] - }, - "_native": "", - "sample": 24, - "speed": 1, - "wrapMode": 2, - "enableTrsBlending": false, - "_duration": 0.125, - "_hash": 500763545, - "_tracks": [ - { - "__id__": 1 - } - ], - "_exoticAnimation": null, - "_events": [], - "_embeddedPlayers": [], - "_additiveSettings": { - "__id__": 6 - }, - "_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 - ], - "_values": [ - { - "__uuid__": "930f41c2-9ec2-4b26-a832-35e40bdf3afe@c30fb", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "930f41c2-9ec2-4b26-a832-35e40bdf3afe@c86cc", - "__expectedType__": "cc.SpriteFrame" - } - ] - }, - { - "__type__": "cc.AnimationClipAdditiveSettings", - "enabled": false, - "refClip": null - } -] \ No newline at end of file diff --git a/assets/resources/game/skills/base/base.plist b/assets/resources/game/skills/base/base.plist deleted file mode 100644 index 99c2a3bc..00000000 --- a/assets/resources/game/skills/base/base.plist +++ /dev/null @@ -1,161 +0,0 @@ - - - - - frames - - 1.png - - aliases - - spriteOffset - {0,0} - spriteSize - {139,128} - spriteSourceSize - {139,128} - textureRect - {{201,578},{139,128}} - textureRotated - - - 2.png - - aliases - - spriteOffset - {0,0} - spriteSize - {138,105} - spriteSourceSize - {138,105} - textureRect - {{342,578},{138,105}} - textureRotated - - - fire1.png - - aliases - - spriteOffset - {0,0} - spriteSize - {128,128} - spriteSourceSize - {128,128} - textureRect - {{342,685},{128,128}} - textureRotated - - - fire2.png - - aliases - - spriteOffset - {0,0} - spriteSize - {128,128} - spriteSourceSize - {128,128} - textureRect - {{201,708},{128,128}} - textureRotated - - - fire3.png - - aliases - - spriteOffset - {0,0} - spriteSize - {575,507} - spriteSourceSize - {575,507} - textureRect - {{1,1},{575,507}} - textureRotated - - - ice1.png - - aliases - - spriteOffset - {0,0} - spriteSize - {128,128} - spriteSourceSize - {128,128} - textureRect - {{201,838},{128,128}} - textureRotated - - - ice2.png - - aliases - - spriteOffset - {0,0} - spriteSize - {128,128} - spriteSourceSize - {128,128} - textureRect - {{331,815},{128,128}} - textureRotated - - - ice3.png - - aliases - - spriteOffset - {0,0} - spriteSize - {198,282} - spriteSourceSize - {198,282} - textureRect - {{1,578},{198,282}} - textureRotated - - - ice4.png - - aliases - - spriteOffset - {0,0} - spriteSize - {29,76} - spriteSourceSize - {29,76} - textureRect - {{1,862},{29,76}} - textureRotated - - - - metadata - - format - 3 - pixelFormat - RGBA8888 - premultiplyAlpha - - realTextureFileName - base.png - size - {509,967} - smartupdate - $TexturePacker:SmartUpdate:74c5fb4451ae760d45afc066a745f4c9:a24e36ddc18433980d4bf7a182b7b870:401c17bbbff7ec4d72e526f50b04f8bf$ - textureFileName - base.png - - - diff --git a/assets/resources/game/skills/base/base.plist.meta b/assets/resources/game/skills/base/base.plist.meta deleted file mode 100644 index 6207fba8..00000000 --- a/assets/resources/game/skills/base/base.plist.meta +++ /dev/null @@ -1,431 +0,0 @@ -{ - "ver": "1.0.8", - "importer": "sprite-atlas", - "imported": true, - "uuid": "930f41c2-9ec2-4b26-a832-35e40bdf3afe", - "files": [ - ".json" - ], - "subMetas": { - "c30fb": { - "importer": "sprite-frame", - "uuid": "930f41c2-9ec2-4b26-a832-35e40bdf3afe@c30fb", - "displayName": "", - "id": "c30fb", - "name": "1", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 201, - "trimY": 578, - "width": 139, - "height": 128, - "rawWidth": 139, - "rawHeight": 128, - "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": "512a13bb-2546-4038-becc-b456652baa3e@6c48a", - "atlasUuid": "930f41c2-9ec2-4b26-a832-35e40bdf3afe" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "c86cc": { - "importer": "sprite-frame", - "uuid": "930f41c2-9ec2-4b26-a832-35e40bdf3afe@c86cc", - "displayName": "", - "id": "c86cc", - "name": "2", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 342, - "trimY": 578, - "width": 138, - "height": 105, - "rawWidth": 138, - "rawHeight": 105, - "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": "512a13bb-2546-4038-becc-b456652baa3e@6c48a", - "atlasUuid": "930f41c2-9ec2-4b26-a832-35e40bdf3afe" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "bc05e": { - "importer": "sprite-frame", - "uuid": "930f41c2-9ec2-4b26-a832-35e40bdf3afe@bc05e", - "displayName": "", - "id": "bc05e", - "name": "fire1", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 342, - "trimY": 685, - "width": 128, - "height": 128, - "rawWidth": 128, - "rawHeight": 128, - "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": "512a13bb-2546-4038-becc-b456652baa3e@6c48a", - "atlasUuid": "930f41c2-9ec2-4b26-a832-35e40bdf3afe" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "ce133": { - "importer": "sprite-frame", - "uuid": "930f41c2-9ec2-4b26-a832-35e40bdf3afe@ce133", - "displayName": "", - "id": "ce133", - "name": "fire2", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 201, - "trimY": 708, - "width": 128, - "height": 128, - "rawWidth": 128, - "rawHeight": 128, - "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": "512a13bb-2546-4038-becc-b456652baa3e@6c48a", - "atlasUuid": "930f41c2-9ec2-4b26-a832-35e40bdf3afe" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "9269f": { - "importer": "sprite-frame", - "uuid": "930f41c2-9ec2-4b26-a832-35e40bdf3afe@9269f", - "displayName": "", - "id": "9269f", - "name": "fire3", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": true, - "offsetX": 0, - "offsetY": 0, - "trimX": 1, - "trimY": 1, - "width": 575, - "height": 507, - "rawWidth": 575, - "rawHeight": 507, - "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": "512a13bb-2546-4038-becc-b456652baa3e@6c48a", - "atlasUuid": "930f41c2-9ec2-4b26-a832-35e40bdf3afe" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "1d397": { - "importer": "sprite-frame", - "uuid": "930f41c2-9ec2-4b26-a832-35e40bdf3afe@1d397", - "displayName": "", - "id": "1d397", - "name": "ice1", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 201, - "trimY": 838, - "width": 128, - "height": 128, - "rawWidth": 128, - "rawHeight": 128, - "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": "512a13bb-2546-4038-becc-b456652baa3e@6c48a", - "atlasUuid": "930f41c2-9ec2-4b26-a832-35e40bdf3afe" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "52c22": { - "importer": "sprite-frame", - "uuid": "930f41c2-9ec2-4b26-a832-35e40bdf3afe@52c22", - "displayName": "", - "id": "52c22", - "name": "ice2", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 331, - "trimY": 815, - "width": 128, - "height": 128, - "rawWidth": 128, - "rawHeight": 128, - "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": "512a13bb-2546-4038-becc-b456652baa3e@6c48a", - "atlasUuid": "930f41c2-9ec2-4b26-a832-35e40bdf3afe" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "3f96b": { - "importer": "sprite-frame", - "uuid": "930f41c2-9ec2-4b26-a832-35e40bdf3afe@3f96b", - "displayName": "", - "id": "3f96b", - "name": "ice3", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 1, - "trimY": 578, - "width": 198, - "height": 282, - "rawWidth": 198, - "rawHeight": 282, - "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": "512a13bb-2546-4038-becc-b456652baa3e@6c48a", - "atlasUuid": "930f41c2-9ec2-4b26-a832-35e40bdf3afe" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "7ec14": { - "importer": "sprite-frame", - "uuid": "930f41c2-9ec2-4b26-a832-35e40bdf3afe@7ec14", - "displayName": "", - "id": "7ec14", - "name": "ice4", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 1, - "trimY": 862, - "width": 29, - "height": 76, - "rawWidth": 29, - "rawHeight": 76, - "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": "512a13bb-2546-4038-becc-b456652baa3e@6c48a", - "atlasUuid": "930f41c2-9ec2-4b26-a832-35e40bdf3afe" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "atlasTextureName": "base.png", - "format": 3, - "uuid": "930f41c2-9ec2-4b26-a832-35e40bdf3afe", - "textureUuid": "512a13bb-2546-4038-becc-b456652baa3e@6c48a" - } -} diff --git a/assets/resources/game/skills/base/base.png b/assets/resources/game/skills/base/base.png deleted file mode 100644 index 6f0f2ea3..00000000 Binary files a/assets/resources/game/skills/base/base.png and /dev/null differ diff --git a/assets/resources/game/skills/base/base.png.meta b/assets/resources/game/skills/base/base.png.meta deleted file mode 100644 index 7e0aeae6..00000000 --- a/assets/resources/game/skills/base/base.png.meta +++ /dev/null @@ -1,42 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "512a13bb-2546-4038-becc-b456652baa3e", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "512a13bb-2546-4038-becc-b456652baa3e@6c48a", - "displayName": "base", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "512a13bb-2546-4038-becc-b456652baa3e", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "texture", - "fixAlphaTransparencyArtifacts": false, - "redirect": "512a13bb-2546-4038-becc-b456652baa3e@6c48a" - } -} diff --git a/assets/resources/game/skills/base/xiexia.anim b/assets/resources/game/skills/base/xiexia.anim index 17dcada3..19b5a045 100644 --- a/assets/resources/game/skills/base/xiexia.anim +++ b/assets/resources/game/skills/base/xiexia.anim @@ -7,25 +7,22 @@ "embeddedPlayerGroups": [] }, "_native": "", - "sample": 30, + "sample": 24, "speed": 1, "wrapMode": 1, "enableTrsBlending": false, - "_duration": 0.4, + "_duration": 0.375, "_hash": 500763545, "_tracks": [ { "__id__": 1 - }, - { - "__id__": 12 } ], "_exoticAnimation": null, "_events": [], "_embeddedPlayers": [], "_additiveSettings": { - "__id__": 23 + "__id__": 12 }, "_auxiliaryCurveEntries": [] }, @@ -77,8 +74,8 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.2, - 0.4 + 0.125, + 0.375 ], "_values": [ { @@ -103,9 +100,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null }, { "__type__": "cc.RealKeyframeValue", @@ -133,8 +128,8 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.2, - 0.4 + 0.125, + 0.375 ], "_values": [ { @@ -159,9 +154,7 @@ "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null }, { "__type__": "cc.RealKeyframeValue", @@ -189,8 +182,8 @@ "__type__": "cc.RealCurve", "_times": [ 0, - 0.2, - 0.4 + 0.125, + 0.375 ], "_values": [ { @@ -209,15 +202,13 @@ "__type__": "cc.RealKeyframeValue", "interpolationMode": 0, "tangentWeightMode": 0, - "value": 80, + "value": 90, "rightTangent": 0, "rightTangentWeight": 1, "leftTangent": 0, "leftTangentWeight": 1, "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } + "__editorExtras__": null }, { "__type__": "cc.RealKeyframeValue", @@ -248,225 +239,6 @@ "preExtrapolation": 1, "postExtrapolation": 1 }, - { - "__type__": "cc.animation.VectorTrack", - "_binding": { - "__type__": "cc.animation.TrackBinding", - "path": { - "__id__": 13 - }, - "proxy": null - }, - "_channels": [ - { - "__id__": 15 - }, - { - "__id__": 17 - }, - { - "__id__": 19 - }, - { - "__id__": 21 - } - ], - "_nComponents": 3 - }, - { - "__type__": "cc.animation.TrackPath", - "_paths": [ - { - "__id__": 14 - }, - "position" - ] - }, - { - "__type__": "cc.animation.HierarchyPath", - "path": "node" - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 16 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [ - 0, - 0.2, - 0.4 - ], - "_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": 16.666666666666664, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": { - "tangentMode": 0 - } - }, - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 50, - "rightTangent": 0, - "rightTangentWeight": 1, - "leftTangent": 0, - "leftTangentWeight": 1, - "easingMethod": 0, - "__editorExtras__": null - } - ], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, - { - "__type__": "cc.animation.Channel", - "_curve": { - "__id__": 18 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [ - 0, - 0.2, - 0.4 - ], - "_values": [ - { - "__type__": "cc.RealKeyframeValue", - "interpolationMode": 0, - "tangentWeightMode": 0, - "value": 90, - "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__": { - "tangentMode": 0 - } - }, - { - "__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__": 20 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [ - 0, - 0.2, - 0.4 - ], - "_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__": { - "tangentMode": 0 - } - }, - { - "__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__": 22 - } - }, - { - "__type__": "cc.RealCurve", - "_times": [], - "_values": [], - "preExtrapolation": 1, - "postExtrapolation": 1 - }, { "__type__": "cc.AnimationClipAdditiveSettings", "enabled": false, diff --git a/assets/resources/game/skills/buff/ap_up.atlas b/assets/resources/game/skills/buff/ap_up.atlas deleted file mode 100644 index 741e76f2..00000000 --- a/assets/resources/game/skills/buff/ap_up.atlas +++ /dev/null @@ -1,34 +0,0 @@ - -ap_up.png -size: 123,80 -format: RGBA8888 -filter: Linear,Linear -repeat: none -buff_0 - rotate: false - xy: 2, 2 - size: 76, 76 - orig: 82, 82 - offset: 3, 3 - index: -1 -buff_1_1 - rotate: false - xy: 80, 2 - size: 29, 33 - orig: 31, 36 - offset: 1, 2 - index: -1 -buff_1_3 - rotate: false - xy: 80, 2 - size: 29, 33 - orig: 31, 36 - offset: 1, 2 - index: -1 -buff_1_2 - rotate: false - xy: 80, 37 - size: 41, 41 - orig: 82, 81 - offset: 21, 20 - index: -1 diff --git a/assets/resources/game/skills/buff/ap_up.atlas.meta b/assets/resources/game/skills/buff/ap_up.atlas.meta deleted file mode 100644 index 9f457b98..00000000 --- a/assets/resources/game/skills/buff/ap_up.atlas.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.0.1", - "importer": "*", - "imported": true, - "uuid": "0b8a49e6-8eeb-446f-bb1d-810553ff7cfe", - "files": [ - ".atlas", - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/resources/game/skills/buff/ap_up.json b/assets/resources/game/skills/buff/ap_up.json deleted file mode 100644 index 5adf5227..00000000 --- a/assets/resources/game/skills/buff/ap_up.json +++ /dev/null @@ -1,90 +0,0 @@ -{ -"skeleton": { - "hash": "FNNmwbijC7nZIvTsWlu3NlBldhM=", - "spine": "3.8.75", - "x": -32.8, - "y": -32.8, - "width": 65.6, - "height": 65.6, - "images": "./images/", - "audio": "" -}, -"bones": [ - { "name": "root", "scaleX": 0.8, "scaleY": 0.8 }, - { "name": "main", "parent": "root", "rotation": 43.44 }, - { "name": "bone2", "parent": "root", "x": 15.46, "y": -13.96 }, - { "name": "bone3", "parent": "root", "x": -20.82, "y": 10.06 }, - { "name": "bone", "parent": "root" } -], -"slots": [ - { "name": "buff_0_1", "bone": "root" }, - { "name": "buff_0", "bone": "bone", "attachment": "buff_0" }, - { "name": "buff_1_3", "bone": "bone3", "attachment": "buff_1_3" }, - { "name": "buff_1_6", "bone": "bone3", "attachment": "buff_1_3", "blend": "screen" }, - { "name": "buff_1_2", "bone": "main", "attachment": "buff_1_2" }, - { "name": "buff_1_4", "bone": "main", "attachment": "buff_1_2", "blend": "screen" }, - { "name": "buff_1_1", "bone": "bone2", "attachment": "buff_1_1" }, - { "name": "buff_1_5", "bone": "bone2", "attachment": "buff_1_1", "blend": "screen" } -], -"skins": [ - { - "name": "default", - "attachments": { - "buff_0": { - "buff_0": { "width": 82, "height": 82 } - }, - "buff_1_1": { - "buff_1_1": { "x": 0.5, "width": 31, "height": 36 } - }, - "buff_1_2": { - "buff_1_2": { "x": 0.34, "y": 0.36, "rotation": -43.44, "width": 82, "height": 81 } - }, - "buff_1_3": { - "buff_1_3": { "x": 0.5, "width": 31, "height": 36 } - }, - "buff_1_4": { - "buff_1_2": { "x": 0.34, "y": 0.36, "rotation": -43.44, "width": 82, "height": 81 } - }, - "buff_1_5": { - "buff_1_1": { "x": 0.5, "width": 31, "height": 36 } - }, - "buff_1_6": { - "buff_1_3": { "x": 0.5, "width": 31, "height": 36 } - } - } - } -], -"animations": { - "loop": { - "bones": { - "bone2": { - "scale": [ - { "x": 0.929, "y": 0.929, "curve": 0.25, "c3": 0.75 }, - { "time": 0.2333, "x": 1.073, "y": 1.073, "curve": 0.25, "c3": 0.75 }, - { "time": 0.4667, "x": 0.929, "y": 0.929, "curve": 0.25, "c3": 0.75 }, - { "time": 0.7, "x": 1.073, "y": 1.073, "curve": 0.25, "c3": 0.75 }, - { "time": 0.9333, "x": 0.929, "y": 0.929 } - ] - }, - "bone3": { - "scale": [ - { "x": 1.057, "y": 1.057, "curve": 0.38, "c2": 0.53, "c3": 0.745 }, - { "time": 0.1, "curve": 0.25, "c3": 0.75 }, - { "time": 0.3333, "x": 1.14, "y": 1.14, "curve": 0.246, "c3": 0.633, "c4": 0.54 }, - { "time": 0.4667, "x": 1.057, "y": 1.057, "curve": 0.38, "c2": 0.53, "c3": 0.745 }, - { "time": 0.5667, "curve": 0.25, "c3": 0.75 }, - { "time": 0.8, "x": 1.14, "y": 1.14, "curve": 0.246, "c3": 0.633, "c4": 0.54 }, - { "time": 0.9333, "x": 1.057, "y": 1.057 } - ] - }, - "root": { - "translate": [ - { "curve": 0.25, "c3": 0.75 }, - { "time": 0.4667, "y": 4, "curve": 0.25, "c3": 0.75 }, - { "time": 0.9333 } - ] - } - } - } -} -} \ No newline at end of file diff --git a/assets/resources/game/skills/buff/ap_up.json.meta b/assets/resources/game/skills/buff/ap_up.json.meta deleted file mode 100644 index 1cc56711..00000000 --- a/assets/resources/game/skills/buff/ap_up.json.meta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ver": "1.2.6", - "importer": "spine-data", - "imported": true, - "uuid": "e53bbef1-7515-4aed-ab0b-4fb1bfb2c906", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/resources/game/skills/buff/ap_up.png b/assets/resources/game/skills/buff/ap_up.png deleted file mode 100644 index 168e463d..00000000 Binary files a/assets/resources/game/skills/buff/ap_up.png and /dev/null differ diff --git a/assets/resources/game/skills/buff/ap_up.png.meta b/assets/resources/game/skills/buff/ap_up.png.meta deleted file mode 100644 index c8ad796d..00000000 --- a/assets/resources/game/skills/buff/ap_up.png.meta +++ /dev/null @@ -1,42 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "70a3d41b-f33f-4e61-8683-290204a2ea6d", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "70a3d41b-f33f-4e61-8683-290204a2ea6d@6c48a", - "displayName": "ap_up", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "70a3d41b-f33f-4e61-8683-290204a2ea6d", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "texture", - "fixAlphaTransparencyArtifacts": false, - "redirect": "70a3d41b-f33f-4e61-8683-290204a2ea6d@6c48a" - } -} diff --git a/assets/resources/game/skills/buff/b1.plist b/assets/resources/game/skills/buff/b1.plist deleted file mode 100644 index 919800cd..00000000 --- a/assets/resources/game/skills/buff/b1.plist +++ /dev/null @@ -1,386 +0,0 @@ - - - - - frames - - buff-n-0.png - - aliases - - spriteOffset - {0,0} - spriteSize - {68,68} - spriteSourceSize - {68,68} - textureRect - {{0,105},{68,68}} - textureRotated - - - buff-n-1.png - - aliases - - spriteOffset - {0,0} - spriteSize - {68,68} - spriteSourceSize - {68,68} - textureRect - {{0,173},{68,68}} - textureRotated - - - buff-n-2.png - - aliases - - spriteOffset - {0,0} - spriteSize - {68,68} - spriteSourceSize - {68,68} - textureRect - {{0,241},{68,68}} - textureRotated - - - buff-n-3.png - - aliases - - spriteOffset - {0,0} - spriteSize - {68,68} - spriteSourceSize - {68,68} - textureRect - {{0,309},{68,68}} - textureRotated - - - buff-n-4.png - - aliases - - spriteOffset - {0,0} - spriteSize - {68,68} - spriteSourceSize - {68,68} - textureRect - {{0,377},{68,68}} - textureRotated - - - buff-n-5.png - - aliases - - spriteOffset - {0,0} - spriteSize - {68,68} - spriteSourceSize - {68,68} - textureRect - {{0,445},{68,68}} - textureRotated - - - buff2-0.png - - aliases - - spriteOffset - {0,0} - spriteSize - {105,70} - spriteSourceSize - {105,70} - textureRect - {{0,582},{105,70}} - textureRotated - - - buff2-1.png - - aliases - - spriteOffset - {0,0} - spriteSize - {96,70} - spriteSourceSize - {96,70} - textureRect - {{0,652},{96,70}} - textureRotated - - - buff2-2.png - - aliases - - spriteOffset - {0,0} - spriteSize - {103,71} - spriteSourceSize - {103,71} - textureRect - {{0,932},{103,71}} - textureRotated - - - buff2-3.png - - aliases - - spriteOffset - {0,0} - spriteSize - {98,70} - spriteSourceSize - {98,70} - textureRect - {{0,722},{98,70}} - textureRotated - - - buff2-4.png - - aliases - - spriteOffset - {0,0} - spriteSize - {94,70} - spriteSourceSize - {94,70} - textureRect - {{0,792},{94,70}} - textureRotated - - - buff2-5.png - - aliases - - spriteOffset - {0,0} - spriteSize - {94,70} - spriteSourceSize - {94,70} - textureRect - {{0,862},{94,70}} - textureRotated - - - buff2-6.png - - aliases - - spriteOffset - {0,0} - spriteSize - {93,69} - spriteSourceSize - {93,69} - textureRect - {{0,513},{93,69}} - textureRotated - - - buff3-0.png - - aliases - - spriteOffset - {0,0} - spriteSize - {100,19} - spriteSourceSize - {100,19} - textureRect - {{0,10},{100,19}} - textureRotated - - - buff3-1.png - - aliases - - spriteOffset - {0,0} - spriteSize - {100,19} - spriteSourceSize - {100,19} - textureRect - {{0,29},{100,19}} - textureRotated - - - buff3-2.png - - aliases - - spriteOffset - {0,0} - spriteSize - {100,19} - spriteSourceSize - {100,19} - textureRect - {{0,48},{100,19}} - textureRotated - - - buff3-3.png - - aliases - - spriteOffset - {0,0} - spriteSize - {100,19} - spriteSourceSize - {100,19} - textureRect - {{0,67},{100,19}} - textureRotated - - - buff3-4.png - - aliases - - spriteOffset - {0,0} - spriteSize - {100,19} - spriteSourceSize - {100,19} - textureRect - {{0,86},{100,19}} - textureRotated - - - jiaxue-0.png - - aliases - - spriteOffset - {0,0} - spriteSize - {7,10} - spriteSourceSize - {7,10} - textureRect - {{0,0},{7,10}} - textureRotated - - - jiaxue-1.png - - aliases - - spriteOffset - {0,0} - spriteSize - {7,10} - spriteSourceSize - {7,10} - textureRect - {{7,0},{7,10}} - textureRotated - - - jiaxue-2.png - - aliases - - spriteOffset - {0,0} - spriteSize - {7,10} - spriteSourceSize - {7,10} - textureRect - {{14,0},{7,10}} - textureRotated - - - jiaxue-3.png - - aliases - - spriteOffset - {0,0} - spriteSize - {7,10} - spriteSourceSize - {7,10} - textureRect - {{21,0},{7,10}} - textureRotated - - - jiaxue-4.png - - aliases - - spriteOffset - {0,0} - spriteSize - {7,10} - spriteSourceSize - {7,10} - textureRect - {{28,0},{7,10}} - textureRotated - - - jiaxue-5.png - - aliases - - spriteOffset - {0,0} - spriteSize - {7,10} - spriteSourceSize - {7,10} - textureRect - {{35,0},{7,10}} - textureRotated - - - - metadata - - format - 3 - pixelFormat - RGBA8888 - premultiplyAlpha - - realTextureFileName - b1.png - size - {105,1003} - smartupdate - $TexturePacker:SmartUpdate:3116efc0bdf80f788ce6d6b911ed721a:c1a234e31e5b9411c14817f040f6011b:711ea92644afcfa26ff56bf794426a0a$ - textureFileName - b1.png - - - diff --git a/assets/resources/game/skills/buff/b1.plist.meta b/assets/resources/game/skills/buff/b1.plist.meta deleted file mode 100644 index 001a5564..00000000 --- a/assets/resources/game/skills/buff/b1.plist.meta +++ /dev/null @@ -1,1121 +0,0 @@ -{ - "ver": "1.0.8", - "importer": "sprite-atlas", - "imported": true, - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0", - "files": [ - ".json" - ], - "subMetas": { - "38637": { - "importer": "sprite-frame", - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@38637", - "displayName": "", - "id": "38637", - "name": "jiaxue-4", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 28, - "trimY": 0, - "width": 7, - "height": 10, - "rawWidth": 7, - "rawHeight": 10, - "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "81236": { - "importer": "sprite-frame", - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@81236", - "displayName": "", - "id": "81236", - "name": "buff3-0", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 10, - "width": 100, - "height": 19, - "rawWidth": 100, - "rawHeight": 19, - "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "cc2a3": { - "importer": "sprite-frame", - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@cc2a3", - "displayName": "", - "id": "cc2a3", - "name": "buff-n-0", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 105, - "width": 68, - "height": 68, - "rawWidth": 68, - "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "c57d4": { - "importer": "sprite-frame", - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@c57d4", - "displayName": "", - "id": "c57d4", - "name": "buff-n-1", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 173, - "width": 68, - "height": 68, - "rawWidth": 68, - "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "d8842": { - "importer": "sprite-frame", - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@d8842", - "displayName": "", - "id": "d8842", - "name": "buff-n-2", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 241, - "width": 68, - "height": 68, - "rawWidth": 68, - "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "9255d": { - "importer": "sprite-frame", - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@9255d", - "displayName": "", - "id": "9255d", - "name": "buff-n-3", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 309, - "width": 68, - "height": 68, - "rawWidth": 68, - "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "4bfa2": { - "importer": "sprite-frame", - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@4bfa2", - "displayName": "", - "id": "4bfa2", - "name": "buff-n-4", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 377, - "width": 68, - "height": 68, - "rawWidth": 68, - "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "40e82": { - "importer": "sprite-frame", - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@40e82", - "displayName": "", - "id": "40e82", - "name": "buff-n-5", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 445, - "width": 68, - "height": 68, - "rawWidth": 68, - "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "b1e25": { - "importer": "sprite-frame", - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@b1e25", - "displayName": "", - "id": "b1e25", - "name": "buff2-0", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 582, - "width": 105, - "height": 70, - "rawWidth": 105, - "rawHeight": 70, - "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "c6e3b": { - "importer": "sprite-frame", - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@c6e3b", - "displayName": "", - "id": "c6e3b", - "name": "buff2-1", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 652, - "width": 96, - "height": 70, - "rawWidth": 96, - "rawHeight": 70, - "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "74f0a": { - "importer": "sprite-frame", - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@74f0a", - "displayName": "", - "id": "74f0a", - "name": "buff2-2", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 932, - "width": 103, - "height": 71, - "rawWidth": 103, - "rawHeight": 71, - "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "a824d": { - "importer": "sprite-frame", - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@a824d", - "displayName": "", - "id": "a824d", - "name": "buff2-3", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 722, - "width": 98, - "height": 70, - "rawWidth": 98, - "rawHeight": 70, - "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "43a27": { - "importer": "sprite-frame", - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@43a27", - "displayName": "", - "id": "43a27", - "name": "buff2-4", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 792, - "width": 94, - "height": 70, - "rawWidth": 94, - "rawHeight": 70, - "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "798c8": { - "importer": "sprite-frame", - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@798c8", - "displayName": "", - "id": "798c8", - "name": "buff2-5", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 862, - "width": 94, - "height": 70, - "rawWidth": 94, - "rawHeight": 70, - "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "8fbc1": { - "importer": "sprite-frame", - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@8fbc1", - "displayName": "", - "id": "8fbc1", - "name": "buff2-6", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 513, - "width": 93, - "height": 69, - "rawWidth": 93, - "rawHeight": 69, - "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "05350": { - "importer": "sprite-frame", - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@05350", - "displayName": "", - "id": "05350", - "name": "buff3-1", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 29, - "width": 100, - "height": 19, - "rawWidth": 100, - "rawHeight": 19, - "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "0a216": { - "importer": "sprite-frame", - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@0a216", - "displayName": "", - "id": "0a216", - "name": "buff3-2", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 48, - "width": 100, - "height": 19, - "rawWidth": 100, - "rawHeight": 19, - "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "6b05a": { - "importer": "sprite-frame", - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@6b05a", - "displayName": "", - "id": "6b05a", - "name": "buff3-3", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 67, - "width": 100, - "height": 19, - "rawWidth": 100, - "rawHeight": 19, - "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "9e298": { - "importer": "sprite-frame", - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@9e298", - "displayName": "", - "id": "9e298", - "name": "buff3-4", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 86, - "width": 100, - "height": 19, - "rawWidth": 100, - "rawHeight": 19, - "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "0a780": { - "importer": "sprite-frame", - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@0a780", - "displayName": "", - "id": "0a780", - "name": "jiaxue-0", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 7, - "height": 10, - "rawWidth": 7, - "rawHeight": 10, - "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "d2c0d": { - "importer": "sprite-frame", - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@d2c0d", - "displayName": "", - "id": "d2c0d", - "name": "jiaxue-1", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 7, - "trimY": 0, - "width": 7, - "height": 10, - "rawWidth": 7, - "rawHeight": 10, - "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "dfefd": { - "importer": "sprite-frame", - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@dfefd", - "displayName": "", - "id": "dfefd", - "name": "jiaxue-2", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 14, - "trimY": 0, - "width": 7, - "height": 10, - "rawWidth": 7, - "rawHeight": 10, - "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "e3a32": { - "importer": "sprite-frame", - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@e3a32", - "displayName": "", - "id": "e3a32", - "name": "jiaxue-3", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 21, - "trimY": 0, - "width": 7, - "height": 10, - "rawWidth": 7, - "rawHeight": 10, - "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - }, - "5c7dd": { - "importer": "sprite-frame", - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0@5c7dd", - "displayName": "", - "id": "5c7dd", - "name": "jiaxue-5", - "userData": { - "trimType": "auto", - "trimThreshold": 1, - "rotated": false, - "offsetX": 0, - "offsetY": 0, - "trimX": 35, - "trimY": 0, - "width": 7, - "height": 10, - "rawWidth": 7, - "rawHeight": 10, - "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": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a", - "atlasUuid": "2e272fb5-0f2a-459c-853d-e312e14693d0" - }, - "ver": "1.0.12", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "atlasTextureName": "b1.png", - "format": 3, - "uuid": "2e272fb5-0f2a-459c-853d-e312e14693d0", - "textureUuid": "39cde2ed-1c08-46d0-9fe1-ad4c917a7b34@6c48a" - } -} diff --git a/assets/resources/game/skills/buff/b1.png b/assets/resources/game/skills/buff/b1.png deleted file mode 100644 index 218b22f7..00000000 Binary files a/assets/resources/game/skills/buff/b1.png and /dev/null differ diff --git a/assets/resources/game/skills/buff/buff_add.anim b/assets/resources/game/skills/buff/buff_add.anim deleted file mode 100644 index d2d48ef4..00000000 --- a/assets/resources/game/skills/buff/buff_add.anim +++ /dev/null @@ -1,103 +0,0 @@ -[ - { - "__type__": "cc.AnimationClip", - "_name": "buff_add", - "_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__": 6 - }, - "_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.16666666666666666, - 0.3333333333333333, - 0.5, - 0.6666666666666666, - 0.8333333333333334 - ], - "_values": [ - { - "__uuid__": "2e272fb5-0f2a-459c-853d-e312e14693d0@cc2a3", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2e272fb5-0f2a-459c-853d-e312e14693d0@c57d4", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2e272fb5-0f2a-459c-853d-e312e14693d0@d8842", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2e272fb5-0f2a-459c-853d-e312e14693d0@9255d", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2e272fb5-0f2a-459c-853d-e312e14693d0@4bfa2", - "__expectedType__": "cc.SpriteFrame" - }, - { - "__uuid__": "2e272fb5-0f2a-459c-853d-e312e14693d0@40e82", - "__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_add.anim.meta b/assets/resources/game/skills/buff/buff_add.anim.meta deleted file mode 100644 index 543c4bba..00000000 --- a/assets/resources/game/skills/buff/buff_add.anim.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "2.0.3", - "importer": "animation-clip", - "imported": true, - "uuid": "00cf1b0a-8952-433d-87a0-7f3dc167cbef", - "files": [ - ".cconb" - ], - "subMetas": {}, - "userData": { - "name": "buff_add" - } -} diff --git a/assets/resources/game/skills/buff/cd_up.atlas b/assets/resources/game/skills/buff/cd_up.atlas deleted file mode 100644 index 4619f055..00000000 --- a/assets/resources/game/skills/buff/cd_up.atlas +++ /dev/null @@ -1,34 +0,0 @@ - -cd_up.png -size: 121,80 -format: RGBA8888 -filter: Linear,Linear -repeat: none -Icon_Sword02 - rotate: false - xy: 80, 39 - size: 39, 39 - orig: 39, 39 - offset: 0, 0 - index: -1 -buff_0 - rotate: false - xy: 2, 2 - size: 76, 76 - orig: 82, 82 - offset: 3, 3 - index: -1 -buff_1_1 - rotate: false - xy: 80, 4 - size: 29, 33 - orig: 31, 36 - offset: 1, 2 - index: -1 -buff_1_3 - rotate: false - xy: 80, 4 - size: 29, 33 - orig: 31, 36 - offset: 1, 2 - index: -1 diff --git a/assets/resources/game/skills/buff/cd_up.atlas.meta b/assets/resources/game/skills/buff/cd_up.atlas.meta deleted file mode 100644 index 65aa97a5..00000000 --- a/assets/resources/game/skills/buff/cd_up.atlas.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.0.1", - "importer": "*", - "imported": true, - "uuid": "60562de8-1fdc-4b61-a8ae-2726aba94a19", - "files": [ - ".atlas", - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/resources/game/skills/buff/cd_up.json b/assets/resources/game/skills/buff/cd_up.json deleted file mode 100644 index 83be2ea3..00000000 --- a/assets/resources/game/skills/buff/cd_up.json +++ /dev/null @@ -1,90 +0,0 @@ -{ -"skeleton": { - "hash": "u1Kcf+EHdtiLrMlOhOSZHtC8gLI=", - "spine": "3.8.75", - "x": -32.8, - "y": -32.21, - "width": 65.6, - "height": 65.6, - "images": "./images/", - "audio": "" -}, -"bones": [ - { "name": "root", "y": 0.59, "scaleX": 0.8, "scaleY": 0.8 }, - { "name": "main", "parent": "root", "rotation": 43.44 }, - { "name": "bone2", "parent": "root", "x": 15.46, "y": -13.96 }, - { "name": "bone3", "parent": "root", "x": -20.82, "y": 10.06 }, - { "name": "bone", "parent": "root" } -], -"slots": [ - { "name": "buff_0_1", "bone": "root" }, - { "name": "buff_0", "bone": "bone", "attachment": "buff_0" }, - { "name": "buff_1_3", "bone": "bone3", "attachment": "buff_1_3" }, - { "name": "buff_1_6", "bone": "bone3", "attachment": "buff_1_3", "blend": "screen" }, - { "name": "buff_1_2", "bone": "main", "attachment": "Icon_Sword02" }, - { "name": "buff_1_4", "bone": "main", "attachment": "Icon_Sword02", "blend": "screen" }, - { "name": "buff_1_1", "bone": "bone2", "attachment": "buff_1_1" }, - { "name": "buff_1_5", "bone": "bone2", "attachment": "buff_1_1", "blend": "screen" } -], -"skins": [ - { - "name": "default", - "attachments": { - "buff_0": { - "buff_0": { "width": 82, "height": 82 } - }, - "buff_1_1": { - "buff_1_1": { "x": 0.5, "width": 31, "height": 36 } - }, - "buff_1_2": { - "Icon_Sword02": { "x": 0.34, "y": 0.36, "rotation": -43.44, "width": 39, "height": 39 } - }, - "buff_1_3": { - "buff_1_3": { "x": 0.5, "width": 31, "height": 36 } - }, - "buff_1_4": { - "Icon_Sword02": { "x": 0.34, "y": 0.36, "rotation": -43.44, "width": 39, "height": 39 } - }, - "buff_1_5": { - "buff_1_1": { "x": 0.5, "width": 31, "height": 36 } - }, - "buff_1_6": { - "buff_1_3": { "x": 0.5, "width": 31, "height": 36 } - } - } - } -], -"animations": { - "loop": { - "bones": { - "bone2": { - "scale": [ - { "x": 0.929, "y": 0.929, "curve": 0.25, "c3": 0.75 }, - { "time": 0.2333, "x": 1.073, "y": 1.073, "curve": 0.25, "c3": 0.75 }, - { "time": 0.4667, "x": 0.929, "y": 0.929, "curve": 0.25, "c3": 0.75 }, - { "time": 0.7, "x": 1.073, "y": 1.073, "curve": 0.25, "c3": 0.75 }, - { "time": 0.9333, "x": 0.929, "y": 0.929 } - ] - }, - "bone3": { - "scale": [ - { "x": 1.057, "y": 1.057, "curve": 0.38, "c2": 0.53, "c3": 0.745 }, - { "time": 0.1, "curve": 0.25, "c3": 0.75 }, - { "time": 0.3333, "x": 1.14, "y": 1.14, "curve": 0.246, "c3": 0.633, "c4": 0.54 }, - { "time": 0.4667, "x": 1.057, "y": 1.057, "curve": 0.38, "c2": 0.53, "c3": 0.745 }, - { "time": 0.5667, "curve": 0.25, "c3": 0.75 }, - { "time": 0.8, "x": 1.14, "y": 1.14, "curve": 0.246, "c3": 0.633, "c4": 0.54 }, - { "time": 0.9333, "x": 1.057, "y": 1.057 } - ] - }, - "root": { - "translate": [ - { "curve": 0.25, "c3": 0.75 }, - { "time": 0.4667, "y": 4, "curve": 0.25, "c3": 0.75 }, - { "time": 0.9333 } - ] - } - } - } -} -} \ No newline at end of file diff --git a/assets/resources/game/skills/buff/cd_up.json.meta b/assets/resources/game/skills/buff/cd_up.json.meta deleted file mode 100644 index 488e7379..00000000 --- a/assets/resources/game/skills/buff/cd_up.json.meta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ver": "1.2.6", - "importer": "spine-data", - "imported": true, - "uuid": "3f3890f8-95ab-44e3-92b8-6b144223e1d0", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/resources/game/skills/buff/cd_up.png b/assets/resources/game/skills/buff/cd_up.png deleted file mode 100644 index 60db8637..00000000 Binary files a/assets/resources/game/skills/buff/cd_up.png and /dev/null differ diff --git a/assets/resources/game/skills/buff/cd_up.png.meta b/assets/resources/game/skills/buff/cd_up.png.meta deleted file mode 100644 index be5020ba..00000000 --- a/assets/resources/game/skills/buff/cd_up.png.meta +++ /dev/null @@ -1,42 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "4ca8a5ce-8f45-4560-8a62-9870732e4e23", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "4ca8a5ce-8f45-4560-8a62-9870732e4e23@6c48a", - "displayName": "cd_up", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "4ca8a5ce-8f45-4560-8a62-9870732e4e23", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "texture", - "fixAlphaTransparencyArtifacts": false, - "redirect": "4ca8a5ce-8f45-4560-8a62-9870732e4e23@6c48a" - } -} diff --git a/assets/resources/game/skills/buff/crit_up.atlas b/assets/resources/game/skills/buff/crit_up.atlas deleted file mode 100644 index 3ae719be..00000000 --- a/assets/resources/game/skills/buff/crit_up.atlas +++ /dev/null @@ -1,34 +0,0 @@ - -crit_up.png -size: 141,81 -format: RGBA8888 -filter: Linear,Linear -repeat: none -Icon_Fire02 - rotate: false - xy: 80, 33 - size: 59, 46 - orig: 59, 46 - offset: 0, 0 - index: -1 -buff_0 - rotate: false - xy: 2, 3 - size: 76, 76 - orig: 82, 82 - offset: 3, 3 - index: -1 -buff_1_1 - rotate: true - xy: 80, 2 - size: 29, 33 - orig: 31, 36 - offset: 1, 2 - index: -1 -buff_1_3 - rotate: true - xy: 80, 2 - size: 29, 33 - orig: 31, 36 - offset: 1, 2 - index: -1 diff --git a/assets/resources/game/skills/buff/crit_up.atlas.meta b/assets/resources/game/skills/buff/crit_up.atlas.meta deleted file mode 100644 index 8e56b0b9..00000000 --- a/assets/resources/game/skills/buff/crit_up.atlas.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.0.1", - "importer": "*", - "imported": true, - "uuid": "deccfb06-bf4a-4b9e-8e73-031a1f66686f", - "files": [ - ".atlas", - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/resources/game/skills/buff/crit_up.json b/assets/resources/game/skills/buff/crit_up.json deleted file mode 100644 index fd64e09e..00000000 --- a/assets/resources/game/skills/buff/crit_up.json +++ /dev/null @@ -1,90 +0,0 @@ -{ -"skeleton": { - "hash": "lvs4ZvyHfANnPU4Kp+6e51YupD4=", - "spine": "3.8.75", - "x": -32.8, - "y": -32.8, - "width": 65.6, - "height": 65.6, - "images": "./images/", - "audio": "" -}, -"bones": [ - { "name": "root", "scaleX": 0.8, "scaleY": 0.8 }, - { "name": "main", "parent": "root", "rotation": 43.44 }, - { "name": "bone2", "parent": "root", "x": 15.46, "y": -13.96 }, - { "name": "bone3", "parent": "root", "x": -20.82, "y": 10.06 }, - { "name": "bone", "parent": "root" } -], -"slots": [ - { "name": "buff_0_1", "bone": "root" }, - { "name": "buff_0", "bone": "bone", "attachment": "buff_0" }, - { "name": "buff_1_3", "bone": "bone3", "attachment": "buff_1_3" }, - { "name": "buff_1_6", "bone": "bone3", "attachment": "buff_1_3", "blend": "screen" }, - { "name": "buff_1_2", "bone": "main", "attachment": "Icon_Fire02" }, - { "name": "buff_1_4", "bone": "main", "attachment": "Icon_Fire02", "blend": "screen" }, - { "name": "buff_1_1", "bone": "bone2", "attachment": "buff_1_1" }, - { "name": "buff_1_5", "bone": "bone2", "attachment": "buff_1_1", "blend": "screen" } -], -"skins": [ - { - "name": "default", - "attachments": { - "buff_0": { - "buff_0": { "width": 82, "height": 82 } - }, - "buff_1_1": { - "buff_1_1": { "x": 0.5, "width": 31, "height": 36 } - }, - "buff_1_2": { - "Icon_Fire02": { "x": 0.34, "y": 0.36, "rotation": -43.44, "width": 59, "height": 46 } - }, - "buff_1_3": { - "buff_1_3": { "x": 0.5, "width": 31, "height": 36 } - }, - "buff_1_4": { - "Icon_Fire02": { "x": 0.34, "y": 0.36, "rotation": -43.44, "width": 59, "height": 46 } - }, - "buff_1_5": { - "buff_1_1": { "x": 0.5, "width": 31, "height": 36 } - }, - "buff_1_6": { - "buff_1_3": { "x": 0.5, "width": 31, "height": 36 } - } - } - } -], -"animations": { - "loop": { - "bones": { - "bone2": { - "scale": [ - { "x": 0.929, "y": 0.929, "curve": 0.25, "c3": 0.75 }, - { "time": 0.2333, "x": 1.073, "y": 1.073, "curve": 0.25, "c3": 0.75 }, - { "time": 0.4667, "x": 0.929, "y": 0.929, "curve": 0.25, "c3": 0.75 }, - { "time": 0.7, "x": 1.073, "y": 1.073, "curve": 0.25, "c3": 0.75 }, - { "time": 0.9333, "x": 0.929, "y": 0.929 } - ] - }, - "bone3": { - "scale": [ - { "x": 1.057, "y": 1.057, "curve": 0.38, "c2": 0.53, "c3": 0.745 }, - { "time": 0.1, "curve": 0.25, "c3": 0.75 }, - { "time": 0.3333, "x": 1.14, "y": 1.14, "curve": 0.246, "c3": 0.633, "c4": 0.54 }, - { "time": 0.4667, "x": 1.057, "y": 1.057, "curve": 0.38, "c2": 0.53, "c3": 0.745 }, - { "time": 0.5667, "curve": 0.25, "c3": 0.75 }, - { "time": 0.8, "x": 1.14, "y": 1.14, "curve": 0.246, "c3": 0.633, "c4": 0.54 }, - { "time": 0.9333, "x": 1.057, "y": 1.057 } - ] - }, - "root": { - "translate": [ - { "curve": 0.25, "c3": 0.75 }, - { "time": 0.4667, "y": 4, "curve": 0.25, "c3": 0.75 }, - { "time": 0.9333 } - ] - } - } - } -} -} \ No newline at end of file diff --git a/assets/resources/game/skills/buff/crit_up.json.meta b/assets/resources/game/skills/buff/crit_up.json.meta deleted file mode 100644 index ec249f38..00000000 --- a/assets/resources/game/skills/buff/crit_up.json.meta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ver": "1.2.6", - "importer": "spine-data", - "imported": true, - "uuid": "10f1c534-e608-4b93-b5ef-9167d6a511b2", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/resources/game/skills/buff/crit_up.png b/assets/resources/game/skills/buff/crit_up.png deleted file mode 100644 index 31266dbc..00000000 Binary files a/assets/resources/game/skills/buff/crit_up.png and /dev/null differ diff --git a/assets/resources/game/skills/buff/crit_up.png.meta b/assets/resources/game/skills/buff/crit_up.png.meta deleted file mode 100644 index d73f08bd..00000000 --- a/assets/resources/game/skills/buff/crit_up.png.meta +++ /dev/null @@ -1,42 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "430eda2a-27f2-41ff-a2c7-bd67d699ea0f", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "430eda2a-27f2-41ff-a2c7-bd67d699ea0f@6c48a", - "displayName": "crit_up", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "430eda2a-27f2-41ff-a2c7-bd67d699ea0f", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "texture", - "fixAlphaTransparencyArtifacts": false, - "redirect": "430eda2a-27f2-41ff-a2c7-bd67d699ea0f@6c48a" - } -} diff --git a/assets/resources/game/skills/buff/def_up.atlas b/assets/resources/game/skills/buff/def_up.atlas deleted file mode 100644 index 509aca63..00000000 --- a/assets/resources/game/skills/buff/def_up.atlas +++ /dev/null @@ -1,34 +0,0 @@ - -def_up.png -size: 135,88 -format: RGBA8888 -filter: Linear,Linear -repeat: none -Icon_Shield - rotate: false - xy: 80, 33 - size: 53, 53 - orig: 53, 53 - offset: 0, 0 - index: -1 -buff_0 - rotate: false - xy: 2, 10 - size: 76, 76 - orig: 82, 82 - offset: 3, 3 - index: -1 -buff_1_1 - rotate: true - xy: 80, 2 - size: 29, 33 - orig: 31, 36 - offset: 1, 2 - index: -1 -buff_1_3 - rotate: true - xy: 80, 2 - size: 29, 33 - orig: 31, 36 - offset: 1, 2 - index: -1 diff --git a/assets/resources/game/skills/buff/def_up.atlas.meta b/assets/resources/game/skills/buff/def_up.atlas.meta deleted file mode 100644 index a9e0f387..00000000 --- a/assets/resources/game/skills/buff/def_up.atlas.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.0.1", - "importer": "*", - "imported": true, - "uuid": "5522dff4-e8bb-4a1c-bbee-42499400066a", - "files": [ - ".atlas", - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/resources/game/skills/buff/def_up.json b/assets/resources/game/skills/buff/def_up.json deleted file mode 100644 index 3c2f9a4a..00000000 --- a/assets/resources/game/skills/buff/def_up.json +++ /dev/null @@ -1,90 +0,0 @@ -{ -"skeleton": { - "hash": "dH6pKhTB/o05k6Za95T509y6ka4=", - "spine": "3.8.75", - "x": -32.8, - "y": -32.8, - "width": 65.6, - "height": 65.6, - "images": "./images/", - "audio": "" -}, -"bones": [ - { "name": "root", "scaleX": 0.8, "scaleY": 0.8 }, - { "name": "main", "parent": "root", "rotation": 43.44 }, - { "name": "bone2", "parent": "root", "x": 15.46, "y": -13.96 }, - { "name": "bone3", "parent": "root", "x": -20.82, "y": 10.06 }, - { "name": "bone", "parent": "root" } -], -"slots": [ - { "name": "buff_0_1", "bone": "root" }, - { "name": "buff_0", "bone": "bone", "attachment": "buff_0" }, - { "name": "buff_1_3", "bone": "bone3", "attachment": "buff_1_3" }, - { "name": "buff_1_6", "bone": "bone3", "attachment": "buff_1_3", "blend": "screen" }, - { "name": "buff_1_2", "bone": "main", "attachment": "Icon_Shield" }, - { "name": "buff_1_4", "bone": "main", "attachment": "Icon_Shield", "blend": "screen" }, - { "name": "buff_1_1", "bone": "bone2", "attachment": "buff_1_1" }, - { "name": "buff_1_5", "bone": "bone2", "attachment": "buff_1_1", "blend": "screen" } -], -"skins": [ - { - "name": "default", - "attachments": { - "buff_0": { - "buff_0": { "width": 82, "height": 82 } - }, - "buff_1_1": { - "buff_1_1": { "x": 0.5, "width": 31, "height": 36 } - }, - "buff_1_2": { - "Icon_Shield": { "x": 0.34, "y": 0.36, "rotation": -43.44, "width": 53, "height": 53 } - }, - "buff_1_3": { - "buff_1_3": { "x": 0.5, "width": 31, "height": 36 } - }, - "buff_1_4": { - "Icon_Shield": { "x": 0.34, "y": 0.36, "rotation": -43.44, "width": 53, "height": 53 } - }, - "buff_1_5": { - "buff_1_1": { "x": 0.5, "width": 31, "height": 36 } - }, - "buff_1_6": { - "buff_1_3": { "x": 0.5, "width": 31, "height": 36 } - } - } - } -], -"animations": { - "loop": { - "bones": { - "bone2": { - "scale": [ - { "x": 0.929, "y": 0.929, "curve": 0.25, "c3": 0.75 }, - { "time": 0.2333, "x": 1.073, "y": 1.073, "curve": 0.25, "c3": 0.75 }, - { "time": 0.4667, "x": 0.929, "y": 0.929, "curve": 0.25, "c3": 0.75 }, - { "time": 0.7, "x": 1.073, "y": 1.073, "curve": 0.25, "c3": 0.75 }, - { "time": 0.9333, "x": 0.929, "y": 0.929 } - ] - }, - "bone3": { - "scale": [ - { "x": 1.057, "y": 1.057, "curve": 0.38, "c2": 0.53, "c3": 0.745 }, - { "time": 0.1, "curve": 0.25, "c3": 0.75 }, - { "time": 0.3333, "x": 1.14, "y": 1.14, "curve": 0.246, "c3": 0.633, "c4": 0.54 }, - { "time": 0.4667, "x": 1.057, "y": 1.057, "curve": 0.38, "c2": 0.53, "c3": 0.745 }, - { "time": 0.5667, "curve": 0.25, "c3": 0.75 }, - { "time": 0.8, "x": 1.14, "y": 1.14, "curve": 0.246, "c3": 0.633, "c4": 0.54 }, - { "time": 0.9333, "x": 1.057, "y": 1.057 } - ] - }, - "root": { - "translate": [ - { "curve": 0.25, "c3": 0.75 }, - { "time": 0.4667, "y": 4, "curve": 0.25, "c3": 0.75 }, - { "time": 0.9333 } - ] - } - } - } -} -} \ No newline at end of file diff --git a/assets/resources/game/skills/buff/def_up.json.meta b/assets/resources/game/skills/buff/def_up.json.meta deleted file mode 100644 index 4ff11f54..00000000 --- a/assets/resources/game/skills/buff/def_up.json.meta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ver": "1.2.6", - "importer": "spine-data", - "imported": true, - "uuid": "4c5cb1cc-5985-4ebe-918c-61fd50774b2f", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/resources/game/skills/buff/def_up.png b/assets/resources/game/skills/buff/def_up.png deleted file mode 100644 index ef6db68e..00000000 Binary files a/assets/resources/game/skills/buff/def_up.png and /dev/null differ diff --git a/assets/resources/game/skills/buff/def_up.png.meta b/assets/resources/game/skills/buff/def_up.png.meta deleted file mode 100644 index 72a69290..00000000 --- a/assets/resources/game/skills/buff/def_up.png.meta +++ /dev/null @@ -1,42 +0,0 @@ -{ - "ver": "1.0.26", - "importer": "image", - "imported": true, - "uuid": "a15784ea-b7aa-4a7f-a3c5-6214416b0c07", - "files": [ - ".json", - ".png" - ], - "subMetas": { - "6c48a": { - "importer": "texture", - "uuid": "a15784ea-b7aa-4a7f-a3c5-6214416b0c07@6c48a", - "displayName": "def_up", - "id": "6c48a", - "name": "texture", - "userData": { - "wrapModeS": "repeat", - "wrapModeT": "repeat", - "minfilter": "linear", - "magfilter": "linear", - "mipfilter": "none", - "anisotropy": 0, - "isUuid": true, - "imageUuidOrDatabaseUri": "a15784ea-b7aa-4a7f-a3c5-6214416b0c07", - "visible": false - }, - "ver": "1.0.22", - "imported": true, - "files": [ - ".json" - ], - "subMetas": {} - } - }, - "userData": { - "hasAlpha": true, - "type": "texture", - "fixAlphaTransparencyArtifacts": false, - "redirect": "a15784ea-b7aa-4a7f-a3c5-6214416b0c07@6c48a" - } -} diff --git a/assets/resources/game/skills/buff2.prefab b/assets/resources/game/skills/buff2.prefab deleted file mode 100644 index 40230881..00000000 --- a/assets/resources/game/skills/buff2.prefab +++ /dev/null @@ -1,271 +0,0 @@ -[ - { - "__type__": "cc.Prefab", - "_name": "buff2", - "_objFlags": 0, - "__editorExtras__": {}, - "_native": "", - "data": { - "__id__": 1 - }, - "optimizationPolicy": 0, - "persistent": false - }, - { - "__type__": "cc.Node", - "_name": "buff2", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": null, - "_children": [ - { - "__id__": 2 - } - ], - "_active": true, - "_components": [ - { - "__id__": 10 - } - ], - "_prefab": { - "__id__": 12 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 3.317, - "y": 48.724, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "buff-n-0", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 3 - }, - { - "__id__": 5 - }, - { - "__id__": 7 - } - ], - "_prefab": { - "__id__": 9 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 1, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 4 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 84, - "height": 84 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d7b/DUpjJNSKVX7O8hzniN" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 6 - }, - "_customMaterial": null, - "_srcBlendFactor": 2, - "_dstBlendFactor": 4, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_spriteFrame": { - "__uuid__": "2e272fb5-0f2a-459c-853d-e312e14693d0@cc2a3", - "__expectedType__": "cc.SpriteFrame" - }, - "_type": 0, - "_fillType": 0, - "_sizeMode": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_useGrayscale": false, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "8ccnp8T85P15Gy83fQ6GoY" - }, - { - "__type__": "cc.Animation", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 2 - }, - "_enabled": true, - "__prefab": { - "__id__": 8 - }, - "playOnLoad": true, - "_clips": [ - { - "__uuid__": "00cf1b0a-8952-433d-87a0-7f3dc167cbef", - "__expectedType__": "cc.AnimationClip" - } - ], - "_defaultClip": { - "__uuid__": "00cf1b0a-8952-433d-87a0-7f3dc167cbef", - "__expectedType__": "cc.AnimationClip" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "48GVh3ehlMqKFFeTGwLsiP" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "5fgTcBE1hGQ7BzL0V9k+AN", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 100, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "2bHSCaSYdP1L1hw6n74Vml" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "2e1WXUIxlLWLT5zBlbV6nF", - "instance": null, - "targetOverrides": null - } -] \ No newline at end of file diff --git a/assets/resources/game/skills/dadao.prefab b/assets/resources/game/skills/dadao.prefab index 5a3b6f80..440b8599 100644 --- a/assets/resources/game/skills/dadao.prefab +++ b/assets/resources/game/skills/dadao.prefab @@ -49,7 +49,7 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 5, + "y": 0, "z": 0 }, "_lrot": { @@ -100,15 +100,15 @@ "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": 30, + "y": 0, "z": 0 }, "_lrot": { "__type__": "cc.Quat", "x": 0, "y": 0, - "z": 0.42261826174069944, - "w": 0.9063077870366499 + "z": 0.7071067811865475, + "w": 0.7071067811865476 }, "_lscale": { "__type__": "cc.Vec3", @@ -122,7 +122,7 @@ "__type__": "cc.Vec3", "x": 0, "y": 0, - "z": 50 + "z": 90 }, "_id": "" }, @@ -162,8 +162,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 2, - "y": 2, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -190,8 +190,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 144, - "height": 48 + "width": 238, + "height": 80 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -227,7 +227,7 @@ "a": 255 }, "_spriteFrame": { - "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@1615b", + "__uuid__": "bacd2847-dd53-4572-9d68-c78c06a4eecc@1615b", "__expectedType__": "cc.SpriteFrame" }, "_type": 0, @@ -317,12 +317,12 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 600, - "height": 100 + "width": 400, + "height": 200 }, "_anchorPoint": { "__type__": "cc.Vec2", - "x": 0.5, + "x": 0, "y": 0.5 }, "_id": "" @@ -385,13 +385,13 @@ "_restitution": 0, "_offset": { "__type__": "cc.Vec2", - "x": 0, + "x": 200, "y": 0 }, "_size": { "__type__": "cc.Size", - "width": 600, - "height": 100 + "width": 400, + "height": 200 }, "_id": "" }, diff --git a/assets/resources/game/skills/patk.prefab b/assets/resources/game/skills/patk.prefab index 6e9b1449..4f8bccfa 100644 --- a/assets/resources/game/skills/patk.prefab +++ b/assets/resources/game/skills/patk.prefab @@ -38,13 +38,10 @@ }, { "__id__": 20 - }, - { - "__id__": 22 } ], "_prefab": { - "__id__": 24 + "__id__": 22 }, "_lpos": { "__type__": "cc.Vec3", @@ -417,35 +414,6 @@ "__type__": "cc.CompPrefabInfo", "fileId": "8ahZv91itPcYJm8S0veHYl" }, - { - "__type__": "cc.Animation", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 21 - }, - "playOnLoad": true, - "_clips": [ - { - "__uuid__": "c51459fd-7bf0-42cf-9a36-620f6d6b00b9", - "__expectedType__": "cc.AnimationClip" - } - ], - "_defaultClip": { - "__uuid__": "c51459fd-7bf0-42cf-9a36-620f6d6b00b9", - "__expectedType__": "cc.AnimationClip" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "a5NNgxWupMNKFQIq6nHEwd" - }, { "__type__": "3a728/XIrpLz7uIWIOQNGox", "_name": "", @@ -456,7 +424,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 23 + "__id__": 21 }, "_id": "" }, diff --git a/assets/resources/game/skills/skill_tx.anim.meta b/assets/resources/game/skills/skill_tx.anim.meta deleted file mode 100644 index 50f7382f..00000000 --- a/assets/resources/game/skills/skill_tx.anim.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "2.0.3", - "importer": "animation-clip", - "imported": true, - "uuid": "aad6cf63-5eb6-4e5f-9ff5-d798558e99a0", - "files": [ - ".cconb" - ], - "subMetas": {}, - "userData": { - "name": "skill_tx" - } -} diff --git a/assets/resources/game/skills/sword1.prefab.meta b/assets/resources/game/skills/sword1.prefab.meta deleted file mode 100644 index 28389d67..00000000 --- a/assets/resources/game/skills/sword1.prefab.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.50", - "importer": "prefab", - "imported": true, - "uuid": "0068f82c-b136-47ca-b9f2-4486f4dffcff", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": { - "syncNodeName": "sword1" - } -} diff --git a/assets/script/Main.ts b/assets/script/Main.ts index 93631133..bbb006f4 100644 --- a/assets/script/Main.ts +++ b/assets/script/Main.ts @@ -18,7 +18,7 @@ export class Main extends Root { // // | EPhysics2DDrawFlags.Pair // |EPhysics2DDrawFlags.CenterOfMass // |EPhysics2DDrawFlags.Joint - // |EPhysics2DDrawFlags.Shape; + |EPhysics2DDrawFlags.Shape; // console.log("PhysicsSystem2D",PhysicsSystem2D.instance.gravity) } protected async run() { diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts index 2fde2db1..43d06e76 100644 --- a/assets/script/game/common/config/SkillSet.ts +++ b/assets/script/game/common/config/SkillSet.ts @@ -28,31 +28,37 @@ run:number = 0; // 0有目标 带方向，1贝塞尔曲线 2 不动 ,3 直线 */ export const SkillSet={ - 6001:{uuid: 6001,path: "6001",type: 1,tg:3,angle:true,upcost:2,name: "火球术",sp_name:"fire",info:"释放一个火球术攻击敌人", - in:0.2,count:1,ap:10,hp:0,shield:0,sd:10,cd:3,bsd:0,bcd:0,sk_uuid:6001,sk_count:0,speed:300, }, + - 6002:{uuid: 6002,path: "6002",type: 1,tg:3,angle:true,upcost:2,name: "寒冰箭",sp_name:"ice",info:"释放一个寒冰箭攻击敌人", - in:0.2,count:1,ap:10,hp:0,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:6001,sk_count:0,speed:300, }, + 6001:{uuid: 6001,path: "6001",type: 1,tg:3,angle:true,upcost:2,name: "寒冰弹",sp_name:"ball_blue",info:"释放一个火球术攻击敌人", + in:0.2,count:1,ap:10,hp:0,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:6001,sk_count:0,speed:300, }, - 6003:{uuid: 6003,path: "6003",type: 1,tg:3,angle:true,upcost:2,name: "强效射击",sp_name:"b_arrow",info:"释放一个火球术攻击敌人", - in:0.2,count:1,ap:10,hp:0,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:6001,sk_count:0,speed:300, }, + 6002:{uuid: 6002,path: "6002",type: 1,tg:3,angle:true,upcost:2,name: "火焰弹",sp_name:"ball_red",info:"释放一个火球术攻击敌人", + in:0.2,count:1,ap:10,hp:0,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:6001,sk_count:0,speed:300, }, - 6004:{uuid: 6004,path: "6004",type: 1,tg:3,angle:true,upcost:2,name: "奥术冲击",sp_name:"bm_ball",info:"释放一个寒冰箭攻击敌人", - in:0.2,count:1,ap:10,hp:0,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:6001,sk_count:0,speed:300, }, + 6003:{uuid: 6003,path: "6003",type: 1,tg:3,angle:true,upcost:2,name: "魔法弹",sp_name:"ball_green",info:"释放一个火球术攻击敌人", + in:0.2,count:1,ap:10,hp:0,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:6001,sk_count:0,speed:300, }, - 6005:{uuid: 6005,path: "6005",type: 1,tg:3,angle:true,upcost:2,name: "无形剑气",sp_name:"patk",info:"释放无形剑气攻击前方直线100码的敌人", - in:0.2,count:1,ap:0,hp:0,shield:0,sd:0,cd:0,bsd:0,bcd:0,sk_uuid:6001,sk_count:0,speed:300,}, - 6006:{uuid: 6006,path: "6005",type: 1,tg:3,angle:true,upcost:2,name: "有形剑气",sp_name:"dadao",info:"释放有形剑气攻击前方直线300码的敌人", - in:0.5,count:1,ap:0,hp:0,shield:0,sd:0,cd:0,bsd:0,bcd:0,sk_uuid:6001,sk_count:0,speed:300,}, - - 6101:{uuid: 6101,path: "6101",type: 91,tg:1,angle:false,upcost:2,name: "治愈术",sp_name:"heath",info:"释放一个寒冰箭攻击敌人", - in:0.2,count:1,ap:0,hp:3,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:6001,sk_count:0,speed:300, }, + 6004:{uuid: 6004,path: "6004",type: 1,tg:3,angle:true,upcost:2,name: "圣光弹",sp_name:"ball_yellow",info:"释放一个火球术攻击敌人", + in:0.2,count:1,ap:10,hp:0,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:6001,sk_count:0,speed:300, }, - 6102:{uuid: 6102,path: "6102",type: 91,tg:0,angle:false,upcost:2,name: "魔法盾",sp_name:"shield",info:"释放一个寒冰箭攻击敌人", - in:0.2,count:1,ap:0,hp:0,shield:1,sd:0,cd:0,bsd:8,bcd:0,sk_uuid:6001,sk_count:0,speed:300, }, + 6005:{uuid: 6005,path: "6005",type: 1,tg:3,angle:true,upcost:2,name: "无形剑气",sp_name:"patk",info:"释放无形剑气攻击前方直线100码的敌人", + in:0.2,count:1,ap:0,hp:0,shield:0,sd:0,cd:0,bsd:0,bcd:0,sk_uuid:6001,sk_count:0,speed:300,}, - 6103:{uuid: 6103,path: "6103",type: 91,tg:0,angle:false,upcost:2,name: "狂暴",sp_name:"atkup",info:"释放一个寒冰箭攻击敌人", - in:0.2,count:1,ap:1,hp:0,shield:0,sd:0,cd:0,bsd:8,bcd:0,sk_uuid:6001,sk_count:0,speed:300, }, + 6006:{uuid: 6006,path: "6006",type: 1,tg:3,angle:true,upcost:2,name: "射击",sp_name:"arrow",info:"释放无形剑气攻击前方直线100码的敌人", + in:0.2,count:1,ap:0,hp:0,shield:0,sd:0,cd:0,bsd:0,bcd:0,sk_uuid:6001,sk_count:0,speed:300,}, + + 6011:{uuid: 6011,path: "6011",type: 1,tg:3,angle:true,upcost:2,name: "有形剑气",sp_name:"dadao",info:"释放有形剑气攻击前方直线300码的敌人", + in:0.5,count:1,ap:0,hp:0,shield:0,sd:0,cd:0,bsd:0,bcd:0,sk_uuid:6001,sk_count:0,speed:300,}, + + 6101:{uuid: 6101,path: "6101",type: 91,tg:1,angle:false,upcost:2,name: "治愈术",sp_name:"heath",info:"释放一个寒冰箭攻击敌人", + in:0.5,count:1,ap:0,hp:3,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:6001,sk_count:0,speed:300, }, + + 6102:{uuid: 6102,path: "6102",type: 91,tg:0,angle:false,upcost:2,name: "魔法盾",sp_name:"shield",info:"释放一个寒冰箭攻击敌人", + in:0.2,count:1,ap:0,hp:0,shield:1,sd:0,cd:0,bsd:8,bcd:0,sk_uuid:6001,sk_count:0,speed:300, }, + + 6103:{uuid: 6103,path: "6103",type: 91,tg:0,angle:false,upcost:2,name: "狂暴",sp_name:"atkup",info:"释放一个寒冰箭攻击敌人", + in:0.2,count:1,ap:1,hp:0,shield:0,sd:0,cd:0,bsd:8,bcd:0,sk_uuid:6001,sk_count:0,speed:300, }, } diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts index 133bdc17..63abab58 100644 --- a/assets/script/game/common/config/heroSet.ts +++ b/assets/script/game/common/config/heroSet.ts @@ -50,7 +50,7 @@ export const HeroInfo = { //坦克， 高防 ，攻击时有可能冲击目标，造成70% 攻击伤害 5001: { uuid:5001,name: "灰烬使者",path:"k1",quality:3,kind:1,type:0,hp:200,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:180,a_cd:1.5, - lvexp:100,slvexp:10,slv:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6006,6006,6006,6006,6006,6006],sk2:[6006,6006,6006,6006,6006,6006],sk3:[6006,6006,6006,6006,6006,6006],pw:0,pwm:150,pws:10,apw:10,uapw:10,cpw:10,dpw:10,dopw:10, + lvexp:100,slvexp:10,slv:0, speed: 100,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6011,6011,6011,6011,6011,6011],sk3:[6011,6011,6011,6011,6011,6011],pw:0,pwm:150,pws:10,apw:10,uapw:10,cpw:10,dpw:10,dopw:10, akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001, tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"] @@ -94,7 +94,7 @@ export const HeroInfo = { }, 5007: { uuid:5007,name: "冰法",path:"m1",quality:3,kind:2,type:1,hp:200,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5, - lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6006,6006,6006,6006,6006,6006],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, + lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6001,6001,6001,6001,6001,6001],sk2:[6001,6001,6001,6001,6001,6001],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001, tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"] @@ -108,56 +108,56 @@ export const HeroInfo = { }, 5009: { uuid:5009,name: "火法",path:"m3",quality:3,kind:2,type:1,hp:200,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5, - lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6006,6006,6006,6006,6006,6006],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, + lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6002,6002,6002,6002,6002,6002],sk2:[6002,6002,6002,6002,6002,6002],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001, tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"] }, 5010: { uuid:5010,name: "牧师",path:"h1",quality:3,kind:2,type:1,hp:200,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5, - lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6006,6006,6006,6006,6006,6006],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, + lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6004,6004,6004,6004,6004,6004],sk2:[6004,6004,6004,6004,6004,6004],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001, tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"] }, 5011: { uuid:5011,name: "冰精灵",path:"ice1",quality:3,kind:2,type:1,hp:200,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5, - lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6006,6006,6006,6006,6006,6006],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, + lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6001,6001,6001,6001,6001,6001],sk2:[6001,6001,6001,6001,6001,6001],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001, tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"] }, 5012: { uuid:5012,name: "船长",path:"cz1",quality:3,kind:2,type:1,hp:200,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5, - lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6006,6006,6006,6006,6006,6006],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, + lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001, tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"] }, 5013: { uuid:5013,name: "风暴斧",path:"ft1",quality:3,kind:2,type:1,hp:200,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5, - lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6006,6006,6006,6006,6006,6006],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, + lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001, tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"] }, 5014: { uuid:5014,name: "召唤师",path:"zh1",quality:3,kind:2,type:1,hp:200,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5, - lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6006,6006,6006,6006,6006,6006],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, + lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6003,6003,6003,6003,6003,6003],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001, tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"] }, 5015: { uuid:5015,name: "死灵法师",path:"zh2",quality:3,kind:2,type:1,hp:200,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5, - lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6006,6006,6006,6006,6006,6006],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, + lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6003,6003,6003,6003,6003,6003],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001, tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"] }, 5016: { uuid:5016,name: "下忍",path:"n1",quality:3,kind:2,type:1,hp:200,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5, - lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6006,6006,6006,6006,6006,6006],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, + lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001, tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"] @@ -165,14 +165,14 @@ export const HeroInfo = { 5017: { uuid:5017,name: "德鲁伊",path:"d1",quality:3,kind:2,type:1,hp:200,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5, - lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6006,6006,6006,6006,6006,6006],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, + lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6003,6003,6003,6003,6003,6003],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001, tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"] }, 5018: { uuid:5018,name: "猎人",path:"d2",quality:3,kind:2,type:1,hp:200,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5, - lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6006,6006,6006,6006,6006,6006],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, + lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6003,6003,6003,6003,6003,6003],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001, tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"] @@ -186,7 +186,7 @@ export const HeroInfo = { }, 5020: { uuid:5020,name: "亚瑟王",path:"k5",quality:3,kind:2,type:1,hp:200,hp_up:10, shp_up:20,def:10,def_up:1,sdef_up:20,ap:20,ap_up:2,sap_up:20,atp:1,vun:0,crit:20,crit_add:0,ucr:0,dodge:0,dis:300,a_cd:1.5, - lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6006,6006,6006,6006,6006,6006],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, + lvexp:100,slvexp:10,slv:0, speed: 50,aexp:5,uaexp:1,cexp:10,doexp:10,dexp:20,sk1:[6005,6005,6005,6005,6005,6005],sk2:[6102,6102,6102,6102,6102,6102],sk3:[6102,6102,6102,6102,6102,6102],pw:0,pwm:150,pws:10,apw:0,uapw:0,cpw:0,dpw:0,dopw:0, akr:[10,20,30,40,50,60],akc:[1,1,1,1,1,1],uar:[10,20,30,40,50,60],uac:[1,1,1,1,1,1],dgr:[10,20,30,40,50,60],dgc:[1,1,1,1,1,1],crr:[10,20,30,40,50,60],crc:[1,1,1,1,1,1], abh:0,abc:0,uabh:0,uabc:0,cbh:0,cbc:0,aua:0,auc:0,uaua:0,uauc:0,cua:0,cuc:0,wp:1001,arm:2001,ring:3001,shoes:4001, tals:["这是一级说明","这是二级说明","这是三级说明","这是四级说明","这是五级说明"] diff --git a/assets/script/game/hero/HeroViewComp.ts b/assets/script/game/hero/HeroViewComp.ts index 71bc7b94..3d1d9743 100644 --- a/assets/script/game/hero/HeroViewComp.ts +++ b/assets/script/game/hero/HeroViewComp.ts @@ -169,7 +169,7 @@ export class HeroViewComp extends CCComp { 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); + console.log(Date.now()+this.hero_name+":"+this.uuid+' onBeginContact: '+skill.uuid); if(this.hp <= 0 ) return this.check_uatk(skill); } diff --git a/assets/script/game/skills/SkillCom.ts b/assets/script/game/skills/SkillCom.ts index 108ac041..f1f91a2f 100644 --- a/assets/script/game/skills/SkillCom.ts +++ b/assets/script/game/skills/SkillCom.ts @@ -4,6 +4,7 @@ import { CCComp } from "../../../../extensions/oops-plugin-framework/assets/modu import { BoxSet } from "../common/config/BoxSet"; import { smc } from "../common/SingletonModuleComp"; import { Timer } from "../../../../extensions/oops-plugin-framework/assets/core/common/timer/Timer"; +import { HeroViewComp } from "../hero/HeroViewComp"; const { ccclass, property } = _decorator; @@ -26,6 +27,7 @@ export class SkillCom extends CCComp { box_tag:number=0; type:number = 1; in_time:number = 0.3; // 不动技能持续时间 + enemys:any = []; start() { this.node.active=true let collider = this.getComponent(Collider2D); @@ -42,6 +44,19 @@ export class SkillCom extends CCComp { onBeginContact (selfCollider: Collider2D, otherCollider: Collider2D, contact: IPhysics2DContact | null) { if(otherCollider.group != selfCollider.group&&otherCollider.tag ==0){ this.atk_count+=1 + // console.log("skill onBeginContact",otherCollider.node.getComponent(HeroViewComp).uuid) + // let uid=otherCollider.node.getComponent(HeroViewComp).uuid + // const count = this.enemys.filter(enemy => enemy.uid === uid).length; + // if(count==0){ + // // otherCollider.node.getComponent(HeroViewComp).check_uatk(this) + // console.log("count==0",otherCollider.node.getComponent(HeroViewComp).uuid) + // this.enemys.push(uid) + // } + + + // if(this.type==1 ){ + // this.is_destroy=true + // } // console.log("skill onBeginContact",selfCollider.group,otherCollider.group) // if(this.type==1 ){ // this.is_destroy=true