xhqss
|
ad07ec150b
|
Merge branch 'master_lme' into dev
# Conflicts:
# module/config/argument/args.json
# module/shop/ui.py
|
2025-11-07 18:11:22 +08:00 |
|
LmeSzinc
|
106a22143e
|
Fix: shop refresh not available
|
2025-11-04 14:01:43 +08:00 |
|
LmeSzinc
|
feecbc2c15
|
Fix: Handle two kinds of shop refresh button
|
2025-11-03 19:28:05 +08:00 |
|
xhqss
|
4137ff807c
|
Merge branch 'master_lme' into dev
# Conflicts:
# module/config/argument/args.json
# module/map/assets.py
# module/shop/shop_reward.py
# module/ui/assets.py
|
2025-10-24 11:10:21 +08:00 |
|
whjhs1010203
|
cac507229f
|
Upd: [TW] shop assets
|
2025-10-19 17:05:55 +08:00 |
|
Zuosizhu
|
1eef741b73
|
Fix: medal shop
|
2025-10-12 16:18:32 +08:00 |
|
Zuosizhu
|
26db9292c8
|
Fix: shit shop
|
2025-10-12 16:06:44 +08:00 |
|
Zuosizhu
|
f8dc506dad
|
Fix: shit
|
2025-10-12 12:43:32 +08:00 |
|
Zuosizhu
|
65df98ba36
|
Fix: shop
|
2025-10-12 12:35:42 +08:00 |
|
Zuosizhu
|
0d849aa003
|
Fix: shop_core
|
2025-10-12 11:49:27 +08:00 |
|
Zuosizhu
|
31c99d8953
|
Merge remote-tracking branch 'Lme/master' into dev
# Conflicts:
# module/campaign/os_run.py
# module/config/argument/args.json
# module/os/operation_siren.py
# module/retire/assets.py
# module/shop/shop_reward.py
# module/shop/ui.py
# module/ui/assets.py
|
2025-10-12 11:28:13 +08:00 |
|
LmeSzinc
|
80fe33d9c4
|
Upd: [JP] shop navigation assets
- TODO: update FREE_SUPPLY_PACK
|
2025-10-11 01:12:31 +08:00 |
|
nEEtdo0d
|
a61e93942d
|
Upd: [EN] UI, ShopUI, Freebies assets (#5202)
|
2025-10-10 21:20:18 +08:00 |
|
LmeSzinc
|
2267203305
|
Upd: ShopUI from #5197
|
2025-10-09 21:59:37 +08:00 |
|
LmeSzinc
|
470babfe80
|
Refactor: shop ui navigation
|
2025-10-09 21:44:27 +08:00 |
|
LmeSzinc
|
5df0383395
|
Tmp: Disable shop before assets updated
|
2025-10-09 21:16:08 +08:00 |
|
LmeSzinc
|
a1b9fffb16
|
Chore: Cleanup code and assets of old UI
|
2025-10-09 21:12:33 +08:00 |
|
weeswelai
|
01c6e5fd0f
|
Del: Delete old shop ui assets
|
2025-10-01 02:44:01 +08:00 |
|
weeswelai
|
1f909110a5
|
Upd: Update shop UI, supply pack for server TW
|
2025-10-01 02:42:22 +08:00 |
|
weeswelai
|
cdad6ed32e
|
Upd: Update shop_tab_250814 for server CN, TW
|
2025-09-28 14:11:56 +08:00 |
|
0O0o0oOoO00
|
f65933e89a
|
Merge branch 'Lme/master' into dev
# Conflicts:
# README.md
# module/config/argument/args.json
|
2025-09-13 23:04:47 +08:00 |
|
LmeSzinc
|
67985322a0
|
Fix: Handle MEDAL_SHOP_SCROLL_250814 just at 0.90
(330.5-61.5)/(422-123)
|
2025-09-09 00:39:06 +08:00 |
|
guoh064
|
6dd2b52795
|
Upd: [JP] asset SHOP_REFRESH (#5114)
|
2025-09-08 23:28:38 +08:00 |
|
Zuosizhu
|
c4d85cdb50
|
Fix: medalshop still too 2
|
2025-09-01 20:05:27 +08:00 |
|
Zuosizhu
|
427183a30c
|
Fix: Shop and Gacha
|
2025-09-01 19:46:40 +08:00 |
|
Zuosizhu
|
567e854546
|
Merge branch 'master_of_lme' into dev
# Conflicts:
# module/config/argument/args.json
# module/gacha/gacha_reward.py
# module/shop/shop_reward.py
# module/ui/assets.py
|
2025-09-01 16:07:45 +08:00 |
|
guoh064
|
e1a4a06be7
|
Upd: [JP] color of SHOP_OCR_BALANCE
|
2025-08-30 00:42:23 +08:00 |
|
guoh064
|
1feec35e4c
|
Upd: [JP] shop_tab_250814
|
2025-08-30 00:28:57 +08:00 |
|
LmeSzinc
|
653260f431
|
Tmp: [TW] Disable shop before it confirm working
|
2025-08-29 21:53:46 +08:00 |
|
nEEtdo0d
|
3d947fc72e
|
Fix: [EN] shop task; grid now uniform with other servers (#5081)
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
|
2025-08-29 21:36:37 +08:00 |
|
LmeSzinc
|
a9bf935f41
|
Opt: Early stop medal shop if having any item soldout
|
2025-08-27 23:26:44 +08:00 |
|
nEEtdo0d
|
5a9a227ff8
|
Fix: [EN] shop and supply pack tasks
|
2025-08-26 21:23:14 -04:00 |
|
nEEtdo0d
|
ee36113697
|
Fix: voucher shop revert, still old ui arrangement
|
2025-08-26 19:41:04 -04:00 |
|
sui_feng
|
d0857c549d
|
Merge pull request #5069 from sui-feng-cb/medal_shop_fix
Fix: class name MedalShop2_250814 for getattr
|
2025-08-26 00:39:49 +08:00 |
|
0O0o0oOoO00
|
e453c4464a
|
Merge branch 'Lme/master' into dev
# Conflicts:
# module/config/argument/args.json
# module/shop/shop_reward.py
# module/shop/ui.py
# module/ui/assets.py
|
2025-08-25 23:46:48 +08:00 |
|
LmeSzinc
|
0c92002bc0
|
Tmp: Limit shop to CN/TW before other server confirm working
|
2025-08-25 13:08:53 +08:00 |
|
LmeSzinc
|
48ac9d825c
|
Chore: Format code
|
2025-08-25 13:08:03 +08:00 |
|
weeswelai
|
9d544ae0e8
|
Upd: Update ShopItem_250814 method predict_valid, use np.max
|
2025-08-24 16:14:57 +08:00 |
|
weeswelai
|
87257e65a8
|
Upd: Update new UI 20250814 for server JP, update CN assets
|
2025-08-21 23:59:59 +08:00 |
|
weeswelai
|
ef22869306
|
Fix: Update func predict_valid, distinguish the selling status
|
2025-08-21 23:59:59 +08:00 |
|
weeswelai
|
55c37475f1
|
Upd: Add MedalShop_250814 cost_area
|
2025-08-21 23:59:59 +08:00 |
|
weeswelai
|
7562c8287c
|
Upd: Update server JP supply pack
|
2025-08-21 23:59:59 +08:00 |
|
weeswelai
|
11f5c78e8e
|
Upd: Update comments
|
2025-08-21 23:59:59 +08:00 |
|
weeswelai
|
bb7d12c3cc
|
Upd: Update server TW assets
|
2025-08-21 23:59:59 +08:00 |
|
weeswelai
|
0f14b7693d
|
Upd: Update server CN 2025-08-14 new shop UI
|
2025-08-21 23:59:59 +08:00 |
|
weeswelai
|
ba2a07c256
|
Upd: Update new UI 20250814 for server CN, update shop buy supply pack
|
2025-08-21 23:59:59 +08:00 |
|
0O0o0oOoO00
|
f96b13fea2
|
Merge branch 'Lme/master' into dev
# Conflicts:
# assets/cn/campaign/EVENT_20221124_ENTRANCE.png
# campaign/event_20221124_cn/campaign_base.py
# module/campaign/assets.py
# module/config/argument/override.yaml
# module/config/config_updater.py
# module/retire/assets.py
# module/shop/shop_reward.py
|
2025-08-16 14:24:45 +08:00 |
|
LmeSzinc
|
034f69e98e
|
Tmp: Disable supply pack for now
|
2025-08-15 11:58:07 +08:00 |
|
LmeSzinc
|
9b0e5156de
|
Tmp: disable shop before update
|
2025-08-14 18:36:17 +08:00 |
|
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 |
|