diff --git a/card/swd.js b/card/swd.js index be94216d9..3e7a320ac 100644 --- a/card/swd.js +++ b/card/swd.js @@ -1033,8 +1033,7 @@ card.swd={ value:[5,1], result:{ target:function(player,target){ - if(target.hasSkill('jiguanyaoshu_skill')) return 0.5; - return 1; + return 1/(1+target.num('e')); } } } diff --git a/character/rank.js b/character/rank.js index d899f12da..278178945 100644 --- a/character/rank.js +++ b/character/rank.js @@ -33,7 +33,6 @@ window.characterRank={ 'old_yuanshu', 'xunyu', 'pal_murongziying', - 'diaochan', 'swd_jiliang', 'swd_shuijing', 'shen_caocao', @@ -67,6 +66,7 @@ window.characterRank={ a:[ 'hs_khadgar', 'hs_tyrande', + 'diaochan', 'diy_zaozhirenjun', 'pal_muchanglan', 'ow_heiying', @@ -98,7 +98,6 @@ window.characterRank={ 'gjqt_xiayize', 'hs_yngvar', 're_huanggai', - 're_zhangliao', 'hs_aedwin', 'hs_antonidas', 'chenlin', @@ -142,6 +141,7 @@ window.characterRank={ ], am:[ 'old_wangyi', + 're_zhangliao', 'jianyong', 'zhoutai', 'zhugejin', @@ -419,6 +419,7 @@ window.characterRank={ 'yxs_yujix', 'swd_jialanduo', 'swd_jiting', + //...... 'sp_machao', 're_zhaoyun', 'fuwan', diff --git a/character/swd.js b/character/swd.js index 8cd4c68ba..4bd965ca8 100644 --- a/character/swd.js +++ b/character/swd.js @@ -5473,6 +5473,7 @@ character.swd={ jikong:{ trigger:{player:['loseEnd','phaseBegin']}, direct:true, + usable:1, filter:function(event,player){ if(event.name=='phase') return true; if(player.num('h')) return false; @@ -8772,7 +8773,7 @@ character.swd={ polang_info:'每当你造成一次伤害,可以一张对方的装备牌', jikong:'亟空', jikong2:'亟空', - jikong_info:'当你失去最后一张手牌,或在准备阶段时,你可以指定一名角色视为对其使用一张雷杀', + jikong_info:'准备阶段,你可以指定一名角色视为对其使用一张雷杀;每当你失去最后一张手牌,你可以指定一名角色视为对其使用一张雷杀(每回合限发动一次)', xiangu:'仙骨', xiangu_info:'锁定技,你的手牌上限不会因体力值的减少而减少。', yiesheng:'回雪', diff --git a/game/asset.js b/game/asset.js index ea1d132e4..dc8fb76bf 100644 --- a/game/asset.js +++ b/game/asset.js @@ -1,5 +1,5 @@ window.noname_asset_list=[ - '1.9.9', + '1.9.9.5', 'image/background/huangtian_bg.jpg', 'image/background/september_bg.jpg', 'image/background/shengshi_bg.jpg', diff --git a/game/game.js b/game/game.js index 32e35f017..3a7e0d773 100644 --- a/game/game.js +++ b/game/game.js @@ -12738,15 +12738,16 @@ }, removeAdditionalSkill:function(skill){ if(this.additionalSkills[skill]){ - if(typeof this.additionalSkills[skill]=='string'){ - this.removeSkill(this.additionalSkills[skill]); + var additionalSkills=this.additionalSkills[skill]; + delete this.additionalSkills[skill]; + if(typeof additionalSkills=='string'){ + this.removeSkill(additionalSkills); } - else if(Array.isArray(this.additionalSkills[skill])){ - for(var i=0;i