导表+逻辑优化

This commit is contained in:
yuexin 2021-01-11 17:42:26 +08:00
parent d25a3d8fa7
commit ec5f15100c
4 changed files with 25 additions and 27 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -238,6 +238,7 @@ export class PlayerHandler {
if(cfg.skill_typeid == SkillType.MAGIC){
for(let i = 0; i < count; i++){
let sk = this.newSkill(skillid);
sk.setOrignParam(param.edd_cnt, param.cardpoint, pet, pet);
lst.push(sk);
}
}else {

View File

@ -311,13 +311,13 @@ export class Skill {
break;
}
let ncount = this.getQuoteValue(skcount, skmaxcount, param.edd_cnt);
let ncount = this.getQuoteValue(skcount, skmaxcount, this._orign_effcnt);
for(let i=0; i<ncount;i++){
for(let j = 0; j < pl.length; j++){
let sp = pl[j];
let st = bst? sts[j]: null;
sk._trigger(sp, cb, st);
sk.trigger(sp, cb, st);
}
}
}
@ -344,9 +344,9 @@ export class Skill {
this._data.quoteskill2_times, this._data.quoteskill2_timesmax, param, res, cb);
};
trigger(param: SkillParam, cb?: any) {
trigger(param: SkillParam, cb?: any, target?: SkillTarget) {
let ncount = this.getFinalValue(EnhanceCustomType.RELEASE_TIMES, this._data.release_times,
this._data.release_timesmax, param.edd_cnt, true);
this._data.release_timesmax, this._orign_effcnt, true);
let sp;
// if(param.srcpet != this._petowner){
if(false){
@ -357,7 +357,7 @@ export class Skill {
sp = param;
}
for(let i=0; i<ncount;i++){
this._trigger(sp, cb);
this._trigger(sp, cb, target);
}
};
@ -531,11 +531,20 @@ export class Skill {
}
};
summon(efftype: SkillEffectType, exparam: SkillParam, tgt: SkillTarget){
summonSkill(skillid: number, count: number, countmax: number, obj: any, sender: PetHandler): SkillTarget[]{
if(!obj){
return null;
}else{
let ncount = this.getFinalValue(EnhanceCustomType.GET_TIMES, count, countmax, this._orign_effcnt, true);
return obj.useSkillEx(skillid, ncount, sender);
}
};
summon(efftype: SkillEffectType, exparam: SkillParam, tgt: SkillTarget){
switch(efftype){
case SkillEffectType.SUMMON_NPC:
{
let ncount = this.getQuoteValue(this._data.quoteunit_times, this._data.quoteunit_timesmax, exparam.edd_cnt);
let ncount = this.getQuoteValue(this._data.quoteunit_times, this._data.quoteunit_timesmax, this._orign_effcnt);
let obj = tgt.srcpet? tgt.srcpet: tgt.srcplayer;
let n = obj.summonPet(this._data.quoteunitid, ncount, exparam);
@ -554,11 +563,11 @@ export class Skill {
return;
}
let n1 = this.getQuoteValue(this._data.quoteskill_times, this._data.quoteskill_timesmax, exparam.edd_cnt);
let n1 = this.getQuoteValue(this._data.quoteskill_times, this._data.quoteskill_timesmax, this._orign_effcnt);
let r1 = obj.useSkill(this._data.quoteskillid, n1, exparam);
r1 && tgt.success(efftype, this._data.quoteskillid);
let n2 = this.getQuoteValue(this._data.quoteskill2_times, this._data.quoteskill2_timesmax, exparam.edd_cnt);
let n2 = this.getQuoteValue(this._data.quoteskill2_times, this._data.quoteskill2_timesmax, this._orign_effcnt);
let r2 = obj.useSkill(this._data.quoteskill2id, n2, exparam);
r2 && tgt.success(efftype, this._data.quoteskill2id);
@ -582,27 +591,15 @@ export class Skill {
if(this._data.getskillid){
let obj = tgt.getTarget(this._data.skill_ownersid);
if(!obj){
tgt.fail(efftype, this._data.getskillid);
}else{
let ncount = this.getFinalValue(EnhanceCustomType.GET_TIMES, this._data.getskill_times, this._data.getskill_timesmax,
exparam.edd_cnt, true);
let res = obj.useSkillEx(this._data.getskillid, ncount, sender);
res? tgt.success(efftype, this._data.getskillid): tgt.fail(efftype, this._data.getskillid);
}
let res = this.summonSkill(this._data.getskillid, this._data.getskill_times, this._data.getskill_timesmax, obj, sender);
res? tgt.success(efftype, this._data.getskillid): tgt.fail(efftype, this._data.getskillid);
bres1 = true;
}
if(this._data.getskill2id){
let obj = tgt.getTarget(this._data.skill2_ownersid);
if(!obj){
tgt.fail(efftype, this._data.getskill2id);
}else{
let ncount = this.getFinalValue(EnhanceCustomType.GET_TIMES, this._data.getskill2_times, this._data.getskill2_timesmax,
exparam.edd_cnt, true);
let res = obj.useSkillEx(this._data.getskill2id, ncount, sender);
res? tgt.success(efftype, this._data.getskill2id): tgt.fail(efftype, this._data.getskill2id);
}
let res = this.summonSkill(this._data.getskill2id, this._data.getskill2_times, this._data.getskill2_timesmax, obj, sender);
res? tgt.success(efftype, this._data.getskill2id): tgt.fail(efftype, this._data.getskill2id);
bres2 = true;
}