From 76932cf0712c778f103fbf521d7c446c510efb95 Mon Sep 17 00:00:00 2001 From: YangHu Date: Tue, 25 Feb 2020 15:00:07 +0800 Subject: [PATCH] 1.0.1.0224 --- CHANGELOG.md | 7 +++++++ conf_example.ini | 4 ++++ explore/explore.py | 3 +++ gameLib/fighter.py | 22 ++++++++++++++++++++++ gameLib/game_ctl.py | 4 ++-- goryou/single_fight.py | 3 +++ gui/tkui.py | 31 ++++++++++++++++++++++++++++--- img/icon/OnmyojiBot.ico | Bin 0 -> 16958 bytes mitama/fighter_driver.py | 3 +++ mitama/fighter_passenger.py | 3 +++ mitama/single_fight.py | 4 ++++ onmyoji.py | 8 ++++++++ ui.py | 16 ++++++++++++++++ 13 files changed, 103 insertions(+), 5 deletions(-) create mode 100644 img/icon/OnmyojiBot.ico diff --git a/CHANGELOG.md b/CHANGELOG.md index 92d8664..794599c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,12 @@ # CHANGELOG +## v1.0.1.0224 +#### New features: +* 系统缩放自适应。 +* 增加了游戏次数的选项。 +* 增加了游戏结束后的选项。 +* 为本程序增加了图标。 + ## v1.0.1.0221 #### New features: * 采用了新的算法，大幅度提高了图片识别的准确性，目前在部分场景有应用。 diff --git a/conf_example.ini b/conf_example.ini index af7c728..e531bb9 100644 --- a/conf_example.ini +++ b/conf_example.ini @@ -4,6 +4,10 @@ run_section = 0 #run_mode 运行模式：对于御魂0-单刷；1-司机；2-乘客；3-双开 run_mode = 0 +#max_times 最大游戏次数：0-无数次；其他-其他次 +max_times = 0 +#end_operation 结束后操作：0-结束后关闭脚本；1-结束后关闭脚本和游戏 +end_operation = 0 [mitama] ######御魂参数##### diff --git a/explore/explore.py b/explore/explore.py index 8df75dd..e9ab32a 100644 --- a/explore/explore.py +++ b/explore/explore.py @@ -222,3 +222,6 @@ def start(self): self.switch_to_scene(3) self.log.writeinfo('结束本轮探索') time.sleep(0.5) + + # 检查游戏次数 + self.check_times() diff --git a/gameLib/fighter.py b/gameLib/fighter.py index 468467f..82bed0d 100644 --- a/gameLib/fighter.py +++ b/gameLib/fighter.py @@ -5,6 +5,7 @@ import configparser import logging +import os import random import threading import time @@ -32,6 +33,9 @@ def __init__(self, name='', emyc=0, hwnd=0): self.max_op_time = conf.getint('watchdog', 'max_op_time') self.max_win_time = conf.getint('watchdog', 'max_win_time') self.mitama_team_mark = conf.getint('mitama', 'mitama_team_mark') + self.max_times = conf.getint('DEFAULT', 'max_times') + self.end_operation = conf.getint('DEFAULT', 'end_operation') + self.run_times = 0 # 启动日志 self.log = WriteLog() @@ -68,6 +72,24 @@ def check_end(self): self.yys.wait_game_img('img\\JIE-SU.png', self.max_win_time) self.log.writeinfo(self.name + "战斗结束") + def check_times(self): + ''' + 监测游戏次数是否达到最大次数 + ''' + self.run_times = self.run_times + 1 + logging.info('游戏已运行'+str(self.run_times)+'次') + if(self.run_times == self.max_times): + if(self.end_operation == 0): + logging.warning('关闭脚本(次数已满)...') + self.run = False + os._exit(0) + elif(self.end_operation == 1): + logging.warning('关闭游戏(次数已满)...') + self.yys.quit_game() + logging.warning('关闭脚本(次数已满)...') + self.run = False + os._exit(0) + def mitama_team_click(self): ''' 御魂标记己方式神 diff --git a/gameLib/game_ctl.py b/gameLib/game_ctl.py index dd0d644..73f9751 100644 --- a/gameLib/game_ctl.py +++ b/gameLib/game_ctl.py @@ -24,10 +24,10 @@ def __init__(self, hwnd, quit_game_enable=1): self.hwnd = hwnd self.quit_game_enable = quit_game_enable self.debug_enable = False - #user32 = ctypes.windll.user32 - # user32.SetProcessDPIAware() l1, t1, r1, b1 = win32gui.GetWindowRect(self.hwnd) + #print(l1,t1, r1,b1) l2, t2, r2, b2 = win32gui.GetClientRect(self.hwnd) + #print(l2,t2,r2,b2) self._client_h = b2 - t2 self._client_w = r2 - l2 self._border_l = ((r1 - l1) - (r2 - l2)) // 2 diff --git a/goryou/single_fight.py b/goryou/single_fight.py index c451c92..8233dde 100644 --- a/goryou/single_fight.py +++ b/goryou/single_fight.py @@ -41,3 +41,6 @@ def start(self): self.click_until_knn('结算', 'img\\TIAO-ZHAN.png', *CommonPos.second_position, mood3.get1mood()/1000, thread=20) logging.info("回到选择界面") + + # 检查游戏次数 + self.check_times() diff --git a/gui/tkui.py b/gui/tkui.py index 08ba91c..463ac05 100644 --- a/gui/tkui.py +++ b/gui/tkui.py @@ -7,6 +7,7 @@ class Application(tk.Frame): def __init__(self, master=None): super().__init__(master) self.master = master + self.master.iconbitmap('img/icon/OnmyojiBot.ico') self.master.wm_title('OnmyojiBot') self.pack() @@ -14,6 +15,7 @@ def __init__(self, master=None): self.run_section = 0 self.run_mode = tk.IntVar() self.run_submode = tk.IntVar() + self.max_times = tk.IntVar() self.watchdog_enable = tk.BooleanVar() self.max_win_time = tk.IntVar() @@ -29,6 +31,7 @@ def __init__(self, master=None): self.run_mode.set(0) self.run_submode.set(0) + self.max_times.set(0) self.watchdog_enable.set(True) self.max_win_time.set(100) self.max_op_time.set(20) @@ -53,6 +56,9 @@ def __init__(self, master=None): self.create_frame2() self.create_frame3() + # 创建次数菜单 + self.create_times() + # 创建高级菜单 self.create_advance() @@ -113,7 +119,7 @@ def create_section(self): self.frame3 = tk.Frame(self.section) self.section.add(self.frame3, text='关于') - self.section.pack(fill=tk.BOTH) + self.section.pack(fill=tk.BOTH, expand=True) def create_frame0(self): ''' @@ -169,11 +175,11 @@ def create_frame2(self): ''' # 提示文本 textframe = tk.Frame(self.frame2) - textframe.pack(expand=True, fill=tk.X) + textframe.pack(expand=True, fill=tk.BOTH) s = tk.Scrollbar(textframe) s.pack(side=tk.RIGHT) text = tk.Text(textframe, height=5, width=21) - text.pack(side=tk.LEFT, expand=True, fill=tk.X) + text.pack(side=tk.LEFT, expand=True, fill=tk.BOTH) text.insert(tk.INSERT, '把狗粮队长放在最左边，点开需要打的章节，然后开始。\n') text.insert(tk.INSERT, '支持自动换狗粮，只打经验怪。\n') text.insert(tk.END, '最好把“合并相同式神”选项关闭。\n') @@ -212,6 +218,22 @@ def create_frame3(self): tk.END, '网址：https://github.com/AcademicDog/onmyoji_bot\n\n交流Q群：592055060') text.config(state=tk.DISABLED) + def create_times(self): + ''' + 游戏次数 + ''' + times = tk.LabelFrame(self.main_frame1, text='次数设置') + times.pack(padx=5, fill=tk.X, anchor=tk.W) + timeframe1 = tk.Frame(times) + timeframe1.pack(anchor=tk.W) + tk.Label(timeframe1, text='游戏次数(0=无数次):').pack(side=tk.LEFT) + tk.Entry(timeframe1, width=6, textvariable=self.max_times).pack() + self.end_operation = ttk.Combobox(times) + self.end_operation['value'] = ('结束后关闭脚本', '结束后关闭脚本和游戏') + self.end_operation.pack(fill=tk.X, padx=2, pady=2) + self.end_operation.current(0) + self.end_operation.config(state='readonly') + def create_advance(self): ''' 高级菜单 @@ -260,6 +282,9 @@ def show_params(self): self.params.insert(tk.END, '\nrun_mode: '+str(self.run_mode.get())) self.params.insert(tk.END, '\nrun_submode: ' + str(self.run_submode.get())) + self.params.insert(tk.END, '\nmax_times: ' + str(self.max_times.get())) + self.params.insert(tk.END, '\nend_operation: ' + + str(self.end_operation.current())) self.params.insert(tk.END, '\nwatchdog_enable: ' + str(self.watchdog_enable.get())) self.params.insert(tk.END, '\nmax_win_time: ' + diff --git a/img/icon/OnmyojiBot.ico b/img/icon/OnmyojiBot.ico new file mode 100644 index 0000000000000000000000000000000000000000..3a49ad467626290e8b86ffe7a7ca89583a07f075 GIT binary patch literal 16958 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 literal 0 HcmV?d00001 diff --git a/mitama/fighter_driver.py b/mitama/fighter_driver.py index 3881911..b43e8f3 100644 --- a/mitama/fighter_driver.py +++ b/mitama/fighter_driver.py @@ -62,3 +62,6 @@ def start(self): time.sleep(0.2) self.yys.mouse_click_bg((674, 384)) self.log.writeinfo('Driver: 自动邀请') + + # 检查游戏次数 + self.check_times() diff --git a/mitama/fighter_passenger.py b/mitama/fighter_passenger.py index 66195dc..cd9406f 100644 --- a/mitama/fighter_passenger.py +++ b/mitama/fighter_passenger.py @@ -63,3 +63,6 @@ def start(self): elif self.yys.find_game_img('img\\JIE-SHOU.png'): self.yys.mouse_click_bg((125, yuhun_loc[1])) self.log.writeinfo('Passenger: 接受邀请') + + # 检查游戏次数 + self.check_times() diff --git a/mitama/single_fight.py b/mitama/single_fight.py index 7322a0a..fdf0586 100644 --- a/mitama/single_fight.py +++ b/mitama/single_fight.py @@ -3,6 +3,7 @@ import tools.utilities as ut import configparser +import logging class SingleFight(Fighter): @@ -54,3 +55,6 @@ def start(self): self.click_until_knn('结算', 'img\\TIAO-ZHAN.png', *CommonPos.second_position, mood3.get1mood()/1000, thread=20) self.log.writeinfo("回到选择界面") + + # 检查游戏次数 + self.check_times() diff --git a/onmyoji.py b/onmyoji.py index 3bc08b1..a756ff6 100644 --- a/onmyoji.py +++ b/onmyoji.py @@ -83,6 +83,14 @@ def my_excepthook(exc_type, exc_value, tb): sys.excepthook = my_excepthook logging.info('UAC pass') + # Query DPI Awareness (Windows 10 and 8) + awareness = ctypes.c_int() + errorCode = ctypes.windll.shcore.GetProcessDpiAwareness( + 0, ctypes.byref(awareness)) + + # Set DPI Awareness (Windows 10 and 8) + errorCode = ctypes.windll.shcore.SetProcessDpiAwareness(0) + # 设置战斗参数 init() diff --git a/ui.py b/ui.py index 6a9b775..84df08b 100644 --- a/ui.py +++ b/ui.py @@ -43,6 +43,8 @@ def set_conf(self): # 御魂参数 self.conf.set('DEFAULT', 'run_mode', str(self.run_mode.get())) + self.conf.set('DEFAULT', 'max_times', str(self.max_times.get())) + self.conf.set('DEFAULT', 'end_operation', str(self.end_operation.current())) self.conf.set('mitama', 'run_submode', str(self.run_submode.get())) self.conf.set('mitama', 'mitama_team_mark', str(self.mitama_team_mark.current())) @@ -111,6 +113,20 @@ def my_excepthook(exc_type, exc_value, tb): if is_admin(): sys.excepthook = my_excepthook + # Query DPI Awareness (Windows 10 and 8) + awareness = ctypes.c_int() + errorCode = ctypes.windll.shcore.GetProcessDpiAwareness( + 0, ctypes.byref(awareness)) + + # Set DPI Awareness (Windows 10 and 8) + errorCode = ctypes.windll.shcore.SetProcessDpiAwareness(1) + # the argument is the awareness level, which can be 0, 1 or 2: + # for 1-to-1 pixel control I seem to need it to be non-zero (I'm using level 2) + + # Set DPI Awareness (Windows 7 and Vista) + success = ctypes.windll.user32.SetProcessDPIAware() + # behaviour on later OSes is undefined, although when I run it on my Windows 10 machine, it seems to work with effects identical to SetProcessDpiAwareness(1) + # 设置战斗参数 root = tk.Tk() app = MyBattle(root)