From 0803a4e8af8bf88dc02954f9ea3d844b58a44c1c Mon Sep 17 00:00:00 2001 From: 157 <3619242020@qq.com> Date: Wed, 24 Jan 2024 11:34:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=86=E8=8A=82=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- card/extra.js | 2 +- character/sp.js | 2 +- character/yingbian.js | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/card/extra.js b/card/extra.js index 7618ffc81..4bb555b7d 100644 --- a/card/extra.js +++ b/card/extra.js @@ -330,7 +330,7 @@ game.import('card',function(lib,game,ui,get,ai,_status){ res = 0.9; if(f&&t || target.hasSkillTag('nodamage')) return 0; if(f || t) res = 0.45; - if(target.getEquip('tengjia')) res *= 2; + if(!f&&target.getEquip('tengjia')) res *= 2; if(!target.isLinked()) res = -res; if(ui.selected.targets.length) return res; let fs = 0, diff --git a/character/sp.js b/character/sp.js index 502ffbd08..ed340087b 100755 --- a/character/sp.js +++ b/character/sp.js @@ -942,7 +942,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ audio:2, trigger:{ player:'loseAfter', - global:['gainAfter','equipAfter','addJudgeAfter','gainAfter','loseAsyncAfter','addToExpansionAfter'], + global:['gainAfter','equipAfter','addJudgeAfter','loseAsyncAfter','addToExpansionAfter'], }, filter(event,player){ if(!_status.currentPhase||!_status.currentPhase.isIn()) return false; diff --git a/character/yingbian.js b/character/yingbian.js index 0d796c1f5..1d76c1e0b 100644 --- a/character/yingbian.js +++ b/character/yingbian.js @@ -971,7 +971,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ charlotte:true, forced:true, popup:false, - trigger:{global:['equipAfter','addJudgeAfter','gainAfter','loseAsyncAfter','loseAfter','gainAfter','addToExpansionAfter']}, + trigger:{global:['equipAfter','addJudgeAfter','gainAfter','loseAsyncAfter','loseAfter','addToExpansionAfter']}, usable:1, filter:function(event,player){ var target=player.storage.qimei_draw; @@ -1623,7 +1623,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ var list,skills=[]; if(get.mode()=='guozhan'){ list=[]; - for(var i in lib.characterPack.mode_guozhan){ + for(var i in lib.characterPack.mode_guozhan){ if(lib.character[i])list.push(i); } }