diff --git a/dist.rar b/dist.rar
index 53b939c..a0b65ca 100644
Binary files a/dist.rar and b/dist.rar differ
diff --git a/src/pb/proto.js b/src/pb/proto.js
index 4469c29..c17634e 100644
--- a/src/pb/proto.js
+++ b/src/pb/proto.js
@@ -389,6 +389,10 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       first: {
         type: "int32",
         id: 1
+      },
+      second: {
+        type: "int32",
+        id: 2
       }
     }
   },
@@ -422,6 +426,9 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       NameExist: 1006,
       VeriCodeNoValid: 1007,
       VeriCodeExpired: 1008,
+      UserResetData: 1009,
+      ModifynameCount: 1010,
+      MailErr: 1011,
       FriendNotSelf: 1100,
       FriendSelfMax: 1101,
       FriendTargetMax: 1102,
@@ -438,6 +445,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       ItemsNoFoundGird: 1201,
       ItemsGridNumUpper: 1202,
       ItemsGirdAmountUpper: 1203,
+      ItemsUseNotSupported: 1204,
       HeroNoExist: 1300,
       HeroNoEnough: 1301,
       HeroMaxLv: 1302,
@@ -460,10 +468,15 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       HeroAddMaxExp: 1319,
       HeroStarLvErr: 1320,
       HeroMaxStarLv: 1321,
+      DrawCardTypeNotFound: 1322,
       EquipmentOnFoundEquipment: 1400,
       EquipmentLvlimitReached: 1401,
       MainlineNotFindChapter: 1500,
       MainlineIDFailed: 1501,
+      MainlineNotFound: 1502,
+      MainlinePreNotFound: 1503,
+      MainlineRepeatReward: 1504,
+      MainlineCompleteReward: 1505,
       TaskInit: 1600,
       TaskReset: 1601,
       TaskHandle: 1602,
@@ -472,7 +485,8 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       TaskActiveNofound: 1605,
       TaskActiveNoenough: 1606,
       TaskNoFinished: 1607,
-      TaskFinished: 1608
+      TaskFinished: 1608,
+      ShopGoodsIsSoldOut: 1700
     }
   },
   google: {
@@ -526,7 +540,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         id: 1
       },
       cId: {
-        type: "sint32",
+        type: "string",
         id: 2
       },
       uId: {
@@ -932,7 +946,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         id: 2
       },
       heroID: {
-        type: "int32",
+        type: "string",
         id: 3
       },
       star: {
@@ -1063,6 +1077,18 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       }
     }
   },
+  MapStringInt32: {
+    fields: {
+      Key: {
+        type: "string",
+        id: 1
+      },
+      Value: {
+        type: "int32",
+        id: 2
+      }
+    }
+  },
   HeroStrengthenUplvReq: {
     fields: {
       heroObjID: {
@@ -1070,8 +1096,8 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         id: 1
       },
       expCards: {
-        keyType: "string",
-        type: "int32",
+        rule: "repeated",
+        type: "MapStringInt32",
         id: 2
       }
     }
@@ -1235,7 +1261,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
     fields: {
       heroIds: {
         rule: "repeated",
-        type: "int32",
+        type: "string",
         id: 1
       }
     }
@@ -1286,7 +1312,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
   HeroGetSpecifiedReq: {
     fields: {
       heroCoinfigID: {
-        type: "int32",
+        type: "string",
         id: 1
       },
       Amount: {
@@ -1323,7 +1349,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
     fields: {
       heroes: {
         rule: "repeated",
-        type: "int32",
+        type: "string",
         id: 1
       }
     }
@@ -1348,7 +1374,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         id: 2
       },
       itemId: {
-        type: "int32",
+        type: "string",
         id: 3
       },
       amount: {
@@ -1434,7 +1460,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         id: 1
       },
       ItemId: {
-        type: "int32",
+        type: "string",
         id: 2
       },
       Amount: {
@@ -1554,9 +1580,8 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
   },
   MailDelMailResp: {
     fields: {
-      Mail: {
-        rule: "repeated",
-        type: "DBMailData",
+      ObjID: {
+        type: "string",
         id: 1
       }
     }
@@ -1587,26 +1612,14 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         type: "int32",
         id: 4
       },
-      intensity: {
-        type: "int32",
-        id: 5
-      },
       awaredID: {
         type: "int32",
-        id: 6
-      },
-      progress: {
-        type: "int32",
-        id: 7
-      },
-      totalBox: {
-        type: "int32",
-        id: 8
+        id: 5
       },
       branchID: {
         rule: "repeated",
         type: "int32",
-        id: 9
+        id: 6
       }
     }
   },
@@ -1622,19 +1635,15 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       }
     }
   },
-  MainlineGetRewrdReq: {
+  MainlineGetRewardReq: {
     fields: {
-      chapterId: {
-        type: "uint32",
+      chapterObj: {
+        type: "string",
         id: 1
-      },
-      boxId: {
-        type: "uint32",
-        id: 2
       }
     }
   },
-  MainlineGetRewrdResp: {
+  MainlineGetRewardResp: {
     fields: {
       data: {
         type: "DBMainline",
@@ -1644,8 +1653,8 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
   },
   MainlineChallengeReq: {
     fields: {
-      chapterId: {
-        type: "uint32",
+      chapterObj: {
+        type: "string",
         id: 1
       },
       mainlineId: {
@@ -1662,6 +1671,14 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       }
     }
   },
+  MainlineNewChapterPush: {
+    fields: {
+      data: {
+        type: "DBMainline",
+        id: 1
+      }
+    }
+  },
   DBSystemNotify: {
     fields: {
       id: {
@@ -1808,10 +1825,12 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         id: 3
       },
       buyNum: {
+        keyType: "int32",
         type: "int32",
         id: 4
       },
       lastBuyTime: {
+        keyType: "int32",
         type: "int64",
         id: 5
       }
@@ -1866,9 +1885,13 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
   },
   ShopBuyReq: {
     fields: {
+      ShopType: {
+        type: "ShopType",
+        id: 1
+      },
       GoodsId: {
         type: "int32",
-        id: 1
+        id: 2
       }
     }
   },
@@ -1894,21 +1917,29 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         type: "int32",
         id: 3
       },
-      progress: {
+      tag: {
         type: "int32",
         id: 4
       },
-      active: {
+      progress: {
         type: "int32",
         id: 5
       },
-      status: {
+      active: {
         type: "int32",
         id: 6
       },
-      received: {
+      status: {
         type: "int32",
         id: 7
+      },
+      received: {
+        type: "int32",
+        id: 8
+      },
+      typeId: {
+        type: "int32",
+        id: 9
       }
     }
   },
@@ -1926,9 +1957,13 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         type: "int32",
         id: 3
       },
-      received: {
+      tag: {
         type: "int32",
         id: 4
+      },
+      received: {
+        type: "int32",
+        id: 5
       }
     }
   },
@@ -2031,6 +2066,14 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       }
     }
   },
+  TaskFinishedPush: {
+    fields: {
+      taskId: {
+        type: "int32",
+        id: 1
+      }
+    }
+  },
   CacheUser: {
     fields: {
       uid: {
@@ -2128,6 +2171,10 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       diamond: {
         type: "int32",
         id: 18
+      },
+      title: {
+        type: "int32",
+        id: 19
       }
     }
   },
@@ -2204,6 +2251,10 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       data: {
         type: "DBUser",
         id: 1
+      },
+      ex: {
+        type: "DBUserExpand",
+        id: 2
       }
     }
   },
@@ -2254,7 +2305,12 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
     }
   },
   UserCreateResp: {
-    fields: {}
+    fields: {
+      IsSucc: {
+        type: "bool",
+        id: 1
+      }
+    }
   },
   UserAddResReq: {
     fields: {
@@ -2340,6 +2396,38 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
   UserInitdataResp: {
     fields: {}
   },
+  UserModifynameReq: {
+    fields: {
+      name: {
+        type: "string",
+        id: 1
+      }
+    }
+  },
+  UserModifynameResp: {
+    fields: {
+      uid: {
+        type: "string",
+        id: 1
+      },
+      count: {
+        type: "uint32",
+        id: 2
+      }
+    }
+  },
+  UserGetTujianReq: {
+    fields: {}
+  },
+  UserGetTujianResp: {
+    fields: {
+      heroids: {
+        rule: "repeated",
+        type: "string",
+        id: 1
+      }
+    }
+  },
   DBUserExpand: {
     fields: {
       id: {
@@ -2354,9 +2442,38 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         type: "int64",
         id: 3
       },
+      lastInitdataTime: {
+        type: "int64",
+        id: 4
+      },
+      initdataCount: {
+        type: "uint32",
+        id: 5
+      },
       chatchannel: {
         type: "int32",
-        id: 4
+        id: 6
+      },
+      modifynameCount: {
+        type: "int32",
+        id: 7
+      },
+      tujian: {
+        keyType: "string",
+        type: "bool",
+        id: 8
+      }
+    }
+  },
+  Floor: {
+    fields: {
+      h4: {
+        type: "int32",
+        id: 1
+      },
+      h5: {
+        type: "int32",
+        id: 2
       }
     }
   },
@@ -2370,21 +2487,37 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         type: "string",
         id: 2
       },
-      type: {
-        type: "int32",
+      race0: {
+        type: "Floor",
         id: 3
       },
-      parame: {
-        type: "int32",
+      race1: {
+        type: "Floor",
         id: 4
       },
-      value: {
-        type: "int32",
+      race2: {
+        type: "Floor",
         id: 5
       },
-      ctime: {
-        type: "int64",
+      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
       }
     }
   }
diff --git a/src/pb/proto/chat_db.proto b/src/pb/proto/chat_db.proto
index d6b141b..758cbc2 100644
--- a/src/pb/proto/chat_db.proto
+++ b/src/pb/proto/chat_db.proto
@@ -2,23 +2,24 @@ syntax = "proto3";
 option go_package = ".;pb";
 
 enum ChatChannel {
-  World = 0;       //世界频道
-  Union = 1;       //工会频道
-  Private = 2;     //私有频道
-  CrossServer = 3; //跨服频道
-  System = 4;      //系统频道
+    World = 0;              //世界频道
+    Union = 1;              //工会频道
+    Private = 2;            //私有频道
+    CrossServer = 3;        //跨服频道
+    System = 4;             //系统频道
 }
 
+
 message DBChat {
-  string id = 1;           //主键id
-  ChatChannel channel = 2; //频道
-  string suid = 3;         //发送用户id
-  string ruid = 4;         //接收用户id channel == Private 有效
-  int32 groud = 5;         //跨服频道 分组id
-  int32 areaId = 6;        //跨服频道 频道Id
-  string unionId = 7;      //工会id
-  int32 headid = 8;        //用户头像
-  string uname = 9;        //用户名
-  string content = 10;     //内容
-  int64 ctime = 11;        //创建时间
+    string id =1;               //主键id
+    ChatChannel channel = 2;    //频道
+    string suid =3;             //发送用户id
+    string ruid = 4;            //接收用户id channel == Private 有效
+    int32 groud = 5;            //跨服频道 分组id
+    int32 areaId = 6;           //跨服频道 频道Id
+    string unionId = 7;         //工会id
+    int32 headid = 8;           //用户头像
+    string uname = 9;           //用户名
+    string content = 10;         //内容
+    int64 ctime = 11;           //创建时间 
 }
\ No newline at end of file
diff --git a/src/pb/proto/comm.proto b/src/pb/proto/comm.proto
index 6b20b21..d2395df 100644
--- a/src/pb/proto/comm.proto
+++ b/src/pb/proto/comm.proto
@@ -92,4 +92,5 @@ message UserAssets {
 
 message TaskParam {
   int32 first = 1;  //限定条件
+  int32 second = 2; //次数
 }
\ No newline at end of file
diff --git a/src/pb/proto/equipment_db.proto b/src/pb/proto/equipment_db.proto
index 914db48..f6a1609 100644
--- a/src/pb/proto/equipment_db.proto
+++ b/src/pb/proto/equipment_db.proto
@@ -13,7 +13,7 @@ message EquipmentAttributeEntry {
 //武器数据
 message DB_Equipment {
     string Id = 1;                                              //@go_tags(`bson:"_id"`) 装备id
-    sint32 cId = 2;                                             //@go_tags(`bson:"cId"`)    配置Id
+    string cId = 2;                                             //@go_tags(`bson:"cId"`)    配置Id
     string uId = 3;                                             //@go_tags(`bson:"uid"`)    所属玩家Id
     string heroId = 5;                                          //@go_tags(`bson:"heroId"`)  挂在的英雄卡片id 未装备 填 ''
     sint32 lv = 6;                                              //@go_tags(`bson:"lv"`) 装备强化等级
diff --git a/src/pb/proto/errorcode.proto b/src/pb/proto/errorcode.proto
index 6f07c13..d50b991 100644
--- a/src/pb/proto/errorcode.proto
+++ b/src/pb/proto/errorcode.proto
@@ -32,6 +32,9 @@ enum ErrorCode {
   NameExist = 1006;       //昵称已存在
   VeriCodeNoValid = 1007; //验证码无效
   VeriCodeExpired = 1008; //验证码过期
+  UserResetData = 1009;   //初始化用户失败
+  ModifynameCount = 1010; //名称修改次数不足
+  MailErr = 1011; // 邮件不存在
 
   // friend
   FriendNotSelf = 1100;         //不能是自己
@@ -52,6 +55,7 @@ enum ErrorCode {
   ItemsNoFoundGird = 1201;     //背包未找到物品格子
   ItemsGridNumUpper = 1202;    //背包格子数量已达上限
   ItemsGirdAmountUpper = 1203; //背包格子容量已达上限
+  ItemsUseNotSupported = 1204; //暂不支持使用
 
   // hero
   HeroNoExist = 1300;         //英雄不存在
@@ -76,6 +80,7 @@ enum ErrorCode {
   HeroAddMaxExp = 1319;       // 升级经验卡溢出 检查传入的数量
   HeroStarLvErr = 1320;       // 升星等级不够
   HeroMaxStarLv = 1321;       // 达到最大升星等级
+  DrawCardTypeNotFound = 1322; // 抽卡类型不匹配
 
   // equipment
   EquipmentOnFoundEquipment = 1400; // 未找到武器
@@ -83,6 +88,10 @@ enum ErrorCode {
   // mainMainline
   MainlineNotFindChapter = 1500; // 没有找到主线关卡信息
   MainlineIDFailed = 1501;       // 关卡ID 错误
+  MainlineNotFound = 1502; // 主线关卡不存在
+  MainlinePreNotFound = 1503; // 前置关卡不匹配
+  MainlineRepeatReward = 1504; // 重复领奖
+  MainlineCompleteReward = 1505; // 通关才能领奖
 
   // task
   TaskInit = 1600;           //初始化失败
@@ -94,4 +103,7 @@ enum ErrorCode {
   TaskActiveNoenough = 1606; //活跃值未达标
   TaskNoFinished = 1607;     //任务未完成
   TaskFinished = 1608;       //已完成
+
+  // shop
+  ShopGoodsIsSoldOut = 1700;  //商品已售罄
 }
\ No newline at end of file
diff --git a/src/pb/proto/hero_db.proto b/src/pb/proto/hero_db.proto
index fd36e29..ee77ad2 100644
--- a/src/pb/proto/hero_db.proto
+++ b/src/pb/proto/hero_db.proto
@@ -9,7 +9,7 @@ message SkillData {
 message DBHero {
   string id = 1; //@go_tags(`bson:"_id"`) ID
   string uid = 2;
-  int32 heroID = 3;       //@go_tags(`bson:"heroID"`)  英雄的配置表ID
+  string heroID = 3;       //@go_tags(`bson:"heroID"`)  英雄的配置表ID
   int32 star = 4;         // 英雄星级
   int32 lv = 5;           // 英雄等级
   int32 exp = 6;          // 英雄经验
diff --git a/src/pb/proto/hero_msg.proto b/src/pb/proto/hero_msg.proto
index 716d336..5152afa 100644
--- a/src/pb/proto/hero_msg.proto
+++ b/src/pb/proto/hero_msg.proto
@@ -22,10 +22,15 @@ message ItemData {
   int32 amount = 3; //数量
 }
 
+message MapStringInt32 {
+  string Key = 1;
+  int32 Value = 2;
+}
+
 // 卡牌升级
 message HeroStrengthenUplvReq {
   string heroObjID = 1; // 英雄对象ID
-  map<string, int32> expCards = 2;
+  repeated MapStringInt32 expCards = 2;
 }
 
 // 卡牌升级返回
@@ -104,7 +109,7 @@ message HeroAwakenResp {
 }
 
 //抽卡
-message HeroChoukaReq { repeated int32 heroIds = 1; }
+message HeroChoukaReq { repeated string heroIds = 1; }
 
 message HeroChoukaResp { repeated DBHero heroes = 1; }
 
@@ -125,10 +130,10 @@ message HeroLockResp {
 
 // 测试用（获取指定星级等级的英雄）
 message HeroGetSpecifiedReq {
-  int32 heroCoinfigID = 1; // 英雄配置ID
-  int32 Amount = 2;        // 数量
-  int32 star = 3;          // 星级
-  int32 lv = 4;            // 等级
+  string heroCoinfigID = 1; // 英雄配置ID
+  int32 Amount = 2;         // 数量
+  int32 star = 3;           // 星级
+  int32 lv = 4;             // 等级
 }
 
 message HeroGetSpecifiedResp {
@@ -141,7 +146,7 @@ message HeroDrawCardReq {
 }
 
 message HeroDrawCardResp {
-  repeated int32 heroes = 1; // 返回英雄的configID
+  repeated string heroes = 1; // 返回英雄的configID
 }
 
 // 英雄变化推送
diff --git a/src/pb/proto/items_db.proto b/src/pb/proto/items_db.proto
index 7b66f4b..ee9a0d4 100644
--- a/src/pb/proto/items_db.proto
+++ b/src/pb/proto/items_db.proto
@@ -6,7 +6,7 @@ option go_package = ".;pb";
 message DB_UserItemData {
     string gridId = 1;                           //@go_tags(`bson:"_id"`)               背包格子Id
     string uId = 2;                              //@go_tags(`bson:"uid"`)               用户id
-    int32 itemId = 3;                            //@go_tags(`bson:"itemId"`)            存放物品的Id
+    string itemId = 3;                            //@go_tags(`bson:"itemId"`)            存放物品的Id
     uint32 amount = 4;                           //@go_tags(`bson:"amount"`)            存放物品的数量
     int64 cTime = 5;                             //@go_tags(`bson:"cTime"`)             物品获取时间
     int64 eTime = 6;                             //@go_tags(`bson:"eTime"`)             物品过期时间
diff --git a/src/pb/proto/items_msg.proto b/src/pb/proto/items_msg.proto
index aa3734b..0eeeb6c 100644
--- a/src/pb/proto/items_msg.proto
+++ b/src/pb/proto/items_msg.proto
@@ -33,7 +33,7 @@ message ItemsUseItemResp {
 //出售道具请求sailitem
 message ItemsSellItemReq {
   string GridId = 1; //格子Id
-  int32 ItemId = 2;  //物品Id
+  string ItemId = 2; //物品Id
   uint32 Amount = 3; //使用数量
 }
 
diff --git a/src/pb/proto/mail_msg.proto b/src/pb/proto/mail_msg.proto
index 33561fa..4ccd829 100644
--- a/src/pb/proto/mail_msg.proto
+++ b/src/pb/proto/mail_msg.proto
@@ -20,7 +20,9 @@ message MailGetUserMailAttachmentResp { DBMailData Mail = 1; }
 // 删除某个邮件
 message MailDelMailReq { string ObjID = 1; }
 
-message MailDelMailResp { repeated DBMailData Mail = 1; }
+message MailDelMailResp {
+  string ObjID = 1; // 返回删除邮件id
+}
 
 // 推送邮件
 message MailGetNewMailPush {
diff --git a/src/pb/proto/mainline_db.proto b/src/pb/proto/mainline_db.proto
index 08b8204..029bf03 100644
--- a/src/pb/proto/mainline_db.proto
+++ b/src/pb/proto/mainline_db.proto
@@ -6,9 +6,6 @@ message DBMainline {
   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 intensity = 5;  //@go_tags(`bson:"intensity"`) 难度类型
-  int32 awaredID  = 6;  //@go_tags(`bson:"awaredID"`) 领奖ID
-  int32 progress = 7;   // @go_tags(`bson:"progress"`) 通关进度(打了多少主关卡)
-  int32 totalBox = 8;   // @go_tags(`bson:"totalBox"`) 总关卡数量
-  repeated int32 branchID = 9; // @go_tags(`bson:"branchID"`) 记录分支通关的情况
+  int32 awaredID  = 5;  //@go_tags(`bson:"awaredID"`) 是否领奖(设置int是考虑后续扩展有多个宝箱情况)
+  repeated int32 branchID = 6; // @go_tags(`bson:"branchID"`) 记录分支通关的情况
 }
\ No newline at end of file
diff --git a/src/pb/proto/mainline_msg.proto b/src/pb/proto/mainline_msg.proto
index d2be58f..6a21c46 100644
--- a/src/pb/proto/mainline_msg.proto
+++ b/src/pb/proto/mainline_msg.proto
@@ -8,21 +8,23 @@ message MainlineGetListReq {}
 message MainlineGetListResp { repeated DBMainline data = 1; }
 
 // 领取关卡宝箱
-message MainlineGetRewrdReq {
-  uint32 chapterId = 1; // 章节ID
-  uint32 boxId = 2;     // 宝箱ID
+message MainlineGetRewardReq {
+  string chapterObj = 1; // 章节唯一对象id
 }
 
-message MainlineGetRewrdResp {
+message MainlineGetRewardResp {
   DBMainline data = 1; //当前章节信息
 }
 
 // 挑战关卡
 message MainlineChallengeReq {
-  uint32 chapterId = 1;  // 章节ID
+  string chapterObj = 1; // 章节唯一对象id
   uint32 mainlineId = 2; // 小关ID
 }
 
 message MainlineChallengeResp {
   DBMainline data = 1; //当前章节信息
-}
\ No newline at end of file
+}
+
+// 推送新章节
+message MainlineNewChapterPush { DBMainline data = 1; }
\ No newline at end of file
diff --git a/src/pb/proto/shop_db.proto b/src/pb/proto/shop_db.proto
index 3f5294e..eebb822 100644
--- a/src/pb/proto/shop_db.proto
+++ b/src/pb/proto/shop_db.proto
@@ -30,6 +30,6 @@ 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 buyNum = 4;                   //@go_tags(`bson:"buyNum"`)购买数量
-    int64 lastBuyTime = 5;              //@go_tags(`bson:"lastBuyTime"`)最后一次购买的时间
+    map<int32,int32> buyNum = 4;        //@go_tags(`bson:"buyNum"`)购买数量
+    map<int32,int64> lastBuyTime = 5;   //@go_tags(`bson:"lastBuyTime"`)最后一次购买的时间
 }
\ No newline at end of file
diff --git a/src/pb/proto/shop_msg.proto b/src/pb/proto/shop_msg.proto
index 2ae8c64..536d8f1 100644
--- a/src/pb/proto/shop_msg.proto
+++ b/src/pb/proto/shop_msg.proto
@@ -25,7 +25,8 @@ message ShopGetListResp {
 
 //购买商品 请求
 message ShopBuyReq {
-  int32 GoodsId = 1; //商品Id
+  ShopType ShopType = 1; //商店类型
+  int32 GoodsId = 2;     //商品Id
 }
 
 //购买商品 回应
diff --git a/src/pb/proto/task_db.proto b/src/pb/proto/task_db.proto
index 7e44af9..f5ba4a9 100644
--- a/src/pb/proto/task_db.proto
+++ b/src/pb/proto/task_db.proto
@@ -5,15 +5,18 @@ message DBTask {
   string id = 1;      //@go_tags(`bson:"_id"`) ID
   string uid = 2;     //@go_tags(`bson:"uid"`) 用户ID
   int32 taskId = 3;   //@go_tags(`bson:"taskId"`) 任务Id
-  int32 progress = 4; //@go_tags(`bson:"progress"`) 任务进度/完成次数
-  int32 active = 5;   //@go_tags(`bson:"active"`) 活跃度
-  int32 status = 6; //@go_tags(`bson:"status"`)  任务状态 默认0未完成 1已完成
-  int32 received = 7; //@go_tags(`bson:"received"`) 领取状态 默认0未领取 1已领取
+  int32 tag = 4;      //@go_tags(`bson:"tag"`) 标签
+  int32 progress = 5; //@go_tags(`bson:"progress"`) 任务进度/完成次数
+  int32 active = 6;   //@go_tags(`bson:"active"`) 活跃度
+  int32 status = 7; //@go_tags(`bson:"status"`)  任务状态 默认0未完成 1已完成
+  int32 received = 8; //@go_tags(`bson:"received"`) 领取状态 默认0未领取 1已领取
+  int32 typeId = 9; //@go_tags(`bson:"typeId"`)
 }
 
 message DBTaskActive {
   string id = 1;  //@go_tags(`bson:"_id"`) ID
   string uid = 2; //@go_tags(`bson:"uid"`) 用户ID
   int32 rId = 3;  //@go_tags(`bson:"taskId"`) rewardId
-  int32 received = 4; //@go_tags(`bson:"received"`) 领取状态 默认0未领取 1已领取
+  int32 tag = 4;  //@go_tags(`bson:"tag"`) 标签
+  int32 received = 5; //@go_tags(`bson:"received"`) 领取状态 默认0未领取 1已领取
 }
\ No newline at end of file
diff --git a/src/pb/proto/task_msg.proto b/src/pb/proto/task_msg.proto
index 5099bc9..58a0505 100644
--- a/src/pb/proto/task_msg.proto
+++ b/src/pb/proto/task_msg.proto
@@ -43,4 +43,7 @@ message TaskDoStrategyReq {
 
 message TaskDoStrategyResp {
   repeated int32 taskIds = 1; //任务ID
-}
\ No newline at end of file
+}
+
+//任务完成推送
+message TaskFinishedPush { int32 taskId = 1; }
\ No newline at end of file
diff --git a/src/pb/proto/user_db.proto b/src/pb/proto/user_db.proto
index 5237fdc..e2a4da3 100644
--- a/src/pb/proto/user_db.proto
+++ b/src/pb/proto/user_db.proto
@@ -2,12 +2,12 @@ syntax = "proto3";
 option go_package = ".;pb";
 
 message CacheUser {
-  string uid = 1;                       //用户id
-  string SessionId = 2;                 //会话id
-  string ServiceTag = 3;                //所在服务集群 区服id
-  string GatewayServiceId = 4;          //所在网关服务id
-  string ip = 5;                        //远程ip
-  // DB_UserData UserData = 4; //@go_tags(`json:",inline"`)
+  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 {
@@ -29,6 +29,7 @@ message DBUser {
   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"`)头衔
 }
 
 message DBUserSetting {
@@ -46,4 +47,4 @@ message DBUserSetting {
   bool huodong = 12;   //@go_tags(`bson:"huodong"`) 特殊活动开启
   bool xuanshang = 13; //@go_tags(`bson:"wanfa"`)悬赏玩法重置
   bool saiji = 14;     //@go_tags(`bson:"wanfa"`)格斗场玩法赛季重置
-}
\ No newline at end of file
+}
diff --git a/src/pb/proto/user_msg.proto b/src/pb/proto/user_msg.proto
index f696d90..4c327e1 100644
--- a/src/pb/proto/user_msg.proto
+++ b/src/pb/proto/user_msg.proto
@@ -3,6 +3,7 @@ option go_package = ".;pb";
 import "errorcode.proto";
 import "user_db.proto";
 import "comm.proto";
+import "userexpand.proto";
 
 //用户登录
 message UserLoginReq {
@@ -10,7 +11,10 @@ message UserLoginReq {
   int32 sid = 2;      //区服编号
 }
 
-message UserLoginResp { DBUser data = 1; }
+message UserLoginResp {
+  DBUser data = 1;
+  DBUserExpand ex = 2; //用户扩展
+}
 
 //登出
 message UserLogoutReq {}
@@ -35,7 +39,7 @@ message UserCreateReq {
   string NickName = 1; //昵称
 }
 
-message UserCreateResp {}
+message UserCreateResp { bool IsSucc = 1; }
 
 //添加用户资源
 message UserAddResReq {
@@ -72,7 +76,21 @@ message UserVeriCodeResp {
   int32 code = 1; //验证码
 }
 
+//初始化用户数据
 message UserInitdataReq {
   int32 code = 1; //验证码
 }
-message UserInitdataResp {}
\ No newline at end of file
+message UserInitdataResp {}
+
+//修改玩家名字
+message UserModifynameReq {
+  string name = 1; //玩家名称
+}
+message UserModifynameResp {
+  string uid = 1;
+  uint32 count = 2; //剩余修改次数
+}
+
+message UserGetTujianReq {}
+
+message UserGetTujianResp { repeated string heroids = 1; }
\ No newline at end of file
diff --git a/src/pb/proto/userexpand.proto b/src/pb/proto/userexpand.proto
index 8ce3d42..a04842f 100644
--- a/src/pb/proto/userexpand.proto
+++ b/src/pb/proto/userexpand.proto
@@ -1,11 +1,14 @@
 syntax = "proto3";
 option go_package = ".;pb";
 
-
 //用户扩展数据
 message DBUserExpand {
-    string id = 1;                  //主键id
-    string uid  = 2;                //用户id   
-    int64 lastreadnotiftime = 3;    //最后阅读公告时间
-    int32 chatchannel = 4;          //跨服聊天频道
- }
\ No newline at end of file
+  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;  // 图鉴
+}
diff --git a/src/pb/proto/userrecord.proto b/src/pb/proto/userrecord.proto
index c72f140..717ded3 100644
--- a/src/pb/proto/userrecord.proto
+++ b/src/pb/proto/userrecord.proto
@@ -1,13 +1,21 @@
 syntax = "proto3";
 option go_package = ".;pb";
 
+message Floor{ // 记录阵型保底数据
+    int32 h4 = 1;  // 4星次数
+    int32 h5 = 2;  // 5星次数
+}
 
 //用户扩展数据
 message DBUserRecord {
-    string id = 1;                  // 主键id
-    string uid  = 2;                // 用户id   
-    int32 type = 3;					// 数据类型
-	int32 parame = 4;				// 参数
-	int32 value = 5;				// 值
-	int64 ctime = 6;				// 创建时间
+    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;                // 修改时间
 }
\ No newline at end of file