Commit Graph

7662 Commits

Author SHA1 Message Date
SarContDeli
bd680eb3a8
Add: fake module PIL for webui (#4374)
* Add: fake module PIL for webui

* Fix: Load runtime before module PIL

* Upd: Error message of MAA loading failure

* Upd: Adjust timing of import fake module
2024-11-19 12:37:59 +08:00
LmeSzinc
bc5e6ed86a
Merge pull request #4377 from guoh064/event_update
Event update (20241114)
2024-11-14 17:28:13 +08:00
guoh064
d5c7eaa688 Add: [TW] event_20240229_cn 2024-11-14 09:54:07 +08:00
guoh064
b689b59ebd Add: [CN, EN, JP] event_20220915_cn rerun 2024-11-14 09:51:31 +08:00
LmeSzinc
1765b5e71f
Merge pull request #4375 from LmeSzinc/dev
Bug fix
2024-11-13 10:56:56 +08:00
Compeador
56a9df03d2
Add: JP iridescent fantasy ui quit button (#4369)
* Add: [JP] rainbow combat ui quit

* fix: minor displacement of quit btn
2024-11-12 11:26:48 +08:00
Hao Guo
4b6a9566a4
Revert "Upd: [JP] asset QUIT" (#4370)
This reverts commit bdd081f501.
2024-11-11 15:29:04 +08:00
SarContDeli
6cddaf420f
Fix: Compatible with new versions of maa (#4366) 2024-11-10 09:17:33 +08:00
LmeSzinc
1889ab1ac6
Merge pull request #4356 from LmeSzinc/dev
Bug fix
2024-11-06 20:35:24 +08:00
LmeSzinc
1c4857d653 Fix: Double clicking REWARD_GOTO_TACTICAL 2024-11-06 18:27:17 +08:00
Hao Guo
29b1e8b19c
Fix: predict_enemy_genre in t4 of event_20241024_cn (#4352) 2024-11-06 18:25:22 +08:00
hephooey
0d0aff44c0
[TW]Event: Whence Flowers Bear No Fruit (#4347) 2024-11-05 11:34:03 +08:00
LmeSzinc
e3fabe1fe6
Merge pull request #4336 from LmeSzinc/dev
Bug fix
2024-10-30 14:42:24 +08:00
LmeSzinc
9a31f709c0 Fix: Double clicking REWARD_GOTO_TACTICAL (#4328) 2024-10-30 14:37:58 +08:00
guoh064
227fed1665 upd: [JP] OCR_SHOP_YELLOW_COINS 2024-10-30 12:18:09 +08:00
guoh064
08a9326e84 upd: [JP] EmotionDigit pre_process 2024-10-30 12:18:09 +08:00
guoh064
ba27a51cbb tmp: [JP] OCR_REMAIN in daily 2024-10-30 12:18:09 +08:00
guoh064
1dd263d59d upd: [JP] get_zone_name correction 2024-10-30 12:18:09 +08:00
guoh064
51c84fc231 tmp: ocr_collect in jp 2024-10-30 12:18:09 +08:00
guoh064
6ea92ef60e upd: [JP] COIN_HOLDER in minigame 2024-10-30 12:18:09 +08:00
guoh064
68e6ac4b82 upd: [JP] OCR_SHOP_GOLD_COINS and OCR_SHOP_GEMS 2024-10-30 12:18:09 +08:00
guoh064
4f79fba2c2 upd: [JP] opsi beacon page color 2024-10-30 12:18:09 +08:00
guoh064
74e241d9ef Revert "tmp: [JP] opsi beacon page color and assets"
This reverts commit 402a0083ef.
2024-10-30 12:18:09 +08:00
LmeSzinc
47a85ab7e8
Merge pull request #4326 from LmeSzinc/dev
Event Tempesta and the Sleeping Sea (event_20241024_cn)
2024-10-25 23:10:34 +08:00
LmeSzinc
1024f5063d Add: CHAPTER_SWITCH_20241024 2024-10-25 22:31:20 +08:00
LmeSzinc
36568cab65 Add: Chapter SP 2024-10-25 22:31:18 +08:00
LmeSzinc
847dcd847b Add: Chapter T 2024-10-25 19:37:55 +08:00
guoh064
3f6738af8c Add: event entrance of event_20241024_cn 2024-10-25 11:55:23 +08:00
guoh064
049f478fd5 Add: auto format for campaign/Readme.md 2024-10-25 11:55:23 +08:00
LmeSzinc
25b5349fd3
Merge pull request #4307 from guoh064/asset_update
Revert "tmp: [JP] opsi beacon page color and assets"
2024-10-22 09:59:43 +08:00
guoh064
99363a3c14 upd: [JP] opsi beacon page color 2024-10-21 11:20:34 +08:00
guoh064
d3eb5fa774 Revert "tmp: [JP] opsi beacon page color and assets"
This reverts commit 402a0083ef.
2024-10-21 10:14:53 +08:00
LmeSzinc
05abbb2322
Merge pull request #4306 from LmeSzinc/dev
Bug fix
2024-10-20 22:40:06 +08:00
Air111
98e6d1397c Upd: [TW] Assets for COALITION_ACADEMY 2024-10-20 22:36:01 +08:00
guoh064
be856259a2 upd: [JP] ExpOnSkillSelect 2024-10-20 21:58:34 +08:00
guoh064
cc957fe92e upd: [JP] SKILL_EXP 2024-10-20 21:58:34 +08:00
guoh064
65304fee2e upd: [JP] LevelOcr and EmotionDigit 2024-10-20 21:58:34 +08:00
guoh064
d1052df932 Revert "tmp: [JP] LevelOcr"
This reverts commit a24a7fcfd1.
2024-10-20 21:58:34 +08:00
guoh064
17a6da533e upd: [JP] OCR_DOCK_AMOUNT 2024-10-20 21:58:34 +08:00
guoh064
d13e852b92 upd: [JP] retire assets 2024-10-20 21:58:34 +08:00
guoh064
92c5f5f59f upd: [JP] commission ocr 2024-10-20 21:58:34 +08:00
guoh064
168338b4aa Upd: [JP] asset OCR_REMAIN 2024-10-20 21:58:34 +08:00
guoh064
12096e5fd5 Upd: war archives entrance 2024-10-20 21:58:34 +08:00
guoh064
9390cf0b3d Upd: module.combat_ui.assets 2024-10-20 21:58:34 +08:00
LmeSzinc
560a747a75 Upd: [EN] QUIT assets 2024-10-18 22:09:12 +08:00
LmeSzinc
233462c605
Merge pull request #4298 from LmeSzinc/dev
Bug fix
2024-10-17 21:17:31 +08:00
guoh064
d4df09d0f4
Upd: [JP] asset QUIT (#4296) 2024-10-17 20:57:28 +08:00
guoh064
bd0fccbd31 Add: event entrance 20241017
* event_20220728_cn rerun in cn/en/jp
* coalition_20240627 in tw
2024-10-17 20:56:53 +08:00
guoh064
d35bfa0f5d Add: War Archives
* war_archives_20201012_cn
* war_archives_20210422_cn
* war_archives_20210916_cn
* war_archives_20211111_cn
* war_archives_20211229_cn
2024-10-17 20:56:53 +08:00
LmeSzinc
423ac123bf
Merge pull request #4291 from LmeSzinc/dev
Bug fix
2024-10-16 13:06:35 +08:00