2024-03-14

master
Your Name 2024-03-29 18:44:03 +08:00
parent e4a4938293
commit b51171cd56
5 changed files with 21 additions and 21 deletions

View File

@ -44,7 +44,7 @@ try:
except Exception as exc: except Exception as exc:
pass pass
CONST_APP_VERSION = "MaxBot (2024.03.13)" CONST_APP_VERSION = "MaxBot (2024.03.14)"
CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt" CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt"
CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_CONFIG_FILE = "settings.json"
@ -7961,7 +7961,10 @@ def kktix_main(driver, url, config_dict, kktix_dict):
if not kktix_dict["played_sound_order"]: if not kktix_dict["played_sound_order"]:
play_sound_while_ordering(config_dict) play_sound_while_ordering(config_dict)
if not kktix_dict["played_sound_order"]: kktix_dict["played_sound_order"] = True
if config_dict["advanced"]["headless"]:
if not kktix_dict["is_popup_checkout"]:
kktix_account = config_dict["advanced"]["kktix_account"] kktix_account = config_dict["advanced"]["kktix_account"]
kktix_password = config_dict["advanced"]["kktix_password_plaintext"].strip() kktix_password = config_dict["advanced"]["kktix_password_plaintext"].strip()
if kktix_password == "": if kktix_password == "":
@ -7971,13 +7974,9 @@ def kktix_main(driver, url, config_dict, kktix_dict):
if len(kktix_account) > 0: if len(kktix_account) > 0:
print("搶票成功, 帳號:", kktix_account) print("搶票成功, 帳號:", kktix_account)
threading.Thread(target=launch_maxbot, args=("", url, kktix_account, kktix_password, "false", )).start() threading.Thread(target=launch_maxbot, args=("", url, kktix_account, kktix_password, "false", )).start()
driver.quit() #driver.quit()
sys.exit() #sys.exit()
kktix_dict["played_sound_order"] = True
if config_dict["advanced"]["headless"]:
if not kktix_dict["is_popup_checkout"]:
is_event_page = False is_event_page = False
if len(url.split('/'))>=7: if len(url.split('/'))>=7:
is_event_page = True is_event_page = True
@ -7988,6 +7987,7 @@ def kktix_main(driver, url, config_dict, kktix_dict):
checkout_url = "https://%s/account/orders" % (domain_name) checkout_url = "https://%s/account/orders" % (domain_name)
print("搶票成功, 請前往該帳號訂單查看: %s" % (checkout_url)) print("搶票成功, 請前往該帳號訂單查看: %s" % (checkout_url))
webbrowser.open_new(checkout_url) webbrowser.open_new(checkout_url)
kktix_dict["is_popup_checkout"] = True kktix_dict["is_popup_checkout"] = True
driver.quit() driver.quit()
sys.exit() sys.exit()

View File

@ -23,7 +23,7 @@ import sys
import threading import threading
import webbrowser import webbrowser
CONST_APP_VERSION = "MaxBot (2024.03.13)" CONST_APP_VERSION = "MaxBot (2024.03.14)"
CONST_MAXBOT_LAUNCHER_FILE = "config_launcher.json" CONST_MAXBOT_LAUNCHER_FILE = "config_launcher.json"
CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_CONFIG_FILE = "settings.json"

View File

@ -11,7 +11,7 @@ import requests
import asyncio import asyncio
import nodriver as uc import nodriver as uc
CONST_APP_VERSION = "MaxBot (2024.03.13)" CONST_APP_VERSION = "MaxBot (2024.03.14)"
CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_CONFIG_FILE = "settings.json"
USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36" USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/123.0.0.0 Safari/537.36"

View File

@ -29,7 +29,7 @@ from datetime import datetime
import requests import requests
CONST_APP_VERSION = "MaxBot (2024.03.13)" CONST_APP_VERSION = "MaxBot (2024.03.14)"
CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_CONFIG_FILE = "settings.json"
CONST_MAXBOT_KKTIX_CONFIG_FILE = "kktix.json" CONST_MAXBOT_KKTIX_CONFIG_FILE = "kktix.json"

View File

@ -50,7 +50,7 @@ try:
except Exception as exc: except Exception as exc:
pass pass
CONST_APP_VERSION = "MaxBot (2024.03.13)" CONST_APP_VERSION = "MaxBot (2024.03.14)"
CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt" CONST_MAXBOT_ANSWER_ONLINE_FILE = "MAXBOT_ONLINE_ANSWER.txt"
CONST_MAXBOT_CONFIG_FILE = "settings.json" CONST_MAXBOT_CONFIG_FILE = "settings.json"