sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-22 18:43:44 +08:00
Code Activity

Fix: [JP] fix default package

Browse Source
This commit is contained in:
whoamikyo
2020-08-18 12:49:33 -03:00
parent abd2fafb40
commit 6129d25a9b
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
alas.bat
View File

@@ -73,6 +73,7 @@ set sha=%sha: =%
for /f "skip=14 tokens=3 delims=:" %%I IN (%API_JSON%) DO IF NOT DEFINED message SET message=%%I for /f "skip=14 tokens=3 delims=:" %%I IN (%API_JSON%) DO IF NOT DEFINED message SET message=%%I
set message=%message:"=% set message=%message:"=%
set message=%message:,=% set message=%message:,=%
for /f %%i in ('git rev-parse --abbrev-ref HEAD') do set BRANCH=%%i
for /f "delims=" %%i IN ('%GIT% log -1 "--pretty=%%H"') DO set LAST_LOCAL_GIT=%%i for /f "delims=" %%i IN ('%GIT% log -1 "--pretty=%%H"') DO set LAST_LOCAL_GIT=%%i
for /f "tokens=1,2" %%A in ('%GIT% log -1 "--format=%%h %%ct" -- .') do ( for /f "tokens=1,2" %%A in ('%GIT% log -1 "--format=%%h %%ct" -- .') do (
set GIT_SHA1=%%A set GIT_SHA1=%%A
@@ -82,22 +83,25 @@ for /f "tokens=1,2" %%A in ('%GIT% log -1 "--format=%%h %%ct" -- .') do (
:time_parsed :time_parsed
if %LAST_LOCAL_GIT% equ %sha% ( if %LAST_LOCAL_GIT% equ %sha% (
echo ---------------------------------------------------------------- echo ----------------------------------------------------------------
echo Remote Git hash: %sha% echo Remote Git hash: %sha%
echo Remote Git message: %message% echo Remote Git message: %message%
echo ---------------------------------------------------------------- echo ----------------------------------------------------------------
echo Local Git hash: %LAST_LOCAL_GIT% echo Local Git hash: %LAST_LOCAL_GIT%
echo Local commit date: %GIT_CTIME% echo Local commit date: %GIT_CTIME%
echo Local Branch: %BRANCH%
echo ---------------------------------------------------------------- echo ----------------------------------------------------------------
echo your ALAS is updated echo your ALAS is updated
echo Press any to continue...
pause > NUL pause > NUL
call :adb_kill call :adb_kill
) else ( ) else (
echo ---------------------------------------------------------------- echo ----------------------------------------------------------------
echo Remote Git hash: %sha% echo Remote Git hash: %sha%
echo Remote Git message: %message% echo Remote Git message: %message%
echo ---------------------------------------------------------------- echo ----------------------------------------------------------------
echo Local Git hash: %LAST_LOCAL_GIT% echo Local Git hash: %LAST_LOCAL_GIT%
echo Local commit date: %GIT_CTIME% echo Local commit date: %GIT_CTIME%
echo Local Branch: %BRANCH%
echo ---------------------------------------------------------------- echo ----------------------------------------------------------------
call popup.exe call popup.exe
choice /t 10 /c yn /d n /m "There is an update for ALAS. Download now?" choice /t 10 /c yn /d n /m "There is an update for ALAS. Download now?"
@@ -202,6 +206,7 @@ echo ----------------------------------------------------------------
echo Old Serial: %serial% echo Old Serial: %serial%
echo New Serial: %SERIAL_REALTIME% echo New Serial: %SERIAL_REALTIME%
echo ---------------------------------------------------------------- echo ----------------------------------------------------------------
echo Press any to continue...
pause > NUL pause > NUL
for /f "delims=" %%i in ('type "%config%" ^& break ^> "%config%" ') do ( for /f "delims=" %%i in ('type "%config%" ^& break ^> "%config%" ') do (
set line=%%i set line=%%i
@@ -272,6 +277,7 @@ echo ----------------------------------------------------------------
echo initializing uiautomator2 echo initializing uiautomator2
call %PYTHON% -m uiautomator2 init call %PYTHON% -m uiautomator2 init
echo ---------------------------------------------------------------- echo ----------------------------------------------------------------
echo Press any to continue...
pause > NUL pause > NUL
:: uncomment the pause to catch errors :: uncomment the pause to catch errors
REM pause REM pause

2
module/config/argparser_jp.py
View File

@@ -312,7 +312,7 @@ def main(ini_name=''):
emulator = emulator_parser.add_argument_group('Emulator', 'Need to Press start to save your settings, it will check whether the game is started \nIf the game has not started, it will be started', gooey_options={'label_color': '#931D03'}) emulator = emulator_parser.add_argument_group('Emulator', 'Need to Press start to save your settings, it will check whether the game is started \nIf the game has not started, it will be started', gooey_options={'label_color': '#931D03'})
emulator.add_argument('--serial', default=default('--serial'), emulator.add_argument('--serial', default=default('--serial'),
help='', gooey_options={'label_color': '#4B5F83'}) help='', gooey_options={'label_color': '#4B5F83'})
emulator.add_argument('--package_name', default='com.YoStarEN.AzurLane', help='', gooey_options={'label_color': '#4B5F83'}) emulator.add_argument('--package_name', default='com.YoStarJP.AzurLane', help='', gooey_options={'label_color': '#4B5F83'})
emulator.add_argument( emulator.add_argument(
'--default_serial', '--default_serial',
default=message, default=message,