04.15 commit

qt/app.py

@@ -4,7 +4,9 @@ import sys
 from PySide6.QtGui import QIcon
 
 from qt.components.top import TopWidget
+from qt.scripts.config import config_script
 from qt.scripts.top import top_script
+from qt.components.config import ConfigWidget
 from qt.components.equipments import EquipmentsWidget
 from qt.scripts.equipments import equipments_script
 from qt.components.consumables import ConsumablesWidget
@@ -18,8 +20,8 @@ from qt.scripts.recipes import recipes_script
 from qt.components.dashboard import DashboardWidget
 from qt.scripts.dashboard import dashboard_script
 
-from PySide6.QtWidgets import QApplication, QMainWindow, QStyleFactory, QVBoxLayout, QGridLayout, QWidget, QSizePolicy, \
-    QHBoxLayout, QTabWidget
+from PySide6.QtWidgets import QApplication, QMainWindow, QStyleFactory
+from PySide6.QtWidgets import QVBoxLayout, QHBoxLayout, QWidget, QTabWidget
 
 
 class MainWindow(QMainWindow):
@@ -38,37 +40,42 @@ class MainWindow(QMainWindow):
         layout = QVBoxLayout(self.central_widget)
 
         self.top_widget = TopWidget()
+        layout.addWidget(self.top_widget, 1)
+
+        self.config_widget = ConfigWidget()
+        layout.addWidget(self.config_widget, 1)
+        self.config_widget.hide()
+
         self.bottom_widget = QWidget()
-        bottom_layout = QHBoxLayout(self.bottom_widget)
-        layout.addWidget(self.top_widget)
-        layout.addWidget(self.bottom_widget)
+        layout.addWidget(self.bottom_widget, 8)
+        self.bottom_widget.hide()
 
-        self.config_widget = QTabWidget()
+        bottom_layout = QHBoxLayout(self.bottom_widget)
+        self.detail_widget = QTabWidget()
         self.dashboard_widget = DashboardWidget()
-        bottom_layout.addWidget(self.config_widget, 1)
+        bottom_layout.addWidget(self.detail_widget, 1)
         bottom_layout.addWidget(self.dashboard_widget, 1)
 
         self.equipments_widget = EquipmentsWidget()
-        self.config_widget.addTab(self.equipments_widget, "配装")
+        self.detail_widget.addTab(self.equipments_widget, "配装")
         self.consumable_widget = ConsumablesWidget()
-        self.config_widget.addTab(self.consumable_widget, "消耗品")
+        self.detail_widget.addTab(self.consumable_widget, "消耗品")
         self.talents_widget = TalentsWidget()
-        self.config_widget.addTab(self.talents_widget, "奇穴")
+        self.detail_widget.addTab(self.talents_widget, "奇穴")
         self.recipes_widget = RecipesWidget()
-        self.config_widget.addTab(self.recipes_widget, "秘籍")
+        self.detail_widget.addTab(self.recipes_widget, "秘籍")
 
         parser = top_script(
-            self.top_widget, self.bottom_widget, self.dashboard_widget,
+            self.top_widget, self.config_widget, self.bottom_widget, self.dashboard_widget,
             self.talents_widget, self.recipes_widget, self.equipments_widget, self.consumable_widget,
         )
+        config_script(parser, self.config_widget, self.equipments_widget)
         equipments = equipments_script(self.equipments_widget)
         consumables = consumables_script(self.consumable_widget)
         talents = talents_script(self.talents_widget)
         recipes = recipes_script(self.recipes_widget)
         dashboard_script(parser, self.dashboard_widget, talents, recipes, equipments, consumables)
 
-        self.bottom_widget.hide()
-
 
 if __name__ == "__main__":
     app = QApplication(sys.argv)

qt/components/__init__.py

@@ -1,7 +1,6 @@
-from PySide6.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QLabel, QAbstractItemView, QTableWidgetItem, \
-    QHeaderView, QSizePolicy, QListWidgetItem, QSpacerItem, QListView
-from PySide6.QtWidgets import QComboBox, QRadioButton, QTextBrowser, QTextEdit, QSpinBox, QListWidget, QTableWidget
-from PySide6.QtCore import Qt
+from PySide6.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QLabel
+from PySide6.QtWidgets import QAbstractItemView, QTableWidgetItem, QHeaderView, QListView
+from PySide6.QtWidgets import QComboBox, QRadioButton, QTextBrowser, QLineEdit, QSpinBox, QListWidget, QTableWidget
 
 
 class LabelWidget(QWidget):
@@ -143,20 +142,16 @@ class SpinWithLabel(LabelWidget):
 
 
 class TextWithLabel(LabelWidget):
-    def __init__(self, label, stretch: bool = True, editable: bool = False):
+    def __init__(self, label):
         super().__init__(label)
         layout = QVBoxLayout(self)
 
-        if editable:
-            self.text_browser = QTextEdit()
-        else:
-            self.text_browser = QTextBrowser()
+        self.text_browser = QLineEdit()
 
         layout.addWidget(self.label)
         layout.addWidget(self.text_browser)
 
-        if stretch:
-            layout.addStretch()
+        layout.addStretch()
 
     def set_text(self, text):
         self.text_browser.setText(text)

qt/components/config.py

@@ -0,0 +1,22 @@
+from PySide6.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QPushButton
+
+from qt.components import ComboWithLabel, TextWithLabel
+
+
+class ConfigWidget(QWidget):
+    def __init__(self):
+        super().__init__()
+        layout = QVBoxLayout(self)
+        top_layout = QHBoxLayout()
+        layout.addLayout(top_layout)
+        bottom_layout = QHBoxLayout()
+        layout.addLayout(bottom_layout)
+
+        self.config_select = ComboWithLabel("Select")
+        top_layout.addWidget(self.config_select, 1)
+        self.load_config = QPushButton("Load")
+        bottom_layout.addWidget(self.load_config, 1)
+        self.config_name = TextWithLabel("Name")
+        top_layout.addWidget(self.config_name, 1)
+        self.save_config = QPushButton("Save")
+        bottom_layout.addWidget(self.save_config, 1)

qt/components/dashboard.py

@@ -1,6 +1,6 @@
 from PySide6.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QPushButton, QTabWidget
 
-from qt.components import ComboWithLabel, SpinWithLabel, TextWithLabel, LabelWithLabel, TableWithLabel
+from qt.components import ComboWithLabel, SpinWithLabel, LabelWithLabel, TableWithLabel
 from base.constant import SHIELD_BASE_MAP
 
 

qt/components/equipments.py

@@ -4,8 +4,7 @@ import os
 from qt.constant import POSITION_MAP, STONES_POSITIONS, EQUIPMENTS_DIR, ENCHANTS_DIR, STONES_DIR, MAX_STONE_ATTR
 from qt.constant import EMBED_POSITIONS, MAX_EMBED_LEVEL, MAX_STONE_LEVEL, SPECIAL_ENCHANT_POSITIONS
 from qt.components import ComboWithLabel, RadioWithLabel, TableWithLabel
-from PySide6.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QGridLayout, QTabWidget, QSizePolicy, QSpacerItem
-from PySide6.QtCore import Qt
+from PySide6.QtWidgets import QWidget, QVBoxLayout, QHBoxLayout, QGridLayout, QTabWidget
 
 
 class EquipmentWidget(QWidget):

qt/scripts/config.py

@@ -0,0 +1,86 @@
+import json
+import os
+
+from qt.components.config import ConfigWidget
+from qt.components.equipments import EquipmentsWidget
+from utils.parser import Parser
+
+
+if not os.path.exists("config"):
+    CONFIG = {}
+else:
+    CONFIG = json.load(open("config", encoding="utf-8"))
+
+
+def config_script(parser: Parser, config_widget: ConfigWidget, equipments_widget: EquipmentsWidget):
+    def load_config():
+        config_name = config_widget.config_select.combo_box.currentText()
+        config = CONFIG.get(parser.school.school, {}).get(config_name, {})
+
+        for label, equipment in equipments_widget.items():
+            if 'equipment' not in config[label]:
+                continue
+            else:
+                index = equipment.equipment.combo_box.findText(config[label]['equipment'])
+                equipment.equipment.combo_box.setCurrentIndex(index)
+
+            equipment.strength_level.combo_box.setCurrentIndex(config[label]['strength_level'])
+            if 'enchant' in config[label]:
+                index = equipment.enchant.combo_box.findText(config[label]['enchant'])
+                equipment.enchant.combo_box.setCurrentIndex(index)
+            if 'special_enchant' in config[label]:
+                if equipment.special_enchant.radio_button.isChecked() != config[label]['special_enchant']:
+                    equipment.special_enchant.radio_button.click()
+            if 'embed_levels' in config[label]:
+                for i, embed_level in enumerate(equipment.embed_levels):
+                    embed_level.combo_box.setCurrentIndex(config[label]['embed_levels'][i])
+            if 'stone_level' in config[label]:
+                equipment.stone_level.combo_box.setCurrentIndex(config[label]['stone_level'])
+            if 'stone_attrs' in config[label]:
+                for i, stone_attr in enumerate(equipment.stone_attrs):
+                    index = equipment.stone_attrs[i].combo_box.findText(config[label]['stone_attrs'][i])
+                    stone_attr.combo_box.setCurrentIndex(index)
+
+        config_widget.config_name.text_browser.setText(config_name)
+
+    config_widget.load_config.clicked.connect(load_config)
+
+    def save_config():
+        config_name = config_widget.config_name.text_browser.text()
+        if parser.school.school not in CONFIG:
+            CONFIG[parser.school.school] = {}
+        if config_name not in CONFIG[parser.school.school]:
+            CONFIG[parser.school.school][config_name] = {}
+        config = CONFIG[parser.school.school][config_name]
+
+        for label, equipment in equipments_widget.items():
+            config[label] = {}
+            if not (text := equipment.equipment.combo_box.currentText()):
+                continue
+            else:
+                config[label]['equipment'] = text
+            config[label]['strength_level'] = equipment.strength_level.combo_box.currentIndex()
+            if equipment.enchant:
+                config[label]['enchant'] = equipment.enchant.combo_box.currentText()
+            if equipment.special_enchant:
+                config[label]['special_enchant'] = equipment.special_enchant.radio_button.isChecked()
+            if equipment.embed_levels:
+                config[label]['embed_levels'] = [
+                    embed_level.combo_box.currentIndex() for embed_level in equipment.embed_levels
+                ]
+            if equipment.stone_level:
+                config[label]['stone_level'] = equipment.stone_level.combo_box.currentIndex()
+            if equipment.stone_attrs:
+                config[label]['stone_attrs'] = [
+                    stone_attr.combo_box.currentText() for stone_attr in equipment.stone_attrs
+                ]
+        json.dump(CONFIG, open("config", "w", encoding="utf-8"), ensure_ascii=False)
+
+        config_choices = list(CONFIG.get(parser.school.school, {}))
+        if current_select := config_widget.config_select.combo_box.currentText():
+            default_index = config_choices.index(current_select)
+        else:
+            default_index = -1
+        config_widget.config_select.set_items(config_choices, default_index=default_index)
+
+    config_widget.save_config.clicked.connect(save_config)

qt/scripts/dashboard.py

@@ -33,8 +33,9 @@ def detail_content(detail):
     damage_content = [
         ["命中伤害", f"{detail['damage']}"],
         ["会心伤害", f"{detail['critical_damage']}"],
-        ["期望会心", f"{round(detail['critical_strike'] * 100, 2)}%"],
-        ["期望伤害", f"{round(detail['expected_damage'], 2)}"]
+        ["期望伤害", f"{round(detail['expected_damage'], 2)}"],
+        ["会心", f"{round(detail['critical_strike'] * 100, 2)}%"],
+        ["期望会心", f"{round(detail['expected_critical_strike'] * 100, 2)}%"],
     ]
     gradient_content = [
         [ATTR_TYPE_TRANSLATE[k], f"{round(v / detail['expected_damage'] * 100, 2)}%"]
@@ -109,6 +110,7 @@ def dashboard_script(parser: Parser,
         detail_widget.skill_combo.set_items(skill_choices, default_index=default_index)
 
     def set_status(_):
+        set_detail(None)
         detail_widget = dashboard_widget.detail_widget
         skill = detail_widget.skill_combo.combo_box.currentText()
         status = detail_widget.status_combo.combo_box.currentText()

qt/scripts/top.py

@@ -1,6 +1,7 @@
 from PySide6.QtWidgets import QFileDialog, QWidget
 
 from general.consumables import FOODS, POTIONS, WEAPON_ENCHANTS, SNACKS, WINES, SPREADS
+from qt.components.config import ConfigWidget
 from qt.components.consumables import ConsumablesWidget
 from qt.components.dashboard import DashboardWidget
 from qt.components.equipments import EquipmentsWidget
@@ -11,19 +12,22 @@ from qt.components.top import TopWidget
 # from general.consumables import FOODS, POTIONS, WEAPON_ENCHANTS, SPREADS, SNACKS, WINES
 # from general.gains.formation import FORMATIONS
 from qt.constant import MAX_RECIPES, MAX_STONE_LEVEL
+from qt.scripts.config import CONFIG
 from utils.parser import Parser
 
 
-def top_script(top_widget: TopWidget, config_widget: QWidget, dashboard_widget: DashboardWidget,
-               talents_widget: TalentsWidget, recipes_widget: RecipesWidget,
-               equipments_widget: EquipmentsWidget, consumables_widget: ConsumablesWidget
-               ):
+def top_script(top_widget: TopWidget, config_widget: ConfigWidget, bottom_widget: QWidget,
+               dashboard_widget: DashboardWidget, talents_widget: TalentsWidget, recipes_widget: RecipesWidget,
+               equipments_widget: EquipmentsWidget, consumables_widget: ConsumablesWidget):
     parser = Parser()
 
     def upload_logs():
         file_name = QFileDialog(top_widget, "Choose File").getOpenFileName()
         parser(file_name[0])
         school = parser.school
+        """ Update config """
+        config_choices = list(CONFIG.get(school.school, {}))
+        config_widget.config_select.set_items(config_choices, default_index=-1)
         """ Update dashboard """
         record_index = list(parser.record_index)
         dashboard_widget.fight_select.set_items(record_index)
@@ -78,6 +82,7 @@ def top_script(top_widget: TopWidget, config_widget: QWidget, dashboard_widget:
         consumables_widget.spread.set_items([""] + SPREADS[school.major] + SPREADS[school.kind])
 
         config_widget.show()
+        bottom_widget.show()
 
     top_widget.upload_button.clicked.connect(upload_logs)
 

schools/bei_ao_jue/skills.py

@@ -59,6 +59,13 @@ SKILLS: Dict[int, Skill | dict] = {
                             [280],
         "interval": 48
     },
+    17060: {
+        "skill_class": Skill,
+        "skill_name": "闹须弥",
+        "bind_skill": 11447,
+        "tick": 8
+
+    },
     16933: {
         "skill_class": PhysicalDamage,
         "skill_name": "惊燕式",
@@ -299,6 +306,12 @@ SKILLS: Dict[int, Skill | dict] = {
         "attack_power_cof": 380,
         "interval": 48
 
+    },
+    26934: {
+        "skill_class": Skill,
+        "skill_name": "背水沉舟",
+        "bind_skill": 19555,
+        "tick": 8
     }
 }
 

utils/analyzer.py

@@ -11,7 +11,7 @@ def filter_status(status, school: School, skill_id):
         if buff.gain_attributes or skill_id in buff.gain_skills:
             buffs.append(buff)
 
-    return buffs
+    return tuple(buffs)
 
 
 def add_buffs(current_buffs, snapshot_buffs, attribute: Attribute, skill: Skill):
@@ -42,7 +42,6 @@ def analyze_details(record, duration: int, attribute: Attribute, school: School)
     total_gradients = {attr: 0. for attr in attribute.grad_attrs}
     duration *= 1000
 
-    existed_buffs = []
     for skill, status in record.items():
         skill_id, skill_level, skill_stack = skill
         skill: Skill = school.skills[skill_id]
@@ -51,7 +50,13 @@ def analyze_details(record, duration: int, attribute: Attribute, school: School)
         skill_detail = {}
         details[skill.display_name] = skill_detail
         for (current_status, snapshot_status), timeline in status.items():
-            timeline = [t for t in timeline if t < duration]
+            hit_timeline, critical_timeline = [], []
+            for timestamp, critical in timeline:
+                if critical:
+                    critical_timeline.append(timestamp)
+                else:
+                    hit_timeline.append(timestamp)
+            timeline = [t for t in timeline if t[0] < duration]
             if not timeline:
                 continue
 
@@ -59,7 +64,7 @@ def analyze_details(record, duration: int, attribute: Attribute, school: School)
             snapshot_buffs = filter_status(snapshot_status, school, skill_id)
             add_buffs(current_buffs, snapshot_buffs, attribute, skill)
 
-            damage, critical_strike, critical_damage, expected_damage = skill(attribute)
+            damage, expected_critical_strike, critical_damage, expected_damage = skill(attribute)
             gradients = analyze_gradients(skill, attribute)
 
             sub_buffs(current_buffs, snapshot_buffs, attribute, skill)
@@ -68,16 +73,18 @@ def analyze_details(record, duration: int, attribute: Attribute, school: School)
             for attr, residual_damage in gradients.items():
                 total_gradients[attr] += residual_damage * len(timeline)
 
-            buffs = (",".join(buff.display_name for buff in current_buffs) +
-                     ";" +
-                     ",".join(buff.display_name for buff in snapshot_buffs))
+            buffs = ",".join(buff.display_name for buff in current_buffs)
+            if snapshot_buffs and current_buffs != snapshot_buffs:
+                buffs += f"({','.join(buff.display_name for buff in snapshot_buffs)})"
+
             if not buffs:
-                buffs = "~~~~~"
+                buffs = "~"
             skill_detail[buffs] = dict(
                 damage=damage,
-                critical_strike=critical_strike,
                 critical_damage=critical_damage,
                 expected_damage=expected_damage,
+                critical_strike=len(critical_timeline) / (len(critical_timeline) + len(hit_timeline)),
+                expected_critical_strike=expected_critical_strike,
                 # "timeline": [round(t / 1000, 3) for t in timeline],
                 count=len(timeline),
                 gradients=gradients
@@ -95,10 +102,10 @@ def analyze_summary(details):
     for skill, skill_detail in details.items():
         skill = skill.split("/")[0]
         if skill not in summary:
-            summary[skill] = {"count": 0, "hit": 0, "critical": 0, "damage": 0}
+            summary[skill] = {"count": 0, "critical": 0, "damage": 0}
         for buff, detail in skill_detail.items():
             summary[skill]["count"] += detail['count']
-            summary[skill]["critical"] += detail['count'] * detail['critical_strike']
+            summary[skill]["critical"] += detail['count'] * detail['expected_critical_strike']
             summary[skill]["damage"] += detail['count'] * detail['expected_damage']
 
     return summary

utils/parser.py

@@ -1,5 +1,6 @@
 from dataclasses import dataclass
 from typing import Dict, List, Type, Union, Tuple
+from collections import defaultdict
 
 from base.attribute import Attribute
 from base.buff import Buff
@@ -124,8 +125,8 @@ class Parser:
         self.records = []
         self.status = {}
         self.snapshot = {}
-        self.stacks = {}
-        self.ticks = {}
+        self.stacks = defaultdict(int)
+        self.ticks = defaultdict(int)
 
         self.start_time = []
         self.end_time = []
@@ -161,16 +162,16 @@ class Parser:
             self.status[(buff_id, buff_level)] = buff_stack
 
     def parse_skill(self, detail, timestamp):
-        skill_id, skill_level = detail[4], detail[5]
+        skill_id, skill_level, critical = detail[4], detail[5], detail[6]
         if skill_id not in self.school.skills:
             return
 
-        skill_stack = max(1, self.stacks.get(skill_id, 0))
-
-        if self.ticks.get(skill_id):
+        timestamp = int(timestamp) - self.start_time[-1]
+        skill_stack = max(1, self.stacks[skill_id])
+        if self.ticks[skill_id]:
             self.ticks[skill_id] -= 1
-            if not self.ticks[skill_id]:
-                self.stacks[skill_id] = 0
+        if not self.ticks[skill_id]:
+            self.stacks[skill_id] = 0
 
         skill_tuple = (skill_id, skill_level, skill_stack)
         skill = self.school.skills[skill_id]
@@ -181,10 +182,10 @@ class Parser:
         else:
             if skill_tuple not in self.current_record:
                 self.current_record[skill_tuple] = {}
-            status = self.available_status(skill_id)
-            if status not in self.current_record[skill_tuple]:
-                self.current_record[skill_tuple][status] = []
-            self.current_record[skill_tuple][status].append(int(timestamp) - self.start_time[-1])
+            status_tuple = self.available_status(skill_id)
+            if status_tuple not in self.current_record[skill_tuple]:
+                self.current_record[skill_tuple][status_tuple] = []
+            self.current_record[skill_tuple][status_tuple].append((timestamp, critical))
 
     def __call__(self, file_name):
         self.reset()