diff --git a/backend/core/basic/skill.py b/backend/core/basic/skill.py
index 9e8f92be..8417d900 100644
--- a/backend/core/basic/skill.py
+++ b/backend/core/basic/skill.py
@@ -135,7 +135,7 @@ class Skill:
return True
def apply_association(self, type, old, new, data, skills, exceptSkills,ratio = 100,weapon = []):
- if self.char.GetWeaponType()[0] not in weapon:
+ if (self.char.GetWeaponType()[0] not in weapon) and not (self.char.GetWeaponType()[0] is None and len(weapon) == len(self.char.武器选项)):
return
if type.startswith('$*'):
if 'cdReduce' in type:
@@ -157,7 +157,7 @@ class Skill:
self.update_skill_attribute(skill,type, old, new, data,ratio,weapon)
def update_skill_attribute(self,skill, type, old, new, data,ratio = 100,weapon = []):
- if self.char.GetWeaponType()[0] not in weapon:
+ if (self.char.GetWeaponType()[0] not in weapon) and not (self.char.GetWeaponType()[0] is None and len(weapon) == len(self.char.武器选项)):
return
if type.startswith('*'):
if 'cdReduce' in type or type == 'cd' or 'cdRatio' in type:
diff --git a/backend/core/character/GF/fighter_female/grappler_female.py b/backend/core/character/GF/fighter_female/grappler_female.py
index cd6381cb..0b66073c 100755
--- a/backend/core/character/GF/fighter_female/grappler_female.py
+++ b/backend/core/character/GF/fighter_female/grappler_female.py
@@ -219,6 +219,7 @@ class Skill20(ActiveSkill):
mp = [126, 975]
uuid = "92360eab6e1f378902018eca681ac629"
damage = False
+ buff = True
# 滑行抓取 슬라이딩 그랩
@@ -257,10 +258,8 @@ class Skill23(PassiveSkill):
rangeLv = 5
uuid = "2f5d03c7848effbc0a23f4df45d9ca46"
data0 = [0, 20, 22, 24, 26, 28, 30, 32, 34, 36, 38, 40]# noqa: E501
- hit0 = 1 #TODO
- data1 = [0, 10, 10.5, 11, 11.5, 12, 12.5, 13, 13.5, 14, 14.5, 15]# noqa: E501
- hit1 = 1 #TODO
+ associate = [{"data":data0,"skills":["背摔","抛投","霹雳肘击","空绞锤","螺旋彗星落","地狱摇篮","裂石破天","末日风暴","死亡摇篮","末日摇篮","风暴之舞","苍宇彗星落","送葬舞步","女皇时代·辉煌舞台"]}]# noqa: E501
# 折颈 넥 스냅
@@ -370,9 +369,6 @@ class Skill31(ActiveSkill):
data0 = [0, 19560, 21548, 23525, 25515, 27494, 29487, 31467, 33454, 35433, 37422, 39406, 41390, 43374, 45358, 47347, 49331, 51315, 53298, 55284, 57265, 59255, 61236, 63221, 65205, 67187, 69175, 71160, 73144, 75126, 77110, 79098, 81078, 83067, 85046, 87037, 89019, 91004, 92987, 94971, 96958, 98942, 100929, 102910, 104899, 106877, 108868, 110852, 112836, 114820, 116799, 118789, 120773, 122755, 124743, 126723, 128716, 130693, 132682, 134662, 136649, 138632, 140617, 142606, 144583, 146572, 148555, 150545, 152526, 154513, 156492]# noqa: E501
hit0 = 1 #TODO
- data1 = [0, 100, 101, 102, 103, 103, 104, 105, 106, 107, 108, 109, 109, 110, 111, 112, 113, 114, 115, 116, 116, 117, 118, 119, 120, 121, 122, 122, 123, 124, 125, 126, 127, 128, 128, 129, 130, 131, 132, 133, 134, 134, 135, 136, 137, 138, 139, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140, 140]# noqa: E501
- hit1 = 1 #TODO
-
# 螺旋彗星落 스파이어
# https://api.neople.co.kr/df/skills/a7a059ebe9e6054c0644b40ef316d6e9/d085127b0edd719782bd618d5688f4a1?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0
@@ -454,21 +450,28 @@ class Skill36(ActiveSkill):
cd = 45
mp = [360, 3024]
uuid = "d53301bb328baf12a3ae482cc6a565dd"
- # data0 = [0, 9000, 9906, 10821, 11735, 12650, 13559, 14474, 15383, 16302, 17211, 18120, 19034, 19953, 20862, 21777, 22691, 23598, 24518, 25425, 26348, 27254, 28169, 29081, 29993, 30902, 31820, 32727, 33651, 34554, 35469, 36380, 37293, 38204, 39123, 40034, 40958, 41861, 42774, 43686, 44603, 45506, 46428, 47337, 48248, 49163, 50075, 50988, 51905, 52812, 53730, 54638, 55553, 56466, 57375, 58292, 59205, 60117, 61034, 61938, 62855, 63767, 64682, 65591, 66510, 67421, 68333, 69239, 70154, 71070, 71984]# noqa: E501
- # hit0 = 1 #TODO
+ data0 = [0, 9000, 9906, 10821, 11735, 12650, 13559, 14474, 15383, 16302, 17211, 18120, 19034, 19953, 20862, 21777, 22691, 23598, 24518, 25425, 26348, 27254, 28169, 29081, 29993, 30902, 31820, 32727, 33651, 34554, 35469, 36380, 37293, 38204, 39123, 40034, 40958, 41861, 42774, 43686, 44603, 45506, 46428, 47337, 48248, 49163, 50075, 50988, 51905, 52812, 53730, 54638, 55553, 56466, 57375, 58292, 59205, 60117, 61034, 61938, 62855, 63767, 64682, 65591, 66510, 67421, 68333, 69239, 70154, 71070, 71984]# noqa: E501
+ hit0 = 1
- # data1 = [0, 2994, 3300, 3603, 3908, 4208, 4515, 4820, 5121, 5423, 5733, 6032, 6333, 6641, 6944, 7247, 7550, 7854, 8157, 8462, 8768, 9065, 9378, 9680, 9987, 10287, 10592, 10895, 11202, 11502, 11808, 12108, 12414, 12717, 13026, 13323, 13629, 13929, 14238, 14540, 14847, 15150, 15453, 15758, 16065, 16362, 16664, 16974, 17273, 17577, 17883, 18191, 18489, 18795, 19097, 19398, 19706, 20010, 20315, 20621, 20924, 21231, 21528, 21834, 22137, 22445, 22745, 23049, 23352, 23655, 23961]# noqa: E501
- # hit1 = 1 #TODO
+ data1 = [0, 2994, 3300, 3603, 3908, 4208, 4515, 4820, 5121, 5423, 5733, 6032, 6333, 6641, 6944, 7247, 7550, 7854, 8157, 8462, 8768, 9065, 9378, 9680, 9987, 10287, 10592, 10895, 11202, 11502, 11808, 12108, 12414, 12717, 13026, 13323, 13629, 13929, 14238, 14540, 14847, 15150, 15453, 15758, 16065, 16362, 16664, 16974, 17273, 17577, 17883, 18191, 18489, 18795, 19097, 19398, 19706, 20010, 20315, 20621, 20924, 21231, 21528, 21834, 22137, 22445, 22745, 23049, 23352, 23655, 23961]# noqa: E501
+ hit1 = 3
- # data2 = [0, 11921, 13127, 14340, 15548, 16757, 17964, 19179, 20390, 21597, 22803, 24012, 25221, 26432, 27642, 28853, 30056, 31263, 32475, 33689, 34898, 36107, 37320, 38528, 39735, 40943, 42156, 43367, 44574, 45777, 46994, 48197, 49409, 50616, 51830, 53030, 54248, 55455, 56669, 57872, 59084, 60294, 61500, 62709, 63926, 65135, 66341, 67554, 68762, 69974, 71177, 72386, 73593, 74804, 76016, 77228, 78434, 79641, 80850, 82065, 83276, 84482, 85688, 86900, 88110, 89319, 90530, 91740, 92945, 94149, 95367]# noqa: E501
- # hit2 = 1 #TODO
+ data2 = [0, 11921, 13127, 14340, 15548, 16757, 17964, 19179, 20390, 21597, 22803, 24012, 25221, 26432, 27642, 28853, 30056, 31263, 32475, 33689, 34898, 36107, 37320, 38528, 39735, 40943, 42156, 43367, 44574, 45777, 46994, 48197, 49409, 50616, 51830, 53030, 54248, 55455, 56669, 57872, 59084, 60294, 61500, 62709, 63926, 65135, 66341, 67554, 68762, 69974, 71177, 72386, 73593, 74804, 76016, 77228, 78434, 79641, 80850, 82065, 83276, 84482, 85688, 86900, 88110, 89319, 90530, 91740, 92945, 94149, 95367]# noqa: E501
+ hit2 = 1
- # data3 = [0, 32150, 35414, 38673, 41939, 45198, 48456, 51723, 54978, 58241, 61508, 64767, 68027, 71295, 74556, 77811, 81078, 84330, 87591, 90860, 94122, 97386, 100644, 103902, 107172, 110433, 113693, 116955, 120213, 123476, 126741, 129998, 133262, 136526, 139785, 143046, 146310, 149571, 152832, 156093, 159350, 162617, 165876, 169137, 172400, 175659, 178919, 182190, 185448, 188709, 191973, 195231, 198497, 201762, 205016, 208278, 211545, 214808, 218063, 221330, 224588, 227852, 231111, 234372, 237636, 240897, 244155, 247419, 250680, 253941, 257208]# noqa: E501
- # hit3 = 1 #TODO
+ data3 = [0, 32150, 35414, 38673, 41939, 45198, 48456, 51723, 54978, 58241, 61508, 64767, 68027, 71295, 74556, 77811, 81078, 84330, 87591, 90860, 94122, 97386, 100644, 103902, 107172, 110433, 113693, 116955, 120213, 123476, 126741, 129998, 133262, 136526, 139785, 143046, 146310, 149571, 152832, 156093, 159350, 162617, 165876, 169137, 172400, 175659, 178919, 182190, 185448, 188709, 191973, 195231, 198497, 201762, 205016, 208278, 211545, 214808, 218063, 221330, 224588, 227852, 231111, 234372, 237636, 240897, 244155, 247419, 250680, 253941, 257208]# noqa: E501
+ hit3 = 1
+ # 随机应变 1.65已经在面板上体现了
data4 = [0, 57636, 63482, 69342, 75180, 81039, 86877, 92715, 98574, 104424, 110261, 116123, 121965, 127805, 133658, 139496, 145350, 151211, 157053, 162911, 168746, 174588, 180438, 186297, 192140, 197988, 203831, 209672, 215529, 221372, 227225, 233075, 238920, 244763, 250614, 256464, 262304, 268157, 274008, 279855, 285698, 291537, 297393, 303246, 309099, 314943, 320786, 326619, 332475, 338328, 344187, 350030, 355863, 361724, 367566, 373422, 379263, 385107, 390965, 396812, 402650, 408507, 414351, 420192, 426048, 431891, 437741, 443588, 449430, 455277, 461136]# noqa: E501
- hit4 = 1 #TODO
+ hit4 = 0
+ useAdapt = 0
+
+ def setMode(self, mode = None):
+ if self.useAdapt:
+ self.hit4 = 1
+ self.hit0 = self.hit1 = self.hit2 = self.hit3 = 0
# 抓取奥义 옷깃 잡기
@@ -535,18 +538,21 @@ class Skill40(ActiveSkill):
cd = 50
mp = [840, 1764]
uuid = "c5a2956d8ed3af1746ed2f76ca971a09"
- # data0 = [0, 4647, 5127, 5600, 6065, 6542, 7014, 7481, 7961, 8429, 8895, 9374, 9846, 10317, 10788, 11261, 11732, 12207, 12678, 13142, 13623, 14094, 14564, 15039, 15509, 15983, 16457, 16929, 17397, 17867, 18342, 18813, 19286, 19757, 20234, 20703, 21174, 21647, 22118, 22590, 23063, 23538, 24006, 24477, 24951, 25422, 25893, 26364, 26838, 27311, 27783]# noqa: E501
- # hit0 = 1 #TODO
+ data0 = [0, 4647, 5127, 5600, 6065, 6542, 7014, 7481, 7961, 8429, 8895, 9374, 9846, 10317, 10788, 11261, 11732, 12207, 12678, 13142, 13623, 14094, 14564, 15039, 15509, 15983, 16457, 16929, 17397, 17867, 18342, 18813, 19286, 19757, 20234, 20703, 21174, 21647, 22118, 22590, 23063, 23538, 24006, 24477, 24951, 25422, 25893, 26364, 26838, 27311, 27783]# noqa: E501
+ hit0 = 1 #TODO
data1 = [0, 92898, 102318, 111747, 121170, 130593, 140015, 149445, 158868, 168291, 177713, 187146, 196566, 205989, 215412, 224843, 234266, 243687, 253109, 262541, 271964, 281384, 290807, 300236, 309660, 319083, 328505, 337937, 347361, 356784, 366209, 375633, 385053, 394479, 403902, 413333, 422753, 432179, 441602, 451029, 460449, 469871, 479297, 488730, 498150, 507576, 516999, 526424, 535847, 545268, 554696]# noqa: E501
hit1 = 1 #TODO
- # data2 = [0, 91458, 100736, 110013, 119300, 128571, 137853, 147134, 156405, 165680, 174975, 184244, 193526, 202805, 212081, 221360, 230646, 239922, 249198, 258479, 267746, 277032, 286320, 295590, 304868, 314150, 323423, 332702, 341988, 351270, 360546, 369827, 379098, 388374, 397659, 406937, 416207, 425495, 434769, 444047, 453326, 462603, 471879, 481175, 490442, 499713, 509004, 518280, 527549, 536843, 546114]# noqa: E501
- # hit2 = 1 #TODO
+ data2 = [0, 91458, 100736, 110013, 119300, 128571, 137853, 147134, 156405, 165680, 174975, 184244, 193526, 202805, 212081, 221360, 230646, 239922, 249198, 258479, 267746, 277032, 286320, 295590, 304868, 314150, 323423, 332702, 341988, 351270, 360546, 369827, 379098, 388374, 397659, 406937, 416207, 425495, 434769, 444047, 453326, 462603, 471879, 481175, 490442, 499713, 509004, 518280, 527549, 536843, 546114]# noqa: E501
+ hit2 = 0
- # 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
- # hit3 = 1 #TODO
+ useAdapt = 0
+ def setMode(self, mode = None):
+ if self.useAdapt:
+ self.hit2 = 1
+ self.hit0 = self.hit1 = 0
# 极手奥义 체인 그랩
# https://api.neople.co.kr/df/skills/a7a059ebe9e6054c0644b40ef316d6e9/5892d1fa4462e561ac8f8d2c74892b0a?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0
@@ -576,12 +582,27 @@ class Skill42(ActiveSkill):
mp = [580, 4500]
uuid = "fc458e449ee00b01dbf88d09aae65462"
+ data0 = [0, 12686, 13972, 15255, 16541, 17829, 19116, 20401, 21687, 22975, 24266, 25552, 26837, 28125, 29410, 30694, 31981, 33270, 34559, 35845, 37130, 38416, 39705, 40990, 42274, 43562, 44849, 46138, 47426, 48709, 49998, 51284, 52570, 53856, 55143, 56434, 57718, 59005, 60291, 61578, 62863, 64150, 65435, 66727, 68013, 69299, 70583, 71871, 73157, 74443, 75728]# noqa: E501
+ hit0 = 1 #TODO
+
+ data1 = [0, 12686, 13972, 15255, 16541, 17829, 19116, 20401, 21687, 22975, 24266, 25552, 26837, 28125, 29410, 30694, 31981, 33270, 34559, 35845, 37130, 38416, 39705, 40990, 42274, 43562, 44849, 46138, 47426, 48709, 49998, 51284, 52570, 53856, 55143, 56434, 57718, 59005, 60291, 61578, 62863, 64150, 65435, 66727, 68013, 69299, 70583, 71871, 73157, 74443, 75728]# noqa: E501
+ hit1 = 5
+
+ data3 = [0, 19462, 21436, 23406, 25382, 27357, 29328, 31304, 33280, 35251, 37226, 39201, 41176, 43149, 45125, 47095, 49068, 51046, 53020, 54995, 56967, 58943, 60919, 62889, 64864, 66840, 68815, 70788, 72761, 74737, 76709, 78680, 80663, 82632, 84609, 86579, 88555, 90531, 92504, 94480, 96452, 98426, 100401, 102374, 104353, 106322, 108298, 110277, 112247, 114220, 116192]# noqa: E501
+ hit3 = 1 #TODO
+
data4 = [0, 18494, 20369, 22245, 24123, 26002, 27876, 29753, 31629, 33505, 35380, 37257, 39132, 41010, 42889, 44762, 46639, 48517, 50390, 52268, 54146, 56025, 57896, 59771, 61652, 63524, 65403, 67280, 69155, 71031, 72909, 74785, 76658, 78537, 80413, 82289, 84165, 86042, 87919, 89792, 91673, 93547, 95425, 97300, 99175, 101053, 102928, 104806, 106681, 108558, 110433]# noqa: E501
- hit4 = 1 #TODO
+ hit4 = 0
data5 = [0, 73982, 81482, 88987, 96497, 103999, 111502, 119011, 126516, 134018, 141522, 149033, 156537, 164037, 171547, 179055, 186554, 194067, 201568, 209072, 216583, 224083, 231588, 239091, 246603, 254105, 261609, 269119, 276622, 284124, 291634, 299136, 306642, 314154, 321657, 329156, 336659, 344171, 351677, 359178, 366689, 374194, 381692, 389203, 396706, 404210, 411720, 419224, 426729, 434228, 441739]# noqa: E501
- hit5 = 1 #TODO
+ hit5 = 0
+ useAdapt = 0
+
+ def setMode(self, mode = None):
+ if self.useAdapt:
+ self.hit4 = self.hit5 = 1
+ self.hit0 = self.hit1 = self.hit3 = 0
# 随机应变 턴 힐
# https://api.neople.co.kr/df/skills/a7a059ebe9e6054c0644b40ef316d6e9/2a0a39184de92acf1c1375e00b77404c?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0
@@ -594,6 +615,11 @@ class Skill43(PassiveSkill):
rangeLv = 3
uuid = "2a0a39184de92acf1c1375e00b77404c"
+ associate = [
+ {"type":"+useAdapt","skills":["裂石破天","死亡摇篮","末日摇篮","苍宇彗星落"],"data":[0,100]}
+ ]
+
+
# 风暴之舞 토르베지노
# https://api.neople.co.kr/df/skills/a7a059ebe9e6054c0644b40ef316d6e9/1812a1ece67bb37b6b44b54766450064?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0
class Skill44(ActiveSkill):
@@ -609,9 +635,7 @@ class Skill44(ActiveSkill):
uuid = "1812a1ece67bb37b6b44b54766450064"
data1 = [0, 12672, 13960, 15241, 16531, 17813, 19098, 20384, 21674, 22959, 24242, 25530, 26809, 28101, 29381, 30666, 31951, 33238, 34525, 35808, 37093, 38379, 39667, 40949, 42235, 43525, 44805, 46096, 47378, 48666, 49949, 51237, 52521, 53808, 55094, 56375, 57665, 58947, 60231, 61516, 62806, 64088, 65375, 66662, 67942, 69232, 70514, 71803, 73091, 74373, 75659]# noqa: E501
- hit1 = 6 #还是7？
-
- data2 = [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]# noqa: E501
+ hit1 = 6
data3 = [0, 35220, 38787, 42365, 45935, 49507, 53077, 56658, 60229, 63801, 67375, 70944, 74519, 78091, 81663, 85232, 88810, 92380, 95952, 99529, 103099, 106673, 110244, 113820, 117387, 120961, 124535, 128109, 131679, 135254, 138829, 142402, 145974, 149545, 153117, 156689, 160262, 163832, 167406, 170979, 174551, 178124, 181704, 185272, 188847, 192419, 195993, 199562, 203131, 206709, 210283]# noqa: E501
hit3 = 1 #TODO
@@ -630,17 +654,24 @@ class Skill45(ActiveSkill):
cd = 180
mp = [2500, 5000]
uuid = "d89f26862e348a801b30bb9fd7125db5"
- # data0 = [0, 30281, 37301, 44324, 51344, 58368, 65390, 72416, 79433, 86453, 93477, 100501, 107521, 114544, 121565, 128588, 135606, 142632, 149652, 156675, 163696, 170718, 177738, 184763, 191784, 198806, 205829, 212845, 219869, 226893, 233916, 240935, 247958, 254982, 262001, 269022, 276048, 283071, 290090, 297111, 304132, 311154, 318179, 325200, 332222, 339242, 346264, 353284, 360309, 367331, 374354]# noqa: E501
- # hit0 = 1 #TODO
+ data0 = [0, 30281, 37301, 44324, 51344, 58368, 65390, 72416, 79433, 86453, 93477, 100501, 107521, 114544, 121565, 128588, 135606, 142632, 149652, 156675, 163696, 170718, 177738, 184763, 191784, 198806, 205829, 212845, 219869, 226893, 233916, 240935, 247958, 254982, 262001, 269022, 276048, 283071, 290090, 297111, 304132, 311154, 318179, 325200, 332222, 339242, 346264, 353284, 360309, 367331, 374354]# noqa: E501
+ hit0 = 1 #TODO
- # data1 = [0, 186325, 229531, 272737, 315943, 359149, 402356, 445562, 488767, 531973, 575179, 618386, 661590, 704800, 748004, 791212, 834414, 877621, 920829, 964033, 1007238, 1050444, 1093652, 1136857, 1180065, 1223270, 1266478, 1309682, 1352888, 1396093, 1439300, 1482503, 1525713, 1568918, 1612122, 1655328, 1698536, 1741742, 1784946, 1828152, 1871359, 1914567, 1957771, 2000978, 2044185, 2087386, 2130595, 2173803, 2217007, 2260214, 2303421]# noqa: E501
- # hit1 = 1 #TODO
+ data1 = [0, 186325, 229531, 272737, 315943, 359149, 402356, 445562, 488767, 531973, 575179, 618386, 661590, 704800, 748004, 791212, 834414, 877621, 920829, 964033, 1007238, 1050444, 1093652, 1136857, 1180065, 1223270, 1266478, 1309682, 1352888, 1396093, 1439300, 1482503, 1525713, 1568918, 1612122, 1655328, 1698536, 1741742, 1784946, 1828152, 1871359, 1914567, 1957771, 2000978, 2044185, 2087386, 2130595, 2173803, 2217007, 2260214, 2303421]# noqa: E501
+ hit1 = 1 #TODO
data2 = [0, 22102, 27227, 32353, 37482, 42608, 47733, 52858, 57981, 63105, 68234, 73360, 78481, 83606, 88736, 93862, 98988, 104112, 109239, 114362, 119490, 124613, 129738, 134863, 139992, 145117, 150242, 155367, 160494, 165616, 170743, 175870, 180994, 186119, 191245, 196370, 201497, 206621, 211749, 216872, 221999, 227123, 232247, 237373, 242500, 247626, 252752, 257877, 263003, 268125, 273252]# noqa: E501
- hit2 = 1 #TODO
+ hit2 = 0
data3 = [0, 198977, 245112, 291248, 337392, 383530, 429672, 475806, 521946, 568087, 614224, 660369, 706504, 752644, 798782, 844921, 891062, 937200, 983337, 1029480, 1075618, 1121759, 1167898, 1214036, 1260176, 1306317, 1352458, 1398594, 1444732, 1490873, 1537011, 1583149, 1629292, 1675428, 1721568, 1767705, 1813846, 1859988, 1906122, 1952266, 1998404, 2044540, 2090681, 2136822, 2182963, 2229099, 2275236, 2321379, 2367518, 2413656, 2459797]# noqa: E501
- hit3 = 1 #TODO
+ hit3 = 0
+
+ useAdapt = 0
+
+ def setMode(self, mode = None):
+ if self.useAdapt:
+ self.hit2 = self.hit3 = 1
+ self.hit0 = self.hit1 = 0
# 送葬舞步 샤이닝 윙즈 플랩
@@ -711,3 +742,22 @@ class Skill48(ActiveSkill):
data5 = [0, 31792, 39163, 46536, 53908, 61279, 68651, 76022, 83395, 90768, 98139, 105510, 112881, 120255, 127627, 134998, 142370, 149741, 157113, 164488, 171860, 179231, 186602, 193975, 201345, 208720, 216091, 223462, 230834, 238205, 245579, 252951, 260322, 267694, 275066, 282437, 289809, 297181, 304552, 311925, 319299, 326669, 334041, 341416, 348785, 356157, 363530, 370900, 378272, 385645, 393016]# noqa: E501
hit5 = 6
+class classChange(Character):
+ def __init__(self, equVersion):
+
+ self.name = 'grappler_female'
+ self.nameCN = '归元·柔道家'
+ self.role = 'fighter_female'
+
+ self.武器选项 = ['手套', '臂铠','爪','东方棍']
+ self.输出类型选项 = ['物理固伤']
+ self.输出类型 = '物理固伤'
+ self.防具精通属性 = ['力量']
+ self.防具类型 = '轻甲'
+ self.buff = 2.215
+
+ self.角色 = '格斗家(女)'
+
+ self.职业 = '柔道家'
+
+ super().__init__(equVersion, __name__)
diff --git a/backend/core/character/GF/fighter_male/striker_male.py b/backend/core/character/GF/fighter_male/striker_male.py
index 7cb40757..c88f6376 100644
--- a/backend/core/character/GF/fighter_male/striker_male.py
+++ b/backend/core/character/GF/fighter_male/striker_male.py
@@ -416,6 +416,7 @@ class Skill25(ActiveSkill):
cd = 145
mp = [500, 4480]
uuid = "01384bbfc346775d1267fa0bc4ca605f"
+ bind = False
data0 = [0, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15]# noqa: E501
@@ -441,6 +442,7 @@ class Skill26(ActiveSkill):
cd = 145
mp = [850, 7000]
uuid = "c39c703f72d289fcd5a8f182068140d4"
+ bind = True
data0 = [0, 66520, 81946, 97369, 112792, 128218, 143642, 159068, 174493, 189918, 205341, 220767, 236192, 251621, 267043, 282468, 297896, 313317, 328745, 344167, 359595, 375018, 390443, 405869, 421291, 436718, 452143, 467565, 482992, 498418, 513841, 529265, 544690, 560118, 575544, 590969, 606390, 621816, 637241, 652666, 668090, 683521, 698946, 714363, 729793, 745215, 760642, 776068, 791491, 806918, 822340]# noqa: E501
hit0 = 1
diff --git a/backend/core/character/GF/mage_female/battle_mage.py b/backend/core/character/GF/mage_female/battle_mage.py
index 4c60cca6..d92e15ce 100644
--- a/backend/core/character/GF/mage_female/battle_mage.py
+++ b/backend/core/character/GF/mage_female/battle_mage.py
@@ -433,8 +433,10 @@ class Skill23(ActiveSkill):
data4 = [0, 25629, 28229, 30829, 33429, 36029, 38629, 41229, 43829, 46429, 49029, 51629, 54229, 56829, 59429, 62029, 64629, 67229, 69829, 72429, 75029, 77630, 80230, 82830, 85430, 88030, 90630, 93230, 95830, 98430, 101030, 103630, 106230, 108830, 111430, 114030, 116630, 119230, 121830, 124430, 127030, 129630, 132230, 134830, 137430, 140030, 142630, 145230, 147830, 150430, 153030, 155630, 158231, 160831, 163431, 166031, 168631, 171231, 173831, 176431, 179031, 181631, 184231, 186831, 189431, 192031, 194631, 197231, 199831, 202431, 205031]# noqa: E501
hit4 = 0
+ useChange = 0
+
def setMode(self, mode):
- if self.char.GetSkillByName("煌龙乱舞").lv > 0:
+ if self.useChange:
self.hit0 = self.hit1 = self.hit2 = 0
self.hit3 = 5
self.hit4 = 1
@@ -451,6 +453,8 @@ class Skill24(PassiveSkill):
rangeLv = 2
uuid = "573723c8c0614f5b1218ca9ff992115b"
+ associate = [{"type":"+change", "data":[0,100]}]
+
# 斗神意志 배틀 그루브
# https://api.neople.co.kr/df/skills/3909d0b188e9c95311399f776e331da5/dcb31a63ef58954f44ff2070c42a9a98?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0
diff --git a/backend/core/character/adventure.py b/backend/core/character/adventure.py
index 1888a204..47354165 100644
--- a/backend/core/character/adventure.py
+++ b/backend/core/character/adventure.py
@@ -46,7 +46,7 @@ adv = [
{'id': 0, 'name': 'nenmaster_female', 'title': '归元·气功师', 'open': True, 'class': 'GF.fighter_female.nenmaster_female'},
{'id': 1, 'name': 'striker_female', 'title': '归元·散打', 'open': True,'class':"GF.fighter_female.striker_female"},
{'id': 2, 'name': 'brawler_female', 'title': '归元·街霸', 'open': False},
- {'id': 3, 'name': 'grappler_female', 'title': '归元·柔道家', 'open': False},
+ {'id': 3, 'name': 'grappler_female', 'title': '归元·柔道家', 'open': True,'class':"GF.fighter_female.grappler_female"},
{'name': 'sponsor', 'url': 'https://bbs.colg.cn', 'title': '', 'open': True},
],
},
diff --git a/frontend/index.html b/frontend/index.html
index 9a63f109..c7d542e1 100644
--- a/frontend/index.html
+++ b/frontend/index.html
@@ -2,7 +2,7 @@
-
+
diff --git a/frontend/src/pages/Character/Skill/components/SkillTree/index.tsx b/frontend/src/pages/Character/Skill/components/SkillTree/index.tsx
index 09e557de..c86929f5 100644
--- a/frontend/src/pages/Character/Skill/components/SkillTree/index.tsx
+++ b/frontend/src/pages/Character/Skill/components/SkillTree/index.tsx
@@ -41,7 +41,7 @@ export default defineComponent({
const lvList = [15, 20, 25, 30, 35, 40, 45, 50, 60, 70, 80, 90, 100]
- const columns = [...new Array(10).keys()]
+ const columns = [...new Array(11).keys()]
const activeSkill = ref(-1)