Merge branch 'master' into develop

# Conflicts: # src/data/updateLog.json
2025-05-23 19:35:24 +00:00 · 2025-03-20 17:13:38 +08:00 · 2025-03-20 17:13:38 +08:00 · b951e0ea5e
commit b951e0ea5e
parent a14b9dd1dc 5c6ed57727
2 changed files with 9 additions and 2 deletions
--- a/src/data/Shikigami.json
+++ b/src/data/Shikigami.json
@ -146,12 +146,12 @@
    },
    {
        "avatar": "/assets/Shikigami/sp/551.png",
-        "name": "孔雀明王",
+        "name": "寻森小鹿男",
        "rarity": "SP"
    },
    {
        "avatar": "/assets/Shikigami/ssr/550.png",
-        "name": "八岐大蛇",
+        "name": "孔雀明王",
        "rarity": "SSR"
    },
    {
--- a/src/data/updateLog.json
+++ b/src/data/updateLog.json
@ -6,6 +6,13 @@
      "增加式神搜索功能"
    ]
  },
+  {
+    "version": "2.0.3",
+    "date": "2025-03-20",
+    "changes": [
+      "修复寻森小鹿男，孔雀明王的名称显示"
+    ]
+  },
  {
    "version": "2.0.2",
    "date": "2025-03-19",