diff --git a/character/diy.js b/character/diy.js index 41c5c2348..48a63d25c 100755 --- a/character/diy.js +++ b/character/diy.js @@ -7451,12 +7451,13 @@ game.import('character',function(lib,game,ui,get,ai,_status){ }); 'step 1' if(result.control=='cancel2') return; - player.logSkill('shiorimiyuki_tingxian'); + player.logSkill('shiorimiyuki_tingxian1'); var num=1+result.index; player.draw(num).gaintag=['shiorimiyuki_tingxian']; player.recover(); player.addTempSkill('shiorimiyuki_tingxian2'); }, + group:'shiorimiyuki_tingxian1', }, shiorimiyuki_tingxian1:{audio:true}, shiorimiyuki_tingxian2:{ diff --git a/character/sp.js b/character/sp.js index 29100a746..5c456160e 100755 --- a/character/sp.js +++ b/character/sp.js @@ -10473,16 +10473,16 @@ game.import('character',function(lib,game,ui,get,ai,_status){ player.awakenSkill('luanfeng'); trigger.player.recover(3-trigger.player.hp); 'step 1' - var list=[]; + var list=[],target=trigger.player; for(var i=1;i<6;i++){ - for(var j=0;j0) player.enableEquip(list); - if(list.length<6) trigger.player.drawTo(6-list.length); - if(trigger.player.storage.kotarou_rewrite) trigger.player.storage.kotarou_rewrite=[]; - if(player==trigger.player) player.storage.youlong2=[]; + if(list.length>0) target.enableEquip(list); + if(list.length<6) target.drawTo(6-list.length); + if(target.storage.kotarou_rewrite) target.storage.kotarou_rewrite=[]; + if(player==target) player.storage.youlong2=[]; }, }, //曹爽,韩遂,何进 diff --git a/game/game.js b/game/game.js index bf7b227db..8172e5506 100644 --- a/game/game.js +++ b/game/game.js @@ -47335,8 +47335,8 @@ if(window.plugins&&window.plugins.insomnia) window.plugins.insomnia.keepAwake(); else{ lib.init.js(lib.assetURL+'game','NoSleep',function(){ - var noSleep = new NoSleep(); - document.addEventListener(lib.config.touchscreen?'touchend':'click', function enableNoSleep() { + var noSleep = new NoSleep(); + document.addEventListener(lib.config.touchscreen?'touchend':'click', function enableNoSleep() { document.removeEventListener(lib.config.touchscreen?'touchend':'click', enableNoSleep, false); noSleep.enable(); window.noSleep=noSleep; @@ -47361,6 +47361,10 @@ ui.backgroundMusic.autoplay=true; ui.backgroundMusic.addEventListener('ended',game.playBackgroundMusic); ui.window.appendChild(ui.backgroundMusic); + ui.window.addEventListener(lib.config.touchscreen?'touchend':'click', function playMusic() { + ui.window.removeEventListener(lib.config.touchscreen?'touchend':'click', playMusic, false); + if(!ui.backgroundMusic.played.length) ui.backgroundMusic.play(); + }, false); if(lib.config.cursor_style=='pointer'){ ui.window.classList.add('nopointer'); }