5.15 commit

gr/components/combat.py

@@ -13,20 +13,21 @@ class CombatComponent:
 
         with gr.Tab("属性"):
             with gr.Row():
-                self.init_attribute = gr.Textbox("初始属性")
-                self.final_attribute = gr.Textbox("增益后属性")
+                self.init_attribute = gr.Textbox(label="初始属性")
+                self.final_attribute = gr.Textbox(label="增益后属性")
         with gr.Tab("伤害总结"):
+            self.details = gr.State({})
             self.skill_select = gr.Dropdown(label="选择技能")
             self.status_select = gr.Dropdown(label="选择增益")
             with gr.Row():
                 self.damage_detail = gr.Textbox(label="伤害细节")
-                self.gradient_detail = gr.Textbox(label="属性收益")
+                self.damage_gradient = gr.Textbox(label="属性收益")
         with gr.Tab("战斗统计"):
             with gr.Row():
                 self.summary = gr.DataFrame(label="战斗总结", headers=["技能/次数", "命中/%", "会心/%", "伤害/%"], scale=3)
                 with gr.Column(scale=1):
-                    self.dps = gr.Textbox("每秒伤害")
-                    self.gradient = gr.Textbox("属性收益")
+                    self.dps = gr.Textbox(label="每秒伤害")
+                    self.gradient = gr.Textbox(label="属性收益", lines=10)
 
 
 

gr/components/equipments.py

@@ -1,9 +1,9 @@
 import json
 import os
 
-from assets.constant import POSITION_MAP, STONES_POSITIONS, EQUIPMENTS_DIR, ENCHANTS_DIR, STONES_DIR, MAX_STONE_ATTR, \
-    ATTR_TYPE_TRANSLATE
-from assets.constant import EMBED_POSITIONS, MAX_EMBED_LEVEL, MAX_STONE_LEVEL, SPECIAL_ENCHANT_POSITIONS
+from assets.constant import POSITION_MAP, STONES_POSITIONS, EQUIPMENTS_DIR, ENCHANTS_DIR, STONES_DIR, MAX_STONE_ATTR
+from assets.constant import EMBED_POSITIONS, MAX_STRENGTH_LEVEL, MAX_EMBED_LEVEL, MAX_STONE_LEVEL
+from assets.constant import SPECIAL_ENCHANT_POSITIONS
 import gradio as gr
 
 
@@ -30,7 +30,7 @@ class EquipmentComponent:
                         self.special_enchant = gr.Checkbox(label="大附魔")
 
                 with gr.Row():
-                    self.strength_level = gr.Dropdown(label="精炼等级")
+                    self.strength_level = gr.Dropdown(choices=list(range(MAX_STRENGTH_LEVEL + 1)), label="精炼等级")
 
                     self.embed_levels = []
                     for i in range(EMBED_POSITIONS[self.position]):

gr/scripts/combat.py

@@ -20,10 +20,10 @@ def attribute_content(display_attrs, attribute):
     for attr, name in display_attrs.items():
         value = getattr(attribute, attr)
         if isinstance(value, int):
-            content.append([name, f"{value}"])
+            content.append(name.ljust(10, FULL_SPACE) + str(value))
         else:
-            content.append([name, f"{round(value * 100, 2)}%"])
-    return content
+            content.append(name.ljust(10, FULL_SPACE) + f"{round(value * 100, 2)}%")
+    return "\n".join(content)
 
 
 def summary_content(summary: Dict[str, Detail], total_damage):
@@ -51,16 +51,18 @@ def gradient_content(gradients, total_damage):
 
 
 def detail_content(detail: Detail):
-    damage_content = "\n".join([
-        "命中伤害\t" + f"{round(detail.damage)}",
-        "会心伤害\t" + f"{round(detail.critical_damage)}",
-        "期望伤害\t" + f"{round(detail.expected_damage)}",
-        "期望会心\t" + f"{round(detail.critical_strike * 100, 2)}%",
-        "实际会心\t" + f"{round(detail.actual_critical_strike * 100, 2)}%",
-        "统计数量\t" + f"{detail.count}"
+    damage_detail = "\n".join([
+        "命中伤害".ljust(10) + f"{round(detail.damage)}",
+        "会心伤害".ljust(10) + f"{round(detail.critical_damage)}",
+        "期望伤害".ljust(10) + f"{round(detail.expected_damage)}",
+        "期望会心".ljust(10) + f"{round(detail.critical_strike * 100, 2)}%",
+        "实际会心".ljust(10) + f"{round(detail.actual_critical_strike * 100, 2)}%",
+        "统计数量".ljust(10) + f"{detail.count}"
     ])
 
-    return damage_content, gradient_content(detail.gradients, detail.expected_damage)
+    damage_gradient = gradient_content(detail.gradients, detail.expected_damage)
+
+    return damage_detail, damage_gradient
 
 
 def combat_script(
@@ -69,7 +71,7 @@ def combat_script(
         # consumables: Consumables, bonuses: Bonuses
         combat_component: CombatComponent,
 ):
-    def formulate(target_level, duration):
+    def formulate(target_level, duration, skill, status):
         combat_update = {}
         record = parser.current_records
         school = parser.current_school
@@ -107,45 +109,51 @@ def combat_script(
         combat_update[combat_component.dps] = gr.update(value=round(total.expected_damage / duration))
 
         combat_update[combat_component.gradient] = gradient_content(total.gradients, total.expected_damage)
-        #
-        # dashboard_widget.detail_widget.details = details
-        # set_skills()
+
+        combat_update[combat_component.details] = details
+        combat_update[combat_component.skill_select] = gr.update(choices=list(details))
+        if skill_detail := details.get(skill, {}):
+            combat_update[combat_component.status_select] = gr.update(choices=[""] + list(skill_detail))
+        if detail := skill_detail.get(status):
+            damage_detail, damage_gradient = detail_content(detail)
+            combat_update[combat_component.damage_detail] = gr.update(value=damage_detail)
+            combat_update[combat_component.damage_gradient] = gr.update(value=damage_gradient)
+        else:
+            combat_update[combat_component.damage_detail] = gr.update(value="")
+            combat_update[combat_component.damage_gradient] = gr.update(value="")
 
         combat_update[combat_component.summary] = summary_content(summary, total.expected_damage)
         return combat_update
 
     combat_component.formulate.click(
         formulate,
-        [combat_component.target_level, combat_component.combat_duration],
+        [combat_component.target_level, combat_component.combat_duration,
+         combat_component.skill_select, combat_component.status_select],
         [combat_component.init_attribute, combat_component.final_attribute,
-         combat_component.dps, combat_component.gradient, combat_component.summary]
+         combat_component.dps, combat_component.gradient, combat_component.summary,
+         combat_component.details, combat_component.skill_select, combat_component.status_select,
+         combat_component.damage_detail, combat_component.damage_gradient
+         ]
     )
 
-    # def set_skills():
-    #     detail_widget = dashboard_widget.detail_widget
-    #     detail_widget.skill_combo.set_items(list(detail_widget.details), keep_index=True, default_index=-1)
-    #     set_status(None)
-    #
-    # def set_status(_):
-    #     detail_widget = dashboard_widget.detail_widget
-    #     skill = detail_widget.skill_combo.combo_box.currentText()
-    #     detail_widget.status_combo.set_items(
-    #         list(detail_widget.details.get(skill, {})), keep_index=True, default_index=-1
-    #     )
-    #     set_detail(None)
-    #
-    # dashboard_widget.detail_widget.skill_combo.combo_box.currentTextChanged.connect(set_status)
-    #
-    # def set_detail(_):
-    #     detail_widget = dashboard_widget.detail_widget
-    #     skill = detail_widget.skill_combo.combo_box.currentText()
-    #     status = detail_widget.status_combo.combo_box.currentText()
-    #     if detail := detail_widget.details.get(skill, {}).get(status):
-    #         damage_content, gradient_content = detail_content(detail)
-    #         detail_widget.damage_detail.set_content(damage_content)
-    #         detail_widget.gradient_detail.set_content(gradient_content)
-    #     else:
-    #         detail_widget.damage_detail.table.clear()
-    #         detail_widget.gradient_detail.table.clear()
-    #
-    # dashboard_widget.detail_widget.status_combo.combo_box.currentTextChanged.connect(set_detail)
+    def skill_changed(skill, details):
+        if skill not in details:
+            return None
+        return gr.update(choices=[""] + list(details[skill]))
+
+    combat_component.skill_select.change(
+        skill_changed, [combat_component.skill_select, combat_component.details], combat_component.status_select
+    )
+
+    def status_changed(skill, status, details):
+        if skill not in details:
+            return None, None
+        if status not in details[skill]:
+            return None, None
+        damage_detail, damage_gradient = detail_content(details[skill][status])
+        return gr.update(value=damage_detail), gr.update(value=damage_gradient)
+
+    combat_component.status_select.change(
+        status_changed, [combat_component.skill_select, combat_component.status_select, combat_component.details],
+        [combat_component.damage_detail, combat_component.damage_gradient]
+    )

gr/scripts/top.py

@@ -1,4 +1,5 @@
 import json
+import os
 
 import gradio as gr
 
@@ -59,7 +60,7 @@ def top_script(
             return [None] * 4
         result = json.load(open(file_path, encoding="utf-8"))
 
-        file_name = result['file_name'].split(".jcl")[0] + ".json"
+        file_name = os.path.basename(result['file_name']).split(".jcl")[0] + ".json"
         json.dump(result, open(file_name, "w", encoding="utf-8"), ensure_ascii=False)
 
         result['records'] = unserialize(result['records'])

utils/analyzer.py

@@ -127,8 +127,11 @@ def analyze_details(record, duration: int, attribute: Attribute, school: School)
 
             buffs = add_buffs(current_buffs, snapshot_buffs, target_buffs, attribute, skill)
             buffs = concat_buffs(buffs)
-            detail = skill_detail[buffs] = Detail(*skill(attribute))
-            detail.gradients = analyze_gradients(skill, attribute)
+            if buffs in skill_detail:
+                detail = skill_detail[buffs]
+            else:
+                detail = skill_detail[buffs] = Detail(*skill(attribute))
+                detail.gradients = analyze_gradients(skill, attribute)
             sub_buffs(current_buffs, snapshot_buffs, target_buffs, attribute, skill)
 
             detail.critical_count += len(critical_timeline)

utils/parser.py

@@ -418,7 +418,7 @@ class Parser(BaseParser):
     def __call__(self, file_name):
         self.file_name = os.path.basename(file_name)
         self.reset()
-        lines = open(file_name).readlines()
+        lines = open(file_name, encoding="gbk").readlines()
         rows = []
         for line in lines:
             row = line.split("\t")