merge latest -> main

2024-04-05 20:56:45 +08:00 · 2024-04-05 20:56:45 +08:00 · 0a63321f2a
commit 0a63321f2a
parent e7abb5c390
2 changed files with 1149 additions and 967 deletions
--- a/assets/zh.json
+++ b/assets/zh.json
@ -140,7 +140,7 @@
    "HP": "HP",
    "detail": " 攻 [] 防 [] 速 [] 敏 [] 魔 [] 抗 [] 智 []",
    "inputTitle": "名字竞技场",
-    "inputPlaceholder": "每行输入一个名字\n\n组队对战时用空行隔开组队\n\n修改by shenjackyuanjie",
+    "inputPlaceholder": "每行输入一个名字\n\n组队对战时用空行隔开组队\n\n修改by shenjackyuanjie&超导体元素",
    "startFight": "开 始",
    "closeTitle": "关闭",
    "fastTitle": "快进",
--- a/md5.js
+++ b/md5.js