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
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
LA-DI-DA
23152493b1
Add: pick out auto research farming from more alas
2024-07-07 11:53:00 +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
a8f8432842
Add: [CN] Assets for coalition_20240627
2024-06-28 01:18:59 +08:00
LmeSzinc
b9730d4cd2
Opt: Add default filter in OpsiShop
2024-06-23 18:09:19 +08:00
霞飛
62bc1ed7f7
ref: remove frequency config and not to judge coins at last day
2024-06-22 21:43:55 +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
LA_DI_DA
72acfd999b
fix(AutoRestart): lack of gui setting of InstanceRestart
2024-05-20 22:38:08 +08:00
LA_DI_DA
85e4f8e15e
Merge branch 'refs/heads/lme-alas/master' into smallkai
...
# Conflicts:
# README.md
# module/config/i18n/zh-CN.json
# module/config/i18n/zh-TW.json
# module/equipment/equipment.py
# module/equipment/equipment_change.py
2024-05-17 18:38:32 +08:00
Air111
c5073e5917
Upd: gui text ( #3735 )
2024-05-08 01:01:12 +08:00
LA_DI_DA
928b61978d
Add: more setting for click record check
2024-04-28 23:06:32 +08:00
xhqss
765eeed754
Merge branch '20230309' into smallkai
2024-04-11 22:12:34 +08:00
Zuosizhu
69aebdcf30
Merge branch 'master_lme'
...
# Conflicts:
# config/template.json
# deploy/Windows/app.py
# deploy/Windows/config.py
# deploy/Windows/emulator.py
# deploy/Windows/git.py
# deploy/Windows/logger.py
# deploy/Windows/template.yaml
# module/campaign/gems_farming.py
# module/config/argument/args.json
# module/config/argument/argument.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/device/device.py
# module/device/emulator.py
# module/device/method/droidcast.py
# module/device/platform/emulator_base.py
# module/device/platform/emulator_windows.py
# module/device/platform/platform_windows.py
# module/handler/auto_search.py
2024-04-10 12:22:40 +08:00
ygrzxc
7d574dde8b
Add: Change the designated vanguard combination ( #3520 )
...
* Add: Change the designated vanguard combination
* Add: Change the designated vanguard combination
* Add: Change the designated vanguard combination
* Add: Change the designated vanguard combination
* Add: Change the designated vanguard combination
* Add: Change the designated vanguard combination
* Add: Translation for change the designated vanguard combination
* Add: Translation for change the designated vanguard combination
* Upd:Update dev's args.json
* Upd:Update dev's args.json
* Upd:Reduce template image size and Implement function
* Upd:Reduce template image size and Implement function
* Upd:Reduce template image size and Implement function
---------
Co-authored-by: y y <jaxvuav@163.com >
2024-04-08 22:49:30 +08:00
LmeSzinc
6987d60c96
Add: Alas.EmulatorInfo settings
2024-03-28 12:44:42 +08:00
LA_DI_DA
300a28148a
Upd: default ship data
2024-03-04 22:36:21 +08:00
LA_DI_DA
3dba1cf7f9
Add: ship filter for GemsFarming
2024-03-04 22:35:19 +08:00
LA_DI_DA
fb93d4caf8
Merge branch 'zuosizhu-alas/20230309' into smallkai
...
# Conflicts:
# module/config/argument/args.json
2024-03-02 11:33:53 +08:00
Zuosizhu
dd0d415b67
Merge branch 'LmeSzinc:master' into 20230309
2024-03-02 09:01:48 +08:00
LmeSzinc
ffb38e5d83
Add: Event entrance of Snowrealm Peregrination (event_20240229_cn)
2024-03-01 23:27:03 +08:00
mulaikurisu
4f60d70f9b
Merge remote-tracking branch 'zuosizhu-alas/20230309' into smallkai
...
# Conflicts:
# module/config/argument/args.json
2024-01-31 18:27:04 +08:00
Zuosizhu
98f02c7fa5
Merge branch 'LmeSzinc:master' into 20230309
2024-01-26 00:25:15 +08:00
