Merge pull request #1434 from IceCola97/PR-Branch
step转async（shenhua/skill.js全部）；萌喵的bug修复；choose/discard/gainPlayerCard…
This commit is contained in:
Spmario233
GitHub
commit
d27e3696b9
File diff suppressed because it is too large
Load Diff
|
|
@ -182,6 +182,10 @@ const skills = {
|
|||
},
|
||||
},
|
||||
},
|
||||
ai: {
|
||||
order: 1,
|
||||
result: { player: 1 },
|
||||
},
|
||||
},
|
||||
//蔡瑁
|
||||
olzuolian: {
|
||||
|
|
|
|||
|
|
@ -22,7 +22,8 @@ const skills = {
|
|||
.set("prompt", "辞虑：选择执行并移去一项")
|
||||
.set("ai", () => {
|
||||
const player = get.event("player"),
|
||||
trigger = get.event().getTrigger();
|
||||
trigger = get.event().getTrigger(),
|
||||
card = trigger.card;
|
||||
let controls = get.event("controls").slice();
|
||||
if (controls.includes("防伤")) {
|
||||
if (get.tag(card, "damage")) return "防伤";
|
||||
|
|
|
|||
|
|
@ -5888,6 +5888,7 @@ export const Content = {
|
|||
} else if (!event.dialog.noforcebutton) {
|
||||
event.dialog.classList.add("forcebutton-auto");
|
||||
}
|
||||
directh = false;
|
||||
} else {
|
||||
event.dialog.add([hs, "blank"]);
|
||||
}
|
||||
|
|
@ -6082,6 +6083,7 @@ export const Content = {
|
|||
} else if (!event.dialog.noforcebutton) {
|
||||
event.dialog.classList.add("forcebutton-auto");
|
||||
}
|
||||
directh = false;
|
||||
} else {
|
||||
event.dialog.add([hs, "blank"]);
|
||||
}
|
||||
|
|
@ -6299,6 +6301,7 @@ export const Content = {
|
|||
} else if (!event.dialog.noforcebutton) {
|
||||
event.dialog.classList.add("forcebutton-auto");
|
||||
}
|
||||
directh = false;
|
||||
} else {
|
||||
event.dialog.add([hs, "blank"]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -7074,7 +7074,7 @@ export class Player extends HTMLDivElement {
|
|||
node = ui.create.div(".card.mark.drawinghidden");
|
||||
ui.create.div(".background.skillmark", node).innerHTML = get.translation(name)[0];
|
||||
} else {
|
||||
if (!lib.character[name]) return;
|
||||
if (!get.character(name)) return;
|
||||
node = ui.create.div(".card.mark.drawinghidden").setBackground(name, "character");
|
||||
}
|
||||
this.node.marks.insertBefore(node, this.node.marks.childNodes[1]);
|
||||
|
|
|
|||
|
|
@ -11999,6 +11999,7 @@ export class Library {
|
|||
},
|
||||
},
|
||||
};
|
||||
/** @type {Object<string, import("./element/character.js").Character>} */
|
||||
character = new Proxy(
|
||||
{},
|
||||
{
|
||||
|
|
@ -12040,8 +12041,8 @@ export class Library {
|
|||
lib.node.observing.push(this);
|
||||
this.send("reinit", lib.configOL, get.arenaState(), game.getState ? game.getState() : {}, game.ip, game.players[0].playerid, null, _status.cardtag);
|
||||
// 没有系统提示的接口喵？
|
||||
game.log("玩家 ", `#y${config.nickname}`, " 进入房间观战");
|
||||
game.me.chat(`玩家 <span style="font-weight: bold; color: rgb(126, 180, 255)">${config.nickname}</span> 进入房间观战`);
|
||||
game.log("玩家 ", `#y${get.plainText(config.nickname)}`, " 进入房间观战");
|
||||
game.me.chat(`玩家 <span style="font-weight: bold; color: rgb(126, 180, 255)">${get.plainText(config.nickname)}</span> 进入房间观战`);
|
||||
if (!ui.removeObserve) {
|
||||
ui.removeObserve = ui.create.system(
|
||||
"移除旁观",
|
||||
|
|
|
|||
|
|
@ -3653,24 +3653,25 @@ class Sandbox {
|
|||
return Marshal[SandboxExposer2]
|
||||
(SandboxSignal_Marshal, result, prevDomain);
|
||||
// } catch (e) {
|
||||
// // 立即报告错误
|
||||
// const window = Domain.topDomain[SandboxExposer](SandboxSignal_GetWindow);
|
||||
// // @ts-ignore
|
||||
// const line = String(e.stack).split("\n")[1];
|
||||
// const match = /<anonymous>:(\d+):\d+\)/.exec(line);
|
||||
// if (match) {
|
||||
// const index = parseInt(match[1]) - 5;
|
||||
// const lines = code.split("\n");
|
||||
// let codeView = "";
|
||||
// for (let i = index - 4; i < index + 5; i++) {
|
||||
// if (i < 0 || i >= lines.length)
|
||||
// continue;
|
||||
// codeView += `${i + 1}|${i == index ? "⚠️" : " "}${lines[i]}\n`;
|
||||
// }
|
||||
// // @ts-ignore
|
||||
// window.alert(`沙盒内出现错误：\n----------\n${codeView}\n----------\n${String(e.stack)}`);
|
||||
// // 立即报告错误
|
||||
// const window = Domain.topDomain[SandboxExposer](SandboxSignal_GetWindow);
|
||||
// // @ts-ignore
|
||||
// const stack = String(e.stack);
|
||||
// const line = stack.split("\n")[1];
|
||||
// const match = /<anonymous>:(\d+):\d+\)/.exec(line);
|
||||
// if (match) {
|
||||
// const index = parseInt(match[1]) - 5;
|
||||
// const lines = code.split("\n");
|
||||
// let codeView = "";
|
||||
// for (let i = index - 4; i < index + 5; i++) {
|
||||
// if (i < 0 || i >= lines.length)
|
||||
// continue;
|
||||
// codeView += `${i + 1}|${i == index ? "⚠️" : " "}${lines[i]}\n`;
|
||||
// }
|
||||
// throw e;
|
||||
// // @ts-ignore
|
||||
// window.alert(`Sandbox内执行的代码出现错误：\n${stack}\n----------\n${codeView}\n----------`);
|
||||
// }
|
||||
// throw e; // 不再向上抛出异常
|
||||
} finally {
|
||||
Sandbox.#executingScope.pop();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue