Merge branch 'master' of https://git.bobsong.cn/Game/Fishing2Server

# Conflicts:
#	Config/NetworkProtocol/Outer/data/MapProtoData.proto
#	Entity/Generate/NetworkProtocol/MapProtoData.cs
#	Entity/Generate/NetworkProtocol/OuterOpcode.cs

Config/NetworkProtocol/Outer/GameMessage.proto

@@ -1,3 +1,86 @@
 syntax = "proto3";
 package Fantasy.Network.Message;
 
+////////////// ********  物品信息 *******/////////////
+
+///请求背包列表
+message C2Game_GetItemsRequest // ICustomRouteRequest,Game2C_GetItemsResponse,GameRoute
+{
+
+}
+
+///请求背包列表响应
+message Game2C_GetItemsResponse // ICustomRouteResponse
+{
+	repeated ItemInfo Items = 1;        //物品信息
+    repeated ItemBindInfo Rigs = 2;     //钓组信息
+}
+
+///请求使用物品
+message C2Game_UseItemRequest // ICustomRouteRequest,Game2C_UseItemResponse,GameRoute
+{
+
+}
+
+///请求使用物品响应
+message Game2C_UseItemResponse // ICustomRouteResponse
+{
+}
+
+///物品变化
+message Game2C_ItemChange // ICustomRouteMessage,GameRoute
+{
+	int32 Type = 1;                 //变化类型 0.新增 1,更新 -1删除
+	repeated ItemInfo Items = 2;    //物品信息
+    repeated int64 Removes = 3;     //移除物品(移除时有)
+}
+
+
+////////////// ********  鱼护 *******/////////////
+
+///请求鱼护列表
+message C2Game_GetFishsRequest // ICustomRouteRequest,Game2C_GetFishsResponse,GameRoute
+{
+
+}
+
+///请求鱼护列表响应
+message Game2C_GetFishsResponse // ICustomRouteResponse
+{
+	repeated FishInfo Fishs = 1;
+}
+
+///鱼护变化
+message Game2C_FishChange // ICustomRouteMessage,GameRoute
+{
+	int32 Type = 1;                 //变化类型 0.新增 1,更新 -1删除
+	repeated FishInfo Fishs = 2;    //物品信息
+    repeated int64 Removes = 3;     //移除物品(移除时有)
+}
+
+///请求出售
+message C2Game_SellFishRequest // ICustomRouteRequest,Game2C_SellFishResponse,GameRoute
+{
+    repeated int64 Ids = 1;     //出售id
+}
+
+///请求出售响应
+message Game2C_SellFishResponse // ICustomRouteResponse
+{
+	repeated AwardInfo Awards = 1; //奖励
+}
+
+
+////////////// ********  商店 *******/////////////
+
+///请求购买
+message C2Game_BuyRequest // ICustomRouteRequest,Game2C_GetFishsResponse,GameRoute
+{
+
+}
+
+///请求购买响应
+message Game2C_BuyResponse // ICustomRouteResponse
+{
+	repeated AwardInfo Awards = 1; //奖励
+}

Config/NetworkProtocol/Outer/RoomMessage.proto

@@ -72,7 +72,8 @@ message Map2C_MoveNotify // ICustomRouteMessage,MapRoute
     Vector3Info Rotation = 3;           //角色方向
     Vector3Info Direction = 4;          // 移动方向
     bool IsStop = 5;                    // 是否停止移动
-    int64 Timestamp = 6;                // 时间点
+    bool IsRun = 6;                     //是否奔跑
+    int64 Timestamp = 7;                // 时间点
 }
 
 ///玩家旋转推送

Config/NetworkProtocol/Outer/data/CommonProtoData.proto

@@ -28,13 +28,13 @@ message RoleInfo
     RoleBaseInfo BaseInfo = 1;
     int64 RoleId = 2;                       //账号id
     repeated ItemInfo Items = 3;            //身上物品
-    repeated FishInfo Fishs = 4;            //鱼护
-    repeated ActivityInfo Activities = 5;   //活动信息
-    repeated KeyValueInt64 Currency = 6;    //货币信息
-    repeated KeyValueInt64 Slots = 7;       //插槽使用情况
-    repeated SkillInfo Skills = 8;          //技能信息
-    repeated GearInfo Gears = 9;            //钓组信息
-    int32 MapId = 9;                        //当前所在地图
+    repeated ItemBindInfo ItemBinds = 4;    //物品绑定信息
+    repeated FishInfo Fishs = 5;            //鱼护
+    repeated ActivityInfo Activities = 6;   //活动信息
+    repeated KeyValueInt64 Currency = 7;    //货币信息
+    repeated KeyValueInt64 Slots = 8;       //插槽使用情况
+    repeated SkillInfo Skills = 9;          //技能信息
+    int32 MapId = 10;                       //当前所在地图
 }
 
 /// 角色信息
@@ -64,6 +64,12 @@ message AwardInfo
     int32 Count = 2;                //数量
 }
 
+///玩家当前使用钓组信息
+message ItemBindInfo
+{
+    int64 Item = 1;                     //主物品
+    repeated int64 BindItems = 2;       //绑定物品
+}
 ///物品信息
 message ItemInfo
 {