LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-20 05:49:30 +08:00
Code Activity
9,684 Commits 12 Branches 0 Tags
f1cfd90deb98dead6cb6f66ea4e94e5facee0519
Commit Graph

148 Commits

Author SHA1 Message Date
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
LmeSzinc
d1015d9e39 Upd: [TW] BOX assets (#4879) 2025-06-14 01:31:41 +08: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
dragonheart107
4172356a9a Upd: [EN] DOCK_SELECTED (#4850) 2025-05-30 22:09:46 +08:00
guoh064
fe44724016 tmp: [JP] asset DOCK_CHECK 2025-05-29 22:29:54 +08:00
xhqss
791f4bfd5a Merge branch 'master' into dev 2025-05-23 00:03:44 +08:00
LmeSzinc
242b964981 Upd: [JP] BOX assets (#4814) 2025-05-21 23:44:58 +08:00
LmeSzinc
c226228d98 Upd: [EN] EQUIP_CONFIRM_2 2025-05-21 23:22:23 +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
14b4820523 Upd: [EN] BOX assets 2025-05-21 02:52:39 +08:00
LmeSzinc
9c83c0bbc3 Chore: Move BOX_ITEM_* to EQUIP_CONFIRM 
to be reused in retirement and enhancement
 2025-05-21 02:25:28 +08:00
LmeSzinc
7f54ae8234 Upd: [TW] ENHANCE_CONFIRM and ENHANCE_RECOMMEND 2025-05-18 03:12:30 +08:00
LmeSzinc
b4930d486e Upd: [EN] ENHANCE_CONFIRM ENHANCE_RECOMMEND 2025-05-11 00:12:00 +08:00
LmeSzinc
ea4a73ff24 Fix: Skip NPC character when entering first ship in dock (#4725, #3678) 2025-04-11 01:46:06 +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
guoh064
17a6da533e upd: [JP] OCR_DOCK_AMOUNT 2024-10-20 21:58:34 +08:00
guoh064
d13e852b92 upd: [JP] retire assets 2024-10-20 21:58:34 +08:00
guoh064
4852d66be0 Upd: [JP] asset TEMPLATE_IN_COMMISSION (#4211) 2024-09-20 22:35:00 +08:00
Zuosizhu
185af2808f Merge Lme/Master into dev 2024-07-22 16:45:29 +08:00
guoh064
a2ebcbef1b Add: scroll retire comfirm page to find more common cv 2024-07-19 12:33:50 +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
6105801737 Upd: [EN][JP] RETIRE_SETTING_* 2024-07-06 02:07:05 +08:00
LmeSzinc
095c51d2f8 Upd: [CN] RETIRE_SETTING_* 2024-07-03 22:55:10 +08:00
pull[bot]
c85c6582e1 Merge pull request #15 from LmeSzinc/master 
[pull] smallkai from LmeSzinc:master
 2024-05-24 03:30:45 +00:00
LmeSzinc
0bb086c7c7 Upd: [TW] Dock favourite assets 2024-05-24 02:55:32 +08:00
Zuosizhu
ddcfbb0a97 Merge branch 'master_lme' 
# Conflicts:
#	README.md
#	deploy/adb.py
#	deploy/pip.py
#	module/daily/equipment.py
 2024-05-23 02:31:29 +08:00
LmeSzinc
f5f2112442 Upd: [CN][EN][JP] Dock favourite assets 2024-05-23 01:42:19 +08:00
Zuosizhu
69aebdcf30 Merge branch 'master_lme' 
# Conflicts:
#	config/template.json
#	deploy/Windows/app.py
#	deploy/Windows/config.py
#	deploy/Windows/emulator.py
#	deploy/Windows/git.py
#	deploy/Windows/logger.py
#	deploy/Windows/template.yaml
#	module/campaign/gems_farming.py
#	module/config/argument/args.json
#	module/config/argument/argument.yaml
#	module/config/config_generated.py
#	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/device/device.py
#	module/device/emulator.py
#	module/device/method/droidcast.py
#	module/device/platform/emulator_base.py
#	module/device/platform/emulator_windows.py
#	module/device/platform/platform_windows.py
#	module/handler/auto_search.py
 2024-04-10 12:22:40 +08:00
霞飛
09fe301597 fix: ship template assets bit error (#3618) 2024-04-09 11:23:16 +08:00
ygrzxc
7d574dde8b Add: Change the designated vanguard combination (#3520) 
* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Change the designated vanguard combination

* Add: Translation for change the designated vanguard combination

* Add: Translation for change the designated vanguard combination

* Upd:Update dev's args.json

* Upd:Update dev's args.json

* Upd:Reduce template image size and Implement function

* Upd:Reduce template image size and Implement function

* Upd:Reduce template image size and Implement function

---------

Co-authored-by: y y <jaxvuav@163.com>
 2024-04-08 22:49:30 +08:00
Zuosizhu
50aef0ec0f Fix: Same ships are black when changing hard mode flagships 2023-12-24 18:57:53 +08:00
Zuosizhu
94c5fb4858 Merge branch 'LmeSzinc:master' into 20230309 2023-11-17 08:01:26 +08:00
RilyLC
d84010bfb1 Fix:[TW]support server_support_status_fleet in campaign\gems_farming (#3285) 
* Fix:[TW]support server_support_status_fleet in campaign\gems_farming

* Fix:[TW]ship scan asset

* Fix:[TW]remove server_support in retirement and gems_farming

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2023-11-15 18:28:47 +08:00
Zuosizhu
7f9c64e284 Merge branch 'LmeSzinc:master' into 20230309 2023-11-10 14:33:24 +08:00
Jiahao Yuan
1d6bf0547f Upd: Dorm UI assets (#3275) 2023-11-10 11:27:44 +08:00
guoh064
4ae8438338 Upd: [JP] RETIRE_COIN (#3267) 2023-11-09 15:35:31 +08:00
Zuosizhu
e2f7cd544f Merge branch 'master_lme' 
# Conflicts:
#	module/map/assets.py
 2023-10-20 01:01:54 +08:00
Zuosizhu
526d26e6c6 Merge branch 'LmeSzinc:master' into 20230309 2023-10-19 22:53:32 +08:00
LmeSzinc
44197dba56 Upd: [EN] RETIRE_COIN (#3124) 2023-10-14 21:45:49 +08:00
Zuosizhu
8b8d8c9b67 Merge branch 'LmeSzinc:master' into 20230309 2023-06-14 22:05:37 +08:00
guoh064
6dde835ce1 Upd: [JP] DOCK_SELECTED (#2750) 2023-06-11 01:41:02 +08:00
Zuosizhu
1acc700629 Merge branch 'LmeSzinc:master' into 20230309 2023-06-10 02:53:17 +08:00
LmeSzinc
166fa65ecc Upd: [EN] DOCK_SELECTED 2023-06-08 23:54:48 +08:00
Zuosizhu
1b2e230274 Merge branch 'LmeSzinc:master' into 20230309 2023-06-08 21:43:02 +08:00
LmeSzinc
454e308702 Upd: [CN][TW] DOCK_SELECTED (#2729) 2023-06-08 16:33:31 +08:00
Zuosizhu
8606f2af24 Merge branch 'master_lme' 
# Conflicts:
#	README.md
#	module/retire/assets.py
#	module/retire/scanner.py
 2023-03-28 16:50:00 +08:00
Horizon101011
3e47c8a4f3 Fix: New ship status 'in_event_fleet' 2023-03-27 21:56:01 +08:00
Zuosizhu
ddc94bf109 Merge branch 'LmeSzinc:master' into master 2023-02-28 01:42:07 +08:00
LmeSzinc
9ce0755d31 Merge pull request #2297 from kmou424/sync-python-exe 
Fix: sync python executable with python 3.7 slim image
 2023-02-27 23:51:50 +08:00
Zuosizhu
58082e29e0 Merge branch 'LmeSzinc:master' into master 2023-02-27 14:18:41 +08:00