LA_DI_DA
5ab8cfdee5
Merge branch 'refs/heads/lme-alas/master' into dev
...
# Conflicts:
# README.md
2024-07-06 19:17:11 +08:00
LmeSzinc
2995c5408d
Fix: Add Coalition as task requires balance ( #3941 )
2024-07-01 17:00:20 +08:00
Zuosizhu
7fdba38b75
Fix: Get value error while creating new enemies
...
(cherry picked from commit 41a17dd0d2 )
2023-09-15 08:51:24 +08:00
Zuosizhu
dfa815645d
Merge branch 'master_lme'
...
# Conflicts:
# module/campaign/campaign_status.py
# module/config/argument/args.json
2023-09-15 08:26:53 +08:00
LmeSzinc
686b7fb921
Fix: Adaptive OCR_OIL to handle black overlay
2023-09-14 22:44:28 +08:00
Zuosizhu
1e12176684
Fix: Multiple coin ocr in auto search combat
2023-03-28 17:44:16 +08:00
Zuosizhu
f505061384
Merge branch 'master_lme'
...
# Conflicts:
# module/campaign/assets.py
# module/campaign/campaign_status.py
2023-03-25 00:05:17 +08:00
LmeSzinc
8c4526b0c0
Fix: Handle appear animation in coalition page ( #2397 )
2023-03-24 23:18: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
88b68e22c0
Fix: Record 0 for pt when not in event
2023-02-25 13:43:50 +08:00
Zuosizhu
0a419cb876
Refactor: the way to call LogRes
2023-02-14 02:21:43 +08:00
Zuosizhu
d8bd81be88
Fix: Reduce config write. Part2
2023-02-10 18:51:03 +08:00
Zuosizhu
371734606d
Fix: Reduce config write.
2023-02-10 18:08:52 +08:00
Zuosizhu
9d6dc4f822
Fix: Dashboard record oil and coin between two battles in auto_search battles
2023-02-10 17:23:20 +08:00
Zuosizhu
25db60cc16
Fix: Duplicated codes.Add shop coins to dashboard. Need for i18n
2023-02-07 20:24:53 +08:00
Zuosizhu
13e5333569
Refactor: resource record and dashboard display
2023-02-07 10:48:11 +08:00
Zuosizhu
5aa1e7d00a
Fix: Meet part of LmeSzinc's demand
2023-02-06 10:52:51 +08:00
MengNianxiaoyao
f760a99812
Feature: Dashboard update for further features
2023-02-04 11:23:26 +08:00
LmeSzinc
5c70364353
Refactor: Abstract CampaignStatus class and fix task balancer in Raid
2022-10-30 14:49:04 +08:00