为更新后首次启动添加扩展报错提示；优化之前的代码
This commit is contained in:
IceCola
parent
17d422b8ca
commit
e3e04e0f73
|
|
@ -845,7 +845,6 @@ const skills = {
|
|||
return get.prompt("xinfu_zuilun") + "（可获得" + get.cnNumber(num) + "张牌）";
|
||||
},
|
||||
async content(event, trigger, player) {
|
||||
"step 0";
|
||||
let num = 0;
|
||||
const cards = get.cards(3);
|
||||
await game.cardsGotoOrdering(cards);
|
||||
|
|
@ -1389,7 +1388,6 @@ const skills = {
|
|||
return get.type(event.card) == "trick" && event.targets.length > 1 && player.countCards("he") > 0;
|
||||
},
|
||||
async cost(event, trigger, player) {
|
||||
"step 0";
|
||||
event.result = await player
|
||||
.chooseCardTarget({
|
||||
filterCard: true,
|
||||
|
|
@ -1590,7 +1588,6 @@ const skills = {
|
|||
return player.countCards("he") > 0;
|
||||
},
|
||||
async cost(event, trigger, player) {
|
||||
"step 0";
|
||||
event.result = await player
|
||||
.chooseCard(get.prompt("kongsheng"), "将任意张牌置于武将牌上", "he", [1, player.countCards("he")])
|
||||
.set("ai", function (card) {
|
||||
|
|
@ -1630,13 +1627,13 @@ const skills = {
|
|||
return get.type(i, false) == "equip" && player.hasUseTarget(i);
|
||||
});
|
||||
if (cards.length > 0) {
|
||||
let card = cards[0];
|
||||
let [card] = cards;
|
||||
if (cards.length > 1) {
|
||||
const { result } = await player.chooseButton(true, ["选择要使用的装备牌", cards]).set("ai", function (button) {
|
||||
return get.order(button.link);
|
||||
});
|
||||
if (!result.bool) continue;
|
||||
card = result.links[0];
|
||||
[card] = result.links;
|
||||
}
|
||||
await player.chooseUseTarget(card, true);
|
||||
} else break;
|
||||
|
|
@ -1961,6 +1958,7 @@ const skills = {
|
|||
combo: "nzry_huaiju",
|
||||
},
|
||||
},
|
||||
// ----- 审查分界线喵 ----- 上面的代码已经经过了审查喵
|
||||
nzry_kuizhu: {
|
||||
audio: 2,
|
||||
trigger: {
|
||||
|
|
|
|||
|
|
@ -513,6 +513,8 @@ export async function boot() {
|
|||
}
|
||||
delete _status.htmlbg;
|
||||
|
||||
const isFirstStartAfterUpdate = !!window.noname_update;
|
||||
|
||||
// 无名杀更新日志
|
||||
if (window.noname_update) {
|
||||
Reflect.set(lib, "version", window.noname_update.version);
|
||||
|
|
@ -527,7 +529,7 @@ export async function boot() {
|
|||
html`
|
||||
<div
|
||||
style="position: relative;width:50px;height:50px;border-radius:50px;background-image:url('${description
|
||||
.author.avatar_url}');background-size:cover;vertical-align:middle;"
|
||||
.author.avatar_url}');background-size:cover;vertical-align:middle;"
|
||||
></div>
|
||||
${description.author.login}于${description.published_at}发布
|
||||
`.trim(),
|
||||
|
|
@ -633,6 +635,7 @@ export async function boot() {
|
|||
for (const promise of _status.extensionLoading) {
|
||||
await promise.catch(async (error) => {
|
||||
if (extErrorList.includes(error)) return;
|
||||
extErrorList.add(error);
|
||||
if (!promiseErrorHandler || !promiseErrorHandler.onHandle) return;
|
||||
// @ts-ignore
|
||||
await promiseErrorHandler.onHandle({ promise });
|
||||
|
|
@ -640,6 +643,14 @@ export async function boot() {
|
|||
}
|
||||
// await Promise.allSettled(_status.extensionLoading);
|
||||
|
||||
if (isFirstStartAfterUpdate && extErrorList.length) {
|
||||
const stacktraces = extErrorList.map(e => e instanceof Error ? e.stack : String(e)).join("\n\n")
|
||||
// game.saveConfig("update_first_log", stacktraces);
|
||||
if(confirm(`扩展加载出错！是否重新载入游戏？\n本次更新可能导致了扩展出现了错误：\n${stacktraces}`)){
|
||||
game.reload();
|
||||
}
|
||||
}
|
||||
|
||||
_status.extensionLoaded
|
||||
.filter((name) => game.hasExtension(name))
|
||||
.forEach((name) => {
|
||||
|
|
@ -778,18 +789,18 @@ function initSheet(libConfig) {
|
|||
}
|
||||
Reflect.get(ui, "css").border_stylesheet.sheet.insertRule(
|
||||
'#window .player>.framebg,#window #arena.long.mobile:not(.fewplayer) .player[data-position="0"]>.framebg{display:block;background-image:url("' +
|
||||
lib.assetURL +
|
||||
"theme/style/player/" +
|
||||
bstyle +
|
||||
'1.png")}',
|
||||
lib.assetURL +
|
||||
"theme/style/player/" +
|
||||
bstyle +
|
||||
'1.png")}',
|
||||
0
|
||||
);
|
||||
Reflect.get(ui, "css").border_stylesheet.sheet.insertRule(
|
||||
'#window #arena.long:not(.fewplayer) .player>.framebg, #arena.oldlayout .player>.framebg{background-image:url("' +
|
||||
lib.assetURL +
|
||||
"theme/style/player/" +
|
||||
bstyle +
|
||||
'3.png")}',
|
||||
lib.assetURL +
|
||||
"theme/style/player/" +
|
||||
bstyle +
|
||||
'3.png")}',
|
||||
0
|
||||
);
|
||||
Reflect.get(ui, "css").border_stylesheet.sheet.insertRule(
|
||||
|
|
@ -818,14 +829,14 @@ function initSheet(libConfig) {
|
|||
if (libConfig.control_style == "wood") {
|
||||
Reflect.get(ui, "css").control_stylesheet = lib.init.sheet(
|
||||
"#window .control,#window .menubutton,#window #system>div>div,#window #system>div>.pressdown2{background-image:" +
|
||||
str +
|
||||
"}"
|
||||
str +
|
||||
"}"
|
||||
);
|
||||
} else {
|
||||
Reflect.get(ui, "css").control_stylesheet = lib.init.sheet(
|
||||
"#window .control,.menubutton:not(.active):not(.highlight):not(.red):not(.blue),#window #system>div>div{background-image:" +
|
||||
str +
|
||||
"}"
|
||||
str +
|
||||
"}"
|
||||
);
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue