-
-
Notifications
You must be signed in to change notification settings - Fork 180
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
新增主线推进模式 #118
base: dev
Are you sure you want to change the base?
新增主线推进模式 #118
Conversation
FGO-py/fgoCli.py
Outdated
@@ -124,6 +124,12 @@ def do_battle(self,line): | |||
arg=parser_battle.parse_args(line.split()) | |||
self.work=fgoKernel.Battle() | |||
self.do_continue(f'-s {arg.sleep}') | |||
def do_story(self,line): | |||
'Run for Story Mode until AP empty or defeated' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
修改此描述为
Push the story forward until AP empty
FGO-py/fgoGui.py
Outdated
'Windows':lambda:os.startfile('.'), | ||
'Linux':lambda:os.system("xdg-open ."), | ||
'Darwin':lambda:os.system("open ."), | ||
'':lambda:os.system('open .') |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
为什么这里有个空字符串分支?
此外,你需要提供一个default
FGO-py/fgoMainWindow.ui
Outdated
@@ -478,6 +491,7 @@ | |||
<tabstop>BTN_MAIN</tabstop> | |||
<tabstop>BTN_BATTLE</tabstop> | |||
<tabstop>BTN_CLASSIC</tabstop> | |||
<tabstop>BTN_STORY</tabstop> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
将布局改为1*1+1*3+1*2+1*2,如下
+-------------------------------+
| 肝! +
+-------------------------------+
| 完成战斗 | 陈年老肝 | 剧情推进 +
+-------------------------------+
| 挂起战斗 | 终止战斗 |
+-------------------------------+
| 预约终止 | 检查截图 |
+-------------------------------+
或是1*1+1*3+1*4亦可
FGO-py/fgoMainWindow.ui
Outdated
@@ -638,6 +658,7 @@ | |||
<slot>revoke169()</slot> | |||
<slot>runBattle()</slot> | |||
<slot>runClassic()</slot> | |||
<slot>runStory()</slot> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
按字典序排列
FGO-py/fgoKernel.py
Outdated
if Detect(.3,.3).isMainInterface(): | ||
s=time.time() | ||
while not Detect(.3,.3).isBattleBegin(): | ||
if p:=Detect.cache.findStoryNext(): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
DFA要有基本的基于流程控制的状态转移
需要尽可能避免每次循环见啥点啥一把梭
复读
FGO-py/fgoMainWindow.ui
Outdated
@@ -556,73 +575,73 @@ | |||
<signal>triggered()</signal> | |||
<receiver>fgoMainWindow</receiver> | |||
<slot>expBall()</slot> | |||
</connection> | |||
</connection> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
撤回这些更改
FGO-py/fgoMainWindow.ui
Outdated
@@ -166,34 +166,47 @@ | |||
</widget> | |||
</item> | |||
<item> | |||
<layout class="QHBoxLayout" name="LAYOUT_FUNC"> | |||
<layout class="QHBoxLayout" name="LAYOUT_BATTLE"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
此layout名保持LAYOUT_FUNC
而原本的LAYOUT_FUNC改名为LAYOUT_CONTROL
LAYOUT_FUNC_MAIN改名为LAYOUT_CONTROL_LEFT
LAYOUT_FUNC_CONTROL改名为LAYOUT_CONTROL_RIGHT
FGO-py/fgoMainWindow.ui
Outdated
</item> | ||
<item> | ||
<widget class="QPushButton" name="BTN_STORY"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
修正taborder
FGO-py/fgoMainWindow.ui
Outdated
</widget> | ||
</item> | ||
</layout> | ||
<widget class="QPushButton" name="BTN_CLASSIC"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
修正为我描述的顺序
已完成gui及cli界面下运行主线推进模式,不過目前该模式只能在tw及na服下运行。
功能描述:
于显示next的界面即可使用,该模式自动帮你跳过剧情,选助战(选助战界面连续刷新3次后还没找到符合目标就选第一个),战斗,关闭通关特异点后出现的界面等等。目前在两服上测试稳定,身为萌新的我使用体验良好。
变更:
未完成: