ZuoSiZhu 39c18d8103 Merge remote-tracking branch 'lme/master' into dev ...

# Conflicts:
#	deploy/AidLux/0.92/requirements.txt
#	module/campaign/campaign_event.py
#	module/os/map.py
#	module/os_ash/ash.py
#	module/webui/config.py

2025-02-28 11:01:23 +08:00

..

assets.py

Upd: [TW] SHOP_BUY_CONFIRM_AMOUNT

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

base.py

Add: Medal Shop item SpecializedCore (#3637)

2024-04-13 23:42:53 +08:00

clerk.py

Fix: Retry getting stock limit

2024-05-06 00:59:16 +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

Pref: Reuse image array to improve memory performance

2024-06-05 01:15:41 +08:00

shop_merit.py

Refactor: Abstract ShopStatus class

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

shop_reward.py

Upd: [TW] Shop indexes, all server synced now

2024-06-03 01:56:08 +08:00

shop_select_globals.py

Fix: Shop select grids (#2684)

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

shop_status.py

Merge branch 'master_lme'

2024-11-15 17:14:11 +08:00

shop_voucher.py

Update shop_voucher.py (#4576)

2025-02-12 01:40:25 +08:00

ui.py

Upd: Shop module

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