From 573ed72ceea40aa6d08de18f88c08412aa68f2ef Mon Sep 17 00:00:00 2001 From: xuruian <1925134362@qq.com> Date: Tue, 18 Jun 2024 15:39:58 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=85=B7=E8=A1=A5=E4=B8=8A=E8=AE=B8?= =?UTF-8?q?=E6=84=BF=E6=B1=A0=E7=94=9F=E5=91=BD=E6=8A=A4=E7=9B=BE=E9=98=B6?= =?UTF-8?q?=E6=AE=B5=E5=8A=A0=E6=88=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config.yaml | 20 ++++++++++---------- core/__init__.py | 2 +- core/attribute.py | 6 ++++-- 3 files changed, 15 insertions(+), 13 deletions(-) diff --git a/config.yaml b/config.yaml index 175f7c2..1a9114f 100644 --- a/config.yaml +++ b/config.yaml @@ -12,7 +12,7 @@ my_kf_level: 1400 skl_def: 0 crt_def: 0 # 时间范围，如果为空则全量抓取，因为3s环境变化较快不建议设置太久远 -start_date: '2024-06-01' +start_date: '2024-06-14' end_date: '' # 段位限制，只分析此段位的出击记录，填空字符串为不限制，注意此选项需要最新版收割机的支持 rank_limit: 'SSS' @@ -42,22 +42,22 @@ default_g: 100000 # 装备默认百分比，觉得欧狗多就设置的高些，注意设置的太高胜率容易尿崩 gear_config: STAFF: '150 150 150 150' - BLADE: '100 150 150 150' + BLADE: '100 150 150 130' ASSBOW: '100 150 150 120' DAGGER: '100 130 150 150' WAND: '120 120 130 150' SHIELD: '100 150 130 140' CLAYMORE: '110 110 150 150' - SPEAR: '120 150 150 100' + SPEAR: '100 150 150 120' GLOVES: '150 150 150 150' BRACELET: '150 150 100 150' VULTURE: '120 120 130 150' - CLOAK: '150 100 150 120' - THORN: '150 100 130 150' - WOOD: '150 130 130 120' + CLOAK: '100 120 150 150' + THORN: '150 100 120 150' + WOOD: '150 120 120 130' CAPE: '150 150 150 100' SCARF: '150 150 150 150' - TIARA: '120 150 150 100' + TIARA: '150 150 150 100' RIBBON: '100 150 150 150' RING: '100 150 150 150' DEVOUR: '100 150 150 150' @@ -67,9 +67,9 @@ gear_config: LEATHER: '150 150 150 150' CLOTH: '150 150 150 150' COLORFUL: '120 100 150 150' - HUNT: '150 100 140 140' - LIMPIDWAND: '120 150 150 110' - REFRACT: '130 100 150 150' + HUNT: '150 100 150 150' + LIMPIDWAND: '100 150 150 120' + REFRACT: '120 100 150 150' FIERCE: '100 150 150 150' # 是否加入权重，会根据出现次数加入w值，目前匹配池不平均建议开启 is_add_w: true diff --git a/core/__init__.py b/core/__init__.py index d98a1cb..1c39ae1 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -6,7 +6,7 @@ def start(): - print('Version 2.8.20') + print('Version 2.8.21') # 加载配置文件 config._init() # 加载模板 diff --git a/core/attribute.py b/core/attribute.py index 4eb114f..ec061a5 100644 --- a/core/attribute.py +++ b/core/attribute.py @@ -86,7 +86,7 @@ def cal_battle_int(enemy_data, battle_data, attr_data, aumlet_str): m_damage -= battle_data.cache_p_damage # 葡萄 atk_aumlet_ratio = 1 + aumlet_from_str(aumlet_str, 'PATK') / 100 - atk_aumlet_ratio += int(int(config.read_config('wish_config').split(' ')[7]) / 100) + atk_aumlet_ratio += int(int(config.read_config('wish_config').split(' ')[6]) / 100) if enemy_data.enemy_card == 'WU': atk_aumlet_ratio += 0.3 m_damage /= atk_aumlet_ratio @@ -138,7 +138,7 @@ def cal_battle_int(enemy_data, battle_data, attr_data, aumlet_str): gear_add += int(gear_level_list[0]) * 10 * int(config.read_config('gear_config')['STAFF'].split(' ')[1]) / 100 base_matk -= gear_add # 许愿池 - base_matk -= int(config.read_config('wish_config').split(' ')[7]) * 5 + base_matk -= int(config.read_config('wish_config').split(' ')[6]) * 5 if base_matk <= 10: attr_data.all_point -= 1 return @@ -612,6 +612,7 @@ def cal_sld(enemy_data, battle_data, attr_data, aumlet_str): # 最后乘算因素 final_ratio = 1 final_ratio += aumlet_from_str(aumlet_str, 'SLD') / 100 + final_ratio += int(int(config.read_config('wish_config').split(' ')[8]) / 100) if gear_list[2] == 'CLOAK' and gear_mystery_list[2] == '1': final_ratio += 0.5 if enemy_data.enemy_card == 'MO': @@ -772,6 +773,7 @@ def cal_hp(enemy_data, battle_data, attr_data, aumlet_str): # 最后乘算因素 final_ratio = 1 final_ratio += aumlet_from_str(aumlet_str, 'HP') / 100 + final_ratio += int(int(config.read_config('wish_config').split(' ')[7]) / 100) if enemy_data.enemy_card == 'LIN': final_ratio += 0.3 if enemy_data.enemy_card == 'YI':