mirror of
https://gitee.com/sui-feng-cb/AzurLaneAutoScript1
synced 2026-03-14 17:46:01 +08:00
Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript
This commit is contained in:
@@ -1,9 +1,16 @@
|
||||
import {alasPath, pythonPath} from '/@/config';
|
||||
<<<<<<< HEAD
|
||||
import logger from '/@/logger';
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
|
||||
const {PythonShell} = require('python-shell');
|
||||
const treeKill = require('tree-kill');
|
||||
|
||||
<<<<<<< HEAD
|
||||
=======
|
||||
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
export class PyShell extends PythonShell {
|
||||
constructor(script: string, args: Array<string> = []) {
|
||||
const options = {
|
||||
@@ -12,7 +19,10 @@ export class PyShell extends PythonShell {
|
||||
pythonPath: pythonPath,
|
||||
scriptPath: alasPath,
|
||||
};
|
||||
<<<<<<< HEAD
|
||||
logger.info(`${pythonPath} ${script} ${args}`);
|
||||
=======
|
||||
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
|
||||
super(script, options);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user