diff --git a/character/sp.js b/character/sp.js index 7b09b2d6c..0afece84f 100644 --- a/character/sp.js +++ b/character/sp.js @@ -5458,6 +5458,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ audio:2, trigger:{player:'phaseDrawBegin'}, check:function(event,player){ + if(player.storage.tunchu&&player.storage.tunchu.length) return false; return player.countCards('h')-player.countCards('h',{type:'equip'})<=player.hp; }, content:function(){ @@ -9791,7 +9792,7 @@ game.import('character',function(lib,game,ui,get,ai,_status){ danji:'单骑', danji_info:'觉醒技,准备阶段开始时,若你的手牌数大于你的体力值,你减1点体力上限,然后获得“马术”和“怒斩”', tunchu:'屯储', - tunchu_info:'摸牌阶段摸牌时,你可以额外摸两张牌,然后将任意张手牌置于你的武将上,称为“粮”,只要你的武将牌上有“粮”,你便不能使用【杀】', + tunchu_info:'摸牌阶段摸牌时,若你没有“粮”,你可以额外摸两张牌,然后将任意张手牌置于你的武将上,称为“粮”,只要你的武将牌上有“粮”,你便不能使用【杀】', shuliang:'输粮', shuliang_info:'每当一名角色的结束阶段开始时,若其手牌数少于体力值,你可以移去一张“粮”,然后该角色摸两张牌', jieyuan:'竭缘', diff --git a/game/game.js b/game/game.js index e2c9d8715..fded4bd11 100644 --- a/game/game.js +++ b/game/game.js @@ -2298,6 +2298,21 @@ } } }, + glass_ui:{ + name:'玻璃主题', + intro:'为游戏主题打开玻璃效果(手机暂不支持)', + init:false, + unfrequent:true, + onclick:function(bool){ + game.saveConfig('glass_ui',bool); + if(bool){ + ui.window.classList.add('glass_ui'); + } + else{ + ui.window.classList.remove('glass_ui'); + } + } + }, damage_shake:{ name:'伤害抖动', intro:'角色受到伤害时的抖动效果', @@ -8429,6 +8444,7 @@ game.saveConfig('change_skin',false); game.saveConfig('show_splash','off'); game.saveConfig('show_favourite',false); + game.saveConfig('animation', false); // game.saveConfig('characters',lib.config.all.characters); // game.saveConfig('cards',lib.config.all.cards); game.saveConfig('plays',['cardpile']); @@ -35429,6 +35445,7 @@ li2.innerHTML='素材版本:'+(lib.config.asset_version||'无')+'

'; li3.innerHTML='更新地址:'+trimurl(lib.config.updateURL||lib.updateURL)+'

'; li3.style.whiteSpace='nowrap'; + // li3.style.display='none';// coding var button1,button2,button3,button4,button5; @@ -35856,7 +35873,7 @@ else{ updatep1.style.display=''; updatep2.style.display=''; - updatep3.style.display=''; + updatep3.style.display='none'; // coding updatepx.style.display='none'; updatep4.innerHTML='更新'; } @@ -35880,6 +35897,7 @@ var button6=document.createElement('button'); button6.innerHTML='设为国内镜像'; + button6.style.display='none';// coding // button6.style.marginLeft='5px'; button6.onclick=function(){ game.saveConfig('updateURL',lib.mirrorURL); @@ -38032,6 +38050,9 @@ } if(lib.config.blur_ui){ ui.window.classList.add('blur_ui'); + } + if(lib.config.glass_ui){ + ui.window.classList.add('glass_ui'); } if(lib.config.custom_button){ lib.configMenu.appearence.config.custom_button.onclick('skip'); diff --git a/game/package.js b/game/package.js index c92c03504..a022a7612 100644 --- a/game/package.js +++ b/game/package.js @@ -70,6 +70,6 @@ window.noname_package={ theme:{ woodden:'木纹', music:'音乐', - simple:'简约', + simple:'简约' } }; diff --git a/theme/simple/style.css b/theme/simple/style.css index 157572bda..e5c7ffc82 100644 --- a/theme/simple/style.css +++ b/theme/simple/style.css @@ -15,6 +15,19 @@ body{ position: absolute; display: block; } +.glass_ui .dialog.scroll1.scroll2, +.glass_ui .menubg.charactercard, +.glass_ui .menu { + backdrop-filter: blur(3px); + -webkit-backdrop-filter: blur(3px); + background: rgba(0, 0, 0, 0.4); + box-shadow: rgba(0, 0, 0, 0.5) 0 0 0 1px, rgba(0, 0, 0, 0.3) 0 3px 10px; +} +#window.glass_ui .dialog.popped:not(.menu) { + backdrop-filter: blur(3px); + -webkit-backdrop-filter: blur(3px); + box-shadow: rgba(0, 0, 0, 0.6) 0 0 0 1px, rgba(0, 0, 0, 0.3) 0 3px 10px; +} #system>div>div,#mebg,.control,.player,.card,.avatar,.avatar2,.button,#window>.dialog.popped, #arena:not(.long) .player.unseen .equips:not(*:empty), #arena.long .player.unseen2 .equips:not(*:empty),.menu,.menubutton,#splash>div,