From 77f6751314fa7b6d87c15a9bfd1068b7c596056e Mon Sep 17 00:00:00 2001 From: yuexin Date: Wed, 9 Dec 2020 15:49:37 +0800 Subject: [PATCH 1/5] fix skill type --- .vscode/launch.json | 16 ++++++++++++++++ src/rooms/logic/skill/TriggerMan.ts | 2 +- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/.vscode/launch.json b/.vscode/launch.json index ba17817..1eaf40b 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -32,6 +32,22 @@ "type": "node", "trace": true + }, + + { + "address": "127.0.0.1", + "localRoot": "${workspaceFolder}/src", + "name": "127.0.0.1", + "port": 9229, + "remoteRoot": "E:\\work_git\\server\\src", + "request": "attach", + "skipFiles": [ + "/**", + "node_modules/**" + ], + "type": "node", + "trace": true + } ] } \ No newline at end of file diff --git a/src/rooms/logic/skill/TriggerMan.ts b/src/rooms/logic/skill/TriggerMan.ts index 6c6dc35..cb89da5 100644 --- a/src/rooms/logic/skill/TriggerMan.ts +++ b/src/rooms/logic/skill/TriggerMan.ts @@ -73,7 +73,7 @@ let TriggerManager = { onTrigger(sender: Skill, param: SkillParam): SkillTarget[] { - let effectid = sender._type; + let effectid = sender._data.effect_typeid; let env = sender.getEnhanceValue(param); let effv = sender.getEffValue(param.cardpoint); let tgts = sender.getTargets(param); From bfe66d9d7f448ec6774de365e4b122e8b5883dc4 Mon Sep 17 00:00:00 2001 From: yuexin Date: Wed, 9 Dec 2020 16:22:27 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E6=88=98=E5=90=BC?= =?UTF-8?q?=E7=9B=AE=E6=A0=87=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/rooms/logic/Handler/PlayerHandler.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rooms/logic/Handler/PlayerHandler.ts b/src/rooms/logic/Handler/PlayerHandler.ts index 35af267..86a76af 100644 --- a/src/rooms/logic/Handler/PlayerHandler.ts +++ b/src/rooms/logic/Handler/PlayerHandler.ts @@ -260,7 +260,7 @@ export class PlayerHandler { this._owner.onDelPetNotify(apet); // 遗愿 - this.simpleCheckSkills(apet._dieSkills, apet); + this.simpleCheckSkills(apet._dieSkills); this.delPet(apet); }; @@ -378,7 +378,7 @@ export class PlayerHandler { }; simpleCheckSkills(skills: Skill[], apet?: PetHandler, param?: SkillParam): SkillTarget[]{ - let ps = param? param: new SkillParam(0, 0, 0, this, apet, null, null); + let ps = param? param: new SkillParam(0, 0, 0, this, apet, this, apet); let reslst: SkillTarget[] = []; skills.forEach((item: Skill)=>{ item.checkTrigger(TriggerType.NO_COND, 0, ps, (skill: Skill, ap: SkillParam, res: SkillTarget[])=>{ From fc18c461db32abc6b1a4a902f0ffc56916300999 Mon Sep 17 00:00:00 2001 From: yuexin Date: Wed, 9 Dec 2020 16:46:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E7=9B=AE=E6=A0=87?= =?UTF-8?q?=E9=80=89=E6=8B=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/rooms/logic/Handler/BattleHandler.ts | 4 ++++ src/rooms/logic/Handler/PlayerHandler.ts | 3 +++ 2 files changed, 7 insertions(+) diff --git a/src/rooms/logic/Handler/BattleHandler.ts b/src/rooms/logic/Handler/BattleHandler.ts index 594047d..f12e5dd 100644 --- a/src/rooms/logic/Handler/BattleHandler.ts +++ b/src/rooms/logic/Handler/BattleHandler.ts @@ -232,6 +232,10 @@ export class BattleHandler { pt *= obj.dbpt_cnt; } + if(!dstph){ + dstph = ph; + } + let ps = new SkillParam(obj.card, pt, obj.eff_cnt, ph, null, dstph, dstpt); ph.useCard(ps); diff --git a/src/rooms/logic/Handler/PlayerHandler.ts b/src/rooms/logic/Handler/PlayerHandler.ts index 86a76af..4deff8d 100644 --- a/src/rooms/logic/Handler/PlayerHandler.ts +++ b/src/rooms/logic/Handler/PlayerHandler.ts @@ -135,6 +135,9 @@ export class PlayerHandler { return false; } obj.srcpet = pet; + if(!obj.dstpet){ + obj.dstpet = pet; + } pet.loadData(cfg.stageunit_id, obj, [cfg.quoteskill1id, cfg.quoteskill2id, cfg.quoteskill3id, cfg.quoteskill4id]); }else if(cfg.type_id == EffectCardType.MAGIC){ From 98fb1aa4465f99d86863794ab2ced1b142c2aaf2 Mon Sep 17 00:00:00 2001 From: yuexin Date: Wed, 9 Dec 2020 16:59:45 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E5=88=A4=E5=AE=9A?= =?UTF-8?q?=E9=9A=8F=E4=BB=8E=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/rooms/logic/Handler/BattleHandler.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/rooms/logic/Handler/BattleHandler.ts b/src/rooms/logic/Handler/BattleHandler.ts index f12e5dd..58ed024 100644 --- a/src/rooms/logic/Handler/BattleHandler.ts +++ b/src/rooms/logic/Handler/BattleHandler.ts @@ -63,7 +63,7 @@ export class BattleHandler { return false; } let obj = players.find( (item: PlayerHandler) =>{ - item.isMyPet(pet); + return item.isMyPet(pet); }); if(!obj){ return false; @@ -165,7 +165,7 @@ export class BattleHandler { } break; case GameCampType.ENEMY: - if(dst && dst._friend != src && dst.isAlive()){ + if(dst && dst != src && dst._friend != src && dst.isAlive()){ lst.push(dst); } break; From 8526ef71ea3232518f518683f2943544012f11d1 Mon Sep 17 00:00:00 2001 From: yuexin Date: Wed, 9 Dec 2020 17:18:20 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=B0=8F=E4=BF=AE=E8=AE=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/rooms/logic/Handler/PlayerHandler.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/rooms/logic/Handler/PlayerHandler.ts b/src/rooms/logic/Handler/PlayerHandler.ts index 4deff8d..0043331 100644 --- a/src/rooms/logic/Handler/PlayerHandler.ts +++ b/src/rooms/logic/Handler/PlayerHandler.ts @@ -136,7 +136,9 @@ export class PlayerHandler { } obj.srcpet = pet; if(!obj.dstpet){ - obj.dstpet = pet; + if(obj.dstplayer && obj.dstplayer.isMyPet(pet)){ + obj.dstpet = pet; + } } pet.loadData(cfg.stageunit_id, obj, [cfg.quoteskill1id, cfg.quoteskill2id, cfg.quoteskill3id, cfg.quoteskill4id]);