From 7558e992fa185f6b29f7fb8644567070cdf166c5 Mon Sep 17 00:00:00 2001 From: yuexin Date: Thu, 3 Dec 2020 20:10:41 +0800 Subject: [PATCH] fix param err --- .vscode/launch.json | 15 +++++++++++++++ src/rooms/logic/skill/Skill.ts | 5 +---- src/rooms/logic/skill/TriggerCtrl.ts | 4 ++-- 3 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 .vscode/launch.json diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..7a9dfa0 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,15 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "pwa-chrome", + "request": "launch", + "name": "Launch Chrome against localhost", + "url": "http://localhost:8080", + "webRoot": "${workspaceFolder}" + } + ] +} \ No newline at end of file diff --git a/src/rooms/logic/skill/Skill.ts b/src/rooms/logic/skill/Skill.ts index d6af788..f8c11fe 100644 --- a/src/rooms/logic/skill/Skill.ts +++ b/src/rooms/logic/skill/Skill.ts @@ -18,8 +18,6 @@ export class Skill { _show_effect: any[]; _param: number; _tgctrl: any; - _condv: any; - _condv2: any; _maxvalue: any; _man: any; _splashinfo: {}; @@ -205,7 +203,7 @@ export class Skill { this._startround++; } } - this._tgctrl.checkTrigger(tg_type, tg_value, this._condv, this._owner, () => { + this._tgctrl.checkTrigger(tg_type, tg_value, this._owner, () => { cb && cb(this); this.trigger(tg_target); }); @@ -508,7 +506,6 @@ export class Skill { obj._type = this._type; obj._param = this._param; obj._tgctrl = this._tgctrl; - obj._condv = this._condv; obj._man = this._man; obj._show_effect = this._show_effect; obj._maxvalue = this._maxvalue; diff --git a/src/rooms/logic/skill/TriggerCtrl.ts b/src/rooms/logic/skill/TriggerCtrl.ts index f015239..dfabdc6 100644 --- a/src/rooms/logic/skill/TriggerCtrl.ts +++ b/src/rooms/logic/skill/TriggerCtrl.ts @@ -23,13 +23,13 @@ export class TriggerCtrl{ this._cond = condobj; }; - checkTrigger(tg_type: TriggerType, tg_value: any, condv: any, tg_owner: PlayerHandler, callback: any){ + checkTrigger(tg_type: TriggerType, tg_value: any, tg_owner: PlayerHandler, callback: any){ if(tg_type == TriggerType.NO_COND){ // callback && callback(); return; } if(this._tg.isOK(tg_type)){ - if(this._cond.isOK(tg_value, tg_owner, condv)){ + if(this._cond.isOK(tg_value, tg_owner)){ callback && callback(); } }