tanghai пре 3 година
родитељ
комит
3378798cc5

+ 1 - 1
.gitignore

@@ -56,7 +56,7 @@ Server/.DS_Store
 /Unity/Assets/Bundles/Code/Code.pdb.bytes
 /Unity/Assets/Bundles/Code/Code.pdb.bytes.meta
 /Unity/Assembly-CSharp.csproj
-~$*.xlsx
+/Unity/Assets/Config/Excel/~$*.xlsx
 /.vscode
 /Unity/UserSettings/Search.settings
 /Unity/Unity.Hotfix.csproj

+ 2 - 2
Unity/Assets/Scripts/Codes/Hotfix/Client/Module/Message/NetClientComponentSystem.cs

@@ -59,7 +59,7 @@ namespace ET.Client
             long channelId = RandomGenerator.RandInt64();
             Session session = self.AddChildWithId<Session, int>(channelId, self.ServiceId);
             session.RemoteAddress = realIPEndPoint;
-            if (self.DomainScene().SceneType != SceneType.BenchmarkClient)
+            if (self.DomainScene().SceneType != SceneType.Benchmark)
             {
                 session.AddComponent<SessionIdleCheckerComponent>();
             }
@@ -73,7 +73,7 @@ namespace ET.Client
             long channelId = NetServices.Instance.CreateConnectChannelId(localConn);
             Session session = self.AddChildWithId<Session, int>(channelId, self.ServiceId);
             session.RemoteAddress = realIPEndPoint;
-            if (self.DomainScene().SceneType != SceneType.BenchmarkClient)
+            if (self.DomainScene().SceneType != SceneType.Benchmark)
             {
                 session.AddComponent<SessionIdleCheckerComponent>();
             }

+ 1 - 1
Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/Scenes/Benchmark/BenchmarkClientComponentSystem.cs

@@ -22,7 +22,7 @@ namespace ET.Server
             await TimerComponent.Instance.WaitAsync(1000);
 
             Scene scene = await SceneFactory.CreateServerScene(self, IdGenerater.Instance.GenerateId(), IdGenerater.Instance.GenerateInstanceId(),
-                self.DomainZone(), "bechmark", SceneType.BenchmarkClient);
+                self.DomainZone(), "bechmark", SceneType.Benchmark);
             
             NetClientComponent netClientComponent = scene.AddComponent<NetClientComponent, AddressFamily>(AddressFamily.InterNetwork);
 

+ 1 - 0
Unity/Assets/Scripts/Core/Module/Entity/SceneType.cs

@@ -15,6 +15,7 @@
 		Robot = 9,
 		BenchmarkClient = 10,
 		BenchmarkServer = 11,
+		Benchmark = 12,
 
 		// 客户端Model层
 		Client = 31,