diff --git a/audio/effect/damage.mp3 b/audio/effect/damage.mp3 new file mode 100644 index 000000000..3948a24d2 Binary files /dev/null and b/audio/effect/damage.mp3 differ diff --git a/audio/effect/die_female.mp3 b/audio/effect/die_female.mp3 new file mode 100644 index 000000000..dea4d0169 Binary files /dev/null and b/audio/effect/die_female.mp3 differ diff --git a/audio/effect/die_male.mp3 b/audio/effect/die_male.mp3 new file mode 100644 index 000000000..b4347b215 Binary files /dev/null and b/audio/effect/die_male.mp3 differ diff --git a/audio/effect/equip1.mp3 b/audio/effect/equip1.mp3 new file mode 100644 index 000000000..02e926a18 Binary files /dev/null and b/audio/effect/equip1.mp3 differ diff --git a/audio/effect/equip2.mp3 b/audio/effect/equip2.mp3 new file mode 100644 index 000000000..cec4baefd Binary files /dev/null and b/audio/effect/equip2.mp3 differ diff --git a/audio/effect/equip3.mp3 b/audio/effect/equip3.mp3 new file mode 100644 index 000000000..8b10b52c7 Binary files /dev/null and b/audio/effect/equip3.mp3 differ diff --git a/audio/effect/equip4.mp3 b/audio/effect/equip4.mp3 new file mode 100644 index 000000000..8b10b52c7 Binary files /dev/null and b/audio/effect/equip4.mp3 differ diff --git a/audio/effect/equip5.mp3 b/audio/effect/equip5.mp3 new file mode 100644 index 000000000..f159b12d9 Binary files /dev/null and b/audio/effect/equip5.mp3 differ diff --git a/audio/effect/judge.mp3 b/audio/effect/judge.mp3 new file mode 100644 index 000000000..62933c85a Binary files /dev/null and b/audio/effect/judge.mp3 differ diff --git a/game/config.js b/game/config.js index 1e1c08cea..a05acfd5b 100644 --- a/game/config.js +++ b/game/config.js @@ -174,6 +174,7 @@ window.config={ show_auto_config:'显示托管按钮', show_volumn_config:'显示音量按钮', show_name_config:'显示角色名称', + auto_popped_config:'自动弹出菜单', ui_zoom_config:'界面缩放', show_stat_config:'显示战斗统计', show_scrollbar_config:'显示滚动条', diff --git a/game/game.js b/game/game.js index d0e9c8b85..cdce20e6c 100644 --- a/game/game.js +++ b/game/game.js @@ -1420,8 +1420,7 @@ window.play={}; }, respond:function(){ if(event.skill){ - player.popup(event.skill); - game.log(get.translation(player)+'发动了'+get.translation(event.skill)); + player.logSkill(event.skill); if(player.checkShow){ player.checkShow(event.skill); } @@ -1800,6 +1799,9 @@ window.play={}; game.playAudio('die',player.name) } } + if(lib.config.background_audio){ + game.playAudio('effect','die_'+(player.sex==='female'?'female':'male')); + } if(player==game.me&&!_status.over){ ui.control.show(); if(get.config('swap')&&lib.config.mode!='versus'){ @@ -1829,6 +1831,9 @@ window.play={}; player.lose(player.get('e',{subtype:get.subtype(card)}),false); "step 1" card.fix(); + if(lib.config.background_audio){ + game.playAudio('effect',get.subtype(card)); + } var equipNum=get.equipNum(card); var equipped=false; for(var i=0;idiv{margin: 10px;position: relative;display: block;min-height: 5px;} #scrollzone1{left: 0;} #scrollzone2{left: calc(50% - 140px);} @@ -140,7 +142,7 @@ margin-bottom: 5px; .content>.placeholder.slim{margin:1px;} .content>.placeholder.removing{margin-top: -13px;} .content{display: block;width: 100%;} -.dialog .content>.config{ +.dialog:not('.popped') .content>.config{ width:200px; left:0; margin-left: 20px;