Selaa lähdekoodia

【优化】暂时调整为单进程模式,多进程有点问题

johnclot69 1 vuosi sitten
vanhempi
commit
b0c8d2f7f5
25 muutettua tiedostoa jossa 21 lisäystä ja 43 poistoa
  1. BIN
      Config/Excel/StartConfig/Release/StartProcessConfig@s.xlsx
  2. BIN
      Config/Excel/StartConfig/Release/StartSceneConfig@s.xlsx
  3. 1 4
      Config/GenFromExcel/s/StartConfig/Release/StartProcessConfigCategory.bytes
  4. 3 3
      Config/GenFromExcel/s/StartConfig/Release/StartSceneConfigCategory.bytes
  5. 0 3
      Config/GenJson/s/StartConfig/Release/StartProcessConfig.txt
  6. 3 3
      Config/GenJson/s/StartConfig/Release/StartSceneConfig.txt
  7. 5 5
      DotNet/Hotfix/Scenes/Watcher/WatcherHelper.cs
  8. 0 4
      GameServer/Config/GenFromExcel/c/AIConfigCategory.bytes
  9. BIN
      GameServer/Config/GenFromExcel/c/CharacterCategory.bytes
  10. BIN
      GameServer/Config/GenFromExcel/c/ItemIdConfigCategory.bytes
  11. BIN
      GameServer/Config/GenFromExcel/c/ItemTypeConfigCategory.bytes
  12. BIN
      GameServer/Config/GenFromExcel/c/MonsterCategory.bytes
  13. BIN
      GameServer/Config/GenFromExcel/c/SkillConfigCategory.bytes
  14. 0 6
      GameServer/Config/GenFromExcel/c/UnitConfigCategory.bytes
  15. BIN
      GameServer/Config/GenFromExcel/c/UpLevelExpCategory.bytes
  16. 1 4
      GameServer/Config/GenFromExcel/s/StartConfig/Release/StartProcessConfigCategory.bytes
  17. 3 3
      GameServer/Config/GenFromExcel/s/StartConfig/Release/StartSceneConfigCategory.bytes
  18. 0 3
      GameServer/Config/GenJson/s/StartConfig/Release/StartProcessConfig.txt
  19. 3 3
      GameServer/Config/GenJson/s/StartConfig/Release/StartSceneConfig.txt
  20. BIN
      GameServer/DebugBin/Hotfix.dll
  21. BIN
      GameServer/DebugBin/Hotfix.pdb
  22. BIN
      GameServer/DebugBin/Model.dll
  23. BIN
      GameServer/DebugBin/Model.pdb
  24. 1 1
      GameServer/启动游戏服-Localhost配置.bat
  25. 1 1
      GameServer/启动游戏服-Release配置.bat

BIN
Config/Excel/StartConfig/Release/StartProcessConfig@s.xlsx


BIN
Config/Excel/StartConfig/Release/StartSceneConfig@s.xlsx


+ 1 - 4
Config/GenFromExcel/s/StartConfig/Release/StartProcessConfigCategory.bytes

@@ -1,5 +1,2 @@
 
-�
-�
-�
-�
+�

+ 3 - 3
Config/GenFromExcel/s/StartConfig/Release/StartSceneConfigCategory.bytes

@@ -1,5 +1,5 @@
 
-"Realm*Realm0²ê
-‘N"Game*Game10³ê
+"Realm*Realm0²ê
+‘N"Game*Game10³ê
 )¬"
RouterManager*
RouterManager0Üì
-­"Router*Router010íº
+­"Router*Router010Ýì

+ 0 - 3
Config/GenJson/s/StartConfig/Release/StartProcessConfig.txt

@@ -1,6 +1,3 @@
 {"list":[
 {"_t":"StartProcessConfig","_id":1,"MachineId":1,"InnerPort":20101},
-{"_t":"StartProcessConfig","_id":2,"MachineId":1,"InnerPort":20102},
-{"_t":"StartProcessConfig","_id":3,"MachineId":1,"InnerPort":20103},
-{"_t":"StartProcessConfig","_id":4,"MachineId":1,"InnerPort":20104},
 ]}

+ 3 - 3
Config/GenJson/s/StartConfig/Release/StartSceneConfig.txt

@@ -1,6 +1,6 @@
 {"list":[
-{"_t":"StartSceneConfig","_id":1,"Process":3,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30002},
-{"_t":"StartSceneConfig","_id":10001,"Process":4,"Zone":1,"SceneType":"Game","Name":"Game1","OuterPort":30003},
+{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30002},
+{"_t":"StartSceneConfig","_id":10001,"Process":1,"Zone":1,"SceneType":"Game","Name":"Game1","OuterPort":30003},
 {"_t":"StartSceneConfig","_id":300,"Process":1,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","OuterPort":30300},
-{"_t":"StartSceneConfig","_id":301,"Process":2,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":40301},
+{"_t":"StartSceneConfig","_id":301,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":30301},
 ]}

+ 5 - 5
DotNet/Hotfix/Scenes/Watcher/WatcherHelper.cs

@@ -27,7 +27,7 @@ namespace ET.Server
 
             return startMachineConfig;
         }
-        
+
         public static bool IsThisMachine(string ip, string[] localIPs)
         {
             if (ip != "127.0.0.1" && ip != "0.0.0.0" && !((IList) localIPs).Contains(ip))
@@ -36,14 +36,14 @@ namespace ET.Server
             }
             return true;
         }
-        
+
         public static Process StartProcess(int processId, int createScenes = 0)
         {
             StartProcessConfig startProcessConfig = StartProcessConfigCategory.Instance.Get(processId);
             const string exe = "dotnet";
-            string arguments = $"App.dll" + 
+            string arguments = $"App.dll" +
                     $" --Process={startProcessConfig.Id}" +
-                    $" --AppType=Server" +  
+                    $" --AppType=Server" +
                     $" --StartConfig={Options.Instance.StartConfig}" +
                     $" --Develop={Options.Instance.Develop}" +
                     $" --CreateScenes={createScenes}" +
@@ -54,4 +54,4 @@ namespace ET.Server
             return process;
         }
     }
-}
+}

+ 0 - 4
GameServer/Config/GenFromExcel/c/AIConfigCategory.bytes

@@ -1,4 +0,0 @@
-
-e"	AI_Attack
-f"	AI_XunLuo
-É"	AI_XunLuo

BIN
GameServer/Config/GenFromExcel/c/CharacterCategory.bytes


BIN
GameServer/Config/GenFromExcel/c/ItemIdConfigCategory.bytes


BIN
GameServer/Config/GenFromExcel/c/ItemTypeConfigCategory.bytes


BIN
GameServer/Config/GenFromExcel/c/MonsterCategory.bytes


BIN
GameServer/Config/GenFromExcel/c/SkillConfigCategory.bytes


+ 0 - 6
GameServer/Config/GenFromExcel/c/UnitConfigCategory.bytes

@@ -1,6 +0,0 @@
-
-é	米克尔 (²
-ê
-米克尔2 (–
-ì
-米克尔4 (–

BIN
GameServer/Config/GenFromExcel/c/UpLevelExpCategory.bytes


+ 1 - 4
GameServer/Config/GenFromExcel/s/StartConfig/Release/StartProcessConfigCategory.bytes

@@ -1,5 +1,2 @@
 
-�
-�
-�
-�
+�

+ 3 - 3
GameServer/Config/GenFromExcel/s/StartConfig/Release/StartSceneConfigCategory.bytes

@@ -1,5 +1,5 @@
 
-"Realm*Realm0²ê
-‘N"Game*Game10³ê
+"Realm*Realm0²ê
+‘N"Game*Game10³ê
 )¬"
RouterManager*
RouterManager0Üì
-­"Router*Router010íº
+­"Router*Router010Ýì

+ 0 - 3
GameServer/Config/GenJson/s/StartConfig/Release/StartProcessConfig.txt

@@ -1,6 +1,3 @@
 {"list":[
 {"_t":"StartProcessConfig","_id":1,"MachineId":1,"InnerPort":20101},
-{"_t":"StartProcessConfig","_id":2,"MachineId":1,"InnerPort":20102},
-{"_t":"StartProcessConfig","_id":3,"MachineId":1,"InnerPort":20103},
-{"_t":"StartProcessConfig","_id":4,"MachineId":1,"InnerPort":20104},
 ]}

+ 3 - 3
GameServer/Config/GenJson/s/StartConfig/Release/StartSceneConfig.txt

@@ -1,6 +1,6 @@
 {"list":[
-{"_t":"StartSceneConfig","_id":1,"Process":3,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30002},
-{"_t":"StartSceneConfig","_id":10001,"Process":4,"Zone":1,"SceneType":"Game","Name":"Game1","OuterPort":30003},
+{"_t":"StartSceneConfig","_id":1,"Process":1,"Zone":1,"SceneType":"Realm","Name":"Realm","OuterPort":30002},
+{"_t":"StartSceneConfig","_id":10001,"Process":1,"Zone":1,"SceneType":"Game","Name":"Game1","OuterPort":30003},
 {"_t":"StartSceneConfig","_id":300,"Process":1,"Zone":3,"SceneType":"RouterManager","Name":"RouterManager","OuterPort":30300},
-{"_t":"StartSceneConfig","_id":301,"Process":2,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":40301},
+{"_t":"StartSceneConfig","_id":301,"Process":1,"Zone":3,"SceneType":"Router","Name":"Router01","OuterPort":30301},
 ]}

BIN
GameServer/DebugBin/Hotfix.dll


BIN
GameServer/DebugBin/Hotfix.pdb


BIN
GameServer/DebugBin/Model.dll


BIN
GameServer/DebugBin/Model.pdb


+ 1 - 1
GameServer/启动游戏服-Localhost配置.bat

@@ -1,5 +1,5 @@
 @echo off
 
 cd DebugBin
-App.exe --AppType=Watcher --StartConfig=StartConfig/Localhost
+App.exe --AppType=Server --StartConfig=StartConfig/Localhost
 @pause

+ 1 - 1
GameServer/启动游戏服-Release配置.bat

@@ -1,5 +1,5 @@
 @echo off
 
 cd DebugBin
-App.exe --AppType=Watcher --StartConfig=StartConfig/Release --InitAccessToken=1
+App.exe --AppType=Server --StartConfig=StartConfig/Release --InitAccessToken=1
 @pause