From 72e59f80a851ceffcf99ce00638ec038539ccb5c Mon Sep 17 00:00:00 2001 From: yuexin Date: Wed, 9 Dec 2020 19:55:02 +0800 Subject: [PATCH 1/7] aa --- src/rooms/logic/Handler/PlayerHandler.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/rooms/logic/Handler/PlayerHandler.ts b/src/rooms/logic/Handler/PlayerHandler.ts index 7ffedf6..e1fd6d7 100644 --- a/src/rooms/logic/Handler/PlayerHandler.ts +++ b/src/rooms/logic/Handler/PlayerHandler.ts @@ -86,7 +86,7 @@ export class PlayerHandler { (idx >= 0) && this._pets.splice(idx, 1); }; - public getPet(pet: Pet){ + public getPet(pet: Pet): PetHandler{ return this._pets.find((item:PetHandler)=>{ return item._pet == pet; }) From 19b212ced8614bf97ee300340c56362cb86a7a5c Mon Sep 17 00:00:00 2001 From: yuexin Date: Wed, 9 Dec 2020 20:33:19 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E5=87=BD=E6=95=B0=E5=90=8D=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/rooms/logic/Handler/PetHandler.ts | 6 +++--- src/rooms/logic/Handler/PlayerHandler.ts | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/rooms/logic/Handler/PetHandler.ts b/src/rooms/logic/Handler/PetHandler.ts index ef832af..1f7c10e 100644 --- a/src/rooms/logic/Handler/PetHandler.ts +++ b/src/rooms/logic/Handler/PetHandler.ts @@ -92,7 +92,7 @@ export class PetHandler { // this._exap = 0; }; - public addEffHalo(skill: Skill): boolean{ + private _addEffHalo(skill: Skill): boolean{ if(!this.hasEffHalo(skill)){ this._effhalos.push(skill); return true; @@ -274,11 +274,11 @@ export class PetHandler { }; // 自己的光环是否加到apet上 - public checkHalo(apet: PetHandler): boolean{ + public addEffHalo(apet: PetHandler): boolean{ let bok = false; this._halos.forEach((item: Skill)=>{ if(item.isEffSelfPet(this, apet)){ - if(apet.addEffHalo(item)){ + if(apet._addEffHalo(item)){ bok = true; } // 暂时都加战力 } diff --git a/src/rooms/logic/Handler/PlayerHandler.ts b/src/rooms/logic/Handler/PlayerHandler.ts index e1fd6d7..d98ad5f 100644 --- a/src/rooms/logic/Handler/PlayerHandler.ts +++ b/src/rooms/logic/Handler/PlayerHandler.ts @@ -89,7 +89,7 @@ export class PlayerHandler { public getPet(pet: Pet): PetHandler{ return this._pets.find((item:PetHandler)=>{ return item._pet == pet; - }) + }); }; public exportAllPets(skill: Skill, param: SkillParam, expet: PetHandler, dst: SkillTarget[]): SkillTarget[]{ From 3430eab7f29b153ebb7368812e3888d4f2790d6d Mon Sep 17 00:00:00 2001 From: yuexin Date: Wed, 9 Dec 2020 20:48:29 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E5=85=89=E7=8E=AF=E9=80=BB=E8=BE=91?= =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/rooms/logic/Handler/PlayerHandler.ts | 37 ++++++------------------ 1 file changed, 9 insertions(+), 28 deletions(-) diff --git a/src/rooms/logic/Handler/PlayerHandler.ts b/src/rooms/logic/Handler/PlayerHandler.ts index d98ad5f..51eab52 100644 --- a/src/rooms/logic/Handler/PlayerHandler.ts +++ b/src/rooms/logic/Handler/PlayerHandler.ts @@ -280,56 +280,37 @@ export class PlayerHandler { }; public onHaloAdd(apet: PetHandler, only_checkother: boolean = false){ - let bkself = this._self._effhalos.length; - let bkpets: number[] = []; - let lst: PetHandler[] = []; if(only_checkother){ this._pets.forEach((obj: PetHandler)=>{ - if(apet.checkHalo(obj)){ + if(apet.addEffHalo(obj)){ lst.push(obj); } }); if(this._self != apet){ - if(apet.checkHalo(this._self)){ + if(apet.addEffHalo(this._self)){ lst.push(this._self); } } }else{ - this._self.clearEffHalos(); - this._pets.forEach((obj:PetHandler)=>{ - bkpets.push(obj._effhalos.length); - obj.clearEffHalos(); - }); - - apet.checkHalo(apet); + apet.addEffHalo(apet); this._pets.forEach((obj: PetHandler)=>{ if(obj != apet){ - obj.checkHalo(apet); - apet.checkHalo(obj); + obj.addEffHalo(apet); + if(apet.addEffHalo(obj)){ + lst.push(obj); + } } }); if(this._self != apet){ - this._self.checkHalo(apet); - apet.checkHalo(this._self); - } - - if(bkself != this._self._effhalos.length){ - if(this._self != apet){ + this._self.addEffHalo(apet); + if(apet.addEffHalo(this._self)){ lst.push(this._self); } } - - for(let i = 0; i < bkpets.length; i++){ - let bk = bkpets[i]; - let obj = this._pets[i]; - if(obj != apet && obj._effhalos.length != bk){ - lst.push(obj); - } - } } this._owner.onUpdatePetsNotify(lst); From c2c4d4ded6e41c331d4720db056b3e716aea3e61 Mon Sep 17 00:00:00 2001 From: yuexin Date: Wed, 9 Dec 2020 20:56:23 +0800 Subject: [PATCH 4/7] =?UTF-8?q?case=20break=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/PetHandler.ts | 4 +--- src/rooms/logic/skill/Skill.ts | 5 +++++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/rooms/logic/Handler/PetHandler.ts b/src/rooms/logic/Handler/PetHandler.ts index 1f7c10e..f89bba4 100644 --- a/src/rooms/logic/Handler/PetHandler.ts +++ b/src/rooms/logic/Handler/PetHandler.ts @@ -72,9 +72,7 @@ export class PetHandler { this.addSkill(skillid); }); - if(this._halos.length > 0){ - this._owner.onHaloAdd(this, false); - } + this._owner.onHaloAdd(this, false); this.born(param); }; diff --git a/src/rooms/logic/skill/Skill.ts b/src/rooms/logic/skill/Skill.ts index 26ad6d2..07da471 100644 --- a/src/rooms/logic/skill/Skill.ts +++ b/src/rooms/logic/skill/Skill.ts @@ -144,12 +144,17 @@ export class Skill { switch(this._data.targetid){ case GameUnitType.BATTLEUNIT: tgok = this.isInRange(srcpet, dstpet); + break; case GameUnitType.HERO: tgok = dstpet._isHero; + break; case GameUnitType.PET: if(!dstpet._isHero){ tgok = this.isInRange(srcpet, dstpet); } + break; + default: + break; } return tgok; }; From 4e7fd119e6c9a064fd659c5bca403248b8f5e587 Mon Sep 17 00:00:00 2001 From: yuexin Date: Wed, 9 Dec 2020 20:59:53 +0800 Subject: [PATCH 5/7] =?UTF-8?q?case=20break=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/rooms/logic/skill/TriggerMan.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rooms/logic/skill/TriggerMan.ts b/src/rooms/logic/skill/TriggerMan.ts index cb89da5..c50bba9 100644 --- a/src/rooms/logic/skill/TriggerMan.ts +++ b/src/rooms/logic/skill/TriggerMan.ts @@ -110,6 +110,7 @@ let TriggerManager = { tgts.forEach((item)=>{ sender.taunt(item); }); + break; case SkillEffectType.HURT_HP: tgts.forEach((item)=>{ sender.handleHP(effv + env, item); From 9d5c16a377124826807c749129e16cdc00461505 Mon Sep 17 00:00:00 2001 From: yuexin Date: Wed, 9 Dec 2020 21:06:47 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=88=98=E5=8A=9B=E5=8F=96=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/rooms/logic/Handler/PetHandler.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/rooms/logic/Handler/PetHandler.ts b/src/rooms/logic/Handler/PetHandler.ts index f89bba4..dfc5757 100644 --- a/src/rooms/logic/Handler/PetHandler.ts +++ b/src/rooms/logic/Handler/PetHandler.ts @@ -56,6 +56,7 @@ export class PetHandler { this._baseap = param.cardpoint; if(this._cfg.powernum_typeid == PowerValueType.RATIO){ this._baseap *= this._cfg.powernum; + this._baseap = Math.ceil(this._baseap); } } if(param && param.edd_cnt && this._isEnhancePower(this._cfg.edd_effid)){ From 1836361b5873e9d64c8efa5b74029c40519428c6 Mon Sep 17 00:00:00 2001 From: yuexin Date: Wed, 9 Dec 2020 21:20:30 +0800 Subject: [PATCH 7/7] =?UTF-8?q?ap=E5=8F=96=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/rooms/logic/Handler/PetHandler.ts | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/rooms/logic/Handler/PetHandler.ts b/src/rooms/logic/Handler/PetHandler.ts index dfc5757..8fb31cf 100644 --- a/src/rooms/logic/Handler/PetHandler.ts +++ b/src/rooms/logic/Handler/PetHandler.ts @@ -56,13 +56,15 @@ export class PetHandler { this._baseap = param.cardpoint; if(this._cfg.powernum_typeid == PowerValueType.RATIO){ this._baseap *= this._cfg.powernum; - this._baseap = Math.ceil(this._baseap); } } if(param && param.edd_cnt && this._isEnhancePower(this._cfg.edd_effid)){ this._baseap += CfgMan.calcEnhanceValue(this._cfg.edd_effid, this._cfg.edd_effnum, param.edd_cnt, this._baseap); } + + this._ceilBaseAP(); + this._skills.clear(); this.addSkill(this._cfg.base_skill1id); @@ -78,6 +80,10 @@ export class PetHandler { this.born(param); }; + private _ceilBaseAP(){ + this._baseap = Math.ceil(this._baseap); + }; + private _isEnhancePower(enid: number){ return enid == EnhanceEffectType.EN_POWER_BYCFG || enid == EnhanceEffectType.EN_POWER_BYAP; }; @@ -192,6 +198,7 @@ export class PetHandler { } if(n < 0){ this._baseap += n; + this._ceilBaseAP(); } this.dataChanged(); if(this._baseap < 0){ @@ -205,6 +212,7 @@ export class PetHandler { return 0; } this._baseap += value; + this._ceilBaseAP(); this.dataChanged(); if(this._baseap < 0){ this.die();