修复在mac上运行的问题

Config/Json/cs/StartConfig/Localhost/StartSceneConfig.txt

@@ -8,7 +8,6 @@
 [301, {"_t":"StartSceneConfig","_id":301,"Process":1,"Zone":3,"SceneType":"Gate","Name":"Gate1","Port":30101}],
 [302, {"_t":"StartSceneConfig","_id":302,"Process":1,"Zone":3,"SceneType":"Gate","Name":"Gate2","Port":30102}],
 [303, {"_t":"StartSceneConfig","_id":303,"Process":1,"Zone":3,"SceneType":"Location","Name":"Location","Port":0}],
-[304, {"_t":"StartSceneConfig","_id":304,"Process":1,"Zone":3,"SceneType":"Match","Name":"Match","Port":0}],
-[305, {"_t":"StartSceneConfig","_id":305,"Process":1,"Zone":3,"SceneType":"Map","Name":"Map1","Port":0}],
-[306, {"_t":"StartSceneConfig","_id":306,"Process":1,"Zone":3,"SceneType":"Map","Name":"Map2","Port":0}],
+[304, {"_t":"StartSceneConfig","_id":304,"Process":1,"Zone":3,"SceneType":"Map","Name":"Map1","Port":0}],
+[305, {"_t":"StartSceneConfig","_id":305,"Process":1,"Zone":3,"SceneType":"Map","Name":"Map2","Port":0}],
 ]}

Config/Json/cs/StartConfig/Release/StartSceneConfig.txt

@@ -8,7 +8,6 @@
 [301, {"_t":"StartSceneConfig","_id":301,"Process":6,"Zone":3,"SceneType":"Gate","Name":"Gate1","Port":30101}],
 [302, {"_t":"StartSceneConfig","_id":302,"Process":7,"Zone":3,"SceneType":"Gate","Name":"Gate2","Port":30102}],
 [303, {"_t":"StartSceneConfig","_id":303,"Process":8,"Zone":3,"SceneType":"Location","Name":"Location","Port":0}],
-[304, {"_t":"StartSceneConfig","_id":304,"Process":9,"Zone":3,"SceneType":"Match","Name":"Match","Port":0}],
-[305, {"_t":"StartSceneConfig","_id":305,"Process":10,"Zone":3,"SceneType":"Map","Name":"Map1","Port":0}],
-[306, {"_t":"StartSceneConfig","_id":306,"Process":11,"Zone":3,"SceneType":"Map","Name":"Map2","Port":0}],
+[304, {"_t":"StartSceneConfig","_id":304,"Process":9,"Zone":3,"SceneType":"Map","Name":"Map1","Port":0}],
+[305, {"_t":"StartSceneConfig","_id":305,"Process":10,"Zone":3,"SceneType":"Map","Name":"Map2","Port":0}],
 ]}

Config/Json/s/StartConfig/Localhost/StartSceneConfig.txt

@@ -8,7 +8,6 @@
 [301, {"_t":"StartSceneConfig","_id":301,"Process":1,"Zone":3,"SceneType":"Gate","Name":"Gate1","Port":30101}],
 [302, {"_t":"StartSceneConfig","_id":302,"Process":1,"Zone":3,"SceneType":"Gate","Name":"Gate2","Port":30102}],
 [303, {"_t":"StartSceneConfig","_id":303,"Process":1,"Zone":3,"SceneType":"Location","Name":"Location","Port":0}],
-[304, {"_t":"StartSceneConfig","_id":304,"Process":1,"Zone":3,"SceneType":"Match","Name":"Match","Port":0}],
-[305, {"_t":"StartSceneConfig","_id":305,"Process":1,"Zone":3,"SceneType":"Map","Name":"Map1","Port":0}],
-[306, {"_t":"StartSceneConfig","_id":306,"Process":1,"Zone":3,"SceneType":"Map","Name":"Map2","Port":0}],
+[304, {"_t":"StartSceneConfig","_id":304,"Process":1,"Zone":3,"SceneType":"Map","Name":"Map1","Port":0}],
+[305, {"_t":"StartSceneConfig","_id":305,"Process":1,"Zone":3,"SceneType":"Map","Name":"Map2","Port":0}],
 ]}

Config/Json/s/StartConfig/Release/StartSceneConfig.txt

@@ -8,7 +8,6 @@
 [301, {"_t":"StartSceneConfig","_id":301,"Process":6,"Zone":3,"SceneType":"Gate","Name":"Gate1","Port":30101}],
 [302, {"_t":"StartSceneConfig","_id":302,"Process":7,"Zone":3,"SceneType":"Gate","Name":"Gate2","Port":30102}],
 [303, {"_t":"StartSceneConfig","_id":303,"Process":8,"Zone":3,"SceneType":"Location","Name":"Location","Port":0}],
-[304, {"_t":"StartSceneConfig","_id":304,"Process":9,"Zone":3,"SceneType":"Match","Name":"Match","Port":0}],
-[305, {"_t":"StartSceneConfig","_id":305,"Process":10,"Zone":3,"SceneType":"Map","Name":"Map1","Port":0}],
-[306, {"_t":"StartSceneConfig","_id":306,"Process":11,"Zone":3,"SceneType":"Map","Name":"Map2","Port":0}],
+[304, {"_t":"StartSceneConfig","_id":304,"Process":9,"Zone":3,"SceneType":"Map","Name":"Map1","Port":0}],
+[305, {"_t":"StartSceneConfig","_id":305,"Process":10,"Zone":3,"SceneType":"Map","Name":"Map2","Port":0}],
 ]}

Packages/com.etetet.init/Editor/GitDependencyResolver/DependencyResolver.cs

@@ -25,13 +25,10 @@ namespace Hibzz.DependencyResolver
     [InitializeOnLoad]
     public class DependencyResolver
     {
+        [MenuItem("ET/MoveToPackage")]
         static void MoveToPackage()
         {
-#if UNITY_EDITOR_WIN
-            Process process = ProcessHelper.Run("powershell.exe", $"-NoExit -ExecutionPolicy Bypass -File .\\Scripts/MoveToPackages.ps1", waitExit: true);
-#else
-            Process process = ProcessHelper.Run("pwsh", $"-NoExit -ExecutionPolicy Bypass -File ./Scripts/MoveToPackages.ps1", waitExit: true);
-#endif
+            Process process = ProcessHelper.PowerShell($"-NoExit -ExecutionPolicy Bypass -File .\\Scripts/MoveToPackages.ps1", waitExit: true);
             Debug.Log(process.StandardOutput.ReadToEnd());
             AssetDatabase.Refresh();
         }

Packages/com.etetet.init/Editor/GitDependencyResolver/ProcessHelper.cs

@@ -9,6 +9,18 @@ namespace ET
 {
     public static class ProcessHelper
     {
+        public static System.Diagnostics.Process PowerShell(string arguments, string workingDirectory = ".", bool waitExit = false)
+        {
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                return Run("powershell.exe", arguments, workingDirectory, waitExit);
+            }
+            else
+            {
+                return Run("/usr/local/bin/pwsh", arguments, workingDirectory, waitExit);
+            }
+        }
+
         public static System.Diagnostics.Process Run(string exe, string arguments, string workingDirectory = ".", bool waitExit = false)
         {
             //Log.Debug($"Process Run exe:{exe} ,arguments:{arguments} ,workingDirectory:{workingDirectory}");

Packages/com.etetet.init/Editor/PackagesEditor/LinkSlnHelper.cs

@@ -25,11 +25,7 @@ namespace ET
                 throw new Exception("not found ET.sln in et packages!");
             }
             
-#if UNITY_EDITOR_WIN
-            Process process = ProcessHelper.Run("powershell.exe", $"New-Item -ItemType HardLink -Target {slns[0]} ./ET.sln", waitExit: true);
-#else
-            Process process = ProcessHelper.Run("pwsh", $"New-Item -ItemType HardLink -Target {slns[0]} ./ET.sln", waitExit: true);
-#endif
+            Process process = ProcessHelper.PowerShell($"-c New-Item -ItemType HardLink -Target {slns[0]} ./ET.sln", waitExit: true);
             UnityEngine.Debug.Log(process.StandardOutput.ReadToEnd());
         }
     }

Packages/com.etetet.init/Editor/ShellHelper.cs

@@ -1,103 +0,0 @@
-using System;
-using System.Diagnostics;
-using System.Collections.Generic;
-
-namespace ET
-{
-    public static class ShellHelper
-    {
-        public static void Run(string cmd, string workDirectory, List<string> environmentVars = null)
-        {
-            System.Diagnostics.Process process = new();
-            try
-            {
-#if UNITY_EDITOR_OSX || UNITY_EDITOR_LINUX
-                string app = "bash";
-                string splitChar = ":";
-                string arguments = "-c";
-#elif UNITY_EDITOR_WIN
-                string app = "cmd.exe";
-                string splitChar = ";";
-                string arguments = "/c";
-#endif
-                ProcessStartInfo start = new ProcessStartInfo(app);
-
-                if (environmentVars != null)
-                {
-                    foreach (string var in environmentVars)
-                    {
-                        start.EnvironmentVariables["PATH"] += (splitChar + var);
-                    }
-                }
-
-                process.StartInfo = start;
-                start.Arguments = arguments + " \"" + cmd + "\"";
-                start.CreateNoWindow = true;
-                start.ErrorDialog = true;
-                start.UseShellExecute = false;
-                start.WorkingDirectory = workDirectory;
-
-                if (start.UseShellExecute)
-                {
-                    start.RedirectStandardOutput = false;
-                    start.RedirectStandardError = false;
-                    start.RedirectStandardInput = false;
-                }
-                else
-                {
-                    start.RedirectStandardOutput = true;
-                    start.RedirectStandardError = true;
-                    start.RedirectStandardInput = true;
-                    start.StandardOutputEncoding = System.Text.Encoding.UTF8;
-                    start.StandardErrorEncoding = System.Text.Encoding.UTF8;
-                }
-
-                bool endOutput = false;
-                bool endError = false;
-
-                process.OutputDataReceived += (sender, args) =>
-                {
-                    if (args.Data != null)
-                    {
-                        UnityEngine.Debug.Log(args.Data);
-                    }
-                    else
-                    {
-                        endOutput = true;
-                    }
-                };
-
-                process.ErrorDataReceived += (sender, args) =>
-                {
-                    if (args.Data != null)
-                    {
-                        UnityEngine.Debug.LogError(args.Data);
-                    }
-                    else
-                    {
-                        endError = true;
-                    }
-                };
-
-                process.Start();
-                process.BeginOutputReadLine();
-                process.BeginErrorReadLine();
-
-                while (!endOutput || !endError)
-                {
-                }
-
-                process.CancelOutputRead();
-                process.CancelErrorRead();
-            }
-            catch (Exception e)
-            {
-                UnityEngine.Debug.LogException(e);
-            }
-            finally
-            {
-                process.Close();
-            }
-        }
-    }
-}

Packages/com.etetet.init/Editor/ShellHelper.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 61f2b8fe7ecd64cb3aad11c6a350638b
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Packages/com.etetet.init/Editor/ToolEditor/ToolsEditor.cs

@@ -1,4 +1,5 @@
 using UnityEditor;
+using System.Diagnostics;
 
 namespace ET
 {
@@ -8,22 +9,26 @@ namespace ET
         public static void ExcelExporter()
         {
 #if UNITY_EDITOR_OSX || UNITY_EDITOR_LINUX
-            const string tools = "dotnet";
+            const string tools = "/usr/local/bin/dotnet";
 #else
             const string tools = "dotnet.exe";
 #endif
-            ShellHelper.Run($"{tools} ./Packages/cn.etetet.excel/DotNet~/Exe/ET.ExcelExporter.dll", "./");
+            Process process = ProcessHelper.Run($"{tools}", "./Packages/cn.etetet.excel/DotNet~/Exe/ET.ExcelExporter.dll", "./", true);
+
+            UnityEngine.Debug.Log(process.StandardOutput.ReadToEnd());
         }
         
         [MenuItem("ET/Proto2CS")]
         public static void Proto2CS()
         {
 #if UNITY_EDITOR_OSX || UNITY_EDITOR_LINUX
-            const string tools = "dotnet";
+            const string tools = "/usr/local/bin/dotnet";
 #else
             const string tools = "dotnet.exe";
 #endif
-            ShellHelper.Run($"{tools} ./Packages/cn.etetet.proto/DotNet~/Exe/ET.Proto2CS.dll", "./");
+            Process process = ProcessHelper.Run($"{tools}", "./Packages/cn.etetet.proto/DotNet~/Exe/ET.Proto2CS.dll", "./", true);
+
+            UnityEngine.Debug.Log(process.StandardOutput.ReadToEnd());
         }
     }
 }

Packages/com.unity.ide.rider@3.0.28/Rider/Editor/RiderScriptEditor.cs

@@ -336,7 +336,7 @@ namespace Packages.Rider.Editor
       //  return solutionFile;
       //}
 
-      return "ET.sln";
+      return System.IO.Path.GetFullPath("./ET.sln");
     }
 
     static bool IsUnityScript(string path)

Scripts/MoveToPackages.ps1

@@ -8,9 +8,10 @@ foreach($dir in Get-ChildItem "Library/PackageCache")
     if ($dir.Name.StartsWith("cn.etetet"))
     {
         $baseName = $dir.Name.Substring(0, $dir.Name.indexOf("@"))
-             
-        Move-Item "Library/PackageCache/$dir" "Packages/$baseName"
-        Write-Host "move Library/PackageCache/$dir to Packages/$baseName"
+        
+        $t = $dir.Name
+        Write-Host "move Library/PackageCache/$t to Packages/$baseName"
+        Move-Item "Library/PackageCache/$t" "Packages/$baseName"
     }  
 }