导表+逻辑处理
This commit is contained in:
parent
9cf9c2e20c
commit
c6934bf4ec
@ -1 +1 @@
|
|||||||
[{"id":99001,"type_id":1,"value":6},{"id":99002,"type_id":1,"value":2},{"id":99003,"type_id":2,"value":20},{"id":99004,"type_id":1,"value":2},{"id":99005,"type_id":1,"value":3},{"id":99006,"type_id":1,"value":4},{"id":99007,"type_id":1,"value":12},{"id":99008,"type_id":2,"value":12},{"id":99009,"type_id":2,"value":15},{"id":99010,"type_id":2,"value":15},{"id":99011,"type_id":2,"value":20},{"id":99012,"type_id":2,"value":5},{"id":99013,"type_id":1,"value":2},{"id":99014,"type_id":2,"value":5},{"id":99015,"type_id":1,"value":10},{"id":99016,"type_id":1,"value":10},{"id":99017,"type_id":2,"value":12},{"id":99018,"type_id":2,"value":12},{"id":99019,"type_id":2,"value":3},{"id":99020,"type_id":2,"value":20},{"id":99021,"type_id":3,"value":10},{"id":99022,"type_id":3,"value":55},{"id":99023,"type_id":1,"value":2}]
|
[{"id":99001,"type_id":1,"value":6},{"id":99002,"type_id":1,"value":2},{"id":99003,"type_id":2,"value":20},{"id":99004,"type_id":1,"value":2},{"id":99005,"type_id":1,"value":3},{"id":99006,"type_id":1,"value":4},{"id":99007,"type_id":1,"value":12},{"id":99008,"type_id":2,"value":12},{"id":99009,"type_id":2,"value":15},{"id":99010,"type_id":2,"value":15},{"id":99011,"type_id":2,"value":20},{"id":99012,"type_id":2,"value":5},{"id":99013,"type_id":1,"value":2},{"id":99014,"type_id":2,"value":5},{"id":99015,"type_id":1,"value":10},{"id":99016,"type_id":1,"value":10},{"id":99017,"type_id":2,"value":12},{"id":99018,"type_id":2,"value":12},{"id":99019,"type_id":2,"value":3},{"id":99020,"type_id":2,"value":20},{"id":99021,"type_id":3,"value":10},{"id":99022,"type_id":3,"value":55},{"id":99023,"type_id":1,"value":2},{"id":99024,"type_id":1,"value":3},{"id":99025,"type_id":1,"value":4}]
|
||||||
File diff suppressed because one or more lines are too long
@ -1 +1 @@
|
|||||||
[{"id":51012,"unittypei_id":2,"hero_hp":0,"spell_power":0,"defense":30,"race_id":0,"job_id":0,"powernum_typeid":2,"powernum":1.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40022,"base_skill2id":0,"base_skill3id":0},{"id":51022,"unittypei_id":2,"hero_hp":0,"spell_power":15,"defense":0,"race_id":0,"job_id":0,"powernum_typeid":2,"powernum":1.0,"num_signid":1,"edd_effid":30,"edd_effnum":15.0,"eddeffnum_signid":1,"base_skill1id":0,"base_skill2id":0,"base_skill3id":0},{"id":51032,"unittypei_id":2,"hero_hp":0,"spell_power":0,"defense":0,"race_id":0,"job_id":0,"powernum_typeid":2,"powernum":1.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40141,"base_skill2id":0,"base_skill3id":0},{"id":51042,"unittypei_id":2,"hero_hp":0,"spell_power":0,"defense":0,"race_id":0,"job_id":0,"powernum_typeid":2,"powernum":1.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40282,"base_skill2id":0,"base_skill3id":0},{"id":51052,"unittypei_id":2,"hero_hp":0,"spell_power":0,"defense":0,"race_id":0,"job_id":0,"powernum_typeid":2,"powernum":0.5,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40292,"base_skill2id":0,"base_skill3id":0},{"id":51062,"unittypei_id":2,"hero_hp":0,"spell_power":0,"defense":0,"race_id":0,"job_id":0,"powernum_typeid":2,"powernum":1.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40082,"base_skill2id":0,"base_skill3id":0},{"id":51072,"unittypei_id":2,"hero_hp":0,"spell_power":0,"defense":50,"race_id":0,"job_id":0,"powernum_typeid":2,"powernum":1.0,"num_signid":1,"edd_effid":4,"edd_effnum":20.0,"eddeffnum_signid":1,"base_skill1id":40121,"base_skill2id":0,"base_skill3id":0},{"id":51082,"unittypei_id":2,"hero_hp":0,"spell_power":0,"defense":30,"race_id":0,"job_id":0,"powernum_typeid":2,"powernum":1.0,"num_signid":1,"edd_effid":4,"edd_effnum":20.0,"eddeffnum_signid":1,"base_skill1id":40402,"base_skill2id":0,"base_skill3id":0},{"id":52012,"unittypei_id":1,"hero_hp":100,"spell_power":0,"defense":30,"race_id":0,"job_id":0,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40011,"base_skill2id":0,"base_skill3id":0},{"id":52022,"unittypei_id":1,"hero_hp":100,"spell_power":0,"defense":30,"race_id":0,"job_id":0,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40031,"base_skill2id":0,"base_skill3id":0},{"id":52032,"unittypei_id":1,"hero_hp":100,"spell_power":0,"defense":30,"race_id":0,"job_id":0,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40442,"base_skill2id":0,"base_skill3id":0},{"id":52042,"unittypei_id":1,"hero_hp":100,"spell_power":0,"defense":30,"race_id":0,"job_id":0,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40061,"base_skill2id":0,"base_skill3id":0},{"id":52052,"unittypei_id":1,"hero_hp":100,"spell_power":0,"defense":30,"race_id":0,"job_id":0,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40412,"base_skill2id":0,"base_skill3id":0},{"id":52062,"unittypei_id":1,"hero_hp":100,"spell_power":0,"defense":30,"race_id":0,"job_id":0,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40432,"base_skill2id":0,"base_skill3id":0},{"id":52072,"unittypei_id":1,"hero_hp":100,"spell_power":0,"defense":30,"race_id":0,"job_id":0,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40422,"base_skill2id":0,"base_skill3id":0},{"id":52082,"unittypei_id":1,"hero_hp":100,"spell_power":0,"defense":30,"race_id":0,"job_id":0,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40062,"base_skill2id":0,"base_skill3id":0}]
|
[{"id":51012,"unittypei_id":2,"hero_hp":0,"spell_power":0,"defense":30,"race_id":0,"job_id":0,"powernum_typeid":2,"powernum":1.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40022,"base_skill2id":0,"base_skill3id":0},{"id":51022,"unittypei_id":2,"hero_hp":0,"spell_power":15,"defense":0,"race_id":0,"job_id":0,"powernum_typeid":2,"powernum":1.0,"num_signid":1,"edd_effid":30,"edd_effnum":15.0,"eddeffnum_signid":1,"base_skill1id":0,"base_skill2id":0,"base_skill3id":0},{"id":51032,"unittypei_id":2,"hero_hp":0,"spell_power":0,"defense":0,"race_id":0,"job_id":0,"powernum_typeid":2,"powernum":1.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40141,"base_skill2id":0,"base_skill3id":0},{"id":51042,"unittypei_id":2,"hero_hp":0,"spell_power":0,"defense":0,"race_id":0,"job_id":0,"powernum_typeid":2,"powernum":1.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40282,"base_skill2id":0,"base_skill3id":0},{"id":51052,"unittypei_id":2,"hero_hp":0,"spell_power":0,"defense":0,"race_id":0,"job_id":0,"powernum_typeid":2,"powernum":0.5,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40292,"base_skill2id":0,"base_skill3id":0},{"id":51062,"unittypei_id":2,"hero_hp":0,"spell_power":0,"defense":0,"race_id":0,"job_id":0,"powernum_typeid":2,"powernum":1.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40082,"base_skill2id":0,"base_skill3id":0},{"id":51072,"unittypei_id":2,"hero_hp":0,"spell_power":0,"defense":50,"race_id":0,"job_id":0,"powernum_typeid":2,"powernum":1.0,"num_signid":1,"edd_effid":4,"edd_effnum":20.0,"eddeffnum_signid":1,"base_skill1id":40121,"base_skill2id":0,"base_skill3id":0},{"id":51082,"unittypei_id":2,"hero_hp":0,"spell_power":0,"defense":30,"race_id":0,"job_id":0,"powernum_typeid":2,"powernum":1.0,"num_signid":1,"edd_effid":4,"edd_effnum":20.0,"eddeffnum_signid":1,"base_skill1id":40402,"base_skill2id":0,"base_skill3id":0},{"id":52012,"unittypei_id":1,"hero_hp":100,"spell_power":0,"defense":30,"race_id":0,"job_id":0,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40011,"base_skill2id":40452,"base_skill3id":0},{"id":52022,"unittypei_id":1,"hero_hp":100,"spell_power":0,"defense":30,"race_id":0,"job_id":0,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40031,"base_skill2id":40452,"base_skill3id":0},{"id":52032,"unittypei_id":1,"hero_hp":100,"spell_power":0,"defense":30,"race_id":0,"job_id":0,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40442,"base_skill2id":40452,"base_skill3id":0},{"id":52042,"unittypei_id":1,"hero_hp":100,"spell_power":0,"defense":30,"race_id":0,"job_id":0,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40061,"base_skill2id":40452,"base_skill3id":0},{"id":52052,"unittypei_id":1,"hero_hp":100,"spell_power":0,"defense":30,"race_id":0,"job_id":0,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40412,"base_skill2id":40452,"base_skill3id":0},{"id":52062,"unittypei_id":1,"hero_hp":100,"spell_power":0,"defense":30,"race_id":0,"job_id":0,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40432,"base_skill2id":40452,"base_skill3id":0},{"id":52072,"unittypei_id":1,"hero_hp":100,"spell_power":0,"defense":30,"race_id":0,"job_id":0,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40422,"base_skill2id":40452,"base_skill3id":0},{"id":52082,"unittypei_id":1,"hero_hp":100,"spell_power":0,"defense":30,"race_id":0,"job_id":0,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40062,"base_skill2id":40452,"base_skill3id":0}]
|
||||||
@ -1,4 +1,5 @@
|
|||||||
import { SkillCfg } from "cfg/parsers/SkillCfg";
|
import { SkillCfg } from "cfg/parsers/SkillCfg";
|
||||||
|
import e from "express";
|
||||||
import { SKillEffectData } from "message/SkillInfo";
|
import { SKillEffectData } from "message/SkillInfo";
|
||||||
import CfgMan from "../CfgMan";
|
import CfgMan from "../CfgMan";
|
||||||
import { PetHandler } from "../Handler/PetHandler";
|
import { PetHandler } from "../Handler/PetHandler";
|
||||||
@ -225,27 +226,43 @@ export class Skill {
|
|||||||
this.halo_v = -1;
|
this.halo_v = -1;
|
||||||
};
|
};
|
||||||
|
|
||||||
_triggerSubSkill(param: SkillParam, cb?: any){
|
_triggerSubSkill(param: SkillParam, sts: SkillTarget[], cb?: any){
|
||||||
if(this._data.quoteskillid && !this._subskill){
|
if(this._data.quoteskillid && !this._subskill){
|
||||||
this._subskill = this._owner.newSkill(this._data.quoteskillid);
|
this._subskill = this._owner.newSkill(this._data.quoteskillid);
|
||||||
}
|
}
|
||||||
if(this._subskill){
|
if(this._subskill){
|
||||||
let subparam = this._data.skill_users? param.clone(): param;
|
let pl = [];
|
||||||
if(this._data.skill_users){
|
if(!this._data.skill_users){
|
||||||
let tmpplayer = subparam.srcplayer;
|
pl.push(param);
|
||||||
let tmppet = subparam.srcpet;
|
}else{
|
||||||
subparam.srcplayer = subparam.dstplayer;
|
if(sts && sts.length > 0){
|
||||||
subparam.srcpet = subparam.dstpet;
|
sts.forEach((item: SkillTarget)=>{
|
||||||
subparam.dstpet = tmppet;
|
let sp = param.oppClone();
|
||||||
subparam.dstplayer = tmpplayer;
|
if(item.dsttype != GameUnitType.NONE){
|
||||||
|
if(item.dsttype == GameUnitType.PLAYER){
|
||||||
|
sp.srcplayer = (item.dst as PlayerHandler);
|
||||||
|
sp.srcpet = sp.srcplayer._self;
|
||||||
|
}else {
|
||||||
|
sp.srcpet = (item.dst as PetHandler);
|
||||||
|
sp.srcplayer = sp.srcpet._owner;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
pl.push(sp);
|
||||||
|
});
|
||||||
|
}else{
|
||||||
|
pl.push(param.oppClone());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let ncount = this.getFinalValue(EnhanceCustomType.QUOTE_TIMES, this._data.quotecard_times,
|
let ncount = this.getFinalValue(EnhanceCustomType.QUOTE_TIMES, this._data.quotecard_times,
|
||||||
this._data.quotecard_timesmax, param.edd_cnt, param.cardpoint);
|
this._data.quotecard_timesmax, param.edd_cnt, param.cardpoint);
|
||||||
if(ncount == 0){
|
if(ncount == 0){
|
||||||
ncount = 1;
|
ncount = 1;
|
||||||
}
|
}
|
||||||
for(let i=0; i<ncount;i++){
|
for(let i=0; i<ncount;i++){
|
||||||
this._subskill._trigger(subparam, cb);
|
pl.forEach((item: SkillParam)=>{
|
||||||
|
this._subskill._trigger(item, cb);
|
||||||
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -264,7 +281,7 @@ export class Skill {
|
|||||||
|
|
||||||
this._cb && this._cb(this, param, res);
|
this._cb && this._cb(this, param, res);
|
||||||
|
|
||||||
this._triggerSubSkill(param, cb);
|
this._triggerSubSkill(param, res, cb);
|
||||||
};
|
};
|
||||||
|
|
||||||
trigger(param: SkillParam, cb?: any) {
|
trigger(param: SkillParam, cb?: any) {
|
||||||
@ -542,13 +559,7 @@ export class Skill {
|
|||||||
if(res){
|
if(res){
|
||||||
tgt.success(efftype, res);
|
tgt.success(efftype, res);
|
||||||
// if(this._data.quoteskillid){
|
// if(this._data.quoteskillid){
|
||||||
// let dp = this._data.skill_users? param.clone(): param;
|
// let dp = this._data.skill_users? param.oppClone(): param;
|
||||||
// if(this._data.skill_users){
|
|
||||||
// dp.srcpet = param.dstpet;
|
|
||||||
// dp.srcplayer = param.dstplayer;
|
|
||||||
// dp.dstpet = param.srcpet;
|
|
||||||
// dp.dstplayer = param.srcplayer;
|
|
||||||
// }
|
|
||||||
// let pet = tgt.srcpet;
|
// let pet = tgt.srcpet;
|
||||||
// if(!pet && tgt.srcplayer){
|
// if(!pet && tgt.srcplayer){
|
||||||
// pet = tgt.srcplayer._self;
|
// pet = tgt.srcplayer._self;
|
||||||
|
|||||||
@ -248,7 +248,6 @@ export const enum GameUnitType {
|
|||||||
BATTLEUNIT = 2,
|
BATTLEUNIT = 2,
|
||||||
HERO = 3,
|
HERO = 3,
|
||||||
PET = 4,
|
PET = 4,
|
||||||
ANY = 5,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// 游戏敌我阵营
|
// 游戏敌我阵营
|
||||||
|
|||||||
@ -29,6 +29,20 @@ export class SkillParam{
|
|||||||
return new SkillParam(this.cardid, this.cardpoint, this.edd_cnt,
|
return new SkillParam(this.cardid, this.cardpoint, this.edd_cnt,
|
||||||
this.srcplayer, this.srcpet, this.dstplayer, this.dstpet);
|
this.srcplayer, this.srcpet, this.dstplayer, this.dstpet);
|
||||||
};
|
};
|
||||||
|
|
||||||
|
oppClone(){
|
||||||
|
return new SkillParam(this.cardid, this.cardpoint, this.edd_cnt,
|
||||||
|
this.dstplayer, this.dstpet, this.srcplayer, this.srcpet);
|
||||||
|
};
|
||||||
|
|
||||||
|
reverse(){
|
||||||
|
let tmpplayer = this.srcplayer;
|
||||||
|
let tmppet = this.srcpet;
|
||||||
|
this.srcplayer = this.dstplayer;
|
||||||
|
this.srcpet = this.dstpet;
|
||||||
|
this.dstpet = tmppet;
|
||||||
|
this.dstplayer = tmpplayer;
|
||||||
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
export class SkillResult{
|
export class SkillResult{
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user