diff --git a/config/effectcard_tbl.json b/config/effectcard_tbl.json index 4f59695..cd5d3dd 100644 --- a/config/effectcard_tbl.json +++ b/config/effectcard_tbl.json @@ -1 +1 @@ -[{"id":20012,"type_id":2,"count":20,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":41075,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20022,"type_id":2,"count":20,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":41062,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20032,"type_id":2,"count":20,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":41064,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20042,"type_id":2,"count":20,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":41065,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20052,"type_id":2,"count":20,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":41067,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20062,"type_id":2,"count":20,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":41069,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20072,"type_id":2,"count":20,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":41071,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20082,"type_id":2,"count":20,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":41072,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20092,"type_id":2,"count":20,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":41076,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20102,"type_id":11,"count":100,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":0,"followdouble":0},{"id":20112,"type_id":3,"count":20,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":0,"followdouble":0},{"id":20122,"type_id":4,"count":8,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":0,"followdouble":0},{"id":20132,"type_id":5,"count":0,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":0,"followdouble":0},{"id":20202,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51012,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20212,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51022,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20222,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51032,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20232,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51042,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20242,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51052,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20252,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51062,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20262,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51072,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20272,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51082,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20282,"type_id":2,"count":20,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":41073,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20292,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51092,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20302,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51102,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20312,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51112,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20322,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51122,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20332,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51132,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20342,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51142,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20352,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51152,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20362,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51162,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20372,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51172,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20382,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51182,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20392,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51192,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20402,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51202,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20412,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51212,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20422,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51222,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20432,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51232,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20442,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51242,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20462,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51262,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20472,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51272,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20482,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51282,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20492,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51292,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20502,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51302,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20512,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51312,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20522,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51322,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20532,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51332,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20552,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51352,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20572,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51372,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20582,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51382,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20592,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51392,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20602,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51402,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20612,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51412,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20452,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51252,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20542,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51342,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20562,"type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51362,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1}] \ No newline at end of file +[{"id":20012,"org_gift":"1","type_id":2,"count":20,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":41075,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20022,"org_gift":"0","type_id":2,"count":20,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":41062,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20032,"org_gift":"1","type_id":2,"count":20,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":41064,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20042,"org_gift":"1","type_id":2,"count":20,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":41065,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20052,"org_gift":"1","type_id":2,"count":20,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":41067,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20062,"org_gift":"1","type_id":2,"count":20,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":41069,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20072,"org_gift":"1","type_id":2,"count":20,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":41071,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20082,"org_gift":"1","type_id":2,"count":20,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":41072,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20092,"org_gift":"0","type_id":2,"count":20,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":41076,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20102,"org_gift":"1","type_id":11,"count":100,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":0,"followdouble":0},{"id":20112,"org_gift":"1","type_id":3,"count":20,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":0,"followdouble":0},{"id":20122,"org_gift":"1","type_id":4,"count":8,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":0,"followdouble":0},{"id":20132,"org_gift":"0","type_id":5,"count":0,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":0,"followdouble":0},{"id":20202,"org_gift":"1","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51012,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20212,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51022,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20222,"org_gift":"1","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51032,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20232,"org_gift":"1","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51042,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20242,"org_gift":"1","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51052,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20252,"org_gift":"1","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51062,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20262,"org_gift":"1","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51072,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20272,"org_gift":"1","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51082,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20282,"org_gift":"","type_id":2,"count":20,"weight":0,"affix1id":0,"affix2id":0,"stageunit_id":0,"quoteskill1id":41073,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20292,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51092,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20302,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51102,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20312,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51112,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20322,"org_gift":"1","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51122,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20332,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51132,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20342,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51142,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20352,"org_gift":"1","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51152,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20362,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51162,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20372,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51172,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20382,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51182,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20392,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51192,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20402,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51202,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20412,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51212,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20422,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51222,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20432,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51232,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20442,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51242,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20462,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51262,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20472,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51272,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20482,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51282,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20492,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51292,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20502,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51302,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20512,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51312,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20522,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51322,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20532,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51332,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20552,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51352,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20572,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51372,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20582,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51382,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20592,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51392,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20602,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51402,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20612,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51412,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20452,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51252,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20542,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51342,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1},{"id":20562,"org_gift":"","type_id":1,"count":0,"weight":100,"affix1id":0,"affix2id":0,"stageunit_id":51362,"quoteskill1id":0,"quoteskill2id":0,"quoteskill3id":0,"quoteskill4id":0,"followeddeff":1,"followdouble":1}] \ No newline at end of file diff --git a/config/formula_tbl.json b/config/formula_tbl.json index c5961df..8e70ccb 100644 --- a/config/formula_tbl.json +++ b/config/formula_tbl.json @@ -1 +1 @@ -[{"id":70001,"name":"天梯分","code":"cp","number":0,"numtypeid":4,"prerequisite1id":0,"prerequisite2id":0,"":"新cp=旧cp+cp_chg1-cp_chg2+cp_chg3-cp_chg4"},{"id":70002,"name":"最小天梯分","code":"ll_cp","number":600,"numtypeid":2,"prerequisite1id":0,"prerequisite2id":0,"":"cp>=ll_cp"},{"id":70003,"name":"原始天梯分","code":"or_cp","number":1000,"numtypeid":2,"prerequisite1id":0,"prerequisite2id":0,"":""},{"id":70004,"name":"玩家所在队伍天梯总分","code":"team_cp","number":0,"numtypeid":5,"prerequisite1id":0,"prerequisite2id":0,"":"team_cp=玩家cp+队友cp"},{"id":70005,"name":"玩家敌对队伍天梯总分","code":"eteam_cp","number":0,"numtypeid":5,"prerequisite1id":0,"prerequisite2id":0,"":"eteam_cp=敌玩家1cp+敌玩家2cp"},{"id":70006,"name":"队伍分高胜利天梯分增加","code":"cp_chg1","number":0,"numtypeid":6,"prerequisite1id":3,"prerequisite2id":1,"":"100/(1+10^((team_cp-eteam_cp)/2500))"},{"id":70007,"name":"队伍分高失败天梯分减少","code":"cp_chg2","number":0,"numtypeid":6,"prerequisite1id":3,"prerequisite2id":2,"":"80-80/(1+10^((team_cp-eteam_cp)/2500))"},{"id":70008,"name":"队伍分低胜利天梯分增加","code":"cp_chg3","number":0,"numtypeid":6,"prerequisite1id":4,"prerequisite2id":1,"":"100-100/(1+10^((eteam_cp-team_cp)/2500))"},{"id":70009,"name":"队伍分低失败天梯分减少","code":"cp_chg4","number":0,"numtypeid":6,"prerequisite1id":4,"prerequisite2id":2,"":"80/(1+10^((eteam_cp-team_cp)/2500))"},{"id":70010,"name":"赛季重置后天梯分","code":"recp","number":0,"numtypeid":4,"prerequisite1id":5,"prerequisite2id":0,"":"recp=1000+(cp-1000)*30%"},{"id":70011,"name":"十场胜率","code":"twp","number":0,"numtypeid":4,"prerequisite1id":0,"prerequisite2id":0,"":"twp=ten_wp*ten_wn-ten_lp*ten_ln-ten_ap*ten_an"},{"id":70012,"name":"原始十场胜率","code":"or_twp","number":50,"numtypeid":3,"prerequisite1id":0,"prerequisite2id":0,"":""},{"id":70013,"name":"十场获胜数","code":"ten_wp","number":0,"numtypeid":5,"prerequisite1id":0,"prerequisite2id":0,"":""},{"id":70014,"name":"十场失败数","code":"ten_lp","number":0,"numtypeid":5,"prerequisite1id":0,"prerequisite2id":0,"":""},{"id":70015,"name":"十场未打数","code":"ten_ap","number":0,"numtypeid":5,"prerequisite1id":0,"prerequisite2id":0,"":""},{"id":70016,"name":"十场获胜系数","code":"ten_wn","number":10,"numtypeid":3,"prerequisite1id":0,"prerequisite2id":0,"":""},{"id":70017,"name":"十场失败系数","code":"ten_ln","number":0,"numtypeid":3,"prerequisite1id":0,"prerequisite2id":0,"":""},{"id":70018,"name":"十场未打系数","code":"ten_an","number":2,"numtypeid":3,"prerequisite1id":0,"prerequisite2id":0,"":""},{"id":70019,"name":"匹配分","code":"mp","number":0,"numtypeid":4,"prerequisite1id":0,"prerequisite2id":0,"":"mp=bm_mp+cp*(bm_twp+twp)"},{"id":70020,"name":"基准胜率","code":"bm_twp","number":50,"numtypeid":3,"prerequisite1id":0,"prerequisite2id":0,"":""},{"id":70021,"name":"基准匹配分","code":"bm_mp","number":1000,"numtypeid":2,"prerequisite1id":0,"prerequisite2id":0,"":""},{"id":70022,"name":"房间平均分","code":"room_mp","number":0,"numtypeid":5,"prerequisite1id":0,"prerequisite2id":0,"":""},{"id":70023,"name":"组队匹配时间","code":"ranktime","number":6,"numtypeid":6,"prerequisite1id":6,"prerequisite2id":0,"":"ranktime=6秒"},{"id":70024,"name":"同分匹配时间","code":"fairtime","number":6,"numtypeid":7,"prerequisite1id":0,"prerequisite2id":0,"":""},{"id":70025,"name":"跨分匹配时间","code":"steptime","number":6,"numtypeid":7,"prerequisite1id":0,"prerequisite2id":0,"":""},{"id":70026,"name":"新增匹配时间","code":"addtime","number":3,"numtypeid":7,"prerequisite1id":0,"prerequisite2id":0,"":""},{"id":70027,"name":"组队成员匹配分","code":"rank_mp","number":0,"numtypeid":4,"prerequisite1id":0,"prerequisite2id":0,"":"rank_mp=rank_mpa*(100%+mp)"},{"id":70028,"name":"组队成员匹配分增值幅度","code":"rank_mpa","number":20,"numtypeid":3,"prerequisite1id":0,"prerequisite2id":0,"":""},{"id":70029,"name":"同分高于平均分幅度","code":"fair_ir","number":20,"numtypeid":3,"prerequisite1id":0,"prerequisite2id":0,"":""},{"id":70030,"name":"同分低于平均分幅度","code":"fair_dr","number":20,"numtypeid":3,"prerequisite1id":0,"prerequisite2id":0,"":""},{"id":70031,"name":"跨分高于平均分幅度","code":"step_ir","number":35,"numtypeid":3,"prerequisite1id":0,"prerequisite2id":0,"":""},{"id":70032,"name":"跨分高于平均分幅度","code":"step_dr","number":35,"numtypeid":3,"prerequisite1id":0,"prerequisite2id":0,"":""},{"id":70033,"name":"电脑默认天梯分","code":"aicp","number":0,"numtypeid":4,"prerequisite1id":0,"prerequisite2id":0,"":"其他玩家天梯平均分*aicp_ll= 0){ switch(skill._data.targetid){ case GameUnitType.PLAYER: @@ -353,10 +362,10 @@ export class BattleHandler { return lst; }; - public getTargetPlayers(gct: GameCampType, src:PlayerHandler, dst:PlayerHandler): PlayerHandler[]{ + public getTargetPlayers(gct: GameCampType, src:PlayerHandler, dst:PlayerHandler, last: PlayerHandler): PlayerHandler[]{ let lst: PlayerHandler[] = []; switch(gct){ - case GameCampType.SELF: + case GameCampType.SELFPLAYER: if(src && src.isAlive()){ lst.push(src); } @@ -390,7 +399,7 @@ export class BattleHandler { } } break; - case GameCampType.ALL: + case GameCampType.ALLPLAYER: for(let [key, obj] of this._players){ if(obj && obj.isAlive()){ lst.push(obj); @@ -433,17 +442,22 @@ export class BattleHandler { } } if(!bfind){ - return this.getTargetPlayers(GameCampType.RANDOM_ENEMY, src, dst); + return this.getTargetPlayers(GameCampType.RANDOM_ENEMY, src, dst, last); } } break; - case GameCampType.ALL_EXSELF: + case GameCampType.ALLPLAYER_EXSELF: for(let [key, obj] of this._players){ if(obj && obj.isAlive() && obj != src){ lst.push(obj); } } break; + case GameCampType.LAST_HURT: + if(last && last != src && last.isAlive()){ + lst.push(last); + } + break; default: break; } diff --git a/src/rooms/logic/Handler/PetHandler.ts b/src/rooms/logic/Handler/PetHandler.ts index 5d89207..80f7f24 100644 --- a/src/rooms/logic/Handler/PetHandler.ts +++ b/src/rooms/logic/Handler/PetHandler.ts @@ -116,9 +116,9 @@ export class PetHandler { this.addSkill(skillid); }); - this._owner.onHaloAdd(this); + this._owner.onPetBorned(this, param); - this.born(param); + this._owner.onHaloAdd(this); }; private _I(v: number): number{ @@ -135,15 +135,6 @@ export class PetHandler { // this._exap = 0; }; - private _addEffHalo(skill: Skill): boolean{ - if(!this.hasEffHalo(skill)){ - this._effhalos.set(skill, skill.getHaloValue()); - return true; - } - return false; - // this._exap += ap; - }; - public getEffHaloV(): number{ let n = 0; this._effhalos.forEach((value: number) => { @@ -304,8 +295,11 @@ export class PetHandler { return res; }; - public addExAP(value: number, from: PetHandler): number{ - // return this.addAP(value); + public addExAP(value: number, sk: Skill, from: PetHandler): number{ + if(!this.hasEffHalo(sk)){ + this._effhalos.set(sk, value); + return value; + } return 0; }; @@ -341,7 +335,7 @@ export class PetHandler { let res = this.subAP(rv, from); if(res != 0){ - this._owner.onBeHurt(this, res); + this._owner.onBeHurt(this, res, from); } return res; @@ -390,10 +384,6 @@ export class PetHandler { return value; }; - public born(param: SkillParam){ - this._owner.onPetBorned(this, param); - }; - public isAlive(){ if(this._isHero){ return this._owner.isAlive(); @@ -544,21 +534,19 @@ export class PetHandler { }; // 自己的光环是否加到apet上 - public addEffHalo(apet: PetHandler): boolean{ - let bok = false; + public addEffHalo(apet: PetHandler): number{ + let res = 0; this._halos.forEach((item: Skill)=>{ if(item.canEffect(this, apet)){ if(item.isAPHaloSkill()){ - bok = true; - if(apet._addEffHalo(item)){ - } // 加战力 + res += apet.addExAP(item.getEffValue(), item, this); // 加战力 }else if(item.isBuffHaloSkill()){ item.trigger(new SkillParam(0, 0, 0, this._owner, - this, apet._owner, apet)); - } // 触发技能 + this, apet._owner, apet)); // 触发技能 + } } }); - return bok; + return res; }; // remove加在自己身上的属于apet的光环 diff --git a/src/rooms/logic/Handler/PlayerHandler.ts b/src/rooms/logic/Handler/PlayerHandler.ts index 73a2361..a14afa2 100644 --- a/src/rooms/logic/Handler/PlayerHandler.ts +++ b/src/rooms/logic/Handler/PlayerHandler.ts @@ -4,7 +4,7 @@ import { HeroCfg } from "../../../cfg/parsers/HeroCfg"; import { BattleHandler } from "./BattleHandler"; import CfgMan from "../CfgMan"; import { Pet } from "rooms/schema/Pet"; -import { CondDecideType, CondType, EffectCardType, GameUnitType, SkillType, SkillUserType, TriggerType } from "../skill/SkillConst"; +import { CondDecideType, CondType, EffectCardType, GameUnitType, SkillEffectType, SkillType, SkillUserType, TriggerType } from "../skill/SkillConst"; import { UnitCfg } from "cfg/parsers/UnitCfg"; import { Skill } from "../skill/Skill"; import { SkillParam, SkillTarget } from "../skill/SkillParam"; @@ -324,8 +324,8 @@ export class PlayerHandler { return this._self? this._self.addBaseAP(value, from): 0; }; - public addExAP(value: number, from: PetHandler): number{ - return 0; + public addExAP(value: number, sender: Skill, from: PetHandler): number{ + return this._self? this._self.addExAP(value, sender, from): 0; }; public getHP(){ @@ -452,43 +452,72 @@ export class PlayerHandler { * @param only_checkother : 只检查apet加给别人的光环 */ public onHaloAdd(apet: PetHandler, only_checkother: boolean = false){ - let lst: PetHandler[] = []; + let pets: Map = new Map(); + if(only_checkother){ this._pets.forEach((obj: PetHandler)=>{ - if(apet.addEffHalo(obj)){ - lst.push(obj); + let n = apet.addEffHalo(obj); + if(n != 0){ + pets.set(obj, n); } }); - + if(this._self != apet){ - if(apet.addEffHalo(this._self)){ - lst.push(this._self); + let n = apet.addEffHalo(this._self); + if(n != 0){ + pets.set(this._self, n); } } }else{ // apet加给自己 - apet.addEffHalo(apet); + let n = apet.addEffHalo(apet); + if(n != 0){ + pets.set(apet, n); + } // apet加给别人/别人加给apet this._pets.forEach((obj: PetHandler)=>{ if(obj != apet){ - obj.addEffHalo(apet); - if(apet.addEffHalo(obj)){ - lst.push(obj); + let n = obj.addEffHalo(apet); + if(n != 0){ + if(pets.has(apet)){ + pets.set(apet, pets.get(apet) + n); + }else{ + pets.set(apet, n); + } + } + n = apet.addEffHalo(obj); + if(n != 0){ + pets.set(obj, n); } } }); // _self加给apet/apet加给_self if(this._self != apet && this._self){ - this._self.addEffHalo(apet); - if(apet.addEffHalo(this._self)){ - lst.push(this._self); + let n = this._self.addEffHalo(apet); + if(n != 0){ + if(pets.has(apet)){ + pets.set(apet, pets.get(apet) + n); + }else{ + pets.set(apet, n); + } + } + n = apet.addEffHalo(this._self); + if(n != 0){ + pets.set(this._self, n); } } } - this._owner.onUpdatePetsNotify(lst, apet); + if(pets.size > 0){ + for(let [k, v] of pets){ + let sk = this._owner.singleSkillTarget(null, apet, k); + sk.success(SkillEffectType.POWEREX_ENHANCE, v); + sk.success(SkillEffectType.CHG_AP, v); + } + this._owner.onUpdatePetsNotify([...pets.keys()], apet); + } }; public onHaloRemove(apet: PetHandler){ @@ -523,8 +552,8 @@ export class PlayerHandler { this.singleCheckSkills(apet, TriggerType.BE_ATTACK, null, sp); }; - public onBeHurt(apet: PetHandler, value: number){ - this.singleCheckSkills(apet, TriggerType.BE_HURT); + public onBeHurt(apet: PetHandler, value: number, from: PetHandler){ + this.singleCheckSkills(apet, TriggerType.BE_HURT, from._owner); }; public onShieldUsed(apet: PetHandler){ diff --git a/src/rooms/logic/skill/Skill.ts b/src/rooms/logic/skill/Skill.ts index 16ccb68..29d91ad 100644 --- a/src/rooms/logic/skill/Skill.ts +++ b/src/rooms/logic/skill/Skill.ts @@ -1,3 +1,4 @@ +import { sendFriendRequest } from "@colyseus/social"; import { SkillCfg } from "cfg/parsers/SkillCfg"; import e from "express"; import { SKillEffectData } from "message/SkillInfo"; @@ -177,7 +178,7 @@ export class Skill { // 技能光环是否能影响dst canEffect(srcpet: PetHandler, dstpet: PetHandler){ - if(this._data.friendlyid != GameCampType.SELF){ + if(this._data.friendlyid != GameCampType.SELFPLAYER){ return false; } let tgok = false; @@ -223,8 +224,8 @@ export class Skill { return this._owner._owner.singleSkillTargets(this, this._petowner, this._petowner); }; - getTargets(param: SkillParam): SkillTarget[]{ - return this._owner._owner.getSkillTargets(this, param); + getTargets(param: SkillParam, lastph?: PlayerHandler): SkillTarget[]{ + return this._owner._owner.getSkillTargets(this, param, lastph); }; getOppTargets(st: SkillTarget): SkillTarget[]{ @@ -293,7 +294,8 @@ export class Skill { } }; - _triggerSubSkill(sk: Skill, skid: number, skusertype: number, skcount: number, skmaxcount: number, param: SkillParam, sts: SkillTarget[], cb?: any){ + _triggerSubSkill(sk: Skill, skid: number, skusertype: number, skcount: number, skmaxcount: number, + param: SkillParam, sts: SkillTarget[], cb: any, lastph: PlayerHandler){ if(skid && !sk){ sk = this._owner.newSkill(skid); sk.setOrignParam(this._orign_effcnt, this._orign_cardpt, this._from, this._petowner, 0); @@ -314,7 +316,7 @@ export class Skill { let ncount = this.getQuoteValue(skcount, skmaxcount, this._orign_effcnt); for(let i=0; i