YunFeiyang
/
noname
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1300 from lieren2023/lieren2023-patch-9 

minor fix
This commit is contained in:
Spmario233 2024-05-01 21:42:21 +08:00 committed by GitHub
parent ccf99c998e 732877842c
commit d32f6db4a2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
noname/init/import.js
View File

@ -102,8 +102,8 @@ function generateImportFunction(type, pathParser) {
script.remove(); script.remove();
if (status === "error") { if (status === "error") {
if (type === "character") { if (type === "character") {
console.error( console.warn(
"如果您在扩展中使用了game.import创建武将包，请将以下代码删除: lib.config.all.characters.push('武将包名');" "如果您在扩展中使用了game.import创建武将包，可将以下代码删除: lib.config.all.characters.push('武将包名');"
); );
} }
return; return;

6
noname/init/onload.js
View File

@ -378,7 +378,7 @@ export async function onload(resetGameTimeout) {
lib[j][k].addArray(character[i][j][k]); lib[j][k].addArray(character[i][j][k]);
} else { } else {
console.log( 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], lib[j][k],
`\ncharacter.${i}.${j}.${k}`, `\ncharacter.${i}.${j}.${k}`,
character[i][j][k] character[i][j][k]
@ -491,7 +491,7 @@ export async function onload(resetGameTimeout) {
} }
} else { } else {
console.log( 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], lib[j][k],
`\ncard.${i}.${j}.${k}`, `\ncard.${i}.${j}.${k}`,
card[i][j][k] card[i][j][k]
@ -577,7 +577,7 @@ export async function onload(resetGameTimeout) {
} else { } else {
if (lib[j][k] != undefined) { if (lib[j][k] != undefined) {
console.log( 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], lib[j][k],
`\nplay.${i}.${j}.${k}`, `\nplay.${i}.${j}.${k}`,
play[i][j][k] play[i][j][k]

4
noname/library/element/content.js
View File

@ -2432,7 +2432,7 @@ export const Content = {
lib[j][k].addArray(character[i][j][k]); lib[j][k].addArray(character[i][j][k]);
} else { } else {
console.log( 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], lib[j][k],
`\ncharacter.${i}.${j}.${k}`, `\ncharacter.${i}.${j}.${k}`,
character[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)); Object.defineProperty(lib[j], k, Object.getOwnPropertyDescriptor(card[i][j], k));
else { else {
console.log( 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], lib[j][k],
`\ncard.${i}.${j}.${k}`, `\ncard.${i}.${j}.${k}`,
card[i][j][k] card[i][j][k]

3
noname/ui/create/menu/pages/characterPackMenu.js
View File

@ -252,8 +252,7 @@ export const characterPackMenu = function (connectMenu) {
page.appendChild(cfgnode2); page.appendChild(cfgnode2);
} }
} else if (mode.startsWith("mode_extension")) { } else if (mode.startsWith("mode_extension")) {
// 排除4个基本扩展 // 排除4个基本扩展，再排除剑阁武将包
// 再排除那个boss扩展的间隔包
// 给扩展的武将包加一个开启关闭的功能 // 给扩展的武将包加一个开启关闭的功能
if ( if (
!lib.config.all.stockextension.includes(mode.slice(15)) && !lib.config.all.stockextension.includes(mode.slice(15)) &&