LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-18 12:59:32 +08:00
Code Activity
8,834 Commits 12 Branches 0 Tags
a2e6986dcd9f00a9e86c4e7887cca1d25e427c52
Commit Graph

552 Commits

Author SHA1 Message Date
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
e89063bade Jp font 20241011 (#4272) 
* tmp: [JP] commission assets

* tmp: [JP] asset RESEARCH_COST_CHECKER

* tmp: [JP] assets in mail batch

* tmp: [JP] opsi get_zone_name color

* tmp: [JP] get_coin and get_oil color

* tmp: [JP] ash_collect_status and get_yellow_coins color

* upd: [JP] resize commission assets recognize size
 2024-10-12 14:29:01 +08:00
Air111
3ad070d6f1 Fix: ensure not at war archives campaign in ui_goto_event (#4237) 2024-09-29 12:09:42 +08:00
weeswelai
cb2ca4375d Upd: In some events, ensure_auto_search_exit enters a dead loop (#4227) 2024-09-23 19:14:12 +08:00
LA_DI_DA
02fec1598d Merge branch 'refs/heads/LmeSzinc/master' into dev 2024-08-31 11:05:57 +08:00
LmeSzinc
87cb525b58 Add: Chapter T 2024-08-30 22:49:07 +08:00
LmeSzinc
3740ab7164 Fix: ensure_campaign_ui should have timeout instead of loop count 2024-08-20 01:35:10 +08:00
LmeSzinc
c9349b1bba Fix: _get_stage_name should before handle_get_chapter_additional (#4094) 
so loop can be break
 2024-08-20 01:31:50 +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
bbad8d0359 Add: Handle story stages after A2 2024-08-16 22:34:38 +08:00
LmeSzinc
8dd6ec7811 Fix: Slowly appeared WITHDRAW button (#4044) 2024-08-02 01:02:05 +08:00
Zuosizhu
1d85336ba4 Merge remote-tracking branch 'refs/remotes/Lme/master' into dev 
# Conflicts:
#	module/device/method/adb.py
#	module/device/screenshot.py
 2024-07-26 08:04:44 +08:00
LmeSzinc
5e05db05d0 Add: Switch mode in map preparation 2024-07-26 02:20:15 +08:00
LmeSzinc
2da2d58297 Fix: Handle yet another CLEAR icon 2024-07-26 02:20:05 +08:00
LmeSzinc
e2d1d2ff8a Upd: Handle yet another mode switch in event_20240725_cn 2024-07-26 00:23:57 +08:00
Zuosizhu
784f1c8aff Merge Lme/Master into dev 2024-07-21 14:51:18 +08:00
Zuosizhu
87b44b2f57 Fix: Auto prepare ships for hard GemsFarming 2024-07-21 04:26:49 +08:00
Zuosizhu
ae45257731 Adj: Fuck FleetNumberInHardMode Setting, bind it with FleetOrder 2024-07-20 15:10:27 +08:00
guoh064
11e3580c61 Opt: always keep common cv at retirement if GemsFarming enabled 2024-07-19 12:33:50 +08:00
LA-DI-DA
23152493b1 Add: pick out auto research farming from more alas 2024-07-07 11:53:00 +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
2995c5408d Fix: Add Coalition as task requires balance (#3941) 2024-07-01 17:00:20 +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
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
霞飛
0b97b40c46 Feature: New OpsiShop. (#3086) 
* feat: New OpsiShop

* fix: use AdaptiveScroll

* feat: scan counter

* perf: calculate y value
 2024-06-17 11:24:40 +08:00
Air111
a70d4c4675 Upd: add CommonDD option (#3786) 
* Upd: add dd combination z20_or_z21

* Upd: add dd option favourite

* Opt: use fation to filter Z20 or Z21
 2024-06-14 03:39:20 +08:00
LmeSzinc
58202c6a40 Pref: Reuse image array to improve memory performance 2024-06-05 01:15:41 +08:00
LA_DI_DA
cd64d084b2 Fix: set gemsfarming's ship filter to default after this task is set to campaign_main 2024-05-25 19:43:00 +08:00
LA_DI_DA
7b81250ec9 Merge branch 'zuosizhu-alas/20230309' into smallkai 
# Conflicts:
#	campaign/Readme.md
#	module/config/argument/args.json
 2024-04-27 15:56:34 +08:00
Zuosizhu
8fd3c7eedd Merge branch 'master_lme_to_merge' 
# Conflicts:
#	assets/cn/equipment/FLEET_DETAIL_CHECK.png
#	assets/en/equipment/FLEET_DETAIL_CHECK.png
#	assets/jp/equipment/FLEET_DETAIL_CHECK.png
#	assets/tw/equipment/FLEET_DETAIL_CHECK.png
#	deploy/docker/requirements.txt
#	deploy/git.py
#	module/campaign/gems_farming.py
#	module/equipment/assets.py
#	module/equipment/equipment_change.py
#	requirements-in.txt
#	requirements.txt
 2024-04-27 13:00:39 +08:00
Zuosizhu
e99c8ad341 Revert "Upd: Flagship changing (#3556)" 
This reverts commit 2507b0fa
 2024-04-27 12:58:56 +08:00
Zuosizhu
4fcb955168 Revert "Fix: rename equip_enter" 
This reverts commit cddfea680d.
 2024-04-27 12:57:37 +08:00
Zuosizhu
7e75b7fdd7 Revert "Fix: scan ships in correct fleet" 
This reverts commit 0eee91a891.
 2024-04-27 12:57:29 +08:00
Zuosizhu
d43b218a0f Revert "Fix: lower SIM_VALUE in ship matching of GemsFarming" 
This reverts commit 194ec3e234.
 2024-04-27 12:57:26 +08:00
LmeSzinc
bfb9bd0d61 Fix: Convert stage names in event_20240425_cn 2024-04-26 04:07:31 +08:00
LmeSzinc
bbef93c03d Add: Heart-Linking Harmony chapter ISP 2024-04-26 03:25:58 +08:00
Air111
194ec3e234 Fix: lower SIM_VALUE in ship matching of GemsFarming 2024-04-19 21:48:50 +08:00
Air111
0eee91a891 Fix: scan ships in correct fleet 2024-04-19 21:46:26 +08:00
Air111
cddfea680d Fix: rename equip_enter 2024-04-19 14:13:18 +08:00
Zuosizhu
0b2f9ed81c Merge branch 'dev' 
# Conflicts:
#	campaign/campaign_main/campaign_15_1.py
#	campaign/campaign_main/campaign_15_2.py
#	campaign/campaign_main/campaign_15_3.py
#	campaign/campaign_main/campaign_15_4.py
 2024-04-19 02:17:51 +08:00
Air111
2507b0fa6b Upd: Flagship changing (#3556) 
* Upd: Flagship changing asset

* Upd: Equipment enter

* Upd: Fleet detail check

* Refactor: equipment changing

* Upd: asset exercise/EQUIP_ENTER

* Refactor: rename equipment functions

* Fix: avoid GameTooManyClickError when EQUIPMENT_SCROLL disappears

* Upd: [CN] assets EQUIP_1/2/3

* Fix: skip first screenshot in equipment.py
 2024-04-19 01:40:40 +08:00
guoh064
9388666d1d Fix: fall back to all union DDs when not specifying DD (#3648) 2024-04-18 12:14:57 +08:00
Zuosizhu
4486c8cff6 Merge branch 'LmeSzinc:master' into 20230309 2024-04-15 23:25:52 +08:00
LmeSzinc
42af2e479f Chore: [ALAS] Abstract has_cached_image 2024-04-13 02:28:11 +08:00
LmeSzinc
7321af9e8f Opt: [CN] Remove temp fixes of rendering bugs on game client 2024-04-13 01:43:30 +08:00
Zuosizhu
d9d5db0ca5 Merge remote-tracking branch 'origin/20230309' 2024-04-12 23:46:26 +08:00
Zuosizhu
8aba12c7a5 Fix: Unable to retire when retire method set to enhance when entering hard event 2024-04-12 23:46:14 +08:00
Zuosizhu
c547c7ab86 Merge branch 'LmeSzinc:master' into 20230309 2024-04-12 23:41:14 +08:00
xhqss
7e1fd52ba6 Merge branch '20230309' into smallkai 2024-04-12 18:48:45 +08:00
Zuosizhu
07e9d88b71 Fix: Merge mistakes(Stuck when changing flagship at hard event) 2024-04-12 13:50:55 +08:00