node/card_svr
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of git.kingsome.cn:node/card_svr

Browse Source
This commit is contained in:
zhl 2020-12-10 12:58:10 +08:00
commit 1f94bfddde
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configs/effectcard_tbl.json
View File

@ -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":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}]

2
configs/skill_tbl.json
View File

File diff suppressed because one or more lines are too long

2
src/rooms/logic/Handler/PlayerHandler.ts
View File

@ -371,7 +371,7 @@ export class PlayerHandler {
}; };
onCardLinkEnd(linkcards: Card[], fromplayer: PlayerHandler){ onCardLinkEnd(linkcards: Card[], fromplayer: PlayerHandler){
this.checkSkills(TriggerType.CARD_LINK_AFTER); this.checkSkills(TriggerType.CARD_LINK_AFTER, fromplayer);
}; };
onCardDroped(dropcards: Card[], srcplayer: PlayerHandler){ onCardDroped(dropcards: Card[], srcplayer: PlayerHandler){

4
src/rooms/logic/skill/Condition.ts
View File

@ -34,6 +34,10 @@ export class Condition {
case CondType.CARD_COUNT_TOTAL: case CondType.CARD_COUNT_TOTAL:
v = tg_owner.getTotalCardCount(); v = tg_owner.getTotalCardCount();
return this._isok(v,this._v,this._cdt); 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: default:
break; break;
} }