Fun/bettergi-scripts-list
1
0
Fork 0
mirror of https://github.com/babalae/bettergi-scripts-list.git synced 2026-05-21 22:35:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

修复bug (#3039)

Browse Source
This commit is contained in:
吉吉喵
2026-03-25 20:02:08 +08:00
committed by GitHub
parent e6b314f675
commit d76677fcf0
1 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
repo/js/背包材料统计/lib/backStats.js
View File

@@ -487,6 +487,7 @@ async function scanMaterials(materialsCategory, materialCategoryMap, isPostPrior
let shouldEndScan = false; let shouldEndScan = false;
let foundPriorityMaterial = false; let foundPriorityMaterial = false;
let isEighthColumnScan = false; // 当前是否为第八列扫描（用于跳过5秒超时终止） let isEighthColumnScan = false; // 当前是否为第八列扫描（用于跳过5秒超时终止）
let hasStartedFullColumnScan = false; // 是否已经开始过全列扫描（用于开启5秒翻页终止检测）
// 俏皮话逻辑 // 俏皮话逻辑
const scanPhrases = [ const scanPhrases = [
@@ -646,6 +647,7 @@ async function scanMaterials(materialsCategory, materialCategoryMap, isPostPrior
// 只有发现目标材料时，才执行全列扫描 // 只有发现目标材料时，才执行全列扫描
if (foundPriorityMaterial) { if (foundPriorityMaterial) {
if (debugLog) log.info(`开始全列扫描`); if (debugLog) log.info(`开始全列扫描`);
hasStartedFullColumnScan = true; // 标记已经开始全列扫描（后续所有翻页都执行终止检测）
const ocrRegions = await performFullColumnScan(ra, materialCategories, materialImages, recognizedMaterials, startX, startY, columnWidth, columnHeight, maxColumns, OffsetWidth, tolerance); const ocrRegions = await performFullColumnScan(ra, materialCategories, materialImages, recognizedMaterials, startX, startY, columnWidth, columnHeight, maxColumns, OffsetWidth, tolerance);
// 批量处理OCR // 批量处理OCR
@@ -656,6 +658,10 @@ async function scanMaterials(materialsCategory, materialCategoryMap, isPostPrior
for (const { name, result } of ocrResults) { for (const { name, result } of ocrResults) {
materialInfo.push({ name, count: result || "?" }); materialInfo.push({ name, count: result || "?" });
} }
// 更新最后发现材料的时间
hasFoundFirstMaterial = true;
lastFoundTime = Date.now();
} }
} else { } else {
log.info(`未发现目标材料，跳过`); log.info(`未发现目标材料，跳过`);
@@ -701,9 +707,9 @@ async function scanMaterials(materialsCategory, materialCategoryMap, isPostPrior
isEighthColumnScan = false; // 第八列扫描结束，重置标志 isEighthColumnScan = false; // 第八列扫描结束，重置标志
// 5秒未发现新材料时结束扫描，但如果触发兜底逻辑或第八列扫描则跳过此检查 // 5秒未发现新材料时结束扫描，只有开始全列扫描后才允许执行此检测
if (hasFoundFirstMaterial && Date.now() - lastFoundTime > 5000 && !useScreenComparison && !isEighthColumnScan) { if (hasStartedFullColumnScan && hasFoundFirstMaterial && Date.now() - lastFoundTime > 5000) {
log.info("未发现新的材料，结束扫描"); log.info("全列扫描模式下未发现新的材料，结束扫描");
shouldEndScan = true; shouldEndScan = true;
break; break;
} }
@@ -743,6 +749,10 @@ async function scanMaterials(materialsCategory, materialCategoryMap, isPostPrior
for (const { name, result } of ocrResults) { for (const { name, result } of ocrResults) {
materialInfo.push({ name, count: result || "?" }); materialInfo.push({ name, count: result || "?" });
} }
// 更新最后发现材料的时间
hasFoundFirstMaterial = true;
lastFoundTime = Date.now();
} }
log.info("最后一次全列扫描完成，结束扫描"); log.info("最后一次全列扫描完成，结束扫描");
@@ -771,6 +781,11 @@ async function scanMaterials(materialsCategory, materialCategoryMap, isPostPrior
} }
} }
// 将未匹配的材料添加到结果中，数量设为0
for (const name of unmatchedMaterialNames) {
materialInfo.push({ name, count: 0 });
}
// 日志记录 // 日志记录
const now = new Date(); const now = new Date();
const formattedTime = now.toLocaleString(); const formattedTime = now.toLocaleString();
@@ -904,7 +919,7 @@ async function MaterialPath(materialCategoryMap, cachedFrame = null) {
loopCount++; loopCount++;
switch (stage) { switch (stage) {
case 0: // 返回主界面 case 0: // 返回主界面
log.info("返回主界面"); // log.info("返回主界面");
await genshin.returnMainUi(); await genshin.returnMainUi();
await sleep(500); await sleep(500);
stage = 1; // 进入下一阶段 stage = 1; // 进入下一阶段