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
4,986 Commits 9 Branches 0 Tags 274 MiB
6702ec234a
Commit Graph

376 Commits

Author SHA1 Message Date
nEEtdo0d
f45c16fc4d Upd: public to protected, since are just helper funcs for handle_2x_book_setting 2021-06-24 09:35:43 -04:00
nEEtdo0d
0380e76184 Fix: 2x book can be delayed in appearance onto screen, add timeout ensurance whether present or not 2021-06-22 23:34:27 -04:00
nEEtdo0d
786aa3ee7a Add: [EN, JP, TW] same assets across all servers for new 2x book handling 2021-06-22 22:36:21 -04:00
nEEtdo0d
fb567eefeb Upd: change func signature, minor edits 2021-06-22 22:28:03 -04:00
nEEtdo0d
d43842e025 Fix: incorrect asset reference 2021-06-22 22:12:31 -04:00
nEEtdo0d
8ea03b83e8 Fix: implement using image_color_count instead of Switch class due to inconsistencies in appearance on various campaign UIs 2021-06-22 21:58:49 -04:00
LmeSzinc
3f38f0c7d4 Fix: Add offset argument to all uses of MAP_PREPARATION and FLEET_PREPARATION (#493) 2021-06-20 17:03:35 +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
7a4581a695 Fix: 2x book enable in fleet prep mode, likewise done in auto mode 2021-06-14 13:32:17 -04:00
LmeSzinc
7ba14590a6 Fix: UI changes in fleet preparation 
EN, JP, TW need to update assets except *_IN_USE and check _fleet_sidebar
 2021-06-10 16:07:32 +08:00
nEEtdo0d
770292758b Fix: Remove offset for AUTO_*_BOOK 2021-05-29 17:31:12 -04:00
LmeSzinc
bb33e1d183 Add: Handle maze in map 
- Fix: round_wait when no sirens on map
- Fix: Repeated path end in find_path
 2021-04-23 19:13:37 +08:00
LmeSzinc
1a1519ede5 Fix: Clear mode now unlock after map 100 percent clear 2021-04-17 13:53:13 +08:00
noname94
8c3b433f19 Add: [JP] DAILY_NORMAL_RUN asset 
and minor fixes after font changed
 2021-04-17 11:33:20 +09:00
Zorachristine
48f1047152 Add: [TW] Daily assets 2021-04-17 09:53:19 +08: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
Ray
2474df1397 fix: update [jp] asset USE_DATA_KEY 2021-04-14 18:10:48 +08:00
nEEtdo0d
f1dfc402d2 Opt: Extend handle_2x_book_setting for prep and auto menu 2021-04-09 00:36:24 -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
51c65f062d Fix: Handle moving normal enemies 
- Add option to disable swipe predict
 2021-03-26 17:15:12 +08:00
LmeSzinc
fe2b48dd52 Upd: [CN] War archives entrance assets 2021-03-15 22:36:59 +08:00
LmeSzinc
17f844fe58 Fix: [CN] LOGIN_CONFIRM 
There are 2 fonts may be used in LOGIN_CONFIRM, so change detection from letter LOGIN to color
 2021-03-12 14:40:50 +08:00
LmeSzinc
4b43011632 Del: Assets STORY_CHOOSE_* 2021-03-08 10:57:49 +08:00
LmeSzinc
71b1e6eefd Fix: Redundant story option in EN 
EN has 2 lines of text in one option, may detected as two option
 2021-03-07 15:51:12 +08:00
LmeSzinc
2b6e6807dc Fix: Detection of story options, changes to color detection 
Current detection of options is based on texture.
But some users get screenshots with a little grayish and have different texture, which result in keep clicking SKIP and ignore the options.
 2021-03-03 22:58:25 +08:00
LmeSzinc
cf494bb35c Opt: Decrease timer in ensure_no_story 2021-02-25 17:44:06 +08: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
Zorachristine
766df5ccea Add:[TW] auto_search assets 2021-02-15 12:23:50 +08:00
noname94
f071d10802 Fix: [JP] STORY_CHOOSE_LONG_n assets fixed 
a little bit different in CN and JP server.
 2021-02-15 03:22:55 +09:00
whoamikyo
e72605ba95 Fix: fixed bluestacks hyper-v multi-instance support 2021-02-13 00:53:19 -03:00
noname94
d37041ee6e Add: [JP] assets for guild and OS 
GUILD_BOSS_ENTER and GUILD_OPERATIONS_JOIN still missing.
Also fixed map name detection in OS and _fleet_sidebar of auto search.
 2021-02-10 18:38:20 +09:00
nEEtdo0d
4bc0788398 Fix: [EN] STORY_CHOOSE_LONG and STORY_CHOOSE_LONG_3 diff from 
other servers, updated shape and location of detection
 2021-02-06 11:23:44 -05:00
nEEtdo0d
a028c1ba43 Merge remote-tracking branch 'origin/master' into operation_siren 2021-02-06 02:29:14 -05:00
Ray
b7f4dabe9f update jp auto_search assets 2021-02-06 13:39:20 +08:00
nEEtdo0d
860789078e Add: [EN] OS Ash, Map, and various Assets 
Opt: [JP, TW] Common OS and other assets
 2021-02-06 00:08:52 -05:00
nEEtdo0d
4e9a2a5c61 Add: handle_popup_single, shared asset GET_MISSION is used in other 
UI pages such as guild
 2021-02-05 22:27:05 -05:00
LmeSzinc
ceaa5d2545 Fix: [CN] GET_MISSION 2021-02-04 21:28:19 +08:00
LmeSzinc
f6327b655d Fix: Handle guild popup in login 2021-02-04 00:02:45 +08:00
LmeSzinc
bccd5650d0 Fix: Move STORY_SKIP to avoid clicking on HOME button 2021-02-03 16:59:38 +08:00
nEEtdo0d
5a33291944 Fix: Update handler assets.py, forgot in last PR 2021-01-31 19:50:55 -05:00
nEEtdo0d
fd61568ad0 Add: USE_DATA_KEY_NOTIFIED action to remove pop up in subsequent runs 2021-01-30 11:52:04 -05:00
LmeSzinc
8e84099073 Fix: [EN] Fleet side bar server difference 2021-01-28 12:27:00 +08:00
Kyo
7873c87c9b
Merge pull request #321 from nEEtdo0d/update_asset 
Fix: Daily Ash and Guild Pop Up
 2021-01-27 22:38:18 -03:00
nEEtdo0d
b2f1b21e9b Add: [EN] AUTO_SEARCH_* assets, 
Verified AUTO_SEARCH_SET_* are at the same location as CN for EN,
likely other servers share this same trait
 2021-01-27 18:28:18 -05: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
LmeSzinc
5ac50e6910 Add: Support auto search 2021-01-28 00:35:15 +08:00
nEEtdo0d
b4dd5b2d96 Opt: Daily can also trigger guild pop up, cancel when encountered 
Fix: During campaign, may enter this method too early resulting
in stuck status. Allow method to detect for guild pop up as well
 2021-01-26 14:43:16 -05:00
nEEtdo0d
bb9ebc524e Opt: Match guild pop up handling to predecessor handle_popup_* calls 2021-01-26 13:55:21 -05:00
LmeSzinc
cebb785e14
Merge pull request #318 from noname94/patch1 
Fix: [JP] MAP_STAR_n assets fixed.
 2021-01-24 15:53:45 +08:00
noname94
27b49b736a Fix: [JP] MAP_STAR_n assets fixed 2021-01-24 15:54:08 +09:00
LmeSzinc
8e9e62bb27 Add: Entrance of auto search, but not fully supported yet 
- Add: Option ENABLE_FLEET_REVERSE_IN_HARD
 2021-01-22 23:50:44 +08:00
LmeSzinc
237c871d7d Opt: Add logging STOP_IF_MAP_REACH when parsing map info 2021-01-22 20:50:02 +08:00
nEEtdo0d
55b7e801cb Add: [EN] AUTO_SEARCH_* assets 
Upd: [EN] FAST_FORWARD_* assets

TODO: [JP, TW] Replace placeholder assets based on CN, FAST_FORWARD_*
should be same across servers

TODO: [EN, JP, TW] Guild leaders need additional assets for module guild
 2021-01-21 12:56:00 -05:00
LmeSzinc
453b38f15c Fix: Handle auto search, disable it currently 2021-01-21 19:54:36 +08:00
LmeSzinc
191274c10c Add: Empyreal Tragicomedy A2 AS2 
- Fix: map clear bar in A2
- Fix: Handle mechanics in A2, just able to run, slow
- Opt: perspective parameters
 2021-01-21 17:25:25 +08:00
noname94
e85be55bc1 Add: [JP] GUILD_POPUP_* assets added. 2021-01-20 02:33:07 +09:00
nEEtdo0d
ac6c82a496 Add: MISSION_POPUP_* assets and handling 
TODO: [CN, TW, JP] may need to replace unless POP_UP_* assets are sufficient
EN may be the only server that has altered pop up for these missions
 2021-01-17 22:23:40 -05:00
nEEtdo0d
4e3f275f4c Del: Unused .BUTTON assets for module guild 
TODO: [JP, TW] Replace GUILD_POPUP_*
 2021-01-16 19:23:37 -05:00
nEEtdo0d
918eddb740 Fix: Resolve merge conflict 2021-01-16 09:56:52 -05:00
nEEtdo0d
5c51818c6b Fix: [CN] Correct asset name, adjust code 2021-01-16 09:08:33 -05:00
nEEtdo0d
8dca110761 Add: [EN] GUILD_POPUP_* assets 2021-01-16 08:57:42 -05:00
nEEtdo0d
44442c5876 Add: [EN] GUILD_POPUP_* assets 2021-01-15 11:16:01 -05:00
LmeSzinc
717420aa6a Fix: Handle guild popups 2021-01-15 22:32:06 +08:00
LmeSzinc
58cbc8033c Add: Daily OS ash beacon assist 
- TODO: [EN][JP][TW] Replace assets
 2021-01-15 17:41:39 +08:00
nEEtdo0d
b6e3222927 Opt: [JP, TW] Clean up dev_tool.button_extract output 
Copied placeholder assets from CN to missing servers
 2021-01-01 15:43:59 -05:00
LmeSzinc
c2ab750f0c Del: Complex logic in STOP_IF_MAP_REACH, now it's just how people understand 2020-12-29 23:42:05 +08:00
nEEtdo0d
5453c6b560 Add: Semi-auto operation siren additional assets 
TODO: [CN, JP, TW] Add equivalent GET_MEOWFFICER_ITEMS and MAP_WORLD
STORY_CHOOSE_SHORT_2 does not need to be replaced
 2020-12-27 10:32:42 -05:00
noname94
093c5e8b3e Fix: stuck in retreat confirmation on potato pcs 
and remove duplicate GET_ITEMS_1 in handler assets
 2020-12-27 11:55:52 +09:00
whoamikyo
2a471523f6 Fix: fixed STORY_CHOOSE_LONG_3 2020-12-26 11:37:27 -03:00
Zorachristine
0564665aa9 twassetsfix 2020-12-26 12:44:06 +08:00
LmeSzinc
ddd44d231d Add: STORY_CHOOSE_LONG_3 to choose the first option 2020-12-25 16:38:53 +08:00
LmeSzinc
57822607e1 Add: Semi-auto for operation siren 
- Fix: Clicking on HOME button when skipping story
- TODO: [EN][JP] Replace assets in os_combat and os_handler
 2020-12-23 18:50:51 +08:00
LmeSzinc
12e8ddc87b Fix: ensure_no_unfinished_campaign (#273) 2020-12-23 16:01:12 +08:00
LmeSzinc
b497454edc Opt: Lazy load ambush and enhancement templates 
- Opt: move letter preprocess functions to info_bar.py
 2020-12-16 19:57:57 +08:00
LmeSzinc
7fba5b6cb2 Add: STORY_CHOOSE_LONG_2 2020-11-27 19:45:03 +08:00
LmeSzinc
75c958bb06 Fix: Handle Story with long choosing button 
- Opt: Campaign swipe multiply in SP1
 2020-11-26 18:10:18 +08:00
LmeSzinc
4e9d46fb85 Fix: Handle Game tips 2020-11-26 17:52:24 +08:00
LmeSzinc
4e564cbf71 Fix: UI switching in Vacation Lane 
- Fix: Handle Animation after cleared the 4th enemy
 2020-11-26 17:39:12 +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
3772d5046f Add: Disable mechanism when reach threat save 2020-11-19 17:43:47 +08:00
nEEtdo0d
f22e5e68a8 Merge remote-tracking branch 'origin/master' into war_archives 2020-11-17 00:31:45 -05:00
noname94
849c86cc78 Revert "Fix: info_bar breaks map edge detection" 
This reverts commit 708c6a8658.
 2020-11-17 10:57:30 +09:00
nEEtdo0d
fc384b3e0a Fix: Remove 'EX' maps not available in war archives, update offset for USE_DATA_KEY 2020-11-16 13:54:23 -05:00
nEEtdo0d
7d2547e5be Fix: Re-implemented per PR comments 2020-11-14 17:54:21 -05:00
nEEtdo0d
af9add1e8e Fix: Winter's Crown incorrect siren template names, map_extractor may need dictionary updates 
Fix: Detection of info window pertaining to data key usage from appear to ocr method
 2020-11-14 00:50:56 -05:00
nEEtdo0d
274e56529a Add: War Archives Campaign Run 
TODO: Update images as needed per server, scroll/next page implementation for page_archives, maybe rename and move war archives events back to where others are and prepend with 'war_archives' for those events
 2020-11-07 13:45:30 -05:00
LmeSzinc
589b125ddc
Merge pull request #232 from noname94/patch2 
Opt: Skip dorm collecting when nothing to collect.
 2020-11-02 20:54:20 +08:00
noname94
a78a07e07f Add: [JP] sos assets 
and some other assets fixed.
 2020-11-02 20:13:59 +09:00
whoamikyo
cabbec2932 Fix: fix switch over missclick due emulator slowdown 
- sometimes when enter in stage an emulator slowdown can cause missclick over switch button, increasing delay may fix it.
 2020-11-02 04:59:21 -03:00
LmeSzinc
79547fe0bf Fix: Retry on strategy open and close 2020-10-31 22:49:22 +08:00
LmeSzinc
08e4242229 Add: Handle game tips 2020-10-30 18:08:59 +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
LmeSzinc
1d3fa9ed42 Fix: [CN] LOGIN_CONFIRM 
Login button has changed since the last user agreement update
 2020-10-09 17:03:27 +08:00
LmeSzinc
6f7ff6eb0d Fix: handle_sensitive_image 2020-09-27 03:04:10 +08:00
LmeSzinc
c29b0d719f Opt: Mask.apply on both monochrome and RGB images 
- Opt: Cached mask file in sensitive info hiding
 2020-09-26 03:17:49 +08:00
noname94
708c6a8658 Fix: info_bar breaks map edge detection 2020-09-23 04:10:51 +09:00
noname94
3932ac8e30 Fix: [JP] fix STRATEGY_OPENED asset 2020-09-23 01:47:40 +09:00
LmeSzinc
24e5094680 Opt: Battle logic in HT4 HT5 HT6 T6 
- Add map_is_clear_mode
 2020-09-20 19:15:34 +08:00
LmeSzinc
a9fbeed5a0 Fix: Re-entering map 2020-09-20 00:22:29 +08:00
LmeSzinc
2f3001b2fe Dev: Extract portal info, chapter_template_loop 
- Extract MAP_HAS_MOVABLE_ENEMY, MAP_HAS_AMBUSH
 2020-09-19 17:26:23 +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
noname94
6c0fd9520d Fix: Handle maintenance announcement for all servers 2020-09-03 10:52:33 +09:00
noname94
2dbd8b456e Fix: [JP] Handle maintenance announcement at login 2020-09-03 09:44:03 +09:00
noname94
6cd4541c6f Fix: [JP] assets update 2020-09-02 06:33:25 +09:00
LmeSzinc
9a6a18150a Fix: Stuck timer after script sleep 2020-08-29 17:40:51 +08:00
LmeSzinc
1ed8ce8fde Fix: CN channel server login 2020-08-27 20:52:42 +08:00
LmeSzinc
11be13cd78 Fix: Click MAP_PREPARATION_CANCEL when entering map 2020-08-26 00:01:37 +08:00
LmeSzinc
b66b4d3529 Dev: Siren names translation and config extract in map_extractor 2020-08-20 22:19:35 +08:00
whoamikyo
11c667b576 Update assets.py 2020-08-14 10:41:18 -03:00
LmeSzinc
afcf48f89f Add: 1-1 Affinity farming 2020-08-14 08:05:26 +08:00
whoamikyo
534c8979fe Revert "Merge branch 'master' of https://github.com/whoamikyo/AzurLaneAutoScript" 
This reverts commit d9f73c9ed9, reversing
changes made to 56b140d9e8.
 2020-08-13 15:35:13 -03:00
Kyo
ef96c4bd16
Revert "Opt: added update checker at startup using only batch script " 2020-08-13 14:03:59 -03:00
whoamikyo
c837a97bd0 Opt: added update checker at startup using only batch script 
- added LmeSzinc Dev branch to updater menu
- removed legacy functions
- others minors optimizations
 2020-08-13 13:46:24 -03:00
noname94
515a3e7942 Fix: Fleet lock and Login confirm for JP version. 2020-08-12 12:02:00 +09:00
LmeSzinc
a8c47b51b1 Add: Option map_green_without_3_star to setting if_map_reach 2020-08-11 02:15:33 +08:00
LmeSzinc
eb177e8a10 Fix: Config to disable walk route optimization 2020-08-11 01:37:49 +08:00
LmeSzinc
d648bfde66 Opt: Auto disable if_map_reach if map already reached a specific condition 2020-08-11 00:32:27 +08:00
LmeSzinc
7ee63cc651 Opt: Move Wasteland mode to stop condition if_map_reach 
Opt: Gather map status
 2020-08-11 00:08:29 +08:00
LmeSzinc
2134c4d8d5 Fix: Handle submarine view icon bug 2020-08-10 18:02:10 +08:00
LmeSzinc
414dc0f0b5 Fix: Fleet lock assets 2020-08-10 16:12:40 +08:00
LmeSzinc
9de84f29d7 Fix: Fleet lock detection 2020-08-10 11:56:42 +08:00
Kyo
2a4d4edce7
Merge branch 'nightly' into dev 2020-08-06 03:02:13 -03:00
LmeSzinc
2c7ef03abd Fix: Handle game stuck when login 2020-08-05 16:21:18 +08:00
LmeSzinc
4cc9c0481a Fix: Mis-click HOME when skipping story 
- Fix daily hard when fleet lock disabled
 2020-08-03 16:28:22 +08:00
whoamikyo
5879e7000c Fix: [EN] fix login assets 2020-08-02 07:09:18 -03:00
LmeSzinc
14c3966874 Add: Game stuck handler 
- Add ensure game running when running alas functions
 2020-08-01 17:53:00 +08:00
LmeSzinc
63e8f80c37 Fix: Handle research popup when login 2020-08-01 14:59:46 +08:00
LmeSzinc
ebf382dd4d Merge branch 'master' into dev 2020-07-28 16:01:07 +08:00
LmeSzinc
2badf70d83 Fix: Handle mis-clicking stage after boss cleared 2020-07-28 15:59:54 +08:00
LmeSzinc
69afef4844 Add: [CN] event_20200723_cn B1B2, D1D2 
- Fix U73 template
- Fix story skip popup confirm
- Add GRID_IMAGE_A_MULTIPLY
 2020-07-25 02:41:21 +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
LmeSzinc
30cafe1b0e Opt: Better ambush evade detect area load 2020-07-24 06:40:06 +08:00
whoamikyo
d2f16031e1 Opt: changed the way to get area from TEMPLATE_AMBUSH 2020-07-22 04:48:48 -03:00
whoamikyo
dd41432dd5 Fix: [EN] Fix Map walk out of step 2020-07-22 03:40:56 -03:00
LmeSzinc
0a8a90cdb1 Typo: Docstring in assets.py 2020-07-15 23:33:38 +08:00
LmeSzinc
4ca076dd05 Add: Replace user filepath with "C:\fakepath" in error logs 2020-07-01 11:26:02 +08:00
whoamikyo
689d6c7427 Fix: [EN] Fix LOGIN_RETURN_SIGN 
Button moved to another place to avoid issues.
 2020-06-29 20:50:57 -03:00
Erik
1b785b3eb8
Merge pull request #54 from LmeSzinc/master 
Add: Delete sensitive info in log images
 2020-06-29 15:44:46 -03:00
LmeSzinc
5982e44dd7 Add: Delete sensitive info in log images 2020-06-30 02:42:36 +08:00
whoamikyo
a14a73fba8 Fix: Increase interval to 5 to avoid stucks in potato machines. 2020-06-29 15:11:47 -03:00
whoamikyo
c8bdb7c0c2 Assets: Added Assets for equipment 
- Minor changes in dev_tools.bat
 2020-06-26 19:25:06 -03:00
whoamikyo
b0f0999f73 Updated login asset 2020-06-24 17:17:45 -03:00
LmeSzinc
1150041049 Add: Raid and Raid daily 
- Increase interval of login_confirm
 2020-06-24 17:10:57 +08:00
LmeSzinc
a606ac736b Fix: Mis-disable clearing mode 
- Handle the animation of map information loading instead of hardcoded script sleep
 2020-06-23 17:51:28 +08:00
LmeSzinc
4f8ba8e911 Fix: Stuck when map is just 100% clear 
- Fix timer arrive_confirm
 2020-06-23 03:17:16 +08:00
LmeSzinc
26ce4d896d Fix: Timer for potato pc 
- Timer for retreat
- Timer for equip swipe
- Fix error when already in map
- Better code appearance for B3/D3 in event_20200611_en
 2020-06-19 17:19:03 +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
6f8b449540 Fix: Click low emotion warn as story confirm when fleet lock disabled 2020-06-17 01:37:23 +08:00
LmeSzinc
20567ceba5 Merge remote-tracking branch 'origin/master' 2020-06-16 18:34:26 +08:00
whoamikyo
23aa33ce23 Asset: [EN] Updated MAP_ENEMY_SEARCHING 2020-06-16 06:51:34 -03:00
LmeSzinc
51f39be0ff Fix: [CN] LOGIN_CONFIRM different in different device 
- Improve log appearance of login
 2020-06-16 17:26:34 +08:00
ferina8-14
dea0a02245 Merge remote-tracking branch 'upstream/master' 2020-06-14 02:30:12 +09: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
9657141390 Add: [JP] add jp assets, handler module 2020-06-13 02:51:55 +09:00
LmeSzinc
a623e7d082 Fix: rare bugs 
- Fix roadblocks in 6-4
- Fix mis-detect BATTLE_STATUS_D when battle executing
- Add call details to popup
 2020-06-12 19:29:13 +08:00
kyO The NinjA
f49da62dce Fix: [EN[ Fix INFO_BAR assets 2020-06-11 15:52:15 -03:00
kyO The NinjA
ab18cf38bb Fix: [EN] Fix assets 2020-06-11 15:10:20 -03:00
LmeSzinc
c37fda242c Fix: [EN] POPUP assets now in 1280x720 
- Add assets check to button_extract
 2020-06-12 00:09:58 +08:00
Erik
2b58d4dd6a
Merge pull request #15 from LmeSzinc/master 
Fix: Parameters for 3-4
 2020-06-06 15:53:44 -03:00
kyO The NinjA
6d5ac959d4 Add: [EN] Ambush assets updated 2020-06-06 15:44:58 -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
f9c37ea7e4 Fix: Disable submarine_view check because of icon bug of submarine zone 2020-06-06 15:43:38 +08:00
kyO The NinjA
524570d12c Fix: [EN] update assets.py 2020-06-03 14:27:09 -03:00
LmeSzinc
4094ab1f00 Fix: [CN] Login confirm 2020-06-03 15:21:20 +08:00
LmeSzinc
30e11c6caf Fix: Re-check all timeout timer 
- Fix tactical class get stuck when skill level reach to max.
 2020-06-03 05:06:51 +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
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
Erik
1a369a68b7
Merge pull request #4 from LmeSzinc/master 
Fix: using old api in Screen size check
 2020-05-29 14:06:09 -03:00
LmeSzinc
c01a075554 Fix: Timeout adjustment 
- increase walk_timeout
- increase in_stage_timer
 2020-05-29 17:29:46 +08:00
kyO The NinjA
2154edefb1 Update assets.py 2020-05-28 22:20:19 -03:00
kyO The NinjA
5f55303421 FIx 3 Star Asset 2020-05-27 21:56:32 -03:00
kyO The NinjA
a3f0c0304e Fix assets for SHIP morale 2020-05-27 19:56:35 -03:00
kyO The NinjA
0645d5cb3f Added new EN assets and new maps support 
- Added suport to 10-1 and 10-2
- Added suport to EN event Iris of Light and Dark Rerun, only D2 at the moment
- New EN assets
 2020-05-27 13:49:26 -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
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
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
75dab4db70 Fix: 修复长时间运行时, 游戏内心情值计算bug导致的出错 
- 未开启红脸出击时, 会每隔2小时重启游戏
 2020-05-20 17:58:28 +08:00
LmeSzinc
9c77cdd058 Fix: 修复长时间运行时, 游戏内心情值计算bug导致的出错 
- 未开启红脸出击时, 会每隔两个半小时重启游戏
 2020-05-19 22:58:25 +08:00
LmeSzinc
fa0a243df1 Refactor: 合并处理消息的类 2020-05-15 14:19:34 +08:00
LmeSzinc
65de042dd3 Add: 增加挂机收菜模式 2020-05-06 23:53:25 +08:00
LmeSzinc
fc7e16835f Fix: 纠正拼写错误 2020-05-05 02:54:23 +08:00
LmeSzinc
290e755432 Fix: 修复剧情跳过 
- 增加黑屏带文字剧情的跳过
- 增加战斗开始时的剧情跳过
 2020-05-01 01:02:32 +08:00
LmeSzinc
2c10f77e4d Fix: 调整了回出击界面时的判定, 修改了一些地图格子权重 2020-04-30 17:11:47 +08:00
LmeSzinc
2244ca3d8d Fix: 修复额外剧情出现时报错的问题 2020-04-29 17:45:35 +08:00
LmeSzinc
088aca3c95 Fix: 修复登录, 增加章节名OCR纠错 2020-04-28 22:51:32 +08:00
LmeSzinc
61aa7d8340 Fix: 修复截图速度过慢时出现的问题 
当使用像以下结构的代码时, 需要增加触发计数
否则当截图耗时大于计时器触发时间时, 会触发错误的结果
if self.appear(MAIN_CHECK):
    if confirm_timer.reached():
        pass
    else:
        confirm_timer.reset()
 2020-04-28 14:37:13 +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
6b56215d71 Fix: 修复地图特效导致的章节名识别错误和进图等待 
- 章节名识别错误时有20次重试的机会
- 进图时不再使用章节图标识别
- 更改了exception文件的位置
 2020-04-25 17:10:22 +08:00
LmeSzinc
f5ee202934 Optimize: 优化复刻苍红的回响C2和D3 
- 修改了绿海时的地图设置覆盖
 2020-04-25 16:43:41 +08:00
LmeSzinc
4e58edadbd Fix: 修复登录 2020-04-25 00:11:44 +08:00
LmeSzinc
604cdf4005 Fix: 修复 
- 优化章节名OCR, 防止地图特效影响识别
- 修复等待精英移动
- 修复回到出击界面
 2020-04-24 17:57:40 +08:00