新增逻辑

Tools/NetworkProtocol/Outer/GameMessage.proto

@@ -20,7 +20,7 @@ message Game2C_GetItemsResponse // ICustomRouteResponse
 ///请求使用物品
 message C2Game_UseItemRequest // ICustomRouteRequest,Game2C_UseItemResponse,GameRoute
 {
-
+	int64 ItemId = 1;//主物体id
 }
 
 ///请求使用物品响应

Tools/NetworkProtocol/Outer/MapMessage.proto

@@ -2,7 +2,7 @@ syntax = "proto3";
 package Fantasy.Network.Message;
 
 /// 请求创建房间
-message C2Map_CreateRoomRequest // ICustomRouteRequest,Map2C_CreateRoomResponse,MapRoute
+message C2Map_CreateRoomRequest // ICustomRouteRequest,Map2C_CreateRoomResponse,GameRoute
 {
     int32 MapId = 1;//地图id
 }
@@ -43,22 +43,11 @@ message G2C_EnterMapResponse // IResponse
 }
 
 
-// // 请求进入地图
-// message C2Map_EnterMapRequest // ICustomRouteRequest,Map2C_EnterMapResponse,MapRoute
-// {
-//     int32 MapId = 1;//地图id
-//     string RoomCode = 2;//房间id，如果是进入房间
-// }
 
 
-// message Map2C_EnterMapResponse // ICustomRouteResponse
-// {
-    
-// }
-
 
 /// 通知客户端切换地图
-message Map2C_ChangeMap // ICustomRouteMessage,MapRoute
+message Map2C_ChangeMap // ICustomRouteMessage,GameRoute
 {
 	int32 MapId = 1;	//地图id
 	int32 Node = 2;		//站位节点

Tools/NetworkProtocol/Outer/RoomMessage.proto

@@ -4,39 +4,56 @@ package Fantasy.Network.Message;
 
 //**************          进入 离开         **********************
 ///用户进入地图
-message Map2C_RoleEnterRoomNotify // ICustomRouteMessage,MapRoute
+message Map2C_RoleEnterRoomNotify // ICustomRouteMessage,GameRoute
 {
 	MapUnitInfo Info = 2;
 }
 
 ///用户离开地图
-message Map2C_RoleExitRoomNotify // ICustomRouteMessage,MapRoute
+message Map2C_RoleExitRoomNotify // ICustomRouteMessage,GameRoute
 {
 	int64 Id = 1;//离开人员
 }
 
+//**************          物品变化         **********************
+
+/// 请求拿起物品
+message C2Map_TakeItemRequest // ICustomRouteRequest,Map2C_TakeItemResponse,GameRoute
+{
+    int32 Id = 1;           //物品id
+    bool Task = 2;          //拿起
+}
+
+/// 请求拿起物品响应
+message Map2C_TakeItemResponse // ICustomRouteResponse
+{
+    int32 Id = 1;           //物品id
+    bool Task = 2;          //拿起
+}
+
+
 //**************          参数变化         **********************
-message C2Map_RolePropertyChange // ICustomRouteMessage,MapRoute
+message C2Map_RolePropertyChange // ICustomRouteMessage,GameRoute
 {
     repeated KeyValueInt64 Propertys = 1;      //变化的属性信息
 }
 
 ///玩家状态变化同步
-message Map2C_RoleStateNotify // ICustomRouteMessage,MapRoute
+message Map2C_RoleStateNotify // ICustomRouteMessage,GameRoute
 {
     int64 Id = 1;
     UnitStateInfo State = 2;
 }
 
 ///玩家钓组变化
-message Map2C_RoleGearChangeNotify // ICustomRouteMessage,MapRoute
+message Map2C_RoleGearChangeNotify // ICustomRouteMessage,GameRoute
 {
     int64 Id = 1;
     repeated GearInfo Gears = 2;    //钓组数据
 }
 
 //玩家属性值变化
-message Map2C_RolePropertyChangeNotify // ICustomRouteMessage,MapRoute
+message Map2C_RolePropertyChangeNotify // ICustomRouteMessage,GameRoute
 {
     int64 Id = 1;
     repeated KeyValueInt64 Propertys = 2;      //变化的属性信息
@@ -47,7 +64,7 @@ message Map2C_RolePropertyChangeNotify // ICustomRouteMessage,MapRoute
 //**************          移动 旋转         **********************
 
 // 角色移动
-message C2Map_Move // ICustomRouteMessage,MapRoute
+message C2Map_Move // ICustomRouteMessage,GameRoute
 {
     Vector3Info Position = 1;           //当前位置
     Vector3Info Rotation = 2;           //角色方向
@@ -58,14 +75,14 @@ message C2Map_Move // ICustomRouteMessage,MapRoute
 }
 
 // 角色朝向变化
-message C2Map_Look // ICustomRouteMessage,MapRoute
+message C2Map_Look // ICustomRouteMessage,GameRoute
 {
     Vector3Info Rotation = 1;    //角色方向
     int64 Timestamp = 2;            // 时间点
 }
 
 ///玩家移动推送
-message Map2C_MoveNotify // ICustomRouteMessage,MapRoute
+message Map2C_MoveNotify // ICustomRouteMessage,GameRoute
 {
     int64 Id = 1;                       // id
     Vector3Info Position = 2;           //当前位置
@@ -77,9 +94,11 @@ message Map2C_MoveNotify // ICustomRouteMessage,MapRoute
 }
 
 ///玩家旋转推送
-message Map2C_LookeNotify // ICustomRouteMessage,MapRoute
+message Map2C_LookeNotify // ICustomRouteMessage,GameRoute
 {
     int64 Id = 1;                       // id
     Vector3Info Rotation = 2;           //角色方向
     int64 Timestamp = 3;                // 时间点
-}
+}
+
+

Tools/NetworkProtocol/Outer/data/MapProtoData.proto

@@ -22,11 +22,13 @@ message QuaternionInfo
 ///玩家当前使用钓组信息
 message GearInfo
 {
-    int64 Rod = 1;
-    repeated int64 Rigs = 2;                //钓组配件
-    Vector3Info Position = 3;               //钓组当前位置
-    Vector3Info Rotation = 4;               //钓组方向
-    repeated KeyValueInt64 Propertys = 5;   //钓组参数信息
+    ItemInfo Item = 1;                           //主物品id
+    repeated ItemInfo Binds = 2;                //物品配件
+    Vector3Info Position = 3;               //物品当前位置
+    Vector3Info Rotation = 4;               //物品方向
+    repeated KeyValueInt64 Propertys = 5;   //物品参数信息
+    bool InUse = 6;                         //使用中
+    bool InHand = 7;                        //在手中
 }
 
 
@@ -43,7 +45,7 @@ message MapUnitInfo
     Vector3Info Position = 3;           //当前位置
     Vector3Info Rotation = 4;           //角色方向
     UnitStateInfo State = 5;            //状态信息
-    repeated GearInfo Gears = 6;                 //钓组数据
+    repeated GearInfo Gears = 6;        //钓组数据
     repeated KeyValueInt64 Propertys = 7;      //属性信息
 }
 

Tools/NetworkProtocol/RouteType.Config

@@ -1,5 +1,4 @@
 // Route协议定义(需要定义1000以上、因为1000以内的框架预留)
 GateRoute = 1001		// Gate
 SocialRoute = 1002		// Social
-GameRoute = 1003		// Game
-MapRoute = 1004         // 地图
+GameRoute = 1003		// Game