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

..

assets.py

Upd: [TW] SHOP_BUY_CONFIRM_AMOUNT

2023-10-17 18:27:14 +08:00

base.py

Upd: Regex for merit shop (#3305)

2023-11-23 22:01:48 +08:00

clerk.py

Fix: Handle missing / in tactical skill ocr

2024-02-06 20:29:10 +08:00

shop_core.py

Refactor: Abstract ShopStatus class

2023-01-31 23:59:41 +08:00

shop_general.py

Fix: reset general shop consume coins setting when setting is still bool

2024-02-15 18:16:28 +08:00

shop_guild.py

Fix: Missing cached_property decorator on shop_guild_items (fixed #2898)

2023-07-20 14:36:48 +08:00

shop_medal.py

Fix: [TW] shop_medal_grid (#2956)

2023-08-02 23:56:56 +08:00

shop_merit.py

Refactor: Abstract ShopStatus class

2023-01-31 23:59:41 +08:00

shop_reward.py

Merge branch '0O0o0oOoO00-alas/smallkai' into dev

2023-10-19 23:03:07 +08:00

shop_select_globals.py

Fix: Shop select grids (#2684)

2023-06-04 02:44:25 +08:00

shop_status.py

Refactor: the way to call LogRes

2023-02-14 02:21:43 +08:00

shop_voucher.py

Refactor: Abstract ShopStatus class

2023-01-31 23:59:41 +08:00

ui.py

Upd: Shop module

2023-07-14 01:43:19 +08:00