From 359c6b25192fe91a1f1fffadbd7230efa736ba79 Mon Sep 17 00:00:00 2001 From: mackerel-12138 Date: Tue, 18 Apr 2023 22:02:17 +0800 Subject: [PATCH] =?UTF-8?q?=E9=9C=B2=E5=A8=9C=E5=A1=94=E5=9B=9E=E5=BB=8A?= =?UTF-8?q?=E6=89=AB=E8=8D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- AutoPcr_py/AutoPcr4.0.py | 33 +++++++++++++++++++ AutoPcr_py/AutoPcr4.0_GUI.py | 9 ++++- AutoPcr_py/img/huodong/hlcheck.png | Bin 0 -> 7332 bytes AutoPcr_py/img/huodong/huilang.png | Bin 0 -> 4071 bytes AutoPcr_py/img/{other => huodong}/lunata.png | Bin AutoPcr_py/img/huodong/saodang1.png | Bin 0 -> 5170 bytes AutoPcr_py/img/huodong/saodang5.png | Bin 0 -> 5142 bytes README.md | 4 +++ 8 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 AutoPcr_py/img/huodong/hlcheck.png create mode 100644 AutoPcr_py/img/huodong/huilang.png rename AutoPcr_py/img/{other => huodong}/lunata.png (100%) create mode 100644 AutoPcr_py/img/huodong/saodang1.png create mode 100644 AutoPcr_py/img/huodong/saodang5.png diff --git a/AutoPcr_py/AutoPcr4.0.py b/AutoPcr_py/AutoPcr4.0.py index 5d0184a..f494ecc 100644 --- a/AutoPcr_py/AutoPcr4.0.py +++ b/AutoPcr_py/AutoPcr4.0.py @@ -1281,6 +1281,7 @@ def needSeedZbStart(): DoKeyDown(huodongKey) time.sleep(1) if (IsHasImg('img/main/sure.png', False) == True): + time.sleep(1) logger.info("上期乞讨尚未结束") DoKeyDown(exitKey) DoKeyDown(exitKey) @@ -1445,6 +1446,9 @@ def OnHuoDongHard(hd='jqhd'): ToFightPage() WaitToClickImg('img/main/dxc.png', False) # DoKeyDown(huodongKey) + if not IsHasImg(huoDongkey, False): + logger.info('选择的活动未开放') + return WaitToClickImg(huoDongkey) DoKeyDown(exitKey) DoKeyDown(exitKey) @@ -1477,7 +1481,9 @@ def OnHuoDongHard(hd='jqhd'): MoveToLeft() continue SaoDang(2) + time.sleep(1) DoKeyDown(exitKey) + time.sleep(1) else: logger.info('必须输入剧情活动关卡') @@ -1514,6 +1520,29 @@ def MoveToLeft(): DoKeyDown('C') +def OnLunaTa(): + logger.info('露娜塔扫荡') + ToFightPage() + + if not IsHasImg('img/huodong/lunata.png', False): + logger.info('露娜塔未开放') + return + WaitToClickImg('img/huodong/lunata.png') + time.sleep(2) + if not IsHasImg('img/huodong/hlcheck.png', False) and not IsHasImg('img/huodong/saodang1.png', False): + logger.info('露娜塔回廊未通关') + return + for i in range(6): + DoKeyDown(listSelectKeys[2]) + WaitToClickImg("img/huodong/saodang5.png") + WaitToClickImg("img/main/sure.png") + WaitToClickImg("img/main/skip.png") + time.sleep(1) + DoKeyDown(exitKey) + + ToHomePage() + + def DianZan(): ToHangHuiPage() WaitToClickImg('img/other/members.png') @@ -1566,6 +1595,8 @@ def DailyTasks(): OnHuoDongHard('jqhd') if isFuKeHuoDong: OnHuoDongHard('fkhd') + if (isLunaTa): + OnLunaTa() if (isTuitu): OnTuitu() if (isHomeTake): @@ -1725,6 +1756,7 @@ def GetIntConfig(key): isFuKeHuoDongKey = 'isFuKeHuoDong' isHuoDongHardKey = 'isHuoDongHard' huoDongHardKeys = 'huoDongHard' +isLunaTaKey = 'isLunaTa' needZbNameKey = 'needZbName' isBuyMoreExpKey = 'isBuyMoreExp' @@ -1762,6 +1794,7 @@ def GetIntConfig(key): isHuoDongHard = GetBoolConfig(isHuoDongHardKey) huoDongHard = GetStrConfig(huoDongHardKeys) isVHBoss = GetBoolConfig(isVHBossKey) +isLunaTa = GetBoolConfig(isLunaTaKey) isDianZan = GetBoolConfig(isDianZanKey) needZbName = GetStrConfig(needZbNameKey) diff --git a/AutoPcr_py/AutoPcr4.0_GUI.py b/AutoPcr_py/AutoPcr4.0_GUI.py index 9bb10b7..f124d73 100644 --- a/AutoPcr_py/AutoPcr4.0_GUI.py +++ b/AutoPcr_py/AutoPcr4.0_GUI.py @@ -136,6 +136,7 @@ def SetMnqDir(): isHuoDongHardKey = 'isHuoDongHard' huoDongHardKeys = 'huoDongHard' isVHBossKey = 'isVHBoss' +isLunaTaKey = 'isLunaTa' needZbNameKey = 'needZbName' #isBuyMoreExpKey = 'isBuyMoreExp' isTuituKey = 'isTuituKey' @@ -174,6 +175,7 @@ def SetMnqDir(): isHuoDongHard = GetBoolConfig(isHuoDongHardKey) huoDongHard = GetStrConfig(huoDongHardKeys) isVHBoss = GetBoolConfig(isVHBossKey) +isLunaTa = GetBoolConfig(isLunaTaKey) isDianZan = GetBoolConfig(isDianZanKey) LeiDianDir = cfg.get('MainSetting', LeiDianDirKey) @@ -221,6 +223,7 @@ def SavaConfig(AllValues): SetConfigAuto(isHuoDongHardKey, AllValues) SetConfigAuto(huoDongHardKeys, AllValues) SetConfigAuto(isVHBossKey, AllValues) + SetConfigAuto(isLunaTaKey, AllValues) SetConfigAuto(isDianZanKey, AllValues) SetConfigAuto(needZbNameKey, AllValues) @@ -258,6 +261,7 @@ def ReadConfig(): ReadBoolConfig(isHuoDongHardKey) ReadStrConfig(huoDongHardKeys) ReadBoolConfig(isVHBossKey) + ReadBoolConfig(isLunaTaKey) ReadBoolConfig(isTuituKey) ReadBoolConfig(isAutoTaskKey) #ReadBoolConfig(isBuyMoreExpKey) @@ -378,6 +382,9 @@ def StartPcr(): sg.InputText(huoDongHard, size=(8, None), key=huoDongHardKeys), sg.Checkbox('VHBoss', isVHBoss, key=isVHBossKey) ], + [ + sg.Checkbox('露娜塔回廊扫荡', isLunaTa, key=isLunaTaKey), + ], ] duli_col = [ [ @@ -417,7 +424,7 @@ def StartPcr(): ] menu_col = [ [sg.Text('项目地址', font='underline', enable_events=True, key="URL")], - [sg.Text('计划剩余功能: 露娜塔回廊扫荡 6星碎片', font='黑体')], + [sg.Text('计划剩余功能: 6星碎片', font='黑体')], ] right_col = [ [sg.Frame('地下城', layout=dxc_col, expand_x=True)], diff --git a/AutoPcr_py/img/huodong/hlcheck.png b/AutoPcr_py/img/huodong/hlcheck.png new file mode 100644 index 0000000000000000000000000000000000000000..b923952fa021fa4fe5aa5492202b3a2ab3e3a538 GIT binary patch literal 7332 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 KMNUMnLSTZ8Q;bsp literal 0 HcmV?d00001 diff --git a/AutoPcr_py/img/huodong/huilang.png b/AutoPcr_py/img/huodong/huilang.png new file mode 100644 index 0000000000000000000000000000000000000000..e717cf6723ea6118ddcaf1c4f1648643bbece923 GIT binary patch literal 4071 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 Z_9uGd88;y{;*bCU002ovPDHLkV1lSG^&tQN literal 0 HcmV?d00001 diff --git a/AutoPcr_py/img/other/lunata.png b/AutoPcr_py/img/huodong/lunata.png similarity index 100% rename from AutoPcr_py/img/other/lunata.png rename to AutoPcr_py/img/huodong/lunata.png diff --git a/AutoPcr_py/img/huodong/saodang1.png b/AutoPcr_py/img/huodong/saodang1.png new file mode 100644 index 0000000000000000000000000000000000000000..42ecc3781e0e0902631867451e8741f782a6fa72 GIT binary patch literal 5170 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 literal 0 HcmV?d00001 diff --git a/AutoPcr_py/img/huodong/saodang5.png b/AutoPcr_py/img/huodong/saodang5.png new file mode 100644 index 0000000000000000000000000000000000000000..72e6eae341ca1077dd56ae43588b6f23de0285b7 GIT binary patch literal 5142 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