This commit is contained in:
libccy 2017-02-17 21:31:25 +08:00
parent cac7872227
commit e16a3813f2
5 changed files with 14 additions and 12 deletions

View File

@ -1033,8 +1033,7 @@ card.swd={
value:[5,1], value:[5,1],
result:{ result:{
target:function(player,target){ target:function(player,target){
if(target.hasSkill('jiguanyaoshu_skill')) return 0.5; return 1/(1+target.num('e'));
return 1;
} }
} }
} }

View File

@ -33,7 +33,6 @@ window.characterRank={
'old_yuanshu', 'old_yuanshu',
'xunyu', 'xunyu',
'pal_murongziying', 'pal_murongziying',
'diaochan',
'swd_jiliang', 'swd_jiliang',
'swd_shuijing', 'swd_shuijing',
'shen_caocao', 'shen_caocao',
@ -67,6 +66,7 @@ window.characterRank={
a:[ a:[
'hs_khadgar', 'hs_khadgar',
'hs_tyrande', 'hs_tyrande',
'diaochan',
'diy_zaozhirenjun', 'diy_zaozhirenjun',
'pal_muchanglan', 'pal_muchanglan',
'ow_heiying', 'ow_heiying',
@ -98,7 +98,6 @@ window.characterRank={
'gjqt_xiayize', 'gjqt_xiayize',
'hs_yngvar', 'hs_yngvar',
're_huanggai', 're_huanggai',
're_zhangliao',
'hs_aedwin', 'hs_aedwin',
'hs_antonidas', 'hs_antonidas',
'chenlin', 'chenlin',
@ -142,6 +141,7 @@ window.characterRank={
], ],
am:[ am:[
'old_wangyi', 'old_wangyi',
're_zhangliao',
'jianyong', 'jianyong',
'zhoutai', 'zhoutai',
'zhugejin', 'zhugejin',
@ -419,6 +419,7 @@ window.characterRank={
'yxs_yujix', 'yxs_yujix',
'swd_jialanduo', 'swd_jialanduo',
'swd_jiting', 'swd_jiting',
//......
'sp_machao', 'sp_machao',
're_zhaoyun', 're_zhaoyun',
'fuwan', 'fuwan',

View File

@ -5473,6 +5473,7 @@ character.swd={
jikong:{ jikong:{
trigger:{player:['loseEnd','phaseBegin']}, trigger:{player:['loseEnd','phaseBegin']},
direct:true, direct:true,
usable:1,
filter:function(event,player){ filter:function(event,player){
if(event.name=='phase') return true; if(event.name=='phase') return true;
if(player.num('h')) return false; if(player.num('h')) return false;
@ -8772,7 +8773,7 @@ character.swd={
polang_info:'每当你造成一次伤害,可以一张对方的装备牌', polang_info:'每当你造成一次伤害,可以一张对方的装备牌',
jikong:'亟空', jikong:'亟空',
jikong2:'亟空', jikong2:'亟空',
jikong_info:'当你失去最后一张手牌,或在准备阶段时,你可以指定一名角色视为对其使用一张雷杀', jikong_info:'准备阶段,你可以指定一名角色视为对其使用一张雷杀;每当你失去最后一张手牌,你可以指定一名角色视为对其使用一张雷杀(每回合限发动一次)',
xiangu:'仙骨', xiangu:'仙骨',
xiangu_info:'锁定技,你的手牌上限不会因体力值的减少而减少。', xiangu_info:'锁定技,你的手牌上限不会因体力值的减少而减少。',
yiesheng:'回雪', yiesheng:'回雪',

View File

@ -1,5 +1,5 @@
window.noname_asset_list=[ window.noname_asset_list=[
'1.9.9', '1.9.9.5',
'image/background/huangtian_bg.jpg', 'image/background/huangtian_bg.jpg',
'image/background/september_bg.jpg', 'image/background/september_bg.jpg',
'image/background/shengshi_bg.jpg', 'image/background/shengshi_bg.jpg',

View File

@ -12738,15 +12738,16 @@
}, },
removeAdditionalSkill:function(skill){ removeAdditionalSkill:function(skill){
if(this.additionalSkills[skill]){ if(this.additionalSkills[skill]){
if(typeof this.additionalSkills[skill]=='string'){ var additionalSkills=this.additionalSkills[skill];
this.removeSkill(this.additionalSkills[skill]); delete this.additionalSkills[skill];
if(typeof additionalSkills=='string'){
this.removeSkill(additionalSkills);
} }
else if(Array.isArray(this.additionalSkills[skill])){ else if(Array.isArray(additionalSkills)){
for(var i=0;i<this.additionalSkills[skill].length;i++){ for(var i=0;i<additionalSkills.length;i++){
this.removeSkill(this.additionalSkills[skill][i]); this.removeSkill(additionalSkills[i]);
} }
} }
delete this.additionalSkills[skill];
} }
}, },
awakenSkill:function(skill,nounmark){ awakenSkill:function(skill,nounmark){