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

717 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
bd0fccbd31 Add: event entrance 20241017 
* event_20220728_cn rerun in cn/en/jp
* coalition_20240627 in tw
 2024-10-17 20:56:53 +08:00
guoh064
d35bfa0f5d Add: War Archives 
* war_archives_20201012_cn
* war_archives_20210422_cn
* war_archives_20210916_cn
* war_archives_20211111_cn
* war_archives_20211229_cn
 2024-10-17 20:56:53 +08:00
coconutjuice
6b7ea0448c Upd:Adds the Meowfficer maximum level option for enhance (#4267) 
* Upd:Adds the Meowfficer maximum level option for enhance

* Upd:Move ocr and judgment logic out of the loop

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: yx800 <yoyo.duan@cfnet.com.cn>
 2024-10-12 00:45:56 +08:00
julystone
589c4a1bf5 Fix: [Tw] TW event update· (#4221) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: julystone <july401@>
 2024-09-20 21:53:25 +08:00
LA_DI_DA
e2cae00f23 upd: args.json 2024-09-14 15:51:53 +08:00
LmeSzinc
78a9191936 Upd: Config update 2024-09-14 15:07:04 +08:00
dragonheart107
67efb5df16 Add files via upload (#4187) 2024-09-14 00:36:51 +08:00
LA_DI_DA
a9afa5487a Merge branch 'refs/heads/LmeSzinc/master' into dev 
# Conflicts:
#	module/webui/app.py
 2024-09-13 23:09:32 +08:00
weeswelai
1c9534d7a4 Upd: Update event Ode of Everblooming Crimson(event_20240912_cn) 2024-09-13 18:38:43 +08:00
LA_DI_DA
02fec1598d Merge branch 'refs/heads/LmeSzinc/master' into dev 2024-08-31 11:05:57 +08:00
LmeSzinc
7428485487 Add: Event entrance of Whence Flowers Bear No Fruit (event_20240829_cn) 2024-08-30 18:57:36 +08:00
LA_DI_DA
396e567b57 Fix: update new event for event2 2024-08-17 22:58:37 +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
2ad7bed1b6 Add: [CN] Server 水仙行动 (fixed #4087) 2024-08-16 22:34:38 +08:00
LmeSzinc
c3fcb76732 Add: Event entrance of Windborne Steel Wings (event_20240815_cn) 2024-08-16 22:34:37 +08:00
Zuosizhu
aef67541c5 Add: Option to disable Opsi repair 2024-08-02 17:23:36 +08:00
guoh064
fe0e687dcb Add: [TW] event entrance of raid_20240328 (#4038) 
* Fix: predict_enemy_genre in event_20220526_cn rerun (#4005)

* Add: [TW] event entrance of raid_20240328

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: Air111 <54128005+Air111@users.noreply.github.com>
 2024-07-28 13:31:36 +08:00
LmeSzinc
7d4b21b4fc Upd: [CN] New server 暴雨行动 (#4025) 2024-07-27 01:54:57 +08:00
LA_DI_DA
7e273a0ca7 Fix: update new event in Event2 2024-07-26 11:59:36 +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
bec185c855 Add: Event entrance of Interlude of Illusions (event_20240725_cn) 2024-07-25 23:37:48 +08:00
LmeSzinc
2454d2aa2c Opt: Use MaaTouch as default control method 2024-07-25 02:19:45 +08:00
LmeSzinc
733bb89b2d Add: [ALAS] Add ldopengl setting 2024-07-25 02:16:34 +08:00
LA_DI_DA
be68cd03fe Merge branch 'refs/heads/feature/player-level-and-exp' into dev 2024-07-21 12:54:27 +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
Zuosizhu
ae45257731 Adj: Fuck FleetNumberInHardMode Setting, bind it with FleetOrder 2024-07-20 15:10:27 +08:00
Zuosizhu
4ad4b064ee Fix: Cvl to bc/bb with common bb problem about Nevada 2024-07-20 12:56:32 +08:00
Zuosizhu
ad6d508013 Add: Options for an easier way of changing ShipType 2024-07-19 19:27:52 +08:00
LA_DI_DA
a12a831419 Merge branch 'refs/heads/lme-alas/master' into dev 
# Conflicts:
#	alas.py
 2024-07-18 23:12:53 +08:00
LmeSzinc
e66b2a84b0 Add: Claim mails in task freebies 
- TODO: [JP][TW] Update mail assets
 2024-07-18 22:48:40 +08:00
梦念逍遥
6a0466d842 Add: Event Pledge of the Radiant Court Rerun (#4001) 
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2024-07-18 21:38:27 +08:00
LA_DI_DA
356c7f097b Add: research farming for opsi hazard1 2024-07-17 22:36:01 +08:00
LA_DI_DA
95a3fe236b Add: 7th research for ResearchFarming 2024-07-17 17:38:48 +08:00
ReLU
fceeff25e0 Merge remote-tracking branch 'upstream/master' into dev 2024-07-12 03:54:22 +08:00
LmeSzinc
5ee7f9118e Add: Series 7 filter 2024-07-12 00:24:36 +08:00
RilyLC
ec1ae2cb3e Upd:[TW]Event:Tower of Transcendence Rerun (#3981) 
* docs: update game configs

* Upd:[TW]Event:Tower of Transcendence Rerun

---------

Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
Co-authored-by: 霞飛 <saarchaffee@qq.com>
 2024-07-11 22:11:37 +08:00
Zuosizhu
6448f9174f Add: PR7 gui settings 2024-07-11 16:36:41 +08:00
Zuosizhu
106d46dc0a Fix: all the shit chasing me from last year 2024-07-08 03:23:53 +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
c25ea046c6 Upd: update args.json and other files 2024-07-06 19:14:14 +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
9bdfdb6447 Fix: Override mode in CoalitionSp 2024-06-28 01:54:38 +08:00
LmeSzinc
a8f8432842 Add: [CN] Assets for coalition_20240627 2024-06-28 01:18:59 +08:00
LmeSzinc
6bdfbc3dcd Add: Event entrance of coalition_20240627 2024-06-27 23:34:39 +08:00
RilyLC
d1b16a99c2 Upd:[TW]Event:Tempesta and the Fountain of Youth (#3933) 
* Fix: Skip first screenshot in tools

since you cannot run benchmark before benckmarked

* Fix: Lower HOMO_CANNY_THRESHOLD in event_20220428_cn

to fit maps in 2024

* Fix: Random background of chapter A hits EXP_INFO_B

* Upd:[TW]Event:Tempesta and the Fountain of Youth

---------

Co-authored-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
Co-authored-by: LmeSzinc <lmeszincsales@gmail.com>
 2024-06-27 19:59:16 +08:00
LmeSzinc
b9730d4cd2 Opt: Add default filter in OpsiShop 2024-06-23 18:09:19 +08:00
霞飛
62bc1ed7f7 ref: remove frequency config and not to judge coins at last day 2024-06-22 21:43:55 +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
86d6c36670 Merge branch 'master' into dev 2024-06-21 01:50:05 +08:00