diff --git a/Assets/GameScripts/Editor.meta b/Assets/GameScripts/Editor.meta new file mode 100644 index 00000000..97a32d77 --- /dev/null +++ b/Assets/GameScripts/Editor.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: f69993ae3e14f924aa33b8747244c587 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/TEngine/Runtime/GameFramework/Resource/ResourceManager.cs b/Assets/TEngine/Runtime/GameFramework/Resource/ResourceManager.cs index e87d0d70..b1bd398d 100644 --- a/Assets/TEngine/Runtime/GameFramework/Resource/ResourceManager.cs +++ b/Assets/TEngine/Runtime/GameFramework/Resource/ResourceManager.cs @@ -171,6 +171,7 @@ namespace TEngine // 联机运行模式 if (PlayMode == EPlayMode.HostPlayMode) { + HostServerURL = SettingsUtils.FrameworkGlobalSettings.HostServerURL; var createParameters = new HostPlayModeParameters(); createParameters.DecryptionServices = new GameDecryptionServices(); createParameters.QueryServices = new GameQueryServices(); diff --git a/Assets/TEngine/Runtime/GameSettings/Framework/FrameworkGlobalSettings.cs b/Assets/TEngine/Runtime/GameSettings/Framework/FrameworkGlobalSettings.cs index 19bd0351..81a4ff96 100644 --- a/Assets/TEngine/Runtime/GameSettings/Framework/FrameworkGlobalSettings.cs +++ b/Assets/TEngine/Runtime/GameSettings/Framework/FrameworkGlobalSettings.cs @@ -159,6 +159,8 @@ public class FrameworkGlobalSettings [Header("Hotfix")] [SerializeField] private string m_ResourceVersionFileName = "ResourceVersion.txt"; + public string HostServerURL = "http://127.0.0.1:8081"; + public string ResourceVersionFileName { get { return m_ResourceVersionFileName; } diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index a1cf65b6..3dd9e7ae 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -6,6 +6,6 @@ EditorBuildSettings: serializedVersion: 2 m_Scenes: - enabled: 1 - path: Assets/Scenes/main.unity - guid: 2cda990e2423bbf4892e6590ba056729 + path: Assets/AATemp/temp.unity + guid: 18a2a610457925e44ac734e90182e6b6 m_configObjects: {} diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index b44a2a06..a19ae882 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -27,14 +27,14 @@ EditorUserSettings: value: 2242470311464677080f021607265a1e5932002b21382a353e662e30e7ee312badcb39eee81936323c0fee280d3d4f2afc031d12 flags: 0 RecentlyUsedScenePath-7: - value: 224247031146467a2c3a092f006c4b151b07563f22213229 - flags: 0 - RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c5e020204553f256522353e201a3dacf53a31f6fe flags: 0 - RecentlyUsedScenePath-9: + RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c52111f19563f22213229 flags: 0 + RecentlyUsedScenePath-9: + value: 224247031146467a2c3a092f006c4b151b07563f22213229 + flags: 0 vcSharedLogLevel: value: 0d5e400f0650 flags: 0