sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-09 18:39:04 +08:00
Code
8,345 Commits 9 Branches 0 Tags 274 MiB
21c83983d6
Commit Graph

456 Commits

Author SHA1 Message Date
LmeSzinc
02bf27c2e1 Fix: Disable task balancer before it is being fixed 2023-03-02 20:29:33 +08:00
Zuosizhu
49c980be75 Fix: issue#2311 
(cherry picked from commit 597cee9cb561c6657b6da0520741ea8c41e0b2c3)
 2023-03-01 16:10:35 +08:00
LmeSzinc
311c1fc50d Fix: Handle campaign name OCR result started with 0 2023-03-01 12:23:22 +08:00
LmeSzinc
af65f961e2 Refactor: Simplify GemsFarming settings 2023-03-01 00:12:15 +08:00
LmeSzinc
430ee8fea3 Fix: GemsFarming.LowEmotionRetreat no longer requires low emotion 2023-02-28 00:28:34 +08:00
LmeSzinc
d191d16649 Opt: Re-organise CalculateEmotion and IgnoreLowEmotionWarn 2023-02-18 01:19:04 +08:00
LmeSzinc
ca3581a715 Upd: Dock filter grids 2023-02-16 22:06:56 +08:00
bookbug666
83c3b8da9e Move ui_goto_* into campaign_event.py 2023-01-25 01:47:44 +08:00
bookbug666
793b3be5ca Reuse disable_tasks in CampaignEvent 2023-01-13 23:16:18 +08:00
bookbug666
1e8f0052b3 Merge branch 'dev' into event_checker 2023-01-12 09:23:52 +08:00
LmeSzinc
61986a7f4c Refactor: Map names convert 2023-01-11 01:00:19 +08:00
bookbug666
c03f8b86ee Reform function into ui_goto_* 2023-01-10 11:20:27 +08:00
LmeSzinc
38c694ad3b Fix: PT limit not working in GemsFarming 2023-01-09 21:08:57 +08:00
LmeSzinc
0249927d3e Fix: Use retry interval instead of bare sleep 2023-01-09 01:10:48 +08:00
bookbug666
033d7486df Add:Check event availability before event tasks, using temporality asset. 2023-01-07 12:01:57 +08:00
LmeSzinc
fa5dd91696 Upd: [EN] Assets of OpSi monthly bosses (#2032) 2023-01-06 20:46:23 +08:00
LmeSzinc
3e1a223dc5 Opt: Auto choose event or main chapters from GemsFarming 2023-01-05 21:27:35 +08:00
LmeSzinc
c22dede8d8 Upd: Lock OpsiMonthBoss from EN/TW before assets update 2023-01-03 23:38:27 +08:00
LmeSzinc
a820633129 Merge branch 'master' into dev 2022-12-28 18:24:53 +08:00
LmeSzinc
8b0964ebfd Fix: CampaignEnd error when battle function exhausted 2022-12-28 18:09:55 +08:00
YJGeng-Iriy
49b15eafd6
Merge branch 'master' into opsi_month_boss 2022-12-21 00:09:20 +08:00
SarContDeli
6c47514d78 Opt: Set action point limit in meowfficer farming with cl1 enabled 2022-12-20 19:53:39 +08:00
YJGeng-Iriy
207ff9d586 Merge branch 'opsi_month_boss' of https://github.com/YJGeng-Iriy/AzurLaneAutoScript into opsi_month_boss 2022-12-13 21:39:42 +08:00
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
nEEtdo0d
4be37e3596 Add: [EN] asset update for strategic search (#1948) 2022-12-11 23:53:52 -05:00
YJGeng-Iriy
a361d8ad0d opsi month boss init 2022-12-11 20:59:16 +08:00
下面我簡單喵兩句
da7efd102c
Add: [TW] asset support for voucher shop (#1982) 2022-12-11 14:52:19 +08:00
下面我簡單喵兩句
873a6da0e2
Add: [TW]Assets update for strategic search (#1981) 2022-12-11 13:49:28 +08:00
bookbug666
37ea94b809 Remove server checker before testing 2022-12-09 23:22:54 +08:00
LmeSzinc
6878308f13
Merge pull request #1950 from bookbug666/voucher_shop_jp 
Add: [JP] asset support for voucher shop
 2022-12-06 01:36:05 +08:00
bookbug666
096d0dbc1b Remove server restrictions in os_run.py 2022-12-06 00:58:13 +08:00
bookbug666
0cdc4cfff0 Unlock server restrictions, update assets.py 2022-12-06 00:05:31 +08:00
LmeSzinc
919a154c31 Opt: Disable CL1 leveling before server support 2022-12-05 22:44:58 +08:00
LmeSzinc
54d5874b9d Upd: [CN] Voucher shop assets and translation 2022-12-05 22:31:53 +08:00
nEEtdo0d
6daaea364a Add: temporary server check for opsi voucher task 2022-12-02 16:45:03 -05:00
nEEtdo0d
e9013b7e01 Fix: sync edit across from sibling funcs to voucher and archive counterpart (43c9671) 2022-12-01 12:33:24 -05:00
nEEtdo0d
1d433efc7b Fix: merge LmeSzinc/dev into branch, resolve conflicts 2022-12-01 10:52:40 -05: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
LmeSzinc
43c96719a1 Fix: ActionPointLimit is never caught in load_campaign() 2022-11-30 00:14:44 +08:00
LmeSzinc
f309402062 Fix: Task balance is not working in loop stages (fixed #1920) 2022-11-29 21:18:11 +08:00
LmeSzinc
59183aeff1 Fix: Oil limit too low 2022-11-29 21:15:51 +08:00
nEEtdo0d
afc8468e0a Add: Opsi archive zone monthly task support 2022-11-28 00:21:52 -05:00
LmeSzinc
90223d84e1 Merge branch 'master' into dev 2022-11-28 01:14:45 +08:00
nEEtdo0d
629addada4 Add: Opsi voucher monthly task support 2022-11-26 23:44:38 -05:00
LmeSzinc
2617a47297 Del: Remove SWITCH_1_HARD_ALCHEMIST, just no need anymore 2022-11-25 20:23:21 +08:00
LmeSzinc
1cb7ae25e6 Add: Loop stage support 2022-11-25 16:37:48 +08:00
LmeSzinc
85938744e6 Merge branch 'master' into dev 2022-11-25 02:29:03 +08:00
LmeSzinc
803c3749aa Add: The Alchemist and the Archipelago of Secrets chapter TH 2022-11-25 01:58:05 +08:00
LmeSzinc
e0feea2366 Add: The Alchemist and the Archipelago of Secrets chapter T 2022-11-24 22:24:20 +08:00
SarContDeli
a258ef4435
Merge pull request #1871 from SaiCateDoan/hz1 
Add: hazard 1 leveling
 2022-11-16 17:39:55 +08:00
nEEtdo0d
19e3e8d111 Fix: [EN] SWITCH_1_NORMAL asset change on game update 2022-11-14 10:11:13 -05:00
Horizon101011
129cbcad92
Merge branch 'bug_fix' into dockScanner 2022-11-14 09:56:42 +08:00
Horizon101011
e60dafc791 Fix: Flagship lv32 cause frequent change 2022-11-14 09:38:02 +08:00
SarContDeli
1f38e92e02 Add: hazard 1 leveling 2022-11-12 00:05:30 +08:00
LmeSzinc
f64f02fac7
Merge pull request #1842 from Horizon101011/dockScanner 
Opt: Re-adjust retire level threshold; Reduce ship change
 2022-11-10 23:02:42 +08:00
Horizon101011
719b186c31 Opt: Re-adjust retire level threshold; Reduce ship change 2022-11-10 18:13:56 +08:00
Horizon101011
08e5d21446 Opt: Give priority to ship with higher emotion and lower level 2022-11-06 23:34:08 +08:00
Horizon101011
4e20b4c954 Opt: Give priority to ship with higher emotion and lower level 2022-11-06 23:26:38 +08:00
LmeSzinc
383b8893c2 Merge branch 'master' into dev 2022-11-02 00:22:03 +08:00
LmeSzinc
5c70364353 Refactor: Abstract CampaignStatus class and fix task balancer in Raid 2022-10-30 14:49:04 +08:00
nEEtdo0d
27fabf7b9f Add: [EN] asset support for ship scan (#1776) 2022-10-27 01:13:39 -04:00
Horizon101011
34e21beb1f
Merge branch 'dev' into dockScanner 2022-10-25 18:42:25 +08:00
Horizon101011
0c5c0f6dbc Opt: Disable some properties for unsupported servers 2022-10-25 18:39:54 +08:00
VirtualTowel
b93ee5eaa1 Fix: Can not withdraw on BattlePreparation page 2022-10-19 00:46:04 +08:00
Horizon101011
c0f125bada Opt: Improve flagships_retire 2022-10-18 00:08:42 +08:00
VirtualTowel
328b18660b Fix: check VanguardChange switch in GemsFarming 2022-10-17 21:05:17 +08:00
Horizon101011
f2502e766e Opt: Adjust threshold; Add delay; Add output 2022-10-12 22:44:33 +08:00
Horizon101011
12e04ebaab
Merge branch 'dev' into dockScanner 2022-10-10 23:06:27 +08:00
Horizon101011
b2712d81d2 Refator: Abstract scanner class; Bind properties to scanners 2022-10-10 23:03:11 +08:00
LmeSzinc
4dd2a5a8b5 Refactor: Move del_cached_property to module.base.decorator 2022-09-25 00:31:42 +08:00
LmeSzinc
b990246165 Merge branch 'master' into bug_fix 2022-09-20 01:09:35 +08:00
Horizon101011
522cb0caf4 Fix: Explicitly invoke flagships' templates 2022-09-18 23:25:52 +08:00
Horizon101011
1df88a1b71 Fix: Lack of flagships' template 2022-09-18 18:22:14 +08:00
LmeSzinc
ab68a1f333 Opt: Remove MetaReward call after meowfficer farming 
because meta attacks are on standalone tasks
 2022-09-16 23:11:20 +08:00
Horizon101011
670697055e Fix: Missing DockScanner 2022-09-16 12:50:54 +08:00
Horizon101011
546613a485 Fix: Lack of flagships' template 2022-09-16 09:01:37 +08:00
Horizon101011
e1f50c64cb
Merge branch 'dev' into dockScanner 2022-09-14 10:32:54 +08:00
LmeSzinc
67e7eb04a5 Refactor: Abstract filter_set to Setting class 2022-09-08 12:27:50 +08:00
Horizon101011
b32dd61b00 Revert "Upd: Delay task if ship not changed" 
This reverts commit 7817995604.
 2022-09-07 12:47:49 +08:00
Horizon101011
7817995604 Upd: Delay task if ship not changed 2022-09-07 12:45:31 +08:00
LmeSzinc
1f67a9a109 Add: Get and set config across tasks 2022-09-06 22:20:29 +08:00
Horizon101011
2369581794 Upd: Add support for commission status 2022-09-06 21:36:35 +08:00
LmeSzinc
f1ef87ca50 Merge branch 'master' into dev 
# Conflicts:
#	module/device/emulator.py
 2022-09-02 00:13:11 +08:00
Horizon101011
37df16aa49 Fix: STOP_IF_REACH_LV32 cannot work properly if using delay 2022-08-31 17:57:43 +08:00
Horizon101011
8887993b74 Opt: Add support for choosing certain CV 2022-08-30 00:08:26 +08:00
Horizon101011
81e84d1259 Add: DockScanner 2022-08-29 12:56:01 +08:00
Bookbug
b26b6c97d1
Add: TaskBalancer (#1509) 
* CoinManagement added, but malfunction

* CoinManagement added, but malfunction

* CoinManagement:Translation complete

* CoinManagement:ready for testing

* CoinManagement:ready for testing

* CoinControl: Almost done, needs optimization/fix

* Add: CoinControl, done with full test.

* Add: TaskBalancer(experimental)

* Add: TaskBalancer(experimental)

* Remove legacy codes

* Upt: Reform codes(Experimental)

* Add:Task Balancer(Experimental)

* Add:Task Balancer(Experimental)

* Upt: config.py

* Fix: Default value of CheckInterval

* Upd: Minor translation adjustment

* Upd: Minor translation adjustment

* Upd: Revert the enable button and remove the CheckInterval

* Fix: minor translation

* Fix: additional trigger message caused by legacy code

* Add: User-defined delay interval

* Opt: Translation and default value of CoinLimit; Remove user-defined CheckInterval; Reform task sorting logic
 2022-08-24 23:44:49 +08:00
LmeSzinc
f3f6d19a1f Add: Event Operation Convergence (event_20220818_cn) 2022-08-18 23:51:30 +08:00
VirtualTowel
e4e391880a
Fix: Incompele gems_farming stop condition (#1524) 
* Fix: Incompele gems_farming stop condition

* Indentation fixed
 2022-08-15 01:22:55 +08:00
Horizon101011
a8654b0809 Opt: Reuse flagship; Add emotion threshold; Delay if not change 2022-08-14 20:32:23 +08:00
LmeSzinc
27f2c92c00 Opt: Less ui switchings when changing equipments 2022-08-07 17:18:18 +08:00
LmeSzinc
d936a60c65
Merge pull request #1485 from bookbug666/dev_0804 
Upt: Assets of equipment_change
 2022-08-07 15:25:17 +08:00
bookbug666
3c672e0d65 Fix: Remove ui_back to prevent additional back action 2022-08-06 23:21:32 +08:00
bookbug666
dd8d7f0ec5 Fix: Delete unused ui action; Rename button 2022-08-06 16:40:47 +08:00
bookbug666
a54d5e299f Upt: Assets of Equipment_change 2022-08-04 22:49:45 +08:00
LmeSzinc
3f28d59e35 Fix: Remove spaces in stage name 2022-07-30 18:16:19 +08:00
LmeSzinc
9786e2951b Fix: Strip thousands separators in EventGeneral.PtLimit 2022-07-30 00:23:26 +08:00
bookbug666
692e4d1300 補齊了SOS的Enemy_filter支援;更改每日活動地圖的命名;修正了部分翻譯;將國服以外緊急委託刷鑽石的等級修正 2022-07-26 16:29:03 +08:00
bookbug666
704c27cf4d Add: Several Submarine supports and EnemyFilter; add EventB, EventD 2022-07-26 16:29:03 +08:00
LmeSzinc
206b546eb1 Opt: Auto convert chapter A/B/C/D to T/HT 2022-07-15 01:51:04 +08:00
LmeSzinc
c6a4c13038 Add: Support PT limit in Raid 
- Fix: Disable RAID_FLEET_PREPARATION at startup
- TODO: EN and JP need to update IRIS_OCR_PT
 2022-06-30 22:26:54 +08:00
hgjazhgj
e779fd7e64 Fix: Misspelling & Line-end spaces 2022-06-25 20:04:45 +08:00
LmeSzinc
3a38f803f6 Fix: Stage auto increase to SP4 but event doesn't have SP4 2022-06-20 02:17:58 +08:00
LmeSzinc
d683db6647 Fix: Close auto search menu if map achievement is set 2022-06-19 16:33:38 +08:00
LmeSzinc
a4bc79302d Fix: Cannot detect remain data key at auto search menu 2022-06-12 18:06:37 +08:00
LmeSzinc
65d964b65e Fix: map_is_2x_book is in emotion calculation before map_get_info() 2022-06-09 23:24:51 +08:00
LmeSzinc
ebd6872358 Fix: Convert stage name to string 2022-06-07 00:58:07 +08:00
LmeSzinc
f28d0c0c29 Fix: Clear click record on each battle and each campaign (fixed #447) 2022-06-05 08:35:21 +08:00
LmeSzinc
a13a0ad68a Opt: Run task Reward more frequently 2022-05-28 00:56:29 +08:00
LmeSzinc
f47e7b046e Fix: Duplicate restart at server reset 2022-05-02 16:43:25 +08:00
LmeSzinc
562365afe6 Opt: Lower the priority of task OpsiMeowfficerFarming 2022-05-02 16:32:04 +08:00
LmeSzinc
71885d1544 Opt: Add config_override() teaching people how to use a bot 2022-04-29 11:59:12 +08:00
LmeSzinc
3b8da700d3 Fix: Disable auto search temporarily instead of turning it off in user config 2022-04-29 11:41:27 +08:00
LmeSzinc
d30da01a10 Opt: Remove 7-2 mystery farming, 12-2 leveling, 12-4 leveling; add multiple Main and Event tasks 2022-04-23 14:36:52 +08:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -03:00
SaarChaffee
303dd90fdc change CRLF to LF 2022-04-09 23:31:09 +08:00
LmeSzinc
ea8a200fbc Opt: Faster stage detection 
Time cost reduced from 200ms to 40ms
 2022-04-06 19:29:46 +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
0190d4fbe1 Add: Virtual Tower (event_20220324_cn) 2022-03-24 19:20:02 +08:00
LmeSzinc
e5492da3eb Opt: Close auto search menu and retreat at campaign start to reduce user mistakes 2022-03-20 16:55:05 +08:00
LmeSzinc
dbfbd294ff Fix: Confirm unknown ui page; 5 seconds timeout (#956) 2022-03-07 22:18:10 +08:00
Zorachristine
f3e62ffaf1 Fix: [TW] switch_2_ex assets 2022-03-02 21:08:36 +08:00
LmeSzinc
49c9e0afd9 Add: Abyssal Refrain chapter AC 
- Add: clear_bouncing_enemy()
- Opt: Retry faster if fleet was caught by a moving enemy
 2022-02-24 21:34:16 +08:00
LmeSzinc
e47e613638 Add: Event PT and time limit 
- Fix: Auto update events in GemsFarming
 2022-02-11 22:52:36 +08:00
LmeSzinc
65f166ad12 Refactor: Use numpy image cache instead of pillow image 2022-01-23 23:03:55 +08: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
2443a022f7 Fix: TooManyClickError on clicking MODE_SWITCH_1 when going to hard mode 
Loop in switch to normal mode, switch to hard mode, ensure chapter but no stage found, switch to normal mode
 2022-01-11 00:36:49 +08:00
LmeSzinc
ec4fec4f6d Opt: Remove STAGE_SHOWN_WAIT for faster 2022-01-10 23:54:02 +08:00
LmeSzinc
50b5b49365 Opt: Faster Switch.set(), replace click-wait with click interval 2022-01-10 20:35:07 +08:00
LmeSzinc
cd0204f455 Opt: Better tips when having wrong configs 2021-12-31 01:34:01 +08:00
LmeSzinc
e89d07da12 Add: Tower of Transcendence chapter BD 
- Fix: BATTLE_STATUS_B was clicked after EXP_INFO
- Fix: STORY_SKIP offset
- Fix: One-time stages in stage auto increase
 2021-12-30 17:46:30 +08:00
LmeSzinc
8e790b3340 Opt: Add counter of possible reasons 
To prevent user reading only the last one
 2021-12-30 17:38:09 +08:00
LmeSzinc
da84af0e50 Opt: Better enemy selection when having movable normal enemies 2021-12-30 12:46:18 +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
d5735604e1 Dev: Uniform comments of generated files 2021-12-07 23:29:33 +08:00
nEEtdo0d
b1c726056e Fix: [EN] Move handle to before campaign_ensure_chapter, tested (#786) 2021-12-01 10:15:58 -05:00
LmeSzinc
ac4f6e6fab Fix: [EN] Handle info_bar when entering HM12, not tested (#786) 2021-12-01 18:39:54 +08:00
LmeSzinc
a299c119b4 Fix: Gems farming not switching task when there're no ships to change 2021-12-01 17:51:44 +08:00
LmeSzinc
95e6b4524d Fix: [JP] Chapter names are wrongly split (#773, #774) 
- Increase split threshold
- Add more docstring of campaign detection, I almost forget implementation details
 2021-11-27 00:30:46 +08:00
LmeSzinc
8ac6e59f2a Upd: Update World-spanning Arclight 
- Fix: Varies map mode switches
- Fix: Handle stories in map detection
- Upd: GAME_TIPS
 2021-11-26 01:17:49 +08:00
LmeSzinc
9b5df053f9 Add: Event maps in World-spanning Arclight (event_20211125_cn) 2021-11-26 01:17:48 +08:00
LmeSzinc
1e3cdd4c38 Opt: Faster retirement, including click interval clear and less screenshots 
- Rename dock_filter_set_faster to dock_filter_set and remove old dock_filter_set
 2021-11-21 17:16:18 +08:00
Cyumxi
ad855d9783 fix: Dock_Filter 2021-11-16 23:39:03 +08:00
LmeSzinc
a6571c6d79 Refactor: Stop condition, reach level 2021-11-14 21:47:01 +08:00
LmeSzinc
f8d6848d84 Fix: Modified settings are still retained and written to file in the next update (#737) 2021-11-12 22:29:04 +08:00
LmeSzinc
a723740528 Add: The Flame-Touched Dagger (event_20211111_cn) 
- Fix: Force to use fleet2 when MAP_CLEAR_ALL_THIS_TIME is True
 2021-11-11 18:25:34 +08:00
LmeSzinc
b554a39351 Refactor: Fleet switching and fleet reverse 
- Revert swipe limit of ensure_edge_insight
 2021-11-06 22:25:14 +08:00