Zuosizhu de303b492e Merge branch 'master_lme' into brocore_dev ...

# Conflicts:
#	module/config/argument/override.yaml
#	module/research/selector.py
#	module/ui/ui.py
#	module/webui/app.py

2025-07-11 23:03:05 +08:00

..

assets.py

Upd: [TW] SHOP_BUY_CONFIRM_AMOUNT

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

base.py

Fix: missing HiddenZoneDataLogger in regex (#4939)

2025-07-10 22:41:57 +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

Fix: random background thingy that may mis-detected as medal (#4786)

2025-05-19 03:49:17 +08:00

shop_merit.py

Refactor: Abstract ShopStatus class

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

shop_reward.py

fix: fix merge mistake of event shop

2025-05-24 12:05:52 +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

Add: Event Shop

2025-02-23 10:55:35 +08:00