LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-19 20:29:31 +08:00
Code Activity

update gg

Browse Source
This commit is contained in:
MengNianxiaoyao
2023-01-27 16:47:16 +08:00
parent 8f010a0b24
commit bfa2e13dc7
5 changed files with 46 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
module/gg_handler/gg_xpath.py
View File

@@ -12,6 +12,7 @@ class GGXpath(Base):
def __init__(self, config, device):
self.config = config
self.device = device
u2.connect(self.config.Emulator_Serial).reset_uiautomator()
self.d = u2.connect(self.config.Emulator_Serial)
self.gg_package_name = deep_get(self.config.data, keys='GameManager.GGHandler.GGPackageName')
self.d.wait_timeout = 10.0
@@ -162,4 +163,4 @@ class GGXpath(Base):
return 0
logger.hr('GG Enabled', level=2)
self.d.app_stop(self.gg_package_name)
return 1
return 1

38
module/log_res/log_res.py
View File

@@ -2,29 +2,29 @@ from module.logger import logger
class log_res:
def log_res(self,num,name):
ViewCurrentResources=[
'oil',
'coin',
'gem',
'PT',
'opcoin',
'purplecoin',
'actionpoint',
'cube',
'maxoil',
'maxcoin',
'oiltomaxoil',
'cointomaxcoin'
]
ViewEquipProgress=['457mm','234mm','tenrai','152mm']
def log_res(self, num, name):
ViewCurrentResources = [
'oil',
'coin',
'gem',
'pt',
'opcoin',
'purplecoin',
'actionpoint',
'cube',
'maxoil',
'maxcoin',
'oiltomaxoil',
'cointomaxcoin'
]
ViewEquipProgress = ['457mm', '234mm', 'tenrai', '152mm']
if name in ViewCurrentResources:
key=f'ViewCurrentResources.ViewCurrentResources.{name}'
key = f'ViewCurrentResources.ViewCurrentResources.{name}'
self.config.cross_set(keys=key, value=num)
logger.info(f'{key}')
elif name in ViewEquipProgress:
key=f'ViewCurrentResources.ViewEquipProgress.{name}'
key = f'ViewCurrentResources.ViewEquipProgress.{name}'
self.config.cross_set(keys=key, value=num)
else:
logger.warn('No such resource!')

8
module/raid/raid.py
View File

@@ -293,16 +293,16 @@ class Raid(MapOperation, Combat, CampaignEvent):
if timeout.reached():
logger.warning('Wait PT timeout, assume it is')
from module.log_res.log_res import log_res
log_res.log_res(self, pt, 'PT')
log_res.log_res(self, pt, 'pt')
return pt
if pt in [70000, 70001]:
continue
else:
from module.log_res.log_res import log_res
log_res.log_res(self, pt, 'PT')
log_res.log_res(self, pt, 'pt')
return pt
else:
logger.info(f'Raid {self.config.Campaign_Event} does not support PT ocr, skip')
from module.log_res.log_res import log_res
log_res.log_res(self, 0, 'PT')
return 0
log_res.log_res(self, 0, 'pt')
return 0