Merge branch 'master' into bugfix

This commit is contained in:
dy 2023-12-30 10:27:48 +08:00
commit 35ea01f3aa

View File

@ -54,8 +54,8 @@
"undefined": "游轮竞技第1名获得解锁后攻击加成+1%", "undefined": "游轮竞技第1名获得解锁后攻击加成+1%",
"img": "txk_016", "img": "txk_016",
"cond": [ "cond": [
"time", "jjc_rank",
-1 1
], ],
"intr": "playerheadFrame_des_4", "intr": "playerheadFrame_des_4",
"sort": 4, "sort": 4,