diff --git a/config.py b/config.py index 0c92794..cdab029 100644 --- a/config.py +++ b/config.py @@ -2,6 +2,8 @@ import os import json import tools +#是否启用config +enable_Config = True #这里的内容会自动获取 mihoyobbs_Login_ticket = "" mihoyobbs_Stuid = "" @@ -36,11 +38,14 @@ config_Path = f"{path}/config.json" def Load_config(): with open(config_Path, "r") as f: data = json.load(f) + global enable_Config global mihoyobbs_Login_ticket global mihoyobbs_Stuid global mihoyobbs_Stoken global mihoyobbs_Cookies global mihoyobbs + global genshin_AutoSingin + enable_Config = data["enable_Config"] mihoyobbs_Login_ticket = data["mihoyobbs_Login_ticket"] mihoyobbs_Stuid = data["mihoyobbs_Stuid"] mihoyobbs_Stoken = data["mihoyobbs_Stoken"] @@ -74,6 +79,7 @@ def Save_config(): def Clear_cookies(): with open(config_Path,"r+") as f: data = json.load(f) + data["enable_Config"] = False data["mihoyobbs_Login_ticket"] = "" data["mihoyobbs_Stuid"] = "" data["mihoyobbs_Stoken"] = "" diff --git a/config/config.json.example b/config/config.json.example index d8d1322..c0c6d0f 100644 --- a/config/config.json.example +++ b/config/config.json.example @@ -1,4 +1,6 @@ { + "enable_Config": true, + "config_Version": 1, "mihoyobbs_Login_ticket": "", "mihoyobbs_Stuid": "", "mihoyobbs_Stoken": "", @@ -13,5 +15,5 @@ "bbs_Unlike": true, "bbs_Share": true }, - "genshin_AutoSingin": false + "genshin_AutoSingin": true } \ No newline at end of file diff --git a/genshin.py b/genshin.py index a40c7a6..b9ba562 100644 --- a/genshin.py +++ b/genshin.py @@ -35,6 +35,7 @@ class genshin: exit() for i in data["data"]["list"]: temp_List.append([i["nickname"], i["game_uid"], i["region"]]) + tools.log.info(f"已获取到{len(temp_List)}个原神账号信息") return (temp_List) #获取已经签到奖励列表 diff --git a/main.py b/main.py index c6d37de..1614187 100644 --- a/main.py +++ b/main.py @@ -1,4 +1,5 @@ import login +import tools import config import genshin import setting @@ -7,34 +8,37 @@ import mihoyobbs def main(): #初始化,加载配置 config.Load_config() + if (config.enable_Config == True): #检测参数是否齐全,如果缺少就进行登入操作 - if (config.mihoyobbs_Login_ticket == "" or config.mihoyobbs_Stuid == "" or config.mihoyobbs_Stoken == ""): - #登入 - login.login() - #获取要使用的BBS列表,#判断是否开启bbs_Singin_multi - if (config.mihoyobbs["bbs_Singin_multi"] == True): - for i in setting.mihoyobbs_List: - if (int(i["id"]) in config.mihoyobbs["bbs_Singin_multi_list"]): - setting.mihoyobbs_List_Use.append(i) + if (config.mihoyobbs_Login_ticket == "" or config.mihoyobbs_Stuid == "" or config.mihoyobbs_Stoken == ""): + #登入 + login.login() + #获取要使用的BBS列表,#判断是否开启bbs_Singin_multi + if (config.mihoyobbs["bbs_Singin_multi"] == True): + for i in setting.mihoyobbs_List: + if (int(i["id"]) in config.mihoyobbs["bbs_Singin_multi_list"]): + setting.mihoyobbs_List_Use.append(i) + else: + #关闭bbs_Singin_multi后只签到大别墅 + for i in setting.mihoyobbs_List: + if (int(i["id"]) == 5): + setting.mihoyobbs_List_Use.append(i) + #米游社签到 + if(config.mihoyobbs["bbs_Gobal"] == True): + bbs = mihoyobbs.mihoyobbs() + if (config.mihoyobbs["bbs_Singin"] == True): + bbs.Singin() + if (config.mihoyobbs["bbs_Read_posts"] == True): + bbs.Readposts() + if (config.mihoyobbs["bbs_Like_posts"] == True): + bbs.Likeposts() + if (config.mihoyobbs["bbs_Share"] == True): + bbs.Share() + if(config.genshin_AutoSingin == True): + genshin_Help = genshin.genshin() + genshin_Help.Sing_acc() else: - #关闭bbs_Singin_multi后只签到大别墅 - for i in setting.mihoyobbs_List: - if (int(i["id"]) == 5): - setting.mihoyobbs_List_Use.append(i) - #米游社签到 - if(config.mihoyobbs["bbs_Gobal"] == True): - bbs = mihoyobbs.mihoyobbs() - if (config.mihoyobbs["bbs_Singin"] == True): - bbs.Singin() - if (config.mihoyobbs["bbs_Read_posts"] == True): - bbs.Readposts() - if (config.mihoyobbs["bbs_Like_posts"] == True): - bbs.Likeposts() - if (config.mihoyobbs["bbs_Share"] == True): - bbs.Share() - if(config.genshin_AutoSingin == True): - genshin_Help = genshin.genshin() - genshin_Help.Sing_acc() + tools.log.warn ("Config未启用!") if __name__ == "__main__": main() diff --git a/main_multi.py b/main_multi.py index 5084451..ce4665a 100644 --- a/main_multi.py +++ b/main_multi.py @@ -3,6 +3,7 @@ import main import time import tools import config +import setting #搜索配置文件 def Fund_config() ->list: @@ -20,6 +21,7 @@ def main_multi(): input("请输入回车继续,需要重新搜索配置文件请Ctrl+C退出脚本") for i in iter(config_List): tools.log.info(f"正在执行{i}") + setting.mihoyobbs_List_Use = [] config.config_Path= f"{config.path}/{i}" main.main() tools.log.info(f"{i}执行完毕")