Merge pull request #3 from mackerel-12138/dxc

新版本适配
mackerel-12138 · Apr 13, 2023 · a4c980b · a4c980b
2 parents 507b493 + 9fd81cf
commit a4c980b
Show file tree

Hide file tree

Showing 30 changed files with 157 additions and 153 deletions.
diff --git a/AutoPcr_py/AutoPcr4.0.py b/AutoPcr_py/AutoPcr4.0.py
diff --git a/AutoPcr_py/AutoPcr4.0_GUI.py b/AutoPcr_py/AutoPcr4.0_GUI.py
@@ -32,7 +32,7 @@ def GetFullPath(pngName):
 dxcDropKey = 'dxcDrop'
 needZbNameKey = 'zbDrop'
 buyExpNumKey = 'buyExpNumDrop'
-dxcDropValue = ["炸脖龙", "绿龙", "黑白王"]
+dxcDropValue = ["黑白王"]
 mnqIndexDropValue = ["1", "0"]
 needZbNameValue = ['新月的悲叹', '焰帝戒指', '忘哭之冠', '深渊之弓', '愤怒法杖', '鹰神之煌剑', '狮鹫羽饰', '恶魔法杖']
 buyExpNumValue = [1, 2, 3, 4, 5, 6, 7, 8]
@@ -438,9 +438,21 @@ def SetAllSelect2():
     window[isXinSuiKey].Update(isAllSelect2)
 
 
+# def OutLog():
+#     yield
+#     fname = './autopcr.log'
+#     with open(fname, 'r', encoding='gbk') as f:
+#         lines = f.readlines()
+#         last_line = lines[-1]
+#         print(last_line)
+
+# log = OutLog()
 # sg.popup_get_folder('Enter the file you wish to process')
 # Event Loop to process "events" and get the "values" of the inputs
 while True:
+    # print("next")
+    # next(log)
+
     event, values = window.read()
     print(event)
     if event == '检查模拟器':

diff --git a/AutoPcr_py/img/dxc/bossEnd.png b/AutoPcr_py/img/dxc/bossEnd.png
diff --git a/AutoPcr_py/img/dxc/box1.png b/AutoPcr_py/img/dxc/box1.png
diff --git a/AutoPcr_py/img/dxc/box2.png b/AutoPcr_py/img/dxc/box2.png
diff --git a/AutoPcr_py/img/dxc/box3.png b/AutoPcr_py/img/dxc/box3.png
diff --git a/AutoPcr_py/img/dxc/box4.png b/AutoPcr_py/img/dxc/box4.png
diff --git a/AutoPcr_py/img/dxc/box5.png b/AutoPcr_py/img/dxc/box5.png
diff --git a/AutoPcr_py/img/dxc/dxcBack.png b/AutoPcr_py/img/dxc/dxcBack.png
diff --git a/AutoPcr_py/img/dxc/ex.png b/AutoPcr_py/img/dxc/ex.png
diff --git a/AutoPcr_py/img/dxc/lose.png b/AutoPcr_py/img/dxc/lose.png
diff --git a/AutoPcr_py/img/dxc/win.png b/AutoPcr_py/img/dxc/win.png
diff --git a/AutoPcr_py/img/dxc_ex3/bossEnd.png b/AutoPcr_py/img/dxc_ex3/bossEnd.png
diff --git a/AutoPcr_py/img/dxc_ex3/box1.png b/AutoPcr_py/img/dxc_ex3/box1.png
diff --git a/AutoPcr_py/img/dxc_ex3/box2.png b/AutoPcr_py/img/dxc_ex3/box2.png
diff --git a/AutoPcr_py/img/dxc_ex3/box3.png b/AutoPcr_py/img/dxc_ex3/box3.png
diff --git a/AutoPcr_py/img/dxc_ex3/box4.png b/AutoPcr_py/img/dxc_ex3/box4.png
diff --git a/AutoPcr_py/img/dxc_ex3/box5.png b/AutoPcr_py/img/dxc_ex3/box5.png
diff --git a/AutoPcr_py/img/dxc_ex3/dxcBack.png b/AutoPcr_py/img/dxc_ex3/dxcBack.png
diff --git a/AutoPcr_py/img/dxc_ex3/enter.png b/AutoPcr_py/img/dxc_ex3/enter.png
diff --git a/AutoPcr_py/img/dxc_ex3/ex.png b/AutoPcr_py/img/dxc_ex3/ex.png
diff --git a/AutoPcr_py/img/dxc_ex3/lose.png b/AutoPcr_py/img/dxc_ex3/lose.png
diff --git a/AutoPcr_py/img/dxc_ex3/run.png b/AutoPcr_py/img/dxc_ex3/run.png
diff --git a/AutoPcr_py/img/dxc_ex3/win.png b/AutoPcr_py/img/dxc_ex3/win.png
diff --git a/AutoPcr_py/img/shop/allitem.png b/AutoPcr_py/img/shop/allitem.png
diff --git a/AutoPcr_py/img/shop/buyBtn.png b/AutoPcr_py/img/shop/buyBtn.png
diff --git a/AutoPcr_py/img/shop/buyall.png b/AutoPcr_py/img/shop/buyall.png
diff --git a/AutoPcr_py/img/shop/expitem.png b/AutoPcr_py/img/shop/expitem.png
diff --git a/AutoPcr_py/img/shop/selectall.png b/AutoPcr_py/img/shop/selectall.png
diff --git a/AutoPcr_py/img/shop/stoneitem.png b/AutoPcr_py/img/shop/stoneitem.png