Merge branch 'tt'

Assets/Scripts/Demo/SessionHelper.cs

@@ -1,6 +1,6 @@
 using System;
-using NBC;
-using NBC.Network;
+using Fantasy;
+using Fantasy.Network;
 
 namespace NBF
 {

Assets/Scripts/Editor/Builder/Builder.cs

@@ -2,7 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using NBC.Asset.Editor;
+using NBC.Editor;
 using UnityEditor;
 using Debug = UnityEngine.Debug;
 

Assets/Scripts/Editor/Builder/Tasks/BuildABTask.cs

@@ -18,7 +18,7 @@ namespace NBF
             }
 
             DeleteStreamingAssetsBundleCache();
-            NBC.Asset.Editor.Builder.Build();
+            NBC.Editor.Builder.Build();
         }
 
         void DeleteStreamingAssetsBundleCache()

Assets/Scripts/Fishing2/Camera/CameraComponent.cs

@@ -1,8 +1,7 @@
 using NBC;
-using NBC.Entitas;
-using NBC.Entitas.Interface;
-using NBC.Event;
-using UnityEditor;
+using Fantasy.Entitas;
+using Fantasy.Entitas.Interface;
+using Fantasy.Event;
 using UnityEngine;
 
 namespace NBF.Fishing2

Assets/Scripts/Fishing2/Camera/InputComponent.cs

@@ -1,6 +1,6 @@
 using System;
-using NBC.Entitas;
-using NBC.Entitas.Interface;
+using Fantasy.Entitas;
+using Fantasy.Entitas.Interface;
 using UnityEngine;
 using UnityEngine.InputSystem;
 

Assets/Scripts/Fishing2/Camera/SettingComponent.cs

@@ -1,4 +1,4 @@
-using NBC.Entitas;
+using Fantasy.Entitas;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Fishing2/Helper/MapHelper.cs

@@ -1,7 +1,8 @@
 using System;
 using System.Collections.Generic;
+using Fantasy.Async;
 using NBC;
-using NBC.Entitas;
+using Fantasy.Entitas;
 using UnityEngine;
 using Object = System.Object;
 

Assets/Scripts/Fishing2/Helper/MoveHelper.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Fantasy.Async;
 using NBC;
 using Unity.Mathematics;
 

Assets/Scripts/Fishing2/Helper/SceneHelper.cs

@@ -1,4 +1,5 @@
 using System;
+using Fantasy.Async;
 using NBC;
 using UnityEngine.SceneManagement;
 

Assets/Scripts/Fishing2/Helper/UnitHelper.cs

@@ -1,5 +1,6 @@
-using NBC;
-using NBC.Entitas;
+using Fantasy.Async;
+using NBC;
+using Fantasy.Entitas;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Fishing2/Map/Handler/Map2C_ChangeMapHandler.cs

@@ -1,6 +1,7 @@
-using NBC;
-using NBC.Network;
-using NBC.Network.Interface;
+using Fantasy.Async;
+using Fantasy.Network;
+using Fantasy.Network.Interface;
+using NBC;
 using NBF.Fishing2;
 
 namespace NBF.Fishing2

Assets/Scripts/Fishing2/Map/Handler/Map2C_RoleEnterMapNotifyHandler.cs

@@ -1,7 +1,7 @@
-using NBC;
-using NBC.Network;
-using NBC.Network.Interface;
-
+using Fantasy.Async;
+using Fantasy.Network;
+using Fantasy.Network.Interface;
+using NBC;
 namespace NBF.Fishing2
 {
     public class Map2C_RoleEnterMapNotifyHandler : Message<Map2C_RoleEnterRoomNotify>

Assets/Scripts/Fishing2/Map/Handler/Map2C_RoleExitMapNotifyHandler.cs

@@ -1,6 +1,7 @@
-using NBC;
-using NBC.Network;
-using NBC.Network.Interface;
+using Fantasy.Async;
+using Fantasy.Network;
+using Fantasy.Network.Interface;
+using NBC;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Fishing2/Map/Map.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using NBC;
-using NBC.Entitas;
+using Fantasy.Entitas;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Fishing2/Map/MapManageComponent.cs

@@ -1,4 +1,4 @@
-using NBC.Entitas;
+using Fantasy.Entitas;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Fishing2/Message/Event/NumericChangeEvent.cs

@@ -1,7 +1,7 @@
 using System.Collections.Generic;
+using Fantasy.Event;
 using NBC;
 using NBC.Event;
-using NBC.Helper;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Fishing2/Message/Map2C_LookNotifyHandler.cs

@@ -1,6 +1,7 @@
-using NBC;
-using NBC.Network;
-using NBC.Network.Interface;
+using Fantasy.Async;
+using Fantasy.Network;
+using Fantasy.Network.Interface;
+using NBC;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Fishing2/Message/Map2C_MoveNotifyHandler.cs

@@ -1,6 +1,7 @@
-using NBC;
-using NBC.Network;
-using NBC.Network.Interface;
+using Fantasy.Async;
+using Fantasy.Network;
+using Fantasy.Network.Interface;
+using NBC;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Fishing2/Message/Map2C_RolePropertyChangeNotifyHandler.cs

@@ -1,6 +1,7 @@
-using NBC;
-using NBC.Network;
-using NBC.Network.Interface;
+using Fantasy.Async;
+using Fantasy.Network;
+using Fantasy.Network.Interface;
+using NBC;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Fishing2/Role/Role.cs

@@ -1,6 +1,7 @@
-using NBC;
-using NBC.Entitas;
-using NBC.Entitas.Interface;
+using Fantasy.Async;
+using NBC;
+using Fantasy.Entitas;
+using Fantasy.Entitas.Interface;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Fishing2/Role/RoleBag.cs

@@ -1,6 +1,7 @@
 using System.Collections.Generic;
+using Fantasy.Async;
+using Fantasy.Entitas;
 using NBC;
-using NBC.Entitas;
 using NBF.Utils;
 using Newtonsoft.Json;
 

Assets/Scripts/Fishing2/Role/RoleFishBag.cs

@@ -1,4 +1,4 @@
-using NBC.Entitas;
+using Fantasy.Entitas;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Fishing2/Unit/Equipment/FlashlightComponent.cs

@@ -1,5 +1,5 @@
-using NBC.Entitas;
-using NBC.Entitas.Interface;
+using Fantasy.Entitas;
+using Fantasy.Entitas.Interface;
 using UnityEngine;
 
 namespace NBF.Fishing2

Assets/Scripts/Fishing2/Unit/Gear/Child/GearBaitComponent.cs

@@ -1,4 +1,4 @@
-using NBC.Entitas;
+using Fantasy.Entitas;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Fishing2/Unit/Gear/Child/GearBobberComponent.cs

@@ -1,4 +1,4 @@
-using NBC.Entitas;
+using Fantasy.Entitas;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Fishing2/Unit/Gear/Child/GearHookComponent.cs

@@ -1,4 +1,4 @@
-using NBC.Entitas;
+using Fantasy.Entitas;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Fishing2/Unit/Gear/Child/GearLineComponent.cs

@@ -1,4 +1,4 @@
-using NBC.Entitas;
+using Fantasy.Entitas;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Fishing2/Unit/Gear/Child/GearLureComponent.cs

@@ -1,4 +1,4 @@
-using NBC.Entitas;
+using Fantasy.Entitas;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Fishing2/Unit/Gear/Child/GearReelComponent.cs

@@ -1,4 +1,4 @@
-using NBC.Entitas;
+using Fantasy.Entitas;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Fishing2/Unit/Gear/Child/GearRodComponent.cs

@@ -1,4 +1,4 @@
-using NBC.Entitas;
+using Fantasy.Entitas;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Fishing2/Unit/Gear/Child/GearWeightComponent.cs

@@ -1,4 +1,4 @@
-using NBC.Entitas;
+using Fantasy.Entitas;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Fishing2/Unit/Gear/UnitGearComponent.cs

@@ -1,5 +1,5 @@
 using NBC;
-using NBC.Entitas;
+using Fantasy.Entitas;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Fishing2/Unit/MapUnit.cs

@@ -1,5 +1,6 @@
-using NBC;
-using NBC.Entitas;
+using Fantasy.Async;
+using NBC;
+using Fantasy.Entitas;
 using Unity.Mathematics;
 using UnityEngine;
 

Assets/Scripts/Fishing2/Unit/MapUnitBasic.cs

@@ -1,5 +1,5 @@
 using NBC;
-using NBC.Entitas;
+using Fantasy.Entitas;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Fishing2/Unit/Move/CharacterControllerComponent.cs

@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using NBC;
-using NBC.Entitas;
-using NBC.Entitas.Interface;
-using NBC.Helper;
+using Fantasy.Entitas;
+using Fantasy.Entitas.Interface;
+using Fantasy.Helper;
 using UnityEngine;
 using UnityEngine.InputSystem;
 

Assets/Scripts/Fishing2/Unit/Parts/UnitFlashlightComponent.cs

@@ -1,4 +1,4 @@
-using NBC.Entitas;
+using Fantasy.Entitas;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Fishing2/Unit/Skin/UnitSkinComponent.cs

@@ -1,4 +1,4 @@
-using NBC.Entitas;
+using Fantasy.Entitas;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Fishing2/Unit/Unity/UnitUnityComponent.cs

@@ -1,6 +1,7 @@
-using NBC;
-using NBC.Entitas;
-using NBC.Entitas.Interface;
+using Fantasy.Async;
+using NBC;
+using Fantasy.Entitas;
+using Fantasy.Entitas.Interface;
 using RootMotion.FinalIK;
 using UnityEngine;
 

Assets/Scripts/Game.cs

@@ -7,8 +7,7 @@ namespace NBF
     public class Game : MonoBehaviour
     {
         public static Game Instance { get; private set; }
-
-
+        
         public static InputComponent Input;
 
         /// <summary>

Assets/Scripts/Generate/Config/BaitConfig.cs

@@ -6,12 +6,12 @@ using System.Reflection;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
 using NBC;
-using NBC.Serialize;
+using Fantasy.Serialize;
 
 namespace NBF
 {
     [ProtoContract]
-    public sealed partial class BaitConfig : ASerialize, IProto, IConfigTable
+    public sealed partial class BaitConfig : ASerialize, IConfigTable
     {
     
 		[ProtoMember(1)]

Assets/Scripts/Generate/Config/BasicConfig.cs

@@ -6,12 +6,12 @@ using System.Reflection;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
 using NBC;
-using NBC.Serialize;
+using Fantasy.Serialize;
 
 namespace NBF
 {
     [ProtoContract]
-    public sealed partial class BasicConfig : ASerialize, IProto, IConfigTable
+    public sealed partial class BasicConfig : ASerialize, IConfigTable
     {
     
 		[ProtoMember(1)]

Assets/Scripts/Generate/Config/BobberConfig.cs

@@ -6,12 +6,12 @@ using System.Reflection;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
 using NBC;
-using NBC.Serialize;
+using Fantasy.Serialize;
 
 namespace NBF
 {
     [ProtoContract]
-    public sealed partial class BobberConfig : ASerialize, IProto, IConfigTable
+    public sealed partial class BobberConfig : ASerialize, IConfigTable
     {
     
 		[ProtoMember(1)]

Assets/Scripts/Generate/Config/FeederConfig.cs

@@ -6,12 +6,12 @@ using System.Reflection;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
 using NBC;
-using NBC.Serialize;
+using Fantasy.Serialize;
 
 namespace NBF
 {
     [ProtoContract]
-    public sealed partial class FeederConfig : ASerialize, IProto, IConfigTable
+    public sealed partial class FeederConfig : ASerialize, IConfigTable
     {
     
 		[ProtoMember(1)]

Assets/Scripts/Generate/Config/FishConfig.cs

@@ -6,12 +6,12 @@ using System.Reflection;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
 using NBC;
-using NBC.Serialize;
+using Fantasy.Serialize;
 
 namespace NBF
 {
     [ProtoContract]
-    public sealed partial class FishConfig : ASerialize, IProto, IConfigTable
+    public sealed partial class FishConfig : ASerialize, IConfigTable
     {
     
 		[ProtoMember(1)]

Assets/Scripts/Generate/Config/HookConfig.cs

@@ -6,12 +6,12 @@ using System.Reflection;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
 using NBC;
-using NBC.Serialize;
+using Fantasy.Serialize;
 
 namespace NBF
 {
     [ProtoContract]
-    public sealed partial class HookConfig : ASerialize, IProto, IConfigTable
+    public sealed partial class HookConfig : ASerialize, IConfigTable
     {
     
 		[ProtoMember(1)]

Assets/Scripts/Generate/Config/InitConfig.cs

@@ -6,12 +6,12 @@ using System.Reflection;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
 using NBC;
-using NBC.Serialize;
+using Fantasy.Serialize;
 
 namespace NBF
 {
     [ProtoContract]
-    public sealed partial class InitConfig : ASerialize, IProto, IConfigTable
+    public sealed partial class InitConfig : ASerialize, IConfigTable
     {
     
 		[ProtoMember(1)]

Assets/Scripts/Generate/Config/ItemConfig.cs

@@ -6,12 +6,12 @@ using System.Reflection;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
 using NBC;
-using NBC.Serialize;
+using Fantasy.Serialize;
 
 namespace NBF
 {
     [ProtoContract]
-    public sealed partial class ItemConfig : ASerialize, IProto, IConfigTable
+    public sealed partial class ItemConfig : ASerialize, IConfigTable
     {
     
 		[ProtoMember(1)]

Assets/Scripts/Generate/Config/LineConfig.cs

@@ -6,12 +6,12 @@ using System.Reflection;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
 using NBC;
-using NBC.Serialize;
+using Fantasy.Serialize;
 
 namespace NBF
 {
     [ProtoContract]
-    public sealed partial class LineConfig : ASerialize, IProto, IConfigTable
+    public sealed partial class LineConfig : ASerialize, IConfigTable
     {
     
 		[ProtoMember(1)]

Assets/Scripts/Generate/Config/LureConfig.cs

@@ -6,12 +6,12 @@ using System.Reflection;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
 using NBC;
-using NBC.Serialize;
+using Fantasy.Serialize;
 
 namespace NBF
 {
     [ProtoContract]
-    public sealed partial class LureConfig : ASerialize, IProto, IConfigTable
+    public sealed partial class LureConfig : ASerialize, IConfigTable
     {
     
 		[ProtoMember(1)]

Assets/Scripts/Generate/Config/ReelConfig.cs

@@ -6,12 +6,12 @@ using System.Reflection;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
 using NBC;
-using NBC.Serialize;
+using Fantasy.Serialize;
 
 namespace NBF
 {
     [ProtoContract]
-    public sealed partial class ReelConfig : ASerialize, IProto, IConfigTable
+    public sealed partial class ReelConfig : ASerialize, IConfigTable
     {
     
 		[ProtoMember(1)]

Assets/Scripts/Generate/Config/RingConfig.cs

@@ -6,12 +6,12 @@ using System.Reflection;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
 using NBC;
-using NBC.Serialize;
+using Fantasy.Serialize;
 
 namespace NBF
 {
     [ProtoContract]
-    public sealed partial class RingConfig : ASerialize, IProto, IConfigTable
+    public sealed partial class RingConfig : ASerialize, IConfigTable
     {
     
 		[ProtoMember(1)]

Assets/Scripts/Generate/Config/RodConfig.cs

@@ -6,12 +6,12 @@ using System.Reflection;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
 using NBC;
-using NBC.Serialize;
+using Fantasy.Serialize;
 
 namespace NBF
 {
     [ProtoContract]
-    public sealed partial class RodConfig : ASerialize, IProto, IConfigTable
+    public sealed partial class RodConfig : ASerialize, IConfigTable
     {
     
 		[ProtoMember(1)]

Assets/Scripts/Generate/Config/RodRingConfig.cs

@@ -6,12 +6,12 @@ using System.Reflection;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
 using NBC;
-using NBC.Serialize;
+using Fantasy.Serialize;
 
 namespace NBF
 {
     [ProtoContract]
-    public sealed partial class RodRingConfig : ASerialize, IProto, IConfigTable
+    public sealed partial class RodRingConfig : ASerialize, IConfigTable
     {
     
 		[ProtoMember(1)]

Assets/Scripts/Generate/Config/Unit2Config.cs

@@ -6,12 +6,12 @@ using System.Reflection;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
 using NBC;
-using NBC.Serialize;
+using Fantasy.Serialize;
 
 namespace NBF
 {
     [ProtoContract]
-    public sealed partial class Unit2Config : ASerialize, IProto, IConfigTable
+    public sealed partial class Unit2Config : ASerialize, IConfigTable
     {
     
 		[ProtoMember(1)]

Assets/Scripts/Generate/Config/UnitConfig.cs

@@ -6,12 +6,12 @@ using System.Reflection;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
 using NBC;
-using NBC.Serialize;
+using Fantasy.Serialize;
 
 namespace NBF
 {
     [ProtoContract]
-    public sealed partial class UnitConfig : ASerialize, IProto, IConfigTable
+    public sealed partial class UnitConfig : ASerialize, IConfigTable
     {
     
 		[ProtoMember(1)]

Assets/Scripts/Generate/Config/WeightConfig.cs

@@ -6,12 +6,12 @@ using System.Reflection;
 using System.Collections.Generic;
 using System.Collections.Concurrent;
 using NBC;
-using NBC.Serialize;
+using Fantasy.Serialize;
 
 namespace NBF
 {
     [ProtoContract]
-    public sealed partial class WeightConfig : ASerialize, IProto, IConfigTable
+    public sealed partial class WeightConfig : ASerialize, IConfigTable
     {
     
 		[ProtoMember(1)]

Assets/Scripts/Generate/NetworkProtocol/CommonProtoData.cs

@@ -2,9 +2,8 @@ using ProtoBuf;
 
 using System.Collections.Generic;
 using Fantasy;
+using Fantasy.Network.Interface;
 using NBC;
-using NBC.Network.Interface;
-using NBC.Serialize;
 #pragma warning disable CS8618
 
 namespace NBC
@@ -13,7 +12,7 @@ namespace NBC
 	///  角色基础信息
 	/// </summary>
 	[ProtoContract]
-	public partial class RoleBaseInfo : AMessage, IProto
+	public partial class RoleBaseInfo : AMessage
 	{
 		public static RoleBaseInfo Create(Scene scene)
 		{
@@ -45,7 +44,7 @@ namespace NBC
 		public VipInfo VipInfo { get; set; }
 	}
 	[ProtoContract]
-	public partial class KeyValueInt64 : AMessage, IProto
+	public partial class KeyValueInt64 : AMessage
 	{
 		public static KeyValueInt64 Create(Scene scene)
 		{
@@ -68,7 +67,7 @@ namespace NBC
 	///  角色信息
 	/// </summary>
 	[ProtoContract]
-	public partial class RoleInfo : AMessage, IProto
+	public partial class RoleInfo : AMessage
 	{
 		public static RoleInfo Create(Scene scene)
 		{
@@ -115,7 +114,7 @@ namespace NBC
 	///  角色信息
 	/// </summary>
 	[ProtoContract]
-	public partial class RoleSimpleInfo : AMessage, IProto
+	public partial class RoleSimpleInfo : AMessage
 	{
 		public static RoleSimpleInfo Create(Scene scene)
 		{
@@ -153,7 +152,7 @@ namespace NBC
 	///  VIP信息
 	/// </summary>
 	[ProtoContract]
-	public partial class VipInfo : AMessage, IProto
+	public partial class VipInfo : AMessage
 	{
 		public static VipInfo Create(Scene scene)
 		{
@@ -179,7 +178,7 @@ namespace NBC
 	/// 奖励信息
 	/// </summary>
 	[ProtoContract]
-	public partial class AwardInfo : AMessage, IProto
+	public partial class AwardInfo : AMessage
 	{
 		public static AwardInfo Create(Scene scene)
 		{
@@ -202,7 +201,7 @@ namespace NBC
 	/// 玩家当前使用钓组信息
 	/// </summary>
 	[ProtoContract]
-	public partial class ItemBindInfo : AMessage, IProto
+	public partial class ItemBindInfo : AMessage
 	{
 		public static ItemBindInfo Create(Scene scene)
 		{
@@ -225,7 +224,7 @@ namespace NBC
 	/// 物品信息
 	/// </summary>
 	[ProtoContract]
-	public partial class ItemInfo : AMessage, IProto
+	public partial class ItemInfo : AMessage
 	{
 		public static ItemInfo Create(Scene scene)
 		{
@@ -260,7 +259,7 @@ namespace NBC
 	/// fish信息
 	/// </summary>
 	[ProtoContract]
-	public partial class FishInfo : AMessage, IProto
+	public partial class FishInfo : AMessage
 	{
 		public static FishInfo Create(Scene scene)
 		{
@@ -289,7 +288,7 @@ namespace NBC
 		public long ExpirationTime { get; set; }
 	}
 	[ProtoContract]
-	public partial class ActivityInfo : AMessage, IProto
+	public partial class ActivityInfo : AMessage
 	{
 		public static ActivityInfo Create(Scene scene)
 		{
@@ -318,7 +317,7 @@ namespace NBC
 	/// 技能情况
 	/// </summary>
 	[ProtoContract]
-	public partial class SkillInfo : AMessage, IProto
+	public partial class SkillInfo : AMessage
 	{
 		public static SkillInfo Create(Scene scene)
 		{

Assets/Scripts/Generate/NetworkProtocol/GameMessage.cs

@@ -2,9 +2,8 @@ using ProtoBuf;
 
 using System.Collections.Generic;
 using Fantasy;
+using Fantasy.Network.Interface;
 using NBC;
-using NBC.Network.Interface;
-using NBC.Serialize;
 #pragma warning disable CS8618
 
 namespace NBC
@@ -16,7 +15,7 @@ namespace NBC
 	/// 请求背包列表
 	/// </summary>
 	[ProtoContract]
-	public partial class C2Game_GetItemsRequest : AMessage, ICustomRouteRequest, IProto
+	public partial class C2Game_GetItemsRequest : AMessage, ICustomRouteRequest
 	{
 		public static C2Game_GetItemsRequest Create(Scene scene)
 		{
@@ -38,7 +37,7 @@ namespace NBC
 	/// 请求背包列表响应
 	/// </summary>
 	[ProtoContract]
-	public partial class Game2C_GetItemsResponse : AMessage, ICustomRouteResponse, IProto
+	public partial class Game2C_GetItemsResponse : AMessage, ICustomRouteResponse
 	{
 		public static Game2C_GetItemsResponse Create(Scene scene)
 		{
@@ -65,7 +64,7 @@ namespace NBC
 	/// 请求使用物品
 	/// </summary>
 	[ProtoContract]
-	public partial class C2Game_UseItemRequest : AMessage, ICustomRouteRequest, IProto
+	public partial class C2Game_UseItemRequest : AMessage, ICustomRouteRequest
 	{
 		public static C2Game_UseItemRequest Create(Scene scene)
 		{
@@ -87,7 +86,7 @@ namespace NBC
 	/// 请求使用物品响应
 	/// </summary>
 	[ProtoContract]
-	public partial class Game2C_UseItemResponse : AMessage, ICustomRouteResponse, IProto
+	public partial class Game2C_UseItemResponse : AMessage, ICustomRouteResponse
 	{
 		public static Game2C_UseItemResponse Create(Scene scene)
 		{
@@ -108,7 +107,7 @@ namespace NBC
 	/// 物品变化
 	/// </summary>
 	[ProtoContract]
-	public partial class Game2C_ItemChange : AMessage, ICustomRouteMessage, IProto
+	public partial class Game2C_ItemChange : AMessage, ICustomRouteMessage
 	{
 		public static Game2C_ItemChange Create(Scene scene)
 		{
@@ -140,7 +139,7 @@ namespace NBC
 	/// 请求安装或取下配件
 	/// </summary>
 	[ProtoContract]
-	public partial class C2Game_RigChangeRequest : AMessage, ICustomRouteRequest, IProto
+	public partial class C2Game_RigChangeRequest : AMessage, ICustomRouteRequest
 	{
 		public static C2Game_RigChangeRequest Create(Scene scene)
 		{
@@ -171,7 +170,7 @@ namespace NBC
 	/// 请求安装配件响应
 	/// </summary>
 	[ProtoContract]
-	public partial class Game2C_RigChangeResponse : AMessage, ICustomRouteResponse, IProto
+	public partial class Game2C_RigChangeResponse : AMessage, ICustomRouteResponse
 	{
 		public static Game2C_RigChangeResponse Create(Scene scene)
 		{
@@ -198,7 +197,7 @@ namespace NBC
 	/// 请求鱼护列表
 	/// </summary>
 	[ProtoContract]
-	public partial class C2Game_GetFishsRequest : AMessage, ICustomRouteRequest, IProto
+	public partial class C2Game_GetFishsRequest : AMessage, ICustomRouteRequest
 	{
 		public static C2Game_GetFishsRequest Create(Scene scene)
 		{
@@ -220,7 +219,7 @@ namespace NBC
 	/// 请求鱼护列表响应
 	/// </summary>
 	[ProtoContract]
-	public partial class Game2C_GetFishsResponse : AMessage, ICustomRouteResponse, IProto
+	public partial class Game2C_GetFishsResponse : AMessage, ICustomRouteResponse
 	{
 		public static Game2C_GetFishsResponse Create(Scene scene)
 		{
@@ -244,7 +243,7 @@ namespace NBC
 	/// 鱼护变化
 	/// </summary>
 	[ProtoContract]
-	public partial class Game2C_FishChange : AMessage, ICustomRouteMessage, IProto
+	public partial class Game2C_FishChange : AMessage, ICustomRouteMessage
 	{
 		public static Game2C_FishChange Create(Scene scene)
 		{
@@ -273,7 +272,7 @@ namespace NBC
 	/// 请求出售
 	/// </summary>
 	[ProtoContract]
-	public partial class C2Game_SellFishRequest : AMessage, ICustomRouteRequest, IProto
+	public partial class C2Game_SellFishRequest : AMessage, ICustomRouteRequest
 	{
 		public static C2Game_SellFishRequest Create(Scene scene)
 		{
@@ -298,7 +297,7 @@ namespace NBC
 	/// 请求出售响应
 	/// </summary>
 	[ProtoContract]
-	public partial class Game2C_SellFishResponse : AMessage, ICustomRouteResponse, IProto
+	public partial class Game2C_SellFishResponse : AMessage, ICustomRouteResponse
 	{
 		public static Game2C_SellFishResponse Create(Scene scene)
 		{
@@ -325,7 +324,7 @@ namespace NBC
 	/// 请求购买
 	/// </summary>
 	[ProtoContract]
-	public partial class C2Game_BuyRequest : AMessage, ICustomRouteRequest, IProto
+	public partial class C2Game_BuyRequest : AMessage, ICustomRouteRequest
 	{
 		public static C2Game_BuyRequest Create(Scene scene)
 		{
@@ -347,7 +346,7 @@ namespace NBC
 	/// 请求购买响应
 	/// </summary>
 	[ProtoContract]
-	public partial class Game2C_BuyResponse : AMessage, ICustomRouteResponse, IProto
+	public partial class Game2C_BuyResponse : AMessage, ICustomRouteResponse
 	{
 		public static Game2C_BuyResponse Create(Scene scene)
 		{

Assets/Scripts/Generate/NetworkProtocol/MapMessage.cs

@@ -2,9 +2,8 @@ using ProtoBuf;
 
 using System.Collections.Generic;
 using Fantasy;
+using Fantasy.Network.Interface;
 using NBC;
-using NBC.Network.Interface;
-using NBC.Serialize;
 #pragma warning disable CS8618
 
 namespace NBC
@@ -13,7 +12,7 @@ namespace NBC
 	///  请求创建房间
 	/// </summary>
 	[ProtoContract]
-	public partial class C2Map_CreateRoomRequest : AMessage, ICustomRouteRequest, IProto
+	public partial class C2Map_CreateRoomRequest : AMessage, ICustomRouteRequest
 	{
 		public static C2Map_CreateRoomRequest Create(Scene scene)
 		{
@@ -38,7 +37,7 @@ namespace NBC
 	///  请求创建房间成功
 	/// </summary>
 	[ProtoContract]
-	public partial class Map2C_CreateRoomResponse : AMessage, ICustomRouteResponse, IProto
+	public partial class Map2C_CreateRoomResponse : AMessage, ICustomRouteResponse
 	{
 		public static Map2C_CreateRoomResponse Create(Scene scene)
 		{
@@ -65,7 +64,7 @@ namespace NBC
 	///  请求网关离开房间（离开房间，但是不离开地图）
 	/// </summary>
 	[ProtoContract]
-	public partial class C2G_ExitRoomRequest : AMessage, IRequest, IProto
+	public partial class C2G_ExitRoomRequest : AMessage, IRequest
 	{
 		public static C2G_ExitRoomRequest Create(Scene scene)
 		{
@@ -88,7 +87,7 @@ namespace NBC
 	///  请求网关进入离开响应
 	/// </summary>
 	[ProtoContract]
-	public partial class G2C_ExitRoomResponse : AMessage, IResponse, IProto
+	public partial class G2C_ExitRoomResponse : AMessage, IResponse
 	{
 		public static G2C_ExitRoomResponse Create(Scene scene)
 		{
@@ -112,7 +111,7 @@ namespace NBC
 	///  请求网关进入地图
 	/// </summary>
 	[ProtoContract]
-	public partial class C2G_EnterMapRequest : AMessage, IRequest, IProto
+	public partial class C2G_EnterMapRequest : AMessage, IRequest
 	{
 		public static C2G_EnterMapRequest Create(Scene scene)
 		{
@@ -138,7 +137,7 @@ namespace NBC
 	///  请求网关进入房间响应
 	/// </summary>
 	[ProtoContract]
-	public partial class G2C_EnterMapResponse : AMessage, IResponse, IProto
+	public partial class G2C_EnterMapResponse : AMessage, IResponse
 	{
 		public static G2C_EnterMapResponse Create(Scene scene)
 		{
@@ -168,7 +167,7 @@ namespace NBC
 	///  通知客户端切换地图
 	/// </summary>
 	[ProtoContract]
-	public partial class Map2C_ChangeMap : AMessage, ICustomRouteMessage, IProto
+	public partial class Map2C_ChangeMap : AMessage, ICustomRouteMessage
 	{
 		public static Map2C_ChangeMap Create(Scene scene)
 		{

Assets/Scripts/Generate/NetworkProtocol/MapProtoData.cs

@@ -2,15 +2,14 @@ using ProtoBuf;
 
 using System.Collections.Generic;
 using Fantasy;
+using Fantasy.Network.Interface;
 using NBC;
-using NBC.Network.Interface;
-using NBC.Serialize;
 #pragma warning disable CS8618
 
 namespace NBC
 {
 	[ProtoContract]
-	public partial class Vector3Info : AMessage, IProto
+	public partial class Vector3Info : AMessage
 	{
 		public static Vector3Info Create(Scene scene)
 		{
@@ -33,7 +32,7 @@ namespace NBC
 		public float z { get; set; }
 	}
 	[ProtoContract]
-	public partial class Vector2Info : AMessage, IProto
+	public partial class Vector2Info : AMessage
 	{
 		public static Vector2Info Create(Scene scene)
 		{
@@ -53,7 +52,7 @@ namespace NBC
 		public float y { get; set; }
 	}
 	[ProtoContract]
-	public partial class QuaternionInfo : AMessage, IProto
+	public partial class QuaternionInfo : AMessage
 	{
 		public static QuaternionInfo Create(Scene scene)
 		{
@@ -82,7 +81,7 @@ namespace NBC
 	/// 玩家当前使用钓组信息
 	/// </summary>
 	[ProtoContract]
-	public partial class GearInfo : AMessage, IProto
+	public partial class GearInfo : AMessage
 	{
 		public static GearInfo Create(Scene scene)
 		{
@@ -111,7 +110,7 @@ namespace NBC
 		public List<KeyValueInt64> Propertys = new List<KeyValueInt64>();
 	}
 	[ProtoContract]
-	public partial class UnitStateInfo : AMessage, IProto
+	public partial class UnitStateInfo : AMessage
 	{
 		public static UnitStateInfo Create(Scene scene)
 		{
@@ -131,7 +130,7 @@ namespace NBC
 		public List<KeyValueInt64> Propertys = new List<KeyValueInt64>();
 	}
 	[ProtoContract]
-	public partial class MapUnitInfo : AMessage, IProto
+	public partial class MapUnitInfo : AMessage
 	{
 		public static MapUnitInfo Create(Scene scene)
 		{

Assets/Scripts/Generate/NetworkProtocol/OuterMessage.cs

@@ -2,15 +2,14 @@ using ProtoBuf;
 
 using System.Collections.Generic;
 using Fantasy;
+using Fantasy.Network.Interface;
 using NBC;
-using NBC.Network.Interface;
-using NBC.Serialize;
 #pragma warning disable CS8618
 
 namespace NBC
 {
 	[ProtoContract]
-	public partial class C2A_LoginRequest : AMessage, IRequest, IProto
+	public partial class C2A_LoginRequest : AMessage, IRequest
 	{
 		public static C2A_LoginRequest Create(Scene scene)
 		{
@@ -39,7 +38,7 @@ namespace NBC
 		public int Region { get; set; }
 	}
 	[ProtoContract]
-	public partial class A2C_LoginResponse : AMessage, IResponse, IProto
+	public partial class A2C_LoginResponse : AMessage, IResponse
 	{
 		public static A2C_LoginResponse Create(Scene scene)
 		{
@@ -63,7 +62,7 @@ namespace NBC
 	///  客户端登录到Gate服务器
 	/// </summary>
 	[ProtoContract]
-	public partial class C2G_LoginRequest : AMessage, IRequest, IProto
+	public partial class C2G_LoginRequest : AMessage, IRequest
 	{
 		public static C2G_LoginRequest Create(Scene scene)
 		{
@@ -83,7 +82,7 @@ namespace NBC
 		public string ToKen { get; set; }
 	}
 	[ProtoContract]
-	public partial class G2C_LoginResponse : AMessage, IResponse, IProto
+	public partial class G2C_LoginResponse : AMessage, IResponse
 	{
 		public static G2C_LoginResponse Create(Scene scene)
 		{
@@ -107,7 +106,7 @@ namespace NBC
 	///  通知客户端重复登录
 	/// </summary>
 	[ProtoContract]
-	public partial class G2C_RepeatLogin : AMessage, IMessage, IProto
+	public partial class G2C_RepeatLogin : AMessage, IMessage
 	{
 		public static G2C_RepeatLogin Create(Scene scene)
 		{
@@ -122,7 +121,7 @@ namespace NBC
 		public uint OpCode() { return OuterOpcode.G2C_RepeatLogin; }
 	}
 	[ProtoContract]
-	public partial class C2Game_GetRoleInfoRequest : AMessage, ICustomRouteRequest, IProto
+	public partial class C2Game_GetRoleInfoRequest : AMessage, ICustomRouteRequest
 	{
 		public static C2Game_GetRoleInfoRequest Create(Scene scene)
 		{
@@ -141,7 +140,7 @@ namespace NBC
 		public int RouteType => Fantasy.RouteType.GameRoute;
 	}
 	[ProtoContract]
-	public partial class Game2C_GetRoleInfoResponse : AMessage, ICustomRouteResponse, IProto
+	public partial class Game2C_GetRoleInfoResponse : AMessage, ICustomRouteResponse
 	{
 		public static Game2C_GetRoleInfoResponse Create(Scene scene)
 		{

Assets/Scripts/Generate/NetworkProtocol/RoomMessage.cs

@@ -2,9 +2,8 @@ using ProtoBuf;
 
 using System.Collections.Generic;
 using Fantasy;
+using Fantasy.Network.Interface;
 using NBC;
-using NBC.Network.Interface;
-using NBC.Serialize;
 #pragma warning disable CS8618
 
 namespace NBC
@@ -13,7 +12,7 @@ namespace NBC
 	/// 用户进入地图
 	/// </summary>
 	[ProtoContract]
-	public partial class Map2C_RoleEnterRoomNotify : AMessage, ICustomRouteMessage, IProto
+	public partial class Map2C_RoleEnterRoomNotify : AMessage, ICustomRouteMessage
 	{
 		public static Map2C_RoleEnterRoomNotify Create(Scene scene)
 		{
@@ -36,7 +35,7 @@ namespace NBC
 	/// 用户离开地图
 	/// </summary>
 	[ProtoContract]
-	public partial class Map2C_RoleExitRoomNotify : AMessage, ICustomRouteMessage, IProto
+	public partial class Map2C_RoleExitRoomNotify : AMessage, ICustomRouteMessage
 	{
 		public static Map2C_RoleExitRoomNotify Create(Scene scene)
 		{
@@ -56,7 +55,7 @@ namespace NBC
 		public long Id { get; set; }
 	}
 	[ProtoContract]
-	public partial class C2Map_RolePropertyChange : AMessage, ICustomRouteMessage, IProto
+	public partial class C2Map_RolePropertyChange : AMessage, ICustomRouteMessage
 	{
 		public static C2Map_RolePropertyChange Create(Scene scene)
 		{
@@ -79,7 +78,7 @@ namespace NBC
 	/// 玩家状态变化同步
 	/// </summary>
 	[ProtoContract]
-	public partial class Map2C_RoleStateNotify : AMessage, ICustomRouteMessage, IProto
+	public partial class Map2C_RoleStateNotify : AMessage, ICustomRouteMessage
 	{
 		public static Map2C_RoleStateNotify Create(Scene scene)
 		{
@@ -105,7 +104,7 @@ namespace NBC
 	/// 玩家钓组变化
 	/// </summary>
 	[ProtoContract]
-	public partial class Map2C_RoleGearChangeNotify : AMessage, ICustomRouteMessage, IProto
+	public partial class Map2C_RoleGearChangeNotify : AMessage, ICustomRouteMessage
 	{
 		public static Map2C_RoleGearChangeNotify Create(Scene scene)
 		{
@@ -128,7 +127,7 @@ namespace NBC
 		public List<GearInfo> Gears = new List<GearInfo>();
 	}
 	[ProtoContract]
-	public partial class Map2C_RolePropertyChangeNotify : AMessage, ICustomRouteMessage, IProto
+	public partial class Map2C_RolePropertyChangeNotify : AMessage, ICustomRouteMessage
 	{
 		public static Map2C_RolePropertyChangeNotify Create(Scene scene)
 		{
@@ -151,7 +150,7 @@ namespace NBC
 		public List<KeyValueInt64> Propertys = new List<KeyValueInt64>();
 	}
 	[ProtoContract]
-	public partial class C2Map_Move : AMessage, ICustomRouteMessage, IProto
+	public partial class C2Map_Move : AMessage, ICustomRouteMessage
 	{
 		public static C2Map_Move Create(Scene scene)
 		{
@@ -186,7 +185,7 @@ namespace NBC
 		public long Timestamp { get; set; }
 	}
 	[ProtoContract]
-	public partial class C2Map_Look : AMessage, ICustomRouteMessage, IProto
+	public partial class C2Map_Look : AMessage, ICustomRouteMessage
 	{
 		public static C2Map_Look Create(Scene scene)
 		{
@@ -212,7 +211,7 @@ namespace NBC
 	/// 玩家移动推送
 	/// </summary>
 	[ProtoContract]
-	public partial class Map2C_MoveNotify : AMessage, ICustomRouteMessage, IProto
+	public partial class Map2C_MoveNotify : AMessage, ICustomRouteMessage
 	{
 		public static Map2C_MoveNotify Create(Scene scene)
 		{
@@ -253,7 +252,7 @@ namespace NBC
 	/// 玩家旋转推送
 	/// </summary>
 	[ProtoContract]
-	public partial class Map2C_LookeNotify : AMessage, ICustomRouteMessage, IProto
+	public partial class Map2C_LookeNotify : AMessage, ICustomRouteMessage
 	{
 		public static Map2C_LookeNotify Create(Scene scene)
 		{

Assets/Scripts/Generate/NetworkProtocol/SocialMessage.cs

@@ -2,9 +2,8 @@ using ProtoBuf;
 
 using System.Collections.Generic;
 using Fantasy;
+using Fantasy.Network.Interface;
 using NBC;
-using NBC.Network.Interface;
-using NBC.Serialize;
 #pragma warning disable CS8618
 
 namespace NBC
@@ -16,7 +15,7 @@ namespace NBC
 	///  会话信息
 	/// </summary>
 	[ProtoContract]
-	public partial class ConversationInfo : AMessage, IProto
+	public partial class ConversationInfo : AMessage
 	{
 		public static ConversationInfo Create(Scene scene)
 		{
@@ -36,7 +35,7 @@ namespace NBC
 		public List<MailInfo> List = new List<MailInfo>();
 	}
 	[ProtoContract]
-	public partial class MailInfo : AMessage, IProto
+	public partial class MailInfo : AMessage
 	{
 		public static MailInfo Create(Scene scene)
 		{
@@ -74,7 +73,7 @@ namespace NBC
 	/// 请求会话列表
 	/// </summary>
 	[ProtoContract]
-	public partial class C2S_GetConversationsRequest : AMessage, ICustomRouteRequest, IProto
+	public partial class C2S_GetConversationsRequest : AMessage, ICustomRouteRequest
 	{
 		public static C2S_GetConversationsRequest Create(Scene scene)
 		{
@@ -96,7 +95,7 @@ namespace NBC
 	/// 请求会话列表响应
 	/// </summary>
 	[ProtoContract]
-	public partial class S2C_GetConversationsResponse : AMessage, ICustomRouteResponse, IProto
+	public partial class S2C_GetConversationsResponse : AMessage, ICustomRouteResponse
 	{
 		public static S2C_GetConversationsResponse Create(Scene scene)
 		{
@@ -120,7 +119,7 @@ namespace NBC
 	/// 发送邮件消息
 	/// </summary>
 	[ProtoContract]
-	public partial class C2S_SendMailRequest : AMessage, ICustomRouteRequest, IProto
+	public partial class C2S_SendMailRequest : AMessage, ICustomRouteRequest
 	{
 		public static C2S_SendMailRequest Create(Scene scene)
 		{
@@ -151,7 +150,7 @@ namespace NBC
 	/// 发送邮件消息响应
 	/// </summary>
 	[ProtoContract]
-	public partial class S2C_SendMailResponse : AMessage, ICustomRouteResponse, IProto
+	public partial class S2C_SendMailResponse : AMessage, ICustomRouteResponse
 	{
 		public static S2C_SendMailResponse Create(Scene scene)
 		{
@@ -172,7 +171,7 @@ namespace NBC
 	/// 发送删除会话消息
 	/// </summary>
 	[ProtoContract]
-	public partial class C2S_DeleteMailRequest : AMessage, ICustomRouteRequest, IProto
+	public partial class C2S_DeleteMailRequest : AMessage, ICustomRouteRequest
 	{
 		public static C2S_DeleteMailRequest Create(Scene scene)
 		{
@@ -197,7 +196,7 @@ namespace NBC
 	/// 发送删除会话消息响应
 	/// </summary>
 	[ProtoContract]
-	public partial class S2C_DeleteMailResponse : AMessage, ICustomRouteResponse, IProto
+	public partial class S2C_DeleteMailResponse : AMessage, ICustomRouteResponse
 	{
 		public static S2C_DeleteMailResponse Create(Scene scene)
 		{
@@ -221,7 +220,7 @@ namespace NBC
 	/// 新邮件推送
 	/// </summary>
 	[ProtoContract]
-	public partial class S2C_HaveMail : AMessage, ICustomRouteMessage, IProto
+	public partial class S2C_HaveMail : AMessage, ICustomRouteMessage
 	{
 		public static S2C_HaveMail Create(Scene scene)
 		{
@@ -244,7 +243,7 @@ namespace NBC
 		public string Key { get; set; }
 	}
 	[ProtoContract]
-	public partial class S2C_MailState : AMessage, ICustomRouteMessage, IProto
+	public partial class S2C_MailState : AMessage, ICustomRouteMessage
 	{
 		public static S2C_MailState Create(Scene scene)
 		{
@@ -270,7 +269,7 @@ namespace NBC
 	/// /////////// ********  频道聊天 *******/////////////
 	/// </summary>
 	[ProtoContract]
-	public partial class ChatUserInfo : AMessage, IProto
+	public partial class ChatUserInfo : AMessage
 	{
 		public static ChatUserInfo Create(Scene scene)
 		{
@@ -290,7 +289,7 @@ namespace NBC
 		public long Name { get; set; }
 	}
 	[ProtoContract]
-	public partial class ChatMessageInfo : AMessage, IProto
+	public partial class ChatMessageInfo : AMessage
 	{
 		public static ChatMessageInfo Create(Scene scene)
 		{
@@ -322,7 +321,7 @@ namespace NBC
 	/// 创建频道
 	/// </summary>
 	[ProtoContract]
-	public partial class C2S_CreateChannelRequest : AMessage, ICustomRouteRequest, IProto
+	public partial class C2S_CreateChannelRequest : AMessage, ICustomRouteRequest
 	{
 		public static C2S_CreateChannelRequest Create(Scene scene)
 		{
@@ -347,7 +346,7 @@ namespace NBC
 	/// 创建频道响应
 	/// </summary>
 	[ProtoContract]
-	public partial class S2C_CreateChannelResponse : AMessage, ICustomRouteResponse, IProto
+	public partial class S2C_CreateChannelResponse : AMessage, ICustomRouteResponse
 	{
 		public static S2C_CreateChannelResponse Create(Scene scene)
 		{
@@ -371,7 +370,7 @@ namespace NBC
 	/// 请求进入频道
 	/// </summary>
 	[ProtoContract]
-	public partial class C2S_JoinChannelRequest : AMessage, ICustomRouteRequest, IProto
+	public partial class C2S_JoinChannelRequest : AMessage, ICustomRouteRequest
 	{
 		public static C2S_JoinChannelRequest Create(Scene scene)
 		{
@@ -396,7 +395,7 @@ namespace NBC
 	/// 进入频道响应
 	/// </summary>
 	[ProtoContract]
-	public partial class S2C_JoinChannelResponse : AMessage, ICustomRouteResponse, IProto
+	public partial class S2C_JoinChannelResponse : AMessage, ICustomRouteResponse
 	{
 		public static S2C_JoinChannelResponse Create(Scene scene)
 		{
@@ -417,7 +416,7 @@ namespace NBC
 	/// 发送消息
 	/// </summary>
 	[ProtoContract]
-	public partial class C2S_SendMessageRequest : AMessage, ICustomRouteRequest, IProto
+	public partial class C2S_SendMessageRequest : AMessage, ICustomRouteRequest
 	{
 		public static C2S_SendMessageRequest Create(Scene scene)
 		{
@@ -445,7 +444,7 @@ namespace NBC
 	/// 发送消息响应
 	/// </summary>
 	[ProtoContract]
-	public partial class S2C_SendMessageResponse : AMessage, ICustomRouteResponse, IProto
+	public partial class S2C_SendMessageResponse : AMessage, ICustomRouteResponse
 	{
 		public static S2C_SendMessageResponse Create(Scene scene)
 		{
@@ -466,7 +465,7 @@ namespace NBC
 	/// 推送消息
 	/// </summary>
 	[ProtoContract]
-	public partial class S2C_Message : AMessage, ICustomRouteMessage, IProto
+	public partial class S2C_Message : AMessage, ICustomRouteMessage
 	{
 		public static S2C_Message Create(Scene scene)
 		{
@@ -489,7 +488,7 @@ namespace NBC
 	/// /////////// ********  工会 *******/////////////
 	/// </summary>
 	[ProtoContract]
-	public partial class ClubInfo : AMessage, IProto
+	public partial class ClubInfo : AMessage
 	{
 		public static ClubInfo Create(Scene scene)
 		{
@@ -521,7 +520,7 @@ namespace NBC
 	/// 请求创建工会
 	/// </summary>
 	[ProtoContract]
-	public partial class C2S_CreateClubRequest : AMessage, ICustomRouteRequest, IProto
+	public partial class C2S_CreateClubRequest : AMessage, ICustomRouteRequest
 	{
 		public static C2S_CreateClubRequest Create(Scene scene)
 		{
@@ -546,7 +545,7 @@ namespace NBC
 	/// 创建工会响应
 	/// </summary>
 	[ProtoContract]
-	public partial class S2C_CreateClubResponse : AMessage, ICustomRouteResponse, IProto
+	public partial class S2C_CreateClubResponse : AMessage, ICustomRouteResponse
 	{
 		public static S2C_CreateClubResponse Create(Scene scene)
 		{
@@ -570,7 +569,7 @@ namespace NBC
 	/// 请求工会信息
 	/// </summary>
 	[ProtoContract]
-	public partial class C2S_GetClubInfoRequest : AMessage, ICustomRouteRequest, IProto
+	public partial class C2S_GetClubInfoRequest : AMessage, ICustomRouteRequest
 	{
 		public static C2S_GetClubInfoRequest Create(Scene scene)
 		{
@@ -595,7 +594,7 @@ namespace NBC
 	/// 响应工会信息
 	/// </summary>
 	[ProtoContract]
-	public partial class S2C_GetClubInfoResponse : AMessage, ICustomRouteResponse, IProto
+	public partial class S2C_GetClubInfoResponse : AMessage, ICustomRouteResponse
 	{
 		public static S2C_GetClubInfoResponse Create(Scene scene)
 		{
@@ -619,7 +618,7 @@ namespace NBC
 	///  请求工会成员列表
 	/// </summary>
 	[ProtoContract]
-	public partial class C2S_GetMemberListRequest : AMessage, ICustomRouteRequest, IProto
+	public partial class C2S_GetMemberListRequest : AMessage, ICustomRouteRequest
 	{
 		public static C2S_GetMemberListRequest Create(Scene scene)
 		{
@@ -644,7 +643,7 @@ namespace NBC
 	///  响应工会成员列表
 	/// </summary>
 	[ProtoContract]
-	public partial class S2C_GetMemberListResponse : AMessage, ICustomRouteResponse, IProto
+	public partial class S2C_GetMemberListResponse : AMessage, ICustomRouteResponse
 	{
 		public static S2C_GetMemberListResponse Create(Scene scene)
 		{
@@ -668,7 +667,7 @@ namespace NBC
 	/// 获取工会列表请求
 	/// </summary>
 	[ProtoContract]
-	public partial class C2S_GetClubListRequest : AMessage, ICustomRouteRequest, IProto
+	public partial class C2S_GetClubListRequest : AMessage, ICustomRouteRequest
 	{
 		public static C2S_GetClubListRequest Create(Scene scene)
 		{
@@ -690,7 +689,7 @@ namespace NBC
 	/// 获取工会列表响应
 	/// </summary>
 	[ProtoContract]
-	public partial class S2C_GetClubListResponse : AMessage, ICustomRouteResponse, IProto
+	public partial class S2C_GetClubListResponse : AMessage, ICustomRouteResponse
 	{
 		public static S2C_GetClubListResponse Create(Scene scene)
 		{
@@ -714,7 +713,7 @@ namespace NBC
 	///  请求加入工会
 	/// </summary>
 	[ProtoContract]
-	public partial class C2S_JoinClubRequest : AMessage, ICustomRouteRequest, IProto
+	public partial class C2S_JoinClubRequest : AMessage, ICustomRouteRequest
 	{
 		public static C2S_JoinClubRequest Create(Scene scene)
 		{
@@ -739,7 +738,7 @@ namespace NBC
 	///  响应加入工会
 	/// </summary>
 	[ProtoContract]
-	public partial class S2C_JoinClubResponse : AMessage, ICustomRouteResponse, IProto
+	public partial class S2C_JoinClubResponse : AMessage, ICustomRouteResponse
 	{
 		public static S2C_JoinClubResponse Create(Scene scene)
 		{
@@ -763,7 +762,7 @@ namespace NBC
 	///  请求退出工会
 	/// </summary>
 	[ProtoContract]
-	public partial class C2S_LeaveClubRequest : AMessage, ICustomRouteRequest, IProto
+	public partial class C2S_LeaveClubRequest : AMessage, ICustomRouteRequest
 	{
 		public static C2S_LeaveClubRequest Create(Scene scene)
 		{
@@ -788,7 +787,7 @@ namespace NBC
 	///  响应退出工会
 	/// </summary>
 	[ProtoContract]
-	public partial class S2C_LeaveClubResponse : AMessage, ICustomRouteResponse, IProto
+	public partial class S2C_LeaveClubResponse : AMessage, ICustomRouteResponse
 	{
 		public static S2C_LeaveClubResponse Create(Scene scene)
 		{
@@ -812,7 +811,7 @@ namespace NBC
 	///  请求解散工会
 	/// </summary>
 	[ProtoContract]
-	public partial class C2S_DissolveClubRequest : AMessage, ICustomRouteRequest, IProto
+	public partial class C2S_DissolveClubRequest : AMessage, ICustomRouteRequest
 	{
 		public static C2S_DissolveClubRequest Create(Scene scene)
 		{
@@ -837,7 +836,7 @@ namespace NBC
 	///  响应解散工会
 	/// </summary>
 	[ProtoContract]
-	public partial class S2C_DissolveClubResponse : AMessage, ICustomRouteResponse, IProto
+	public partial class S2C_DissolveClubResponse : AMessage, ICustomRouteResponse
 	{
 		public static S2C_DissolveClubResponse Create(Scene scene)
 		{
@@ -861,7 +860,7 @@ namespace NBC
 	///  请求操作申请
 	/// </summary>
 	[ProtoContract]
-	public partial class C2S_DisposeJoinRequest : AMessage, ICustomRouteRequest, IProto
+	public partial class C2S_DisposeJoinRequest : AMessage, ICustomRouteRequest
 	{
 		public static C2S_DisposeJoinRequest Create(Scene scene)
 		{
@@ -892,7 +891,7 @@ namespace NBC
 	///  响应操作申请
 	/// </summary>
 	[ProtoContract]
-	public partial class S2C_DisposeJoinResponse : AMessage, ICustomRouteResponse, IProto
+	public partial class S2C_DisposeJoinResponse : AMessage, ICustomRouteResponse
 	{
 		public static S2C_DisposeJoinResponse Create(Scene scene)
 		{
@@ -922,7 +921,7 @@ namespace NBC
 	/// 推送消息
 	/// </summary>
 	[ProtoContract]
-	public partial class S2C_ClubChange : AMessage, ICustomRouteMessage, IProto
+	public partial class S2C_ClubChange : AMessage, ICustomRouteMessage
 	{
 		public static S2C_ClubChange Create(Scene scene)
 		{

Assets/Scripts/Init.cs

@@ -3,6 +3,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Threading.Tasks;
 using FairyGUI;
+using Fantasy.Async;
 using NBC;
 using NBF.Fishing2;
 using UnityEngine;

Assets/Scripts/Model/Login/LoginHelper.cs

@@ -1,7 +1,8 @@
 using Assets.Scripts.Entity;
 using Assets.Scripts.Hotfix;
+using Fantasy.Async;
+using Fantasy.Network;
 using NBC;
-using NBC.Network;
 using NBF.Fishing2;
 using Newtonsoft.Json;
 

Assets/Scripts/Model/Module/Numeric/NumericComponent.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using NBC;
-using NBC.Entitas;
+using Fantasy.Entitas;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Model/Module/ObjectWait/ObjectWait.cs

@@ -1,8 +1,9 @@
 using System;
 using System.Collections.Generic;
+using Fantasy.Async;
 using NBC;
-using NBC.Entitas;
-using NBC.Entitas.Interface;
+using Fantasy.Entitas;
+using Fantasy.Entitas.Interface;
 
 namespace NBF.Fishing2
 {

Assets/Scripts/Model/Net/Entity/AuthenticationSelectComponent.cs

@@ -1,6 +1,6 @@
 namespace Assets.Scripts.Entity
 {
-    public class AuthenticationSelectComponent : NBC.Entitas.Entity
+    public class AuthenticationSelectComponent : Fantasy.Entitas.Entity
     {
         
     }

Assets/Scripts/Model/Net/Entity/JWT/JWTParseComponent.cs

@@ -10,7 +10,7 @@ namespace Assets.Scripts.Entity
         public string aud { get; set; }
     }
     
-    public sealed class JWTParseComponent : NBC.Entitas.Entity
+    public sealed class JWTParseComponent : Fantasy.Entitas.Entity
     {
         
     }

Assets/Scripts/Model/Net/Hotfix/Handler/G2C_RepeatLoginHandler.cs

@@ -1,7 +1,7 @@
+using Fantasy.Async;
+using Fantasy.Network;
+using Fantasy.Network.Interface;
 using NBC;
-using NBC.Async;
-using NBC.Network;
-using NBC.Network.Interface;
 
 namespace Assets.Scripts.Hotfix
 {

Assets/Scripts/Model/Net/Hotfix/System/AuthenticationSelectComponentSystem.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 using Assets.Scripts.Entity;
-using NBC.Helper;
+using Fantasy.Helper;
 
 namespace Assets.Scripts.Hotfix
 {

Assets/Scripts/Model/Net/Hotfix/System/JWT/JWTParseComponentSystem.cs

@@ -1,7 +1,7 @@
 using System;
 using Assets.Scripts.Entity;
+using Fantasy.Helper;
 using NBC;
-using NBC.Helper;
 
 namespace Assets.Scripts.Hotfix
 {

Assets/Scripts/Model/Net/Hotfix/System/SessionHelper.cs

@@ -1,6 +1,7 @@
 using System;
+using Fantasy;
+using Fantasy.Network;
 using NBC;
-using NBC.Network;
 
 namespace Assets.Scripts.Hotfix
 {

Assets/Scripts/Model/Net/MessageHandler/Chat2C_MessageHandler.cs

@@ -1,6 +1,7 @@
-using NBC;
-using NBC.Network;
-using NBC.Network.Interface;
+using Fantasy.Async;
+using Fantasy.Network;
+using Fantasy.Network.Interface;
+using NBC;
 
 namespace NBF
 {

Assets/Scripts/Model/Net/Net.cs

@@ -1,8 +1,9 @@
 using Assets.Scripts.Entity;
 using Assets.Scripts.Hotfix;
+using Fantasy.Async;
+using Fantasy.Network;
+using Fantasy.Network.Interface;
 using NBC;
-using NBC.Network;
-using NBC.Network.Interface;
 
 namespace NBF
 {

Assets/Scripts/Model/Net/NetExtends.cs

@@ -1,4 +1,4 @@
-using NBC.Network.Interface;
+using Fantasy.Network.Interface;
 
 namespace NBF
 {

Assets/Scripts/NBC.Fantasy.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 0e84a538e50a435d9dbfaafbeeb42598
+timeCreated: 1762933552

Assets/Scripts/NBC.Fantasy/Editor.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a7726b361cdb4bb79be04c1a2c69e205
+timeCreated: 1762933682

Assets/Scripts/NBC.Fantasy/Editor/Asset/Attributes.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace NBC.Asset.Editor
+namespace NBC.Editor
 {
     /// <summary>
     /// 自定义名称

Assets/Scripts/NBC.Fantasy/Editor/Asset/Builder/BuildContext.cs

@@ -2,7 +2,7 @@
 using System.Linq;
 using UnityEditor;
 
-namespace NBC.Asset.Editor
+namespace NBC.Editor
 {
     public class BuildContext
     {

Assets/Scripts/NBC.Fantasy/Editor/Asset/Builder/Builder.cs

@@ -6,7 +6,7 @@ using UnityEditor;
 using UnityEngine;
 using Debug = UnityEngine.Debug;
 
-namespace NBC.Asset.Editor
+namespace NBC.Editor
 {
     public class Builder
     {

Assets/Scripts/NBC.Fantasy/Editor/Asset/Builder/Gathers/GatherBase.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using UnityEditor;
 using UnityEngine;
 
-namespace NBC.Asset.Editor
+namespace NBC.Editor
 {
     public abstract class GatherBase
     {

Assets/Scripts/NBC.Fantasy/Editor/Asset/Builder/Gathers/GatherFile.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NBC.Asset.Editor
+namespace NBC.Editor
 {
     [Bind(BundleMode.File)]
     public class GatherFile : GatherBase

Assets/Scripts/NBC.Fantasy/Editor/Asset/Builder/Gathers/GatherFolder.cs

@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using UnityEditor;
 
-namespace NBC.Asset.Editor
+namespace NBC.Editor
 {
     [Bind(BundleMode.Folder)]
     public class GatherFolder : GatherBase

Assets/Scripts/NBC.Fantasy/Editor/Asset/Builder/Gathers/GatherFolderParent.cs

@@ -4,7 +4,7 @@ using System.IO;
 using UnityEditor;
 using UnityEngine;
 
-namespace NBC.Asset.Editor
+namespace NBC.Editor
 {
     [Bind(BundleMode.FolderParent)]
     public class GatherFolderParent : GatherBase

Assets/Scripts/NBC.Fantasy/Editor/Asset/Builder/Gathers/GatherSingle.cs

@@ -1,6 +1,6 @@
 using System.Collections.Generic;
 
-namespace NBC.Asset.Editor
+namespace NBC.Editor
 {
     [Bind(BundleMode.Single)]
     public class GatherSingle : GatherBase

Assets/Scripts/NBC.Fantasy/Editor/Asset/Builder/Gathers/GatherWithoutSub.cs

@@ -3,7 +3,7 @@ using System.IO;
 using UnityEditor;
 using Object = UnityEngine.Object;
 
-namespace NBC.Asset.Editor
+namespace NBC.Editor
 {
     [Bind(BundleMode.WithoutSub)]
     public class GatherWithoutSub : GatherBase