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
LmeSzinc
532e4c2eee
Merge branch 'bug_fix' into dev
2025-07-11 00:14:29 +08:00
ChthoIly
9e91543a14
Add: [CN] Private Quarters localization ( #4933 )
...
* Upd: [CN] Private Quarters localization
Add: Add CN server asset for Private Quarters
Fix: Stuck in Private Quarters Shop when not enough gold coins
Changed DigitCounter OCR parameters for CN server to fix unexpected ocr result when reading daily intimacy count
* re-compress asset images using `image_fixup()` from #4849 (comment)
2025-07-11 00:04:28 +08:00
LmeSzinc
d28ace6294
Upd: Research S8 configs and presets
2025-07-10 22:42:17 +08:00
sui-feng-cb
3001ae011a
Add: war_archives_20220728_cn
2025-07-07 18:00:53 +08:00
LmeSzinc
0ab6d50656
Upd: [TW] Event Toward Tulipa’s Seas ( #4922 )
2025-07-03 22:59:22 +08:00
nEEtdo0d
b85b47d67c
Merge branch 'master' into dev
2025-06-28 16:11:37 -04:00
0O0o0oOoO00
171520adfb
Merge remote-tracking branch 'LmeSzinc/master' into dev
...
# Conflicts:
# config/template.json
# module/config/argument/args.json
# module/config/argument/menu.json
# module/config/argument/task.yaml
# module/config/i18n/en-US.json
# module/config/i18n/ja-JP.json
# module/config/i18n/zh-CN.json
# module/ui/ui.py
2025-06-28 23:09:47 +08:00
LmeSzinc
37ad6c9d12
Upd: stage convert
2025-06-27 00:08:42 +08:00
LmeSzinc
373cf7e919
Add: Event entrance of Neon City Investigator (coalition_20250626)
2025-06-26 23:46:41 +08:00
ZuoSiZhu
7e3bfdefd3
Fix: i18n
2025-06-21 21:06:26 +08:00
ZuoSiZhu
b7ad8e7368
Adj: Remove config for OthersLogin.Method
2025-06-21 16:57:55 +08:00
LmeSzinc
0934746701
Upd: Event entrance of Confluence of Nothingness
2025-06-19 22:51:39 +08:00
0O0o0oOoO00
ab18217fa8
del: remove lock of daily event
2025-06-19 19:15:41 +08:00
guoh064
046e3fb377
Add: delay task after opsi level check passed
2025-06-17 14:41:16 +09:00
0O0o0oOoO00
f64bc96bb2
Merge remote-tracking branch 'LmeSzinc/master' into dev
...
# Conflicts:
# config/deploy.template-AidLux-cn.yaml
# config/deploy.template-AidLux.yaml
# config/deploy.template-cn.yaml
# config/deploy.template-docker-cn.yaml
# config/deploy.template-docker.yaml
# config/deploy.template-linux-cn.yaml
# config/deploy.template-linux.yaml
# config/deploy.template.yaml
2025-06-17 13:19:30 +08:00
nEEtdo0d
f77aec689e
Add: [EN] Private Quarters support New Jersey; implement _pq_goto_room_seek and adapt asset's varying y-position for pq_interact
2025-06-15 17:09:52 -04:00
nEEtdo0d
64c5b5e30f
Merge branch 'master' into dev
2025-06-15 16:59:21 -04:00
LmeSzinc
9014b9640b
Upd: [TW] Event A Rose on the High Tower (event_20250520_cn)
2025-06-13 22:45:12 +08:00
guoh064
7cef54d350
Add: check leveling in cl1 daily
2025-06-08 13:08:19 +09:00
0O0o0oOoO00
54d5d018f0
add: exercise more power and exercise god mode
2025-06-08 09:57:30 +08:00
ZuoSiZhu
733b20a6db
fix: unexpected restarts caused by do_inject
2025-06-08 02:48:37 +08:00
ZuoSiZhu
dc1db0f0b4
adj: remove PushEverytime in Hook, set to auto update instead
2025-06-08 01:44:32 +08:00
xhqss
0339fe9dcc
Merge branch 'master_lme' into dev
...
# Conflicts:
# module/event_hospital/assets.py
2025-05-25 15:18:10 +08:00
travellerse
56a010366c
Add: [CN] Server 冬月计划 长弓计划
2025-05-24 00:34:21 +08:00
0O0o0oOoO00
f5191c03a1
add: push luahook resource everytime
2025-05-22 17:40:05 +08:00
LmeSzinc
23d4bd308e
Merge branch 'master' into dev
2025-05-22 14:23:40 +08:00
0O0o0oOoO00
8748eb237c
fix: add event4-6 to scheduler
2025-05-21 14:02:07 +08:00
0O0o0oOoO00
16fa913b69
fix: merge mistake of more event
2025-05-21 13:17:53 +08:00
ZuoSiZhu
78112d5e2b
fix: Entrance of event_20250520
2025-05-21 09:31:48 +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
ZuoSiZhu
99ae4c66d4
Add: cheat support for daemon
2025-05-21 03:30:02 +08:00
LmeSzinc
653601aa4f
Chore: Add MAP_CLEAR_PERCENTAGE_SHORT
2025-05-21 00:45:32 +08:00
LmeSzinc
92a93eeaf1
Add: Event entrance of A Rose on the High Tower (event_20250520_cn)
2025-05-20 23:53:42 +08:00
0O0o0oOoO00
13eb3a079f
fix: lack of KeepOil setting
2025-05-19 11:37:17 +08:00
0O0o0oOoO00
75267083c9
Merge branch 'feature/more' into dev
...
# Conflicts:
# alas.py
# module/exception.py
2025-05-18 22:03:42 +08:00
0O0o0oOoO00
d411b16ce8
add: wait time setting of phone and adb
2025-05-18 21:32:49 +08:00
0O0o0oOoO00
423ce223f9
add: restart chinac cloud phone
2025-05-18 20:43:18 +08:00
LmeSzinc
79d72c4fa0
Merge branch 'master' into dev
...
# Conflicts:
# module/device/method/pool.py
2025-05-18 03:15:41 +08:00
0O0o0oOoO00
03a59cca17
Merge branch 'dev' into feature/more
2025-05-11 15:29:08 +08:00
0O0o0oOoO00
604da2aaeb
add: global speedup for hook
2025-05-11 15:19:14 +08:00
ZuoSiZhu
9304e3931a
Fix: config_updater will correctly handle dashboard items
2025-05-11 00:24:12 +08:00
0O0o0oOoO00
16f60ac787
fix: mis-deleted dashboard settings
2025-05-10 14:00:06 +08:00
0O0o0oOoO00
92d3616459
add: global speedup
2025-05-10 13:45:15 +08:00
下面我簡單喵兩句
ca3ad5db41
Upd:[TW]Event:Ode of Everblooming Crimson ( #4768 )
2025-05-02 00:53:17 +08:00
nEEtdo0d
09caf9704f
Add: [EN] Private Quarters support
2025-04-27 13:12:08 -04:00
xhqss
f45ad334db
Add: MAP_CHAPTER_SWITCH_20241219_SP to handle event_20250424_cn
2025-04-25 13:25:31 +08:00
xhqss
c050356ec1
upd:event_20250424_cn，same as dev branch
2025-04-25 10:39:14 +08:00
xhqss
557127f167
upd:event_20250424_cn
2025-04-25 10:34:42 +08:00
sui_feng
978167218d
Merge pull request #4750 from sui-feng-cb/war_archives_update
...
Add: war_archives_20220526_cn
2025-04-25 00:00:02 +08:00
