LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 23:49:25 +08:00
Code Activity
8,569 Commits 12 Branches 0 Tags
95a3fe236b2ef5a858f09e7af4937575baecbc34
Commit Graph

54 Commits

Author SHA1 Message Date
Zuosizhu
b6e6f60754 Merge branch 'LmeSzinc:master' into 20230309 2024-03-29 07:09:29 +08:00
LmeSzinc
8be7d9f794 Add: Enter stage in RPG raid 2024-03-29 02:27:36 +08:00
Zuosizhu
73c29c9afd Merge branch 'LmeSzinc:master' into 20230309 2024-02-06 21:00:56 +08:00
weeswelai
b3521111f9 Upd: Update pt OCR recognition of Raid_20240130 2024-02-05 10:41:53 +08:00
Zuosizhu
62712d1864 Merge branch 'LmeSzinc:master' into 20230309 2024-01-31 13:10:56 +08:00
weeswelai
b04b349206 Add: Add raid event Spring Festive Fiasco(raid_20240130) 2024-01-31 10:57:34 +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
54d4920a63 Fix: Handle RAID_REWARDS at raid ocr (#2838) 2023-07-07 00:38:10 +08:00
Tarin_Chan
b9e5134464 Fix: add RAID_REWARDS.png to fix raid reward problem (#2829) 
* Add files via upload

* Update raid.py

更改了逻辑
特别感谢Alas群 莱森·何Horizon101011 的帮助

* Update raid.py

趁没人看见修点丢人bug

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-07-02 15:38:44 +08:00
Zuosizhu
68a2ba7c12 Merge branch 'LmeSzinc:master' into 20230309 2023-07-01 20:57:27 +08:00
nEEtdo0d
e0f79d13ca Add: Gorizia raid ex ocr clause and remain asset 2023-06-30 17:38:52 -04:00
Zuosizhu
b34d2afc1a Merge branch 'LmeSzinc:master' into 20230309 2023-06-30 19:51:52 +08:00
LmeSzinc
2c39f195f8 Add: [CN] Raid assets of Reflections of the Oasis 2023-06-30 16:05:15 +08:00
Zuosizhu
fb67ae3ab7 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	module/campaign/campaign_event.py
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/config_manual.py
#	module/config/config_updater.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
 2023-03-24 16:33:37 +08:00
xzjjasper
802bb6c26e Upd: [TW] raid assets 2023-03-23 21:52:41 +08:00
Zuosizhu
e1811c1ac0 Fix: value log error 2023-02-14 08:10:18 +08:00
Zuosizhu
db9443be2e Merge branch master_GUI 2023-02-08 08:02:39 +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
Zuosizhu
bb62c17259 Refactor: LogName of Dashboard. Icon of Alas 2023-02-01 02:41:44 +08:00
Zuosizhu
a102dd16c1 Fix: Not logging oil in OpSi. Reduntant codes. Template fix. 2023-01-31 04:03:13 +08:00
Zuosizhu
d07264269e Merge branch master from "github.com/LmeSzinc/AzurLaneAutoScript" 2023-01-31 00:01:24 +08:00
Zuosizhu
1071f2f3d0 Feature: Support for log resTime 2023-01-30 18:01:04 +08:00
nEEtdo0d
539ec00f09 Add: support automate raid ex mode 2023-01-28 12:19:02 -05:00
Zuosizhu
3ff90bc0c6 Remake: Encapsulation of GG Handler 
* Remake: Encapsulation of GG Handler

* Fix: Unstoppable restart
 2023-01-28 15:46:53 +08:00
Zuosizhu
3624fbffeb Fix: Difference between log and config 2023-01-27 14:49:58 +08:00
Zuosizhu
8b6b3c00b2 Feature: Configurable power-limit 2023-01-24 20:31:12 +08:00
Zuosizhu
2a76ef57fd Fix: Checkbox AutoRestartGG of no use 2023-01-21 05:49:05 +08:00
Zuosizhu
a496f8b39e Feature: Auto restart in unsafe situations when GG is on 2023-01-21 05:06:56 +08:00
Zuosizhu
0d5ed252ca Fix: Raid PT log (althogh the original one is not functioning) 2023-01-20 20:09:47 +08:00
LmeSzinc
d1d7efc80a Fix: Handle default PT value 70001 2023-01-19 17:01:39 +08:00
LmeSzinc
5482dc660d Add: Event Winter Pathfinder (raid_20230118) 2023-01-18 18:30:59 +08:00
LmeSzinc
59183aeff1 Fix: Oil limit too low 2022-11-29 21:15:51 +08:00
LmeSzinc
158a617e7d Opt: Remove redundant config read before raid battle 2022-10-30 14:49:21 +08:00
LmeSzinc
5c70364353 Refactor: Abstract CampaignStatus class and fix task balancer in Raid 2022-10-30 14:49:04 +08:00
YJGeng-Iriy
911c5cb4d1 raid_20221027_2 2022-10-28 01:26:19 +08:00
YJGeng-Iriy
2551107e10 raid_20221027 2022-10-28 00:44:47 +08:00
LmeSzinc
154787cae8 Fix: [JP] '/' is missing in raid daily ocr 2022-07-02 01:53:25 +08:00
LmeSzinc
2c3360f988 Fix: Ignore default raid PT value 70000 2022-07-01 20:54:22 +08:00
LmeSzinc
a937994aab Fix: [EN] '/' is missing in raid daily ocr 2022-07-01 18:38:53 +08:00
LmeSzinc
c6a4c13038 Add: Support PT limit in Raid 
- Fix: Disable RAID_FLEET_PREPARATION at startup
- TODO: EN and JP need to update IRIS_OCR_PT
 2022-06-30 22:26:54 +08:00
LmeSzinc
ea209009a5 Add: Raid event Angel of Iris (raid_20220630) 
TODO: EN and JP need assets update
 2022-06-30 21:17:05 +08:00
LmeSzinc
65d964b65e Fix: map_is_2x_book is in emotion calculation before map_get_info() 2022-06-09 23:24:51 +08:00
LmeSzinc
2a09605eb6 Fix: Add another port repair check condition 2022-01-28 13:16:08 +08:00
LmeSzinc
b1a7f57628 Fix: Missing emotion check before raid battle 2022-01-28 12:53:35 +08:00
LmeSzinc
cd7b0a565e Fix: Wait daily count show up (#908) 2022-01-28 00:03:43 +08:00
LmeSzinc
7856c5eba5 Add: Joint Battle Mystery Investigation (raid_20220127) 2022-01-27 20:49:46 +08:00
LmeSzinc
61cbe75527 Refactor: More accurate exceptions and add friendly advices 2021-09-16 12:09:00 +08:00
Ray
bcb06487fd Fix: use raid_daily_name (not raid_name) in Daily 2021-07-13 15:05:16 +08:00
LmeSzinc
6f103bae6b Ref: Raid entrance assets for multiple raid events 2021-07-08 22:57:21 +08:00