@@ -82129,13 +82129,13 @@ System.register(
8212982129 return d.default.createElement(
8213082130 "div",
8213182131 {
82132- className: h.default("player", { operator: t.operator, "menu-open": a }),
82132+ className: h.default("player", { operator: t.operator, disabled: t.inGame, "menu-open": a }),
8213382133 "data-r-tooltip": l,
8213482134 onClick: (e) => {
82135- (e.preventDefault(), e.stopPropagation(), o || n(!0));
82135+ (e.preventDefault(), e.stopPropagation(), o || t.inGame || n(!0));
8213682136 },
8213782137 onContextMenu: (e) => {
82138- (e.preventDefault(), e.stopPropagation(), o || n(!0));
82138+ (e.preventDefault(), e.stopPropagation(), o || t.inGame || n(!0));
8213982139 }
8214082140 },
8214182141 d.default.createElement(g.ChannelOpIndicator, { operator: t.operator }),
@@ -82145,6 +82145,7 @@ System.register(
8214582145 { className: "player-name-wrapper" },
8214682146 d.default.createElement("span", { className: "player-name" }, t.name),
8214782147 !o &&
82148+ !t.inGame &&
8214882149 0 < c.length &&
8214982150 d.default.createElement(
8215082151 d.default.Fragment,
@@ -82361,9 +82362,14 @@ System.register(
8236182362 key: e.name,
8236282363 className: "game",
8236382364 selected: r,
82365+ disabled: !!e.resLocked,
8236482366 tooltip: s,
82365- onClick: () => l(e),
82366- onDoubleClick: () => c(e)
82367+ onClick: () => {
82368+ e.resLocked || l(e);
82369+ },
82370+ onDoubleClick: () => {
82371+ e.resLocked || c(e);
82372+ }
8236782373 },
8236882374 g.default.createElement(
8236982375 "span",
@@ -104681,6 +104687,10 @@ System.register("gui/screen/mainMenu/quickGame/ChatUi",["@puzzl/core/lib/async/c
104681104687 (this.users = []),
104682104688 (this.chatHistory = new d.ChatHistory()),
104683104689 (this.playerProfiles = new Map()),
104690+ (this.sortUsers = (e) =>
104691+ e.sort(
104692+ (e, t) => Number(!!e.inGame) - Number(!!t.inGame) || Number(t.operator) - Number(e.operator)
104693+ )),
104684104694 (this.onChannelJoinLeave = (t) => {
104685104695 let e = t.channel,
104686104696 i = e.match(/#Lob (\d+) (\d)/i);
@@ -104699,10 +104709,7 @@ System.register("gui/screen/mainMenu/quickGame/ChatUi",["@puzzl/core/lib/async/c
104699104709 )
104700104710 : t.channel === this.channelName &&
104701104711 ("join" === t.type
104702- ? (this.users.push(t.user),
104703- this.users.sort(
104704- (e, t) => Number(t.operator) - Number(e.operator),
104705- ))
104712+ ? (this.users.some((e) => e.name === t.user.name) || this.users.push(t.user), this.sortUsers(this.users))
104706104713 : -1 !==
104707104714 (s = this.users.findIndex(
104708104715 (e) => e.name === t.user.name,
@@ -104713,6 +104720,7 @@ System.register("gui/screen/mainMenu/quickGame/ChatUi",["@puzzl/core/lib/async/c
104713104720 (this.onChannelUsers = (e) => {
104714104721 e.channelName === this.channelName &&
104715104722 ((this.users = e.users),
104723+ this.sortUsers(this.users),
104716104724 this.updateView({ users: this.users }),
104717104725 this.refreshPlayerRanks());
104718104726 }),
0 commit comments