diff --git a/Server/Model/Generate/ConfigPartial/StartSceneConfig.cs b/Server/Model/Generate/ConfigPartial/StartSceneConfig.cs
index b705b2549a1a79151d88587c6dc783c3d0dfe31c..67874e193614563135b8888516fe42ccf95b6399 100644
--- a/Server/Model/Generate/ConfigPartial/StartSceneConfig.cs
+++ b/Server/Model/Generate/ConfigPartial/StartSceneConfig.cs
@@ -67,7 +67,7 @@ namespace ET
{
get
{
- return StartZoneConfigCategory.Instance.Get(this.Process);
+ return StartZoneConfigCategory.Instance.Get(this.Zone);
}
}
diff --git a/Server/Model/Server.Model.csproj b/Server/Model/Server.Model.csproj
index a31bf03d7d83a8727844d0458d542356ef7197c2..820d8b0d8696a2118096f64b555708000a7fc98c 100644
--- a/Server/Model/Server.Model.csproj
+++ b/Server/Model/Server.Model.csproj
@@ -82,7 +82,6 @@
-
diff --git a/Unity/Assets/Model/Base/Options.cs b/Unity/Assets/Model/Base/Options.cs
deleted file mode 100644
index 849db97ca7d49728ccfe445ffff00d1c526939d5..0000000000000000000000000000000000000000
--- a/Unity/Assets/Model/Base/Options.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using CommandLine;
-using System;
-using System.Collections.Generic;
-
-namespace ET
-{
- public enum ServerType
- {
- Game,
- Watcher,
- }
-
- public class Options
- {
- [Option("ServerType", Required = false, Default = ServerType.Game, HelpText = "serverType enum")]
- public ServerType ServerType { get; set; }
-
- [Option("Process", Required = false, Default = 1)]
- public int Process { get; set; } = 1;
-
- [Option("Develop", Required = false, Default = 0, HelpText = "develop mode, 0正式 1开发 2压测")]
- public int Develop { get; set; } = 0;
-
- [Option("LogLevel", Required = false, Default = 0)]
- public int LogLevel { get; set; } = 2;
- }
-}
\ No newline at end of file
diff --git a/Unity/Assets/Model/Module/Message/ProtobufHelper.cs b/Unity/Assets/Model/Core/Helper/ProtobufHelper.cs
similarity index 100%
rename from Unity/Assets/Model/Module/Message/ProtobufHelper.cs
rename to Unity/Assets/Model/Core/Helper/ProtobufHelper.cs
diff --git a/Unity/Assets/Model/Module/Message/ProtobufHelper.cs.meta b/Unity/Assets/Model/Core/Helper/ProtobufHelper.cs.meta
similarity index 100%
rename from Unity/Assets/Model/Module/Message/ProtobufHelper.cs.meta
rename to Unity/Assets/Model/Core/Helper/ProtobufHelper.cs.meta
diff --git a/Server/Model/Demo/Options.cs b/Unity/Assets/Model/Core/Options.cs
similarity index 76%
rename from Server/Model/Demo/Options.cs
rename to Unity/Assets/Model/Core/Options.cs
index f3418e29415ef7b355043c0422e54af7d907963e..315fbc6eae9552686186b5ec9aea5abc36f3bc52 100644
--- a/Server/Model/Demo/Options.cs
+++ b/Unity/Assets/Model/Core/Options.cs
@@ -1,4 +1,4 @@
-using CommandLine;
+using CommandLine;
namespace ET
{
@@ -7,16 +7,16 @@ namespace ET
Game,
Watcher,
}
-
+
public class Options
{
//[Option("StartConfig", Required = true)]
//public string StartConfig { get; set; }
-//
- //[Option("ServerType", Required = false, Default = ServerType.Game, HelpText = "serverType enum")]
- //public ServerType ServerType { get; set; }
- [Option("Develop", Required = false, Default = 0, HelpText = "develop mode")]
+ [Option("ServerType", Required = false, Default = ServerType.Game, HelpText = "serverType enum")]
+ public ServerType ServerType { get; set; }
+
+ [Option("Develop", Required = false, Default = 0, HelpText = "develop mode, 0正式 1开发 2压测")]
public int Develop { get; set; }
[Option("Process", Required = false, Default = 1)]
diff --git a/Unity/Assets/Model/Base/Options.cs.meta b/Unity/Assets/Model/Core/Options.cs.meta
similarity index 100%
rename from Unity/Assets/Model/Base/Options.cs.meta
rename to Unity/Assets/Model/Core/Options.cs.meta