diff --git a/noname/init/import.js b/noname/init/import.js index a20bc3dc8..adb0eb644 100644 --- a/noname/init/import.js +++ b/noname/init/import.js @@ -102,8 +102,8 @@ function generateImportFunction(type, pathParser) { script.remove(); if (status === "error") { if (type === "character") { - console.error( - "如果您在扩展中使用了game.import创建武将包,请将以下代码删除: lib.config.all.characters.push('武将包名');" + console.warn( + "如果您在扩展中使用了game.import创建武将包,可将以下代码删除: lib.config.all.characters.push('武将包名');" ); } return; diff --git a/noname/init/onload.js b/noname/init/onload.js index 3f84c59fd..9c87312ab 100644 --- a/noname/init/onload.js +++ b/noname/init/onload.js @@ -378,7 +378,7 @@ export async function onload(resetGameTimeout) { lib[j][k].addArray(character[i][j][k]); } else { console.log( - `dublicate ${j} in character ${i}:\n${k}:\nlib.${j}.${k}`, + `duplicated ${j} in character ${i}:\n${k}:\nlib.${j}.${k}`, lib[j][k], `\ncharacter.${i}.${j}.${k}`, character[i][j][k] @@ -491,7 +491,7 @@ export async function onload(resetGameTimeout) { } } else { console.log( - `dublicate ${j} in card ${i}:\n${k}:\nlib.${j}.${k}`, + `duplicated ${j} in card ${i}:\n${k}:\nlib.${j}.${k}`, lib[j][k], `\ncard.${i}.${j}.${k}`, card[i][j][k] @@ -577,7 +577,7 @@ export async function onload(resetGameTimeout) { } else { if (lib[j][k] != undefined) { console.log( - `dublicate ${j} in play ${i}:\n${k}:\nlib.${j}.${k}`, + `duplicated ${j} in play ${i}:\n${k}:\nlib.${j}.${k}`, lib[j][k], `\nplay.${i}.${j}.${k}`, play[i][j][k] diff --git a/noname/library/element/content.js b/noname/library/element/content.js index 05a7f3a1d..39f93cfe3 100644 --- a/noname/library/element/content.js +++ b/noname/library/element/content.js @@ -2432,7 +2432,7 @@ export const Content = { lib[j][k].addArray(character[i][j][k]); } else { console.log( - `dublicate ${j} in character ${i}:\n${k}:\nlib.${j}.${k}`, + `duplicated ${j} in character ${i}:\n${k}:\nlib.${j}.${k}`, lib[j][k], `\ncharacter.${i}.${j}.${k}`, character[i][j][k] @@ -2465,7 +2465,7 @@ export const Content = { Object.defineProperty(lib[j], k, Object.getOwnPropertyDescriptor(card[i][j], k)); else { console.log( - `dublicate ${j} in card ${i}:\n${k}\nlib.${j}.${k}`, + `duplicated ${j} in card ${i}:\n${k}\nlib.${j}.${k}`, lib[j][k], `\ncard.${i}.${j}.${k}`, card[i][j][k] diff --git a/noname/ui/create/menu/pages/characterPackMenu.js b/noname/ui/create/menu/pages/characterPackMenu.js index 6028376ea..c5a7bf389 100644 --- a/noname/ui/create/menu/pages/characterPackMenu.js +++ b/noname/ui/create/menu/pages/characterPackMenu.js @@ -252,8 +252,7 @@ export const characterPackMenu = function (connectMenu) { page.appendChild(cfgnode2); } } else if (mode.startsWith("mode_extension")) { - // 排除4个基本扩展 - // 再排除那个boss扩展的间隔包 + // 排除4个基本扩展,再排除剑阁武将包 // 给扩展的武将包加一个开启关闭的功能 if ( !lib.config.all.stockextension.includes(mode.slice(15)) &&