From 474620b0eb72c1d3bb83ff004834324b7abb5ce2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=A5=BF=E7=93=9C=C2=B0?= Date: Mon, 28 Apr 2025 10:47:38 +0800 Subject: [PATCH] dev --- .../GF/gunner_female/spitfire_female.py | 2 + .../GF/swordman_female/sword_master.py | 192 ++++++++---------- backend/core/equipment/version_0/stone.py | 16 +- backend/dataFiles/dcalc_0.db | Bin 1007616 -> 1007616 bytes 4 files changed, 95 insertions(+), 115 deletions(-) diff --git a/backend/core/character/GF/gunner_female/spitfire_female.py b/backend/core/character/GF/gunner_female/spitfire_female.py index ac883214..4c700eb6 100644 --- a/backend/core/character/GF/gunner_female/spitfire_female.py +++ b/backend/core/character/GF/gunner_female/spitfire_female.py @@ -235,6 +235,7 @@ class Skill11(ActiveSkill): mp = [150, 1232] data0 = [0, 21240, 23396, 25550, 27705, 29861, 32015, 34170, 36324, 38480, 40635, 42789, 44945, 47099, 49254, 51411, 53564, 55719, 57873, 60029, 62186, 64338, 66495, 68648, 70803, 72960, 75113, 77270, 79422, 81579, 83735, 85887, 88044, 90197, 92354, 94509, 96663, 98819, 100971, 103128, 105284, 107438, 109593, 111746, 113903, 116058, 118212, 120368, 122522, 124677, 126833, 128987, 131142, 133296, 135452, 137607, 139761, 141917, 144071, 146226, 148382, 150536, 152691, 154845, 157001, 159156, 161310, 163466, 165620, 167775, 169932]# noqa: E501 + hit0 = 1 # 聚合弹 버스터 샷 @@ -250,6 +251,7 @@ class Skill12(ActiveSkill): mp = [150, 1232] data0 = [0, 24425, 26904, 29382, 31860, 34337, 36818, 39294, 41772, 44252, 46730, 49208, 51684, 54165, 56642, 59120, 61598, 64077, 66555, 69032, 71510, 73989, 76467, 78944, 81422, 83903, 86379, 88857, 91334, 93815, 96291, 98769, 101247, 103727, 106205, 108681, 111159, 113639, 116117, 118595, 121071, 123552, 126029, 128507, 130986, 133464, 135942, 138419, 140900, 143376, 145854, 148331, 150812, 153288, 155766, 158244, 160724, 163202, 165678, 168156, 170636, 173114, 175592, 178068, 180549, 183026, 185504, 187982, 190461, 192939, 195416]# noqa: E501 + hit0 = 1 # 凝固汽油弹 네이팜 탄 diff --git a/backend/core/character/GF/swordman_female/sword_master.py b/backend/core/character/GF/swordman_female/sword_master.py index f2821d25..981804cb 100644 --- a/backend/core/character/GF/swordman_female/sword_master.py +++ b/backend/core/character/GF/swordman_female/sword_master.py @@ -24,6 +24,29 @@ class Skill1(ActiveSkill): position = 4 #TODO rangeLv = 1 mp = [6, 6] + # 巨剑 180.53+205.90+127.83 + data0 = [int(i) for i in [0, 514.25]] + hit0 = 0 + # 太刀 122.81+170.41+195.72 + data1 = [int(i) for i in [0, 486.67]] + hit1 = 0 + # 短剑 (69.16+74.22+80.97+86.03)*2 + data2 = [int(i) for i in [0, 310.37]] + hit2 = 0 + # 钝器 102.14+153.95+179.12+76.98 + data3 = [int(i) for i in [0, 512.19]] + hit3 = 0 + + def setMode(self, mode): + weapon = self.char.GetWeaponType() + if weapon == "巨剑": + self.hit0 = 1 + if weapon == "太刀": + self.hit1 = 1 + if weapon == "短剑": + self.hit2 = 2 + if weapon == "钝器": + self.hit3 = 3 # 基础精通 기본기 숙련 @@ -43,54 +66,27 @@ class Skill2(PassiveSkill): associate = [{"type":"*skillRation","data":[i-100 if i>0 else 0 for i in data0],"skills":["帝国剑术"]}] - -# 十字剑 혈십자검 -# https://api.neople.co.kr/df/skills/1645c45aabb008c98406b3a16447040d/1b1cfab062e0768bcc889e33e1f30dbf?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill3(ActiveSkill): - name = "十字剑" - learnLv = 5 - masterLv = 60 - maxLv = 70 - position = 2 #TODO - rangeLv = 2 - cd = 3 - mp = [10, 170] - - data0 = [0, 552, 610, 666, 721, 779, 835, 892, 949, 1003, 1062, 1120, 1175, 1231, 1287, 1346, 1404, 1457, 1515, 1572, 1629, 1683, 1741, 1797, 1855, 1907, 1965, 2023, 2074, 2130, 2188, 2246, 2304, 2361, 2416, 2474, 2531, 2586, 2642, 2698, 2756, 2812, 2866, 2924, 2982, 3036, 3092, 3150, 3206, 3262, 3320, 3376, 3434, 3492, 3544, 3602, 3658, 3716, 3771, 3827, 3884, 3942, 3995, 4053, 4107, 4163, 4219, 4276, 4333, 4391, 4444]# noqa: E501 - hit0 = 1 #TODO - - data1 = [0, 1076, 1185, 1295, 1406, 1515, 1624, 1732, 1843, 1953, 2062, 2171, 2280, 2394, 2499, 2610, 2720, 2827, 2939, 3048, 3155, 3267, 3376, 3480, 3592, 3703, 3811, 3920, 4031, 4138, 4250, 4360, 4466, 4578, 4687, 4794, 4906, 5015, 5124, 5234, 5343, 5450, 5562, 5673, 5778, 5889, 5999, 6112, 6220, 6327, 6440, 6547, 6657, 6769, 6875, 6985, 7096, 7200, 7313, 7424, 7531, 7640, 7749, 7857, 7968, 8080, 8186, 8294, 8406, 8515, 8628]# noqa: E501 - hit1 = 1 #TODO - - data2 = [0, 933, 1027, 1124, 1214, 1312, 1408, 1503, 1595, 1692, 1787, 1882, 1972, 2067, 2166, 2258, 2351, 2448, 2543, 2638, 2732, 2827, 2924, 3018, 3111, 3206, 3300, 3397, 3494, 3585, 3680, 3777, 3873, 3966, 4056, 4153, 4250, 4342, 4437, 4534, 4629, 4721, 4816, 4911, 5010, 5100, 5197, 5292, 5384, 5481, 5574, 5671, 5765, 5860, 5953, 6052, 6142, 6236, 6334, 6426, 6523, 6615, 6713, 6807, 6902, 6996, 7094, 7186, 7281, 7375, 7468]# noqa: E501 - hit2 = 1 #TODO - - 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, 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 - - # 招架反击 반격 # https://api.neople.co.kr/df/skills/1645c45aabb008c98406b3a16447040d/2f5d03c7848effbc0a23f4df45d9ca46?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill4(ActiveSkill): +class Skill3(ActiveSkill): name = "招架反击" learnLv = 15 masterLv = 60 maxLv = 70 position = 8 #TODO rangeLv = 2 - cd = [2, 2, 2, 2, 2, 2.1, 2.1, 2.1, 2.1, 2.1, 2.1, 2.1, 2.1, 2.2, 2.2, 2.2, 2.2, 2.2, 2.2, 2.2, 2.2, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.4, 2.4, 2.4, 2.4, 2.4, 2.4, 2.4, 2.4, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.6, 2.6, 2.6, 2.6, 2.6, 2.6, 2.6, 2.6, 2.7, 2.7, 2.7, 2.7, 2.7, 2.7, 2.7, 2.7, 2.8, 2.8, 2.8, 2.8, 2.8, 2.8, 2.8, 2.8, 2.9] - mp = [17, 390] + cdList = [0,2, 2, 2, 2, 2, 2.1, 2.1, 2.1, 2.1, 2.1, 2.1, 2.1, 2.1, 2.2, 2.2, 2.2, 2.2, 2.2, 2.2, 2.2, 2.2, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.3, 2.4, 2.4, 2.4, 2.4, 2.4, 2.4, 2.4, 2.4, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.5, 2.6, 2.6, 2.6, 2.6, 2.6, 2.6, 2.6, 2.6, 2.7, 2.7, 2.7, 2.7, 2.7, 2.7, 2.7, 2.7, 2.8, 2.8, 2.8, 2.8, 2.8, 2.8, 2.8, 2.8, 2.9] + + damage = False - data0 = [0, 2454, 2702, 2950, 3202, 3451, 3700, 3951, 4199, 4449, 4699, 4947, 5196, 5446, 5694, 5942, 6190, 6442, 6692, 6940, 7188, 7436, 7686, 7936, 8184, 8432, 8682, 8931, 9179, 9427, 9677, 9928, 10178, 10427, 10675, 10925, 11175, 11423, 11673, 11923, 12171, 12419, 12667, 12920, 13169, 13417, 13665, 13913, 14163, 14413, 14661, 14909, 15159, 15408, 15656, 15904, 16156, 16405, 16655, 16904, 17152, 17402, 17650, 17900, 18148, 18398, 18646, 18894, 19142, 19396, 19644]# noqa: E501 - hit0 = 1 #TODO - - 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 - hit1 = 1 #TODO + def getSkillCD(self): + self.cd = self.cdList[self.lv] + return super().getSkillCD() # 剑术精通 납도 # https://api.neople.co.kr/df/skills/1645c45aabb008c98406b3a16447040d/4224f9b0b8c7c903e9a1e0f9d9f6d04d?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill15(PassiveSkill): +class Skill4(PassiveSkill): name = "剑术精通" learnLv = 15 masterLv = 1 @@ -101,7 +97,7 @@ class Skill15(PassiveSkill): # 驭剑术 발검술 # https://api.neople.co.kr/df/skills/1645c45aabb008c98406b3a16447040d/78bd107acd474518b606be1e4fd38239?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill6(PassiveSkill): +class Skill5(PassiveSkill): name = "驭剑术" learnLv = 15 masterLv = 10 @@ -109,16 +105,12 @@ class Skill6(PassiveSkill): position = 6 #TODO rangeLv = 2 - data0 = [0, 2, 2, 2, 3, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6, 7, 7, 7, 8, 8]# noqa: E501 - hit0 = 1 #TODO - - data1 = [0, 10, 9, 8.5, 8, 7.5, 7, 6.5, 6, 5.5, 5, 4.5, 4, 3.5, 3, 2.8, 2.6, 2.4, 2.2, 2, 1.8]# noqa: E501 - hit1 = 1 #TODO + damage = False # 魔剑降临 속성변환 # https://api.neople.co.kr/df/skills/1645c45aabb008c98406b3a16447040d/ade01c1d6afc8a05055225045e89fe49?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 -class Skill7(ActiveSkill): +class Skill6(ActiveSkill): name = "魔剑降临" learnLv = 15 masterLv = 60 @@ -127,37 +119,33 @@ class Skill7(ActiveSkill): rangeLv = 2 cd = 5 mp = [94, 1029] - - data0 = [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 - hit0 = 1 #TODO - + # 火 data1 = [0, 203, 220, 242, 261, 283, 300, 323, 342, 364, 381, 403, 422, 448, 463, 487, 504, 527, 543, 568, 587, 609, 626, 648, 667, 691, 709, 730, 748, 771, 789, 811, 830, 852, 871, 890, 912, 932, 952, 971, 992, 1012, 1034, 1053, 1073, 1094, 1114, 1131, 1155, 1175, 1196, 1213, 1235, 1253, 1279, 1294, 1318, 1335, 1359, 1374, 1400, 1418, 1440, 1459, 1479, 1498, 1522, 1541, 1561, 1580, 1602]# noqa: E501 - hit1 = 1 #TODO - - 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 - hit2 = 1 #TODO - + hit1 = 0 + # 冰 data3 = [0, 203, 220, 242, 261, 283, 300, 323, 342, 364, 381, 403, 422, 448, 463, 487, 504, 527, 543, 568, 587, 609, 626, 648, 667, 691, 709, 730, 748, 771, 789, 811, 830, 852, 871, 890, 912, 932, 952, 971, 992, 1012, 1034, 1053, 1073, 1094, 1114, 1131, 1155, 1175, 1196, 1213, 1235, 1253, 1279, 1294, 1318, 1335, 1359, 1374, 1400, 1418, 1440, 1459, 1479, 1498, 1522, 1541, 1561, 1580, 1602]# noqa: E501 - hit3 = 1 #TODO - - data4 = [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 - hit4 = 1 #TODO - + hit3 = 0 + # 光 data5 = [0, 223, 257, 279, 296, 329, 344, 359, 393, 408, 439, 463, 488, 504, 529, 553, 568, 609, 624, 648, 672, 689, 713, 737, 769, 784, 816, 832, 849, 879, 896, 929, 952, 976, 992, 1015, 1041, 1056, 1095, 1112, 1136, 1160, 1175, 1201, 1224, 1255, 1272, 1304, 1320, 1335, 1367, 1384, 1417, 1440, 1464, 1479, 1503, 1527, 1544, 1583, 1600, 1624, 1648, 1663, 1687, 1711, 1743, 1760, 1791, 1808, 1823]# noqa: E501 hit5 = 1 #TODO - - data6 = [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 - hit6 = 1 #TODO - + # 暗 dot伤害，按秒伤看叠满两层是每秒4段 data7 = [0, 133, 145, 160, 172, 187, 203, 213, 230, 240, 255, 266, 279, 295, 310, 320, 335, 346, 363, 376, 385, 402, 417, 429, 442, 454, 470, 483, 497, 509, 524, 536, 551, 561, 577, 590, 606, 618, 631, 645, 658, 670, 686, 697, 711, 726, 740, 750, 767, 777, 793, 806, 818, 832, 849, 857, 873, 884, 900, 913, 925, 939, 954, 966, 980, 992, 1007, 1022, 1034, 1046, 1063]# noqa: E501 hit7 = 1 #TODO - data8 = [0, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5, 4.5]# noqa: E501 - hit8 = 1 #TODO + mode = ["火", "冰", "光", "暗"] - data9 = [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 - hit9 = 1 #TODO + def setMode(self, mode): + if mode == "火": + self.hit1 = 1 + elif mode == "冰": + self.hit3 = 1 + elif mode == "光": + self.hit5 = 3 + elif mode == "暗": + self.hit7 = 4 + def getSkillCD(self): + return 1.0 # 魔性之短剑精通 속성의 소검 마스터리 # https://api.neople.co.kr/df/skills/1645c45aabb008c98406b3a16447040d/d2c6df5105577fb59fb92529a36165a0?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 @@ -170,26 +158,24 @@ class Skill8(PassiveSkill): rangeLv = 3 data0 = [0, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 34, 36, 38, 40, 42, 44, 46, 48, 50, 52]# noqa: E501 - hit0 = 1 #TODO - + data1 = [0, 17.5, 18, 18.5, 19, 19.5, 20, 20.5, 21, 21.5, 22, 22.5, 23, 23.5, 24, 24.5, 25, 25.5, 26, 26.5, 27, 27.5, 28, 28.5, 29, 29.5, 30, 30.5, 31, 31.5, 32, 32.5, 33, 33.5, 34, 34.5, 35, 35.5, 36, 36.5, 37]# noqa: E501 - hit1 = 1 #TODO data2 = [0, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25]# noqa: E501 - hit2 = 1 #TODO data3 = [0, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65, 65]# noqa: E501 - hit3 = 1 #TODO data4 = [0, 34, 35, 37, 38, 40, 41, 42, 44, 45, 47, 48, 50, 51, 53, 54, 56, 57, 58, 60, 61, 63, 64, 66, 67, 69, 70, 71, 73, 74, 76, 77, 79, 80, 82, 83, 85, 86, 87, 88, 89]# noqa: E501 - hit4 = 1 #TODO data5 = [0, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30, 30]# noqa: E501 - hit5 = 1 #TODO - - data6 = [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]# noqa: E501 - hit6 = 1 #TODO + associate = [ + {"type":"$*PAtkP","data":data0,"weapon":["短剑"]}, + {"type":"*skillRation","data":data1,"weapon":["短剑"]}, + {"type":"+power_sub","data":data2,"skills":["魔剑奥义"],"weapon":["短剑"]}, + {"type":"*skillRation","data":data3,"skills":["魔剑奥义"],"weapon":["短剑"]} + + ] # 血影之太刀精通 쾌속의 도 마스터리 # https://api.neople.co.kr/df/skills/1645c45aabb008c98406b3a16447040d/de3fea2d65c597f4d55c70a02b97fc79?apikey=fdvit1Kj64EAJm0qfB3JEAD8FLExLDD0 @@ -473,44 +459,36 @@ class Skill19(PassiveSkill): position = 3 #TODO rangeLv = 2 - data0 = [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 - hit0 = 1 #TODO - - data1 = [0, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5, 1.5]# noqa: E501 - hit1 = 1 #TODO - + # 火 data2 = [0, 911, 1003, 1097, 1189, 1281, 1374, 1466, 1559, 1649, 1744, 1837, 1928, 2021, 2112, 2205, 2299, 2391, 2484, 2575, 2668, 2761, 2853, 2946, 3038, 3131, 3223, 3316, 3408, 3500, 3594, 3686, 3778, 3871, 3963, 4056, 4148, 4241, 4334, 4426, 4519, 4610, 4703, 4796, 4889, 4982, 5072, 5165, 5258, 5350, 5442, 5535, 5628, 5721, 5813, 5905, 5997, 6090, 6183, 6275, 6368, 6460, 6553, 6645, 6737, 6831, 6923, 7016, 7107, 7200, 7293]# noqa: E501 - hit2 = 1 #TODO - + hit2 = 0 + # 冰 data3 = [0, 1003, 1103, 1206, 1306, 1410, 1512, 1613, 1714, 1815, 1918, 2020, 2122, 2224, 2325, 2426, 2528, 2629, 2732, 2834, 2935, 3038, 3138, 3240, 3342, 3444, 3545, 3647, 3750, 3849, 3953, 4054, 4156, 4258, 4359, 4462, 4561, 4665, 4767, 4868, 4970, 5071, 5173, 5277, 5377, 5479, 5580, 5682, 5784, 5886, 5989, 6088, 6191, 6293, 6394, 6497, 6598, 6700, 6800, 6903, 7005, 7106, 7209, 7310, 7411, 7513, 7614, 7716, 7819, 7921, 8023]# noqa: E501 - hit3 = 1 #TODO - - data4 = [0, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600, 600]# noqa: E501 - hit4 = 1 #TODO - - data5 = [0, 1.5, 1.6, 1.7, 1.7, 1.8, 1.9, 2, 2, 2.1, 2.2, 2.3, 2.4, 2.5, 2.5, 2.6, 2.7, 2.8, 2.8, 2.9, 3, 3.1, 3.2, 3.2, 3.3, 3.4, 3.5, 3.5, 3.6, 3.7, 3.8, 3.9, 4, 4, 4.1, 4.2, 4.3, 4.3, 4.4, 4.5, 4.6, 4.7, 4.7, 4.8, 4.9, 5, 5, 5.1, 5.2, 5.3, 5.4, 5.5, 5.5, 5.6, 5.7, 5.8, 5.8, 5.9, 6, 6.1, 6.2, 6.2, 6.3, 6.4, 6.5, 6.5, 6.6, 6.7, 6.8, 6.9, 7]# noqa: E501 - hit5 = 1 #TODO - - data6 = [0, 9, 9.9, 10.9, 11.8, 12.8, 13.7, 14.7, 15.6, 16.6, 17.5, 18.5, 19.4, 20.4, 21.3, 22.3, 23.2, 24.2, 25.1, 26.1, 27, 27.9, 28.9, 29.8, 30.8, 31.7, 32.7, 33.6, 34.6, 35.5, 36.5, 37.4, 38.4, 39.3, 40.3, 41.2, 42.2, 43.1, 44.1, 45, 45.9, 46.9, 47.8, 48.8, 49.7, 50.7, 51.6, 52.6, 53.5, 54.5, 55.4, 56.4, 57.3, 58.3, 59.2, 60.2, 61.1, 62.1, 63, 63.9, 64.9, 65.8, 66.8, 67.7, 68.7, 69.6, 70.6, 71.5, 72.5, 73.4, 74.4]# noqa: E501 - hit6 = 1 #TODO - + hit3 = 0 + # 暗 data7 = [0, 911, 1003, 1097, 1189, 1281, 1374, 1466, 1559, 1649, 1744, 1837, 1928, 2021, 2112, 2205, 2299, 2391, 2484, 2575, 2668, 2761, 2853, 2946, 3038, 3131, 3223, 3316, 3408, 3500, 3594, 3686, 3778, 3871, 3963, 4056, 4148, 4241, 4334, 4426, 4519, 4610, 4703, 4796, 4889, 4982, 5072, 5165, 5258, 5350, 5442, 5535, 5628, 5721, 5813, 5905, 5997, 6090, 6183, 6275, 6368, 6460, 6553, 6645, 6737, 6831, 6923, 7016, 7107, 7200, 7293]# noqa: E501 - hit7 = 1 #TODO - - data8 = [0, 9, 9.9, 10.9, 11.8, 12.8, 13.7, 14.7, 15.6, 16.6, 17.5, 18.5, 19.4, 20.4, 21.3, 22.3, 23.2, 24.2, 25.1, 26.1, 27, 27.9, 28.9, 29.8, 30.8, 31.7, 32.7, 33.6, 34.6, 35.5, 36.5, 37.4, 38.4, 39.3, 40.3, 41.2, 42.2, 43.1, 44.1, 45, 45.9, 46.9, 47.8, 48.8, 49.7, 50.7, 51.6, 52.6, 53.5, 54.5, 55.4, 56.4, 57.3, 58.3, 59.2, 60.2, 61.1, 62.1, 63, 63.9, 64.9, 65.8, 66.8, 67.7, 68.7, 69.6, 70.6, 71.5, 72.5, 73.4, 74.4]# noqa: E501 - hit8 = 1 #TODO - - data9 = [0, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 15, 15, 15]# noqa: E501 - hit9 = 1 #TODO - - data10 = [0, 1.5, 1.6, 1.7, 1.7, 1.8, 1.9, 2, 2, 2.1, 2.2, 2.3, 2.4, 2.5, 2.5, 2.6, 2.7, 2.8, 2.8, 2.9, 3, 3.1, 3.2, 3.2, 3.3, 3.4, 3.5, 3.5, 3.6, 3.7, 3.8, 3.9, 4, 4, 4.1, 4.2, 4.3, 4.3, 4.4, 4.5, 4.6, 4.7, 4.7, 4.8, 4.9, 5, 5, 5.1, 5.2, 5.3, 5.4, 5.5, 5.5, 5.6, 5.7, 5.8, 5.8, 5.9, 6, 6.1, 6.2, 6.2, 6.3, 6.4, 6.5, 6.5, 6.6, 6.7, 6.8, 6.9, 7]# noqa: E501 - hit10 = 1 #TODO - + hit7 = 0 + # 光 data11 = [0, 1003, 1103, 1206, 1306, 1410, 1512, 1613, 1714, 1815, 1918, 2020, 2122, 2224, 2325, 2426, 2528, 2629, 2732, 2834, 2935, 3038, 3138, 3240, 3342, 3444, 3545, 3647, 3750, 3849, 3953, 4054, 4156, 4258, 4359, 4462, 4561, 4665, 4767, 4868, 4970, 5071, 5173, 5277, 5377, 5479, 5580, 5682, 5784, 5886, 5989, 6088, 6191, 6293, 6394, 6497, 6598, 6700, 6800, 6903, 7005, 7106, 7209, 7310, 7411, 7513, 7614, 7716, 7819, 7921, 8023]# noqa: E501 - hit11 = 1 #TODO + hit11 = 0 - data12 = [0, 1.5, 1.6, 1.7, 1.7, 1.8, 1.9, 2, 2, 2.1, 2.2, 2.3, 2.4, 2.5, 2.5, 2.6, 2.7, 2.8, 2.8, 2.9, 3, 3.1, 3.2, 3.2, 3.3, 3.4, 3.5, 3.5, 3.6, 3.7, 3.8, 3.9, 4, 4, 4.1, 4.2, 4.3, 4.3, 4.4, 4.5, 4.6, 4.7, 4.7, 4.8, 4.9, 5, 5, 5.1, 5.2, 5.3, 5.4, 5.5, 5.5, 5.6, 5.7, 5.8, 5.8, 5.9, 6, 6.1, 6.2, 6.2, 6.3, 6.4, 6.5, 6.5, 6.6, 6.7, 6.8, 6.9, 7]# noqa: E501 - hit12 = 1 #TODO + power_sub = 0 + + mode = ["火/暗", "冰/光", "冰光", "冰火", "火暗", "火冰"] + + def setMode(self, mode): + weapon = self.char.GetWeaponType() + if weapon == '短剑' and len(mode) == 3: + self.skillRation *= 0 + if weapon != '短剑' and len(mode) == 2: + self.skillRation *= 0 + if len(mode) == 3: + mode = mode[:1] + for element, hit_attr, power_attr in [("火", "hit2", "power2"), ("冰", "hit3", "power3"), ("暗", "hit7", "power7"), ("光", "hit11", "power11")]: + if element in mode: + setattr(self, hit_attr, 1) + if mode.index(element) == 1: + setattr(self, power_attr, getattr(self, power_attr) * self.power_sub) # 魔剑觉醒 마검일체 diff --git a/backend/core/equipment/version_0/stone.py b/backend/core/equipment/version_0/stone.py index 031e5149..c9696222 100644 --- a/backend/core/equipment/version_0/stone.py +++ b/backend/core/equipment/version_0/stone.py @@ -3922,7 +3922,7 @@ def stone_327(char: CharacterProperty): 技能伤害+14.5% 技能范围+7% """ - char.SetStatus(SkillAttack=0.145) + char.SetStatus(SkillAttack=0.175) pass @@ -3935,7 +3935,7 @@ def stone_328(char: CharacterProperty): 35级主动技能攻击力 +12% 35级技能范围 +12% """ - char.SetStatus(SkillAttack=0.145) + char.SetStatus(SkillAttack=0.16) char.SetSkillRation(35,35,0.12) pass @@ -3949,7 +3949,7 @@ def stone_329(char: CharacterProperty): 40级主动技能攻击力 +12% 40级技能范围 +12% """ - char.SetStatus(SkillAttack=0.145) + char.SetStatus(SkillAttack=0.16) char.SetSkillRation(40,40,0.12) pass @@ -3963,7 +3963,7 @@ def stone_330(char: CharacterProperty): 45级主动技能攻击力 +12% 45级技能范围 +12% """ - char.SetStatus(SkillAttack=0.145) + char.SetStatus(SkillAttack=0.16) char.SetSkillRation(45,45,0.12) pass @@ -3977,7 +3977,7 @@ def stone_331(char: CharacterProperty): 60级主动技能攻击力 +12% 60级技能范围 +12% """ - char.SetStatus(SkillAttack=0.145) + char.SetStatus(SkillAttack=0.16) char.SetSkillRation(60,60,0.12) @@ -3990,7 +3990,7 @@ def stone_332(char: CharacterProperty): 70级主动技能攻击力 +12% 70级技能范围 +12% """ - char.SetStatus(SkillAttack=0.145) + char.SetStatus(SkillAttack=0.16) char.SetSkillRation(70,70,0.12) pass @@ -4004,7 +4004,7 @@ def stone_333(char: CharacterProperty): 75级主动技能攻击力 +12% 75级技能范围 +12% """ - char.SetStatus(SkillAttack=0.145) + char.SetStatus(SkillAttack=0.16) char.SetSkillRation(75,75,0.12) pass @@ -4018,7 +4018,7 @@ def stone_334(char: CharacterProperty): 80级主动技能攻击力 +12% 80级技能范围 +12% """ - char.SetStatus(SkillAttack=0.145) + char.SetStatus(SkillAttack=0.16) char.SetSkillRation(80,80,0.12) pass diff --git a/backend/dataFiles/dcalc_0.db b/backend/dataFiles/dcalc_0.db index 95075179b7044164161c6b152ae2a305fef33212..ead1ae47ccc4dc7d33185fcafc4da79047ba936b 100644 GIT binary patch delta 1276 zcmZ{jT}V@57{_)U41tg<2F^uTZN(Z3?w3bdy3G9#eQQX&!ErhE;nM1|^rl zz}nbhx53ck_W2yUBA&sB7ZZ!%$NB=euzdk;;QlGtECn$&1FaZc12gVUlO5{h6x^{o z+t{&MaA+119NG7(gzSxhPZaB|rJslu^?h@2NT`n1QcYz=OQSe656#>^zC_mbN2>J! ze4mFVEy5^9ihqgc9Rr_B;VkZf2v9_AVEnmqSm@tM_ z*DCZIwGjl^8DYI`!&bIpY8nVmXJJmHKiI^DCv}8?Z-2miMI#pO?O^9|^&8ov7S`aq zJFDa2 zz?mGxco(Jf2(SSiDd4-jh+Mg8G1Jq!96xt0XxWkb)O-Q#Daor^Q{;ltDYGkrcbDzt z#AgD?W6pBEI+x5Y>q9wkjg1q_ScY83&?ln3St+EoiWgxZoOJaT9ySu|M^IQR<0{Ag1m4a9J&dr z8((jvS()LV<%l|Yw_q6<1QEo*o0Yk;Q4@_yaICX^ojIrH{`o!c`@G-t4J29z60LU| zgy6l#pb(5ul?o~qRcckKO{F_jTBFihl}akzsZzU2>r}eyIfcjfZDC0WYxXGg2u{|_ zI@}gZyW8uP1CfTF$N`LuKnl|u*znUBc(fZ2U`BE@v*TN3J`7DjoNG@lkhY>*=XSE; zNki5(1trq*7m2@Uezb~;&w(FPd2n(n`qZF4*n1v;d z)~7(my=x$A-ESbSkWih}WF4ycLEgcz7}8wJ&@DPyfSu>A`zy}957Q5U;OGiWZ4T`# z0;f#?!1t>V^Tw{_XD#04tSRth zL|>$|S8f$3$iAq$z{=@u5a}=SaCLP93;n0szh|8T*v}NbEaV;QYoPd6p%eeg6OzhqKrK