diff --git a/game/asset.js b/game/asset.js index 3feabd11b..96c2b85c3 100644 --- a/game/asset.js +++ b/game/asset.js @@ -2326,6 +2326,8 @@ window.noname_asset_list=[ 'image/character/niujin.jpg', 'image/character/lisu.jpg', 'image/character/re_zhangjiao.jpg', + 'image/character/zhangwen.jpg', + 'image/character/re_zuoci.jpg', 'image/character/baiwuchang.jpg', 'image/character/baosanniang.jpg', diff --git a/game/config.js b/game/config.js index 0339e7322..9718379e3 100644 --- a/game/config.js +++ b/game/config.js @@ -1,5 +1,5 @@ window.config={ - forbidai:['ns_liuzhang'], + forbidai:['ns_liuzhang','xin_yuji'], forbidai_user:[], forbidall:[], forbidstone:['zhugedan','pal_xuanxiao','hs_malfurion','lusu','chenlin','hs_siwangzhiyi', @@ -182,7 +182,10 @@ window.config={ customforbid:[], forbid:[ ['huashen'], + ['rehuashen'], ['xinmanjuan'], + ['xinleiji','fuji'], + ['xinleiji','xinfu_jijun'], ['reluanji','jueqing'], ['lianying','rende'], ['lianying','anxian'], diff --git a/game/game.js b/game/game.js index 71ba0703e..33291ace0 100644 --- a/game/game.js +++ b/game/game.js @@ -10212,7 +10212,7 @@ target.addJudge(card,cards); }, equipCard:function(){ - target.equip(card); + target.equip(cards[0]); }, gameDraw:function(){ "step 0" @@ -14580,7 +14580,7 @@ },_status.dying); event.finish(); } - else{ + else if(!event.skipTao){ var next=game.createEvent('_save'); var start=false; var starts=[_status.currentPhase,event.source,event.player,game.me,game.players[0]]; @@ -46103,10 +46103,10 @@ } } else{ - if(card.name!=get.name(card)||card.nature!=get.nature(card)){ + if(card.name!=get.name(card)||card.nature!=get.nature(card)||card.suit!=get.suit(card)){ var next={ name:get.name(card), - suit:card.suit, + suit:get.suit(card), number:card.number, nature:get.nature(card), }; diff --git a/game/update.js b/game/update.js index 2226ec663..313d4e11b 100644 --- a/game/update.js +++ b/game/update.js @@ -1,7 +1,8 @@ window.noname_update={ - version:'1.9.96.1', - update:'1.9.96', + version:'1.9.96.2', + update:'1.9.96.1', changeLog:[ + '界左慈,界于吉,张温', '修复BUG', ], files:[ @@ -12,34 +13,34 @@ window.noname_update={ //'card/swd.js', //'card/guozhan.js', //'card/gwent.js', - 'character/diy.js', + //'character/diy.js', //'character/extra.js', //'character/hearth.js', //'character/gujian.js', //'character/gwent.js', - //'character/mobile.js', + 'character/mobile.js', //'character/mtg.js', 'character/old.js', 'character/refresh.js', - 'character/shenhua.js', + //'character/shenhua.js', 'character/sp.js', //'character/tw.js', //'character/standard.js', //'character/swd.js', //'character/xianjian.js', 'character/xinghuoliaoyuan.js', - 'character/yijiang.js', + //'character/yijiang.js', //'character/yxs.js', //'extension/boss/extension.js', - //'mode/identity.js', + 'mode/identity.js', //'mode/doudizhu.js', - 'mode/guozhan.js', + //'mode/guozhan.js', 'mode/single.js', //'mode/stone.js', //'mode/versus.js', //'mode/boss.js', 'game/game.js', - //'game/config.js', + 'game/config.js', //'game/package.js', //'game/asset.js', //'game/source.js',