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

464 Commits

Author SHA1 Message Date
LmeSzinc
2995c5408d Fix: Add Coalition as task requires balance (#3941) 2024-07-01 17:00:20 +08:00
霞飛
0b97b40c46
Feature: New OpsiShop. (#3086)
* feat: New OpsiShop

* fix: use AdaptiveScroll

* feat: scan counter

* perf: calculate y value
2024-06-17 11:24:40 +08:00
Air111
a70d4c4675
Upd: add CommonDD option (#3786)
* Upd: add dd combination z20_or_z21

* Upd: add dd option favourite

* Opt: use fation to filter Z20 or Z21
2024-06-14 03:39:20 +08:00
LmeSzinc
58202c6a40 Pref: Reuse image array to improve memory performance 2024-06-05 01:15:41 +08:00
LmeSzinc
bfb9bd0d61 Fix: Convert stage names in event_20240425_cn 2024-04-26 04:07:31 +08:00
LmeSzinc
bbef93c03d Add: Heart-Linking Harmony chapter ISP 2024-04-26 03:25:58 +08:00
Air111
194ec3e234 Fix: lower SIM_VALUE in ship matching of GemsFarming 2024-04-19 21:48:50 +08:00
Air111
0eee91a891 Fix: scan ships in correct fleet 2024-04-19 21:46:26 +08:00
Air111
cddfea680d Fix: rename equip_enter 2024-04-19 14:13:18 +08:00
Air111
2507b0fa6b
Upd: Flagship changing (#3556)
* Upd: Flagship changing asset

* Upd: Equipment enter

* Upd: Fleet detail check

* Refactor: equipment changing

* Upd: asset exercise/EQUIP_ENTER

* Refactor: rename equipment functions

* Fix: avoid GameTooManyClickError when EQUIPMENT_SCROLL disappears

* Upd: [CN] assets EQUIP_1/2/3

* Fix: skip first screenshot in equipment.py
2024-04-19 01:40:40 +08:00
guoh064
9388666d1d
Fix: fall back to all union DDs when not specifying DD (#3648) 2024-04-18 12:14:57 +08:00
LmeSzinc
42af2e479f Chore: [ALAS] Abstract has_cached_image 2024-04-13 02:28:11 +08:00
LmeSzinc
7321af9e8f Opt: [CN] Remove temp fixes of rendering bugs on game client 2024-04-13 01:43:30 +08:00
LmeSzinc
b3ca33fc2f Fix: Add half percent template also 2024-04-12 00:35:35 +08:00
LmeSzinc
dba2309f9d Upd: [CN] Add TEMPLATE_STAGE_CLEAR_SMALL to handle bugged game client 2024-04-11 21:59:29 +08:00
LmeSzinc
92a9761d1b Upd: [CN] Smaller SWITCH_2_EX to handle game client bug 2024-04-11 21:48:58 +08:00
LmeSzinc
010d4aa812 Chore: Raise error when receiving invalid CommonDD setting 2024-04-08 22:54:44 +08:00
ygrzxc
7d574dde8b
Add: Change the designated vanguard combination (#3520)
* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Translation for change the designated vanguard combination

* Add: Translation for change the designated vanguard combination

* Upd:Update dev's args.json

* Upd:Update dev's args.json

* Upd:Reduce template image size and Implement function

* Upd:Reduce template image size and Implement function

* Upd:Reduce template image size and Implement function

---------

Co-authored-by: y y <jaxvuav@163.com>
2024-04-08 22:49:30 +08:00
Air111
1decd3d6a1
Fix: Reset dock sorting after changing ship (#3608) 2024-04-04 19:31:26 +08:00
LmeSzinc
31462288bd Opt: Reset dock sorting after changing flagship (#3532) 2024-04-04 00:02:19 +08:00
somegituser
d29f93c1c1 add: wararchive Dreamwaker's Butterfly & Mirror Involution
新增作战档案: 蝶海梦花&镜位螺旋
2024-01-23 14:05:05 +08:00
LmeSzinc
3eaaefb0ca Upd: [TW] Disable OpsiShop before rework done 2024-01-11 12:06:10 +08:00
Zuosizhu
9d7d0474ce
Fix: Change Fleet_2's ships instead of fixed Fleet_1 when using 'fleet1_standby_fleet2_all' in GemsFarming (#3387)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2023-12-29 09:59:09 +08:00
LmeSzinc
8a8fcaf56f Add: Chapter T 2023-11-24 00:45:23 +08:00
RilyLC
d84010bfb1
Fix:[TW]support server_support_status_fleet in campaign\gems_farming (#3285)
* Fix:[TW]support server_support_status_fleet in campaign\gems_farming

* Fix:[TW]ship scan asset

* Fix:[TW]remove server_support in retirement and gems_farming

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2023-11-15 18:28:47 +08:00
LmeSzinc
d3c8221e14 Fix: Unknown stage name should not be considered as any chapter 2023-11-01 01:36:52 +08:00
LmeSzinc
ab014c86a7 Fix: handle story skip in emotion withdraw 2023-10-29 23:10:49 +08:00
LmeSzinc
f4277912cb Fix: Stage name convert 2023-10-29 01:58:31 +08:00
LmeSzinc
4969dc01b0 Upd: [CN] Fleet preparation 2023-10-19 22:02:24 +08:00
LmeSzinc
f23c960b97 Fix: Actively clear stuck records in combat 2023-10-14 21:03:58 +08:00
LmeSzinc
686b7fb921 Fix: Adaptive OCR_OIL to handle black overlay 2023-09-14 22:44:28 +08:00
LmeSzinc
100ba7a441 Fix: Disable OpsiShop before assets update 2023-09-01 00:54:51 +08:00
LmeSzinc
1a7d74493d Fix: Story stages before A1 2023-08-23 12:46:05 +08:00
LmeSzinc
b451096fb8 Add: Handle stories before event maps in chapter BD 2023-08-18 22:23:20 +08:00
LmeSzinc
b3c59c0cca Add: Handle stories before event maps 2023-08-18 13:25:51 +08:00
LmeSzinc
61aca93cfb Add: Stage increase in TSS maps 2023-07-26 19:57:14 +08:00
梦念逍遥
5c054b6b20
Upd: World-spanning Arclight Rerun chapter TSS (#2912)
* Upd: World-spanning Arclight Rerun chapter TSS

* Upd: addd tss config about MAP_IS_ONE_TIME_STAGE
2023-07-25 12:35:28 +08:00
LmeSzinc
c13651130d Opt: Add fool-proof chapter converts 2023-07-20 23:45:42 +08:00
LmeSzinc
2f771d8ca5 Refactor: [ALAS] Page class
Path findings in page class
2023-07-02 15:24:40 +08:00
guoh064
ca5f565626
Add: Campaign_12_4_H (#2768)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
2023-06-14 12:10:14 +08:00
LmeSzinc
63ff035116 Fix: Handle AUTO_SEARCH_EXIT in emotion withdraw 2023-05-27 21:57:55 +08:00
LmeSzinc
4dd3692318 Fix: [EN] Stage entrance detection 2023-05-27 21:37:29 +08:00
LmeSzinc
e43116d3db Fix: Auto event convert should before stage covert 2023-05-27 21:37:29 +08:00
LmeSzinc
5394c65975 Add: Confluence of Nothingness chapter T 2023-05-27 17:58:31 +08:00
LmeSzinc
f9e9824c55 Fix: Stage entrance extraction in Confluence of Nothingness 2023-05-26 17:34:21 +08:00
LmeSzinc
e908fee2cd Fix: Handle random stage OCR error like "1--" and "49X" (#2591) 2023-05-21 22:58:24 +08:00
Karl Whit
6a7c049f9c
Fix: Skip hard mode campaign_main when remaining number of times is 0 (#2568)
Co-authored-by: yypsybs <yux@taizhitech.com>
2023-05-11 23:35:00 +08:00
LmeSzinc
196d687970 Fix: Update map files and UI switches 2023-04-27 22:48:18 +08:00
LmeSzinc
590435f42c Fix: Handle OCR error in campaign_ensure_chapter() due to slow animation 2023-04-15 22:28:08 +08:00
guoh064
929f6494e5
Fix: notify_handle AttributeError (#2438)
* Fix #2436 : object call error
2023-04-01 11:43:15 +08:00
guoh064
b2c58aa464
Add: Campaign finish notification via Onepush (#2431)
Co-authored-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
2023-03-31 20:57:16 +08:00
LmeSzinc
8c4526b0c0 Fix: Handle appear animation in coalition page (#2397) 2023-03-24 23:18:16 +08:00
LmeSzinc
14870c6807 Fix: ui switches to page_coalition 2023-03-24 05:31:26 +08:00
LmeSzinc
7ecf3ac502 Add: Coalition task 2023-03-24 04:41:13 +08:00
LmeSzinc
db2055099d Opt: Improve log appearance when changing flagship and vanguard 2023-03-16 22:51:24 +08:00
Alexanded
3797402ad1 Opt: Set EnemyPriority to S1_enemy_first in GemsFarming 2023-03-08 07:05:27 +03:00
Alexanded
1bceb5bfbd Add: Disable flagship and vanguard change in GemsFarming 2023-03-03 23:51:49 +03:00
Bookbug
45373c52b8
Fix: TaskBalancer malfunctioning caused by ocr failure (#2295)
* Fix: Cannot OCR coin when using auto search(#2289)

* Merge TaskBalancer into StopCondition

* Add: Avoid zero OCR in coin

* Restruct function due to operator precedence

* Merge bug_fix into coin_autocheck

* Fix: Dumb error caused by no parameter

* Fix: Minor bugs
2023-03-03 22:19:07 +08:00
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