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
9,175 Commits 9 Branches 0 Tags 274 MiB
44eb4dbcf2
Commit Graph

358 Commits

Author SHA1 Message Date
nEEtdo0d
e57309d888 Upd: [EN] additional post update assets 
Add: restore select partial commits; 1e13eab, c3c0ba4, 1cc28f5
 2022-04-12 22:55:49 -04:00
Egor Nats
1ebe64950a Fix: [EN] Revert to old assets 
- Tactical class and Dorm feature still broken, please disable until fix.
 2022-04-12 11:20:34 -03:00
SaarChaffee
303dd90fdc change CRLF to LF 2022-04-09 23:31:09 +08:00
nEEtdo0d
73ddcd9b7f Upd: [EN] post major app update bulk assets; WIP part 2 2022-04-08 00:57:15 -04:00
nEEtdo0d
96b39a9ea5 Upd: [EN] post major app update bulk assets; WIP part 1 2022-04-07 22:32:24 -04:00
LmeSzinc
23cf1acd1a Fix: map_offensive_auto_search is not working with fleet lock disabled 2022-03-29 21:47:39 +08:00
LmeSzinc
f9c4939821 Fix: Trying to fix the auto search bug on AL game client (#947) 2022-03-26 23:25:46 +08:00
LmeSzinc
5951d05f90 Fix: Trying to fix the auto search bug on AL game client (#947) 2022-03-23 20:57:17 +08:00
LmeSzinc
ca2491611b Fix: Expiration detection when selected a commission 
Red background of expiration become lighter when commission is selected
 2022-03-10 21:08:00 +08:00
LmeSzinc
ff3cbbe6e5 Fix: Trying to handle auto search strike after exiting from retirement 2022-02-25 19:24:10 +08:00
LmeSzinc
e754e45edb Opt: Faster story handling in event maps 
- Del: Remove the use of handle_map_after_combat_story
- Opt: Skip checking arrive_timer when having a result
- Fix: Map detection is still working on story popup
 2022-02-10 18:25:51 +08:00
LmeSzinc
fe8fff68b0 Fix: Saving drop screenshots in OpSi abyssal 
- Increase timer of wait_until_camera_stable()
 2022-02-06 02:35:22 +08:00
LmeSzinc
eec0e8927c Add: Save drop screenshots in OpSi abyssal 2022-02-02 16:21:28 +08:00
LmeSzinc
7b0981fd48 Add: Screenshot interval in non-combat to help reduce CPU 2022-02-02 00:46:06 +08:00
LmeSzinc
65f166ad12 Refactor: Use numpy image cache instead of pillow image 2022-01-23 23:03:55 +08:00
LmeSzinc
a7fa97c5b4 Opt: Click interval on GET_SHIP 2022-01-10 00:25:07 +08:00
LmeSzinc
62bba1b25c Fix: Story skip in auto search 2021-12-31 02:25: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
d5735604e1 Dev: Uniform comments of generated files 2021-12-07 23:29:33 +08:00
nEEtdo0d
5da6c05b67 Opt: compress condition; less duplication 2021-12-03 22:54:38 -05:00
LmeSzinc
ff7c875f3f Add: Collect battle pass rewards 2021-12-03 17:32:10 +08:00
Cola
cffef972b3 Fix: [TW] update assets 2021-11-25 13:34:18 +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
LmeSzinc
c1fc7ef614 Fix: Level gap too large when there was an OCR error 2021-11-18 12:50:00 +08:00
Ray
247420140d Fix: check expected end before combat status 2021-11-17 21:27:18 +08:00
LmeSzinc
a6571c6d79 Refactor: Stop condition, reach level 2021-11-14 21:47:01 +08:00
LmeSzinc
7f1227aabf Fix: SubmarineMode not working because handle_submarine_call() received None (#705) 
- Opt: Re-check if submarine is clear
 2021-11-06 22:43:37 +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
nEEtdo0d
7a4804541f Fix: submarine settings for auto search and opsi obscure 2021-11-03 20:46:12 -04:00
LmeSzinc
41325a4258 Fix: Failed to detect dropping a new ship 2021-10-25 17:46:10 +08:00
LmeSzinc
21a865cb00
Merge pull request #676 from ddmugicha/auto_search_check_oil 
Fix: check oil in auto search
 2021-10-24 11:31:19 +08:00
LmeSzinc
32d2dbf8e6 Merge branch 'master' into app 2021-10-24 01:34:25 +08:00
LmeSzinc
80f2bc3542 Fix: Reset submarine click timer preventing TooManyClickError 2021-10-24 01:33:29 +08:00
Cola
261b938aea Fix:check oil in auto search 2021-10-23 23:40:16 +08:00
LmeSzinc
10b14dcc1e Opt: Slower screenshot speed in combat loading 2021-10-16 18:00:58 +08:00
LmeSzinc
7a53f608aa Merge branch 'master' into app 2021-10-16 17:49:53 +08:00
LmeSzinc
e272c2e664 Fix: Handle vote popup in auto search status 2021-10-16 17:16:58 +08:00
LmeSzinc
8b052e7dd3 Fix: More campaign reward popup handlers 2021-10-15 21:55:32 +08:00
LmeSzinc
1a683b02a4 Merge branch 'master' into app 2021-10-15 21:22:41 +08:00
Cola
64e69d4bbd Fix: [JP] Automation_Confirm & War_Archives/Template_* asset 2021-10-14 22:57:56 -11:00
LmeSzinc
a70bef7efa Merge branch 'master' into app 
# Conflicts:
#	module/combat/auto_search_combat.py
 2021-10-14 20:49:04 +08:00
LmeSzinc
e3b9761043 Fix: More vote handlers 2021-10-14 20:41:04 +08:00
LmeSzinc
fe99f712b2 Upd: Campaign bonus drop screenshots 2021-10-14 17:51:36 +08:00
LmeSzinc
01d49bb752 Merge branch 'master' into app 2021-10-14 17:48:12 +08:00
LmeSzinc
6e2b418ddd Fix: AUTO_SEARCH_ON/OFF assets, handle vote popup 2021-10-14 17:37:02 +08:00
LmeSzinc
495242cbc2 Refactor: Ash beacon assist 2021-09-25 00:38:53 +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
c8c1cd9789 Refactor: Guild module 
- Simplify guild exchange with Filter
- Expose submarine mode
 2021-09-21 01:19:43 +08:00
LmeSzinc
9f47fb9bc2 Merge branch 'master' into app 
# Conflicts:
#	module/combat/auto_search_combat.py
 2021-09-20 18:02:52 +08:00
LmeSzinc
fb33dfb884 Fix: Handle lost connection popup when game client is sending battle results 2021-09-20 18:01:15 +08:00
LmeSzinc
57c15e6ebb Fix: Solve merge conflicts 
- Fix typo UrgentCube-1:45
- Add auto mode control in auto search
 2021-09-18 00:26:21 +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
eb045242c3 Refactor: Rename retire configs 
- Fix combat drop screenshot missed because clicking too fast
- Close campaign preparation at start
 2021-09-15 23:33:06 +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
8e0b689e66 Fix: Level detection init 2021-08-16 12:11:08 +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
3836824929 add low emotion confirm in auto search 2021-08-14 00:56:57 +08:00
Cyunmi
3d8e92c4f3 get flag ship lv in auto search 2021-08-13 20:54:01 +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
9abe459fdc Fix: Lock new ships in auto search combat 2021-07-23 16:03:52 +08:00
LmeSzinc
d750f73696 Add: Change flagship when level >= 32 2021-06-30 18:04:31 +08:00
LmeSzinc
cf5bfbc9a7 Opt: Template.match_result returns similarity and Button 
- Add Button.move() Button.crop()
 2021-06-30 13:59:24 +08:00
LmeSzinc
e6facc606a Opt: Cache ButtonGrid.buttons and add move() crop() 2021-06-29 23:04:19 +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
LmeSzinc
6af769a28b Revert "Opt: Disable emotion bug handler" 
This reverts commit a34e9002
 2021-06-09 12:35:17 +08:00
LmeSzinc
a34e900251 Opt: Disable emotion bug handler 2021-06-09 09:55:03 +08:00
nEEtdo0d
5b5412ccc0 Fix: HP grid check normal vs os, straight forward, no @Config 2021-05-24 16:21:44 -04:00
LmeSzinc
ae570058bd Fix: Detect auto search menu in every steps of auto search 
- Fix: Increase timer in mission submit
 2021-05-04 14:59:36 +08:00
LmeSzinc
9e6e0c8fae Fix: Combat automation confirm in auto search 2021-05-02 01:10:47 +08:00
LmeSzinc
470308db52 Merge branch 'master' into dev 2021-04-27 16:28:29 +08:00
tsweeneySG
f9de54b558 Fix: [JP] Switch to SP/EX asset 2021-04-25 19:27:30 -04:00
Zorachristine
9b67bbd529 Fix: [TW] retire & combat assets 2021-04-25 20:04:52 +08:00
LmeSzinc
bb63613419 Merge branch 'master' into dev 2021-04-25 15:57:13 +08:00
LmeSzinc
9e1d76b563 Upd: [JP] OPTS_INFO_D (#381) 2021-04-25 15:28:09 +08:00
LmeSzinc
4f4f296e44 Merge branch 'master' into dev 
# Conflicts:
#	module/os/assets.py
 2021-04-16 17:51:18 +08:00
noname94
f92234614d Fix: [JP] assets fix 2 after font changed 
Many assets with words need fixes after the font changed. Most functions should work now.
 2021-04-16 13:58:57 +09:00
noname94
b8e2321140 Fix: [JP] assets fix after font changed 
Many assets with words need fixes after the font changed. This commit is not complete yet.
 2021-04-16 02:47:31 +09:00
LmeSzinc
fc9fdad3ae Fix: [CN] ASH_POPUP_CHECK 2021-04-05 21:10:43 +08:00
nEEtdo0d
867bd965ea Merge remote-tracking branch 'origin/master' into emotion 2021-04-02 18:36:20 -04:00
nEEtdo0d
ec04eb7c8c Mov: 2x book check and handle setting 
Opt: Switch for enable and disable for 2x book, get_expected_reduce @property now
 2021-04-02 18:26:00 -04:00
LmeSzinc
dab2bb8933 Fix: Ring cover letter "L" in Level OCR 2021-04-01 01:29:38 +08:00
LmeSzinc
4d07925de4 Fix: Handle continuous combat in siren scanning device 2021-03-31 17:13:11 +08:00
nEEtdo0d
f724a3a61f Fix: Restrict to only to commands capable of using 2x book 2021-03-26 20:43:41 -04:00
nEEtdo0d
607e8b1260 Opt: Emotion refactor for enable 2x book configuration 2021-03-26 20:31:44 -04:00
LmeSzinc
c438e4686c Fix: Mis detection of combat status when combat executing 2021-03-08 10:59:41 +08:00
LmeSzinc
1b604e3ae5 Opt: Not raising GameStuckError if get battle status C or D 
Because the detection of battle status is color detection which may go wrong
 2021-02-28 16:40:01 +08:00
Ray
a0d118f62f update jp asset "PAUSE" 2021-02-26 11:04:55 +08:00
LmeSzinc
2d48654def Merge branch 'master' into dev 2021-02-20 17:35:56 +08:00
whoamikyo
a0f84696e1 Opt: Few changes to match with new notifications system 2021-02-19 20:01:32 -03:00
LmeSzinc
4fd33bd4f2 Merge branch 'master' into dev 2021-02-18 16:49:14 +08:00
whoamikyo
989ab1280c Opt: removed battle status S toast notification 2021-02-17 14:20:42 -03:00
LmeSzinc
4290f959b9 Fix: Detection of PAUSE during the boss appear animation 2021-02-17 18:01:26 +08:00
LmeSzinc
fd03a211a3 Opt: Delete warning log of battle status S 2021-02-16 19:31:01 +08: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
nEEtdo0d
d8b051651d Fix: New ship drop can result in game stuck exception during auto-search as not handled 2021-02-15 11:04:12 -05:00
LmeSzinc
4797565148 Merge branch 'master' into dev 2021-02-01 00:14:36 +08:00
LmeSzinc
3d27c5b94d Fix: Auto search finish check 
- Fix argument of triggered_stop_condition in war archives
 2021-01-31 23:54:21 +08: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
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
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
46d1430860 Merge branch 'master' into dev 2021-01-20 21:53:08 +08:00
noname94
5426dfc295 Fix: [JP] Location of HP bar and ship level 2021-01-20 02:36:52 +09:00
LmeSzinc
6656b097dc Merge branch 'master' into dev 2021-01-19 16:24:10 +08:00
LmeSzinc
9a1b2d8383 Fix: Location of HP bar and ship level 2021-01-19 16:15:54 +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
e5cf62069f Merge remote-tracking branch 'origin/master' into update_asset 2021-01-17 11:08:42 -05:00
LmeSzinc
d3abb53021 Opt: One less screenshot before clicking BATTLE_PREPARATION 2021-01-17 21:31:37 +08:00
nEEtdo0d
3a049c99fa Mov: *_CF references and assets to module guild from combat 
Add: GuildCombat class

Fix: GuildOperations use independent instance GuildCombat to
handle combat interfaces for guild raid boss
 2021-01-16 13:53:46 -05:00
nEEtdo0d
bbd44d3d3c Add: If popup encountered, handle guild after campaign completed 2021-01-16 10:26:10 -05:00
LmeSzinc
717420aa6a Fix: Handle guild popups 2021-01-15 22:32:06 +08:00
nEEtdo0d
d03caa87e8 Add: Handler for Guild Info, occurs after battle and also sometimes 
upon log in (TBD, add fix if needed)
Able to handle either logistics or operations by scanning the
page before determining the necessary actions

TODO: Test for when operations info appear
[CN, TW, JP] Replace GUILD_HANDLE_CONFIRM
 2021-01-14 14:55:52 -05:00
nEEtdo0d
7837707995 Add: [CN, TW, JP] Add placeholder assets and update assets.py 
TODO: Replace for respective server GUILD_BOSS_ENTER,
GUILD_DISPATCH_*, GUILD_OPERATIONS_*, GUILD_REPORT_*
 2021-01-07 11:51:23 -05:00
nEEtdo0d
8264b3c0e7 Add: Support for guild raid boss 2021-01-07 11:32:13 -05:00
Zorachristine
0564665aa9 twassetsfix 2020-12-26 12:44:06 +08:00
LmeSzinc
99db81550c Fix: Get items in OS semi auto 2020-12-25 13:34:04 +08:00
noname94
d6933b68b2 Fix: [JP] GET_ITEMS_3 asset 2020-11-03 12:37:28 +09:00
noname94
a78a07e07f Add: [JP] sos assets 
and some other assets fixed.
 2020-11-02 20:13:59 +09:00
whoamikyo
d1dd15ceec Added: Taiwan server support 2020-10-26 15:22:13 -03:00
noname94
90d1b09bce Fix: pre_process of LevelOcr may return NoneType 2020-10-20 16:58:21 +09:00
noname94
1ec5d66be2 Opt: level detection minor optimizations 2020-10-20 16:28:04 +09:00
noname94
1eeeb474b2 Opt: LevelOcr optimization 2020-10-08 03:16:08 +09:00
noname94
65d0a7ff2b Opt: level detection code optimization 2020-10-06 15:37:52 +09:00
noname94
aaf93ee11d Add: added ship level detection in combat 2020-10-05 21:45:08 +09: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
noname94
38339a7b19 Opt: hp balancer optimization 
The logic of hp balancer for 3 ships now is that, to reposition two adjacent units in 'descending' if and only if their difference is greater than threshold / 2.
 2020-09-28 02:36:24 +09:00
noname94
a3e5db6c89 Opt: minor optimization in hp balancer 
For example, hp = [0.9, 0.6, 1], threshold = 0.2, the script would swap the ship in pos 0 and pos 2 which is needless.
 2020-09-28 00:10:08 +09:00
noname94
a0b7bff066 Opt: minor optimization 2020-09-26 18:40:41 +09:00
noname94
7b23a54805 Fix: fix the stable check before emergency repairing may not work on potato pcs 2020-09-26 18:12:24 +09:00
noname94
17aaa56539 Opt: minor optimization 2020-09-25 15:41:49 +09:00
noname94
995410812d Fix: add a stable checker to confirm the availbillity of emergency repair 2020-09-25 15:16:15 +09:00
LmeSzinc
22b534b619 Opt: Random emotion bug threshold 2020-09-08 14:30:10 +08:00
noname94
6cd4541c6f Fix: [JP] assets update 2020-09-02 06:33:25 +09:00
LmeSzinc
96e17067a4 Fix: HP balance logic when using minitouch 2020-08-25 01:15:43 +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
58297661fa Opt: Condition of handle_emergency_repair_use 2020-08-15 21:18:21 +08:00
LmeSzinc
bd215e0e98 Add: Combat mode hide_in_bottom_left 2020-08-14 06:52:21 +08:00
LmeSzinc
3be8617847 Fix: HP bar have_ship, when there's white object on background 
- Back to something similar to hp_record
 2020-08-09 06:52:59 +08:00
LmeSzinc
b909cf5644 Fix: HP calculation 
- Now predict has_ship directly, no need to use record
- Opt: faster hp bar calculation
 2020-08-09 05:09:12 +08:00
LmeSzinc
e8ce2d37b5 Add: Combat auto mode for different fleet 2020-07-29 00:50:49 +08:00
LmeSzinc
3b811fca9c Fix: Lots of problems 
- Fix HOMO_EDGE_HOUGHLINES_THRESHOLD not used
- Fix get stuck if kill too fast in combat_executing
- Fix wrong swipe when camera out of map
- Fix walk_out_of_step not detected
- Opt relative_record now save temp images in sub folder
 2020-07-24 19:56:24 +08:00
whoamikyo
997dc110f6 Fix: [EN] Fix EMERGENCY_REPAIR_CONFIRM 2020-07-23 04:07:22 -03:00
LmeSzinc
0a8a90cdb1 Typo: Docstring in assets.py 2020-07-15 23:33:38 +08:00
LmeSzinc
b7a89bf8b0 Fix: Get items more than 2 rows in research 2020-07-14 01:56:50 +08:00
LmeSzinc
65f00f183d Fix: Mis-detect BATTLE_STATUS_B when combat executing 2020-07-12 22:31:31 +08:00
LmeSzinc
ed2e92b703 Fix: Detection of combat loading 
- Opt: Now use template matching instead of color_bar_percentage
 2020-07-10 00:40:01 +08:00
LmeSzinc
a97cf304b6 Fix: Mis-click auto switch if released torpedo at combat start 2020-07-06 05:15:45 +08:00
LmeSzinc
1f110c43cf Fix: Increase battle_status_click_interval when enable drop screenshot 2020-07-05 04:48:02 +08:00
LmeSzinc
4f10fbde15 Fix: Handle combat submarine icon bug in game 2020-07-01 14:58:47 +08:00
LmeSzinc
31450ea4d7 Fix: Oil limit not working in raid 
- Add wait_until_stable
- Add ensure_combat_oil_loaded
- Add grid_location_to_screen_point
 2020-06-30 07:10:10 +08:00
whoamikyo
c8bdb7c0c2 Assets: Added Assets for equipment 
- Minor changes in dev_tools.bat
 2020-06-26 19:25:06 -03:00
LmeSzinc
593fcb4a32 Fix: ui_current unrecognised after raid 
- Fix ui_ensure stop without error
- Fix log string for callable expected_end
 2020-06-25 11:03:44 +08:00
LmeSzinc
e128142678 Fix: Mis-detection 
- Mis-detect BATTLE_STATUS_B when battle executing
- Mis-detect in_stage on potato device
- Optimize enemy_genre select for 12-2 leveling
 2020-06-17 17:56:10 +08:00
LmeSzinc
1e55c25f49 Fix: All BATTLE_STATUS and EXP_INFO of all server 2020-06-16 02:47:28 +08: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
ef0fc01b08 Add: [JP] add jp assets, combat module 2020-06-13 02:50:12 +09:00
kyO The NinjA
ad90d29525 Fix: [EN] Fix Retire assets and AUTOMATION_CONFIRM asset 2020-06-12 00:15:49 -03:00
nEEtdo0d
0e8e25de18 Fixed EN rank D assets, CN so those needs to be updated since I don't play CN I've only inserted dummy files so that button_extract module would run. Also added extra conditions for the exercise loop so that it exits the rank D screens 2020-06-08 17:06:39 -04:00
kyO The NinjA
95ca113562 Add: Map 11-4 support, Columbia farm is real 
Add: Suport to Rank B
 2020-06-08 03:16:00 -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
2fd9651d60 Fix: Mis-detect GET_SHIP when white screen bug happened in game 2020-06-05 04:28:48 +08:00
LmeSzinc
2fa8b4d4fc Fix: Enhance failed turn to retry retire when mood notice popup 2020-06-01 17:26:35 +08:00
kyO The NinjA
6eabcf6a35 Fix: [EN] Relogin is now working 
Optimize: [EN] GUI improved
 2020-05-31 04:48:22 -03:00
kyO The NinjA
916e797b34 New assets 
- New assets
- New parameters for EN event maps
- New tips GUI
 2020-05-28 18:37:17 -03:00
kyO The NinjA
ba9ae67d63 New EN assets and new maps support 
- Added new EN assets
- Added support to maps A1, A2, A3, B1, B2, B3, C1, C2, C3, D1 and D3
 2020-05-27 18:51:05 -03: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
6d6f686e0f Fix: Misuse emergency_repair after retirement 2020-05-26 23:35:51 +08:00
LmeSzinc
41dcdf5ff3 Fix: 修复使用辅助点击时, 退役后报错 2020-05-26 03:14:30 +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
4503793e47 Add: 增加中路站桩时放空袭和鱼雷 2020-05-22 22:33:18 +08:00
LmeSzinc
8ec5099b58 Add: 适配穹顶下的圣咏曲AC图 
- 修复UI导致的动态边缘识别出错
- 修复只识别出一队时的处理逻辑
- 修复处理战斗结束后跳出的剧情
- 修复辅助点击报CampaignEnd
- 修复游戏出现白屏bug时, 连续点击使用紧急维修
- 增加地图全清时, 使用二队打BOSS, 忽略FLEET_BOSS
- 增加被精英抓住的识别, 暂时还用不到
 2020-05-22 21:48:56 +08:00
LmeSzinc
bd8090dff5 Fix: 修复长时间运行时, 游戏内心情值计算bug导致的出错 
- 未开启红脸出击时, 累计消耗100心情后重启游戏
 2020-05-21 12:26:28 +08:00
LmeSzinc
db8c01431e Add: 增加使用紧急维修 2020-05-17 17:11:02 +08:00
LmeSzinc
239590b2de Add: 增加先锋血量权重 
- 修复12-4打大型练级不挑敌人时, 会开局撤退的问题
 2020-05-17 13:36:54 +08:00
LmeSzinc
fa0a243df1 Refactor: 合并处理消息的类 2020-05-15 14:19:34 +08:00
LmeSzinc
39ab5776c8 Fix: 修复先锋未上满时血量平衡出错的问题 2020-05-09 22:51:41 +08:00
LmeSzinc
75254b6599 Fix: 修复血量平衡拖拽无效的问题 
- 修复12-2不打小型的问题
 2020-05-08 23:10:55 +08:00
LmeSzinc
7d77a8f438 Fix: 修复在每日中启用血量平衡报错的问题 2020-05-02 18:48:27 +08:00
LmeSzinc
290e755432 Fix: 修复剧情跳过 
- 增加黑屏带文字剧情的跳过
- 增加战斗开始时的剧情跳过
 2020-05-01 01:02:32 +08:00
LmeSzinc
2244ca3d8d Fix: 修复额外剧情出现时报错的问题 2020-04-29 17:45:35 +08:00
LmeSzinc
ef5885767e Optimize: 战斗中放慢截图速度, 降低CPU使用 2020-04-28 12:53:24 +08:00
LmeSzinc
5284c1a390 Fix: 修复打完BOSS有时会卡住的问题 
- 优化了苍红的回响C2, 大型航空对低耗队杀伤力太大了
 2020-04-27 22:49:30 +08:00
LmeSzinc
fc84f5e610 Fix: 修复开荒 
- 修复低级图出BOSS后报错的问题
- 修复了开荒进度0%时的章节名OCR
- 修复打完BOSS有时会卡住的问题
 2020-04-27 19:32:58 +08:00
LmeSzinc
d43ff8a3f7 Fix: 修复退役后出现行走超时的问题 2020-04-25 23:08:45 +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
a674198365 Add: 适配了第四章 
- 稍微移动了章节OCR的位置, 因为4-4会识别为14-4
- 针对第四章这种偏红的地图做了一些优化
- 稍微延长了敌人刷新时的等待时间
- 更改出错截图文件名为格式化的时间
 2020-04-18 00:19:50 +08:00
LmeSzinc
69b868a79e Fix: 修复一些bug 
- 修复了收完菜后不重新检查潜艇的问题
- 修复了使用潜艇时, 经验结算卡住的问题
- 调整了日常委托和教材类委托的权重, 不然一天下来, 日常委托做不完
 2020-04-16 22:01:52 +08:00
LmeSzinc
b94baf8831 Add: 增加了掉船的截图, 修复丢失截图的问题 
- 调整了战斗模块的函数
- 修改了GUI的文字说明
- 修复有文字窗口时紧急委托截图的问题
 2020-04-15 22:42:24 +08:00
LmeSzinc
70936f4f39 Add: 适配第二章 
- 修复了不开启周回模式时, 会在出击界面开启自动的问题
- 修复了多打一战后, 打完BOSS不判定当前出击结束的问题
- 增加掉落新船时锁定的功能
- 增加了地图不支持周回模式时, 跳过周回检查的功能
  周回模式的选项可以无脑开了
- 修改透视识别报warning为info
  因为低级图地图小降低了检测的阈值, 导致需要纠正错误有点多
- 减少了战斗准备页面的多余点击
- 减少了挂委托时的多余点击
 2020-04-14 17:32:26 +08:00
LmeSzinc
ad73de92dd Refactor: 抽象出处理确认弹窗的逻辑 
- 删除了一些无用的assets
- 纠正了一些拼写错误
 2020-04-13 23:00:19 +08:00
LmeSzinc
5b3dc4ec85 Fix: 修复一些bug 
- 修复了删除空列时, 边缘仍然存在, 导致网格定位出错的问题
- 修复了在边缘外有错误的内部线时, 会把边缘删除的问题
- 调整了一图的边缘识别参数
- 修复了紧急委托过多时, 会触发同一按钮点击过多停止的问题
  委托列表拖动方式从 拖动-点击 改为 拖拽抖动
  独立出random_rectangle_vector函数
  增加random_line_segments函数
- 更改: 索敌时默认使用地图权重
- 修复了收菜获取物品过多时会卡住的问题
- 写死了1-1的相机移动, 防止因为地图太小导致透视识别错误
 2020-04-13 18:49:28 +08:00
LmeSzinc
061077c690 Fix: 修复一些bug 
- 修复了日常结束后不收菜的问题
- 修复登录
- 增加不能使用潜艇的地图的覆盖设置
- 修复了因图片不更新导致二队不会跳过阵容检查的问题
- 修复了一些过场图导致进入战斗判断错误的问题
 2020-04-12 20:28:31 +08:00