diff --git a/assets/resources/game/skills/atk1/poweratk.anim b/assets/resources/game/skills/atk1/poweratk.anim new file mode 100644 index 00000000..635f153f --- /dev/null +++ b/assets/resources/game/skills/atk1/poweratk.anim @@ -0,0 +1,88 @@ +[ + { + "__type__": "cc.AnimationClip", + "_name": "poweratk", + "_objFlags": 0, + "__editorExtras__": { + "embeddedPlayerGroups": [] + }, + "_native": "", + "sample": 24, + "speed": 1, + "wrapMode": 2, + "enableTrsBlending": false, + "_duration": 0.20833333333333334, + "_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, + 0.16666666666666666 + ], + "_values": [ + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@c30fb", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@c86cc", + "__expectedType__": "cc.SpriteFrame" + }, + { + "__uuid__": "45af5702-7585-4d72-85cf-d7b8da02d832@e7223", + "__expectedType__": "cc.SpriteFrame" + } + ] + }, + { + "__type__": "cc.AnimationClipAdditiveSettings", + "enabled": false, + "refClip": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skills/atk1/poweratk.anim.meta b/assets/resources/game/skills/atk1/poweratk.anim.meta new file mode 100644 index 00000000..a7e76c33 --- /dev/null +++ b/assets/resources/game/skills/atk1/poweratk.anim.meta @@ -0,0 +1,13 @@ +{ + "ver": "2.0.3", + "importer": "animation-clip", + "imported": true, + "uuid": "0e4f52b7-c12d-4ee8-9a1f-453d625dca5a", + "files": [ + ".cconb" + ], + "subMetas": {}, + "userData": { + "name": "poweratk" + } +} diff --git a/assets/resources/game/skills/b_atk.prefab b/assets/resources/game/skills/b_atk.prefab new file mode 100644 index 00000000..bfcc0ec0 --- /dev/null +++ b/assets/resources/game/skills/b_atk.prefab @@ -0,0 +1,366 @@ +[ + { + "__type__": "cc.Prefab", + "_name": "b_atk", + "_objFlags": 0, + "__editorExtras__": {}, + "_native": "", + "data": { + "__id__": 1 + }, + "optimizationPolicy": 0, + "persistent": false + }, + { + "__type__": "cc.Node", + "_name": "b_atk", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": null, + "_children": [ + { + "__id__": 2 + } + ], + "_active": true, + "_components": [ + { + "__id__": 10 + }, + { + "__id__": 12 + }, + { + "__id__": 14 + }, + { + "__id__": 16 + } + ], + "_prefab": { + "__id__": 18 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "1", + "_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": 0.3, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 4 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 220, + "height": 62 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "54XuPQkT1F5r577uJ9DF7y" + }, + { + "__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__": "45af5702-7585-4d72-85cf-d7b8da02d832@c30fb", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 1, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "44Wj4iS6RKTaShTlDoAgZc" + }, + { + "__type__": "cc.Animation", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 2 + }, + "_enabled": true, + "__prefab": { + "__id__": 8 + }, + "playOnLoad": false, + "_clips": [ + { + "__uuid__": "0e4f52b7-c12d-4ee8-9a1f-453d625dca5a", + "__expectedType__": "cc.AnimationClip" + } + ], + "_defaultClip": { + "__uuid__": "0e4f52b7-c12d-4ee8-9a1f-453d625dca5a", + "__expectedType__": "cc.AnimationClip" + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "06CnaNgitIU4LA21ovmhwE" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "72bewQVOVCXapmpWV8T9GZ", + "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": 40, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.49664333316829656, + "y": 0.5156666649712457 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "63NP9yq3hEUKD/OZZZ5t7x" + }, + { + "__type__": "cc.RigidBody2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "enabledContactListener": true, + "bullet": true, + "awakeOnLoad": true, + "_group": 4, + "_type": 2, + "_allowSleep": false, + "_gravityScale": 0, + "_linearDamping": 0, + "_angularDamping": 0, + "_linearVelocity": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_angularVelocity": 0, + "_fixedRotation": false, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "f1VxV09PdOkofzgGv1tsZE" + }, + { + "__type__": "cc.BoxCollider2D", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 15 + }, + "tag": 8, + "_group": 4, + "_density": 1, + "_sensor": true, + "_friction": 0.2, + "_restitution": 0, + "_offset": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_size": { + "__type__": "cc.Size", + "width": 20, + "height": 60 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "23eik112JPZYGiI8mJalTK" + }, + { + "__type__": "45646oIyIdA24W+0c5rdELD", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 1 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "8ahZv91itPcYJm8S0veHYl" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c46/YsCPVOJYA4mWEpNYRx", + "instance": null, + "targetOverrides": null + } +] \ No newline at end of file diff --git a/assets/resources/game/skills/b_atk.prefab.meta b/assets/resources/game/skills/b_atk.prefab.meta new file mode 100644 index 00000000..e1665667 --- /dev/null +++ b/assets/resources/game/skills/b_atk.prefab.meta @@ -0,0 +1,13 @@ +{ + "ver": "1.1.50", + "importer": "prefab", + "imported": true, + "uuid": "1f22aa44-f7c8-460f-8c7b-7fe6aacf87c8", + "files": [ + ".json" + ], + "subMetas": {}, + "userData": { + "syncNodeName": "b_atk" + } +} diff --git a/assets/resources/game/skills/base/skeleton.atlas b/assets/resources/game/skills/base/skeleton.atlas deleted file mode 100644 index db26fe67..00000000 --- a/assets/resources/game/skills/base/skeleton.atlas +++ /dev/null @@ -1,13 +0,0 @@ - -skeleton.png -size: 112,126 -format: RGBA8888 -filter: Linear,Linear -repeat: none -SlashFX - rotate: false - xy: 2, 2 - size: 108, 122 - orig: 128, 128 - offset: 10, 3 - index: -1 diff --git a/assets/resources/game/skills/base/skeleton.atlas.meta b/assets/resources/game/skills/base/skeleton.atlas.meta deleted file mode 100644 index d95b2d1a..00000000 --- a/assets/resources/game/skills/base/skeleton.atlas.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.0.1", - "importer": "*", - "imported": true, - "uuid": "7dfe95a3-a115-498c-89e7-7f065be4557c", - "files": [ - ".atlas", - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/resources/game/skills/base/skeleton.json b/assets/resources/game/skills/base/skeleton.json deleted file mode 100644 index 9b97e4f5..00000000 --- a/assets/resources/game/skills/base/skeleton.json +++ /dev/null @@ -1,45 +0,0 @@ -{ -"skeleton": { - "hash": "xk8FIIMxVBwhqa/vQ+2zpo2cDWg", - "spine": "3.8.99", - "x": -123.74, - "y": -43.97, - "width": 173.38, - "height": 173.38, - "images": "", - "audio": "" -}, -"bones": [ - { "name": "root", "y": -1.51 }, - { "name": "bone", "parent": "root", "length": 71.92, "rotation": 103.92, "x": 0.11, "y": 0.27 } -], -"slots": [ - { "name": "SlashFX", "bone": "bone", "attachment": "SlashFX" } -], -"skins": [ - { - "name": "default", - "attachments": { - "SlashFX": { - "SlashFX": { "x": 51.62, "y": 25.5, "rotation": -75.62, "width": 128, "height": 128 } - } - } - } -], -"animations": { - "animation": { - "bones": { - "bone": { - "rotate": [ - {}, - { "time": 0.5, "angle": -58.15 } - ], - "translate": [ - {}, - { "time": 0.5, "x": 10.32, "y": -79.39 } - ] - } - } - } -} -} \ No newline at end of file diff --git a/assets/resources/game/skills/base/skeleton.json.meta b/assets/resources/game/skills/base/skeleton.json.meta deleted file mode 100644 index e3f19304..00000000 --- a/assets/resources/game/skills/base/skeleton.json.meta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ver": "1.2.6", - "importer": "spine-data", - "imported": true, - "uuid": "13735ea1-2867-4a01-94e2-c33d3f294a1a", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/resources/game/skills/base/skeleton.png b/assets/resources/game/skills/base/skeleton.png deleted file mode 100644 index dbd7c8ec..00000000 Binary files a/assets/resources/game/skills/base/skeleton.png and /dev/null differ diff --git a/assets/resources/game/skills/skills.plist.meta b/assets/resources/game/skills/skills.plist.meta new file mode 100644 index 00000000..80c15be7 --- /dev/null +++ b/assets/resources/game/skills/skills.plist.meta @@ -0,0 +1,293 @@ +{ + "ver": "1.0.8", + "importer": "sprite-atlas", + "imported": true, + "uuid": "45af5702-7585-4d72-85cf-d7b8da02d832", + "files": [ + ".json" + ], + "subMetas": { + "c30fb": { + "importer": "sprite-frame", + "uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@c30fb", + "displayName": "", + "id": "c30fb", + "name": "1", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 1, + "width": 220, + "height": 62, + "rawWidth": 220, + "rawHeight": 62, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "cd104e76-5215-49fe-a074-e65ffa26583e@6c48a", + "atlasUuid": "45af5702-7585-4d72-85cf-d7b8da02d832" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "c86cc": { + "importer": "sprite-frame", + "uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@c86cc", + "displayName": "", + "id": "c86cc", + "name": "2", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 223, + "trimY": 1, + "width": 160, + "height": 60, + "rawWidth": 160, + "rawHeight": 60, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "cd104e76-5215-49fe-a074-e65ffa26583e@6c48a", + "atlasUuid": "45af5702-7585-4d72-85cf-d7b8da02d832" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "e7223": { + "importer": "sprite-frame", + "uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@e7223", + "displayName": "", + "id": "e7223", + "name": "3", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 1, + "trimY": 65, + "width": 217, + "height": 58, + "rawWidth": 217, + "rawHeight": 58, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "cd104e76-5215-49fe-a074-e65ffa26583e@6c48a", + "atlasUuid": "45af5702-7585-4d72-85cf-d7b8da02d832" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "aa3e6": { + "importer": "sprite-frame", + "uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@aa3e6", + "displayName": "", + "id": "aa3e6", + "name": "SlashFX", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 459, + "trimY": 1, + "width": 110, + "height": 124, + "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": "cd104e76-5215-49fe-a074-e65ffa26583e@6c48a", + "atlasUuid": "45af5702-7585-4d72-85cf-d7b8da02d832" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "4421a": { + "importer": "sprite-frame", + "uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@4421a", + "displayName": "", + "id": "4421a", + "name": "k_shield-2", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 223, + "trimY": 63, + "width": 64, + "height": 116, + "rawWidth": 64, + "rawHeight": 116, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "cd104e76-5215-49fe-a074-e65ffa26583e@6c48a", + "atlasUuid": "45af5702-7585-4d72-85cf-d7b8da02d832" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + }, + "581e3": { + "importer": "sprite-frame", + "uuid": "45af5702-7585-4d72-85cf-d7b8da02d832@581e3", + "displayName": "", + "id": "581e3", + "name": "k_shield-5", + "userData": { + "trimType": "auto", + "trimThreshold": 1, + "rotated": true, + "offsetX": 0, + "offsetY": 0, + "trimX": 341, + "trimY": 63, + "width": 64, + "height": 116, + "rawWidth": 64, + "rawHeight": 116, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "packable": true, + "pixelsToUnit": 100, + "pivotX": 0.5, + "pivotY": 0.5, + "meshType": 0, + "vertices": { + "rawPosition": [], + "indexes": [], + "uv": [], + "nuv": [], + "minPos": [], + "maxPos": [] + }, + "isUuid": true, + "imageUuidOrDatabaseUri": "cd104e76-5215-49fe-a074-e65ffa26583e@6c48a", + "atlasUuid": "45af5702-7585-4d72-85cf-d7b8da02d832" + }, + "ver": "1.0.12", + "imported": true, + "files": [ + ".json" + ], + "subMetas": {} + } + }, + "userData": { + "atlasTextureName": "skills.png", + "format": 3, + "uuid": "45af5702-7585-4d72-85cf-d7b8da02d832", + "textureUuid": "cd104e76-5215-49fe-a074-e65ffa26583e@6c48a" + } +} diff --git a/assets/resources/game/skills/base/skeleton.png.meta b/assets/resources/game/skills/skills.png.meta similarity index 71% rename from assets/resources/game/skills/base/skeleton.png.meta rename to assets/resources/game/skills/skills.png.meta index 26413028..c913066d 100644 --- a/assets/resources/game/skills/base/skeleton.png.meta +++ b/assets/resources/game/skills/skills.png.meta @@ -2,7 +2,7 @@ "ver": "1.0.26", "importer": "image", "imported": true, - "uuid": "a232f5f1-0158-4c91-864f-cfe3fafc46a6", + "uuid": "cd104e76-5215-49fe-a074-e65ffa26583e", "files": [ ".json", ".png" @@ -10,8 +10,8 @@ "subMetas": { "6c48a": { "importer": "texture", - "uuid": "a232f5f1-0158-4c91-864f-cfe3fafc46a6@6c48a", - "displayName": "skeleton", + "uuid": "cd104e76-5215-49fe-a074-e65ffa26583e@6c48a", + "displayName": "skills", "id": "6c48a", "name": "texture", "userData": { @@ -22,7 +22,7 @@ "mipfilter": "none", "anisotropy": 0, "isUuid": true, - "imageUuidOrDatabaseUri": "a232f5f1-0158-4c91-864f-cfe3fafc46a6", + "imageUuidOrDatabaseUri": "cd104e76-5215-49fe-a074-e65ffa26583e", "visible": false }, "ver": "1.0.22", @@ -37,6 +37,6 @@ "hasAlpha": true, "type": "texture", "fixAlphaTransparencyArtifacts": false, - "redirect": "a232f5f1-0158-4c91-864f-cfe3fafc46a6@6c48a" + "redirect": "cd104e76-5215-49fe-a074-e65ffa26583e@6c48a" } } diff --git a/assets/script/game/Role/RoleViewComp.ts b/assets/script/game/Role/RoleViewComp.ts index dd9b5f30..bd85bf23 100644 --- a/assets/script/game/Role/RoleViewComp.ts +++ b/assets/script/game/Role/RoleViewComp.ts @@ -57,10 +57,9 @@ export class RoleViewComp extends CCComp { power_max: number = 1200; /** 能量最大值 */ power_speed: number = 1; //能量回复速度每0.1秒回复量 - skill_name: string = "base"; //技能名称 - max_skill_name: string = "base"; //大技能名称 - skill_uuid:number = 9002; - max_skill_uuid:number = 9002; + + skill_uuid:number = 1005; + max_skill_uuid:number = 1005; atk: number = 10; /**攻击力 */ // atk_speed: number = 1; atk_cd: number = 1.3; /**攻击速度 攻击间隔 */ diff --git a/assets/script/game/common/SingletonModuleComp.ts b/assets/script/game/common/SingletonModuleComp.ts index da8a4895..ea6bdf06 100644 --- a/assets/script/game/common/SingletonModuleComp.ts +++ b/assets/script/game/common/SingletonModuleComp.ts @@ -77,7 +77,7 @@ export class SingletonModuleComp extends ecs.Comp { g_time:0, }, role:{ - hp:300, + hp:3000, atk:10, lv:1, exp:0, diff --git a/assets/script/game/common/config/MissionSet.ts b/assets/script/game/common/config/MissionSet.ts index 9ede7a80..f0f6abc9 100644 --- a/assets/script/game/common/config/MissionSet.ts +++ b/assets/script/game/common/config/MissionSet.ts @@ -1,19 +1,22 @@ -export const MissionNum = [1,2,3] +export const MissionNum = [6] export const MonsetList = { - 1:{ - 1:[1001,1002,1003,1041,1042,1043], - }, - 2:{ - 1:[1011,1012,1013,1041,1042,1043], - }, - 3:{ - 1:[1041,1042,1043], - }, - 4:{ - 1:[1021,1022,1023,1041,1042,1043], - }, - 5:{ - 1:[1031,1032,1033,1041,1042,1043], + // 1:{ + // 1:[1001,1002,1003,1041,1042,1043], + // }, + // 2:{ + // 1:[1011,1012,1013,1041,1042,1043], + // }, + // 3:{ + // 1:[1041,1042,1043], + // }, + // 4:{ + // 1:[1021,1022,1023,1041,1042,1043], + // }, + // 5:{ + // 1:[1031,1032,1033,1041,1042,1043], + // }, + 6:{ + 1:[1021,1022,1023], }, } diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts index 479d706d..9f2a62ca 100644 --- a/assets/script/game/common/config/SkillSet.ts +++ b/assets/script/game/common/config/SkillSet.ts @@ -31,6 +31,8 @@ export const SkillSet={ dis:720,count:1,atk:10,hp:0,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:350, }, 1004:{uuid: 1004,path: "1004",type: 1,level: 1,name: "奥术冲击",sp_name:"bm_ball",info:"释放一个寒冰箭攻击敌人", dis:720,count:1,atk:10,hp:0,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:350, }, + 1005:{uuid: 1005,path: "1005",type: 1,level: 1,name: "猛击",sp_name:"b_atk",info:"释放一个寒冰箭攻击敌人", + dis:0,count:1,atk:10,hp:0,shield:0,sd:10,cd:1,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:350, }, 4011:{uuid: 4011,path: "1011",type: 1,level: 3,name: "火焰风暴",sp_name:"fire",info:"释放多个个火球术攻击敌人", dis:720,count:5,atk:10,hp:0,shield:0,sd:10,cd:2,bsd:0,bcd:0,sk_uuid:1001,sk_count:0,speed:350, }, 4012:{uuid: 4012,path: "1012",type: 1,level: 3,name: "冰晶风暴",sp_name:"ice",info:"释放多个个寒冰箭攻击敌人", diff --git a/assets/script/game/common/config/heroSet.ts b/assets/script/game/common/config/heroSet.ts index 811fcf18..c2e1fdc4 100644 --- a/assets/script/game/common/config/heroSet.ts +++ b/assets/script/game/common/config/heroSet.ts @@ -2,7 +2,7 @@ export const HeroSet = { 9001: { uuid: 9001, path: "k3", type: 1, level: 1, name: "战士", atk: 4, hp: 35, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, - max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1, + max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 1005, word: "守护", info: "自身护盾", atktype: 1, }, @@ -31,51 +31,51 @@ export const HeroSet = { export const MonSet = { 1001: { uuid: 1001, path: "ge1", type: 1, level: 1, name: "战斗哥", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, - max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1 + max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 1005, word: "守护", info: "自身护盾", atktype: 1 }, 1002: { uuid: 1002, path: "ge2", type: 1, level: 1, name: "墨西哥", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, - max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1 + max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 1005, word: "守护", info: "自身护盾", atktype: 1 }, 1003: { uuid: 1003, path: "ge3", type: 1, level: 1, name: "铁头哥", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, - max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1 + max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 1005, word: "守护", info: "自身护盾", atktype: 1 }, 1011: { uuid: 1011, path: "orc1", type: 1, level: 1, name: "森林兽人", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, - max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1 + max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 1005, word: "守护", info: "自身护盾", atktype: 1 }, 1012: { uuid: 1012, path: "orc2", type: 1, level: 1, name: "荒野兽人", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, - max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1 + max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 1005, word: "守护", info: "自身护盾", atktype: 1 }, 1013: { uuid: 1013, path: "orc3", type: 1, level: 1, name: "兽人战士", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, - max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1 + max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 1005, word: "守护", info: "自身护盾", atktype: 1 }, 1021: { uuid: 1021, path: "gou1", type: 1, level: 1, name: "黄皮豺狼", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, - max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1 + max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 1005, word: "守护", info: "自身护盾", atktype: 1 }, 1022: { uuid: 1022, path: "gou2", type: 1, level: 1, name: "白皮豺狼", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, - max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1 + max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 1005, word: "守护", info: "自身护盾", atktype: 1 }, 1023: { uuid: 1023, path: "gou3", type: 1, level: 1, name: "灰皮豺狼", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, - max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1 + max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 1005, word: "守护", info: "自身护盾", atktype: 1 }, 1031: { uuid: 1031, path: "gou1", type: 1, level: 1, name: "独眼巨人", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, - max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1 + max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 1005, word: "守护", info: "自身护盾", atktype: 1 }, 1032: { uuid: 1032, path: "gou2", type: 1, level: 1, name: "狂暴独眼", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, - max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1 + max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 1005, word: "守护", info: "自身护盾", atktype: 1 }, 1033: { uuid: 1033, path: "gou3", type: 1, level: 1, name: "独眼首领", atk: 4, hp: 30, atk_dis: 30, atk_cd: 2, power: 0, power_max: 10, speed: 30, - max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 9001, word: "守护", info: "自身护盾", atktype: 1 + max_skill: "精准打击", skill_uuid: 9001, max_skill_uuid: 1005, word: "守护", info: "自身护盾", atktype: 1 }, 1041: { uuid: 1041, path: "ys1", type: 1, level: 1, name: "火元素", atk: 4, hp: 30, atk_dis: 200, atk_cd: 2, power: 0, power_max: 10, speed: 30,