diff --git a/card/hearth.js b/card/hearth.js index 617d7f3e7..b6036e894 100644 --- a/card/hearth.js +++ b/card/hearth.js @@ -1,6 +1,6 @@ 'use strict'; card.hearth={ - forbid:['stone'], + // forbid:['stone'], card:{ linghunzhihuo:{ fullskin:true, diff --git a/game/game.js b/game/game.js index 0263bb7e1..19b5fffba 100755 --- a/game/game.js +++ b/game/game.js @@ -676,7 +676,22 @@ // unfrequent:true, // }, show_card_prompt:{ - name:'出牌显示卡牌名', + name:'显示出牌提示', + init:true, + unfrequent:true, + }, + hide_card_prompt_basic:{ + name:'隐藏基本牌提示', + init:false, + unfrequent:true, + }, + hide_card_prompt_equip:{ + name:'隐藏装备牌提示', + init:false, + unfrequent:true, + }, + show_phase_prompt:{ + name:'显示阶段提示', init:true, unfrequent:true, }, @@ -1055,6 +1070,14 @@ map.round_menu_func.show(); map.show_roundmenu.show(); } + if(config.show_card_prompt){ + map.hide_card_prompt_basic.show(); + map.hide_card_prompt_equip.show(); + } + else{ + map.hide_card_prompt_basic.hide(); + map.hide_card_prompt_equip.hide(); + } }, } }, @@ -3283,7 +3306,9 @@ event.num=player.num('h')-game.checkMod(player,player.hp,'maxHandcard',player.get('s')); if(event.num<=0) event.finish(); else{ - player.popup('弃牌阶段'); + if(lib.config.show_phase_prompt){ + player.popup('弃牌阶段'); + } } event.trigger('phaseDiscard'); "step 1" @@ -4072,8 +4097,11 @@ player.popup(event.card.name); } else if(lib.config.show_card_prompt){ - //&&get.type(event.card)!='equip' - player.popup(event.card.name,'metal'); + if(get.type(event.card)=='equip'&&lib.config.hide_card_prompt_equip); + else if(get.type(event.card)=='basic'&&lib.config.hide_card_prompt_basic); + else{ + player.popup(event.card.name,'metal'); + } } if(event.audio===false){ cardaudio=false; @@ -4543,7 +4571,7 @@ player.checkShow(event.skill); } } - else if(lib.config.show_card_prompt){ + else if(lib.config.show_card_prompt&&!lib.config.hide_card_prompt_basic){ player.popup(card.name,'wood'); } if(cardaudio&&event.parent.parent.parent.name=='useCard'){ @@ -9101,7 +9129,7 @@ priority:20, popup:false, content:function(){ - if(!player.noPhaseDelay){ + if(!player.noPhaseDelay&&lib.config.show_phase_prompt){ player.popup('回合开始'); } if(lib.config.glow_phase){ diff --git a/manifest.json b/manifest.json index 5533bfb81..ce4781105 100644 --- a/manifest.json +++ b/manifest.json @@ -1,6 +1,6 @@ { "name": "noname", - "xwalk_version": "1.7.6", + "xwalk_version": "1.7.7", "start_url": "index.html", "icons": [ { diff --git a/package.json b/package.json index c37374993..8f86016ff 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { "name": "无名杀", - "version": "1.7.6", + "version": "1.7.7", "main": "main.js" }