上传协议更新

src/pb/proto.js

@@ -412,6 +412,10 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       StateInvalid: 20,
       DBError: 21,
       SystemError: 22,
+      DecodeError: 23,
+      TimestampTimeout: 24,
+      PbError: 25,
+      AgentUidEmpty: 26,
       Exception: 100,
       Unknown: 101,
       ResNoEnough: 102,
@@ -423,12 +427,12 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       GoldNoEnough: 1003,
       DiamondNoEnough: 1004,
       RoleCreated: 1005,
-      NameExist: 1006,
+      UserNickNameExist: 1006,
       VeriCodeNoValid: 1007,
       VeriCodeExpired: 1008,
       UserResetData: 1009,
-      ModifynameCount: 1010,
+      UserModiNameCount: 1010,
-      MailErr: 1011,
+      UserNickNameEmpty: 1011,
       FriendNotSelf: 1100,
       FriendSelfMax: 1101,
       FriendTargetMax: 1102,
@@ -471,6 +475,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       DrawCardTypeNotFound: 1322,
       EquipmentOnFoundEquipment: 1400,
       EquipmentLvlimitReached: 1401,
+      EquipmentIsWorn: 1402,
       MainlineNotFindChapter: 1500,
       MainlineIDFailed: 1501,
       MainlineNotFound: 1502,
@@ -486,8 +491,11 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       TaskActiveNoenough: 1606,
       TaskNoFinished: 1607,
       TaskFinished: 1608,
+      TaskTagEmpty: 1609,
+      TaskIdEmpty: 1610,
       ShopGoodsIsSoldOut: 1700,
-      ShopNoSurplusRefreshNum: 1701
+      ShopNoSurplusRefreshNum: 1701,
+      MailErr: 1800
     }
   },
   google: {
@@ -924,6 +932,22 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       }
     }
   },
+  GMCmdReq: {
+    fields: {
+      Cmod: {
+        type: "string",
+        id: 1
+      }
+    }
+  },
+  GMCmdResp: {
+    fields: {
+      IsSucc: {
+        type: "bool",
+        id: 1
+      }
+    }
+  },
   SkillData: {
     fields: {
       skillID: {
@@ -1435,6 +1459,10 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       Amount: {
         type: "uint32",
         id: 2
+      },
+      Select: {
+        type: "int32",
+        id: 3
       }
     }
   },
@@ -2523,6 +2551,22 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       }
     }
   },
+  UserModifysignReq: {
+    fields: {
+      sign: {
+        type: "string",
+        id: 1
+      }
+    }
+  },
+  UserModifysignResp: {
+    fields: {
+      uid: {
+        type: "string",
+        id: 1
+      }
+    }
+  },
   Hair: {
     fields: {
       resId: {
@@ -2642,6 +2686,18 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         keyType: "int32",
         type: "Figure",
         id: 10
+      },
+      activeday: {
+        type: "int32",
+        id: 11
+      },
+      activeweek: {
+        type: "int32",
+        id: 12
+      },
+      sign: {
+        type: "string",
+        id: 13
       }
     }
   },

src/pb/proto/chat_msg.proto

@@ -3,23 +3,15 @@ option go_package = ".;pb";
 import "chat_db.proto";
 
 //聊天消息推送
-message ChatMessagePush{
+message ChatMessagePush { DBChat chat = 1; }
-    DBChat chat = 1;
-}
 
 //申请跨服频道号
-message ChatCrossChannelReq {
+message ChatCrossChannelReq {}
-
-}
 //申请跨服频道号 回应
-message ChatCrossChannelResp {
+message ChatCrossChannelResp { int32 channelId = 1; }
-    int32 channelId = 1;
-}
 
 //申请切换频道
-message ChatChanageChannelReq {
+message ChatChanageChannelReq { int32 channelId = 1; }
-    int32 channelId = 1;
-}
 //申请切换频道 回应
 message ChatChanageChannelResp {
   int32 channelId = 1;
@@ -31,10 +23,7 @@ message ChatGetListReq {
   ChatChannel channel = 1; //频道
 }
 //请求聊天消息 回应
-message ChatGetListResp {
+message ChatGetListResp { repeated DBChat chats = 1; }
-    repeated DBChat chats = 1;
-}
-
 
 //请求跨服聊天消息
 message ChatSpanGetListReq {
@@ -42,9 +31,7 @@ message ChatSpanGetListReq {
   int32 channelId = 2;     //跨服频道id
 }
 //请求跨服聊天消息 回应
-message ChatSpanGetListResp {
+message ChatSpanGetListResp { repeated DBChat chats = 1; }
-    repeated DBChat chats = 1;
-}
 
 //消息发送请求
 message ChatSendReq {
@@ -53,10 +40,7 @@ message ChatSendReq {
   string content = 3;      //内容
 }
 //消息发送请求 回应
-message ChatSendResp {
+message ChatSendResp {}
-
-}
-
 
 //跨服消息发送请求
 message ChatSpanSendReq {
@@ -64,7 +48,4 @@ message ChatSpanSendReq {
   string content = 2;      //内容
 }
 //跨服消息发送请求 回应
-message ChatSpanSendResp {
+message ChatSpanSendResp {}
-
-}
-

src/pb/proto/equipment_msg.proto

@@ -3,9 +3,7 @@ option go_package = ".;pb";
 import "equipment_db.proto";
 
 //获取装备列表请求
-message EquipmentGetListReq {
+message EquipmentGetListReq {}
-
-}
 //获取装备列表请求 回应
 message EquipmentGetListResp {
   repeated DB_Equipment Equipments = 1; //装备列表
@@ -17,23 +15,24 @@ message EquipmentChangePush {
 }
 
 //装备挂在到英雄上
-message EquipmentEquipReq{
+message EquipmentEquipReq {
   string HeroCardId = 1; //英雄卡Id
   repeated string EquipmentId = 2; //装备Id  固定长度的数组 0-5 对应的装备栏
 }
 
 //装备挂在到英雄上 回应
-message EquipmentEquipResp{
+message EquipmentEquipResp {
   repeated DB_Equipment Equipments = 1; //挂在装备列表
 }
 
 //装备升级
-message EquipmentUpgradeReq{
+message EquipmentUpgradeReq {
   string EquipmentId = 1; //装备Id
 }
 
 //装备升级 回应
-message EquipmentUpgradeResp{
+message EquipmentUpgradeResp {
   bool IsSucc = 1;
-    repeated DB_Equipment Equipment = 2;             //由于装备可以叠加 升级后会创建一个新的装备出来 所以可能影响两个装备
+  repeated DB_Equipment Equipment =
+      2; //由于装备可以叠加 升级后会创建一个新的装备出来 所以可能影响两个装备
 }

src/pb/proto/errorcode.proto

@@ -9,13 +9,17 @@ enum ErrorCode {
   CacheReadError = 13;          //缓存读取失败
   SqlExecutionError = 14;       //数据库执行错误
   ReqParameterError = 15;       //请求参数错误
-  SignError = 16;               //签名错误
+  SignError = 16;               //签名串错误
   InsufficientPermissions = 17; //权限不足
   NoLogin = 18;                 //未登录
   UserSessionNobeing = 19;      //用户不存在
   StateInvalid = 20;            //无效状态
   DBError = 21;                 //数据库操作失败
   SystemError = 22;             //通用错误
+  DecodeError = 23;             //加密串解码错误
+  TimestampTimeout = 24;        //加密串时间戳超时
+  PbError = 25;                 // pb错误
+  AgentUidEmpty = 26;           // AgentUid空
   Exception = 100;              //程序执行异常
   Unknown = 101;                //未知错误
   ResNoEnough = 102;            //资源不足
@@ -29,12 +33,12 @@ enum ErrorCode {
   GoldNoEnough = 1003;      // 金币不足
   DiamondNoEnough = 1004;   // 钻石不足
   RoleCreated = 1005;       //已创角
-  NameExist = 1006;       //昵称已存在
+  UserNickNameExist = 1006; //昵称已存在
   VeriCodeNoValid = 1007;   //验证码无效
   VeriCodeExpired = 1008;   //验证码过期
   UserResetData = 1009;     //初始化用户失败
-  ModifynameCount = 1010; //名称修改次数不足
+  UserModiNameCount = 1010; //名称修改次数不足
-  MailErr = 1011; // 邮件不存在
+  UserNickNameEmpty = 1011; //昵称空
 
   // friend
   FriendNotSelf = 1100;         //不能是自己
@@ -85,6 +89,8 @@ enum ErrorCode {
   // equipment
   EquipmentOnFoundEquipment = 1400; // 未找到武器
   EquipmentLvlimitReached = 1401;   // 武器等级已达上限
+  EquipmentIsWorn = 1402;           // 武器已经穿戴
+
   // mainMainline
   MainlineNotFindChapter = 1500; // 没有找到主线关卡信息
   MainlineIDFailed = 1501;       // 关卡ID 错误
@@ -103,8 +109,12 @@ enum ErrorCode {
   TaskActiveNoenough = 1606; //活跃值未达标
   TaskNoFinished = 1607;     //任务未完成
   TaskFinished = 1608;       //已完成
+  TaskTagEmpty = 1609;       //任务类型空
+  TaskIdEmpty = 1610;        //任务ID空
 
   // shop
   ShopGoodsIsSoldOut = 1700;      //商品已售罄
   ShopNoSurplusRefreshNum = 1701; //剩余刷新次数已用完
+  // mail
+  MailErr = 1800; // 邮件不存在
 }

src/pb/proto/gm_msg.proto

@@ -0,0 +1,11 @@
+syntax = "proto3";
+option go_package = ".;pb";
+
+///gm 命令请求
+message GMCmdReq {
+    string Cmod = 1;
+}
+///gm 命令请求 回应
+message GMCmdResp {
+    bool IsSucc = 1;
+}

src/pb/proto/hero_db.proto

@@ -30,4 +30,5 @@ message DBHero {
   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"`) 
 }

src/pb/proto/hero_msg.proto

@@ -150,6 +150,4 @@ message HeroDrawCardResp {
 }
 
 // 英雄变化推送
-message HeroChangePush{
+message HeroChangePush { repeated DBHero list = 1; }
-  repeated DBHero list = 1;
-}

src/pb/proto/items_msg.proto

@@ -21,6 +21,7 @@ message ItemsChangePush {
 message ItemsUseItemReq {
   string GridId = 1; //格子Id
   uint32 Amount = 2; //使用数量
+  int32 Select = 3;  //选择下标
 }
 
 //使用物品请求 回应

src/pb/proto/mail_msg.proto

@@ -2,43 +2,29 @@ syntax = "proto3";
 option go_package = ".;pb";
 import "mail_db.proto";
 
-message MailGetListReq {
+message MailGetListReq {}
-
-}
 
 // 查询邮件信息
-message MailGetListResp {
+message MailGetListResp { repeated DBMailData Mails = 1; }
-   repeated DBMailData Mails = 1;
-}
 
 // 查看邮件
-message MailReadMailReq {
+message MailReadMailReq { string ObjID = 1; }
-   string ObjID = 1;
-}
 
-message MailReadMailResp {
+message MailReadMailResp { DBMailData Mail = 1; }
-   DBMailData Mail = 1;
-}
 
 // 领取附件
-message MailGetUserMailAttachmentReq {
+message MailGetUserMailAttachmentReq { string ObjID = 1; }
-   string ObjID = 1;
-}
 
-message MailGetUserMailAttachmentResp {
+message MailGetUserMailAttachmentResp { DBMailData Mail = 1; }
-   DBMailData Mail = 1;
-}
 
 // 删除某个邮件
-message MailDelMailReq {
+message MailDelMailReq { string ObjID = 1; }
-   string ObjID = 1;
-}
 
 message MailDelMailResp {
   string ObjID = 1; // 返回删除邮件id
 }
 
 // 推送邮件
-message MailGetNewMailPush{
+message MailGetNewMailPush {
   DBMailData Mail = 1; // 推送新的邮件信息
 }

src/pb/proto/mainline_msg.proto

@@ -3,13 +3,9 @@ option go_package = ".;pb";
 import "mainline_db.proto";
 
 // 查询关卡进度
-message MainlineGetListReq {
+message MainlineGetListReq {}
-
-}
 // 返回进度信息
-message MainlineGetListResp { 
+message MainlineGetListResp { repeated DBMainline data = 1; }
-    repeated DBMainline data = 1; 
-}
 
 // 领取关卡宝箱
 message MainlineGetRewardReq {
@@ -31,6 +27,4 @@ message MainlineChallengeResp {
 }
 
 // 推送新章节
-message MainlineNewChapterPush{
+message MainlineNewChapterPush { DBMainline data = 1; }
-    DBMainline data = 1; 
-}

src/pb/proto/shop_db.proto

@@ -19,17 +19,17 @@ message UserShopData {
 message DBShop {
     string id = 1;                      //@go_tags(`bson:"_id"`) 装备id   
     string uid = 2;                     //@go_tags(`bson:"uid"`) 装备id
-    UserShopData goldShop  = 3;         //@go_tags(`bson:"goldShop"`)金币商店数据
+    UserShopData goldShop  = 3;         //@go_tags(`bson:"goldShop"`) 金币商店数据
-    UserShopData diamondShop  = 4;      //@go_tags(`bson:"diamondShop"`)金币商店数据
+    UserShopData diamondShop  = 4;      //@go_tags(`bson:"diamondShop"`) 金币商店数据
-    UserShopData pvpShop  = 5;          //@go_tags(`bson:"pvpShop"`)金币商店数据
+    UserShopData pvpShop  = 5;          //@go_tags(`bson:"pvpShop"`) 金币商店数据
-    UserShopData pveShop  = 6;          //@go_tags(`bson:"pveShop"`)金币商店数据
+    UserShopData pveShop  = 6;          //@go_tags(`bson:"pveShop"`) 金币商店数据
-    UserShopData allianceShop  = 7;     //@go_tags(`bson:"allianceShop"`)金币商店数据
+    UserShopData allianceShop  = 7;     //@go_tags(`bson:"allianceShop"`) 金币商店数据
 }
 
 message DBShopItem {
     string id = 1;                      //@go_tags(`bson:"_id"`) 装备id   
     string uid = 2;                     //@go_tags(`bson:"uid"`) 装备id
-    int32 goodsId = 3;                  //@go_tags(`bson:"goodsId"`)商品Id
+    int32 goodsId = 3;                  //@go_tags(`bson:"goodsId"`) 商品Id
-    map<int32,int32> buyNum = 4;        //@go_tags(`bson:"buyNum"`)购买数量
+    map<int32,int32> buyNum = 4;        //@go_tags(`bson:"buyNum"`) 购买数量
-    map<int32,int64> lastBuyTime = 5;   //@go_tags(`bson:"lastBuyTime"`)最后一次购买的时间
+    map<int32,int64> lastBuyTime = 5;   //@go_tags(`bson:"lastBuyTime"`) 最后一次购买的时间
 }

src/pb/proto/task_msg.proto

@@ -46,6 +46,4 @@ message TaskDoStrategyResp {
 }
 
 //任务完成推送
-message TaskFinishedPush {
+message TaskFinishedPush { int32 taskId = 1; }
-  int32 taskId = 1;
-}

src/pb/proto/user_msg.proto

@@ -39,9 +39,7 @@ message UserCreateReq {
   string NickName = 1; //昵称
 }
 
-message UserCreateResp {
+message UserCreateResp { bool IsSucc = 1; }
-  bool IsSucc = 1;
-}
 
 //添加用户资源
 message UserAddResReq {
@@ -120,3 +118,8 @@ message UserFigureResp {
   int32 action = 2; //部位
   Figure figure = 3;
 }
+
+// 用户签名
+message UserModifysignReq { string sign = 1; }
+
+message UserModifysignResp { string uid = 1; }

src/pb/proto/userexpand.proto

@@ -50,4 +50,7 @@ message DBUserExpand {
   map<string, bool> tujian = 8;       // 图鉴
   int32 curFigure = 9;                //当前形象
   map<int32, Figure> preinstall = 10; //形象预设
+  int32 activeday = 11;               //日活跃度
+  int32 activeweek = 12;              //周活跃度
+  string sign = 13;                   //用户签名
 }