LIIILLIIILLIIII/Alas
1
0
Fork 0
mirror of https://github.com/0O0o0oOoO00/Alas.git synced 2026-05-22 19:59:28 +08:00
Code Activity
8,551 Commits 12 Branches 0 Tags
af5bcafcc5ccccbbf8d1db5d86d9b3c8a73da621
Commit Graph

6007 Commits

Author SHA1 Message Date
Karl Whit
6a7c049f9c Fix: Skip hard mode campaign_main when remaining number of times is 0 (#2568) 
Co-authored-by: yypsybs <yux@taizhitech.com>
 2023-05-11 23:35:00 +08:00
LmeSzinc
563df544de Merge pull request #2544 from guoh064/meta_reward_dossier 
Add: Dossier Meta Reward Receive (#2353)
 2023-05-11 22:09:33 +08:00
guoh064
736a839f08 Upd: [JP] Assets for BUILD_CUBE_COUNT (#2571) 2023-05-11 21:50:24 +08:00
guoh064
da848ea2b5 Fix: Wrong exit condition for meta_reward_exit 2023-05-09 20:46:01 +08:00
guoh064
53e027f909 Opt: Code Refactor and rename 2023-05-09 20:41:52 +08:00
hgjazhgj
0640732797 Opt: No raw command textarea in FpyBenchmark 2023-05-09 14:40:24 +08:00
guoh064
20fd6775ef Fix: bug in dossier_ship_enter 2023-05-08 08:22:54 +08:00
guoh064
452a4d2b4d Add: log for meta_reward.py 2023-05-07 22:56:25 +08:00
guoh064
a26e15675e Add: TEMPLATE_META_DOCK_RED_DOT for other servers 2023-05-07 22:21:20 +08:00
LmeSzinc
b14b9af392 Merge branch 'master' into feature 2023-05-07 21:36:38 +08:00
LmeSzinc
bb4f341b58 Fix: Add missing InvalidPrefixTemplate key 2023-05-07 21:17:04 +08:00
LmeSzinc
0f936f89d7 Fix: Confirm equipment dissemble but nothing is selected 2023-05-07 21:10:36 +08:00
LmeSzinc
0a0c0ffc20 Fix: port_goto() loops between NY City and Gibraltar 2023-05-07 21:10:36 +08:00
hgjazhgj
59263237ab Add: TeamIndex 2023-05-07 09:17:14 +08:00
hgjazhgj
f6d52621fe Add: Submodule AlasFpyBridge (experimental) 2023-05-06 20:58:08 +08:00
hgjazhgj
b18be2ae2b Fix: Redundant template-maa.maa.json config file (#2551) 2023-05-05 12:29:53 +08:00
LA-DI-DA
a97bbe228a Fix:Equipment change when in cloud 2023-05-03 23:42:36 +08:00
Zuosizhu
af50441528 Merge branch 'LmeSzinc:master' into 20230309 2023-05-03 21:24:06 +08:00
Zuosizhu
3590356135 Merge branch 'LmeSzinc:master' into master 2023-05-03 21:23:51 +08:00
LA-DI-DA
f85522f66d Add device sleep in EquipmentChange 2023-05-01 20:48:24 +08:00
LA-DI-DA
53f47ad579 Merge branch 'lme-alas/master' into wait 2023-04-30 23:03:45 +08:00
guoh064
88ca3c8568 Add: method for dossier ship click 2023-04-30 17:04:57 +08:00
guoh064
ad55533ee7 Opt: abstract method meta_reward_check 2023-04-30 16:26:07 +08:00
guoh064
5247bb2c0c Add: Dossier meta_reward receiving 2023-04-30 16:13:17 +08:00
LA-DI-DA
81f98084b0 Merge branch 'lme-alas/master' into wait 2023-04-28 23:43:29 +08:00
Zuosizhu
53cfc78a11 Merge branch 'LmeSzinc:master' into 20230309 2023-04-28 20:50:44 +08:00
Zuosizhu
6ba40f3e94 Merge branch 'LmeSzinc:master' into master 2023-04-28 20:50:37 +08:00
xzjjasper
3b6ce54740 Upd: [TW] Vacation Lane (#2533) 2023-04-28 19:41:37 +08:00
LmeSzinc
ea9b198205 Merge branch 'master' into feature 2023-04-28 01:15:50 +08:00
guoh064
8746a0ada3 Opt: Only Delay 12 hours for Hazard1leveling (#2530) 2023-04-28 01:10:53 +08:00
Zuosizhu
d2e395dc3a Fix: All 2023 to 2020 in datetime 2023-04-28 01:06:46 +08:00
Zuosizhu
f8dc5471a7 Merge branch 'LmeSzinc:master' into master 2023-04-28 01:04:17 +08:00
Zuosizhu
1666c3e421 Merge branch 'master_lme' 
# Conflicts:
#	campaign/Readme.md
#	module/config/i18n/en-US.json
#	module/config/i18n/ja-JP.json
#	module/config/i18n/zh-CN.json
#	module/config/i18n/zh-TW.json
 2023-04-28 01:01:55 +08:00
LmeSzinc
391be3ce51 Gui: Move down CoalitionSp in event daily tasks 2023-04-28 00:52:38 +08:00
LmeSzinc
81f0135b8a Gui: Rename Develop page to Home page 2023-04-28 00:52:38 +08:00
LmeSzinc
25c7512bc9 Opt: No for-append in put_arg_select() 2023-04-28 00:27:06 +08:00
LmeSzinc
075a420d4b Opt: Leave only one option if a select is disabled 
to stop people from asking why event is not selectable
 2023-04-27 23:50:16 +08:00
LmeSzinc
196d687970 Fix: Update map files and UI switches 2023-04-27 22:48:18 +08:00
LmeSzinc
0e7b9fe8c8 Add: Event Entrance of Vacation Lane Rerun (event_20230427_cn) 2023-04-27 22:19:30 +08:00
LmeSzinc
b5398cb97f Fix: daily_event typo (fixed #2525) 2023-04-27 22:12:44 +08:00
Zuosizhu
18b824d3ba Merge branch 'LmeSzinc:master' into 20230309 2023-04-27 15:24:49 +08:00
Zuosizhu
cb8be9b7b7 Merge branch 'LmeSzinc:master' into master 2023-04-27 15:24:02 +08:00
Zuosizhu
f15f0befb3 Add: Event entrance of Vacation Lane Rerun(event 20201126 cn) 2023-04-27 15:23:13 +08:00
Horizon101011
3b0cffa420 Upd: ServerChecker support for new servers (#2523) 2023-04-27 12:25:58 +08:00
guoh064
5024454b42 Fix: [JP] Opsi ocr fix (#2521) 
* Opt: abspath in appdir of uiautomator2 cache

* Fix: [JP] Opsi port ocr hotfix

Fix wrong ocr of port Taranto from 'タフント' to 'タラント'.

---------

Co-authored-by: LmeSzinc <37934724+LmeSzinc@users.noreply.github.com>
 2023-04-27 12:25:42 +08:00
LmeSzinc
5acd27ac96 Fix: Bound task Restart due to set sorting 2023-04-26 01:22:48 +08:00
LmeSzinc
c46feef6e8 Add: Auto start emulators 2023-04-25 23:51:54 +08:00
LmeSzinc
1befc42836 Opt: Rename emulator modules and improve log appearance 2023-04-25 23:20:41 +08:00
LmeSzinc
043d76480f Add: Start/stop MuMu Player family 2023-04-25 23:03:23 +08:00
LmeSzinc
dbd2c7d80b Upd: Use emulator official names and update translations 2023-04-25 23:03:23 +08:00