1
0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-14 11:49:26 +08:00
Commit Graph

8316 Commits

Author SHA1 Message Date
0O0o0oOoO00
0b1bfce553 fix: do not run commission, reward and reward logic error 2025-09-12 23:29:44 +08:00
0O0o0oOoO00
fbeeb766fa fix: import datetime again 2025-09-12 23:12:56 +08:00
0O0o0oOoO00
794bbdb221 fix: remove timeout param when push crack files 2025-09-12 23:04:21 +08:00
0O0o0oOoO00
efb9bea743 fix: return result from full config after result checked 2025-09-12 23:00:26 +08:00
0O0o0oOoO00
1821a8aba9 add: log non-existent configuration fields 2025-09-12 22:37:40 +08:00
0O0o0oOoO00
998cf9c65f add: add scheduler watcher support 2025-09-12 22:35:00 +08:00
0O0o0oOoO00
1918e56dbb add: support game auto restart 2025-09-12 19:15:32 +08:00
0O0o0oOoO00
cf0c93a766 add: add do not run reward, commission and research actually 2025-09-12 00:11:58 +08:00
0O0o0oOoO00
026860508a add: add shop enable setting for each shop in shop once 2025-09-11 23:56:53 +08:00
0O0o0oOoO00
1f6b8ddd47 Merge remote-tracking branch 'LmeSzinc/master' into refactor 2025-09-11 23:43:38 +08:00
0O0o0oOoO00
d8389dd470 ref: get crack setting through full config 2025-09-11 23:38:46 +08:00
0O0o0oOoO00
a2db3daa03 add: add power limit setting 2025-09-11 23:12:25 +08:00
LmeSzinc
4b85d18958 Merge pull request #5118 from LmeSzinc/dev
Bug fix
2025-09-09 01:05:56 +08:00
LmeSzinc
327eb2f9b9 Fix: [ALAS] BlueStacks Air serial auto increase from 127.0.0.1:5555 + 10*n 2025-09-08 23:37:45 +08:00
guoh064
6dd2b52795 Upd: [JP] asset SHOP_REFRESH (#5114) 2025-09-08 23:28:38 +08:00
LmeSzinc
7a578ea855 Bug fix (#5104)
* Merge pull request #5102 from guoh064/jp_os_names

Fix: [JP] get_zone_name after process

* fix: some shop item assets (#5100)

---------

Co-authored-by: guoh064 <50830808+guoh064@users.noreply.github.com>
Co-authored-by: Compeador <qj6w94g0q@gmail.com>
2025-09-03 12:49:49 +08:00
Compeador
8bf8b5c1a4 fix: some shop item assets (#5100) 2025-09-03 12:47:15 +08:00
guoh064
ec3d215deb Merge pull request #5102 from guoh064/jp_os_names
Fix: [JP] get_zone_name after process
2025-09-03 12:29:17 +08:00
LmeSzinc
17842593a6 Bug fix (#5097)
* Fix: OpsiCrossMonth should not buy oil at meowfficer farming step (#5095)

* Refactor: Gitpython preparations

* Opt: disable handle_get_items in OSCombat.combat_status (#5019)

---------

Co-authored-by: guoh064 <50830808+guoh064@users.noreply.github.com>
2025-09-02 01:06:52 +08:00
guoh064
804f8c5f10 Opt: disable handle_get_items in OSCombat.combat_status (#5019) 2025-09-02 01:05:17 +08:00
LmeSzinc
8c4a9600e6 Refactor: Gitpython preparations 2025-09-02 00:59:07 +08:00
guoh064
f65c0c17e9 Fix: OpsiCrossMonth should not buy oil at meowfficer farming step (#5095) 2025-09-02 00:51:58 +08:00
0O0o0oOoO00
160b6bdb1f add: base framework of game restart and instance restart 2025-09-02 00:48:40 +08:00
0O0o0oOoO00
f2137c699a fix: add the newly added mains and events to the scheduler priority 2025-09-01 00:22:57 +08:00
0O0o0oOoO00
c823e21b77 add: more events and mains 2025-09-01 00:14:00 +08:00
0O0o0oOoO00
cfea6f5715 fix: ignore existing fields of self 2025-09-01 00:08:25 +08:00
0O0o0oOoO00
488ded9f18 add: full config access 2025-08-31 23:58:15 +08:00
0O0o0oOoO00
9c2eb2b0d9 adj: remove event name lock 2025-08-31 23:16:03 +08:00
0O0o0oOoO00
00918d42a3 add: base support for luahook 2025-08-31 22:39:41 +08:00
0O0o0oOoO00
93cd5a8425 upd: alas.svg 2025-08-31 21:32:16 +08:00
0O0o0oOoO00
b2c66347ce del: remove all readme 2025-08-31 21:26:07 +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
34611fb420 Merge pull request #5092 from LmeSzinc/dev
Bug fix
2025-08-30 22:19:24 +08:00
LmeSzinc
b911e53d3e Fix: War archive shouldn't have option_bold 2025-08-30 22:18:53 +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
LmeSzinc
58ea4a1fe1 Merge pull request #5090 from guoh064/jp_shop
Fix: [JP] shop related things
2025-08-30 22:06:08 +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
b8cdbcf7d9 Merge pull request #5088 from LmeSzinc/dev
Bug fix
2025-08-29 21:56:43 +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
90d65f318d Merge pull request #5080 from LmeSzinc/dev
Bug fix
2025-08-27 23:29:16 +08:00
LmeSzinc
a9bf935f41 Opt: Early stop medal shop if having any item soldout 2025-08-27 23:26:44 +08:00
LmeSzinc
e9f8a5d35a Merge pull request #5078 from nEEtdo0d/ui_refactor_shop_v2
Fix: [EN] shop and supply tasks + other hotfixes
2025-08-27 22:44:18 +08:00