LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-19 07:39:29 +08:00
Code Activity
9,220 Commits 12 Branches 0 Tags
07c7252f8fb00102786966b3321ebd30a9acc192
Commit Graph

579 Commits

Author SHA1 Message Date
xhqss
07c7252f8f Merge branch 'master' into master_more 
# Conflicts:
#	module/config/argument/task.yaml
#	module/config/config_manual.py
 2025-01-19 16:23:06 +08:00
xhqss
baa8d2ccd7 Merge branch 'master_lme' 
# Conflicts:
#	README.md
#	module/ui_white/assets.py
 2025-01-19 15:59:20 +08:00
xhqss
2ddc7fff1c Merge branch 'master_lme' 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/config/config_manual.py
#	module/handler/assets.py
#	module/retire/retirement.py
#	module/tactical/tactical_class.py
 2025-01-16 08:52:42 +08:00
dragonheart107
44742e3757 Updated EN assets for 2x book (#4516) 2025-01-16 00:08:29 +08:00
LmeSzinc
f434784c6e Add: Do event story, not added to GUI yet 
run with `python -m module.eventstory.eventstory`
 2025-01-02 00:38:28 +08:00
LmeSzinc
1e7aaf5628 Fix: Handle BATTLE_PASS_NEW_SEASON 2024-12-27 00:58:07 +08:00
xhqss
ca22f21108 Merge branch 'master_GG' 2024-12-20 23:55:46 +08:00
xhqss
e7f93d8efe Merge branch 'master_lme' 
# Conflicts:
#	module/equipment/equipment.py
 2024-12-20 23:51:48 +08:00
Shane (Treasure) Xue
27b92c9b58 Bugfix: to_map_input_name case issue (#4433) 
After bugfixes #4423 logic in the function changed and on the line where CAMPAIGN_ is removed the name is actually in lower case. Moved upper case manupulation in order to ensure correct case. 
Upper was not removed considering the function should turn d3 into D3.
Before this bugfix incrementing to the next stage was unusable (eg. 12-2 would be incremented to a strange "n2")

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2024-12-16 00:05:50 +08:00
sui_feng
eb836d1b4f Fix: correct check_button in add_state() (#4429) 2024-12-13 09:52:45 +08:00
LmeSzinc
bfdf6e4179 Fix: Redirect stage names like "B-1" to be foolproof 2024-12-11 11:46:23 +08:00
LmeSzinc
4ab8337324 Sync: [ALAS] Refactored Switch.set() 2024-12-11 11:46:19 +08:00
LmeSzinc
ba5b853cb9 Refactor: Standardize the use of match_template_color() 2024-12-09 16:09:34 +08:00
xhqss
ab99aca4c1 Merge branch 'master' into master_morealas 
# Conflicts:
#	module/webui/app.py
 2024-11-23 00:11:04 +08:00
xhqss
d8d70b2607 Merge branch 'master_lme' 2024-11-23 00:08:44 +08:00
LmeSzinc
c7908073b2 Upd: [JP] USE_DATA_KEY (fixed #4344) 2024-11-22 22:22:07 +08:00
LA_DI_DA
6fdb207e7f Merge branch 'refs/heads/0O0o0oOoO00/master' into dev 2024-10-27 18:34:32 +08:00
LA_DI_DA
a2e6986dcd Merge branch 'refs/heads/LmeSzinc/master' into dev 
# Conflicts:
#	module/campaign/campaign_status.py
#	module/exercise/combat.py
#	module/retire/dock.py
#	module/retire/enhancement.py
 2024-10-25 12:01:29 +08:00
LmeSzinc
cf7b208a4f Upd: [TW] MISSION_POPUP_ACK MISSION_POPUP_GO (#fixed 4228) 
Signed-off-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
 2024-09-25 11:44:31 +08:00
LA_DI_DA
f3a2ee56e9 Merge branch 'refs/heads/0O0o0oOoO00/master' into dev 
# Conflicts:
#	module/webui/app.py
 2024-09-13 23:13:31 +08:00
LA_DI_DA
a9afa5487a Merge branch 'refs/heads/LmeSzinc/master' into dev 
# Conflicts:
#	module/webui/app.py
 2024-09-13 23:09:32 +08:00
xhqss
9c6eee6335 Merge branch 'master_lme' 2024-09-11 20:45:36 +08:00
guoh064
34acf7ed3a Add: mask for ui_white_main (#4145) 2024-09-09 23:44:48 +08:00
LA_DI_DA
c89281fa1f Merge branch 'refs/heads/0O0o0oOoO00/master' into dev 2024-08-31 11:33:21 +08:00
LA_DI_DA
02fec1598d Merge branch 'refs/heads/LmeSzinc/master' into dev 2024-08-31 11:05:57 +08:00
LmeSzinc
ffc956d3c7 Opt: Reduce 2x book confirm timer for faster 2024-08-23 03:00:16 +08:00
LmeSzinc
918e700831 Fix: Enlarge strategy search area since they are shown in 2x4 now (#4108) 2024-08-23 02:59:40 +08:00
LA_DI_DA
7ea67e514e Merge branch 'refs/heads/0O0o0oOoO00-alas/master' into dev 2024-07-26 12:25:03 +08:00
xhqss
fbe58bd329 Merge branch 'refs/heads/master_lme' 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/device/method/adb.py
#	module/device/screenshot.py
 2024-07-26 10:28:26 +08:00
Zuosizhu
1d85336ba4 Merge remote-tracking branch 'refs/remotes/Lme/master' into dev 
# Conflicts:
#	module/device/method/adb.py
#	module/device/screenshot.py
 2024-07-26 08:04:44 +08:00
LmeSzinc
e2d1d2ff8a Upd: Handle yet another mode switch in event_20240725_cn 2024-07-26 00:23:57 +08:00
LA_DI_DA
66d0734ea0 Merge branch 'refs/heads/0O0o0oOoO00-alas/master' into dev 
# Conflicts:
#	alas.py
#	module/exception.py
 2024-07-06 19:23:57 +08:00
Zuosizhu
1e31cb6de5 Merge branch 'master_lme' into AlasGGdev 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/coalition/coalition.py
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/os/operation_siren.py
#	module/os_handler/os_status.py
 2024-06-28 16:01:16 +08:00
LmeSzinc
ec5f0f92a6 Upd: [EN] MOB_MOVE_CANCEL 2024-06-28 09:12:18 +08:00
LmeSzinc
3958373fc4 Upd: [TW] MOB_MOVE_CANCEL (#3922) 2024-06-27 22:51:59 +08:00
LA_DI_DA
573210af2b Merge branch 'refs/heads/lme-alas/master' into dev 
# Conflicts:
#	alas.py
#	module/os/fleet.py
 2024-06-22 20:31:35 +08:00
LmeSzinc
eada57f97d Pref: Reduce CPU usage during auto search daemon 2024-06-05 01:15:42 +08:00
LmeSzinc
58202c6a40 Pref: Reuse image array to improve memory performance 2024-06-05 01:15:41 +08:00
LmeSzinc
77d48937fc Fix: Handle mail full popup 2024-06-03 10:22:06 +08:00
Air111
1e793295e8 Fix: mob move optimization 2024-06-03 00:04:42 +08:00
LA_DI_DA
f8964c88d9 Merge branch 'refs/heads/0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	.gitignore
#	alas.py
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/argument/task.yaml
#	module/config/config_generated.py
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/handler/login.py
 2024-05-23 13:07:57 +08:00
Zuosizhu
ddcfbb0a97 Merge branch 'master_lme' 
# Conflicts:
#	README.md
#	deploy/adb.py
#	deploy/pip.py
#	module/daily/equipment.py
 2024-05-23 02:31:29 +08:00
LmeSzinc
ecfd5d50bf Upd: [CN] Support UI in 2024.05.21 2024-05-23 01:16:41 +08:00
LA_DI_DA
6669aa99b4 Revert "fix: check if has login" 
This reverts commit 8fd1c2122b.
 2024-05-21 23:01:07 +08:00
LA_DI_DA
c19053125f Revert "fix: disable has_login before start" 
This reverts commit 12c99a3eae.
 2024-05-21 23:00:07 +08:00
LA_DI_DA
12c99a3eae fix: disable has_login before start 2024-05-18 22:50:45 +08:00
LA_DI_DA
8fd1c2122b fix: check if has login 2024-05-18 00:14:05 +08:00
LA_DI_DA
1be62c9c8f Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/config/argument/args.json
 2024-04-27 16:01:37 +08:00
Zuosizhu
8fd3c7eedd Merge branch 'master_lme_to_merge' 
# Conflicts:
#	assets/cn/equipment/FLEET_DETAIL_CHECK.png
#	assets/en/equipment/FLEET_DETAIL_CHECK.png
#	assets/jp/equipment/FLEET_DETAIL_CHECK.png
#	assets/tw/equipment/FLEET_DETAIL_CHECK.png
#	deploy/docker/requirements.txt
#	deploy/git.py
#	module/campaign/gems_farming.py
#	module/equipment/assets.py
#	module/equipment/equipment_change.py
#	requirements-in.txt
#	requirements.txt
 2024-04-27 13:00:39 +08:00
guoh064
41075b4a52 Fix: W15 optimization (#3660) 
* Fix: force battle function choice for 15-1/15-2 when clear all

* Add: battle strategy when missing support fleet in W15

* Opt: open strategy once when checking mob move

* Opt: reuse strategy_get_mob_move_remain()
 2024-04-22 23:16:39 +08:00