diff --git a/docker/Dockerfile b/docker/Dockerfile index 9067522..e52f55f 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -23,7 +23,7 @@ RUN export BUNDLE_FFMPEG=${BUNDLE_FFMPEG:-true} \ && export USE_PYPI_MIRROR=${USE_PYPI_MIRROR:-true} \ \ && ((test "$USE_APT_MIRROR"x = "true"x \ - && sed -i "s/deb.debian.org/mirrors.bit.edu.cn/g" /etc/apt/sources.list) || true) \ + && sed -i "s/deb.debian.org/mirrors.ustc.edu.cn/g" /etc/apt/sources.list) || true) \ && apt-get update \ && apt-get upgrade -y \ && apt-get install -y wget xz-utils dos2unix \ diff --git a/plugins/genshin/model/base.js b/plugins/genshin/model/base.js index 6f4e0e5..689ed12 100644 --- a/plugins/genshin/model/base.js +++ b/plugins/genshin/model/base.js @@ -18,7 +18,7 @@ export default class base { * @param pluResPath 插件资源路径 */ get screenData () { - let headImg = '迪希雅' + let headImg = '白术' return { saveId: this.userId, diff --git a/plugins/genshin/model/gachaLog.js b/plugins/genshin/model/gachaLog.js index 8acb6ac..2e3876c 100644 --- a/plugins/genshin/model/gachaLog.js +++ b/plugins/genshin/model/gachaLog.js @@ -588,21 +588,24 @@ export default class GachaLog extends base { return false } - if (this.role.name == '刻晴') { - let start = new Date('2021-02-17 18:00:00').getTime() - let end = new Date('2021-03-02 15:59:59').getTime() - let logTime = new Date(this.role.time).getTime() - - if (logTime < start || logTime > end) { - return false - } else { - return true + let role5join = { + '刻晴': { + start: '2021-02-17 18:00:00', + end: '2021-03-02 15:59:59' + }, + '提纳里': { + start: '2022-08-24 06:00:00', + end: '2022-09-09 17:59:59' + }, + '迪希雅': { + start: '2023-03-01 06:00:00', + end: '2023-03-21 17:59:59' } } - if (this.role.name == '提纳里') { - let start = new Date('2022-08-24 06:00:00').getTime() - let end = new Date('2022-09-09 17:59:59').getTime() + if (lodash.keys(role5join).includes(this.role.name)) { + let start = new Date(role5join[this.role.name].start).getTime() + let end = new Date(role5join[this.role.name].end).getTime() let logTime = new Date(this.role.time).getTime() if (logTime < start || logTime > end) { diff --git a/plugins/genshin/model/logCount.js b/plugins/genshin/model/logCount.js index 4cb5dab..3de796c 100644 --- a/plugins/genshin/model/logCount.js +++ b/plugins/genshin/model/logCount.js @@ -22,7 +22,7 @@ export default class LogCount extends base { ] /** 五星角色 */ - this.role5 = ['刻晴', '莫娜', '七七', '迪卢克', '琴', '提纳里'] + this.role5 = ['刻晴', '莫娜', '七七', '迪卢克', '琴', '提纳里', '迪希雅'] /** 五星武器 */ this.weapon5 = ['阿莫斯之弓', '天空之翼', '天空之卷', '天空之脊', '天空之傲', '天空之刃', '四风原典', '和璞鸢', '狼的末路', '风鹰剑'] } diff --git a/plugins/genshin/model/roleDetail.js b/plugins/genshin/model/roleDetail.js index 7277d57..3e05c7c 100644 --- a/plugins/genshin/model/roleDetail.js +++ b/plugins/genshin/model/roleDetail.js @@ -128,7 +128,7 @@ export default class RoleDetail extends base { if (lodash.random(0, 100) > 50) { bg = 3 } - } else if (['芭芭拉', '凝光', '刻晴', '琴'].includes(avatars.name)) { + } else if (['芭芭拉', '凝光', '刻晴', '琴', '菲谢尔', '迪卢克', '丽莎', '神里绫华'].includes(avatars.name)) { if (avatars.costumes && avatars.costumes.length >= 1) { bg = 3 }