From 94f516517906aa82c94b85299fdcebee4baeb365 Mon Sep 17 00:00:00 2001
From: SkywalkerJi <skywalkerji.cn@gmail.com>
Date: Mon, 13 Jun 2022 01:28:54 +0800
Subject: [PATCH] v0.2.18

---
 README.md               |  5 ++++-
 mdt_deck_reader.py      |  8 ++++----
 mdt_gui.py              | 24 ++++++++++++------------
 win7/mdt_deck_reader.py |  8 ++++----
 4 files changed, 24 insertions(+), 21 deletions(-)

diff --git a/README.md b/README.md
index b8f6763..1dfcf3d 100644
--- a/README.md
+++ b/README.md
@@ -354,11 +354,14 @@ CLI版本在MDT v0.2.3版本进行拆分，拆分后对CLI版本只做基础可
 
 ## Changelog
 
+*v0.2.178*
+* 修复卡组导出功能。
+
 *v0.2.17*
 * 图像模式更新6月10日新卡hash。by wtof1996
 * 修复识别线程失效问题。by chunibyo
 * 将效果框置为只读。by funnyvalentine2363
-* 去除了失效的卡组导出功能。（可能需要新的实现方式）
+* 去除了失效的卡组导出功能。
 
 <details>
    <summary>展开过往版本</summary>
diff --git a/mdt_deck_reader.py b/mdt_deck_reader.py
index fdadc5f..d3f217d 100644
--- a/mdt_deck_reader.py
+++ b/mdt_deck_reader.py
@@ -58,13 +58,13 @@ def get_deck_dict():
     main_name = "masterduel.exe"
     module_name = "GameAssembly.dll"
     ma_count_static = 0x01E99C18
-    ma_count_offsets = [0xB8, 0x00, 0xF8, 0x1C0, 0x90, 0x18]
+    ma_count_offsets = [0xB8, 0x00, 0xF8, 0x1C8, 0x150, 0x48]
     ex_count_static = 0x01E99C18
-    ex_count_offsets = [0xB8, 0x00, 0xF8, 0x1C0, 0x98, 0x18]
+    ex_count_offsets = [0xB8, 0x00, 0xF8, 0x1C8, 0x150, 0x18]
     ma_cards_static = 0x01E99C18
-    ma_cards_offsets = [0xB8, 0x00, 0xF8, 0x1C0, 0x90, 0x10, 0x20]
+    ma_cards_offsets = [0xB8, 0x00, 0xF8, 0x1C8, 0x150, 0x40, 0x20]
     ex_cards_static = 0x01E99C18
-    ex_cards_offsets = [0xB8, 0x00, 0xF8, 0x1C0, 0x98, 0x10, 0x20]
+    ex_cards_offsets = [0xB8, 0x00, 0xF8, 0x1C8, 0x150, 0x10, 0x20]
     deck_dict = {"error": _("无法读取卡组信息")}
     try:
         pm = get_process(main_name)
diff --git a/mdt_gui.py b/mdt_gui.py
index 9283c25..c332226 100644
--- a/mdt_gui.py
+++ b/mdt_gui.py
@@ -405,7 +405,7 @@ def main():
         ],
     ]
     window = sg.Window(
-        "MDT v0.2.17 GPLv3",
+        "MDT v0.2.18 GPLv3",
         card_frame,
         default_element_size=(12, 1),
         font=("Microsoft YaHei", font_size),
@@ -716,17 +716,17 @@ def main():
                             ]
                         ]
                     ),
-                    # sg.Column(
-                    #     [
-                    #         [
-                    #             sg.Button(
-                    #                 _("导出卡组"),
-                    #                 button_color=("white", "#238636"),
-                    #                 border_width=1,
-                    #             )
-                    #         ]
-                    #     ]
-                    # ),
+                    sg.Column(
+                        [
+                            [
+                                sg.Button(
+                                    _("导出卡组"),
+                                    button_color=("white", "#238636"),
+                                    border_width=1,
+                                )
+                            ]
+                        ]
+                    ),
                     sg.Column(
                         [
                             [
diff --git a/win7/mdt_deck_reader.py b/win7/mdt_deck_reader.py
index 69bfb77..8d26f3a 100644
--- a/win7/mdt_deck_reader.py
+++ b/win7/mdt_deck_reader.py
@@ -58,13 +58,13 @@ def get_deck_dict():
     main_name = "masterduel.exe"
     module_name = "GameAssembly.dll"
     ma_count_static = 0x01E99C18
-    ma_count_offsets = [0xB8, 0x00, 0xF8, 0x1C0, 0x90, 0x18]
+    ma_count_offsets = [0xB8, 0x00, 0xF8, 0x1C8, 0x150, 0x48]
     ex_count_static = 0x01E99C18
-    ex_count_offsets = [0xB8, 0x00, 0xF8, 0x1C0, 0x98, 0x18]
+    ex_count_offsets = [0xB8, 0x00, 0xF8, 0x1C8, 0x150, 0x18]
     ma_cards_static = 0x01E99C18
-    ma_cards_offsets = [0xB8, 0x00, 0xF8, 0x1C0, 0x90, 0x10, 0x20]
+    ma_cards_offsets = [0xB8, 0x00, 0xF8, 0x1C8, 0x150, 0x40, 0x20]
     ex_cards_static = 0x01E99C18
-    ex_cards_offsets = [0xB8, 0x00, 0xF8, 0x1C0, 0x98, 0x10, 0x20]
+    ex_cards_offsets = [0xB8, 0x00, 0xF8, 0x1C8, 0x150, 0x10, 0x20]
     deck_dict = {"error": _("无法读取卡组信息")}
     try:
         pm = get_process(main_name)