Merge pull request #852 from universe-st/PR-Branch

修复选择装备出现空装备问题,修复async bug
This commit is contained in:
Spmario233 2024-01-25 22:18:41 +08:00 committed by GitHub
commit 2f14771f2a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 2 additions and 1 deletions

View File

@ -3736,7 +3736,7 @@ export class Get extends Uninstantable {
else if (node.classList.contains('equips') && ui.arena.classList.contains('selecting')) {
(function () {
uiintro.add('选择装备');
uiintro.addSmall(Array.from(node.childNodes).filter(node => !node.classList.contains('feichu')), true);
uiintro.addSmall(Array.from(node.childNodes).filter(node => !node.classList.contains('emptyequip') && !node.classList.contains('feichu')), true);
uiintro.clickintro = true;
ui.control.hide();
uiintro._onclose = function () {

View File

@ -63,6 +63,7 @@ export class GameEventPromise extends Promise {
// 得新执行一个只执行这个异步事件的game.loop
// 事件自行处理skip情况
_status.event.next.remove(eventPromise);
if (event.player && event.player.skipList.includes(event.name)) {
_status.event.trigger(event.name + 'Skipped');
event.player.skipList.remove(event.name);