增加获得指定牌技能

This commit is contained in:
yuexin 2020-12-14 17:42:36 +08:00
parent 54591b6de4
commit e3ac1d1901
8 changed files with 30 additions and 3 deletions

File diff suppressed because one or more lines are too long

View File

@ -1 +1 @@
[{"id":50011,"unittypei_id":1,"hero_hp":150,"race_id":14,"job_id":1,"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":50021,"unittypei_id":1,"hero_hp":150,"race_id":15,"job_id":4,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40031,"base_skill2id":40021,"base_skill3id":0},{"id":50031,"unittypei_id":1,"hero_hp":150,"race_id":25,"job_id":1,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40041,"base_skill2id":40021,"base_skill3id":0},{"id":50041,"unittypei_id":1,"hero_hp":150,"race_id":14,"job_id":3,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40061,"base_skill2id":40021,"base_skill3id":0},{"id":51011,"unittypei_id":2,"hero_hp":0,"race_id":18,"job_id":1,"powernum_typeid":2,"powernum":1.0,"num_signid":1,"edd_effid":4,"edd_effnum":20.0,"eddeffnum_signid":1,"base_skill1id":40111,"base_skill2id":40121,"base_skill3id":0},{"id":51021,"unittypei_id":2,"hero_hp":0,"race_id":18,"job_id":4,"powernum_typeid":2,"powernum":1.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":0,"base_skill2id":0,"base_skill3id":0},{"id":51031,"unittypei_id":2,"hero_hp":0,"race_id":18,"job_id":1,"powernum_typeid":2,"powernum":0.5,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40141,"base_skill2id":0,"base_skill3id":0},{"id":51041,"unittypei_id":2,"hero_hp":0,"race_id":19,"job_id":1,"powernum_typeid":2,"powernum":1.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":0,"base_skill2id":0,"base_skill3id":0},{"id":51051,"unittypei_id":2,"hero_hp":0,"race_id":18,"job_id":1,"powernum_typeid":2,"powernum":1.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":0,"base_skill2id":0,"base_skill3id":0},{"id":51061,"unittypei_id":2,"hero_hp":0,"race_id":20,"job_id":4,"powernum_typeid":2,"powernum":1.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":0,"base_skill2id":0,"base_skill3id":0},{"id":50051,"unittypei_id":1,"hero_hp":180,"race_id":24,"job_id":1,"powernum_typeid":1,"powernum":40.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40021,"base_skill2id":0,"base_skill3id":0},{"id":50061,"unittypei_id":1,"hero_hp":150,"race_id":24,"job_id":4,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40081,"base_skill2id":40021,"base_skill3id":0},{"id":50071,"unittypei_id":1,"hero_hp":150,"race_id":16,"job_id":1,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40091,"base_skill2id":40021,"base_skill3id":0},{"id":50081,"unittypei_id":1,"hero_hp":150,"race_id":15,"job_id":3,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40101,"base_skill2id":40021,"base_skill3id":0}]
[{"id":50011,"unittypei_id":1,"hero_hp":150,"race_id":14,"job_id":1,"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":50021,"unittypei_id":1,"hero_hp":150,"race_id":15,"job_id":4,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40031,"base_skill2id":40021,"base_skill3id":0},{"id":50031,"unittypei_id":1,"hero_hp":150,"race_id":25,"job_id":1,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40041,"base_skill2id":40021,"base_skill3id":0},{"id":50041,"unittypei_id":1,"hero_hp":150,"race_id":14,"job_id":3,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40061,"base_skill2id":40021,"base_skill3id":0},{"id":51011,"unittypei_id":2,"hero_hp":0,"race_id":18,"job_id":1,"powernum_typeid":2,"powernum":1.0,"num_signid":1,"edd_effid":4,"edd_effnum":20.0,"eddeffnum_signid":1,"base_skill1id":40111,"base_skill2id":40121,"base_skill3id":0},{"id":51021,"unittypei_id":2,"hero_hp":0,"race_id":18,"job_id":4,"powernum_typeid":2,"powernum":1.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":0,"base_skill2id":0,"base_skill3id":0},{"id":51031,"unittypei_id":2,"hero_hp":0,"race_id":18,"job_id":1,"powernum_typeid":2,"powernum":0.5,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40141,"base_skill2id":0,"base_skill3id":0},{"id":51041,"unittypei_id":2,"hero_hp":0,"race_id":19,"job_id":1,"powernum_typeid":2,"powernum":1.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":0,"base_skill2id":0,"base_skill3id":0},{"id":51051,"unittypei_id":2,"hero_hp":0,"race_id":18,"job_id":1,"powernum_typeid":2,"powernum":1.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":0,"base_skill2id":0,"base_skill3id":0},{"id":51061,"unittypei_id":2,"hero_hp":0,"race_id":20,"job_id":4,"powernum_typeid":2,"powernum":1.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":0,"base_skill2id":0,"base_skill3id":0},{"id":50051,"unittypei_id":1,"hero_hp":170,"race_id":24,"job_id":1,"powernum_typeid":1,"powernum":50.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40021,"base_skill2id":0,"base_skill3id":0},{"id":50061,"unittypei_id":1,"hero_hp":150,"race_id":24,"job_id":4,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40081,"base_skill2id":40021,"base_skill3id":0},{"id":50071,"unittypei_id":1,"hero_hp":150,"race_id":16,"job_id":1,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40091,"base_skill2id":40021,"base_skill3id":0},{"id":50081,"unittypei_id":1,"hero_hp":150,"race_id":15,"job_id":3,"powernum_typeid":1,"powernum":30.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"base_skill1id":40101,"base_skill2id":40021,"base_skill3id":0}]

View File

@ -26,6 +26,8 @@ export class SkillCfg implements Cfg{
public quoteunit_times: number;
public quoteskillid: number;
public quoteskill_times: number;
public quotecardid: number;
public quotecard_times: number;
public decode(data: any) {
this.id = data.id;
@ -51,6 +53,8 @@ export class SkillCfg implements Cfg{
this.quoteunit_times = data.quoteunit_times;
this.quoteskillid = data.quoteskillid;
this.quoteskill_times = data.quoteskill_times;
this.quotecardid = data.quotecardid;
this.quotecard_times = data.quotecard_times;
};
public isOK (uniqueID: number, param1: any, param2: any): boolean {

View File

@ -438,6 +438,12 @@ export class BattleHandler {
return this._room.drawCardFromPlayer(srcplayer.getId(), dstplayer.getId(), count);
};
public onPlayerAddDirectCardNotify(aplayer: PlayerHandler, count: number, cardid: number,
from?: PlayerHandler){
this._room.generateCard({player: aplayer.getId(), count, effectId: cardid, fromplayer: from? from.getId(): null});
return 0;
};
public onSkillResultNotify(skillres: SkillTarget[]){
if(!skillres || skillres.length <= 0){
return;

View File

@ -237,6 +237,10 @@ export class PlayerHandler {
return this._owner.onPlayerAddCardNotify(this, 0, maxcount, from);
};
public addDirectCard(cardid: number, count: number, from?: PlayerHandler){
return this._owner.onPlayerAddDirectCardNotify(this, count, cardid, from);
};
public stealCard(dstplayer: PlayerHandler, count: number): number{
return this._owner.onPlayerStealCardNotify(this, dstplayer, count);
};

View File

@ -240,7 +240,7 @@ export class Skill {
}
};
handleCard(efftype: SkillEffectType, effvalue: number, tgt: SkillTarget){
handleCard(efftype: SkillEffectType, effvalue: number, tgt: SkillTarget, cardid?: number){
let res = effvalue;
switch(efftype){
case SkillEffectType.CARD_ADD:
@ -276,6 +276,16 @@ export class Skill {
case SkillEffectType.CARD_CHG_EN:
//todo: 暂不处理
break;
case SkillEffectType.CARD_GETDIRECT:
if(tgt.dsttype == GameUnitType.PLAYER){
let n = (tgt.dst as PlayerHandler).addDirectCard(cardid, res, tgt.srcplayer);
if(n >= 0){
tgt.success(efftype, n);
}
}else{
tgt.fail(efftype, -1);
}
break;
default:
break;
}

View File

@ -113,6 +113,7 @@ export const enum SkillEffectType
HURT_HP = 11,
POWER_ADD_BUFF = 12,
HURT_REDUCE = 13,
CARD_GETDIRECT = 21,
};
// 技能效果参数类型

View File

@ -7,6 +7,7 @@
// Learn life-cycle callbacks:
// - [Chinese] https://docs.cocos.com/creator/manual/zh/scripting/life-cycle-callbacks.html
import { SKillEffectData } from "message/SkillInfo";
import { PetHandler } from "../Handler/PetHandler";
import { Condition } from "./Condition";
import { Skill } from "./Skill";
@ -90,6 +91,7 @@ let TriggerManager = {
case SkillEffectType.CARD_ADD_LIMIT:
case SkillEffectType.CARD_STEAL:
case SkillEffectType.CARD_CHG_EN:
case SkillEffectType.CARD_GETDIRECT:
tgts.forEach((item)=>{
sender.handleCard(effectid, effv + env, item);
});