LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-22 19:59:28 +08:00
Code Activity
9,052 Commits 12 Branches 0 Tags
7b70ee8f57e245ddc23f745fa3c04400d4e2f73a
Commit Graph

574 Commits

Author SHA1 Message Date
LA_DI_DA
803e96c14e feat: use higher emotion ship when changing vanguard 2025-02-16 13:43:58 +08:00
LA_DI_DA
3fb870b605 fix: call __init__ of parent classes in GemsFarming 2025-02-14 18:55:10 +08:00
LA_DI_DA
39b4783723 fix: do not use original GemsFarming 2025-02-14 18:18:14 +08:00
LA_DI_DA
791c62d455 opt(GemsFarming): use self-inherit to override functions from original class 2025-02-14 13:47:54 +08:00
xhqss
066d2acb24 Rollback the version of gems_farming.py to the state before merging on 2025/01/16. 2025-01-19 20:17:11 +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
LmeSzinc
2176fdf803 Fix: Getting index of a digit chapter when looking for a non-digit chapter (#4504) 2025-01-10 02:27:51 +08:00
sui_feng
9b61faf308 Fix: z20_or_z21 should be filtered by any ship (#4494) 2025-01-07 11:19:21 +08:00
LmeSzinc
4a2eb4470c Opt: Combine dock filter operations to skip waiting dock loaded 2025-01-04 00:02:29 +08:00
LmeSzinc
3be9adc485 Fix: Switch handler in campaign_ensure_aside_20241219 2025-01-02 01:04:51 +08:00
LmeSzinc
72142c698b Chore: campaign_set_chapter_20241219 should use wrapped methods 2025-01-02 00:12:48 +08:00
xhqss
e7f93d8efe Merge branch 'master_lme' 
# Conflicts:
#	module/equipment/equipment.py
 2024-12-20 23:51:48 +08:00
LmeSzinc
7b4a716273 Add: Chapter SP 
- Spilt map config MAP_CHAPTER_SWITCH_20241219 and MAP_HAS_MODE_SWITCH
 2024-12-20 23:31:49 +08:00
LmeSzinc
cc2cf0d046 Refactor: Abstract chapter switches from 20240725 to 20241219 2024-12-20 22:24:47 +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
xhqss
d8d70b2607 Merge branch 'master_lme' 2024-11-23 00:08:44 +08:00
LmeSzinc
64b3122127 Add: Chapter T 2024-11-22 21:25:41 +08:00
Zuosizhu
47608ccfb2 Fix: Merge error causing Ocr failure 2024-10-27 13:25:40 +08:00
LA_DI_DA
07d61ec68b Merge branch 'refs/heads/LmeSzinc/master' into dev 2024-10-25 23:28:19 +08:00
LmeSzinc
1024f5063d Add: CHAPTER_SWITCH_20241024 2024-10-25 22:31:20 +08:00
LmeSzinc
847dcd847b Add: Chapter T 2024-10-25 19:37:55 +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
guoh064
e89063bade Jp font 20241011 (#4272) 
* tmp: [JP] commission assets

* tmp: [JP] asset RESEARCH_COST_CHECKER

* tmp: [JP] assets in mail batch

* tmp: [JP] opsi get_zone_name color

* tmp: [JP] get_coin and get_oil color

* tmp: [JP] ash_collect_status and get_yellow_coins color

* upd: [JP] resize commission assets recognize size
 2024-10-12 14:29:01 +08:00
Air111
3ad070d6f1 Fix: ensure not at war archives campaign in ui_goto_event (#4237) 2024-09-29 12:09:42 +08:00
weeswelai
cb2ca4375d Upd: In some events, ensure_auto_search_exit enters a dead loop (#4227) 2024-09-23 19:14:12 +08:00
LA_DI_DA
02fec1598d Merge branch 'refs/heads/LmeSzinc/master' into dev 2024-08-31 11:05:57 +08:00
LmeSzinc
87cb525b58 Add: Chapter T 2024-08-30 22:49:07 +08:00
LmeSzinc
3740ab7164 Fix: ensure_campaign_ui should have timeout instead of loop count 2024-08-20 01:35:10 +08:00
LmeSzinc
c9349b1bba Fix: _get_stage_name should before handle_get_chapter_additional (#4094) 
so loop can be break
 2024-08-20 01:31:50 +08:00
LA_DI_DA
89be3580ec Merge branch 'refs/heads/LmeSzinc/master' into dev 
# Conflicts:
#	module/ui/page.py
 2024-08-17 21:48:52 +08:00
LmeSzinc
bbad8d0359 Add: Handle story stages after A2 2024-08-16 22:34:38 +08:00
LmeSzinc
8dd6ec7811 Fix: Slowly appeared WITHDRAW button (#4044) 2024-08-02 01:02:05 +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
5e05db05d0 Add: Switch mode in map preparation 2024-07-26 02:20:15 +08:00
LmeSzinc
2da2d58297 Fix: Handle yet another CLEAR icon 2024-07-26 02:20:05 +08:00
LmeSzinc
e2d1d2ff8a Upd: Handle yet another mode switch in event_20240725_cn 2024-07-26 00:23:57 +08:00
Zuosizhu
784f1c8aff Merge Lme/Master into dev 2024-07-21 14:51:18 +08:00
Zuosizhu
87b44b2f57 Fix: Auto prepare ships for hard GemsFarming 2024-07-21 04:26:49 +08:00
Zuosizhu
ae45257731 Adj: Fuck FleetNumberInHardMode Setting, bind it with FleetOrder 2024-07-20 15:10:27 +08:00
guoh064
11e3580c61 Opt: always keep common cv at retirement if GemsFarming enabled 2024-07-19 12:33:50 +08:00
LA-DI-DA
23152493b1 Add: pick out auto research farming from more alas 2024-07-07 11:53:00 +08:00
LA_DI_DA
5ab8cfdee5 Merge branch 'refs/heads/lme-alas/master' into dev 
# Conflicts:
#	README.md
 2024-07-06 19:17:11 +08:00
LmeSzinc
2995c5408d Fix: Add Coalition as task requires balance (#3941) 2024-07-01 17:00:20 +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
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
霞飛
0b97b40c46 Feature: New OpsiShop. (#3086) 
* feat: New OpsiShop

* fix: use AdaptiveScroll

* feat: scan counter

* perf: calculate y value
 2024-06-17 11:24:40 +08:00
Air111
a70d4c4675 Upd: add CommonDD option (#3786) 
* Upd: add dd combination z20_or_z21

* Upd: add dd option favourite

* Opt: use fation to filter Z20 or Z21
 2024-06-14 03:39:20 +08:00
LmeSzinc
58202c6a40 Pref: Reuse image array to improve memory performance 2024-06-05 01:15:41 +08:00
LA_DI_DA
cd64d084b2 Fix: set gemsfarming's ship filter to default after this task is set to campaign_main 2024-05-25 19:43:00 +08:00