diff --git a/Config/NetworkProtocol/Outer/data/CommonProtoData.proto b/Config/NetworkProtocol/Outer/data/CommonProtoData.proto index 41a1b03..7bfbb9a 100644 --- a/Config/NetworkProtocol/Outer/data/CommonProtoData.proto +++ b/Config/NetworkProtocol/Outer/data/CommonProtoData.proto @@ -114,11 +114,4 @@ message SkillInfo int32 ConfigId = 1; //技能配置id int32 Level = 2; //技能等级 int32 Exp = 3; //技能经验 -} - -///玩家当前使用钓组信息 -message GearInfo -{ - int64 Rod = 1; - repeated int64 Rigs = 2; //钓组配件 } \ No newline at end of file diff --git a/Config/NetworkProtocol/Outer/data/MapProtoData.proto b/Config/NetworkProtocol/Outer/data/MapProtoData.proto index 74678d3..d695c99 100644 --- a/Config/NetworkProtocol/Outer/data/MapProtoData.proto +++ b/Config/NetworkProtocol/Outer/data/MapProtoData.proto @@ -19,14 +19,20 @@ message QuaternionInfo float w = 4; } -message UnitFishingInfo +///玩家当前使用钓组信息 +message GearInfo { - float LineLength = 1;//线长度 - float ReelSpeed = 2;//收线速度 - bool OpenLight = 3;//打开手电筒 - int RodSetting = 4; + int64 Rod = 1; + repeated int64 Rigs = 2; //钓组配件 + float LineLength = 3; //线长度 + float ReelSpeed = 4; //收线速度 + int32 State = 5; //杆子状态 + Vector3Info Position = 6; //钓组当前位置 + Vector3Info Rotation = 7; //钓组方向 } + + message UnitStateInfo { int32 State = 1; //状态id @@ -40,8 +46,8 @@ message MapUnitInfo Vector3Info Position = 3; //当前位置 Vector3Info Rotation = 4; //角色方向 UnitStateInfo State = 5; //状态信息 - GearInfo Gears = 6; //钓组数据 - UnitFishingInfo FishingInfo = 7; //钓鱼状态信息 - repeated KeyValueInt32 KV = 8; //属性信息 + GearInfo Gears = 7; //钓组数据 + UnitFishingInfo FishingInfo = 8; //钓鱼状态信息 + repeated KeyValueInt32 KV = 9; //属性信息 } diff --git a/Entity/Map/Entity/MapUnit.cs b/Entity/Map/Entity/MapUnit.cs index 93d6509..35e53c6 100644 --- a/Entity/Map/Entity/MapUnit.cs +++ b/Entity/Map/Entity/MapUnit.cs @@ -1,4 +1,5 @@ -using Fantasy.Entitas; +using Fantasy; +using Fantasy.Entitas; using Unity.Mathematics; namespace NB.Map; @@ -8,6 +9,11 @@ namespace NB.Map; /// public class MapUnit : Entity { + /// + /// 角色基础信息 + /// + public RoleSimpleInfo Info; + /// /// 位置 /// @@ -29,4 +35,9 @@ public class MapUnit : Entity public long RoomId; public long GateRouteId; + + /// + /// 钓组信息 + /// + public List Gears = new List(); } \ No newline at end of file diff --git a/Entity/Map/Entity/MapUnitGear.cs b/Entity/Map/Entity/MapUnitGear.cs new file mode 100644 index 0000000..56f85e6 --- /dev/null +++ b/Entity/Map/Entity/MapUnitGear.cs @@ -0,0 +1,42 @@ +using Fantasy.Entitas; +using Unity.Mathematics; + +namespace NB.Map; + +public enum MapGearState +{ + None = 0, + Take = 1, + Put = 2, +} + +/// +/// 钓组信息 +/// +public class MapUnitGear : Entity +{ + /// + /// 杆子 + /// + public long Rod; + + /// + /// 杆子配件 + /// + public List Rings = new List(); + + /// + /// 杆子状态 + /// + public MapGearState State; + + /// + /// 位置 + /// + public float3 Position; + + /// + /// 旋转 + /// + public float3 Rotation; +} \ No newline at end of file diff --git a/Main/Properties/launchSettings.json b/Main/Properties/launchSettings.json index c31a6c9..90a0233 100644 --- a/Main/Properties/launchSettings.json +++ b/Main/Properties/launchSettings.json @@ -3,7 +3,7 @@ "profiles": { "Main": { "commandName": "Project", -// "workingDirectory": "$(OutputPath)", + "workingDirectory": "$(OutputPath)", "environmentVariables": {}, "commandLineArgs": "--m Develop" }