Kaynağa Gözat

Update StartSceneConfig (#235)

* 把Core的依赖文件移到Core内部,使得Core不在依赖任何外部文件
Logicoder 4 yıl önce
ebeveyn
işleme
176a763706

+ 1 - 1
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);
             }
         }
 

+ 0 - 1
Server/Model/Server.Model.csproj

@@ -82,7 +82,6 @@
     <Compile Include="..\..\Unity\Assets\Model\Module\Message\MessageHandlerAttribute.cs" Link="Module\Message\MessageHandlerAttribute.cs" />
     <Compile Include="..\..\Unity\Assets\Model\Module\Message\OpcodeHelper.cs" Link="Module\Message\OpcodeHelper.cs" />
     <Compile Include="..\..\Unity\Assets\Model\Module\Message\OpcodeTypeComponent.cs" Link="Module\Message\OpcodeTypeComponent.cs" />
-    <Compile Include="..\..\Unity\Assets\Model\Module\Message\ProtobufHelper.cs" Link="Module\Message\ProtobufHelper.cs" />
     <Compile Include="..\..\Unity\Assets\Model\Module\Message\RpcException.cs" Link="Module\Message\RpcException.cs" />
     <Compile Include="..\..\Unity\Assets\Model\Module\Message\Session.cs" Link="Module\Message\Session.cs" />
     <Compile Include="..\..\Unity\Assets\Model\Module\NetworkTCP\PacketParser.cs">

+ 0 - 27
Unity/Assets/Model/Base/Options.cs

@@ -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;
-    }
-}

+ 0 - 0
Unity/Assets/Model/Module/Message/ProtobufHelper.cs → Unity/Assets/Model/Core/Helper/ProtobufHelper.cs


+ 0 - 0
Unity/Assets/Model/Module/Message/ProtobufHelper.cs.meta → Unity/Assets/Model/Core/Helper/ProtobufHelper.cs.meta


+ 6 - 6
Server/Model/Demo/Options.cs → 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)]

+ 0 - 0
Unity/Assets/Model/Base/Options.cs.meta → Unity/Assets/Model/Core/Options.cs.meta