guoh064
7cef54d350
Add: check leveling in cl1 daily
2025-06-08 13:08:19 +09:00
0O0o0oOoO00
45ac6bdf45
Merge remote-tracking branch 'LmeSzinc/master' into dev
...
# Conflicts:
# module/retire/assets.py
# module/retire/dock.py
2025-06-05 23:53:43 +08:00
LmeSzinc
6d7e43974a
Fix: handle game tips that infos skin feature when entering dock
2025-05-29 22:48:01 +08:00
0O0o0oOoO00
2b832b9bb3
fix: switch gemsfarming to 15-1 when event limit is reached
2025-05-24 17:55:12 +08:00
0O0o0oOoO00
1053aa427e
fix: merge mistake of stop barrier
2025-05-21 14:07:57 +08:00
ZuoSiZhu
dee0c1484f
Merge branch 'master_lme' into dev
...
# Conflicts:
# campaign/Readme.md
# module/base/utils.py
# module/coalition/assets.py
# module/config/argument/args.json
# 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
# module/retire/dock.py
# module/retire/enhancement.py
# module/shop/shop_reward.py
2025-05-21 04:17:08 +08:00
0O0o0oOoO00
13eb3a079f
fix: lack of KeepOil setting
2025-05-19 11:37:17 +08:00
0O0o0oOoO00
75267083c9
Merge branch 'feature/more' into dev
...
# Conflicts:
# alas.py
# module/exception.py
2025-05-18 22:03:42 +08:00
ZuoSiZhu
3c63b8d65d
adj: GemsFarming allow low vanguard level when hook is enabled
2025-05-12 23:28:44 +08:00
0O0o0oOoO00
03a59cca17
Merge branch 'dev' into feature/more
2025-05-11 15:29:08 +08:00
0O0o0oOoO00
50e1521de1
fix: chapter name convertion for event_20250424_cn
2025-04-25 14:34:42 +08:00
xhqss
f45ad334db
Add: MAP_CHAPTER_SWITCH_20241219_SP to handle event_20250424_cn
2025-04-25 13:25:31 +08:00
LmeSzinc
c1eb1e47cc
Add: Chapter T
2025-04-24 23:43:28 +08:00
LA-DI-DA
62c33f27e0
Merge the remaining functions in MoreAlas
2025-04-24 23:30:50 +08:00
LmeSzinc
c95816ecf7
Add: MAP_CHAPTER_SWITCH_20241219_SP to handle sp events
2025-04-24 22:49:31 +08:00
ZuoSiZhu
166b49f8f0
Merge branch 'master_lme' into dev
...
# Conflicts:
# alas.py
# module/config/config_manual.py
# module/ui/page.py
# module/ui/ui.py
2025-03-28 08:34:41 +08:00
LmeSzinc
8321182fdc
Fix: Disable task hospital when event is over
2025-03-28 04:00:17 +08:00
ZuoSiZhu
7e3e97a5d9
Fix: Shit from deep_get
2025-03-28 01:20:07 +08:00
ZuoSiZhu
58a217d98f
Merge branch 'master_lme' into dev
...
# Conflicts:
# module/webui/app.py
# module/webui/config.py
2025-03-28 00:23:16 +08:00
ZuoSiZhu
df7937ce05
Fix: Spellings
2025-03-14 09:05:18 +08:00
ZuoSiZhu
b82b79988d
Merge remote-tracking branch 'lme/master' into dev
...
# Conflicts:
# module/config/argument/override.yaml
2025-03-14 00:57:23 +08:00
guoh064
edb8bcb5c7
Fix: vanguard_change logic ( #4636 )
...
* Add: support list types limitations in Ship class
* Opt: get_common_rarity_dd logic
get_common_rarity_dd should always check all available
ships and not just the ones in the current fleet.
2025-03-10 23:30:02 +08:00
qinsgit
c857ed4e22
Fix: spelling mistakes ( #4648 )
...
Co-authored-by: qinsgit <123123123@qq.com >
2025-03-10 23:28:12 +08:00
silvergundam
b9dff3e177
Add: Call abyssal,strongholdo,obscure when yellow coins below 35000
2025-03-03 18:35:56 +08:00
ZuoSiZhu
39c18d8103
Merge remote-tracking branch 'lme/master' into dev
...
# Conflicts:
# deploy/AidLux/0.92/requirements.txt
# module/campaign/campaign_event.py
# module/os/map.py
# module/os_ash/ash.py
# module/webui/config.py
2025-02-28 11:01:23 +08:00
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
LmeSzinc
fc90b8e72b
Fix: Disable raid tasks if another event is ongoing
2025-02-13 12:50:29 +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
