diff --git a/FGO-py/fgoCli.py b/FGO-py/fgoCli.py index b8dc2308..f53c46f9 100644 --- a/FGO-py/fgoCli.py +++ b/FGO-py/fgoCli.py @@ -55,7 +55,6 @@ def teamup_load(self,arg): def teamup_save(self,arg): if self.currentTeam=='DEFAULT':return self.teamup[self.currentTeam]={ - 'teamIndex':fgoKernel.Main.teamIndex, 'skillInfo':str(fgoKernel.ClassicTurn.skillInfo).replace(' ',''), 'houguInfo':str(fgoKernel.ClassicTurn.houguInfo).replace(' ',''), 'masterSkill':str(fgoKernel.ClassicTurn.masterSkill).replace(' ','')} diff --git a/FGO-py/fgoConst.py b/FGO-py/fgoConst.py index c693ee81..05dceae1 100644 --- a/FGO-py/fgoConst.py +++ b/FGO-py/fgoConst.py @@ -1,4 +1,4 @@ -VERSION='v9.7.2' +VERSION='v9.7.3' # F1-F10 选取编队 # 12345 选卡,234指向技能的目标,银苹果 # 678 宝具卡,选取剧情选项,8选取第一个关卡 diff --git a/FGO-py/fgoKernel.py b/FGO-py/fgoKernel.py index 540ad656..cf736513 100644 --- a/FGO-py/fgoKernel.py +++ b/FGO-py/fgoKernel.py @@ -364,7 +364,7 @@ def __call__(self): self.chooseFriend() while not Detect(0,.3).isBattleBegin():pass if self.teamIndex and Detect.cache.getTeamIndex()+1!=self.teamIndex:fgoDevice.device.perform('\x70\x71\x72\x73\x74\x75\x76\x77\x78\x79'[self.teamIndex-1]+' ',(1000,1500)) - fgoDevice.device.perform(' M ',(800,2000,15000)) + fgoDevice.device.perform(' M ',(2000,2000,13000)) break elif Detect.cache.isBattleContinue(): fgoDevice.device.press('L') @@ -372,7 +372,7 @@ def __call__(self): stop=True break self.chooseFriend() - schedule.sleep(8) + schedule.sleep(6) break elif Detect.cache.isTurnBegin():break elif Detect.cache.isAddFriend():fgoDevice.device.perform('X',(300,)) diff --git a/readme.md b/readme.md index a8ec6655..c3610b73 100644 --- a/readme.md +++ b/readme.md @@ -255,6 +255,12 @@ Add:计划作战 # 版本记录 Version Logs +## 2022/09/12 v9.7.3 + +Fix:处理下的配置保存 +Fix:merge [pr #85](https://github.com/hgjazhgj/FGO-py/pull/85) +我之前写的Windows鼠标事件居然漏了两个参数并且几次review都没发现... + ## 2022/09/10 v9.7.2 Upd:旧版战斗更名为经典战斗