Sfoglia il codice sorgente

增加StartMachineConfig表,几个开服的表含义如下
StartMachineConfig 该表表示物理机配置,每台物理机一条数据
StartProcessConfig 该表表示进程配置,每个进程一条配置
StartZoneConfig 该表表示游戏区配置,每个区一条
StartSceneConfig 该表表示游戏场景配置,场景属于哪个区,放在哪个进程上面
可以从表看出,游戏所有区都可以配置在一个进程上,方便开发,正式发布再配置到不同的进程即可,非常方便!

tanghai 5 anni fa
parent
commit
74bd1f78d6

+ 1 - 0
Config/StartMachineConfig.txt

@@ -0,0 +1 @@
+{"_id":1,"InnerIP":"127.0.0.1","OuterIP":"127.0.0.1"}

+ 2 - 2
Config/StartProcessConfig.txt

@@ -1,2 +1,2 @@
-{"_id":1,"InnerIP":"127.0.0.1","InnerPort":"20001","OuterIP":"127.0.0.1"}
-{"_id":2,"InnerIP":"127.0.0.2","InnerPort":"20002","OuterIP":"127.0.0.2"}
+{"_id":1,"MachineId":1,"InnerPort":"20001"}
+{"_id":2,"MachineId":1,"InnerPort":"20002"}

BIN
Excel/StartMachineConfig.xlsx


BIN
Excel/StartProcessConfig.xlsx


BIN
Excel/StartSceneConfig.xlsx


+ 19 - 0
Server/Model/Demo/Config/StartMachineConfig.cs

@@ -0,0 +1,19 @@
+namespace ET
+{
+	[Config]
+	public partial class StartMachineConfigCategory : ACategory<StartMachineConfig>
+	{
+		public static StartMachineConfigCategory Instance;
+		public StartMachineConfigCategory()
+		{
+			Instance = this;
+		}
+	}
+
+	public partial class StartMachineConfig: IConfig
+	{
+		public long Id { get; set; }
+		public string InnerIP;
+		public string OuterIP;
+	}
+}

+ 1 - 2
Server/Model/Demo/Config/StartProcessConfig.cs

@@ -13,8 +13,7 @@ namespace ET
 	public partial class StartProcessConfig: IConfig
 	{
 		public long Id { get; set; }
-		public string InnerIP;
+		public int MachineId;
 		public string InnerPort;
-		public string OuterIP;
 	}
 }

+ 21 - 2
Server/Model/Demo/ConfigPartial/StartProcessConfig.cs

@@ -11,7 +11,27 @@ namespace ET
 	
 	public partial class StartProcessConfig: ISupportInitialize
 	{
-		public string InnerAddress;
+		private string innerAddress;
+
+		public string InnerAddress
+		{
+			get
+			{
+				if (this.innerAddress == null)
+				{
+					this.innerAddress = $"{StartMachineConfigCategory.Instance.Get(this.MachineId)}:{this.InnerPort}";
+				}
+				return this.innerAddress;
+			}
+		}
+
+		public string OuterIP
+		{
+			get
+			{
+				return StartMachineConfigCategory.Instance.Get(this.MachineId).OuterIP;
+			}
+		}
 
 		public void BeginInit()
 		{
@@ -19,7 +39,6 @@ namespace ET
 
 		public void EndInit()
 		{
-			this.InnerAddress = $"{this.InnerIP}:{this.InnerPort}";
 		}
 	}
 }

+ 1 - 0
Unity/Assets/Bundles/Config/StartMachineConfig.txt

@@ -0,0 +1 @@
+{"_id":1,"InnerIP":"127.0.0.1","OuterIP":"127.0.0.1"}

+ 7 - 0
Unity/Assets/Bundles/Config/StartMachineConfig.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 7b39853d8c29e4f34855245bb82d8470
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 2
Unity/Assets/Bundles/Config/StartProcessConfig.txt

@@ -1,2 +1,2 @@
-{"_id":1,"InnerIP":"127.0.0.1","InnerPort":"20001","OuterIP":"127.0.0.1"}
-{"_id":2,"InnerIP":"127.0.0.2","InnerPort":"20002","OuterIP":"127.0.0.2"}
+{"_id":1,"MachineId":1,"InnerPort":"20001"}
+{"_id":2,"MachineId":1,"InnerPort":"20002"}

+ 0 - 12
Unity/Assets/Model/Base/Object/EventProxy.cs.meta

@@ -1,12 +0,0 @@
-fileFormatVersion: 2
-guid: 22310cc42f777f5439dea1ea1ca183e1
-timeCreated: 1518145019
-licenseType: Free
-MonoImporter:
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 19 - 0
Unity/Assets/Model/Demo/Config/StartMachineConfig.cs

@@ -0,0 +1,19 @@
+namespace ET
+{
+	[Config]
+	public partial class StartMachineConfigCategory : ACategory<StartMachineConfig>
+	{
+		public static StartMachineConfigCategory Instance;
+		public StartMachineConfigCategory()
+		{
+			Instance = this;
+		}
+	}
+
+	public partial class StartMachineConfig: IConfig
+	{
+		public long Id { get; set; }
+		public string InnerIP;
+		public string OuterIP;
+	}
+}

+ 1 - 1
Unity/Assets/HotfixView/Demo/UI/UILogin/InitSceneStart_CreateLoginUI.cs.meta → Unity/Assets/Model/Demo/Config/StartMachineConfig.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 157b06c3e92d4ae47a49ad0e76fa88a2
+guid: a58b7dfbd1f2447968265382cf244fe9
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 1 - 2
Unity/Assets/Model/Demo/Config/StartProcessConfig.cs

@@ -13,8 +13,7 @@ namespace ET
 	public partial class StartProcessConfig: IConfig
 	{
 		public long Id { get; set; }
-		public string InnerIP;
+		public int MachineId;
 		public string InnerPort;
-		public string OuterIP;
 	}
 }

+ 2 - 3
Unity/Assets/Model/Base/Event/EventIdType.cs.meta → Unity/Assets/Model/EventType.cs.meta

@@ -1,8 +1,7 @@
 fileFormatVersion: 2
-guid: 50aff527fd963e44fbce24e2ef3c1287
-timeCreated: 1476421726
-licenseType: Pro
+guid: e1008d46fb45b450cb0079aff105569b
 MonoImporter:
+  externalObjects: {}
   serializedVersion: 2
   defaultReferences: []
   executionOrder: 0