v0.2.19

SkywalkerJi · Jun 15, 2022 · 0a8521c · 0a8521c
1 parent b7d632f
commit 0a8521c
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 Yu-Gi-Oh! Master Duel Translation Script
 
-[![GitHub release (latest by date)](https://img.shields.io/github/v/release/SkywalkerJi/mdt)](https://github.com/SkywalkerJi/mdt/releases/latest) [![GitHub all releases](https://img.shields.io/github/downloads/SkywalkerJi/mdt/total)](https://github.com/SkywalkerJi/mdt#download) [![GitHub forks](https://img.shields.io/github/forks/SkywalkerJi/mdt)](https://github.com/SkywalkerJi/mdt/network) [![GitHub stars](https://img.shields.io/github/stars/SkywalkerJi/mdt)](https://github.com/SkywalkerJi/mdt/stargazers) [![GitHub license](https://img.shields.io/github/license/SkywalkerJi/mdt)](https://github.com/SkywalkerJi/mdt/blob/master/LICENSE) ![Chinese translation](https://img.shields.io/badge/%E4%B8%AD%E6%96%87%E7%BF%BB%E8%AF%91-100%25-green) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/SkywalkerJi/mdt/GitHub%20Actions%20Build%20and%20Deploy) [![Steam Game Ver](https://img.shields.io/badge/Steam-1.1.1-informational)](https://store.steampowered.com/app/1449850/YuGiOh_Master_Duel/)
+[![GitHub release (latest by date)](https://img.shields.io/github/v/release/SkywalkerJi/mdt)](https://github.com/SkywalkerJi/mdt/releases/latest) [![GitHub all releases](https://img.shields.io/github/downloads/SkywalkerJi/mdt/total)](https://github.com/SkywalkerJi/mdt#download) [![GitHub forks](https://img.shields.io/github/forks/SkywalkerJi/mdt)](https://github.com/SkywalkerJi/mdt/network) [![GitHub stars](https://img.shields.io/github/stars/SkywalkerJi/mdt)](https://github.com/SkywalkerJi/mdt/stargazers) [![GitHub license](https://img.shields.io/github/license/SkywalkerJi/mdt)](https://github.com/SkywalkerJi/mdt/blob/master/LICENSE) ![Chinese translation](https://img.shields.io/badge/%E4%B8%AD%E6%96%87%E7%BF%BB%E8%AF%91-100%25-green) ![GitHub Workflow Status](https://img.shields.io/github/workflow/status/SkywalkerJi/mdt/GitHub%20Actions%20Build%20and%20Deploy) [![Steam Game Ver](https://img.shields.io/badge/Steam-1.1.2-informational)](https://store.steampowered.com/app/1449850/YuGiOh_Master_Duel/)
 
 * 自动切换，自动查卡，全面覆盖Deck、Duel、Solo、Replay、Shop模式。
 * 高正确性，除非卡片数据本身有错。
@@ -13,7 +13,7 @@ Yu-Gi-Oh! Master Duel Translation Script
 * i18n，支持简体中文和繁体中文。
 * 高兼容性，点开即用，支持各种游戏内语言，最低可支持win7。
 * 支持内存检测和图像指纹两种识别模式。
-* 支持ydk格式卡组导入。
+* 一键导入导出游戏卡组，支持`.ydk`格式。
 * 可一键直达网页卡查和官方数据库，MDT也有 [Secret Pack查询工具](https://ygo.xn--uesr8qr0rdwk.cn/)。
 * 支持全屏置顶、无边框、半透明。
 * 支持对重要UR，主流断点进行警示。
@@ -354,7 +354,10 @@ CLI版本在MDT v0.2.3版本进行拆分，拆分后对CLI版本只做基础可
 
 ## Changelog
 
-*v0.2.178*
+*v0.2.19*
+* 对游戏steam版本V1.1.2进行支持。。
+
+*v0.2.18*
 * 修复卡组导出功能。
 
 *v0.2.17*

diff --git a/mdt.py b/mdt.py
@@ -138,9 +138,9 @@ def get_baseAddress():
         pm.process_handle, "GameAssembly.dll"
     ).lpBaseOfDll
     # deck 组卡界面 duel 决斗界面 oppo 回放
-    deck_addr = baseAddress + int("0x01E99C18", base=16)
-    duel_addr = baseAddress + int("0x01DBDC88", base=16)
-    oppo_addr = baseAddress + int("0x01E99C18", base=16)
+    deck_addr = baseAddress + int("0x01E9AC28", base=16)
+    duel_addr = baseAddress + int("0x01DBEC88", base=16)
+    oppo_addr = baseAddress + int("0x01E9AC28", base=16)
 
 
 # UAC判断

diff --git a/mdt_deck_reader.py b/mdt_deck_reader.py
@@ -57,13 +57,13 @@ def get_database(path):
 def get_deck_dict():
     main_name = "masterduel.exe"
     module_name = "GameAssembly.dll"
-    ma_count_static = 0x01E99C18
-    ma_count_offsets = [0xB8, 0x00, 0xF8, 0x1C8, 0x150, 0x48]
-    ex_count_static = 0x01E99C18
+    ma_count_static = 0x01E9AC28
+    ma_count_offsets = [0xB8, 0x00, 0xF8, 0x1C8, 0x150, 0x288]
+    ex_count_static = 0x01E9AC28
     ex_count_offsets = [0xB8, 0x00, 0xF8, 0x1C8, 0x150, 0x18]
-    ma_cards_static = 0x01E99C18
-    ma_cards_offsets = [0xB8, 0x00, 0xF8, 0x1C8, 0x150, 0x40, 0x20]
-    ex_cards_static = 0x01E99C18
+    ma_cards_static = 0x01E9AC28
+    ma_cards_offsets = [0xB8, 0x00, 0xF8, 0x1C8, 0x148, 0x10, 0x20]
+    ex_cards_static = 0x01E9AC28
     ex_cards_offsets = [0xB8, 0x00, 0xF8, 0x1C8, 0x150, 0x10, 0x20]
     deck_dict = {"error": _("无法读取卡组信息")}
     try:

diff --git a/mdt_gui.py b/mdt_gui.py
@@ -405,7 +405,7 @@ def main():
         ],
     ]
     window = sg.Window(
-        "MDT v0.2.18 GPLv3",
+        "MDT v0.2.19 GPLv3",
         card_frame,
         default_element_size=(12, 1),
         font=("Microsoft YaHei", font_size),
@@ -437,7 +437,7 @@ def main():
             window["-desc-"].Widget.configure(wrap="char")
         if cid != cid_temp and cid:
             cid_temp = cid
-            print(cid)
+            # print(cid)
             try:
                 card_t = cards_db[str(cid)]
                 window["-cn_name-"].update(card_t["cn_name"])

diff --git a/win7/mdt_deck_reader.py b/win7/mdt_deck_reader.py
@@ -57,13 +57,13 @@ def get_database(path):
 def get_deck_dict():
     main_name = "masterduel.exe"
     module_name = "GameAssembly.dll"
-    ma_count_static = 0x01E99C18
-    ma_count_offsets = [0xB8, 0x00, 0xF8, 0x1C8, 0x150, 0x48]
-    ex_count_static = 0x01E99C18
+    ma_count_static = 0x01E9AC28
+    ma_count_offsets = [0xB8, 0x00, 0xF8, 0x1C8, 0x150, 0x288]
+    ex_count_static = 0x01E9AC28
     ex_count_offsets = [0xB8, 0x00, 0xF8, 0x1C8, 0x150, 0x18]
-    ma_cards_static = 0x01E99C18
-    ma_cards_offsets = [0xB8, 0x00, 0xF8, 0x1C8, 0x150, 0x40, 0x20]
-    ex_cards_static = 0x01E99C18
+    ma_cards_static = 0x01E9AC28
+    ma_cards_offsets = [0xB8, 0x00, 0xF8, 0x1C8, 0x148, 0x10, 0x20]
+    ex_cards_static = 0x01E9AC28
     ex_cards_offsets = [0xB8, 0x00, 0xF8, 0x1C8, 0x150, 0x10, 0x20]
     deck_dict = {"error": _("无法读取卡组信息")}
     try: