v10.4.0

Author: hgjazhgj

FGO-py/fgo.py

@@ -1,13 +1,16 @@
-import argparse
+import argparse,os
 from fgoConst import VERSION
 
 parser=argparse.ArgumentParser(description=f'FGO-py {VERSION}')
 parser.add_argument('entrypoint',help='Program entry point (default: %(default)s)',type=str.lower,choices=['gui','cli','web'],default='gui',nargs='?')
 parser.add_argument('-v','--version',help='Show FGO-py version',action='version',version=VERSION)
 parser.add_argument('-l','--loglevel',help='Change the console log level (default: %(default)s)',type=str.upper,choices=['DEBUG','INFO','WARNING','CRITICAL','ERROR'],default='INFO')
 parser.add_argument('-c','--config',help='Config file path (default: %(default)s)',type=str,default='fgoConfig.json')
+parser.add_argument('--no-color',help='Disable colored console output',action='store_true')
 arg=parser.parse_args()
 
+if arg.no_color:os.environ['NO_COLOR']='1'
+
 if arg.entrypoint=='gui':from fgoGui import main
 elif arg.entrypoint=='cli':from fgoCli import main
 elif arg.entrypoint=='web':from fgoWebServer import main

FGO-py/fgoCli.py

@@ -6,6 +6,7 @@
 from fgoTeamupParser import IniParser
 logger=getLogger('Cli')
 
+prompt='FGO-py@{Device}({Team})> 'if os.getenv('NO_COLOR')else'FGO-py\033[32m@{Device}\033[36m({Team})\033[0m> '
 def wrapTry(func):
     @wraps(func)
     def wrapper(self,*args,**kwargs):
@@ -14,7 +15,7 @@ def wrapper(self,*args,**kwargs):
             if e.args[0]is not None:logger.error(e)
         except KeyboardInterrupt:logger.critical('KeyboardInterrupt')
         except BaseException as e:logger.exception(e)
-        finally:self.prompt=f'FGO-py\033[32m@{fgoDevice.device.name}\033[36m({fgoKernel.Main.teamIndex})\033[0m> '
+        finally:self.prompt=prompt.format(Device=fgoDevice.device.name,Team=fgoKernel.Main.teamIndex)
     return wrapper
 def countdown(x):
     timer=time.time()+x
@@ -31,7 +32,7 @@ class Cmd(cmd.Cmd,metaclass=lambda name,bases,attrs:type(name,bases,{i:wrapTry(j
 Type help or ? to list commands, help <command> to get more information.
 Some commands support <command> [<subcommand> ...] {{-h, --help}} for further information.
 '''
-    prompt='FGO-py\033[32m@Device\033[36m(Team)\033[0m> '
+    prompt=prompt.format(Device='Device',Team='Team')
     def __init__(self,config):
         super().__init__()
         fgoDevice.Device.enumDevices()

FGO-py/fgoConst.py

@@ -1,4 +1,4 @@
-VERSION='v10.3.0'
+VERSION='v10.4.0'
 CONFIG={
 'runOnce':'',
 'device':'',

FGO-py/fgoDetect.py

@@ -158,6 +158,8 @@ def getTeamServantClassRank(self):return[(lambda x:x if x is None else divmod(x,
     def findFriend(self,img):return self._find(img,(13,166,1233,720))
     def findLastExec(self):return self._find(IMG.LASTEXEC,(200,160,1280,560))
     def findMail(self,img):return self._find(img,(73,166,920,720),threshold=.016)
+    @classmethod
+    def saveGachaHistory(cls):return(lambda c:(lambda img:(c,cls.__new__(cls).inject(img).save(f'GachaHistory({c})',(0,0,*img.shape[::-1]))))(numpy.vstack((cv2.putText(numpy.zeros((36,XDetect._gachaHistory.shape[1]),numpy.uint8),f'GachaHistory({c}) generated by FGO-py',(8,26),cv2.FONT_HERSHEY_DUPLEX,0.85,255,2,cv2.LINE_4),XDetect._gachaHistory[:numpy.flatnonzero(numpy.max(XDetect._gachaHistory,axis=1))[-1]+2]))))(cls.getGachaHistoryCount())
     def isGameAnnounce(self):raise NotImplementedError
     def isGameLaunch(self):raise NotImplementedError
     def isInCampaign(self):raise NotImplementedError

FGO-py/fgoKernel.py

@@ -112,11 +112,7 @@ def gachaHistory():
         Detect().getGachaHistory()
     fgoDevice.device.swipe((930,500,930,200))
     Detect().getGachaHistory()
-    gachaHistory.result={
-        'type':'GachaHistory',
-        'value':(t:=Detect.getGachaHistoryCount()),
-        'file':Detect.__new__(Detect).inject(XDetect._gachaHistory).save(f'GachaHistory({t})',(0,0,*XDetect._gachaHistory.shape[::-1]))
-    }
+    gachaHistory.result={'type':'GachaHistory'}|dict(zip(('value','file'),Detect.saveGachaHistory()))
 @withLock(lock)
 def bench(times=20,touch=True,screenshot=True):
     if not(touch or screenshot):touch=screenshot=True

FGO-py/fgoLogging.py

@@ -1,12 +1,18 @@
-import logging,platform,time
+import logging,platform,os,time
 from copy import copy
 from functools import wraps
 from fgoConst import VERSION
 if platform.system()=='Windows':(lambda k:k.SetConsoleMode(k.GetStdHandle(-11),7))(__import__('ctypes').windll.kernel32) # -11:STD_OUTPUT_HANDLE, 7:ENABLE_VIRTUAL_TERMINAL_PROCESSING
-def color(c=None,f='38'):return'\033[0m'if c is None else f'\033[{f};2;{c>>16&0xFF};{c>>8&0xFF};{c&0xFF}m'
-logging.root.addHandler((lambda handler:(handler.setFormatter(logging.Formatter('[%(asctime)s][%(levelname)s]<%(name)s> %(message)s')),handler.setLevel(logging.DEBUG),handler)[-1])(logging.FileHandler(time.strftime('fgoLog/Log_%Y-%m-%d_%H.%M.%S.txt'))))
+monoFormatter=logging.Formatter('[%(asctime)s][%(levelname)s]<%(name)s> %(message)s')
+if os.getenv('NO_COLOR'):
+    def color(c=None,f='38'):return''
+    coloredFormatter=monoFormatter
+else:
+    def color(c=None,f='38'):return'\033[0m'if c is None else f'\033[{f};2;{c>>16&0xFF};{c>>8&0xFF};{c&0xFF}m'
+    coloredFormatter=type('ColoredFormatter',(logging.Formatter,),{'__init__':lambda self,*args,**kwargs:logging.Formatter.__init__(self,*args,**kwargs),'format':lambda self,record:((lambda record:(setattr(record,'levelname','\033[{}m[{}]'.format({'DEBUG':'37','INFO':'34','WARNING':'33','CRITICAL':'35','ERROR':'31'}.get(record.levelname,'0'),record.levelname)),logging.Formatter.format(self,record))[-1])(copy(record)))})('\033[32m[%(asctime)s]%(levelname)s\033[36m<%(name)s>\033[0m %(message)s')
+logging.root.addHandler((lambda handler:(handler.setFormatter(monoFormatter),handler.setLevel(logging.DEBUG),handler)[-1])(logging.FileHandler(time.strftime('fgoLog/Log_%Y-%m-%d_%H.%M.%S.txt'))))
 logger=logging.getLogger('fgo')
-(logger.setLevel(logging.DEBUG),logger.addHandler((lambda handler:(handler.setFormatter(type('ColoredFormatter',(logging.Formatter,),{'__init__':lambda self,*args,**kwargs:logging.Formatter.__init__(self,*args,**kwargs),'format':lambda self,record:((lambda record:(setattr(record,'levelname','\033[{}m[{}]'.format({'DEBUG':'37','INFO':'34','WARNING':'33','CRITICAL':'35','ERROR':'31'}.get(record.levelname,'0'),record.levelname)),logging.Formatter.format(self,record))[-1])(copy(record)))})('\033[32m[%(asctime)s]%(levelname)s\033[36m<%(name)s>\033[0m %(message)s')),handler.setLevel(logging.INFO),handler)[-1])(logging.StreamHandler())))
+(logger.setLevel(logging.DEBUG),logger.addHandler((lambda handler:(handler.setFormatter(coloredFormatter),handler.setLevel(logging.INFO),handler)[-1])(logging.StreamHandler())))
 (lambda handler:(handler.setLevel(logging.INFO),handler.setFormatter(logger.handlers[-1].formatter)))((lambda logger:(logger.setLevel(logging.DEBUG),logger)[-1])(logging.getLogger('airtest')).handlers[0])
 def getLogger(name):return logging.getLogger('fgo.'+name)
 def logit(logger,level=logging.DEBUG):return lambda func:wraps(func)(lambda*args,**kwargs:(lambda x:(logger.log(level,' '.join((func.__name__,str(x)[:100].split('\n',1)[0]))),x)[-1]if x is not None else x)(func(*args,**kwargs)))

readme.md

@@ -81,6 +81,7 @@ FGO-py一经立项,就把*打破当前游戏版本下想尽办法3t速刷的固
 - 不管什么本直接上就行连作业都不用抄
 - 可以一键清完所有强化本
 - 剧情关锁人?游戏内组好队就行程序内还是只点击完成战斗
+- 可以在高难中帮你收拾残局
 - 不像有些3T脚本需要用户删掉练度不足的好友
 - 把你喜欢的从者编入队伍中
 - 拥有一队15羁绊的伊莉雅小黑美游真的超酷的好吗
@@ -265,7 +266,18 @@ Add:onepush
 
 # 版本记录 Version Logs
 
-## 2022/01/01 v10.3.0
+## 2023/01/29 v10.4.0
+
+Add:NO_COLOR  
+起因是我拥有了一个灰度的水墨屏(e-ink display)设备,如果能在压泡面的同时打打FGO那便是极好的,然而此时彩色的输出将难以辨识  
+运行时附加`--no-color`参数可以使程序不输出任何颜色  
+遵循[NO_COLOR标准](http://no-color.org/),非空的`NO_COLOR`环境变量将会打开本开关而无需每次运行都附加参数  
+禁用彩色时,Windows cmd的模拟终端开关仍会被打开  
+此外,NO_COLOR标准记录了符合该标准的系列应用程序,但是在这个列表中出现一个中文二刺螈项目似乎有些ky,所以就暂时不开pr了  
+Opt:抽卡统计图片美化  
+主要是裁去了滑动到底后多余的空白  
+
+## 2023/01/01 v10.3.0
 
 Add:抽卡记录统计导出  
 获取当前抽数以知晓保底还有多远