YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

销毁机制bug修复2

This commit is contained in:
Spmario233 2023-10-28 01:19:43 +08:00
parent 2d9c40f41c
commit bbcc7233a2
1 changed files with 22 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
game/game.js
View File

@ -13719,7 +13719,7 @@
var withPile=false; var withPile=false;
for(var i=0;i<cards.length;i++){ for(var i=0;i<cards.length;i++){
if(cards[i].willBeDestroyed('discardPile',null,event)){ if(cards[i].willBeDestroyed('discardPile',null,event)){
cards[i].splice(i--,1); cards[i].remove();
continue; continue;
} }
if(get.position(cards[i],true)=='c') withPile=true; if(get.position(cards[i],true)=='c') withPile=true;
@ -13739,7 +13739,7 @@
var withPile=false; var withPile=false;
for(var i=0;i<cards.length;i++){ for(var i=0;i<cards.length;i++){
if(cards[i].willBeDestroyed('ordering',null,event)){ if(cards[i].willBeDestroyed('ordering',null,event)){
cards[i].splice(i--,1); cards[i].remove();
continue; continue;
} }
if(get.position(cards[i],true)=='c') withPile=true; if(get.position(cards[i],true)=='c') withPile=true;
@ -13762,7 +13762,7 @@
var withPile=false; var withPile=false;
for(var i=0;i<cards.length;i++){ for(var i=0;i<cards.length;i++){
if(cards[i].willBeDestroyed('special',null,event)){ if(cards[i].willBeDestroyed('special',null,event)){
cards[i].splice(i--,1); cards[i].remove();
continue; continue;
} }
if(get.position(cards[i],true)=='c') withPile=true; if(get.position(cards[i],true)=='c') withPile=true;
@ -19632,11 +19632,6 @@
cards.splice(i--,1); cards.splice(i--,1);
continue; continue;
} }
else if(event.getlx!==false&&cards[i].willBeDestroyed(event.position.id,null,event)){
cards[i].delete();
cards.splice(i--,1);
continue;
}
else if(cards[i].parentNode){ else if(cards[i].parentNode){
if(cards[i].parentNode.classList.contains('equips')){ if(cards[i].parentNode.classList.contains('equips')){
cards[i].original='e'; cards[i].original='e';
@ -19676,12 +19671,25 @@
cards[i].recheck(); cards[i].recheck();
var info=lib.card[cards[i].name]; var info=lib.card[cards[i].name];
var destroyInfo=cards[i].hasOwnProperty('_destroy')?cards[i]._destroy:info.destroy; if(cards[i].hasOwnProperty('_destroy')){
if(destroyInfo){ if(cards[i]._destroy){
cards[i].delete(); cards[i].delete();
cards[i].destroyed=destroyInfo; cards[i].destroyed=card._destroy;
continue;
} }
else if(event.position){ }
else if(cards[i].hasOwnProperty('destroyed')){
if(event.getlx!==false&&event.position&&cards[i].willBeDestroyed(event.position.id,null,event)){
cards[i].delete();
continue;
}
}
else if(info.destroy){
cards[i].delete();
cards[i].destroyed=info.destroy;
continue;
}
if(event.position){
if(_status.discarded){ if(_status.discarded){
if(event.position==ui.discardPile){ if(event.position==ui.discardPile){
_status.discarded.add(cards[i]); _status.discarded.add(cards[i]);
@ -36305,7 +36313,7 @@
const pile=ui.cardPile; const pile=ui.cardPile;
for(let i=0;i<cards.length;i++){ for(let i=0;i<cards.length;i++){
if(cards[i].willBeDestroyed('cardPile',null,event)){ if(cards[i].willBeDestroyed('cardPile',null,event)){
cards[i].splice(i--,1); cards[i].remove();
continue; continue;
} }
if(event.insert_index){ if(event.insert_index){