女蓝拳&破浪初版

2026-06-10 23:48:22 +08:00
parent 15ee762a52
commit 3fa640e64f
2 changed files with 241 additions and 84 deletions
@@ -14,7 +14,7 @@ class Skill0(ActiveSkill):
    learnLv = 1
    masterLv = 1
    maxLv = 1
-    position = 0 #TODO
+    position = 3 #TODO
    rangeLv = 1
    mp = [1, 1]
    uuid = "7822d6d52e10964a6755f142c666b494"
@@ -37,7 +37,7 @@ class Skill1(PassiveSkill):
    learnLv = 1
    masterLv = 115
    maxLv = 200
-    position = 0 #TODO
+    position = 1 #TODO
    rangeLv = 1
    uuid = "5a56514f35cf0270ae8d6c65f8fefd78"
    icon = "$common/$uuid"
@@ -55,6 +55,9 @@ class Skill1(PassiveSkill):
    # REMOVE: data2 = [0, 150, 158.7, 167.3, 176, 184.5, 193.2, 201.8, 210.5, 219.2, 227.7, 236.4, 245, 253.7, 262.2, 270.9, 284.3, 297.6, 311, 324.3, 337.7, 350.9, 364.2, 377.6, 390.9, 404.3, 417.6, 431, 444.3, 457.7, 471, 484.2, 497.6, 510.9, 524.3, 537.6, 551, 564.3, 577.7, 591, 604.4, 617.7, 630.9, 644.3, 657.6, 671, 684.3, 697.7, 711, 724.4, 737.7, 751.1, 764.3, 777.6, 791, 804.3, 817.7, 831, 844.4, 857.7, 871.1, 884.4, 897.8, 911, 924.3, 937.7, 951, 964.4, 977.7, 991.1, 1004.4, 1017.8, 1031.1, 1044.5, 1057.7, 1071, 1084.4, 1097.7, 1111.1, 1124.4, 1137.8, 1151.1, 1164.5, 1177.8, 1191, 1204.4, 1217.7, 1231.1, 1244.4, 1257.8, 1271.1, 1284.5, 1297.8, 1311.2, 1324.5, 1337.7, 1351.1, 1364.4, 1377.8, 1391.1, 1404.5, 1417.8, 1431.2, 1444.5, 1457.9, 1471.2, 1484.6, 1497.9, 1511.3, 1524.6, 1538, 1551.3, 1564.7, 1578, 1591.4, 1604.7, 1618.1, 1631.4, 1644.8, 1658.1, 1671.5, 1684.8, 1698.2, 1711.5, 1724.9, 1738.2, 1751.6, 1764.9, 1778.3, 1791.6, 1805, 1818.3, 1831.7, 1845, 1858.4, 1871.7, 1885.1, 1898.4, 1911.8, 1925.1, 1938.5, 1951.8, 1965.2, 1978.5, 1991.9, 2005.2, 2018.6, 2031.9, 2045.3, 2058.6, 2072, 2085.3, 2098.7, 2112, 2125.4, 2138.7, 2152.1, 2165.4, 2178.8, 2192.1, 2205.5, 2218.8, 2232.2, 2245.5, 2258.9, 2272.2, 2285.6, 2298.9, 2312.3, 2325.6, 2339, 2352.3, 2365.7, 2379, 2392.4, 2405.7, 2419.1, 2432.4, 2445.8, 2459.1, 2472.5, 2485.8, 2499.2, 2512.5, 2525.9, 2539.2, 2552.6, 2565.9, 2579.3, 2592.6, 2606, 2619.3, 2632.7, 2646, 2659.4, 2672.7, 2686.1, 2699.4, 2712.8, 2726.1, 2739.5]# noqa: E501
    data2 = get_data(f'{prefix}/{uuid}', 2)

+    associate = [{'type': '*skillDamage', 'data': [i - 100 if i > 0 else 0 for i in data0], 'skills': ['上挑','圣拳连击']}]
+
+
 # 受身蹲伏
 # priest_female/infighter_female/ce26c6b69d02a440a81b552bec94f03b
 # 0c1b401bb09241570d364420b3ba3fd7/ce26c6b69d02a440a81b552bec94f03b
@@ -66,7 +69,7 @@ class Skill2(ActiveSkill):
    learnLv = 1
    masterLv = 10
    maxLv = 20
-    position = 0 #TODO
+    position = 2 #TODO
    rangeLv = 1
    cd = 5
    mp = [1, 1]
@@ -99,7 +102,7 @@ class Skill3(ActiveSkill):
    learnLv = 1
    masterLv = 60
    maxLv = 70
-    position = 0 #TODO
+    position = 5 #TODO
    rangeLv = 2
    cd = 5
    mp = [13, 85]
@@ -111,9 +114,11 @@ class Skill3(ActiveSkill):
    # 刺拳攻击力 : {value0}%
    # REMOVE: data0 = [0, 2133, 2349, 2566, 2782, 2998, 3215, 3431, 3647, 3864, 4080, 4297, 4513, 4729, 4946, 5162, 5378, 5595, 5811, 6027, 6244, 6460, 6677, 6893, 7109, 7326, 7542, 7758, 7975, 8191, 8408, 8624, 8840, 9057, 9273, 9489, 9706, 9922, 10139, 10355, 10571, 10788, 11004, 11220, 11437, 11653, 11869, 12086, 12302, 12519, 12735, 12951, 13168, 13384, 13600, 13817, 14033, 14250, 14466, 14682, 14899, 15115, 15331, 15548, 15764, 15981, 16197, 16413, 16630, 16846, 17062]# noqa: E501
    data0 = get_data(f'{prefix}/{uuid}', 0)
+    hit0 = 1
    # 直拳攻击力 : {value1}%
    # REMOVE: data1 = [0, 3199, 3524, 3848, 4173, 4497, 4822, 5147, 5471, 5796, 6120, 6445, 6769, 7094, 7418, 7743, 8068, 8392, 8717, 9041, 9366, 9690, 10015, 10339, 10664, 10989, 11313, 11638, 11962, 12287, 12611, 12936, 13260, 13585, 13910, 14234, 14559, 14883, 15208, 15532, 15857, 16181, 16506, 16831, 17155, 17480, 17804, 18129, 18453, 18778, 19102, 19427, 19752, 20076, 20401, 20725, 21050, 21374, 21699, 22023, 22348, 22673, 22997, 23322, 23646, 23971, 24295, 24620, 24944, 25269, 25594]# noqa: E501
    data1 = get_data(f'{prefix}/{uuid}', 1)
+    hit1 = 1
    # [范围信息]
    # 攻击范围比率 : {value2}%
    # REMOVE: data2 = [0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100]# noqa: E501
@@ -134,7 +139,7 @@ class Skill4(ActiveSkill):
    learnLv = 1
    masterLv = 10
    maxLv = 20
-    position = 0 #TODO
+    position = 4 #TODO
    rangeLv = 3
    cd = 2
    uuid = "150aa05b9ee8b9c7c04a25f3e425900c"
@@ -145,6 +150,7 @@ class Skill4(ActiveSkill):
    # 攻击力 : {value0}%
    # REMOVE: data0 = [0, 188, 218, 248, 278, 308, 338, 368, 398, 428, 458, 488, 518, 548, 578, 608, 638, 668, 698, 727, 757]# noqa: E501
    data0 = get_data(f'{prefix}/{uuid}', 0)
+    hit0 = 1
    # 浮空力比率 : {value1}%
    # REMOVE: data1 = [0, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 112, 116, 120, 123, 127, 130, 134, 138, 141, 145]# noqa: E501
    data1 = get_data(f'{prefix}/{uuid}', 1)
@@ -166,7 +172,7 @@ class Skill5(ActiveSkill):
    learnLv = 1
    masterLv = 1
    maxLv = 1
-    position = 0 #TODO
+    position = 7 #TODO
    rangeLv = 1
    cd = 1.5
    mp = [3, 3]
@@ -201,7 +207,7 @@ class Skill6(PassiveSkill):
    learnLv = 1
    masterLv = 1
    maxLv = 1
-    position = 0 #TODO
+    position = 4 #TODO
    rangeLv = 3
    cd = 2
    uuid = "a81e5b7defa1819263ed8e86f69fd06f"
@@ -291,7 +297,7 @@ class Skill9(ActiveSkill):
    learnLv = 5
    masterLv = 60
    maxLv = 70
-    position = 0 #TODO
+    position = 9 #TODO
    rangeLv = 3
    cd = 10
    mp = [15, 154]
@@ -326,7 +332,7 @@ class Skill10(ActiveSkill):
    learnLv = 5
    masterLv = 60
    maxLv = 70
-    position = 0 #TODO
+    position = 2 #TODO
    rangeLv = 2
    cd = 5
    mp = [28, 176]
@@ -338,6 +344,7 @@ class Skill10(ActiveSkill):
    # 攻击力 : {value0}% x {value1}
    # REMOVE: data0 = [0, 2060, 2269, 2478, 2687, 2895, 3104, 3313, 3522, 3731, 3940, 4149, 4358, 4567, 4776, 4985, 5194, 5403, 5612, 5821, 6030, 6239, 6448, 6657, 6866, 7075, 7283, 7492, 7701, 7910, 8119, 8328, 8537, 8746, 8955, 9164, 9373, 9582, 9791, 10000, 10209, 10418, 10627, 10836, 11045, 11254, 11462, 11671, 11880, 12089, 12298, 12507, 12716, 12925, 13134, 13343, 13552, 13761, 13970, 14179, 14388, 14597, 14806, 15015, 15224, 15433, 15642, 15850, 16059, 16268, 16477]# noqa: E501
    data0 = get_data(f'{prefix}/{uuid}', 0)
+    hit0 = 3
    # REMOVE: data1 = [0, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3]# noqa: E501
    data1 = get_data(f'{prefix}/{uuid}', 1)
    # [范围信息]
@@ -356,7 +363,7 @@ class Skill11(ActiveSkill):
    learnLv = 10
    masterLv = 1
    maxLv = 11
-    position = 0 #TODO
+    position = 9 #TODO
    rangeLv = 5
    cd = 15
    mp = [22, 238]
@@ -390,7 +397,7 @@ class Skill12(PassiveSkill):
    learnLv = 10
    masterLv = 1
    maxLv = 1
-    position = 0 #TODO
+    position = 4 #TODO
    rangeLv = 1
    cd = 30
    uuid = "2b340542e776818b78f3212af184bd6b"
@@ -419,7 +426,7 @@ class Skill13(ActiveSkill):
    learnLv = 10
    masterLv = 1
    maxLv = 1
-    position = 0 #TODO
+    position = 6 #TODO
    rangeLv = 3
    cd = 5
    mp = [13, 13]
@@ -448,7 +455,7 @@ class Skill14(ActiveSkill):
    learnLv = 10
    masterLv = 60
    maxLv = 70
-    position = 0 #TODO
+    position = 5 #TODO
    rangeLv = 2
    cd = 5
    mp = [29, 184]
@@ -457,15 +464,18 @@ class Skill14(ActiveSkill):
    hasUP = False
    custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501

+    hit0 = 1
    # 吸附攻击力 : {value1}%
    # REMOVE: data1 = [0, 2809, 3094, 3379, 3664, 3949, 4234, 4519, 4804, 5089, 5374, 5659, 5944, 6229, 6514, 6799, 7084, 7369, 7654, 7939, 8224, 8509, 8794, 9079, 9364, 9649, 9934, 10219, 10504, 10789, 11074, 11359, 11644, 11929, 12214, 12499, 12784, 13069, 13354, 13639, 13924, 14209, 14494, 14779, 15064, 15349, 15634, 15919, 16204, 16489, 16774, 17059, 17344, 17629, 17914, 18199, 18484, 18769, 19054, 19339, 19624, 19909, 20194, 20479, 20764, 21049, 21334, 21619, 21904, 22189, 22474]# noqa: E501
    data1 = get_data(f'{prefix}/{uuid}', 1)
+    hit1 = 1
    # 上勾拳攻击力 : {value0}%
    # REMOVE: data0 = [0, 1873, 2063, 2253, 2443, 2633, 2823, 3013, 3203, 3393, 3583, 3773, 3963, 4153, 4343, 4533, 4723, 4913, 5103, 5293, 5483, 5673, 5863, 6053, 6243, 6433, 6623, 6813, 7003, 7193, 7383, 7573, 7763, 7953, 8143, 8333, 8523, 8713, 8903, 9093, 9283, 9473, 9663, 9853, 10043, 10233, 10423, 10613, 10803, 10993, 11183, 11373, 11563, 11752, 11942, 12132, 12322, 12512, 12702, 12892, 13082, 13272, 13462, 13652, 13842, 14032, 14222, 14412, 14602, 14792, 14982]# noqa: E501
    data0 = get_data(f'{prefix}/{uuid}', 0)
    # 抽打攻击力 : {value1}%
    # REMOVE: data1 = [0, 2809, 3094, 3379, 3664, 3949, 4234, 4519, 4804, 5089, 5374, 5659, 5944, 6229, 6514, 6799, 7084, 7369, 7654, 7939, 8224, 8509, 8794, 9079, 9364, 9649, 9934, 10219, 10504, 10789, 11074, 11359, 11644, 11929, 12214, 12499, 12784, 13069, 13354, 13639, 13924, 14209, 14494, 14779, 15064, 15349, 15634, 15919, 16204, 16489, 16774, 17059, 17344, 17629, 17914, 18199, 18484, 18769, 19054, 19339, 19624, 19909, 20194, 20479, 20764, 21049, 21334, 21619, 21904, 22189, 22474]# noqa: E501
    data1 = get_data(f'{prefix}/{uuid}', 1)
+    hit2 = 1

 # 拳意
 # priest_female/infighter_female/66a9967e677651d0def34c475795ccde
@@ -493,6 +503,8 @@ class Skill15(PassiveSkill):
    # REMOVE: data0 = [0, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 17, 19, 21, 23, 25, 27, 29, 31, 33, 35]# noqa: E501
    data0 = get_data(f'{prefix}/{uuid}', 0)

+    associate = [{"data":data0}]
+
 # 圣拳连击
 # priest_female/infighter_female/87a918bb22cfc959a16e0bf939bb6c24
 # 0c1b401bb09241570d364420b3ba3fd7/87a918bb22cfc959a16e0bf939bb6c24
@@ -508,7 +520,7 @@ class Skill16(ActiveSkill):
    learnLv = 15
    masterLv = 1
    maxLv = 1
-    position = 0 #TODO
+    position = 3 #TODO
    rangeLv = 2
    cd = 5
    mp = [33, 33]
@@ -520,12 +532,15 @@ class Skill16(ActiveSkill):
    # 刺拳攻击力 : {value0}%
    # REMOVE: data0 = [0, 670]# noqa: E501
    data0 = get_data(f'{prefix}/{uuid}', 0)
+    hit0 = 1
    # 第一次钩爪攻击力 : {value2}%
    # REMOVE: data2 = [0, 1676]# noqa: E501
    data2 = get_data(f'{prefix}/{uuid}', 2)
+    hit1 = 1
    # 第二次钩爪攻击力 : {value3}%
    # REMOVE: data3 = [0, 1]# noqa: E501
    data3 = get_data(f'{prefix}/{uuid}', 3)
+    hit2 = 1
    # 压制力 (4人队伍) : <소수1+>秒 (<소수1+>秒)
    # [范围信息]
    # 攻击范围比率 : {value1}%
@@ -545,7 +560,7 @@ class Skill17(ActiveSkill):
    learnLv = 15
    masterLv = 60
    maxLv = 70
-    position = 0 #TODO
+    position = 7 #TODO
    rangeLv = 2
    cd = 4
    mp = [36, 228]
@@ -557,6 +572,7 @@ class Skill17(ActiveSkill):
    # 刺拳攻击力 : {value0}%
    # REMOVE: data0 = [0, 7666, 8444, 9221, 9999, 10777, 11555, 12332, 13110, 13888, 14665, 15443, 16221, 16999, 17776, 18554, 19332, 20109, 20887, 21665, 22442, 23220, 23998, 24776, 25553, 26331, 27109, 27886, 28664, 29442, 30220, 30997, 31775, 32553, 33330, 34108, 34886, 35664, 36441, 37219, 37997, 38774, 39552, 40330, 41108, 41885, 42663, 43441, 44218, 44996, 45774, 46552, 47329, 48107, 48885, 49662, 50440, 51218, 51995, 52773, 53551, 54329, 55106, 55884, 56662, 57439, 58217, 58995, 59773, 60550, 61328]# noqa: E501
    data0 = get_data(f'{prefix}/{uuid}', 0)
+    hit0 = 1

 # 暴击
 # priest_female/infighter_female/fc1262c19f3d0477ee8eda47b8db8696
@@ -569,7 +585,7 @@ class Skill18(PassiveSkill):
    learnLv = 20
    masterLv = 10
    maxLv = 20
-    position = 0 #TODO
+    position = 5 #TODO
    rangeLv = 3
    uuid = "fc1262c19f3d0477ee8eda47b8db8696"
    hasVP = False
@@ -597,7 +613,7 @@ class Skill19(ActiveSkill):
    learnLv = 20
    masterLv = 60
    maxLv = 70
-    position = 0 #TODO
+    position = 5 #TODO
    rangeLv = 2
    cd = 6
    mp = [58, 368]
@@ -606,6 +622,7 @@ class Skill19(ActiveSkill):
    hasUP = True
    custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501

+    hit0 = 1
    # 斩击攻击力 : {value1}%
    # REMOVE: data1 = [0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]# noqa: E501
    data1 = get_data(f'{prefix}/{uuid}', 1)
@@ -634,7 +651,7 @@ class Skill20(ActiveSkill):
    learnLv = 20
    masterLv = 60
    maxLv = 70
-    position = 0 #TODO
+    position = 6 #TODO
    rangeLv = 2
    cd = 7
    mp = [67, 430]
@@ -643,9 +660,11 @@ class Skill20(ActiveSkill):
    hasUP = True
    custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501

+    hit0 = 1
    # 背击攻击力 : {value1}%
    # REMOVE: data1 = [0, 3830, 4218, 4607, 4995, 5384, 5772, 6161, 6550, 6938, 7327, 7715, 8104, 8492, 8881, 9269, 9658, 10046, 10435, 10823, 11212, 11600, 11989, 12377, 12766, 13155, 13543, 13932, 14320, 14709, 15097, 15486, 15874, 16263, 16651, 17040, 17428, 17817, 18205, 18594, 18982, 19371, 19760, 20148, 20537, 20925, 21314, 21702, 22091, 22479, 22868, 23256, 23645, 24033, 24422, 24810, 25199, 25588, 25976, 26365, 26753, 27142, 27530, 27919, 28307, 28696, 29084, 29473, 29861, 30250, 30638]# noqa: E501
    data1 = get_data(f'{prefix}/{uuid}', 1)
+    hit1 = 1
    # 吸附攻击力 : {value0}%
    # REMOVE: data0 = [0, 2553, 2812, 3071, 3330, 3589, 3848, 4107, 4366, 4625, 4884, 5143, 5402, 5661, 5920, 6179, 6439, 6698, 6957, 7216, 7475, 7734, 7993, 8252, 8511, 8770, 9029, 9288, 9547, 9806, 10065, 10324, 10583, 10842, 11101, 11360, 11619, 11878, 12137, 12396, 12655, 12914, 13173, 13432, 13691, 13950, 14209, 14468, 14727, 14986, 15245, 15504, 15763, 16022, 16281, 16540, 16799, 17058, 17317, 17576, 17835, 18094, 18353, 18612, 18871, 19130, 19390, 19649, 19908, 20167, 20426]# noqa: E501
    data0 = get_data(f'{prefix}/{uuid}', 0)
@@ -656,6 +675,7 @@ class Skill20(ActiveSkill):
    # 攻击范围比率 : {value2}%
    # REMOVE: data2 = [0, 6383, 7031, 7678, 8326, 8973, 9621, 10268, 10916, 11563, 12211, 12859, 13506, 14154, 14801, 15449, 16096, 16744, 17391, 18039, 18686, 19334, 19982, 20629, 21277, 21924, 22572, 23219, 23867, 24514, 25162, 25810, 26457, 27105, 27752, 28400, 29047, 29695, 30342, 30990, 31637, 32285, 32933, 33580, 34228, 34875, 35523, 36170, 36818, 37465, 38113, 38761, 39408, 40056, 40703, 41351, 41998, 42646, 43293, 43941, 44588, 45236, 45884, 46531, 47179, 47826, 48474, 49121, 49769, 50416, 51064]# noqa: E501
    data2 = get_data(f'{prefix}/{uuid}', 2)
+    hit2 = 1

 # 士气
 # priest_female/infighter_female/b69d38bcddd41b3566c6d5cf78d060bb
@@ -705,6 +725,8 @@ class Skill21(PassiveSkill):
    # 开启结束暂缓时间 : {value6}秒
    # data6 = None # TOCHECK    # REMOVE: data6 = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]# noqa: E501
    data6 = get_data(f'{prefix}/{uuid}', 6)
+    
+    associate = [ {"type":"*cdReduce","data":data0,"exceptSkills":['圣拳锤击','召唤兽传送','末日风暴','帝国的愤怒','九霄风雷','残酷组合','元素爆发','燃烧的比赫门斯','弗格纳斯·沃伦塔利斯']}]

 # 圣拳锤击
 # priest_female/infighter_female/ca2536eb56df0e812c88c59cabd38be0
@@ -729,7 +751,7 @@ class Skill22(ActiveSkill):
    learnLv = 25
    masterLv = 60
    maxLv = 70
-    position = 0 #TODO
+    position = 4 #TODO
    rangeLv = 2
    cd = 12
    mp = [109, 697]
@@ -741,6 +763,7 @@ class Skill22(ActiveSkill):
    # 冲击波攻击力 : {value0}%
    # REMOVE: data0 = [0, 21909, 24132, 26354, 28577, 30800, 33022, 35245, 37468, 39690, 41913, 44136, 46358, 48581, 50803, 53026, 55249, 57471, 59694, 61917, 64139, 66362, 68585, 70807, 73030, 75253, 77475, 79698, 81921, 84143, 86366, 88589, 90811, 93034, 95257, 97479, 99702, 101924, 104147, 106370, 108592, 110815, 113038, 115260, 117483, 119706, 121928, 124151, 126374, 128596, 130819, 133042, 135264, 137487, 139710, 141932, 144155, 146378, 148600, 150823, 153045, 155268, 157491, 159713, 161936, 164159, 166381, 168604, 170827, 173049, 175272]# noqa: E501
    data0 = get_data(f'{prefix}/{uuid}', 0)
+    hit0 = 1
    # 压制力 (4人队伍) : <소수1+>秒 (<소수1+>秒)
    # [学习[不知火舞]时]
    # 控制时间 : {value1}秒
@@ -764,7 +787,7 @@ class Skill23(ActiveSkill):
    learnLv = 25
    masterLv = 60
    maxLv = 70
-    position = 0 #TODO
+    position = 2 #TODO
    rangeLv = 2
    cd = 7
    mp = [64, 406]
@@ -776,6 +799,7 @@ class Skill23(ActiveSkill):
    # 攻击力 : {value0}% x {value1}
    # REMOVE: data0 = [0, 3615, 3981, 4348, 4715, 5081, 5448, 5815, 6181, 6548, 6915, 7281, 7648, 8015, 8381, 8748, 9115, 9482, 9848, 10215, 10582, 10948, 11315, 11682, 12048, 12415, 12782, 13148, 13515, 13882, 14248, 14615, 14982, 15349, 15715, 16082, 16449, 16815, 17182, 17549, 17915, 18282, 18649, 19015, 19382, 19749, 20115, 20482, 20849, 21216, 21582, 21949, 22316, 22682, 23049, 23416, 23782, 24149, 24516, 24882, 25249, 25616, 25982, 26349, 26716, 27083, 27449, 27816, 28183, 28549, 28916]# noqa: E501
    data0 = get_data(f'{prefix}/{uuid}', 0)
+    hit0 = 4
    # REMOVE: data1 = [0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4]# noqa: E501
    data1 = get_data(f'{prefix}/{uuid}', 1)
    # [范围信息]
@@ -811,6 +835,8 @@ class Skill24(PassiveSkill):
    # REMOVE: data2 = [0, 5.5, 6, 6.5, 7, 7.5, 8, 8.5, 9, 9.5, 10, 10.5, 11, 11.5, 12, 12.5, 13, 13.5, 14, 14.5, 15]# noqa: E501
    data2 = get_data(f'{prefix}/{uuid}', 2)

+    associate = [ {'type': '$*PAtkP', 'data': data0}, ]
+
 # -  [可追加幻影攻击的技能]  -
 # priest_female/infighter_female/c1dd8b776fb1dd24c6373c678ef1dd2e
 # 0c1b401bb09241570d364420b3ba3fd7/c1dd8b776fb1dd24c6373c678ef1dd2e
@@ -824,7 +850,7 @@ class Skill25(ActiveSkill):
    learnLv = 30
    masterLv = 10
    maxLv = 20
-    position = 0 #TODO
+    position = 7 #TODO
    rangeLv = 3
    cd = 5
    uuid = "c1dd8b776fb1dd24c6373c678ef1dd2e"
@@ -863,7 +889,7 @@ class Skill26(ActiveSkill):
    learnLv = 30
    masterLv = 60
    maxLv = 70
-    position = 0 #TODO
+    position = 3 #TODO
    rangeLv = 2
    cd = 25
    mp = [256, 1633]
@@ -872,6 +898,7 @@ class Skill26(ActiveSkill):
    hasUP = True
    custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501

+    hit0 = 1
    # 拳头攻击力 : {value1}%
    # REMOVE: data1 = [0, 39495, 43501, 47508, 51515, 55522, 59528, 63535, 67542, 71548, 75555, 79562, 83568, 87575, 91582, 95589, 99595, 103602, 107609, 111615, 115622, 119629, 123636, 127642, 131649, 135656, 139662, 143669, 147676, 151683, 155689, 159696, 163703, 167709, 171716, 175723, 179730, 183736, 187743, 191750, 195756, 199763, 203770, 207776, 211783, 215790, 219797, 223803, 227810, 231817, 235823, 239830, 243837, 247844, 251850, 255857, 259864, 263870, 267877, 271884, 275891, 279897, 283904, 287911, 291917, 295924, 299931, 303937, 307944, 311951, 315958]# noqa: E501
    data1 = get_data(f'{prefix}/{uuid}', 1)
@@ -901,7 +928,7 @@ class Skill27(ActiveSkill):
    learnLv = 30
    masterLv = 60
    maxLv = 70
-    position = 0 #TODO
+    position = 5 #TODO
    rangeLv = 2
    cd = 8
    mp = [82, 522]
@@ -910,12 +937,15 @@ class Skill27(ActiveSkill):
    hasUP = True
    custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501

+    hit0 = 1
    # 背击1次攻击力 : {value1}%
    # REMOVE: data1 = [0, 5710, 6289, 6868, 7447, 8027, 8606, 9185, 9764, 10343, 10923, 11502, 12081, 12660, 13240, 13819, 14398, 14977, 15557, 16136, 16715, 17294, 17874, 18453, 19032, 19611, 20190, 20770, 21349, 21928, 22507, 23087, 23666, 24245, 24824, 25404, 25983, 26562, 27141, 27721, 28300, 28879, 29458, 30037, 30617, 31196, 31775, 32354, 32934, 33513, 34092, 34671, 35251, 35830, 36409, 36988, 37568, 38147, 38726, 39305, 39884, 40464, 41043, 41622, 42201, 42781, 43360, 43939, 44518, 45098, 45677]# noqa: E501
    data1 = get_data(f'{prefix}/{uuid}', 1)
+    hit1 = 1
    # 血流 2段攻击力 : {value2}%
    # REMOVE: data2 = [0, 9516, 10481, 11447, 12412, 13378, 14343, 15308, 16274, 17239, 18205, 19170, 20135, 21101, 22066, 23031, 23997, 24962, 25928, 26893, 27858, 28824, 29789, 30755, 31720, 32685, 33651, 34616, 35582, 36547, 37512, 38478, 39443, 40409, 41374, 42339, 43305, 44270, 45235, 46201, 47166, 48132, 49097, 50062, 51028, 51993, 52959, 53924, 54889, 55855, 56820, 57786, 58751, 59716, 60682, 61647, 62613, 63578, 64543, 65509, 66474, 67439, 68405, 69370, 70336, 71301, 72266, 73232, 74197, 75163, 76128]# noqa: E501
    data2 = get_data(f'{prefix}/{uuid}', 2)
+    hit2 = 1
    # 直拳攻击力 : {value0}%
    # REMOVE: data0 = [0, 3806, 4193, 4579, 4965, 5351, 5737, 6123, 6509, 6896, 7282, 7668, 8054, 8440, 8826, 9213, 9599, 9985, 10371, 10757, 11143, 11530, 11916, 12302, 12688, 13074, 13460, 13846, 14233, 14619, 15005, 15391, 15777, 16163, 16550, 16936, 17322, 17708, 18094, 18480, 18867, 19253, 19639, 20025, 20411, 20797, 21183, 21570, 21956, 22342, 22728, 23114, 23500, 23887, 24273, 24659, 25045, 25431, 25817, 26203, 26590, 26976, 27362, 27748, 28134, 28520, 28907, 29293, 29679, 30065, 30451]# noqa: E501
    data0 = get_data(f'{prefix}/{uuid}', 0)
@@ -943,7 +973,7 @@ class Skill28(ActiveSkill):
    learnLv = 35
    masterLv = 60
    maxLv = 70
-    position = 0 #TODO
+    position = 6 #TODO
    rangeLv = 2
    cube = 1
    cd = 12
@@ -957,6 +987,7 @@ class Skill28(ActiveSkill):
    # 刺拳连击攻击力 : {value0}%
    # REMOVE: data0 = [0, 1150, 1267, 1384, 1500, 1617, 1734, 1851, 1967, 2084, 2201, 2317, 2434, 2551, 2667, 2784, 2901, 3018, 3134, 3251, 3368, 3484, 3601, 3718, 3834, 3951, 4068, 4185, 4301, 4418, 4535, 4651, 4768, 4885, 5002, 5118, 5235, 5352, 5468, 5585, 5702, 5818, 5935, 6052, 6169, 6285, 6402, 6519, 6635, 6752, 6869, 6985, 7102, 7219, 7336, 7452, 7569, 7686, 7802, 7919, 8036, 8152, 8269, 8386, 8503, 8619, 8736, 8853, 8969, 9086, 9203]# noqa: E501
    data0 = get_data(f'{prefix}/{uuid}', 0)
+    hit0 = 7
    # 上勾拳攻击力 : {value1}%
    # REMOVE: data1 = [0, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7]# noqa: E501
    data1 = get_data(f'{prefix}/{uuid}', 1)
@@ -964,6 +995,7 @@ class Skill28(ActiveSkill):
    # 攻击范围比率 : {value2}%
    # REMOVE: data2 = [0, 14955, 16472, 17989, 19506, 21023, 22540, 24057, 25574, 27092, 28609, 30126, 31643, 33160, 34677, 36194, 37711, 39229, 40746, 42263, 43780, 45297, 46814, 48331, 49849, 51366, 52883, 54400, 55917, 57434, 58951, 60468, 61986, 63503, 65020, 66537, 68054, 69571, 71088, 72605, 74123, 75640, 77157, 78674, 80191, 81708, 83225, 84742, 86260, 87777, 89294, 90811, 92328, 93845, 95362, 96879, 98397, 99914, 101431, 102948, 104465, 105982, 107499, 109017, 110534, 112051, 113568, 115085, 116602, 118119, 119636]# noqa: E501
    data2 = get_data(f'{prefix}/{uuid}', 2)
+    hit2 = 1

    def vp_1(self):
        """
@@ -1016,7 +1048,7 @@ class Skill29(ActiveSkill):
    learnLv = 40
    masterLv = 60
    maxLv = 70
-    position = 0 #TODO
+    position = 2 #TODO
    rangeLv = 2
    cube = 1
    cd = 20
@@ -1030,6 +1062,7 @@ class Skill29(ActiveSkill):
    # 前冲攻击力 : {value0}%
    # REMOVE: data0 = [0, 3692, 4066, 4441, 4815, 5190, 5564, 5939, 6313, 6688, 7062, 7437, 7811, 8186, 8560, 8935, 9310, 9684, 10059, 10433, 10808, 11182, 11557, 11931, 12306, 12680, 13055, 13429, 13804, 14178, 14553, 14927, 15302, 15676, 16051, 16425, 16800, 17174, 17549, 17923, 18298, 18673, 19047, 19422, 19796, 20171, 20545, 20920, 21294, 21669, 22043, 22418, 22792, 23167, 23541, 23916, 24290, 24665, 25039, 25414, 25788, 26163, 26537, 26912, 27286, 27661, 28036, 28410, 28785, 29159, 29534]# noqa: E501
    data0 = get_data(f'{prefix}/{uuid}', 0)
+    hit0 = 4
    # 冲击波攻击力 : {value1}%
    # REMOVE: data1 = [0, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4]# noqa: E501
    data1 = get_data(f'{prefix}/{uuid}', 1)
@@ -1040,6 +1073,7 @@ class Skill29(ActiveSkill):
    # 攻击范围比率 : {value2}%
    # REMOVE: data2 = [0, 22150, 24397, 26644, 28892, 31139, 33386, 35633, 37880, 40127, 42374, 44621, 46869, 49116, 51363, 53610, 55857, 58104, 60351, 62598, 64846, 67093, 69340, 71587, 73834, 76081, 78328, 80575, 82822, 85070, 87317, 89564, 91811, 94058, 96305, 98552, 100799, 103047, 105294, 107541, 109788, 112035, 114282, 116529, 118776, 121024, 123271, 125518, 127765, 130012, 132259, 134506, 136753, 139001, 141248, 143495, 145742, 147989, 150236, 152483, 154730, 156978, 159225, 161472, 163719, 165966, 168213, 170460, 172707, 174954, 177202]# noqa: E501
    data2 = get_data(f'{prefix}/{uuid}', 2)
+    hit2 = 1

    def vp_1(self):
        """
@@ -1082,7 +1116,7 @@ class Skill30(ActiveSkill):
    learnLv = 40
    masterLv = 60
    maxLv = 70
-    position = 0 #TODO
+    position = 5 #TODO
    rangeLv = 2
    cube = 1
    cd = 20
@@ -1096,12 +1130,15 @@ class Skill30(ActiveSkill):
    # 摆拳攻击力 : {value0}%
    # REMOVE: data0 = [0, 7361, 8108, 8855, 9602, 10348, 11095, 11842, 12589, 13336, 14082, 14829, 15576, 16323, 17069, 17816, 18563, 19310, 20057, 20803, 21550, 22297, 23044, 23791, 24537, 25284, 26031, 26778, 27524, 28271, 29018, 29765, 30512, 31258, 32005, 32752, 33499, 34246, 34992, 35739, 36486, 37233, 37980, 38726, 39473, 40220, 40967, 41713, 42460, 43207, 43954, 44701, 45447, 46194, 46941, 47688, 48435, 49181, 49928, 50675, 51422, 52169, 52915, 53662, 54409, 55156, 55902, 56649, 57396, 58143, 58890]# noqa: E501
    data0 = get_data(f'{prefix}/{uuid}', 0)
+    hit0 = 1
    # 背击攻击力 : {value2}%
    # REMOVE: data2 = [0, 18403, 20270, 22137, 24004, 25871, 27738, 29605, 31472, 33339, 35206, 37073, 38940, 40807, 42674, 44541, 46408, 48275, 50142, 52008, 53875, 55742, 57609, 59476, 61343, 63210, 65077, 66944, 68811, 70678, 72545, 74412, 76279, 78146, 80013, 81880, 83747, 85614, 87481, 89348, 91215, 93082, 94949, 96816, 98683, 100550, 102417, 104284, 106151, 108018, 109885, 111752, 113619, 115485, 117352, 119219, 121086, 122953, 124820, 126687, 128554, 130421, 132288, 134155, 136022, 137889, 139756, 141623, 143490, 145357, 147224]# noqa: E501
    data2 = get_data(f'{prefix}/{uuid}', 2)
+    hit2 = 1
    # 直拳攻击力 : {value1}%
    # REMOVE: data1 = [0, 11042, 12162, 13282, 14402, 15523, 16643, 17763, 18883, 20003, 21123, 22244, 23364, 24484, 25604, 26724, 27845, 28965, 30085, 31205, 32325, 33445, 34566, 35686, 36806, 37926, 39046, 40167, 41287, 42407, 43527, 44647, 45767, 46888, 48008, 49128, 50248, 51368, 52489, 53609, 54729, 55849, 56969, 58089, 59210, 60330, 61450, 62570, 63690, 64811, 65931, 67051, 68171, 69291, 70411, 71532, 72652, 73772, 74892, 76012, 77133, 78253, 79373, 80493, 81613, 82733, 83854, 84974, 86094, 87214, 88334]# noqa: E501
    data1 = get_data(f'{prefix}/{uuid}', 1)
+    hit1 = 1
    # [范围信息]
    # 攻击范围比率 : {value2}%
    # REMOVE: data2 = [0, 18403, 20270, 22137, 24004, 25871, 27738, 29605, 31472, 33339, 35206, 37073, 38940, 40807, 42674, 44541, 46408, 48275, 50142, 52008, 53875, 55742, 57609, 59476, 61343, 63210, 65077, 66944, 68811, 70678, 72545, 74412, 76279, 78146, 80013, 81880, 83747, 85614, 87481, 89348, 91215, 93082, 94949, 96816, 98683, 100550, 102417, 104284, 106151, 108018, 109885, 111752, 113619, 115485, 117352, 119219, 121086, 122953, 124820, 126687, 128554, 130421, 132288, 134155, 136022, 137889, 139756, 141623, 143490, 145357, 147224]# noqa: E501
@@ -1140,6 +1177,11 @@ class Skill30(ActiveSkill):
        攻击力 -16.7%
        """
        ...
+    
+    def effect(self, old, new):
+        if self.vp == 2:
+            self.associate = [{'type': '*skillRation', 'data': [0] + [-16.7] * self.maxLv, 'skills': ['强摔攻击力 : <int>%']}]
+        return super().effect(old, new)

 # 末日风暴
 # priest_female/infighter_female/b860cbf5979b4bcc6beea725636b915e
@@ -1160,7 +1202,7 @@ class Skill31(ActiveSkill):
    learnLv = 45
    masterLv = 60
    maxLv = 70
-    position = 0 #TODO
+    position = 3 #TODO
    rangeLv = 2
    cube = 2
    cd = 50
@@ -1174,6 +1216,7 @@ class Skill31(ActiveSkill):
    # 拳击攻击力 : {value0}%
    # REMOVE: data0 = [0, 91815, 101130, 110444, 119759, 129073, 138388, 147702, 157017, 166332, 175646, 184961, 194275, 203590, 212904, 222219, 231533, 240848, 250163, 259477, 268792, 278106, 287421, 296735, 306050, 315365, 324679, 333994, 343308, 352623, 361937, 371252, 380567, 389881, 399196, 408510, 417825, 427139, 436454, 445768, 455083, 464398, 473712, 483027, 492341, 501656, 510970, 520285, 529600, 538914, 548229, 557543, 566858, 576172, 585487, 594802, 604116, 613431, 622745, 632060, 641374, 650689, 660003, 669318, 678633, 687947, 697262, 706576, 715891, 725205, 734520]# noqa: E501
    data0 = get_data(f'{prefix}/{uuid}', 0)
+    hit0 = 1
    # [范围信息]
    # 冲击波范围比率 : {value1}%
    # REMOVE: data1 = [0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100]# noqa: E501
@@ -1209,6 +1252,12 @@ class Skill31(ActiveSkill):
        """
        ...

+    #这里CD也要翻倍
+    def effect(self, old, new):
+        if self.vp == 2:
+            self.associate = [{'type': '*skillRation', 'data': [0] + [100] * self.maxLv, 'skills': ['召唤兽传送']}]
+        return super().effect(old, new)
+
 # 被隐藏的本能
 # priest_female/infighter_female/37cf7b7a269058dc02bef5b5bc9de282
 # 0c1b401bb09241570d364420b3ba3fd7/37cf7b7a269058dc02bef5b5bc9de282
@@ -1222,7 +1271,7 @@ class Skill32(PassiveSkill):
    learnLv = 48
    masterLv = 40
    maxLv = 50
-    position = 0 #TODO
+    position = 1 #TODO
    rangeLv = 3
    uuid = "37cf7b7a269058dc02bef5b5bc9de282"
    hasVP = False
@@ -1236,6 +1285,8 @@ class Skill32(PassiveSkill):
    # REMOVE: data0 = [0, 4, 6, 8, 10, 12, 14, 16, 18, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52, 54, 56, 58, 60, 62, 64, 66, 68, 70, 72, 74, 76, 78, 80, 82, 84, 86, 88, 90, 92, 94, 96, 98, 100, 102]# noqa: E501
    data0 = get_data(f'{prefix}/{uuid}', 0)

+    associate = [{"data":data0}]
+
 # 帝国的愤怒
 # priest_female/infighter_female/97972dba4694d6c0fcd2f7e8efb3a499
 # 0c1b401bb09241570d364420b3ba3fd7/97972dba4694d6c0fcd2f7e8efb3a499
@@ -1251,7 +1302,7 @@ class Skill33(ActiveSkill):
    learnLv = 50
    masterLv = 40
    maxLv = 50
-    position = 0 #TODO
+    position = 5 #TODO
    rangeLv = 5
    cube = 5
    cd = 135
@@ -1264,15 +1315,19 @@ class Skill33(ActiveSkill):
    # 第1击攻击力 : {value0}%
    # REMOVE: data0 = [0, 6752, 8318, 9883, 11449, 13015, 14580, 16146, 17712, 19277, 20843, 22408, 23974, 25540, 27105, 28671, 30237, 31802, 33368, 34934, 36499, 38065, 39631, 41196, 42762, 44328, 45893, 47459, 49025, 50590, 52156, 53722, 55287, 56853, 58419, 59984, 61550, 63116, 64681, 66247, 67813, 69378, 70944, 72510, 74075, 75641, 77207, 78772, 80338, 81903, 83469]# noqa: E501
    data0 = get_data(f'{prefix}/{uuid}', 0)
+    hit0 = 1
    # 2段~3段攻击力 : {value2}%
    # REMOVE: data2 = [0, 13504, 16635, 19766, 22898, 26029, 29160, 32292, 35423, 38554, 41686, 44817, 47948, 51080, 54211, 57342, 60474, 63605, 66736, 69867, 72999, 76130, 79261, 82393, 85524, 88655, 91787, 94918, 98049, 101181, 104312, 107443, 110575, 113706, 116837, 119969, 123100, 126231, 129362, 132494, 135625, 138756, 141888, 145019, 148150, 151282, 154413, 157544, 160676, 163807, 166938]# noqa: E501
    data2 = get_data(f'{prefix}/{uuid}', 2)
+    hit2 = 3
    # 4~6次攻击力 : {value3}%
    # REMOVE: data3 = [0, 67519, 83176, 98832, 114489, 130145, 145802, 161458, 177115, 192772, 208428, 224085, 239741, 255398, 271055, 286711, 302368, 318024, 333681, 349337, 364994, 380651, 396307, 411964, 427620, 443277, 458933, 474590, 490247, 505903, 521560, 537216, 552873, 568530, 584186, 599843, 615499, 631156, 646812, 662469, 678126, 693782, 709439, 725095, 740752, 756409, 772065, 787722, 803378, 819035, 834691]# noqa: E501
    data3 = get_data(f'{prefix}/{uuid}', 3)
+    hit3 = 1
    # 最后一击攻击力 : {value1}%
    # REMOVE: data1 = [0, 10128, 12476, 14825, 17173, 19522, 21870, 24219, 26567, 28916, 31264, 33613, 35961, 38310, 40658, 43007, 45355, 47704, 50052, 52401, 54749, 57098, 59446, 61795, 64143, 66492, 68840, 71189, 73537, 75885, 78234, 80582, 82931, 85279, 87628, 89976, 92325, 94673, 97022, 99370, 101719, 104067, 106416, 108764, 111113, 113461, 115810, 118158, 120507, 122855, 125204]# noqa: E501
    data1 = get_data(f'{prefix}/{uuid}', 1)
+    hit1 = 2
    # 寻敌范围 : {value2}px
    # REMOVE: data2 = [0, 13504, 16635, 19766, 22898, 26029, 29160, 32292, 35423, 38554, 41686, 44817, 47948, 51080, 54211, 57342, 60474, 63605, 66736, 69867, 72999, 76130, 79261, 82393, 85524, 88655, 91787, 94918, 98049, 101181, 104312, 107443, 110575, 113706, 116837, 119969, 123100, 126231, 129362, 132494, 135625, 138756, 141888, 145019, 148150, 151282, 154413, 157544, 160676, 163807, 166938]# noqa: E501
    data2 = get_data(f'{prefix}/{uuid}', 2)
@@ -1294,7 +1349,7 @@ class Skill34(ActiveSkill):
    learnLv = 60
    masterLv = 40
    maxLv = 50
-    position = 0 #TODO
+    position = 2 #TODO
    rangeLv = 2
    cube = 1
    cd = 30
@@ -1305,11 +1360,13 @@ class Skill34(ActiveSkill):
    custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501
    vps = get_data(f'{prefix}/{uuid}', "vps") # noqa: E501

+    hit0 = 10
    # 连发拳攻击力 : {value1}% x {value2}
    # REMOVE: data1 = [0, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10]# noqa: E501
    data1 = get_data(f'{prefix}/{uuid}', 1)
    # REMOVE: data2 = [0, 26238, 28899, 31561, 34223, 36885, 39547, 42208, 44870, 47532, 50194, 52855, 55517, 58179, 60841, 63503, 66164, 68826, 71488, 74150, 76812, 79473, 82135, 84797, 87459, 90120, 92782, 95444, 98106, 100768, 103429, 106091, 108753, 111415, 114077, 116738, 119400, 122062, 124724, 127385, 130047, 132709, 135371, 138033, 140694, 143356, 146018, 148680, 151342, 154003, 156665]# noqa: E501
    data2 = get_data(f'{prefix}/{uuid}', 2)
+    hit2 = 1
    # 捶击攻击力 : {value0}%
    # REMOVE: data0 = [0, 3936, 4335, 4734, 5133, 5533, 5932, 6331, 6731, 7130, 7529, 7928, 8328, 8727, 9126, 9525, 9925, 10324, 10723, 11122, 11522, 11921, 12320, 12720, 13119, 13518, 13917, 14317, 14716, 15115, 15514, 15914, 16313, 16712, 17111, 17511, 17910, 18309, 18709, 19108, 19507, 19906, 20306, 20705, 21104, 21503, 21903, 22302, 22701, 23100, 23500]# noqa: E501
    data0 = get_data(f'{prefix}/{uuid}', 0)
@@ -1367,7 +1424,7 @@ class Skill35(ActiveSkill):
    learnLv = 70
    masterLv = 40
    maxLv = 50
-    position = 0 #TODO
+    position = 4 #TODO
    rangeLv = 2
    cube = 3
    cd = 50
@@ -1384,6 +1441,7 @@ class Skill35(ActiveSkill):
    # 第二次下劈攻击力 : {value2}%
    # REMOVE: data2 = [0, 127423, 140350, 153277, 166204, 179131, 192058, 204985, 217912, 230839, 243766, 256693, 269620, 282547, 295474, 308401, 321328, 334255, 347182, 360108, 373035, 385962, 398889, 411816, 424743, 437670, 450597, 463524, 476451, 489378, 502305, 515232, 528159, 541086, 554013, 566940, 579867, 592794, 605721, 618648, 631575, 644502, 657429, 670356, 683283, 696210, 709137, 722064, 734991, 747918, 760845]# noqa: E501
    data2 = get_data(f'{prefix}/{uuid}', 2)
+    hit2 = 1
    # [激进]
    # 全力下劈攻击力 : {value3}%
    # REMOVE: data3 = [0, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100, 100]# noqa: E501
@@ -1433,6 +1491,14 @@ class Skill35(ActiveSkill):
        """
        ...

+        self.cd = 20
+        self.skillRation *= 0.5
+
+    def effect(self, old, new):
+        if self.vp == 1:
+            self.associate = [{'type': '*skillRation', 'data': [0] + [-28.6] * self.maxLv, 'skills': ['圣拳锤击']}]
+        return super().effect(old, new)        
+
 # 不完整的世界崩坏攻击力 : <int> x <int>
 # priest_female/infighter_female/4e9e8942841b9767f683fb23c1ef1435
 # 0c1b401bb09241570d364420b3ba3fd7/4e9e8942841b9767f683fb23c1ef1435
@@ -1446,7 +1512,7 @@ class Skill36(PassiveSkill):
    learnLv = 75
    masterLv = 40
    maxLv = 50
-    position = 0 #TODO
+    position = 1 #TODO
    rangeLv = 3
    uuid = "4e9e8942841b9767f683fb23c1ef1435"
    hasVP = False
@@ -1457,6 +1523,8 @@ class Skill36(PassiveSkill):
    # data1 = None # TOCHECK    # REMOVE: data1 = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]# noqa: E501
    data1 = get_data(f'{prefix}/{uuid}', 1)

+    associate = [{"data":data0}]
+
 # 残酷组合
 # priest_female/infighter_female/ef896bbdc68660c22b6e60502044d690
 # 0c1b401bb09241570d364420b3ba3fd7/ef896bbdc68660c22b6e60502044d690
@@ -1476,7 +1544,7 @@ class Skill37(ActiveSkill):
    learnLv = 75
    masterLv = 40
    maxLv = 50
-    position = 0 #TODO
+    position = 5 #TODO
    rangeLv = 2
    cube = 3
    cd = 50
@@ -1487,12 +1555,15 @@ class Skill37(ActiveSkill):
    custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501
    vps = get_data(f'{prefix}/{uuid}', "vps") # noqa: E501

+    hit0 = 1
    # 第一次拳击攻击力 : {value1}%
    # REMOVE: data1 = [0, 44111, 48586, 53061, 57536, 62011, 66486, 70961, 75436, 79911, 84386, 88861, 93337, 97812, 102287, 106762, 111237, 115712, 120187, 124662, 129137, 133612, 138087, 142562, 147037, 151512, 155987, 160462, 164937, 169412, 173887, 178362, 182837, 187312, 191787, 196262, 200737, 205213, 209688, 214163, 218638, 223113, 227588, 232063, 236538, 241013, 245488, 249963, 254438, 258913, 263388]# noqa: E501
    data1 = get_data(f'{prefix}/{uuid}', 1)
+    hit1 = 1
    # 第二次拳击攻击力 : {value2}%
    # REMOVE: data2 = [0, 73519, 80977, 88435, 95894, 103352, 110810, 118269, 125727, 133186, 140644, 148102, 155561, 163019, 170478, 177936, 185394, 192853, 200311, 207770, 215228, 222686, 230145, 237603, 245062, 252520, 259978, 267437, 274895, 282354, 289812, 297270, 304729, 312187, 319646, 327104, 334562, 342021, 349479, 356938, 364396, 371854, 379313, 386771, 394230, 401688, 409146, 416605, 424063, 431522, 438980]# noqa: E501
    data2 = get_data(f'{prefix}/{uuid}', 2)
+    hit2 = 1
    # 肩撞攻击力 : {value0}%
    # REMOVE: data0 = [0, 29407, 32391, 35374, 38357, 41341, 44324, 47308, 50291, 53274, 56258, 59241, 62224, 65208, 68191, 71174, 74158, 77141, 80125, 83108, 86091, 89075, 92058, 95041, 98025, 101008, 103991, 106975, 109958, 112941, 115925, 118908, 121892, 124875, 127858, 130842, 133825, 136808, 139792, 142775, 145758, 148742, 151725, 154708, 157692, 160675, 163659, 166642, 169625, 172609, 175592]# noqa: E501
    data0 = get_data(f'{prefix}/{uuid}', 0)
@@ -1552,7 +1623,7 @@ class Skill38(ActiveSkill):
    learnLv = 80
    masterLv = 40
    maxLv = 50
-    position = 0 #TODO
+    position = 3 #TODO
    rangeLv = 2
    cube = 5
    cd = 50
@@ -1566,12 +1637,15 @@ class Skill38(ActiveSkill):
    # 捶击攻击力 : {value0}%
    # REMOVE: data0 = [0, 15309, 16862, 18415, 19968, 21521, 23074, 24628, 26181, 27734, 29287, 30840, 32393, 33946, 35499, 37052, 38605, 40158, 41711, 43265, 44818, 46371, 47924, 49477, 51030, 52583, 54136, 55689, 57242, 58795, 60349, 61902, 63455, 65008, 66561, 68114, 69667, 71220, 72773, 74326, 75879, 77432, 78986, 80539, 82092, 83645, 85198, 86751, 88304, 89857, 91410]# noqa: E501
    data0 = get_data(f'{prefix}/{uuid}', 0)
+    hit0 = 1
    # 斩击攻击力 : {value2}%
    # REMOVE: data2 = [0, 130127, 143328, 156529, 169730, 182931, 196133, 209334, 222535, 235736, 248938, 262139, 275340, 288541, 301743, 314944, 328145, 341346, 354548, 367749, 380950, 394151, 407353, 420554, 433755, 446956, 460157, 473359, 486560, 499761, 512962, 526164, 539365, 552566, 565767, 578969, 592170, 605371, 618572, 631774, 644975, 658176, 671377, 684579, 697780, 710981, 724182, 737384, 750585, 763786, 776987]# noqa: E501
    data2 = get_data(f'{prefix}/{uuid}', 2)
+    hit2 = 1
    # 刺击攻击力 : {value1}%
    # REMOVE: data1 = [0, 7655, 8431, 9208, 9984, 10761, 11537, 12314, 13090, 13867, 14643, 15420, 16196, 16973, 17750, 18526, 19303, 20079, 20856, 21632, 22409, 23185, 23962, 24738, 25515, 26292, 27068, 27845, 28621, 29398, 30174, 30951, 31727, 32504, 33280, 34057, 34834, 35610, 36387, 37163, 37940, 38716, 39493, 40269, 41046, 41822, 42599, 43376, 44152, 44929, 45705]# noqa: E501
    data1 = get_data(f'{prefix}/{uuid}', 1)
+    hit1 = 1
    # 压制力 (4人队伍) : <소수1+>秒 (<소수1+>秒)
    # [范围信息]
    # 攻击范围比率 : {value2}%
@@ -1621,7 +1695,7 @@ class Skill39(ActiveSkill):
    learnLv = 85
    masterLv = 40
    maxLv = 50
-    position = 0 #TODO
+    position = 5 #TODO
    rangeLv = 5
    cube = 10
    cd = 170
@@ -1653,15 +1727,21 @@ class Skill39(ActiveSkill):
    # 直拳攻击力 : {value6}%
    # REMOVE: data6 = [0, 9494, 11696, 13897, 16099, 18300, 20502, 22703, 24905, 27106, 29308, 31509, 33711, 35912, 38114, 40315, 42517, 44718, 46920, 49121, 51323, 53524, 55726, 57927, 60129, 62330, 64532, 66733, 68935, 71137, 73338, 75540, 77741, 79943, 82144, 84346, 86547, 88749, 90950, 93152, 95353, 97555, 99756, 101958, 104159, 106361, 108562, 110764, 112965, 115167, 117368]# noqa: E501
    data6 = get_data(f'{prefix}/{uuid}', 6)
+    hit6 = 11
    # 下砸攻击力 : {value7}%
    # REMOVE: data7 = [0, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10]# noqa: E501
    data7 = get_data(f'{prefix}/{uuid}', 7)
    # 白手套攻击力 : {value11}%
    # REMOVE: data11 = [0, 158234, 194926, 231618, 268310, 305002, 341694, 378386, 415078, 451770, 488461, 525153, 561845, 598537, 635229, 671921, 708613, 745305, 781997, 818689, 855381, 892073, 928765, 965457, 1002149, 1038841, 1075533, 1112224, 1148916, 1185608, 1222300, 1258992, 1295684, 1332376, 1369068, 1405760, 1442452, 1479144, 1515836, 1552528, 1589220, 1625912, 1662604, 1699296, 1735988, 1772679, 1809371, 1846063, 1882755, 1919447, 1956139]# noqa: E501
    data11 = get_data(f'{prefix}/{uuid}', 11)
+    hit11 = 1
    # 最后一击冲击波攻击力 : {value8}%
    # REMOVE: data8 = [0, 22153, 27290, 32427, 37563, 42700, 47837, 52974, 58111, 63248, 68385, 73521, 78658, 83795, 88932, 94069, 99206, 104343, 109480, 114616, 119753, 124890, 130027, 135164, 140301, 145438, 150575, 155711, 160848, 165985, 171122, 176259, 181396, 186533, 191670, 196806, 201943, 207080, 212217, 217354, 222491, 227628, 232765, 237901, 243038, 248175, 253312, 258449, 263586, 268723, 273859]# noqa: E501
    data8 = get_data(f'{prefix}/{uuid}', 8)
+    hit8 = 1
+
+    hit9 = 1
+    hit10 = 1

 # 启源·微观宇宙
 # priest_female/infighter_female/3b712691fcaaaa80438e5e31b6451884
@@ -1686,7 +1766,7 @@ class Skill40(PassiveSkill):
    learnLv = 95
    masterLv = 40
    maxLv = 50
-    position = 0 #TODO
+    position = 1 #TODO
    rangeLv = 3
    uuid = "3b712691fcaaaa80438e5e31b6451884"
    hasVP = False
@@ -1705,6 +1785,8 @@ class Skill40(PassiveSkill):
    # REMOVE: data1 = [0, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400, 400]# noqa: E501
    data1 = get_data(f'{prefix}/{uuid}', 1)

+    associate = [{"data":data0}]
+
 # Excel 驱动
 # priest_female/infighter_female/f8226512ea3dbcb1fe1374baa0c6bbee
 # 0c1b401bb09241570d364420b3ba3fd7/f8226512ea3dbcb1fe1374baa0c6bbee
@@ -1722,7 +1804,7 @@ class Skill41(ActiveSkill):
    learnLv = 95
    masterLv = 40
    maxLv = 50
-    position = 0 #TODO
+    position = 6 #TODO
    rangeLv = 2
    cube = 7
    cd = 60
@@ -1735,6 +1817,7 @@ class Skill41(ActiveSkill):
    # 冲击波攻击力 : {value0}%
    # REMOVE: data0 = [0, 90538, 99723, 108908, 118093, 127279, 136464, 145649, 154834, 164019, 173204, 182389, 191574, 200759, 209944, 219129, 228314, 237499, 246684, 255869, 265054, 274239, 283424, 292609, 301794, 310979, 320165, 329350, 338535, 347720, 356905, 366090, 375275, 384460, 393645, 402830, 412015, 421200, 430385, 439570, 448755, 457940, 467125, 476310, 485495, 494680, 503866, 513051, 522236, 531421, 540606]# noqa: E501
    data0 = get_data(f'{prefix}/{uuid}', 0)
+    hit0 = 3

 # 弗格纳斯·沃伦塔利斯
 # priest_female/infighter_female/96c8ddd388e1b08e7fc98c5041382e26
@@ -1753,7 +1836,7 @@ class Skill42(ActiveSkill):
    learnLv = 100
    masterLv = 40
    maxLv = 50
-    position = 0 #TODO
+    position = 5 #TODO
    rangeLv = 5
    cube = 15
    cd = 270
@@ -1763,17 +1846,20 @@ class Skill42(ActiveSkill):
    hasUP = False
    custom = get_data(f'{prefix}/{uuid}', "custom") # noqa: E501

+    hit0 = 5
    # 开启冲击波攻击力 : {value1}% x{value2}
    # REMOVE: data1 = [0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5]# noqa: E501
    data1 = get_data(f'{prefix}/{uuid}', 1)
    # REMOVE: data2 = [0, 616268, 759171, 902074, 1044976, 1187879, 1330782, 1473685, 1616587, 1759490, 1902393, 2045296, 2188198, 2331101, 2474004, 2616907, 2759809, 2902712, 3045615, 3188518, 3331420, 3474323, 3617226, 3760129, 3903031, 4045934, 4188837, 4331740, 4474642, 4617545, 4760448, 4903351, 5046253, 5189156, 5332059, 5474962, 5617864, 5760767, 5903670, 6046573, 6189475, 6332378, 6475281, 6618184, 6761086, 6903989, 7046892, 7189794, 7332697, 7475600, 7618503]# noqa: E501
    data2 = get_data(f'{prefix}/{uuid}', 2)
+    hit2 = 1
    # 蕴含意志的拳头 攻击力 : {value3}%
    # REMOVE: data3 = [0, 51062, 62903, 74743, 86584, 98424, 110265, 122105, 133946, 145786, 157627, 169467, 181308, 193148, 204989, 216829, 228670, 240510, 252351, 264191, 276032, 287872, 299713, 311554, 323394, 335235, 347075, 358916, 370756, 382597, 394437, 406278, 418118, 429959, 441799, 453640, 465480, 477321, 489161, 501002, 512842, 524683, 536523, 548364, 560204, 572045, 583885, 595726, 607566, 619407, 631247]# noqa: E501
    data3 = get_data(f'{prefix}/{uuid}', 3)
    # 击退冲击波攻击力 : {value4}% x{value5}
    # REMOVE: data4 = [0, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5]# noqa: E501
    data4 = get_data(f'{prefix}/{uuid}', 4)
+    hit4 = 5
    # data5 = None # TOCHECK    # REMOVE: data5 = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]# noqa: E501
    data5 = get_data(f'{prefix}/{uuid}', 5)

@@ -1789,11 +1875,11 @@ class classChange(Character):
        self.jobId = '0c1b401bb09241570d364420b3ba3fd7'
        self.jobGrowId = '92da05ec93fb43406e193ffb9a2a629b'

-        self.武器选项 = [] # TODO
-        self.输出类型选项 = [] # TODO
-        self.输出类型 = '' # TODO
-        self.防具精通属性 = [''] # TODO
+        self.武器选项 = ['光杖', '念珠', '图腾', '镰刀', '战斧'] # TODO
+        self.输出类型选项 = ['物理百分比'] # TODO
+        self.输出类型 = '物理百分比' # TODO
+        self.防具精通属性 = ['力量'] # TODO
        self.防具类型 = ''
-        self.buff = ... # TODO
+        self.buff = 2.083 # TODO

        super().__init__(equVersion, __name__)