diff --git a/apps/wiki/Calendar.js b/apps/wiki/Calendar.js index fc00cd8f..ed223a54 100644 --- a/apps/wiki/Calendar.js +++ b/apps/wiki/Calendar.js @@ -88,8 +88,7 @@ let Cal = { annTime = [vTime, timeRet[0]] } } - } - if (/\d\.\d版本期间持续开放/.test(content)) { + } else if (/\d\.\d版本期间持续开放/.test(content)) { let vRet = /(\d\.\d)版本期间持续开放/.exec(content) let vTime = '' if (vRet && vRet[1] && versionTime[vRet[1]]) { @@ -101,6 +100,8 @@ let Cal = { let format = 'YYYY-MM-DD HH:mm:ss' let versionLastDay = moment(vTime, format).add(42, 'days').hours(6).format(format) annTime = [vTime, versionLastDay] + } else if (/后永久开放/.test(content)) { + annTime = [timeRet[1], '2099/01/01 00:00:00'] } if (annTime.length === 2) { timeMap[annId] = { diff --git a/apps/wiki/CalendarSr.js b/apps/wiki/CalendarSr.js index d7de7351..0a83ff4f 100644 --- a/apps/wiki/CalendarSr.js +++ b/apps/wiki/CalendarSr.js @@ -141,7 +141,7 @@ let CalSr = { let title2 = '「虚构叙事」' let exchange = false let diff = newAbyssStart.diff(abyss0Start, 'days') - if (diff >= 0 && diff % 28 === 0) { + if (diff % 28 === 0) { exchange = true } if (exchange) { diff --git a/models/Player.js b/models/Player.js index 4302096a..1cf2122a 100644 --- a/models/Player.js +++ b/models/Player.js @@ -210,7 +210,7 @@ export default class Player extends Base { if (this.isSr) { // 兼容处理开拓者的情况 if (char.isTrailblazer && !create) { - switch (id) { + switch (id * 1) { case 8001: id = avatars['8001'] ? 8001 : 8002 break