Browse Source

修改一些打包设置

大爷 2 years ago
parent
commit
ba9dd92a38

+ 0 - 8
Unity/Assets/Config.meta

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

+ 136 - 36
Unity/Assets/HybridCLRData/Generated/AOTGenericReferences.cs

@@ -104,49 +104,150 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour
 		// System.Object ET.Client.GameObjectHelper::Get<System.Object>(UnityEngine.GameObject,System.String)
 		// System.Object ET.Entity::AddChild<System.Object,System.Object,System.Object>(System.Object,System.Object,System.Boolean)
 		// System.Object ET.Entity::AddChildWithId<System.Object,System.Int32>(System.Int64,System.Int32,System.Boolean)
-		// System.Object ET.Entity::AddComponent<System.Object,System.Object,System.Int32>(System.Object,System.Int32,System.Boolean)
 		// System.Object ET.Entity::AddComponent<System.Object>(System.Boolean)
 		// System.Object ET.Entity::AddComponent<System.Object,System.Net.Sockets.AddressFamily>(System.Net.Sockets.AddressFamily,System.Boolean)
+		// System.Object ET.Entity::AddComponent<System.Object,System.Object,System.Int32>(System.Object,System.Int32,System.Boolean)
 		// System.Object ET.Entity::GetChild<System.Object>(System.Int64)
 		// System.Object ET.Entity::GetComponent<System.Object>()
 		// System.Object ET.Entity::GetParent<System.Object>()
 		// System.Void ET.Entity::RemoveComponent<System.Object>()
-		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,System.Object>(System.Object&,System.Object&)
-		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.TaskAwaiter`1<System.ValueTuple`2<System.UInt32,System.UInt32>>,System.Object>(System.Runtime.CompilerServices.TaskAwaiter`1<System.ValueTuple`2<System.UInt32,System.UInt32>>&,System.Object&)
-		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<ET.ETTaskCompleted,System.Object>(ET.ETTaskCompleted&,System.Object&)
-		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.TaskAwaiter`1<System.Object>,System.Object>(System.Runtime.CompilerServices.TaskAwaiter`1<System.Object>&,System.Object&)
-		// System.Void ET.ETAsyncTaskMethodBuilder::Start<System.Object>(System.Object&)
-		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Int32>::AwaitUnsafeOnCompleted<System.Object,System.Object>(System.Object&,System.Object&)
-		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.TaskAwaiter`1<System.Object>,System.Object>(System.Runtime.CompilerServices.TaskAwaiter`1<System.Object>&,System.Object&)
-		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::AwaitUnsafeOnCompleted<System.Object,System.Object>(System.Object&,System.Object&)
-		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Byte>::AwaitUnsafeOnCompleted<System.Object,System.Object>(System.Object&,System.Object&)
-		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::AwaitUnsafeOnCompleted<ET.ETTaskCompleted,System.Object>(ET.ETTaskCompleted&,System.Object&)
-		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.UInt32>::AwaitUnsafeOnCompleted<System.Object,System.Object>(System.Object&,System.Object&)
-		// System.Void ET.ETAsyncTaskMethodBuilder`1<ET.Client.Wait_CreateMyUnit>::AwaitUnsafeOnCompleted<System.Object,System.Object>(System.Object&,System.Object&)
-		// System.Void ET.ETAsyncTaskMethodBuilder`1<ET.Client.Wait_SceneChangeFinish>::AwaitUnsafeOnCompleted<System.Object,System.Object>(System.Object&,System.Object&)
-		// System.Void ET.ETAsyncTaskMethodBuilder`1<ET.Client.Wait_UnitStop>::AwaitUnsafeOnCompleted<System.Object,System.Object>(System.Object&,System.Object&)
-		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.ValueTuple`2<System.UInt32,System.Object>>::AwaitUnsafeOnCompleted<System.Object,System.Object>(System.Object&,System.Object&)
-		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::Start<System.Object>(System.Object&)
-		// System.Void ET.ETAsyncTaskMethodBuilder`1<ET.Client.Wait_SceneChangeFinish>::Start<System.Object>(System.Object&)
-		// System.Void ET.ETAsyncTaskMethodBuilder`1<ET.Client.Wait_UnitStop>::Start<System.Object>(System.Object&)
-		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.ValueTuple`2<System.UInt32,System.Object>>::Start<System.Object>(System.Object&)
-		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Int32>::Start<System.Object>(System.Object&)
-		// System.Void ET.ETAsyncTaskMethodBuilder`1<ET.Client.Wait_CreateMyUnit>::Start<System.Object>(System.Object&)
-		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Byte>::Start<System.Object>(System.Object&)
-		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.UInt32>::Start<System.Object>(System.Object&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<ET.ETTaskCompleted,ET.ReloadDllConsoleHandler/<Run>d__0>(ET.ETTaskCompleted&,ET.ReloadDllConsoleHandler/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.ResourcesComponentSystem/<>c__DisplayClass13_0/<<LoadBundleAsync>g__LoadDependency|0>d>(System.Object&,ET.Client.ResourcesComponentSystem/<>c__DisplayClass13_0/<<LoadBundleAsync>g__LoadDependency|0>d&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.RouterAddressComponentSystem/<GetAllRouter>d__2>(System.Object&,ET.Client.RouterAddressComponentSystem/<GetAllRouter>d__2&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<ET.ETTaskCompleted,ET.EntryEvent1_InitShare/<Run>d__0>(ET.ETTaskCompleted&,ET.EntryEvent1_InitShare/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.RouterAddressComponentSystem/<Init>d__1>(System.Object&,ET.Client.RouterAddressComponentSystem/<Init>d__1&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.PingComponentAwakeSystem/<PingAsync>d__1>(System.Object&,ET.Client.PingComponentAwakeSystem/<PingAsync>d__1&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.MoveHelper/<MoveToAsync>d__1>(System.Object&,ET.Client.MoveHelper/<MoveToAsync>d__1&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<ET.ETTaskCompleted,ET.Client.M2C_StopHandler/<Run>d__0>(ET.ETTaskCompleted&,ET.Client.M2C_StopHandler/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.M2C_PathfindingResultHandler/<Run>d__0>(System.Object&,ET.Client.M2C_PathfindingResultHandler/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.TaskAwaiter`1<System.Object>,ET.ConsoleComponentSystem/<Start>d__3>(System.Runtime.CompilerServices.TaskAwaiter`1<System.Object>&,ET.ConsoleComponentSystem/<Start>d__3&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.LoginHelper/<Login>d__0>(System.Object&,ET.Client.LoginHelper/<Login>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.ResourcesLoaderComponentSystem/<LoadAsync>d__1>(System.Object&,ET.Client.ResourcesLoaderComponentSystem/<LoadAsync>d__1&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.EnterMapHelper/<EnterMapAsync>d__0>(System.Object&,ET.Client.EnterMapHelper/<EnterMapAsync>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.ConsoleComponentSystem/<Start>d__3>(System.Object&,ET.ConsoleComponentSystem/<Start>d__3&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.AI_XunLuo/<Execute>d__1>(System.Object&,ET.Client.AI_XunLuo/<Execute>d__1&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.AI_Attack/<Execute>d__1>(System.Object&,ET.Client.AI_Attack/<Execute>d__1&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<ET.ETTaskCompleted,ET.NumericChangeEvent_NotifyWatcher/<Run>d__0>(ET.ETTaskCompleted&,ET.NumericChangeEvent_NotifyWatcher/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<ET.ETTaskCompleted,ET.ReloadConfigConsoleHandler/<Run>d__0>(ET.ETTaskCompleted&,ET.ReloadConfigConsoleHandler/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.ResourcesComponentSystem/<LoadOneBundleAllAssets>d__15>(System.Object&,ET.Client.ResourcesComponentSystem/<LoadOneBundleAllAssets>d__15&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.ResourcesLoaderComponentSystem/ResourcesLoaderComponentDestroySystem/<>c__DisplayClass0_0/<<Destroy>g__UnLoadAsync|0>d>(System.Object&,ET.Client.ResourcesLoaderComponentSystem/ResourcesLoaderComponentDestroySystem/<>c__DisplayClass0_0/<<Destroy>g__UnLoadAsync|0>d&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.ResourcesComponentSystem/<LoadBundleAsync>d__13>(System.Object&,ET.Client.ResourcesComponentSystem/<LoadBundleAsync>d__13&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<ET.ETTaskCompleted,ET.Client.ChangeRotation_SyncGameObjectRotation/<Run>d__0>(ET.ETTaskCompleted&,ET.Client.ChangeRotation_SyncGameObjectRotation/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<ET.ETTaskCompleted,ET.Client.ChangePosition_SyncGameObjectPos/<Run>d__0>(ET.ETTaskCompleted&,ET.Client.ChangePosition_SyncGameObjectPos/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<ET.ETTaskCompleted,ET.Client.AfterUnitCreate_CreateUnitView/<Run>d__0>(ET.ETTaskCompleted&,ET.Client.AfterUnitCreate_CreateUnitView/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.LoginFinish_RemoveLoginUI/<Run>d__0>(System.Object&,ET.Client.LoginFinish_RemoveLoginUI/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.AppStartInitFinish_CreateLoginUI/<Run>d__0>(System.Object&,ET.Client.AppStartInitFinish_CreateLoginUI/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.RouterAddressComponentSystem/<WaitTenMinGetAllRouter>d__3>(System.Object&,ET.Client.RouterAddressComponentSystem/<WaitTenMinGetAllRouter>d__3&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.LoginFinish_CreateLobbyUI/<Run>d__0>(System.Object&,ET.Client.LoginFinish_CreateLobbyUI/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<ET.ETTaskCompleted,ET.Client.UIHelper/<Remove>d__1>(ET.ETTaskCompleted&,ET.Client.UIHelper/<Remove>d__1&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.SceneChangeFinishEvent_CreateUIHelp/<Run>d__0>(System.Object&,ET.Client.SceneChangeFinishEvent_CreateUIHelp/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.SceneChangeStart_AddComponent/<Run>d__0>(System.Object&,ET.Client.SceneChangeStart_AddComponent/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<ET.ETTaskCompleted,ET.Client.AfterCreateCurrentScene_AddComponent/<Run>d__0>(ET.ETTaskCompleted&,ET.Client.AfterCreateCurrentScene_AddComponent/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.UILobbyComponentSystem/<EnterMap>d__1>(System.Object&,ET.Client.UILobbyComponentSystem/<EnterMap>d__1&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.EntryEvent3_InitClient/<Run>d__0>(System.Object&,ET.Client.EntryEvent3_InitClient/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<ET.ETTaskCompleted,ET.Client.AfterCreateClientScene_AddComponent/<Run>d__0>(ET.ETTaskCompleted&,ET.Client.AfterCreateClientScene_AddComponent/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.RouterCheckComponentAwakeSystem/<CheckAsync>d__1>(System.Object&,ET.Client.RouterCheckComponentAwakeSystem/<CheckAsync>d__1&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.ResourcesComponentSystem/<UnloadBundleAsync>d__7>(System.Object&,ET.Client.ResourcesComponentSystem/<UnloadBundleAsync>d__7&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.M2C_StartSceneChangeHandler/<Run>d__0>(System.Object&,ET.Client.M2C_StartSceneChangeHandler/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Client.SceneChangeHelper/<SceneChangeTo>d__0>(System.Object&,ET.Client.SceneChangeHelper/<SceneChangeTo>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.TaskAwaiter`1<System.ValueTuple`2<System.UInt32,System.UInt32>>,ET.Client.RouterCheckComponentAwakeSystem/<CheckAsync>d__1>(System.Runtime.CompilerServices.TaskAwaiter`1<System.ValueTuple`2<System.UInt32,System.UInt32>>&,ET.Client.RouterCheckComponentAwakeSystem/<CheckAsync>d__1&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<ET.ETTaskCompleted,ET.Client.M2C_CreateMyUnitHandler/<Run>d__0>(ET.ETTaskCompleted&,ET.Client.M2C_CreateMyUnitHandler/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<ET.ETTaskCompleted,ET.Client.M2C_CreateUnitsHandler/<Run>d__0>(ET.ETTaskCompleted&,ET.Client.M2C_CreateUnitsHandler/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<System.Object,ET.Entry/<StartAsync>d__2>(System.Object&,ET.Entry/<StartAsync>d__2&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<ET.ETTaskCompleted,ET.Client.M2C_RemoveUnitsHandler/<Run>d__0>(ET.ETTaskCompleted&,ET.Client.M2C_RemoveUnitsHandler/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::AwaitUnsafeOnCompleted<ET.ETTaskCompleted,ET.Client.NetClientComponentOnReadEvent/<Run>d__0>(ET.ETTaskCompleted&,ET.Client.NetClientComponentOnReadEvent/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.SceneChangeStart_AddComponent/<Run>d__0>(ET.Client.SceneChangeStart_AddComponent/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.EntryEvent3_InitClient/<Run>d__0>(ET.Client.EntryEvent3_InitClient/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.AfterCreateClientScene_AddComponent/<Run>d__0>(ET.Client.AfterCreateClientScene_AddComponent/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.AfterCreateCurrentScene_AddComponent/<Run>d__0>(ET.Client.AfterCreateCurrentScene_AddComponent/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.SceneChangeFinishEvent_CreateUIHelp/<Run>d__0>(ET.Client.SceneChangeFinishEvent_CreateUIHelp/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.ChangePosition_SyncGameObjectPos/<Run>d__0>(ET.Client.ChangePosition_SyncGameObjectPos/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.LoginFinish_CreateLobbyUI/<Run>d__0>(ET.Client.LoginFinish_CreateLobbyUI/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.UILobbyComponentSystem/<EnterMap>d__1>(ET.Client.UILobbyComponentSystem/<EnterMap>d__1&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.LoginFinish_RemoveLoginUI/<Run>d__0>(ET.Client.LoginFinish_RemoveLoginUI/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.AfterUnitCreate_CreateUnitView/<Run>d__0>(ET.Client.AfterUnitCreate_CreateUnitView/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.ChangeRotation_SyncGameObjectRotation/<Run>d__0>(ET.Client.ChangeRotation_SyncGameObjectRotation/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.UIHelper/<Remove>d__1>(ET.Client.UIHelper/<Remove>d__1&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Entry/<StartAsync>d__2>(ET.Entry/<StartAsync>d__2&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.AppStartInitFinish_CreateLoginUI/<Run>d__0>(ET.Client.AppStartInitFinish_CreateLoginUI/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.M2C_CreateUnitsHandler/<Run>d__0>(ET.Client.M2C_CreateUnitsHandler/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.MoveHelper/<MoveToAsync>d__1>(ET.Client.MoveHelper/<MoveToAsync>d__1&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.M2C_StopHandler/<Run>d__0>(ET.Client.M2C_StopHandler/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.M2C_PathfindingResultHandler/<Run>d__0>(ET.Client.M2C_PathfindingResultHandler/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.LoginHelper/<Login>d__0>(ET.Client.LoginHelper/<Login>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.EnterMapHelper/<EnterMapAsync>d__0>(ET.Client.EnterMapHelper/<EnterMapAsync>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.AI_XunLuo/<Execute>d__1>(ET.Client.AI_XunLuo/<Execute>d__1&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.AI_Attack/<Execute>d__1>(ET.Client.AI_Attack/<Execute>d__1&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.NumericChangeEvent_NotifyWatcher/<Run>d__0>(ET.NumericChangeEvent_NotifyWatcher/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.PingComponentAwakeSystem/<PingAsync>d__1>(ET.Client.PingComponentAwakeSystem/<PingAsync>d__1&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.ReloadDllConsoleHandler/<Run>d__0>(ET.ReloadDllConsoleHandler/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.ConsoleComponentSystem/<Start>d__3>(ET.ConsoleComponentSystem/<Start>d__3&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.M2C_RemoveUnitsHandler/<Run>d__0>(ET.Client.M2C_RemoveUnitsHandler/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.ResourcesLoaderComponentSystem/ResourcesLoaderComponentDestroySystem/<>c__DisplayClass0_0/<<Destroy>g__UnLoadAsync|0>d>(ET.Client.ResourcesLoaderComponentSystem/ResourcesLoaderComponentDestroySystem/<>c__DisplayClass0_0/<<Destroy>g__UnLoadAsync|0>d&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.ResourcesComponentSystem/<>c__DisplayClass13_0/<<LoadBundleAsync>g__LoadDependency|0>d>(ET.Client.ResourcesComponentSystem/<>c__DisplayClass13_0/<<LoadBundleAsync>g__LoadDependency|0>d&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.ResourcesLoaderComponentSystem/<LoadAsync>d__1>(ET.Client.ResourcesLoaderComponentSystem/<LoadAsync>d__1&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.ResourcesComponentSystem/<LoadOneBundleAllAssets>d__15>(ET.Client.ResourcesComponentSystem/<LoadOneBundleAllAssets>d__15&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.ResourcesComponentSystem/<LoadBundleAsync>d__13>(ET.Client.ResourcesComponentSystem/<LoadBundleAsync>d__13&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.ResourcesComponentSystem/<UnloadBundleAsync>d__7>(ET.Client.ResourcesComponentSystem/<UnloadBundleAsync>d__7&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.ReloadConfigConsoleHandler/<Run>d__0>(ET.ReloadConfigConsoleHandler/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.RouterAddressComponentSystem/<Init>d__1>(ET.Client.RouterAddressComponentSystem/<Init>d__1&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.EntryEvent1_InitShare/<Run>d__0>(ET.EntryEvent1_InitShare/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.RouterAddressComponentSystem/<GetAllRouter>d__2>(ET.Client.RouterAddressComponentSystem/<GetAllRouter>d__2&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.NetClientComponentOnReadEvent/<Run>d__0>(ET.Client.NetClientComponentOnReadEvent/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.M2C_CreateMyUnitHandler/<Run>d__0>(ET.Client.M2C_CreateMyUnitHandler/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.RouterAddressComponentSystem/<WaitTenMinGetAllRouter>d__3>(ET.Client.RouterAddressComponentSystem/<WaitTenMinGetAllRouter>d__3&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.SceneChangeHelper/<SceneChangeTo>d__0>(ET.Client.SceneChangeHelper/<SceneChangeTo>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.RouterCheckComponentAwakeSystem/<CheckAsync>d__1>(ET.Client.RouterCheckComponentAwakeSystem/<CheckAsync>d__1&)
+		// System.Void ET.ETAsyncTaskMethodBuilder::Start<ET.Client.M2C_StartSceneChangeHandler/<Run>d__0>(ET.Client.M2C_StartSceneChangeHandler/<Run>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Int32>::AwaitUnsafeOnCompleted<System.Object,ET.Client.MoveHelper/<MoveToAsync>d__0>(System.Object&,ET.Client.MoveHelper/<MoveToAsync>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::AwaitUnsafeOnCompleted<System.Object,ET.Client.UILoginEvent/<OnCreate>d__0>(System.Object&,ET.Client.UILoginEvent/<OnCreate>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::AwaitUnsafeOnCompleted<System.Object,ET.Client.ResourcesComponentSystem/<LoadOneBundleAsync>d__14>(System.Object&,ET.Client.ResourcesComponentSystem/<LoadOneBundleAsync>d__14&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::AwaitUnsafeOnCompleted<System.Object,ET.SessionSystem/<Call>d__4>(System.Object&,ET.SessionSystem/<Call>d__4&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::AwaitUnsafeOnCompleted<System.Object,ET.Client.RouterHelper/<CreateRouterSession>d__0>(System.Object&,ET.Client.RouterHelper/<CreateRouterSession>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.ValueTuple`2<System.UInt32,System.Object>>::AwaitUnsafeOnCompleted<System.Object,ET.Client.RouterHelper/<GetRouterAddress>d__1>(System.Object&,ET.Client.RouterHelper/<GetRouterAddress>d__1&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.UInt32>::AwaitUnsafeOnCompleted<System.Object,ET.Client.RouterHelper/<Connect>d__2>(System.Object&,ET.Client.RouterHelper/<Connect>d__2&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::AwaitUnsafeOnCompleted<System.Runtime.CompilerServices.TaskAwaiter`1<System.Object>,ET.Client.HttpClientHelper/<Get>d__0>(System.Runtime.CompilerServices.TaskAwaiter`1<System.Object>&,ET.Client.HttpClientHelper/<Get>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::AwaitUnsafeOnCompleted<System.Object,ET.Client.UIComponentSystem/<Create>d__0>(System.Object&,ET.Client.UIComponentSystem/<Create>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::AwaitUnsafeOnCompleted<System.Object,ET.Client.UIEventComponentSystem/<OnCreate>d__1>(System.Object&,ET.Client.UIEventComponentSystem/<OnCreate>d__1&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Byte>::AwaitUnsafeOnCompleted<System.Object,ET.MoveComponentSystem/<MoveToAsync>d__5>(System.Object&,ET.MoveComponentSystem/<MoveToAsync>d__5&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::AwaitUnsafeOnCompleted<System.Object,ET.Client.UILobbyEvent/<OnCreate>d__0>(System.Object&,ET.Client.UILobbyEvent/<OnCreate>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::AwaitUnsafeOnCompleted<ET.ETTaskCompleted,ET.Client.UILobbyEvent/<OnCreate>d__0>(ET.ETTaskCompleted&,ET.Client.UILobbyEvent/<OnCreate>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::AwaitUnsafeOnCompleted<ET.ETTaskCompleted,ET.Client.SceneFactory/<CreateClientScene>d__0>(ET.ETTaskCompleted&,ET.Client.SceneFactory/<CreateClientScene>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::AwaitUnsafeOnCompleted<System.Object,ET.Client.UIHelper/<Create>d__0>(System.Object&,ET.Client.UIHelper/<Create>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::AwaitUnsafeOnCompleted<System.Object,ET.Client.UIHelpEvent/<OnCreate>d__0>(System.Object&,ET.Client.UIHelpEvent/<OnCreate>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::AwaitUnsafeOnCompleted<System.Object,ET.SessionSystem/<Call>d__3>(System.Object&,ET.SessionSystem/<Call>d__3&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::Start<ET.Client.SceneFactory/<CreateClientScene>d__0>(ET.Client.SceneFactory/<CreateClientScene>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::Start<ET.Client.ResourcesComponentSystem/<LoadOneBundleAsync>d__14>(ET.Client.ResourcesComponentSystem/<LoadOneBundleAsync>d__14&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::Start<ET.Client.UIComponentSystem/<Create>d__0>(ET.Client.UIComponentSystem/<Create>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::Start<ET.Client.UIHelpEvent/<OnCreate>d__0>(ET.Client.UIHelpEvent/<OnCreate>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Byte>::Start<ET.MoveComponentSystem/<MoveToAsync>d__5>(ET.MoveComponentSystem/<MoveToAsync>d__5&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::Start<ET.Client.UIEventComponentSystem/<OnCreate>d__1>(ET.Client.UIEventComponentSystem/<OnCreate>d__1&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::Start<ET.Client.HttpClientHelper/<Get>d__0>(ET.Client.HttpClientHelper/<Get>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<ET.Client.Wait_CreateMyUnit>::Start<ET.ObjectWaitSystem/<Wait>d__4`1<ET.Client.Wait_CreateMyUnit>>(ET.ObjectWaitSystem/<Wait>d__4`1<ET.Client.Wait_CreateMyUnit>&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::Start<ET.Client.UILoginEvent/<OnCreate>d__0>(ET.Client.UILoginEvent/<OnCreate>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Int32>::Start<ET.Client.MoveHelper/<MoveToAsync>d__0>(ET.Client.MoveHelper/<MoveToAsync>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<ET.Client.Wait_UnitStop>::Start<ET.ObjectWaitSystem/<Wait>d__4`1<ET.Client.Wait_UnitStop>>(ET.ObjectWaitSystem/<Wait>d__4`1<ET.Client.Wait_UnitStop>&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<ET.Client.Wait_SceneChangeFinish>::Start<ET.ObjectWaitSystem/<Wait>d__4`1<ET.Client.Wait_SceneChangeFinish>>(ET.ObjectWaitSystem/<Wait>d__4`1<ET.Client.Wait_SceneChangeFinish>&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::Start<ET.Client.UIHelper/<Create>d__0>(ET.Client.UIHelper/<Create>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::Start<ET.Client.UILobbyEvent/<OnCreate>d__0>(ET.Client.UILobbyEvent/<OnCreate>d__0&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.ValueTuple`2<System.UInt32,System.Object>>::Start<ET.Client.RouterHelper/<GetRouterAddress>d__1>(ET.Client.RouterHelper/<GetRouterAddress>d__1&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::Start<ET.SessionSystem/<Call>d__3>(ET.SessionSystem/<Call>d__3&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::Start<ET.SessionSystem/<Call>d__4>(ET.SessionSystem/<Call>d__4&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.UInt32>::Start<ET.Client.RouterHelper/<Connect>d__2>(ET.Client.RouterHelper/<Connect>d__2&)
+		// System.Void ET.ETAsyncTaskMethodBuilder`1<System.Object>::Start<ET.Client.RouterHelper/<CreateRouterSession>d__0>(ET.Client.RouterHelper/<CreateRouterSession>d__0&)
 		// System.Object ET.EventSystem::Invoke<ET.NavmeshComponent/RecastFileLoader,System.Object>(System.Int32,ET.NavmeshComponent/RecastFileLoader)
-		// System.Void ET.EventSystem::Publish<ET.EventType.EnterMapFinish>(ET.Scene,ET.EventType.EnterMapFinish)
-		// System.Void ET.EventSystem::Publish<ET.EventType.SceneChangeFinish>(ET.Scene,ET.EventType.SceneChangeFinish)
-		// System.Void ET.EventSystem::Publish<ET.EventType.AfterCreateClientScene>(ET.Scene,ET.EventType.AfterCreateClientScene)
-		// System.Void ET.EventSystem::Publish<ET.EventType.MoveStop>(ET.Scene,ET.EventType.MoveStop)
-		// System.Void ET.EventSystem::Publish<ET.EventType.SceneChangeStart>(ET.Scene,ET.EventType.SceneChangeStart)
-		// System.Void ET.EventSystem::Publish<ET.EventType.AfterCreateCurrentScene>(ET.Scene,ET.EventType.AfterCreateCurrentScene)
-		// System.Void ET.EventSystem::Publish<ET.Client.NetClientComponentOnRead>(ET.Scene,ET.Client.NetClientComponentOnRead)
-		// System.Void ET.EventSystem::Publish<ET.EventType.AfterUnitCreate>(ET.Scene,ET.EventType.AfterUnitCreate)
+		// System.Void ET.EventSystem::Publish<ET.EventType.ChangeRotation>(ET.Scene,ET.EventType.ChangeRotation)
 		// System.Void ET.EventSystem::Publish<ET.EventType.NumbericChange>(ET.Scene,ET.EventType.NumbericChange)
+		// System.Void ET.EventSystem::Publish<ET.EventType.AfterUnitCreate>(ET.Scene,ET.EventType.AfterUnitCreate)
 		// System.Void ET.EventSystem::Publish<ET.EventType.ChangePosition>(ET.Scene,ET.EventType.ChangePosition)
-		// System.Void ET.EventSystem::Publish<ET.EventType.ChangeRotation>(ET.Scene,ET.EventType.ChangeRotation)
+		// System.Void ET.EventSystem::Publish<ET.Client.NetClientComponentOnRead>(ET.Scene,ET.Client.NetClientComponentOnRead)
+		// System.Void ET.EventSystem::Publish<ET.EventType.SceneChangeStart>(ET.Scene,ET.EventType.SceneChangeStart)
+		// System.Void ET.EventSystem::Publish<ET.EventType.AfterCreateCurrentScene>(ET.Scene,ET.EventType.AfterCreateCurrentScene)
 		// System.Void ET.EventSystem::Publish<ET.EventType.MoveStart>(ET.Scene,ET.EventType.MoveStart)
+		// System.Void ET.EventSystem::Publish<ET.EventType.AfterCreateClientScene>(ET.Scene,ET.EventType.AfterCreateClientScene)
+		// System.Void ET.EventSystem::Publish<ET.EventType.MoveStop>(ET.Scene,ET.EventType.MoveStop)
+		// System.Void ET.EventSystem::Publish<ET.EventType.EnterMapFinish>(ET.Scene,ET.EventType.EnterMapFinish)
+		// System.Void ET.EventSystem::Publish<ET.EventType.SceneChangeFinish>(ET.Scene,ET.EventType.SceneChangeFinish)
 		// ET.ETTask ET.EventSystem::PublishAsync<ET.EventType.EntryEvent1>(ET.Scene,ET.EventType.EntryEvent1)
 		// ET.ETTask ET.EventSystem::PublishAsync<ET.EventType.EntryEvent2>(ET.Scene,ET.EventType.EntryEvent2)
 		// ET.ETTask ET.EventSystem::PublishAsync<ET.EventType.EntryEvent3>(ET.Scene,ET.EventType.EntryEvent3)
@@ -157,18 +258,17 @@ public class AOTGenericReferences : UnityEngine.MonoBehaviour
 		// System.Void ET.RandomGenerator::BreakRank<System.Object>(System.Collections.Generic.List`1<System.Object>)
 		// System.String ET.StringHelper::ArrayToString<System.Single>(System.Single[])
 		// System.Object ReferenceCollector::Get<System.Object>(System.String)
+		// ET.Client.Wait_SceneChangeFinish System.Activator::CreateInstance<ET.Client.Wait_SceneChangeFinish>()
 		// ET.Client.Wait_UnitStop System.Activator::CreateInstance<ET.Client.Wait_UnitStop>()
 		// ET.Client.Wait_CreateMyUnit System.Activator::CreateInstance<ET.Client.Wait_CreateMyUnit>()
-		// ET.Client.Wait_SceneChangeFinish System.Activator::CreateInstance<ET.Client.Wait_SceneChangeFinish>()
 		// System.Object[] System.Array::Empty<System.Object>()
 		// System.Linq.IOrderedEnumerable`1<System.Collections.Generic.KeyValuePair`2<System.Object,System.Int32>> System.Linq.Enumerable::OrderBy<System.Collections.Generic.KeyValuePair`2<System.Object,System.Int32>,System.Int32>(System.Collections.Generic.IEnumerable`1<System.Collections.Generic.KeyValuePair`2<System.Object,System.Int32>>,System.Func`2<System.Collections.Generic.KeyValuePair`2<System.Object,System.Int32>,System.Int32>)
 		// System.Collections.Generic.IEnumerable`1<System.Object> System.Linq.Enumerable::Select<System.Collections.Generic.KeyValuePair`2<System.Object,System.Int32>,System.Object>(System.Collections.Generic.IEnumerable`1<System.Collections.Generic.KeyValuePair`2<System.Object,System.Int32>>,System.Func`2<System.Collections.Generic.KeyValuePair`2<System.Object,System.Int32>,System.Object>)
-		// ET.RpcInfo[] System.Linq.Enumerable::ToArray<ET.RpcInfo>(System.Collections.Generic.IEnumerable`1<ET.RpcInfo>)
 		// System.Object[] System.Linq.Enumerable::ToArray<System.Object>(System.Collections.Generic.IEnumerable`1<System.Object>)
+		// ET.RpcInfo[] System.Linq.Enumerable::ToArray<ET.RpcInfo>(System.Collections.Generic.IEnumerable`1<ET.RpcInfo>)
 		// System.Threading.Tasks.Task`1<System.Object> System.Threading.Tasks.TaskFactory::StartNew<System.Object>(System.Func`1<System.Object>,System.Threading.CancellationToken)
 		// System.Object UnityEngine.GameObject::GetComponent<System.Object>()
 		// System.Object UnityEngine.Object::Instantiate<System.Object>(System.Object,UnityEngine.Transform,System.Boolean)
 		// System.Object UnityEngine.Object::Instantiate<System.Object>(System.Object,UnityEngine.Transform)
-		// System.Object UnityEngine.Resources::Load<System.Object>(System.String)
 	}
 }

+ 53 - 21
Unity/Assets/HybridCLRData/Generated/link.xml

@@ -1,23 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <linker>
-  <assembly fullname="FairyGUI.Runtime">
-    <type fullname="FairyGUI.Controller" preserve="all" />
-    <type fullname="FairyGUI.GButton" preserve="all" />
-    <type fullname="FairyGUI.GComponent" preserve="all" />
-    <type fullname="FairyGUI.GGroup" preserve="all" />
-    <type fullname="FairyGUI.GImage" preserve="all" />
-    <type fullname="FairyGUI.GObject" preserve="all" />
-    <type fullname="FairyGUI.GTextField" preserve="all" />
-    <type fullname="FairyGUI.Transition" preserve="all" />
-    <type fullname="FairyGUI.UIObjectFactory" preserve="all" />
-    <type fullname="FairyGUI.UIPackage" preserve="all" />
-    <type fullname="FairyGUI.Utils.XML" preserve="all" />
-  </assembly>
   <assembly fullname="MongoDB.Bson">
     <type fullname="MongoDB.Bson.Serialization.Attributes.BsonDictionaryOptionsAttribute" preserve="all" />
     <type fullname="MongoDB.Bson.Serialization.Attributes.BsonElementAttribute" preserve="all" />
     <type fullname="MongoDB.Bson.Serialization.Attributes.BsonIgnoreAttribute" preserve="all" />
-    <type fullname="MongoDB.Bson.Serialization.BsonClassMap" preserve="all" />
     <type fullname="MongoDB.Bson.Serialization.Options.DictionaryRepresentation" preserve="all" />
   </assembly>
   <assembly fullname="mscorlib">
@@ -25,7 +11,6 @@
     <type fullname="System.Action`2" preserve="all" />
     <type fullname="System.Action`3" preserve="all" />
     <type fullname="System.Activator" preserve="all" />
-    <type fullname="System.ArgumentOutOfRangeException" preserve="all" />
     <type fullname="System.Array" preserve="all" />
     <type fullname="System.BitConverter" preserve="all" />
     <type fullname="System.Byte" preserve="all" />
@@ -40,11 +25,8 @@
     <type fullname="System.Console" preserve="all" />
     <type fullname="System.Diagnostics.DebuggableAttribute" preserve="all" />
     <type fullname="System.Diagnostics.DebuggableAttribute/DebuggingModes" preserve="all" />
-    <type fullname="System.Diagnostics.DebuggerBrowsableAttribute" preserve="all" />
-    <type fullname="System.Diagnostics.DebuggerBrowsableState" preserve="all" />
     <type fullname="System.Diagnostics.DebuggerDisplayAttribute" preserve="all" />
     <type fullname="System.Diagnostics.DebuggerHiddenAttribute" preserve="all" />
-    <type fullname="System.Diagnostics.DebuggerStepThroughAttribute" preserve="all" />
     <type fullname="System.Enum" preserve="all" />
     <type fullname="System.Exception" preserve="all" />
     <type fullname="System.Func`1" preserve="all" />
@@ -167,7 +149,6 @@
     <type fullname="ET.NetServices" preserve="all" />
     <type fullname="ET.NetworkHelper" preserve="all" />
     <type fullname="ET.ObjectSystemAttribute" preserve="all" />
-    <type fullname="ET.Options" preserve="all" />
     <type fullname="ET.ProtobufHelper" preserve="all" />
     <type fullname="ET.ProtoObject" preserve="all" />
     <type fullname="ET.RandomGenerator" preserve="all" />
@@ -190,12 +171,13 @@
   </assembly>
   <assembly fullname="Unity.Loader">
     <type fullname="ET.CodeLoader" preserve="all" />
-    <type fullname="ET.CodeMode" preserve="all" />
     <type fullname="ET.CoroutineHelper" preserve="all" />
     <type fullname="ET.Define" preserve="all" />
     <type fullname="ET.GlobalConfig" preserve="all" />
     <type fullname="ET.PathHelper" preserve="all" />
     <type fullname="ET.UILayer" preserve="all" />
+    <type fullname="ET.YooAssetProxy" preserve="all" />
+    <type fullname="HotUpdateAssemblyManifest" preserve="all" />
     <type fullname="ReferenceCollector" preserve="all" />
   </assembly>
   <assembly fullname="Unity.Mathematics">
@@ -218,9 +200,12 @@
     <type fullname="ProtoBuf.ProtoMemberAttribute" preserve="all" />
   </assembly>
   <assembly fullname="UnityEngine.AnimationModule">
+    <type fullname="UnityEngine.Animation" preserve="all" />
     <type fullname="UnityEngine.AnimationClip" preserve="all" />
     <type fullname="UnityEngine.Animator" preserve="all" />
     <type fullname="UnityEngine.AnimatorControllerParameter" preserve="all" />
+    <type fullname="UnityEngine.Avatar" preserve="all" />
+    <type fullname="UnityEngine.AvatarMask" preserve="all" />
     <type fullname="UnityEngine.RuntimeAnimatorController" preserve="all" />
   </assembly>
   <assembly fullname="UnityEngine.AssetBundleModule">
@@ -233,31 +218,78 @@
     <type fullname="UnityEngine.AsyncOperation" preserve="all" />
     <type fullname="UnityEngine.Camera" preserve="all" />
     <type fullname="UnityEngine.Component" preserve="all" />
+    <type fullname="UnityEngine.Cubemap" preserve="all" />
     <type fullname="UnityEngine.Events.UnityAction" preserve="all" />
     <type fullname="UnityEngine.Events.UnityEvent" preserve="all" />
+    <type fullname="UnityEngine.FlareLayer" preserve="all" />
     <type fullname="UnityEngine.GameObject" preserve="all" />
     <type fullname="UnityEngine.KeyCode" preserve="all" />
     <type fullname="UnityEngine.LayerMask" preserve="all" />
+    <type fullname="UnityEngine.Light" preserve="all" />
+    <type fullname="UnityEngine.LightingSettings" preserve="all" />
+    <type fullname="UnityEngine.LightProbes" preserve="all" />
+    <type fullname="UnityEngine.Material" preserve="all" />
+    <type fullname="UnityEngine.Mesh" preserve="all" />
+    <type fullname="UnityEngine.MeshFilter" preserve="all" />
+    <type fullname="UnityEngine.MeshRenderer" preserve="all" />
     <type fullname="UnityEngine.Object" preserve="all" />
     <type fullname="UnityEngine.Quaternion" preserve="all" />
     <type fullname="UnityEngine.Ray" preserve="all" />
-    <type fullname="UnityEngine.Resources" preserve="all" />
+    <type fullname="UnityEngine.RectTransform" preserve="all" />
     <type fullname="UnityEngine.SceneManagement.SceneManager" preserve="all" />
+    <type fullname="UnityEngine.Shader" preserve="all" />
+    <type fullname="UnityEngine.ShaderVariantCollection" preserve="all" />
+    <type fullname="UnityEngine.SkinnedMeshRenderer" preserve="all" />
+    <type fullname="UnityEngine.Sprite" preserve="all" />
     <type fullname="UnityEngine.TextAsset" preserve="all" />
+    <type fullname="UnityEngine.Texture2D" preserve="all" />
     <type fullname="UnityEngine.Transform" preserve="all" />
     <type fullname="UnityEngine.Vector3" preserve="all" />
   </assembly>
+  <assembly fullname="UnityEngine.IMGUIModule">
+    <type fullname="UnityEngine.GUISkin" preserve="all" />
+  </assembly>
   <assembly fullname="UnityEngine.InputLegacyModule">
     <type fullname="UnityEngine.Input" preserve="all" />
   </assembly>
   <assembly fullname="UnityEngine.PhysicsModule">
+    <type fullname="UnityEngine.BoxCollider" preserve="all" />
+    <type fullname="UnityEngine.CapsuleCollider" preserve="all" />
+    <type fullname="UnityEngine.MeshCollider" preserve="all" />
     <type fullname="UnityEngine.Physics" preserve="all" />
     <type fullname="UnityEngine.RaycastHit" preserve="all" />
+    <type fullname="UnityEngine.Rigidbody" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.TextRenderingModule">
+    <type fullname="UnityEngine.Font" preserve="all" />
   </assembly>
   <assembly fullname="UnityEngine.UI">
+    <type fullname="UnityEngine.EventSystems.BaseInput" preserve="all" />
+    <type fullname="UnityEngine.EventSystems.EventSystem" preserve="all" />
+    <type fullname="UnityEngine.EventSystems.EventTrigger" preserve="all" />
+    <type fullname="UnityEngine.EventSystems.StandaloneInputModule" preserve="all" />
     <type fullname="UnityEngine.UI.Button" preserve="all" />
     <type fullname="UnityEngine.UI.Button/ButtonClickedEvent" preserve="all" />
+    <type fullname="UnityEngine.UI.CanvasScaler" preserve="all" />
+    <type fullname="UnityEngine.UI.GraphicRaycaster" preserve="all" />
+    <type fullname="UnityEngine.UI.HorizontalLayoutGroup" preserve="all" />
+    <type fullname="UnityEngine.UI.Image" preserve="all" />
     <type fullname="UnityEngine.UI.InputField" preserve="all" />
+    <type fullname="UnityEngine.UI.LayoutElement" preserve="all" />
+    <type fullname="UnityEngine.UI.RectMask2D" preserve="all" />
+    <type fullname="UnityEngine.UI.Scrollbar" preserve="all" />
+    <type fullname="UnityEngine.UI.ScrollRect" preserve="all" />
     <type fullname="UnityEngine.UI.Text" preserve="all" />
+    <type fullname="UnityEngine.UI.VerticalLayoutGroup" preserve="all" />
+  </assembly>
+  <assembly fullname="UnityEngine.UIModule">
+    <type fullname="UnityEngine.Canvas" preserve="all" />
+    <type fullname="UnityEngine.CanvasGroup" preserve="all" />
+    <type fullname="UnityEngine.CanvasRenderer" preserve="all" />
+  </assembly>
+  <assembly fullname="YooAsset">
+    <type fullname="YooAsset.RawFileOperation" preserve="all" />
+    <type fullname="YooAsset.YooAssets" preserve="all" />
+    <type fullname="YooAsset.YooAssetSettings" preserve="all" />
   </assembly>
 </linker>

+ 3 - 0
Unity/Assets/Res/Config/HotUpdateAssemblyManifest.asset

@@ -22,3 +22,6 @@ MonoBehaviour:
   - Unity.ThirdParty.dll
   - Unity.Core.dll
   - Unity.Loader.dll
+  - YooAsset.dll
+  - UniTask.YooAsset.dll
+  - FairyGUI.Runtime.dll

+ 1 - 0
Unity/Assets/Scripts/Codes/Hotfix/Server/Demo/EntryEvent2_InitServer.cs

@@ -20,6 +20,7 @@ namespace ET.Server
             Root.Instance.Scene.AddComponent<NavmeshComponent>();
 
             StartProcessConfig processConfig = StartProcessConfigCategory.Instance.Get(Options.Instance.Process);
+            Log.Debug($"AppType: {Options.Instance.AppType}");
             switch (Options.Instance.AppType)
             {
                 case AppType.Server:

+ 2 - 2
Unity/Assets/Scripts/Codes/HotfixView/Client/Demo/EntryEvent3_InitClient.cs

@@ -9,11 +9,11 @@ namespace ET.Client
         protected override async ETTask Run(Scene scene, ET.EventType.EntryEvent3 args)
         {
             // 加载配置
-            Root.Instance.Scene.AddComponent<ResourcesComponent>();
+            //Root.Instance.Scene.AddComponent<ResourcesComponent>();
             
             Root.Instance.Scene.AddComponent<GlobalComponent>();
 
-            await ResourcesComponent.Instance.LoadBundleAsync("unit.unity3d");
+            //await ResourcesComponent.Instance.LoadBundleAsync("unit.unity3d");
             
             Scene clientScene = await SceneFactory.CreateClientScene(1, "Game");
             

+ 5 - 5
Unity/Assets/Scripts/Editor/BuildEditor/BuildEditor.cs

@@ -112,10 +112,6 @@ namespace ET
                             break;
                     }
                 }
-                //生成exe之前,先生成最新的link.xml
-                //BuildModelAndHotfix(this.codeOptimization);
-                //CopyHotfixdllToHybridDir();
-                //LinkGeneratorCommand.GenerateLinkXml(EditorUserBuildSettings.activeBuildTarget);
 
                 BuildHelper.Build(this.platformType, this.buildAssetBundleOptions, this.buildOptions, this.isBuildExe, this.isContainAB, this.clearFolder);
             }
@@ -124,13 +120,17 @@ namespace ET
             GUILayout.Label("Build & copy AOTMetadlls");
             if (GUILayout.Button("Hybrid-GenerateAll & copy2CodeDll"))
             {
+                //CompileDll时,HotUpdateDll目录的model.dll会被清理掉,生成link.xml会报错
+                //所以在compileDll后,增加了BuildModel & copy动作
+                //PrebuildCommand.GenerateAll();
+
                 BuildTarget target = EditorUserBuildSettings.activeBuildTarget;
                 CompileDllCommand.CompileDll(target);
+
                 //生成最新的mode.dll & hotfix.dll,然后copy到hotupdate目录,供linkxml用
                 BuildModelAndHotfix(this.codeOptimization);
                 CopyHotfixdllToHybridDir();
 
-                //Hybrid-GenerateAll
                 Il2CppDefGeneratorCommand.GenerateIl2CppDef();
                 // 这几个生成依赖HotUpdateDlls
                 LinkGeneratorCommand.GenerateLinkXml(target);

+ 4 - 4
Unity/Assets/Scripts/Editor/BuildEditor/BuildHelper.cs

@@ -137,7 +137,7 @@ namespace ET
                     break;
             }
 
-            string fold = string.Format(BuildFolder, type);
+            /*string fold = string.Format(BuildFolder, type);
             if (clearFolder && Directory.Exists(fold))
             {
                 Directory.Delete(fold, true);
@@ -154,7 +154,7 @@ namespace ET
                 FileHelper.CleanDirectory("Assets/StreamingAssets/");
                 FileHelper.CopyDirectory(fold, "Assets/StreamingAssets/");
                 AssetDatabase.Refresh();
-            }
+            }*/
 
             if (isBuildExe)
             {
@@ -164,13 +164,13 @@ namespace ET
             }
             else
             {
-                if (isContainAB && type == PlatformType.Windows)
+                /*if (isContainAB && type == PlatformType.Windows)
                 {
                     string targetPath = Path.Combine(relativeDirPrefix, $"{programName}_Data/StreamingAssets/");
                     FileHelper.CleanDirectory(targetPath);
                     Debug.Log($"src dir: {fold}    target: {targetPath}");
                     FileHelper.CopyDirectory(fold, targetPath);
-                }
+                }*/
             }
         }
 

+ 0 - 8
Unity/Assets/ThirdParty.meta

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