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,948 Commits 9 Branches 0 Tags 274 MiB
0ae38fe96f
Commit Graph

584 Commits

Author SHA1 Message Date
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
LmeSzinc
4b7733c68e Fix: Campaign name is case sensitive 2021-10-27 17:33:30 +08:00
Cola
261b938aea Fix:check oil in auto search 2021-10-23 23:40:16 +08:00
LmeSzinc
f2791c3abb Fix: Calls commission if task disabled 2021-10-22 21:18:18 +08:00
LmeSzinc
825d0651d8 Add: W14 maps extracted 
- Opt: _extract_stage_name for color just a little bit higher than 235
- Add: LuaLoader
 2021-10-21 22:15:05 +08:00
nEEtdo0d
d9cec4134e Add: war archives support for app 2021-10-10 23:38:10 -04:00
LmeSzinc
09f28b740f Merge branch 'master' into app 2021-09-28 22:41:41 +08:00
LmeSzinc
a629981a84 Fix: Shortest commission filter 2021-09-28 22:35:13 +08:00
Cyumxi
40bf9f3402 fix issue #628 2021-09-28 02:17:20 +08:00
LmeSzinc
5b772facb8 Fix: Menu extraction 
- Delay task if reach oil limit
 2021-09-28 00:49:38 +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
3483ea2041 Refactor: Config generating 2021-09-26 00:04:11 +08:00
LmeSzinc
a77f4095c3 Merge branch 'master' into app 2021-09-25 13:27:39 +08:00
LmeSzinc
cf5fdf3fe9 Fix: Color of stage entrance button is empty (#630) 2021-09-25 13:27:13 +08:00
LmeSzinc
33d503465f Refactor: SOS module 
- Fix: Expected reduce when no fleet 2
 2021-09-24 21:51:44 +08:00
LmeSzinc
89bf271417 Refactor: Emotion module 
- Fix: Modifications of config will be overridden by the loading of yaml file during update
 2021-09-24 20:24:46 +08:00
LmeSzinc
f71a151678 Merge branch 'master' into app 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/config/config.py
 2021-09-19 23:34:30 +08:00
Cyumxi
d7982683a0 self.campaign 2021-09-19 22:29:13 +08:00
Cyumxi
7958f6112f [Fix]: get_equiping_list 2021-09-19 20:02:24 +08:00
Cyumxi
c8f3519dd8 [Fix]: fix endless retrying bug 2021-09-19 17:11:40 +08:00
LmeSzinc
5ed75c8de5 Merge branch 'master' into app 
# Conflicts:
#	module/config/config.py
#	module/map/fleet.py
#	module/ui/ui.py
 2021-09-17 23:53:15 +08:00
LmeSzinc
a8a5166de2 Fix: Using wrong config in gems farming 2021-09-17 23:39:53 +08:00
LmeSzinc
017df17029 Fix: Path finding when grids blocked by fortress 2021-09-17 18:23:25 +08:00
LmeSzinc
61cbe75527 Refactor: More accurate exceptions and add friendly advices 2021-09-16 12:09:00 +08:00
LmeSzinc
5dd0459de9 Refactor: Gems farming configs 
- Opt: Avoid clicking AUTO_SEARCH_MAP_OPTION_OFF after ignore low emotion warn
- Opt: Skip map cat attack in auto search
 2021-09-16 03:53:57 +08:00
LmeSzinc
abdfbb713a Refactor: Rename auto search configs 
- Refactor device/app configs
- Fix: Research finish detection
 2021-09-15 23:50:30 +08:00
LmeSzinc
3dc7f9d17d Add: Task switch 2021-09-15 23:32:58 +08:00
LmeSzinc
46d8d2fadb Refactor: Rename main configs 
- Faster chapter selection and page_campaign
- Rename some old Chinglish variables in map info
 2021-09-15 23:32:31 +08:00
LmeSzinc
2777f00584 Add: Obscure finish in OS fully auto 2021-08-22 00:16:40 +08:00
Cyunmi
e0ef2661a0 code format 2021-08-16 23:04:23 +08:00
Cyunmi
eecda9ba70 [Fix]: change the way of coding, 
now is more stable
 2021-08-16 22:36:00 +08:00
LmeSzinc
8e0b689e66 Fix: Level detection init 2021-08-16 12:11:08 +08:00
Cyunmi
8f45af7f73 ADD LOGGER 2021-08-14 22:31:11 +08:00
Cyunmi
15e8acaa4a resolve conversation 2021-08-14 21:48:21 +08:00
Cyunmi
fda815b7d0 fix auto search combat status when low emotion 2021-08-14 16:15:08 +08:00
Cyunmi
0c5b747f37 add cn gui 2021-08-14 04:05:31 +08:00
Cyunmi
8307ef2245 add AUTO_SEARCH_SETTING to config cover 2021-08-14 02:24:28 +08:00
Cyunmi
c86cd524de format document 
add comments
 2021-08-14 02:10:36 +08:00
Cyunmi
298175fe61 add config gems_low_emotion_withdraw 2021-08-14 01:18:15 +08:00
Cyunmi
3d8e92c4f3 get flag ship lv in auto search 2021-08-13 20:54:01 +08:00
Cyunmi
d63e5aa05c fix equipment_take_on bug 
fix flagship_equip_change bug when COMMON_CV_NAME == 'ANY'
 2021-08-13 18:57:06 +08:00
Cyunmi
e4ed2ba06c ADD equip change when COMMON_CV_NAME == 'ANY' 2021-08-13 18:09:05 +08:00
Cyunmi
6e06e5ab36 ADD COMMON_CV_NAME == 'any' 2021-08-13 17:48:44 +08:00
Cyunmi
49cafc64c1 add optional to equipment change 2021-08-13 02:55:51 +08:00
Cyunmi
eb1d174e31 fix emotion withdraw bug 2021-08-13 02:32:05 +08:00
Cyunmi
21420d7645 Transform GEMS_AUTO_SEARCH_FARMING 
to ENABLE_AUTO_SEARCH
 2021-08-13 01:01:35 +08:00
Cyunmi
36d6870b0c use GemsCampaignOverride 2021-08-13 00:53:07 +08:00
Cyunmi
02b0100325 add check_flag_ship_level 2021-08-12 22:37:48 +08:00
Cyunmi
a0c6028b16 fix retirement rename bug 2021-08-12 21:05:46 +08:00
Cyunmi
79977b840b fix dock_select_one bug 2021-08-12 19:28:57 +08:00
Cyunmi
e10cb0e042 1. 很多函数直接在 gems_farming 里覆盖就可以了, 不要直接在底层里加 
因为只是 gems_farming 自己用的, 不是通用的
 2021-08-12 18:20:35 +08:00
Cyunmi
59702082af withdraw when emotion is low 2021-08-12 07:58:03 +08:00
Cyunmi
e61a7b618a finally, it run 2021-08-12 06:14:24 +08:00
Cyunmi
f930709793 add auto search gems farming 2021-08-12 05:19:39 +08:00
Cyunmi
aa4a2d8ef6 Merge branch 'master' into gems_farming 2021-08-09 17:08:25 +08:00
Cyunmi
4c4321777d prepare to merge 2021-08-09 16:50:36 +08:00
LmeSzinc
63de5be652 Fix: Conflicts among branches 
- [CN][TW] Fix option name
- Change ButtonGrids.buttons() to ButtonGrids.buttons
 2021-07-24 17:53:45 +08:00
LmeSzinc
e918a5db97 Merge branch 'gems_farming' into dev 
# Conflicts:
#	module/campaign/campaign_ocr.py
#	module/equipment/equipment.py
#	module/guild/base.py
 2021-07-24 17:33:58 +08:00
LmeSzinc
706ffc8a75 Fix: Wrong fleet to change flagship in gems farming 2021-07-24 17:22:04 +08:00
LmeSzinc
7ec9e0d88f Add: Siren templates in Azur Anthem SP3 
- Opt: Lower campaign match threshold to 0.8, in order to detect 50% clear SP3
 2021-07-23 20:15:05 +08:00
LmeSzinc
6d06346210 Add: Azur Anthem Event maps 
- Handle event animation after the 4th battle
- Add ensure_edge_insight configuration
 2021-07-23 18:26:24 +08:00
RuaBQ
bdd4105235 Merge remote-tracking branch 'upstream/gems_farming' into gems_farming 2021-07-06 20:24:23 +08:00
RuaBQ
d322f0b528 add Vanguard ship change 2021-07-06 16:48:52 +08:00
RuaBQ
272422ff91 add emotion ocr 2021-07-06 15:50:33 +08:00
RuaBQ
c4e4c1fec2 每艘 cv 用一个单独的 template 
改变了 retirement 的写法
 2021-07-06 01:14:05 +08:00
RuaBQ
9e0875a274 finish retirement keep one common cv 2021-07-05 02:24:38 +08:00
LmeSzinc
e22840cc84 Fix: Config reset in gems farming 2021-07-01 22:32:55 +08:00
LmeSzinc
d750f73696 Add: Change flagship when level >= 32 2021-06-30 18:04:31 +08:00
LmeSzinc
e6c17171c8 Opt: Template.match_multi returns list of Button 2021-06-30 15:39:06 +08:00
LmeSzinc
f94f3ce955 Opt: Points and Lines class no longer require config 2021-06-30 14:11:04 +08:00
RuaBQ
bc05b4cd89 merge equipment change 
add some assert
 2021-06-30 02:15:57 +08:00
LmeSzinc
48d53f6cab Add: Flagship changing 2021-06-29 23:10:13 +08:00
LmeSzinc
d6d56c79d6 Del: Remove GUILD_POPUP_TRIGGERED because AL can receive guild missions automatically now 2021-06-20 16:39:14 +08:00
nEEtdo0d
43ee1f35fe Add: [EN] Support for OS world clearing 2021-05-14 16:19:55 -04:00
LmeSzinc
470308db52 Merge branch 'master' into dev 2021-04-27 16:28:29 +08:00
LmeSzinc
127212b204 Add: Do os in daily 2021-04-27 16:27:55 +08:00
tsweeneySG
f9de54b558 Fix: [JP] Switch to SP/EX asset 2021-04-25 19:27:30 -04:00
LmeSzinc
40578204b5 Add: OS full auto and add it to GUI 2021-04-17 22:05:36 +08:00
LmeSzinc
1b07abaf4e Add: Finish all OS daily missions 
- Opt: Skip selecting zone type if already selected at the right one
- Opt: Get zone name in init and after entering map
- Fix: os_init in port shop
 2021-04-14 20:47:23 +08:00
LmeSzinc
df7fec4e2b Add: Repair ships in port and accept all missions in all ports 
- Fix: Port exit
- Fix: Handle unable to accept more missions
- Opt: Adjust map init, map init should be called at first, and when zone changed
 2021-04-05 18:15:16 +08:00
nEEtdo0d
867bd965ea Merge remote-tracking branch 'origin/master' into emotion 2021-04-02 18:36:20 -04:00
LmeSzinc
4866584e1b Upd: [CN] SWITCH_2_EX asset 2021-03-29 22:53:26 +08:00
whoamikyo
25f67bcc1a Fix: [EN] fixed SWITCH_2_EX asset 2021-03-28 18:43:20 -03:00
LmeSzinc
71b67506e2 Fix: Typo in _campaign_get_chapter_index 2021-03-28 18:00:57 +08:00
nEEtdo0d
607e8b1260 Opt: Emotion refactor for enable 2x book configuration 2021-03-26 20:31:44 -04:00
LmeSzinc
e21acd3989 Opt: General support for as bs cs ds maps 2021-03-26 15:23:49 +08:00
Zorachristine
b9e4df458b Fix: [TW] exercise and campaign assets 2021-03-15 23:33:31 +08:00
LmeSzinc
45768a0fd2 Fix: Missing screenshot in ensure_campaign_ui after retry 2021-03-15 22:35:34 +08:00
whoamikyo
171627cf0e Opt: New toast notifications 2021-03-02 05:53:18 -03:00
whoamikyo
a0f84696e1 Opt: Few changes to match with new notifications system 2021-02-19 20:01:32 -03:00
whoamikyo
f506631456 Added: added GameStuckHandler for C and D battle status 
- game will restart when get C and D battle status now
 2021-02-15 15:14:47 -03:00
LmeSzinc
36b85f40e3 Fix: Typo in _emotion_expected_reduce() 2021-02-13 23:44:42 +08:00
whoamikyo
e72605ba95 Fix: fixed bluestacks hyper-v multi-instance support 2021-02-13 00:53:19 -03:00
whoamikyo
95c1008e5a Added: added toast notifications support to windows 10 2021-02-11 06:24:16 -03:00
LmeSzinc
1e5813ddb3 Merge branch 'master' into dev 2021-01-30 10:54:13 +08:00
LmeSzinc
26c484bd87 Fix: auto search in event daily AB 
- Add auto call submarine in auto search
 2021-01-28 14:11:06 +08:00
LmeSzinc
14c3dc9b0c Merge branch 'master' into dev 2021-01-28 12:29:13 +08:00
nEEtdo0d
eabede70e1 Fix: Merge latest and resolve conflict in module/campaign/run.py 2021-01-27 15:34:37 -05:00
LmeSzinc
f6fdb1e5ec Fix: Auto fallback to original mode if a map don't have auto search 
- Disable auto search in daily hard currently
- Handle auto search menu sometimes disappear
 2021-01-28 02:58:25 +08:00
nEEtdo0d
cc5972365d Opt: Add additional parameter to select ui_click calls during daily 
Transfer detection status to ensure reward_when_finished or
continuing campaign run will execute handle_guild
 2021-01-27 13:50:26 -05:00
LmeSzinc
c244575c94 Fix: _emotion_expected_reduce when using one fleet to clear all 2021-01-28 00:43:06 +08:00
LmeSzinc
5ac50e6910 Add: Support auto search 2021-01-28 00:35:15 +08:00
LmeSzinc
0077eb4d9c Add: Operation siren clear full map 
- Skip clicking if already goto destination
- Skip path finding if no fleet 2
- Right align Y axis when showing map
- Fix perspective draw
- Add MAP_FOCUS_ENEMY_AFTER_BATTLE for OS
- ensure_edge_insight now focus to random corner, rather than bottom-right
- Add OSGrids
- Add view mode to detect maps in OS
- Fix OCR debug run before model init
- Add handle_map_event() to include all os handlers
- Add OS map info extractor
 2021-01-26 17:07:34 +08:00
LmeSzinc
c2f23ab5fd Del: Delete spare fleet 
- Fix: [JP] guild boss setting in GUI
 2021-01-22 17:02:35 +08:00
LmeSzinc
343b5b4613 Fix: Reset GUILD_POPUP_TRIGGERED in campaign object 2021-01-20 00:21:35 +08:00
LmeSzinc
b96f68289e Fix: GUILD_POPUP_TRIGGERED syncing in config 
- Opt: skip interval check if GUILD_POPUP_TRIGGERED
 2021-01-19 15:44:12 +08:00
LmeSzinc
1aacce72e8 Fix: _guild_triggered not working in non-continuous campaign 
- Opt: Comments in logistics_mission to avoid mis-understandings
 2021-01-19 03:38:43 +08:00
nEEtdo0d
bbd44d3d3c Add: If popup encountered, handle guild after campaign completed 2021-01-16 10:26:10 -05:00
nEEtdo0d
845c9d5e67 Fix: Raise exception in case name does not belong anywhere 
indicating malformed timing of screen capture for OCR
 2021-01-11 13:52:43 -05:00
nEEtdo0d
03ad5434bc Fix: Handle malformed or empty ocr campaign results 2021-01-10 13:16:07 -05:00
Ray
49829abed0 [jp] update assets imgs 2021-01-06 10:14:48 +08:00
LmeSzinc
d8e904622a Fix: Detection of EXTRA stage 
Inverted Orthant will goto EXTRA by default, not SP
- Del: Delete unused function _name_separate
 2021-01-02 17:08:54 +08:00
nEEtdo0d
e9dcd8f124 Fix: [EN] Regen assets based on master revision 2021-01-01 14:43:25 -05:00
whoamikyo
ded489def4 Upd: [EN] Update campaign mode switch 2 2020-12-31 13:52:31 -03:00
LmeSzinc
9a048775c1 Upd: [CN] Update campaign mode switch 2 
- TODO: [EN][JP] update SWITCH_2_EX and SWITCH_2_HARD
 2020-12-31 21:57:13 +08:00
nEEtdo0d
2394749e76 Fix: [EN] Assets for campaign mode switching 2020-12-22 16:35:13 -05:00
noname94
cc497ce146 Fix: [JP] assets for the latest update 
4169ffb84d, 635e18e579 and 8b7a46b2c8
 2020-12-23 03:18:36 +09:00
LmeSzinc
8b7a46b2c8 Fix: Assets for campaign mode switching 
- EN and JP need to replace SWITCH_1_*.png
- FLEET_PREPARATION_HARD_*.png don't need to replace
 2020-12-22 19:21:39 +08:00
LmeSzinc
5db3b5d57c Fix: Loop in reward if ENABLE_REWARD disabled and commission notice found (#260) 2020-12-15 16:22:28 +08:00
LmeSzinc
3399b64330 Fix: Skip reverting config in hard, if drop screenshot disabled 2020-12-04 22:37:18 +08:00
LmeSzinc
523f31f35e Fix: Wrong folder to save drop screenshot after running daily hard 2020-12-03 12:09:02 +08:00
LmeSzinc
94cb3a390a Fix: SP in Vacation Lane 
- Add: siren template in SP
 2020-11-27 00:28:50 +08:00
LmeSzinc
15381e9dc3 Fix: Add TEMPLATE_STAGE_HALF_PERCENT to fix SP3 
In event Vacation Lane SP3, when it's 50%, a part of the '%' is out of the stage icon, so use the left side of '%' to match stage entrance
 2020-11-26 22:46:58 +08:00
LmeSzinc
d37e9ba4b0 Opt: Code formatting 2020-11-21 11:14:43 +08:00
nEEtdo0d
7607d50545 Fix: resolve merge conflicts 2020-11-19 11:19:41 -05:00
LmeSzinc
ace77fa1c7 Add: Handle mechanism and land_based 2020-11-16 21:16:27 +08:00
nEEtdo0d
e125bdaa65 Fix: Move war archive events where others are, adjust code as needed 2020-11-07 16:43:40 -05:00
LmeSzinc
a63ac5631b Opt: Wait for emotion before entering map 2020-10-29 22:21:39 +08:00
whoamikyo
d1dd15ceec Added: Taiwan server support 2020-10-26 15:22:13 -03:00
LmeSzinc
df0c33c72c Opt: Switch class 
- Add offset argument, rename is_choice to is_selector
 2020-10-20 15:44:32 +08:00
LmeSzinc
b9d09f3d49 Opt: Move module/base/switch.py to module/ui 2020-10-18 21:02:03 +08:00
noname94
aaf93ee11d Add: added ship level detection in combat 2020-10-05 21:45:08 +09:00
LmeSzinc
0244212596 Fix: Stage ENTRANCE in hard mode 
- Fix Points.group()
 2020-10-04 19:35:30 +08:00
whoamikyo
20955d5ac8 Add: [EN] added Counterattack Within the Fjord event to EN server 
- added stop triggered if get a new ship
 2020-10-02 12:56:22 -03:00
LmeSzinc
d00e114387 Add: GIF template multi-match 
- Fix: IndexError when finding Hard campaign
 2020-09-26 02:59:10 +08:00
LmeSzinc
62957d9830 Fix: Daily hard has no campaign_extract_name_image 
- Fix event switching with campaign ball
- Add MAP_IS_ONE_TIME_STAGE
- Opt description of event_stage in GUI
- Add info when map file not found
 2020-09-18 22:58:18 +08:00
LmeSzinc
a189076da8 Add: Dreamwaker's Butterfly (event_20200917) TS1 T1 
- Dev: Fix relative_crop import
 2020-09-18 20:09:59 +08:00
LmeSzinc
d141f4763e Opt: Move CampaignOcr, CampaignUI to CampaignBase 
- Fix: Handle story after in map enemy searching
- Fix: stage ENTRANCE in event
- Fix: in_stage check in event
- Dev: map_extractor add STAR_REQUIRE_X, fix for tutorial maps
 2020-09-18 19:01:40 +08:00
LmeSzinc
0a266411de Fix: Handle new stage entrance icon 
- Fix in_stage detection on slow pc
 2020-09-18 01:09:59 +08:00
LmeSzinc
3d50a3a418 Fix: Switch campaign mode in other functions except main chapter 2020-09-04 01:42:06 +08:00
LmeSzinc
f0e2767a7d Fix: Wrong drop screenshot save folder after research receive 2020-08-29 01:38:01 +08:00
LmeSzinc
2036ebc8e7 Fix: MapDetectionError after fleet switch (#166) 2020-08-26 18:39:13 +08:00
whoamikyo
09d3f695de Revert "Revert "Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into dev"" 
This reverts commit ac9303012c.
 2020-08-18 20:48:14 -03:00
whoamikyo
ac9303012c Revert "Merge branch 'dev' of https://github.com/LmeSzinc/AzurLaneAutoScript into dev" 
This reverts commit bdc5aa0720, reversing
changes made to 6ee7a62edf.
 2020-08-18 20:47:27 -03:00
LmeSzinc
3fa23af1a6 Merge branch 'master' into dev 
# Conflicts:
#	module/config/argparser.py
#	module/config/argparser_en.py
#	module/config/argparser_jp.py
 2020-08-19 00:19:42 +08:00
whoamikyo
93ee619cbf Opt: alas.bat and dev_tools.bat refactor 2020-08-17 19:26:30 -03:00
LmeSzinc
a5f611dce0 Opt: Reuse device instance 
because can't have multiple connection with minitouch
 2020-08-17 21:27:24 +08:00
LmeSzinc
c22355ee86 Opt: Handle movable enemy in other battle condition 
- Fix walk timeout warning when ambush evade failed
- Disable POOR_MAP_DATA in event_20200723_cn
 2020-08-05 18:29:27 +08:00
LmeSzinc
5d9e4b651d Opt: Handle movable enemy without POOR_MAP_DATA enabled and won't goto previous siren location 
- Fix: enemy_genre merge
- Add: counter of map walk round
- Opt: Smarter enemy moving wait
 2020-08-05 03:07:20 +08:00
LmeSzinc
2dc80628f6 Fix: Campaign go from chapter B to chapter D 2020-08-01 01:18:48 +08:00
whoamikyo
a791c0c0e1 Fix: New siren GIF templates 2020-07-28 07:00:43 -03:00
Kyo
65c7d9e4b8
Merge branch 'nightly' into dev 2020-07-28 06:57:56 -03:00
whoamikyo
d1e2a240ad Fix: New siren GIF templates and New MODE switch assets 2020-07-28 06:55:34 -03:00
LmeSzinc
35a4884ac8 Add: [JP] campaign mode switch assets 2020-07-28 17:10:11 +08:00
LmeSzinc
a0c17b4533 Add: Event SP switch 2020-07-28 14:56:17 +08:00
LmeSzinc
673e8422a4 Add: [CN] event_20200723_cn B3 D3 
- Fix homography error when no edge detected
- Increase battle function try count, just for pool logic currently
 2020-07-25 03:40:40 +08:00
LmeSzinc
0a8a90cdb1 Typo: Docstring in assets.py 2020-07-15 23:33:38 +08:00
LmeSzinc
0cc2fe2946 Fix: OCR in campaign, commission, daily, hard, fleet, raid, oil 
- Add Digit OCR
 2020-07-15 03:39:04 +08:00
whoamikyo
c8bdb7c0c2 Assets: Added Assets for equipment 
- Minor changes in dev_tools.bat
 2020-06-26 19:25:06 -03:00
LmeSzinc
03a78b835e Fix: Catch errors and show info 
- No attribute ui_current, if start from unsupported page
- ModuleNotFoundError, if map file not exists
- ModuleNotFoundError, if run daily_ab on SP map
 2020-06-23 00:26:05 +08:00
whoamikyo
b90fef9522 Add: Added new exception to ENABLE_EXCEPTION option 2020-06-20 07:15:15 -03:00
whoamikyo
5efc957abb Add: Added option to enable or disable some exceptions 
-ALAS will withdraw from the map when it occurs instead of stopping
 2020-06-19 05:34:40 -03:00
ferina8-14
47adffd1a0 Merge branch 'master' into try_jp 
[JP] copy assets from cn

# Conflicts:
#	module/combat/assets.py
#	module/daemon/assets.py
#	module/handler/assets.py
#	module/retire/assets.py
#	module/reward/assets.py
 2020-06-13 03:29:35 +09:00
ferina8-14
ca1fd238a9 Add: [JP] add jp assets, campaign module 2020-06-13 02:49:47 +09:00
kyO The NinjA
ae88a57eba Fix: [EN] Fix Miss detect lines as characters in Commission module 2020-06-08 07:54:21 -03:00
kyO The NinjA
7c15659f7f Add: Added support for hard map 
- Now is possible cleared a hard map like a normal map
 2020-06-08 05:56:43 -03:00
LmeSzinc
3c35974bbe Fix: add new day check to reward_loop 
- Fix emotion reduce when calculating recover
 2020-06-06 21:53:31 +08:00
LmeSzinc
2609b4a70d Add: Timezone aware 
- Fix mat withdraw on slow device
 2020-06-01 02:26:55 +08:00
Erik
4dbd8dd2c1
Merge pull request #5 from LmeSzinc/master 
Fix: Enemy detection
 2020-05-30 21:31:23 -03:00
LmeSzinc
83508b94d3 Fix: Enemy detection 
- Log shows 'E' and wrong prediction is_siren, because attributes are kept to the next detection
- Fix missing predict also
- Fix log show DEFAULT_BUTTON for the entrance of campaign
 2020-05-31 02:49:06 +08:00
kyO The NinjA
c491fe7ec5 Add: [EN] New B2 battle logic thanks @justtesting 
Add: [EN] New C1 battle logic
Add: [EN] New B3 battle logic
Add: [EN] New D3 battle logic
Add: [EN] New assets
 2020-05-30 05:41:06 -03:00
LmeSzinc
c402d3e047 Fix: Folder create when --enable_drop_screenshot disabled 2020-05-29 17:08:43 +08:00
Erik
1244f9a6f1
Merge pull request #3 from LmeSzinc/master 
Add: Map logic fleet_2_push_forward, better support 7-1
 2020-05-28 18:52:45 -03:00
kyO The NinjA
88091632fe revert changes 
- Revert changes in campaign_ocr.py
 2020-05-28 18:47:52 -03:00
LmeSzinc
3e687c4b23 Fix: campaign_ocr result start with '-' 2020-05-28 07:29:42 +08:00
kyO The NinjA
10b53f80ba Localization for EN version 
- Updated assets for EN version
- Created EN dictionary
- Fix Stage OCR recognition Thanks @LmeSzinc
 2020-05-27 10:32:05 -03:00
LmeSzinc
e885665181 Fix: [EN] campaign name ocr 2020-05-27 21:29:32 +08:00
LmeSzinc
83674b7a37 Optimize: Redundant campaign_hard file 2020-05-26 23:47:08 +08:00
LmeSzinc
2f1f999ce5 Add: multi-server support 2020-05-25 22:05:42 +08:00
LmeSzinc
f32042fbd2 Fix: 修复调用错误心情对象的问题 2020-05-24 20:11:23 +08:00
LmeSzinc
eb2a58d7f5 Add: 增加处理被精英抓住 
- 修复原地寻路报warning
- 修复到达误判
 2020-05-23 14:30:07 +08:00
LmeSzinc
8ec5099b58 Add: 适配穹顶下的圣咏曲AC图 
- 修复UI导致的动态边缘识别出错
- 修复只识别出一队时的处理逻辑
- 修复处理战斗结束后跳出的剧情
- 修复辅助点击报CampaignEnd
- 修复游戏出现白屏bug时, 连续点击使用紧急维修
- 增加地图全清时, 使用二队打BOSS, 忽略FLEET_BOSS
- 增加被精英抓住的识别, 暂时还用不到
 2020-05-22 21:48:56 +08:00
LmeSzinc
9c77cdd058 Fix: 修复长时间运行时, 游戏内心情值计算bug导致的出错 
- 未开启红脸出击时, 会每隔两个半小时重启游戏
 2020-05-19 22:58:25 +08:00
LmeSzinc
1203585771 Fix: 修复SP进图 2020-05-07 13:55:00 +08:00
LmeSzinc
088aca3c95 Fix: 修复登录, 增加章节名OCR纠错 2020-04-28 22:51:32 +08:00
LmeSzinc
fc84f5e610 Fix: 修复开荒 
- 修复低级图出BOSS后报错的问题
- 修复了开荒进度0%时的章节名OCR
- 修复打完BOSS有时会卡住的问题
 2020-04-27 19:32:58 +08:00
LmeSzinc
6b56215d71 Fix: 修复地图特效导致的章节名识别错误和进图等待 
- 章节名识别错误时有20次重试的机会
- 进图时不再使用章节图标识别
- 更改了exception文件的位置
 2020-04-25 17:10:22 +08:00
LmeSzinc
604cdf4005 Fix: 修复 
- 优化章节名OCR, 防止地图特效影响识别
- 修复等待精英移动
- 修复回到出击界面
 2020-04-24 17:57:40 +08:00
LmeSzinc
bea05d396e Add: 适配复刻苍红的回响AB图 
- 开荒模式移动至出击设置
- 增加开荒模式自动启用, 无脑开就完事了
- 将透视识别参数放到了config里, 这样就可以用地图config覆盖了
- 适配小地图模式, 参数抄A1就行了
- 修复了章节名OCR的识别位置
- 修复了开荒会把BOSS当作精英打问题
- 增加战斗中的剧情跳过
- 注释掉了截图和点击的retry
- 增加了捕捉目标点超出移动范围
 2020-04-24 15:26:11 +08:00
LmeSzinc
b4054b579e Add: 增加行走步长设置 
- 修复跨天重启重置队伍的问题
- 修复碰磁BOSS战斗结束卡住的问题
 2020-04-23 01:58:35 +08:00
LmeSzinc
468537d615 Add: 支持在更少的地图信息下运行, 开启POOR_MAP_DATA即可 
这是为未来的活动图准备的, 毕竟不可能一直手动填写地图信息.
现在仍需要填写海陆位置信息(识别这个还有点难度),
敌人刷新点, 每战刷新信息, 可以不用填写了
- 问号将被视为可以通过
- 增加了暴力找路障的功能
- 修复了拣问号被堵住的问题
- 地图7-1太小了, 识别有问题
 2020-04-21 23:21:48 +08:00
LmeSzinc
b3698d7ae6 Add: 跨天运行时重启游戏 2020-04-20 18:37:10 +08:00
LmeSzinc
580a36375c Add: 增加主线图开荒功能, 支持打三星, 打到绿海 2020-04-19 00:49:33 +08:00
LmeSzinc
a8a243052f Add: 增加了未通关的章节名的识别 
- ocr预处理时会将图片左对齐
 2020-04-18 21:20:42 +08:00
LmeSzinc
a674198365 Add: 适配了第四章 
- 稍微移动了章节OCR的位置, 因为4-4会识别为14-4
- 针对第四章这种偏红的地图做了一些优化
- 稍微延长了敌人刷新时的等待时间
- 更改出错截图文件名为格式化的时间
 2020-04-18 00:19:50 +08:00
LmeSzinc
007d14c1d7 Fix: 修复和优化 
- 纠正了5-3刷新数据
- 更改出错截图文件名为毫秒时间戳
- 修复了伏击出现时, 仍会识别队伍的情况
- 修复了不开启截图时获得紧急委托时不点击的情况
 2020-04-17 17:19:09 +08:00
LmeSzinc
69b868a79e Fix: 修复一些bug 
- 修复了收完菜后不重新检查潜艇的问题
- 修复了使用潜艇时, 经验结算卡住的问题
- 调整了日常委托和教材类委托的权重, 不然一天下来, 日常委托做不完
 2020-04-16 22:01:52 +08:00
LmeSzinc
8ce405f28a Add: 适配第三章 
- 增加处理踩问号是会刷物资船的情况
- 增加对物资船的缺失预测
- 收完菜后出击, 会重新检查舰队
  因为离开出击界面后, 出击舰队会重置为游戏默认的
- 修复了部分偏红的过场图, 会被认作索敌的问题
 2020-04-15 15:14:35 +08:00
LmeSzinc
70936f4f39 Add: 适配第二章 
- 修复了不开启周回模式时, 会在出击界面开启自动的问题
- 修复了多打一战后, 打完BOSS不判定当前出击结束的问题
- 增加掉落新船时锁定的功能
- 增加了地图不支持周回模式时, 跳过周回检查的功能
  周回模式的选项可以无脑开了
- 修改透视识别报warning为info
  因为低级图地图小降低了检测的阈值, 导致需要纠正错误有点多
- 减少了战斗准备页面的多余点击
- 减少了挂委托时的多余点击
 2020-04-14 17:32:26 +08:00
LmeSzinc
be00742c3c Add: 适配第一章, 修复大量bug 
- 修复处理夜间委托时, 出现递归调用的问题
- 增加红脸出击确认的功能
- 增加了透视识别错误图片保存的开关
- 修复了地图太小时, 透视识别报错的问题
- 修复了相机位于地图外时, 透视识别出错的问题
- 修复了离开退役时, 会连击的问题
- 修复了同时出现低心情和船坞已满弹窗时, 卡住的问题
- 更新了一键退役实装后的安全点击的位置
- 修复了换装滑动失败时, 卡住的问题
- 修复了关闭自动收获后, 出现委托完成的提示是, 进图卡住的问题
- 修复了, 无正在跑的委托时, 报错的问题
 2020-04-11 15:26:42 +08:00
LmeSzinc
012a4decbb Add: 更多收菜的触发条件 
- 在主线图时, 出现委托完成的红点, 会触发收菜
- 完成每日任务时, 会触发收菜
- 执行收菜设置时, 会触发收菜
 2020-04-10 15:19:02 +08:00
LmeSzinc
8eab19ab04 Refactor: 统一了模板的写法 
- 修复了没有阵容锁定选项时会卡住的问题
- 修复了非周回时频繁报Arrive with unexpected result的问题
- 清理了一些无用的asset
 2020-04-09 16:30:40 +08:00
LmeSzinc
c2f74dda79 Add: 增加了收菜模块的设置 
- 增加了出击后定时回港收菜的功能
- 支持收食堂, 小卖部, 任务, 委托, 科研, 未支持委托派遣, 挂科研, 学技能
- 合并了收菜模块的文件
- 修正了收菜模块资源名称的拼写错误
 2020-04-01 22:40:21 +08:00
LmeSzinc
fc0e075422 Fix: 修复停止条件: 如果船坞已满无效的问题 
(其实是没写)
 2020-04-01 12:55:17 +08:00
LmeSzinc
8366d7a258 Add: 活动AB图每日三倍基本稳定 
- 调整了微层混合透视识别的参数
- 增加了在hsv色彩空间下的识别方法
- 增加了对地面闪烁红框的识别
- 增加了已打精英的计数
- 修改精英识别, boss识别, 舰队识别方法为hsv颜色计数
- 修复了自动生成camera_data的报错
 2020-03-31 14:23:44 +08:00
LmeSzinc
ce4887a4f5 Initial commit 2020-03-29 01:41:34 +08:00