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,294 Commits 9 Branches 0 Tags 274 MiB
5e027ec923
Commit Graph

501 Commits

Author SHA1 Message Date
nEEtdo0d
f04a35b078 Upd: [EN] LOGIN_GAME_UPDATE, BATTLE_STATUS; text size/thickness changed 
Fix: [EN] restore commit df6e9385; skill exp detection read incorrectly
 2022-04-15 14:35:31 -04:00
Egor Nats
6eac8ae259 Opt: Imports isorted 2022-04-14 16:37:54 -03:00
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
LmeSzinc
987b7b7b4e Fix: Handle game freeze at the first retreat after client start 2022-04-12 18:17:48 +08:00
SaarChaffee
303dd90fdc change CRLF to LF 2022-04-09 23:31:09 +08:00
LmeSzinc
1e6d3ba2d9 Fix: Stuck on map withdraw because cache is not cleared 2022-04-09 16:56:43 +08:00
nEEtdo0d
7779bc7672 Upd: [EN] remaining post major update assets 
Upd: [EN] adopt same style as other servers for MAIN_GOTO*

TODO: other uncommon assets updated when available; debug tactical class, stuck frequently
 2022-04-08 19:09:08 -04:00
nEEtdo0d
1cc28f524f Upd: [EN] post major app update bulk assets; WIP part 3 2022-04-08 01:28:25 -04:00
nEEtdo0d
96b39a9ea5 Upd: [EN] post major app update bulk assets; WIP part 1 2022-04-07 22:32:24 -04:00
LmeSzinc
8d25e709c3 Fix: Handle battle pass notice 2022-03-31 21:32:34 +08:00
LmeSzinc
af3e402c49 Fix: Handle monthly pass notice 2022-03-31 21:32:17 +08:00
LmeSzinc
55c8c9da3f Fix: Cannot set submarine role when auto search is not available 2022-03-16 02:10:16 +08:00
Horizon101011
2f5b19949e Opt: Refactor module enhancement 2022-03-12 01:22:31 +08:00
LmeSzinc
14fc2cab5d Opt: Enemy selection in Counterattack Within the Fjord 
And handle the stories in it
 2022-03-10 14:40:50 +08:00
LmeSzinc
1ad23dbe90 Fix: Watch device orientate when starting app 
- Opt: Skip screen size check at the first screenshot when game is not started
 2022-03-06 19:18:35 +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
Horizon101011
6ba0a755db Opt: Refactoring logic of ship enhancement 
Using a new judgement logic similar to the state machine. Judge the state according to the appearance and disappearance of enhancement material after some operations, instead of only depending on info_bar. The new logic is more robust, even in poor equipment (simulating by delaying 5s)
 2022-02-23 00:06:11 +08:00
LmeSzinc
839fb18661 Fix: MapDetectionError raised in submarine move (#937) 2022-02-17 21:36:27 +08:00
nEEtdo0d
9e5d42a85b Add: [EN] submarine handler assets 2022-02-15 19:41:01 -05: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
893dc62afb Opt: [CN] Handle user agreement in pure image detection 
- Add image_color_button()
- Remove unused assets in login
 2022-02-02 19:44:58 +08:00
LmeSzinc
e92579b5f9 Opt: Remove redundant converts from pillow to numpy 2022-01-24 23:43:53 +08:00
LmeSzinc
b37114d505 Opt: Release cached assets 2022-01-24 23:15:47 +08:00
LmeSzinc
65f166ad12 Refactor: Use numpy image cache instead of pillow image 2022-01-23 23:03:55 +08:00
LmeSzinc
8374174d55 Refactor: module/device, separate all screenshot method and control methods 
- Better screenshot and control retries, handle common exceptions
 2022-01-22 17:42:47 +08:00
LmeSzinc
0caf4ba990 Fix: Handle popup to use 2x book (#880) 2022-01-18 22:06:38 +08:00
Ray
50ca1adf78 Upd: [JP] SUBMARINE_MOVE_* assets 2022-01-16 15:19:02 +08:00
LmeSzinc
50b5b49365 Opt: Faster Switch.set(), replace click-wait with click interval 2022-01-10 20:35:07 +08:00
LmeSzinc
84f5e86077 Fix: Hunt zone view re-enabled by game 
- Fix: Validate switch status
 2022-01-10 01:27:03 +08:00
LmeSzinc
1b5ecb21ac Opt: A revert of "Fix: Handle submarine view icon bug" 
Finally, that bug was fixed by game devs after 17 months.
 2022-01-09 23:10:09 +08:00
LmeSzinc
487d4ed9e8 Fix: Force to disable auto submarine call if only calling submarine at boss 2022-01-09 21:06:46 +08:00
LmeSzinc
63b6e07a45 Merge branch 'master' into dev 2022-01-09 19:26:49 +08:00
LmeSzinc
c5a04c55dc Add: Submarine move in map (#864) 2022-01-09 19:26:49 +08:00
MrGuoRanDuo
24b67f402e Fix: [CN]Bilibili: extend outside image 2022-01-09 15:32:38 +08:00
MrGuoRanDuo
0c4850bb9e Fix: [CN]Bilibili: user agreement and login btn 2022-01-03 01:40:35 +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
hephooey
bfff82c778 Update LOGIN_GAME_UPDATE assets for tw servers 2021-12-15 23:57:08 -05:00
LmeSzinc
ae41f8fd0e Merge branch 'dev' 2021-12-09 23:33:48 +08:00
LmeSzinc
6e0bded8c4 Add: OpSi fleet filter 
- Fix: Showing disabled tasks in scheduler
- Fix: Fleet lock not detected in OpSi
- Fix: Filter presets are case sensitive
- Opt: Increase confirm timer in question_goto()
 2021-12-08 21:47:09 +08:00
LmeSzinc
d5735604e1 Dev: Uniform comments of generated files 2021-12-07 23:29:33 +08:00
LmeSzinc
caf51858e9 Add: Attack abyssal boss 2021-12-06 20:56:57 +08:00
Zorachristine
7cb6bf9e33 Fix: [TW] BOOK_BOX_AUTO & BOOK_CHECK_AUTO assets 2021-12-06 20:21:54 +08:00
LmeSzinc
c76313e02d Opt: Force to disable auto search if StopCondition.MapAchievement is not 'non_stop' 2021-11-30 18:27:49 +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
Cola
82f354da03 Fix: [TW] Submarine&Fleet assets 2021-11-25 13:31:47 +08:00
LmeSzinc
790515c800 Fix: Delay the wrong task after restart (#755) 2021-11-22 22:40:11 +08:00
LmeSzinc
153c9fb491 Revert "Fix: fix switch over missclick due emulator slowdown" 
This reverts commit cabbec29
 2021-11-22 17:44:46 +08:00
nEEtdo0d
3ff20265cb Fix: can enter early; add clause into handle_in_map_with_enemy_searching 2021-11-19 18:47:54 -05:00
LmeSzinc
e984859ad6 Add: Goto main page when task queue is empty 
- Refactor: Task waiting
- Fix: Saving config twice in nested multiset wrapper
 2021-11-14 01:10:36 +08:00
nEEtdo0d
f7035922fc Fix: [EN] IN_MAP not detected 2021-11-11 19:09:10 -05:00
LmeSzinc
1a1eceec41 Fix: Trying to select submarine auto search mode when not using submarines 
- Del: Remove Submarine_AutoSearchMode in stages without auto search
 2021-11-11 21:19:57 +08:00
nEEtdo0d
c902549ad0 Fix: [EN] Use asset button gif support for POPUP_CONFIRM and POPUP_CANCEL 
TODO: [JP] can make gif equivalents for same assets and adjust retirement to use handle_popup_confirm
 2021-11-10 19:42:56 -05:00
LmeSzinc
963437acb4 Opt: Use absolute ADB path 
- AzurLaneUncensored failed to push when using relative path
 2021-11-09 22:17:20 +08:00
Cola
dfa619ae45 Fix: [JP] USE_DATA_KEY_NOTIFIED asset 2021-11-07 19:59:49 +08:00
LmeSzinc
5b05a24cab Fix: Sleep length must be non-negative error after DST 2021-11-07 17:47:52 +08:00
Ray
d255c116f2 Upd: [JP] AUTO_SEARCH_SET_SUB assets 2021-11-07 15:47:23 +08:00
nEEtdo0d
1914f0af58 Upd: [EN] AUTO_SEARCH_SET_SUB assets 2021-11-06 11:01:32 -04:00
LmeSzinc
b554a39351 Refactor: Fleet switching and fleet reverse 
- Revert swipe limit of ensure_edge_insight
 2021-11-06 22:25:14 +08:00
lonelyzerg
e047031887 Change sub_auto_summon to sub_auto_call, add en and tw translation 2021-11-06 08:54:06 -05:00
lonelyzerg
dea996596d Add translation for subs, modified logging for auto search selction 2021-11-06 06:56:31 -05:00
lonelyzerg
5b444b73a6 Add Submarine Auto Search Selection 2021-11-06 06:35:13 -05:00
LmeSzinc
3098aa31aa Fix: Stop scheduler if a task failed 3 or more times 
- Add: Clear click record
- Opt: Check the type of user setting and display invalid settings
 2021-11-03 20:46:34 +08:00
LmeSzinc
3249190d61 Opt: Longer wait on stage bonus drops, still a poor implementation 2021-10-25 17:49:49 +08:00
LmeSzinc
31cd872145 Fix: Flares counted as mystery in W14 
- Refactor: Separate handle_mystery
 2021-10-22 02:11:07 +08:00
LmeSzinc
150eda12c7 Fix: Negative sleep length 2021-10-19 21:19:13 +08:00
LmeSzinc
6bf5f9fa92 Add: TaskHoardingDuration and CloseGameDuringWait (#643) 2021-10-18 21:36:22 +08:00
LmeSzinc
4143f26145 Add: Stage Increase for exploring stages one by one (#192) 2021-10-16 19:10:45 +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
Ray
2b074cd213 Fix: [JP] VOTE_CANCEL & SHOP_SELECT_PR1 assets 2021-10-15 09:39:57 +08:00
LmeSzinc
b01e042c04 Merge branch 'master' into app 2021-10-15 02:48:16 +08:00
LmeSzinc
53482ab6d4 Upd: [EN][JP] Auto search assets 2021-10-15 02:43:06 +08:00
nEEtdo0d
4cb52b66a7 Merge branch 'master' into app 
# Updates EN VOTE_CANCEL
# Mitigates multi-click for submit-gacha in case of slow transition
 2021-10-14 11:41:21 -04:00
nEEtdo0d
cc193f96b7 Upd: validate and re-try mechanism for notified check box 2021-10-14 11:32:33 -04:00
nEEtdo0d
bc8536f492 Fix: [EN] VOTE_CANCEL asset 2021-10-14 11:23:32 -04:00
LmeSzinc
6a4064e57f Merge branch 'master' into app 
# Conflicts:
#	module/config/event.py
 2021-10-14 22:07:50 +08:00
LmeSzinc
9b2543f4a7 Upd: [TW] Auto search settings assets 2021-10-14 22:04:34 +08:00
LmeSzinc
21c25ebf3e Fix: Retry selecting auto search options if it's not loaded that fast 2021-10-14 21:56:57 +08:00
LmeSzinc
15d1aae6b3 Opt: Wait campaign bonus show up 2021-10-14 20:48:35 +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
nEEtdo0d
2fdb7447a3 Fix: same appear clause for both areas 2021-10-11 00:00:10 -04:00
nEEtdo0d
d9cec4134e Add: war archives support for app 2021-10-10 23:38:10 -04:00
LmeSzinc
672f5b4608 Fix: Daily app restart 2021-09-25 00:51:51 +08:00
LmeSzinc
b2ea5f897f Fix: Auto search option handling after retire 2021-09-18 18:45:35 +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
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
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
nEEtdo0d
98c19e792b Add: [EN] handle_popup_confirm new clause, handles OS order confirmations 2021-08-22 13:13:32 -04:00
LmeSzinc
a0a9de5ecf Merge branch 'master' into dev 2021-07-24 20:45:50 +08:00
LmeSzinc
4f9458261d Upd: [CN] BOOK_CHECK_PREP (#538) 2021-07-24 18:22:04 +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
Cola
6d30da59f6 Fix: [TW] Dorm_Feed_Cancel&Ambush asset 2021-07-21 11:07:33 +08:00
LmeSzinc
c459a014db Merge branch 'master' into gems_farming 2021-07-18 20:16:44 +08:00
LmeSzinc
ddb67208a7 Fix: [CN] User Agreement detection 
Its font size was changing frequently
 2021-07-16 21:35:11 +08:00
LmeSzinc
17ce119d42 Fix: Handle return account info 
Return accounts will get a message from Akashi, said shikikan has leave xxx days, balabala.
 2021-07-11 21:41:05 +08:00
LmeSzinc
5931c01a49 Merge branch 'master' into gems_farming 2021-07-10 15:47:33 +08:00
LmeSzinc
f1d8f4fba3 Fix: Handle button moving in auto search menu 2021-07-10 11:38:27 +08:00
LmeSzinc
1bb93d3d1c Upd: Button extract 2021-07-10 10:56:11 +08:00
LmeSzinc
3b0b3a491b
Merge branch 'master' into master 2021-07-10 10:54:58 +08:00
James
5d2a1fab05 fix: fix english handler autosearch assets 2021-07-09 19:10:28 -04:00
Cola
81fe29efab Update 2021-07-09 22:41:50 +08:00
Ray
584c1f99a3 Upd: [JP] some BOOK_* and AUTO_SEARCH_* assets 2021-07-09 21:24:16 +08:00
LmeSzinc
292c5d12be Merge branch 'master' into gems_farming 2021-07-09 14:53:14 +08:00
nEEtdo0d
a625f0b1ec Fix: after game update, 2x book auto and auto search related assets out dated 2021-07-08 20:24:16 -04:00
LmeSzinc
082b738a17 Merge branch 'master' into gems_farming 2021-07-08 23:02:37 +08:00
LmeSzinc
b8cc7c02d1 Upd: [CN] Auto search assets and 2x book assets for auto search 2021-07-08 22:00:15 +08:00
nEEtdo0d
669df84f3b Fix: reverse clicked_threshold, correct return value on no detection 2021-07-03 16:45:16 -04:00
LmeSzinc
a3d26f17a2 Merge branch 'master' into gems_farming 2021-07-03 22:08:39 +08:00
LmeSzinc
7ce057ce8c Fix: Handle if map do not have 2x book setting 2021-07-03 21:59:31 +08:00
LmeSzinc
08325029f1 Merge branch 'master' into gems_farming 2021-07-03 17:00:17 +08:00
LmeSzinc
86d6948551 Opt: Faster detection when 2X book option is not loaded immediately 2021-07-03 16:59:25 +08:00
LmeSzinc
e6facc606a Opt: Cache ButtonGrid.buttons and add move() crop() 2021-06-29 23:04:19 +08:00
nEEtdo0d
8c0be41d7a Fix: interval_reset AUTO_SEARCH_MENU_CONTINUE to account for delay made by handle_2x_book_setting 2021-06-29 08:09:30 -04:00
LmeSzinc
6bd8f7d1de Fix: [CN] Handle User Agreement and Privacy Policy (#446) 2021-06-29 14:42:47 +08:00
LmeSzinc
6607fe6472 Upd: [CN] BOOK_BOX_* assets 2021-06-27 22:03:42 +08:00
nEEtdo0d
1458aadbbf Opt: code style alterations 2021-06-26 11:06:19 -04:00
nEEtdo0d
3a7d4052df Fix: Re-work to combine effort between both previous funcs 2021-06-24 21:00:00 -04:00
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