diff --git a/character/sp.js b/character/sp.js index c5a664d4a..0bd8c415b 100755 --- a/character/sp.js +++ b/character/sp.js @@ -3105,11 +3105,6 @@ character.sp={ audio:2, trigger:{player:'phaseEnd'}, direct:true, - check:function(event,player){ - if(player.hp>2) return true; - if(player.hp==2&&player.num('h')==0) return true; - return false; - }, content:function(){ "step 0" if(player.storage.kunfen|| diff --git a/game/game.js b/game/game.js index 5206c57ac..9858f5039 100755 --- a/game/game.js +++ b/game/game.js @@ -22557,9 +22557,11 @@ var packsource; var clickCapt=function(e){ if(_status.dragged) return; - newlined2.style.display='none'; - packsource.innerHTML='武将包'; - packsource.classList.remove('thundertext'); + if(newlined2){ + newlined2.style.display='none'; + packsource.innerHTML='武将包'; + packsource.classList.remove('thundertext'); + } if(this.classList.contains('thundertext')){ dialog.currentcapt=null; dialog.currentcaptnode=null; @@ -22649,118 +22651,121 @@ node.appendChild(span); } } - var groups=['wei','shu','wu','qun']; - var natures=['water','soil','wood','metal']; - var span=document.createElement('span'); - newlined.appendChild(span); - span.style.margin='8px'; - var clickGroup=function(){ - if(_status.dragged) return; - var node=this,link=this.link; - if(node.classList.contains('thundertext')){ - dialog.currentgroup=null; - dialog.currentgroupnode=null; - node.classList.remove('thundertext'); - // node.dataset.nature=''; - for(var i=0;i