diff --git a/chrome_tixcraft.py b/chrome_tixcraft.py index ed2fe2b..a412496 100644 --- a/chrome_tixcraft.py +++ b/chrome_tixcraft.py @@ -55,7 +55,7 @@ import webbrowser import chromedriver_autoinstaller -CONST_APP_VERSION = "MaxBot (2023.12.01)" +CONST_APP_VERSION = "MaxBot (2023.12.02)" CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt" @@ -836,6 +836,7 @@ def get_driver_by_config(config_dict): ,'*syndication.twitter.com/*' ,'*youtube.com/*' ,'*player.youku.*' + ,'*h.clarity.ms/*' ,'*e2elog.fetnet.net*'] if config_dict["advanced"]["hide_some_image"]: @@ -10850,9 +10851,10 @@ def ticketplus_date_auto_select(driver, config_dict): print("find or press button fail:", exc) if not target_button is None: - print("try to click button fail, force click by js.") + #print("try to click button fail, force click by js.") try: - driver.execute_script("arguments[0].click();", target_button) + #driver.execute_script("arguments[0].click();", target_button) + pass except Exception as exc: pass @@ -11759,8 +11761,9 @@ def ticketplus_main(driver, url, config_dict, ocr, Captcha_Browser, ticketplus_d if is_event_page: is_button_pressed = ticketplus_accept_realname_card(driver) + #print("is accept button pressed:", is_button_pressed) is_button_pressed = ticketplus_accept_other_activity(driver) - #print("realname is_button_pressed:", is_button_pressed) + #print("is accept button pressed:", is_button_pressed) if config_dict["tixcraft"]["date_auto_select"]["enable"]: ticketplus_date_auto_select(driver, config_dict) diff --git a/config_launcher.py b/config_launcher.py index a4dfcec..99ce257 100644 --- a/config_launcher.py +++ b/config_launcher.py @@ -22,7 +22,7 @@ import sys import threading import webbrowser -CONST_APP_VERSION = "MaxBot (2023.12.01)" +CONST_APP_VERSION = "MaxBot (2023.12.02)" CONST_MAXBOT_LAUNCHER_FILE = "config_launcher.json" CONST_MAXBOT_CONFIG_FILE = "settings.json" diff --git a/pip-req.txt b/pip-req.txt index 92efde0..b364813 100644 --- a/pip-req.txt +++ b/pip-req.txt @@ -2,7 +2,7 @@ certifi chardet cryptography idna -Pillow==9.5.0 +Pillow selenium>=4.0.0 undetected-chromedriver playsound==1.2.2 diff --git a/settings.py b/settings.py index d3b5de9..d80cd5b 100644 --- a/settings.py +++ b/settings.py @@ -34,7 +34,7 @@ import ssl ssl._create_default_https_context = ssl._create_unverified_context -CONST_APP_VERSION = "MaxBot (2023.12.01)" +CONST_APP_VERSION = "MaxBot (2023.12.02)" CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_LAST_URL_FILE = "MAXBOT_LAST_URL.txt" diff --git a/text_server.py b/text_server.py index 91d9be6..be20997 100644 --- a/text_server.py +++ b/text_server.py @@ -27,7 +27,7 @@ import pyperclip import tornado from tornado.web import Application -CONST_APP_VERSION = "MaxBot (2023.12.01)" +CONST_APP_VERSION = "MaxBot (2023.12.02)" CONST_MAXBOT_QUESTION_FILE = "MAXBOT_QUESTION.txt"