diff --git a/backend/api/core/Redis.py b/backend/api/core/Redis.py index c35ee684..303cb5ef 100644 --- a/backend/api/core/Redis.py +++ b/backend/api/core/Redis.py @@ -5,7 +5,7 @@ from config.main import config def get_redis_info(redis, key, fun, expire = 0, without_gzip=False): info = None - if redis and not config.DEBUG_MODE: + if not config.DEBUG_MODE and redis: try: if without_gzip: info = json.loads(redis.get(key)) @@ -15,7 +15,7 @@ def get_redis_info(redis, key, fun, expire = 0, without_gzip=False): info = None if info is None: info = fun() - if redis and info is not None: + if not config.DEBUG_MODE and redis and info is not None: if without_gzip: redis.set(key, json.dumps(info)) else: diff --git a/backend/core/character/GF/archer/traveler.py b/backend/core/character/GF/archer/traveler.py index 9c091afa..df5736f4 100644 --- a/backend/core/character/GF/archer/traveler.py +++ b/backend/core/character/GF/archer/traveler.py @@ -12,7 +12,7 @@ class TravelerActiveSkill(ActiveSkill): def setMode(self, mode): if mode == "猛击": self.skillDamage *= 1 + self.travelerDamage - self.cdReduce = 1 - 0.8 + self.cdReduce *= 1 - self.travelerCDR pass # 附件 : 迷雾装置 @@ -698,7 +698,7 @@ class Skill25(ActiveSkill): # 空中施放技能结束后霸体护甲持续时间 : {value2}秒 data2 = get_data(f'{prefix}/{uuid}', 2) - associate = [{"data":data0, "type":"=travelerDamage" , "skills": ["装置驱动", "浓雾暴雨", "登跃飞锚", "神雾兵仗·妖旋风", "流雾疾风", "装载 : 烟花漫天", "装置驱动·星云"]}] + associate = [{"data":data0, "type":"=travelerDamage" , "skills": ["装置驱动", "浓雾暴雨", "登跃飞锚", "神雾兵仗·妖旋风", "流雾疾风", "装载 : 烟花漫天", "装置驱动·星云","神雾兵仗·流星"]}] # 浓雾暴雨 # archer/traveler/ade01c1d6afc8a05055225045e89fe49 @@ -795,8 +795,12 @@ class Skill27(TravelerActiveSkill): mode = ["猛击","爆炸","散射"] def setMode(self, mode): - if mode == "猛击" and self.vp != 2: - self.skillRation = 0 + if mode == "猛击": + if self.vp != 2: + self.skillRation = 0 + else: + self.skillDamage *= 1 + self.travelerDamage + self.cdReduce *= 1 - self.travelerCDR return if mode == "爆炸" or self.vp == 2: self.hit1 = 1 @@ -924,7 +928,7 @@ class Skill30(PassiveSkill): # 增益最大持续时间 : {value1}秒 data1 = get_data(f'{prefix}/{uuid}', 1) - associate = [{"data":data0, "type":"=travelerCDR", "skills": []}] + associate = [{"data":data0, "type":"=travelerCDR" , "skills": ["装置驱动", "浓雾暴雨", "登跃飞锚", "神雾兵仗·妖旋风", "流雾疾风", "装载 : 烟花漫天", "装置驱动·星云","神雾兵仗·流星"]}] # 登跃飞锚 # archer/traveler/a5fa08f5d509e6ff2ebc68856a470b5a diff --git a/backend/core/character/GF/priest_female/crusader_female.py b/backend/core/character/GF/priest_female/crusader_female.py index c06410f5..0d3a5293 100644 --- a/backend/core/character/GF/priest_female/crusader_female.py +++ b/backend/core/character/GF/priest_female/crusader_female.py @@ -40,7 +40,7 @@ class Skill2(PassiveBufferSkill): # 技能冷却时间减少量 : {value6}% data6 = get_data(f'{prefix}/{uuid}', 6) - CarryRatio = [0, (1.055 ** 3) * 100 - 100]# noqa: E501 + CarryRatio = [0]+[(1.055 ** 3) * 100 - 100]*maxLv# noqa: E501 # 启示 : 惩戒 # priest_female/crusader_female/42c82812f86ff6704ae9952a2e6093a4 diff --git a/backend/core/character/GF/priest_female/inquistor.py b/backend/core/character/GF/priest_female/inquistor.py index f850f188..d12e10a7 100644 --- a/backend/core/character/GF/priest_female/inquistor.py +++ b/backend/core/character/GF/priest_female/inquistor.py @@ -757,7 +757,7 @@ class Skill31(ActiveSkill): data1 = get_data(f'{prefix}/{uuid}', 1) def skillInfo(self, mode: str | None = None): - pre = self.char.GetSkillByName("神焰洗礼") + pre = self.char.GetSkillByName("神焰洗礼").skillInfo() cd = self.getSkillCD(mode) return pre[0] * 0.3 * self.skillRation, self.skillDamage, cd @@ -1237,7 +1237,7 @@ class Skill41(PassiveSkill): associate = [ {"data":data0,"type":"*skillDamage"}, - {"data":data3*data4,"type":"*skillDamage","Skills":["审判重击"]} + {"data":[(i*j) for i,j in zip(data3,data4)],"type":"*skillDamage","Skills":["审判重击"]} ] # 补赎逆十字 diff --git a/backend/core/character/GF/priest_female/sorceress.py b/backend/core/character/GF/priest_female/sorceress.py index 1da62b0e..695067fb 100644 --- a/backend/core/character/GF/priest_female/sorceress.py +++ b/backend/core/character/GF/priest_female/sorceress.py @@ -816,7 +816,7 @@ class Skill33(PassiveSkill): associate = [ {"data":data0}, {"data":data1,"skills":["念珠连射"]}, - {"data":data2,"skills":["神龙如意珠"],"type":"-cdReduceP"}, + {"data":data2,"skills":["神龙如意珠"],"type":"*cdReduceP"}, ] # 退魔阴阳符 diff --git a/backend/core/character/GF/priest_male/avenger.py b/backend/core/character/GF/priest_male/avenger.py index bde5b9bf..a07d0b11 100644 --- a/backend/core/character/GF/priest_male/avenger.py +++ b/backend/core/character/GF/priest_male/avenger.py @@ -18,7 +18,7 @@ class Skill10(ActiveSkill): learnLv = 10 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 7 rangeLv = 2 cd = 6 mp = [28, 308] @@ -63,7 +63,7 @@ class Skill13(ActiveSkill): learnLv = 15 masterLv = 1 maxLv = 11 - position = 0 #TODO + position = 1 rangeLv = 5 cd = 8 uuid = "2f5d03c7848effbc0a23f4df45d9ca46" @@ -108,7 +108,7 @@ class Skill15(PassiveSkill): learnLv = 15 masterLv = 20 maxLv = 30 - position = 0 #TODO + position = 3 rangeLv = 3 uuid = "dac8d8207618150c162e4c6f9e168527" hasVP = False @@ -142,7 +142,7 @@ class Skill16(ActiveSkill): learnLv = 15 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 5 rangeLv = 2 cd = 5 mp = [30, 336] @@ -179,7 +179,7 @@ class Skill17(ActiveSkill): learnLv = 15 masterLv = 1 maxLv = 11 - position = 0 #TODO + position = 6 rangeLv = 15 cd = 5 mp = [394, 5061] @@ -220,7 +220,7 @@ class Skill19(PassiveSkill): learnLv = 20 masterLv = 10 maxLv = 20 - position = 0 #TODO + position = 6 rangeLv = 3 uuid = "8b08f9504167a9c0f3a1d29d71b7943e" hasVP = False @@ -253,7 +253,7 @@ class Skill20(ActiveSkill): learnLv = 20 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 8 rangeLv = 2 cd = 5 mp = [30, 336] @@ -288,7 +288,7 @@ class Skill22(ActiveSkill): learnLv = 25 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 4 rangeLv = 2 cd = 10 mp = [45, 462] @@ -337,7 +337,7 @@ class Skill23(ActiveSkill): learnLv = 25 masterLv = 20 maxLv = 30 - position = 0 #TODO + position = 1 rangeLv = 3 cd = 5 uuid = "527cdc3ecca985e18ef819d456532b26" @@ -365,7 +365,7 @@ class Skill24(ActiveSkill): learnLv = 30 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 2 rangeLv = 2 cd = 10 mp = [60, 686] @@ -404,7 +404,7 @@ class Skill25(PassiveSkill): learnLv = 30 masterLv = 10 maxLv = 20 - position = 0 #TODO + position = 1 rangeLv = 3 uuid = "002cbdd9bfd0f0b970451ae8d48d029e" hasVP = False @@ -436,7 +436,7 @@ class Skill26(ActiveSkill): learnLv = 35 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 5 rangeLv = 2 cd = 16 mp = [180, 1512] @@ -504,7 +504,7 @@ class Skill27(ActiveSkill): learnLv = 40 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 7 rangeLv = 2 cube = 1 cd = 20 @@ -568,7 +568,7 @@ class Skill28(ActiveSkill): learnLv = 40 masterLv = 50 maxLv = 60 - position = 0 #TODO + position = 1 rangeLv = 2 cube = 1 cd = 25 @@ -647,7 +647,7 @@ class Skill29(ActiveSkill): learnLv = 45 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 3 rangeLv = 2 cube = 2 cd = 40 @@ -717,7 +717,7 @@ class Skill30(PassiveSkill): learnLv = 48 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 9 rangeLv = 3 uuid = "31823197cc0b04d4c5dcf8f928d9220c" hasVP = False @@ -757,7 +757,7 @@ class Skill31(ActiveSkill): learnLv = 50 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 1 rangeLv = 5 cube = 5 cd = 145 @@ -851,7 +851,7 @@ class Skill32(ActiveSkill): learnLv = 50 masterLv = 1 maxLv = 1 - position = 0 #TODO + position = 2 rangeLv = 1 cd = 145 uuid = "85f7c810ad503790e8626439fe936d56" @@ -906,7 +906,7 @@ class Skill33(ActiveSkill): learnLv = 50 masterLv = 1 maxLv = 1 - position = 0 #TODO + position = 1 rangeLv = 1 cd = 5 uuid = "dd32a9825ec1af42a91f2223be6658e5" @@ -929,7 +929,7 @@ class Skill34(PassiveSkill): learnLv = 50 masterLv = 1 maxLv = 1 - position = 0 #TODO + position = 2 rangeLv = 1 uuid = "573723c8c0614f5b1218ca9ff992115b" hasVP = False @@ -952,7 +952,7 @@ class Skill35(ActiveSkill): learnLv = 60 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 4 rangeLv = 2 cube = 1 cd = 30 @@ -1006,7 +1006,7 @@ class Skill36(ActiveSkill): learnLv = 70 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 8 rangeLv = 2 cube = 2 cd = 50 @@ -1065,7 +1065,7 @@ class Skill37(ActiveSkill): learnLv = 75 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 3 rangeLv = 2 cube = 3 cd = 40 @@ -1152,7 +1152,7 @@ class Skill38(PassiveSkill): learnLv = 75 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 1 rangeLv = 3 uuid = "f45301a5590cccefbe0becf2f8d029f5" hasVP = False @@ -1183,7 +1183,7 @@ class Skill39(ActiveSkill): learnLv = 80 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 2 rangeLv = 2 cube = 5 cd = 45 @@ -1254,7 +1254,7 @@ class Skill40(ActiveSkill): learnLv = 85 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 4 rangeLv = 5 cube = 10 cd = 180 @@ -1309,7 +1309,7 @@ class Skill41(PassiveSkill): learnLv = 95 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 5 rangeLv = 3 uuid = "ca2536eb56df0e812c88c59cabd38be0" hasVP = False @@ -1343,7 +1343,7 @@ class Skill42(ActiveSkill): learnLv = 95 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 7 rangeLv = 2 cube = 7 cd = 60 @@ -1389,7 +1389,7 @@ class Skill43(ActiveSkill): learnLv = 100 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 5 rangeLv = 5 cube = 15 cd = 290 diff --git a/backend/core/character/GF/priest_male/crusader_male.py b/backend/core/character/GF/priest_male/crusader_male.py index b52bcdcc..62310fb3 100644 --- a/backend/core/character/GF/priest_male/crusader_male.py +++ b/backend/core/character/GF/priest_male/crusader_male.py @@ -17,7 +17,7 @@ class Skill0(ActiveSkill): learnLv = 1 masterLv = 10 maxLv = 20 - position = 0 #TODO + position = 6 rangeLv = 3 cd = 2 uuid = "3c5604bdbb0240b8f130f59ab40509c3" @@ -43,7 +43,7 @@ class Skill2(PassiveBufferSkill): learnLv = 1 masterLv = 1 maxLv = 1 - position = 0 #TODO + position = 1 rangeLv = 1 uuid = "0232c151ef3731c2dede51931a374723" hasVP = False @@ -65,7 +65,7 @@ class Skill7(ActiveBufferSkill): learnLv = 5 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 3 rangeLv = 3 cd = 8 mp = [28, 308] @@ -94,7 +94,7 @@ class Skill9(ActiveBufferSkill): learnLv = 10 masterLv = 1 maxLv = 11 - position = 0 #TODO + position = 4 rangeLv = 5 cd = 15 mp = [22, 238] @@ -132,7 +132,7 @@ class Skill13(ActiveSkill): learnLv = 15 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 6 rangeLv = 2 cd = 6 mp = [28, 308] @@ -161,7 +161,7 @@ class Skill14(ActiveSkill): learnLv = 15 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 7 rangeLv = 2 cd = 2 mp = [27, 294] @@ -200,7 +200,7 @@ class Skill15(PassiveSkill): learnLv = 15 masterLv = 15 maxLv = 25 - position = 0 #TODO + position = 9 rangeLv = 3 uuid = "2ba299855fc22192cba4f73db75e9d0e" hasVP = False @@ -225,7 +225,7 @@ class Skill16(PassiveBufferSkill): learnLv = 15 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 2 rangeLv = 3 uuid = "2c9d9a36c8401bddff6cdb80fab8dc24" hasVP = False @@ -255,7 +255,7 @@ class Skill16(PassiveBufferSkill): {"data":data0,"type":"$+Vitality","ratio":1}, {"data":data1,"type":"$+Spirit","ratio":1} ] - CarryRatio = [0, (1.055 ** 3) * 100 - 100]# noqa: E501 + CarryRatio = [0]+[(1.055 ** 3) * 100 - 100]*maxLv# noqa: E501 # 光之正义 # priest_male/crusader_male/547ab2b2bd860d3e37355a9cfbc1077c @@ -269,7 +269,7 @@ class Skill17(ActiveSkill): learnLv = 20 masterLv = 1 maxLv = 11 - position = 0 #TODO + position = 4 rangeLv = 2 cd = 10 mp = [45, 469] @@ -317,7 +317,7 @@ class Skill18(PassiveSkill): learnLv = 20 masterLv = 1 maxLv = 6 - position = 0 #TODO + position = 0 rangeLv = 3 uuid = "a5fa08f5d509e6ff2ebc68856a470b5a" hasVP = False @@ -350,7 +350,7 @@ class Skill19(ActiveSkill): learnLv = 20 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 6 rangeLv = 2 cd = 6.6 mp = [32, 343] @@ -387,7 +387,7 @@ class Skill21(ActiveSkill): learnLv = 20 masterLv = 20 maxLv = 30 - position = 0 #TODO + position = 9 rangeLv = 2 cd = 5 uuid = "d8ff976e2aaa4720272a5175d1eb9126" @@ -434,7 +434,7 @@ class Skill22(ActiveBufferSkill): learnLv = 25 masterLv = 10 maxLv = 20 - position = 0 #TODO + position = 2 rangeLv = 3 cd = 10 mp = [201, 262] @@ -480,7 +480,7 @@ class Skill23(ActiveSkill): learnLv = 25 masterLv = 10 maxLv = 20 - position = 0 #TODO + position = 1 rangeLv = 3 cd = 15 mp = [85, 154] @@ -508,7 +508,7 @@ class Skill24(PassiveSkill): learnLv = 25 masterLv = 1 maxLv = 6 - position = 0 #TODO + position = 3 rangeLv = 2 uuid = "d2c6df5105577fb59fb92529a36165a0" hasVP = False @@ -533,7 +533,7 @@ class Skill25(ActiveBufferSkill): learnLv = 25 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 5 rangeLv = 2 cd = 8 mp = [32, 343] @@ -572,7 +572,7 @@ class Skill26(ActiveSkill): learnLv = 30 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 7 rangeLv = 2 cd = 8 mp = [91, 763] @@ -605,7 +605,7 @@ class Skill27(ActiveBufferSkill): learnLv = 30 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 2 rangeLv = 3 cd = 10 uuid = "e4c354a89c337310aeb7041d5e742828" @@ -652,8 +652,8 @@ class Skill28(PassiveSkill): learnLv = 30 masterLv = 1 maxLv = 1 - position = 0 #TODO - rangeLv = 0 + position = 7 + rangeLv = 1 uuid = "3fb8395ae3b81bd608e0c4223a8eb534" hasVP = False hasUP = False @@ -683,7 +683,7 @@ class Skill29(PassiveSkill): learnLv = 30 masterLv = 10 maxLv = 20 - position = 0 #TODO + position = 5 rangeLv = 3 uuid = "030663e99462f628b4c9f813e1406c4e" hasVP = False @@ -709,7 +709,7 @@ class Skill30(ActiveSkill): learnLv = 35 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 7 rangeLv = 2 cube = 1 cd = 14.4 @@ -785,8 +785,8 @@ class Skill31(PassiveSkill): learnLv = 35 masterLv = 1 maxLv = 1 - position = 0 #TODO - rangeLv = 0 + position = 8 + rangeLv = 1 uuid = "9dc8438e4572d39243c97da31c113acc" hasVP = False hasUP = False @@ -816,7 +816,7 @@ class Skill32(ActiveSkill): learnLv = 35 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 5 rangeLv = 2 cd = 10 mp = [32, 343] @@ -880,7 +880,7 @@ class Skill33(ActiveBufferSkill): learnLv = 40 masterLv = 1 maxLv = 11 - position = 0 #TODO + position = 0 rangeLv = 2 cube = 2 cd = 60 @@ -913,7 +913,7 @@ class Skill34(ActiveSkill): learnLv = 40 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 5 rangeLv = 2 cube = 1 cd = 14.4 @@ -973,7 +973,7 @@ class Skill35(ActiveBufferSkill): learnLv = 45 masterLv = 1 maxLv = 11 - position = 0 #TODO + position = 3 rangeLv = 2 cube = 2 cd = 60 @@ -1011,7 +1011,7 @@ class Skill36(ActiveSkill): learnLv = 45 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 6 rangeLv = 2 cube = 2 cd = 45 @@ -1074,7 +1074,7 @@ class Skill37(PassiveBufferSkill): learnLv = 48 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 5 rangeLv = 3 uuid = "4f2e001e9a19eb7bae50ad1840dfb329" hasVP = False @@ -1117,7 +1117,7 @@ class Skill38(ActiveBufferSkill): learnLv = 50 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 6 rangeLv = 5 cube = 5 cd = 170 @@ -1162,7 +1162,7 @@ class Skill39(PassiveSkill): learnLv = 50 masterLv = 1 maxLv = 1 - position = 0 #TODO + position = 0 rangeLv = 3 uuid = "56aa7844a2da23f5bea9b585aea5ae45" hasVP = False @@ -1181,7 +1181,7 @@ class Skill40(ActiveSkill): learnLv = 60 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 7 rangeLv = 2 cube = 1 cd = 30 @@ -1245,7 +1245,7 @@ class Skill41(ActiveSkill): learnLv = 70 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 6 rangeLv = 2 cube = 2 cd = 40 @@ -1312,7 +1312,7 @@ class Skill42(ActiveBufferSkill): learnLv = 75 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 5 rangeLv = 2 cube = 3 cd = 40 @@ -1380,7 +1380,7 @@ class Skill43(ActiveBufferSkill): learnLv = 75 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 4 rangeLv = 3 cube = 3 cd = 20 @@ -1411,7 +1411,7 @@ class Skill43(ActiveBufferSkill): Vitality = data0 Spirit = data0 - associate = [{"data": Vitality, "type": "$+Vitality","ratio":1}, {"data": Spirit, "type": "$+Spirit","ratio":1}] + associate = [{"data": Vitality, "type": "$+Vitality"}, {"data": Spirit, "type": "$+Spirit"}] def vp_1(self): """ @@ -1461,7 +1461,7 @@ class Skill44(ActiveSkill): learnLv = 80 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 4 rangeLv = 2 cube = 5 cd = 45 @@ -1514,7 +1514,7 @@ class Skill45(ActiveBufferSkill): learnLv = 85 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 5 rangeLv = 5 cube = 10 cd = 180 @@ -1560,7 +1560,7 @@ class Skill46(ActiveSkill): learnLv = 85 masterLv = 1 maxLv = 1 - position = 0 #TODO + position = 6 rangeLv = 5 cube = 10 cd = 180 @@ -1592,7 +1592,7 @@ class Skill47(ActiveSkill): learnLv = 95 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 7 rangeLv = 2 cube = 7 cd = 60 @@ -1630,7 +1630,7 @@ class Skill48(PassiveBufferSkill): learnLv = 95 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 5 rangeLv = 3 uuid = "89a4529234904fcbb3abe289e281f2fd" hasVP = False @@ -1647,7 +1647,7 @@ class Skill48(PassiveBufferSkill): Vitality = Spirit = data1 - associate = [{"data": Vitality, "type": "$+Vitality","ratio":1}, {"data": Spirit, "type": "$+Spirit","ratio":1}] + associate = [{"data": Vitality, "type": "$+Vitality"}, {"data": Spirit, "type": "$+Spirit"}] # 生命礼赞 : 神威 # priest_male/crusader_male/a81e5b7defa1819263ed8e86f69fd06f @@ -1672,7 +1672,7 @@ class Skill49(ActiveBufferSkill): learnLv = 100 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 5 rangeLv = 5 cube = 15 cd = 290 diff --git a/backend/core/character/GF/priest_male/exorcist.py b/backend/core/character/GF/priest_male/exorcist.py index 14d3f2ff..eb05b8c0 100644 --- a/backend/core/character/GF/priest_male/exorcist.py +++ b/backend/core/character/GF/priest_male/exorcist.py @@ -28,7 +28,7 @@ class Skill0(ActiveSkill): learnLv = 1 masterLv = 10 maxLv = 20 - position = 0 #TODO + position = 7 rangeLv = 3 cd = 2 uuid = "3c5604bdbb0240b8f130f59ab40509c3" @@ -55,7 +55,7 @@ class Skill3(PassiveSkill): learnLv = 1 masterLv = 115 maxLv = 200 - position = 0 #TODO + position = 1 rangeLv = 1 uuid = "5a56514f35cf0270ae8d6c65f8fefd78" icon = "$common/$uuid" @@ -85,7 +85,7 @@ class Skill6(PassiveSkill): learnLv = 1 masterLv = 1 maxLv = 1 - position = 0 #TODO + position = 2 rangeLv = 1 uuid = "ebff277c02cc8b54c32635cd0d25f6f3" hasVP = False @@ -119,7 +119,7 @@ class Skill16(ActiveSkill): learnLv = 15 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 4 rangeLv = 2 cd = 6 mp = [28, 308] @@ -153,7 +153,7 @@ class Skill17(PassiveSkill): learnLv = 15 masterLv = 1 maxLv = 11 - position = 0 #TODO + position = 8 rangeLv = 5 uuid = "b163d099c8cc27fdb6fd3639c2ee6df9" hasVP = False @@ -175,7 +175,7 @@ class Skill18(PassiveSkill): learnLv = 15 masterLv = 1 maxLv = 1 - position = 0 #TODO + position = 0 rangeLv = 1 uuid = "51a08fd0c90f0a5276cd552047fac93d" hasVP = False @@ -198,7 +198,7 @@ class Skill19(ActiveSkill): learnLv = 15 masterLv = 1 maxLv = 1 - position = 0 #TODO + position = 6 rangeLv = 2 cd = 4.5 mp = [190, 190] @@ -231,7 +231,7 @@ class Skill20(ActiveSkill): learnLv = 20 masterLv = 10 maxLv = 20 - position = 0 #TODO + position = 6 rangeLv = 3 cd = 5 uuid = "128b9ddef2262f40723deae4407bdb42" @@ -261,7 +261,7 @@ class Skill21(PassiveSkill): learnLv = 20 masterLv = 20 maxLv = 30 - position = 0 #TODO + position = 8 rangeLv = 3 uuid = "0b8db1e10b3abbd24d38564e708675d5" hasVP = False @@ -288,7 +288,7 @@ class Skill22(ActiveSkill): learnLv = 20 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 2 rangeLv = 2 cd = 5 mp = [28, 308] @@ -326,7 +326,7 @@ class Skill24(ActiveSkill): learnLv = 25 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 7 rangeLv = 2 cd = 12 mp = [60, 756] @@ -353,7 +353,7 @@ class Skill25(ActiveSkill): learnLv = 25 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 3 rangeLv = 2 cd = 8 mp = [40, 462] @@ -387,7 +387,7 @@ class Skill26(ActiveSkill): learnLv = 30 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 3 rangeLv = 2 cd = 8 mp = [65, 686] @@ -418,7 +418,7 @@ class Skill27(PassiveSkill): learnLv = 30 masterLv = 10 maxLv = 20 - position = 0 #TODO + position = 8 rangeLv = 3 uuid = "150aa05b9ee8b9c7c04a25f3e425900c" hasVP = False @@ -445,7 +445,7 @@ class Skill28(ActiveSkill): learnLv = 35 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 3 rangeLv = 2 cube = 1 cd = 16.5 @@ -505,7 +505,7 @@ class Skill29(ActiveSkill): learnLv = 35 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 5 rangeLv = 2 cube = 1 cd = 14 @@ -569,7 +569,7 @@ class Skill30(ActiveSkill): learnLv = 40 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 7 rangeLv = 2 cube = 1 cd = 20 @@ -631,7 +631,7 @@ class Skill31(ActiveSkill): learnLv = 45 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 5 rangeLv = 2 cube = 2 cd = 40 @@ -682,7 +682,7 @@ class Skill32(PassiveSkill): learnLv = 48 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 8 rangeLv = 3 uuid = "7e904ea3d2a9faa054604e55120a9268" hasVP = False @@ -704,7 +704,7 @@ class Skill33(ActiveSkill): learnLv = 50 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 4 rangeLv = 5 cube = 5 cd = 145 @@ -736,7 +736,7 @@ class Skill34(ActiveSkill): learnLv = 60 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 3 rangeLv = 2 cube = 1 cd = 30 @@ -796,7 +796,7 @@ class Skill35(ActiveSkill): learnLv = 70 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 5 rangeLv = 2 cube = 2 cd = 50 @@ -849,7 +849,7 @@ class Skill36(PassiveSkill): learnLv = 75 masterLv = 1 maxLv = 11 - position = 0 #TODO + position = 3 rangeLv = 50 uuid = "1f4b87944dc5551b91bf6cd25d84b48e" hasVP = False @@ -878,7 +878,7 @@ class Skill37(PassiveSkill): learnLv = 75 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 8 rangeLv = 3 uuid = "328867949b763ce73e243da84fd59157" hasVP = False @@ -906,7 +906,7 @@ class Skill38(ActiveSkill): learnLv = 75 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 7 rangeLv = 2 cube = 5 cd = 50 @@ -975,7 +975,7 @@ class Skill39(ActiveSkill): learnLv = 80 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 2 rangeLv = 2 cube = 5 cd = 50 @@ -1032,7 +1032,7 @@ class Skill40(ActiveSkill): learnLv = 85 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 5 rangeLv = 5 cube = 10 cd = 180 @@ -1063,7 +1063,7 @@ class Skill41(PassiveSkill): learnLv = 95 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 8 rangeLv = 3 uuid = "863295a0fc634cf5fcc01e82a735fd6b" hasVP = False @@ -1088,7 +1088,7 @@ class Skill42(ActiveSkill): learnLv = 95 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 7 rangeLv = 2 cube = 7 cd = 60 @@ -1129,7 +1129,7 @@ class Skill43(ActiveSkill): learnLv = 100 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 5 rangeLv = 5 cube = 15 cd = 290 diff --git a/backend/core/character/GF/priest_male/infighter.py b/backend/core/character/GF/priest_male/infighter.py index a9cfde6b..959c9584 100644 --- a/backend/core/character/GF/priest_male/infighter.py +++ b/backend/core/character/GF/priest_male/infighter.py @@ -19,7 +19,7 @@ class Skill1(ActiveSkill): learnLv = 1 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 3 rangeLv = 2 cd = 5 mp = [15, 154] @@ -52,7 +52,7 @@ class Skill7(ActiveSkill): learnLv = 5 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 6 rangeLv = 2 cd = 3 mp = [15, 154] @@ -84,7 +84,7 @@ class Skill9(ActiveSkill): learnLv = 10 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 5 rangeLv = 2 cd = 2 mp = [10, 84] @@ -114,7 +114,7 @@ class Skill13(ActiveSkill): learnLv = 15 masterLv = 1 maxLv = 1 - position = 0 #TODO + position = 6 rangeLv = 1 cd = 0.7 mp = [1, 1] @@ -144,7 +144,7 @@ class Skill14(ActiveSkill): learnLv = 15 masterLv = 1 maxLv = 1 - position = 0 #TODO + position = 6 rangeLv = 1 cd = 0.7 mp = [1, 1] @@ -172,7 +172,7 @@ class Skill17(ActiveSkill): learnLv = 15 masterLv = 10 maxLv = 20 - position = 0 #TODO + position = 2 rangeLv = 3 cd = 5 uuid = "8f73f243041c2d27739fe7696f02bf9b" @@ -208,7 +208,7 @@ class Skill18(PassiveSkill): learnLv = 15 masterLv = 1 maxLv = 1 - position = 0 #TODO + position = 0 rangeLv = 1 uuid = "da6e37c1e3f0e8867f70007d89c239ff" hasVP = False @@ -234,7 +234,7 @@ class Skill19(ActiveSkill): learnLv = 15 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 7 rangeLv = 2 cd = 3.5 mp = [18, 196] @@ -259,7 +259,7 @@ class Skill20(ActiveSkill): learnLv = 15 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 6 rangeLv = 2 cd = 3.5 mp = [18, 196] @@ -297,7 +297,7 @@ class Skill21(PassiveSkill): learnLv = 20 masterLv = 10 maxLv = 20 - position = 0 #TODO + position = 1 rangeLv = 3 uuid = "8c2379737c5acc935c1731f67f607655" hasVP = False @@ -357,7 +357,7 @@ class Skill22(ActiveSkill): learnLv = 20 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 8 rangeLv = 2 cd = 3.5 mp = [18, 196] @@ -386,7 +386,7 @@ class Skill23(ActiveSkill): learnLv = 20 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 5 rangeLv = 2 cd = 5 mp = [12, 137] @@ -419,7 +419,7 @@ class Skill26(ActiveSkill): learnLv = 25 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 5 rangeLv = 2 cd = 7 mp = [45, 462] @@ -452,7 +452,7 @@ class Skill27(PassiveSkill): learnLv = 25 masterLv = 5 maxLv = 15 - position = 0 #TODO + position = 9 rangeLv = 3 uuid = "dc1ffbe7bfcc6dc2be737951960da9ad" hasVP = False @@ -520,7 +520,7 @@ class Skill28(ActiveSkill): learnLv = 25 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 4 rangeLv = 2 cd = 4 mp = [22, 231] @@ -551,7 +551,7 @@ class Skill29(ActiveSkill): learnLv = 30 masterLv = 1 maxLv = 11 - position = 0 #TODO + position = 2 rangeLv = 3 cd = 6 mp = [22, 231] @@ -567,6 +567,7 @@ class Skill29(ActiveSkill): data1 = get_data(f'{prefix}/{uuid}', 1) preRatio = 1 + power2 = 1 mode = ["反击","手动"] @@ -593,7 +594,7 @@ class Skill30(ActiveSkill): learnLv = 30 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 3 rangeLv = 2 cd = 6 mp = [45, 462] @@ -634,7 +635,7 @@ class Skill31(ActiveSkill): learnLv = 35 masterLv = 10 maxLv = 20 - position = 0 #TODO + position = 7 rangeLv = 3 cd = 5 uuid = "27bade584bb42fef68148d3a0b72bace" @@ -661,7 +662,7 @@ class Skill32(ActiveSkill): learnLv = 35 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 4 rangeLv = 2 cd = 10 mp = [50, 546] @@ -716,7 +717,7 @@ class Skill33(ActiveSkill): learnLv = 35 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 2 rangeLv = 2 cube = 1 cd = 20 @@ -775,7 +776,7 @@ class Skill34(ActiveSkill): learnLv = 40 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 6 rangeLv = 2 cube = 1 cd = 16 @@ -832,7 +833,7 @@ class Skill35(ActiveSkill): learnLv = 45 masterLv = 60 maxLv = 70 - position = 0 #TODO + position = 5 rangeLv = 2 cube = 2 cd = 45 @@ -890,7 +891,7 @@ class Skill36(PassiveSkill): learnLv = 45 masterLv = 1 maxLv = 1 - position = 0 #TODO + position = 7 rangeLv = 1 uuid = "04883563896fe1adac7505c6146b5f59" hasVP = False @@ -914,7 +915,7 @@ class Skill37(PassiveSkill): learnLv = 48 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 5 rangeLv = 3 cd = 3.5 uuid = "b8f4966608e4ebb3cc80ba4eac3649bb" @@ -939,7 +940,7 @@ class Skill38(ActiveSkill): learnLv = 50 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 2 rangeLv = 5 cube = 5 cd = 145 @@ -979,7 +980,7 @@ class Skill39(ActiveSkill): learnLv = 60 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 4 rangeLv = 2 cube = 2 cd = 35 @@ -1044,7 +1045,7 @@ class Skill40(ActiveSkill): learnLv = 70 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 8 rangeLv = 2 cube = 2 cd = 40 @@ -1096,7 +1097,7 @@ class Skill41(ActiveSkill): learnLv = 75 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 5 rangeLv = 2 cube = 3 cd = 40 @@ -1152,7 +1153,7 @@ class Skill42(PassiveSkill): learnLv = 75 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 2 rangeLv = 3 uuid = "087d1068ff506d090710566608a17760" hasVP = False @@ -1179,7 +1180,7 @@ class Skill43(ActiveSkill): learnLv = 80 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 3 rangeLv = 2 cube = 5 cd = 50 @@ -1237,7 +1238,7 @@ class Skill44(ActiveSkill): learnLv = 85 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 6 rangeLv = 5 cube = 10 cd = 180 @@ -1276,7 +1277,7 @@ class Skill45(PassiveSkill): learnLv = 95 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 5 rangeLv = 3 uuid = "515b442ffbf61a82371abb645c149a31" hasVP = False @@ -1300,7 +1301,7 @@ class Skill46(ActiveSkill): learnLv = 95 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 7 rangeLv = 2 cube = 7 cd = 60 @@ -1340,7 +1341,7 @@ class Skill47(ActiveSkill): learnLv = 100 masterLv = 40 maxLv = 50 - position = 0 #TODO + position = 5 rangeLv = 5 cube = 15 cd = 290 diff --git a/backend/core/character/adventure.py b/backend/core/character/adventure.py index a11fd461..95e1cded 100644 --- a/backend/core/character/adventure.py +++ b/backend/core/character/adventure.py @@ -113,12 +113,13 @@ adv = [ 'id': 0, 'name': 'crusader_male', 'title': '神启·圣骑士', - 'open': False, - 'options': [{'id': 0, 'name': 'default', 'title': '奶', 'class': 'crusader_male'}, {'id': 1, 'name': 'default', 'title': '审判', 'class': 'crusader_male_carry'}], + 'open': True, + 'class': 'GF.priest_male.crusader_male' + # 'options': [{'id': 0, 'name': 'default', 'title': '奶', 'class': 'crusader_male'}, {'id': 1, 'name': 'default', 'title': '审判', 'class': 'crusader_male_carry'}], }, - {'id': 1, 'name': 'infighter', 'title': '神启·蓝拳圣使', 'open': False}, - {'id': 2, 'name': 'exorcist', 'title': '神启·驱魔师', 'open': False}, - {'id': 3, 'name': 'avenger', 'title': '神启·复仇者', 'open': False}, + {'id': 1, 'name': 'infighter', 'title': '神启·蓝拳圣使', 'open': True, 'class': 'GF.priest_male.infighter'}, + {'id': 2, 'name': 'exorcist', 'title': '神启·驱魔师', 'open': True, 'class': 'GF.priest_male.exorcist'}, + {'id': 3, 'name': 'avenger', 'title': '神启·复仇者', 'open': True, 'class': 'GF.priest_male.avenger'}, {'id': 4, 'name': 'empty', 'title': ''}, ], },