From e472845924150a7be1872cce6db052d9ebe26bb5 Mon Sep 17 00:00:00 2001 From: panw Date: Mon, 18 May 2026 16:55:29 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B0=83=E6=95=B4=E6=8A=80=E8=83=BD?= =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=B9=B6=E5=88=A0=E9=99=A4=E5=BA=9F=E5=BC=83?= =?UTF-8?q?=E5=86=B0=E9=9C=9C=E7=90=83=E8=B5=84=E6=BA=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 1. 重命名部分技能名称与描述，更新技能效果说明 2. 调整技能ID排序，删除6002-6011区间内的冗余配置 3. 删除废弃的冰霜球prefab及其meta文件 4. 修改大招名称为雷霆击并更新其技能描述 --- .../game/skill/atk/ball_forst.prefab | 372 ------------------ .../game/skill/atk/ball_forst.prefab.meta | 13 - assets/script/game/common/config/SkillSet.ts | 43 +- 3 files changed, 18 insertions(+), 410 deletions(-) delete mode 100644 assets/resources/game/skill/atk/ball_forst.prefab delete mode 100644 assets/resources/game/skill/atk/ball_forst.prefab.meta diff --git a/assets/resources/game/skill/atk/ball_forst.prefab b/assets/resources/game/skill/atk/ball_forst.prefab deleted file mode 100644 index 9ce6e2b7..00000000 --- a/assets/resources/game/skill/atk/ball_forst.prefab +++ /dev/null @@ -1,372 +0,0 @@ -[ - { - "__type__": "cc.Prefab", - "_name": "ball_forst", - "_objFlags": 0, - "__editorExtras__": {}, - "_native": "", - "data": { - "__id__": 1 - }, - "optimizationPolicy": 0, - "persistent": false - }, - { - "__type__": "cc.Node", - "_name": "ball_forst", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": null, - "_children": [ - { - "__id__": 2 - } - ], - "_active": true, - "_components": [ - { - "__id__": 8 - }, - { - "__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": "Node", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": { - "__id__": 1 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 3 - }, - { - "__id__": 5 - } - ], - "_prefab": { - "__id__": 7 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_lrot": { - "__type__": "cc.Quat", - "x": 0, - "y": 0, - "z": 0, - "w": 1 - }, - "_lscale": { - "__type__": "cc.Vec3", - "x": 1, - "y": 1, - "z": 1 - }, - "_mobility": 0, - "_layer": 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": 71, - "height": 38 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "93pNmvtQlLSqtTgIepyEmA" - }, - { - "__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__": "2423272e-e63b-4736-b15b-30b40cf98a23@1e58a", - "__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": { - "__uuid__": "2423272e-e63b-4736-b15b-30b40cf98a23", - "__expectedType__": "cc.SpriteAtlas" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "12eKc8gltBz50frJCS5+ww" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "3arqAMBz1MvoXBzeDaL5M/", - "instance": null, - "targetOverrides": null, - "nestedPrefabInstanceRoots": null - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 9 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 50, - "height": 50 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "63NP9yq3hEUKD/OZZZ5t7x" - }, - { - "__type__": "cc.Animation", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 11 - }, - "playOnLoad": true, - "_clips": [ - { - "__uuid__": "00866c8c-f70c-4ce6-a289-527f6c5f531a", - "__expectedType__": "cc.AnimationClip" - } - ], - "_defaultClip": { - "__uuid__": "00866c8c-f70c-4ce6-a289-527f6c5f531a", - "__expectedType__": "cc.AnimationClip" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "c2RDvksalG2acL3tyGCY0t" - }, - { - "__type__": "57aabs7TE1J5obTAZczc+64", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 13 - }, - "atk_x": 10, - "atk_y": 15, - "debugMode": true, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "60LInmZXxDtKu79AshRG9j" - }, - { - "__type__": "cc.RigidBody2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 15 - }, - "enabledContactListener": true, - "bullet": false, - "awakeOnLoad": true, - "_group": 1, - "_type": 1, - "_allowSleep": false, - "_gravityScale": 1, - "_linearDamping": 0, - "_angularDamping": 0, - "_linearVelocity": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_angularVelocity": 0, - "_fixedRotation": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "e1yBA625RLwLhzo6bLYW7j" - }, - { - "__type__": "cc.BoxCollider2D", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 17 - }, - "tag": 0, - "_group": 1, - "_density": 1, - "_sensor": true, - "_friction": 0.2, - "_restitution": 0, - "_offset": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_size": { - "__type__": "cc.Size", - "width": 50, - "height": 50 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "43ZDJfXX9AX73gyytKQZWm" - }, - { - "__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/skill/atk/ball_forst.prefab.meta b/assets/resources/game/skill/atk/ball_forst.prefab.meta deleted file mode 100644 index 02a83355..00000000 --- a/assets/resources/game/skill/atk/ball_forst.prefab.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.50", - "importer": "prefab", - "imported": true, - "uuid": "267ea886-debe-4793-a09e-3a81e89b2587", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": { - "syncNodeName": "ball_forst" - } -} diff --git a/assets/script/game/common/config/SkillSet.ts b/assets/script/game/common/config/SkillSet.ts index daa84874..bf168c0d 100644 --- a/assets/script/game/common/config/SkillSet.ts +++ b/assets/script/game/common/config/SkillSet.ts @@ -177,58 +177,51 @@ export const SkillSet: Record = { RType:RType.linear,EType:EType.collision,buffs:[],info:"造成攻击力100%的伤害", }, 6002: { - uuid:6002,name:"火球术",sp_name:"ball_fire",icon:"1126",TGroup:TGroup.Enemy,readyAnm:"",endAnm:"",act:"atk", + uuid:6002,name:"火球",sp_name:"ball_fire",icon:"1126",TGroup:TGroup.Enemy,readyAnm:"",endAnm:"",act:"atk", DTType:DTType.single,frz:0,ap:100,hit_count:1,hitcd:0.3,speed:720,with:90,ready:0.2,EAnm:0,DAnm:"",IType:IType.remote, - RType:RType.linear,EType:EType.collision,buffs:[],info:"造成攻击力100%的伤害,一定几率暴击", + RType:RType.linear,EType:EType.collision,buffs:[],info:"造成攻击力100%的伤害,一定几率暴击，高阶技能", }, 6003: { - uuid:6003,name:"风刃",sp_name:"ball_winds",icon:"1126",TGroup:TGroup.Enemy,readyAnm:"",endAnm:"",act:"atk", + uuid:6003,name:"龙卷风",sp_name:"ball_winds",icon:"1126",TGroup:TGroup.Enemy,readyAnm:"",endAnm:"",act:"atk", DTType:DTType.single,ap:100,hit_count:1,hitcd:0.3,speed:720,with:90,ready:0.2,EAnm:0,DAnm:"",IType:IType.remote, - RType:RType.linear,EType:EType.collision,buffs:[],info:"造成攻击力100%的伤害,一定几率击退目标", + RType:RType.linear,EType:EType.collision,buffs:[],info:"造成攻击力100%的伤害,一定几率击退目标，高阶技能", }, 6004: { uuid:6004,name:"暗影球",sp_name:"ball_zi",icon:"1126",TGroup:TGroup.Enemy,readyAnm:"",endAnm:"",act:"atk", DTType:DTType.single,ap:100,hit_count:1,hitcd:0.3,speed:720,with:90,ready:0.2,EAnm:0,DAnm:"",IType:IType.remote, - RType:RType.linear,EType:EType.collision,buffs:[],info:"造成攻击力100%的伤害", + RType:RType.linear,EType:EType.collision,buffs:[],info:"造成攻击力100%的伤害，一定几率上毒（后期加入），高阶技能", }, 6005: { uuid:6005,name:"箭矢",sp_name:"arrow",icon:"1135",TGroup:TGroup.Enemy,readyAnm:"",endAnm:"",act:"atk", DTType:DTType.single,ap:100,hit_count:1,hitcd:0.2,speed:720,with:0,ready:0.2,EAnm:0,DAnm:"",IType:IType.remote, RType:RType.bezier,EType:EType.collision,bezier_start_y:20,bezier_mid_y:140,bezier_arc:1.05,buffs:[],info:"造成攻击力100%的伤害", }, + 6006: { + uuid:6006,name:"光箭蓝",sp_name:"atk_c1",icon:"1126",TGroup:TGroup.Enemy,readyAnm:"",endAnm:"",act:"atk", + DTType:DTType.single,ap:100,hit_count:1,hitcd:0.3,speed:720,with:90,ready:0.2,EAnm:0,DAnm:"",IType:IType.remote, + RType:RType.bezier,EType:EType.collision,buffs:[],info:"近战普通攻击技能", + }, 6007: { - uuid:6007,name:"冰霜球",sp_name:"ball_forst",icon:"1126",TGroup:TGroup.Enemy,readyAnm:"",endAnm:"",act:"atk", + uuid:6007,name:"水球",sp_name:"ball_water",icon:"1126",TGroup:TGroup.Enemy,readyAnm:"",endAnm:"",act:"atk", DTType:DTType.single,ap:100,hit_count:1,hitcd:0.3,speed:720,with:90,ready:0.2,EAnm:0,DAnm:"",IType:IType.remote, - RType:RType.bezier,EType:EType.collision,buffs:[],info:"造成攻击力100%的伤害，一定几率冰冻目标", + RType:RType.bezier,EType:EType.collision,buffs:[],info:"造成攻击力100%的伤害，一定几率冰冻目标，高阶技能", }, + 6008: { - uuid:6008,name:"水球",sp_name:"ball_water",icon:"1126",TGroup:TGroup.Enemy,readyAnm:"",endAnm:"",act:"atk", + uuid:6008,name:"光箭红",sp_name:"atk_c2",icon:"1126",TGroup:TGroup.Enemy,readyAnm:"",endAnm:"",act:"atk", DTType:DTType.single,ap:100,hit_count:1,hitcd:0.3,speed:720,with:90,ready:0.2,EAnm:0,DAnm:"",IType:IType.remote, - RType:RType.bezier,EType:EType.collision,buffs:[],info:"发射水球，造成攻击力100%的伤害", + RType:RType.bezier,EType:EType.collision,buffs:[],info:"造成攻击力100%的伤害，一定几率暴击", }, - 6009: { - uuid:6009,name:"光箭蓝",sp_name:"atk_c1",icon:"1126",TGroup:TGroup.Enemy,readyAnm:"",endAnm:"",act:"atk", + uuid:6009,name:"光箭绿",sp_name:"atk_c2",icon:"1126",TGroup:TGroup.Enemy,readyAnm:"",endAnm:"",act:"atk", DTType:DTType.single,ap:100,hit_count:1,hitcd:0.3,speed:720,with:90,ready:0.2,EAnm:0,DAnm:"",IType:IType.remote, - RType:RType.bezier,EType:EType.collision,buffs:[],info:"发射水球，造成攻击力100%的伤害", - }, - 6010: { - uuid:6010,name:"光箭红",sp_name:"atk_c2",icon:"1126",TGroup:TGroup.Enemy,readyAnm:"",endAnm:"",act:"atk", - DTType:DTType.single,ap:100,hit_count:1,hitcd:0.3,speed:720,with:90,ready:0.2,EAnm:0,DAnm:"",IType:IType.remote, - RType:RType.bezier,EType:EType.collision,buffs:[],info:"发射水球，造成攻击力100%的伤害", - }, - 6011: { - uuid:6011,name:"光箭绿",sp_name:"atk_c2",icon:"1126",TGroup:TGroup.Enemy,readyAnm:"",endAnm:"",act:"atk", - DTType:DTType.single,ap:100,hit_count:1,hitcd:0.3,speed:720,with:90,ready:0.2,EAnm:0,DAnm:"",IType:IType.remote, - RType:RType.bezier,EType:EType.collision,buffs:[],info:"发射水球，造成攻击力100%的伤害", + RType:RType.bezier,EType:EType.collision,buffs:[],info:"造成攻击力100%的伤害，一定几率击退目标", }, - - //大招 6101: { - uuid:6101,name:"烈焰斩",sp_name:"atk_fire",icon:"1173",TGroup:TGroup.Enemy,readyAnm:"reds",endAnm:"",act:"max", + uuid:6101,name:"雷霆击",sp_name:"atk_s3",icon:"1173",TGroup:TGroup.Enemy,readyAnm:"reds",endAnm:"",act:"max", DTType:DTType.single,bck:20,ap:150,hit_count:6,hitcd:0.2,speed:720,with:0,ready:0.2,EAnm:0,DAnm:"",IType:IType.Melee, RType:RType.fixed,EType:EType.animationEnd,buffs:[],info:"释放烈焰斩击，最多命中6个敌人，造成攻击力150%的伤害，附带20%击退概率", },