Commit Graph

249 Commits

Author SHA1 Message Date
Erik
56d2df66b9
Merge branch 'dev' into master 2020-06-16 13:36:05 -03:00
LmeSzinc
20567ceba5 Merge remote-tracking branch 'origin/master' 2020-06-16 18:34:26 +08:00
LmeSzinc
383ff448ad Doc: aScreenCap benchmarks
- Fix emulator test config
- Add instruction when no suitable aScreenCap lib
2020-06-16 18:28:24 +08:00
Erik
8dbbee7cb7
Merge pull request #23 from whoamikyo/master
Asset: [EN] Updated MAP_ENEMY_SEARCHING
2020-06-16 07:12:25 -03:00
whoamikyo
23aa33ce23 Asset: [EN] Updated MAP_ENEMY_SEARCHING 2020-06-16 06:51:34 -03:00
LmeSzinc
51f39be0ff Fix: [CN] LOGIN_CONFIRM different in different device
- Improve log appearance of login
2020-06-16 17:26:34 +08:00
Erik
185b85a808
Merge pull request #22 from whoamikyo/master
Mirroring master
2020-06-16 01:12:16 -03:00
whoamikyo
26a321a916 initial commit 2020-06-16 00:30:50 -03:00
whoamikyo
d2d64ee487 Add: Added some icons to GUI
Assets: [EN] updated some templates assets using relative_crop.py
Campaign: Added 12-4 support
Fix: Added camera_data_spawn_point on 7-2 mystery to avoid dont detected a fleet when camera focus on H1
2020-06-16 00:04:16 -03:00
LmeSzinc
d0867262e2 Optimize: Reuse device instance in the same function
- Speed up retire confirm
- Set default server to CN
- Improve log appearance of aScreenCap init
2020-06-16 08:55:44 +08:00
LmeSzinc
2e26d0a1e1 Add: [CN] Main chapter mode settings in GUI 2020-06-16 07:49:15 +08:00
whoamikyo
1ea28dfc86 Merge branch 'master' of https://github.com/whoamikyo/AzurLaneAutoScript 2020-06-15 20:48:45 -03:00
whoamikyo
7326d6b2e0 Update: [EN] change in some terms to facilitate understanding. 2020-06-15 20:48:16 -03:00
LmeSzinc
97b85160cd Add: aScreenCap support
- Optimize adb command call
2020-06-16 07:39:51 +08:00
LmeSzinc
1e55c25f49 Fix: All BATTLE_STATUS and EXP_INFO of all server 2020-06-16 02:47:28 +08:00
nEEtdo0d
8cb55f699d Add new exercise option "easiest" and alternative priority calculation for this specific mode. May alter at a later date but for time being the behavior seems to be consistent in prioritizing the lowest average level based on all 6 ship slots (filled or empty) and lowest average overall power based on number of actual ships (only filled) in the team. 2020-06-14 12:27:13 -04:00
whoamikyo
5434209893 Fix: Fix default PACKAGE_NAME
- this was causing error when triggered app restart
2020-06-13 20:38:35 -03:00
LmeSzinc
0450cbdf80 Fix: The info_bar blocks the ammo icon when reversing fleet 2020-06-14 02:28:52 +08:00
ferina8-14
dea0a02245 Merge remote-tracking branch 'upstream/master' 2020-06-14 02:30:12 +09:00
ferina8-14
0a1b1ea121 Add: [JP] add jp assets 2020-06-13 03:41:21 +09:00
ferina8-14
47adffd1a0 Merge branch 'master' into try_jp
[JP] copy assets from cn

# Conflicts:
#	module/combat/assets.py
#	module/daemon/assets.py
#	module/handler/assets.py
#	module/retire/assets.py
#	module/reward/assets.py
2020-06-13 03:29:35 +09:00
ferina8-14
0b94fade90 Add: [JP] add jp assets, ui module 2020-06-13 02:54:19 +09:00
ferina8-14
a628c5b02b Add: [JP] add jp assets, template module 2020-06-13 02:53:45 +09:00
ferina8-14
9714b6bb1e Add: [JP] add jp assets, reward module 2020-06-13 02:53:29 +09:00
ferina8-14
10bbdd1a79 Add: [JP] add jp assets, retire module 2020-06-13 02:52:55 +09:00
ferina8-14
c78d5f1371 Add: [JP] add jp assets, map module 2020-06-13 02:52:30 +09:00
ferina8-14
4567da5a55 Add: [JP] add jp assets, hard module 2020-06-13 02:52:10 +09:00
ferina8-14
9657141390 Add: [JP] add jp assets, handler module 2020-06-13 02:51:55 +09:00
ferina8-14
b82388a8a2 Add: [JP] add jp assets, exercise module 2020-06-13 02:51:29 +09:00
ferina8-14
2acfb5e615 Add: [JP] add jp assets, equipment module 2020-06-13 02:51:10 +09:00
ferina8-14
7b590b9853 Add: [JP] add jp assets, daily module 2020-06-13 02:50:51 +09:00
ferina8-14
21998812b4 Add: [JP] add jp assets, daemon module 2020-06-13 02:50:35 +09:00
ferina8-14
ef0fc01b08 Add: [JP] add jp assets, combat module 2020-06-13 02:50:12 +09:00
ferina8-14
ca1fd238a9 Add: [JP] add jp assets, campaign module 2020-06-13 02:49:47 +09:00
ferina8-14
f589ecfaa1 Add: [JP] add jp server support, copy assets from cn 2020-06-13 02:35:40 +09:00
LmeSzinc
a623e7d082 Fix: rare bugs
- Fix roadblocks in 6-4
- Fix mis-detect BATTLE_STATUS_D when battle executing
- Add call details to popup
2020-06-12 19:29:13 +08:00
kyO The NinjA
ad90d29525 Fix: [EN] Fix Retire assets and AUTOMATION_CONFIRM asset 2020-06-12 00:15:49 -03:00
kyO The NinjA
f49da62dce Fix: [EN[ Fix INFO_BAR assets 2020-06-11 15:52:15 -03:00
kyO The NinjA
ab18cf38bb Fix: [EN] Fix assets 2020-06-11 15:10:20 -03:00
LmeSzinc
c37fda242c Fix: [EN] POPUP assets now in 1280x720
- Add assets check to button_extract
2020-06-12 00:09:58 +08:00
LmeSzinc
49ae4c6361 Add: [EN] Skybound Oratorio 2020-06-11 23:13:50 +08:00
nEEtdo0d
0e8e25de18 Fixed EN rank D assets, CN so those needs to be updated since I don't play CN I've only inserted dummy files so that button_extract module would run. Also added extra conditions for the exercise loop so that it exits the rank D screens 2020-06-08 17:06:39 -04:00
kyO The NinjA
ae88a57eba Fix: [EN] Fix Miss detect lines as characters in Commission module 2020-06-08 07:54:21 -03:00
kyO The NinjA
7c15659f7f Add: Added support for hard map
- Now is possible cleared a hard map like a normal map
2020-06-08 05:56:43 -03:00
kyO The NinjA
95ca113562 Add: Map 11-4 support, Columbia farm is real
Add: Suport to Rank B
2020-06-08 03:16:00 -03:00
Erik
2b58d4dd6a
Merge pull request #15 from LmeSzinc/master
Fix: Parameters for 3-4
2020-06-06 15:53:44 -03:00
kyO The NinjA
6d5ac959d4 Add: [EN] Ambush assets updated 2020-06-06 15:44:58 -03:00
LmeSzinc
141599c883 Fix: Now will only run commissions with priority > 0 2020-06-06 22:42:32 +08:00
LmeSzinc
3c35974bbe Fix: add new day check to reward_loop
- Fix emotion reduce when calculating recover
2020-06-06 21:53:31 +08:00
LmeSzinc
f9c37ea7e4 Fix: Disable submarine_view check because of icon bug of submarine zone 2020-06-06 15:43:38 +08:00