From deca1a4125a39a0ae04770356333b63829a0e566 Mon Sep 17 00:00:00 2001 From: yuexin Date: Wed, 16 Dec 2020 16:18:27 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/compound_tbl.json | 2 +- config/effectcard_tbl.json | 2 +- config/skill_tbl.json | 2 +- package.json | 3 ++- src/rooms/logic/Handler/PetHandler.ts | 4 ++-- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/config/compound_tbl.json b/config/compound_tbl.json index 3cc8b33..2306fca 100644 --- a/config/compound_tbl.json +++ b/config/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":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}] \ No newline at end of file +[{"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":18},{"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":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":30},{"id":99022,"type_id":3,"value":70}] \ No newline at end of file diff --git a/config/effectcard_tbl.json b/config/effectcard_tbl.json index d751391..d16fd2c 100644 --- a/config/effectcard_tbl.json +++ b/config/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},{"id":10101,"type_id":0,"count":16,"stageunit_id":0,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":0,"followdouble":0},{"id":10111,"type_id":0,"count":8,"stageunit_id":0,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":0,"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":3,"count":16,"stageunit_id":0,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":0,"followdouble":0},{"id":10111,"type_id":4,"count":8,"stageunit_id":0,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":0,"followdouble":0}] \ No newline at end of file diff --git a/config/skill_tbl.json b/config/skill_tbl.json index b2c853c..d9de360 100644 --- a/config/skill_tbl.json +++ b/config/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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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":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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_times":0},{"id":40081,"skill_typeid":5,"skill_indicateid":3,"indicate_time":1.0,"tigger_typeid":2,"cond_typeid":4,"cond_rangeid":0,"cond_num":0,"effect_typeid":21,"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,"quotecardid":10111,"quotecard_times":1},{"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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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":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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_times":0},{"id":40081,"skill_typeid":5,"skill_indicateid":3,"indicate_time":1.0,"tigger_typeid":2,"cond_typeid":4,"cond_rangeid":0,"cond_num":0,"effect_typeid":21,"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,"quotecardid":0,"quotecard_times":1},{"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,"quotecardid":0,"quotecard_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,"quotecardid":0,"quotecard_times":0}] \ No newline at end of file diff --git a/package.json b/package.json index f511c37..3a6e829 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,8 @@ "dev:jc": "DEBUG=jc:* node --require ts-node/register --inspect=0.0.0.0:9229 src/index.ts", "dev:robot": "DEBUG=jc:* node --require ts-node/register --inspect=0.0.0.0:9228 src/robot.ts", "loadtest": "colyseus-loadtest loadtest/example.ts --room my_room --numClients 3", - "test": "echo \"Error: no test specified\" && exit 1" + "test": "echo \"Error: no test specified\" && exit 1", + "robot": "node --require ts-node/register --inspect=0.0.0.0:9228 src/robot.ts" }, "author": "", "devDependencies": { diff --git a/src/rooms/logic/Handler/PetHandler.ts b/src/rooms/logic/Handler/PetHandler.ts index 43eda53..dce9edd 100644 --- a/src/rooms/logic/Handler/PetHandler.ts +++ b/src/rooms/logic/Handler/PetHandler.ts @@ -201,7 +201,7 @@ export class PetHandler { this._ceilBaseAP(); } this.dataChanged(); - if(this._baseap < 0){ + if(this._baseap <= 0){ this.die(); } return value; @@ -214,7 +214,7 @@ export class PetHandler { this._baseap += value; this._ceilBaseAP(); this.dataChanged(); - if(this._baseap < 0){ + if(this._baseap <= 0){ this.die(); } return value;