1
0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-14 17:46:01 +08:00

merge alas

This commit is contained in:
SevCrane
2024-06-05 23:57:58 +08:00
parent 3cb29a9a37
commit abfbbe5064
146 changed files with 0 additions and 13646 deletions

View File

@@ -1,16 +1,9 @@
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 = {
@@ -19,10 +12,7 @@ export class PyShell extends PythonShell {
pythonPath: pythonPath,
scriptPath: alasPath,
};
<<<<<<< HEAD
logger.info(`${pythonPath} ${script} ${args}`);
=======
>>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
super(script, options);
}