From 9a026d7ec6110c7f09a53ea61782a2206eaace18 Mon Sep 17 00:00:00 2001
From: "Y.H" <chaos.huyang@gmail.com>
Date: Wed, 4 Mar 2020 16:17:22 +0800
Subject: [PATCH] 1.0.1.0304

---
 CHANGELOG.md                 |   8 ++
 README.md                    |   2 +-
 conf_example.ini             |   7 +-
 explore/explore.py           |  85 ++++++++++++++----
 explore/explore_dual.py      |  61 +++++++++++++
 explore/explore_leader.py    | 116 ++++++++++++++++++++++++
 explore/explore_passenger.py |  76 ++++++++++++++++
 gameLib/fighter.py           |  72 +++++++++------
 gameLib/game_ctl.py          |  29 +++---
 gui/tkui.py                  | 169 ++++++++++++++++++++++++++++-------
 img/DUI.png                  | Bin 0 -> 710 bytes
 img/FEN-XIANG.png            | Bin 6560 -> 0 bytes
 img/JIE-SUAN-JIA-CHENG.png   | Bin 1511 -> 0 bytes
 img/QUE-DING.png             | Bin 0 -> 3278 bytes
 onmyoji.py                   |  17 +++-
 requirements.txt             |   8 +-
 tools/game_pos.py            |   4 +
 tools/utilities.py           |  14 ++-
 ui.py                        |   9 +-
 19 files changed, 579 insertions(+), 98 deletions(-)
 create mode 100644 explore/explore_dual.py
 create mode 100644 explore/explore_leader.py
 create mode 100644 explore/explore_passenger.py
 create mode 100644 img/DUI.png
 delete mode 100644 img/FEN-XIANG.png
 delete mode 100644 img/JIE-SUAN-JIA-CHENG.png
 create mode 100644 img/QUE-DING.png

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 185c9d7..9b8e3d9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # CHANGELOG
 
+## v1.0.1.0304
+#### New features:
+*  探索双开
+#### Fixes (bugs & defects):
+*  修复了探索副本中不停反复点击准备按钮的问题。
+*  修复了部分玩家BitBlt失败的问题。
+*  优化了结算
+
 ## v1.0.1.0301
 #### New features:
 *  增加延迟设定选项。
diff --git a/README.md b/README.md
index d46085b..f69913a 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@
 
 感谢壁咚咚咚咚咚、Tree.提供的技术指导，感谢Abc为本程序提供了应用图标。
 
-感谢以下人员为测试工作做出的努力：鼠白小验实，忒修斯之旅，Garry。
+感谢以下人员为测试工作做出的努力：鼠白小验实，忒修斯之旅，Garry，DD斩首, 暖。
 
 # 注意事项
 
diff --git a/conf_example.ini b/conf_example.ini
index c184de4..d1f0248 100644
--- a/conf_example.ini
+++ b/conf_example.ini
@@ -4,7 +4,7 @@
 client = 0
 #run_section 运行副本：0-御魂；1-御灵；2-探索
 run_section = 0
-#run_mode 运行模式：对于御魂0-单刷；1-司机；2-乘客；3-双开
+#run_mode 御魂运行模式：0-单刷；1-司机；2-乘客；3-双开
 run_mode = 0
 #max_times 最大游戏次数：0-无数次；其他-其他次
 max_times = 0
@@ -29,6 +29,11 @@ max_op_time = 20
 
 [explore]
 #######探索参数######
+#explore_mode 探索模式：0-单刷；1-队长；2-队员；3-双开
+explore_mode = 0
+#更换狗粮设置：1-左; 2-中; 3-右; 4-左后; 5-右后，下同
+gouliang = [2, 3]
+gouliang_b = []
 #fight_boss_enable 结束后是否打BOSS：True-是；False-否
 fight_boss_enable = False
 #slide_shikigami 换狗粮是否拖放式神进度条：True-是；False-否
diff --git a/explore/explore.py b/explore/explore.py
index 3ab7411..8dc048e 100644
--- a/explore/explore.py
+++ b/explore/explore.py
@@ -9,13 +9,34 @@
 
 
 class ExploreFight(Fighter):
-    def __init__(self):
-        # 初始化
-        Fighter.__init__(self)
+    def __init__(self, hwnd=0, mode=0):
+        '''
+        初始化
+            :param hwnd=0: 指定窗口句柄：0-否；其他-窗口句柄
+            :param mode=0: 狗粮模式：0-正常模式，1-组队后排狗粮
+        '''
+        Fighter.__init__(self, hwnd=hwnd)
 
         # 读取配置文件
         conf = configparser.ConfigParser()
         conf.read('conf.ini')
+
+        # 读取狗粮配置
+        if mode == 0:
+            raw_gouliang = conf.get('explore', 'gouliang')
+        else:
+            raw_gouliang = conf.get('explore', 'gouliang_b')
+        if len(raw_gouliang) == 2:
+            self.gouliang = None
+        elif len(raw_gouliang) == 3:
+            self.gouliang = [int(raw_gouliang[1])]
+        elif len(raw_gouliang) == 6:
+            self.gouliang = [int(raw_gouliang[1]), int(raw_gouliang[4])]
+        elif len(raw_gouliang) == 9:
+            self.gouliang = [int(raw_gouliang[1]), int(
+                raw_gouliang[4]), int(raw_gouliang[7])]
+
+        # 读取其他配置
         self.fight_boss_enable = conf.getboolean(
             'explore', 'fight_boss_enable')
         self.slide_shikigami = conf.getboolean('explore', 'slide_shikigami')
@@ -36,18 +57,34 @@ def next_scene(self):
     def check_exp_full(self):
         '''
         检查狗粮经验，并自动换狗粮
+        狗粮序列，1-左; 2-中; 3-右; 4-左后; 5-右后
         '''
-        # 狗粮经验判断, gouliang1是中间狗粮，gouliang2是右边狗粮
-        gouliang1 = self.yys.find_game_img(
-            'img\\MAN1.png', 1, *TansuoPos.gouliang_middle, 1)
-        gouliang2 = self.yys.find_game_img(
-            'img\\MAN2.png', 1, *TansuoPos.gouliang_right, 1)
+        if self.gouliang == None:
+            return
 
-        # print(gouliang1)
-        # print(gouliang2)
+        # 狗粮经验判断
+        gouliang = []
+        if 1 in self.gouliang:
+            gouliang.append(self.yys.find_game_img(
+                'img\\MAN2.png', 1, *TansuoPos.gouliang_left, 1, 0.8))
+        if 2 in self.gouliang:
+            gouliang.append(self.yys.find_game_img(
+                'img\\MAN2.png', 1, *TansuoPos.gouliang_middle, 1, 0.8))
+        if 3 in self.gouliang:
+            gouliang.append(self.yys.find_game_img(
+                'img\\MAN2.png', 1, *TansuoPos.gouliang_right, 1, 0.8))
+        if 4 in self.gouliang:
+            gouliang.append(self.yys.find_game_img(
+                'img\\MAN2.png', 1, *TansuoPos.gouliang_leftback, 1, 0.8))
+        if 5 in self.gouliang:
+            gouliang.append(self.yys.find_game_img(
+                'img\\MAN2.png', 1, *TansuoPos.gouliang_rightback, 1, 0.8))
 
         # 如果都没满则退出
-        if not gouliang1 and not gouliang2:
+        res = False
+        for item in gouliang:
+            res = res or bool(item)
+        if not res:
             return
 
         # 开始换狗粮
@@ -84,13 +121,22 @@ def check_exp_full(self):
 
             self.yys.mouse_drag_bg(
                 TansuoPos.n_slide[0], (pos_end_x, pos_end_y))
+            time.sleep(1)
 
         # 更换狗粮
-        if gouliang1:
-            self.yys.mouse_drag_bg((309, 520), (554, 315))
-        if gouliang2:
-            time.sleep(1)
-            self.yys.mouse_drag_bg((191, 520), (187, 315))
+        for i in range(0, len(self.gouliang)):
+            if gouliang[i]:
+                if self.gouliang[i] == 1:
+                    self.yys.mouse_drag_bg((422, 520), (955, 315))
+                elif self.gouliang[i] == 2:
+                    self.yys.mouse_drag_bg((309, 520), (554, 315))
+                elif self.gouliang[i] == 3:
+                    self.yys.mouse_drag_bg((191, 520), (167, 315))
+                elif self.gouliang[i] == 4:
+                    self.yys.mouse_drag_bg((309, 520), (829, 315))
+                elif self.gouliang[i] == 5:
+                    self.yys.mouse_drag_bg((191, 520), (301, 315))
+                ut.mysleep(1000)
 
     def find_exp_moster(self):
         '''
@@ -160,7 +206,7 @@ def fight_moster(self, mood1, mood2):
                     return -1
 
             # 攻击怪
-            self.yys.mouse_click_bg(fight_pos)            
+            self.click_until('怪', 'img/YING-BING.png', fight_pos, step_time=0.3, appear=False)
             self.log.writeinfo('已进入战斗')
 
             # 等待式神准备
@@ -171,8 +217,8 @@ def fight_moster(self, mood1, mood2):
             self.check_exp_full()
 
             # 点击准备，直到进入战斗
-            self.click_until('准备按钮', 'img\\ZI-DONG.png', *
-                             TansuoPos.ready_btn, mood1.get1mood()/1000)
+            self.click_until('准备按钮', 'img/ZHUN-BEI.png', *
+                             TansuoPos.ready_btn, mood1.get1mood()/1000, False)
 
             # 检查是否打完
             state = self.check_end()
@@ -204,6 +250,7 @@ def start(self):
                 if result == 1:
                     continue
                 elif result == 2:
+                    time.sleep(1)
                     break
                 else:
                     self.log.writeinfo('移动至下一个场景')
diff --git a/explore/explore_dual.py b/explore/explore_dual.py
new file mode 100644
index 0000000..5907a17
--- /dev/null
+++ b/explore/explore_dual.py
@@ -0,0 +1,61 @@
+from gameLib.game_ctl import GameControl
+from explore.explore_leader import ExploreLeader
+from explore.explore_passenger import ExplorePassenger
+
+import logging
+import threading
+import win32gui
+
+hwndlist = []
+
+
+def get_all_hwnd(hwnd, mouse):
+    '''
+    获取所有阴阳师窗口
+    '''
+    if win32gui.IsWindow(hwnd) and win32gui.IsWindowEnabled(hwnd) and win32gui.IsWindowVisible(hwnd):
+        if win32gui.GetWindowText(hwnd) == u'阴阳师-网易游戏':
+            hwndlist.append(hwnd)
+
+
+def get_game_hwnd():
+    win32gui.EnumWindows(get_all_hwnd, 0)
+
+
+class ExploreDual():
+    def __init__(self):
+        # 初始化窗口信息
+        get_game_hwnd()
+        self.hwndlist = hwndlist
+
+        # 检测窗口信息是否正确
+        num = len(self.hwndlist)
+        if num == 2:
+            logging.info('检测到两个窗口，窗口信息正常')
+        else:
+            logging.warning('检测到'+str(num)+'个窗口，窗口信息异常！')
+
+        # 初始化司机和打手
+        for hwnd in hwndlist:
+            yys = GameControl(hwnd)
+            if yys.find_game_img('img/DUI.png', 1, (68, 242), (135, 306), thread=0.8):
+                self.driver = ExploreLeader(hwnd=hwnd)
+                hwndlist.remove(hwnd)
+                logging.info('发现队长')
+                break
+        self.passenger = ExplorePassenger(hwnd=hwndlist[0])
+        logging.info('发现乘客')
+
+    def start(self):
+        task1 = threading.Thread(target=self.driver.start)
+        task2 = threading.Thread(target=self.passenger.start)
+        task1.start()
+        task2.start()
+
+        task1.join()
+        task2.join()
+
+    def deactivate(self):
+        self.hwndlist = []
+        self.driver.deactivate()
+        self.passenger.deactivate()
diff --git a/explore/explore_leader.py b/explore/explore_leader.py
new file mode 100644
index 0000000..90a03ea
--- /dev/null
+++ b/explore/explore_leader.py
@@ -0,0 +1,116 @@
+from explore.explore import ExploreFight
+from tools.game_pos import TansuoPos
+import tools.utilities as ut
+
+import logging
+import random
+import time
+
+
+class ExploreLeader(ExploreFight):
+    '''
+    组队探索队长
+    '''
+
+    def __init__(self, hwnd=0):
+        '''
+        初始化
+        '''
+        ExploreFight.__init__(self, hwnd=hwnd, mode=1)
+        self.name = 'Leader: '
+
+    def prev_scene(self):
+        '''
+        滑动到前一页面
+        '''
+        x0 = random.randint(510, 1126)
+        x1 = x0 - 500
+        y0 = random.randint(110, 210)
+        y1 = random.randint(110, 210)
+        self.yys.mouse_drag_bg((x1, y1), (x0, y0))
+
+    def start(self):
+        '''
+        开始战斗
+        '''
+        mood1 = ut.Mood(3)
+        mood2 = ut.Mood(3)
+        mood3 = ut.Mood()
+        scene = self.get_scene()
+        if scene == 4:
+            logging.info('Leader: 已进入探索，就绪')
+        else:
+            logging.warning('Leader: 请检查是否进入探索内，退出')
+            return
+
+        while self.run:
+            # 检测当前场景
+            maxVal_list, maxLoc_list = self.yys.find_multi_img(
+                'img/DUI.png', 'img/YING-BING.png')
+            if maxVal_list[0] < 0.8 and maxVal_list[1] > 0.8:
+                # 队长退出，结束
+                logging.warning('Leader: 队员已退出，脚本结束')
+                self.yys.quit_game()
+
+            # 开始打怪
+            i = 0
+            ok = False
+            while self.run:
+                if i >= 4:
+                    break
+                result = self.fight_moster(mood1, mood2)
+                if result == 1:
+                    ok = True
+                    continue
+                elif result == 2:
+                    break
+                else:
+                    self.log.writeinfo('Leader: 移动至下一个场景')
+                    self.next_scene()
+                    i += 1
+
+            if not ok:
+                # 没有经验怪，随便打一个                
+                fight_pos = self.yys.find_game_img('img/FIGHT.png')
+                while not fight_pos:
+                    self.prev_scene()
+                    fight_pos = self.yys.find_game_img('img/FIGHT.png')
+                # 攻击怪
+                self.yys.mouse_click_bg(fight_pos)
+                self.log.writeinfo('Leader: 已进入战斗')
+
+                # 等待式神准备
+                self.yys.wait_game_img_knn('img/ZHUN-BEI.png', thread=30)
+                logging.info('Leader: 式神准备完成')
+
+                # 检查狗粮经验
+                self.check_exp_full()
+
+                # 点击准备，直到进入战斗
+                self.click_until('准备按钮', 'img/ZHUN-BEI.png', *
+                             TansuoPos.ready_btn, mood1.get1mood()/1000, False)
+
+                # 检查是否打完
+                state = self.check_end()
+                mood1.moodsleep()
+
+                # 在战斗结算页面
+                self.get_reward(mood2, state)
+
+            # 退出探索
+            self.log.writeinfo('Leader: 结束本轮探索')
+            # 点击退出探索
+            self.click_until('退出按钮', 'img/QUE-REN.png',
+                             *TansuoPos.quit_btn, 2)
+            # 点击确认
+            self.click_until('确认按钮', 'img/QUE-REN.png',
+                             *TansuoPos.confirm_btn, 2, False)
+
+            # 下一轮自动邀请
+            self.yys.wait_game_img('img/QUE-DING.png', self.max_win_time)
+            time.sleep(0.5)
+            self.click_until('继续邀请', 'img/QUE-DING.png', *
+                             TansuoPos.yaoqing_comfirm, mood3.get1mood()/1000, False)
+
+            # 检查游戏次数
+            self.check_times()
diff --git a/explore/explore_passenger.py b/explore/explore_passenger.py
new file mode 100644
index 0000000..92fae07
--- /dev/null
+++ b/explore/explore_passenger.py
@@ -0,0 +1,76 @@
+from explore.explore import ExploreFight
+from tools.game_pos import TansuoPos
+import tools.utilities as ut
+
+import logging
+import time
+
+
+class ExplorePassenger(ExploreFight):
+    '''
+    组队探索队员
+    '''
+
+    def __init__(self, hwnd=0):
+        '''
+        初始化
+        '''
+        ExploreFight.__init__(self, hwnd=hwnd)
+        self.name = 'Passenger: '
+
+    def start(self):
+        '''
+        开始战斗
+        '''
+        mood = ut.Mood(3)
+        scene = self.get_scene()
+        if scene == 4:
+            logging.info('Passenger: 已进入探索，就绪')
+        else:
+            logging.warning('Passenger: 请检查是否进入探索内，退出')
+            return
+
+        while self.run:
+            # 检测当前场景
+            maxVal_list, maxLoc_list = self.yys.find_multi_img(
+                'img/DUI.png', 'img/YING-BING.png')
+            # print(maxVal_list)
+            if maxVal_list[0] < 0.8 and maxVal_list[1] > 0.8:
+                # 队长退出，则跟着退出
+                logging.info('Passenger: 队长已退出，跟随退出')
+                self.switch_to_scene(3)
+
+                # 等待邀请
+                js_loc = self.yys.wait_game_img(
+                    'img/JIE-SHOU.png', self.max_win_time)
+                if js_loc:
+                    # 点击接受邀请
+                    if self.yys.find_game_img('img/JIE-SHOU.png'):
+                        self.yys.mouse_click_bg((js_loc[0]+33, js_loc[1]+34))
+                        self.log.writeinfo('Passenger: 接受邀请')
+
+                # 检查游戏次数
+                self.check_times()
+
+            elif maxVal_list[0] > 0.8 and maxVal_list[1] < 0.8:
+                # 进入战斗，等待式神准备
+                self.yys.wait_game_img_knn('img/ZHUN-BEI.png', thread=30)
+                logging.info('Passenger: 式神准备完成')
+
+                # 检查狗粮经验
+                self.check_exp_full()
+
+                # 点击准备，直到进入战斗
+                self.click_until_knn('准备按钮', 'img/ZI-DONG.png', *
+                                 TansuoPos.ready_btn, mood.get1mood()/1000, False, 30)
+
+                # 检测是否打完
+                state = self.check_end()
+                mood.moodsleep()
+
+                # 点击结算
+                self.get_reward(mood, state)
+
+            else:
+                # 其他，不做任何操作
+                time.sleep(0.5)
diff --git a/gameLib/fighter.py b/gameLib/fighter.py
index 89da64e..acdde4f 100644
--- a/gameLib/fighter.py
+++ b/gameLib/fighter.py
@@ -78,10 +78,13 @@ def check_end(self):
         检测是否打完
             :return: 胜利页面返回0；奖励页面返回1
         '''
-        self.yys.rejectbounty()
         self.log.writeinfo(self.name + '检测是战斗是否结束')
         start_time = time.time()
+        myend = -1
         while time.time()-start_time <= self.max_win_time and self.run:
+            # 拒绝悬赏
+            self.yys.rejectbounty()
+
             maxVal, maxLoc = self.yys.find_multi_img(
                 'img/SHENG-LI.png', 'img/TIAO-DAN.png', 'img/JIN-BI.png', 'img/JIE-SU.png')
             end_cof = max(maxVal)
@@ -91,7 +94,6 @@ def check_end(self):
             time.sleep(0.5)
         if myend in [0, 3]:
             logging.info(self.name + '战斗成功')
-            self.yys.mouse_click_bg(*ut.firstposition())
             return 0
         elif myend in [1, 2]:
             logging.info(self.name + '本轮战斗结束')
@@ -121,25 +123,45 @@ def get_reward(self, mood, state):
             :param mood: 状态函数
             :param state: 上一步的状态。0-战斗成功页面; 1-领取奖励页面
         '''
+        # 初始化结算点
+        mypos = ut.secondposition()
         if state == 0:
-            self.click_until('奖励', 'img/TIAO-DAN.png', *
-                             ut.firstposition(), mood.get1mood()/1000)
-        mood.moodsleep()
-        self.yys.mouse_click_bg(ut.secondposition())
+            self.yys.mouse_click_bg(mypos)
+            logging.info(self.name + '点击结算')
+            mood.moodsleep()
         start_time = time.time()
         while time.time()-start_time <= self.max_op_time and self.run:
+            # 拒绝悬赏
+            self.yys.rejectbounty()
+
+            while True:
+                newpos = (mypos[0] + random.randint(-50, 50),
+                          mypos[1] + random.randint(-50, 50))
+                if ut.checkposition(newpos):
+                    mypos = newpos
+                    break
+
+            # 点击一次结算
+            self.yys.mouse_click_bg(mypos)
+            logging.info(self.name + '点击结算')
+            mood.moodsleep()
+
+            # 错误纠正
             maxVal, maxLoc = self.yys.find_multi_img(
-                'img/FA-SONG-XIAO-XI.png', 'img/ZHI-LIAO-LIANG.png', 'img/JIE-SUAN-JIA-CHENG.png')
+                'img/FA-SONG-XIAO-XI.png', 'img/ZHI-LIAO-LIANG.png')
             if max(maxVal) > 0.9:
                 self.yys.mouse_click_bg((35, 295), (140, 475))
-            result = self.yys.find_game_img_knn('img/TIAO-DAN.png', thread=2)
-            if not result:
+                logging.info(self.name + '错误纠正')
+                mood.moodsleep()
+                continue
+
+            # 正常结算
+            maxVal, maxLoc = self.yys.find_multi_img(
+                'img/SHENG-LI.png', 'img/TIAO-DAN.png', 'img/JIN-BI.png', 'img/JIE-SU.png')
+            if max(maxVal) < 0.9:
                 logging.info(self.name + '结算成功')
                 return
-            else:
-                self.yys.mouse_click_bg(ut.secondposition())
-                self.log.writeinfo(self.name + '点击结算')
-            mood.moodsleep()
+
         self.log.writewarning(self.name + '点击结算失败!')
         # 提醒玩家点击失败，并在5s后退出
         self.yys.activate_window()
@@ -197,20 +219,20 @@ def click_until(self, tag, img_path, pos, pos_end=None, step_time=0.8, appear=Tr
         # 在指定时间内反复监测画面并点击
         start_time = time.time()
         while time.time()-start_time <= self.max_op_time and self.run:
+            # 点击指定位置
+            self.yys.mouse_click_bg(pos, pos_end)
+            self.log.writeinfo(self.name + '点击 ' + tag)
+            ut.mysleep(step_time*1000)
+
             result = self.yys.find_game_img(img_path)
             if not appear:
                 result = not result
             if result:
                 self.log.writeinfo(self.name + '点击 ' + tag + ' 成功')
                 return True
-            else:
-                # 点击指定位置并等待下一轮
-                self.yys.mouse_click_bg(pos, pos_end)
-                self.log.writeinfo(self.name + '点击 ' + tag)
-            ut.mysleep(step_time*1000)
-        self.log.writewarning(self.name + '点击 ' + tag + ' 失败!')
 
         # 提醒玩家点击失败，并在5s后退出
+        self.log.writewarning(self.name + '点击 ' + tag + ' 失败!')
         self.yys.activate_window()
         time.sleep(5)
         self.yys.quit_game()
@@ -230,20 +252,20 @@ def click_until_knn(self, tag, img_path, pos, pos_end=None, step_time=0.8, appea
         # 在指定时间内反复监测画面并点击
         start_time = time.time()
         while time.time()-start_time <= self.max_op_time and self.run:
+            # 点击指定位置并等待下一轮
+            self.yys.mouse_click_bg(pos, pos_end)
+            self.log.writeinfo(self.name + '点击 ' + tag)
+            ut.mysleep(step_time*1000)
+
             result = self.yys.find_game_img_knn(img_path, thread=thread)
             if not appear:
                 result = not result
             if result:
                 self.log.writeinfo(self.name + '点击 ' + tag + ' 成功')
                 return True
-            else:
-                # 点击指定位置并等待下一轮
-                self.yys.mouse_click_bg(pos, pos_end)
-                self.log.writeinfo(self.name + '点击 ' + tag)
-            ut.mysleep(step_time*1000)
-        self.log.writewarning(self.name + '点击 ' + tag + ' 失败!')
 
         # 提醒玩家点击失败，并在5s后退出
+        self.log.writewarning(self.name + '点击 ' + tag + ' 失败!')
         self.yys.activate_window()
         time.sleep(5)
         self.yys.quit_game()
diff --git a/gameLib/game_ctl.py b/gameLib/game_ctl.py
index 09ca273..77196a9 100644
--- a/gameLib/game_ctl.py
+++ b/gameLib/game_ctl.py
@@ -30,7 +30,7 @@ def __init__(self, hwnd, quit_game_enable=1):
         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)
+        # print(l2,t2,r2,b2)
         self._client_h = b2 - t2
         self._client_w = r2 - l2
         self._border_l = ((r1 - l1) - (r2 - l2)) // 2
@@ -42,6 +42,15 @@ def __init__(self, hwnd, quit_game_enable=1):
             os.system('adb connect 127.0.0.1:7555')
             os.system('adb devices')
 
+    def init_mem(self):
+        self.hwindc = win32gui.GetWindowDC(self.hwnd)
+        self.srcdc = win32ui.CreateDCFromHandle(self.hwindc)
+        self.memdc = self.srcdc.CreateCompatibleDC()
+        self.bmp = win32ui.CreateBitmap()
+        self.bmp.CreateCompatibleBitmap(
+            self.srcdc, self._client_w, self._client_h)
+        self.memdc.SelectObject(self.bmp)
+
     def window_full_shot(self, file_name=None, gray=0):
         """
         窗口截图
@@ -51,13 +60,7 @@ def window_full_shot(self, file_name=None, gray=0):
         """
         try:
             if (not hasattr(self, 'memdc')):
-                self.hwindc = win32gui.GetWindowDC(self.hwnd)
-                self.srcdc = win32ui.CreateDCFromHandle(self.hwindc)
-                self.memdc = self.srcdc.CreateCompatibleDC()
-                self.bmp = win32ui.CreateBitmap()
-                self.bmp.CreateCompatibleBitmap(
-                    self.srcdc, self._client_w, self._client_h)
-                self.memdc.SelectObject(self.bmp)
+                self.init_mem()
             if self.client == 0:
                 self.memdc.BitBlt((0, 0), (self._client_w, self._client_h), self.srcdc,
                                   (self._border_l, self._border_t), win32con.SRCCOPY)
@@ -78,6 +81,7 @@ def window_full_shot(self, file_name=None, gray=0):
                 else:
                     return cv2.cvtColor(img, cv2.COLOR_BGRA2GRAY)
         except Exception:
+            self.init_mem()
             logging.warning('window_full_shot执行失败')
             a = traceback.format_exc()
             logging.warning(a)
@@ -149,7 +153,7 @@ def find_color(self, region, color, tolerance=0):
                 except Exception:
                     logging.warning('find_color执行失败')
                     a = traceback.format_exc()
-                    logging.warning(a)                    
+                    logging.warning(a)
                     return -1
         return -1
 
@@ -275,7 +279,7 @@ def find_multi_img(self, *img_template_path, part=0, pos1=None, pos2=None, gray=
             except Exception:
                 logging.warning('find_multi_img执行失败')
                 a = traceback.format_exc()
-                logging.warning(a)                
+                logging.warning(a)
                 maxVal_list.append(0)
                 maxLoc_list.append(0)
         # 返回列表
@@ -492,7 +496,7 @@ def rejectbounty(self):
             return True
         return False
 
-    def find_game_img(self, img_path, part=0, pos1=None, pos2=None, gray=0):
+    def find_game_img(self, img_path, part=0, pos1=None, pos2=None, gray=0, thread=0.9):
         '''
         查找图片
             :param img_path: 查找路径
@@ -500,12 +504,13 @@ def find_game_img(self, img_path, part=0, pos1=None, pos2=None, gray=0):
             :param pos1=None: 欲查找范围的左上角坐标
             :param pos2=None: 欲查找范围的右下角坐标
             :param gray=0: 是否查找黑白图片，0：查找彩色图片，1：查找黑白图片
+            :param thread=0.9: 自定义阈值
             :return: 查找成功返回位置坐标，否则返回False
         '''
         self.rejectbounty()
         maxVal, maxLoc = self.find_img(img_path, part, pos1, pos2, gray)
         # print(maxVal)
-        if maxVal > 0.9:
+        if maxVal > thread:
             return maxLoc
         else:
             return False
diff --git a/gui/tkui.py b/gui/tkui.py
index 36e97c2..43330d7 100644
--- a/gui/tkui.py
+++ b/gui/tkui.py
@@ -22,6 +22,12 @@ def __init__(self, master=None):
         self.max_win_time = tk.IntVar()
         self.max_op_time = tk.IntVar()
 
+        self.explore_mode = tk.IntVar(value=0)
+        self.gouliang_1 = tk.BooleanVar(value=False)
+        self.gouliang_2 = tk.BooleanVar(value=True)
+        self.gouliang_3 = tk.BooleanVar(value=True)
+        self.gouliang_4 = tk.BooleanVar(value=False)
+        self.gouliang_5 = tk.BooleanVar(value=False)
         self.fight_boss_enable = tk.BooleanVar()
         self.slide_shikigami = tk.BooleanVar()
         self.slide_shikigami_progress = tk.IntVar()
@@ -78,16 +84,19 @@ def create_menubar(self):
 
         # 创建菜单项
         menu1 = tk.Menu(menubar, tearoff=0)
-        menu1.add_command(label='关于', command=self.say_hi)
-
-        # 链接
         menubar.add_cascade(label="文件", menu=menu1)
+        menu1.add_command(label='关于', command=self.say_hi)
 
         # 高级选项
         menu2 = tk.Menu(menubar, tearoff=0)
         menubar.add_cascade(label="高级", menu=menu2)
         menu2.add_command(label='自定义延迟', command=self.delay_dialog)
 
+        # 帮助
+        menu3 = tk.Menu(menubar, tearoff=0)
+        menubar.add_cascade(label='帮助', menu=menu3)
+        menu3.add_command(label='使用说明', command=self.help)
+
         # 设置
         self.master.config(menu=menubar)
 
@@ -157,7 +166,7 @@ def create_frame0(self):
                        value=3).grid(row=1, column=1, sticky=tk.W)
 
         # 游戏副本
-        submode = tk.LabelFrame(self.frame0, text='副本')
+        submode = tk.LabelFrame(self.frame0, text='副本(请锁定阵容)')
         submode.pack(padx=5, pady=5, fill=tk.BOTH, expand=True)
         tk.Radiobutton(submode, text='八岐大蛇', variable=self.run_submode,
                        value=0).grid(row=0, column=0, sticky=tk.W)
@@ -190,18 +199,41 @@ def create_frame2(self):
         '''
         探索参数
         '''
-        # 提示文本
-        textframe = tk.Frame(self.frame2)
-        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.BOTH)
-        text.insert(tk.INSERT, '把狗粮队长放在最左边，点开需要打的章节，然后开始。\n')
-        text.insert(tk.INSERT, '支持自动换狗粮，只打经验怪。\n')
-        text.insert(tk.END, '最好把“合并相同式神”选项关闭。\n')
-        s.config(command=text.yview)
-        text.config(yscrollcommand=s.set, state=tk.DISABLED)
+        # 副本选择
+        submode = tk.LabelFrame(self.frame2, text='模式')
+        submode.pack(fill=tk.BOTH, expand=True)
+        tk.Radiobutton(submode, text='单刷', variable=self.explore_mode,
+                       value=0, command=lambda: self.gouliang_state(1)).grid(row=0, column=0, sticky=tk.W)
+        tk.Radiobutton(submode, text='单人队长', variable=self.explore_mode,
+                       value=1, command=lambda: self.gouliang_state(2)).grid(row=0, column=1, sticky=tk.W)
+        tk.Radiobutton(submode, text='单人队员', variable=self.explore_mode,
+                       value=2, command=lambda: self.gouliang_state(1)).grid(row=1, column=0, sticky=tk.W)
+        tk.Radiobutton(submode, text='桌面版双开', variable=self.explore_mode,
+                       value=3, command=lambda: self.gouliang_state(3)).grid(row=1, column=1, sticky=tk.W)
+
+        # 狗粮设置
+        food = tk.LabelFrame(self.frame2, text='更换狗粮 (勿锁定阵容)')
+        food.pack(fill=tk.BOTH, expand=True)
+        self.gouliang_l = tk.Checkbutton(
+            food, text='左', variable=self.gouliang_1)
+        self.gouliang_l.grid(row=0, column=0)
+        self.gouliang_m = tk.Checkbutton(
+            food, text='中', variable=self.gouliang_2)
+        self.gouliang_m.grid(row=0, column=1)
+        self.gouliang_r = tk.Checkbutton(
+            food, text='右', variable=self.gouliang_3)
+        self.gouliang_r.grid(row=0, column=2)
+        tk.Label(food, text='单人/队员').grid(row=0, column=3, sticky=tk.W)
+
+        self.gouliang_lb = tk.Checkbutton(
+            food, text='左', variable=self.gouliang_4)
+        self.gouliang_lb.grid(row=1, column=0)
+        self.gouliang_rb = tk.Checkbutton(
+            food, text='右', variable=self.gouliang_5)
+        self.gouliang_rb.grid(row=1, column=2)
+        tk.Label(food, text='队长').grid(row=1, column=3, sticky=tk.W)
+        self.gouliang_lb.config(state=tk.DISABLED)
+        self.gouliang_rb.config(state=tk.DISABLED)
 
         # 换狗粮设置
         tk.Checkbutton(self.frame2, text='换狗粮拖放式神进度条，进度:',
@@ -226,6 +258,8 @@ def create_frame3(self):
         text.pack(expand=True, fill=tk.BOTH)
         text.insert(
             tk.END, '网址：https://github.com/AcademicDog/onmyoji_bot\n\n交流Q群：592055060')
+        text.insert(
+            tk.END, '\n\n如果觉得脚本动作太慢，请到高级菜单自定义延迟。')
         text.config(state=tk.DISABLED)
 
     def create_times(self):
@@ -285,8 +319,9 @@ def create_command(self):
                   command=self.stop_onmyoji).pack(fill=tk.X)
 
     def show_params(self):
+        self.get_gouliang()
         self.params.config(state=tk.NORMAL)
-        self.params.insert(tk.END, '########1.0.1.0229########\n')
+        self.params.insert(tk.END, '########1.0.1.0304########\n')
         self.params.insert(tk.END, 'client: ' + str(self.client.current()))
         self.params.insert(tk.END, '\nrun_section: ' +
                            str(self.section.index('current')))
@@ -304,6 +339,10 @@ def show_params(self):
                            str(self.max_op_time.get()))
         self.params.insert(tk.END, '\nmitama_team_mark: ' +
                            str(self.mitama_team_mark.current()))
+        self.params.insert(tk.END, '\nexplore_mode: ' +
+                           str(self.explore_mode.get()))
+        self.params.insert(tk.END, '\ngouliang: ' + str(self.gouliang))
+        self.params.insert(tk.END, '\ngouliang_b: ' + str(self.gouliang_b))
         self.params.insert(tk.END, '\nfight_boss_enable: ' +
                            str(self.fight_boss_enable.get()))
         self.params.insert(tk.END, '\nslide_shikigami: ' +
@@ -329,16 +368,73 @@ def delay_dialog(self):
         pw = DelayDialog(self)
         self.wait_window(pw)
 
+    def help(self):
+        '''
+        使用说明
+        '''
+        tk.messagebox.showinfo(
+            "使用说明", '详细使用说明请参考https://academicdog.github.io/onmyoji_bot/')
+
+    def gouliang_state(self, state):
+        '''
+        禁用狗粮选项
+            :param state: 1-仅启用3狗粮，2-禁用3狗粮，3-全启用
+        '''
+        if state == 1:
+            self.gouliang_4.set(False)
+            self.gouliang_5.set(False)
+            self.gouliang_l.config(state=tk.NORMAL)
+            self.gouliang_m.config(state=tk.NORMAL)
+            self.gouliang_r.config(state=tk.NORMAL)
+            self.gouliang_lb.config(state=tk.DISABLED)
+            self.gouliang_rb.config(state=tk.DISABLED)
+        elif state == 2:
+            self.gouliang_1.set(False)
+            self.gouliang_2.set(False)
+            self.gouliang_3.set(False)
+            self.gouliang_l.config(state=tk.DISABLED)
+            self.gouliang_m.config(state=tk.DISABLED)
+            self.gouliang_r.config(state=tk.DISABLED)
+            self.gouliang_lb.config(state=tk.NORMAL)
+            self.gouliang_rb.config(state=tk.NORMAL)
+        elif state == 3:
+            self.gouliang_l.config(state=tk.NORMAL)
+            self.gouliang_m.config(state=tk.NORMAL)
+            self.gouliang_r.config(state=tk.NORMAL)
+            self.gouliang_lb.config(state=tk.NORMAL)
+            self.gouliang_rb.config(state=tk.NORMAL)
+
+    def get_gouliang(self):
+        '''
+        计算狗粮坐标
+        '''
+        # 前狗粮
+        self.gouliang = []
+        if self.gouliang_1.get():
+            self.gouliang.append(1)
+        if self.gouliang_2.get():
+            self.gouliang.append(2)
+        if self.gouliang_3.get():
+            self.gouliang.append(3)
+        
+        # 后狗粮
+        self.gouliang_b = []
+        if self.gouliang_4.get():
+            self.gouliang_b.append(4)
+        if self.gouliang_5.get():
+            self.gouliang_b.append(5)
+
     def start_onmyoji(self):
         self.show_params()
 
     def stop_onmyoji(self):
         pass
 
+
 class DelayDialog(tk.Toplevel):
     def __init__(self, parent):
         super().__init__()
-        self.title('延迟设置')        
+        self.title('延迟设置')
         self.parent = parent
 
         # 参数
@@ -354,7 +450,7 @@ def __init__(self, parent):
         row1.pack(fill=tk.X)
         tk.Label(row1, text='延迟机制：').pack(anchor=tk.W)
         text = tk.Text(row1, height=11, width=40)
-        text.pack(expand=True, fill=tk.BOTH)        
+        text.pack(expand=True, fill=tk.BOTH)
         text.insert(tk.END, '1-总共5级延迟，脚本随机从1-5级延迟中选择一级作为主延迟，\
 同时在1-3级延迟中选择一级作为副延迟。在此基础上乘以随机系数。\n\n')
         text.insert(tk.END, '2-每5分钟刷新选择，计算单位毫秒。\n\n')
@@ -367,33 +463,43 @@ def __init__(self, parent):
         row2.pack(fill=tk.X)
         tk.Label(row2, text='一级: ').grid(row=0, column=0)
         tk.Label(row2, text='最低').grid(row=0, column=1)
-        tk.Entry(row2, width=7, textvariable=self.delay[1][0]).grid(row=0, column=3)
+        tk.Entry(row2, width=7, textvariable=self.delay[1][0]).grid(
+            row=0, column=3)
         tk.Label(row2, text='最高').grid(row=0, column=4)
-        tk.Entry(row2, width=7, textvariable=self.delay[1][1]).grid(row=0, column=5)
+        tk.Entry(row2, width=7, textvariable=self.delay[1][1]).grid(
+            row=0, column=5)
 
         tk.Label(row2, text='二级: ').grid(row=1, column=0)
         tk.Label(row2, text='最低').grid(row=1, column=1)
-        tk.Entry(row2, width=7, textvariable=self.delay[2][0]).grid(row=1, column=3)
+        tk.Entry(row2, width=7, textvariable=self.delay[2][0]).grid(
+            row=1, column=3)
         tk.Label(row2, text='最高').grid(row=1, column=4)
-        tk.Entry(row2, width=7, textvariable=self.delay[2][1]).grid(row=1, column=5)
+        tk.Entry(row2, width=7, textvariable=self.delay[2][1]).grid(
+            row=1, column=5)
 
         tk.Label(row2, text='三级: ').grid(row=2, column=0)
         tk.Label(row2, text='最低').grid(row=2, column=1)
-        tk.Entry(row2, width=7, textvariable=self.delay[3][0]).grid(row=2, column=3)
+        tk.Entry(row2, width=7, textvariable=self.delay[3][0]).grid(
+            row=2, column=3)
         tk.Label(row2, text='最高').grid(row=2, column=4)
-        tk.Entry(row2, width=7, textvariable=self.delay[3][1]).grid(row=2, column=5)
+        tk.Entry(row2, width=7, textvariable=self.delay[3][1]).grid(
+            row=2, column=5)
 
         tk.Label(row2, text='四级: ').grid(row=3, column=0)
         tk.Label(row2, text='最低').grid(row=3, column=1)
-        tk.Entry(row2, width=7, textvariable=self.delay[4][0]).grid(row=3, column=3)
+        tk.Entry(row2, width=7, textvariable=self.delay[4][0]).grid(
+            row=3, column=3)
         tk.Label(row2, text='最高').grid(row=3, column=4)
-        tk.Entry(row2, width=7, textvariable=self.delay[4][1]).grid(row=3, column=5)
+        tk.Entry(row2, width=7, textvariable=self.delay[4][1]).grid(
+            row=3, column=5)
 
         tk.Label(row2, text='五级: ').grid(row=4, column=0)
         tk.Label(row2, text='最低').grid(row=4, column=1)
-        tk.Entry(row2, width=7, textvariable=self.delay[5][0]).grid(row=4, column=3)
+        tk.Entry(row2, width=7, textvariable=self.delay[5][0]).grid(
+            row=4, column=3)
         tk.Label(row2, text='最高').grid(row=4, column=4)
-        tk.Entry(row2, width=7, textvariable=self.delay[5][1]).grid(row=4, column=5)
+        tk.Entry(row2, width=7, textvariable=self.delay[5][1]).grid(
+            row=4, column=5)
 
         # 按钮
         row3 = tk.Frame(self)
@@ -402,13 +508,13 @@ def __init__(self, parent):
         tk.Button(row3, text='取消', command=self.cancel).grid(row=0, column=1)
 
     def confirm(self):
-        mydelay ={
+        mydelay = {
             1: [self.delay[1][0].get(), self.delay[1][1].get() - self.delay[1][0].get()],
             2: [self.delay[2][0].get(), self.delay[2][1].get() - self.delay[2][0].get()],
             3: [self.delay[3][0].get(), self.delay[3][1].get() - self.delay[3][0].get()],
             4: [self.delay[4][0].get(), self.delay[4][1].get() - self.delay[4][0].get()],
             5: [self.delay[5][0].get(), self.delay[5][1].get() - self.delay[5][0].get()]}
-        jsObj = json.dumps(mydelay) 
+        jsObj = json.dumps(mydelay)
         with open('delay.json', 'w') as f:
             f.write(jsObj)
         self.destroy()
@@ -416,6 +522,7 @@ def confirm(self):
     def cancel(self):
         self.destroy()
 
+
 if __name__ == "__main__":
     root = tk.Tk()
     app = Application(master=root)
diff --git a/img/DUI.png b/img/DUI.png
new file mode 100644
index 0000000000000000000000000000000000000000..6658a8982ac3175f5f00815a656fcce648a30fc2
GIT binary patch
literal 710
zcmV;%0y+JOP)<h;3K|Lk000e1NJLTq000gE000dL1^@s6ncQE00007wNkl<ZD3KkK
z=}S~`6o#L>IOF6j>Qzy&L}wz~Txg>tinJ&YTOcYV+Q6Xt1Ns*VN~#Y<Nzg(R6<Hs|
zoYrZ<Xv2bVO|!Bw%h9=WXYO3@%=F9i>3n(5d(LxSDR`_UbNXWss+P~nnrfZ|A5*tx
zIY*A{BWc^Tp1MT;@HZ}AIDsQN$-vcHcz;GvvwSL*3oCGIMJ%Zdphy{7TK15e<Djp1
z7<*=h#es5s&Mef@5{kEO=2v?svbLt0+(HdK5+SZn<Mnw!Qm_&xdMr*fX5gP+j?<Ne
z71Pl~U({HS>@A-sTqNA?9Eu9_dE5P#V8<g=hm)utBNCay<MWbMvPg;5(`J&w1p(wt
zA_;bisc4LWuixqGAL3c))vVL#_c6x9zxnX4hmnC1Jl;GZkdRU!r|mRx)5I|1%vct=
zV!GQshu;%_>G|}9rBzGGcI9xf?Iz*BI@xYF0)r6BvM|h0RFKEPy-l1sd7S1wJLvr~
zNN?W|4GrsP+_sg^pL;oX{u+jr#^G`xTcR<H1hzdRZb;zw&n4TFPiHWM%jIPCvPvq-
z3fNG;mX5BcT)WZElxd?HR*GqHkEZ1!D^7le|ImJ?gO6g(qlb1=oae+&>ulLrN9biY
zt!LX985u<$9UjIoEg{qx|D$vH>V2+Uzsri+C2ZMLCqj_KOeQET_R_qoiIU<%?%nT1
z9q)cmGHGH19S=j?y#0Vx%d0rNe<v=dB7Uj!pN67l*touyQlFC#!PiJH4m4+;r^Ih+
z78CH75t)oowJ0E9c`@P!v!%!aqeNnCjA-Z$o^V1$R8`oX<7L{85vVA@vw9JR5XVG{
sBtcw~m03~r=MN^jUf>#>AnNw;56rk38P2e*CjbBd07*qoM6N<$g5^O~I{*Lx

literal 0
HcmV?d00001

diff --git a/img/FEN-XIANG.png b/img/FEN-XIANG.png
deleted file mode 100644
index c5756aaa157cfe59ef0a7dfce80c9739ab3f7dc6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6560
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
SjiGY@0000<MNUMnLSTY_NcCO-

diff --git a/img/JIE-SUAN-JIA-CHENG.png b/img/JIE-SUAN-JIA-CHENG.png
deleted file mode 100644
index 155bfc31082e80f732f2b68d400a62a7b0f6b885..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1511
zcmV<D1sM8?P)<h;3K|Lk000e1NJLTq009;N000RH1^@s6_qqeM000H9Nkl<ZXo2mT
z*^cC98HOL*zspOxTzhxTbb8X$35>!pfIvbVa>^BO#078%TmrY2gJ_5%6hdYuGf6Mi
zOKmRiE1ye@2#Ul33KI_esx7;0w{5lbJ^j4y*8cp5r_EhZGMNm~XjpGTj(x@Dw&3bM
z;_-=3kT!gMn=o(;-kaKZMnRco#D&f_H^>bK$5!+VoiND>f<0wXQkFGkRblmP#-l#2
z+r#&4dZtO2E?wST>ZT!13${T*5+?*<BJ)|$Q-;i^Ldi^yM;@k9#92;VmUw!~(5x}7
z9+hcxA5>heBAH)<M@J4uUGUX1;g=r{*#|N9aD;1W?9v)F8!8&P!EU$1vP=f5!f`$F
z`;5iN;kUm!5m*#_d6_UB`#8OZ`@1c91$tg%?DoX*mLif1%FZ|z=wunDKuT${FDbd(
zg)DFH3DXkIFi--ZE?v63+f-GJRyTN#Lf2sAD*8=Dl{b`zlKBlq5PDb&JXtK?$L{x0
zdX3+=dGdkJ&1R3;q&zzxaw)R$&GHqMrdZ4etoNBfMHA@=QTwF9c5I<ULDSUC9*oHv
z#Wu{DjXkb6IX$`X@x&GIXoO)*(a5?od2th=$3iuu#2*cq3)wRHyxRmsS<SBMQOLt<
z0wE>WKJw*Wros@od^_5AHoA1_@_nWjprm<0A~K+fm1y$Iy-<xDi5STIjwe3Dp+{0S
zVl^R=G?F(W0;5sQ`xD4S7V>P*V(OBHVlL~HRjgrHwltfVM?X8IC^jUC@L*`6+`*7q
zh|@Pr`mRk`*L?c?g`AYrw{=#cKIjeeiPRWN9<Z`_bzAcCE+@=HpWK;HBSSeZ!}&x^
zCCBL9iNQ!Us%$2Rp@=$}qFn9uy}khIZ57hmFYQ~~UAlDnU!;<`4x@zKJ|Y*uwDwZf
z6}mvhCSbPk7)_7Z>{6o2Ak9jOYQW{T6d*M`JM)<OJ#<pGMa@#Upv)da$KZOo<<0Sw
zr$0Vpze~uZBB|4}4`rftBB?Cv^_ovUd&SN5ijUs+#4vOkqhT`Y@mR3cvnRa%TgbLj
zLO6p(Ybf%NS&<NnTh*~459$&)r|6<mrvj0Y?_o>DYAwaFEnKl9^R2P`8%eb9?&{K|
z%lDG@9ZQ<!L~$b0P#i$hZm)Ntn8=uw$V;?0$O}c~%qgW=JajBHO(RY+E<*T`Gve`a
zjZ*hqm|`~Dg!5yIA~E^+`AfN`oO6D9s7>l-9Z0pY`0J}%-hBCmR2BH?lZPA+71NPo
zK6jWe9-ui>{_;XP)z)A<o^muDGw3^nNy7blOBAK-vjSb$@jRPHL#am75&ocmcv;&%
zpds*SkGI=hx^#KBY2nhE3QcP(4T;p9)n>;^<~L|<CN1O~9j9+`GV+-n{-6V^ZE%?J
z=dUZg(S-A#%oyKZaC5O{y)XDcvoMx1pMCzCm$E)tOws=I`(HFWZNesM$o4CK{qzCP
zK02q6u4QVe*ou6U?efXzcf7tzaQg!u9L)~UaQ<m5Z717Dv5>GtiH*2Yd4>X%erqQ!
zRCMiMm8VOWE<bqMw=1<&p;X|~zBk>;(i%-0TjsiL8UxQo7YPXD*!At|u;^OJZ+?En
z$=D>=1Z-nXnv5+KDCXl&|IVAWd^T#dKmP7Xqb6qpkAXlU#}j2aJ6$l83zu@E%}$6G
zq*8Zk#<K6dheymOV{E%8^+p%MArPu4%aXd1&L$9P;i8n1T4Z!M>C)x@IE`3L`!6Bw
z47c+uJ1~@S5CTKmh13g~?TTO@a<#k@xZEEq)Wo-$jeTh+9+fcQ;(E>H^8UaC4XI0J
z5pg;nVviR@(xtY+o-e*y9&XlFmiDEqYg;VlQywm6qDP~{yOI_lZ_|@L2G$Sv)9KQs
z%YPkH=GXa8$6L^-;bCow&9vsyg63{>Ls4Cc#pnl_IGT;|`!0DN^ADqvsIx|Y&{hBd
N002ovPDHLkV1gL5?<)WR

diff --git a/img/QUE-DING.png b/img/QUE-DING.png
new file mode 100644
index 0000000000000000000000000000000000000000..2759d03bd8ff7db94ce04a5f4bbde5f48f60d5e1
GIT binary patch
literal 3278
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
M07*qoM6N<$g48EVv;Y7A

literal 0
HcmV?d00001

diff --git a/onmyoji.py b/onmyoji.py
index e8c5f5b..4b28ef7 100644
--- a/onmyoji.py
+++ b/onmyoji.py
@@ -1,4 +1,7 @@
 from explore.explore import ExploreFight
+from explore.explore_passenger import ExplorePassenger
+from explore.explore_leader import ExploreLeader
+from explore.explore_dual import ExploreDual
 from goryou.single_fight import GoryouFight
 from mitama.dual import DualFighter
 from mitama.fighter_driver import DriverFighter
@@ -59,7 +62,19 @@ def init():
 
     elif section == 2:
         # 探索
-        fight = ExploreFight()
+        mode = conf.getint('explore', 'explore_mode')
+        if mode == 0:
+            # 单刷
+            fight = ExploreFight()
+        elif mode == 1:
+            # 单人队长
+            fight = ExploreLeader()
+        elif mode == 2:
+            # 单人队员
+            fight = ExplorePassenger()
+        elif mode == 3:
+            # 双开
+            fight = ExploreDual()
 
     fight.start()
 
diff --git a/requirements.txt b/requirements.txt
index 4603c20..bec434d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
-numpy==1.17.1
-pywin32==224
-opencv_python==4.1.0.25
-Pillow==6.1.0
+numpy
+pywin32
+opencv_python
+Pillow
 opencv_contrib_python==3.4.2.16
\ No newline at end of file
diff --git a/tools/game_pos.py b/tools/game_pos.py
index 7f5e0eb..49d3f45 100644
--- a/tools/game_pos.py
+++ b/tools/game_pos.py
@@ -23,8 +23,12 @@ class TansuoPos():
     s_tab_btn = (33, 264), (82, 307)  # 素材标签
     r_tab_btn = (216, 322), (259, 366)  # r卡标签
     n_slide = (168, 615), (784, 615)  # n卡进度条，从头至尾
+    gouliang_left = (161, 174), (322, 288)  # 左边狗粮位置
     gouliang_middle = (397, 218), (500, 349)  # 中间狗粮位置
     gouliang_right = (628, 293), (730, 430)  # 右边狗粮位置
+    gouliang_leftback = (0, 273), (150, 393)  # 左后狗粮位置
+    gouliang_rightback = (433, 462), (567, 569)  # 右后狗粮位置
+    yaoqing_comfirm = (601, 361), (746, 406)  # 继续邀请按钮
 
     @staticmethod
     def InitPosWithClient__():
diff --git a/tools/utilities.py b/tools/utilities.py
index c8ebd21..07120c4 100644
--- a/tools/utilities.py
+++ b/tools/utilities.py
@@ -92,7 +92,19 @@ def secondposition():
     获得点击位置，扣除御魂部分
         :return: 返回随机位置坐标
     '''
-    return (random.randint(887, 1111), random.randint(56, 452))
+    return (random.randint(970, 1111), random.randint(100, 452))
+
+
+def checkposition(pos):
+    '''
+    校核结算位置
+        :param pos: (x, y)位置坐标
+        :return: 如果合适返回True，否则返回False
+    '''
+    if pos[0] < 1111 and pos[0] > 970:
+        if pos[1] < 452 and pos[1] > 100:
+            return True
+    return False
 
 
 def mysleep(slpa, slpb=0):
diff --git a/ui.py b/ui.py
index b6c8ede..5b505b3 100644
--- a/ui.py
+++ b/ui.py
@@ -52,6 +52,9 @@ def set_conf(self):
                       str(self.mitama_team_mark.current()))
 
         # 探索参数
+        self.conf.set('explore', 'explore_mode', str(self.explore_mode.get()))
+        self.conf.set('explore', 'gouliang', str(self.gouliang))
+        self.conf.set('explore', 'gouliang_b', str(self.gouliang_b))
         self.conf.set('explore', 'fight_boss_enable',
                       str(self.fight_boss_enable.get()))
         self.conf.set('explore', 'slide_shikigami',
@@ -79,12 +82,12 @@ def get_conf(self):
             self.conf.write(configfile)
 
     def start_onmyoji(self):
-        # 读取主要副本
-        self.get_conf()
-
         # 显示参数
         self.show_params()
 
+        # 读取主要副本
+        self.get_conf()
+
         subprocess.Popen("cmd.exe /c start Core.exe")
         # os.system("onmyoji.exe")