露娜塔回廊扫荡

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)
 

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)],

README.md

@@ -29,6 +29,10 @@ config.ini是配置文件, 如果想保留配置, 可以在更新后, 把这个
 1. 本源码供学习用，禁止用于商业相关
 
 # 更新历史
+## 2023-4-18
+1. 露娜塔回廊扫荡
+## 2023-4-17
+1. 地下城商店
 ## 2023-4-16
 1. 地下城扫荡
 2. 自动推图优化