上传代码

2022-10-13 13:48:48 +08:00 · 2022-10-13 13:48:48 +08:00 · ecc38d841e
commit ecc38d841e
parent b70da778cf
39 changed files with 2310 additions and 582 deletions
--- a/src/pb/proto.js
+++ b/src/pb/proto.js
--- a/src/pb/proto/battle_db.proto
+++ b/src/pb/proto/battle_db.proto
@ -11,9 +11,12 @@ enum BattleType {

 //玩法类型
 enum PlayType {
-  mainline = 0;    //主线玩法
-  pagoda = 1;      //爬塔
-  moonfantasy = 2; //月之秘境
+  moonfantasy = 0; //月之秘境
+  mainline = 1;    //主线玩法
+  pagoda = 2;      //爬塔
+  viking = 3;      //远征
+  rtask = 4;       //随机任务
+  hunting = 5;     //狩猎
 }

 //战斗状态
@ -29,23 +32,38 @@ enum DBBattleComp {
  bule = 2; //蓝方
 }

+message BattleRole {
+  int32 tid = 1;           // 临时id
+  string oid = 2;          // 玩家英雄数据库id
+  int32 pos = 3;           // 站位坐标
+  string heroID = 4;       //@go_tags(`bson:"heroID"`) 英雄的配置表ID
+  int32 star = 5;          // 英雄星级
+  int32 lv = 6;            // 英雄等级
+  int32 captainSkill = 7;  //@go_tags(`bson:"captainSkill"`) 队长技能
+  int32 mainSuitSkill = 8; ///@go_tags(`bson:"mainSuitSkill"`)  主套装技能
+  int32 subSuitSkill = 9;  ///@go_tags(`bson:"subSuitSkill"`)  副套装技能
+  repeated SkillData normalSkill = 10; //@go_tags(`bson:"normalSkill"`) 普通技能
+  map<string, int32> property = 11; // 属性相关
+}
+
 //战斗阵型信息
 message DBBattleFormt {
  int32 leadpos = 1; //队长位置
-  repeated DBHero team = 2;
+  repeated BattleRole team = 2;
 }

 //战斗记录
 message DBBattleRecord {
  string id = 1;                          //战斗记录id
-  BattleType btype = 2;                   //战斗类型
-  PlayType ptype = 3;                     //玩法类型
-  string plevel = 4;                      //玩法关卡
-  BBattleState state = 5;                 //战斗状态
-  string redCompId = 6;                   //红方阵营id
-  repeated DBBattleFormt redflist = 7;    //红方阵型列表
-  string blueCompId = 8;                  //蓝方阵营id
-  repeated DBBattleFormt buleflist = 9;   //红方阵型列表
-  repeated DBBattleComp roundresult = 10; //战斗场次结果
-  DBBattleComp result = 11;               //最终结果
+  string title = 2;                       //战斗标题
+  BattleType btype = 3;                   //战斗类型
+  PlayType ptype = 4;                     //玩法类型
+  string plevel = 5;                      //玩法关卡
+  BBattleState state = 6;                 //战斗状态
+  string redCompId = 7;                   //红方阵营id
+  repeated DBBattleFormt redflist = 8;    //红方阵型列表
+  string blueCompId = 9;                  //蓝方阵营id
+  repeated DBBattleFormt buleflist = 10;  //红方阵型列表
+  repeated DBBattleComp roundresult = 11; //战斗场次结果
+  DBBattleComp result = 12;               //最终结果
 }
--- a/src/pb/proto/battle_msg.proto
+++ b/src/pb/proto/battle_msg.proto
@ -1,25 +1,35 @@
 syntax = "proto3";
 option go_package = ".;pb";
 import "battle_db.proto";
+message LineUp {
+  string cid = 1; // 配置表id
+  int32 star = 2; // 星级
+  int32 lv = 3;   // 等级
+}

 // pve 战斗创建请求       (此请求 为服务端间使用 客户端可忽略)
 message BattlePVEReq {
  PlayType ptype = 1;          //玩法类型
-  int32 leadpos = 2;           //队长位置
-  repeated string teamids = 3; //阵容信息
-  repeated int32 mformat = 4;  //敌方增容信息
+  string title = 2;            //战斗标题
+  int32 leadpos = 3;           //队长位置
+  repeated string teamids = 4; //阵容信息
+  repeated int32 mformat = 5;  //敌方增容信息
 }

 //战斗开始推送
 message BattleInfo {
  string id = 1;                        //战斗id
-  BattleType btype = 2;                 //战斗类型
-  PlayType ptype = 3;                   //玩法类型
-  string redCompId = 4;                 //红方阵营id
-  repeated DBBattleFormt redflist = 5;  //红方阵型列表
-  string blueCompId = 6;                //蓝方阵营id
-  repeated DBBattleFormt buleflist = 7; //红方阵型列表
+  string title = 2;                     //战斗标题
+  BattleType btype = 3;                 //战斗类型
+  PlayType ptype = 4;                   //玩法类型
+  string redCompId = 5;                 //红方阵营id
+  repeated DBBattleFormt redflist = 6;  //红方阵型列表
+  string blueCompId = 7;                //蓝方阵营id
+  repeated DBBattleFormt buleflist = 8; //红方阵型列表
 }

 //战报数据
-message BattleReport {}
+message BattleReport {
+  BattleInfo info = 1;
+  int32 Costtime = 2; //战斗时长 单位ms
+}
--- a/src/pb/proto/chat_db.proto
+++ b/src/pb/proto/chat_db.proto
@ -11,8 +11,12 @@ enum ChatChannel {

 //聊天消息类型
 enum ChatType {
-  Text = 0;        //文泵聊天消息
-  Moonfantasy = 1; //月子秘境消息
+  Text = 0;           //文泵聊天消息
+  Moonfantasy = 1;    //月子秘境消息
+  Share = 2;          //分享类型
+  HeroShare = 3;      //英雄分享
+  EquipmentShare = 4; //装备分享
+  ItemShare = 5;      //道具分享
 }

 message DBChat {
@ -32,4 +36,5 @@ message DBChat {
  int64 appendInt = 14;    //@go_tags(`bson:"appendInt"`) 聊天附加数据
  string appendStr = 15;   //@go_tags(`bson:"appendStr"`) 聊天附加数据
  string appendBool = 16;  //@go_tags(`bson:"appendBool"`) 聊天附加数据
+  bytes appendBytes = 17;  //@go_tags(`bson:"appendInt"`) 聊天附加数据
 }
--- a/src/pb/proto/chat_msg.proto
+++ b/src/pb/proto/chat_msg.proto
@ -3,51 +3,75 @@ option go_package = ".;pb";
 import "chat_db.proto";

 //聊天消息推送
-message ChatMessagePush{
-    DBChat chat = 1;
-}
+message ChatMessagePush { DBChat chat = 1; }

 //申请跨服频道号
-message ChatCrossChannelReq {
-
-}
+message ChatCrossChannelReq {}
 //申请跨服频道号 回应
-message ChatCrossChannelResp {
-    int32 channelId = 1;
-}
+message ChatCrossChannelResp { int32 channelId = 1; }

 //申请切换频道
-message ChatChanageChannelReq {
-    int32 channelId = 1;
-}
+message ChatChanageChannelReq { int32 channelId = 1; }
 //申请切换频道 回应
 message ChatChanageChannelResp {
-    int32 channelId = 1;
-    bool isSucc = 2;
+  int32 channelId = 1;
+  bool isSucc = 2;
 }

 //请求聊天消息
 message ChatGetListReq {
-    ChatChannel channel = 1;    //频道
-    int32 channelId = 2;        //跨服频道id
+  ChatChannel channel = 1; //频道
+  int32 channelId = 2;     //跨服频道id
 }

 //请求聊天消息 回应
-message ChatGetListResp {
-    repeated DBChat chats = 1;
+message ChatGetListResp { repeated DBChat chats = 1; }
+
+//跨服请求聊天消息
+message ChatGetCrossListReq {
+  ChatChannel channel = 1; //频道
+  int32 channelId = 2;     //跨服频道id
 }

+//跨服请求聊天消息 回应
+message ChatGetCrossListResp { repeated DBChat chats = 1; }
+
 //消息发送请求
 message ChatSendReq {
-    string avatar = 1;              //用户头像
-    string uname = 2;               //用户名
-    int32 ulv = 3;                  //用户等级
-    ChatChannel channel = 4;        //频道
-    string targetId = 5;            //目标用户id
-    string content = 6;             //内容
+  string avatar = 1;       //用户头像
+  string uname = 2;        //用户名
+  int32 ulv = 3;           //用户等级
+  ChatChannel channel = 4; //频道
+  string targetId = 5;     //目标用户id
+  ChatType ctype = 6;      //消息类型
+  string content = 7;      //内容
+  int64 appendInt = 8;     //@go_tags(`bson:"appendInt"`) 聊天附加数据
+  string appendStr = 9;    //@go_tags(`bson:"appendStr"`) 聊天附加数据
+  string appendBool = 10;  //@go_tags(`bson:"appendBool"`) 聊天附加数据
+  bytes appendBytes = 11;  //@go_tags(`bson:"appendInt"`) 聊天附加数据
 }

 //消息发送请求 回应
 message ChatSendResp {
-    bool issucc = 1;                //是否成功
+  bool issucc = 1; //是否成功
+}
+
+//跨服消息发送请求
+message ChatSendCrossReq {
+  string avatar = 1;       //用户头像
+  string uname = 2;        //用户名
+  int32 ulv = 3;           //用户等级
+  ChatChannel channel = 4; //频道
+  string targetId = 5;     //目标用户id
+  ChatType ctype = 6;      //消息类型
+  string content = 7;      //内容
+  int64 appendInt = 8;     //@go_tags(`bson:"appendInt"`) 聊天附加数据
+  string appendStr = 9;    //@go_tags(`bson:"appendStr"`) 聊天附加数据
+  string appendBool = 10;  //@go_tags(`bson:"appendBool"`) 聊天附加数据
+  bytes appendBytes = 11;  //@go_tags(`bson:"appendInt"`) 聊天附加数据
+}
+
+//跨服消息发送请求 回应
+message ChatSendCrossResp {
+  bool issucc = 1; //是否成功
 }
--- a/src/pb/proto/comm.proto
+++ b/src/pb/proto/comm.proto
@ -65,6 +65,15 @@ message BroadCastMessageReq {
 //关闭用户代理
 message AgentCloseeReq { string UserSessionId = 1; }

+//通知用户登录
+message NoticeUserLoginReq {
+  string Ip = 1;
+  string UserSessionId = 2;
+  string UserId = 3;
+  string ServiceTag = 4;
+  string GatewayServiceId = 5;
+}
+
 //通知用户离线
 message NoticeUserCloseReq {
  string Ip = 1;
@ -93,4 +102,10 @@ message UserAssets {
 message TaskParam {
  int32 first = 1;  //限定条件
  int32 second = 2; //次数
+}
+
+message RtaskParam {
+  int32 param1 = 1;
+  int32 param2 = 2;
+  int32 param3 = 3;
 }
--- a/src/pb/proto/errorcode.proto
+++ b/src/pb/proto/errorcode.proto
@ -25,21 +25,24 @@ enum ErrorCode {
  ResNoEnough = 102;            //资源不足
  ConfigurationException = 103; //配置异常
  ConfigNoFound = 104;          //配置未找到
+  UserLogined = 105;            //已在其它终端登录

  // user
-  SecKeyInvalid = 1000;     //秘钥无效
-  SecKey = 1001;            //秘钥格式错误
-  BindUser = 1002;          //用户绑定错误
-  GoldNoEnough = 1003;      // 金币不足
-  DiamondNoEnough = 1004;   // 钻石不足
-  RoleCreated = 1005;       //已创角
-  UserNickNameExist = 1006; //昵称已存在
-  VeriCodeNoValid = 1007;   //验证码无效
-  VeriCodeExpired = 1008;   //验证码过期
-  UserResetData = 1009;     //初始化用户失败
-  UserModiNameCount = 1010; //名称修改次数不足
-  UserNickNameEmpty = 1011; //昵称空
-  UserExpandNull = 1012;    //扩展数据空
+  SecKeyInvalid = 1000;      //秘钥无效
+  SecKey = 1001;             //秘钥格式错误
+  BindUser = 1002;           //用户绑定错误
+  GoldNoEnough = 1003;       // 金币不足
+  DiamondNoEnough = 1004;    // 钻石不足
+  RoleCreated = 1005;        //已创角
+  UserNickNameExist = 1006;  //昵称已存在
+  VeriCodeNoValid = 1007;    //验证码无效
+  VeriCodeExpired = 1008;    //验证码过期
+  UserResetData = 1009;      //初始化用户失败
+  UserModiNameCount = 1010;  //名称修改次数不足
+  UserNickNameEmpty = 1011;  //昵称空
+  UserExpandNull = 1012;     //扩展数据空
+  UserExpNoEnough = 1013;    //经验不足
+  UserFriendNoEnough = 1014; //友情点不足

  // friend
  FriendNotSelf = 1100;         //不能是自己
@ -58,6 +61,7 @@ enum ErrorCode {
  FriendZanreceived = 1113;     //已领取点赞
  FriendZanSelf = 1114;         //不能给自己点赞
  FriendPointLimit = 1115;      //友情点上线
+  FriendNoreceived = 1116;      //未更换助战没有可领取的奖励

  // item
  ItemsNoEnough = 1200;        //背包物品不足
@ -65,6 +69,7 @@ enum ErrorCode {
  ItemsGridNumUpper = 1202;    //背包格子数量已达上限
  ItemsGirdAmountUpper = 1203; //背包格子容量已达上限
  ItemsUseNotSupported = 1204; //暂不支持使用
+  ItemsUseNoCanSell = 1205;    //道具不支持出售

  // hero
  HeroNoExist = 1300;             //英雄不存在
@ -97,6 +102,7 @@ enum ErrorCode {
  EquipmentOnFoundEquipment = 1400; // 未找到武器
  EquipmentLvlimitReached = 1401;   // 武器等级已达上限
  EquipmentIsWorn = 1402;           // 武器已经穿戴
+  EquipmentNoCanSell = 1403;        // 装备不能出售

  // mainMainline
  MainlineNotFindChapter = 1500; // 没有找到主线关卡信息
@ -134,14 +140,49 @@ enum ErrorCode {
  MartialhallNotUnlocked = 2000; //没有解锁
  MartialhallInUse = 2001;       //已经在使用
  MartialhallUnlocked = 2002;    //已解锁
+  MartialhallNoUnlocked = 2003;  //有未解锁柱子
+
  // 美食馆
  GourmetMoreOrderTime = 2101; // 超过订单时长
  GourmetSkillMaxLv = 2102;    // 技能已经达到满级

  // rtask
-  RtaskFinished = 2201;    //任务已完成
-  RtaskUnFinished = 2202;  //任务未完成
-  RtaskNoRtask = 2203;     //任务未开启
-  RtaskRewarded = 2204;    //已获取奖励
-  RtaskPreNoFinish = 2205; //前置未完成
+  RtaskFinished = 2201;     //任务已完成
+  RtaskUnFinished = 2202;   //任务未完成
+  RtaskNoRtask = 2203;      //任务未开启
+  RtaskRewarded = 2204;     //已获取奖励
+  RtaskPreNoFinish = 2205;  //前置未完成
+  RtaskCondiNoReach = 2206; //未达到限定条件
+  RtaskNoLastOne = 2207;    //不是最后一个任务
+  RtaskCondiNoFound = 2208; //未找到符合的条件配置
+
+  // viking
+  VikingLvErr = 2301;             // 关卡难度不匹配
+  VikingBoosType = 2302;          // BOSS 类型不对
+  VikingBuyMaxCount = 2303;       // 购买达到最大次数
+  VikingMaxChallengeCount = 2304; // 挑战达到最大次数
+
+  // moonfantasy  月之秘境
+  MoonfantasyHasExpired = 2401;       // boos 连接已失效
+  MoonfantasyJoinUp = 2402;           // boos 参与人数已达上限
+  MoonfantasyDareUp = 2403;           // boos 挑战次数已达上限
+  MoonfantasyBattleNoEnd = 2404;      // boos 战斗未结束
+  MoonfantasyBattleNoWin = 2405;      // boos 战斗魏未胜利
+  MoonfantasyNoJoin = 2406;           // boos 未加入战斗序列
+  MoonfantasyNotEnoughbattles = 2407; // boos 挑战次数不足
+
+  BattleNoFoundRecord = 2501; // 未找到记录
+
+  LinestoryTaskFinished = 2601;      //任务已完成
+  LinestorySubTaskFinished = 2602;   //子任务已完成
+  LinestoryTaskDisabledEnter = 2603; //禁止进入
+  LinestoryPreTaskNoFinished = 2604; //前置任务未完成
+
+  // hunting
+  HuntingLvErr = 2701;             // 关卡难度不匹配
+  HuntingBoosType = 2702;          // BOSS 类型不对
+  HuntingBuyMaxCount = 2703;       // 购买达到最大次数
+  HuntingMaxChallengeCount = 2704; // 挑战达到最大次数
+  // library
+  LibraryMaxLv = 2801; // 达到最大等级
 }
--- a/src/pb/proto/forum_msg.proto
+++ b/src/pb/proto/forum_msg.proto
@ -3,46 +3,53 @@ option go_package = ".;pb";
 import "forum_db.proto";
 import "hero_db.proto";

+
 //获取评论列表
 message ForumGetListReq {
-  string herocid = 1; //英雄配置id
+    string herocid = 1;         //英雄配置id
 }

 //获取评论回应
-message ForumGetListResp { repeated DBComment comment = 1; }
+message ForumGetListResp {
+    repeated DBComment comment = 1; 
+}

 //发布评论请求
 message ForumReleaseCommentReq {
-  string avatar = 1;  //用户头像
-  string uname = 2;   //用户名
-  string herocid = 3; //英雄的配置id
-  string herooid = 4; //英雄的实例id
-  string content = 5; //评论内容
+    string avatar = 1;               //用户头像
+    string uname = 2;               //用户名
+    string herocid = 3;             //英雄的配置id
+    string herooid = 4;             //英雄的实例id
+    string content = 5;             //评论内容
 }

 //发布评论回应
-message ForumReleaseCommentResp { DBComment comment = 1; }
+message ForumReleaseCommentResp {
+    DBComment comment = 1; 
+}

 //查看英雄信息请求
 message ForumWatchHeroReq {
-  string uid = 1;     //用户id
-  string stag = 2;    //区服id
-  string herocId = 3; //用户cid
-  string herooId = 4; //英雄实例id
+    string uid  = 1;            //用户id
+    string stag = 2;            //区服id
+    string herocId = 3;         //用户cid
+    string herooId = 4;         //英雄实例id
 }
 //查看英雄信息回应
-message ForumWatchHeroResp { DBHero hero = 1; }
+message ForumWatchHeroResp {
+    DBHero hero = 1;
+}

 //请求点赞 请求
 message ForumLikeReq {
-  string herocid = 1; //英雄配置id
-  string cid = 2;     //评论id
-  bool islike = 3;    //是否点赞
+    string herocid = 1;         //英雄配置id
+    string cid  = 2;            //评论id
+    bool islike = 3;            //是否点赞
 }

 //请求点赞 回应
 message ForumLikeResp {
-  string cid = 1;  //评论id
-  bool islike = 2; //是否点赞
-  bool issucc = 3; //成功失败
+    string cid  = 1;            //评论id
+    bool islike = 2;            //是否点赞
+    bool issucc = 3;            //成功失败
 }
--- a/src/pb/proto/friend_db.proto
+++ b/src/pb/proto/friend_db.proto
@ -9,4 +9,6 @@ message DBFriend {
  repeated string zanIds = 5;    //@go_tags(`bson:"zanIds"`) 点赞好友ID
  repeated string getZandIds = 6; //@go_tags(`bson:"getZandIds"`) 已接收赞好友ID
  string assistHeroId = 7; //@go_tags(`bson:"assistHeroId"`) 助战英雄ID
+  int32 received = 8; //@go_tags(`bson:"received"`) 领取奖励状态0未领1可领2已领
+  int64 updateTime = 9; //@go_tags(`bson:"updateTime"`)  更新时间
 }
--- a/src/pb/proto/friend_msg.proto
+++ b/src/pb/proto/friend_msg.proto
@ -7,20 +7,18 @@ message FriendBase {
  int32 level = 3;       //等级
  string avatar = 4;     //头像
  int64 strength = 5;    //战力
-  int32 serverId = 6;    //服务编号
+  string serverId = 6;   //服务编号
  int64 offlineTime = 7; //最近一次下线时间 0在线
  bool isApplied = 8;    //是否已申请加好友
  bool isZaned = 9;      //是否已点赞
  bool isGetZaned = 10;  //是否已获赞
+  string heroObjId = 11; //助战英雄ID
 }

 //好友列表
 message FriendListReq {}

-message FriendListResp {
-  repeated FriendBase list = 1;
-  string heroObjId = 2;
-}
+message FriendListResp { repeated FriendBase list = 1; }

 // 随机的在线玩家
 message FriendRandlistReq {}
@ -117,4 +115,18 @@ message FriendZanreceiveResp { bool flag = 1; }

 // 设置助战英雄
 message FriendAssistheroReq { string heroObjId = 1; }
-message FriendAssistheroResp { string heroObjId = 1; }
+message FriendAssistheroResp {
+  string heroObjId = 1;
+  int32 received = 2; //领取奖励状态0未领1可领2已领
+}
+
+//助战列表
+message FriendAssistlistReq {}
+message FriendAssistlistResp {
+  repeated FriendBase list = 1;
+  string heroObjId = 2;
+}
+
+// 助战奖励
+message FriendGetrewardReq {}
+message FriendGetrewardResp { int32 received = 1; }
--- a/src/pb/proto/gourmet_db.proto
+++ b/src/pb/proto/gourmet_db.proto
@ -6,6 +6,7 @@ import "comm.proto";
 message Cooking{
  int32 foodType = 1; // 料理类型
  int64 eTime = 2; // 结束时间戳
+  int64 sTime = 3; // 开始时间戳
 }

 // 队列里的烹饪食品
@ -15,12 +16,12 @@ message OrderCook{
  int32 cookTime = 3; // 剩余烹饪时间
 }
 message DBGourmet {
-  string id = 1;        //@go_tags(`bson:"_id"`) ID
-  string uid = 2;       //@go_tags(`bson:"uid"`) 用户ID
-  Cooking cookingFood = 3;//@go_tags(`bson:"cookingFood"`) 正在烹饪的食品
-  repeated OrderCook foods = 4; // 等待烹饪的食品
-  repeated UserAssets items = 5; // 已经做好的食品
-  map<int32,int32> skill = 6;//@go_tags(`bson:"skill"`) 技能ID
+  string id = 1; //@go_tags(`bson:"_id"`) ID
+  string uid = 2; //@go_tags(`bson:"uid"`) 用户ID
+  Cooking cookingFood = 3; //@go_tags(`bson:"cooking"`) 正在烹饪的食品
+  repeated OrderCook foods = 4; //@go_tags(`bson:"foods"`) 等待烹饪的食品
+  repeated UserAssets items = 5; //@go_tags(`bson:"items"`) 已经做好的食品
+  map<int32,int32> skill = 6; //@go_tags(`bson:"skill"`) 技能ID
  map<int32,int32> specialSkill = 7; //@go_tags(`bson:"specialSkill"`) 通用技能
  int32 orderCostTime = 8; //@go_tags(`bson:"orderCostTime"`) 订单消耗的时常
  int64 ctime = 9; // 订单创建时间
--- a/src/pb/proto/hero_db.proto
+++ b/src/pb/proto/hero_db.proto
@ -6,10 +6,15 @@ message SkillData {
  int32 skillLv = 2;
 }

+enum HeroType {
+  HeroTypeNil    = 0;
+	HeroTypeKongFu = 1;
+}
+
 message DBHero {
  string id = 1; //@go_tags(`bson:"_id"`) ID
  string uid = 2;
-  string heroID = 3;      //@go_tags(`bson:"heroID"`)  英雄的配置表ID
+  string heroID = 3;       //@go_tags(`bson:"heroID"`)  英雄的配置表ID
  int32 star = 4;         // 英雄星级
  int32 lv = 5;           // 英雄等级
  int32 exp = 6;          // 英雄经验
@ -17,38 +22,39 @@ message DBHero {
  int32 captainSkill = 8; //@go_tags(`bson:"captainSkill"`) 队长技能
  repeated SkillData normalSkill = 9; //@go_tags(`bson:"normalSkill"`) 普通技能
  map<string, int32> property = 10; // 属性相关
-  map<string, int32> addProperty =
-      11; //@go_tags(`bson:"addProperty"`) 附加属性相关
-  int32 cardType =
-      12; //@go_tags(`bson:"cardType"`) 卡片类型(升星卡、经验卡、技能升级卡)
+  map<string, int32> addProperty = 11;               //@go_tags(`bson:"addProperty"`) 附加属性相关
+  int32 cardType = 12; //@go_tags(`bson:"cardType"`) 卡片类型(升星卡、经验卡、技能升级卡)
  int32 curSkin = 13; //@go_tags(`bson:"curSkin"`) 当前装备的皮肤ID
  repeated int32 skins = 14;    // 所有皮肤ID
  bool block = 15;              // 锁定
  repeated string equipID = 16; //@go_tags(`bson:"equipID"`) 装备 objID
  int32 resonateNum = 17;       //@go_tags(`bson:"resonateNum"`) 共鸣次数
-  int32 distributionResonate =
-      18; //@go_tags(`bson:"distributionResonate"`) 分配的共鸣能量
-  map<string, int32> energy =
-      19; // @go_tags(`bson:"energy"`)能量分配到哪里[hppro:0,atkpro:0,defpro:20]
+  int32 distributionResonate = 18; //@go_tags(`bson:"distributionResonate"`) 分配的共鸣能量
+  map<string, int32> energy = 19; // @go_tags(`bson:"energy"`)能量分配到哪里[hppro:0,atkpro:0,defpro:20]
  int32 sameCount = 20;  // @go_tags(`bson:"sameCount"`) 卡片叠加数量
  int32 suiteId = 21;    //@go_tags(`bson:"suiteId"`)  套装Id
  int32 suiteExtId = 22; // go_tags(`bson:"suiteExtId"`) 扩展套装Id
  bool isOverlying = 23; // go_tags(`bson:"isOverlying"`) 是否允许叠加 默认true
-  map<string, int32> energyProperty = 24; //@go_tags(`bson:"energyProperty"`)
-  map<string, int32> juexProperty = 25;   //@go_tags(`bson:"juexProperty"`) //hp
+  map<string, int32> energyProperty = 24; //@go_tags(`bson:"energyProperty"`) 
+  map<string, int32> juexProperty = 25; //@go_tags(`bson:"juexProperty"`) //hp
+  HeroType status = 26; //@go_tags(`bson:"status"`) 状态 (1 练功)
+  int32 suite1Star = 27; //@go_tags(`bson:"suite1Star"`) 
+  int32 suite2Star = 28; //@go_tags(`bson:"suite2Star"`)
+  int32 suite1Lv = 29; //@go_tags(`bson:"suite1Lv"`)
+  int32 suite2Lv = 30; //@go_tags(`bson:"suite2Lv"`)
 }

-message Floor { // 记录阵型保底数据
-  int32 h4 = 1; // 4星次数
-  int32 h5 = 2; // 5星次数
+message Floor{ // 记录阵型保底数据
+  int32 h4 = 1;  // 4星次数
+  int32 h5 = 2;  // 5星次数
 }

 //英雄扩展数据
 message DBHeroRecord {
-  string id = 1;       //@go_tags(`bson:"_id"`) ID 主键id
-  string uid = 2;      //@go_tags(`bson:"uid"`) 用户ID
-  int32 star4 = 3;     // 4星保底
-  int32 star5 = 4;     // 5星保底
-  int64 mtime = 5;     // 修改时间
-  int32 drawcount = 6; // 普通卡牌累计抽取次数
+  string id = 1;                  //@go_tags(`bson:"_id"`) ID 主键id
+  string uid  = 2;                //@go_tags(`bson:"uid"`) 用户ID
+  int32 star4 = 3;                // 4星保底
+  int32 star5 = 4;                // 5星保底
+  int64 mtime = 5;                // 修改时间
+  int32 drawcount = 6;           // 普通卡牌累计抽取次数
 }
--- a/src/pb/proto/hero_msg.proto
+++ b/src/pb/proto/hero_msg.proto
@ -111,10 +111,6 @@ message HeroAwakenResp {
  DBHero hero = 1; // 英雄对象
 }

-//抽卡
-message HeroChoukaReq { repeated string heroIds = 1; }
-
-message HeroChoukaResp { repeated DBHero heroes = 1; }

 //英雄属性推送
 message HeroPropertyPush {
@ -156,4 +152,13 @@ message HeroDrawCardResp {
 // 英雄变化推送
 message HeroChangePush{
  repeated DBHero list = 1;
-}
+}
+
+message HeroDrawCardFloorReq { 
+}
+// 获取抽卡保底次数
+message HeroDrawCardFloorResp { 
+  int32 star4 = 1;
+  int32 star5 = 2;
+}
+
--- a/src/pb/proto/hunting_db.proto
+++ b/src/pb/proto/hunting_db.proto
@ -6,10 +6,10 @@ message DBHunting {
  string id = 1;        //@go_tags(`bson:"_id"`) ID
  string uid = 2;       //@go_tags(`bson:"uid"`) 用户ID
  int32 challengeCount = 3;  //@go_tags(`bson:"challengeCount"`) 挑战次数
-  map<int32,int32> boos = 4; // key boos 类型 value 难度
+  map<int32,int32> boss = 4; // key boss 类型 value 难度
  int32 buyCount = 5;//@go_tags(`bson:"buyCount"`) 购买次数
  int64 cTime = 6; //@go_tags(`bson:"cTime"`) 修改时间
-  map<int32,int32> challengeTime = 7; //@go_tags(`bson:"challengeTime"`) 每个难度通关时间
+  map<string,int32> bossTime = 7; //@go_tags(`bson:"bossTime"`) 
 }

 // 狩猎排行榜
--- a/src/pb/proto/hunting_msg.proto
+++ b/src/pb/proto/hunting_msg.proto
@ -1,29 +1,55 @@
 syntax = "proto3";
 option go_package = ".;pb";
 import "hunting_db.proto";
+import "battle_msg.proto";
+message HuntingGetListReq {

-message HuntingGetListReq {}
+}

-message HuntingGetListResp { DBHunting data = 1; }
+message HuntingGetListResp { 
+    DBHunting data = 1; 
+}

 // 挑战
 message HuntingChallengeReq {
-  int32 bossType = 1;   // boos 类型
-  int32 difficulty = 2; // 难度
+    int32 bossType = 1;  // boos 类型
+    int32 difficulty = 2; // 难度
+    int32 leadpos = 3;           //队长位置
+    repeated string teamids = 4; //阵容信息
 }

-message HuntingChallengeResp { DBHunting data = 1; }
+message HuntingChallengeResp {
+    BattleInfo info = 1;
+    int32 bossType = 2;  // boos 类型
+    int32 difficulty = 3; // 难度
+}
+
+message HuntingChallengeOverReq {
+    int32 bossType = 1;  // boos 类型
+    int32 difficulty = 2; // 难度
+    BattleReport report = 3; //战报
+}
+
+// 客户端通知服务器打赢了
+message HuntingChallengeOverResp {
+    DBHunting data = 1; 
+}

 // 购买
 message HuntingBuyReq {
-  int32 count = 1; // 购买次数
+    int32 count = 1;// 购买次数
 }

-message HuntingBuyResp { DBHunting data = 1; }
+message HuntingBuyResp {
+    DBHunting data = 1; 
+}

 // 排行榜
-message HuntingRankListReq {}
+message HuntingRankListReq{
+	int32 boosType = 1; // boss 类型
+	bool friend = 2; // 是否是好友榜
+}

-message HuntingRankListResp {
-  repeated DBHuntingRank ranks = 1; // 排行数据 有序的 注意boss类型
+message HuntingRankListResp{
+    repeated DBHuntingRank ranks = 1; // 排行数据 有序的 注意boss类型
 }
--- a/src/pb/proto/library_db.proto
+++ b/src/pb/proto/library_db.proto
@ -0,0 +1,24 @@
+syntax = "proto3";
+option go_package = ".;pb";
+
+message DBLibrary {
+  string id = 1;        //@go_tags(`bson:"_id"`) ID
+  string uid = 2;       //@go_tags(`bson:"uid"`) 用户ID
+  int32 fid = 3;        // 配置表id 羁绊id
+  map<string,int32> hero = 4; // key: hid value: favorlv
+  map<int32,int32> prize = 5; //是否领奖  key 好感度等级
+  int32 fetterlv = 6; // 当前羁绊等级
+  int32 storyid = 7; // 故事id 用来判断是否领奖
+  bool activation = 8; // 是否激活
+}
+
+// 羁绊英雄数据
+message DBHeroFetter{
+  string id = 1;        //@go_tags(`bson:"_id"`) ID
+  string uid = 2;       //@go_tags(`bson:"uid"`) 用户ID
+  string heroid = 3; // 英雄配置表id
+  repeated int32 history = 4; // 传记往事ID
+  int32 favorlv = 5; // 好感度等级
+  int32 favorexp = 6; // 好感度经验
+  int32 stroyprize = 7; // 剧情奖励
+}
--- a/src/pb/proto/library_msg.proto
+++ b/src/pb/proto/library_msg.proto
@ -0,0 +1,49 @@
+syntax = "proto3";
+option go_package = ".;pb";
+import "library_db.proto";
+
+// 获取羁绊信息
+message LibraryGetListReq {
+
+}
+
+message LibraryGetListResp { 
+   repeated DBLibrary data = 1; 
+}
+// 获取英雄详细羁绊数据
+message LibraryGetFetterListReq {
+
+}
+
+message LibraryGetFetterListResp { 
+   repeated DBHeroFetter data = 1; 
+}
+
+// 领取奖励
+message LibraryGetRewardReq {
+    string objId = 1;
+}
+
+message LibraryGetRewardResp { 
+   DBLibrary data = 1; 
+}
+// 领取剧情奖励
+message LibraryGetStoryRewardReq {
+   string hid = 1; // 英雄ID
+   int32 history = 2; // 传记往事id
+   int32 rightend = 3; // 对应配置表 rightend
+}
+
+message LibraryGetStoryRewardResp { 
+  DBLibrary data = 1; 
+}
+
+// 给英雄赠送礼物
+message LibraryUseGiftReq{
+   string heroid = 1; // 英雄id
+   map<string,int32> items = 2; // key 道具ID value 数量
+}
+
+message LibraryUseGiftResp{
+   DBHeroFetter data = 1;
+}
--- a/src/pb/proto/linestory_db.proto
+++ b/src/pb/proto/linestory_db.proto
@ -0,0 +1,15 @@
+syntax = "proto3";
+option go_package = ".;pb";
+
+message TaskNode {
+  int32 status = 1; //@go_tags(`bson:"status"`) 状态 0未做
+                    // 1进行中(子任务没有全部完成) 2已做 3禁止进入
+  repeated int32 subtaskIds = 2; //@go_tags(`bson:"subtasks"`) 子任务
+}
+
+message DBLinestory {
+  string id = 1;                  //@go_tags(`bson:"_id"`) ID
+  string uid = 2;                 //@go_tags(`bson:"uid"`) 用户ID
+  int32 jqId = 3;                 //@go_tags(`bson:"jqId"`) 剧情ID
+  map<int32, TaskNode> tasks = 4; //@go_tags(`bson:"tasks"`) 任务
+}
--- a/src/pb/proto/linestory_msg.proto
+++ b/src/pb/proto/linestory_msg.proto
@ -0,0 +1,23 @@
+syntax = "proto3";
+option go_package = ".;pb";
+
+// 剧情开始
+message LinestoryStartReq {
+  int32 jqId = 1; //剧情ID
+}
+message LinestoryStartResp {
+  int32 jqId = 1;
+  repeated int32 taskIds = 2; //已完成的任务ID
+}
+
+// 做任务
+message LinestoryDotaskReq {
+  int32 taskId = 1;    //任务ID
+  int32 subtaskId = 2; //子任务ID
+}
+
+message LinestoryDotaskResp {
+  int32 taskId = 1;      //任务ID
+  int32 subtaskId = 2;   //子任务ID
+  int32 resetTaskId = 3; //重置任务起始ID
+}
--- a/src/pb/proto/mainline_db.proto
+++ b/src/pb/proto/mainline_db.proto
@ -1,12 +1,17 @@
 syntax = "proto3";
 option go_package = ".;pb";

+enum AwaredType {
+  TypeNil    = 0; 
+	TypeAvailable = 1; // 可领取
+	TypeReceived = 2; // 已领取
+}
 message DBMainline {
  string id = 1;        //@go_tags(`bson:"_id"`) ID
  string uid = 2;       //@go_tags(`bson:"uid"`) 用户ID
  int32 chapterId = 3;  //@go_tags(`bson:"chapterId"`) 章节ID
  int32 mainlineId = 4;    //@go_tags(`bson:"mainlineId"`) 主线关卡ID
-  int32 awaredID  = 5;  //@go_tags(`bson:"awaredID"`) 是否领奖(设置int是考虑后续扩展有多个宝箱情况)
-  repeated int32 branchID = 6; // @go_tags(`bson:"branchID"`) 记录分支通关的情况
+  AwaredType awaredID  = 5;  //@go_tags(`bson:"awaredID"`) 是否领奖(设置int是考虑后续扩展有多个宝箱情况)
+  repeated int32 branchID = 6; // @go_tags(`bson:"branchID"`) 记录所有通关的关卡数据
  int32 intensity = 7; // 难度
 }
--- a/src/pb/proto/mainline_msg.proto
+++ b/src/pb/proto/mainline_msg.proto
@ -3,39 +3,49 @@ option go_package = ".;pb";
 import "mainline_db.proto";
 import "battle_msg.proto";
 // 查询关卡进度
-message MainlineGetListReq {}
+message MainlineGetListReq {
+
+}
 // 返回进度信息
-message MainlineGetListResp { repeated DBMainline data = 1; }
+message MainlineGetListResp { 
+    repeated DBMainline data = 1; 
+}

 // 领取关卡宝箱
 message MainlineGetRewardReq {
-  string chapterObj = 1; // 章节唯一对象id
+    string chapterObj = 1; // 章节唯一对象id
 }

 message MainlineGetRewardResp {
-  DBMainline data = 1; //当前章节信息
+    DBMainline data = 1; //当前章节信息
 }

 // 挑战关卡
 message MainlineChallengeReq {
-  string chapterObj = 1;       // 章节唯一对象id
-  uint32 mainlineId = 2;       // 小关ID
-  int32 leadpos = 3;           //队长位置
-  repeated string teamids = 4; //阵容信息
+    string chapterObj = 1; // 章节唯一对象id
+    uint32 mainlineId = 2; // 小关ID
+    int32 leadpos = 3;           //队长位置
+    repeated string teamids = 4; //阵容信息
 }

-message MainlineChallengeResp { BattleInfo info = 1; }
+message MainlineChallengeResp {
+    BattleInfo info = 1;
+    string chapterObj = 2; // 章节唯一对象id
+    uint32 mainlineId = 3; // 小关ID
+}

 // 客户端通知服务器打赢了
 message MainlineChallengeOverReq {
-  string chapterObj = 1;   // 章节唯一对象id
-  uint32 mainlineId = 2;   // 小关ID
-  BattleReport report = 3; //战报
+    string chapterObj = 1; // 章节唯一对象id
+    uint32 mainlineId = 2; // 小关ID
+    BattleReport report = 3; //战报
 }

 message MainlineChallengeOverResp {
-  DBMainline data = 1; //当前章节信息
+    DBMainline data = 1; //当前章节信息
 }

 // 推送新章节
-message MainlineNewChapterPush { DBMainline data = 1; }
+message MainlineNewChapterPush{
+    DBMainline data = 1; 
+}
--- a/src/pb/proto/martialhall_db.proto
+++ b/src/pb/proto/martialhall_db.proto
@ -9,13 +9,14 @@ enum PillarState {

 ///练功柱子
 message DBPillar {
-  bool isunlock = 1;     //是否解锁
-  PillarState state = 2; //状态
-  string hero = 3;       //当前练功英雄
-  int64 start = 4;       //开始时间
-  int64 end = 5;         //结束时间
-  int64 lastbill = 6;    //上次结账时间
-  int32 reward = 7;      //奖励
+  int32 index = 1;       //柱子下标
+  bool isunlock = 2;     //是否解锁
+  PillarState state = 3; //状态
+  string hero = 4;       //当前练功英雄
+  int64 start = 5;       //开始时间
+  int64 end = 6;         //结束时间
+  int64 lastbill = 7;    //上次结账时间
+  int32 reward = 8;      //奖励
 }

 //练功房
--- a/src/pb/proto/martialhall_msg.proto
+++ b/src/pb/proto/martialhall_msg.proto
@ -10,12 +10,12 @@ message MartialhallInfoResp { DBMartialhall info = 1; }
 message MartialhallPracticeReq {
  int32 pillar = 1; //柱子
  string hero = 2;  //英雄
+  int32 time = 3;   //修炼时长
 }
 ///练功请求 回应
 message MartialhallPracticeResp {
-  int32 pillar = 1; //柱子
-  string hero = 2;  //英雄
-  bool issucc = 3;  //是否成功
+  bool issucc = 1; //是否成功
+  DBMartialhall info = 2;
 }

 ///领取 请求
@ -27,4 +27,17 @@ message MartialhallReceiveResp {}
 message MartialhallUpgradeReq {}

 ///升级 请求回应
-message MartialhallUpgradeResp { DBMartialhall info = 1; }
+message MartialhallUpgradeResp {
+  bool issucc = 1;
+  DBMartialhall info = 2;
+}
+
+///解锁 请求
+message MartialhallUnLockReq {
+  int32 pillar = 1; //柱子
+}
+///解锁 请求 回应
+message MartialhallUnLockResp {
+  bool issucc = 1;
+  DBMartialhall info = 2;
+}
--- a/src/pb/proto/moonfantasy_db.proto
+++ b/src/pb/proto/moonfantasy_db.proto
@ -1,13 +1,31 @@
 syntax = "proto3";
 option go_package = ".;pb";

-message DBMoonfantasy {
+message UserInfo {
+  string uid = 1;     //用户id
+  string name = 2;    //昵称
+  string avatar = 12; // 头像
+}
+
+//月之秘境
+message DBMoonFantasy {
  string id = 1;                 //@go_tags(`bson:"_id"`) ID
  string uid = 2;                //用户id
-  string monster = 3;            //英雄id
+  string monster = 3;            //怪物id
  int64 ctime = 4;               //创建时间
-  int32 joinnum = 5;             //参与人数
+  repeated UserInfo join = 5;    //参与人数
  int32 numup = 6;               //人数上限
  int32 unitmup = 7;             //单人可挑战次数
  map<string, int32> record = 8; //挑战记录
+}
+
+//用户参与的月之秘境列表
+message DBUserMFantasy {
+  string id = 1;                 //@go_tags(`bson:"_id"`) ID
+  string uid = 2;                //用户id
+  repeated string mfantasys = 3; //月之秘境列表
+  int32 triggerNum = 4; //@go_tags(`bson:"triggerNum"`)   月之秘境触发次数
+  int32 battleNum = 5; //@go_tags(`bson:"battleNum"`)   月之秘境挑战次数
+  int32 buyNum = 6;    //@go_tags(`bson:"buyNum"`)   月之秘境挑战次数
+  int64 lastTrigger = 7; //@go_tags(`bson:"lastTrigger"`)  月之秘境最后触发时间
 }
--- a/src/pb/proto/moonfantasy_msg.proto
+++ b/src/pb/proto/moonfantasy_msg.proto
@ -1,54 +1,70 @@
 syntax = "proto3";
 option go_package = ".;pb";
 import "errorcode.proto";
+import "moonfantasy_db.proto";
 import "battle_msg.proto";

-///触发秘境
-message MoonfantasyTriggerReq {
-  string avatar = 1; //用户头像
-  string uname = 2;  //用户名
-  int32 ulv = 3;     //用户等级
+//获取装备列表请求
+message MoonfantasyGetListReq {}
+//获取装备列表请求 回应
+message MoonfantasyGetListResp {
+  int32 battleNum = 1;
+  repeated DBMoonFantasy dfantasys = 2; //秘境列表
 }

+// ///触发秘境
+// message MoonfantasyTriggerReq {
+//   string avatar = 1; //用户头像
+//   string uname = 2;  //用户名
+//   int32 ulv = 3;     //用户等级
+// }
+
 ///触发秘境
-message MoonfantasyTriggerResp {
+message MoonfantasyTriggerPush {
  bool issucc = 1;    //是否成功
  string mid = 2;     //唯一id         //挑战时需要传递的数据
  string monster = 3; //怪物id
 }

-///挑战秘境
+///询问秘境
 message MoonfantasyAskReq {
-  string uid = 1; //发布者用户id
-  string mid = 2; //唯一id
+  string mid = 1; //唯一id
 }

 message MoonfantasyAskResp {
-  ErrorCode code = 1; //是否成功
+  ErrorCode code = 1;     //是否成功
+  DBMoonFantasy info = 2; //秘境信息 可能为空
 }

 ///挑战秘境
 message MoonfantasyBattleReq {
-  string uid = 1;              //发布者用户id
-  string mid = 2;              //唯一id
-  int32 leadpos = 3;           //队长位置
-  repeated string teamids = 4; //阵容信息
+  string mid = 1;              //唯一id
+  int32 leadpos = 2;           //队长位置
+  repeated string teamids = 3; //阵容信息
 }

 message MoonfantasyBattleResp {
  ErrorCode code = 1; //是否成功
-  string monster = 2; //怪物id
+  string mid = 2;     //怪物id
  BattleInfo info = 3;
 }

 ///领取战斗奖励
 message MoonfantasyReceiveReq {
  string bid = 2;          //战斗id 后续需要这个id来领取奖励
-  string monster = 3;      //怪物id
+  string mid = 3;          //怪物id
  BattleReport report = 4; //战报
 }

 ///领取战斗奖励
 message MoonfantasyReceiveResp {
  bool issucc = 1; //是否成功
+}
+
+///购买挑战次数
+message MoonfantasyBuyReq { int32 BuyNum = 1; }
+///购买挑战次数 回应
+message MoonfantasyBuyResp {
+  bool issucc = 1;     //是否成功
+  int32 BattleNum = 2; //当前挑战次数
 }
--- a/src/pb/proto/pagoda_db.proto
+++ b/src/pb/proto/pagoda_db.proto
@ -1,9 +1,34 @@
 syntax = "proto3";
 option go_package = ".;pb";
-
+import "battle_msg.proto";
+//普通塔
 message DBPagoda {
  string id = 1;        //@go_tags(`bson:"_id"`) ID
  string uid = 2;       //@go_tags(`bson:"uid"`) 用户ID
  int32 pagodaId = 3;  //@go_tags(`bson:"pagodaId"`) 塔层
  map<int32,bool> reward = 4; // 是否领奖
+  int32 type = 5;
+}
+
+// 赛季塔 赛季结束会清理
+message DBSeasonPagoda {
+  string id = 1;        //@go_tags(`bson:"_id"`) ID
+  string uid = 2;       //@go_tags(`bson:"uid"`) 用户ID
+  int32 pagodaId = 3;  //@go_tags(`bson:"pagodaId"`) 塔层
+  map<int32,bool> reward = 4; // 是否领奖
+  int32 type = 5;
+}
+
+// 爬塔数据明细
+message DBPagodaRecord {
+  string id = 1;        //@go_tags(`bson:"_id"`) ID
+  string uid = 2;       //@go_tags(`bson:"uid"`) 用户ID
+  int32 pagodaId = 3;  //@go_tags(`bson:"pagodaId"`) 塔层
+  int32 type = 4; // 塔类型
+  string nickname = 5;// 昵称
+  string icon = 6; // 头像
+  int32 lv = 7; // 等级
+  int32 leadpos = 8; //队长位置
+  repeated LineUp line = 9; // 阵容数据
+  int32 costTime = 10; //@go_tags(`bson:"costTime"`) 闯关耗时 单位s
 }
--- a/src/pb/proto/pagoda_msg.proto
+++ b/src/pb/proto/pagoda_msg.proto
@ -1,22 +1,65 @@
 syntax = "proto3";
 option go_package = ".;pb";
 import "pagoda_db.proto";
-
+import "battle_msg.proto";
 // 查询塔进度
-message PagodaGetListReq {}
+message PagodaGetListReq {
+
+}
 // 返回进度信息
-message PagodaGetListResp { DBPagoda data = 1; }
+message PagodaGetListResp { 
+    DBPagoda data = 1; 
+}

 // 领取关卡宝箱
 message PagodaGetRewardReq {
-  int32 id = 1; // 对应 task_reward 表中的id
+    int32 id = 1; // 对应 task_reward 表中的id
 }

-message PagodaGetRewardResp { DBPagoda data = 1; }
+message PagodaGetRewardResp {
+    DBPagoda data = 1;
+}

-// 挑战
 message PagodaChallengeReq {
-  int32 levelID = 1; // 挑战的关卡ID
+    int32 levelID = 1;  // 挑战层数
+    int32 PagodaType = 2; // 塔类型
+
+    int32 leadpos = 3;           //队长位置
+    repeated string teamids = 4; //阵容信息
 }

-message PagodaChallengeResp { DBPagoda data = 1; }
+message PagodaChallengeResp {
+    BattleInfo info = 1;
+    int32 levelID = 2;  // 挑战层数
+    int32 PagodaType = 3; // 塔类型
+}
+
+// 客户端通知服务器打赢了
+message PagodaChallengeOverReq {
+    int32 levelID = 1;  // 挑战层数
+    int32 PagodaType = 2; // 塔类型
+    BattleReport report = 3; //战报
+}
+
+message PagodaChallengeOverResp {
+    DBPagoda data = 1;
+}
+
+// 排行榜
+message PagodaRankListReq{
+    int32 floorId = 1; // 层数 0 标识总榜
+    bool friend = 2; // true 好友榜
+}
+
+message PagodaRankListResp{
+    repeated DBPagodaRecord ranks = 1;
+}
+
+// 查询玩家最佳通关记录数据
+message PagodaQueryRecordReq{
+
+}
+
+message PagodaQueryRecordResp{
+    DBPagodaRecord data = 1;
+}
--- a/src/pb/proto/protoc.exe
+++ b/src/pb/proto/protoc.exe
--- a/src/pb/proto/rtask_db.proto
+++ b/src/pb/proto/rtask_db.proto
@ -0,0 +1,26 @@
+syntax = "proto3";
+option go_package = ".;pb";
+
+message frtaskIds { repeated int32 rtaskIds = 1; }
+
+// 玩家任务状态
+message DBRtask {
+  string id = 1;  //@go_tags(`bson:"_id"`) ID
+  string uid = 2; //@go_tags(`bson:"uid"`) 用户ID
+  map<int32, frtaskIds> frtaskIds =
+      3;                 //@go_tags(`bson:"frtaskIds"`) 已完成的任务Id
+  int32 nextRtaskId = 4; //@go_tags(`bson:"nextRtaskId"`) 下个任务Id
+  bool isReward = 5;     //@go_tags(`bson:"isReward"`) 接收奖励
+}
+
+message rtaskData {
+  map<int32, int32> data = 1; //@go_tags(`bson:"data"`)  当前任务值
+  int32 rtype = 2;            //@go_tags(`bson:"rtype"`)  任务类型
+  int64 timestamp = 3;        //@go_tasg(`bson:"timestamp"`) 时间戳
+}
+// 玩家任务记录
+message DBRtaskRecord {
+  string id = 1;                  //@go_tags(`bson:"_id"`) ID
+  string uid = 2;                 //@go_tags(`bson:"uid"`) 用户ID
+  map<int32, rtaskData> vals = 3; //@go_tags(`bson:"vals"`) 任务记录值
+}
--- a/src/pb/proto/rtask_msg.proto
+++ b/src/pb/proto/rtask_msg.proto
@ -0,0 +1,96 @@
+syntax = "proto3";
+option go_package = ".;pb";
+
+import "battle_msg.proto";
+import "rtask_db.proto";
+
+// 申请做任务
+message RtaskApplyReq {
+  int32 rtaskId = 1;    //任务ID
+  int32 rtaskSubId = 2; //支线任务ID
+}
+
+message RtaskApplyResp { int32 rtaskId = 1; }
+
+// 任务列表
+message RtasklistReq {
+  int32 groupId = 1; //分组ID
+}
+message RtasklistResp {
+  repeated int32 rtaskIds = 1;
+  int32 groupId = 2;
+}
+
+// 对话选项
+message RtaskChooseReq {
+  int32 rtaskId = 1;    //任务ID
+  int32 chooseId = 2;   //选项配置ID
+  int32 rtaskSubId = 3; //支线任务ID
+}
+
+message RtaskChooseResp {
+  int32 rtaskId = 1;    //任务ID
+  int32 chooseId = 2;   //选项配置ID
+  int32 rtaskSubId = 3; //支线任务ID
+}
+
+// 任务完成推送
+message RtaskFinishPush { int32 rtaskId = 1; }
+
+// 当前完成的任务列表推送
+message RtaskFinishIdsPush {
+  repeated int32 rtaskId = 1;
+  int32 groupId = 2;
+}
+
+// 领奖
+message RtaskGetRewardReq {
+  int32 rtaskId = 1;
+  int32 rtaskSubId = 2; //支线任务ID
+}
+message RtaskGetRewardResp {
+  int32 rtaskId = 1;
+  int32 rtaskSubId = 2; //支线任务ID
+}
+
+// 开始战斗
+message RtaskBattleStartReq {
+  int32 battleConfId = 1;      //战斗配表ID
+  int32 leadpos = 3;           //队长位置
+  repeated string teamids = 4; //阵容信息
+}
+
+message RtaskBattleStartResp {
+  BattleInfo info = 1; //战斗信息
+}
+
+// 战斗完成
+message RtaskBattleFinishReq {
+  int32 rtaskId = 1;    //任务ID
+  int32 rtaskSubId = 2; //支线任务ID
+  int32 chooseId = 3;   //选项配置ID
+}
+
+message RtaskBattleFinishResp {
+  int32 rtaskId = 1;    //任务ID
+  int32 rtaskSubId = 2; //支线任务ID
+}
+
+//获取玩家任务记录
+message RtaskGetrecordReq {}
+
+message RtaskGetrecordResp { DBRtaskRecord record = 1; }
+
+// 测试使用
+message RtaskTestReq {
+  int32 rtaskType = 1;       //任务类型
+  repeated int32 params = 2; //参数
+  int32 condiId = 3;         //条件ID
+  int32 groupId = 4;         //分组编号
+  string rtaskIds = 5;       //已完成的任务ids
+}
+
+message RtaskTestResp {
+  bool flag = 1;
+  repeated int32 rtaskIds = 2;
+}
--- a/src/pb/proto/shop_msg.proto
+++ b/src/pb/proto/shop_msg.proto
@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;pb";
-import "shop/shop_db.proto";
+import "shop_db.proto";
 import "comm.proto";


--- a/src/pb/proto/smithy_db.proto
+++ b/src/pb/proto/smithy_db.proto
@ -6,6 +6,8 @@ import "comm.proto";
 message Clang{
  int32 deskType = 1;  // 台子类型
  int64 eTime = 2;
+  int64 sTime = 3; // 订单开始时间
+  
 }

 // 队列里的烹饪食品
@ -24,6 +26,6 @@ message DBSmithy {
  int32 stoveLv = 7; //@go_tags(`bson:"stoveLv"`) 炉子等级
  int32 orderCostTime = 8; //@go_tags(`bson:"orderCostTime"`) 订单消耗的时常
  int64 ctime = 9; // 订单创建时间
-  int32 deskFloor = 10;//@go_tags(`bson:"deskFloor"`)台子保底
+  map<int32,int32> deskFloor = 10;//@go_tags(`bson:"deskFloor"`)台子保底
  int32 stoveFloor = 11;//@go_tags(`bson:"stoveFloor"`) 炉子保底
 }
--- a/src/pb/proto/smithy_msg.proto
+++ b/src/pb/proto/smithy_msg.proto
@ -29,10 +29,27 @@ message SmithyGetRewardResp{
 }

 // 技能升级
-message SmithySkillLvReq{
-    int32 skillType = 1; // 技能id
+message SmithyDeskSkillLvReq{
+    int32 deskType = 1; // 台子类型
 }

-message SmithySkillLvResp{
+message SmithyDeskSkillLvResp{
    DBSmithy data = 1;
+}
+
+// 炉子技能升级
+message SmithyStoveSkillLvReq{
+
+}
+
+message SmithyStoveSkillLvResp{
+    DBSmithy data = 1;
+}
+
+message SmithyGetRandUserReq{
+
+}
+
+message SmithyGetRandUserResp{
+    repeated string user = 1; 
 }
--- a/src/pb/proto/sys_msg.proto
+++ b/src/pb/proto/sys_msg.proto
@ -0,0 +1,8 @@
+syntax = "proto3";
+option go_package = ".;pb";
+
+message SysFuncListReq {}
+
+message SysFuncListResp {
+  repeated string funcIds = 1; //功能ID
+}
--- a/src/pb/proto/user_db.proto
+++ b/src/pb/proto/user_db.proto
@ -2,11 +2,12 @@ syntax = "proto3";
 option go_package = ".;pb";

 message CacheUser {
-  string uid = 1;                       //@go_tags(`json:"uid"`) 用户id
-  string SessionId = 2;                 //@go_tags(`json:"sessionId"`) 会话id
-  string ServiceTag = 3;                //@go_tags(`json:"serviceTag"`) 所在服务集群 区服id
-  string GatewayServiceId = 4;          //@go_tags(`json:"gatewayServiceId"`) 所在网关服务id
-  string ip = 5;                        //@go_tags(`json:"ip"`) 远程ip
+  string uid = 1;       //@go_tags(`json:"uid"`) 用户id
+  string SessionId = 2; //@go_tags(`json:"sessionId"`) 会话id
+  string ServiceTag = 3; //@go_tags(`json:"serviceTag"`) 所在服务集群 区服id
+  string GatewayServiceId =
+      4;         //@go_tags(`json:"gatewayServiceId"`) 所在网关服务id
+  string ip = 5; //@go_tags(`json:"ip"`) 远程ip
 }

 message DBUser {
@ -15,20 +16,22 @@ message DBUser {
  string uuid = 3;     //@go_tags(`bson:"uuid"`) 玩家唯一uuid
  string binduid = 4;  //@go_tags(`bson:"binduid"`) 玩家账号
  string name = 5;     //@go_tags(`bson:"name"`) 玩家名
-  string sid = 6;       //@go_tags(`bson:"sid"`) 区服id
+  string sid = 6;      //@go_tags(`bson:"sid"`) 区服id
  string createip = 7; //@go_tags(`bson:"createip"`) 创建账号时的ip
  string lastloginip = 8; //@go_tags(`bson:"lastloginip"`) 最后一次登录时的ip
  int64 ctime = 9;        //@go_tags(`bson:"ctime"`) 玩家创号时间戳
  int64 logintime = 10; //@go_tags(`bson:"logintime"`) 最后一次登录时间
-  int32 friendPoint = 11; //@go_tags(`bson:"friendPoint"`) 友情点
-  string avatar = 12;      //@go_tags(`bson:"avatar"`) 头像
-  int32 gold = 13;        //@go_tags(`bson:"gold"`) 金币
-  int32 exp = 14;         //@go_tags(`bson:"exp"`) 经验
-  bool created = 15;      //@go_tags(`bson:"created"`) 创角
-  int32 lv = 16;          //@go_tags(`bson:"lv"`) 等级
-  int32 vip = 17;         //@go_tags(`bson:"vip"`)  vip
-  int32 diamond = 18;     //@go_tags(`bson:"diamond"`)  钻石
-  int32 title = 19;       //@go_tags(`bson:"title"`)头衔
+  string avatar = 12;   //@go_tags(`bson:"avatar"`) 头像
+  int64 gold = 13;      //@go_tags(`bson:"gold"`) 金币
+  int64 exp = 14;       //@go_tags(`bson:"exp"`) 经验
+  bool created = 15;    //@go_tags(`bson:"created"`) 创角
+  int32 lv = 16;        //@go_tags(`bson:"lv"`) 等级
+  int32 vip = 17;       //@go_tags(`bson:"vip"`)  vip
+  int64 diamond = 18;   //@go_tags(`bson:"diamond"`)  钻石
+  int32 title = 19;     //@go_tags(`bson:"title"`)头衔
+  int64 offlinetime = 11; //@go_tags(`bson:"offlinetime"`) 离线时间
+  int32 figure = 20;      //@go_tags(`bson:"figure"`) 主角形象
+  int32 bgp = 21;         //@go_tags(`bson:"bgp"`) 背景
 }

 message DBUserSetting {
--- a/src/pb/proto/user_msg.proto
+++ b/src/pb/proto/user_msg.proto
@ -2,8 +2,8 @@ syntax = "proto3";
 option go_package = ".;pb";
 import "errorcode.proto";
 import "user_db.proto";
-import "comm.proto";
 import "userexpand.proto";
+import "pagoda_db.proto";

 //用户登录
 message UserLoginReq {
@ -17,6 +17,14 @@ message UserLoginResp {
  int64 timeNow = 3;   // 服务器时间
 }

+// 获取用户信息
+message UserInfoReq {}
+
+message UserInfoResp {
+  DBUser data = 1;
+  DBUserExpand ex = 2; //用户扩展
+}
+
 //登出
 message UserLogoutReq {}

@ -42,22 +50,12 @@ message UserCreateReq {

 message UserCreateResp { bool IsSucc = 1; }

-//添加用户资源
-message UserAddResReq {
-  UserAssets res = 1; //资源类型
-}
-
-message UserAddResResp {
-  UserAssets res = 1; //资源类型
-}
-
 // 玩家资源变更推送
-message UserResChangePush {
-  int32 gold = 1;    //@go_tags(`bson:"gold"`) 金币
-  int32 exp = 2;     //@go_tags(`bson:"exp"`) 经验
-  int32 lv = 3;      //@go_tags(`bson:"lv"`) 等级
-  int32 vip = 4;     //@go_tags(`bson:"vip"`)  vip
-  int32 diamond = 5; //@go_tags(`bson:"diamond"`)  钻石
+message UserResChangedPush {
+  int64 gold = 1;    //@go_tags(`bson:"gold"`) 金币
+  int64 exp = 2;     //@go_tags(`bson:"exp"`) 经验
+  int64 diamond = 5; //@go_tags(`bson:"diamond"`)  钻石
+  int32 friend = 6;  //@go_tags(`bson:"frined`) 友情点
 }

 //用户设置获取
@ -90,6 +88,35 @@ message UserModifynameReq {
 message UserModifynameResp {
  string uid = 1;
  uint32 count = 2; //剩余修改次数
+  string name = 3;
+}
+
+// 修改头像
+message UserModifyavatarReq {
+  string avatarId = 1; //头像ID
+}
+
+message UserModifyavatarResp {
+  string uid = 1;
+  string avatarId = 2;
+}
+
+// 修改背景图片
+message UserModifybgpReq {
+  int32 bgpId = 1; //背景图片ID
+}
+
+message UserModifybgpResp {
+  string uid = 1;
+  int32 bgpId = 2; //背景图片ID
+}
+
+// 修改形象
+message UserModifyfigureReq { int32 figureId = 1; }
+
+message UserModifyfigureResp {
+  string uid = 1;
+  int32 figureId = 2;
 }

 // 图鉴
@ -97,30 +124,21 @@ message UserGetTujianReq {}
 message UserGetTujianResp { repeated string heroids = 1; }

 //玩家等级经验变化推送
-message UserChangedPush {
+message UserLvChangedPush {
  string uid = 1;
-  int32 exp = 2;
+  int64 exp = 2;
  int32 lv = 3;
 }

-//主角形象
-message UserFigureReq {
-  int32 preinstall = 1;      //预设编号 1-5
-  int32 action = 2;          //部位 1-5 0不修改任何数据
-  Hair hair = 3;             //部位 1
-  Eyes eyes = 4;             //部位 2
-  Mouth mouth = 5;           //部位 3
-  Body body = 6;             //部位 4
-  Complexion complexion = 7; //部位 5
-}
-
-message UserFigureResp {
-  string uid = 1;
-  int32 action = 2; //部位
-  Figure figure = 3;
-}
-
 // 用户签名
 message UserModifysignReq { string sign = 1; }

-message UserModifysignResp { string uid = 1; }
+message UserModifysignResp { string uid = 1; }
+
+// 玩家战斗记录
+message UserBattlerecordReq {}
+
+message UserBattlerecordResp {
+  string uid = 1;
+  DBPagodaRecord pagodaRecord = 2; //爬塔战斗记录
+}
--- a/src/pb/proto/userexpand.proto
+++ b/src/pb/proto/userexpand.proto
@ -1,56 +1,25 @@
 syntax = "proto3";
 option go_package = ".;pb";

-// 发型
-message Hair {
-  int32 resId = 1;  //资源ID
-  string color = 2; //颜色
-}
-
-// 眼睛
-message Eyes {
-  int32 resId = 1;  //资源ID
-  string color = 2; //颜色
-}
-
-// 嘴巴
-message Mouth {
-  string resId = 1; //资源ID
-}
-
-// 身体
-message Body {
-  int32 high = 1;  //身高
-  int32 shape = 2; //体型
-}
-
-// 肤色
-message Complexion {
-  string color = 1; //颜色值
-}
-
-// 形象
-message Figure {
-  Hair hair = 1;
-  Eyes eyes = 2;
-  Mouth mouth = 3;
-  Body body = 4;
-  Complexion complexion = 5;
-}
-
 //用户扩展数据
 message DBUserExpand {
-  string id = 1;                      //主键id
-  string uid = 2;                     //用户id
-  int64 lastreadnotiftime = 3;        //最后阅读公告时间
-  int64 lastInitdataTime = 4;         //上次初始数据时间
-  uint32 initdataCount = 5;           //今日初始累计次数
-  int32 chatchannel = 6;              //跨服聊天频道
-  int32 modifynameCount = 7;          //修改昵称次数
-  map<string, bool> tujian = 8;       // 图鉴
-  int32 curFigure = 9;                //当前形象
-  map<int32, Figure> preinstall = 10; //形象预设
-  int32 activeday = 11;               //日活跃度
-  int32 activeweek = 12;              //周活跃度
-  string sign = 13;                   //用户签名
+  string id = 1;                 //主键id
+  string uid = 2;                //用户id
+  int64 lastreadnotiftime = 3;   //最后阅读公告时间
+  int64 lastInitdataTime = 4;    //上次初始数据时间
+  uint32 initdataCount = 5;      //今日初始累计次数
+  int32 chatchannel = 6;         //跨服聊天频道
+  int32 modifynameCount = 7;     //修改昵称次数
+  map<string, int32> tujian = 8; //图鉴
+  int32 activeday = 11;          //日活跃度
+  int32 activeweek = 12;         //周活跃度
+  string sign = 13;              //用户签名
+  int32 friendPoint = 14;        //@go_tags(`bson:"friendPoint"`) 友情点
+  int32 friendPointID = 15; //@go_tags(`bson:"friendPointID"`) 每日获赠友情点
+  int32 friendPointOD = 16; //@go_tags(`bson:"friendPointOD"`) 每日送出友情点
+  int32 loginAddCount = 19; //@go_tasgs(`bson:"loginAddCount"`) 累计登录天数
+  int32 loginContinueCount =
+      20; //@go_tasgs(`bson:"loginContinueCount"`)  连续登录天数
+  bool completePagoda = 21; //@go_tags(`bson:"completePagoda"`) 通关普通塔
+  int32 rtaskId = 22; //@go_tags(`bson:"rtaskId"`)  当前完成的随机任务ID
 }
--- a/src/pb/proto/viking_db.proto
+++ b/src/pb/proto/viking_db.proto
@ -1,6 +1,6 @@
 syntax = "proto3";
 option go_package = ".;pb";
-
+import "battle_msg.proto";
 //维京远征
 message DBViking {
  string id = 1;        //@go_tags(`bson:"_id"`) ID
@ -12,13 +12,6 @@ message DBViking {
  map<string,int32> bossTime = 7; //@go_tags(`bson:"bossTime"`) 
 }

-// 阵型数据
-message LineUp{
-  string cid = 1; // 配置表id
-  int32 star = 2; // 星级
-  int32 lv = 3; // 等级
-}
-
 // 维京远征排行榜
 message DBVikingRank {
  string id = 1;        //@go_tags(`bson:"_id"`) ID
--- a/src/pb/proto/viking_msg.proto
+++ b/src/pb/proto/viking_msg.proto
@ -14,7 +14,11 @@ message VikingChallengeReq {
  repeated string teamids = 4; //阵容信息
 }

-message VikingChallengeResp { BattleInfo info = 1; }
+message VikingChallengeResp {
+  BattleInfo info = 1;
+  int32 bossType = 2;   // boos 类型
+  int32 difficulty = 3; // 难度
+}

 message VikingChallengeOverReq {
  int32 bossType = 1;      // boos 类型