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

Merge pull request #1012 from kuangshen04/test-Branch 

check增加hook接口+bugfix
This commit is contained in:
Spmario233 2024-03-04 20:57:09 +08:00 committed by GitHub
parent 3d706aa3cb 4f7227aeb9
commit 8ecd4cc4ec
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
noname/game/index.js
View File

@ -5861,6 +5861,8 @@ export class Game extends Uninstantable {
* @param { GameEventPromise } [event]
*/
static check(event = _status.event) {
game.callHook("checkBegin", [event]);
event._checked = true;
let ok = true, auto = true, auto_confirm = lib.config.auto_confirm;
const player = event.player;
@ -5890,7 +5892,7 @@ export class Game extends Uninstantable {
game.Check.skill(event);
player.node.equips.classList.remove('popequip');
if (event.filterCard && lib.config.popequip && get.is.phoneLayout() &&
if (event.filterCard && lib.config.popequip && !_status.nopopequip && get.is.phoneLayout() &&
typeof event.position === 'string' && event.position.includes('e') &&
player.node.equips.querySelector('.card.selectable')) {
player.node.equips.classList.add('popequip');
@ -5927,6 +5929,7 @@ export class Game extends Uninstantable {
}
if (event.isMine()) game.Check.confirm(event, { ok, auto, auto_confirm });
// if (ui.confirm && ui.confirm.lastChild.link == 'cancel') {
// if (_status.event.type == 'phase' && !_status.event.skill) {
// ui.confirm.lastChild.innerHTML = '结束';
@ -5935,6 +5938,8 @@ export class Game extends Uninstantable {
// ui.confirm.lastChild.innerHTML = '取消';
// }
// }
game.callHook("checkEnd", [event]);
return ok;
}
static Check = class extends Uninstantable {
@ -5953,12 +5958,12 @@ export class Game extends Uninstantable {
if (useCache) {
if (!event[`_${type}Choice`]) event[`_${type}Choice`] = {};
const cacheId = Object.keys(ui.selected).reduce((result, Type) => {
if (Type === type + 's') return result;
let idType = Type.slice(0, -1);
if (idType === "target") idType = "player";
return ui.selected[Type].reduce((t, i) => t ^= i[`${idType}id`], result);
}, 0);
let cacheId = 0;
for (let Type of ['button', 'card', 'target']) {
if (type === Type) break;
if (Type === "target") Type = "player";
ui.selected[`${Type}s`].forEach(i => cacheId ^= i[`${Type}id`]);
}
if (!event[`_${type}Choice`][cacheId]) {
event[`_${type}Choice`][cacheId] = [];
firstCheck = true;
@ -6017,8 +6022,6 @@ export class Game extends Uninstantable {
const players = game.players.slice();
if (event.deadTarget) players.addArray(game.dead);
const cards = player.getCards(event.position);
let firstCheck = false;
const range = get.select(event.selectCard);
const isSelectable = card => {
if (card.classList.contains('uncheck')) return false;
if (player.isOut()) return false;

3
noname/library/index.js
View File

@ -325,6 +325,9 @@ export class Library extends Uninstantable {
game.dynamicStyle.addObject(result2);
}
}],
//game.check美化
checkBegin: [],
checkEnd: [],
};
/**