提交代码

2025-12-22 17:05:54 +08:00
parent afb4f0d765
commit 384f11f620
26 changed files with 41 additions and 144 deletions
--- a/Assets/Scripts/Fishing2/Unit/Event/SetUnitGearEvent.cs
+++ b/Assets/Scripts/Fishing2/Unit/Event/SetUnitGearEvent.cs
@@ -1,7 +0,0 @@
-namespace NBF.Fishing2
-{
-    public struct UseGearEvent
-    {
-        public UnitGearComponent Gear;
-    }
-}
--- a/Assets/Scripts/Fishing2/Unit/Event/SetUnitGearEvent.cs.meta
+++ b/Assets/Scripts/Fishing2/Unit/Event/SetUnitGearEvent.cs.meta
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 6172898013ee4551afc0686399136d8f
-timeCreated: 1765523056
--- a/Assets/Scripts/Fishing2/Unit/Gear/Child.meta
+++ b/Assets/Scripts/Fishing2/Unit/Gear/Child.meta
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 629d828f3fc74ce78482025124c31f85
-timeCreated: 1756047176
--- a/Assets/Scripts/Fishing2/Unit/Gear/Child/GearBaitComponent.cs
+++ b/Assets/Scripts/Fishing2/Unit/Gear/Child/GearBaitComponent.cs
@@ -1,9 +0,0 @@
-using Fantasy.Entitas;
-
-namespace NBF.Fishing2
-{
-    public class GearBaitComponent : Entity
-    {
-        public int ConfigId;
-    }
-}
--- a/Assets/Scripts/Fishing2/Unit/Gear/Child/GearBaitComponent.cs.meta
+++ b/Assets/Scripts/Fishing2/Unit/Gear/Child/GearBaitComponent.cs.meta
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: ee9d5fa0951c490fafb108bfb3e1d496
-timeCreated: 1756047193
--- a/Assets/Scripts/Fishing2/Unit/Gear/Child/GearBobberComponent.cs
+++ b/Assets/Scripts/Fishing2/Unit/Gear/Child/GearBobberComponent.cs
@@ -1,9 +0,0 @@
-using Fantasy.Entitas;
-
-namespace NBF.Fishing2
-{
-    public class GearBobberComponent : Entity
-    {
-        public int ConfigId;
-    }
-}
--- a/Assets/Scripts/Fishing2/Unit/Gear/Child/GearBobberComponent.cs.meta
+++ b/Assets/Scripts/Fishing2/Unit/Gear/Child/GearBobberComponent.cs.meta
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 3f772262a6ee45ebaa276d716c191ddd
-timeCreated: 1756047151
--- a/Assets/Scripts/Fishing2/Unit/Gear/Child/GearHookComponent.cs
+++ b/Assets/Scripts/Fishing2/Unit/Gear/Child/GearHookComponent.cs
@@ -1,9 +0,0 @@
-using Fantasy.Entitas;
-
-namespace NBF.Fishing2
-{
-    public class GearHookComponent : Entity
-    {
-        public int ConfigId;
-    }
-}
--- a/Assets/Scripts/Fishing2/Unit/Gear/Child/GearHookComponent.cs.meta
+++ b/Assets/Scripts/Fishing2/Unit/Gear/Child/GearHookComponent.cs.meta
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 601122a982d048789ee9131376c72158
-timeCreated: 1756047164
--- a/Assets/Scripts/Fishing2/Unit/Gear/Child/GearLineComponent.cs
+++ b/Assets/Scripts/Fishing2/Unit/Gear/Child/GearLineComponent.cs
@@ -1,9 +0,0 @@
-using Fantasy.Entitas;
-
-namespace NBF.Fishing2
-{
-    public class GearLineComponent : Entity
-    {
-        public int ConfigId;
-    }
-}
--- a/Assets/Scripts/Fishing2/Unit/Gear/Child/GearLineComponent.cs.meta
+++ b/Assets/Scripts/Fishing2/Unit/Gear/Child/GearLineComponent.cs.meta
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 3e1209cd4f4242c2af9fbfbbb7480f6b
-timeCreated: 1756047232
--- a/Assets/Scripts/Fishing2/Unit/Gear/Child/GearLureComponent.cs
+++ b/Assets/Scripts/Fishing2/Unit/Gear/Child/GearLureComponent.cs
@@ -1,9 +0,0 @@
-using Fantasy.Entitas;
-
-namespace NBF.Fishing2
-{
-    public class GearLureComponent : Entity
-    {
-        public int ConfigId;
-    }
-}
--- a/Assets/Scripts/Fishing2/Unit/Gear/Child/GearLureComponent.cs.meta
+++ b/Assets/Scripts/Fishing2/Unit/Gear/Child/GearLureComponent.cs.meta
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 5537f49777ef40f0adeb36bb7687356d
-timeCreated: 1756047207
--- a/Assets/Scripts/Fishing2/Unit/Gear/Child/GearReelComponent.cs
+++ b/Assets/Scripts/Fishing2/Unit/Gear/Child/GearReelComponent.cs
@@ -1,9 +0,0 @@
-using Fantasy.Entitas;
-
-namespace NBF.Fishing2
-{
-    public class GearReelComponent : Entity
-    {
-        public int ConfigId;
-    }
-}
--- a/Assets/Scripts/Fishing2/Unit/Gear/Child/GearReelComponent.cs.meta
+++ b/Assets/Scripts/Fishing2/Unit/Gear/Child/GearReelComponent.cs.meta
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 60c6ee2c8c084dd29267b0653a1a239d
-timeCreated: 1756047139
--- a/Assets/Scripts/Fishing2/Unit/Gear/Child/GearRodComponent.cs
+++ b/Assets/Scripts/Fishing2/Unit/Gear/Child/GearRodComponent.cs
@@ -1,9 +0,0 @@
-using Fantasy.Entitas;
-
-namespace NBF.Fishing2
-{
-    public class GearRodComponent : Entity
-    {
-        public int ConfigId;
-    }
-}
--- a/Assets/Scripts/Fishing2/Unit/Gear/Child/GearRodComponent.cs.meta
+++ b/Assets/Scripts/Fishing2/Unit/Gear/Child/GearRodComponent.cs.meta
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 8a353dda940c4dd9bddcf7420d1c2108
-timeCreated: 1756047099
--- a/Assets/Scripts/Fishing2/Unit/Gear/Child/GearWeightComponent.cs
+++ b/Assets/Scripts/Fishing2/Unit/Gear/Child/GearWeightComponent.cs
@@ -1,9 +0,0 @@
-using Fantasy.Entitas;
-
-namespace NBF.Fishing2
-{
-    public class GearWeightComponent : Entity
-    {
-        public int ConfigId;
-    }
-}
--- a/Assets/Scripts/Fishing2/Unit/Gear/Child/GearWeightComponent.cs.meta
+++ b/Assets/Scripts/Fishing2/Unit/Gear/Child/GearWeightComponent.cs.meta
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 82411b517dd84b9ca7839a4ddb486a66
-timeCreated: 1756047222
--- a/Assets/Scripts/Fishing2/Unit/Gear/MapUnitGear.cs
+++ b/Assets/Scripts/Fishing2/Unit/Gear/MapUnitGear.cs
@@ -0,0 +1,16 @@
+using System.Collections.Generic;
+using Fantasy.Entitas;
+
+namespace NBF.Fishing2
+{
+    /// <summary>
+    /// 玩家组件
+    /// </summary>
+    public class MapUnitGear : Entity
+    {
+        /// <summary>
+        /// 绑定的子组件
+        /// </summary>
+        public List<MapUnitGearPart> Binding = new List<MapUnitGearPart>();
+    }
+}
--- a/Assets/Scripts/Fishing2/Unit/Gear/MapUnitGear.cs.meta
+++ b/Assets/Scripts/Fishing2/Unit/Gear/MapUnitGear.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 01c5cf0e015042fbae5000cff14bb419
+timeCreated: 1766325287
--- a/Assets/Scripts/Fishing2/Unit/Gear/MapUnitGearPart.cs
+++ b/Assets/Scripts/Fishing2/Unit/Gear/MapUnitGearPart.cs
@@ -0,0 +1,12 @@
+using Fantasy.Entitas;
+
+namespace NBF.Fishing2
+{
+    public class MapUnitGearPart : Entity
+    {
+        /// <summary>
+        /// 配置表id
+        /// </summary>
+        public int ConfigId { get; set; }
+    }
+}
--- a/Assets/Scripts/Fishing2/Unit/Gear/MapUnitGearPart.cs.meta
+++ b/Assets/Scripts/Fishing2/Unit/Gear/MapUnitGearPart.cs.meta
@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a83db5681be745a3b692da5c82496a40
+timeCreated: 1766325663
--- a/Assets/Scripts/Fishing2/Unit/Gear/UnitGearComponent.cs
+++ b/Assets/Scripts/Fishing2/Unit/Gear/UnitGearComponent.cs
@@ -1,31 +0,0 @@
-using NBC;
-using Fantasy.Entitas;
-
-namespace NBF.Fishing2
-{
-    /// <summary>
-    /// 钓组组件
-    /// </summary>
-    public class UnitGearComponent : Entity
-    {
-        /// <summary>
-        /// 线长度
-        /// </summary>
-        public float LineLength { get; set; }
-
-        /// <summary>
-        /// 旋转速度
-        /// </summary>
-        public float ReelSpeed { get; set; }
-
-        /// <summary>
-        /// 鱼竿设置
-        /// </summary>
-        public int RedSetting { get; set; }
-
-        /// <summary>
-        /// 是否拿在手里
-        /// </summary>
-        public bool InHand { get; set; }
-    }
-}
--- a/Assets/Scripts/Fishing2/Unit/Gear/UnitGearComponent.cs.meta
+++ b/Assets/Scripts/Fishing2/Unit/Gear/UnitGearComponent.cs.meta
@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 3c9a70a1145b41e2ad6c57384d7c922c
-timeCreated: 1755921173
--- a/Assets/Scripts/Fishing2/Unit/MapUnit.cs
+++ b/Assets/Scripts/Fishing2/Unit/MapUnit.cs
@@ -1,4 +1,5 @@
-using Fantasy;
+using System.Collections.Generic;
+using Fantasy;
 using Fantasy.Async;
 using NBC;
 using Fantasy.Entitas;
@@ -15,6 +16,11 @@ namespace NBF.Fishing2
    {
        public int ConfigId { get; set; } //配置表id

+        /// <summary>
+        /// 钓组信息
+        /// </summary>
+        public List<MapUnitGear> Gears = new List<MapUnitGear>();
+
        /// <summary>
        /// 是否在地面
        /// </summary>