上传页面工具代码

src/pb/proto.js

@@ -47,8 +47,8 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         type: "string",
         id: 7
       },
-      headid: {
+      avatar: {
-        type: "int32",
+        type: "string",
         id: 8
       },
       uname: {
@@ -144,17 +144,25 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
   },
   ChatSendReq: {
     fields: {
-      channel: {
+      avatar: {
-        type: "ChatChannel",
+        type: "string",
         id: 1
       },
-      targetId: {
+      uname: {
         type: "string",
         id: 2
       },
+      channel: {
+        type: "ChatChannel",
+        id: 3
+      },
+      targetId: {
+        type: "string",
+        id: 4
+      },
       content: {
         type: "string",
-        id: 3
+        id: 5
       }
     }
   },
@@ -163,13 +171,21 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
   },
   ChatSpanSendReq: {
     fields: {
+      avatar: {
+        type: "string",
+        id: 1
+      },
+      uname: {
+        type: "string",
+        id: 2
+      },
       channel: {
         type: "ChatChannel",
-        id: 1
+        id: 3
       },
       content: {
         type: "string",
-        id: 2
+        id: 4
       }
     }
   },
@@ -433,6 +449,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       UserResetData: 1009,
       UserModiNameCount: 1010,
       UserNickNameEmpty: 1011,
+      UserExpandNull: 1012,
       FriendNotSelf: 1100,
       FriendSelfMax: 1101,
       FriendTargetMax: 1102,
@@ -473,6 +490,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       HeroStarLvErr: 1320,
       HeroMaxStarLv: 1321,
       DrawCardTypeNotFound: 1322,
+      HeroMaxSkillLv: 1323,
       EquipmentOnFoundEquipment: 1400,
       EquipmentLvlimitReached: 1401,
       EquipmentIsWorn: 1402,
@@ -493,6 +511,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       TaskFinished: 1608,
       TaskTagEmpty: 1609,
       TaskIdEmpty: 1610,
+      TaskNotFound: 1611,
       ShopGoodsIsSoldOut: 1700,
       ShopNoSurplusRefreshNum: 1701,
       MailErr: 1800
@@ -651,6 +670,312 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       }
     }
   },
+  CommentState: {
+    values: {
+      Release: 0,
+      Offline: 1
+    }
+  },
+  DBComment: {
+    fields: {
+      id: {
+        type: "string",
+        id: 1
+      },
+      heroid: {
+        type: "string",
+        id: 2
+      },
+      heroobjid: {
+        type: "string",
+        id: 3
+      },
+      uid: {
+        type: "string",
+        id: 4
+      },
+      stage: {
+        type: "string",
+        id: 5
+      },
+      avatar: {
+        type: "string",
+        id: 6
+      },
+      uname: {
+        type: "string",
+        id: 7
+      },
+      state: {
+        type: "CommentState",
+        id: 8
+      },
+      ctime: {
+        type: "int64",
+        id: 9
+      },
+      content: {
+        type: "string",
+        id: 10
+      },
+      starlist: {
+        type: "int32",
+        id: 11
+      }
+    }
+  },
+  ForumGetListReq: {
+    fields: {
+      herocid: {
+        type: "string",
+        id: 1
+      }
+    }
+  },
+  ForumGetListResp: {
+    fields: {
+      comment: {
+        rule: "repeated",
+        type: "DBComment",
+        id: 1
+      }
+    }
+  },
+  ForumReleaseCommentReq: {
+    fields: {
+      avatar: {
+        type: "string",
+        id: 1
+      },
+      uname: {
+        type: "string",
+        id: 2
+      },
+      herocid: {
+        type: "string",
+        id: 3
+      },
+      herooid: {
+        type: "string",
+        id: 4
+      },
+      content: {
+        type: "string",
+        id: 5
+      }
+    }
+  },
+  ForumReleaseCommentResp: {
+    fields: {
+      comment: {
+        type: "DBComment",
+        id: 1
+      }
+    }
+  },
+  ForumWatchHeroReq: {
+    fields: {
+      uid: {
+        type: "string",
+        id: 1
+      },
+      stag: {
+        type: "string",
+        id: 2
+      },
+      herocId: {
+        type: "string",
+        id: 3
+      },
+      herooId: {
+        type: "string",
+        id: 4
+      }
+    }
+  },
+  ForumWatchHeroResp: {
+    fields: {
+      hero: {
+        type: "DBHero",
+        id: 1
+      }
+    }
+  },
+  SkillData: {
+    fields: {
+      skillID: {
+        type: "int32",
+        id: 1
+      },
+      skillLv: {
+        type: "int32",
+        id: 2
+      }
+    }
+  },
+  DBHero: {
+    fields: {
+      id: {
+        type: "string",
+        id: 1
+      },
+      uid: {
+        type: "string",
+        id: 2
+      },
+      heroID: {
+        type: "string",
+        id: 3
+      },
+      star: {
+        type: "int32",
+        id: 4
+      },
+      lv: {
+        type: "int32",
+        id: 5
+      },
+      exp: {
+        type: "int32",
+        id: 6
+      },
+      juexingLv: {
+        type: "int32",
+        id: 7
+      },
+      captainSkill: {
+        type: "int32",
+        id: 8
+      },
+      normalSkill: {
+        rule: "repeated",
+        type: "SkillData",
+        id: 9
+      },
+      property: {
+        keyType: "string",
+        type: "int32",
+        id: 10
+      },
+      addProperty: {
+        keyType: "string",
+        type: "int32",
+        id: 11
+      },
+      cardType: {
+        type: "int32",
+        id: 12
+      },
+      curSkin: {
+        type: "int32",
+        id: 13
+      },
+      skins: {
+        rule: "repeated",
+        type: "int32",
+        id: 14
+      },
+      block: {
+        type: "bool",
+        id: 15
+      },
+      equipID: {
+        rule: "repeated",
+        type: "string",
+        id: 16
+      },
+      resonateNum: {
+        type: "int32",
+        id: 17
+      },
+      distributionResonate: {
+        type: "int32",
+        id: 18
+      },
+      energy: {
+        keyType: "int32",
+        type: "int32",
+        id: 19
+      },
+      sameCount: {
+        type: "int32",
+        id: 20
+      },
+      suiteId: {
+        type: "int32",
+        id: 21
+      },
+      suiteExtId: {
+        type: "int32",
+        id: 22
+      },
+      isOverlying: {
+        type: "bool",
+        id: 23
+      },
+      energyProperty: {
+        keyType: "string",
+        type: "int32",
+        id: 24
+      }
+    }
+  },
+  Floor: {
+    fields: {
+      h4: {
+        type: "int32",
+        id: 1
+      },
+      h5: {
+        type: "int32",
+        id: 2
+      }
+    }
+  },
+  DBHeroRecord: {
+    fields: {
+      id: {
+        type: "string",
+        id: 1
+      },
+      uid: {
+        type: "string",
+        id: 2
+      },
+      race0: {
+        type: "Floor",
+        id: 3
+      },
+      race1: {
+        type: "Floor",
+        id: 4
+      },
+      race2: {
+        type: "Floor",
+        id: 5
+      },
+      race3: {
+        type: "Floor",
+        id: 6
+      },
+      race4: {
+        type: "Floor",
+        id: 7
+      },
+      triggernum: {
+        type: "int32",
+        id: 8
+      },
+      activityid: {
+        type: "int32",
+        id: 9
+      },
+      mtime: {
+        type: "int64",
+        id: 10
+      }
+    }
+  },
   DBFriend: {
     fields: {
       uid: {
@@ -948,120 +1273,6 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       }
     }
   },
-  SkillData: {
-    fields: {
-      skillID: {
-        type: "int32",
-        id: 1
-      },
-      skillLv: {
-        type: "int32",
-        id: 2
-      }
-    }
-  },
-  DBHero: {
-    fields: {
-      id: {
-        type: "string",
-        id: 1
-      },
-      uid: {
-        type: "string",
-        id: 2
-      },
-      heroID: {
-        type: "string",
-        id: 3
-      },
-      star: {
-        type: "int32",
-        id: 4
-      },
-      lv: {
-        type: "int32",
-        id: 5
-      },
-      exp: {
-        type: "int32",
-        id: 6
-      },
-      juexingLv: {
-        type: "int32",
-        id: 7
-      },
-      captainSkill: {
-        type: "int32",
-        id: 8
-      },
-      normalSkill: {
-        rule: "repeated",
-        type: "SkillData",
-        id: 9
-      },
-      property: {
-        keyType: "string",
-        type: "int32",
-        id: 10
-      },
-      addProperty: {
-        keyType: "string",
-        type: "int32",
-        id: 11
-      },
-      cardType: {
-        type: "int32",
-        id: 12
-      },
-      curSkin: {
-        type: "int32",
-        id: 13
-      },
-      skins: {
-        rule: "repeated",
-        type: "int32",
-        id: 14
-      },
-      block: {
-        type: "bool",
-        id: 15
-      },
-      equipID: {
-        rule: "repeated",
-        type: "string",
-        id: 16
-      },
-      resonateNum: {
-        type: "int32",
-        id: 17
-      },
-      distributionResonate: {
-        type: "int32",
-        id: 18
-      },
-      energy: {
-        keyType: "int32",
-        type: "int32",
-        id: 19
-      },
-      sameCount: {
-        type: "int32",
-        id: 20
-      },
-      suiteId: {
-        type: "int32",
-        id: 21
-      },
-      suiteExtId: {
-        type: "int32",
-        id: 22
-      },
-      isOverlying: {
-        type: "bool",
-        id: 23
-      }
-    }
-  },
   HeroInfoReq: {
     fields: {
       heroId: {
@@ -1180,6 +1391,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         id: 1
       },
       costCardObj: {
+        rule: "repeated",
         type: "string",
         id: 2
       }
@@ -1623,6 +1835,23 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       }
     }
   },
+  MailGetAllMailAttachmentReq: {
+    fields: {}
+  },
+  MailGetAllMailAttachmentResp: {
+    fields: {
+      res: {
+        rule: "repeated",
+        type: "UserAssets",
+        id: 1
+      },
+      ids: {
+        rule: "repeated",
+        type: "string",
+        id: 2
+      }
+    }
+  },
   DBMainline: {
     fields: {
       id: {
@@ -2170,7 +2399,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         id: 5
       },
       sid: {
-        type: "int32",
+        type: "string",
         id: 6
       },
       createip: {
@@ -2194,7 +2423,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         id: 11
       },
       avatar: {
-        type: "int32",
+        type: "string",
         id: 12
       },
       gold: {
@@ -2290,7 +2519,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         id: 1
       },
       sid: {
-        type: "int32",
+        type: "string",
         id: 2
       }
     }
@@ -2304,6 +2533,10 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       ex: {
         type: "DBUserExpand",
         id: 2
+      },
+      timeNow: {
+        type: "int64",
+        id: 3
       }
     }
   },
@@ -2320,7 +2553,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         id: 1
       },
       sid: {
-        type: "int32",
+        type: "string",
         id: 2
       }
     }
@@ -2700,62 +2933,6 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         id: 13
       }
     }
-  },
-  Floor: {
-    fields: {
-      h4: {
-        type: "int32",
-        id: 1
-      },
-      h5: {
-        type: "int32",
-        id: 2
-      }
-    }
-  },
-  DBUserRecord: {
-    fields: {
-      id: {
-        type: "string",
-        id: 1
-      },
-      uid: {
-        type: "string",
-        id: 2
-      },
-      race0: {
-        type: "Floor",
-        id: 3
-      },
-      race1: {
-        type: "Floor",
-        id: 4
-      },
-      race2: {
-        type: "Floor",
-        id: 5
-      },
-      race3: {
-        type: "Floor",
-        id: 6
-      },
-      race4: {
-        type: "Floor",
-        id: 7
-      },
-      triggernum: {
-        type: "int32",
-        id: 8
-      },
-      activityid: {
-        type: "int32",
-        id: 9
-      },
-      mtime: {
-        type: "int64",
-        id: 10
-      }
-    }
   }
 });
 

src/pb/proto/chat_db.proto

@@ -9,17 +9,17 @@ enum ChatChannel {
   System = 4;      //系统频道
 }
 
-
 message DBChat {
-    string id =1;               //主键id
+  string id = 1;           //主键id
   ChatChannel channel = 2; //频道
-    string suid =3;             //发送用户id
+  string suid = 3;         //发送用户id
-    string ruid = 4;            //接收用户id channel == Private 有效
+  int32 slv = 4;           //发送者等级
-    int32 groud = 5;            //跨服频道 分组id
+  string ruid = 5;         //接收用户id channel == Private 有效
-    int32 areaId = 6;           //跨服频道 频道Id
+  int32 channelId = 6;     //跨服频道 频道Id
   string unionId = 7;      //工会id
-    int32 headid = 8;           //用户头像
+  string stag = 8;         //区服id
-    string uname = 9;           //用户名
+  string avatar = 9;       //用户头像
-    string content = 10;         //内容
+  string uname = 10;       //用户名
-    int64 ctime = 11;           //创建时间 
+  string content = 11;     //内容
+  int64 ctime = 12;        //创建时间
 }

src/pb/proto/chat_msg.proto

@@ -21,31 +21,23 @@ message ChatChanageChannelResp {
 //请求聊天消息
 message ChatGetListReq {
   ChatChannel channel = 1; //频道
+  int32 channelId = 2;     //跨服频道id
 }
+
 //请求聊天消息 回应
 message ChatGetListResp { repeated DBChat chats = 1; }
 
-//请求跨服聊天消息
-message ChatSpanGetListReq {
-  ChatChannel channel = 1; //频道
-  int32 channelId = 2;     //跨服频道id
-}
-//请求跨服聊天消息 回应
-message ChatSpanGetListResp { repeated DBChat chats = 1; }
-
 //消息发送请求
 message ChatSendReq {
-  ChatChannel channel = 1; //频道
+  string avatar = 1;       //用户头像
-  string targetId = 2;     //目标用户id
+  string uname = 2;        //用户名
-  string content = 3;      //内容
+  int32 ulv = 3;           //用户等级
+  ChatChannel channel = 4; //频道
+  string targetId = 5;     //目标用户id
+  string content = 6;      //内容
 }
-//消息发送请求 回应
-message ChatSendResp {}
 
-//跨服消息发送请求
+//消息发送请求 回应
-message ChatSpanSendReq {
+message ChatSendResp {
-  ChatChannel channel = 1; //频道
+  bool issucc = 1; //是否成功
-  string content = 2;      //内容
 }
-//跨服消息发送请求 回应
-message ChatSpanSendResp {}

src/pb/proto/equipment_msg.proto

@@ -3,7 +3,9 @@ option go_package = ".;pb";
 import "equipment_db.proto";
 
 //获取装备列表请求
-message EquipmentGetListReq {}
+message EquipmentGetListReq {
+
+}
 //获取装备列表请求 回应
 message EquipmentGetListResp {
     repeated DB_Equipment Equipments = 1;   //装备列表
@@ -15,24 +17,23 @@ 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 =
+    repeated DB_Equipment Equipment = 2;             //由于装备可以叠加 升级后会创建一个新的装备出来 所以可能影响两个装备
-      2; //由于装备可以叠加 升级后会创建一个新的装备出来 所以可能影响两个装备
 }

src/pb/proto/errorcode.proto

@@ -39,6 +39,7 @@ enum ErrorCode {
   UserResetData = 1009;     //初始化用户失败
   UserModiNameCount = 1010; //名称修改次数不足
   UserNickNameEmpty = 1011; //昵称空
+  UserExpandNull = 1012;    //扩展数据空
 
   // friend
   FriendNotSelf = 1100;         //不能是自己
@@ -85,6 +86,7 @@ enum ErrorCode {
   HeroStarLvErr = 1320;        // 升星等级不够
   HeroMaxStarLv = 1321;        // 达到最大升星等级
   DrawCardTypeNotFound = 1322; // 抽卡类型不匹配
+  HeroMaxSkillLv = 1323;       // 达到最大技能等级
 
   // equipment
   EquipmentOnFoundEquipment = 1400; // 未找到武器
@@ -111,6 +113,7 @@ enum ErrorCode {
   TaskFinished = 1608;       //已完成
   TaskTagEmpty = 1609;       //任务类型空
   TaskIdEmpty = 1610;        //任务ID空
+  TaskNotFound = 1611;       //未找到用户任务
 
   // shop
   ShopGoodsIsSoldOut = 1700;      //商品已售罄

src/pb/proto/forum_db.proto

@@ -1,3 +1,24 @@
 syntax = "proto3";
 option go_package = ".;pb";
 
+enum CommentState {
+    Release = 0;        //发布
+    Offline = 1;        //下架
+}
+
+//评论数据
+message DBComment {
+    string id =1;                   //主键id
+    string heroid = 2;              //英雄id
+    string heroobjid = 3;           //目标英雄的实例id
+    string uid =4;                  //发送用户id
+    string stage =5;                //区服id
+    string avatar = 6;               //用户头像
+    string uname = 7;               //用户名
+    CommentState state = 8;         //状态
+    int64 ctime = 9;                //发布时间
+    string content = 10;             //内容
+    int32 starlist = 11;             //点赞数
+}
+
+

src/pb/proto/forum_msg.proto

@@ -1,2 +1,39 @@
 syntax = "proto3";
 option go_package = ".;pb";
+import "forum_db.proto";
+import "hero_db.proto";
+//获取评论列表
+message ForumGetListReq {
+    string herocid = 1;         //英雄配置id
+}
+
+//获取评论回应
+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;             //评论内容
+}
+
+//发布评论回应
+message ForumReleaseCommentResp {
+    DBComment comment = 1; 
+}
+
+//查看英雄信息请求
+message ForumWatchHeroReq {
+    string uid  = 1;            //用户id
+    string stag = 2;            //区服id
+    string herocId = 3;         //用户cid
+    string herooId = 4;         //英雄实例id
+}
+//查看英雄信息回应
+message ForumWatchHeroResp {
+    DBHero hero = 1;
+}

src/pb/proto/hero_db.proto

@@ -30,5 +30,24 @@ 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"`) 
+  map<string, int32> energyProperty = 24;               //@go_tags(`bson:"energyProperty"`) 
+}
+
+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
+  Floor race0 = 3;    // 普通卡池
+  Floor race1 = 4;    // 阵型1卡池
+  Floor race2 = 5;    // 阵型2卡池
+  Floor race3 = 6;    // 阵型3卡池
+  Floor race4 = 7;    // 阵型4卡池
+  int32 triggernum = 8;           // 活动数据 存放没有触发次数 
+  int32 activityid = 9;           // 活动id
+  int64 mtime = 10;                // 修改时间
 }

src/pb/proto/hero_msg.proto

@@ -57,7 +57,7 @@ message HeroStrengthenUpStarResp {
 // 卡牌技能升级
 message HeroStrengthenUpSkillReq {
   string heroObjID = 1;   // 英雄对象ID
-  string costCardObj = 2; // 消耗技能升级卡
+  repeated string costCardObj = 2; // 消耗技能升级卡
 }
 
 // 卡牌技能升级返回
@@ -150,4 +150,6 @@ message HeroDrawCardResp {
 }
 
 // 英雄变化推送
-message HeroChangePush { repeated DBHero list = 1; }
+message HeroChangePush{
+  repeated DBHero list = 1;
+}

src/pb/proto/mail_msg.proto

@@ -1,30 +1,54 @@
 syntax = "proto3";
 option go_package = ".;pb";
 import "mail_db.proto";
+import "comm.proto";
 
-message MailGetListReq {}
+message MailGetListReq {
+
+}
 
 // 查询邮件信息
-message MailGetListResp { repeated DBMailData Mails = 1; }
+message MailGetListResp {
+   repeated DBMailData Mails = 1;
+}
 
 // 查看邮件
-message MailReadMailReq { string ObjID = 1; }
+message MailReadMailReq {
+   string ObjID = 1;
+}
 
-message MailReadMailResp { DBMailData Mail = 1; }
+message MailReadMailResp {
+   DBMailData Mail = 1;
+}
 
 // 领取附件
-message MailGetUserMailAttachmentReq { string ObjID = 1; }
+message MailGetUserMailAttachmentReq {
+   string ObjID = 1;
+}
 
-message MailGetUserMailAttachmentResp { DBMailData Mail = 1; }
+message MailGetUserMailAttachmentResp {
+   DBMailData Mail = 1;
+}
 
 // 删除某个邮件
-message MailDelMailReq { string ObjID = 1; }
+message MailDelMailReq {
+   string ObjID = 1;
+}
 
 message MailDelMailResp {
    string ObjID = 1; // 返回删除邮件id
 }
 
 // 推送邮件
-message MailGetNewMailPush {
+message MailGetNewMailPush{
    DBMailData Mail = 1; // 推送新的邮件信息
 }
+// 领取所有附件
+message MailGetAllMailAttachmentReq {
+
+}
+
+message MailGetAllMailAttachmentResp {
+   repeated UserAssets res = 1; //资源类型
+   repeated string ids = 2; // 已经领取的邮件唯一id
+}

src/pb/proto/mainline_msg.proto

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

src/pb/proto/shop_msg.proto

@@ -1,8 +1,9 @@
 syntax = "proto3";
 option go_package = ".;pb";
-import "shop_db.proto";
+import "shop/shop_db.proto";
 import "comm.proto";
 
+
 //商品对象数据
 message ShopItem {
    int32  GoodsId = 1;                  //商品Id

src/pb/proto/task_msg.proto

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

src/pb/proto/user_db.proto

@@ -15,13 +15,13 @@ message DBUser {
   string uuid = 3;     //@go_tags(`bson:"uuid"`) 玩家唯一uuid
   string binduid = 4;  //@go_tags(`bson:"binduid"`) 玩家账号
   string name = 5;     //@go_tags(`bson:"name"`) 玩家名
-  int32 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"`) 友情点
-  int32 avatar = 12;      //@go_tags(`bson:"avatar"`) 头像
+  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"`) 创角

src/pb/proto/user_msg.proto

@@ -8,12 +8,13 @@ import "userexpand.proto";
 //用户登录
 message UserLoginReq {
   string account = 1; //账号
-  int32 sid = 2;      //区服编号
+  string sid = 2;     //区服编号
 }
 
 message UserLoginResp {
   DBUser data = 1;
   DBUserExpand ex = 2; //用户扩展
+  int64 timeNow = 3;   // 服务器时间
 }
 
 //登出
@@ -24,7 +25,7 @@ message UserLogoutResp {}
 //注册
 message UserRegisterReq {
   string account = 1;
-  int32 sid = 2;
+  string sid = 2;
 }
 
 message UserRegisterResp {

src/pb/proto/userrecord.proto

@@ -1,21 +0,0 @@
-syntax = "proto3";
-option go_package = ".;pb";
-
-message Floor{ // 记录阵型保底数据
-    int32 h4 = 1;  // 4星次数
-    int32 h5 = 2;  // 5星次数
-}
-
-//用户扩展数据
-message DBUserRecord {
-    string id = 1;                  //@go_tags(`bson:"_id"`) ID 主键id
-    string uid  = 2;                //@go_tags(`bson:"uid"`) 用户ID
-    Floor race0 = 3;    // 普通卡池
-    Floor race1 = 4;    // 阵型1卡池
-    Floor race2 = 5;    // 阵型2卡池
-    Floor race3 = 6;    // 阵型3卡池
-    Floor race4 = 7;    // 阵型4卡池
-    int32 triggernum = 8;           // 活动数据 存放没有触发次数 
-    int32 activityid = 9;           // 活动id
-    int64 mtime = 10;                // 修改时间
-}

src/views/protocol/Index.vue

@@ -214,6 +214,8 @@ export default defineComponent({
       { mainType: 'stak', subs: [] },
       { mainType: 'mainline', subs: [] },
       { mainType: 'chat', subs: [] },
+      { mainType: 'gm', subs: [] },
+      { mainType: 'forum', subs: [] },
     ])
     for (const v of Object.keys(proto)) {
       for (const v1 of proto_models) {