Skip to content

Commit 4783c7f

Browse files
zaodonganqizaodonganqi
authored
feat: 修改火神默认策略为精通 (#3402)
1 parent 7f57fe3 commit 4783c7f

3 files changed

Lines changed: 123 additions & 59 deletions

File tree

‎repo/js/ArtifactScore/manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"manifest_version": 1,
33
"name": "圣遗物实时评分",
4-
"version": "1.6.0",
4+
"version": "1.7.0",
55
"bgi_version": "0.61.2",
66
"description": "在角色圣遗物界面通过浮窗实时显示圣遗物的评分",
77
"authors": [

‎repo/js/ArtifactScore/tools/crawl-standalone.js‎

Lines changed: 99 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -22,18 +22,78 @@ const BASE = 'https://raw.githubusercontent.com/yoimiya-kokomi/miao-plugin'
2222
const BRANCH = process.argv.includes('--branch')
2323
? process.argv[process.argv.indexOf('--branch') + 1] : 'master'
2424

25+
// ============================================================
26+
// 本地覆盖
27+
//
28+
// 上游 miao-plugin 的数据不一定完全符合预期，比如某个角色的默认
29+
// 流派选得不对、权重有争议等等。这里可以覆盖 usefulAttr 的权重
30+
// 或者直接替换整条特殊规则，重新生成时会自动合入，不用担心被冲掉。
31+
// ============================================================
32+
33+
const LOCAL_OVERRIDES = {
34+
// 角色基础权重（只写需要改的字段即可，其余沿用上游）
35+
weights: {
36+
// 玛薇卡默认应该是蒸发/融化精通流，而不是纯火
37+
'玛薇卡': { mastery: 100 }
38+
},
39+
// 角色特殊规则（会完全替换上游的 artis.js 转换结果）
40+
rules: {
41+
'玛薇卡': `'玛薇卡': ({ charAttrs }) => {
42+
let particularAttr = {...usefulAttr['玛薇卡']}
43+
// 只有面板精通明确很低的时候才切到纯火/超载
44+
if ((charAttrs?.mastery || 0) > 0 && (charAttrs?.mastery || 0) < 40) {
45+
particularAttr.atk = 85
46+
particularAttr.mastery = 0
47+
return { title: '玛薇卡-纯火/超载', attrWeight: particularAttr, useDefaultPipeline: false }
48+
}
49+
// 其他情况一律按精通流处理
50+
particularAttr.mastery = 100
51+
return { title: '玛薇卡-精通', attrWeight: particularAttr, useDefaultPipeline: false }
52+
}`
53+
}
54+
}
55+
2556
// ============================================================
2657
// HTTP helpers
2758
// ============================================================
2859

29-
async function fetchRaw(path) {
60+
const RETRY_MAX = 3
61+
const RETRY_DELAY_MS = 1000
62+
63+
async function sleep(ms) {
64+
return new Promise(resolve => setTimeout(resolve, ms))
65+
}
66+
67+
/**
68+
* 带重试的 fetch。404 不重试，网络错误和服务端错误（5xx / 429）退避重试。
69+
*/
70+
async function fetchRaw(path, retries = RETRY_MAX) {
3071
const url = `${BASE}/${BRANCH}/${path}`
31-
const res = await fetch(url)
32-
if (!res.ok) {
33-
if (res.status === 404) return null
34-
throw new Error(`HTTP ${res.status} for ${path}`)
72+
for (let attempt = 1; attempt <= retries; attempt++) {
73+
try {
74+
const res = await fetch(url)
75+
if (res.ok) return res.text()
76+
if (res.status === 404) return null
77+
78+
// 服务端错误或限流，可重试
79+
if (attempt < retries) {
80+
const delay = RETRY_DELAY_MS * Math.pow(2, attempt - 1)
81+
console.warn(` HTTP ${res.status} for ${path}, retry ${attempt}/${retries} after ${delay}ms`)
82+
await sleep(delay)
83+
} else {
84+
console.warn(` HTTP ${res.status} for ${path}, exhausted retries, skipping`)
85+
}
86+
} catch (e) {
87+
if (attempt < retries) {
88+
const delay = RETRY_DELAY_MS * Math.pow(2, attempt - 1)
89+
console.warn(` Network error for ${path}, retry ${attempt}/${retries} after ${delay}ms`)
90+
await sleep(delay)
91+
} else {
92+
console.warn(` Network error for ${path}, exhausted retries, skipping`)
93+
}
94+
}
3595
}
36-
return res.text()
96+
return null
3797
}
3898

3999
async function fetchJson(path) {
@@ -1069,6 +1129,14 @@ async function main() {
10691129
const usefulAttr = sortObjectByName(parseUsefulAttr(artisMarkText))
10701130
console.log(` usefulAttr: ${Object.keys(usefulAttr).length} characters`)
10711131

1132+
// 合入本地权重覆盖
1133+
for (const [name, patch] of Object.entries(LOCAL_OVERRIDES.weights)) {
1134+
if (usefulAttr[name]) {
1135+
Object.assign(usefulAttr[name], patch)
1136+
console.log(` 本地覆盖权重: ${name} ${JSON.stringify(patch)}`)
1137+
}
1138+
}
1139+
10721140
const attrMapBase = parseExportValue(extraText, 'attrMap')
10731141
const attrPct = parseExportValue(extraText, 'attrPct')
10741142
const basicNum = parseExportValue(extraText, 'basicNum')
@@ -1092,19 +1160,23 @@ async function main() {
10921160
const encoded = encodeURIComponent(name)
10931161
const result = { name, baseAttr: null, elem: '', code: '', defWeights: null }
10941162

1095-
// Fetch data.json
1096-
const dj = await fetchJson(`resources/meta-gs/character/${encoded}/data.json`)
1097-
if (dj?.['baseAttr']) {
1098-
result.baseAttr = dj['baseAttr']
1099-
result.elem = dj['elem'] || ''
1100-
}
1163+
try {
1164+
// Fetch data.json
1165+
const dj = await fetchJson(`resources/meta-gs/character/${encoded}/data.json`)
1166+
if (dj?.['baseAttr']) {
1167+
result.baseAttr = dj['baseAttr']
1168+
result.elem = dj['elem'] || ''
1169+
}
11011170

1102-
// Fetch artis.js
1103-
const artisSrc = await fetchRaw(`resources/meta-gs/character/${encoded}/artis.js`)
1104-
if (artisSrc) {
1105-
const { code, defWeights } = transformArtisJs(artisSrc, name)
1106-
result.code = code || ''
1107-
result.defWeights = defWeights || null
1171+
// Fetch artis.js
1172+
const artisSrc = await fetchRaw(`resources/meta-gs/character/${encoded}/artis.js`)
1173+
if (artisSrc) {
1174+
const { code, defWeights } = transformArtisJs(artisSrc, name)
1175+
result.code = code || ''
1176+
result.defWeights = defWeights || null
1177+
}
1178+
} catch (e) {
1179+
console.warn(` 角色 ${name} 数据拉取/转换失败: ${e.message}，保留现有数据`)
11081180
}
11091181

11101182
return result
@@ -1129,7 +1201,15 @@ async function main() {
11291201
dataJsonFailed++
11301202
}
11311203

1132-
if (result.code) {
1204+
// 本地有覆盖就用本地的，否则用上游转换结果
1205+
const overrideRule = LOCAL_OVERRIDES.rules[result.name]
1206+
if (overrideRule) {
1207+
artisJsFetched++
1208+
charRulesEntries.push(overrideRule)
1209+
if (result.defWeights) {
1210+
artisDefaultWeights[result.name] = result.defWeights
1211+
}
1212+
} else if (result.code) {
11331213
artisJsFetched++
11341214
charRulesEntries.push(result.code)
11351215
if (result.defWeights) {

‎repo/js/ArtifactScore/utils/artis-score-standalone.js‎

Lines changed: 23 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -853,7 +853,7 @@ const usefulAttr = {
853853
"def": 0,
854854
"cpct": 100,
855855
"cdmg": 100,
856-
"mastery": 85,
856+
"mastery": 100,
857857
"dmg": 100,
858858
"phy": 0,
859859
"recharge": 0,
@@ -2414,32 +2414,6 @@ const charSpecialRules = {
24142414
}
24152415
return null
24162416
},
2417-
'爱可菲': ({ weaponName, weaponAffix, charAttrs }) => {
2418-
let title = []
2419-
let particularAttr = {...usefulAttr['爱可菲']}
2420-
if (weaponName === '西风长枪' && (charAttrs?.recharge || 0) >= 230) {
2421-
title = []
2422-
title.push('西风纯辅')
2423-
particularAttr.atk = 0
2424-
particularAttr.cpct = 100
2425-
particularAttr.cdmg = 0
2426-
particularAttr.recharge = 100
2427-
particularAttr.dmg = 0
2428-
}
2429-
if (weaponName === '香韵奏者' && (charAttrs?.recharge || 0) >= 230) {
2430-
title = []
2431-
title.push('餐叉纯辅')
2432-
particularAttr.atk = 0
2433-
particularAttr.cpct = 0
2434-
particularAttr.cdmg = 0
2435-
particularAttr.recharge = 100
2436-
particularAttr.dmg = 0
2437-
}
2438-
if (title.length > 0) {
2439-
return { title: `爱可菲-${title.join('')}`, attrWeight: particularAttr, useDefaultPipeline: false }
2440-
}
2441-
return null
2442-
},
24432417
'芭芭拉': ({ charAttrs, artisSets, artifacts }) => {
24442418
if ((charAttrs?.cpct || 0) * 2 + (charAttrs?.cdmg || 0) >= 180 && ((artifacts||[]).find(a=>a.pos===3)?.mainKey||'') && (artifacts.find(a=>a.pos===3).mainKey==='dmg'||isElem(artifacts.find(a=>a.pos===3).mainKey||''))) {
24452419
return { title: '芭芭拉-暴力', attrWeight: { hp: 50, atk: 75, cpct: 100, cdmg: 100, mastery: 75, dmg: 100, recharge: 30, heal: 50 }, useDefaultPipeline: false }
@@ -2533,6 +2507,17 @@ const charSpecialRules = {
25332507
particularAttr.recharge = 100
25342508
particularAttr.dmg = 0
25352509
}
2510+
if (weaponName === '岩峰巡歌' && (charAttrs?.recharge || 0) >= 220) {
2511+
title = []
2512+
title.push('岩峰纯辅')
2513+
particularAttr.hp = 0
2514+
particularAttr.def = 100
2515+
particularAttr.mastery = 0
2516+
particularAttr.cpct = 0
2517+
particularAttr.cdmg = 0
2518+
particularAttr.recharge = 100
2519+
particularAttr.dmg = 0
2520+
}
25362521
if (title.length > 0) {
25372522
return { title: `芙宁娜-${title.join('')}`, attrWeight: particularAttr, useDefaultPipeline: false }
25382523
}
@@ -2652,18 +2637,17 @@ const charSpecialRules = {
26522637
return null
26532638
},
26542639
'玛薇卡': ({ charAttrs }) => {
2655-
let title = []
2656-
let particularAttr = {...usefulAttr['玛薇卡']}
2657-
if ((charAttrs?.mastery || 0) < 50) {
2658-
title.push('纯火/超载')
2659-
particularAttr.atk = 85
2660-
particularAttr.mastery = 0
2661-
}
2662-
if (title.length > 0) {
2663-
return { title: `玛薇卡-${title.join('')}`, attrWeight: particularAttr, useDefaultPipeline: false }
2664-
}
2665-
return null
2666-
},
2640+
let particularAttr = {...usefulAttr['玛薇卡']}
2641+
// 只有面板精通明确很低的时候才切到纯火/超载
2642+
if ((charAttrs?.mastery || 0) > 0 && (charAttrs?.mastery || 0) < 40) {
2643+
particularAttr.atk = 85
2644+
particularAttr.mastery = 0
2645+
return { title: '玛薇卡-纯火/超载', attrWeight: particularAttr, useDefaultPipeline: false }
2646+
}
2647+
// 其他情况一律按精通流处理
2648+
particularAttr.mastery = 100
2649+
return { title: '玛薇卡-精通', attrWeight: particularAttr, useDefaultPipeline: false }
2650+
},
26672651
'莫娜': ({ weaponName, weaponAffix }) => {
26682652
let title = []
26692653
let particularAttr = {...usefulAttr['莫娜']}

0 commit comments

Comments
 (0)