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

bugfix 

ui.selected.cards范围太大，不宜默认筛选
This commit is contained in:
157 2023-12-29 22:36:58 +08:00
parent 0163689c92
commit db1b6281a7
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
noname/library/element/player.js
View File

@ -7904,12 +7904,12 @@ export class Player extends HTMLDivElement {
else return true; else return true;
} }
if (get.itemtype(viewer) !== 'player') viewer = _status.event.player; if (get.itemtype(viewer) !== 'player') viewer = _status.event.player;
let cards, selected = get.copy(ui.selected.cards); let cards, selected = [];
if (get.itemtype(ignore) === 'cards') selected.addArray(ignore); if (get.itemtype(ignore) === 'cards') selected.addArray(ignore);
else if (get.itemtype(ignore) === 'card') selected.add(ignore); else if (get.itemtype(ignore) === 'card') selected.add(ignore);
if (this === viewer || get.itemtype(viewer) == 'player') cards = this.getKnownCards(viewer); if (this === viewer || get.itemtype(viewer) == 'player') cards = this.getKnownCards(viewer);
else cards = this.getShownCards(); else cards = this.getShownCards();
count += cards.filter(card => { cards = cards.filter(card => {
if (selected.includes(card)) return false; if (selected.includes(card)) return false;
let name = get.name(card, this); let name = get.name(card, this);
if (name == 'sha' || name == 'hufu' || name == 'yuchanqian') { if (name == 'sha' || name == 'hufu' || name == 'yuchanqian') {
@ -7918,9 +7918,10 @@ export class Player extends HTMLDivElement {
return true; return true;
} }
return false; return false;
}).length; });
count += cards.length;
if (count && rvt !== 'count') return true; if (count && rvt !== 'count') return true;
let hs = this.getCards('hs').filter(i => !cards.includes(i) && !selected.includes(i)).length; let hs = this.getCards('hs').filter(i => !cards.includes(i)).length;
if (!hs) { if (!hs) {
if (rvt === 'count') return count; if (rvt === 'count') return count;
return false; return false;
@ -7946,12 +7947,12 @@ export class Player extends HTMLDivElement {
else return true; else return true;
} }
if (get.itemtype(viewer) !== 'player') viewer = _status.event.player; if (get.itemtype(viewer) !== 'player') viewer = _status.event.player;
let cards, selected = get.copy(ui.selected.cards); let cards, selected = [];
if (get.itemtype(ignore) === 'cards') selected.addArray(ignore); if (get.itemtype(ignore) === 'cards') selected.addArray(ignore);
else if (get.itemtype(ignore) === 'card') selected.add(ignore); else if (get.itemtype(ignore) === 'card') selected.add(ignore);
if (this === viewer || get.itemtype(viewer) == 'player') cards = this.getKnownCards(viewer); if (this === viewer || get.itemtype(viewer) == 'player') cards = this.getKnownCards(viewer);
else cards = this.getShownCards(); else cards = this.getShownCards();
count += cards.filter(card => { cards = cards.filter(card => {
if (selected.includes(card)) return false; if (selected.includes(card)) return false;
let name = get.name(card, this); let name = get.name(card, this);
if (name === 'shan' || name === 'hufu') { if (name === 'shan' || name === 'hufu') {
@ -7960,9 +7961,10 @@ export class Player extends HTMLDivElement {
return true; return true;
} }
return false; return false;
}).length; });
count += cards.length;
if (count && rvt !== 'count') return true; if (count && rvt !== 'count') return true;
let hs = this.getCards('hs').filter(i => !cards.includes(i) && !selected.includes(i)).length; let hs = this.getCards('hs').filter(i => !cards.includes(i)).length;
if (!hs) { if (!hs) {
if (rvt === 'count') return count; if (rvt === 'count') return count;
return false; return false;