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
a24a7fcfd1
tmp: [JP] LevelOcr
2024-10-16 12:48:21 +08:00
LmeSzinc
b0561ae468
Fix: Wrong area to get combat paused
2024-09-15 23:18:21 +08:00
LA_DI_DA
15dbb46cc3
Merge branch 'refs/heads/LmeSzinc/master' into dev
...
# Conflicts:
# module/config/argument/args.json
# module/exercise/combat.py
# module/os/map.py
2024-09-15 18:06:15 +08:00
LmeSzinc
d1eeb02bd2
Add: Support Battle UI theme
2024-09-15 04:34:14 +08:00
LA_DI_DA
a9afa5487a
Merge branch 'refs/heads/LmeSzinc/master' into dev
...
# Conflicts:
# module/webui/app.py
2024-09-13 23:09:32 +08:00
LmeSzinc
14b01ff9a0
Upd: [EN] PAUSE
2024-09-13 02:09:12 +08:00
LA_DI_DA
c74a54a857
Adj: adjust skip getting ship level when battle 0 warning to info level
2024-07-22 16:03:46 +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
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
79747e86ab
Fix: Fleet switch is never watched in auto search ( #3866 )
2024-06-12 00:14:16 +08:00
LmeSzinc
a668840ee9
Pref: Faster is_combat_loading()
2024-06-05 02:24:47 +08:00
LmeSzinc
eada57f97d
Pref: Reduce CPU usage during auto search daemon
2024-06-05 01:15:42 +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
254e9422ed
Fix: auto_search_moving ends with is_combat_executing
2024-05-23 01:44:31 +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
382980ca06
Fix: Add PAUSE in stuck record since is_combat_executing() bypassed appear()
2024-05-09 21:40:37 +08:00
LmeSzinc
4e469098e2
Fix: Handle another PAUSE and remove direct use of PAUSE
2024-05-09 18:50:32 +08:00
LA-DI-DA
153dbdd79e
Merge branch 'zuosizhu-alas/20230309' into smallkai
...
# Conflicts:
# campaign/Readme.md
2023-10-27 19:28:33 +08:00
Zuosizhu
b842d27611
Merge branch 'master_lme'
...
# Conflicts:
# module/map/assets.py
2023-10-26 00:04:07 +08:00
LmeSzinc
c6c0af7be9
Fix: Screenshot interval is not extended in daemon and guild combat
2023-10-21 21:35:17 +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
f23c960b97
Fix: Actively clear stuck records in combat
2023-10-14 21:03:58 +08:00
LA-DI-DA
833a80b584
Fix(tmp): inappropriate lv32 trigger when using "GemsFarming" which set to hard mode map
2023-09-15 20:09:52 +08:00
Zuosizhu
78d8ed1c5b
Merge branch 'master_lme'
...
# Conflicts:
# assets/gui/css/light-alas.css
# 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/webui/app.py
2023-09-02 17:47:24 +08:00
LmeSzinc
c987eb68cb
Upd: Assets update
2023-09-01 02:21:37 +08:00
LmeSzinc
3aee6082c2
Fix: [TW] Increase threshold of BATTLE_PREPARATION_WITH_OVERLAY ( #3058 )
2023-08-31 10:43:33 +08:00
Zuosizhu
1e1661f4bb
Merge branch 'LmeSzinc:master' into 20230309
2023-07-29 22:04:54 +08:00
LmeSzinc
f948fd502f
Fix: Handle empty HP when using emergency repair ( #2925 )
2023-07-25 12:48:47 +08:00
Zuosizhu
0935b58ede
Merge branch 'master_lme'
...
# Conflicts:
# module/campaign/gems_farming.py
# module/exercise/exercise.py
# module/ui/ui.py
2023-07-15 20:26:12 +08:00
LmeSzinc
85ec86ba1c
Fix: Check exp_info first if battle_status has been clicked ( #2774 )
2023-07-02 15:54:26 +08:00
Zuosizhu
2d95de0dc5
Merge branch 'LmeSzinc:master' into 20230309
2023-05-26 09:51:44 +08:00
LmeSzinc
ee6602a1fe
Upd: BATTLE_STATUS_*
2023-05-26 00:55:35 +08:00
Zuosizhu
72e5e200ed
Merge branch 'master_lme'
...
# Conflicts:
# README.md
2023-05-26 00:26:23 +08:00
LmeSzinc
c6df09e170
Upd: EXP_INFO_* and the exercise one
2023-05-25 21:45:19 +08:00
Zuosizhu
dba6d7e4e4
Merge branch 'LmeSzinc:master' into 20230309
2023-05-25 13:54:56 +08:00
LmeSzinc
b3628b2a4a
Fix: Missing B to 8 digit replacement
2023-05-22 12:10:12 +08:00
Zuosizhu
cacc828f08
Merge branch 'master_lme'
...
# Conflicts:
# config/template.json
# module/config/argument/args.json
# module/config/argument/argument.yaml
# module/config/config_generated.py
# module/config/i18n/zh-CN.json
# module/exercise/assets.py
# module/exercise/exercise.py
2023-04-12 15:25:30 +08:00
LmeSzinc
5105b4bfec
Fix: Limit expected emotion reduce to 29 at max
2023-04-11 22:46:13 +08:00
Zuosizhu
1e12176684
Fix: Multiple coin ocr in auto search combat
2023-03-28 17:44:16 +08:00
Zuosizhu
2bc586ce57
Merge branch 'master_lme'
...
# Conflicts:
# module/campaign/campaign_event.py
# module/campaign/campaign_status.py
2023-03-04 03:11:41 +08:00
Bookbug
45373c52b8
Fix: TaskBalancer malfunctioning caused by ocr failure ( #2295 )
...
* Fix: Cannot OCR coin when using auto search(#2289 )
* Merge TaskBalancer into StopCondition
* Add: Avoid zero OCR in coin
* Restruct function due to operator precedence
* Merge bug_fix into coin_autocheck
* Fix: Dumb error caused by no parameter
* Fix: Minor bugs
2023-03-03 22:19:07 +08:00
Zuosizhu
a94d7b58a5
Merge branch 'master_lme'
...
# Conflicts:
# module/ui/ui.py
2023-02-26 17:35:50 +08:00
LmeSzinc
8b6a68651a
Fix: Handle Chinese comma in HpControl_HpBalanceWeight
2023-02-26 01:25:32 +08:00
Zuosizhu
b072baa596
Merge branch 'master_lme'
...
# Conflicts:
# config/template.json
# 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/retire/retirement.py
2023-02-20 12:35:43 +08:00
LmeSzinc
d191d16649
Opt: Re-organise CalculateEmotion and IgnoreLowEmotionWarn
2023-02-18 01:19:04 +08:00
