From 271c766f815779f7e6827a49990b81d0088f524f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ca=28HCO=E2=82=83=29=E2=82=82?= <143723419+kaguramaisakuya@users.noreply.github.com> Date: Sat, 4 May 2024 20:59:46 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=85=91=E6=8D=A2?= =?UTF-8?q?=E7=A0=81=E6=88=AA=E6=AD=A2=E6=97=B6=E9=97=B4=E9=94=99=E8=AF=AF?= =?UTF-8?q?=20(#416)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/genshin/apps/exchange.js | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/plugins/genshin/apps/exchange.js b/plugins/genshin/apps/exchange.js index c6a713f..a1a30a2 100644 --- a/plugins/genshin/apps/exchange.js +++ b/plugins/genshin/apps/exchange.js @@ -4,7 +4,7 @@ import fetch from 'node-fetch' import MysInfo from '../model/mys/mysInfo.js' export class exchange extends plugin { - constructor () { + constructor() { super({ name: '兑换码', dsc: '前瞻直播兑换码', @@ -23,7 +23,7 @@ export class exchange extends plugin { }) } - async getCode () { + async getCode() { let reg = this.e.msg.match(/^(#|\*)?(原神|星铁|崩铁|崩三|崩坏三|崩坏3)?(直播|前瞻)?兑换码$/) this.uid = '75276550' if (reg[1] == '*' || ['星铁', '崩铁'].includes(reg[2])) { @@ -76,7 +76,7 @@ export class exchange extends plugin { await this.reply(msg) } - async getData (type) { + async getData(type) { let url = { index: `https://api-takumi.mihoyo.com/event/miyolive/index`, code: `https://api-takumi-static.mihoyo.com/event/miyolive/refreshCode?version=${this.code_ver}&time=${this.now}`, @@ -105,7 +105,7 @@ export class exchange extends plugin { } // 获取 "act_id" - async getActId () { + async getActId() { let ret = await this.getData('actId') if (ret.error || ret.retcode !== 0) { return '' @@ -123,8 +123,16 @@ export class exchange extends plugin { continue } let date = new Date(post.created_at * 1000) - date.setDate(date.getDate() + 1) - this.deadline = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()} 12:00:00` + if (this.uid == '80823548') { + date.setDate(date.getDate() + 1) + this.deadline = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()} 23:59:59` + } else if (this.uid == '73565430') { + date.setDate(date.getDate() + 5) + this.deadline = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()} 12:00:00` + } else { + date.setDate(date.getDate() + 3) + this.deadline = `${date.getFullYear()}-${date.getMonth() + 1}-${date.getDate()} 12:00:00` + } let structured_content = post.structured_content let result = structured_content.match(/{\"link\":\"https:\/\/webstatic.mihoyo.com\/bbs\/event\/live\/index.html\?act_id=(.*?)\\/) if (result) { @@ -134,7 +142,7 @@ export class exchange extends plugin { } // 兑换码使用 - async useCode () { + async useCode() { const cdkCode = this.e.msg.replace(/#(兑换码使用|cdk-u)/, '').trim() const res = await MysInfo.get(this.e, 'useCdk', { cdk: cdkCode }) if (res) { From 9df1e4c440700d6d98668fbbfda9fd62fb4f49a3 Mon Sep 17 00:00:00 2001 From: KeyPJ Date: Mon, 13 May 2024 17:41:35 +0000 Subject: [PATCH 2/4] =?UTF-8?q?!169=204.6=E4=B8=8A=E5=8D=8A=E5=8D=A1?= =?UTF-8?q?=E6=B1=A0=20*=201=20*=201=20*=20=E5=8E=9F=E7=A5=9E4.6=E4=B8=8B?= =?UTF-8?q?=20*=20=E6=98=9F=E9=93=812.2=20*=204.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/genshin/defSet/pool/11.yaml | 10 ++++++++++ plugins/genshin/defSet/pool/12.yaml | 10 ++++++++++ plugins/genshin/defSet/pool/301.yaml | 20 ++++++++++++++++++++ plugins/genshin/defSet/pool/302.yaml | 24 ++++++++++++++++++++++++ 4 files changed, 64 insertions(+) diff --git a/plugins/genshin/defSet/pool/11.yaml b/plugins/genshin/defSet/pool/11.yaml index 6b8bf7c..d8afea2 100644 --- a/plugins/genshin/defSet/pool/11.yaml +++ b/plugins/genshin/defSet/pool/11.yaml @@ -1,3 +1,13 @@ +- from: '2024-05-08 06:00:00' + to: '2024-05-29 11:59:59' + five: + - 知更鸟 + - 托帕&账账 + four: + - 三月七 + - 寒鸦 + - 雪衣 + name: 翼声纯律|落日条款 - from: '2024-04-17 12:00:00' to: '2024-05-07 14:59:59' five: diff --git a/plugins/genshin/defSet/pool/12.yaml b/plugins/genshin/defSet/pool/12.yaml index 9945e2d..eb5eeee 100644 --- a/plugins/genshin/defSet/pool/12.yaml +++ b/plugins/genshin/defSet/pool/12.yaml @@ -1,3 +1,13 @@ +- from: '2024-05-08 06:00:00' + to: '2024-05-29 11:59:59' + five: + - 夜色流光溢彩 + - 烦恼着，幸福着 + four: + - 无边曼舞 + - 论剑 + - 此时恰好 + name: 流光定影|溯回忆象 - from: '2024-04-17 12:00:00' to: '2024-05-07 14:59:59' five: diff --git a/plugins/genshin/defSet/pool/301.yaml b/plugins/genshin/defSet/pool/301.yaml index da67301..afb4619 100644 --- a/plugins/genshin/defSet/pool/301.yaml +++ b/plugins/genshin/defSet/pool/301.yaml @@ -1,3 +1,23 @@ +- from: '2024-05-14 18:00:00' + to: '2024-06-04 14:59:59' + five: + - 流浪者 + - 白术 + four: + - 莱依拉 + - 珐露珊 + - 北斗 + name: 久世浮倾|遵生合和 +- from: '2024-04-24 06:00:00' + to: '2024-05-14 17:59:59' + five: + - 阿蕾奇诺 + - 林尼 + four: + - 菲米尼 + - 琳妮特 + - 香菱 + name: 炉边烬影|光与影的戏术 - from: '2024-04-02 18:00:00' to: '2024-04-23 14:59:59' five: diff --git a/plugins/genshin/defSet/pool/302.yaml b/plugins/genshin/defSet/pool/302.yaml index 2f778a6..1ca07c2 100644 --- a/plugins/genshin/defSet/pool/302.yaml +++ b/plugins/genshin/defSet/pool/302.yaml @@ -1,3 +1,27 @@ +- from: '2024-05-14 18:00:00' + to: '2024-06-04 14:59:59' + five: + - 图莱杜拉的回忆 + - 碧落之珑 + four: + - 勘探钻机 + - 测距规 + - 西风剑 + - 雨裁 + - 祭礼残章 + name: 神铸赋形 +- from: '2024-04-24 06:00:00' + to: '2024-05-14 17:59:59' + five: + - 赤月之形 + - 最初的大魔术 + four: + - 船坞长剑 + - 便携动力锯 + - 匣里灭辰 + - 昭心 + - 西风猎弓 + name: 神铸赋形 - from: '2024-04-02 18:00:00' to: '2024-04-23 14:59:59' five: From 189a4315a1db9b7b8dd69f3f98e931b87b82ae9f Mon Sep 17 00:00:00 2001 From: kissnavel Date: Mon, 13 May 2024 17:42:02 +0000 Subject: [PATCH 3/4] =?UTF-8?q?!171=20=E6=B7=BB=E5=8A=A0=E5=9B=BD=E9=99=85?= =?UTF-8?q?=E6=9C=8D=E6=94=AF=E6=8C=81=20*=20=E4=BF=AE=E6=94=B9=E5=88=A4?= =?UTF-8?q?=E6=96=AD=20*=20=E6=9B=B4=E6=96=B0=E6=98=9F=E9=93=81fp=E9=81=BF?= =?UTF-8?q?=E5=BC=80=E9=AA=8C=E8=AF=81=E7=A0=81=20*=20=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E6=9C=8D=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- plugins/genshin/model/mys/MysUser.js | 7 +- plugins/genshin/model/mys/apiTool.js | 116 +++++++++++++++++---------- plugins/genshin/model/mys/mysApi.js | 8 +- plugins/genshin/model/user.js | 13 ++- 4 files changed, 92 insertions(+), 52 deletions(-) diff --git a/plugins/genshin/model/mys/MysUser.js b/plugins/genshin/model/mys/MysUser.js index d77dada..f7e4957 100644 --- a/plugins/genshin/model/mys/MysUser.js +++ b/plugins/genshin/model/mys/MysUser.js @@ -348,7 +348,7 @@ export default class MysUser extends BaseModel { let ck = this.ck let url = { mys: 'https://api-takumi.mihoyo.com/binding/api/getUserGameRolesByCookie', - hoyolab: 'https://api-os-takumi.mihoyo.com/binding/api/getUserGameRolesByCookie' + hoyolab: 'https://sg-public-api.hoyolab.com/binding/api/getUserGameRolesByCookie' } let res = await fetch(url[serv], { method: 'get', headers: { Cookie: ck } }) @@ -373,7 +373,7 @@ export default class MysUser extends BaseModel { Connection: 'keep-alive', Host: 'bbs-api.mihoyo.com', Origin: 'https://m.bbs.mihoyo.com', - Referer: ' https://m.bbs.mihoyo.com/' + Referer: 'https://m.bbs.mihoyo.com/' } }) if (!res.ok) return res @@ -395,7 +395,6 @@ export default class MysUser extends BaseModel { return cache[game] } - // 初始化数据 async initDB(db = false) { if (this.db && !db) { @@ -549,4 +548,4 @@ export default class MysUser extends BaseModel { let uids = this.uids[gameKey] return uids.includes(uid + '') } -} +} \ No newline at end of file diff --git a/plugins/genshin/model/mys/apiTool.js b/plugins/genshin/model/mys/apiTool.js index 0926648..b31ad21 100644 --- a/plugins/genshin/model/mys/apiTool.js +++ b/plugins/genshin/model/mys/apiTool.js @@ -21,18 +21,47 @@ export default class apiTool { } } - getUrlMap = (data = {}) => { - let host, hostRecord + let host, hostRecord, hostPublicData if (['cn_gf01', 'cn_qd01', 'prod_gf_cn', 'prod_qd_cn'].includes(this.server)) { host = 'https://api-takumi.mihoyo.com/' hostRecord = 'https://api-takumi-record.mihoyo.com/' - } else if (['os_usa', 'os_euro', 'os_asia', 'os_cht'].includes(this.server)) { - host = 'https://api-os-takumi.mihoyo.com/' - hostRecord = 'https://bbs-api-os.mihoyo.com/' + hostPublicData = 'https://public-data-api.mihoyo.com/' + } else if (/os_|official/.test(this.server)) { + host = 'https://sg-public-api.hoyolab.com/' + hostRecord = 'https://bbs-api-os.hoyolab.com/' + hostPublicData = 'https://sg-public-data-api.hoyoverse.com/' } let urlMap = { genshin: { + /** 体力接口fp参数用于避开验证码 */ + ...(['cn_gf01', 'cn_qd01'].includes(this.server) ? { + getFp: { + url: `${hostPublicData}device-fp/api/getFp`, + body: { + seed_id: data.seed_id, + device_id: data.deviceId.toUpperCase(), + platform: '1', + seed_time: new Date().getTime() + '', + ext_fields: `{"proxyStatus":"0","accelerometer":"-0.159515x-0.830887x-0.682495","ramCapacity":"3746","IDFV":"${data.deviceId.toUpperCase()}","gyroscope":"-0.191951x-0.112927x0.632637","isJailBreak":"0","model":"iPhone12,5","ramRemain":"115","chargeStatus":"1","networkType":"WIFI","vendor":"--","osVersion":"17.0.2","batteryStatus":"50","screenSize":"414×896","cpuCores":"6","appMemory":"55","romCapacity":"488153","romRemain":"157348","cpuType":"CPU_TYPE_ARM64","magnetometer":"-84.426331x-89.708435x-37.117889"}`, + app_name: 'bbs_cn', + device_fp: '38d7ee834d1e9' + } + } + } : { + getFp: { + url: `${hostPublicData}device-fp/api/getFp`, + body: { + seed_id: data.seed_id, + device_id: data.deviceId.toUpperCase(), + platform: '1', + seed_time: new Date().getTime() + '', + ext_fields: `{"proxyStatus":"0","accelerometer":"-0.159515x-0.830887x-0.682495","ramCapacity":"3746","IDFV":"${data.deviceId.toUpperCase()}","gyroscope":"-0.191951x-0.112927x0.632637","isJailBreak":"0","model":"iPhone12,5","ramRemain":"115","chargeStatus":"1","networkType":"WIFI","vendor":"--","osVersion":"17.0.2","batteryStatus":"50","screenSize":"414×896","cpuCores":"6","appMemory":"55","romCapacity":"488153","romRemain":"157348","cpuType":"CPU_TYPE_ARM64","magnetometer":"-84.426331x-89.708435x-37.117889"}`, + app_name: 'hk4e_global', + device_fp: '38d7ee834d1e9' + } + } + }), /** 首页宝箱 */ index: { url: `${hostRecord}game_record/app/genshin/api/index`, @@ -106,22 +135,46 @@ export default class apiTool { useCdk: { url: 'PLACE_HOLDER', query: null - }, - /** 体力接口fp参数用于避开验证码 */ - getFp: { - url: `https://public-data-api.mihoyo.com/device-fp/api/getFp`, - body: { - seed_id: data.seed_id, - device_id: data.deviceId.toUpperCase(), - platform: '1', - seed_time: new Date().getTime() + '', - ext_fields: `{"proxyStatus":"0","accelerometer":"-0.159515x-0.830887x-0.682495","ramCapacity":"3746","IDFV":"${data.deviceId.toUpperCase()}","gyroscope":"-0.191951x-0.112927x0.632637","isJailBreak":"0","model":"iPhone12,5","ramRemain":"115","chargeStatus":"1","networkType":"WIFI","vendor":"--","osVersion":"17.0.2","batteryStatus":"50","screenSize":"414×896","cpuCores":"6","appMemory":"55","romCapacity":"488153","romRemain":"157348","cpuType":"CPU_TYPE_ARM64","magnetometer":"-84.426331x-89.708435x-37.117889"}`, - app_name: 'bbs_cn', - device_fp: '38d7ee834d1e9' - }, } }, honkaisr: { + ...(['prod_gf_cn', 'prod_qd_cn'].includes(this.server) ? { + UserGame: { + url: `${host}binding/api/getUserGameRolesByCookie`, + query: `game_biz=hkrpg_cn` + }, + /** 体力接口fp参数用于避开验证码 */ + getFp: { + url: `${hostPublicData}device-fp/api/getFp`, + body: { + seed_id: data.seed_id, + device_id: data.deviceId.toUpperCase(), + platform: '1', + seed_time: new Date().getTime() + '', + ext_fields: `{"proxyStatus":"0","accelerometer":"-0.159515x-0.830887x-0.682495","ramCapacity":"3746","IDFV":"${data.deviceId.toUpperCase()}","gyroscope":"-0.191951x-0.112927x0.632637","isJailBreak":"0","model":"iPhone12,5","ramRemain":"115","chargeStatus":"1","networkType":"WIFI","vendor":"--","osVersion":"17.0.2","batteryStatus":"50","screenSize":"414×896","cpuCores":"6","appMemory":"55","romCapacity":"488153","romRemain":"157348","cpuType":"CPU_TYPE_ARM64","magnetometer":"-84.426331x-89.708435x-37.117889"}`, + app_name: 'bbs_cn', + device_fp: '38d7ee834d1e9' + } + } + } : { + UserGame: { + url: `${host}binding/api/getUserGameRolesByCookie`, + query: `game_biz=hkrpg_global` + }, + /** 体力接口fp参数用于避开验证码 */ + getFp: { + url: `${hostPublicData}device-fp/api/getFp`, + body: { + seed_id: data.seed_id, + device_id: data.deviceId.toUpperCase(), + platform: '1', + seed_time: new Date().getTime() + '', + ext_fields: `{"proxyStatus":"0","accelerometer":"-0.159515x-0.830887x-0.682495","ramCapacity":"3746","IDFV":"${data.deviceId.toUpperCase()}","gyroscope":"-0.191951x-0.112927x0.632637","isJailBreak":"0","model":"iPhone12,5","ramRemain":"115","chargeStatus":"1","networkType":"WIFI","vendor":"--","osVersion":"17.0.2","batteryStatus":"50","screenSize":"414×896","cpuCores":"6","appMemory":"55","romCapacity":"488153","romRemain":"157348","cpuType":"CPU_TYPE_ARM64","magnetometer":"-84.426331x-89.708435x-37.117889"}`, + app_name: 'hkrpg_global', + device_fp: '38d7ee834d1e9' + } + } + }), /** 首页宝箱 */ index: { url: `${hostRecord}game_record/app/hkrpg/api/index`, @@ -131,10 +184,6 @@ export default class apiTool { url: `${hostRecord}game_record/app/hkrpg/api/role/basicInfo`, query: `role_id=${this.uid}&server=${this.server}` }, - UserGame: { - url: `${host}binding/api/getUserGameRolesByCookie`, - query: `game_biz=hkrpg_cn` - }, /** 深渊 （混沌回忆） */ spiralAbyss: { url: `${hostRecord}game_record/app/hkrpg/api/challenge`, @@ -144,25 +193,10 @@ export default class apiTool { url: `${hostRecord}game_record/app/hkrpg/api/avatar/info`, query: `need_wiki=true&role_id=${this.uid}&server=${this.server}` }, - /** 体力接口fp参数用于避开验证码 */ - getFp: { - url: `https://public-data-api.mihoyo.com/device-fp/api/getFp`, - body: { - seed_id: data.seed_id, - device_id: data.deviceId, - platform: '1', - seed_time: new Date().getTime() + '', - ext_fields: '{"proxyStatus":"0","accelerometer":"-0.159515x-0.830887x-0.682495","ramCapacity":"3746","IDFV":"8F4E403B-4C28-4F7F-B740-2DD317948B8A","gyroscope":"-0.191951x-0.112927x0.632637","isJailBreak":"0","model":"iPhone12,5","ramRemain":"115","chargeStatus":"1","networkType":"WIFI","vendor":"--","osVersion":"17.0.2","batteryStatus":"50","screenSize":"414×896","cpuCores":"6","appMemory":"55","romCapacity":"488153","romRemain":"157348","cpuType":"CPU_TYPE_ARM64","magnetometer":"-84.426331x-89.708435x-37.117889"}', - app_name: 'bbs_cn', - device_fp: '38d7ee834d1e9' - }, - }, - /** - * 开拓阅历接口 - */ + /** 开拓阅历接口 */ ys_ledger: { url: `${host}event/srledger/month_info`, - query: `region=${this.server}&uid=${this.uid}&month=${data.month}` + query: `lang=zh-cn®ion=${this.server}&uid=${this.uid}&month=${data.month}` }, /** 角色详情 */ character: { @@ -198,11 +232,11 @@ export default class apiTool { urlMap.genshin.blueprint.query = `share_code=${data.share_code}®ion=${this.server}&lang=zh-cn` urlMap.genshin.blueprintCompute.url = 'https://sg-public-api.hoyolab.com/event/calculateos/furniture/compute' urlMap.genshin.blueprintCompute.body = { lang: 'zh-cn', ...data.body } - urlMap.genshin.ys_ledger.url = 'https://hk4e-api-os.mihoyo.com/event/ysledgeros/month_info'// 支持了国际服札记 + urlMap.genshin.ys_ledger.url = 'https://sg-hk4e-api.hoyolab.com/event/ysledgeros/month_info'// 支持了国际服札记 urlMap.genshin.ys_ledger.query = `lang=zh-cn&month=${data.month}&uid=${this.uid}®ion=${this.server}` urlMap.genshin.useCdk.url = 'https://sg-hk4e-api.hoyoverse.com/common/apicdkey/api/webExchangeCdkey' urlMap.genshin.useCdk.query = `uid=${this.uid}®ion=${this.server}&lang=zh-cn&cdkey=${data.cdk}&game_biz=hk4e_global` } return urlMap[this.game] } -} +} \ No newline at end of file diff --git a/plugins/genshin/model/mys/mysApi.js b/plugins/genshin/model/mys/mysApi.js index 8db4c00..b6c91b7 100644 --- a/plugins/genshin/model/mys/mysApi.js +++ b/plugins/genshin/model/mys/mysApi.js @@ -141,7 +141,7 @@ export default class MysApi { const cn = { app_version: '2.40.1', User_Agent: `Mozilla/5.0 (Linux; Android 12; ${this.device}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/99.0.4844.73 Mobile Safari/537.36 miHoYoBBS/2.40.1`, - client_type: 5, + client_type: '5', Origin: 'https://webstatic.mihoyo.com', X_Requested_With: 'com.mihoyo.hyperion', Referer: 'https://webstatic.mihoyo.com' @@ -155,7 +155,7 @@ export default class MysApi { Referer: 'https://webstatic-sea.hoyolab.com' } let client - if (this.server.startsWith('os')) { + if (/os_|official/.test(this.server)) { client = os } else { client = cn @@ -204,7 +204,7 @@ export default class MysApi { if (!proxyAddress) return null if (proxyAddress === 'http://0.0.0.0:0') return null - if (!this.server.startsWith('os')) return null + if (!/os_|official/.test(this.server)) return null if (HttpsProxyAgent === '') { HttpsProxyAgent = await import('https-proxy-agent').catch((err) => { @@ -229,4 +229,4 @@ export default class MysApi { } return result } -} +} \ No newline at end of file diff --git a/plugins/genshin/model/user.js b/plugins/genshin/model/user.js index 29568e5..1cf7a2b 100644 --- a/plugins/genshin/model/user.js +++ b/plugins/genshin/model/user.js @@ -133,7 +133,7 @@ export default class User extends base { '【#体力】查询当前树脂', '【#原石】查看原石札记', '【#原石统计】原石统计数据', - '【#练度统计】技能统计列表', + '【#练度统计】角色列表数据', '【#面板】【#更新面板】面板信息' ) button.push([ @@ -155,13 +155,20 @@ export default class User extends base { '星穹铁道支持：', '【*uid】当前绑定ck uid列表', '【*删除ck】删除当前绑定ck', - '【*体力】体力信息', + '【*体力】查询当前开拓力', + '【*星琼】查看星琼月历', + '【*星琼统计】星琼统计数据', + '【*练度统计】角色列表数据', '【*面板】【*更新面板】面板信息' ) button.push([ { text: '*uid', callback: '*uid' }, { text: '*删除ck', callback: '*删除ck' }, { text: '*体力', callback: '*体力' } + ], [ + { text: '*星琼', callback: '*星琼' }, + { text: '*星琼统计', callback: '*星琼统计' }, + { text: '*练度统计', callback: '*练度统计' } ], [ { text: '*面板', callback: '*面板' }, { text: '*更新面板', callback: '*更新面板' } @@ -653,4 +660,4 @@ export default class User extends base { `#绑定主用户[${id}]`].join('\n')) } } -} +} \ No newline at end of file From 37241496ac0d3ed75f21afef1d7fcf96a701dd5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=F0=9F=8C=8C?= Date: Sat, 18 May 2024 20:21:01 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=94=99=E8=AF=AF=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- trss.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trss.js b/trss.js index 4a3eca7..9256eae 100644 --- a/trss.js +++ b/trss.js @@ -52,9 +52,9 @@ const qq = readYaml("config/config/qq.yaml") exec("git remote add trss https://gitee.com/TimeRainStarSky/Yunzai") exec("git fetch trss main") -exec("git reset --hard") exec("git clean -df") mv("config/config", "config/config_miao") +exec("git reset --hard") exec("git checkout --track trss/main") rm("plugins/ICQQ-Plugin") exec("git clone --depth 1 --single-branch https://gitee.com/TimeRainStarSky/Yunzai-ICQQ-Plugin plugins/ICQQ-Plugin")