dev

backend/core/character/GF/fighter_male/brawler_male.py

@@ -191,7 +191,10 @@ class Skill22(ActiveSkill):
     maxLv = 70
     position = 2
     rangeLv = 3
-    cd = 7
+    # 装填cd
+    # cd = 7
+    # 投掷cd
+    cd = 2
     mp = [50, 420]
     uuid = "762c4e6d030eaf0abbfe1fec2b298574"
 
@@ -207,9 +210,6 @@ class Skill22(ActiveSkill):
     data2 = [0, 3434, 3971, 4522, 5068, 5615, 6164, 6710, 7254, 7800, 8349, 8896, 9442, 9993, 10538, 11086, 11630, 12179, 12719, 13272, 13821, 14362, 14918, 15456, 16002, 16548, 17097, 17644, 18188, 18741, 19290, 19830, 20378, 20925, 21473, 22018, 22569, 23106, 23661, 24203, 24750, 25298, 25845, 26391, 26936, 27489, 28035, 28575, 29126, 29674, 30219, 30767, 31316, 31865, 32404, 32951, 33497, 34049, 34593, 35139, 35690, 36230, 36778, 37322, 37876, 38423, 38969, 39516, 40064, 40608, 41150]# noqa: E501
     hit2 = 1
 
-    # 投掷冷却时间，非装填时间
-    data3 = [0, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2]# noqa: E501
-
     # 双重投掷部分
     data4 = data3
     hit4 = 1
@@ -345,7 +345,9 @@ class Skill30(ActiveSkill):
     maxLv = 70
     position = 3
     rangeLv = 2
-    cd = 6
+    # cd = 6
+    # 投掷CD
+    cd = 3
     mp = [50, 420]
     uuid = "38612d8f2561edc2eb68d5057a837bfa"
 
@@ -365,8 +367,6 @@ class Skill30(ActiveSkill):
     data3 = [0, 840, 926, 1012, 1096, 1180, 1270, 1353, 1438, 1527, 1613, 1693, 1780, 1867, 1948, 2035, 2123, 2208, 2292, 2377, 2465, 2550, 2632, 2720, 2805, 2893, 2978, 3063, 3148, 3237, 3320, 3405, 3490, 3580, 3662, 3747, 3834, 3918, 4004, 4090, 4177, 4264, 4345, 4434, 4520, 4604, 4689, 4775, 4860, 4949, 5029, 5114, 5200, 5285, 5370, 5454, 5544, 5627, 5714, 5800, 5887, 5970, 6055, 6144, 6227, 6310, 6400, 6484, 6569, 6650, 6739]# noqa: E501
     hit3 = 4
 
-    # 投掷冷却时间，非装填时间
-    data4 = [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
     # 双重投掷部分
     data5 = data0
     hit5 = 1
@@ -447,7 +447,8 @@ class Skill34(ActiveSkill):
     maxLv = 70
     position = 4
     rangeLv = 2
-    cd = 6
+    # cd = 6
+    cd = 4
     mp = [50, 420]
     uuid = "bc11d28c04e01923a093d65752c55516"
 
@@ -463,9 +464,6 @@ class Skill34(ActiveSkill):
     data2 = [0, 6565, 7242, 7908, 8575, 9240, 9906, 10577, 11244, 11915, 12580, 13241, 13911, 14578, 15247, 15909, 16584, 17245, 17908, 18576, 19247, 19912, 20580, 21247, 21920, 22586, 23246, 23917, 24580, 25250, 25911, 26588, 27248, 27912, 28587, 29248, 29923, 30586, 31256, 31926, 32589, 33260, 33927, 34586, 35255, 35921, 36589, 37254, 37930, 38598, 39260, 39923, 40594, 41256, 41922, 42594, 43262, 43930, 44598, 45264, 45926, 46595, 47265, 47932, 48608, 49261, 49941, 50597, 51265, 51928, 52600]# noqa: E501
     hit2 = 1
 
-    # 投掷冷却时间，非装填时间
-    data3 = [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
-
     # 双重投掷部分
     data4 = data0
     hit4 = 1
@@ -564,7 +562,7 @@ class Skill38(PassiveSkill):
     learnLv = 40
     masterLv = 1
     maxLv = 11
-    position = 0 #TODO
+    position = 5
     rangeLv = 3
     cube = 1
     uuid = "b3659936a9a74c4ed6f7faf07cca1f9e"
@@ -646,8 +644,11 @@ class Skill41(PassiveSkill):
     uuid = "ab6fc3303df03b58911967dfca2b5d07"
 
     data0 = [0, 1.5, 3, 4.5, 6, 7.5, 9, 10.5, 12, 13.5, 15, 16.5, 18, 19.5, 21, 22.5, 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]# noqa: E501
-
-    associate = [ {"data":data0,"type":"*skillRation"} ]
+    data3 = [0, 98, 96, 93, 91, 88, 86, 83, 81, 78, 76, 73, 71, 68, 66, 63, 61, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60, 60]# noqa: E501
+    associate = [
+        {"data":data0,"type":"*skillRation"},
+        {"data":data3,"type":"*CDReduce","skills":["抛沙","毒瓶投掷","毒针投掷","砖块投掷"]},
+    ]
 
 
 # 天崩地裂 천붕지괴