修订多选随从问题

This commit is contained in:
yuexin 2020-12-09 17:34:10 +08:00
parent c670894adb
commit d2ad64cd5f
3 changed files with 9 additions and 10 deletions

View File

@ -119,17 +119,17 @@ export class BattleHandler {
}else{ }else{
if(skill.isAllTarget()){ if(skill.isAllTarget()){
players.forEach((item: PlayerHandler)=>{ players.forEach((item: PlayerHandler)=>{
item.exportAllPets(skill._data.targetid, param, null, lst); item.exportAllPets(skill, param, null, lst);
}); });
}else{ }else{
if(param.srcpet){ if(param.srcpet){
players.forEach((item: PlayerHandler)=>{ players.forEach((item: PlayerHandler)=>{
item.exportAllPets(skill._data.targetid, param, param.srcpet, lst); item.exportAllPets(skill, param, param.srcpet, lst);
}); });
}else{ }else{
players.forEach((item: PlayerHandler)=>{ players.forEach((item: PlayerHandler)=>{
if(item != param.srcplayer){ if(item != param.srcplayer){
item.exportAllPets(skill._data.targetid, param, param.srcpet, lst); item.exportAllPets(skill, param, param.srcpet, lst);
} }
}); });
} }

View File

@ -92,27 +92,28 @@ export class PlayerHandler {
}) })
}; };
public exportAllPets(ct: GameUnitType, param: SkillParam, expet: PetHandler, dst: SkillTarget[]): SkillTarget[]{ public exportAllPets(skill: Skill, param: SkillParam, expet: PetHandler, dst: SkillTarget[]): SkillTarget[]{
if(!dst){ if(!dst){
return null; return null;
} }
let ct = skill._data.targetid;
switch(ct){ switch(ct){
case GameUnitType.BATTLEUNIT: case GameUnitType.BATTLEUNIT:
let lst = this._pets.reverse(); let lst = this._pets.reverse();
lst.forEach(element => { lst.forEach(element => {
if(expet != element){ if(expet != element){
dst.push(new SkillTarget(param.skill, param.srcplayer, param.srcpet, element, GameUnitType.PET)); dst.push(new SkillTarget(skill, param.srcplayer, param.srcpet, element, GameUnitType.PET));
} }
}); });
(expet != this._self) && dst.push(new SkillTarget(param.skill, param.srcplayer, param.srcpet, this._self, GameUnitType.PET)); (expet != this._self) && dst.push(new SkillTarget(skill, param.srcplayer, param.srcpet, this._self, GameUnitType.PET));
break; break;
case GameUnitType.HERO: case GameUnitType.HERO:
(expet != this._self) && dst.push(new SkillTarget(param.skill, param.srcplayer, param.srcpet, this._self, GameUnitType.PET)); (expet != this._self) && dst.push(new SkillTarget(skill, param.srcplayer, param.srcpet, this._self, GameUnitType.PET));
break; break;
case GameUnitType.PET: case GameUnitType.PET:
lst.forEach(element => { lst.forEach(element => {
if(expet != element){ if(expet != element){
dst.push(new SkillTarget(param.skill, param.srcplayer, param.srcpet, element, GameUnitType.PET)); dst.push(new SkillTarget(skill, param.srcplayer, param.srcpet, element, GameUnitType.PET));
} }
}); });
break; break;

View File

@ -14,8 +14,6 @@ export class SkillParam{
srcpet: PetHandler; srcpet: PetHandler;
skill: Skill;
constructor(cardid: number, cardpoint: number, effcnt: number, srcplayer: PlayerHandler, srcpet: PetHandler, constructor(cardid: number, cardpoint: number, effcnt: number, srcplayer: PlayerHandler, srcpet: PetHandler,
dstplayer: PlayerHandler, dstpet: PetHandler){ dstplayer: PlayerHandler, dstpet: PetHandler){
this.cardid = cardid; this.cardid = cardid;