diff --git a/configs/effectcard_tbl.json b/configs/effectcard_tbl.json index 34863af..a88bbe7 100644 --- a/configs/effectcard_tbl.json +++ b/configs/effectcard_tbl.json @@ -1 +1 @@ -[{"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":0,"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}] \ No newline at end of file +[{"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":0,"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},{"id":10101,"type_id":0,"count":0,"stageunit_id":0,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":0,"followdouble":0},{"id":10111,"type_id":0,"count":0,"stageunit_id":0,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":0,"followdouble":0}] \ No newline at end of file diff --git a/configs/skill_tbl.json b/configs/skill_tbl.json index be8bbf3..b712ecf 100644 --- a/configs/skill_tbl.json +++ b/configs/skill_tbl.json @@ -1 +1 @@ -[{"id":40011,"skill_typeid":5,"skill_indicateid":3,"indicate_time":1.0,"tigger_typeid":5,"cond_typeid":1,"cond_rangeid":1,"cond_num":4,"effect_typeid":2,"friendlyid":1,"targetid":1,"rangeid":0,"select_targetID":0,"eff_numtypeid":1,"eff_num":4.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40021,"skill_typeid":5,"skill_indicateid":3,"indicate_time":1.0,"tigger_typeid":5,"cond_typeid":1,"cond_rangeid":1,"cond_num":2,"effect_typeid":2,"friendlyid":1,"targetid":1,"rangeid":0,"select_targetID":0,"eff_numtypeid":1,"eff_num":2.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40031,"skill_typeid":5,"skill_indicateid":3,"indicate_time":1.0,"tigger_typeid":4,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":1,"friendlyid":1,"targetid":1,"rangeid":0,"select_targetID":0,"eff_numtypeid":1,"eff_num":1.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40041,"skill_typeid":5,"skill_indicateid":3,"indicate_time":1.0,"tigger_typeid":6,"cond_typeid":2,"cond_rangeid":3,"cond_num":4,"effect_typeid":1,"friendlyid":3,"targetid":1,"rangeid":0,"select_targetID":0,"eff_numtypeid":1,"eff_num":1.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40051,"skill_typeid":5,"skill_indicateid":3,"indicate_time":1.0,"tigger_typeid":6,"cond_typeid":2,"cond_rangeid":3,"cond_num":4,"effect_typeid":1,"friendlyid":1,"targetid":1,"rangeid":0,"select_targetID":0,"eff_numtypeid":1,"eff_num":1.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40061,"skill_typeid":5,"skill_indicateid":0,"indicate_time":0.0,"tigger_typeid":10,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":4,"friendlyid":1,"targetid":1,"rangeid":0,"select_targetID":0,"eff_numtypeid":1,"eff_num":2.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40111,"skill_typeid":5,"skill_indicateid":0,"indicate_time":0.0,"tigger_typeid":0,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":13,"friendlyid":1,"targetid":2,"rangeid":1,"select_targetID":0,"eff_numtypeid":1,"eff_num":30.0,"num_signid":2,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40121,"skill_typeid":2,"skill_indicateid":1,"indicate_time":0.0,"tigger_typeid":0,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":10,"friendlyid":1,"targetid":2,"rangeid":1,"select_targetID":0,"eff_numtypeid":0,"eff_num":0.0,"num_signid":0,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40131,"skill_typeid":2,"skill_indicateid":5,"indicate_time":0.0,"tigger_typeid":0,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":5,"friendlyid":1,"targetid":2,"rangeid":3,"select_targetID":3,"eff_numtypeid":1,"eff_num":20.0,"num_signid":1,"edd_effid":1,"edd_effnum":20.0,"eddeffnum_signid":1,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40141,"skill_typeid":4,"skill_indicateid":2,"indicate_time":0.0,"tigger_typeid":0,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":6,"friendlyid":1,"targetid":2,"rangeid":5,"select_targetID":0,"eff_numtypeid":1,"eff_num":15.0,"num_signid":1,"edd_effid":1,"edd_effnum":15.0,"eddeffnum_signid":1,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40151,"skill_typeid":2,"skill_indicateid":3,"indicate_time":1.0,"tigger_typeid":0,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":1,"friendlyid":3,"targetid":1,"rangeid":0,"select_targetID":0,"eff_numtypeid":1,"eff_num":1.0,"num_signid":1,"edd_effid":1,"edd_effnum":1.0,"eddeffnum_signid":1,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40161,"skill_typeid":2,"skill_indicateid":3,"indicate_time":1.0,"tigger_typeid":0,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":1,"friendlyid":1,"targetid":1,"rangeid":0,"select_targetID":0,"eff_numtypeid":1,"eff_num":2.0,"num_signid":1,"edd_effid":1,"edd_effnum":2.0,"eddeffnum_signid":1,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40171,"skill_typeid":2,"skill_indicateid":4,"indicate_time":1.5,"tigger_typeid":0,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":3,"friendlyid":4,"targetid":1,"rangeid":0,"select_targetID":1,"eff_numtypeid":1,"eff_num":1.0,"num_signid":1,"edd_effid":1,"edd_effnum":1.0,"eddeffnum_signid":1,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40181,"skill_typeid":2,"skill_indicateid":6,"indicate_time":1.5,"tigger_typeid":0,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":7,"friendlyid":4,"targetid":2,"rangeid":2,"select_targetID":2,"eff_numtypeid":1,"eff_num":20.0,"num_signid":1,"edd_effid":1,"edd_effnum":20.0,"eddeffnum_signid":1,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40191,"skill_typeid":1,"skill_indicateid":6,"indicate_time":1.5,"tigger_typeid":0,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":7,"friendlyid":4,"targetid":2,"rangeid":2,"select_targetID":2,"eff_numtypeid":2,"eff_num":1.0,"num_signid":1,"edd_effid":2,"edd_effnum":1.0,"eddeffnum_signid":1,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40201,"skill_typeid":1,"skill_indicateid":6,"indicate_time":1.5,"tigger_typeid":0,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":7,"friendlyid":5,"targetid":2,"rangeid":4,"select_targetID":1,"eff_numtypeid":1,"eff_num":15.0,"num_signid":1,"edd_effid":1,"edd_effnum":15.0,"eddeffnum_signid":1,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40081,"skill_typeid":5,"skill_indicateid":3,"indicate_time":1.0,"tigger_typeid":2,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":1,"friendlyid":1,"targetid":1,"rangeid":0,"select_targetID":0,"eff_numtypeid":1,"eff_num":2.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40091,"skill_typeid":5,"skill_indicateid":5,"indicate_time":1.5,"tigger_typeid":2,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":5,"friendlyid":1,"targetid":2,"rangeid":4,"select_targetID":0,"eff_numtypeid":1,"eff_num":5.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40101,"skill_typeid":5,"skill_indicateid":7,"indicate_time":1.5,"tigger_typeid":2,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":11,"friendlyid":5,"targetid":3,"rangeid":0,"select_targetID":0,"eff_numtypeid":1,"eff_num":8.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0}] \ No newline at end of file +[{"id":40011,"skill_typeid":5,"skill_indicateid":3,"indicate_time":1.0,"tigger_typeid":5,"cond_typeid":1,"cond_rangeid":1,"cond_num":4,"effect_typeid":2,"friendlyid":1,"targetid":1,"rangeid":0,"select_targetID":0,"eff_numtypeid":1,"eff_num":4.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40021,"skill_typeid":5,"skill_indicateid":3,"indicate_time":1.0,"tigger_typeid":5,"cond_typeid":1,"cond_rangeid":1,"cond_num":2,"effect_typeid":2,"friendlyid":1,"targetid":1,"rangeid":0,"select_targetID":0,"eff_numtypeid":1,"eff_num":2.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40031,"skill_typeid":5,"skill_indicateid":3,"indicate_time":1.0,"tigger_typeid":4,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":1,"friendlyid":1,"targetid":1,"rangeid":0,"select_targetID":0,"eff_numtypeid":1,"eff_num":1.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40041,"skill_typeid":5,"skill_indicateid":3,"indicate_time":1.0,"tigger_typeid":6,"cond_typeid":2,"cond_rangeid":3,"cond_num":4,"effect_typeid":1,"friendlyid":2,"targetid":1,"rangeid":0,"select_targetID":0,"eff_numtypeid":1,"eff_num":1.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40051,"skill_typeid":5,"skill_indicateid":3,"indicate_time":1.0,"tigger_typeid":6,"cond_typeid":2,"cond_rangeid":3,"cond_num":4,"effect_typeid":1,"friendlyid":1,"targetid":1,"rangeid":0,"select_targetID":0,"eff_numtypeid":1,"eff_num":1.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40061,"skill_typeid":5,"skill_indicateid":0,"indicate_time":0.0,"tigger_typeid":10,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":4,"friendlyid":1,"targetid":1,"rangeid":0,"select_targetID":0,"eff_numtypeid":1,"eff_num":2.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40111,"skill_typeid":2,"skill_indicateid":0,"indicate_time":0.0,"tigger_typeid":0,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":13,"friendlyid":1,"targetid":2,"rangeid":1,"select_targetID":0,"eff_numtypeid":1,"eff_num":30.0,"num_signid":2,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40121,"skill_typeid":2,"skill_indicateid":1,"indicate_time":0.0,"tigger_typeid":0,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":10,"friendlyid":1,"targetid":2,"rangeid":1,"select_targetID":0,"eff_numtypeid":0,"eff_num":0.0,"num_signid":0,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40131,"skill_typeid":2,"skill_indicateid":5,"indicate_time":0.0,"tigger_typeid":0,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":5,"friendlyid":1,"targetid":2,"rangeid":2,"select_targetID":3,"eff_numtypeid":1,"eff_num":20.0,"num_signid":1,"edd_effid":1,"edd_effnum":20.0,"eddeffnum_signid":1,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40141,"skill_typeid":4,"skill_indicateid":2,"indicate_time":0.0,"tigger_typeid":0,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":6,"friendlyid":1,"targetid":2,"rangeid":5,"select_targetID":0,"eff_numtypeid":1,"eff_num":15.0,"num_signid":1,"edd_effid":1,"edd_effnum":15.0,"eddeffnum_signid":1,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40151,"skill_typeid":2,"skill_indicateid":3,"indicate_time":1.0,"tigger_typeid":0,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":1,"friendlyid":3,"targetid":1,"rangeid":0,"select_targetID":0,"eff_numtypeid":1,"eff_num":1.0,"num_signid":1,"edd_effid":1,"edd_effnum":1.0,"eddeffnum_signid":1,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40161,"skill_typeid":2,"skill_indicateid":3,"indicate_time":1.0,"tigger_typeid":0,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":1,"friendlyid":1,"targetid":1,"rangeid":0,"select_targetID":0,"eff_numtypeid":1,"eff_num":2.0,"num_signid":1,"edd_effid":1,"edd_effnum":2.0,"eddeffnum_signid":1,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40171,"skill_typeid":2,"skill_indicateid":4,"indicate_time":1.5,"tigger_typeid":0,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":3,"friendlyid":4,"targetid":1,"rangeid":0,"select_targetID":1,"eff_numtypeid":1,"eff_num":1.0,"num_signid":1,"edd_effid":1,"edd_effnum":1.0,"eddeffnum_signid":1,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40181,"skill_typeid":2,"skill_indicateid":6,"indicate_time":1.5,"tigger_typeid":0,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":7,"friendlyid":4,"targetid":2,"rangeid":2,"select_targetID":2,"eff_numtypeid":1,"eff_num":20.0,"num_signid":1,"edd_effid":1,"edd_effnum":20.0,"eddeffnum_signid":1,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40191,"skill_typeid":1,"skill_indicateid":6,"indicate_time":1.5,"tigger_typeid":0,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":7,"friendlyid":4,"targetid":2,"rangeid":2,"select_targetID":2,"eff_numtypeid":2,"eff_num":1.0,"num_signid":1,"edd_effid":2,"edd_effnum":1.0,"eddeffnum_signid":1,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40201,"skill_typeid":1,"skill_indicateid":6,"indicate_time":1.5,"tigger_typeid":0,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":7,"friendlyid":4,"targetid":2,"rangeid":4,"select_targetID":1,"eff_numtypeid":1,"eff_num":15.0,"num_signid":1,"edd_effid":1,"edd_effnum":15.0,"eddeffnum_signid":1,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40081,"skill_typeid":5,"skill_indicateid":3,"indicate_time":1.0,"tigger_typeid":2,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":1,"friendlyid":1,"targetid":1,"rangeid":0,"select_targetID":0,"eff_numtypeid":1,"eff_num":2.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40091,"skill_typeid":5,"skill_indicateid":5,"indicate_time":1.5,"tigger_typeid":2,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":5,"friendlyid":1,"targetid":2,"rangeid":4,"select_targetID":0,"eff_numtypeid":1,"eff_num":5.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0},{"id":40101,"skill_typeid":5,"skill_indicateid":7,"indicate_time":1.5,"tigger_typeid":2,"cond_typeid":0,"cond_rangeid":0,"cond_num":0,"effect_typeid":11,"friendlyid":5,"targetid":3,"rangeid":0,"select_targetID":0,"eff_numtypeid":1,"eff_num":8.0,"num_signid":1,"edd_effid":0,"edd_effnum":0.0,"eddeffnum_signid":0,"quoteunitid":0,"quoteunit_times":0,"quoteskillid":0,"quoteskill_times":0}] \ No newline at end of file diff --git a/src/rooms/logic/Handler/PlayerHandler.ts b/src/rooms/logic/Handler/PlayerHandler.ts index 51eab52..95d2284 100644 --- a/src/rooms/logic/Handler/PlayerHandler.ts +++ b/src/rooms/logic/Handler/PlayerHandler.ts @@ -371,7 +371,7 @@ export class PlayerHandler { }; onCardLinkEnd(linkcards: Card[], fromplayer: PlayerHandler){ - this.checkSkills(TriggerType.CARD_LINK_AFTER); + this.checkSkills(TriggerType.CARD_LINK_AFTER, fromplayer); }; onCardDroped(dropcards: Card[], srcplayer: PlayerHandler){ diff --git a/src/rooms/logic/skill/Condition.ts b/src/rooms/logic/skill/Condition.ts index b9d51ea..adac190 100644 --- a/src/rooms/logic/skill/Condition.ts +++ b/src/rooms/logic/skill/Condition.ts @@ -34,6 +34,10 @@ export class Condition { case CondType.CARD_COUNT_TOTAL: v = tg_owner.getTotalCardCount(); return this._isok(v,this._v,this._cdt); + case CondType.CARD_ACTION_LINK_OTHER: + return !!tg_value; + case CondType.CARD_ACTION_LINK_SELF: + return !tg_value; default: break; }