代码整理

Unity/Assets/Scripts/Codes/Hotfix/Client/Login/Account.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: fd2ee255078554719991ef2a519f1a8b
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Scripts/Codes/Hotfix/Client/Login/Account/AccountInfoComponentSystem.cs

@@ -1,18 +0,0 @@
-using System;
-
-namespace ET.Client
-{
-    public class AccountInfoComponentDestroySystem : DestroySystem<AccountInfoComponent>
-    {
-        protected override void Destroy(AccountInfoComponent self)
-        {
-            self.Token = String.Empty;
-            self.UserId = 0;
-        }
-    }
-
-    public static class AccountInfoComponentSystem
-    {
-        
-    }
-}

Unity/Assets/Scripts/Codes/Hotfix/Client/Login/Account/AccountInfoComponentSystem.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: fd2fe7a6b385a4515aea76cac7083328
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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

@@ -25,17 +25,28 @@ namespace ET.Client
                     return;
                 }
 
-                SceneChangeHelper.SceneChangeTo(clientScene, mapinfo, g2CEnterMap.MapInstanceId).Coroutine();
-                // 等待场景切换完成
-                await clientScene.GetComponent<ObjectWait>().Wait<Wait_SceneChangeFinish>();
-
-                //告诉战斗服 i am ready
+                //告诉战斗服 i am ready，然后战斗服才会在场景创建其它单位
                 session.Send(new BattleClientReady());
+
+                SceneChangeTo(clientScene, mapinfo, g2CEnterMap.MapInstanceId).Coroutine();
             }
             catch (Exception e)
             {
                 Log.Error(e);
             }	
         }
+
+        // 场景切换协程
+        public static async ETTask SceneChangeTo(Scene clientScene, MapConfig map, long sceneInstanceId)
+        {
+            CurrentScenesComponent currentScenesComponent = clientScene.GetComponent<CurrentScenesComponent>();
+            currentScenesComponent.Scene?.Dispose(); // 删除之前的CurrentScene，创建新的
+            SceneFactory.CreateCurrentScene(sceneInstanceId, clientScene.Zone, map.MapName, currentScenesComponent);
+
+            // 可以订阅这个事件中创建Loading界面
+            EventSystem.Instance.Publish(EventType.LoadSceneEvent.Clone(map.Id));
+
+            await ETTask.CompletedTask;
+        }
     }
 }

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

@@ -23,7 +23,6 @@ namespace ET.Client
                 clientScene.RemoveComponent<RouterAddressComponent>();
                 clientScene.RemoveComponent<NetClientComponent>();
                 clientScene.RemoveComponent<SessionComponent>();
-                clientScene.RemoveComponent<AccountInfoComponent>();
 
                 // 获取路由跟realmDispatcher地址
                 var routerAddressComponent =
@@ -61,9 +60,8 @@ namespace ET.Client
 
                 // 保存账号信息
                 clientScene.AddComponent<SessionComponent>().Session = gateSession;
-                var accountComponet = clientScene.AddComponent<AccountInfoComponent>();
-                accountComponet.Token = r2CLogin.Token;
-                // accountComponet.UserId = r2CLogin.UserId;
+                var player = clientScene.GetComponent<PlayerComponent>();
+                player.Token = r2CLogin.Token;
                 Log.Debug($"登陆game成功...token={r2CLogin.Token}");
 
                 //var player = g2CLoginGate.Players[0];

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

@@ -1,18 +0,0 @@
-namespace ET.Client
-{
-    public static class SceneChangeHelper
-    {
-        // 场景切换协程
-        public static async ETTask SceneChangeTo(Scene clientScene, MapConfig map, long sceneInstanceId)
-        {
-            CurrentScenesComponent currentScenesComponent = clientScene.GetComponent<CurrentScenesComponent>();
-            currentScenesComponent.Scene?.Dispose(); // 删除之前的CurrentScene，创建新的
-            SceneFactory.CreateCurrentScene(sceneInstanceId, clientScene.Zone, map.MapName, currentScenesComponent);
-         
-            // 可以订阅这个事件中创建Loading界面
-            EventSystem.Instance.Publish(EventType.SceneChangeStart.Clone( map.Id ));
-
-            await ETTask.CompletedTask;
-        }
-    }
-}

Unity/Assets/Scripts/Codes/Hotfix/Client/Scene/SceneChangeHelper.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: eff9697e3de79f54dbfd7996f55c6f47
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

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

@@ -12,7 +12,7 @@ namespace ET.Client
             clientScene.AddComponent<CurrentScenesComponent>();
             clientScene.AddComponent<ObjectWait>();
             clientScene.AddComponent<PlayerComponent>();
-            EventSystem.Instance.Publish( EventType.AfterCreateClientScene.Clone(clientScene));
+            //EventSystem.Instance.Publish( EventType.AfterCreateClientScene.Clone(clientScene));
             return clientScene;
         }
         

Unity/Assets/Scripts/Codes/HotfixView/Client/EntryEvent3_InitClient.cs

@@ -12,7 +12,7 @@ namespace ET.Client
             Game.AddSingleton<SoundManager>();
 
             Scene clientScene = await SceneFactory.CreateClientScene( 1, "Game" );
-            await EventSystem.Instance.PublishWait<AppStartInitFinish>();
+            await EventSystem.Instance.PublishWait<ShowLoginUIEvent>();
         }
     }
 }

Unity/Assets/Scripts/Codes/HotfixView/Client/Scene/SceneChangeStart_AddComponent.cs → Unity/Assets/Scripts/Codes/HotfixView/Client/Scene/LoadSceneEventHandle.cs

@@ -5,9 +5,9 @@ using UnityEngine;
 namespace ET.Client
 {
     [Event]
-    public class SceneChangeStart_AddComponent : BEvent<EventType.SceneChangeStart>
+    public class LoadSceneEventHandle : BEvent<EventType.LoadSceneEvent>
     {
-        protected override async ETTask OnEvent(EventType.SceneChangeStart args)
+        protected override async ETTask OnEvent(EventType.LoadSceneEvent args)
         {
             UIHelper.ShowLoadingUI();
 
@@ -25,7 +25,6 @@ namespace ET.Client
 
             // 通知等待场景切换的协程
             EventSystem.Instance.Publish<EventType.SceneLoadFinish>();
-            PlayerComponent.Instance.ClientScene().GetComponent<ObjectWait>().Notify( new Wait_SceneChangeFinish() );
 
             UIHelper.HideLoadingUI();
         }

Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILogin/AppStartInitFinish_CreateLoginUI.cs → Unity/Assets/Scripts/Codes/HotfixView/Client/UI/UILogin/ShowLoginUIEventHandle.cs

@@ -9,12 +9,12 @@ using UnityEngine;
 namespace ET.Client
 {
     [Event]
-    public class AppStartInitFinish_CreateLoginUI : BEvent<EventType.AppStartInitFinish>
+    public class ShowLoginUIEventHandle : BEvent<EventType.ShowLoginUIEvent>
     {
         private string mIP;
         private int mPort;
 
-        protected override async ETTask OnEvent(AppStartInitFinish a)
+        protected override async ETTask OnEvent(ShowLoginUIEvent a)
         {
             var view = await UIHelper.Create( "Login" );
             InitLogin( view );

Unity/Assets/Scripts/Codes/Model/Client/EventTypeClient.cs

@@ -5,17 +5,17 @@ namespace ET
 {
     namespace EventType
     {
-        public class SceneChangeStart
+        public class LoadSceneEvent
         {
             public int mapId;
-            public static SceneChangeStart Static = new();
-            public static SceneChangeStart Clone(int mapid)
+            public static LoadSceneEvent Static = new();
+            public static LoadSceneEvent Clone(int mapid)
             {
                 Static.mapId = mapid;
                 return Static;
             }
         }
-        public class AfterCreateClientScene
+        /*public class AfterCreateClientScene
         {
             public Scene scene;
             public static AfterCreateClientScene Static = new();
@@ -24,7 +24,7 @@ namespace ET
                 Static.scene = scene;
                 return Static;
             }
-        }
+        }*/
         public class AfterCreateCurrentScene
         {
             public Scene scene;
@@ -35,7 +35,7 @@ namespace ET
                 return Static;
             }
         }
-        public class AppStartInitFinish { }
+        public class ShowLoginUIEvent { }
         public class LoginFinish
         {
             public Player player;

Unity/Assets/Scripts/Codes/Model/Client/Login/Account.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: c50416ec18f5f452fad575b91fd53beb
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Scripts/Codes/Model/Client/Login/Account/AccountInfoComponent.cs

@@ -1,15 +0,0 @@
-namespace ET.Client
-{
-    /**
-     * 账号信息
-     */
-    [ComponentOf(typeof(Scene))]
-    public class AccountInfoComponent : Entity, IAwake, IDestroy
-    {
-        /** 登陆token **/
-        public string Token { get; set; }
-
-        /** 账号id **/
-        public long UserId { get; set; }
-    }
-}

Unity/Assets/Scripts/Codes/Model/Client/Login/Account/AccountInfoComponent.cs.meta

@@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 699cf7fa273c34e0ba69ab84eb6426e0
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Unity/Assets/Scripts/Codes/Model/Client/Scene/PlayerComponent.cs

@@ -6,5 +6,7 @@
         [StaticField]
         public static PlayerComponent Instance;
 
+        /** 登陆token **/
+        public string Token { get; set; }
     }
 }