LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-18 15:19:28 +08:00
Code Activity
7,931 Commits 12 Branches 0 Tags
ce6cb8c4bfd1f105b054e4eaafeeaa2a8be99ee4
Commit Graph

180 Commits

Author SHA1 Message Date
Zuosizhu
73c29c9afd Merge branch 'LmeSzinc:master' into 20230309 2024-02-06 21:00:56 +08:00
LmeSzinc
1750f31199 Fix: Handle missing / in tactical skill ocr 2024-02-06 20:29:10 +08:00
Zuosizhu
1e70cabadf Merge branch 'master_lme' 
# Conflicts:
#	deploy/alas.py
 2024-01-31 09:13:04 +08:00
LmeSzinc
640365584d Fix: Handle missing / in StockCounter 2024-01-30 00:30:54 +08:00
Zuosizhu
395090785f Merge branch 'LmeSzinc:master' into 20230309 2023-11-24 07:58:05 +08:00
ATH733
0efe9e3e43 Upd: Regex for merit shop (#3305) 2023-11-23 22:01:48 +08:00
Zuosizhu
526d26e6c6 Merge branch 'LmeSzinc:master' into 20230309 2023-10-19 22:53:32 +08:00
LmeSzinc
5e6ec95b37 Upd: [TW] SHOP_BUY_CONFIRM_AMOUNT 2023-10-17 18:27:14 +08:00
LmeSzinc
cc777e71cc Fix: Missing iris pattern in shop regex (#3075) 2023-10-14 22:32:01 +08:00
LmeSzinc
f5aa5b2d09 Fix: [TW] Shop nav without core limited (#3152) 2023-10-14 22:22:23 +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
guoh064
37e852aadc Add: Crystal Fragment template/filter_string in Voucher Shop (#3068) 2023-09-01 00:46:05 +08:00
Zuosizhu
af06355a75 Merge branch 'LmeSzinc:master' into 20230309 2023-08-13 00:02:41 +08:00
霞飛
30600ae68a fix: shop confirm amount buttom (#3001) 2023-08-11 19:05:52 +08:00
Zuosizhu
c22157a548 Merge branch 'LmeSzinc:master' into 20230309 2023-08-04 00:20:16 +08:00
LmeSzinc
e5e602d9f3 Fix: [TW] shop_medal_grid (#2956) 2023-08-02 23:56:56 +08:00
Zuosizhu
43b707eb61 Merge branch 'LmeSzinc:master' into 20230309 2023-07-21 00:07:23 +08:00
LmeSzinc
8b246421bf Fix: Missing cached_property decorator on shop_guild_items (fixed #2898) 2023-07-20 14:36:48 +08:00
LmeSzinc
7460deb799 Upd: Merge shop/guild and shop/guild_cn 2023-07-19 00:12:30 +08:00
SarContDeli
048268b406 Add: Consume spilled Coins 2023-07-18 23:20:50 +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
d7765f408e Upd: [TW] shop module 2023-07-14 12:15:49 +08:00
xzjjasper
065d4a8bce Upd: [TW] assets of shop module 2023-07-14 12:03:38 +08:00
LmeSzinc
fb68f93bfe Fix: MEDAL_SHOP_SCROLL.drag_threshold 2023-07-14 11:21:35 +08:00
LmeSzinc
044038254a Upd: Shop module 
- Assume TW is unchanged
 2023-07-14 01:43:19 +08:00
LmeSzinc
5af6dce001 Tmp: Disable shop tasks until assets are updated 2023-07-13 13:49:15 +08:00
Zuosizhu
68a2ba7c12 Merge branch 'LmeSzinc:master' into 20230309 2023-07-01 20:57:27 +08:00
nEEtdo0d
096a5d394a Upd: [EN] shop swipe end on gift shop label 2023-06-30 17:58:31 -04:00
Zuosizhu
fbcb8f5292 Merge branch 'LmeSzinc:master' into 20230309 2023-06-18 03:01:08 +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
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
9bf6ce09da Fix: [EN] UI navigate to page_munitions 2023-06-10 01:46:00 +08:00
LmeSzinc
202f271782 Upd: [EN] SHOP_PROTOTYPE_SWIPE_END 2023-06-08 23:59:17 +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
4ff611fec1 Upd: [CN] Shop swipe ends 2023-06-08 16:26:25 +08:00
Zuosizhu
ed4d51851c Merge branch 'LmeSzinc:master' into 20230309 2023-06-04 20:03:28 +08:00
LmeSzinc
9e9adece07 Fix: Shop select grids (#2684) 2023-06-04 02:44:25 +08:00
Zuosizhu
987423a96f Merge branch 'LmeSzinc:master' into 20230309 2023-05-27 20:30:22 +08:00
LmeSzinc
a5ac6e9861 Fix: [TW] Keep TW shops as the old (#2628) 2023-05-27 18:54:51 +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
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
Zuosizhu
2728b60d28 Merge branch 'LmeSzinc:master' into master 2023-03-09 00:54:24 +08:00
LmeSzinc
61547891cf Add: Buy merit ships (#2324) 2023-03-08 00:27:31 +08:00
Zuosizhu
0a419cb876 Refactor: the way to call LogRes 2023-02-14 02:21:43 +08:00