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

2443 Commits

Author SHA1 Message Date
LmeSzinc
f2dadfc9b2 Add: [TW] Iris of Light and Dark rerun 2021-10-28 19:56:09 +08:00
LmeSzinc
eb9c1844f8 Upd: Convert siren templates in Skybound Oratorio to gif
- In order to match mirrored enemies
2021-10-28 18:44:47 +08:00
LmeSzinc
7b66923d51 Opt: Skybound Oratorio Rerun (event_20211028_cn)
- Add: fleet1_boss_fleet2_mob, fleet1_standby_fleet2_all for event hard
- Dev: ENEMY_FILTER in map_extractor.py
2021-10-28 17:52:46 +08:00
18870
dd4d818baf Upd: [CN] Skybound Oratorio Rerun 2021-10-28 16:42:55 +08:00
LmeSzinc
faa0621528 Fix: Path changing in AzurLaneUncensored tool 2021-10-28 14:25:44 +08:00
LmeSzinc
0742c966f0
Merge pull request #681 from julystone/app
ADD:os_meowfficer_farming add specificSea Explore
2021-10-28 14:08:43 +08:00
julystone
24c163c412
Merge branch 'LmeSzinc:app' into app 2021-10-28 11:13:45 +08:00
julystone
90192ebe0c ADD:os_meowfficer_farming add specificSea Explore 2021-10-28 11:07:52 +08:00
LmeSzinc
9ec466a216 Fix: WarArchive.Campaign.Event has an initial value of campaign_main 2021-10-28 02:27:07 +08:00
LmeSzinc
d4d0455e06
Merge pull request #682 from SaigyoujiYukon/app
Add: Using uiautomator2 to supply food in dorm.
2021-10-28 02:17:02 +08:00
SaigyoujiYukon
4a2d7381f6 Fix: ADB users also want to one key feed their waifu. 2021-10-28 02:14:41 +08:00
LmeSzinc
a965e24ae6 Fix: Typo in AzurLaneUncensored 2021-10-28 02:04:40 +08:00
SaigyoujiYukon
af0d2b2858 Add: Using uiautomator2 to supply food in dorm. 2021-10-27 22:22:06 +08:00
SaigyoujiYukon
b9ad017600 Add: Using uiautomator2 to supply food in dorm. 2021-10-27 21:04:31 +08:00
LmeSzinc
4b7733c68e Fix: Campaign name is case sensitive 2021-10-27 17:33:30 +08:00
julystone
0180cf2e57
Merge branch 'LmeSzinc:app' into app 2021-10-27 09:13:33 +08:00
julystone
1d66156c13 ADD:os_meowfficer_farming add specificSea Explore 2021-10-27 09:10:06 +08:00
julystone
d40232b41a Add:meowOffice add targetZone explore 2021-10-27 00:41:46 +08:00
julystone
a2edb3c133 Add:meowOffice add targetZone explore 2021-10-27 00:09:16 +08:00
LmeSzinc
649aa491c9 Add: [CN] AzurLaneUncensored support 2021-10-26 23:09:21 +08:00
julystone
fff3f59caf ADD:os_meowfficer_farming add specificSea Explore 2021-10-26 17:46:04 +08:00
LmeSzinc
366774db57 Opt: Recommend best method in benchmark 2021-10-26 17:44:11 +08:00
LmeSzinc
dd7b389797 Add: Semi-auto, Opsi semi-auto and benchmark
- Add: dependency prettytable
- Fix: Running an Alas module directly
- Del: Remove all assets in daemon module, because it's redundant
2021-10-25 18:49:56 +08:00
LmeSzinc
3249190d61 Opt: Longer wait on stage bonus drops, still a poor implementation 2021-10-25 17:49:49 +08:00
LmeSzinc
10fc4a7ba8 Upd: Default research and commission filter
- Allow both hakuryu and hakuryuu in research
2021-10-25 17:48:01 +08:00
LmeSzinc
41325a4258 Fix: Failed to detect dropping a new ship 2021-10-25 17:46:10 +08:00
18870
721aa9e333 Opt: Improve code
- Delete unnecessary import
- Rename Alas to AlasManager
- Move global var/function into class var/method
- Resolve some IDE warning
2021-10-24 20:54:06 +08:00
18870
25777093c3 Add: Able to create new config in GUI 2021-10-24 16:54:07 +08:00
LmeSzinc
2122852ba5 Opt: Help text for BlueStacks Hyper-V auto connection
- Refactor: find_bluestacks_hyperv()
2021-10-24 12:30:51 +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
FishMagic
a827a0ce2e
Read Bluestacks4 Hyper-V Beta Realtime ADB port 2021-10-24 11:24:45 +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
Ray
7f376c23cf Fix: remove resize in get_research_series_jp 2021-10-23 23:18:53 +08:00
LmeSzinc
ab3fdd0ca7 Opt: Detailed serial and package name help 2021-10-23 22:38:21 +08:00
LmeSzinc
5c034edef9 Add: Auto installer 2021-10-23 21:28:07 +08:00
18870
ea4df56b1b Opt: Filelock config when stop scheduler 2021-10-23 20:32:19 +08:00
LmeSzinc
44be2b05ba Fix: Fleet switching in 7-2 mystery farming 2021-10-23 17:38:06 +08:00
LmeSzinc
a964f4e068 Merge branch 'master' into app 2021-10-23 14:53:06 +08:00
vlziw9y8
55b9cc59e7
Fix invalid warning when do first adb connect 2021-10-23 14:09:13 +08:00
LmeSzinc
5b1928697b Del: Unnecessary settings 2021-10-23 10:31:27 +08:00
18870
36e22699a3 Opt: Split AlasGUI
- Add: TaskHandler for gui, use for running background functions in one thread
- Opt: Reduce numbers of process and thread
- Opt: Type hinting
2021-10-23 00:34:57 +08:00
LmeSzinc
97bd059d00 Fix: Missing ASH_START in ash beacon assist
Forgot to delete in "Move ASH_START clicking to ash combat preparation"
2021-10-23 00:05:10 +08:00
LmeSzinc
f2791c3abb Fix: Calls commission if task disabled 2021-10-22 21:18:18 +08:00
Zorachristine
3b8083ec0c Fix: [TW] MAIN_GOTO_RAID.BUTTON asset reset 2021-10-22 18:34:40 +08:00
LmeSzinc
1caf9fbb20
Merge pull request #671 from ddmugicha/app
Fix: [JP] Typo in get_research_cost_jp
2021-10-22 17:56:38 +08:00
Cola
b9adfd0354 Fix: [JP] Typo in get_research_cost_jp 2021-10-22 17:48:00 +08:00
LmeSzinc
3a489339a4 Fix: Some detection changes for W14
- Expose MAP_SWIPE_PREDICT_WITH_CURRENT_FLEET and MAP_SWIPE_PREDICT_WITH_SEA_GRIDS, due to errors in sea grids predictions
- Expose MAP_WALK_OPTIMIZE, disabled in W14, because of large map size
- Not allow enemy_scale overwrites, but allow 3 overwrites 2. 3 triangle enemies may be detected as 2 if being covered
- Reduce TEMPLATE_ENEMY_L similarity, the same reason as above
2021-10-22 17:40:47 +08:00
LmeSzinc
2794505bc5 Merge branch 'master' into app 2021-10-22 02:46:06 +08:00
LmeSzinc
eea937845d Upd: SHOP_SELECT_PR1 copied to all servers 2021-10-22 02:45:21 +08:00
LmeSzinc
31cd872145 Fix: Flares counted as mystery in W14
- Refactor: Separate handle_mystery
2021-10-22 02:11:07 +08:00
LmeSzinc
a56d204ee1 Merge branch 'master' into app 2021-10-22 01:14:39 +08:00
LmeSzinc
ae6f9ce644 Fix: Missing import for handle_map_cat_attack in OS 2021-10-22 01:14:00 +08:00
LmeSzinc
fa8d29059b Opt: W14 mechanism
- Split map_init()
- Add MAP_WALK_USE_CURRENT_FLEET
2021-10-22 01:08:38 +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
93e2053b59 Merge'master' into app
# Migrate override of handle_map_cat_attack for OpSi
# Migrate fix for _shipyard_buy_confirm
2021-10-21 09:00:43 -04:00
nEEtdo0d
edc01508c4 Fix: _shipyard_buy_confirm may fail to detect either of the normal exit routines, fallback to using ocr and ensure if 0 can also exit as well 2021-10-21 08:57:25 -04:00
nEEtdo0d
97e5d44e9a Fix: Override handle_map_cat_attack for OpSi, as may unintentionally click obscure exit 2021-10-21 08:45:48 -04:00
nEEtdo0d
b55d5598f4 Upd: [EN] config translate and help info 2021-10-21 01:19:45 -04:00
18870
80b9ab73a7 Opt: Rework overview
- Opt: Optimize for mobile
2021-10-21 01:21:05 +08:00
LmeSzinc
3b8e34894a Fix: Minor config changes for dev tools 2021-10-20 00:08:19 +08:00
LmeSzinc
150eda12c7 Fix: Negative sleep length 2021-10-19 21:19:13 +08:00
LmeSzinc
9d40b1ec97 Opt: Separate task calculation and scheduling 2021-10-19 19:50:51 +08:00
LmeSzinc
02864110a6 Upd: [CN] translation 2021-10-19 19:50:51 +08:00
LmeSzinc
deddf3d404 Fix: Accessibility check in enemy filter
- Opt: Swipe multiply factor in W12
2021-10-19 19:50:51 +08:00
Ray
563720fb16 Merge branch 'master' into app 2021-10-19 15:00:36 +08:00
Ray
b53f271179 Fix: [JP] update map/ FLEET_* & SUBMARINE_* assets 2021-10-19 14:40:22 +08:00
LmeSzinc
b1858e5ccb Merge branch 'master' into app 2021-10-18 22:03:14 +08:00
LmeSzinc
d8730025d0 Add: Enemy filter and preserving, opted for W13 2021-10-18 22:00:05 +08:00
LmeSzinc
1835f7493e Fix: fleet1_all_fleet2_standby compatibles with self.fleet_2 calls from old map files 2021-10-18 21:48:55 +08:00
LmeSzinc
4710a00028 Fix: Typo about SUBMARINE override compatibility (#663) 2021-10-18 21:38:43 +08:00
LmeSzinc
6bf5f9fa92 Add: TaskHoardingDuration and CloseGameDuringWait (#643) 2021-10-18 21:36:22 +08:00
LmeSzinc
b1a9157a24 Fix: To have at least one alas instance 2021-10-18 14:01:18 +08:00
LmeSzinc
7aea818c8b Opt: Move ASH_START clicking to ash combat preparation
which is capable to handle unexpected page switching
2021-10-18 01:27:24 +08:00
Ray
0a13719c7a Fix: pass key to shop_items_loading_finished 2021-10-17 22:19:31 +08:00
Ray
bb49d99cee Fix: handle shop items loading not finished 2021-10-17 21:35:35 +08:00
LmeSzinc
aa54055867
Merge pull request #656 from railzy/master
Fix: handle GET_ITMES popup when goto page_os
2021-10-17 14:37:15 +08:00
nEEtdo0d
fda464143a Merge remote-tracking branch 'origin/master' into app 2021-10-16 22:43:22 -04:00
nEEtdo0d
525b108fc9 Fix: _dorm_receive add clause to ensure DORM_CHECK in view before attempt 2021-10-16 22:42:58 -04:00
Ray
3bd2dfea85 Fix: handle GET_ITMES popup when goto page_os 2021-10-17 09:37:50 +08:00
nEEtdo0d
4f09c65868 Merge remote-tracking branch 'origin/master' into app
# [EN] equipment assets update
# sync _dorm_receive update across branches
2021-10-16 20:00:35 -04:00
nEEtdo0d
c31366cb73 Fix: _dorm_receive handle stacked popups, may occur if ui_ensure did not handle 2021-10-16 19:57:17 -04:00
nEEtdo0d
7a89e26f87 Upd: [EN] equipment assets 2021-10-16 19:26:05 -04:00
nEEtdo0d
dd6be5c1e1
Merge pull request #653 from nEEtdo0d/app_data_key
Add: Reward task DataKey
2021-10-16 16:15:13 -04:00
nEEtdo0d
ce5ff0298e Fix: _dorm_receive handle stacked popups, may occur if ui_ensure did not handle 2021-10-16 15:58:18 -04:00
nEEtdo0d
13385dc8c7 Upd: [EN] translate menu 2021-10-16 11:17:11 -04:00
nEEtdo0d
a473bbebbc Upd: server/language JSON files via config_updater 2021-10-16 09:05:54 -04:00
nEEtdo0d
3a89c62af2 Mov: data_key into own folder same as other reward tasks 2021-10-16 09:05:07 -04:00
nEEtdo0d
ad12992712 Merge branch 'app' of https://github.com/LmeSzinc/AzurLaneAutoScript into app_data_key 2021-10-16 08:49:37 -04:00
LmeSzinc
4143f26145 Add: Stage Increase for exploring stages one by one (#192) 2021-10-16 19:10:45 +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
0cc598aeb0 Opt: Reads existing json files in multi-instances 2021-10-16 16:52:35 +08:00
LmeSzinc
2ec4f0a217 Opt: Separate logs, all instances save to their own file 2021-10-16 12:59:29 +08:00
LmeSzinc
1481a9b582 Fix: Compatible with FLEET_2, SUBMARINE set
- Add Story handler to ui_additional
2021-10-16 11:46:32 +08:00
nEEtdo0d
ee7456023e Add: new Reward task DataKey 2021-10-15 18:29:28 -04:00
nEEtdo0d
616b66564e Merge branch 'master' into app
# Migrate handle vote popup check from app to master as common code
# [TW] MAIN_GOTO_RAID asset
2021-10-15 16:27:39 -04:00
nEEtdo0d
8472643221 Fix: handle vote popup, may enter into this while state prematurely 2021-10-15 16:21:57 -04:00
Zorachristine
5ea1fa372c Fix: [TW] MAIN_GOTO_RAID.BUTTON asset for now 2021-10-15 22:56:01 +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
LmeSzinc
5c22b1555e Fix: Timezone awareness in merit guild medal shops (#646) 2021-10-15 20:57:06 +08:00
LmeSzinc
ef286fed2b
Merge pull request #647 from ddmugicha/master
Fix: [JP] Automation_Confirm & War_Archives/Template_* asset
2021-10-15 20:42:31 +08:00
Zorachristine
f3f815df1e Upd:[TW] Raid_SURUGA assets 2021-10-15 18:59:27 +08:00
Cola
64e69d4bbd Fix: [JP] Automation_Confirm & War_Archives/Template_* asset 2021-10-14 22:57:56 -11: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
LmeSzinc
b7555bb9a4 Opt: Repair fleet at OS init 2021-10-15 02:32:14 +08:00
LmeSzinc
98cb8b1b8d Fix: Disable task if reached stop condition 2021-10-15 01:00:42 +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
674722609c Fix: Slow transitions can result in multi-clicks, inadvertently use drill due to same position as checked asset 2021-10-14 11:28:59 -04:00
nEEtdo0d
bc8536f492 Fix: [EN] VOTE_CANCEL asset 2021-10-14 11:23:32 -04:00
18870
79f686cf98 Opt: Highlight current button
- Fix: Save config to correct file
- Opt: Only translate mode reload languages
- Del: UI install
- Fix: Forgot to set current status
- Fix: Add newline to log after stop alas
2021-10-14 23:10:03 +08:00
LmeSzinc
20bd118283 Upd: Event generate 2021-10-14 22:09:50 +08:00
LmeSzinc
6a4064e57f Merge branch 'master' into app
# Conflicts:
#	module/config/event.py
2021-10-14 22:07:50 +08:00
LmeSzinc
8bfa29d565
Merge pull request #644 from Zorachristine/master
Add:[TW] Cross Wave
2021-10-14 22:06:34 +08:00
LmeSzinc
9b2543f4a7 Upd: [TW] Auto search settings assets 2021-10-14 22:04:34 +08:00
Zorachristine
cbbab2735e Add:[TW] Cross Wave 2021-10-14 22:00:26 +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
a70bef7efa Merge branch 'master' into app
# Conflicts:
#	module/combat/auto_search_combat.py
2021-10-14 20:49:04 +08:00
LmeSzinc
15d1aae6b3 Opt: Wait campaign bonus show up 2021-10-14 20:48:35 +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
18870
5b1362cdf8 Add: Display alas running status 2021-10-14 13:31:54 +08:00
18870
ddafa5b309 Opt: Delete unnecessary output() 2021-10-12 13:55:24 +08:00
nEEtdo0d
0835161ed5 Merge branch 'app' of https://github.com/LmeSzinc/AzurLaneAutoScript into app_war_archives 2021-10-11 10:15:37 -04:00
nEEtdo0d
777507dacd Fix: [JP] gacha assets, re-run button_extract 2021-10-11 10:12:03 -04:00
nEEtdo0d
a211b4ba7c Fix: delay task on complete otherwise infinite call 2021-10-11 09:55:21 -04:00
LmeSzinc
1075134d99 Fix: OS low hp detection, immigrates to app branch 2021-10-11 18:00:19 +08:00
LmeSzinc
85101590b7 Merge branch 'master' into app
# Conflicts:
#	module/config/event.py
2021-10-11 12:58:52 +08:00
LmeSzinc
63a8821112 Fix: OS low hp detection (#634) 2021-10-11 12:58:25 +08:00
LmeSzinc
3a6593a3ad Fix: Allow exercise combat ends without end conditions detected (#640) 2021-10-11 12:58:25 +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
nEEtdo0d
5cb9ee1895 Fix: Resolve to allow upstream pull 2021-10-10 23:34:02 -04:00
LmeSzinc
c68f9c1ccd Opt: GUI i18n generation 2021-10-10 23:19:25 +08:00
LmeSzinc
285c8d8ccc Fix: PRBP in medal shop filter (#640) 2021-10-10 22:12:54 +08:00
18870
ec38f7b847 Opt: Add file lock 2021-10-10 01:26:58 +08:00
Zorachristine
2ce81e992b Upd: [TW] Gacha assets 2021-10-09 20:12:57 +08:00
Zorachristine
ecad85b263 Add: [TW] Sundered Blue 2021-10-09 19:49:36 +08:00
18870
9eee0feccf Fix: Log area exceed its size limit 2021-10-09 19:14:42 +08:00
18870
ba588f3a94 Add: Password for Web app 2021-10-09 17:20:59 +08:00
nEEtdo0d
ef863e45e9 Fix: Emulator_Server == SERVER for def with decorators 2021-10-08 22:05:11 -04:00
18870
7d28d06764 Upd: Migrate to PyWebIO 1.4 2021-10-09 01:12:04 +08:00
LmeSzinc
93cd3fb6e8 Refactor: 12-2 leveling, 12-4 leveling, 1-1 affinity farming 2021-10-08 19:49:09 +08:00
LmeSzinc
09a4f446a2 Upd: button_extract 2021-10-08 01:41:24 +08:00
LmeSzinc
c88a2af85e Merge branch 'master' into app
# Conflicts:
#	module/reward/assets.py
#	module/sos/sos.py
2021-10-08 01:40:11 +08:00
LmeSzinc
707c8a7f88 Fix: Reward_CollectMission not used 2021-10-08 01:35:14 +08:00
18870
5130531058 Fix: Enhancement failed if EnhanceFilter never been set
Default value of EnhanceFilter is null, which will transform into None in python.
2021-10-07 16:47:30 +08:00
nEEtdo0d
b055904cae Fix: trigger campaign stop condition result in stuck loop check 2021-10-06 20:10:10 -04:00
nEEtdo0d
830d77231e Fix: sos continous loop, reward can interrupt and throw off next ocr check 2021-10-06 19:21:44 -04:00
nEEtdo0d
7559bd28d8 Fix: MAX_LVL_SUM updated with recent update, 120 -> 125 2021-10-06 16:14:02 -04:00
LmeSzinc
ba4a299fc9 Fix: Handle DORM_TROPHY_CONFIRM when going form page dorm to dorm feed 2021-10-07 03:06:51 +08:00
LmeSzinc
976ddb5ec7 Fix: Medal shop not entering gacha page
- Remove old code of shop reward
2021-10-07 03:02:45 +08:00
LmeSzinc
f87f9ec8f9 Upd: [CN] Arguments translation
- Remove campaign_main from event list
- Fix guild shop filter PR3
2021-10-07 03:02:42 +08:00
nEEtdo0d
ce65c9e133 Fix: re-cut OIL asset to seclude into reward area, depending on secretary can blend and falsely detect and exit reward window unintentionally 2021-10-06 12:14:59 -04:00
LmeSzinc
0e4159c06d Merge branch 'master' into app 2021-10-06 17:04:40 +08:00
LmeSzinc
2c98cc8dc2 Fix: Failed end combat_execute in exercise if BATTLE_STATUS_D is missing but OPTS_INFO_D appears (#439) 2021-10-06 17:04:03 +08:00
Cola
c76954a32a Fix: [JP] Fleet_check asset 2021-10-06 11:37:33 +08:00
Cola
3b48c56493 Fix: [JP] Daily_enter_check asset 2021-10-06 11:36:01 +08:00
nEEtdo0d
3bcb40f27f Fix: bump up offset MEOWFFICER_STATUS, game bug can sometimes screenshot poorly 2021-10-04 18:06:26 -04:00
LmeSzinc
7c512fb6c6 Fix: gacha_bottom_navbar_ensure when left is None 2021-10-05 01:05:20 +08:00
LmeSzinc
48b8ea0eb4 Add: CLI options to start web server
- Opt: Update user config when reading, which is able to change events to the latest
2021-10-05 01:02:43 +08:00
LmeSzinc
81d111fec6 Del: Remove old GUI using gooey 2021-10-04 01:41:35 +08:00
LmeSzinc
af10c5df68 Fix: Sos loops if reached oil limit
- Fix: gacha_bottom_navbar_ensure when left is None
2021-10-04 00:46:23 +08:00
LmeSzinc
8ccb9a67b2 Fix: Minor log showing in CampaignAB 2021-10-03 22:57:28 +08:00
LmeSzinc
4046dd25f5 Refactor: Event daily SP and AB
- Add Raid and WarArchives configs
2021-10-03 22:52:28 +08:00
18870
abbf735fa3 Opt: Format code 2021-10-03 21:40:05 +08:00
LmeSzinc
7fefb6a4f0 Opt: Receive missions again if reach max holding limit 2021-10-03 19:55:36 +08:00
18870
deeb8449be Add: New UI
run `python gui.py` to start webserver
open `http://127.0.0.1` in your browser
2021-10-03 19:18:47 +08:00
LmeSzinc
e5434f4327 Merge branch 'master' into app
# Conflicts:
#	module/tactical/tactical_class.py
2021-10-03 03:10:27 +08:00
LmeSzinc
8aa7a1cfaa Fix: Endless ash beacon assist 2021-10-03 03:07:04 +08:00
LmeSzinc
f3f4f75aa8 Fix: Event name extraction and add ja-JP language file 2021-10-03 02:28:24 +08:00
LmeSzinc
77ace49c2e Refactor: Gacha module 2021-10-03 00:36:14 +08:00
nEEtdo0d
00d44cf9b8 Add: T4 books detection, T4 tier config selector tactical class 2021-10-02 11:58:00 -04:00
Ray
13460e3ae1 Fix: [JP] gacha assets except BUILD_WW_CHECK 2021-10-02 23:18:56 +08:00
LmeSzinc
fe46b8ad93 Upd: Reward assets 2021-10-02 18:08:15 +08:00
LmeSzinc
0ad1daf412 Merge branch 'master' into app
# Conflicts:
#	module/config/config.py
#	module/reward/reward.py
2021-10-02 18:06:22 +08:00
LmeSzinc
46e37ecb9b Fix: Add T4 books detection
- Fix: Error in getting tactical remains when there is only one running
- Opt: Update argument value if it's an empty string
2021-10-02 18:05:27 +08:00
LmeSzinc
86615ede92 Add: Auto updates to the latest event
- Opt: Non-ascii characters in json
- Fix: Template.json override
2021-10-02 17:38:25 +08:00
nEEtdo0d
c977a8d5ce Upd: [EN] coin and exp assets for reward receive 2021-10-01 23:45:17 -04:00
nEEtdo0d
14532568ab Add: EXP reward receive 2021-10-01 23:25:56 -04:00
LmeSzinc
30ab9d5b51 Fix: Opsi explore cannot goto 123 from 143
- Opt: Task priority
2021-10-02 00:30:07 +08:00
LmeSzinc
a82c9b8ce4 Fix: OS explore calls submarine 2021-10-01 00:50:53 +08:00
LmeSzinc
38f55a3a26 Merge branch 'master' into app
# Conflicts:
#	module/config/config.py
#	module/reward/reward.py
2021-09-30 21:26:25 +08:00
LmeSzinc
57af3bcc83 Opt: Retrying on clicking gacha confirm 2021-09-30 21:21:35 +08:00
LmeSzinc
6fa8852369 Upd: [CN] Gacha assets 2021-09-30 21:21:30 +08:00
LmeSzinc
00481e4de5
Merge pull request #632 from nEEtdo0d/gacha_reward_final
Add: Daily Gacha Reward
2021-09-30 20:20:45 +08:00
LmeSzinc
98f1657476 Upd: REWARD_GOTO_MAIN 2021-09-30 20:06:56 +08:00
LmeSzinc
8780477758 Add: Collecting EXP reward
- Opt: Increase reward interval to 60-120
- Fix: Default medal shop filter in buying BPs
2021-09-30 17:12:34 +08:00
LmeSzinc
b0f6798596 Merge branch 'master' into app
# Conflicts:
#	module/reward/assets.py
2021-09-30 16:09:42 +08:00
LmeSzinc
e01b2d49e8 Upd: Reward assets for all servers and add EXP 2021-09-30 16:05:04 +08:00
nEEtdo0d
92bb620372 Res: wishing_well option, help message expansion when using option 2021-09-29 19:18:30 -04:00
LmeSzinc
976ea5d3dc Fix: Missing offset in ash combat status 2021-09-30 01:34:26 +08:00