From 9eb7c6799f41052da22afdbe3437b14f5e3fbea7 Mon Sep 17 00:00:00 2001 From: AnonymousWMS <85045468+AnonymousWMS@users.noreply.github.com> Date: Thu, 26 Jun 2025 13:38:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A9=98=E7=A6=8F=E7=A6=8F=E8=AF=84?= =?UTF-8?q?=E5=88=86=E6=9D=83=E9=87=8D=20(#132)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update EquipScore.json 橘福福 * Update EquipScore.json --------- Co-authored-by: UCPr --- resources/map/EquipScore.json | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/resources/map/EquipScore.json b/resources/map/EquipScore.json index 497866a..1f43b53 100644 --- a/resources/map/EquipScore.json +++ b/resources/map/EquipScore.json @@ -490,5 +490,19 @@ "异常精通": 0, "异常掌控": 0, "物理属性伤害加成": 1 + }, + "橘福福": { + "生命值百分比": 0, + "攻击力百分比": 1, + "防御力百分比": 0, + "冲击力": 1, + "暴击率": 1, + "暴击伤害": 0.75, + "穿透率": 0.75, + "穿透值": 0.25, + "能量自动回复": 0.5, + "异常精通": 0, + "异常掌控": 0, + "火属性伤害加成": 1 } -} \ No newline at end of file +} From 76f23141f8a46efeb41f08c231dbca131f70f7d7 Mon Sep 17 00:00:00 2001 From: kissnavel Date: Sat, 28 Jun 2025 20:33:38 +0800 Subject: [PATCH 2/3] fix:#134 --- model/Enka/enkaApi.js | 19 ++----------------- 1 file changed, 2 insertions(+), 17 deletions(-) diff --git a/model/Enka/enkaApi.js b/model/Enka/enkaApi.js index 8383f82..4d7fbd8 100644 --- a/model/Enka/enkaApi.js +++ b/model/Enka/enkaApi.js @@ -1,5 +1,5 @@ import { Enka2Mys } from './formater.js' -import fetch from 'node-fetch' +import request from '../../utils/request.js' const EnkaApi = 'https://enka.network/api/zzz/uid/' @@ -23,7 +23,7 @@ export function parsePlayerInfo(SocialDetail = {}) { * @param {string|number} uid */ export async function refreshPanelFromEnka(uid) { - const res = await fetch(`${EnkaApi}${uid}`, { + const res = await request(`${EnkaApi}${uid}`, { method: 'GET', headers: { 'User-Agent': 'ZZZ-Plugin/UCPr', @@ -47,18 +47,3 @@ export async function refreshPanelFromEnka(uid) { panelList: Enka2Mys(panelList) } } - -// import fs from 'fs' -// const uid = 11070609 -// const res = await fetch(`${EnkaApi}${uid}`, { -// method: 'GET', -// headers: { -// 'User-Agent': 'ZZZ-Plugin/UCPr', -// } -// }) -// if (!res.ok) { -// console.log(`Enka更新面板失败：${res.status} ${res.statusText}`) -// } -// const data = await res.json() -// console.log(data) -// fs.writeFileSync('enkaPanel1.json', JSON.stringify(data, null, 2)) \ No newline at end of file From 79d0aa67730144e83a853b51d511666f56c2d6fc Mon Sep 17 00:00:00 2001 From: kissnavel Date: Sun, 29 Jun 2025 16:08:05 +0800 Subject: [PATCH 3/3] =?UTF-8?q?feat:=E8=87=AA=E5=AE=9A=E4=B9=89enkaApi?= =?UTF-8?q?=E5=9C=B0=E5=9D=80#134?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- defSet/config.yaml | 4 +++- guoba.support.js | 9 +++++++++ model/Enka/enkaApi.js | 5 ++++- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/defSet/config.yaml b/defSet/config.yaml index 00dbba9..0900cda 100644 --- a/defSet/config.yaml +++ b/defSet/config.yaml @@ -10,4 +10,6 @@ mysCode: - 1034 - 10035 # 自定义绑定设备下载url -url: https://ghproxy.mihomo.me/https://raw.githubusercontent.com/forchannot/get_device_info/main/app/build/outputs/apk/debug/app-debug.apk \ No newline at end of file +url: https://ghproxy.mihomo.me/https://raw.githubusercontent.com/forchannot/get_device_info/main/app/build/outputs/apk/debug/app-debug.apk +# 自定义enkaApi地址 +enkaApi: \ No newline at end of file diff --git a/guoba.support.js b/guoba.support.js index 82d7ef7..2842701 100644 --- a/guoba.support.js +++ b/guoba.support.js @@ -53,6 +53,15 @@ export function supportGuoba() { placeholder: '请输入绑定设备apk下载url', }, }, + { + field: 'config.enkaApi', + label: '自定义enkaApi地址', + bottomHelpMessage: '设置自定义的enkaApi地址', + component: 'Input', + componentProps: { + placeholder: '请输入enkaApi地址', + }, + }, { field: 'config.query.others', label: '查询他人信息', diff --git a/model/Enka/enkaApi.js b/model/Enka/enkaApi.js index 4d7fbd8..fd94c11 100644 --- a/model/Enka/enkaApi.js +++ b/model/Enka/enkaApi.js @@ -1,7 +1,10 @@ import { Enka2Mys } from './formater.js' import request from '../../utils/request.js' +import settings from '../../lib/settings.js' +import _ from 'lodash' -const EnkaApi = 'https://enka.network/api/zzz/uid/' +const config = settings.getConfig('config') +const EnkaApi = _.get(config, 'enkaApi') ?? 'https://enka.network/api/zzz/uid/' export function parsePlayerInfo(SocialDetail = {}) { const ProfileDetail = SocialDetail.ProfileDetail || {}