Merge branch 'master' into dev

This commit is contained in:
dy 2023-12-30 10:28:00 +08:00
commit 005a086ea1

View File

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