Skip to content
This repository was archived by the owner on Sep 3, 2020. It is now read-only.

Commit 7b93f19

Browse files
committed
updated
1 parent 1231d75 commit 7b93f19

File tree

8 files changed

+17
-7
lines changed

8 files changed

+17
-7
lines changed

.gitignore

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/.idea
2+
/.vscode
3+
/__pycache__
4+
/a.out.dSYM
5+
/util/__pycache__
6+
/recovery/__pycache__
7+
/phantasms/__pycache__
8+
/interface/__pycache__
9+
/extra/__pycache__
10+
/cards/__pycache__

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
**Besides, this project no longer maintains**
1313

14-
目前在维护啊的与FGO脚本有关的项目**[FGO-Automata](https://github.com/Meowcolm024/FGO-Automata)** (脚本+API)
14+
与FGO脚本有关的项目**[FGO-Automata](https://github.com/Meowcolm024/FGO-Automata)** (脚本+API)
1515

1616
## About
1717

@@ -24,7 +24,6 @@ The main thinking of this script on [Jianshu](https://www.jianshu.com/p/1b2ca545
2424

2525
## Features
2626

27-
1. Auto-rolling, including selecting _Checkpoint_, _Support Servants_ and
28-
completing the battle.
27+
1. Auto-rolling, including selecting _Checkpoint_, _Support Servants_ and completing the battle.
2928
2. Multiple modes supported, and _Noble Phantasms_ is supported.
3029
3. AP auto recovery when out of AP if is set.

cards/default_mode.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,5 +67,3 @@ def arrange(cards):
6767
print("Order of the cards: ", rank)
6868
decision = [cards[rank[0]].crd, cards[rank[1]].crd, cards[rank[2]].crd]
6969
return decision
70-
71-

interface/Loading.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,8 @@ def have_fun(self):
3434
if action[j] == press:
3535
x0 = 2 * x + random.randrange(-x, x)
3636
y0 = 2 * y + random.randrange(-y, y - 100)
37-
out = "[LOADING] Tap: [" + str(self.mark) + "] " + str(x0) + " " + str(y0)
37+
out = "[LOADING] Tap: [" + \
38+
str(self.mark) + "] " + str(x0) + " " + str(y0)
3839
print(out)
3940
output_log(out)
4041
basic_tap(x0, y0)

log.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[MAIN] MAX APPLES: 0[MAIN] MAX TIMES: 1[BASIC] Buttons: [1800, 986] [LOADING] Swipe: [0] 666.0 282.0 1168.0 608.0 117 [LOADING] Tap: [0] 1590.0 497.0 [LOADING] Swipe: [0] 1500.0 277.0 1011.0 522.0 229 [LOADING] Tap: [0] 624.0 404.0 [LOADING] Swipe: [0] 1378.0 636.0 1214.0 556.0 594 [LOADING] Tap: [0] 670.0 544.0 [LOADING] Swipe: [0] 1319.0 761.0 984.0 565.0 363 [LOADING] Tap: [0] 662.0 578.0 [LOADING] Swipe: [0] 1538.0 468.0 1238.0 581.0 402 [LOADING] Tap: [0] 638.0 544.0 [LOADING] Tap: [0] 584.0 530.0 [LOADING] Tap: [0] 976.0 666.0 [BASIC] Buttons: [1714, 956] [BATTLE] Cards: [268.0, 858.0] [1035.0, 856.0] [1812.0, 856.0] [LOADING] Swipe: [1] 583.0 526.0 1059.0 571.0 212 [LOADING] Swipe: [1] 627.0 738.0 907.0 539.0 606 [BASIC] Buttons: [1714, 956] [BATTLE] Cards: [1735.0, 852.0] [1410.0, 845.0] [652.0, 858.0] [LOADING] Swipe: [1] 1446.0 304.0 1172.0 486.0 778 [LOADING] Swipe: [1] 1126.0 466.0 922.0 480.0 727 [BASIC] Buttons: [1714, 956] [BATTLE] Cards: [652.0, 860.0] [1422.0, 858.0] [1035.0, 858.0] [LOADING] Swipe: [1] 1056.0 671.0 904.0 624.0 305 [LOADING] Swipe: [1] 1603.0 277.0 1042.0 585.0 548 [BASIC] Buttons: [1714, 956] [BATTLE] Cards: [978.0, 360.0] [1362.0, 360.0] [268.0, 859.0] [LOADING] Tap: [1] 550.0 513.0 [BASIC] Buttons: [1714, 956] [BATTLE] Cards: [268.0, 859.0] [1422.0, 859.0] [1812.0, 857.0] [LOADING] Tap: [1] 871.0 602.0 [LOADING] Swipe: [1] 800.0 693.0 1200.0 493.0 932 [BASIC] Buttons: [1714, 956] [BATTLE] Cards: [594.0, 360.0] [575.0, 851.0] [1801.0, 846.0] [BASIC] Buttons: [1714, 956] [BATTLE] Cards: [268.0, 860.0] [1422.0, 860.0] [1812.0, 860.0] [LOADING] Tap: [1] 1381.0 318.0 [LOADING] Swipe: [1] 653.0 428.0 1047.0 622.0 942 [BASIC] Buttons: [1714, 956] [BATTLE] Cards: [978.0, 360.0] [268.0, 858.0] [652.0, 859.0] [LOADING] Tap: [1] 1360.0 321.0 [BASIC] Buttons: [1714, 956] [BATTLE] Cards: [191.0, 852.0] [652.0, 859.0] [1035.0, 859.0] [LOADING] Swipe: [1] 1560.0 298.0 1219.0 488.0 651 [LOADING] Swipe: [1] 1383.0 703.0 1236.0 581.0 867 [BASIC] Buttons: [1714, 956] [BATTLE] Cards: [1362.0, 360.0] [268.0, 859.0] [1422.0, 857.0] [LOADING] Tap: [1] 609.0 493.0 [BASIC] Buttons: [1714, 956] [BATTLE] Cards: [594.0, 360.0] [268.0, 859.0] [1035.0, 860.0] [FINISH] Checked: bond2 1209.0 504.0 [FINISH] Checked: master2 1172.0 306.0 [BASIC] Buttons: [1689, 983] [MAIN] Times left: 0 [MAIN] FINISHED [BASIC] Buttons: [1689, 983]

main.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
play = run_time
99

1010
f = open('log.txt', 'w')
11-
st = '[MAIN] MAX APPLES: ' + str(times) + '\r' + '[MAIN] MAX TIMES: ' + str(play) + '\r'
11+
st = '[MAIN] MAX APPLES: ' + \
12+
str(times) + '\r' + '[MAIN] MAX TIMES: ' + str(play) + '\r'
1213
f.write(st)
1314
f.close()
1415

phantasms/combining.py

Whitespace-only changes.

sh.png

2.06 MB
Loading

0 commit comments

Comments
 (0)