LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-16 11:49:28 +08:00
Code Activity
9,869 Commits 12 Branches 0 Tags
ef7d01a87bea10d7c91fa2e2fa9ba3b3ce630d37
Commit Graph

6933 Commits

Author SHA1 Message Date
Zuosizhu
2d535ebc3a Fix: shipyard ocr 2025-09-02 13:37:17 +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
0O0o0oOoO00
eaf985d185 add: no damage for alas control 2025-09-01 18:12:51 +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
LmeSzinc
1d5d461b5f Revert "Upd: [JP] digit ocr '1' mistaken as 'L'" 
This reverts commit ceb49fcb
 2025-08-31 01:30:01 +08:00
LmeSzinc
b911e53d3e Fix: War archive shouldn't have option_bold 2025-08-30 22:18:53 +08:00
0O0o0oOoO00
ea2b678218 add: better global speedup for alas control 2025-08-30 22:17:06 +08:00
LmeSzinc
719f225316 Gui: Show event as stored to prevent someone trying to select it 2025-08-30 22:15:53 +08:00
guoh064
9ccf678ef3 Fix: OSDaemon.combat_status() should accept end 'no_searching' (#5066) 2025-08-30 22:06:27 +08:00
0O0o0oOoO00
065f0feca3 add: skip battle celebrate for alas 2025-08-30 21:16:59 +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
guoh064
ceb49fcb14 Upd: [JP] digit ocr '1' mistaken as 'L' 2025-08-30 00:28:22 +08:00
LmeSzinc
653260f431 Tmp: [TW] Disable shop before it confirm working 2025-08-29 21:53:46 +08:00
LmeSzinc
7f1021c79f I18n: Simplify Campaign.Name help text 2025-08-29 21:49:22 +08:00
dragonheart107
0e7eaf6fae Fix: MetaReward undefined category defaults to beacon (#5063) 2025-08-29 21:41:54 +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
下面我簡單喵兩句
fcbc77c887 Upd:[TW]Event:Secrets of the Abyss (#5087) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2025-08-29 21:34:09 +08:00
nEEtdo0d
f014c92316 Merge pull request #5065 from dragonheart107/GUI 
Upd: GUI text
 2025-08-27 14:22:23 -04: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
a6e3706ae4 Opt: reduce downtime on select new ship for tactical lesson 2025-08-26 19:42:21 -04:00
nEEtdo0d
ee36113697 Fix: voucher shop revert, still old ui arrangement 2025-08-26 19:41:04 -04:00
nEEtdo0d
7112cba4b8 Fix: Shipyard should not reuse coin ocr in shop 2025-08-26 18:31:15 -04:00
LmeSzinc
721a5a00cf Fix: Gacha should not reuse coin ocr in shop 2025-08-26 00:48:01 +08: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
LmeSzinc
7c922b05ca Merge pull request #5047 from weeswelai/shop_ui_update_250814 
Upd: Update 250814 shop UI for server CN
 2025-08-25 10:41:26 +08:00
0O0o0oOoO00
b2c55961c3 add: monster kill self crack 2025-08-24 17:46:13 +08:00
weeswelai
9d544ae0e8 Upd: Update ShopItem_250814 method predict_valid, use np.max 2025-08-24 16:14:57 +08:00
0O0o0oOoO00
255eb905f7 add: fast wave crack 2025-08-24 16:05:24 +08:00
dragonheart107
4cd166212b Upd: GUI text 2025-08-23 20:29:41 +02:00
LmeSzinc
bb4eec062c Upd: [TW] Abyssal Refrain Rerun 2025-08-23 23:40:08 +08:00
LmeSzinc
596babb1d3 Fix: OS_CHECK may get detected while handling stories 2025-08-23 23:04:56 +08:00
guoh064
f7d1eeab1b Fix: ocr after_process for SKILL_EXP (#5056) 2025-08-23 22:30:13 +08:00
dragonheart107
6d3acaaddb Fix: Exercise item during battle (#5059) 
* Fix: event log

* Fix: random artefacts during exercise mistaken as Items

* Fix: small tweak
 2025-08-23 22:26:48 +08:00
weeswelai
2ccd1036d6 Upd: Update new shop UI goto supply pack page 2025-08-21 23:59:59 +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
b2f94c1685 Upd: Update server CN assets SUPPLY_PACK_CHECK 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
Air111
e32de1bfe2 Opt: clear interval of DOCK_SELECTED for faster ship changing (#5048) 2025-08-21 19:00:29 +08:00