From e1ec3732d075b89e18754c9803d34772255afd25 Mon Sep 17 00:00:00 2001
From: Willis <569869783@qq.com>
Date: Fri, 14 Apr 2023 17:09:42 +0000
Subject: [PATCH 1/2] =?UTF-8?q?update=20docker/Dockerfile.=20=E4=BD=BF?=
 =?UTF-8?q?=E7=94=A8=E4=B8=AD=E5=9B=BD=E7=A7=91=E6=8A=80=E5=A4=A7=E5=AD=A6?=
 =?UTF-8?q?=E6=BA=90=E4=B9=8B=E5=89=8D=E7=9A=84bit=E6=BA=90=E6=9C=89?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E5=9C=A8=E7=88=B1=E9=80=9F=E7=89=B9nas?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 \

From 7e86667cb405928e3c267eb6474f82fa083202ff Mon Sep 17 00:00:00 2001
From: Rrrrrrray <28804884+Rrrrrrray@users.noreply.github.com>
Date: Sun, 16 Apr 2023 21:18:42 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix=EF=BC=9A=E4=BA=91=E5=B4=BD=E6=8A=BD?=
 =?UTF-8?q?=E5=8D=A1=E8=AE=B0=E5=BD=95=E8=BF=AA=E5=B8=8C=E9=9B=85=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 plugins/genshin/model/base.js       |  2 +-
 plugins/genshin/model/gachaLog.js   | 27 +++++++++++++++------------
 plugins/genshin/model/logCount.js   |  2 +-
 plugins/genshin/model/roleDetail.js |  2 +-
 4 files changed, 18 insertions(+), 15 deletions(-)

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
       }