完成配件安装和拆卸

Entity/Generate/ConfigTable/Entity/BobberConfig.cs

@@ -11,15 +11,20 @@ using NBF.ConfigTable;
 namespace NBF
 {
     [ProtoContract]
-    public sealed partial class BobberConfig : ASerialize, IConfigTable
+    public sealed partial class BobberConfig : ASerialize,  IConfigTable
     {
-        [ProtoMember(1)] public uint Id { get; set; } // Id
-        [ProtoMember(2)] public uint Displacement { get; set; } // 位移
-        [ProtoMember(3)] public uint NightLight { get; set; } // 是否夜光  
-        [ProtoIgnore] public uint Key => Id;
-
+    
+		[ProtoMember(1)]
+		public uint Id { get; set; } // Id
+		[ProtoMember(2)]
+		public uint Displacement { get; set; } // 位移
+		[ProtoMember(3)]
+		public uint NightLight { get; set; } // 是否夜光  
+        [ProtoIgnore]
+        public uint Key => Id;
+        
         #region Static
-
+        
         private static ConfigContext<BobberConfig> Context => ConfigTableHelper.Table<BobberConfig>();
 
         public static BobberConfig Get(uint key)
@@ -31,7 +36,7 @@ namespace NBF
         {
             return Context.Get(match);
         }
-
+        
         public static BobberConfig Fist()
         {
             return Context.Fist();
@@ -51,7 +56,7 @@ namespace NBF
         {
             return Context.Last(match);
         }
-
+        
         public static int Count()
         {
             return Context.Count();
@@ -71,12 +76,10 @@ namespace NBF
         {
             return Context.GetList(match);
         }
-
         public static void ParseJson(Newtonsoft.Json.Linq.JArray arr)
         {
             ConfigTableHelper.ParseLine<BobberConfig>(arr);
         }
-
         #endregion
     }
 }

Entity/Generate/ConfigTable/Entity/ItemConfig.cs

@@ -19,7 +19,7 @@ namespace NBF
 		[ProtoMember(2)]
 		public string Model { get; set; } // 模型
 		[ProtoMember(3)]
-		public uint Type { get; set; } // 类型
+		public uint Type { get; set; } // 子类型
 		[ProtoMember(4)]
 		public uint Quality { get; set; } // 品质
 		[ProtoMember(5)]

Entity/Generate/ConfigTable/Entity/LureConfig.cs

@@ -19,6 +19,8 @@ namespace NBF
 		[ProtoMember(2)]
 		public uint[] Hook { get; set; } = Array.Empty<uint>(); // 勾
 		[ProtoMember(3)]
+		public uint HookNum { get; set; } // 装配鱼钩数量
+		[ProtoMember(4)]
 		public uint EfficacyBase { get; set; } // 吸引力  
         [ProtoIgnore]
         public uint Key => Id;

Entity/Generate/NetworkProtocol/GameMessage.cs

@@ -157,8 +157,9 @@ namespace Fantasy
 		}
 		public override void Dispose()
 		{
-			RodId = default;
+			ItemId = default;
 			RigId = default;
+			OldRigId = default;
 			IsAdd = default;
 #if FANTASY_NET || FANTASY_UNITY
 			GetScene().MessagePoolComponent.Return<C2Game_RigChangeRequest>(this);
@@ -170,10 +171,12 @@ namespace Fantasy
 		[ProtoIgnore]
 		public int RouteType => Fantasy.RouteType.GameRoute;
 		[ProtoMember(1)]
-		public long RodId { get; set; }
+		public long ItemId { get; set; }
 		[ProtoMember(2)]
 		public long RigId { get; set; }
 		[ProtoMember(3)]
+		public long OldRigId { get; set; }
+		[ProtoMember(4)]
 		public bool IsAdd { get; set; }
 	}
 	/// <summary>

Entity/Generate/NetworkProtocol/SocialMessage.cs

@@ -483,7 +483,7 @@ namespace Fantasy
 		}
 		public override void Dispose()
 		{
-			Message = default;
+			Msg = default;
 #if FANTASY_NET || FANTASY_UNITY
 			GetScene().MessagePoolComponent.Return<S2C_Message>(this);
 #endif
@@ -492,7 +492,7 @@ namespace Fantasy
 		[ProtoIgnore]
 		public int RouteType => Fantasy.RouteType.SocialRoute;
 		[ProtoMember(1)]
-		public ChatMessageInfo Message { get; set; }
+		public ChatMessageInfo Msg { get; set; }
 	}
 	/// <summary>
 	/// /////////// ********  工会 *******/////////////