Compare commits

...

2 Commits

Author SHA1 Message Date
dy
718add173f Merge branch 'feature/json' into dev 2023-12-29 16:52:17 +08:00
dy
0dede0ac47 cehua json 2023-12-29 16:51:21 +08:00
2 changed files with 252 additions and 2 deletions

View File

@ -18,6 +18,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.6,
"fighter": [
0,
6
],
"npc": 60001 "npc": 60001
}, },
"1": { "1": {
@ -39,6 +44,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.6,
"fighter": [
0,
6
],
"npc": 60002 "npc": 60002
}, },
"2": { "2": {
@ -60,6 +70,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.6,
"fighter": [
0,
6
],
"npc": 60003 "npc": 60003
}, },
"3": { "3": {
@ -81,6 +96,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.6,
"fighter": [
0,
6
],
"npc": 60004 "npc": 60004
}, },
"4": { "4": {
@ -102,6 +122,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.6,
"fighter": [
0,
6
],
"npc": 60005 "npc": 60005
}, },
"5": { "5": {
@ -123,6 +148,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.6,
"fighter": [
0,
6
],
"npc": 60006 "npc": 60006
}, },
"6": { "6": {
@ -144,6 +174,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.6,
"fighter": [
0,
6
],
"npc": 60007 "npc": 60007
}, },
"7": { "7": {
@ -165,6 +200,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.6,
"fighter": [
7,
12
],
"npc": 60008 "npc": 60008
}, },
"8": { "8": {
@ -186,6 +226,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.6,
"fighter": [
7,
12
],
"npc": 60009 "npc": 60009
}, },
"9": { "9": {
@ -207,6 +252,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.6,
"fighter": [
7,
12
],
"npc": 60010 "npc": 60010
}, },
"10": { "10": {
@ -228,6 +278,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.6,
"fighter": [
7,
12
],
"npc": 60011 "npc": 60011
}, },
"11": { "11": {
@ -249,6 +304,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.6,
"fighter": [
7,
12
],
"npc": 60012 "npc": 60012
}, },
"12": { "12": {
@ -270,6 +330,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.6,
"fighter": [
7,
12
],
"npc": 60013 "npc": 60013
}, },
"13": { "13": {
@ -291,6 +356,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.3,
"fighter": [
13,
20
],
"npc": 60014 "npc": 60014
}, },
"14": { "14": {
@ -312,6 +382,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.3,
"fighter": [
13,
20
],
"npc": 60015 "npc": 60015
}, },
"15": { "15": {
@ -333,6 +408,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.3,
"fighter": [
13,
20
],
"npc": 60016 "npc": 60016
}, },
"16": { "16": {
@ -354,6 +434,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.3,
"fighter": [
13,
20
],
"npc": 60017 "npc": 60017
}, },
"17": { "17": {
@ -375,6 +460,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.3,
"fighter": [
13,
20
],
"npc": 60018 "npc": 60018
}, },
"18": { "18": {
@ -396,6 +486,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.3,
"fighter": [
13,
20
],
"npc": 60019 "npc": 60019
}, },
"19": { "19": {
@ -417,6 +512,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.3,
"fighter": [
13,
20
],
"npc": 60020 "npc": 60020
}, },
"20": { "20": {
@ -438,6 +538,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.3,
"fighter": [
13,
20
],
"npc": 60021 "npc": 60021
}, },
"21": { "21": {
@ -459,6 +564,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.3,
"fighter": [
21,
28
],
"npc": 60022 "npc": 60022
}, },
"22": { "22": {
@ -480,6 +590,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.3,
"fighter": [
21,
28
],
"npc": 60023 "npc": 60023
}, },
"23": { "23": {
@ -501,6 +616,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.3,
"fighter": [
21,
28
],
"npc": 60024 "npc": 60024
}, },
"24": { "24": {
@ -522,6 +642,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.3,
"fighter": [
21,
28
],
"npc": 60025 "npc": 60025
}, },
"25": { "25": {
@ -543,6 +668,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.3,
"fighter": [
21,
28
],
"npc": 60026 "npc": 60026
}, },
"26": { "26": {
@ -564,6 +694,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.3,
"fighter": [
21,
28
],
"npc": 60027 "npc": 60027
}, },
"27": { "27": {
@ -585,6 +720,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.3,
"fighter": [
21,
28
],
"npc": 60028 "npc": 60028
}, },
"28": { "28": {
@ -606,6 +746,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.3,
"fighter": [
21,
28
],
"npc": 60029 "npc": 60029
}, },
"29": { "29": {
@ -627,6 +772,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.15,
"fighter": [
29,
38
],
"npc": 60030 "npc": 60030
}, },
"30": { "30": {
@ -648,6 +798,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.15,
"fighter": [
29,
38
],
"npc": 60031 "npc": 60031
}, },
"31": { "31": {
@ -669,6 +824,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.15,
"fighter": [
29,
38
],
"npc": 60032 "npc": 60032
}, },
"32": { "32": {
@ -690,6 +850,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.15,
"fighter": [
29,
38
],
"npc": 60033 "npc": 60033
}, },
"33": { "33": {
@ -711,6 +876,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.15,
"fighter": [
29,
38
],
"npc": 60034 "npc": 60034
}, },
"34": { "34": {
@ -732,6 +902,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.15,
"fighter": [
29,
38
],
"npc": 60035 "npc": 60035
}, },
"35": { "35": {
@ -753,6 +928,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.15,
"fighter": [
29,
38
],
"npc": 60036 "npc": 60036
}, },
"36": { "36": {
@ -774,6 +954,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.15,
"fighter": [
29,
38
],
"npc": 60037 "npc": 60037
}, },
"37": { "37": {
@ -795,6 +980,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.15,
"fighter": [
29,
38
],
"npc": 60038 "npc": 60038
}, },
"38": { "38": {
@ -816,6 +1006,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.15,
"fighter": [
29,
38
],
"npc": 60039 "npc": 60039
}, },
"39": { "39": {
@ -837,6 +1032,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.15,
"fighter": [
39,
48
],
"npc": 60040 "npc": 60040
}, },
"40": { "40": {
@ -858,6 +1058,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.15,
"fighter": [
39,
48
],
"npc": 60041 "npc": 60041
}, },
"41": { "41": {
@ -879,6 +1084,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.15,
"fighter": [
39,
48
],
"npc": 60042 "npc": 60042
}, },
"42": { "42": {
@ -900,6 +1110,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.15,
"fighter": [
39,
48
],
"npc": 60043 "npc": 60043
}, },
"43": { "43": {
@ -921,6 +1136,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.15,
"fighter": [
39,
48
],
"npc": 60044 "npc": 60044
}, },
"44": { "44": {
@ -942,6 +1162,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.15,
"fighter": [
39,
48
],
"npc": 60045 "npc": 60045
}, },
"45": { "45": {
@ -963,6 +1188,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.15,
"fighter": [
39,
48
],
"npc": 60046 "npc": 60046
}, },
"46": { "46": {
@ -984,6 +1214,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.15,
"fighter": [
39,
48
],
"npc": 60047 "npc": 60047
}, },
"47": { "47": {
@ -1005,6 +1240,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.15,
"fighter": [
39,
48
],
"npc": 60048 "npc": 60048
}, },
"48": { "48": {
@ -1026,6 +1266,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0.15,
"fighter": [
39,
48
],
"npc": 60049 "npc": 60049
}, },
"49": { "49": {
@ -1047,6 +1292,11 @@
"n": 100 "n": 100
} }
], ],
"pro": 0,
"fighter": [
39,
49
],
"npc": 60050 "npc": 60050
} }
} }

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,