From 8bdf84e19f822d2bbc8a631769cb93162b4f11e1 Mon Sep 17 00:00:00 2001
From: kaguramaisakuya <1657974606@qq.com>
Date: Tue, 20 Aug 2024 20:32:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=B1=E6=B8=8A=E5=8E=BB=E9=99=A4=E4=B8=8A?=
 =?UTF-8?q?=E4=B8=8B=E5=8D=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/wiki/Calendar.js                 | 6 ++----
 models/Abyss.js                       | 2 +-
 resources/meta-gs/character/data.json | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/apps/wiki/Calendar.js b/apps/wiki/Calendar.js
index 50f0aa98..7759af00 100644
--- a/apps/wiki/Calendar.js
+++ b/apps/wiki/Calendar.js
@@ -192,10 +192,8 @@ let Cal = {
     let next = now.add(1, 'M').format(f)
     let nextM = now.format('MMMM')
 
-    check.push([moment(`${last}-16 04:00:00`), moment(`${curr}-01 03:59:59`), lastM + '下半'])
-    check.push([moment(`${curr}-01 04:00:00`), moment(`${curr}-16 03:59:59`), currM + '上半'])
-    check.push([moment(`${curr}-16 04:00:00`), moment(`${next}-01 03:59:59`), currM + '下半'])
-    check.push([moment(`${next}-01 04:00:00`), moment(`${next}-16 03:59:59`), nextM + '上半'])
+    check.push([moment(`${last}-16 04:00:00`), moment(`${curr}-16 03:59:59`), lastM])
+    check.push([moment(`${curr}-16 04:00:00`), moment(`${next}-16 03:59:59`), currM])
 
     let ret = []
     lodash.forEach(check, (ds) => {
diff --git a/models/Abyss.js b/models/Abyss.js
index 8e96731d..0eb0f57a 100644
--- a/models/Abyss.js
+++ b/models/Abyss.js
@@ -58,7 +58,7 @@ export default class Abyss extends Base {
       stat[dst] = Data.getData(data[key] ? data[key][0] : [], keys)
     })
     let st = moment(new Date(data.start_time * 1000))
-    this.schedule = st.format('M') + '月' + (st.format('D') * 1 > 1 ? '下半' : '上半')
+    this.schedule = st.format('M') + '月'
     this.maxFloor = data.max_floor
     this.total = data.total_battle_times
     this.time = moment().format('MM-DD HH:mm:ss')
diff --git a/resources/meta-gs/character/data.json b/resources/meta-gs/character/data.json
index b37e8f6a..be0eae66 100644
--- a/resources/meta-gs/character/data.json
+++ b/resources/meta-gs/character/data.json
@@ -1505,7 +1505,7 @@
   "10000099": {
     "id": 10000099,
     "name": "艾梅莉埃",
-    "abbr": "艾梅莉埃",
+    "abbr": "艾梅",
     "star": 5,
     "elem": "dendro",
     "weapon": "polearm",