0O0o0oOoO00
03a59cca17
Merge branch 'dev' into feature/more
2025-05-11 15:29:08 +08:00
0O0o0oOoO00
604da2aaeb
add: global speedup for hook
2025-05-11 15:19:14 +08:00
0O0o0oOoO00
16f60ac787
fix: mis-deleted dashboard settings
2025-05-10 14:00:06 +08:00
0O0o0oOoO00
92d3616459
add: global speedup
2025-05-10 13:45:15 +08:00
LA-DI-DA
62c33f27e0
Merge the remaining functions in MoreAlas
2025-04-24 23:30:50 +08:00
silvergundam
95cbfeafea
Fix: Dashboard
2025-04-18 01:01:51 +08:00
xhqss
f35c9d289f
Brute-force porting of LME updates to the event_20250417 branch
2025-04-18 00:07:46 +08:00
silvergundam
73eaab8ace
Merge remote-tracking branch 'lme/master' into dev
2025-04-03 11:57:44 +08:00
POLAR me
42090d5191
update(event_hospital): 添加深谷来信刷图模式
2025-03-31 00:11:52 +08:00
sui_feng
4768c9e46c
Add: War Archives 20220324 ( #4698 )
2025-03-29 01:11:26 +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
985f49279f
Add: Configs for task Hospital
2025-03-28 01:05:09 +08:00
LA_DI_DA
61debe2dbb
add: add python implementation for gg factor
2025-03-27 18:06:23 +08:00
guoh064
e8afd8a5a9
Merge remote-tracking branch 'guoh064/shop_event_3' into dev
2025-03-23 21:32:39 +08:00
LA_DI_DA
3d87557568
add: select arch manually
2025-03-21 19:42:04 +08:00
LA_DI_DA
b4470e355f
add: restart game before crack
2025-03-20 19:27:12 +08:00
LA_DI_DA
245902f1fb
add: resource update server
2025-03-19 22:57:05 +08:00
LA_DI_DA
fdee1ff0d9
add: game lib dir setting for luahook
2025-03-18 13:52:06 +08:00
LA_DI_DA
01b24293c4
add: setting for luahook
2025-03-18 13:38:09 +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
LmeSzinc
c5f1d6e18b
Add: Tools to do event story
2025-03-10 23:02:16 +08:00
guoh064
5eaecdbcdb
Add: Commission Event Shop
2025-02-23 10:55:41 +08:00
guoh064
1f059ff84e
Add: Event Shop
...
Fix: correct pt locations to adapt
Fix: missing self parameter in ur_ship_costs
Opt: Refactor event shop item handling and improve max amount calculation
Fix: ensure bought_all is set correctly after confirming purchase
Fix: update ship buying logic to handle multiple purchases and ensure pt_ur is set correctly
2025-02-23 10:55:35 +08:00
ZuoSiZhu
ad5564cf2f
Add: Meta record
2025-02-19 01:24:46 +08:00
LA_DI_DA
b48679be35
add: more dock filter option for Awaken
2025-02-16 16:39:43 +08:00
LA_DI_DA
7b70ee8f57
add: favourite setting of Awaken
2025-02-16 16:33:01 +08:00
LA_DI_DA
acc1107025
add: more awaken exe time
2025-02-15 14:01:35 +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
sui_feng
1053d490cf
Add: War Archives 20220224 ( #4512 )
2025-01-15 23:24:48 +08:00
LmeSzinc
da81498211
Add: Task Awaken to GUI
2025-01-04 22:19:30 +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
d35bfa0f5d
Add: War Archives
...
* war_archives_20201012_cn
* war_archives_20210422_cn
* war_archives_20210916_cn
* war_archives_20211111_cn
* war_archives_20211229_cn
2024-10-17 20:56:53 +08:00
coconutjuice
6b7ea0448c
Upd:Adds the Meowfficer maximum level option for enhance ( #4267 )
...
* Upd:Adds the Meowfficer maximum level option for enhance
* Upd:Move ocr and judgment logic out of the loop
---------
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com >
Co-authored-by: yx800 <yoyo.duan@cfnet.com.cn >
2024-10-12 00:45:56 +08:00
Zuosizhu
aef67541c5
Add: Option to disable Opsi repair
2024-08-02 17:23:36 +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
2454d2aa2c
Opt: Use MaaTouch as default control method
2024-07-25 02:19:45 +08:00
LA_DI_DA
be68cd03fe
Merge branch 'refs/heads/feature/player-level-and-exp' into dev
2024-07-21 12:54:27 +08:00
LA_DI_DA
327225e74d
Add: show player info in dashboard
...
commits:
Adj: rename update player info function
Fix: use play exp record to check time
Add: show exp and level of player in dashboard
2024-07-21 12:53:55 +08:00
Zuosizhu
ae45257731
Adj: Fuck FleetNumberInHardMode Setting, bind it with FleetOrder
2024-07-20 15:10:27 +08:00
Zuosizhu
4ad4b064ee
Fix: Cvl to bc/bb with common bb problem about Nevada
2024-07-20 12:56:32 +08:00
Zuosizhu
ad6d508013
Add: Options for an easier way of changing ShipType
2024-07-19 19:27:52 +08:00
LA_DI_DA
a12a831419
Merge branch 'refs/heads/lme-alas/master' into dev
...
# Conflicts:
# alas.py
2024-07-18 23:12:53 +08:00
LmeSzinc
e66b2a84b0
Add: Claim mails in task freebies
...
- TODO: [JP][TW] Update mail assets
2024-07-18 22:48:40 +08:00
LA_DI_DA
356c7f097b
Add: research farming for opsi hazard1
2024-07-17 22:36:01 +08:00
LA-DI-DA
15c4cc80fe
Fix: json format error from merge mistake
2024-07-12 10:21:44 +08:00
ReLU
fceeff25e0
Merge remote-tracking branch 'upstream/master' into dev
2024-07-12 03:54:22 +08:00
LmeSzinc
5ee7f9118e
Add: Series 7 filter
2024-07-12 00:24:36 +08:00
Zuosizhu
6448f9174f
Add: PR7 gui settings
2024-07-11 16:36:41 +08:00
Zuosizhu
106d46dc0a
Fix: all the shit chasing me from last year
2024-07-08 03:23:53 +08:00
