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
霞飛
2f9d365fa7
Opt: a better limit when items need to be handled amount ( #4802 )
...
* fix: a better limit when items need to be handled amount
* opt: loop control when handle amount
2025-05-19 03:51:25 +08:00
霞飛
04074db590
Merge pull request #4799 from SaarChaffee/fix-akashi-shop
...
fix: no need to check counter in akashi shop
2025-05-18 15:50:02 +08:00
霞飛
12342c8a3d
doc: add function doc
2025-05-15 14:06:20 +08:00
霞飛
99a577dfcb
fix: item fields typo
2025-05-15 14:05:33 +08:00
霞飛
95d732ab85
fix: argument typo
2025-05-15 13:13:06 +08:00
霞飛
7ee0460e68
fix: handle when shop amount is 0
2025-05-14 02:54:59 +08:00
霞飛
d07157eadf
fix: handle error when can not parse counter
2025-05-14 02:53:55 +08:00
silvergundam
95b1b07062
Fix: Yellow coins preserve in OS Shop
2025-03-04 20:26:31 +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
cf24123677
Upd: [JP] PRICE_OCR in os_shop ( #4601 )
2025-02-23 22:16:17 +08:00
霞飛
3b23cc920b
fix: Incorrect truncation ( #4570 )
2025-02-08 00:50:11 +08:00
xhqss
2ddc7fff1c
Merge branch 'master_lme'
...
# Conflicts:
# module/campaign/gems_farming.py
# module/config/config_manual.py
# module/handler/assets.py
# module/retire/retirement.py
# module/tactical/tactical_class.py
2025-01-16 08:52:42 +08:00
LmeSzinc
04de22164f
Opt: Clear GET_ITEMS_1 interval before os_shop_buy_execute
2025-01-08 12:43:14 +08:00
LA_DI_DA
3b2e152bc2
Del: remove literal rubbish from the preset of the OS shop
2024-07-31 21:53:51 +08:00
LA_DI_DA
a12a831419
Merge branch 'refs/heads/lme-alas/master' into dev
...
# Conflicts:
# alas.py
2024-07-18 23:12:53 +08:00
霞飛
820eea8550
fix: SHOP_BUY_CONFIRM_AMOUNT behavior on slower devices ( #3998 )
...
* fix: SHOP_BUY_CONFIRM_AMOUNT behavior on slower devices
* fix: set interval and reset flag
2024-07-18 21:39:03 +08:00
ReLU
fceeff25e0
Merge remote-tracking branch 'upstream/master' into dev
2024-07-12 03:54:22 +08:00
霞飛
e9179258b2
fix: opsi amount handler and counter ocr ( #3974 )
...
* fix: bugs
* fix
2024-07-11 22:22:07 +08:00
LA_DI_DA
8207914751
Adj: remove PurpleCoins from os shop preset
2024-07-06 20:49:35 +08:00
LmeSzinc
bf03385d6a
Opt: Cache yellow_coins_preserve
2024-07-06 00:52:25 +08:00
LmeSzinc
1bda94335a
Fix: Handle popup confirm in opsi shop buy
2024-07-03 22:27:53 +08:00
霞飛
cb9114c7bd
Fix: none cost ( #3947 )
...
* fix: none cost
* upd: assets
2024-07-01 13:45:21 +08:00
霞飛
79edef015f
fix: handle sidebar disappear ( #3930 )
...
* fix: handle OpsiShop disappear
* docs: add a condition to OpsiShop
* ref: remove useless loop
* fix: exception
* feat: skip to the next month if the new shop do not unlock
2024-06-28 12:18:08 +08:00
LmeSzinc
ee334e4cb9
Fix: Enlarge drag threshold of OS_SHOP_SCROLL
2024-06-23 18:06:45 +08:00
霞飛
1d464a912c
fix: use Unique instance ID instead
2024-06-22 21:43:55 +08:00
霞飛
ad6cb7fab0
chore: move functions and expand expressions
2024-06-22 21:43:55 +08:00
霞飛
0b97b40c46
Feature: New OpsiShop. ( #3086 )
...
* feat: New OpsiShop
* fix: use AdaptiveScroll
* feat: scan counter
* perf: calculate y value
2024-06-17 11:24:40 +08:00
