From fe533f72e6008e92d263024d39c6ccc4a50c70ff Mon Sep 17 00:00:00 2001 From: yuexin Date: Fri, 4 Dec 2020 18:13:36 +0800 Subject: [PATCH 1/2] import table --- configs/compound_tbl.json | 83 +--------------------------- src/rooms/logic/skill/Skill.ts | 8 ++- src/rooms/logic/skill/TriggerCtrl.ts | 5 +- 3 files changed, 9 insertions(+), 87 deletions(-) diff --git a/configs/compound_tbl.json b/configs/compound_tbl.json index 53db4d0..82d7ffc 100644 --- a/configs/compound_tbl.json +++ b/configs/compound_tbl.json @@ -1,82 +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":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}] \ No newline at end of file diff --git a/src/rooms/logic/skill/Skill.ts b/src/rooms/logic/skill/Skill.ts index 3e39b76..09f7f0e 100644 --- a/src/rooms/logic/skill/Skill.ts +++ b/src/rooms/logic/skill/Skill.ts @@ -230,9 +230,11 @@ export class Skill { } } cb && (this._cb = cb); - this._tgctrl.checkTrigger(tg_type, tg_value, this._owner, () => { - this.trigger(tg_target); - }); + if(this._tgctrl.checkTrigger(tg_type, tg_value, this._owner)){ + return this.trigger(tg_target); + }else{ + return null; + } }; handleCard(efftype: SkillEffectType, effvalue: number, tgt: SkillTarget){ diff --git a/src/rooms/logic/skill/TriggerCtrl.ts b/src/rooms/logic/skill/TriggerCtrl.ts index 09df129..beb788b 100644 --- a/src/rooms/logic/skill/TriggerCtrl.ts +++ b/src/rooms/logic/skill/TriggerCtrl.ts @@ -24,14 +24,15 @@ export class TriggerCtrl{ this._cond = condobj; }; - checkTrigger(tg_type: TriggerType, tg_value: any, tg_owner: any, callback: any){ + checkTrigger(tg_type: TriggerType, tg_value: any, tg_owner: any, callback?: any): boolean{ if(tg_type == TriggerType.NO_COND){ // callback && callback(); - return; + return true; } if(this._tg.isOK(tg_type)){ if(this._cond.isOK(tg_value, tg_owner)){ callback && callback(); + return true; } } } From f97fe7664467cb43c7bd52aa7445d404c666e724 Mon Sep 17 00:00:00 2001 From: yuexin Date: Fri, 4 Dec 2020 18:27:27 +0800 Subject: [PATCH 2/2] import tables --- configs/hero_tbl.json | 2 +- configs/unit_tbl.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configs/hero_tbl.json b/configs/hero_tbl.json index c12d00e..2e41454 100644 --- a/configs/hero_tbl.json +++ b/configs/hero_tbl.json @@ -1 +1 @@ -[{"id":30011,"herounit_id":50011,"ex_skill":0},{"id":30021,"herounit_id":50021,"ex_skill":0},{"id":30031,"herounit_id":50031,"ex_skill":0},{"id":30041,"herounit_id":50041,"ex_skill":0}] \ No newline at end of file +[{"id":30011,"herounit_id":50011,"ex_skill":0},{"id":30021,"herounit_id":50021,"ex_skill":0},{"id":30031,"herounit_id":50031,"ex_skill":0},{"id":30041,"herounit_id":50041,"ex_skill":0},{"id":30051,"herounit_id":50051,"ex_skill":0},{"id":30061,"herounit_id":50061,"ex_skill":0},{"id":30071,"herounit_id":50071,"ex_skill":0},{"id":30081,"herounit_id":50081,"ex_skill":0}] \ No newline at end of file diff --git a/configs/unit_tbl.json b/configs/unit_tbl.json index fa44b37..f9d0560 100644 --- a/configs/unit_tbl.json +++ b/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,"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}] \ No newline at end of file +[{"id":50011,"unittypei_id":1,"hero_hp":150,"race_id":14,"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":15,"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":25,"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":15,"job_id":3,"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":51011,"unittypei_id":2,"hero_hp":0,"race_id":18,"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":18,"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":18,"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":19,"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":51051,"unittypei_id":2,"hero_hp":0,"race_id":18,"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":51061,"unittypei_id":2,"hero_hp":0,"race_id":20,"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":50051,"unittypei_id":1,"hero_hp":150,"race_id":24,"job_id":1,"powernum_typeid":1,"powernum":30,"num_signid":1,"edd_effid":0,"edd_effnum":0,"eddeffnum_signid":0,"base_skill1id":0,"base_skill2id":0,"base_skill3id":0},{"id":50061,"unittypei_id":1,"hero_hp":150,"race_id":24,"job_id":4,"powernum_typeid":1,"powernum":30,"num_signid":1,"edd_effid":0,"edd_effnum":0,"eddeffnum_signid":0,"base_skill1id":0,"base_skill2id":0,"base_skill3id":0},{"id":50071,"unittypei_id":1,"hero_hp":150,"race_id":16,"job_id":1,"powernum_typeid":1,"powernum":30,"num_signid":1,"edd_effid":0,"edd_effnum":0,"eddeffnum_signid":0,"base_skill1id":0,"base_skill2id":0,"base_skill3id":0},{"id":50081,"unittypei_id":1,"hero_hp":150,"race_id":14,"job_id":1,"powernum_typeid":1,"powernum":30,"num_signid":1,"edd_effid":0,"edd_effnum":0,"eddeffnum_signid":0,"base_skill1id":0,"base_skill2id":0,"base_skill3id":0}] \ No newline at end of file