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
LA_DI_DA
c25ea046c6
Upd: update args.json and other files
2024-07-06 19:14:14 +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
霞飛
79edef015f
fix: handle sidebar disappear ( #3930 )
...
* fix: handle OpsiShop disappear
* docs: add a condition to OpsiShop
* ref: remove useless loop
* fix: exception
* feat: skip to the next month if the new shop do not unlock
2024-06-28 12:18:08 +08:00
LmeSzinc
12bd302deb
Reverts test code in commit ea68f68d
2024-06-28 03:23:28 +08:00
LmeSzinc
9bdfdb6447
Fix: Override mode in CoalitionSp
2024-06-28 01:54:38 +08:00
LmeSzinc
a8f8432842
Add: [CN] Assets for coalition_20240627
2024-06-28 01:18:59 +08:00
LmeSzinc
6bdfbc3dcd
Add: Event entrance of coalition_20240627
2024-06-27 23:34:39 +08:00
LmeSzinc
ea68f68dc9
Fix: Handle MEOWFFICER_TRAIN_EVALUATE in _meow_skip_lock() ( #3917 )
2024-06-27 22:20:09 +08:00
RilyLC
d1b16a99c2
Upd:[TW]Event:Tempesta and the Fountain of Youth ( #3933 )
...
* Fix: Skip first screenshot in tools
since you cannot run benchmark before benckmarked
* Fix: Lower HOMO_CANNY_THRESHOLD in event_20220428_cn
to fit maps in 2024
* Fix: Random background of chapter A hits EXP_INFO_B
* Upd:[TW]Event:Tempesta and the Fountain of Youth
---------
Co-authored-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com >
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com >
2024-06-27 19:59:16 +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
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
86d6c36670
Merge branch 'master' into dev
2024-06-21 01:50:05 +08:00
Air111
473a7b626c
Add: Event Rondo at Rainbow's End Rerun ( #3902 )
2024-06-20 19:00:11 +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
RilyLC
f70bb61ee6
Upd:[TW]Event:Sundered Blue Rerun ( #3886 )
2024-06-13 22:32:35 +08:00
LmeSzinc
5f56a2bdb7
Chore: [ALAS] Move func methods to the Alas class
2024-05-30 13:34:24 +08:00
LA_DI_DA
219bcc2d76
Merge remote-tracking branch 'origin/smallkai' into smallkai
2024-05-25 19:45:31 +08:00
LA_DI_DA
c5195f4cd5
Add: add more comment for change ship
2024-05-25 19:24:50 +08:00
pull[bot]
c85c6582e1
Merge pull request #15 from LmeSzinc/master
...
[pull] smallkai from LmeSzinc:master
2024-05-24 03:30:45 +00:00
LmeSzinc
c8322b5187
Upd: [TW] Event event_20230525_cn
2024-05-24 03:20:07 +08:00
LA_DI_DA
41794891df
Merge branch 'refs/heads/smallkai-dev' into smallkai
...
# Conflicts:
# module/config/argument/args.json
# module/config/i18n/zh-CN.json
2024-05-23 12:53:42 +08:00
LA_DI_DA
880a1834ec
Merge branch 'refs/heads/zuosizhu-alas/20230309' into smallkai-dev
...
# Conflicts:
# README.md
# module/equipment/equipment.py
# module/equipment/equipment_change.py
2024-05-23 12:51:24 +08:00
xhqss
584c58c3c2
Correct config
2024-05-23 08:29:30 +08:00
xhqss
c0c4913353
Merge branch '20230309' into smallkai
...
# Conflicts:
# module/config/i18n/zh-CN.json
2024-05-23 08:25:21 +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
b85d646a84
Add: Event entrance of Light of the Martyrium (event_20240521_cn)
2024-05-21 22:53:12 +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
eb066faf92
Merge branch 'refs/heads/smallkai' into smallkai-dev
2024-05-19 19:59:21 +08:00
Zuosizhu
5123bd9949
Merge branch 'lme_master'
...
# Conflicts:
# README.md
# module/config/i18n/zh-CN.json
# module/config/i18n/zh-TW.json
# module/equipment/equipment_change.py
2024-05-19 00:50:11 +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
LA_DI_DA
4481519a82
Merge branch 'refs/heads/zuosizhu-alas/20230309' into smallkai
2024-05-17 18:09:32 +08:00
rilylc
bbe601b687
Upd:[TW]Event:Upon the Shimmering Blue Rerun
2024-05-09 18:58:41 +08:00
Air111
c5073e5917
Upd: gui text ( #3735 )
2024-05-08 01:01:12 +08:00
Zuosizhu
af1f0a9056
Merge branch 'LmeSzinc:master' into 20230309
2024-05-03 12:58:36 +08:00
LmeSzinc
d7bb28323b
Merge pull request #3716 from LmeSzinc/dev
...
Bug fix
2024-05-02 18:05:51 +08:00
LmeSzinc
04538c4b1a
Fix: MAP_SWIPE_DROP should >= MAP_GRID_CENTER_TOLERANCE
2024-05-01 23:37:53 +08:00
LmeSzinc
11162310d1
Merge pull request #3708 from LmeSzinc/sync_test
...
Bug fix
2024-04-30 18:26:19 +08:00
LmeSzinc
0fb6a96691
Refactor: Make MaaTouch inputs synchronous
2024-04-30 17:42:52 +08:00
LA_DI_DA
829480275b
Merge branch 'smallkai' into smallkai-dev
2024-04-28 23:37:16 +08:00
LA_DI_DA
e6f317de1b
Revert "Del: screenshot interval limit"
...
This reverts commit 860bcf5760
2024-04-28 23:34:16 +08:00
LA_DI_DA
9fc3556a28
Merge branch 'smallkai' into smallkai-dev
2024-04-28 23:21:45 +08:00
LA_DI_DA
928b61978d
Add: more setting for click record check
2024-04-28 23:06:32 +08:00
LA_DI_DA
860bcf5760
Del: screenshot interval limit
2024-04-28 22:19:09 +08:00
LA_DI_DA
7b81250ec9
Merge branch 'zuosizhu-alas/20230309' into smallkai
...
# Conflicts:
# campaign/Readme.md
# module/config/argument/args.json
2024-04-27 15:56:34 +08:00
LA_DI_DA
02587d5f16
Merge branch 'zuosizhu-alas/20230309' into smallkai-dev
2024-04-27 15:45:38 +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
