diff --git a/character/shenhua.js b/character/shenhua.js index 53c5671ef..4a165349b 100644 --- a/character/shenhua.js +++ b/character/shenhua.js @@ -825,13 +825,23 @@ character.shenhua={ } }, check:function(event,player){ - if(ai.get.attitude(player,event.player)>0) return true; + var du=false; var num=0; for(var i=0;i0){ + if(du&&num<=3){ + return false; + } + return true; + } + if(du) return true; return num>2; }, direct:true, @@ -849,7 +859,13 @@ character.shenhua={ event.finish(); return; } - player.chooseCardButton(event.cards,'固政:选择令'+get.translation(trigger.player)+'收回的牌'); + var check=lib.skill.guzheng.check(trigger,player); + player.chooseCardButton(event.cards,'固政:选择令'+get.translation(trigger.player)+'收回的牌').set('ai',function(button){ + if(_status.event.check){ + return 20-ai.get.value(button.link); + } + return 0; + }).set('check',check); "step 2" if(result.bool){ player.logSkill('guzheng',trigger.player); diff --git a/character/yijiang.js b/character/yijiang.js index d820a7c0f..ae9baf0e9 100755 --- a/character/yijiang.js +++ b/character/yijiang.js @@ -4567,6 +4567,9 @@ character.yijiang={ init:function(player){ player.storage.quanji=[]; }, + filter:function(event){ + return event.num>0; + }, content:function(){ "step 0" player.draw(trigger.num); diff --git a/game/game.js b/game/game.js index 2c9234949..163811c3d 100755 --- a/game/game.js +++ b/game/game.js @@ -7032,13 +7032,13 @@ if(!_status.connectMode&&player==game.me&&!_status.over&&!game.controlOver){ ui.control.show(); - if(get.config('revive')&&lib.mode[lib.config.mode].config.revive){ + if(get.config('revive')&&lib.mode[lib.config.mode].config.revive&&!ui.revive){ ui.revive=ui.create.control('revive',ui.click.dierevive); } - if(get.config('continue_game')&&lib.mode[lib.config.mode].config.continue_game){ + if(get.config('continue_game')&&!ui.continue_game&&lib.mode[lib.config.mode].config.continue_game){ ui.continue_game=ui.create.control('再战',game.reloadCurrent); } - if(get.config('dierestart')&&lib.mode[lib.config.mode].config.dierestart){ + if(get.config('dierestart')&&lib.mode[lib.config.mode].config.dierestart&&!ui.restart){ ui.restart=ui.create.control('restart',game.reload); } } diff --git a/game/update.js b/game/update.js index df25cc59a..7ffa30494 100644 --- a/game/update.js +++ b/game/update.js @@ -8,6 +8,8 @@ window.noname_update={ 'game/game.js', 'card/sp.js', 'card/swd.js', + 'character/yijiang.js', + 'character/shenhua.js', 'mode/connect.js', 'extension/coin/extension.js', 'layout/phone/layout.css',