Merge remote-tracking branch 'origin/main-fix' into think_flow_test

2025-03-26 00:16:56 +08:00
parent 1b960b32b4
commit 681e1aa0fc
6 changed files with 160 additions and 66 deletions
--- a/MaiLauncher.bat
+++ b/MaiLauncher.bat
@@ -277,6 +277,19 @@ if defined VIRTUAL_ENV (
    goto menu
 )

+if exist "%_root%\config\conda_env" (
+    set /p CONDA_ENV=<"%_root%\config\conda_env"
+    call conda activate !CONDA_ENV! || (
+    echo 激活失败，可能原因：
+    echo 1. 环境不存在
+    echo 2. conda配置异常
+    pause
+    goto conda_menu
+	)
+	echo 成功激活conda环境：!CONDA_ENV!
+	goto menu
+)
+
 echo =====================================
 echo 虚拟环境检测警告：
 echo 当前使用系统Python路径：!PYTHON_HOME!
@@ -390,6 +403,7 @@ call conda activate !CONDA_ENV! || (
    goto conda_menu
 )
 echo 成功激活conda环境：!CONDA_ENV!
+echo !CONDA_ENV! > "%_root%\config\conda_env"
 echo 要安装依赖吗？
 set /p install_confirm="继续？(Y/N): "
 if /i "!install_confirm!"=="Y" (