From 1d9af24c669130dbc3787bb55667f56e0aca96fb Mon Sep 17 00:00:00 2001 From: panw Date: Fri, 10 Jan 2025 11:07:53 +0800 Subject: [PATCH] =?UTF-8?q?todo=20=E6=8A=80=E8=83=BD=E5=AD=98=E5=9C=A8?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=87=86=E7=A1=AE=E6=80=A7=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/resources/game/skills/arrow.prefab | 3 +- .../resources/game/skills/atked/slash9.atlas | 34 --- .../game/skills/atked/slash9.atlas.meta | 12 - .../resources/game/skills/atked/slash9.json | 47 ---- .../game/skills/atked/slash9.json.meta | 11 - assets/resources/game/skills/atked/slash9.png | Bin 17174 -> 0 bytes .../game/skills/atked/slash9.png.meta | 42 --- assets/resources/game/skills/buffto.prefab | 215 ++++++++++++++ .../resources/game/skills/buffto.prefab.meta | 13 + assets/resources/game/skills/heath.prefab | 4 +- assets/resources/game/skills/heath2.prefab | 4 +- assets/resources/game/skills/patk.prefab | 262 +----------------- assets/resources/game/skills/patk.prefab.meta | 2 +- assets/script/game/common/config/SkillSet.ts | 53 ++-- assets/script/game/common/config/heroSet.ts | 2 +- assets/script/game/hero/HeroViewComp.ts | 27 +- assets/script/game/map/MissionComp.ts | 2 +- assets/script/game/skills/BuffCom.ts | 14 +- assets/script/game/skills/Skill.ts | 8 +- assets/script/game/skills/SkillCom.ts | 17 +- 20 files changed, 315 insertions(+), 457 deletions(-) delete mode 100644 assets/resources/game/skills/atked/slash9.atlas delete mode 100644 assets/resources/game/skills/atked/slash9.atlas.meta delete mode 100644 assets/resources/game/skills/atked/slash9.json delete mode 100644 assets/resources/game/skills/atked/slash9.json.meta delete mode 100644 assets/resources/game/skills/atked/slash9.png delete mode 100644 assets/resources/game/skills/atked/slash9.png.meta create mode 100644 assets/resources/game/skills/buffto.prefab create mode 100644 assets/resources/game/skills/buffto.prefab.meta diff --git a/assets/resources/game/skills/arrow.prefab b/assets/resources/game/skills/arrow.prefab index 5dc08ba3..c6ad9755 100644 --- a/assets/resources/game/skills/arrow.prefab +++ b/assets/resources/game/skills/arrow.prefab @@ -349,7 +349,6 @@ "__id__": 0 }, "fileId": "c46/YsCPVOJYA4mWEpNYRx", - "instance": null, - "targetOverrides": null + "instance": null } ] \ No newline at end of file diff --git a/assets/resources/game/skills/atked/slash9.atlas b/assets/resources/game/skills/atked/slash9.atlas deleted file mode 100644 index 9211acbd..00000000 --- a/assets/resources/game/skills/atked/slash9.atlas +++ /dev/null @@ -1,34 +0,0 @@ - -slash9.png -size: 277,108 -format: RGBA8888 -filter: Linear,Linear -repeat: none -slash9_00006 - rotate: true - xy: 2, 4 - size: 102, 73 - orig: 148, 75 - offset: 45, 1 - index: -1 -slash9_00007 - rotate: true - xy: 77, 4 - size: 102, 69 - orig: 153, 77 - offset: 50, 7 - index: -1 -slash9_00008 - rotate: true - xy: 148, 2 - size: 104, 64 - orig: 162, 84 - offset: 57, 19 - index: -1 -slash9_00009 - rotate: true - xy: 214, 2 - size: 104, 61 - orig: 166, 89 - offset: 61, 27 - index: -1 diff --git a/assets/resources/game/skills/atked/slash9.atlas.meta b/assets/resources/game/skills/atked/slash9.atlas.meta deleted file mode 100644 index c2a34729..00000000 --- a/assets/resources/game/skills/atked/slash9.atlas.meta +++ /dev/null @@ -1,12 +0,0 @@ -{ - "ver": "1.0.1", - "importer": "*", - "imported": true, - "uuid": "8fc09e22-e242-4b20-b306-b1b65c7bc62a", - "files": [ - ".atlas", - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/resources/game/skills/atked/slash9.json b/assets/resources/game/skills/atked/slash9.json deleted file mode 100644 index f08b1c16..00000000 --- a/assets/resources/game/skills/atked/slash9.json +++ /dev/null @@ -1,47 +0,0 @@ -{ -"skeleton": { - "hash": "lFfjZSvL4itj6YxoiP/PtBsDjyE=", - "spine": "3.8.75", - "x": -83, - "y": -44.5, - "width": 166, - "height": 89, - "images": "./slash9/", - "audio": "D:/исходники/VFX/s/slash9/slash9" -}, -"bones": [ - { "name": "root" } -], -"slots": [ - { "name": "slash9_00001", "bone": "root", "attachment": "slash9_00009" } -], -"skins": [ - { - "name": "default", - "attachments": { - "slash9_00001": { - "slash9_00006": { "width": 148, "height": 75 }, - "slash9_00007": { "width": 153, "height": 77 }, - "slash9_00008": { "width": 162, "height": 84 }, - "slash9_00009": { "width": 166, "height": 89 } - } - } - } -], -"animations": { - "animation": { - "slots": { - "slash9_00001": { - "attachment": [ - { "name": null }, - { "time": 0.0333, "name": "slash9_00006" }, - { "time": 0.0667, "name": "slash9_00007" }, - { "time": 0.1, "name": "slash9_00008" }, - { "time": 0.1333, "name": "slash9_00009" }, - { "time": 0.1667, "name": null } - ] - } - } - } -} -} \ No newline at end of file diff --git a/assets/resources/game/skills/atked/slash9.json.meta b/assets/resources/game/skills/atked/slash9.json.meta deleted file mode 100644 index 160059e6..00000000 --- a/assets/resources/game/skills/atked/slash9.json.meta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ver": "1.2.6", - "importer": "spine-data", - "imported": true, - "uuid": "f6aac092-b804-4402-97ee-83b00c8b7d40", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/resources/game/skills/atked/slash9.png b/assets/resources/game/skills/atked/slash9.png deleted file mode 100644 index e64946e6896e3669ef670881af2e1cc2a1e5802d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17174 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 0){ - let l_shield=this.shield-l_hp - if(l_shield < 0){ - this.shield = 0 - l_hp = Math.abs(l_shield) - }else{ - this.shield = l_shield - l_hp = 0 - } + this.shield -=1 + l_hp = 0 } this.hp_less(l_hp,skill.is_crit); } @@ -557,7 +551,7 @@ export class HeroViewComp extends CCComp { let pos =this.node.position let is_crit=this.check_crit() this.to_console(this.scale+this.hero_name+"使用技能:"+sk+SkillSet[sk].name+" pos:"+pos+" t_pos:"+t_pos+" box:"+this.box_group,); - skill.load(pos,this.box_group,this.node,sk,this.ap_max,t_pos,is_crit,this.crit_add); + skill.load(pos,this.box_group,this.node,sk,this.ap_max,t_pos,is_crit,this.crit_add,this.rhp_max); } check_heros(){ @@ -699,7 +693,7 @@ export class HeroViewComp extends CCComp { let t_pos = pos this.to_console("to_all_buff:"+sk) let is_crit=this.check_crit() - skill.load(pos,this.box_group,this.node,sk,this.ap_max,t_pos,is_crit,this.crit_add); + skill.load(pos,this.box_group,this.node,sk,this.ap_max,t_pos,is_crit,this.crit_add,this.rhp_max); this.to_console("使用buff:"+sk+" t_pos:"+t_pos+" box:"+this.box_group); } @@ -709,7 +703,7 @@ export class HeroViewComp extends CCComp { let pos = this.node.position this.to_console("do_add_buff:"+hero.hero_name+" "+sk); let is_crit=this.check_crit() - skill.load(pos,this.box_group,this.node,sk,this.ap_max,t_pos,is_crit,this.crit_add); + skill.load(pos,this.box_group,this.node,sk,this.ap_max,t_pos,is_crit,this.crit_add,this.rhp_max); this.to_console(this.scale+this.hero_name+"使用buff:"+sk+SkillSet[sk].name+" t_pos:"+t_pos+" box:"+this.box_group,); } @@ -743,10 +737,15 @@ export class HeroViewComp extends CCComp { } this.BUFFCOMP.tooltip(2,hp.toFixed(0)); } - add_hp_max(hp: number=0){ - this.BUFFCOMP.show_buff(0.5) - this.hp += Math.floor(hp/100*this.hp_max) ; + add_hp2(hprate: number=0){ + this.hp += Math.floor(hprate/100*this.hp_max) ; } + add_hp_max(hprate: number=0){ + this.BUFFCOMP.show_hp(0.5) + this.hp_max += Math.floor(hprate/100*this.rhp_max) ; + this.add_hp2(hprate) + } + hp_less(hp: number,is_crit:boolean=false){ if(this.is_dead) return hp=Math.floor(hp) diff --git a/assets/script/game/map/MissionComp.ts b/assets/script/game/map/MissionComp.ts index e4284e27..2cc55a04 100644 --- a/assets/script/game/map/MissionComp.ts +++ b/assets/script/game/map/MissionComp.ts @@ -196,7 +196,7 @@ export class MissionComp extends CCComp { if(smc.vmdata.mission.hp_up > 0 ){ let heros:any =ecs.query(ecs.allOf(HeroModelComp)); for (let i = 0; i < heros.length; i++) { - heros[i].HeroView.add_hp_max(smc.vmdata.mission.hp_up) + heros[i].HeroView.add_hp2(smc.vmdata.mission.hp_up) } } diff --git a/assets/script/game/skills/BuffCom.ts b/assets/script/game/skills/BuffCom.ts index 49e922d4..ab6e832e 100644 --- a/assets/script/game/skills/BuffCom.ts +++ b/assets/script/game/skills/BuffCom.ts @@ -8,22 +8,20 @@ const { ccclass, property } = _decorator; export class BuffCom extends Component { cd:number = 0; base:SkillCom = null + time:number = 0; start() { this.base =this.node.getComponent(SkillCom) - tween(this.node).to( this.base.in_time, - { position: new Vec3(this.node.position.x,this.node.position.y) }, - { - onComplete: (target?: object) => { - this.base.is_destroy=true - }, - } - ).start(); } update(deltaTime: number) { if(smc.mission.pause) return this.cd+=deltaTime + this.time+=deltaTime + if(this.time>=this.base.in_time){ + this.base.is_destroy = true + } if(this.cd>=this.base.cd){ + if(this.base.is_destroy) return // this.node.setPosition(v3(-1000,0,0)) this.node.active = false this.node.active = true diff --git a/assets/script/game/skills/Skill.ts b/assets/script/game/skills/Skill.ts index 964883d0..c542a718 100644 --- a/assets/script/game/skills/Skill.ts +++ b/assets/script/game/skills/Skill.ts @@ -22,7 +22,7 @@ export class Skill extends ecs.Entity { super.destroy(); } load(pos: Vec3 = Vec3.ZERO,group:number,parent:Node,uuid:number=1001, - ap:number =10,t_pos:Vec3 = null,is_crit:boolean=false,crit_add:number=0) + ap:number =10,t_pos:Vec3 = null,is_crit:boolean=false,crit_add:number=0,hp:number=0) { var path = "game/skills/"+SkillSet[uuid].sp_name; var prefab: Prefab = oops.res.get(path, Prefab)!; @@ -45,7 +45,11 @@ export class Skill extends ecs.Entity { // console.log(group+" "+SkillSet[uuid].name+"angle:"+angle) sv.s_uuid = uuid; sv.s_name = SkillSet[uuid].name; - sv.ap = ap*SkillSet[uuid].ap; + sv.ap = ap*SkillSet[uuid].ap/100; // 技能伤害 + sv.apup = ap*SkillSet[uuid].apup/100; // 伤害增量 + sv.hp = hp*SkillSet[uuid].hp/100; // 回复hp增量 + sv.mhp = SkillSet[uuid].mhp/100; // hpmax增量 % + sv.shield =SkillSet[uuid].shield; // 护甲增量 sv.cd = SkillSet[uuid].cd; sv.tg = SkillSet[uuid].tg; sv.debtime = SkillSet[uuid].debtime; diff --git a/assets/script/game/skills/SkillCom.ts b/assets/script/game/skills/SkillCom.ts index 68993ca1..af7aad06 100644 --- a/assets/script/game/skills/SkillCom.ts +++ b/assets/script/game/skills/SkillCom.ts @@ -21,6 +21,10 @@ export class SkillCom extends CCComp { speed:number = 200; scale:number = 1; ap:number = 10; + apup:number = 0;// + mhp:number = 0; + hp:number = 0; //治疗总量 + shield:number = 0;//护甲总量 cd:number = 1; debuff:number = 0; debtime:number = 0; @@ -72,20 +76,23 @@ export class SkillCom extends CCComp { do_buff(hero:any){ this.to_console(" do_buff hero: ",hero) if(SkillSet[this.s_uuid].hp > 0){ //buff加血 - let increase_hp=Math.floor(SkillSet[this.s_uuid].hp*this.ap/(this.in_time/this.cd)) + let increase_hp=Math.floor(this.hp/(this.in_time/this.cd)) hero.add_hp(increase_hp) } if(SkillSet[this.s_uuid].apup > 0){ //buff加攻击 - let increase_atk=Math.floor(SkillSet[this.s_uuid].apup*this.ap/(this.in_time/this.cd)) + let increase_atk=Math.floor(this.apup/(this.in_time/this.cd)) hero.add_ap(increase_atk) } if(SkillSet[this.s_uuid].shield > 0){ //buff护盾 - console.log("do_buff shield: ",SkillSet[this.s_uuid].shield*this.ap/(this.in_time/this.cd)) - hero.add_shield(SkillSet[this.s_uuid].shield*this.ap/(this.in_time/this.cd)) + console.log("do_buff shield: ",this.shield) + hero.add_shield(this.shield) + } + if(SkillSet[this.s_uuid].mhp > 0){ //hp最大值 + console.log("do_buff mhp: ",this.mhp/(this.in_time/this.cd)) + hero.add_hp_max(this.mhp/(this.in_time/this.cd)) } - } update(deltaTime: number) { if(smc.mission.pause) return