LA_DI_DA
6c58ac98ab
Fix: syntax error in operation_siren.py
2024-07-06 20:36:29 +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
ea68f68dc9
Fix: Handle MEOWFFICER_TRAIN_EVALUATE in _meow_skip_lock() ( #3917 )
2024-06-27 22:20:09 +08:00
霞飛
54747a8055
ref: remove functon
2024-06-22 21:43:55 +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
霞飛
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
LmeSzinc
e4653741dd
Fix: Failed to enter boss room due to wrong is_question prediction
2024-06-07 09:56:35 +08:00
LmeSzinc
58202c6a40
Pref: Reuse image array to improve memory performance
2024-06-05 01:15:41 +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
ecfd5d50bf
Upd: [CN] Support UI in 2024.05.21
2024-05-23 01:16:41 +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
LmeSzinc
4e469098e2
Fix: Handle another PAUSE and remove direct use of PAUSE
2024-05-09 18:50:32 +08:00
Zuosizhu
af1f0a9056
Merge branch 'LmeSzinc:master' into 20230309
2024-05-03 12:58:36 +08:00
LmeSzinc
91f2d9506c
Opt: Improve memory performance in GlobeOperation.find_peaks
2024-05-02 17:41:12 +08:00
LmeSzinc
e2e431d3b1
Fix: Fleets not sorted if multiple current fleets found
2024-05-02 14:08:20 +08:00
LmeSzinc
04538c4b1a
Fix: MAP_SWIPE_DROP should >= MAP_GRID_CENTER_TOLERANCE
2024-05-01 23:37:53 +08:00
LmeSzinc
499639f657
Fix: Predict swipe end
2024-04-30 17:42:56 +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
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
LmeSzinc
0437ae80e6
Fix: Increase MAP_GRID_CENTER_TOLERANCE since short swipes on map no longer be responded to
2024-04-26 04:06:23 +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
LmeSzinc
b181669c57
Fix: Handle action point popup during globe_update()
2024-04-03 23:53:24 +08:00
LA_DI_DA
8a2d536260
Merge branch 'zuosizhu-alas/20230309' into smallkai
...
# Conflicts:
# module/config/argument/args.json
# module/ui/page.py
2024-03-29 21:14:59 +08:00
Zuosizhu
b6e6f60754
Merge branch 'LmeSzinc:master' into 20230309
2024-03-29 07:09:29 +08:00
LmeSzinc
ceca042afc
Fix: [CN][JP] Handle bugged AUTO_SEARCH_OS_MAP_OPTION_OFF button
...
- TODO: [EN][TW] Update AUTO_SEARCH_OS_MAP_OPTION_OFF_DISABLED
2024-03-21 18:35:48 +08:00
LmeSzinc
c5fb5a57c5
Revert "Fix: Handle bugged AP button before game devs get it fixed"
...
This reverts commit b615ebf3
2024-02-22 21:00:52 +08:00
LmeSzinc
b615ebf3cf
Fix: Handle bugged AP button before game devs get it fixed
2024-02-22 16:36:32 +08:00
LA-DI-DA
0252b8bcc0
Merge branch 'zuosizhu-alas/20230309' into smallkai
...
# Conflicts:
# module/config/argument/args.json
2024-01-12 10:31:19 +08:00
Zuosizhu
79956f8b66
Merge branch 'master_lme'
2024-01-11 16:59:27 +08:00
LmeSzinc
8b871e8c30
Fix: Don't click MAINTENANCE_ANNOUNCE while interrupting auto search
2024-01-11 10:50:41 +08:00
LA-DI-DA
0619ea1256
Fix: wrong movement of go_month_boss_room when month boss is in hard mode
2024-01-02 22:58:31 +08:00
LA-DI-DA
657d716ed5
Adjust
2023-11-22 16:19:40 +08:00
LA-DI-DA
a65f53b966
Merge branch 'lme-alas/master' into smallkai
...
# Conflicts:
# module/map/assets.py
2023-10-19 23:00:39 +08:00
Zuosizhu
526d26e6c6
Merge branch 'LmeSzinc:master' into 20230309
2023-10-19 22:53:32 +08:00
LmeSzinc
1c06c5e2b0
Fix: [EN] Missing letter "N" in NA Ocean * zones
2023-10-14 21:54:12 +08:00
Zuosizhu
07d5a9e79f
Merge branch 'LmeSzinc:master' into 20230309
2023-09-16 07:53:31 +08:00
LA-DI-DA
dbe45c498d
Merge branch 'lme-alas/master' into smallkai
2023-09-16 00:07:17 +08:00
LmeSzinc
f68406f990
Fix: Disable STORY_ALLOW_SKIP in OpSi
2023-09-15 21:46:57 +08:00
LA-DI-DA
7a716a2e3c
Merge branch 'zuosizhu-alas/20230309' into smallkai
2023-09-11 21:48:50 +08:00
Zuosizhu
f8a35cec1c
Merge branch 'master_lme'
...
# Conflicts:
# README.md
2023-09-11 08:16:09 +08:00
LmeSzinc
da02fd6066
Fix: Trying to fix story skip bug on game client
2023-09-10 16:20:39 +08:00
LmeSzinc
dd4cc0ea32
Fix: Skip stories in FleetSelector.open() ( #3104 )
2023-09-10 15:27:07 +08:00
LA_DI_DA
8368cce3fb
Merge branch 'zuosizhu-alas/20230309' into smallkai
...
# Conflicts:
# module/config/argument/args.json
# module/config/argument/argument.yaml
2023-09-03 19:13:52 +08:00
Zuosizhu
11dc3471aa
Merge branch 'LmeSzinc:master' into 20230309
2023-09-03 09:53:28 +08:00
LmeSzinc
b6e66b4a17
Fix: handle_fleet_emp_debuff in port ( #3076 )
2023-09-02 23:58:56 +08:00
