Merge branch 'master' into bugfix

Merge branch 'bugfix' into release
Merge branch 'feature/json' into release
2023-12-30 10:27:48 +08:00 · 2023-12-29 19:42:58 +08:00 · 2023-12-29 19:01:28 +08:00 · 2023-12-29 19:01:18 +08:00 · 2023-12-29 16:51:21 +08:00
1 changed files with 2 additions and 2 deletions
--- a/src/json/playerHeadFrame.json
+++ b/src/json/playerHeadFrame.json
@ -54,8 +54,8 @@
    "undefined": "游轮竞技第1名获得，解锁后攻击加成+1%",
    "img": "txk_016",
    "cond": [
-      "time",
-      -1
+      "jjc_rank",
+      1
    ],
    "intr": "playerheadFrame_des_4",
    "sort": 4,
Author	SHA1	Message	Date
dy	35ea01f3aa	Merge branch 'master' into bugfix	2023-12-30 10:27:48 +08:00
dy	6be02bee61	Merge branch 'bugfix' into release	2023-12-29 19:42:58 +08:00
dy	fc426a283b	Merge branch 'feature/json' into release	2023-12-29 19:01:28 +08:00
dy	1f3adac088	json	2023-12-29 19:01:18 +08:00
dy	0dede0ac47	cehua json	2023-12-29 16:51:21 +08:00