diff --git a/Assets/Resources/config/ConfigAssets.asset b/Assets/Resources/config/ConfigAssets.asset
index b89006ec7..a1f78b2ce 100644
--- a/Assets/Resources/config/ConfigAssets.asset
+++ b/Assets/Resources/config/ConfigAssets.asset
@@ -12,380 +12,3 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 3d8691ef03f74aedb6cfd67e53cf664f, type: 3}
   m_Name: ConfigAssets
   m_EditorClassIdentifier: 
-  GameBaitsArr:
-  - name: NAME_50001
-    id: 500001
-    modelPath: baits/worm_01/worm_01
-    group: 0
-    type: 0
-    acceptFish: 
-    weightFishAccept: {x: 0, y: 3}
-    weight: 2.5
-    lenght: 0
-    amount: 1
-    Level: 1
-  - name: NAME_50001
-    id: 500002
-    modelPath: baits/fly/fly
-    group: 0
-    type: 0
-    acceptFish: 
-    weightFishAccept: {x: 0, y: 3}
-    weight: 2.5
-    lenght: 0
-    amount: 1
-    Level: 1
-  - name: NAME_50001
-    id: 500003
-    modelPath: baits/black_leech/black_leech
-    group: 0
-    type: 0
-    acceptFish: 
-    weightFishAccept: {x: 0, y: 3}
-    weight: 2.5
-    lenght: 0
-    amount: 1
-    Level: 1
-  - name: NAME_50001
-    id: 500004
-    modelPath: baits/bread/bread
-    group: 0
-    type: 0
-    acceptFish: 
-    weightFishAccept: {x: 0, y: 3}
-    weight: 2.5
-    lenght: 0
-    amount: 1
-    Level: 1
-  GameFeedersArr:
-  - name: NAME_90001
-    id: 900001
-    modelPath: Feeders/Feeder 1/FeedTrash 1
-    group: 0
-    type: 0
-    weight: 5
-    capacity: 100
-    Level: 1
-    amount: 1
-  GameFishAcceptsArr:
-  - name: 
-    id: 2100001
-    bait: 500189
-    min: 0.3
-    max: 26
-  - name: 
-    id: 2100001
-    bait: 500135
-    min: 0.3
-    max: 25
-  GameFishArr:
-  - name: NAME_900001
-    id: 210001
-    speciesName: 10
-    isEnabled: 1
-    type: 0
-    maxWeight: 34
-    speciesCoins: 4
-    rankingPoint: 1
-    modelPath:
-    - Burbot_B
-    imagePath: []
-    modelTrophyPath: []
-    weightLenghtValues: []
-    weightLengthCurve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    acceptFishBaits: []
-    acceptFishLures: []
-  - name: NAME_900002
-    id: 210002
-    speciesName: 11
-    isEnabled: 1
-    type: 0
-    maxWeight: 40
-    speciesCoins: 4
-    rankingPoint: 1
-    modelPath:
-    - CarpCommon_B
-    imagePath: []
-    modelTrophyPath: []
-    weightLenghtValues: []
-    weightLengthCurve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    acceptFishBaits: []
-    acceptFishLures: []
-  - name: NAME_900003
-    id: 210003
-    speciesName: 14
-    isEnabled: 1
-    type: 0
-    maxWeight: 45
-    speciesCoins: 4
-    rankingPoint: 1
-    modelPath:
-    - CarpGrass_B
-    imagePath: []
-    modelTrophyPath: []
-    weightLenghtValues: []
-    weightLengthCurve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    acceptFishBaits: []
-    acceptFishLures: []
-  - name: NAME_900004
-    id: 210004
-    speciesName: 16
-    isEnabled: 1
-    type: 0
-    maxWeight: 3
-    speciesCoins: 4
-    rankingPoint: 1
-    modelPath:
-    - CarpCrucian_B
-    imagePath: []
-    modelTrophyPath: []
-    weightLenghtValues: []
-    weightLengthCurve:
-      serializedVersion: 2
-      m_Curve: []
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    acceptFishBaits: []
-    acceptFishLures: []
-  GameFloatsArr:
-  - name: NAME_30001
-    id: 300001
-    modelPath: bobbers/expressfishing/bob_25003/bob_25003
-    group: 0
-    type: 2
-    weight: 0.5
-    displacement: 3
-    isNightLight: 0
-    Level: 1
-    amount: 1
-  - name: NAME_30002
-    id: 300002
-    modelPath: bobbers/expressfishing/bob_25162_25163/bob_25162
-    group: 0
-    type: 0
-    weight: 0.8
-    displacement: 3
-    isNightLight: 0
-    Level: 1
-    amount: 1
-  - name: NAME_30003
-    id: 300003
-    modelPath: bobbers/expressfishing/bob_25166_25167/bob_25166
-    group: 0
-    type: 0
-    weight: 0.8
-    displacement: 3
-    isNightLight: 0
-    Level: 1
-    amount: 1
-  - name: NAME_30003
-    id: 300004
-    modelPath: bobbers/expressfishing/bob_25001/bob_25001
-    group: 0
-    type: 0
-    weight: 0.8
-    displacement: 3
-    isNightLight: 0
-    Level: 1
-    amount: 1
-  GameHooksArr:
-  - name: HOOK_NAME_70001
-    id: 700001
-    modelPath: hooks/alliance/c_hook_20789_20794/c_hook_20789
-    group: 0
-    color: Nickel
-    type: 1
-    zadzior: 1
-    size: 1
-    amount: 1
-    Level: 1
-  - name: HOOK_NAME_71001
-    id: 700102
-    modelPath: hooks/berserk_hooks/triple_20569_20577/triple_20569
-    group: 0
-    color: Nickel
-    type: 1
-    zadzior: 1
-    size: 1
-    amount: 1
-    Level: 1
-  GameLeadersArr:
-  - name: "UFA\xA9 Leader 0.14/3kg"
-    id: 0
-    modelPath: Leaders/Leader 2/
-    group: 0
-    type: 0
-    strength: 2.5
-    size: 0.15
-    Level: 1
-    amount: 1
-  - name: "UFA\xA9 Leader 0.18/4kg"
-    id: 1
-    modelPath: Leaders/Leader 3/
-    group: 0
-    type: 2
-    strength: 5
-    size: 0.18
-    Level: 4
-    amount: 1
-  - name: "UFA\xA9 Leader 0.2/10kg"
-    id: 2
-    modelPath: Leaders/Leader 1/
-    group: 0
-    type: 0
-    strength: 8
-    size: 0.2
-    Level: 7
-    amount: 1
-  GameLinesArr:
-  - name: NAME_40001
-    id: 400001
-    modelPath: Lines/UFE Mono/UFE monoClear
-    group: 0
-    type: 0
-    length: 75
-    strength: 1.51
-    size: 0.12
-    Level: 1
-  - name: NAME_40002
-    id: 400002
-    modelPath: Lines/UFE Mono/UFE monoClear
-    group: 0
-    type: 0
-    length: 75
-    strength: 2.51
-    size: 0.16
-    Level: 1
-  GameLuresArr:
-  - name: NAME_60001
-    id: 600001
-    modelPath: lures/express_fishing/crankbaits_1/775/crankbaits_775
-    group: 0
-    type: 0
-    acceptFish: 
-    weightFishAccept: {x: 0, y: 3}
-    weight: 5.3
-    lenght: 80
-    amount: 0
-    Level: 1
-    hook: c6ae0a00
-  - name: NAME_60001
-    id: 600002
-    modelPath: lures/express_fishing/poppers_1/poppers_590/poppers_590
-    group: 0
-    type: 0
-    acceptFish: 
-    weightFishAccept: {x: 0, y: 3}
-    weight: 5.3
-    lenght: 80
-    amount: 0
-    Level: 1
-    hook: c6ae0a00
-  - name: NAME_60001
-    id: 600003
-    modelPath: lures/express_fishing/softplastic/ef_supergrab_6/softplastic_g_1622
-    group: 0
-    type: 0
-    acceptFish: 
-    weightFishAccept: {x: 0, y: 3}
-    weight: 5.3
-    lenght: 80
-    amount: 0
-    Level: 1
-    hook: 
-  - name: NAME_60001
-    id: 600004
-    modelPath: lures/express_fishing/softplastic/ef_superminnow_6/softplastic_m_1634
-    group: 0
-    type: 0
-    acceptFish: 
-    weightFishAccept: {x: 0, y: 3}
-    weight: 5.3
-    lenght: 80
-    amount: 0
-    Level: 1
-    hook: 
-  GameReelsArr:
-  - name: NAME_20001
-    id: 200001
-    modelPath: reels/syberia/spin_5002/spin_5002
-    group: 0
-    type: 0
-    strength: 3
-    gearRatio: {x: 6.2, y: 1}
-    size: 2000
-    Level: 1
-  - name: NAME_20002
-    id: 200002
-    modelPath: reels/syberia/spin_5036/spin_5036
-    group: 0
-    type: 0
-    strength: 4.5
-    gearRatio: {x: 6.2, y: 1}
-    size: 2000
-    Level: 1
-  GameRingsArr:
-  - name: NAME_110001
-    id: 1100001
-    modelPath: rod_rings/rumoi/rumoi_oxiline_spin
-    group: 0
-  - name: NAME_110002
-    id: 1100002
-    modelPath: rod_rings/smt/smt_pure_ceramic_bolo
-    group: 0
-  GameRodsArr:
-  - name: NAME_10001
-    id: 100001
-    modelPath: rods/syberia/tele_10037/tele_10037_t13
-    group: 0
-    type: 1
-    length: 3,7
-    weight: 250
-    strength: 40.82
-    maxRange: 67
-    ring: 0
-  - name: NAME_10002
-    id: 100002
-    modelPath: rods/syberia/bolo_10021/bolo_10021_LB400
-    group: 0
-    type: 0
-    length: 2,5
-    weight: 120
-    strength: 1.59
-    maxRange: 30
-    ring: 1100002
-  - name: NAME_10003
-    id: 100003
-    modelPath: rods/syberia/spin_10034/spin_10034_S60H
-    group: 0
-    type: 0
-    length: 2,5
-    weight: 120
-    strength: 1.59
-    maxRange: 30
-    ring: 1100001
-  GameWeightsArr:
-  - name: NAME_80001
-    id: 800001
-    modelPath: Weights/Weight2_5g
-    group: 0
-    type: 0
-    weight: 3
-    Level: 1
-    amount: 1
diff --git a/Assets/Scripts/Configs/Gen.meta b/Assets/Scripts/Configs/Gen.meta
index fc407a550..0dc52f34e 100644
--- a/Assets/Scripts/Configs/Gen.meta
+++ b/Assets/Scripts/Configs/Gen.meta
@@ -1,3 +1,3 @@
 fileFormatVersion: 2
-guid: cdd407e78a9044de9d73e25de68285ba
-timeCreated: 1742999805
\ No newline at end of file
+guid: 0eceaba126fb407583191d01e32bb735
+timeCreated: 1756050728
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/ConfigAssets.Gen.cs b/Assets/Scripts/Configs/Gen/ConfigAssets.Gen.cs
index 3b436ebd2..63afd189c 100644
--- a/Assets/Scripts/Configs/Gen/ConfigAssets.Gen.cs
+++ b/Assets/Scripts/Configs/Gen/ConfigAssets.Gen.cs
@@ -10,106 +10,113 @@ namespace NBF
 {
 	public partial class ConfigAssets
 	{
-		public List<GameBaits> GameBaitsArr;
-		public List<GameFeeders> GameFeedersArr;
-		public List<GameFishAccepts> GameFishAcceptsArr;
-		public List<GameFish> GameFishArr;
-		public List<GameFloats> GameFloatsArr;
-		public List<GameHooks> GameHooksArr;
-		public List<GameLeaders> GameLeadersArr;
-		public List<GameLines> GameLinesArr;
-		public List<GameLures> GameLuresArr;
-		public List<GameReels> GameReelsArr;
-		public List<GameRings> GameRingsArr;
-		public List<GameRods> GameRodsArr;
-		public List<GameWeights> GameWeightsArr;
+		public List<BaitConfig> BaitConfigArr;
+		public List<BobberConfig> BobberConfigArr;
+		public List<FeederConfig> FeederConfigArr;
+		public List<FishAcceptConfig> FishAcceptConfigArr;
+		public List<FishConfig> FishConfigArr;
+		public List<HookConfig> HookConfigArr;
+		public List<LeadersConfig> LeadersConfigArr;
+		public List<LineConfig> LineConfigArr;
+		public List<LureConfig> LureConfigArr;
+		public List<ReelConfig> ReelConfigArr;
+		public List<RingConfig> RingConfigArr;
+		public List<RodConfig> RodConfigArr;
+		public List<UnitConfig> UnitConfigArr;
+		public List<WeightConfig> WeightConfigArr;
 
 		public void Parse(JToken[] arr, Type type)
 		{
 			var tableNameAttribute = type.GetCustomAttribute<TableNameAttribute>();
 			if (tableNameAttribute == null) return;
-			if (type == typeof(GameBaits))
+			if (type == typeof(BaitConfig))
 			{
-				GameBaitsArr = ParseLine<GameBaits>(arr, tableNameAttribute);
+				BaitConfigArr = ParseLine<BaitConfig>(arr, tableNameAttribute);
 			}
 
-			if (type == typeof(GameFeeders))
+			if (type == typeof(BobberConfig))
 			{
-				GameFeedersArr = ParseLine<GameFeeders>(arr, tableNameAttribute);
+				BobberConfigArr = ParseLine<BobberConfig>(arr, tableNameAttribute);
 			}
 
-			if (type == typeof(GameFishAccepts))
+			if (type == typeof(FeederConfig))
 			{
-				GameFishAcceptsArr = ParseLine<GameFishAccepts>(arr, tableNameAttribute);
+				FeederConfigArr = ParseLine<FeederConfig>(arr, tableNameAttribute);
 			}
 
-			if (type == typeof(GameFish))
+			if (type == typeof(FishAcceptConfig))
 			{
-				GameFishArr = ParseLine<GameFish>(arr, tableNameAttribute);
+				FishAcceptConfigArr = ParseLine<FishAcceptConfig>(arr, tableNameAttribute);
 			}
 
-			if (type == typeof(GameFloats))
+			if (type == typeof(FishConfig))
 			{
-				GameFloatsArr = ParseLine<GameFloats>(arr, tableNameAttribute);
+				FishConfigArr = ParseLine<FishConfig>(arr, tableNameAttribute);
 			}
 
-			if (type == typeof(GameHooks))
+			if (type == typeof(HookConfig))
 			{
-				GameHooksArr = ParseLine<GameHooks>(arr, tableNameAttribute);
+				HookConfigArr = ParseLine<HookConfig>(arr, tableNameAttribute);
 			}
 
-			if (type == typeof(GameLeaders))
+			if (type == typeof(LeadersConfig))
 			{
-				GameLeadersArr = ParseLine<GameLeaders>(arr, tableNameAttribute);
+				LeadersConfigArr = ParseLine<LeadersConfig>(arr, tableNameAttribute);
 			}
 
-			if (type == typeof(GameLines))
+			if (type == typeof(LineConfig))
 			{
-				GameLinesArr = ParseLine<GameLines>(arr, tableNameAttribute);
+				LineConfigArr = ParseLine<LineConfig>(arr, tableNameAttribute);
 			}
 
-			if (type == typeof(GameLures))
+			if (type == typeof(LureConfig))
 			{
-				GameLuresArr = ParseLine<GameLures>(arr, tableNameAttribute);
+				LureConfigArr = ParseLine<LureConfig>(arr, tableNameAttribute);
 			}
 
-			if (type == typeof(GameReels))
+			if (type == typeof(ReelConfig))
 			{
-				GameReelsArr = ParseLine<GameReels>(arr, tableNameAttribute);
+				ReelConfigArr = ParseLine<ReelConfig>(arr, tableNameAttribute);
 			}
 
-			if (type == typeof(GameRings))
+			if (type == typeof(RingConfig))
 			{
-				GameRingsArr = ParseLine<GameRings>(arr, tableNameAttribute);
+				RingConfigArr = ParseLine<RingConfig>(arr, tableNameAttribute);
 			}
 
-			if (type == typeof(GameRods))
+			if (type == typeof(RodConfig))
 			{
-				GameRodsArr = ParseLine<GameRods>(arr, tableNameAttribute);
+				RodConfigArr = ParseLine<RodConfig>(arr, tableNameAttribute);
 			}
 
-			if (type == typeof(GameWeights))
+			if (type == typeof(UnitConfig))
 			{
-				GameWeightsArr = ParseLine<GameWeights>(arr, tableNameAttribute);
+				UnitConfigArr = ParseLine<UnitConfig>(arr, tableNameAttribute);
+			}
+
+			if (type == typeof(WeightConfig))
+			{
+				WeightConfigArr = ParseLine<WeightConfig>(arr, tableNameAttribute);
 			}
 
 		}
 
 		public void AssociationContexts()
 		{
-			new ConfigContext<GameBaits>().Association(GameBaitsArr);
-			new ConfigContext<GameFeeders>().Association(GameFeedersArr);
-			new ConfigContext<GameFishAccepts>().Association(GameFishAcceptsArr);
-			new ConfigContext<GameFish>().Association(GameFishArr);
-			new ConfigContext<GameFloats>().Association(GameFloatsArr);
-			new ConfigContext<GameHooks>().Association(GameHooksArr);
-			new ConfigContext<GameLeaders>().Association(GameLeadersArr);
-			new ConfigContext<GameLines>().Association(GameLinesArr);
-			new ConfigContext<GameLures>().Association(GameLuresArr);
-			new ConfigContext<GameReels>().Association(GameReelsArr);
-			new ConfigContext<GameRings>().Association(GameRingsArr);
-			new ConfigContext<GameRods>().Association(GameRodsArr);
-			new ConfigContext<GameWeights>().Association(GameWeightsArr);
+			new ConfigContext<BaitConfig>().Association(BaitConfigArr);
+			new ConfigContext<BobberConfig>().Association(BobberConfigArr);
+			new ConfigContext<FeederConfig>().Association(FeederConfigArr);
+			new ConfigContext<FishAcceptConfig>().Association(FishAcceptConfigArr);
+			new ConfigContext<FishConfig>().Association(FishConfigArr);
+			new ConfigContext<HookConfig>().Association(HookConfigArr);
+			new ConfigContext<LeadersConfig>().Association(LeadersConfigArr);
+			new ConfigContext<LineConfig>().Association(LineConfigArr);
+			new ConfigContext<LureConfig>().Association(LureConfigArr);
+			new ConfigContext<ReelConfig>().Association(ReelConfigArr);
+			new ConfigContext<RingConfig>().Association(RingConfigArr);
+			new ConfigContext<RodConfig>().Association(RodConfigArr);
+			new ConfigContext<UnitConfig>().Association(UnitConfigArr);
+			new ConfigContext<WeightConfig>().Association(WeightConfigArr);
 		}
 	}
 }
diff --git a/Assets/Scripts/Configs/Gen/ConfigAssets.Gen.cs.meta b/Assets/Scripts/Configs/Gen/ConfigAssets.Gen.cs.meta
index eb5f30808..ed730e0fd 100644
--- a/Assets/Scripts/Configs/Gen/ConfigAssets.Gen.cs.meta
+++ b/Assets/Scripts/Configs/Gen/ConfigAssets.Gen.cs.meta
@@ -1,3 +1,2 @@
 fileFormatVersion: 2
-guid: bd9bbc8f86e64a928533f493e39813ed
-timeCreated: 1742999819
\ No newline at end of file
+guid: bd9bbc8f86e64a928533f493e39813ed
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps.meta b/Assets/Scripts/Configs/Gen/Warps.meta
index d7e11fe0b..15944082b 100644
--- a/Assets/Scripts/Configs/Gen/Warps.meta
+++ b/Assets/Scripts/Configs/Gen/Warps.meta
@@ -1,3 +1,3 @@
 fileFormatVersion: 2
-guid: fd8931b9ac4c462b9e85fa625e300cee
-timeCreated: 1743000570
\ No newline at end of file
+guid: 98e70a75b52b4728aec1e5b7f506695c
+timeCreated: 1756050753
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameFloatsWarp.cs b/Assets/Scripts/Configs/Gen/Warps/BaitConfigWarp.cs
similarity index 54%
rename from Assets/Scripts/Configs/Gen/Warps/GameFloatsWarp.cs
rename to Assets/Scripts/Configs/Gen/Warps/BaitConfigWarp.cs
index 68a79b4c2..78fbf6fbf 100644
--- a/Assets/Scripts/Configs/Gen/Warps/GameFloatsWarp.cs
+++ b/Assets/Scripts/Configs/Gen/Warps/BaitConfigWarp.cs
@@ -5,38 +5,38 @@ using System.Collections.Generic;
 namespace NBF
 {
     [Serializable]
-    public partial class GameFloats
+    public partial class BaitConfig
     {
-        private static ConfigContext<GameFloats> _context;
+        private static ConfigContext<BaitConfig> _context;
 
-        private static ConfigContext<GameFloats> Context => _context ??= Configs.Table<GameFloats>();
+        private static ConfigContext<BaitConfig> Context => _context ??= Configs.Table<BaitConfig>();
 
-        public static GameFloats Get(int key)
+        public static BaitConfig Get(int key)
         {
             return Context.Get(key);
         }
 
-        public static GameFloats Get(Predicate<GameFloats> match)
+        public static BaitConfig Get(Predicate<BaitConfig> match)
         {
             return Context.Get(match);
         }
         
-        public static GameFloats Fist()
+        public static BaitConfig Fist()
         {
             return Context.Fist();
         }
 
-        public static GameFloats Last()
+        public static BaitConfig Last()
         {
             return Context.Last();
         }
 
-        public static GameFloats Fist(Predicate<GameFloats> match)
+        public static BaitConfig Fist(Predicate<BaitConfig> match)
         {
             return Context.Fist(match);
         }
 
-        public static GameFloats Last(Predicate<GameFloats> match)
+        public static BaitConfig Last(Predicate<BaitConfig> match)
         {
             return Context.Last(match);
         }
@@ -46,18 +46,18 @@ namespace NBF
             return Context.Count();
         }
 
-        public static int Count(Func<GameFloats, bool> predicate)
+        public static int Count(Func<BaitConfig, bool> predicate)
         {
             return Context.Count(predicate);
         }
 
 
-        public static List<GameFloats> GetList()
+        public static List<BaitConfig> GetList()
         {
             return Context.GetList();
         }
 
-        public static List<GameFloats> GetList(Predicate<GameFloats> match)
+        public static List<BaitConfig> GetList(Predicate<BaitConfig> match)
         {
             return Context.GetList(match);
         }
diff --git a/Assets/Scripts/Configs/Gen/Warps/BaitConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/BaitConfigWarp.cs.meta
new file mode 100644
index 000000000..62c32df08
--- /dev/null
+++ b/Assets/Scripts/Configs/Gen/Warps/BaitConfigWarp.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 5c6bdb0bae4da2a4da6aacaf58a1abc0
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameFeedersWarp.cs b/Assets/Scripts/Configs/Gen/Warps/BobberConfigWarp.cs
similarity index 52%
rename from Assets/Scripts/Configs/Gen/Warps/GameFeedersWarp.cs
rename to Assets/Scripts/Configs/Gen/Warps/BobberConfigWarp.cs
index 1b201760c..b6d3fac39 100644
--- a/Assets/Scripts/Configs/Gen/Warps/GameFeedersWarp.cs
+++ b/Assets/Scripts/Configs/Gen/Warps/BobberConfigWarp.cs
@@ -5,38 +5,38 @@ using System.Collections.Generic;
 namespace NBF
 {
     [Serializable]
-    public partial class GameFeeders
+    public partial class BobberConfig
     {
-        private static ConfigContext<GameFeeders> _context;
+        private static ConfigContext<BobberConfig> _context;
 
-        private static ConfigContext<GameFeeders> Context => _context ??= Configs.Table<GameFeeders>();
+        private static ConfigContext<BobberConfig> Context => _context ??= Configs.Table<BobberConfig>();
 
-        public static GameFeeders Get(int key)
+        public static BobberConfig Get(int key)
         {
             return Context.Get(key);
         }
 
-        public static GameFeeders Get(Predicate<GameFeeders> match)
+        public static BobberConfig Get(Predicate<BobberConfig> match)
         {
             return Context.Get(match);
         }
         
-        public static GameFeeders Fist()
+        public static BobberConfig Fist()
         {
             return Context.Fist();
         }
 
-        public static GameFeeders Last()
+        public static BobberConfig Last()
         {
             return Context.Last();
         }
 
-        public static GameFeeders Fist(Predicate<GameFeeders> match)
+        public static BobberConfig Fist(Predicate<BobberConfig> match)
         {
             return Context.Fist(match);
         }
 
-        public static GameFeeders Last(Predicate<GameFeeders> match)
+        public static BobberConfig Last(Predicate<BobberConfig> match)
         {
             return Context.Last(match);
         }
@@ -46,18 +46,18 @@ namespace NBF
             return Context.Count();
         }
 
-        public static int Count(Func<GameFeeders, bool> predicate)
+        public static int Count(Func<BobberConfig, bool> predicate)
         {
             return Context.Count(predicate);
         }
 
 
-        public static List<GameFeeders> GetList()
+        public static List<BobberConfig> GetList()
         {
             return Context.GetList();
         }
 
-        public static List<GameFeeders> GetList(Predicate<GameFeeders> match)
+        public static List<BobberConfig> GetList(Predicate<BobberConfig> match)
         {
             return Context.GetList(match);
         }
diff --git a/Assets/Scripts/Configs/Gen/Warps/BobberConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/BobberConfigWarp.cs.meta
new file mode 100644
index 000000000..53cac01ed
--- /dev/null
+++ b/Assets/Scripts/Configs/Gen/Warps/BobberConfigWarp.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 99b64c24f2bad454086ac41dd6aa7ffc
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/FeederConfigWarp.cs b/Assets/Scripts/Configs/Gen/Warps/FeederConfigWarp.cs
new file mode 100644
index 000000000..bb2f54b52
--- /dev/null
+++ b/Assets/Scripts/Configs/Gen/Warps/FeederConfigWarp.cs
@@ -0,0 +1,65 @@
+/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/
+using System;
+using System.Collections.Generic;
+
+namespace NBF
+{
+    [Serializable]
+    public partial class FeederConfig
+    {
+        private static ConfigContext<FeederConfig> _context;
+
+        private static ConfigContext<FeederConfig> Context => _context ??= Configs.Table<FeederConfig>();
+
+        public static FeederConfig Get(int key)
+        {
+            return Context.Get(key);
+        }
+
+        public static FeederConfig Get(Predicate<FeederConfig> match)
+        {
+            return Context.Get(match);
+        }
+        
+        public static FeederConfig Fist()
+        {
+            return Context.Fist();
+        }
+
+        public static FeederConfig Last()
+        {
+            return Context.Last();
+        }
+
+        public static FeederConfig Fist(Predicate<FeederConfig> match)
+        {
+            return Context.Fist(match);
+        }
+
+        public static FeederConfig Last(Predicate<FeederConfig> match)
+        {
+            return Context.Last(match);
+        }
+        
+        public static int Count()
+        {
+            return Context.Count();
+        }
+
+        public static int Count(Func<FeederConfig, bool> predicate)
+        {
+            return Context.Count(predicate);
+        }
+
+
+        public static List<FeederConfig> GetList()
+        {
+            return Context.GetList();
+        }
+
+        public static List<FeederConfig> GetList(Predicate<FeederConfig> match)
+        {
+            return Context.GetList(match);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/FeederConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/FeederConfigWarp.cs.meta
new file mode 100644
index 000000000..8bd74b4f9
--- /dev/null
+++ b/Assets/Scripts/Configs/Gen/Warps/FeederConfigWarp.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: dc082eda2a5880148843ce9c21ed4eed
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameLinesWarp.cs b/Assets/Scripts/Configs/Gen/Warps/FishAcceptConfigWarp.cs
similarity index 50%
rename from Assets/Scripts/Configs/Gen/Warps/GameLinesWarp.cs
rename to Assets/Scripts/Configs/Gen/Warps/FishAcceptConfigWarp.cs
index fb3cf2b56..b8081592e 100644
--- a/Assets/Scripts/Configs/Gen/Warps/GameLinesWarp.cs
+++ b/Assets/Scripts/Configs/Gen/Warps/FishAcceptConfigWarp.cs
@@ -5,38 +5,38 @@ using System.Collections.Generic;
 namespace NBF
 {
     [Serializable]
-    public partial class GameLines
+    public partial class FishAcceptConfig
     {
-        private static ConfigContext<GameLines> _context;
+        private static ConfigContext<FishAcceptConfig> _context;
 
-        private static ConfigContext<GameLines> Context => _context ??= Configs.Table<GameLines>();
+        private static ConfigContext<FishAcceptConfig> Context => _context ??= Configs.Table<FishAcceptConfig>();
 
-        public static GameLines Get(int key)
+        public static FishAcceptConfig Get(int key)
         {
             return Context.Get(key);
         }
 
-        public static GameLines Get(Predicate<GameLines> match)
+        public static FishAcceptConfig Get(Predicate<FishAcceptConfig> match)
         {
             return Context.Get(match);
         }
         
-        public static GameLines Fist()
+        public static FishAcceptConfig Fist()
         {
             return Context.Fist();
         }
 
-        public static GameLines Last()
+        public static FishAcceptConfig Last()
         {
             return Context.Last();
         }
 
-        public static GameLines Fist(Predicate<GameLines> match)
+        public static FishAcceptConfig Fist(Predicate<FishAcceptConfig> match)
         {
             return Context.Fist(match);
         }
 
-        public static GameLines Last(Predicate<GameLines> match)
+        public static FishAcceptConfig Last(Predicate<FishAcceptConfig> match)
         {
             return Context.Last(match);
         }
@@ -46,18 +46,18 @@ namespace NBF
             return Context.Count();
         }
 
-        public static int Count(Func<GameLines, bool> predicate)
+        public static int Count(Func<FishAcceptConfig, bool> predicate)
         {
             return Context.Count(predicate);
         }
 
 
-        public static List<GameLines> GetList()
+        public static List<FishAcceptConfig> GetList()
         {
             return Context.GetList();
         }
 
-        public static List<GameLines> GetList(Predicate<GameLines> match)
+        public static List<FishAcceptConfig> GetList(Predicate<FishAcceptConfig> match)
         {
             return Context.GetList(match);
         }
diff --git a/Assets/Scripts/Configs/Gen/Warps/FishAcceptConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/FishAcceptConfigWarp.cs.meta
new file mode 100644
index 000000000..e06497024
--- /dev/null
+++ b/Assets/Scripts/Configs/Gen/Warps/FishAcceptConfigWarp.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 23d45122e487d8f439bf063a4df7a4b7
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameHooksWarp.cs b/Assets/Scripts/Configs/Gen/Warps/FishConfigWarp.cs
similarity index 53%
rename from Assets/Scripts/Configs/Gen/Warps/GameHooksWarp.cs
rename to Assets/Scripts/Configs/Gen/Warps/FishConfigWarp.cs
index e50e1216f..6ea97f0fc 100644
--- a/Assets/Scripts/Configs/Gen/Warps/GameHooksWarp.cs
+++ b/Assets/Scripts/Configs/Gen/Warps/FishConfigWarp.cs
@@ -5,38 +5,38 @@ using System.Collections.Generic;
 namespace NBF
 {
     [Serializable]
-    public partial class GameHooks
+    public partial class FishConfig
     {
-        private static ConfigContext<GameHooks> _context;
+        private static ConfigContext<FishConfig> _context;
 
-        private static ConfigContext<GameHooks> Context => _context ??= Configs.Table<GameHooks>();
+        private static ConfigContext<FishConfig> Context => _context ??= Configs.Table<FishConfig>();
 
-        public static GameHooks Get(int key)
+        public static FishConfig Get(int key)
         {
             return Context.Get(key);
         }
 
-        public static GameHooks Get(Predicate<GameHooks> match)
+        public static FishConfig Get(Predicate<FishConfig> match)
         {
             return Context.Get(match);
         }
         
-        public static GameHooks Fist()
+        public static FishConfig Fist()
         {
             return Context.Fist();
         }
 
-        public static GameHooks Last()
+        public static FishConfig Last()
         {
             return Context.Last();
         }
 
-        public static GameHooks Fist(Predicate<GameHooks> match)
+        public static FishConfig Fist(Predicate<FishConfig> match)
         {
             return Context.Fist(match);
         }
 
-        public static GameHooks Last(Predicate<GameHooks> match)
+        public static FishConfig Last(Predicate<FishConfig> match)
         {
             return Context.Last(match);
         }
@@ -46,18 +46,18 @@ namespace NBF
             return Context.Count();
         }
 
-        public static int Count(Func<GameHooks, bool> predicate)
+        public static int Count(Func<FishConfig, bool> predicate)
         {
             return Context.Count(predicate);
         }
 
 
-        public static List<GameHooks> GetList()
+        public static List<FishConfig> GetList()
         {
             return Context.GetList();
         }
 
-        public static List<GameHooks> GetList(Predicate<GameHooks> match)
+        public static List<FishConfig> GetList(Predicate<FishConfig> match)
         {
             return Context.GetList(match);
         }
diff --git a/Assets/Scripts/Configs/Gen/Warps/FishConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/FishConfigWarp.cs.meta
new file mode 100644
index 000000000..81486f4f3
--- /dev/null
+++ b/Assets/Scripts/Configs/Gen/Warps/FishConfigWarp.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: d60d97e94b1432c4e985a5469fd01409
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameBaitsWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameBaitsWarp.cs.meta
deleted file mode 100644
index 60c0c7052..000000000
--- a/Assets/Scripts/Configs/Gen/Warps/GameBaitsWarp.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 4fd681fc90fb5f2409c0fc68207c77d4
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameFeedersWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameFeedersWarp.cs.meta
deleted file mode 100644
index 1a8e5576d..000000000
--- a/Assets/Scripts/Configs/Gen/Warps/GameFeedersWarp.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 77a5cad97b10e4447afb56f513908506
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameFishAcceptsWarp.cs b/Assets/Scripts/Configs/Gen/Warps/GameFishAcceptsWarp.cs
deleted file mode 100644
index e7ca2cb9b..000000000
--- a/Assets/Scripts/Configs/Gen/Warps/GameFishAcceptsWarp.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/
-using System;
-using System.Collections.Generic;
-
-namespace NBF
-{
-    [Serializable]
-    public partial class GameFishAccepts
-    {
-        private static ConfigContext<GameFishAccepts> _context;
-
-        private static ConfigContext<GameFishAccepts> Context => _context ??= Configs.Table<GameFishAccepts>();
-
-        public static GameFishAccepts Get(int key)
-        {
-            return Context.Get(key);
-        }
-
-        public static GameFishAccepts Get(Predicate<GameFishAccepts> match)
-        {
-            return Context.Get(match);
-        }
-        
-        public static GameFishAccepts Fist()
-        {
-            return Context.Fist();
-        }
-
-        public static GameFishAccepts Last()
-        {
-            return Context.Last();
-        }
-
-        public static GameFishAccepts Fist(Predicate<GameFishAccepts> match)
-        {
-            return Context.Fist(match);
-        }
-
-        public static GameFishAccepts Last(Predicate<GameFishAccepts> match)
-        {
-            return Context.Last(match);
-        }
-        
-        public static int Count()
-        {
-            return Context.Count();
-        }
-
-        public static int Count(Func<GameFishAccepts, bool> predicate)
-        {
-            return Context.Count(predicate);
-        }
-
-
-        public static List<GameFishAccepts> GetList()
-        {
-            return Context.GetList();
-        }
-
-        public static List<GameFishAccepts> GetList(Predicate<GameFishAccepts> match)
-        {
-            return Context.GetList(match);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameFishAcceptsWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameFishAcceptsWarp.cs.meta
deleted file mode 100644
index e76b874cb..000000000
--- a/Assets/Scripts/Configs/Gen/Warps/GameFishAcceptsWarp.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 57149d0eff60b15489ba1edc669fca38
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameFishWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameFishWarp.cs.meta
deleted file mode 100644
index 5fa866fd5..000000000
--- a/Assets/Scripts/Configs/Gen/Warps/GameFishWarp.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: ed51b5aea87f3364e8aa7eaca4e89348
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameFloatsWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameFloatsWarp.cs.meta
deleted file mode 100644
index fe3b805fe..000000000
--- a/Assets/Scripts/Configs/Gen/Warps/GameFloatsWarp.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: cb2e64d338bf02543aad65973e43b011
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameHooksWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameHooksWarp.cs.meta
deleted file mode 100644
index 3faf8a506..000000000
--- a/Assets/Scripts/Configs/Gen/Warps/GameHooksWarp.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 0defd614f8bdb5043868fb08e64c94c6
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameLeadersWarp.cs b/Assets/Scripts/Configs/Gen/Warps/GameLeadersWarp.cs
deleted file mode 100644
index e970333d8..000000000
--- a/Assets/Scripts/Configs/Gen/Warps/GameLeadersWarp.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/
-using System;
-using System.Collections.Generic;
-
-namespace NBF
-{
-    [Serializable]
-    public partial class GameLeaders
-    {
-        private static ConfigContext<GameLeaders> _context;
-
-        private static ConfigContext<GameLeaders> Context => _context ??= Configs.Table<GameLeaders>();
-
-        public static GameLeaders Get(int key)
-        {
-            return Context.Get(key);
-        }
-
-        public static GameLeaders Get(Predicate<GameLeaders> match)
-        {
-            return Context.Get(match);
-        }
-        
-        public static GameLeaders Fist()
-        {
-            return Context.Fist();
-        }
-
-        public static GameLeaders Last()
-        {
-            return Context.Last();
-        }
-
-        public static GameLeaders Fist(Predicate<GameLeaders> match)
-        {
-            return Context.Fist(match);
-        }
-
-        public static GameLeaders Last(Predicate<GameLeaders> match)
-        {
-            return Context.Last(match);
-        }
-        
-        public static int Count()
-        {
-            return Context.Count();
-        }
-
-        public static int Count(Func<GameLeaders, bool> predicate)
-        {
-            return Context.Count(predicate);
-        }
-
-
-        public static List<GameLeaders> GetList()
-        {
-            return Context.GetList();
-        }
-
-        public static List<GameLeaders> GetList(Predicate<GameLeaders> match)
-        {
-            return Context.GetList(match);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameLeadersWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameLeadersWarp.cs.meta
deleted file mode 100644
index ce5219a6d..000000000
--- a/Assets/Scripts/Configs/Gen/Warps/GameLeadersWarp.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: de88b2f351313f74c8889a63265bc4ec
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameLinesWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameLinesWarp.cs.meta
deleted file mode 100644
index 4314b6627..000000000
--- a/Assets/Scripts/Configs/Gen/Warps/GameLinesWarp.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 386a66a581fb2894481a8f43d1d086c8
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameLuresWarp.cs b/Assets/Scripts/Configs/Gen/Warps/GameLuresWarp.cs
deleted file mode 100644
index 4fea33aff..000000000
--- a/Assets/Scripts/Configs/Gen/Warps/GameLuresWarp.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/
-using System;
-using System.Collections.Generic;
-
-namespace NBF
-{
-    [Serializable]
-    public partial class GameLures
-    {
-        private static ConfigContext<GameLures> _context;
-
-        private static ConfigContext<GameLures> Context => _context ??= Configs.Table<GameLures>();
-
-        public static GameLures Get(int key)
-        {
-            return Context.Get(key);
-        }
-
-        public static GameLures Get(Predicate<GameLures> match)
-        {
-            return Context.Get(match);
-        }
-        
-        public static GameLures Fist()
-        {
-            return Context.Fist();
-        }
-
-        public static GameLures Last()
-        {
-            return Context.Last();
-        }
-
-        public static GameLures Fist(Predicate<GameLures> match)
-        {
-            return Context.Fist(match);
-        }
-
-        public static GameLures Last(Predicate<GameLures> match)
-        {
-            return Context.Last(match);
-        }
-        
-        public static int Count()
-        {
-            return Context.Count();
-        }
-
-        public static int Count(Func<GameLures, bool> predicate)
-        {
-            return Context.Count(predicate);
-        }
-
-
-        public static List<GameLures> GetList()
-        {
-            return Context.GetList();
-        }
-
-        public static List<GameLures> GetList(Predicate<GameLures> match)
-        {
-            return Context.GetList(match);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameLuresWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameLuresWarp.cs.meta
deleted file mode 100644
index 8e02ba816..000000000
--- a/Assets/Scripts/Configs/Gen/Warps/GameLuresWarp.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 8cbbbb9861ce4c849a25d434c578a716
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameReelsWarp.cs b/Assets/Scripts/Configs/Gen/Warps/GameReelsWarp.cs
deleted file mode 100644
index 08d27e2dc..000000000
--- a/Assets/Scripts/Configs/Gen/Warps/GameReelsWarp.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/
-using System;
-using System.Collections.Generic;
-
-namespace NBF
-{
-    [Serializable]
-    public partial class GameReels
-    {
-        private static ConfigContext<GameReels> _context;
-
-        private static ConfigContext<GameReels> Context => _context ??= Configs.Table<GameReels>();
-
-        public static GameReels Get(int key)
-        {
-            return Context.Get(key);
-        }
-
-        public static GameReels Get(Predicate<GameReels> match)
-        {
-            return Context.Get(match);
-        }
-        
-        public static GameReels Fist()
-        {
-            return Context.Fist();
-        }
-
-        public static GameReels Last()
-        {
-            return Context.Last();
-        }
-
-        public static GameReels Fist(Predicate<GameReels> match)
-        {
-            return Context.Fist(match);
-        }
-
-        public static GameReels Last(Predicate<GameReels> match)
-        {
-            return Context.Last(match);
-        }
-        
-        public static int Count()
-        {
-            return Context.Count();
-        }
-
-        public static int Count(Func<GameReels, bool> predicate)
-        {
-            return Context.Count(predicate);
-        }
-
-
-        public static List<GameReels> GetList()
-        {
-            return Context.GetList();
-        }
-
-        public static List<GameReels> GetList(Predicate<GameReels> match)
-        {
-            return Context.GetList(match);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameReelsWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameReelsWarp.cs.meta
deleted file mode 100644
index 933234057..000000000
--- a/Assets/Scripts/Configs/Gen/Warps/GameReelsWarp.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: e08ef6d5f3b5f0049bc67ced9737c43e
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameRingsWarp.cs b/Assets/Scripts/Configs/Gen/Warps/GameRingsWarp.cs
deleted file mode 100644
index 708ec6af5..000000000
--- a/Assets/Scripts/Configs/Gen/Warps/GameRingsWarp.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/
-using System;
-using System.Collections.Generic;
-
-namespace NBF
-{
-    [Serializable]
-    public partial class GameRings
-    {
-        private static ConfigContext<GameRings> _context;
-
-        private static ConfigContext<GameRings> Context => _context ??= Configs.Table<GameRings>();
-
-        public static GameRings Get(int key)
-        {
-            return Context.Get(key);
-        }
-
-        public static GameRings Get(Predicate<GameRings> match)
-        {
-            return Context.Get(match);
-        }
-        
-        public static GameRings Fist()
-        {
-            return Context.Fist();
-        }
-
-        public static GameRings Last()
-        {
-            return Context.Last();
-        }
-
-        public static GameRings Fist(Predicate<GameRings> match)
-        {
-            return Context.Fist(match);
-        }
-
-        public static GameRings Last(Predicate<GameRings> match)
-        {
-            return Context.Last(match);
-        }
-        
-        public static int Count()
-        {
-            return Context.Count();
-        }
-
-        public static int Count(Func<GameRings, bool> predicate)
-        {
-            return Context.Count(predicate);
-        }
-
-
-        public static List<GameRings> GetList()
-        {
-            return Context.GetList();
-        }
-
-        public static List<GameRings> GetList(Predicate<GameRings> match)
-        {
-            return Context.GetList(match);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameRingsWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameRingsWarp.cs.meta
deleted file mode 100644
index 5e92911c2..000000000
--- a/Assets/Scripts/Configs/Gen/Warps/GameRingsWarp.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 848422be852cc5c498683477a97bf52c
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameRodsWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameRodsWarp.cs.meta
deleted file mode 100644
index 918635c4b..000000000
--- a/Assets/Scripts/Configs/Gen/Warps/GameRodsWarp.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: 9eb1fcd4c3c31e645b093a6e7bdf6f1d
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameWeightsWarp.cs b/Assets/Scripts/Configs/Gen/Warps/GameWeightsWarp.cs
deleted file mode 100644
index 1bab0e147..000000000
--- a/Assets/Scripts/Configs/Gen/Warps/GameWeightsWarp.cs
+++ /dev/null
@@ -1,65 +0,0 @@
-/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/
-using System;
-using System.Collections.Generic;
-
-namespace NBF
-{
-    [Serializable]
-    public partial class GameWeights
-    {
-        private static ConfigContext<GameWeights> _context;
-
-        private static ConfigContext<GameWeights> Context => _context ??= Configs.Table<GameWeights>();
-
-        public static GameWeights Get(int key)
-        {
-            return Context.Get(key);
-        }
-
-        public static GameWeights Get(Predicate<GameWeights> match)
-        {
-            return Context.Get(match);
-        }
-        
-        public static GameWeights Fist()
-        {
-            return Context.Fist();
-        }
-
-        public static GameWeights Last()
-        {
-            return Context.Last();
-        }
-
-        public static GameWeights Fist(Predicate<GameWeights> match)
-        {
-            return Context.Fist(match);
-        }
-
-        public static GameWeights Last(Predicate<GameWeights> match)
-        {
-            return Context.Last(match);
-        }
-        
-        public static int Count()
-        {
-            return Context.Count();
-        }
-
-        public static int Count(Func<GameWeights, bool> predicate)
-        {
-            return Context.Count(predicate);
-        }
-
-
-        public static List<GameWeights> GetList()
-        {
-            return Context.GetList();
-        }
-
-        public static List<GameWeights> GetList(Predicate<GameWeights> match)
-        {
-            return Context.GetList(match);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameWeightsWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/GameWeightsWarp.cs.meta
deleted file mode 100644
index c12b08e1e..000000000
--- a/Assets/Scripts/Configs/Gen/Warps/GameWeightsWarp.cs.meta
+++ /dev/null
@@ -1,2 +0,0 @@
-fileFormatVersion: 2
-guid: db1dedf7e1b7a894b8800575e45e0b8b
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameFishWarp.cs b/Assets/Scripts/Configs/Gen/Warps/HookConfigWarp.cs
similarity index 53%
rename from Assets/Scripts/Configs/Gen/Warps/GameFishWarp.cs
rename to Assets/Scripts/Configs/Gen/Warps/HookConfigWarp.cs
index 40d11d089..c03d22af3 100644
--- a/Assets/Scripts/Configs/Gen/Warps/GameFishWarp.cs
+++ b/Assets/Scripts/Configs/Gen/Warps/HookConfigWarp.cs
@@ -5,38 +5,38 @@ using System.Collections.Generic;
 namespace NBF
 {
     [Serializable]
-    public partial class GameFish
+    public partial class HookConfig
     {
-        private static ConfigContext<GameFish> _context;
+        private static ConfigContext<HookConfig> _context;
 
-        private static ConfigContext<GameFish> Context => _context ??= Configs.Table<GameFish>();
+        private static ConfigContext<HookConfig> Context => _context ??= Configs.Table<HookConfig>();
 
-        public static GameFish Get(int key)
+        public static HookConfig Get(int key)
         {
             return Context.Get(key);
         }
 
-        public static GameFish Get(Predicate<GameFish> match)
+        public static HookConfig Get(Predicate<HookConfig> match)
         {
             return Context.Get(match);
         }
         
-        public static GameFish Fist()
+        public static HookConfig Fist()
         {
             return Context.Fist();
         }
 
-        public static GameFish Last()
+        public static HookConfig Last()
         {
             return Context.Last();
         }
 
-        public static GameFish Fist(Predicate<GameFish> match)
+        public static HookConfig Fist(Predicate<HookConfig> match)
         {
             return Context.Fist(match);
         }
 
-        public static GameFish Last(Predicate<GameFish> match)
+        public static HookConfig Last(Predicate<HookConfig> match)
         {
             return Context.Last(match);
         }
@@ -46,18 +46,18 @@ namespace NBF
             return Context.Count();
         }
 
-        public static int Count(Func<GameFish, bool> predicate)
+        public static int Count(Func<HookConfig, bool> predicate)
         {
             return Context.Count(predicate);
         }
 
 
-        public static List<GameFish> GetList()
+        public static List<HookConfig> GetList()
         {
             return Context.GetList();
         }
 
-        public static List<GameFish> GetList(Predicate<GameFish> match)
+        public static List<HookConfig> GetList(Predicate<HookConfig> match)
         {
             return Context.GetList(match);
         }
diff --git a/Assets/Scripts/Configs/Gen/Warps/HookConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/HookConfigWarp.cs.meta
new file mode 100644
index 000000000..a48eb7900
--- /dev/null
+++ b/Assets/Scripts/Configs/Gen/Warps/HookConfigWarp.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: fc38b93ab46f1bd4a83f81f1cd3b3e4c
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameRodsWarp.cs b/Assets/Scripts/Configs/Gen/Warps/LeadersConfigWarp.cs
similarity index 52%
rename from Assets/Scripts/Configs/Gen/Warps/GameRodsWarp.cs
rename to Assets/Scripts/Configs/Gen/Warps/LeadersConfigWarp.cs
index d4b7f741a..ad4c8a8af 100644
--- a/Assets/Scripts/Configs/Gen/Warps/GameRodsWarp.cs
+++ b/Assets/Scripts/Configs/Gen/Warps/LeadersConfigWarp.cs
@@ -5,38 +5,38 @@ using System.Collections.Generic;
 namespace NBF
 {
     [Serializable]
-    public partial class GameRods
+    public partial class LeadersConfig
     {
-        private static ConfigContext<GameRods> _context;
+        private static ConfigContext<LeadersConfig> _context;
 
-        private static ConfigContext<GameRods> Context => _context ??= Configs.Table<GameRods>();
+        private static ConfigContext<LeadersConfig> Context => _context ??= Configs.Table<LeadersConfig>();
 
-        public static GameRods Get(int key)
+        public static LeadersConfig Get(int key)
         {
             return Context.Get(key);
         }
 
-        public static GameRods Get(Predicate<GameRods> match)
+        public static LeadersConfig Get(Predicate<LeadersConfig> match)
         {
             return Context.Get(match);
         }
         
-        public static GameRods Fist()
+        public static LeadersConfig Fist()
         {
             return Context.Fist();
         }
 
-        public static GameRods Last()
+        public static LeadersConfig Last()
         {
             return Context.Last();
         }
 
-        public static GameRods Fist(Predicate<GameRods> match)
+        public static LeadersConfig Fist(Predicate<LeadersConfig> match)
         {
             return Context.Fist(match);
         }
 
-        public static GameRods Last(Predicate<GameRods> match)
+        public static LeadersConfig Last(Predicate<LeadersConfig> match)
         {
             return Context.Last(match);
         }
@@ -46,18 +46,18 @@ namespace NBF
             return Context.Count();
         }
 
-        public static int Count(Func<GameRods, bool> predicate)
+        public static int Count(Func<LeadersConfig, bool> predicate)
         {
             return Context.Count(predicate);
         }
 
 
-        public static List<GameRods> GetList()
+        public static List<LeadersConfig> GetList()
         {
             return Context.GetList();
         }
 
-        public static List<GameRods> GetList(Predicate<GameRods> match)
+        public static List<LeadersConfig> GetList(Predicate<LeadersConfig> match)
         {
             return Context.GetList(match);
         }
diff --git a/Assets/Scripts/Configs/Gen/Warps/LeadersConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/LeadersConfigWarp.cs.meta
new file mode 100644
index 000000000..f11b68d93
--- /dev/null
+++ b/Assets/Scripts/Configs/Gen/Warps/LeadersConfigWarp.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 7911fb1cf4470014eadb4d9db5db5861
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/LineConfigWarp.cs b/Assets/Scripts/Configs/Gen/Warps/LineConfigWarp.cs
new file mode 100644
index 000000000..7ae22d3ab
--- /dev/null
+++ b/Assets/Scripts/Configs/Gen/Warps/LineConfigWarp.cs
@@ -0,0 +1,65 @@
+/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/
+using System;
+using System.Collections.Generic;
+
+namespace NBF
+{
+    [Serializable]
+    public partial class LineConfig
+    {
+        private static ConfigContext<LineConfig> _context;
+
+        private static ConfigContext<LineConfig> Context => _context ??= Configs.Table<LineConfig>();
+
+        public static LineConfig Get(int key)
+        {
+            return Context.Get(key);
+        }
+
+        public static LineConfig Get(Predicate<LineConfig> match)
+        {
+            return Context.Get(match);
+        }
+        
+        public static LineConfig Fist()
+        {
+            return Context.Fist();
+        }
+
+        public static LineConfig Last()
+        {
+            return Context.Last();
+        }
+
+        public static LineConfig Fist(Predicate<LineConfig> match)
+        {
+            return Context.Fist(match);
+        }
+
+        public static LineConfig Last(Predicate<LineConfig> match)
+        {
+            return Context.Last(match);
+        }
+        
+        public static int Count()
+        {
+            return Context.Count();
+        }
+
+        public static int Count(Func<LineConfig, bool> predicate)
+        {
+            return Context.Count(predicate);
+        }
+
+
+        public static List<LineConfig> GetList()
+        {
+            return Context.GetList();
+        }
+
+        public static List<LineConfig> GetList(Predicate<LineConfig> match)
+        {
+            return Context.GetList(match);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/LineConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/LineConfigWarp.cs.meta
new file mode 100644
index 000000000..48a663dea
--- /dev/null
+++ b/Assets/Scripts/Configs/Gen/Warps/LineConfigWarp.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 1acb019fe35da324cb5a26e45c54532d
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/LureConfigWarp.cs b/Assets/Scripts/Configs/Gen/Warps/LureConfigWarp.cs
new file mode 100644
index 000000000..e26f0145e
--- /dev/null
+++ b/Assets/Scripts/Configs/Gen/Warps/LureConfigWarp.cs
@@ -0,0 +1,65 @@
+/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/
+using System;
+using System.Collections.Generic;
+
+namespace NBF
+{
+    [Serializable]
+    public partial class LureConfig
+    {
+        private static ConfigContext<LureConfig> _context;
+
+        private static ConfigContext<LureConfig> Context => _context ??= Configs.Table<LureConfig>();
+
+        public static LureConfig Get(int key)
+        {
+            return Context.Get(key);
+        }
+
+        public static LureConfig Get(Predicate<LureConfig> match)
+        {
+            return Context.Get(match);
+        }
+        
+        public static LureConfig Fist()
+        {
+            return Context.Fist();
+        }
+
+        public static LureConfig Last()
+        {
+            return Context.Last();
+        }
+
+        public static LureConfig Fist(Predicate<LureConfig> match)
+        {
+            return Context.Fist(match);
+        }
+
+        public static LureConfig Last(Predicate<LureConfig> match)
+        {
+            return Context.Last(match);
+        }
+        
+        public static int Count()
+        {
+            return Context.Count();
+        }
+
+        public static int Count(Func<LureConfig, bool> predicate)
+        {
+            return Context.Count(predicate);
+        }
+
+
+        public static List<LureConfig> GetList()
+        {
+            return Context.GetList();
+        }
+
+        public static List<LureConfig> GetList(Predicate<LureConfig> match)
+        {
+            return Context.GetList(match);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/LureConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/LureConfigWarp.cs.meta
new file mode 100644
index 000000000..33df3e2ef
--- /dev/null
+++ b/Assets/Scripts/Configs/Gen/Warps/LureConfigWarp.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 74aae733a506d0840a1a7cc2623ed5fd
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/ReelConfigWarp.cs b/Assets/Scripts/Configs/Gen/Warps/ReelConfigWarp.cs
new file mode 100644
index 000000000..e7cb60301
--- /dev/null
+++ b/Assets/Scripts/Configs/Gen/Warps/ReelConfigWarp.cs
@@ -0,0 +1,65 @@
+/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/
+using System;
+using System.Collections.Generic;
+
+namespace NBF
+{
+    [Serializable]
+    public partial class ReelConfig
+    {
+        private static ConfigContext<ReelConfig> _context;
+
+        private static ConfigContext<ReelConfig> Context => _context ??= Configs.Table<ReelConfig>();
+
+        public static ReelConfig Get(int key)
+        {
+            return Context.Get(key);
+        }
+
+        public static ReelConfig Get(Predicate<ReelConfig> match)
+        {
+            return Context.Get(match);
+        }
+        
+        public static ReelConfig Fist()
+        {
+            return Context.Fist();
+        }
+
+        public static ReelConfig Last()
+        {
+            return Context.Last();
+        }
+
+        public static ReelConfig Fist(Predicate<ReelConfig> match)
+        {
+            return Context.Fist(match);
+        }
+
+        public static ReelConfig Last(Predicate<ReelConfig> match)
+        {
+            return Context.Last(match);
+        }
+        
+        public static int Count()
+        {
+            return Context.Count();
+        }
+
+        public static int Count(Func<ReelConfig, bool> predicate)
+        {
+            return Context.Count(predicate);
+        }
+
+
+        public static List<ReelConfig> GetList()
+        {
+            return Context.GetList();
+        }
+
+        public static List<ReelConfig> GetList(Predicate<ReelConfig> match)
+        {
+            return Context.GetList(match);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/ReelConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/ReelConfigWarp.cs.meta
new file mode 100644
index 000000000..30120eb5a
--- /dev/null
+++ b/Assets/Scripts/Configs/Gen/Warps/ReelConfigWarp.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 6bfa9f163eb97be418e04f1f62c607de
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/RingConfigWarp.cs b/Assets/Scripts/Configs/Gen/Warps/RingConfigWarp.cs
new file mode 100644
index 000000000..209da8dfb
--- /dev/null
+++ b/Assets/Scripts/Configs/Gen/Warps/RingConfigWarp.cs
@@ -0,0 +1,65 @@
+/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/
+using System;
+using System.Collections.Generic;
+
+namespace NBF
+{
+    [Serializable]
+    public partial class RingConfig
+    {
+        private static ConfigContext<RingConfig> _context;
+
+        private static ConfigContext<RingConfig> Context => _context ??= Configs.Table<RingConfig>();
+
+        public static RingConfig Get(int key)
+        {
+            return Context.Get(key);
+        }
+
+        public static RingConfig Get(Predicate<RingConfig> match)
+        {
+            return Context.Get(match);
+        }
+        
+        public static RingConfig Fist()
+        {
+            return Context.Fist();
+        }
+
+        public static RingConfig Last()
+        {
+            return Context.Last();
+        }
+
+        public static RingConfig Fist(Predicate<RingConfig> match)
+        {
+            return Context.Fist(match);
+        }
+
+        public static RingConfig Last(Predicate<RingConfig> match)
+        {
+            return Context.Last(match);
+        }
+        
+        public static int Count()
+        {
+            return Context.Count();
+        }
+
+        public static int Count(Func<RingConfig, bool> predicate)
+        {
+            return Context.Count(predicate);
+        }
+
+
+        public static List<RingConfig> GetList()
+        {
+            return Context.GetList();
+        }
+
+        public static List<RingConfig> GetList(Predicate<RingConfig> match)
+        {
+            return Context.GetList(match);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/RingConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/RingConfigWarp.cs.meta
new file mode 100644
index 000000000..8a778e233
--- /dev/null
+++ b/Assets/Scripts/Configs/Gen/Warps/RingConfigWarp.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: a52a98969f4fae44ba19533cb1ae552e
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/GameBaitsWarp.cs b/Assets/Scripts/Configs/Gen/Warps/RodConfigWarp.cs
similarity index 54%
rename from Assets/Scripts/Configs/Gen/Warps/GameBaitsWarp.cs
rename to Assets/Scripts/Configs/Gen/Warps/RodConfigWarp.cs
index 014010b1c..280781968 100644
--- a/Assets/Scripts/Configs/Gen/Warps/GameBaitsWarp.cs
+++ b/Assets/Scripts/Configs/Gen/Warps/RodConfigWarp.cs
@@ -5,38 +5,38 @@ using System.Collections.Generic;
 namespace NBF
 {
     [Serializable]
-    public partial class GameBaits
+    public partial class RodConfig
     {
-        private static ConfigContext<GameBaits> _context;
+        private static ConfigContext<RodConfig> _context;
 
-        private static ConfigContext<GameBaits> Context => _context ??= Configs.Table<GameBaits>();
+        private static ConfigContext<RodConfig> Context => _context ??= Configs.Table<RodConfig>();
 
-        public static GameBaits Get(int key)
+        public static RodConfig Get(int key)
         {
             return Context.Get(key);
         }
 
-        public static GameBaits Get(Predicate<GameBaits> match)
+        public static RodConfig Get(Predicate<RodConfig> match)
         {
             return Context.Get(match);
         }
         
-        public static GameBaits Fist()
+        public static RodConfig Fist()
         {
             return Context.Fist();
         }
 
-        public static GameBaits Last()
+        public static RodConfig Last()
         {
             return Context.Last();
         }
 
-        public static GameBaits Fist(Predicate<GameBaits> match)
+        public static RodConfig Fist(Predicate<RodConfig> match)
         {
             return Context.Fist(match);
         }
 
-        public static GameBaits Last(Predicate<GameBaits> match)
+        public static RodConfig Last(Predicate<RodConfig> match)
         {
             return Context.Last(match);
         }
@@ -46,18 +46,18 @@ namespace NBF
             return Context.Count();
         }
 
-        public static int Count(Func<GameBaits, bool> predicate)
+        public static int Count(Func<RodConfig, bool> predicate)
         {
             return Context.Count(predicate);
         }
 
 
-        public static List<GameBaits> GetList()
+        public static List<RodConfig> GetList()
         {
             return Context.GetList();
         }
 
-        public static List<GameBaits> GetList(Predicate<GameBaits> match)
+        public static List<RodConfig> GetList(Predicate<RodConfig> match)
         {
             return Context.GetList(match);
         }
diff --git a/Assets/Scripts/Configs/Gen/Warps/RodConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/RodConfigWarp.cs.meta
new file mode 100644
index 000000000..33ef28386
--- /dev/null
+++ b/Assets/Scripts/Configs/Gen/Warps/RodConfigWarp.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 81f057dddf36a734ead19cd98e19a2e0
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/UnitConfigWarp.cs b/Assets/Scripts/Configs/Gen/Warps/UnitConfigWarp.cs
new file mode 100644
index 000000000..0398f08b0
--- /dev/null
+++ b/Assets/Scripts/Configs/Gen/Warps/UnitConfigWarp.cs
@@ -0,0 +1,65 @@
+/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/
+using System;
+using System.Collections.Generic;
+
+namespace NBF
+{
+    [Serializable]
+    public partial class UnitConfig
+    {
+        private static ConfigContext<UnitConfig> _context;
+
+        private static ConfigContext<UnitConfig> Context => _context ??= Configs.Table<UnitConfig>();
+
+        public static UnitConfig Get(int key)
+        {
+            return Context.Get(key);
+        }
+
+        public static UnitConfig Get(Predicate<UnitConfig> match)
+        {
+            return Context.Get(match);
+        }
+        
+        public static UnitConfig Fist()
+        {
+            return Context.Fist();
+        }
+
+        public static UnitConfig Last()
+        {
+            return Context.Last();
+        }
+
+        public static UnitConfig Fist(Predicate<UnitConfig> match)
+        {
+            return Context.Fist(match);
+        }
+
+        public static UnitConfig Last(Predicate<UnitConfig> match)
+        {
+            return Context.Last(match);
+        }
+        
+        public static int Count()
+        {
+            return Context.Count();
+        }
+
+        public static int Count(Func<UnitConfig, bool> predicate)
+        {
+            return Context.Count(predicate);
+        }
+
+
+        public static List<UnitConfig> GetList()
+        {
+            return Context.GetList();
+        }
+
+        public static List<UnitConfig> GetList(Predicate<UnitConfig> match)
+        {
+            return Context.GetList(match);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/UnitConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/UnitConfigWarp.cs.meta
new file mode 100644
index 000000000..a260fdbd8
--- /dev/null
+++ b/Assets/Scripts/Configs/Gen/Warps/UnitConfigWarp.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 69acf2fddccdd7b4fae3ad883cbc50ec
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/WeightConfigWarp.cs b/Assets/Scripts/Configs/Gen/Warps/WeightConfigWarp.cs
new file mode 100644
index 000000000..7018eed48
--- /dev/null
+++ b/Assets/Scripts/Configs/Gen/Warps/WeightConfigWarp.cs
@@ -0,0 +1,65 @@
+/**本脚本为自动生成，每次生成会覆盖！请勿手动修改**/
+using System;
+using System.Collections.Generic;
+
+namespace NBF
+{
+    [Serializable]
+    public partial class WeightConfig
+    {
+        private static ConfigContext<WeightConfig> _context;
+
+        private static ConfigContext<WeightConfig> Context => _context ??= Configs.Table<WeightConfig>();
+
+        public static WeightConfig Get(int key)
+        {
+            return Context.Get(key);
+        }
+
+        public static WeightConfig Get(Predicate<WeightConfig> match)
+        {
+            return Context.Get(match);
+        }
+        
+        public static WeightConfig Fist()
+        {
+            return Context.Fist();
+        }
+
+        public static WeightConfig Last()
+        {
+            return Context.Last();
+        }
+
+        public static WeightConfig Fist(Predicate<WeightConfig> match)
+        {
+            return Context.Fist(match);
+        }
+
+        public static WeightConfig Last(Predicate<WeightConfig> match)
+        {
+            return Context.Last(match);
+        }
+        
+        public static int Count()
+        {
+            return Context.Count();
+        }
+
+        public static int Count(Func<WeightConfig, bool> predicate)
+        {
+            return Context.Count(predicate);
+        }
+
+
+        public static List<WeightConfig> GetList()
+        {
+            return Context.GetList();
+        }
+
+        public static List<WeightConfig> GetList(Predicate<WeightConfig> match)
+        {
+            return Context.GetList(match);
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Gen/Warps/WeightConfigWarp.cs.meta b/Assets/Scripts/Configs/Gen/Warps/WeightConfigWarp.cs.meta
new file mode 100644
index 000000000..a14f49de5
--- /dev/null
+++ b/Assets/Scripts/Configs/Gen/Warps/WeightConfigWarp.cs.meta
@@ -0,0 +1,2 @@
+fileFormatVersion: 2
+guid: 43244884876723947bd6574d57b2349c
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Mem/GameBaits.cs b/Assets/Scripts/Configs/Mem/BaitConfig.cs
similarity index 92%
rename from Assets/Scripts/Configs/Mem/GameBaits.cs
rename to Assets/Scripts/Configs/Mem/BaitConfig.cs
index a253d29d3..36e636948 100644
--- a/Assets/Scripts/Configs/Mem/GameBaits.cs
+++ b/Assets/Scripts/Configs/Mem/BaitConfig.cs
@@ -5,7 +5,7 @@ using UnityEngine;
 namespace NBF
 {
     [TableName("gameBaits")]
-    public partial class GameBaits : ConfigGearBase
+    public partial class BaitConfig : ConfigGearBase
     {
         public enum Type
         {
@@ -35,9 +35,9 @@ namespace NBF
         
         public virtual bool CheckIsFishAccept(FishSpecies fishSpecies, float fishWeight = 0f)
         {
-            var fish = GameFish.Get(t => t.speciesName == fishSpecies);
+            var fish = FishConfig.Get(t => t.speciesName == fishSpecies);
             if (fish == null) return false;
-            if (fish.type == GameFish.Type.Predator && type == Type.Spinning)
+            if (fish.type == FishConfig.Type.Predator && type == Type.Spinning)
             {
                 Vector2 vector = weightFishAccept;
                 Debug.Log("Startowa wartosc przynety:" + vector.ToString());
@@ -116,7 +116,7 @@ namespace NBF
                     return true;
                 }
             }
-            else if (fish.type == GameFish.Type.WhiteFish && type == Type.Natural)
+            else if (fish.type == FishConfig.Type.WhiteFish && type == Type.Natural)
             {
                 if (acceptFish.Contains(fishSpecies))
                 {
@@ -124,7 +124,7 @@ namespace NBF
                     return true;
                 }
             }
-            else if (fish.type == GameFish.Type.Predator && type == Type.Natural &&
+            else if (fish.type == FishConfig.Type.Predator && type == Type.Natural &&
                      acceptFish.Contains(fishSpecies))
             {
                 Debug.Log("Fish accept bait predator weight:" + fishWeight);
diff --git a/Assets/Scripts/Configs/Mem/GameBaits.cs.meta b/Assets/Scripts/Configs/Mem/BaitConfig.cs.meta
similarity index 100%
rename from Assets/Scripts/Configs/Mem/GameBaits.cs.meta
rename to Assets/Scripts/Configs/Mem/BaitConfig.cs.meta
diff --git a/Assets/Scripts/Configs/Mem/GameFloats.cs b/Assets/Scripts/Configs/Mem/BobberConfig.cs
similarity index 89%
rename from Assets/Scripts/Configs/Mem/GameFloats.cs
rename to Assets/Scripts/Configs/Mem/BobberConfig.cs
index 8d973c3e5..0457d38b6 100644
--- a/Assets/Scripts/Configs/Mem/GameFloats.cs
+++ b/Assets/Scripts/Configs/Mem/BobberConfig.cs
@@ -4,7 +4,7 @@ using UnityEngine;
 namespace NBF
 {
     [TableName("gameFloats")]
-    public partial class GameFloats : ConfigGearBase
+    public partial class BobberConfig : ConfigGearBase
     {
         public enum Type
         {
diff --git a/Assets/Scripts/Configs/Mem/GameFloats.cs.meta b/Assets/Scripts/Configs/Mem/BobberConfig.cs.meta
similarity index 100%
rename from Assets/Scripts/Configs/Mem/GameFloats.cs.meta
rename to Assets/Scripts/Configs/Mem/BobberConfig.cs.meta
diff --git a/Assets/Scripts/Configs/Mem/GameFeeders.cs b/Assets/Scripts/Configs/Mem/FeederConfig.cs
similarity index 86%
rename from Assets/Scripts/Configs/Mem/GameFeeders.cs
rename to Assets/Scripts/Configs/Mem/FeederConfig.cs
index 71bb5233f..ca386fad3 100644
--- a/Assets/Scripts/Configs/Mem/GameFeeders.cs
+++ b/Assets/Scripts/Configs/Mem/FeederConfig.cs
@@ -4,7 +4,7 @@ using UnityEngine;
 namespace NBF
 {
     [TableName("gameFeeders")]
-    public partial class GameFeeders : ConfigGearBase
+    public partial class FeederConfig : ConfigGearBase
     {
         public enum Type
         {
diff --git a/Assets/Scripts/Configs/Mem/GameFeeders.cs.meta b/Assets/Scripts/Configs/Mem/FeederConfig.cs.meta
similarity index 100%
rename from Assets/Scripts/Configs/Mem/GameFeeders.cs.meta
rename to Assets/Scripts/Configs/Mem/FeederConfig.cs.meta
diff --git a/Assets/Scripts/Configs/Mem/GameFishAccepts.cs b/Assets/Scripts/Configs/Mem/FishAcceptConfig.cs
similarity index 72%
rename from Assets/Scripts/Configs/Mem/GameFishAccepts.cs
rename to Assets/Scripts/Configs/Mem/FishAcceptConfig.cs
index 956a50826..9b26f1d60 100644
--- a/Assets/Scripts/Configs/Mem/GameFishAccepts.cs
+++ b/Assets/Scripts/Configs/Mem/FishAcceptConfig.cs
@@ -1,7 +1,7 @@
 namespace NBF
 {
     [TableName("gameFishAccepts")]
-    public partial class GameFishAccepts : ConfigBase
+    public partial class FishAcceptConfig : ConfigBase
     {
         public int bait;
 
diff --git a/Assets/Scripts/Configs/Mem/GameFishAccepts.cs.meta b/Assets/Scripts/Configs/Mem/FishAcceptConfig.cs.meta
similarity index 100%
rename from Assets/Scripts/Configs/Mem/GameFishAccepts.cs.meta
rename to Assets/Scripts/Configs/Mem/FishAcceptConfig.cs.meta
diff --git a/Assets/Scripts/Configs/Mem/GameFish.cs b/Assets/Scripts/Configs/Mem/FishConfig.cs
similarity index 96%
rename from Assets/Scripts/Configs/Mem/GameFish.cs
rename to Assets/Scripts/Configs/Mem/FishConfig.cs
index e2e316093..56470fffc 100644
--- a/Assets/Scripts/Configs/Mem/GameFish.cs
+++ b/Assets/Scripts/Configs/Mem/FishConfig.cs
@@ -18,9 +18,9 @@ namespace NBF
     }
     
     [TableName("gameFish")]
-    public partial class GameFish : ConfigBase
+    public partial class FishConfig : ConfigBase
     {
-        public static GameFish Get(FishSpecies fishSpecies)
+        public static FishConfig Get(FishSpecies fishSpecies)
         {
             return Get(t => t.speciesName == fishSpecies);
         }
diff --git a/Assets/Scripts/Configs/Mem/GameFish.cs.meta b/Assets/Scripts/Configs/Mem/FishConfig.cs.meta
similarity index 100%
rename from Assets/Scripts/Configs/Mem/GameFish.cs.meta
rename to Assets/Scripts/Configs/Mem/FishConfig.cs.meta
diff --git a/Assets/Scripts/Configs/Mem/GameHooks.cs b/Assets/Scripts/Configs/Mem/HookConfig.cs
similarity index 98%
rename from Assets/Scripts/Configs/Mem/GameHooks.cs
rename to Assets/Scripts/Configs/Mem/HookConfig.cs
index b59e599f2..1c340ab28 100644
--- a/Assets/Scripts/Configs/Mem/GameHooks.cs
+++ b/Assets/Scripts/Configs/Mem/HookConfig.cs
@@ -4,7 +4,7 @@ using UnityEngine;
 namespace NBF
 {
     [TableName("gameHooks")]
-    public partial class GameHooks : ConfigGearBase
+    public partial class HookConfig : ConfigGearBase
     {
         public enum Type
         {
diff --git a/Assets/Scripts/Configs/Mem/GameHooks.cs.meta b/Assets/Scripts/Configs/Mem/HookConfig.cs.meta
similarity index 100%
rename from Assets/Scripts/Configs/Mem/GameHooks.cs.meta
rename to Assets/Scripts/Configs/Mem/HookConfig.cs.meta
diff --git a/Assets/Scripts/Configs/Mem/GameLeaders.cs b/Assets/Scripts/Configs/Mem/LeadersConfig.cs
similarity index 56%
rename from Assets/Scripts/Configs/Mem/GameLeaders.cs
rename to Assets/Scripts/Configs/Mem/LeadersConfig.cs
index 309412d84..6123c5244 100644
--- a/Assets/Scripts/Configs/Mem/GameLeaders.cs
+++ b/Assets/Scripts/Configs/Mem/LeadersConfig.cs
@@ -4,7 +4,7 @@ using UnityEngine;
 namespace NBF
 {
     [TableName("gameLeaders")]
-    public partial class GameLeaders : ConfigGearBase
+    public partial class LeadersConfig : ConfigGearBase
     {
         public enum Type
         {
@@ -13,15 +13,7 @@ namespace NBF
             Steel = 2,
             Titanium = 3
         }
-        
+
         public Type type;
-
-        public float strength = 1f;
-
-        public float size = 0.12f;
-
-        public int Level = 1;
-
-        public int amount = 1;
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Mem/GameLeaders.cs.meta b/Assets/Scripts/Configs/Mem/LeadersConfig.cs.meta
similarity index 100%
rename from Assets/Scripts/Configs/Mem/GameLeaders.cs.meta
rename to Assets/Scripts/Configs/Mem/LeadersConfig.cs.meta
diff --git a/Assets/Scripts/Configs/Mem/GameLines.cs b/Assets/Scripts/Configs/Mem/LineConfig.cs
similarity index 89%
rename from Assets/Scripts/Configs/Mem/GameLines.cs
rename to Assets/Scripts/Configs/Mem/LineConfig.cs
index 103f046fb..747a5b153 100644
--- a/Assets/Scripts/Configs/Mem/GameLines.cs
+++ b/Assets/Scripts/Configs/Mem/LineConfig.cs
@@ -4,7 +4,7 @@ using UnityEngine;
 namespace NBF
 {
     [TableName("gameLines")]
-    public partial class GameLines : ConfigGearBase
+    public partial class LineConfig : ConfigGearBase
     {
         protected override string ModelRoot => "GameItemsPrefabs/";
 
diff --git a/Assets/Scripts/Configs/Mem/GameLines.cs.meta b/Assets/Scripts/Configs/Mem/LineConfig.cs.meta
similarity index 100%
rename from Assets/Scripts/Configs/Mem/GameLines.cs.meta
rename to Assets/Scripts/Configs/Mem/LineConfig.cs.meta
diff --git a/Assets/Scripts/Configs/Mem/GameLures.cs b/Assets/Scripts/Configs/Mem/LureConfig.cs
similarity index 96%
rename from Assets/Scripts/Configs/Mem/GameLures.cs
rename to Assets/Scripts/Configs/Mem/LureConfig.cs
index db8ae1805..9a2b891da 100644
--- a/Assets/Scripts/Configs/Mem/GameLures.cs
+++ b/Assets/Scripts/Configs/Mem/LureConfig.cs
@@ -3,7 +3,7 @@
 namespace NBF
 {
     [TableName("gameLures")]
-    public partial class GameLures : ConfigGearBase
+    public partial class LureConfig : ConfigGearBase
     {
         public enum Type
         {
@@ -37,7 +37,7 @@ namespace NBF
 
         public bool CheckIsFishAccept(FishSpecies fishSpecies, float fishWeight = 0)
         {
-            if (GameFish.Get(fishSpecies).type == GameFish.Type.Predator)
+            if (FishConfig.Get(fishSpecies).type == FishConfig.Type.Predator)
             {
                 Vector2 vector = weightFishAccept;
                 Debug.Log("诱饵的初始值:" + vector.ToString());
diff --git a/Assets/Scripts/Configs/Mem/GameLures.cs.meta b/Assets/Scripts/Configs/Mem/LureConfig.cs.meta
similarity index 100%
rename from Assets/Scripts/Configs/Mem/GameLures.cs.meta
rename to Assets/Scripts/Configs/Mem/LureConfig.cs.meta
diff --git a/Assets/Scripts/Configs/Mem/GameReels.cs b/Assets/Scripts/Configs/Mem/ReelConfig.cs
similarity index 90%
rename from Assets/Scripts/Configs/Mem/GameReels.cs
rename to Assets/Scripts/Configs/Mem/ReelConfig.cs
index a5ccc8002..dab4e3b4e 100644
--- a/Assets/Scripts/Configs/Mem/GameReels.cs
+++ b/Assets/Scripts/Configs/Mem/ReelConfig.cs
@@ -4,7 +4,7 @@ using UnityEngine;
 namespace NBF
 {
     [TableName("gameReels")]
-    public partial class GameReels : ConfigGearBase
+    public partial class ReelConfig : ConfigGearBase
     {
         // protected override string ModelRoot => "GameItemsPrefabs/";
 
diff --git a/Assets/Scripts/Configs/Mem/GameReels.cs.meta b/Assets/Scripts/Configs/Mem/ReelConfig.cs.meta
similarity index 100%
rename from Assets/Scripts/Configs/Mem/GameReels.cs.meta
rename to Assets/Scripts/Configs/Mem/ReelConfig.cs.meta
diff --git a/Assets/Scripts/Configs/Mem/GameRings.cs b/Assets/Scripts/Configs/Mem/RingConfig.cs
similarity index 53%
rename from Assets/Scripts/Configs/Mem/GameRings.cs
rename to Assets/Scripts/Configs/Mem/RingConfig.cs
index d68055998..f29cdfdb0 100644
--- a/Assets/Scripts/Configs/Mem/GameRings.cs
+++ b/Assets/Scripts/Configs/Mem/RingConfig.cs
@@ -1,7 +1,7 @@
 namespace NBF
 {
     [TableName("gameRings")]
-    public partial class GameRings : ConfigGearBase
+    public partial class RingConfig : ConfigGearBase
     {
     }
 }
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Mem/GameRings.cs.meta b/Assets/Scripts/Configs/Mem/RingConfig.cs.meta
similarity index 100%
rename from Assets/Scripts/Configs/Mem/GameRings.cs.meta
rename to Assets/Scripts/Configs/Mem/RingConfig.cs.meta
diff --git a/Assets/Scripts/Configs/Mem/GameRods.cs b/Assets/Scripts/Configs/Mem/RodConfig.cs
similarity index 92%
rename from Assets/Scripts/Configs/Mem/GameRods.cs
rename to Assets/Scripts/Configs/Mem/RodConfig.cs
index c1fa2a712..15e8976cb 100644
--- a/Assets/Scripts/Configs/Mem/GameRods.cs
+++ b/Assets/Scripts/Configs/Mem/RodConfig.cs
@@ -4,7 +4,7 @@ using UnityEngine;
 namespace NBF
 {
     [TableName("gameRods")]
-    public partial class GameRods : ConfigGearBase
+    public partial class RodConfig : ConfigGearBase
     {
 
         public enum Type
diff --git a/Assets/Scripts/Configs/Mem/GameRods.cs.meta b/Assets/Scripts/Configs/Mem/RodConfig.cs.meta
similarity index 100%
rename from Assets/Scripts/Configs/Mem/GameRods.cs.meta
rename to Assets/Scripts/Configs/Mem/RodConfig.cs.meta
diff --git a/Assets/Scripts/Fishing2/Data/Unit/UnitType.cs b/Assets/Scripts/Configs/Mem/UnitConfig.cs
similarity index 72%
rename from Assets/Scripts/Fishing2/Data/Unit/UnitType.cs
rename to Assets/Scripts/Configs/Mem/UnitConfig.cs
index c4867ff21..7a39846f7 100644
--- a/Assets/Scripts/Fishing2/Data/Unit/UnitType.cs
+++ b/Assets/Scripts/Configs/Mem/UnitConfig.cs
@@ -1,5 +1,11 @@
-namespace NBF.Fishing2
+namespace NBF
 {
+    [TableName("gameUnit")]
+    public partial class UnitConfig : ConfigBase
+    {
+        public UnitType Type;
+    }
+
     public enum UnitType : byte
     {
         /// <summary>
diff --git a/Assets/Scripts/Configs/Mem/UnitConfig.cs.meta b/Assets/Scripts/Configs/Mem/UnitConfig.cs.meta
new file mode 100644
index 000000000..daa9722a3
--- /dev/null
+++ b/Assets/Scripts/Configs/Mem/UnitConfig.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 956ed7b067744c369fcff9a8baef77ee
+timeCreated: 1756049614
\ No newline at end of file
diff --git a/Assets/Scripts/Configs/Mem/GameWeights.cs b/Assets/Scripts/Configs/Mem/WeightConfig.cs
similarity index 88%
rename from Assets/Scripts/Configs/Mem/GameWeights.cs
rename to Assets/Scripts/Configs/Mem/WeightConfig.cs
index 94a0531d1..8d769f975 100644
--- a/Assets/Scripts/Configs/Mem/GameWeights.cs
+++ b/Assets/Scripts/Configs/Mem/WeightConfig.cs
@@ -4,7 +4,7 @@ using UnityEngine;
 namespace NBF
 {
     [TableName("gameWeights")]
-    public partial class GameWeights : ConfigGearBase
+    public partial class WeightConfig : ConfigGearBase
     {
         protected override string ModelRoot => "GameItemsPrefabs/";
 
diff --git a/Assets/Scripts/Configs/Mem/GameWeights.cs.meta b/Assets/Scripts/Configs/Mem/WeightConfig.cs.meta
similarity index 100%
rename from Assets/Scripts/Configs/Mem/GameWeights.cs.meta
rename to Assets/Scripts/Configs/Mem/WeightConfig.cs.meta
diff --git a/Assets/Scripts/Fishing2/Data.meta b/Assets/Scripts/Fishing2/Data.meta
index 012ad5b85..49aaa69d4 100644
--- a/Assets/Scripts/Fishing2/Data.meta
+++ b/Assets/Scripts/Fishing2/Data.meta
@@ -1,3 +1,3 @@
 fileFormatVersion: 2
-guid: 81e60ce9e4a944739d285ad0c562a4a0
-timeCreated: 1755914112
\ No newline at end of file
+guid: fe99d0fb1bfc4912a205bb00911c1132
+timeCreated: 1756047069
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Carrier.meta b/Assets/Scripts/Fishing2/Data/Carrier.meta
new file mode 100644
index 000000000..f4c51e849
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Carrier.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5432d229611d4f8e8fa72a637035bb40
+timeCreated: 1756044768
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Gear/Configs.meta b/Assets/Scripts/Fishing2/Data/Gear/Configs.meta
deleted file mode 100644
index acec2aa17..000000000
--- a/Assets/Scripts/Fishing2/Data/Gear/Configs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 1258cbf54dfc4d1c906fd83dfa5943be
-timeCreated: 1755921708
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Map.meta b/Assets/Scripts/Fishing2/Data/Map.meta
new file mode 100644
index 000000000..cf5d9963d
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Map.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6ce24e5f59f2424faadee3d97e357365
+timeCreated: 1756049282
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Map/Map.cs b/Assets/Scripts/Fishing2/Data/Map/Map.cs
new file mode 100644
index 000000000..eeedf2d73
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Map/Map.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using NBC.Entitas;
+
+namespace NBF.Fishing2
+{
+    public class Map : Entity
+    {
+        /// <summary>
+        /// 好友房地图
+        /// </summary>
+        public bool IsRoomMap;
+
+        /// <summary>
+        /// 地图中的单位
+        /// </summary>
+        public Dictionary<long, Unit> Units = new Dictionary<long, Unit>();
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Map/Map.cs.meta b/Assets/Scripts/Fishing2/Data/Map/Map.cs.meta
new file mode 100644
index 000000000..f40f7062a
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Map/Map.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 2acb8a2309ee4443a812939b0e02c18f
+timeCreated: 1756049289
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Gear.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Gear.meta
rename to Assets/Scripts/Fishing2/Data/Unit/Gear.meta
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child.meta
new file mode 100644
index 000000000..a91a0f6b9
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 629d828f3fc74ce78482025124c31f85
+timeCreated: 1756047176
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBaitComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBaitComponent.cs
new file mode 100644
index 000000000..aae539aa8
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBaitComponent.cs
@@ -0,0 +1,9 @@
+using NBC.Entitas;
+
+namespace NBF.Fishing2
+{
+    public class GearBaitComponent : Entity
+    {
+        public int ConfigId;
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBaitComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBaitComponent.cs.meta
new file mode 100644
index 000000000..5f67a8f55
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBaitComponent.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ee9d5fa0951c490fafb108bfb3e1d496
+timeCreated: 1756047193
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBobberComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBobberComponent.cs
new file mode 100644
index 000000000..8c9a64110
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBobberComponent.cs
@@ -0,0 +1,9 @@
+using NBC.Entitas;
+
+namespace NBF.Fishing2
+{
+    public class GearBobberComponent : Entity
+    {
+        public int ConfigId;
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBobberComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBobberComponent.cs.meta
new file mode 100644
index 000000000..841872535
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearBobberComponent.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 3f772262a6ee45ebaa276d716c191ddd
+timeCreated: 1756047151
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearHookComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearHookComponent.cs
new file mode 100644
index 000000000..a72531a63
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearHookComponent.cs
@@ -0,0 +1,9 @@
+using NBC.Entitas;
+
+namespace NBF.Fishing2
+{
+    public class GearHookComponent : Entity
+    {
+        public int ConfigId;
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearHookComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearHookComponent.cs.meta
new file mode 100644
index 000000000..a63a49e38
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearHookComponent.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 601122a982d048789ee9131376c72158
+timeCreated: 1756047164
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLineComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLineComponent.cs
new file mode 100644
index 000000000..1d372a24d
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLineComponent.cs
@@ -0,0 +1,9 @@
+using NBC.Entitas;
+
+namespace NBF.Fishing2
+{
+    public class GearLineComponent : Entity
+    {
+        public int ConfigId;
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLineComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLineComponent.cs.meta
new file mode 100644
index 000000000..3b16c473e
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLineComponent.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 3e1209cd4f4242c2af9fbfbbb7480f6b
+timeCreated: 1756047232
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLureComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLureComponent.cs
new file mode 100644
index 000000000..a8adf310a
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLureComponent.cs
@@ -0,0 +1,9 @@
+using NBC.Entitas;
+
+namespace NBF.Fishing2
+{
+    public class GearLureComponent : Entity
+    {
+        public int ConfigId;
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLureComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLureComponent.cs.meta
new file mode 100644
index 000000000..d85b3f922
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearLureComponent.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5537f49777ef40f0adeb36bb7687356d
+timeCreated: 1756047207
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearReelComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearReelComponent.cs
new file mode 100644
index 000000000..493000c83
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearReelComponent.cs
@@ -0,0 +1,9 @@
+using NBC.Entitas;
+
+namespace NBF.Fishing2
+{
+    public class GearReelComponent : Entity
+    {
+        public int ConfigId;
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearReelComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearReelComponent.cs.meta
new file mode 100644
index 000000000..917327a49
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearReelComponent.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 60c6ee2c8c084dd29267b0653a1a239d
+timeCreated: 1756047139
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearRodComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearRodComponent.cs
new file mode 100644
index 000000000..9427a128b
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearRodComponent.cs
@@ -0,0 +1,9 @@
+using NBC.Entitas;
+
+namespace NBF.Fishing2
+{
+    public class GearRodComponent : Entity
+    {
+        public int ConfigId;
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearRodComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearRodComponent.cs.meta
new file mode 100644
index 000000000..322159c93
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearRodComponent.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 8a353dda940c4dd9bddcf7420d1c2108
+timeCreated: 1756047099
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearWeightComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearWeightComponent.cs
new file mode 100644
index 000000000..9f9ea6e16
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearWeightComponent.cs
@@ -0,0 +1,9 @@
+using NBC.Entitas;
+
+namespace NBF.Fishing2
+{
+    public class GearWeightComponent : Entity
+    {
+        public int ConfigId;
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearWeightComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearWeightComponent.cs.meta
new file mode 100644
index 000000000..dc85f9f67
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/Child/GearWeightComponent.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 82411b517dd84b9ca7839a4ddb486a66
+timeCreated: 1756047222
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Gear/UnitGearComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Gear/UnitGearComponent.cs
similarity index 81%
rename from Assets/Scripts/Fishing2/Data/Gear/UnitGearComponent.cs
rename to Assets/Scripts/Fishing2/Data/Unit/Gear/UnitGearComponent.cs
index be6ceadc7..0556e7b8c 100644
--- a/Assets/Scripts/Fishing2/Data/Gear/UnitGearComponent.cs
+++ b/Assets/Scripts/Fishing2/Data/Unit/Gear/UnitGearComponent.cs
@@ -17,12 +17,7 @@ namespace NBF.Fishing2
         /// 旋转速度
         /// </summary>
         public float ReelSpeed { get; set; }
-
-        /// <summary>
-        /// 打开手电筒
-        /// </summary>
-        public bool OpenLight { get; set; }
-
+        
         /// <summary>
         /// 鱼竿设置
         /// </summary>
diff --git a/Assets/Scripts/Fishing2/Data/Gear/UnitGearComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Gear/UnitGearComponent.cs.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Data/Gear/UnitGearComponent.cs.meta
rename to Assets/Scripts/Fishing2/Data/Unit/Gear/UnitGearComponent.cs.meta
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Parts.meta b/Assets/Scripts/Fishing2/Data/Unit/Parts.meta
new file mode 100644
index 000000000..f3442fbd6
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Unit/Parts.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f63b5a4df9be4d1c839c3c1cc56c1275
+timeCreated: 1756048419
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Parts/UnitFlashlightComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Parts/UnitFlashlightComponent.cs
new file mode 100644
index 000000000..bcd462e6a
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Unit/Parts/UnitFlashlightComponent.cs
@@ -0,0 +1,15 @@
+using NBC.Entitas;
+
+namespace NBF.Fishing2
+{
+    /// <summary>
+    /// 手电筒组件
+    /// </summary>
+    public class UnitFlashlightComponent : Entity
+    {
+        /// <summary>
+        /// 打开手电筒
+        /// </summary>
+        public bool OpenLight { get; set; }
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Parts/UnitFlashlightComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Parts/UnitFlashlightComponent.cs.meta
new file mode 100644
index 000000000..499797438
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Unit/Parts/UnitFlashlightComponent.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5f151cee0d5f43ff90c3aa013214b1ea
+timeCreated: 1756048476
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Skin.meta b/Assets/Scripts/Fishing2/Data/Unit/Skin.meta
new file mode 100644
index 000000000..e2ee5376e
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Unit/Skin.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 0f655e37e9dd4b5885e127f44e01100d
+timeCreated: 1756048586
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Skin/UnitSkinComponent.cs b/Assets/Scripts/Fishing2/Data/Unit/Skin/UnitSkinComponent.cs
new file mode 100644
index 000000000..b3bf24aa7
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Unit/Skin/UnitSkinComponent.cs
@@ -0,0 +1,11 @@
+using NBC.Entitas;
+
+namespace NBF.Fishing2
+{
+    /// <summary>
+    /// Unity皮肤组件
+    /// </summary>
+    public class UnitSkinComponent : Entity
+    {
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Skin/UnitSkinComponent.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/Skin/UnitSkinComponent.cs.meta
new file mode 100644
index 000000000..76e1e5b18
--- /dev/null
+++ b/Assets/Scripts/Fishing2/Data/Unit/Skin/UnitSkinComponent.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 40c5cce71c8443aa82ea4108e72c887b
+timeCreated: 1756048599
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Data/Unit/Unit.cs b/Assets/Scripts/Fishing2/Data/Unit/Unit.cs
index a29726ad7..f674888ca 100644
--- a/Assets/Scripts/Fishing2/Data/Unit/Unit.cs
+++ b/Assets/Scripts/Fishing2/Data/Unit/Unit.cs
@@ -3,6 +3,9 @@ using Unity.Mathematics;
 
 namespace NBF.Fishing2
 {
+    /// <summary>
+    /// 单位
+    /// </summary>
     public class Unit : Entity
     {
         public int ConfigId { get; set; } //配置表id
diff --git a/Assets/Scripts/Fishing2/Data/Unit/UnitType.cs.meta b/Assets/Scripts/Fishing2/Data/Unit/UnitType.cs.meta
deleted file mode 100644
index cd6cc5596..000000000
--- a/Assets/Scripts/Fishing2/Data/Unit/UnitType.cs.meta
+++ /dev/null
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: f13efb3457f04307b46bbfc54422cf48
-timeCreated: 1755915952
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/System.meta b/Assets/Scripts/Fishing2/System.meta
new file mode 100644
index 000000000..1b6b57cb1
--- /dev/null
+++ b/Assets/Scripts/Fishing2/System.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 8e7f0c94a8514f5fa23bcc283e7abdc4
+timeCreated: 1756049392
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/System/Data.meta b/Assets/Scripts/Fishing2/System/Data.meta
new file mode 100644
index 000000000..bcd63628f
--- /dev/null
+++ b/Assets/Scripts/Fishing2/System/Data.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: cd5e378ae3c94070be009d1df97f6aae
+timeCreated: 1756049450
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/System/Data/MapSystem.cs b/Assets/Scripts/Fishing2/System/Data/MapSystem.cs
new file mode 100644
index 000000000..2faa9e4e5
--- /dev/null
+++ b/Assets/Scripts/Fishing2/System/Data/MapSystem.cs
@@ -0,0 +1,43 @@
+using System.Collections.Generic;
+using NBC;
+
+namespace NBF.Fishing2
+{
+    public static class MapSystem
+    {
+        /// <summary>
+        /// 获取一个单位
+        /// </summary>
+        /// <param name="self"></param>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public static Unit GetUnit(this Map self, long id)
+        {
+            return self.Units.GetValueOrDefault(id);
+        }
+
+        /// <summary>
+        /// 进入地图
+        /// </summary>
+        /// <param name="map"></param>
+        /// <param name="unit"></param>
+        /// <returns></returns>
+        public static async FTask<bool> Enter(this Map map, Unit unit)
+        {
+            await FTask.CompletedTask;
+            return true;
+        }
+
+        /// <summary>
+        /// 离开地图
+        /// </summary>
+        /// <param name="self"></param>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        public static async FTask<bool> Exit(this Map self, long id)
+        {
+            await FTask.CompletedTask;
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/System/Data/MapSystem.cs.meta b/Assets/Scripts/Fishing2/System/Data/MapSystem.cs.meta
new file mode 100644
index 000000000..bdf5c359c
--- /dev/null
+++ b/Assets/Scripts/Fishing2/System/Data/MapSystem.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 6e4715bc722c4438ae8603fab6232e81
+timeCreated: 1756049567
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/System/Data/UnitSystem.cs b/Assets/Scripts/Fishing2/System/Data/UnitSystem.cs
new file mode 100644
index 000000000..9cae15acb
--- /dev/null
+++ b/Assets/Scripts/Fishing2/System/Data/UnitSystem.cs
@@ -0,0 +1,15 @@
+namespace NBF.Fishing2
+{
+    public static class UnitSystem
+    {
+        public static UnitConfig Config(this Unit self)
+        {
+            return UnitConfig.Get(self.ConfigId);
+        }
+
+        public static UnitType Type(this Unit self)
+        {
+            return self.Config().Type;
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/System/Data/UnitSystem.cs.meta b/Assets/Scripts/Fishing2/System/Data/UnitSystem.cs.meta
new file mode 100644
index 000000000..0948c54cb
--- /dev/null
+++ b/Assets/Scripts/Fishing2/System/Data/UnitSystem.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1e34ab621bcb45b1af37fca0b06878bb
+timeCreated: 1756049584
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/System/Views.meta b/Assets/Scripts/Fishing2/System/Views.meta
new file mode 100644
index 000000000..35416fae9
--- /dev/null
+++ b/Assets/Scripts/Fishing2/System/Views.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f610539cbd2c43438067954ba6c2f148
+timeCreated: 1756049458
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/System/Views/UnitUnityComponentSystem.cs b/Assets/Scripts/Fishing2/System/Views/UnitUnityComponentSystem.cs
new file mode 100644
index 000000000..1d180367d
--- /dev/null
+++ b/Assets/Scripts/Fishing2/System/Views/UnitUnityComponentSystem.cs
@@ -0,0 +1,35 @@
+using NBC;
+using NBC.Entitas.Interface;
+using UnityEngine;
+
+namespace NBF.Fishing2
+{
+    public static partial class UnitUnityComponentSystem
+    {
+        public class UnitUnityComponentAwakeSystem : AwakeSystem<UnitUnityComponent>
+        {
+            protected override void Awake(UnitUnityComponent self)
+            {
+                Log.Info("UnitUnityComponentAwakeSystem");
+            }
+        }
+
+        public class UnitUnityComponentDestroySystem : DestroySystem<UnitUnityComponent>
+        {
+            protected override void Destroy(UnitUnityComponent self)
+            {
+                self.Animator = null;
+                self.GameObject = null;
+                self.Transform = null;
+            }
+        }
+
+        public static void SetGameObject(this UnitUnityComponent self, GameObject obj)
+        {
+            Log.Info("UnitUnityComponent SetGameObject");
+            self.GameObject = obj;
+            self.Transform = obj.transform;
+            self.Animator = obj.GetComponent<Animator>();
+        }
+    }
+}
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/System/Views/UnitUnityComponentSystem.cs.meta b/Assets/Scripts/Fishing2/System/Views/UnitUnityComponentSystem.cs.meta
new file mode 100644
index 000000000..f57c27aac
--- /dev/null
+++ b/Assets/Scripts/Fishing2/System/Views/UnitUnityComponentSystem.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: f218930cc1994aaf88752a49dc9aa4b1
+timeCreated: 1756049422
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Player.meta b/Assets/Scripts/Fishing2/Views.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Player.meta
rename to Assets/Scripts/Fishing2/Views.meta
diff --git a/Assets/Scripts/Fishing2/Player/Unit.meta b/Assets/Scripts/Fishing2/Views/Unit.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Player/Unit.meta
rename to Assets/Scripts/Fishing2/Views/Unit.meta
diff --git a/Assets/Scripts/Fishing2/Player/Unit/UnitHUDComponent.cs b/Assets/Scripts/Fishing2/Views/Unit/UnitHUDComponent.cs
similarity index 100%
rename from Assets/Scripts/Fishing2/Player/Unit/UnitHUDComponent.cs
rename to Assets/Scripts/Fishing2/Views/Unit/UnitHUDComponent.cs
diff --git a/Assets/Scripts/Fishing2/Player/Unit/UnitHUDComponent.cs.meta b/Assets/Scripts/Fishing2/Views/Unit/UnitHUDComponent.cs.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Player/Unit/UnitHUDComponent.cs.meta
rename to Assets/Scripts/Fishing2/Views/Unit/UnitHUDComponent.cs.meta
diff --git a/Assets/Scripts/Fishing2/Player/Unit/UnitUnityComponent.cs b/Assets/Scripts/Fishing2/Views/Unit/UnitUnityComponent.cs
similarity index 70%
rename from Assets/Scripts/Fishing2/Player/Unit/UnitUnityComponent.cs
rename to Assets/Scripts/Fishing2/Views/Unit/UnitUnityComponent.cs
index ab83f2801..93694e851 100644
--- a/Assets/Scripts/Fishing2/Player/Unit/UnitUnityComponent.cs
+++ b/Assets/Scripts/Fishing2/Views/Unit/UnitUnityComponent.cs
@@ -1,4 +1,6 @@
-using NBC.Entitas;
+using NBC;
+using NBC.Entitas;
+using NBC.Entitas.Interface;
 using UnityEngine;
 
 namespace NBF.Fishing2
@@ -11,5 +13,8 @@ namespace NBF.Fishing2
         public GameObject GameObject { get; set; }
 
         public Transform Transform { get; set; }
+
+        public Animator Animator { get; set; }
     }
+    
 }
\ No newline at end of file
diff --git a/Assets/Scripts/Fishing2/Player/Unit/UnitUnityComponent.cs.meta b/Assets/Scripts/Fishing2/Views/Unit/UnitUnityComponent.cs.meta
similarity index 100%
rename from Assets/Scripts/Fishing2/Player/Unit/UnitUnityComponent.cs.meta
rename to Assets/Scripts/Fishing2/Views/Unit/UnitUnityComponent.cs.meta
diff --git a/Assets/Scripts/UI/Login/LoginHelper.cs b/Assets/Scripts/UI/Login/LoginHelper.cs
index 0763a30f7..1dcdeb454 100644
--- a/Assets/Scripts/UI/Login/LoginHelper.cs
+++ b/Assets/Scripts/UI/Login/LoginHelper.cs
@@ -2,6 +2,7 @@
 using Assets.Scripts.Hotfix;
 using NBC;
 using NBC.Network;
+using NBF.Fishing2;
 
 namespace NBF
 {
@@ -13,6 +14,8 @@ namespace NBF
         {
             _session = Net.CreateSession("127.0.0.1:20001");
 
+            _session.Scene.AddComponent<UnitUnityComponent>();
+            
             var acc = account;
 
             // 发送登录的请求给服务器
diff --git a/Assets/Scripts/UI/Login/LoginPanel.cs b/Assets/Scripts/UI/Login/LoginPanel.cs
index 5569c677c..7fb78ba65 100644
--- a/Assets/Scripts/UI/Login/LoginPanel.cs
+++ b/Assets/Scripts/UI/Login/LoginPanel.cs
@@ -3,6 +3,8 @@
 using FairyGUI;
 using UnityEngine;
 using NBC;
+using NBC.Entitas;
+using NBF.Fishing2;
 using UIPanel = NBC.UIPanel;
 
 namespace NBF
@@ -18,7 +20,12 @@ namespace NBF
         {
             if (btn == BtnLogin)
             {
-                LoginHelper.Login(InputAccount.text).Coroutine();
+                var unitGameObject = new GameObject("Unit");
+                var unit = Entity.Create<Unit>(App.Main, true, true);
+                var unitUnity = unit.AddComponent<UnitUnityComponent>();
+                unitUnity.SetGameObject(unitGameObject);
+                // App.Main.add
+                // LoginHelper.Login(InputAccount.text).Coroutine();
             }
         }
     }
diff --git a/Config/fish-鱼.xlsx b/Config/fish-鱼.xlsx
index 3ae70f534..2345078b3 100644
Binary files a/Config/fish-鱼.xlsx and b/Config/fish-鱼.xlsx differ
diff --git a/Config/fishing gear-渔具.xlsx b/Config/fishing gear-渔具.xlsx
index c086f7921..e1fb0f36b 100644
Binary files a/Config/fishing gear-渔具.xlsx and b/Config/fishing gear-渔具.xlsx differ
diff --git a/Config/unit - 单位.xlsx b/Config/unit - 单位.xlsx
new file mode 100644
index 000000000..d3337655e
Binary files /dev/null and b/Config/unit - 单位.xlsx differ
diff --git a/Fishing2.sln.DotSettings.user b/Fishing2.sln.DotSettings.user
index d2d692fa0..60815a0bb 100644
--- a/Fishing2.sln.DotSettings.user
+++ b/Fishing2.sln.DotSettings.user
@@ -8,6 +8,7 @@
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003ACursor_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F021f30a9a92b48ce98ae6b39956dd76a1df600_003Fd0_003F709b15ec_003FCursor_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AExceptionDispatchInfo_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F314938d17f3848e8ac683e11b27f62ee46ae00_003F70_003F17d560d4_003FExceptionDispatchInfo_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AFullScreenMode_002Ecs_002Fl_003AC_0021_003FUsers_003Fbob_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F021f30a9a92b48ce98ae6b39956dd76a1df600_003F7c_003F0044d980_003FFullScreenMode_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
+	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AGameObject_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2025_002E1_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F021f30a9a92b48ce98ae6b39956dd76a1df600_003F28_003F384825fa_003FGameObject_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIconAttribute_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F021f30a9a92b48ce98ae6b39956dd76a1df600_003F6a_003F44c4467c_003FIconAttribute_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AIMGUIContainer_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003Fb4f75f0eb2d14004826911645c6175d61fbe00_003F49_003F22dd7281_003FIMGUIContainer_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
 	<s:String x:Key="/Default/CodeInspection/ExcludedFiles/FilesAndFoldersToSkip2/=7020124F_002D9FFC_002D4AC3_002D8F3D_002DAAB8E0240759_002Ff_003AKeyCode_002Ecs_002Fl_003AC_0021_003FUsers_003F60527_003FAppData_003FRoaming_003FJetBrains_003FRider2024_002E3_003Fresharper_002Dhost_003FDecompilerCache_003Fdecompiler_003F021f30a9a92b48ce98ae6b39956dd76a1df600_003Fd1_003F01a95d3a_003FKeyCode_002Ecs/@EntryIndexedValue">ForceIncluded</s:String>
diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset
index 728450c56..cf72c0c88 100644
--- a/ProjectSettings/QualitySettings.asset
+++ b/ProjectSettings/QualitySettings.asset
@@ -76,7 +76,7 @@ QualitySettings:
     globalTextureMipmapLimit: 0
     textureMipmapLimitSettings: []
     anisotropicTextures: 2
-    antiAliasing: 2
+    antiAliasing: 8
     softParticles: 0
     softVegetation: 1
     realtimeReflectionProbes: 1