import tables

configs/compound_tbl.json

@@ -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":8},{"id":99009,"type_id":2,"value":8},{"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":5},{"id":99014,"type_id":2,"value":5}]
+[{"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":8},{"id":99009,"type_id":2,"value":8},{"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":5},{"id":99014,"type_id":2,"value":5}]

configs/effectcard_tbl.json

@@ -1 +1 @@
-[{"id":20011,"type_id":1,"count":20,"stageunit_id":51011,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0},{"id":20021,"type_id":1,"count":20,"stageunit_id":51021,"quoteskill1id":40131,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0},{"id":20031,"type_id":1,"count":15,"stageunit_id":51031,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0},{"id":20041,"type_id":1,"count":25,"stageunit_id":51041,"quoteskill1id":40151,"quoteskill2id":40161,"quoteskill3id":0,"quoteskill4id":0},{"id":20051,"type_id":1,"count":25,"stageunit_id":51051,"quoteskill1id":40171,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0},{"id":20061,"type_id":1,"count":20,"stageunit_id":51061,"quoteskill1id":40181,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0},{"id":20071,"type_id":2,"count":20,"stageunit_id":0,"quoteskill1id":40191,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0},{"id":20081,"type_id":2,"count":15,"stageunit_id":0,"quoteskill1id":40201,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0}]
+[{"id":20011,"type_id":1,"count":20,"stageunit_id":51011,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20021,"type_id":1,"count":20,"stageunit_id":51021,"quoteskill1id":40131,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20031,"type_id":1,"count":15,"stageunit_id":51031,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20041,"type_id":1,"count":25,"stageunit_id":51041,"quoteskill1id":40151,"quoteskill2id":40161,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20051,"type_id":1,"count":25,"stageunit_id":51051,"quoteskill1id":40171,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20061,"type_id":1,"count":20,"stageunit_id":51061,"quoteskill1id":40181,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20071,"type_id":2,"count":20,"stageunit_id":0,"quoteskill1id":40191,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20081,"type_id":2,"count":15,"stageunit_id":0,"quoteskill1id":40201,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":0}]

configs/unit_tbl.json

@@ -1 +1 @@
-[{"id":50011,"unittypei_id":1,"hero_hp":150,"race_id":4,"job_id":1,"powernum_typeid":1,"powernum":30,"edd_effid":0,"edd_effnum":0,"base_skill1id":40011,"base_skill2id":0,"base_skill3id":0},{"id":50021,"unittypei_id":1,"hero_hp":150,"race_id":11,"job_id":1,"powernum_typeid":1,"powernum":30,"edd_effid":0,"edd_effnum":0,"base_skill1id":40031,"base_skill2id":40021,"base_skill3id":0},{"id":50031,"unittypei_id":1,"hero_hp":150,"race_id":6,"job_id":1,"powernum_typeid":1,"powernum":30,"edd_effid":0,"edd_effnum":0,"base_skill1id":40041,"base_skill2id":40051,"base_skill3id":40021},{"id":50041,"unittypei_id":1,"hero_hp":150,"race_id":1,"job_id":1,"powernum_typeid":1,"powernum":30,"edd_effid":0,"edd_effnum":0,"base_skill1id":40061,"base_skill2id":40021,"base_skill3id":0},{"id":0,"unittypei_id":0,"hero_hp":0,"race_id":0,"job_id":0,"powernum_typeid":0,"powernum":0,"edd_effid":0,"edd_effnum":0,"base_skill1id":0,"base_skill2id":0,"base_skill3id":0},{"id":0,"unittypei_id":0,"hero_hp":0,"race_id":0,"job_id":0,"powernum_typeid":0,"powernum":0,"edd_effid":0,"edd_effnum":0,"base_skill1id":0,"base_skill2id":0,"base_skill3id":0},{"id":51011,"unittypei_id":2,"hero_hp":0,"race_id":9,"job_id":1,"powernum_typeid":2,"powernum":0,"edd_effid":6,"edd_effnum":20,"base_skill1id":40111,"base_skill2id":40121,"base_skill3id":0},{"id":51021,"unittypei_id":2,"hero_hp":0,"race_id":1,"job_id":1,"powernum_typeid":2,"powernum":0,"edd_effid":0,"edd_effnum":0,"base_skill1id":0,"base_skill2id":0,"base_skill3id":0},{"id":51031,"unittypei_id":2,"hero_hp":0,"race_id":13,"job_id":1,"powernum_typeid":3,"powernum":0,"edd_effid":0,"edd_effnum":0,"base_skill1id":40141,"base_skill2id":0,"base_skill3id":0},{"id":51041,"unittypei_id":2,"hero_hp":0,"race_id":2,"job_id":1,"powernum_typeid":2,"powernum":0,"edd_effid":0,"edd_effnum":0,"base_skill1id":0,"base_skill2id":0,"base_skill3id":0}]
+[{"id":50011,"unittypei_id":1,"hero_hp":150,"race_id":4,"job_id":1,"powernum_typeid":1,"powernum":30,"num_signid":1,"edd_effid":0,"edd_effnum":0,"eddeffnum_signid":0,"base_skill1id":40011,"base_skill2id":0,"base_skill3id":0},{"id":50021,"unittypei_id":1,"hero_hp":150,"race_id":11,"job_id":1,"powernum_typeid":1,"powernum":30,"num_signid":1,"edd_effid":0,"edd_effnum":0,"eddeffnum_signid":0,"base_skill1id":40031,"base_skill2id":40021,"base_skill3id":0},{"id":50031,"unittypei_id":1,"hero_hp":150,"race_id":6,"job_id":1,"powernum_typeid":1,"powernum":30,"num_signid":1,"edd_effid":0,"edd_effnum":0,"eddeffnum_signid":0,"base_skill1id":40041,"base_skill2id":40051,"base_skill3id":40021},{"id":50041,"unittypei_id":1,"hero_hp":150,"race_id":1,"job_id":1,"powernum_typeid":1,"powernum":30,"num_signid":1,"edd_effid":0,"edd_effnum":0,"eddeffnum_signid":0,"base_skill1id":40061,"base_skill2id":40021,"base_skill3id":0},{"id":0,"unittypei_id":0,"hero_hp":0,"race_id":0,"job_id":0,"powernum_typeid":0,"powernum":0,"num_signid":0,"edd_effid":0,"edd_effnum":0,"eddeffnum_signid":0,"base_skill1id":0,"base_skill2id":0,"base_skill3id":0},{"id":0,"unittypei_id":0,"hero_hp":0,"race_id":0,"job_id":0,"powernum_typeid":0,"powernum":0,"num_signid":0,"edd_effid":0,"edd_effnum":0,"eddeffnum_signid":0,"base_skill1id":0,"base_skill2id":0,"base_skill3id":0},{"id":51011,"unittypei_id":2,"hero_hp":0,"race_id":9,"job_id":1,"powernum_typeid":2,"powernum":1,"num_signid":1,"edd_effid":4,"edd_effnum":20,"eddeffnum_signid":1,"base_skill1id":40111,"base_skill2id":40121,"base_skill3id":0},{"id":51021,"unittypei_id":2,"hero_hp":0,"race_id":1,"job_id":1,"powernum_typeid":2,"powernum":1,"num_signid":1,"edd_effid":0,"edd_effnum":0,"eddeffnum_signid":0,"base_skill1id":0,"base_skill2id":0,"base_skill3id":0},{"id":51031,"unittypei_id":2,"hero_hp":0,"race_id":13,"job_id":1,"powernum_typeid":2,"powernum":0,"num_signid":1,"edd_effid":0,"edd_effnum":0,"eddeffnum_signid":0,"base_skill1id":40141,"base_skill2id":0,"base_skill3id":0},{"id":51041,"unittypei_id":2,"hero_hp":0,"race_id":2,"job_id":1,"powernum_typeid":2,"powernum":1,"num_signid":1,"edd_effid":0,"edd_effnum":0,"eddeffnum_signid":0,"base_skill1id":0,"base_skill2id":0,"base_skill3id":0}]

src/cfg/parsers/EffectCardCfg.ts

@@ -11,6 +11,8 @@ export class EffectCardCfg implements Cfg{
 	public quoteskill2id: number;
 	public quoteskill3id: number;
 	public quoteskill4id: number;
+	public followeddeff: number;
+	public followdouble: number;
 
 	public decode(data: any) {
         this.id = data.id;
@@ -21,6 +23,8 @@ export class EffectCardCfg implements Cfg{
         this.quoteskill2id = data.quoteskill2id;
         this.quoteskill3id = data.quoteskill3id;
         this.quoteskill4id = data.quoteskill4id;
+        this.followeddeff = data.followeddeff;
+        this.followdouble = data.followdouble;
 	};
 	
 	public isOK (uniqueID: number, param1: any, param2: any): boolean {

src/cfg/parsers/SkillCfg.ts

@@ -13,10 +13,13 @@ export class SkillCfg implements Cfg{
 	public friendlyid: number;
 	public targetid: number;
 	public rangeid: number;
+	public select_targetID: number;
 	public eff_numtypeid: number;
 	public eff_num: number;
+	public num_signid: number;
 	public edd_effid: number;
 	public edd_effnum: number;
+	public eddeffnum_signid: number;
 	public quoteunitid: number;
 	public quoteunit_times: number;
 	public quoteskillid: number;
@@ -33,10 +36,13 @@ export class SkillCfg implements Cfg{
         this.friendlyid = data.friendlyid;
         this.targetid = data.targetid;
         this.rangeid = data.rangeid;
+        this.select_targetID = data.select_targetID;
         this.eff_numtypeid = data.eff_numtypeid;
         this.eff_num = data.eff_num;
+        this.num_signid = data.num_signid;
         this.edd_effid = data.edd_effid;
         this.edd_effnum = data.edd_effnum;
+        this.eddeffnum_signid = data.eddeffnum_signid;
         this.quoteunitid = data.quoteunitid;
         this.quoteunit_times = data.quoteunit_times;
         this.quoteskillid = data.quoteskillid;

src/cfg/parsers/UnitCfg.ts

@@ -10,8 +10,10 @@ export class UnitCfg implements Cfg{
 	public job_id: number;
 	public powernum_typeid: number;
 	public powernum: number;
+	public num_signid: number;
 	public edd_effid: number;
 	public edd_effnum: number;
+	public eddeffnum_signid: number;
 	public base_skill1id: number;
 	public base_skill2id: number;
 	public base_skill3id: number;
@@ -24,8 +26,10 @@ export class UnitCfg implements Cfg{
         this.job_id = data.job_id;
         this.powernum_typeid = data.powernum_typeid;
         this.powernum = data.powernum;
+        this.num_signid = data.num_signid;
         this.edd_effid = data.edd_effid;
         this.edd_effnum = data.edd_effnum;
+        this.eddeffnum_signid = data.eddeffnum_signid;
         this.base_skill1id = data.base_skill1id;
         this.base_skill2id = data.base_skill2id;
         this.base_skill3id = data.base_skill3id;

src/rooms/logic/Handler/BattleHandler.ts

@@ -36,8 +36,10 @@ export class BattleHandler {
         return aplayer? this._players.get(aplayer): null;
     };
 
-    public getSkillTargets(skill: Skill, param: SkillParam){
+    public getSkillTargets(skill: Skill, param: SkillParam): any{
         //todo:
+        
+        return null;
     };
 
 

src/rooms/logic/Handler/PetHandler.ts

@@ -28,6 +28,8 @@ export class PetHandler {
 
     _isHero: boolean = false;
 
+    _istaunt: boolean = false; // 是否是嘲讽
+
     _selfskills: number[] = [];
     _exskills: number[] = [];
 

src/rooms/logic/Handler/PlayerHandler.ts

@@ -25,7 +25,7 @@ export class PlayerHandler {
 
     public _exskills: Skill[] = [];
 
-    private _owner: BattleHandler;
+    public _owner: BattleHandler;
 
     _friend: PlayerHandler;
 

src/rooms/logic/skill/TriggerMan.ts

@@ -77,6 +77,10 @@ let TriggerManager = {
         let paramlst = sender._param;
         let owner = sender._owner; 
         let bResOk = true;
+        let tgts = sender._owner._owner._owner.getSkillTargets(sender, target);
+        if(!tgts){
+            return;
+        }
         switch (effectid) {
             case SkillEffectType.NONE:
             case SkillEffectType.CARD_ADD: