LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-22 15:19:29 +08:00
Code Activity
9,051 Commits 12 Branches 0 Tags
6fdb207e7f109f8a025d3c9eb47fabdda0899bc8
Commit Graph

207 Commits

Author SHA1 Message Date
LA_DI_DA
66d0734ea0 Merge branch 'refs/heads/0O0o0oOoO00-alas/master' into dev 
# Conflicts:
#	alas.py
#	module/exception.py
 2024-07-06 19:23:57 +08:00
LA_DI_DA
573210af2b Merge branch 'refs/heads/lme-alas/master' into dev 
# Conflicts:
#	alas.py
#	module/os/fleet.py
 2024-06-22 20:31:35 +08:00
LmeSzinc
58202c6a40 Pref: Reuse image array to improve memory performance 2024-06-05 01:15:41 +08:00
LmeSzinc
24aa3e00bd Upd: [TW] Shop indexes, all server synced now 2024-06-03 01:56:08 +08:00
LmeSzinc
5b174e5839 Upd: [TW] Shop indexes, all server synced now 2024-06-03 00:52:20 +08:00
LA_DI_DA
f8964c88d9 Merge branch 'refs/heads/0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	.gitignore
#	alas.py
#	config/template.json
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/argument/task.yaml
#	module/config/config_generated.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
#	module/handler/login.py
 2024-05-23 13:07:57 +08:00
xhqss
c0c4913353 Merge branch '20230309' into smallkai 
# Conflicts:
#	module/config/i18n/zh-CN.json
 2024-05-23 08:25:21 +08:00
Zuosizhu
5123bd9949 Merge branch 'lme_master' 
# Conflicts:
#	README.md
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/equipment/equipment_change.py
 2024-05-19 00:50:11 +08:00
LmeSzinc
1fedcb6fda Fix: Retry getting stock limit 2024-05-06 00:59:16 +08:00
LmeSzinc
2650bc336a Fix: Retry getting shop item limit 2024-05-06 00:56:42 +08:00
LA_DI_DA
1be62c9c8f Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/config/argument/args.json
 2024-04-27 16:01:37 +08:00
LA_DI_DA
7b81250ec9 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	campaign/Readme.md
#	module/config/argument/args.json
 2024-04-27 15:56:34 +08:00
Zuosizhu
bdc7d43c97 Merge branch 'dev-revert-gemsfarming' 
# Conflicts:
#	assets/cn/handler/MOB_MOVE_CANCEL.png
#	module/device/method/utils.py
#	module/handler/fast_forward.py
 2024-04-20 15:16:09 +08:00
LmeSzinc
53aef7e992 Opt: Handle GET_ITEMS before info_bar to be one screenshot faster 2024-04-20 02:56:03 +08:00
Zuosizhu
4486c8cff6 Merge branch 'LmeSzinc:master' into 20230309 2024-04-15 23:25:52 +08:00
guoh064
87c466f55a Add: Medal Shop item SpecializedCore (#3637) 2024-04-13 23:42:53 +08:00
LA_DI_DA
722a96208a Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/config/argument/gui.yaml
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
 2024-02-18 17:49:13 +08:00
LA_DI_DA
1a467113f9 Fix: reset general shop consume coins setting when setting is still bool 2024-02-15 18:16:28 +08:00
LA_DI_DA
bfbe66ec4e Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	README.md
#	module/config/argument/args.json
 2024-02-06 21:51:57 +08:00
LA_DI_DA
259442c13b Merge branch 'zuosizhu-alas/20230309' into smallkai 2024-02-06 21:48:59 +08:00
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
mulaikurisu
0067321df9 Merge remote-tracking branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/config/argument/args.json
 2024-01-31 18:40:47 +08:00
mulaikurisu
4f60d70f9b Merge remote-tracking branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	module/config/argument/args.json
 2024-01-31 18:27:04 +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
LA-DI-DA
7a34a686a6 Adj: flexible consume coins limit 2024-01-16 22:22:39 +08:00
LA-DI-DA
1e41b28aa3 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 2023-11-24 17:04:42 +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
LA-DI-DA
26327087c9 Merge branch '0O0o0oOoO00-alas/smallkai' into dev 
# Conflicts:
#	module/shop/shop_reward.py
 2023-10-19 23:03:07 +08:00
LA-DI-DA
a65f53b966 Merge branch 'lme-alas/master' into smallkai 
# Conflicts:
#	module/map/assets.py
 2023-10-19 23:00:39 +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
LA-DI-DA
e498ddc432 Add: enable option for every shop in shop once 2023-09-20 13:36:43 +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