Merge branch 'master' into develop

# Conflicts:
#	src/data/updateLog.json
pull/5/head
rookie4show 3 weeks ago
commit b951e0ea5e
  1. 4
      src/data/Shikigami.json
  2. 7
      src/data/updateLog.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"
},
{

@ -6,6 +6,13 @@
"增加式神搜索功能"
]
},
{
"version": "2.0.3",
"date": "2025-03-20",
"changes": [
"修复寻森小鹿男,孔雀明王的名称显示"
]
},
{
"version": "2.0.2",
"date": "2025-03-19",

Loading…
Cancel
Save