PaiGramTeam/miao-plugin
3
0
Fork 0
mirror of https://github.com/yoimiya-kokomi/miao-plugin.git synced 2024-11-25 09:27:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Kokomi 2024-05-21 03:17:11 +08:00
commit dffe97e158
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
apps/wiki/Calendar.js
View File

@ -88,8 +88,7 @@ let Cal = {
annTime = [vTime, timeRet[0]] annTime = [vTime, timeRet[0]]
} }
} }
} } else if (/\d\.\d版本期间持续开放/.test(content)) {
if (/\d\.\d版本期间持续开放/.test(content)) {
let vRet = /(\d\.\d)版本期间持续开放/.exec(content) let vRet = /(\d\.\d)版本期间持续开放/.exec(content)
let vTime = '' let vTime = ''
if (vRet && vRet[1] && versionTime[vRet[1]]) { if (vRet && vRet[1] && versionTime[vRet[1]]) {
@ -101,6 +100,8 @@ let Cal = {
let format = 'YYYY-MM-DD HH:mm:ss' let format = 'YYYY-MM-DD HH:mm:ss'
let versionLastDay = moment(vTime, format).add(42, 'days').hours(6).format(format) let versionLastDay = moment(vTime, format).add(42, 'days').hours(6).format(format)
annTime = [vTime, versionLastDay] annTime = [vTime, versionLastDay]
} else if (/后永久开放/.test(content)) {
annTime = [timeRet[1], '2099/01/01 00:00:00']
} }
if (annTime.length === 2) { if (annTime.length === 2) {
timeMap[annId] = { timeMap[annId] = {

2
apps/wiki/CalendarSr.js
View File

@ -141,7 +141,7 @@ let CalSr = {
let title2 = '「虚构叙事」' let title2 = '「虚构叙事」'
let exchange = false let exchange = false
let diff = newAbyssStart.diff(abyss0Start, 'days') let diff = newAbyssStart.diff(abyss0Start, 'days')
if (diff >= 0 && diff % 28 === 0) { if (diff % 28 === 0) {
exchange = true exchange = true
} }
if (exchange) { if (exchange) {

2
models/Player.js
View File

@ -210,7 +210,7 @@ export default class Player extends Base {
if (this.isSr) { if (this.isSr) {
// 兼容处理开拓者的情况 // 兼容处理开拓者的情况
if (char.isTrailblazer && !create) { if (char.isTrailblazer && !create) {
switch (id) { switch (id * 1) {
case 8001: case 8001:
id = avatars['8001'] ? 8001 : 8002 id = avatars['8001'] ? 8001 : 8002
break break