Merge branch 'PR-Branch' of https://github.com/PZ157/noname into PR-Branch

This commit is contained in:
157 2024-01-08 00:42:39 +08:00
commit 30cdffdb19
5 changed files with 20 additions and 23 deletions

View File

@ -824,17 +824,11 @@ export class Get extends Uninstantable {
const constructor = obj.constructor; const constructor = obj.constructor;
let target; let target;
if (!canTranverse[getType(obj)]) { if (!canTranverse[getType(obj)]) {
try { target = obj;
// @ts-ignore return target;
target = new constructor(obj);
} catch (error) {
if (obj instanceof HTMLElement) {
target = obj.cloneNode(true); // 不能cloneNode就寄吧累了
} else throw error
}
} }
// @ts-ignore // @ts-ignore
else target = constructor ? new constructor() : Object.create(null); else target = constructor ? new constructor(target) : Object.create(null);
map.set(obj, target); map.set(obj, target);
if (obj instanceof Map) { if (obj instanceof Map) {

View File

@ -12,11 +12,11 @@ export class Card extends HTMLDivElement {
* @param {true} [noclick] * @param {true} [noclick]
*/ */
// @ts-ignore // @ts-ignore
constructor(position, info, noclick) { constructor(position) {
if (position instanceof Card) { if (position instanceof Card) {
const other = position; const other = position;
// @ts-ignore // @ts-ignore
[position, info, noclick] = other._args; [position] = other._args;
} }
/** /**
* @type {this} * @type {this}
@ -24,9 +24,8 @@ export class Card extends HTMLDivElement {
// @ts-ignore // @ts-ignore
const card = ui.create.div('.card', position); const card = ui.create.div('.card', position);
Object.setPrototypeOf(card, Card.prototype); Object.setPrototypeOf(card, Card.prototype);
card.build(info, noclick);
// @ts-ignore // @ts-ignore
card._args = [position, info, noclick]; card._args = [position];
return card; return card;
} }
build(info, noclick) { build(info, noclick) {
@ -35,6 +34,7 @@ export class Card extends HTMLDivElement {
card.buildIntro(noclick); card.buildIntro(noclick);
card.buildProperty(); card.buildProperty();
card.buildEventListener(info); card.buildEventListener(info);
return this;
} }
buildEventListener(info) { buildEventListener(info) {
let card = this; let card = this;

View File

@ -35,7 +35,7 @@ export class Dialog extends HTMLDivElement {
else if (argument == 'noforcebutton') noForceButton = true; else if (argument == 'noforcebutton') noForceButton = true;
else dialog.add(argument); else dialog.add(argument);
}); });
if (!hidden) dialog.open(); //if (!hidden) dialog.open();
if (!lib.config.touchscreen) dialog.contentContainer.onscroll = ui.update; if (!lib.config.touchscreen) dialog.contentContainer.onscroll = ui.update;
if (!noTouchScroll) { if (!noTouchScroll) {
dialog.contentContainer.ontouchstart = ui.click.dialogtouchStart; dialog.contentContainer.ontouchstart = ui.click.dialogtouchStart;

View File

@ -8,24 +8,22 @@ import { UI as ui } from '../../ui/index.js';
export class Player extends HTMLDivElement { export class Player extends HTMLDivElement {
/** /**
* @param {HTMLDivElement|DocumentFragment} [position] * @param {HTMLDivElement|DocumentFragment} [position]
* @param {true} [noclick]
*/ */
// @ts-ignore // @ts-ignore
constructor(position, noclick) {
constructor(position) {
if (position instanceof Player) { if (position instanceof Player) {
const other = position; const other = position;
[position, noclick] = other._args; [position] = other._args;
} }
/** /**
* @type {this} * @type {this}
*/ */
// @ts-ignore // @ts-ignore
const player = ui.create.div('.player', position); const player = ui.create.div('.player', position);
Object.setPrototypeOf(player, Player.prototype); Object.setPrototypeOf(player, Player.prototype);
player.build(noclick);
// @ts-ignore // @ts-ignore
player._args = [position, noclick]; player._args = [position];
return player; return player;
} }
/** /**
@ -181,6 +179,7 @@ export class Player extends HTMLDivElement {
player.buildProperty(); player.buildProperty();
player.buildExtra(); player.buildExtra();
player.buildEventListener(noclick); player.buildEventListener(noclick);
return this;
} }
buildNode() { buildNode() {
let player = this; let player = this;

View File

@ -8655,7 +8655,11 @@ class Create extends Uninstantable {
return dialog; return dialog;
} }
static dialog() { static dialog() {
return new lib.element.Dialog(...arguments); let dialog = new lib.element.Dialog(...arguments);
if(!Array.from(arguments).includes('hidden')){
dialog.open();
}
return dialog;
} }
static line2() { static line2() {
var node = ui.create.line.apply(this, arguments); var node = ui.create.line.apply(this, arguments);
@ -9898,7 +9902,7 @@ class Create extends Uninstantable {
dialog.buttons.add(next.firstChild); dialog.buttons.add(next.firstChild);
} }
} }
static player(position, noclick) { return new lib.element.Player(position, noclick) } static player(position, noclick) { return new lib.element.Player(position).build(noclick); }
static connectPlayers(ip) { static connectPlayers(ip) {
ui.updateConnectPlayerPositions(); ui.updateConnectPlayerPositions();
game.connectPlayers = []; game.connectPlayers = [];
@ -10047,7 +10051,7 @@ class Create extends Uninstantable {
// ui.updatehl(); // ui.updatehl();
} }
} }
static card(position, info, noclick) { return new lib.element.Card(position, info, noclick)} static card(position, info, noclick) { return new lib.element.Card(position).build(info, noclick);}
static cardsAsync() { static cardsAsync() {
if (lib.onfree) { if (lib.onfree) {
_status.waitingForCards = Array.from(arguments); _status.waitingForCards = Array.from(arguments);