1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Commit Graph

175 Commits

Author SHA1 Message Date
YJGeng-Iriy
9eab7f35b4 Monthly boss code optimization 2022-12-13 21:37:28 +08:00
YJGeng-Iriy
757fc88f7e
Merge branch 'master' into opsi_month_boss 2022-12-12 19:47:59 +08:00
LmeSzinc
9bca3ef32a Opt: Limit situations to buy AP when running CL1 2022-12-12 18:07:30 +08:00
LmeSzinc
ab702bd6e4 Opt: Save AP for tomorrow's dailies 2022-12-11 23:25:44 +08:00
YJGeng-Iriy
97607798ed opsi month boss init 2022-12-11 22:15:26 +08:00
YJGeng-Iriy
a361d8ad0d opsi month boss init 2022-12-11 20:59:16 +08:00
nEEtdo0d
72339a5093 Add: re-instate Opsi archive task, runs weekly as AL devs seemingly add new logger archives after a random scheduled maintenance 2022-12-10 20:26:28 -05:00
YJGeng-Iriy
8ed08f17f6 opsi_month_boss init 2022-12-11 01:40:42 +08:00
YJGeng-Iriy
726dc243c3 opsi_month_boss init 2022-12-10 23:57:09 +08:00
YJGeng-Iriy
dfe156fd79 opsi_moth_boss test in operation_siren.py 2022-12-09 00:09:25 +08:00
LmeSzinc
d9c737deb1 Opt: Log CL1 time cost 2022-12-07 12:26:18 +08:00
LmeSzinc
82b412f773 Del: Remove OpsiHazard1Leveling.StrategicSearch
no need since it's always true
2022-12-05 22:41:47 +08:00
SarContDeli
2fff81ff0d
Opt: Reconstructed hazard 1 leveling (#1941) 2022-12-04 23:24:23 +08:00
nEEtdo0d
1d433efc7b Fix: merge LmeSzinc/dev into branch, resolve conflicts 2022-12-01 10:52:40 -05:00
nEEtdo0d
c2d8fad6bb Del: Opsi archive zone monthly task support; currently not a monthly trend maybe will be in the future 2022-12-01 10:41:05 -05:00
LmeSzinc
c9d296ad76 Merge branch 'master' into dev 2022-12-01 01:08:54 +08:00
LmeSzinc
0f84712d6a Fix: Task switched in os_cross_month 2022-12-01 00:35:16 +08:00
SarContDeli
69d72e508b Opt: Optimized logic of delay abyssal 2022-11-30 21:10:34 +08:00
SarContDeli
c9d9ca6cc5 Merge branch 'bug_fix' into base
# Conflicts:
#	alas.py
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/os/map.py
2022-11-30 20:56:52 +08:00
nEEtdo0d
bc3376e191 Fix: merge LmeSzinc/dev into branch, resolve conflicts 2022-11-29 15:04:47 -05:00
LmeSzinc
b8d06b12e5 Add: OpsiCrossMonth, not tested 2022-11-30 01:40:53 +08:00
nEEtdo0d
afc8468e0a Add: Opsi archive zone monthly task support 2022-11-28 00:21:52 -05:00
nEEtdo0d
629addada4 Add: Opsi voucher monthly task support 2022-11-26 23:44:38 -05:00
SarContDeli
1f38e92e02 Add: hazard 1 leveling 2022-11-12 00:05:30 +08:00
LmeSzinc
769e14ef33 Opt: Save errors when zone locked in OpSi explore 2022-10-06 16:09:03 +08:00
LmeSzinc
436d8ab645 Opt: Call OpsiDaily and OpsiShop when OpsiExplore is finished 2022-10-03 14:50:47 +08:00
LmeSzinc
1f67a9a109 Add: Get and set config across tasks 2022-09-06 22:20:29 +08:00
LmeSzinc
5a91c13ad1 Fix: clear_question is called in OpsiStronghold (fixed #1149) 2022-05-26 00:08:09 +08:00
LmeSzinc
c89f37865b Refactor: Combine OSGlobe and OSMap
- Fix: Fleet repair in OpsiExplore
2022-05-18 00:51:54 +08:00
LmeSzinc
dd879d8088 Fix: STORY_OPTION=0 to choose the first option in special OpSi zones 2022-05-17 02:24:27 +08:00
LmeSzinc
5867754de1 Fix: Edge detection in OpSi obscure and abyssal
- Fix: Increase threshold of OCR_SHOP_YELLOW_COINS
- Fix: Akashi's shop has been checked twice
2022-05-16 01:54:48 +08:00
LmeSzinc
9094e4dcf4 Add: GUI option OpsiGeneral.DoRandomMapEvent 2022-05-15 17:52:04 +08:00
LmeSzinc
d81a86923d Fix: Port dailies are skipped 2022-05-01 21:13:06 +08:00
LmeSzinc
71885d1544 Opt: Add config_override() teaching people how to use a bot 2022-04-29 11:59:12 +08:00
LmeSzinc
cd49c097b6 Fix: Click on MAP_GOTO_GLOBE in os_mission_enter() 2022-04-23 12:39:05 +08:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -03:00
LmeSzinc
e697cd0121 Fix: Target Zone ID of Meowfficer Farming is sometimes ignored (#998) 2022-04-09 17:57:55 +08:00
LmeSzinc
b7470e0601 Fix: Loop in mission accept when OpsiExplore is running and reached the maximum number of mission holdings 2022-04-04 14:11:23 +08:00
LmeSzinc
454a07723d Fix: Some OpSi missions are missed 2022-04-03 12:11:08 +08:00
LmeSzinc
b20e2b7863 Opt: Do missions at port when OpsiExplore is running 2022-04-01 21:24:53 +08:00
LmeSzinc
9b3544e1ac Fix: Handle EMP debuff in opsi that limits fleet steps 2022-04-01 18:38:12 +08:00
LmeSzinc
4f4c5d5be6 Opt: Receive mission rewards when having OpsiExplore running
- Opt: Faster retry in storage_enter()
2022-04-01 00:35:25 +08:00
LmeSzinc
a3799675cb Opt: Delay OpSi tasks 2.5 hours at the last day of every month 2022-03-31 22:33:47 +08:00
LmeSzinc
91328126ed Opt: Auto reduce ActionPointPreserve at the end of every month
- Opt: Use turning samples in OpsiExplore
- Opt: Schedule OpsiExplore to next month instead of turning it off
2022-03-31 19:53:55 +08:00
LmeSzinc
ae1d18055b Fix: Redundant globe_goto call when fleet was already repaired at port 2022-03-23 20:35:39 +08:00
LmeSzinc
1c28482fa6 Fix: Confirm OpSi storage empty cause items are slow to load sometimes 2022-03-02 20:59:14 +08:00
LmeSzinc
f4fcf98133 Add: Support zone name input in OpsiExplore.LastZone 2022-03-01 22:58:54 +08:00
LmeSzinc
573978040a Add: Run OpSi archive zone as OpSi daily 2022-02-25 13:00:55 +08:00
nEEtdo0d
3e87ae310a Add: handle low resolve debuff after repair for stronghold task 2022-02-18 16:37:14 -05:00
LmeSzinc
d591334c76 Fix: Handle locked zones in OpsiExplore, no need to move to NY manually now 2022-02-02 04:02:07 +08:00
LmeSzinc
1b3e44393e Refactor: Split out globe.py from operation_siren.py 2022-02-02 03:13:05 +08:00
LmeSzinc
4dc64a1602 Opt: Auto delay other OpSi tasks during OpsiExplore, no need to disable them manually now 2022-02-02 03:05:51 +08:00
lonelyzerg
868eba53fe Move condition check to storage.py 2022-01-20 04:58:32 -06:00
lonelyzerg
d82880e1c3 Add storage_sample_use_all() to use all samples 2022-01-20 03:50:05 -06:00
lonelyzerg
8f060b8484 Add: Use tuning samples option in OpsiDaily 2022-01-20 02:49:45 -06:00
LmeSzinc
4af820841d Add: Accept port missions in overview
- Split OpsiDaily into OpsiDaily and OpsiShop
- Add config redirection
2022-01-13 18:42:05 +08:00
LmeSzinc
61153482b3 Del: Deprecate port_mission_accept() 2022-01-13 17:48:24 +08:00
LmeSzinc
f8eeb44057 Fix: Handle fleet died without auto search reward 2022-01-08 22:17:24 +08:00
LmeSzinc
3b0bf249af Fix: Exit from a special zone before running auto search 2022-01-05 20:39:32 +08:00
LmeSzinc
f895fb4938 Fix: Redundant meowfficer farming run if started at port 2021-12-11 01:43:09 +08:00
LmeSzinc
dfd334736f Add: OpSi abyssal and handle battle status C/D in auto search 2021-12-11 00:27:04 +08:00
LmeSzinc
20d96f43ff Fix: Auto search in zone 154
- Fix: Loop in zone_init()
- Opt: Skip auto search in port
2021-12-10 13:46:09 +08:00
LmeSzinc
d53ac9afad Fix: Zone names have been hidden in safe zones 2021-12-09 22:50:18 +08:00
LmeSzinc
45097dd408 Opt: Move ash beacon to a standalone setting group 2021-12-09 18:13:34 +08:00
LmeSzinc
6f0e3a38d0 Add: Handle shared CD of recon scan and submarine call
- Add entrance of OpSi abyssal and stronghold
2021-12-08 01:25:35 +08:00
LmeSzinc
29d963a2c0 Add: GUI settings of OpSi abyssal and stronghold
- Opt: Expose EnsureAshCollect
2021-12-07 23:14:19 +08:00
LmeSzinc
d7835fe1f0 Refactor: Get zone name in OpSi 2021-12-07 00:14:17 +08:00
LmeSzinc
bf4ff28c6e Add: Clear one abyssal coordinate
- Fix: Divided by 0 in limit_walk()
- Fix: Taking drop screenshots in abyssal battles
2021-12-07 00:00:40 +08:00
LmeSzinc
4a392407a0 Opt: Uniform the name of zone types in OpSi
obscured to obscure
siren logger to abyssal
2021-12-06 23:41:23 +08:00
LmeSzinc
fcd6ff411f Refactor: Get zone name in OpSi 2021-12-05 22:47:53 +08:00
LmeSzinc
b171b329f5 Upd: [TW] Convert name to zone in OpSi (#762) 2021-11-20 23:56:06 +08:00
LmeSzinc
e02a3503db Fix: OpSi functions was called recursively when it triggers a fleet repair in obscure zone
- Fix: Unable to goto other zones if fleet in in a special zone
2021-11-18 12:28:21 +08:00
LmeSzinc
940869385c Opt: Check task switching in OpSi daily
- Opt: Remove the first screenshot in os_init, because first screenshot is taken at task start
2021-11-14 01:24:00 +08:00
nEEtdo0d
95a5d58e2f Fix: refresh zone to spawn mission objectives 2021-11-06 11:19:00 -04:00
LmeSzinc
fa8e46bee4 Refactor: Remove old OpSi functions and rename the current with old names 2021-11-06 22:25:14 +08:00
nEEtdo0d
7a4804541f Fix: submarine settings for auto search and opsi obscure 2021-11-03 20:46:12 -04:00
julystone
7a2cf53a7a Add:os_explore support SpecialRadar option 2021-11-01 23:22:55 +08:00
julystone
0dae3054ae ADD:os_explore support VoyageRecorder option 2021-11-01 16:03:22 +08:00
julystone
90192ebe0c ADD:os_meowfficer_farming add specificSea Explore 2021-10-28 11:07:52 +08:00
julystone
1d66156c13 ADD:os_meowfficer_farming add specificSea Explore 2021-10-27 09:10:06 +08:00
julystone
d40232b41a Add:meowOffice add targetZone explore 2021-10-27 00:41:46 +08:00
julystone
a2edb3c133 Add:meowOffice add targetZone explore 2021-10-27 00:09:16 +08:00
julystone
fff3f59caf ADD:os_meowfficer_farming add specificSea Explore 2021-10-26 17:46:04 +08:00
LmeSzinc
b1858e5ccb Merge branch 'master' into app 2021-10-18 22:03:14 +08:00
Ray
3bd2dfea85 Fix: handle GET_ITMES popup when goto page_os 2021-10-17 09:37:50 +08:00
LmeSzinc
b7555bb9a4 Opt: Repair fleet at OS init 2021-10-15 02:32:14 +08:00
LmeSzinc
7fefb6a4f0 Opt: Receive missions again if reach max holding limit 2021-10-03 19:55:36 +08:00
LmeSzinc
a82c9b8ce4 Fix: OS explore calls submarine 2021-10-01 00:50:53 +08:00
LmeSzinc
cb5db9d458 Fix: OS explore scheduling
- Add config.multi_set
- Fix exercise server update
2021-09-26 18:47:00 +08:00
LmeSzinc
a52826594e Refactor: OS module
- Refactor OS explore, able to run without 5000 oil item
- Fix: Screenshot interval recover
2021-09-26 17:40:38 +08:00
LmeSzinc
ac0cd6f821 Fix #541: Re-enter current zone if triggers walk_out_of_step 2021-09-06 20:48:37 +08:00
LmeSzinc
bb64d2f90e Opt: Exit special zones in OS init 2021-09-05 19:15:17 +08:00
LmeSzinc
308846983a Fix: Missing stringify time when no obscure coordinates 2021-08-23 00:30:50 +08:00
LmeSzinc
bc02f8ae33 Opt: Able to run obscure finish in os_fully_clear if OS_OBSCURE_FORCE_RUN is enable 2021-08-22 17:43:08 +08:00
LmeSzinc
2777f00584 Add: Obscure finish in OS fully auto 2021-08-22 00:16:40 +08:00
nEEtdo0d
eecb957a04 Add: support to run reward loop during OS 2021-08-07 14:42:11 -04:00
nEEtdo0d
39e9a754bd Fix: Move hp_reset 2021-05-29 19:17:43 -04:00
nEEtdo0d
7f8e8d1173 Fix: Revert else clause, resume using zone_type_select after zone_has_safe 2021-05-20 13:00:07 -04:00
nEEtdo0d
0a3224ae5e Fix: Minimized HP threshold configuration to 1 setting 2021-05-19 21:39:23 -04:00
nEEtdo0d
af275b7e99 Fix: Daily mission no longer uses globe_goto, thinks zone in azur_port, skips akashi unintentionally 2021-05-18 10:58:51 -04:00