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
guoh064
7c7c568ca3
Fix: missing HiddenZoneDataLogger in regex ( #4939 )
2025-07-10 22:41:57 +08:00
0O0o0oOoO00
7a8f898936
fix: fix merge mistake of event shop
2025-05-24 12:05:52 +08:00
ZuoSiZhu
dee0c1484f
Merge branch 'master_lme' into dev
...
# Conflicts:
# campaign/Readme.md
# module/base/utils.py
# module/coalition/assets.py
# 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/handler/login.py
# module/retire/dock.py
# module/retire/enhancement.py
# module/shop/shop_reward.py
2025-05-21 04:17:08 +08:00
LmeSzinc
2b05348f8d
Fix: random background thingy that may mis-detected as medal ( #4786 )
2025-05-19 03:49:17 +08:00
LmeSzinc
1c338e220a
Fix: Clear click record between shop runs
...
to avoid potential GameTooManyClickError
2025-04-25 01:10:42 +08:00
LA-DI-DA
62c33f27e0
Merge the remaining functions in MoreAlas
2025-04-24 23:30:50 +08:00
guoh064
e8afd8a5a9
Merge remote-tracking branch 'guoh064/shop_event_3' into dev
2025-03-23 21:32:39 +08:00
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
guoh064
1f059ff84e
Add: Event Shop
...
Fix: correct pt locations to adapt
Fix: missing self parameter in ur_ship_costs
Opt: Refactor event shop item handling and improve max amount calculation
Fix: ensure bought_all is set correctly after confirming purchase
Fix: update ship buying logic to handle multiple purchases and ensure pt_ur is set correctly
2025-02-23 10:55:35 +08:00
Shane (Treasure) Xue
1435bb7252
Update shop_voucher.py ( #4576 )
...
Corrected scroll action: should scroll to next page, not the bottom.
2025-02-12 01:40:25 +08:00
xhqss
fad84bb0fa
Merge branch 'master_lme'
2024-11-15 17:14:11 +08:00
guoh064
68e6ac4b82
upd: [JP] OCR_SHOP_GOLD_COINS and OCR_SHOP_GEMS
2024-10-30 12:18:09 +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
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
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
1a467113f9
Fix: reset general shop consume coins setting when setting is still bool
2024-02-15 18:16:28 +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
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
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
