diff --git a/CHANGELOG.MD b/CHANGELOG.MD index 35b44c434..aa79ba31c 100644 --- a/CHANGELOG.MD +++ b/CHANGELOG.MD @@ -1,4 +1,2 @@ -1.3.2 -战棋模式调整（见帮助） -通用选项：不无懈自己 -奇策调整 +1.3.3 +弹出菜单改进 diff --git a/character/yxs.js b/character/yxs.js index 0ebf140be..8e76556ac 100755 --- a/character/yxs.js +++ b/character/yxs.js @@ -793,7 +793,7 @@ character.yxs={ trigger:{global:'useCardAfter'}, direct:true, filter:function(event,player){ - return _status.currentPhase!=player&&get.type(event.card)=='trick'&& + return _status.currentPhase!=player&&event.player!=player&&get.type(event.card)=='trick'&& get.position(event.card)=='d'&&!player.skills.contains('zhulu2')&& get.itemtype(event.card)=='card'&&player.num('he',{suit:get.suit(event.card)})>0; }, @@ -917,7 +917,7 @@ character.yxs={ yxs_aijiyanhou:'埃及艳后', yxs_diaochan:'貂蝉', yxs_yangyuhuan:'杨玉环', - + weiyi:'威仪', weiyi_info:'每当你受到一次伤害，可以令伤害来源弃置两张牌', xieling:'挟令', diff --git a/game/config.js b/game/config.js index 824c46051..03cbb4dcb 100755 --- a/game/config.js +++ b/game/config.js @@ -149,6 +149,7 @@ window.config={ show_replay_config:'显示重来按钮', show_pause_config:'显示暂停按钮', show_wuxie_config:'显示不询问无懈', + show_wuxie_self_config:'显示不无懈自己', show_discardpile_config:'暂停时显示弃牌堆', only_fullskin_config:'隐藏非全身皮肤', hide_card_image_config:'隐藏卡牌背景图', @@ -221,6 +222,7 @@ window.config={ show_volumn:true, only_fullskin:true, show_wuxie:true, + show_wuxie_self:true, show_stat:true, show_playerids:true, show_scrollbar:false, diff --git a/game/game.js b/game/game.js index f49137b66..0c5b9f465 100755 --- a/game/game.js +++ b/game/game.js @@ -7733,7 +7733,8 @@ gameconfig.push(ui.create.switcher('cheat',lib.config.cheat,ui.click.sidebar.cheat)); gameconfig.push(ui.create.switcher('auto_confirm',lib.config.auto_confirm,ui.click.sidebar.global)); gameconfig.push(ui.create.switcher('enable_drag',lib.config.enable_drag,ui.click.sidebar.global)); - gameconfig.push(ui.create.switcher('wuxie_self',lib.config.wuxie_self,ui.click.sidebar.global)); + ui.wuxie_self=ui.create.switcher('wuxie_self',lib.config.wuxie_self,ui.click.sidebar.global); + gameconfig.push(ui.wuxie_self); gameconfig.push(ui.create.switcher('duration',[500,700,1000],lib.config.duration,ui.click.sidebar.global)); gameconfig.push(ui.create.switcher('hoveration',[700,1000,1500],lib.config.hoveration,ui.click.sidebar.global)); gameconfig.push(ui.create.div('.placeholder')); @@ -7813,6 +7814,7 @@ appearence.push(ui.create.switcher('show_auto',lib.config.show_auto,ui.click.sidebar.show_auto)); appearence.push(ui.create.switcher('show_volumn',lib.config.show_volumn,ui.click.sidebar.show_volumn)); appearence.push(ui.create.switcher('show_wuxie',lib.config.show_wuxie,ui.click.sidebar.show_wuxie)); + appearence.push(ui.create.switcher('show_wuxie_self',lib.config.show_wuxie_self,ui.click.sidebar.global)); appearence.push(ui.create.switcher('show_discardpile',lib.config.show_discardpile,ui.click.sidebar.global)); appearence.push(ui.create.div('.placeholder')); appearence.push(ui.create.switcher('title',lib.config.title,ui.click.sidebar.title)); @@ -8313,10 +8315,11 @@ ui.pause.style.display='none'; } ui.config2=ui.create.system('选项',ui.click.config); + ui.wuxie=ui.create.system('不询问无懈',ui.click.wuxie,true); if(!lib.config.touchscreen){ lib.setPopped(ui.config2,ui.click.pauseconfig,170); + lib.setPopped(ui.wuxie,ui.click.wuxieconfig,170); } - ui.wuxie=ui.create.system('不询问无懈',ui.click.wuxie,true); ui.auto=ui.create.system('托管',ui.click.auto); ui.volumn=ui.create.system('♫'); lib.setPopped(ui.volumn,ui.click.volumn,200); @@ -8393,6 +8396,7 @@ var node2=ui.create.div('#paused2',node); node2.innerHTML='已暂停'; + // node2.listen(function(){ // _status.clicked=true; // if(ui.sidebar.classList.contains('hidden')){ @@ -8662,6 +8666,16 @@ uiintro.add(ui.sidebar); return uiintro; }, + wuxieconfig:function(){ + if(!lib.config.show_wuxie_self) return; + if(!lib.config.auto_popped) return; + if(!ui.config.childNodes.length) return; + var uiintro=ui.create.dialog('hidden'); + var node=ui.create.switcher('wuxie_self',lib.config.wuxie_self,ui.click.sidebar.wuxie_self); + uiintro.add(node); + + return uiintro; + }, pauseconfig:function(){ if(!lib.config.auto_popped) return; if(!ui.config.childNodes.length) return; @@ -9828,6 +9842,9 @@ game.saveConfig(this.name,item,true); ui.sidebarrestart.classList.add('thundertext'); }, + wuxie_self:function(item){ + ui.wuxie_self.lastChild.click(); + }, global:function(item){ game.saveConfig(this.name,item); }, @@ -12220,6 +12237,17 @@ return aa+bb+cc+dd; } window.onkeydown=function(e){ + if(ui.currentpopped){ + if(ui.currentpopped._uiintro){ + ui.currentpopped._uiintro.delete(); + delete ui.currentpopped._uiintro; + } + delete ui.currentpopped; + } + var dialogs=document.querySelectorAll('#window>.dialog.popped:not(.static)'); + for(var i=0;i