updated: hot reload to 1.13.7
This commit is contained in:
@@ -2,8 +2,11 @@ using System;
|
||||
using System.Diagnostics;
|
||||
using System.IO;
|
||||
using System.Net;
|
||||
#if UNITY_EDITOR_WIN
|
||||
using System.Net.NetworkInformation;
|
||||
#else
|
||||
using System.Net.Sockets;
|
||||
#endif
|
||||
using System.Threading.Tasks;
|
||||
using SingularityGroup.HotReload.Newtonsoft.Json;
|
||||
using UnityEditor;
|
||||
@@ -34,17 +37,19 @@ namespace SingularityGroup.HotReload.Editor.Cli {
|
||||
/// </summary>
|
||||
public static Task StartAsync() {
|
||||
return StartAsync(
|
||||
isReleaseMode: RequestHelper.IsReleaseMode(),
|
||||
exposeServerToNetwork: HotReloadPrefs.ExposeServerToLocalNetwork,
|
||||
allAssetChanges: HotReloadPrefs.AllAssetChanges,
|
||||
createNoWindow: HotReloadPrefs.DisableConsoleWindow
|
||||
createNoWindow: HotReloadPrefs.DisableConsoleWindow,
|
||||
detailedErrorReporting: !HotReloadPrefs.DisableDetailedErrorReporting
|
||||
);
|
||||
}
|
||||
|
||||
internal static async Task StartAsync(bool exposeServerToNetwork, bool allAssetChanges, bool createNoWindow, LoginData loginData = null) {
|
||||
internal static async Task StartAsync(bool exposeServerToNetwork, bool allAssetChanges, bool createNoWindow, bool isReleaseMode, bool detailedErrorReporting, LoginData loginData = null) {
|
||||
var port = await Prepare().ConfigureAwait(false);
|
||||
await ThreadUtility.SwitchToThreadPool();
|
||||
StartArgs args;
|
||||
if (TryGetStartArgs(UnityHelper.DataPath, exposeServerToNetwork, allAssetChanges, createNoWindow, loginData, port, out args)) {
|
||||
if (TryGetStartArgs(UnityHelper.DataPath, exposeServerToNetwork, allAssetChanges, createNoWindow, isReleaseMode, detailedErrorReporting, loginData, port, out args)) {
|
||||
await controller.Start(args);
|
||||
}
|
||||
}
|
||||
@@ -65,7 +70,7 @@ namespace SingularityGroup.HotReload.Editor.Cli {
|
||||
#pragma warning restore CS0649
|
||||
}
|
||||
|
||||
static bool TryGetStartArgs(string dataPath, bool exposeServerToNetwork, bool allAssetChanges, bool createNoWindow, LoginData loginData, int port, out StartArgs args) {
|
||||
static bool TryGetStartArgs(string dataPath, bool exposeServerToNetwork, bool allAssetChanges, bool createNoWindow, bool isReleaseMode, bool detailedErrorReporting, LoginData loginData, int port, out StartArgs args) {
|
||||
string serverDir;
|
||||
if(!CliUtils.TryFindServerDir(out serverDir)) {
|
||||
Log.Warning($"Failed to start the Hot Reload Server. " +
|
||||
@@ -114,7 +119,7 @@ namespace SingularityGroup.HotReload.Editor.Cli {
|
||||
}
|
||||
|
||||
var searchAssemblies = string.Join(";", CodePatcher.I.GetAssemblySearchPaths());
|
||||
var cliArguments = $@"-u ""{unityProjDir}"" -s ""{slnPath}"" -t ""{cliTempDir}"" -a ""{searchAssemblies}"" -ver ""{PackageConst.Version}"" -proc ""{Process.GetCurrentProcess().Id}"" -assets ""{allAssetChanges}"" -p ""{port}""";
|
||||
var cliArguments = $@"-u ""{unityProjDir}"" -s ""{slnPath}"" -t ""{cliTempDir}"" -a ""{searchAssemblies}"" -ver ""{PackageConst.Version}"" -proc ""{Process.GetCurrentProcess().Id}"" -assets ""{allAssetChanges}"" -p ""{port}"" -r {isReleaseMode} -detailed-error-reporting {detailedErrorReporting}";
|
||||
if (loginData != null) {
|
||||
cliArguments += $@" -email ""{loginData.email}"" -pass ""{loginData.password}""";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user