ZoneScene命名太抽象，改成ClientScene

Apps/Hotfix/AppStart_Init.cs

@@ -32,7 +32,7 @@ namespace ET.Server
 
             #region 机器人使用
 
-            Game.Scene.AddComponent<ZoneSceneManagerComponent>();
+            Game.Scene.AddComponent<ClientSceneManagerComponent>();
             Game.Scene.AddComponent<RobotCaseDispatcherComponent>();
             Game.Scene.AddComponent<RobotCaseComponent>();
 

Apps/Hotfix/Server/Robot/RobotCaseSystem.cs

@@ -61,18 +61,18 @@ namespace ET.Server
 
         public static async ETTask<Scene> NewRobot(this RobotCase self, int zone, string name)
         {
-            Scene zoneScene = null;
+            Scene clientScene = null;
             try
             {
-                zoneScene = Client.SceneFactory.CreateZoneScene(zone, name, self);
-                await Client.LoginHelper.Login(zoneScene, zone.ToString(), zone.ToString());
-                await Client.EnterMapHelper.EnterMapAsync(zoneScene);
+                clientScene = Client.SceneFactory.CreateClientScene(zone, name, self);
+                await Client.LoginHelper.Login(clientScene, zone.ToString(), zone.ToString());
+                await Client.EnterMapHelper.EnterMapAsync(clientScene);
                 Log.Debug($"create robot ok: {zone}");
-                return zoneScene;
+                return clientScene;
             }
             catch (Exception e)
             {
-                zoneScene?.Dispose();
+                clientScene?.Dispose();
                 throw new Exception($"RobotCase create robot fail, zone: {zone}", e);
             }
         }
@@ -80,19 +80,19 @@ namespace ET.Server
         private static async ETTask<Scene> NewRobot(this RobotCase self)
         {
             int zone = self.GetParent<RobotCaseComponent>().GetN();
-            Scene zoneScene = null;
+            Scene clientScene = null;
 
             try
             {
-                zoneScene = Client.SceneFactory.CreateZoneScene(zone, $"Robot_{zone}", self);
-                await Client.LoginHelper.Login(zoneScene, zone.ToString(), zone.ToString());
-                await Client.EnterMapHelper.EnterMapAsync(zoneScene);
+                clientScene = Client.SceneFactory.CreateClientScene(zone, $"Robot_{zone}", self);
+                await Client.LoginHelper.Login(clientScene, zone.ToString(), zone.ToString());
+                await Client.EnterMapHelper.EnterMapAsync(clientScene);
                 Log.Debug($"create robot ok: {zone}");
-                return zoneScene;
+                return clientScene;
             }
             catch (Exception e)
             {
-                zoneScene?.Dispose();
+                clientScene?.Dispose();
                 throw new Exception($"RobotCase create robot fail, zone: {zone}", e);
             }
         }

Apps/Hotfix/Server/Robot/RobotManagerComponentSystem.cs

@@ -7,18 +7,18 @@ namespace ET.Server
     {
         public static async ETTask<Scene> NewRobot(this RobotManagerComponent self, int zone)
         {
-            Scene zoneScene = null;
+            Scene clientScene = null;
             try
             {
-                zoneScene = Client.SceneFactory.CreateZoneScene(zone, "Robot", self);
-                await Client.LoginHelper.Login(zoneScene, zone.ToString(), zone.ToString());
-                await Client.EnterMapHelper.EnterMapAsync(zoneScene);
+                clientScene = Client.SceneFactory.CreateClientScene(zone, "Robot", self);
+                await Client.LoginHelper.Login(clientScene, zone.ToString(), zone.ToString());
+                await Client.EnterMapHelper.EnterMapAsync(clientScene);
                 Log.Debug($"create robot ok: {zone}");
-                return zoneScene;
+                return clientScene;
             }
             catch (Exception e)
             {
-                zoneScene?.Dispose();
+                clientScene?.Dispose();
                 throw new Exception($"RobotSceneManagerComponent create robot fail, zone: {zone}", e);
             }
         }

Apps/Model/Generate/ConfigPartial/StartSceneConfig.cs

@@ -10,7 +10,7 @@ namespace ET
         
         public MultiMap<int, StartSceneConfig> ProcessScenes = new MultiMap<int, StartSceneConfig>();
         
-        public Dictionary<long, Dictionary<string, StartSceneConfig>> ZoneScenesByName = new Dictionary<long, Dictionary<string, StartSceneConfig>>();
+        public Dictionary<long, Dictionary<string, StartSceneConfig>> ClientScenesByName = new Dictionary<long, Dictionary<string, StartSceneConfig>>();
 
         public StartSceneConfig LocationConfig;
 
@@ -27,7 +27,7 @@ namespace ET
         
         public StartSceneConfig GetBySceneName(int zone, string name)
         {
-            return this.ZoneScenesByName[zone][name];
+            return this.ClientScenesByName[zone][name];
         }
         
         public override void AfterEndInit()
@@ -36,11 +36,11 @@ namespace ET
             {
                 this.ProcessScenes.Add(startSceneConfig.Process, startSceneConfig);
                 
-                if (!this.ZoneScenesByName.ContainsKey(startSceneConfig.Zone))
+                if (!this.ClientScenesByName.ContainsKey(startSceneConfig.Zone))
                 {
-                    this.ZoneScenesByName.Add(startSceneConfig.Zone, new Dictionary<string, StartSceneConfig>());
+                    this.ClientScenesByName.Add(startSceneConfig.Zone, new Dictionary<string, StartSceneConfig>());
                 }
-                this.ZoneScenesByName[startSceneConfig.Zone].Add(startSceneConfig.Name, startSceneConfig);
+                this.ClientScenesByName[startSceneConfig.Zone].Add(startSceneConfig.Name, startSceneConfig);
                 
                 switch (startSceneConfig.Type)
                 {

Unity/Codes/Hotfix/Client/AI/AI_Attack.cs

@@ -16,16 +16,16 @@ namespace ET.Client
 
         public override async ETTask Execute(AIComponent aiComponent, AIConfig aiConfig, ETCancellationToken cancellationToken)
         {
-            Scene zoneScene = aiComponent.DomainScene();
+            Scene clientScene = aiComponent.DomainScene();
 
-            Unit myUnit = Client.UnitHelper.GetMyUnitFromZoneScene(zoneScene);
+            Unit myUnit = Client.UnitHelper.GetMyUnitFromClientScene(clientScene);
             if (myUnit == null)
             {
                 return;
             }
 
             // 停在当前位置
-            zoneScene.GetComponent<SessionComponent>().Session.Send(new C2M_Stop());
+            clientScene.GetComponent<SessionComponent>().Session.Send(new C2M_Stop());
             
             Log.Debug("开始攻击");
 

Unity/Codes/Hotfix/Client/AI/AI_XunLuo.cs

@@ -16,9 +16,9 @@ namespace ET.Client
 
         public override async ETTask Execute(AIComponent aiComponent, AIConfig aiConfig, ETCancellationToken cancellationToken)
         {
-            Scene zoneScene = aiComponent.DomainScene();
+            Scene clientScene = aiComponent.DomainScene();
 
-            Unit myUnit = Client.UnitHelper.GetMyUnitFromZoneScene(zoneScene);
+            Unit myUnit = Client.UnitHelper.GetMyUnitFromClientScene(clientScene);
             if (myUnit == null)
             {
                 return;

Unity/Codes/Hotfix/Client/Login/EnterMapHelper.cs

@@ -5,17 +5,17 @@ namespace ET.Client
 {
     public static class EnterMapHelper
     {
-        public static async ETTask EnterMapAsync(Scene zoneScene)
+        public static async ETTask EnterMapAsync(Scene clientScene)
         {
             try
             {
-                G2C_EnterMap g2CEnterMap = await zoneScene.GetComponent<SessionComponent>().Session.Call(new C2G_EnterMap()) as G2C_EnterMap;
-                zoneScene.GetComponent<PlayerComponent>().MyId = g2CEnterMap.MyId;
+                G2C_EnterMap g2CEnterMap = await clientScene.GetComponent<SessionComponent>().Session.Call(new C2G_EnterMap()) as G2C_EnterMap;
+                clientScene.GetComponent<PlayerComponent>().MyId = g2CEnterMap.MyId;
                 
                 // 等待场景切换完成
-                await zoneScene.GetComponent<ObjectWait>().Wait<WaitType.Wait_SceneChangeFinish>();
+                await clientScene.GetComponent<ObjectWait>().Wait<WaitType.Wait_SceneChangeFinish>();
                 
-                Game.EventSystem.Publish(zoneScene, new EventType.EnterMapFinish());
+                Game.EventSystem.Publish(clientScene, new EventType.EnterMapFinish());
             }
             catch (Exception e)
             {

Unity/Codes/Hotfix/Client/Login/LoginHelper.cs

@@ -4,7 +4,7 @@ namespace ET.Client
 {
     public static class LoginHelper
     {
-        public static async ETTask Login(Scene zoneScene, string account, string password)
+        public static async ETTask Login(Scene clientScene, string account, string password)
         {
             try
             {
@@ -13,17 +13,17 @@ namespace ET.Client
                 Session session = null;
                 try
                 {
-                    zoneScene.RemoveComponent<RouterAddressComponent>();
+                    clientScene.RemoveComponent<RouterAddressComponent>();
                     // 获取路由跟realmDispatcher地址
-                    RouterAddressComponent routerAddressComponent = zoneScene.GetComponent<RouterAddressComponent>();
+                    RouterAddressComponent routerAddressComponent = clientScene.GetComponent<RouterAddressComponent>();
                     if (routerAddressComponent == null)
                     {
-                        routerAddressComponent = zoneScene.AddComponent<RouterAddressComponent, string>(ConstValue.RouterHttpAddress);
+                        routerAddressComponent = clientScene.AddComponent<RouterAddressComponent, string>(ConstValue.RouterHttpAddress);
                         await routerAddressComponent.Init();
                     }
                     string realmAddress = routerAddressComponent.GetRealmAddress(account);
                     
-                    session = await RouterHelper.CreateRouterSession(zoneScene, realmAddress);
+                    session = await RouterHelper.CreateRouterSession(clientScene, realmAddress);
                     {
                         r2CLogin = (R2C_Login) await session.Call(new C2R_Login() { Account = account, Password = password });
                     }
@@ -34,15 +34,15 @@ namespace ET.Client
                 }
 
                 // 创建一个gate Session,并且保存到SessionComponent中
-                Session gateSession = await RouterHelper.CreateRouterSession(zoneScene, r2CLogin.Address);
-                zoneScene.AddComponent<SessionComponent>().Session = gateSession;
+                Session gateSession = await RouterHelper.CreateRouterSession(clientScene, r2CLogin.Address);
+                clientScene.AddComponent<SessionComponent>().Session = gateSession;
 				
                 G2C_LoginGate g2CLoginGate = (G2C_LoginGate)await gateSession.Call(
                     new C2G_LoginGate() { Key = r2CLogin.Key, GateId = r2CLogin.GateId});
 
                 Log.Debug("登陆gate成功!");
 
-                await Game.EventSystem.PublishAsync(zoneScene, new EventType.LoginFinish());
+                await Game.EventSystem.PublishAsync(clientScene, new EventType.LoginFinish());
             }
             catch (Exception e)
             {

Unity/Codes/Hotfix/Client/Move/M2C_PathfindingResultHandler.cs

@@ -3,7 +3,7 @@ using UnityEngine;
 
 namespace ET.Client
 {
-	[MessageHandler(SceneType.Zone)]
+	[MessageHandler(SceneType.Client)]
 	public class M2C_PathfindingResultHandler : AMHandler<M2C_PathfindingResult>
 	{
 		protected override async ETTask Run(Session session, M2C_PathfindingResult message)

Unity/Codes/Hotfix/Client/Move/M2C_StopHandler.cs

@@ -2,7 +2,7 @@
 
 namespace ET.Client
 {
-	[MessageHandler(SceneType.Zone)]
+	[MessageHandler(SceneType.Client)]
 	public class M2C_StopHandler : AMHandler<M2C_Stop>
 	{
 		protected override async ETTask Run(Session session, M2C_Stop message)

Unity/Codes/Hotfix/Client/Move/MoveHelper.cs

@@ -9,7 +9,7 @@ namespace ET.Client
         public static async ETTask<int> MoveToAsync(this Unit unit, Vector3 targetPos, ETCancellationToken cancellationToken = null)
         {
             C2M_PathfindingResult msg = new C2M_PathfindingResult() {X = targetPos.x, Y = targetPos.y, Z = targetPos.z};
-            unit.ZoneScene().GetComponent<SessionComponent>().Session.Send(msg);
+            unit.ClientScene().GetComponent<SessionComponent>().Session.Send(msg);
 
             ObjectWait objectWait = unit.GetComponent<ObjectWait>();
             

Unity/Codes/Hotfix/Client/Router/RouterCheckComponentSystem.cs

@@ -54,16 +54,16 @@ namespace ET.Client
                     remoteConn = kChannel.RemoteConn;
 
                     string realAddress = self.GetParent<Session>().RemoteAddress.ToString();
-                    Log.Info($"get recvLocalConn start: {self.ZoneScene().Id} {realAddress} {localConn} {remoteConn}");
+                    Log.Info($"get recvLocalConn start: {self.ClientScene().Id} {realAddress} {localConn} {remoteConn}");
 
-                    (uint recvLocalConn, string routerAddress) = await RouterHelper.GetRouterAddress(self.ZoneScene(), realAddress, localConn, remoteConn);
+                    (uint recvLocalConn, string routerAddress) = await RouterHelper.GetRouterAddress(self.ClientScene(), realAddress, localConn, remoteConn);
                     if (recvLocalConn == 0)
                     {
-                        Log.Error($"get recvLocalConn fail: {self.ZoneScene().Id} {routerAddress} {realAddress} {localConn} {remoteConn}");
+                        Log.Error($"get recvLocalConn fail: {self.ClientScene().Id} {routerAddress} {realAddress} {localConn} {remoteConn}");
                         continue;
                     }
                     
-                    Log.Info($"get recvLocalConn ok: {self.ZoneScene().Id} {routerAddress} {realAddress} {recvLocalConn} {localConn} {remoteConn}");
+                    Log.Info($"get recvLocalConn ok: {self.ClientScene().Id} {routerAddress} {realAddress} {recvLocalConn} {localConn} {remoteConn}");
                     
                     session.LastRecvTime = TimeHelper.ClientNow();
                     

Unity/Codes/Hotfix/Client/Router/RouterHelper.cs

@@ -7,34 +7,34 @@ namespace ET.Client
     public static class RouterHelper
     {
         // 注册router
-        public static async ETTask<Session> CreateRouterSession(Scene zoneScene, string address)
+        public static async ETTask<Session> CreateRouterSession(Scene clientScene, string address)
         {
-            (uint recvLocalConn, string routerAddress) = await GetRouterAddress(zoneScene, address, 0, 0);
+            (uint recvLocalConn, string routerAddress) = await GetRouterAddress(clientScene, address, 0, 0);
 
             if (recvLocalConn == 0)
             {
-                throw new Exception($"get router fail: {zoneScene.Id} {address}");
+                throw new Exception($"get router fail: {clientScene.Id} {address}");
             }
             
             Log.Info($"get router: {recvLocalConn} {routerAddress}");
 
-            Session routerSession = zoneScene.GetComponent<NetKcpComponent>().Create(NetworkHelper.ToIPEndPoint(routerAddress), NetworkHelper.ToIPEndPoint(address), recvLocalConn);
+            Session routerSession = clientScene.GetComponent<NetKcpComponent>().Create(NetworkHelper.ToIPEndPoint(routerAddress), NetworkHelper.ToIPEndPoint(address), recvLocalConn);
             routerSession.AddComponent<PingComponent>();
             routerSession.AddComponent<RouterCheckComponent>();
             
             return routerSession;
         }
         
-        public static async ETTask<(uint, string)> GetRouterAddress(Scene zoneScene, string address, uint localConn, uint remoteConn)
+        public static async ETTask<(uint, string)> GetRouterAddress(Scene clientScene, string address, uint localConn, uint remoteConn)
         {
-            Log.Info($"start get router address: {zoneScene.Id} {address} {localConn} {remoteConn}");
+            Log.Info($"start get router address: {clientScene.Id} {address} {localConn} {remoteConn}");
             //return (RandomHelper.RandUInt32(), address);
-            RouterAddressComponent routerAddressComponent = zoneScene.GetComponent<RouterAddressComponent>();
+            RouterAddressComponent routerAddressComponent = clientScene.GetComponent<RouterAddressComponent>();
             string routerInfo = routerAddressComponent.GetAddress();
             
             uint recvLocalConn = await Connect(NetworkHelper.ToIPEndPoint(routerInfo), address, localConn, remoteConn);
             
-            Log.Info($"finish get router address: {zoneScene.Id} {address} {localConn} {remoteConn} {recvLocalConn} {routerInfo}");
+            Log.Info($"finish get router address: {clientScene.Id} {address} {localConn} {remoteConn} {recvLocalConn} {routerInfo}");
             return (recvLocalConn, routerInfo);
         }
 

Unity/Codes/Hotfix/Client/Scene/ClientSceneFlagComponentSystem.cs

@@ -0,0 +1,20 @@
+namespace ET.Client
+{
+    [ObjectSystem]
+    public class ClientSceneFlagComponentDestroySystem: DestroySystem<ClientSceneFlagComponent>
+    {
+        public override void Destroy(ClientSceneFlagComponent self)
+        {
+            ClientSceneManagerComponent.Instance.Remove(self.DomainZone());
+        }
+    }
+
+    [ObjectSystem]
+    public class ClientSceneFlagComponentAwakeSystem: AwakeSystem<ClientSceneFlagComponent>
+    {
+        public override void Awake(ClientSceneFlagComponent self)
+        {
+            ClientSceneManagerComponent.Instance.Add(self.GetParent<Scene>());
+        }
+    }
+}

Unity/Codes/Hotfix/Client/Scene/ClientSceneManagerComponentSystem.cs

@@ -0,0 +1,47 @@
+using System;
+
+namespace ET.Client
+{
+    [FriendClass(typeof(ClientSceneManagerComponent))]
+    public static class ClientSceneManagerComponentSystem
+    {
+        [ObjectSystem]
+        public class ClientSceneManagerComponentAwakeSystem: AwakeSystem<ClientSceneManagerComponent>
+        {
+            public override void Awake(ClientSceneManagerComponent self)
+            {
+                ClientSceneManagerComponent.Instance = self;
+            }
+        }
+
+        [ObjectSystem]
+        public class ClientSceneManagerComponentDestroySystem: DestroySystem<ClientSceneManagerComponent>
+        {
+            public override void Destroy(ClientSceneManagerComponent self)
+            {
+                self.ClientScenes.Clear();
+            }
+        }
+        
+        public static Scene ClientScene(this Entity entity)
+        {
+            return ClientSceneManagerComponent.Instance.Get(entity.DomainZone());
+        }
+        
+        public static void Add(this ClientSceneManagerComponent self, Scene clientScene)
+        {
+            self.ClientScenes.Add(clientScene.Zone, clientScene);
+        }
+        
+        public static Scene Get(this ClientSceneManagerComponent self, int zone)
+        {
+            self.ClientScenes.TryGetValue(zone, out Scene scene);
+            return scene;
+        }
+        
+        public static void Remove(this ClientSceneManagerComponent self, int zone)
+        {
+            self.ClientScenes.Remove(zone);
+        }
+    }
+}

Unity/Codes/Hotfix/Client/Scene/CurrentScenesComponentSystem.cs

@@ -4,9 +4,9 @@ namespace ET.Client
 {
     public static class CurrentScenesComponentSystem
     {
-        public static Scene CurrentScene(this Scene zoneScene)
+        public static Scene CurrentScene(this Scene clientScene)
         {
-            return zoneScene.GetComponent<CurrentScenesComponent>()?.Scene;
+            return clientScene.GetComponent<CurrentScenesComponent>()?.Scene;
         }
     }
 }

Unity/Codes/Hotfix/Client/Scene/M2C_StartSceneChangeHandler.cs

@@ -1,11 +1,11 @@
 namespace ET.Client
 {
-	[MessageHandler(SceneType.Zone)]
+	[MessageHandler(SceneType.Client)]
 	public class M2C_StartSceneChangeHandler : AMHandler<M2C_StartSceneChange>
 	{
 		protected override async ETTask Run(Session session, M2C_StartSceneChange message)
 		{
-			await SceneChangeHelper.SceneChangeTo(session.ZoneScene(), message.SceneName, message.SceneInstanceId);
+			await SceneChangeHelper.SceneChangeTo(session.ClientScene(), message.SceneName, message.SceneInstanceId);
 		}
 	}
 }

Unity/Codes/Hotfix/Client/Scene/SceneChangeHelper.cs

@@ -3,30 +3,30 @@
     public static class SceneChangeHelper
     {
         // 场景切换协程
-        public static async ETTask SceneChangeTo(Scene zoneScene, string sceneName, long sceneInstanceId)
+        public static async ETTask SceneChangeTo(Scene clientScene, string sceneName, long sceneInstanceId)
         {
-            zoneScene.RemoveComponent<AIComponent>();
+            clientScene.RemoveComponent<AIComponent>();
             
-            CurrentScenesComponent currentScenesComponent = zoneScene.GetComponent<CurrentScenesComponent>();
+            CurrentScenesComponent currentScenesComponent = clientScene.GetComponent<CurrentScenesComponent>();
             currentScenesComponent.Scene?.Dispose(); // 删除之前的CurrentScene，创建新的
-            Scene currentScene = SceneFactory.CreateCurrentScene(sceneInstanceId, zoneScene.Zone, sceneName, currentScenesComponent);
+            Scene currentScene = SceneFactory.CreateCurrentScene(sceneInstanceId, clientScene.Zone, sceneName, currentScenesComponent);
             UnitComponent unitComponent = currentScene.AddComponent<UnitComponent>();
          
             // 可以订阅这个事件中创建Loading界面
-            Game.EventSystem.Publish(zoneScene, new EventType.SceneChangeStart());
+            Game.EventSystem.Publish(clientScene, new EventType.SceneChangeStart());
 
             // 等待CreateMyUnit的消息
-            WaitType.Wait_CreateMyUnit waitCreateMyUnit = await zoneScene.GetComponent<ObjectWait>().Wait<WaitType.Wait_CreateMyUnit>();
+            WaitType.Wait_CreateMyUnit waitCreateMyUnit = await clientScene.GetComponent<ObjectWait>().Wait<WaitType.Wait_CreateMyUnit>();
             M2C_CreateMyUnit m2CCreateMyUnit = waitCreateMyUnit.Message;
             Unit unit = Client.UnitFactory.Create(currentScene, m2CCreateMyUnit.Unit);
             unitComponent.Add(unit);
             
-            zoneScene.RemoveComponent<AIComponent>();
+            clientScene.RemoveComponent<AIComponent>();
             
             Game.EventSystem.Publish(currentScene, new EventType.SceneChangeFinish());
 
             // 通知等待场景切换的协程
-            zoneScene.GetComponent<ObjectWait>().Notify(new WaitType.Wait_SceneChangeFinish());
+            clientScene.GetComponent<ObjectWait>().Notify(new WaitType.Wait_SceneChangeFinish());
         }
     }
 }

Unity/Codes/Hotfix/Client/Scene/SceneFactory.cs

@@ -2,17 +2,17 @@ namespace ET.Client
 {
     public static class SceneFactory
     {
-        public static Scene CreateZoneScene(int zone, string name, Entity parent)
+        public static Scene CreateClientScene(int zone, string name, Entity parent)
         {
-            Scene zoneScene = EntitySceneFactory.CreateScene(zone, SceneType.Zone, name, parent);
-            zoneScene.AddComponent<ZoneSceneFlagComponent>();
-            zoneScene.AddComponent<NetKcpComponent, int>(SessionStreamDispatcherType.SessionStreamDispatcherClientOuter);
-			zoneScene.AddComponent<CurrentScenesComponent>();
-            zoneScene.AddComponent<ObjectWait>();
-            zoneScene.AddComponent<PlayerComponent>();
+            Scene clientScene = EntitySceneFactory.CreateScene(zone, SceneType.Client, name, parent);
+            clientScene.AddComponent<ClientSceneFlagComponent>();
+            clientScene.AddComponent<NetKcpComponent, int>(SessionStreamDispatcherType.SessionStreamDispatcherClientOuter);
+			clientScene.AddComponent<CurrentScenesComponent>();
+            clientScene.AddComponent<ObjectWait>();
+            clientScene.AddComponent<PlayerComponent>();
             
-            Game.EventSystem.Publish(zoneScene, new EventType.AfterCreateZoneScene());
-            return zoneScene;
+            Game.EventSystem.Publish(clientScene, new EventType.AfterCreateClientScene());
+            return clientScene;
         }
         
         public static Scene CreateCurrentScene(long id, int zone, string name, CurrentScenesComponent currentScenesComponent)

Unity/Codes/Hotfix/Client/Scene/ZoneSceneFlagComponentSystem.cs

@@ -1,20 +0,0 @@
-namespace ET.Client
-{
-    [ObjectSystem]
-    public class ZoneSceneFlagComponentDestroySystem: DestroySystem<ZoneSceneFlagComponent>
-    {
-        public override void Destroy(ZoneSceneFlagComponent self)
-        {
-            ZoneSceneManagerComponent.Instance.Remove(self.DomainZone());
-        }
-    }
-
-    [ObjectSystem]
-    public class ZoneSceneFlagComponentAwakeSystem: AwakeSystem<ZoneSceneFlagComponent>
-    {
-        public override void Awake(ZoneSceneFlagComponent self)
-        {
-            ZoneSceneManagerComponent.Instance.Add(self.GetParent<Scene>());
-        }
-    }
-}

Unity/Codes/Hotfix/Client/Scene/ZoneSceneManagerComponentSystem.cs

@@ -1,47 +0,0 @@
-using System;
-
-namespace ET.Client
-{
-    [FriendClass(typeof(ZoneSceneManagerComponent))]
-    public static class ZoneSceneManagerComponentSystem
-    {
-        [ObjectSystem]
-        public class ZoneSceneManagerComponentAwakeSystem: AwakeSystem<ZoneSceneManagerComponent>
-        {
-            public override void Awake(ZoneSceneManagerComponent self)
-            {
-                ZoneSceneManagerComponent.Instance = self;
-            }
-        }
-
-        [ObjectSystem]
-        public class ZoneSceneManagerComponentDestroySystem: DestroySystem<ZoneSceneManagerComponent>
-        {
-            public override void Destroy(ZoneSceneManagerComponent self)
-            {
-                self.ZoneScenes.Clear();
-            }
-        }
-        
-        public static Scene ZoneScene(this Entity entity)
-        {
-            return ZoneSceneManagerComponent.Instance.Get(entity.DomainZone());
-        }
-        
-        public static void Add(this ZoneSceneManagerComponent self, Scene zoneScene)
-        {
-            self.ZoneScenes.Add(zoneScene.Zone, zoneScene);
-        }
-        
-        public static Scene Get(this ZoneSceneManagerComponent self, int zone)
-        {
-            self.ZoneScenes.TryGetValue(zone, out Scene scene);
-            return scene;
-        }
-        
-        public static void Remove(this ZoneSceneManagerComponent self, int zone)
-        {
-            self.ZoneScenes.Remove(zone);
-        }
-    }
-}

Unity/Codes/Hotfix/Client/Unit/M2C_CreateMyUnitHandler.cs

@@ -1,6 +1,6 @@
 namespace ET.Client
 {
-	[MessageHandler(SceneType.Zone)]
+	[MessageHandler(SceneType.Client)]
 	public class M2C_CreateMyUnitHandler : AMHandler<M2C_CreateMyUnit>
 	{
 		protected override async ETTask Run(Session session, M2C_CreateMyUnit message)

Unity/Codes/Hotfix/Client/Unit/M2C_CreateUnitsHandler.cs

@@ -1,6 +1,6 @@
 namespace ET.Client
 {
-	[MessageHandler(SceneType.Zone)]
+	[MessageHandler(SceneType.Client)]
 	public class M2C_CreateUnitsHandler : AMHandler<M2C_CreateUnits>
 	{
 		protected override async ETTask Run(Session session, M2C_CreateUnits message)

Unity/Codes/Hotfix/Client/Unit/M2C_RemoveUnitsHandler.cs

@@ -1,6 +1,6 @@
 namespace ET.Client
 {
-	[MessageHandler(SceneType.Zone)]
+	[MessageHandler(SceneType.Client)]
 	public class M2C_RemoveUnitsHandler : AMHandler<M2C_RemoveUnits>
 	{
 		protected override async ETTask Run(Session session, M2C_RemoveUnits message)

Unity/Codes/Hotfix/Client/Unit/UnitHelper.cs

@@ -2,10 +2,10 @@
 {
     public static class UnitHelper
     {
-        public static Unit GetMyUnitFromZoneScene(Scene zoneScene)
+        public static Unit GetMyUnitFromClientScene(Scene clientScene)
         {
-            PlayerComponent playerComponent = zoneScene.GetComponent<PlayerComponent>();
-            Scene currentScene = zoneScene.GetComponent<CurrentScenesComponent>().Scene;
+            PlayerComponent playerComponent = clientScene.GetComponent<PlayerComponent>();
+            Scene currentScene = clientScene.GetComponent<CurrentScenesComponent>().Scene;
             return currentScene.GetComponent<UnitComponent>().Get(playerComponent.MyId);
         }
         

Unity/Codes/HotfixView/AppStart_Init.cs

@@ -20,16 +20,16 @@ namespace ET.Client
             
             Game.Scene.AddComponent<NetThreadComponent>();
             Game.Scene.AddComponent<SessionStreamDispatcher>();
-            Game.Scene.AddComponent<ZoneSceneManagerComponent>();
+            Game.Scene.AddComponent<ClientSceneManagerComponent>();
             
             Game.Scene.AddComponent<GlobalComponent>();
             Game.Scene.AddComponent<NumericWatcherComponent>();
             Game.Scene.AddComponent<AIDispatcherComponent>();
             await ResourcesComponent.Instance.LoadBundleAsync("unit.unity3d");
             
-            Scene zoneScene = Client.SceneFactory.CreateZoneScene(1, "Game", Game.Scene);
+            Scene clientScene = Client.SceneFactory.CreateClientScene(1, "Game", Game.Scene);
             
-            await Game.EventSystem.PublishAsync(zoneScene, new EventType.AppStartInitFinish());
+            await Game.EventSystem.PublishAsync(clientScene, new EventType.AppStartInitFinish());
         }
     }
 }

Unity/Codes/HotfixView/Client/Opera/OperaComponentSystem.cs

@@ -36,7 +36,7 @@ namespace ET.Client
                     self.frameClickMap.X = self.ClickPoint.x;
                     self.frameClickMap.Y = self.ClickPoint.y;
                     self.frameClickMap.Z = self.ClickPoint.z;
-                    self.ZoneScene().GetComponent<SessionComponent>().Session.Send(self.frameClickMap);
+                    self.ClientScene().GetComponent<SessionComponent>().Session.Send(self.frameClickMap);
                 }
             }
 
@@ -51,7 +51,7 @@ namespace ET.Client
             if (Input.GetKeyDown(KeyCode.T))
             {
                 C2M_TransferMap c2MTransferMap = new C2M_TransferMap();
-                self.ZoneScene().GetComponent<SessionComponent>().Session.Call(c2MTransferMap).Coroutine();
+                self.ClientScene().GetComponent<SessionComponent>().Session.Call(c2MTransferMap).Coroutine();
             }
         }
     }

Unity/Codes/HotfixView/Client/Scene/AfterCreateZoneScene_AddComponent.cs → Unity/Codes/HotfixView/Client/Scene/AfterCreateClientScene_AddComponent.cs

@@ -1,9 +1,9 @@
 namespace ET.Client
 {
-    [Event(SceneType.Zone)]
-    public class AfterCreateZoneScene_AddComponent: AEvent<Scene, EventType.AfterCreateZoneScene>
+    [Event(SceneType.Client)]
+    public class AfterCreateClientScene_AddComponent: AEvent<Scene, EventType.AfterCreateClientScene>
     {
-        protected override async ETTask Run(Scene scene, EventType.AfterCreateZoneScene args)
+        protected override async ETTask Run(Scene scene, EventType.AfterCreateClientScene args)
         {
             scene.AddComponent<UIEventComponent>();
             scene.AddComponent<UIComponent>();

Unity/Codes/HotfixView/Client/Scene/SceneChangeStart_AddComponent.cs

@@ -1,6 +1,6 @@
 namespace ET.Client
 {
-    [Event(SceneType.Zone)]
+    [Event(SceneType.Client)]
     public class SceneChangeStart_AddComponent: AEvent<Scene, EventType.SceneChangeStart>
     {
         protected override async ETTask Run(Scene scene, EventType.SceneChangeStart args)

Unity/Codes/HotfixView/Client/UI/UILoading/LoadingBeginEvent_CreateLoadingUI.cs

@@ -2,7 +2,7 @@
 
 namespace ET.Client
 {
-    [Event(SceneType.Zone)]
+    [Event(SceneType.Client)]
     public class LoadingBeginEvent_CreateLoadingUI : AEvent<Scene, EventType.LoadingBegin>
     {
         protected override async ETTask Run(Scene scene, EventType.LoadingBegin args)

Unity/Codes/HotfixView/Client/UI/UILoading/LoadingFinishEvent_RemoveLoadingUI.cs

@@ -1,6 +1,6 @@
 namespace ET.Client
 {
-    [Event(SceneType.Zone)]
+    [Event(SceneType.Client)]
     public class LoadingFinishEvent_RemoveLoadingUI : AEvent<Scene, EventType.LoadingFinish>
     {
         protected override async ETTask Run(Scene scene, EventType.LoadingFinish args)

Unity/Codes/HotfixView/Client/UI/UILobby/LoginFinish_CreateLobbyUI.cs

@@ -1,6 +1,6 @@
 namespace ET.Client
 {
-	[Event(SceneType.Zone)]
+	[Event(SceneType.Client)]
 	public class LoginFinish_CreateLobbyUI: AEvent<Scene, EventType.LoginFinish>
 	{
 		protected override async ETTask Run(Scene scene, EventType.LoginFinish args)

Unity/Codes/HotfixView/Client/UI/UILobby/UILobbyComponentSystem.cs

@@ -20,8 +20,8 @@ namespace ET.Client
         
         public static async ETTask EnterMap(this UILobbyComponent self)
         {
-            await EnterMapHelper.EnterMapAsync(self.ZoneScene());
-            await UIHelper.Remove(self.ZoneScene(), UIType.UILobby);
+            await EnterMapHelper.EnterMapAsync(self.ClientScene());
+            await UIHelper.Remove(self.ClientScene(), UIType.UILobby);
         }
     }
 }

Unity/Codes/HotfixView/Client/UI/UILogin/AppStartInitFinish_CreateLoginUI.cs

@@ -1,6 +1,6 @@
 namespace ET.Client
 {
-	[Event(SceneType.Zone)]
+	[Event(SceneType.Client)]
 	public class AppStartInitFinish_CreateLoginUI: AEvent<Scene, EventType.AppStartInitFinish>
 	{
 		protected override async ETTask Run(Scene scene, EventType.AppStartInitFinish args)

Unity/Codes/HotfixView/Client/UI/UILogin/LoginFinish_RemoveLoginUI.cs

@@ -1,6 +1,6 @@
 namespace ET.Client
 {
-	[Event(SceneType.Zone)]
+	[Event(SceneType.Client)]
 	public class LoginFinish_RemoveLoginUI: AEvent<Scene, EventType.LoginFinish>
 	{
 		protected override async ETTask Run(Scene scene, EventType.LoginFinish args)

Unity/Codes/Model/Core/Entity/SceneType.cs

@@ -11,12 +11,10 @@
 		Map = 6,
 		Router = 7,
 		RouterManager = 8,
+		Robot = 9,
 
 		// 客户端Model层
-		Client = 30,
-		Zone = 31,
-		Login = 32,
-		Robot = 33,
+		Client = 31,
 		Current = 34,
 	}
 }

Unity/Codes/Model/Core/Scene/ZoneSceneFlagComponent.cs → Unity/Codes/Model/Core/Scene/ClientSceneFlagComponent.cs

@@ -3,7 +3,7 @@
 namespace ET
 {
     [ComponentOf(typeof(Scene))]
-    public class ZoneSceneFlagComponent: Entity, IAwake, IDestroy
+    public class ClientSceneFlagComponent: Entity, IAwake, IDestroy
     {
     }
 }

Unity/Codes/Model/Core/Scene/ClientSceneManagerComponent.cs

@@ -0,0 +1,11 @@
+using System.Collections.Generic;
+
+namespace ET
+{
+    [ComponentOf(typeof(Scene))]
+    public class ClientSceneManagerComponent: Entity, IAwake, IDestroy
+    {
+        public static ClientSceneManagerComponent Instance;
+        public Dictionary<int, Scene> ClientScenes = new Dictionary<int, Scene>();
+    }
+}

Unity/Codes/Model/Core/Scene/ZoneSceneManagerComponent.cs

@@ -1,11 +0,0 @@
-using System.Collections.Generic;
-
-namespace ET
-{
-    [ComponentOf(typeof(Scene))]
-    public class ZoneSceneManagerComponent: Entity, IAwake, IDestroy
-    {
-        public static ZoneSceneManagerComponent Instance;
-        public Dictionary<int, Scene> ZoneScenes = new Dictionary<int, Scene>();
-    }
-}

Unity/Codes/Model/Module/AI/AIComponent.cs

@@ -1,6 +1,6 @@
 namespace ET
 {
-    // 客户端挂在ZoneScene上，服务端挂在Unit上
+    // 客户端挂在ClientScene上，服务端挂在Unit上
     [ComponentOf(typeof(Scene))]
     public class AIComponent: Entity, IAwake<int>, IDestroy
     {

Unity/Codes/Model/Share/EventType.cs

@@ -39,7 +39,7 @@ namespace ET
             public long Ping;
         }
         
-        public struct AfterCreateZoneScene
+        public struct AfterCreateClientScene
         {
         }
         

Unity/UserSettings/Layouts/default-2021.dwlt

@@ -1,30 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
 --- !u!114 &1
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_PixelRect:
-    serializedVersion: 2
-    x: 506
-    y: 319
-    width: 640
-    height: 601
-  m_ShowMode: 0
-  m_Title: Build Settings
-  m_RootView: {fileID: 4}
-  m_MinSize: {x: 640, y: 601}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_Maximized: 0
---- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -43,62 +19,12 @@ MonoBehaviour:
     width: 1920
     height: 997
   m_ShowMode: 4
-  m_Title: Project
-  m_RootView: {fileID: 15}
+  m_Title: Inspector
+  m_RootView: {fileID: 12}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
---- !u!114 &3
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: BuildPlayerWindow
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 640
-    height: 601
-  m_MinSize: {x: 640, y: 601}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_ActualView: {fileID: 19}
-  m_Panes:
-  - {fileID: 19}
-  m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &4
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 3}
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 640
-    height: 601
-  m_MinSize: {x: 640, y: 601}
-  m_MaxSize: {x: 4000, y: 4021}
-  vertical: 0
-  controlID: 1592
---- !u!114 &5
+--- !u!114 &2
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -119,12 +45,12 @@ MonoBehaviour:
     height: 315
   m_MinSize: {x: 102, y: 121}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 20}
+  m_ActualView: {fileID: 16}
   m_Panes:
-  - {fileID: 20}
+  - {fileID: 16}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &6
+--- !u!114 &3
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -137,8 +63,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 9}
-  - {fileID: 5}
+  - {fileID: 6}
+  - {fileID: 2}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -148,8 +74,8 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 200}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 19
---- !u!114 &7
+  controlID: 135
+--- !u!114 &4
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -170,12 +96,12 @@ MonoBehaviour:
     height: 259
   m_MinSize: {x: 101, y: 121}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 27}
+  m_ActualView: {fileID: 23}
   m_Panes:
-  - {fileID: 27}
+  - {fileID: 23}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &8
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -188,8 +114,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 18}
-  - {fileID: 7}
+  - {fileID: 15}
+  - {fileID: 4}
   m_Position:
     serializedVersion: 2
     x: 226
@@ -199,8 +125,8 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 200}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 141
---- !u!114 &9
+  controlID: 17
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -221,12 +147,12 @@ MonoBehaviour:
     height: 632
   m_MinSize: {x: 277, y: 71}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 23}
+  m_ActualView: {fileID: 19}
   m_Panes:
-  - {fileID: 23}
+  - {fileID: 19}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &10
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -239,8 +165,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 6}
-  - {fileID: 8}
+  - {fileID: 3}
+  - {fileID: 5}
   m_Position:
     serializedVersion: 2
     x: 213
@@ -250,8 +176,8 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 16192, y: 16192}
   vertical: 0
-  controlID: 140
---- !u!114 &11
+  controlID: 16
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -272,12 +198,12 @@ MonoBehaviour:
     height: 315
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 24}
+  m_ActualView: {fileID: 20}
   m_Panes:
-  - {fileID: 24}
+  - {fileID: 20}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &12
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -290,8 +216,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 13}
-  - {fileID: 11}
+  - {fileID: 10}
+  - {fileID: 8}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -301,8 +227,8 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 200}
   m_MaxSize: {x: 8096, y: 16192}
   vertical: 1
-  controlID: 62
---- !u!114 &13
+  controlID: 141
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -323,12 +249,12 @@ MonoBehaviour:
     height: 632
   m_MinSize: {x: 231, y: 271}
   m_MaxSize: {x: 10001, y: 10021}
-  m_ActualView: {fileID: 22}
+  m_ActualView: {fileID: 18}
   m_Panes:
-  - {fileID: 22}
+  - {fileID: 18}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &14
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -341,8 +267,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 12}
-  - {fileID: 10}
+  - {fileID: 9}
+  - {fileID: 7}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -352,8 +278,8 @@ MonoBehaviour:
   m_MinSize: {x: 300, y: 200}
   m_MaxSize: {x: 24288, y: 16192}
   vertical: 0
-  controlID: 139
---- !u!114 &15
+  controlID: 15
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -366,9 +292,9 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Children:
-  - {fileID: 16}
+  - {fileID: 13}
+  - {fileID: 11}
   - {fileID: 14}
-  - {fileID: 17}
   m_Position:
     serializedVersion: 2
     x: 0
@@ -381,7 +307,7 @@ MonoBehaviour:
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_BottomViewHeight: 20
---- !u!114 &16
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -403,7 +329,7 @@ MonoBehaviour:
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
---- !u!114 &17
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -424,7 +350,7 @@ MonoBehaviour:
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &18
+--- !u!114 &15
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -445,64 +371,14 @@ MonoBehaviour:
     height: 688
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 26}
+  m_ActualView: {fileID: 22}
   m_Panes:
-  - {fileID: 25}
-  - {fileID: 26}
   - {fileID: 21}
+  - {fileID: 22}
+  - {fileID: 17}
   m_Selected: 1
   m_LastSelected: 0
---- !u!114 &19
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12043, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 640, y: 580}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Build Settings
-    m_Image: {fileID: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 506
-    y: 319
-    width: 640
-    height: 580
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-  m_TreeViewState:
-    scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 
-    m_LastClickedID: 0
-    m_ExpandedIDs: 
-    m_RenameOverlay:
-      m_UserAcceptedRename: 0
-      m_Name: 
-      m_OriginalName: 
-      m_EditFieldRect:
-        serializedVersion: 2
-        x: 0
-        y: 0
-        width: 0
-        height: 0
-      m_UserData: 0
-      m_IsWaitingForDelay: 0
-      m_IsRenaming: 0
-      m_OriginalEventType: 11
-      m_IsRenamingFilename: 0
-      m_ClientGUIView: {fileID: 0}
-    m_SearchString: 
---- !u!114 &20
+--- !u!114 &16
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -530,7 +406,7 @@ MonoBehaviour:
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
     m_SaveData: []
---- !u!114 &21
+--- !u!114 &17
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -559,7 +435,7 @@ MonoBehaviour:
   m_OverlayCanvas:
     m_LastAppliedPresetName: Default
     m_SaveData: []
---- !u!114 &22
+--- !u!114 &18
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -615,7 +491,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: b29e0000
     m_LastClickedID: 40626
-    m_ExpandedIDs: 00000000fe5a0000005b0000025b0000045b0000065b0000085b00000a5b0000
+    m_ExpandedIDs: 00000000005b0000025b0000045b0000065b0000085b00000a5b00000c5b0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -643,7 +519,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: ffffffff00000000fe5a0000005b0000025b0000045b0000065b0000085b00000a5b0000
+    m_ExpandedIDs: ffffffff00000000005b0000025b0000045b0000065b0000085b00000a5b00000c5b0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -699,7 +575,7 @@ MonoBehaviour:
     m_GridSize: 64
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 74
---- !u!114 &23
+--- !u!114 &19
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -741,7 +617,7 @@ MonoBehaviour:
   m_LockTracker:
     m_IsLocked: 0
   m_PreviewWindow: {fileID: 0}
---- !u!114 &24
+--- !u!114 &20
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -799,7 +675,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: cb655c4295f43f24fa5cc27df9b91f17
---- !u!114 &25
+--- !u!114 &21
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1105,7 +981,7 @@ MonoBehaviour:
   m_SceneVisActive: 1
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
---- !u!114 &26
+--- !u!114 &22
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1198,7 +1074,7 @@ MonoBehaviour:
   m_LowResolutionForAspectRatios: 01000000000000000000
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
---- !u!114 &27
+--- !u!114 &23
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}