diff --git a/Config/StartMachineConfig.txt b/Config/StartMachineConfig.txt new file mode 100644 index 0000000000000000000000000000000000000000..3490aa092b5c8c368d66981e044b672cb961a1a8 --- /dev/null +++ b/Config/StartMachineConfig.txt @@ -0,0 +1 @@ +{"_id":1,"InnerIP":"127.0.0.1","OuterIP":"127.0.0.1"} diff --git a/Config/StartProcessConfig.txt b/Config/StartProcessConfig.txt index 50713cfcc0fa8668c3cf1aa1677bd1ba6d5d6f97..ee4b3e228ea5a94048a247ba93f92335e8dc372a 100644 --- a/Config/StartProcessConfig.txt +++ b/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"} diff --git a/Excel/StartMachineConfig.xlsx b/Excel/StartMachineConfig.xlsx new file mode 100644 index 0000000000000000000000000000000000000000..5616411737bc27907e461a5986b9fbe5a2a35a81 Binary files /dev/null and b/Excel/StartMachineConfig.xlsx differ diff --git a/Excel/StartProcessConfig.xlsx b/Excel/StartProcessConfig.xlsx index 3fc095832488b7dd25deb97d98f6972ac2dc9f0b..764f0ebdc960c4af79716e71364aeb21140401d6 100644 Binary files a/Excel/StartProcessConfig.xlsx and b/Excel/StartProcessConfig.xlsx differ diff --git a/Excel/StartSceneConfig.xlsx b/Excel/StartSceneConfig.xlsx index 5179cde142213a400ae191cbdfc0da49a6696398..2a5f81dbc94096e06066470f7aa8d861a8910135 100644 Binary files a/Excel/StartSceneConfig.xlsx and b/Excel/StartSceneConfig.xlsx differ diff --git a/Server/Model/Demo/Config/StartMachineConfig.cs b/Server/Model/Demo/Config/StartMachineConfig.cs new file mode 100644 index 0000000000000000000000000000000000000000..8747ca3085e5514150258bc4c7cacff475161d9d --- /dev/null +++ b/Server/Model/Demo/Config/StartMachineConfig.cs @@ -0,0 +1,19 @@ +namespace ET +{ + [Config] + public partial class StartMachineConfigCategory : ACategory + { + public static StartMachineConfigCategory Instance; + public StartMachineConfigCategory() + { + Instance = this; + } + } + + public partial class StartMachineConfig: IConfig + { + public long Id { get; set; } + public string InnerIP; + public string OuterIP; + } +} diff --git a/Server/Model/Demo/Config/StartProcessConfig.cs b/Server/Model/Demo/Config/StartProcessConfig.cs index a71ed3bb2a8bed4fe7e1999a9bc8c9bee955d440..f40795d289c74c815a6249027c381783301ad958 100644 --- a/Server/Model/Demo/Config/StartProcessConfig.cs +++ b/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; } } diff --git a/Server/Model/Demo/ConfigPartial/StartProcessConfig.cs b/Server/Model/Demo/ConfigPartial/StartProcessConfig.cs index 626b41d3642f1a90769f3ac1a99dc847107f1eb1..21c437da0f034765c68fd0a5c6bf00956284b181 100644 --- a/Server/Model/Demo/ConfigPartial/StartProcessConfig.cs +++ b/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}"; } } } diff --git a/Unity/Assets/Bundles/Config/StartMachineConfig.txt b/Unity/Assets/Bundles/Config/StartMachineConfig.txt new file mode 100644 index 0000000000000000000000000000000000000000..3490aa092b5c8c368d66981e044b672cb961a1a8 --- /dev/null +++ b/Unity/Assets/Bundles/Config/StartMachineConfig.txt @@ -0,0 +1 @@ +{"_id":1,"InnerIP":"127.0.0.1","OuterIP":"127.0.0.1"} diff --git a/Unity/Assets/Bundles/Config/StartMachineConfig.txt.meta b/Unity/Assets/Bundles/Config/StartMachineConfig.txt.meta new file mode 100644 index 0000000000000000000000000000000000000000..f7e92eab5fe369f8be19b5dd49976a2c1ba43f94 --- /dev/null +++ b/Unity/Assets/Bundles/Config/StartMachineConfig.txt.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 7b39853d8c29e4f34855245bb82d8470 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Unity/Assets/Bundles/Config/StartProcessConfig.txt b/Unity/Assets/Bundles/Config/StartProcessConfig.txt index 50713cfcc0fa8668c3cf1aa1677bd1ba6d5d6f97..ee4b3e228ea5a94048a247ba93f92335e8dc372a 100644 --- a/Unity/Assets/Bundles/Config/StartProcessConfig.txt +++ b/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"} diff --git a/Unity/Assets/Model/Base/Object/EventProxy.cs.meta b/Unity/Assets/Model/Base/Object/EventProxy.cs.meta deleted file mode 100644 index 7c028dd7bc547f89283ce952ebfaac98fd59b3eb..0000000000000000000000000000000000000000 --- a/Unity/Assets/Model/Base/Object/EventProxy.cs.meta +++ /dev/null @@ -1,12 +0,0 @@ -fileFormatVersion: 2 -guid: 22310cc42f777f5439dea1ea1ca183e1 -timeCreated: 1518145019 -licenseType: Free -MonoImporter: - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Unity/Assets/Model/Demo/Config/StartMachineConfig.cs b/Unity/Assets/Model/Demo/Config/StartMachineConfig.cs new file mode 100644 index 0000000000000000000000000000000000000000..8747ca3085e5514150258bc4c7cacff475161d9d --- /dev/null +++ b/Unity/Assets/Model/Demo/Config/StartMachineConfig.cs @@ -0,0 +1,19 @@ +namespace ET +{ + [Config] + public partial class StartMachineConfigCategory : ACategory + { + public static StartMachineConfigCategory Instance; + public StartMachineConfigCategory() + { + Instance = this; + } + } + + public partial class StartMachineConfig: IConfig + { + public long Id { get; set; } + public string InnerIP; + public string OuterIP; + } +} diff --git a/Unity/Assets/HotfixView/Demo/UI/UILogin/InitSceneStart_CreateLoginUI.cs.meta b/Unity/Assets/Model/Demo/Config/StartMachineConfig.cs.meta similarity index 83% rename from Unity/Assets/HotfixView/Demo/UI/UILogin/InitSceneStart_CreateLoginUI.cs.meta rename to Unity/Assets/Model/Demo/Config/StartMachineConfig.cs.meta index c643e57f127b28e9c3f7403fe56f8d59b090ccff..9fca58e428b91e1df021002f740617b95f4280d3 100644 --- a/Unity/Assets/HotfixView/Demo/UI/UILogin/InitSceneStart_CreateLoginUI.cs.meta +++ b/Unity/Assets/Model/Demo/Config/StartMachineConfig.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 157b06c3e92d4ae47a49ad0e76fa88a2 +guid: a58b7dfbd1f2447968265382cf244fe9 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Unity/Assets/Model/Demo/Config/StartProcessConfig.cs b/Unity/Assets/Model/Demo/Config/StartProcessConfig.cs index a71ed3bb2a8bed4fe7e1999a9bc8c9bee955d440..f40795d289c74c815a6249027c381783301ad958 100644 --- a/Unity/Assets/Model/Demo/Config/StartProcessConfig.cs +++ b/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; } } diff --git a/Unity/Assets/Model/Base/Event/EventIdType.cs.meta b/Unity/Assets/Model/EventType.cs.meta similarity index 69% rename from Unity/Assets/Model/Base/Event/EventIdType.cs.meta rename to Unity/Assets/Model/EventType.cs.meta index 34feb383dbe93f5d9dc98d10acb5bcd266f11d3e..5acc546a52a8ccc5865f235702be0132ddb84dcf 100644 --- a/Unity/Assets/Model/Base/Event/EventIdType.cs.meta +++ b/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