diff --git a/plugins/genshin/defSet/gacha/pool.yaml b/plugins/genshin/defSet/gacha/pool.yaml index d45662a..30cc4fc 100644 --- a/plugins/genshin/defSet/gacha/pool.yaml +++ b/plugins/genshin/defSet/gacha/pool.yaml @@ -1,3 +1,21 @@ +- up4: + - 重云 + - 托马 + - 多莉 + up5: + - 莱欧斯利 + up5_2: + - 温迪 + weapon5: + - 金流监督 + - 终末嗟叹之诗 + weapon4: + - 勘探钻机 + - 测距规 + - 西风剑 + - 雨裁 + - 昭心 + endTime: "2023-11-07 14:59:59" - up4: - 菲谢尔 - 行秋 diff --git a/plugins/genshin/defSet/pool/301.yaml b/plugins/genshin/defSet/pool/301.yaml index 96bdb0d..71f532f 100644 --- a/plugins/genshin/defSet/pool/301.yaml +++ b/plugins/genshin/defSet/pool/301.yaml @@ -1,3 +1,13 @@ +- from: '2023-10-17 18:00:00' + to: '2023-11-07 14:59:59' + five: + - 莱欧斯利 + - 温迪 + four: + - 重云 + - 托马 + - 多莉 + name: 劫中泛滥|杯装之诗 - from: '2023-09-27 06:00:00' to: '2023-10-17 17:59:59' five: diff --git a/plugins/genshin/defSet/pool/302.yaml b/plugins/genshin/defSet/pool/302.yaml index 88bacb7..c12df4e 100644 --- a/plugins/genshin/defSet/pool/302.yaml +++ b/plugins/genshin/defSet/pool/302.yaml @@ -1,3 +1,15 @@ +- from: '2023-10-17 18:00:00' + to: '2023-11-07 14:59:59' + five: + - 金流监督 + - 终末嗟叹之诗 + four: + - 勘探钻机 + - 测距规 + - 西风剑 + - 雨裁 + - 昭心 + name: 神铸赋形 - from: '2023-09-27 06:00:00' to: '2023-10-17 17:59:59' five: diff --git a/plugins/genshin/defSet/role/name.yaml b/plugins/genshin/defSet/role/name.yaml index e584036..6537072 100644 --- a/plugins/genshin/defSet/role/name.yaml +++ b/plugins/genshin/defSet/role/name.yaml @@ -716,6 +716,10 @@ - 莱依菈 - 来依菈 - 来依拉 + - 莱伊拉 + - 莱伊菈 + - 来伊拉 + - 来伊菈 - 不眠不醒不可思议 10000075: - 流浪者 @@ -861,8 +865,11 @@ - 监狱长 - 狱长 - 欧拉欧拉 + - 空条承太郎 + - 承太郎 - 白金之星 - 冰拳 + - 厂长 10000087: - 那维莱特 - Neuvillette @@ -870,6 +877,7 @@ - 那维来特 - 那维莱獭 - 那维来獭 + - 那维 - 审判官 - 最高审判官 - 美露莘爸爸 diff --git a/plugins/genshin/model/mys/apiTool.js b/plugins/genshin/model/mys/apiTool.js index 8e1daf0..9adb221 100644 --- a/plugins/genshin/model/mys/apiTool.js +++ b/plugins/genshin/model/mys/apiTool.js @@ -150,10 +150,10 @@ export default class apiTool { body: { seed_id: data.seed_id, device_id: data.deviceId, - platform: '5', + platform: '1', seed_time: new Date().getTime() + '', - ext_fields: '{"userAgent":"Mozilla/5.0 (iPhone; CPU iPhone OS 16_2 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) miHoYoBBS/2.40.1","browserScreenSize":281520,"maxTouchPoints":5,"isTouchSupported":true,"browserLanguage":"zh-CN","browserPlat":"iPhone","browserTimeZone":"Asia/Shanghai","webGlRender":"Apple GPU","webGlVendor":"Apple Inc.","numOfPlugins":0,"listOfPlugins":"unknown","screenRatio":3,"deviceMemory":"unknown","hardwareConcurrency":"4","cpuClass":"unknown","ifNotTrack":"unknown","ifAdBlock":0,"hasLiedResolution":1,"hasLiedOs":0,"hasLiedBrowser":0}', - app_name: 'account_cn', + 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' }, }, diff --git a/plugins/other/update.js b/plugins/other/update.js index 5328f96..a055e67 100644 --- a/plugins/other/update.js +++ b/plugins/other/update.js @@ -19,11 +19,11 @@ export class update extends plugin { priority: 4000, rule: [ { - reg: '^#更新日志', + reg: '^#更新日志$', fnc: 'updateLog' }, { - reg: '^#(强制)?更新', + reg: '^#(强制)?更新$', fnc: 'update' }, {