LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-21 00:39:29 +08:00
Code Activity
7,388 Commits 12 Branches 0 Tags
f93b3b3db5c94a3ee40afc59cd3ee419eef215b0
Commit Graph

1603 Commits

Author SHA1 Message Date
LA-DI-DA
2a7232bea8 Update alas.svg 2023-07-17 19:58:11 +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
xzjjasper
065d4a8bce Upd: [TW] assets of shop module 2023-07-14 12:03:38 +08:00
LmeSzinc
2cd7f1df01 Fix: Add missing cost templates 2023-07-14 02:04:05 +08:00
LmeSzinc
044038254a Upd: Shop module 
- Assume TW is unchanged
 2023-07-14 01:43:19 +08:00
LmeSzinc
77cea4d7dd Upd: [CN][EN][JP] Assets of page_munition 2023-07-14 00:31:55 +08:00
LmeSzinc
85bea51b60 Upd: Assets for entering supply pack 2023-07-14 00:31:52 +08:00
Bookbug
3072424c47 Add: Blueprint assets of research S6 (#2872) 
* Add: Assets of research S6

* Add: Assets of research S6

* Del: Caps pic

* Del: Caps pic
 2023-07-13 23:02:25 +08:00
LmeSzinc
90c359c6be Upd: Add merit shop templates 2023-07-04 22:58:18 +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
Bookbug
e3d902a650 Add: [JP] Raid assets of Reflections of the Oasis (#2822) 2023-07-01 14:47:52 +08:00
nEEtdo0d
e88ae341f1 Upd: [EN] various assets for server; war_archive, os_ash, template, and handler 2023-06-30 18:00:33 -04:00
nEEtdo0d
096a5d394a Upd: [EN] shop swipe end on gift shop label 2023-06-30 17:58:31 -04: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
b3f1461e37 Upd: [EN] Raid assets of Reflections of the Oasis 2023-06-30 16:16:24 +08:00
LmeSzinc
2c39f195f8 Add: [CN] Raid assets of Reflections of the Oasis 2023-06-30 16:05:15 +08:00
iceynano
ffe3988e72 Fix: Error caused by empty build queue (#2816) 
* Fix: Error caused by empty build queue

* feat: add BUILD_QUEUE_EMPTY assets

* fix: use image_color_count() for identify images

* chore: remove useless asset

* fix: Avoid info_bar and use appear()

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: SaarChaffee <saarchaffee@qq.com>
 2023-06-30 15:32:41 +08:00
Zuosizhu
7cea084ecb Merge branch 'master_lme' 
# Conflicts:
#	assets/gui/css/alas.css
#	module/config/argument/task.yaml
#	module/config/config_updater.py
 2023-06-22 01:06:48 +08:00
Zuosizhu
fbcb8f5292 Merge branch 'LmeSzinc:master' into 20230309 2023-06-18 03:01:08 +08:00
LmeSzinc
0c37354ed5 Opt: List tasks instead of collapsing them in submodules 2023-06-17 22:11:19 +08:00
lwhzbyz
055260a23c Fix asset for SHOP_SELECT_PR1 (#2771) 2023-06-15 02:08:09 +08:00
Zuosizhu
8b8d8c9b67 Merge branch 'LmeSzinc:master' into 20230309 2023-06-14 22:05:37 +08:00
LmeSzinc
44b0cad4bd Merge pull request #2556 from hgjazhgj/fpy 
Add: Submodule AlasFpyBridge (experimental)
 2023-06-11 19:25:41 +08:00
guoh064
6dde835ce1 Upd: [JP] DOCK_SELECTED (#2750) 2023-06-11 01:41:02 +08:00
lwhzbyz
1789d8a7bd Bug fix: Guild shop PR SELECT (#2740) 
* Change SHOP_SELECT_PR for all servers.

* Change SHOP_SELECT_PR for all servers.

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-06-11 01:40:48 +08:00
Zuosizhu
1acc700629 Merge branch 'LmeSzinc:master' into 20230309 2023-06-10 02:53:17 +08:00
LmeSzinc
f71d6d0a69 Upd: [EN] ACADEMY_CHECK 2023-06-10 02:41:03 +08:00
LmeSzinc
ac30c3b65a Upd: [EN][JP] BATTLE_STATUS_CF, EXP_INFO_CF 2023-06-10 01:39:23 +08:00
LmeSzinc
e94a54daed Upd: [CN] BATTLE_STATUS_CF, EXP_INFO_CF 2023-06-09 00:19:01 +08:00
LmeSzinc
202f271782 Upd: [EN] SHOP_PROTOTYPE_SWIPE_END 2023-06-08 23:59:17 +08:00
LmeSzinc
166fa65ecc Upd: [EN] DOCK_SELECTED 2023-06-08 23:54:48 +08:00
Fisher Tipsy
ab0c8d0b85 Add: Allow auto attack dossier (#2579) 2023-06-08 22:28:44 +08:00
guoh064
df2dbd53ee Upd: [JP] Shop swipe ends (#2731) 2023-06-08 22:26:39 +08:00
Zuosizhu
1b2e230274 Merge branch 'LmeSzinc:master' into 20230309 2023-06-08 21:43:02 +08:00
LmeSzinc
454e308702 Upd: [CN][TW] DOCK_SELECTED (#2729) 2023-06-08 16:33:31 +08:00
LmeSzinc
4ff611fec1 Upd: [CN] Shop swipe ends 2023-06-08 16:26:25 +08:00
Zuosizhu
987423a96f Merge branch 'LmeSzinc:master' into 20230309 2023-05-27 20:30:22 +08:00
hgjazhgj
742e34c8d0 Merge branch 'dev' into fpy 2023-05-27 19:12:05 +08:00
LmeSzinc
d98f04d5bf Add: Siren templates 2023-05-27 18:56:49 +08:00
LmeSzinc
f9e9824c55 Fix: Stage entrance extraction in Confluence of Nothingness 2023-05-26 17:34:21 +08:00
guoh064
d38e448425 Upd: [JP] Shop swipe end assets (#2623) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-05-26 13:48:55 +08:00
Zuosizhu
2d95de0dc5 Merge branch 'LmeSzinc:master' into 20230309 2023-05-26 09:51:44 +08:00
LmeSzinc
dd8824ecd2 Upd: [EN] Shop swipe ends 2023-05-26 01:37:28 +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
8625d19ae9 Fix: [CN] UI switching in shops 2023-05-25 23:04:23 +08:00
LmeSzinc
c6df09e170 Upd: EXP_INFO_* and the exercise one 2023-05-25 21:45:19 +08:00
Zuosizhu
4d1fd01511 Merge branch 'master_lme' 
# Conflicts:
#	assets/jp/gacha/BUILD_CUBE_COUNT.png
#	module/campaign/run.py
#	module/gacha/assets.py
 2023-05-15 17:22:33 +08:00