fix param err
This commit is contained in:
parent
12b1ed0160
commit
7558e992fa
15
.vscode/launch.json
vendored
Normal file
15
.vscode/launch.json
vendored
Normal file
@ -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}"
|
||||
}
|
||||
]
|
||||
}
|
@ -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;
|
||||
|
@ -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();
|
||||
}
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user