Merge branch 'feature/fullauto'

This commit is contained in:
Adam Saudagar 2021-04-18 12:54:18 +05:30
commit 1e633f7efe
4 changed files with 3 additions and 16 deletions

View File

@ -8,10 +8,7 @@ import numpy as np
from fishy.engine.fullautofisher.engine import FullAuto from fishy.engine.fullautofisher.engine import FullAuto
from pynput import keyboard, mouse from pynput import keyboard, mouse
from fishy.helper import hotkey
from fishy.helper.config import config from fishy.helper.config import config
from fishy.helper.helper import wait_until
from fishy.helper.hotkey import Key
mse = mouse.Controller() mse = mouse.Controller()
kb = keyboard.Controller() kb = keyboard.Controller()

View File

@ -1,6 +1,6 @@
import logging import logging
from fishy.helper import hotkey, helper from fishy.helper import hotkey
from fishy.engine.fullautofisher.engine import FullAuto, State from fishy.engine.fullautofisher.engine import FullAuto, State
from fishy.helper.hotkey import Key from fishy.helper.hotkey import Key

View File

@ -1,19 +1,12 @@
import math import math
import os
import tempfile
import traceback import traceback
import uuid
from enum import Enum from enum import Enum
from threading import Thread from threading import Thread
from zipfile import ZipFile
import cv2 import cv2
import logging import logging
import time import time
import numpy as np
import pytesseract
from fishy.constants import libgps, fishyqr, lam2 from fishy.constants import libgps, fishyqr, lam2
from fishy.engine.fullautofisher.qr_detection import get_values_from_image, get_qr_location from fishy.engine.fullautofisher.qr_detection import get_values_from_image, get_qr_location
from fishy.engine.semifisher.fishing_mode import FishingMode from fishy.engine.semifisher.fishing_mode import FishingMode
@ -25,10 +18,8 @@ from fishy.engine.semifisher import fishing_mode, fishing_event
from fishy.engine.common.IEngine import IEngine from fishy.engine.common.IEngine import IEngine
from pynput import keyboard, mouse from pynput import keyboard, mouse
from fishy.helper import hotkey, helper, hotkey_process from fishy.helper import hotkey, helper
from fishy.helper.config import config from fishy.helper.helper import sign
from fishy.helper.helper import sign, addon_exists
from fishy.helper.hotkey import Key
mse = mouse.Controller() mse = mouse.Controller()
kb = keyboard.Controller() kb = keyboard.Controller()

View File

@ -1,7 +1,6 @@
import logging import logging
from fishy.engine.fullautofisher.engine import FullAuto from fishy.engine.fullautofisher.engine import FullAuto
from fishy.helper.config import config
class Test: class Test: