LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-17 11:19:29 +08:00
Code Activity
10,175 Commits 12 Branches 0 Tags
d86d75735869ea2bc23a6548c6f4e040256c380d
Commit Graph

179 Commits

Author SHA1 Message Date
Zuosizhu
d1174a7d88 Merge remote-tracking branch 'Lme/master' into unrefactor 
# Conflicts:
#	module/campaign/campaign_event.py
#	module/campaign/os_run.py
#	module/coalition/coalition.py
#	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/os/operation_siren.py
#	module/os_handler/mission.py
#	module/webui/app.py
 2026-01-24 14:18:46 +08:00
LmeSzinc
f552360951 Fix: Startup at coalition fleet preparation 2026-01-23 17:43:04 +08:00
Zuosizhu
5120649acb Merge remote-tracking branch 'Lme/master' into dev 
# Conflicts:
#	module/config/argument/args.json
#	module/config/argument/menu.json
#	module/config/argument/task.yaml
#	module/config/i18n/en-US.json
 2025-11-27 21:53:49 +08:00
guoh064
369a12abfb Fix: ui misclick in coalition_20251120 2025-11-25 12:53:26 +08:00
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
cd18378ad4 Fix: Avoid clicking GET_SHIP after entering page_meowfficer 2025-11-04 23:06:01 +08:00
dragonheart107
f9c25961bb Fix: EN commission + mission reward (#5230) 
* Revert "Tmp: [EN] Temp fix for bugged UI"

This reverts commit c06773e586.

* Fix: EN post maintenance UI bugs

* duplicate removal
 2025-10-18 02:25:24 +08:00
LmeSzinc
c06773e586 Tmp: [EN] Temp fix for bugged UI 2025-10-17 04:13:16 +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
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
9e256ce249 Fix: NEONCITY UI back and home 2025-06-28 19:36:07 +08:00
nEEtdo0d
64c5b5e30f Merge branch 'master' into dev 2025-06-15 16:59:21 -04:00
0O0o0oOoO00
45ac6bdf45 Merge remote-tracking branch 'LmeSzinc/master' into dev 
# Conflicts:
#	module/retire/assets.py
#	module/retire/dock.py
 2025-06-05 23:53:43 +08:00
LmeSzinc
6d7e43974a Fix: handle game tips that infos skin feature when entering dock 2025-05-29 22:48:01 +08:00
xhqss
0339fe9dcc Merge branch 'master_lme' into dev 
# Conflicts:
#	module/event_hospital/assets.py
 2025-05-25 15:18:10 +08:00
LmeSzinc
8d61802fd1 Fix: continuously check rotation on unknown UI (#4729) 2025-05-24 00:42:13 +08:00
LmeSzinc
0abb1fdff7 Fix: Avoid clicking GET_SHIP after dismiss MEOWFFICER_BUY 2025-05-24 00:17:52 +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
LmeSzinc
79d72c4fa0 Merge branch 'master' into dev 
# Conflicts:
#	module/device/method/pool.py
 2025-05-18 03:15:41 +08:00
LmeSzinc
535a6ad243 Fix: More IDLE buttons to handle 2025-05-11 01:34:10 +08:00
nEEtdo0d
0a9027a762 Fix: [EN] Private Quarters observable lag in appearance of roses in shop 
Upd: get_ship toggle for ui_goto, bridge from ui_additional; private quarters page overlaps with the asset
 2025-04-29 00:30:38 -04:00
0O0o0oOoO00
a37763aad1 fix: check last updated time of player info is None 2025-04-24 21:24:29 +08:00
POLAR me
90cad18acd update(event_hospital):深谷来信添加记录档案领取 2025-03-31 00:12:49 +08:00
ZuoSiZhu
166b49f8f0 Merge branch 'master_lme' into dev 
# Conflicts:
#	alas.py
#	module/config/config_manual.py
#	module/ui/page.py
#	module/ui/ui.py
 2025-03-28 08:34:41 +08:00
LmeSzinc
a4233d4743 Fix: Exit from hospital pages 2025-03-28 01:26:17 +08:00
ZuoSiZhu
58a217d98f Merge branch 'master_lme' into dev 
# Conflicts:
#	module/webui/app.py
#	module/webui/config.py
 2025-03-28 00:23:16 +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
0052dc470f Fix: Subpress get_ship in dorm (#4488) 2025-01-04 22:44:56 +08:00
LmeSzinc
1e7aaf5628 Fix: Handle BATTLE_PASS_NEW_SEASON 2024-12-27 00:58:07 +08:00
xhqss
e7f93d8efe Merge branch 'master_lme' 
# Conflicts:
#	module/equipment/equipment.py
 2024-12-20 23:51:48 +08:00
LmeSzinc
164db6f4da Chore: Rename "threshold" in template matching to "similarity" 
to be differ from the "threshold" in color matching
 2024-12-09 15:37:25 +08:00
xhqss
fad84bb0fa Merge branch 'master_lme' 2024-11-15 17:14:11 +08:00
LmeSzinc
9a31f709c0 Fix: Double clicking REWARD_GOTO_TACTICAL (#4328) 2024-10-30 14:37:58 +08:00
LA_DI_DA
a2e6986dcd Merge branch 'refs/heads/LmeSzinc/master' into dev 
# Conflicts:
#	module/campaign/campaign_status.py
#	module/exercise/combat.py
#	module/retire/dock.py
#	module/retire/enhancement.py
 2024-10-25 12:01:29 +08:00
LmeSzinc
95ac640fb8 Fix: Clicking GET_SHIP after MAIN_GOTO_REWARD 
because random ship background triggers GET_SHIP
 2024-10-13 17:33:19 +08:00
LmeSzinc
fc555128a2 Fix: Set page checkers to interval=5 (fixed #4236) 2024-09-25 18:38:09 +08:00
LA_DI_DA
89be3580ec Merge branch 'refs/heads/LmeSzinc/master' into dev 
# Conflicts:
#	module/ui/page.py
 2024-08-17 21:48:52 +08:00
LmeSzinc
8dd6ec7811 Fix: Slowly appeared WITHDRAW button (#4044) 2024-08-02 01:02:05 +08:00
LmeSzinc
d79859e6ed Upd: [TW] rpg page definition 2024-08-01 23:33:47 +08:00
guoh064
5ef353a507 Fix: unrecognized ui page after empty mail receive (#4039) 
* Fix: predict_enemy_genre in event_20220526_cn rerun (#4005)

* Fix: unrecognized ui page after empty mail receive

* Upd: [JP] Asset MAIL_CHECK

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: Air111 <54128005+Air111@users.noreply.github.com>
 2024-07-28 13:32:03 +08:00
LA_DI_DA
327225e74d Add: show player info in dashboard 
commits:
Adj: rename update player info function

Fix: use play exp record to check time

Add: show exp and level of player in dashboard
 2024-07-21 12:53:55 +08:00
LA_DI_DA
5ab8cfdee5 Merge branch 'refs/heads/lme-alas/master' into dev 
# Conflicts:
#	README.md
 2024-07-06 19:17:11 +08:00
LmeSzinc
019a35a64c Fix: Reset interval of GET_SHIP after entering page_dorm 2024-07-03 23:24:18 +08:00
LmeSzinc
67073bad07 Fix: Leave memories tab (fixed #3956) 2024-07-03 22:46:41 +08:00
Zuosizhu
1e31cb6de5 Merge branch 'master_lme' into AlasGGdev 
# Conflicts:
#	module/campaign/gems_farming.py
#	module/coalition/coalition.py
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
#	module/os/operation_siren.py
#	module/os_handler/os_status.py
 2024-06-28 16:01:16 +08:00
LmeSzinc
a8f8432842 Add: [CN] Assets for coalition_20240627 2024-06-28 01:18:59 +08:00
LA_DI_DA
573210af2b Merge branch 'refs/heads/lme-alas/master' into dev 
# Conflicts:
#	alas.py
#	module/os/fleet.py
 2024-06-22 20:31:35 +08:00
LmeSzinc
33cefa9817 Pref: Remove rpg page definition since event was over 2024-06-05 02:55:47 +08:00
LmeSzinc
77d48937fc Fix: Handle mail full popup 2024-06-03 10:22:06 +08:00