上传代码

2023-06-04 12:16:44 +08:00 · 2023-06-04 12:16:44 +08:00 · 14ec1db85d
commit 14ec1db85d
parent c64cd72754
59 changed files with 1504 additions and 583 deletions
--- a/pb_2.7.py
+++ b/pb_2.7.py
@ -23,6 +23,7 @@ if os.path.exists(source_path):
                src_file = os.path.join(root, file)
                out_file = os.path.join(target_path, file)
                file_data = ""
+                print(src_file)
                with io.open(src_file, "r", encoding='utf-8') as f:
                  for line in f:
                    if 'import' in line:
--- a/src/pb/proto.js
+++ b/src/pb/proto.js
--- a/src/pb/proto/arena/arena_db.proto
+++ b/src/pb/proto/arena/arena_db.proto
@ -1,6 +1,8 @@
 syntax = "proto3";
 option go_package = ".;pb";
 import "hero/hero_db.proto";
+import "comm.proto";
+
 //玩家战斗阵型
 message DBPlayerBattleFormt {
  int32 leadpos = 1; //队长位置
@ -38,6 +40,13 @@ message DBHeroBase {
  string cid = 2; //英雄配置id
  int32 star = 3; //英雄星级
  int32 lv = 4;   //英雄等级
+  map<string, int32> property = 5; // 属性相关
+  map<string, int32> addProperty = 6; //@go_tags(`bson:"addProperty"`) 附加属性相关
+  map<string, int32> juexProperty = 7;   //@go_tags(`bson:"juexProperty"`) //觉醒属性
+  map<string, int32> talentProperty = 8; //@go_tags(`bson:"talentProperty"`)  // 天赋属性
+  map<string, int32> horoscopeProperty = 9; //@go_tags(`bson:"horoscopeProperty"`) //星座属性加成
+  map<string, int32> fetters = 10; //@go_tags(`bson:"fetters"`) //羁绊属性加成
+  repeated SkillData normalSkill = 11; //@go_tags(`bson:"normalSkill"`) 普通技能
 }
 //战斗记录
 message DBArenaBattleRecord {
--- a/src/pb/proto/arena/arena_msg.proto
+++ b/src/pb/proto/arena/arena_msg.proto
@ -54,7 +54,7 @@ message ArenaChallengeRewardReq {
  BattleReport report = 5; //战报
  string revengeid = 6;    //复仇id
 }
-message ArenaChallengeRewardResp { bool issucc = 1; }
+message ArenaChallengeRewardResp { bool issucc = 1;int32 integral = 2;int32 dan = 3;}

 //竞技场排行榜 请求
 message ArenaRankReq {}
--- a/src/pb/proto/battle/battle_db.proto
+++ b/src/pb/proto/battle/battle_db.proto
@ -57,7 +57,7 @@ message BattleRole {
  repeated SkillData normalSkill = 10; //@go_tags(`bson:"normalSkill"`) 普通技能
  repeated SkillData equipSkill = 11; //@go_tags(`bson:"equipSkill"`) 普通技能
  int32 PandaBuff = 12;             //熊猫buff技能id
-  map<string, int32> property = 13; // 属性相关
+  map<int32, int32> property = 13; //基础属性
  bool ishelp = 14;                 //是否是助战英雄
  int32 isboos = 15;                //是否是boos
  int32 monsterid = 16;             //怪物id
--- a/src/pb/proto/battle/battle_struct.proto
+++ b/src/pb/proto/battle/battle_struct.proto
@ -154,4 +154,9 @@ enum EffectTipsType {
  Not_Gain = 4; //无法获得增益
  Not_Control = 5; //免疫控制
  Not_Action = 6;  //无法行动
+}
+//链接特效
+message ComChainEffect
+{
+  repeated int32 roles = 1;
 }
--- a/src/pb/proto/caravan/caravan_db.proto
+++ b/src/pb/proto/caravan/caravan_db.proto
@ -0,0 +1,38 @@
+syntax = "proto3";
+option go_package = ".;pb";
+
+message Goods{
+  int32 period = 1;     // 变动周期
+  int32 curPeriod = 2;  // 当前变动周期
+  int32 price = 3;      // 当前价格
+  int64 time = 4;       // 刷新时间
+}
+
+message CityInfo{
+  repeated int32 like = 1;  // 喜欢的货物ID
+  repeated int32 unlike = 2; // 不喜欢的货物ID
+  map<int32,int32> count = 3; // 货物对应的数量
+  int64 rtime = 4; // 商店刷新时间
+}
+
+message  BagInfo{// 背包信息
+  int32 count = 1; //数量
+  int32 price = 2; //单价
+}
+
+message DBCaravan {
+  string id = 1; //@go_tags(`bson:"_id"`) ID
+  string uid = 2; //@go_tags(`bson:"uid"`) 用户ID
+  int32 useCount = 3; //@go_tags(`bson:"usecount"`) 当前背包使用的数量
+  map<int32,BagInfo> items = 4; // 背包数据
+  map<int32,Goods> goods = 5; //  key 货物ID 
+  map<int32,CityInfo> city = 6; // 城市信息
+  int32 lv = 7;// 商队等级
+  int64 profit= 8;// 虚拟货利润
+  int64 resettime = 9;// 最后一次重置时间
+  int32 curcity = 10;// 当前城市
+  int32 taskid = 11; // 对应对应世界任务组 worldtask 
+  int32 eventid = 12; // 特殊事件ID(事件配置唯一id)
+  int64 tasktime = 13; // 任务触发时间
+  int32 baglimit = 14; // 背包上限
+}
--- a/src/pb/proto/caravan/caravan_msg.proto
+++ b/src/pb/proto/caravan/caravan_msg.proto
@ -0,0 +1,52 @@
+syntax = "proto3";
+option go_package = ".;pb";
+import "caravan/caravan_db.proto";
+import "comm.proto";
+// 查询进度
+message CaravanGetListReq {
+
+}
+// 返回进度信息
+message CaravanGetListResp { 
+    DBCaravan data = 1; 
+}
+
+
+message CaravanBuyOrSellReq {
+    int32 city = 1; // 城市id
+    map<int32,int32> items = 2;
+    bool isBuy = 3; // true 为买入 false 为卖出
+}
+
+message CaravanBuyOrSellResp { 
+    DBCaravan data = 1; 
+}
+
+// 去某个city
+message CaravanGotoCityReq {
+    int32 city = 1; // 城市id
+    int32 ticket = 2; // 门票数量
+}
+
+message CaravanGotoCityResp { 
+    DBCaravan data = 1; 
+    bool newtask = 2; // 触发新的任务事件
+}
+
+// 剧情任务
+message CaravanGetStoryReq {
+    int32 cid = 1; 
+    int32 citystory = 2; // 抵达城市触发的剧情
+}
+
+message CaravanGetStoryResp { 
+    DBCaravan data = 1; 
+    bool bSuccess = 2; // 是否成功接取到任务
+}
+
+// 任务完成推送
+message CaravanTaskCompletePush { 
+    DBCaravan data = 1; 
+    bool bSuccess = 2; // 是否成功完成任务
+    repeated UserAssets reward = 3; // 成功奖励
+}
--- a/src/pb/proto/chat/chat_db.proto
+++ b/src/pb/proto/chat/chat_db.proto
@ -17,6 +17,7 @@ enum ChatType {
  HeroShare = 3;      //英雄分享
  EquipmentShare = 4; //装备分享
  ItemShare = 5;      //道具分享
+  Parkour = 6;        //捕羊大赛邀请
 }

 message DBChat {
--- a/src/pb/proto/errorcode.proto
+++ b/src/pb/proto/errorcode.proto
@ -60,6 +60,7 @@ enum ErrorCode {
  UserTalent2NoEnough = 1026; //阵营2天赋点
  UserTalent3NoEnough = 1027; //阵营3天赋点
  UserTalent4NoEnough = 1028; //阵营4天赋点
+  UserMerchantNoEnough = 1029; //虚拟币不足

  // friend
  FriendNotSelf = 1100;         //不能是自己
@ -229,6 +230,7 @@ enum ErrorCode {
  LibraryLvReward = 2805;          // 领奖等级没达到
  LibraryFetterTaskNoFound = 2806; //未找到羁绊任务数据
  LibraryPreTaskNoFinished = 2807; //前置任务未完成
+  LibraryGiveMaxCount = 2808; //送礼达到最大次数

  // Battle
  BattleValidationFailed = 2901; //战斗校验失败
@ -282,6 +284,7 @@ enum ErrorCode {
  SociatyTaskNoFound = 3040;      //未找到boss任务
  SociatyTaskNoFinished = 3041;   //任务未完成
  SociatyTaskReceived = 3042;     //任务奖励已领取
+  SociatyApplyLvLimit = 3043; //超出最大申请等级限制

  // arena
  ArenaTicketBuyUp = 3101;     //票据上限
@ -298,6 +301,8 @@ enum ErrorCode {
  TrollMaxSellCount = 3303;   // 单日最大交易次数
  TrollMaxItemCount = 3304;   //背包格子达到上限
  TrollRepeatedReward = 3305; //奖励重复领取
+  TrollCity = 3306; // 已经在该城市了
+  TrollTask = 3307; // 任务没完成
  // horoscope
  HoroscopeNotTurnedOn = 3401; //未开启
  HoroscopeRestCDNoEnd = 3402; //重置cd未结束
@ -378,4 +383,12 @@ enum ErrorCode {

  //reputation
  ReputationTalentFull = 4501; //天赋满级
+  ReputationNoPreNodeLv= 4502;  //前置节点等级不满足
+
+  // oldtimes
+  OldtimesReceived = 4601; //章节奖励已领取
+  OldtimesFinished = 4602; //章节已完成
+  OldtimesLevelOver = 4603;//已通关
+  OldtimesPreLevelNoFinished = 4604; //前置未完成
+  OldtimesNoAllFinished = 4605; //没有全部通关
 }
--- a/src/pb/proto/hero/hero_db.proto
+++ b/src/pb/proto/hero/hero_db.proto
@ -38,6 +38,7 @@ message DBHero {
  map<string, int32> horoscopeProperty = 28; //@go_tags(`bson:"horoscopeProperty"`) //星座属性加成
  int32 fulllvenr = 29;                      //@go_tags(`bson:"fulllvenr"`) //满级登记分组 武馆使用
  string kongfuUid = 30;  //@go_tags(`bson:"kongfuUid"`)// 英雄在谁家练功
+  map<string, int32> fetters = 31; //@go_tags(`bson:"fetters"`) //羁绊属性加成
 }


--- a/src/pb/proto/library/library_db.proto
+++ b/src/pb/proto/library/library_db.proto
@ -5,11 +5,10 @@ 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: id
+  map<string, string> herofetter = 4; // key: hid value: DBHeroFetter ObjID
  map<int32, int32> prize = 5; //是否领奖  key 好感度等级
-  int32 fetterlv = 6;          // 当前羁绊等级
-  int32 storyid = 7;           // 故事id 用来判断是否领奖
-  bool activation = 8;         // 是否激活
+  int32 storyid = 6;           // 故事id 用来判断是否领奖
+  int32 fidlv = 7;         // 羁绊领奖等级

 }

@ -21,8 +20,10 @@ message DBHeroFetter {
  repeated int32 history = 4;    // 传记往事ID
  int32 favorlv = 5;             // 好感度等级
  int32 favorexp = 6;            // 好感度经验
-  repeated int32 stroyprize = 7; // 剧情奖励
-  repeated int32 lvprize = 8;    // 等级奖励
+
+  map<int32, int32> lvprize = 8;    // 等级奖励
+  int32 givecount = 9; // 赠送次数
+  int64 ctime = 10; // 送礼物时间
 }

 //羁绊剧情
--- a/src/pb/proto/library/library_msg.proto
+++ b/src/pb/proto/library/library_msg.proto
@ -11,18 +11,11 @@ message LibraryGetFetterListReq {}

 message LibraryGetFetterListResp { repeated DBHeroFetter data = 1; }

-// 领取奖励
-message LibraryGetRewardReq {
-  string objId = 1;
-  int32 fetterlv = 2; // 羁绊等级
-}

-message LibraryGetRewardResp { DBLibrary data = 1; }
 // 领取剧情奖励
 message LibraryGetStoryRewardReq {
-  string hid = 1;     // 英雄ID
+  string oid = 1;     // DBHeroFetter oid
  int32 history = 2;  // 传记往事id
-  int32 rightend = 3; // 对应配置表 rightend
 }

 message LibraryGetStoryRewardResp { DBHeroFetter data = 1; }
@ -30,7 +23,8 @@ message LibraryGetStoryRewardResp { DBHeroFetter data = 1; }
 // 给英雄赠送礼物
 message LibraryUseGiftReq {
  string heroid = 1;            // 英雄id
-  map<string, int32> items = 2; // key 道具ID value 数量
+  string items = 2; // 道具ID 
+  int32 counts = 3; //道具 数量
 }

 message LibraryUseGiftResp { DBHeroFetter data = 1; }
@ -61,3 +55,12 @@ message LibraryFetterstoryTaskReq {
  int32 fetterId = 1; //羁绊ID
 }
 message LibraryFetterstoryTaskResp { repeated FetterTask list = 1; }
+
+
+// 手动提升羁绊等级
+message LibraryFetterLvUpReq {
+  string libOid = 1;  // 羁绊对象id
+}
+message LibraryFetterLvUpResp { 
+  DBLibrary data = 1; 
+}
--- a/src/pb/proto/mainline/mainline_db.proto
+++ b/src/pb/proto/mainline/mainline_db.proto
@ -1,18 +0,0 @@
-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
-  AwaredType awaredID  = 5;  //@go_tags(`bson:"awaredID"`) 是否领奖(设置int是考虑后续扩展有多个宝箱情况)
-  repeated int32 branchID = 6; // @go_tags(`bson:"branchID"`) 记录所有通关的关卡数据
-  int32 intensity = 7; // 难度
-  int32 ps = 8;// 预扣的体力
-}
--- a/src/pb/proto/mainline/mainline_msg.proto
+++ b/src/pb/proto/mainline/mainline_msg.proto
@ -1,53 +0,0 @@
-syntax = "proto3";
-option go_package = ".;pb";
-import "mainline/mainline_db.proto";
-import "battle/battle_msg.proto";
-// 查询关卡进度
-message MainlineGetListReq {
-
-}
-// 返回进度信息
-message MainlineGetListResp { 
-    repeated DBMainline data = 1; 
-}
-
-// 领取关卡宝箱
-message MainlineGetRewardReq {
-    string chapterObj = 1; // 章节唯一对象id
-}
-
-message MainlineGetRewardResp {
-    DBMainline data = 1; //当前章节信息
-}
-
-// 挑战关卡
-message MainlineChallengeReq {
-    string chapterObj = 1; // 章节唯一对象id
-    uint32 mainlineId = 2; // 小关ID
-    int32 leadpos = 3;           //队长位置
-    repeated string teamids = 4; //阵容信息
-}
-
-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; //战报
-}
-
-message MainlineChallengeOverResp {
-    DBMainline data = 1; //当前章节信息
-    repeated string newheros = 2;   //获得的新英雄
-    int32 olv = 3;                  //以前的等级
-}
-
-// 推送新章节
-message MainlineNewChapterPush{
-    DBMainline data = 1; 
-}
--- a/src/pb/proto/oldtimes/oldtimes_db.proto
+++ b/src/pb/proto/oldtimes/oldtimes_db.proto
@ -0,0 +1,19 @@
+syntax = "proto3";
+option go_package = ".;pb";
+
+message DBOldtimes{
+ string uid = 1;//@go_tags(`bson:"uid"`) 玩家ID
+ repeated Chapter chapters = 2; //@go_tags(`bson:"chapters"`)  章节
+}
+
+message Chapter{
+    int32 cid=1; //@go_tags(`bson:"cid"`) 章节ID
+    int32 status = 2; //@go_tags(`bson:"status"`) 状态 0锁定 1已解锁 2进行中 3已完成
+    int32 received = 3; //@go_tags(`bson:"received"`) 奖励领取状态0未领取 1已领取
+    repeated Level levels = 4; //@go_tags(`bson:"levels"`) 关卡
+}
+
+message Level{
+    int32 lid = 1; //@go_tags(`bson:"lid"`) 关卡ID
+    int32 status = 2; //@go_tags(`bson:"status"`) 状态 0锁定 1已解锁 2进行中 3已完成
+}
--- a/src/pb/proto/oldtimes/oldtimes_msg.proto
+++ b/src/pb/proto/oldtimes/oldtimes_msg.proto
@ -0,0 +1,42 @@
+syntax = "proto3";
+option go_package = ".;pb";
+import "oldtimes/oldtimes_db.proto";
+
+// 旧时光章节和关卡数据
+message OldtimesGetallReq{}
+
+message OldtimesGetallResp{
+    DBOldtimes data = 1;
+}
+
+//进入关卡
+message OldtimesEnterReq{
+    int32 chapterId = 1;
+    int32 levelId = 2;
+}
+
+message OldtimesEnterResp{
+    int32 code = 1;
+}
+
+//关卡通过
+message OldtimesFinishReq{
+    int32 chapterId = 1; //章节ID
+    int32 levelId = 2; //关卡ID
+}
+
+message OldtimesFinishResp{
+    int32 code = 1;
+}
+
+//领取章节奖励
+message OldtimesReceiveReq{
+    int32 chapterId = 1; //章节ID
+}
+
+message OldtimesReceiveResp{
+    int32 code = 1;
+
+}
+
+
--- a/src/pb/proto/pagoda/pagoda_db.proto
+++ b/src/pb/proto/pagoda/pagoda_db.proto
@ -27,4 +27,5 @@ message DBPagodaRecord {
  int32 leadpos = 8; //队长位置
  repeated LineUp line = 9; // 阵容数据
  int32 costTime = 10; //@go_tags(`bson:"costTime"`) 闯关耗时 单位s
+  int32 tab = 11; // 页签
 }
--- a/src/pb/proto/parkour/parkour_db.proto
+++ b/src/pb/proto/parkour/parkour_db.proto
@ -19,19 +19,22 @@ message DBRaceMember {
    string uid = 1;                         //用户id
    string name = 2;                        //用户名称
    string avatar = 3;                      //用户头像
-    string mount = 4;                       //上阵坐骑
-    int32 hp = 5;                           //初始血量
-    int32 innermost = 6;                    //里程数
-    bool ready = 7;                         //是否准备
-    bool isai = 8;                          //是否是ai
-    bool isoff = 9;                         //是否离线
+    int32 lv = 4;                           //等级
+    string mount = 5;                       //上阵坐骑
+    int32 maxhp = 6;                        //初始血量
+    int32 currhp = 7;                       //当前血量
+    int32 innermost = 8;                    //里程数
+    bool ready = 9;                         //是否准备
+    bool isai = 10;                          //是否是ai
+    bool isoff = 11;                        //是否离线
 }

 message DBRaceInvite {
    string uid = 1;                         //用户id
    string name = 2;                        //用户名称
    string avatar = 3;                      //用户头像
-    int64 expired = 4;                      //过期时间
+    int32 lv = 4;                           //等级
+    int64 expired = 5;                      //过期时间
 }

 //个人竞赛信息
@ -45,7 +48,8 @@ message DBParkour {
    int32 integral = 7;                     //积分
    string captainid = 8;                   //队长id 当前所在队伍
    repeated DBRaceInvite invite = 9;       //邀请列表
-    repeated DBRaceMember member = 10;       //成员列表
+    repeated DBRaceMember member = 10;      //成员列表
+    int32 reward = 11;// 积分信息奖励
 }

 //比赛数据
--- a/src/pb/proto/parkour/parkour_msg.proto
+++ b/src/pb/proto/parkour/parkour_msg.proto
@ -9,8 +9,26 @@ message ParkourInfoReq {

 //请求比赛信息请求
 message ParkourInfoResp {
-    DBParkour info = 1;
-    repeated DBParkour recommend = 2;
+    bool isopen = 1;                        //当前赛事是否开启
+    DBParkour info = 2;
+    repeated DBRaceMember recommend = 3;
+}
+
+// 观察其他玩家信息
+message ParkourViewPlayerReq{
+    repeated string uid = 1;
+}
+
+message ParkourData {
+    string uid = 1;
+    string name = 2;  //用户名称
+    string avatar = 3; //用户头像
+    int32 lv = 4; //等级
+    int64 offlineTime = 5; //最近一次下线时间 -1在线
+}
+
+message ParkourViewPlayerResp{
+    repeated ParkourData player = 1;
 }

 //变更坐骑请求
@ -23,10 +41,10 @@ message ParkourChangeMtsResp {
    string mtsid = 2;
 }

-//推送捕羊大赛用户信息改变
-message ParkourInfoChangePush {
-    DBParkour info = 1;
-}
+// //推送捕羊大赛用户信息改变
+// message ParkourInfoChangePush {
+//     DBParkour info = 1;
+// }

 //组队邀请请求
 message ParkourInviteReq {
@ -78,9 +96,9 @@ message ParkourTeamDisbandNoticePush {
    
 }

-//匹配请求
+//匹配请求 只有队长有权限
 message ParkourRaceMatchReq {
-
+    string captainid = 1;     //队长id
 }

 //匹配请求
@ -88,6 +106,34 @@ message ParkourRaceMatchResp {

 }

+//匹配取消请求  只有队长有权限
+message ParkourRaceMatchCancelReq {
+    string captainid = 1;     //队长id
+}
+
+
+// 加入某个队伍
+message ParkourJoinTeamReq{
+    string uid = 1;
+}
+
+message ParkourJoinTeamResp{
+    DBParkour team = 1;
+}
+
+//匹配取消请求
+message ParkourRaceMatchCancelResp {
+
+}
+
+//匹配成功
+message ParkourRaceMatchStartPush {
+    DBParkour team = 1;
+}
+//匹配取消通知
+message ParkourRaceMatchCancelPush {
+    DBParkour team = 1;
+}
 //匹配成功
 message ParkourRaceMatchSuccPush {
    DBRace race = 1;
@ -95,7 +141,7 @@ message ParkourRaceMatchSuccPush {

 //准备完毕
 message ParkourReadyReq {
-    string id = 1;
+    string battleid = 1;
 }
 //准备完毕
 message ParkourReadyResp {
@ -109,7 +155,7 @@ message ParkourRaceStartPush {

 //射门请求
 message ParkourShotReq {
-    string id = 1;
+    string battleid = 1;
 }

 //射门请求
@ -117,10 +163,19 @@ message ParkourShotResp {
    
 }

+// 领取奖励
+message ParkourGetRewardReq {
+    int32 rid = 1;              //领奖id
+}
+
+message ParkourGetRewardResp {
+    DBParkour info =1;
+}
+
 //躲避障碍请求
 message ParkourAvoidReq {
-    string id = 1;
-    int32 distance = 2;
+    string battleid = 1;
+    float distance = 2;
 }

 //躲避障碍请求 回应
@ -128,20 +183,36 @@ message ParkourAvoidResp {
    
 }

+//恢复Hp请求
+message ParkourRecoverHpReq {
+    string battleid = 1;
+}
+
+//恢复Hp请求
+message ParkourRecoverHpResp {
+    bool issucc = 1;            //恢复成功
+}
+
 //全员冲刺
 message ParkourAllSprintsPush {
    int32 left = 1;                 //剩余时间
 }
+message ParkourInfoChangePush  {
+    DBParkour	Info =1  ;
+}

 //玩家hp变化通知
 message ParkourPlayerHPChanagePush {
-    string uid = 1;
-    int32 hp = 2;
+    map<string,int32> change = 1; //key是uid,value是hp
+    // string uid = 1;
+    // int32 hp = 2;
 }
 //比赛分值变化
 message ParkourScoreChanagePush {
-    int32 red = 1;
-    int32 blue = 2;
+    int32 redscore = 1;
+    int32 redenergy = 2;
+    int32 bluescore = 3;
+    int32 blueenergy = 4;
 }

 //比赛结束通知
--- a/src/pb/proto/privilege/privilege_msg.proto
+++ b/src/pb/proto/privilege/privilege_msg.proto
@ -35,4 +35,8 @@ message PrivilegeVipListReq {

 message PrivilegeVipListResp { 
    DBVip data = 1; 
+}
+
+message PrivilegeChangePush { 
+    map<int32,PrivilegeList> privilege = 1;
 }
--- a/src/pb/proto/pvp/pvp_msg.proto
+++ b/src/pb/proto/pvp/pvp_msg.proto
@ -106,12 +106,11 @@ message PvpFinishPush {
    string battleid = 1;
 }

-
 message RPC_PVPTrusteeshipReq {
    repeated string battleid = 1;
    string uid = 2;
 }

 message RPC_PVPTrusteeshipResp {
-
+    
 }
--- a/src/pb/proto/reputation/reputation_msg.proto
+++ b/src/pb/proto/reputation/reputation_msg.proto
@ -15,6 +15,7 @@ message reputationTalenttestResp{
 //天赋树升级
 message reputationUpgradeReq{
    int32 nodeId = 1; //节点ID
+    int32 raceType =2; //阵营ID
 }

 message reputationUpgradeResp{}
@ -29,3 +30,9 @@ message reputationTalentResp{
    Camp camp = 2;
 }

+// 阵营天赋树重置
+message reputationTalentresetReq{
+    int32 raceType =1;
+}
+
+message reputationTalentresetResp{}
--- a/src/pb/proto/smithy/smithy_msg.proto
+++ b/src/pb/proto/smithy/smithy_msg.proto
@ -21,6 +21,7 @@ message SmithyForgeEquipReq{
    int32 suiteId = 4;// 套装ID (非定制传0 )
    int32 position = 5; // 装备位置(没有指定位置传 -1)
    map<int32,int32> hit = 6;// 敲击数据 key 敲打 cid value 敲打次数
+    int32 count  = 7;// 打造多个装备
 }

 message SmithyForgeEquipResp{
--- a/src/pb/proto/sociaty/sociaty_msg.proto
+++ b/src/pb/proto/sociaty/sociaty_msg.proto
@ -26,9 +26,15 @@ enum SociatyListFilter {
  NOAPPLY = 2;  //无审批
  APPLYING = 3; //申请中
 }
+
+message SociatyInfo {
+  DBSociaty dbSociaty = 1;
+  SociatyMemberInfo master = 2;
+}
+
 // 公会列表
 message SociatyListReq { SociatyListFilter filter = 1; }
-message SociatyListResp { repeated DBSociaty list = 1; }
+message SociatyListResp { repeated SociatyInfo list = 1; }

 // 搜索公会
 message SociatySearchReq {
--- a/src/pb/proto/sys/sys_msg.proto
+++ b/src/pb/proto/sys/sys_msg.proto
@ -1,13 +1,7 @@
 syntax = "proto3";
 option go_package = ".;pb";

-message SysFuncListReq {
-  repeated string keys = 1; //功能ID
-}

-message SysFuncListResp {
-  repeated string funcIds = 1; //功能ID
-}

 message SysFuncGetListReq {
  repeated string keys = 1; //功能ID
@ -24,3 +18,7 @@ message SysFuncActivateReq {
 message SysFuncActivateResp {
  string cid  = 1;
 }
+
+message SysFuncOpnePush {
+  repeated string cid  = 1;
+}
--- a/src/pb/proto/task/task_msg.proto
+++ b/src/pb/proto/task/task_msg.proto
@ -50,4 +50,9 @@ message TaskActiveReceiveResp {


 //任务完成推送
-message TaskFinishedPush { int32 taskId = 1; }
+message TaskFinishedPush { int32 taskId = 1; }
+
+message TaskActiveReceivePush {
+  int32 taskTag = 1;
+  int32 id = 2;
+}
--- a/src/pb/proto/troll/troll_db.proto
+++ b/src/pb/proto/troll/troll_db.proto
@ -35,20 +35,3 @@ message DBTrollRecord{
  int64 time = 5; // 交易时间
 }

-message DBGoods{
-  string id = 1; //@go_tags(`bson:"_id"`) ID
-  int32 period = 2; // 变动周期
-  int32 curPeriod = 3; // 当前变动周期
-  int32 weight = 4; // 周期权重
-  int32 price = 5; // 当前价格
-  int32 time = 6; // 刷新时间
-}
-
-message DBTroll {
-  string id = 1; //@go_tags(`bson:"_id"`) ID
-  string uid = 2; //@go_tags(`bson:"uid"`) 用户ID
-  int32 useCount = 3; // 当前背包使用的数量
-  map<int32,int32> items = 4; // 背包数据
-  map<int32,DBGoods> goods = 5; // 货物 key 货物ID
-  int32 lv = 6;// 商队等级
-}
--- a/src/pb/proto/user/user_db.proto
+++ b/src/pb/proto/user/user_db.proto
@ -43,6 +43,11 @@ message DBUser {
  int32 talent2 = 29; //@go_tags(`bson:"talent2"`) 阵营2天赋点
  int32 talent3 = 30; //@go_tags(`bson:"talent3"`) 阵营3天赋点
  int32 talent4 = 31; //@go_tags(`bson:"talent4"`) 阵营4天赋点
+  int32 merchantmoney=32; //@go_tags(`bson:"merchantmoney"`) 虚拟币（商队)
+  repeated string perlist = 33;  //@go_tags(`bson:"perlist"`) 皮肤,动作,背景
+  string defper1 = 34;    //@go_tags(`bson:"defper1"`) 默认皮肤
+  string defper2 = 35;    //@go_tags(`bson:"defper2"`) 默认动作
+  string defper3 = 36;    //@go_tags(`bson:"defper3"`) 默认背景
 }

 message DBUserSetting {
@ -70,6 +75,6 @@ message DBSign {
  int32 signCount = 4; //@go_tags(`bson:"signCount"`) 玩家累计签到次数
  int32 group = 5;     //记录循环签到值
  int32 day = 6;       // 今天是这个月第几天
-  repeated int32 puzzle= 7; //@go_tags(`bson:"puzzle"`) 拼图游戏完成情况 // 0 未签到 1 已签到 2 玩了游戏
+  repeated int32 puzzle= 7; //@go_tags(`bson:"puzzle"`) 拼图游戏完成情况 // 0 没玩游戏 1 玩了游戏
  int32 tips = 8; // 提示次数
 }
--- a/src/pb/proto/user/user_msg.proto
+++ b/src/pb/proto/user/user_msg.proto
@ -7,6 +7,7 @@ import "pagoda/pagoda_db.proto";
 import "viking/viking_db.proto";
 import "hunting/hunting_db.proto";
 import "serverdata.proto";
+import "comm.proto";
 //用户登录
 message UserLoginReq {
  string account = 1; //账号
@ -70,6 +71,8 @@ message UserResChangedPush {
  int32 talent2 = 12; //@go_tags(`bson:"talent2"`) 阵营2天赋点
  int32 talent3 = 13; //@go_tags(`bson:"talent3"`) 阵营3天赋点
  int32 talent4 = 14; //@go_tags(`bson:"talent4"`) 阵营4天赋点
+  int32 merchantmoney = 15;//@go_tags(`bson:"merchantmoney"`) 商队虚拟币
+  repeated string perlist = 16;//@go_tags(`bson:"perlist"`) 皮肤资源
 }
 // 玩家在其它终端登录的通知
 message UserOtherTermLoginPush { string uid = 1; }
@ -218,4 +221,29 @@ message UserChangeTipsReq {

 message UserChangeTipsResp {
  DBSign data = 1;
+}
+
+
+//出售资源
+message UserSellResReq { repeated UserAtno atno = 1; }
+
+//出售资源 回应
+message UserSellResResp { 
+  repeated UserAssets atn = 1;
+  bool IsSucc = 2; 
+}
+
+//请求设置默认皮肤
+message UserSwitchDefPerReq{
+  string defper1 = 1;
+  string defper2 = 2;
+  string defper3 = 3;
+}
+
+//请求设置默认皮肤
+message UserSwitchDefPerResp{
+  bool issucc = 1;
+  string defper1 =2;
+  string defper2 = 3;
+  string defper3 = 4;
 }
--- a/src/pb/temop/arena_db.proto
+++ b/src/pb/temop/arena_db.proto
@ -1,6 +1,8 @@
 syntax = "proto3";
 option go_package = ".;pb";
 import "hero_db.proto";
+import "comm.proto";
+
 //玩家战斗阵型
 message DBPlayerBattleFormt {
  int32 leadpos = 1; //队长位置
@ -38,6 +40,13 @@ message DBHeroBase {
  string cid = 2; //英雄配置id
  int32 star = 3; //英雄星级
  int32 lv = 4;   //英雄等级
+  map<string, int32> property = 5; // 属性相关
+  map<string, int32> addProperty = 6; //@go_tags(`bson:"addProperty"`) 附加属性相关
+  map<string, int32> juexProperty = 7;   //@go_tags(`bson:"juexProperty"`) //觉醒属性
+  map<string, int32> talentProperty = 8; //@go_tags(`bson:"talentProperty"`)  // 天赋属性
+  map<string, int32> horoscopeProperty = 9; //@go_tags(`bson:"horoscopeProperty"`) //星座属性加成
+  map<string, int32> fetters = 10; //@go_tags(`bson:"fetters"`) //羁绊属性加成
+  repeated SkillData normalSkill = 11; //@go_tags(`bson:"normalSkill"`) 普通技能
 }
 //战斗记录
 message DBArenaBattleRecord {
--- a/src/pb/temop/arena_msg.proto
+++ b/src/pb/temop/arena_msg.proto
@ -54,7 +54,7 @@ message ArenaChallengeRewardReq {
  BattleReport report = 5; //战报
  string revengeid = 6;    //复仇id
 }
-message ArenaChallengeRewardResp { bool issucc = 1; }
+message ArenaChallengeRewardResp { bool issucc = 1;int32 integral = 2;int32 dan = 3;}

 //竞技场排行榜 请求
 message ArenaRankReq {}
--- a/src/pb/temop/battle_db.proto
+++ b/src/pb/temop/battle_db.proto
@ -57,7 +57,7 @@ message BattleRole {
  repeated SkillData normalSkill = 10; //@go_tags(`bson:"normalSkill"`) 普通技能
  repeated SkillData equipSkill = 11; //@go_tags(`bson:"equipSkill"`) 普通技能
  int32 PandaBuff = 12;             //熊猫buff技能id
-  map<string, int32> property = 13; // 属性相关
+  map<int32, int32> property = 13; //基础属性
  bool ishelp = 14;                 //是否是助战英雄
  int32 isboos = 15;                //是否是boos
  int32 monsterid = 16;             //怪物id
--- a/src/pb/temop/battle_struct.proto
+++ b/src/pb/temop/battle_struct.proto
@ -154,4 +154,9 @@ enum EffectTipsType {
  Not_Gain = 4; //无法获得增益
  Not_Control = 5; //免疫控制
  Not_Action = 6;  //无法行动
+}
+//链接特效
+message ComChainEffect
+{
+  repeated int32 roles = 1;
 }
--- a/src/pb/temop/caravan_db.proto
+++ b/src/pb/temop/caravan_db.proto
@ -0,0 +1,38 @@
+syntax = "proto3";
+option go_package = ".;pb";
+
+message Goods{
+  int32 period = 1;     // 变动周期
+  int32 curPeriod = 2;  // 当前变动周期
+  int32 price = 3;      // 当前价格
+  int64 time = 4;       // 刷新时间
+}
+
+message CityInfo{
+  repeated int32 like = 1;  // 喜欢的货物ID
+  repeated int32 unlike = 2; // 不喜欢的货物ID
+  map<int32,int32> count = 3; // 货物对应的数量
+  int64 rtime = 4; // 商店刷新时间
+}
+
+message  BagInfo{// 背包信息
+  int32 count = 1; //数量
+  int32 price = 2; //单价
+}
+
+message DBCaravan {
+  string id = 1; //@go_tags(`bson:"_id"`) ID
+  string uid = 2; //@go_tags(`bson:"uid"`) 用户ID
+  int32 useCount = 3; //@go_tags(`bson:"usecount"`) 当前背包使用的数量
+  map<int32,BagInfo> items = 4; // 背包数据
+  map<int32,Goods> goods = 5; //  key 货物ID 
+  map<int32,CityInfo> city = 6; // 城市信息
+  int32 lv = 7;// 商队等级
+  int64 profit= 8;// 虚拟货利润
+  int64 resettime = 9;// 最后一次重置时间
+  int32 curcity = 10;// 当前城市
+  int32 taskid = 11; // 对应对应世界任务组 worldtask 
+  int32 eventid = 12; // 特殊事件ID(事件配置唯一id)
+  int64 tasktime = 13; // 任务触发时间
+  int32 baglimit = 14; // 背包上限
+}
--- a/src/pb/temop/caravan_msg.proto
+++ b/src/pb/temop/caravan_msg.proto
@ -0,0 +1,52 @@
+syntax = "proto3";
+option go_package = ".;pb";
+import "caravan_db.proto";
+import "comm.proto";
+// 查询进度
+message CaravanGetListReq {
+
+}
+// 返回进度信息
+message CaravanGetListResp { 
+    DBCaravan data = 1; 
+}
+
+
+message CaravanBuyOrSellReq {
+    int32 city = 1; // 城市id
+    map<int32,int32> items = 2;
+    bool isBuy = 3; // true 为买入 false 为卖出
+}
+
+message CaravanBuyOrSellResp { 
+    DBCaravan data = 1; 
+}
+
+// 去某个city
+message CaravanGotoCityReq {
+    int32 city = 1; // 城市id
+    int32 ticket = 2; // 门票数量
+}
+
+message CaravanGotoCityResp { 
+    DBCaravan data = 1; 
+    bool newtask = 2; // 触发新的任务事件
+}
+
+// 剧情任务
+message CaravanGetStoryReq {
+    int32 cid = 1; 
+    int32 citystory = 2; // 抵达城市触发的剧情
+}
+
+message CaravanGetStoryResp { 
+    DBCaravan data = 1; 
+    bool bSuccess = 2; // 是否成功接取到任务
+}
+
+// 任务完成推送
+message CaravanTaskCompletePush { 
+    DBCaravan data = 1; 
+    bool bSuccess = 2; // 是否成功完成任务
+    repeated UserAssets reward = 3; // 成功奖励
+}
--- a/src/pb/temop/chat_db.proto
+++ b/src/pb/temop/chat_db.proto
@ -17,6 +17,7 @@ enum ChatType {
  HeroShare = 3;      //英雄分享
  EquipmentShare = 4; //装备分享
  ItemShare = 5;      //道具分享
+  Parkour = 6;        //捕羊大赛邀请
 }

 message DBChat {
--- a/src/pb/temop/errorcode.proto
+++ b/src/pb/temop/errorcode.proto
@ -60,6 +60,7 @@ enum ErrorCode {
  UserTalent2NoEnough = 1026; //阵营2天赋点
  UserTalent3NoEnough = 1027; //阵营3天赋点
  UserTalent4NoEnough = 1028; //阵营4天赋点
+  UserMerchantNoEnough = 1029; //虚拟币不足

  // friend
  FriendNotSelf = 1100;         //不能是自己
@ -229,6 +230,7 @@ enum ErrorCode {
  LibraryLvReward = 2805;          // 领奖等级没达到
  LibraryFetterTaskNoFound = 2806; //未找到羁绊任务数据
  LibraryPreTaskNoFinished = 2807; //前置任务未完成
+  LibraryGiveMaxCount = 2808; //送礼达到最大次数

  // Battle
  BattleValidationFailed = 2901; //战斗校验失败
@ -282,6 +284,7 @@ enum ErrorCode {
  SociatyTaskNoFound = 3040;      //未找到boss任务
  SociatyTaskNoFinished = 3041;   //任务未完成
  SociatyTaskReceived = 3042;     //任务奖励已领取
+  SociatyApplyLvLimit = 3043; //超出最大申请等级限制

  // arena
  ArenaTicketBuyUp = 3101;     //票据上限
@ -298,6 +301,8 @@ enum ErrorCode {
  TrollMaxSellCount = 3303;   // 单日最大交易次数
  TrollMaxItemCount = 3304;   //背包格子达到上限
  TrollRepeatedReward = 3305; //奖励重复领取
+  TrollCity = 3306; // 已经在该城市了
+  TrollTask = 3307; // 任务没完成
  // horoscope
  HoroscopeNotTurnedOn = 3401; //未开启
  HoroscopeRestCDNoEnd = 3402; //重置cd未结束
@ -378,4 +383,12 @@ enum ErrorCode {

  //reputation
  ReputationTalentFull = 4501; //天赋满级
+  ReputationNoPreNodeLv= 4502;  //前置节点等级不满足
+
+  // oldtimes
+  OldtimesReceived = 4601; //章节奖励已领取
+  OldtimesFinished = 4602; //章节已完成
+  OldtimesLevelOver = 4603;//已通关
+  OldtimesPreLevelNoFinished = 4604; //前置未完成
+  OldtimesNoAllFinished = 4605; //没有全部通关
 }
--- a/src/pb/temop/hero_db.proto
+++ b/src/pb/temop/hero_db.proto
@ -38,6 +38,7 @@ message DBHero {
  map<string, int32> horoscopeProperty = 28; //@go_tags(`bson:"horoscopeProperty"`) //星座属性加成
  int32 fulllvenr = 29;                      //@go_tags(`bson:"fulllvenr"`) //满级登记分组 武馆使用
  string kongfuUid = 30;  //@go_tags(`bson:"kongfuUid"`)// 英雄在谁家练功
+  map<string, int32> fetters = 31; //@go_tags(`bson:"fetters"`) //羁绊属性加成
 }


--- a/src/pb/temop/library_db.proto
+++ b/src/pb/temop/library_db.proto
@ -5,11 +5,10 @@ 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: id
+  map<string, string> herofetter = 4; // key: hid value: DBHeroFetter ObjID
  map<int32, int32> prize = 5; //是否领奖  key 好感度等级
-  int32 fetterlv = 6;          // 当前羁绊等级
-  int32 storyid = 7;           // 故事id 用来判断是否领奖
-  bool activation = 8;         // 是否激活
+  int32 storyid = 6;           // 故事id 用来判断是否领奖
+  int32 fidlv = 7;         // 羁绊领奖等级

 }

@ -21,8 +20,10 @@ message DBHeroFetter {
  repeated int32 history = 4;    // 传记往事ID
  int32 favorlv = 5;             // 好感度等级
  int32 favorexp = 6;            // 好感度经验
-  repeated int32 stroyprize = 7; // 剧情奖励
-  repeated int32 lvprize = 8;    // 等级奖励
+
+  map<int32, int32> lvprize = 8;    // 等级奖励
+  int32 givecount = 9; // 赠送次数
+  int64 ctime = 10; // 送礼物时间
 }

 //羁绊剧情
--- a/src/pb/temop/library_msg.proto
+++ b/src/pb/temop/library_msg.proto
@ -11,18 +11,11 @@ message LibraryGetFetterListReq {}

 message LibraryGetFetterListResp { repeated DBHeroFetter data = 1; }

-// 领取奖励
-message LibraryGetRewardReq {
-  string objId = 1;
-  int32 fetterlv = 2; // 羁绊等级
-}

-message LibraryGetRewardResp { DBLibrary data = 1; }
 // 领取剧情奖励
 message LibraryGetStoryRewardReq {
-  string hid = 1;     // 英雄ID
+  string oid = 1;     // DBHeroFetter oid
  int32 history = 2;  // 传记往事id
-  int32 rightend = 3; // 对应配置表 rightend
 }

 message LibraryGetStoryRewardResp { DBHeroFetter data = 1; }
@ -30,7 +23,8 @@ message LibraryGetStoryRewardResp { DBHeroFetter data = 1; }
 // 给英雄赠送礼物
 message LibraryUseGiftReq {
  string heroid = 1;            // 英雄id
-  map<string, int32> items = 2; // key 道具ID value 数量
+  string items = 2; // 道具ID 
+  int32 counts = 3; //道具 数量
 }

 message LibraryUseGiftResp { DBHeroFetter data = 1; }
@ -61,3 +55,12 @@ message LibraryFetterstoryTaskReq {
  int32 fetterId = 1; //羁绊ID
 }
 message LibraryFetterstoryTaskResp { repeated FetterTask list = 1; }
+
+
+// 手动提升羁绊等级
+message LibraryFetterLvUpReq {
+  string libOid = 1;  // 羁绊对象id
+}
+message LibraryFetterLvUpResp { 
+  DBLibrary data = 1; 
+}
--- a/src/pb/temop/mainline_db.proto
+++ b/src/pb/temop/mainline_db.proto
@ -1,18 +0,0 @@
-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
-  AwaredType awaredID  = 5;  //@go_tags(`bson:"awaredID"`) 是否领奖(设置int是考虑后续扩展有多个宝箱情况)
-  repeated int32 branchID = 6; // @go_tags(`bson:"branchID"`) 记录所有通关的关卡数据
-  int32 intensity = 7; // 难度
-  int32 ps = 8;// 预扣的体力
-}
--- a/src/pb/temop/mainline_msg.proto
+++ b/src/pb/temop/mainline_msg.proto
@ -1,53 +0,0 @@
-syntax = "proto3";
-option go_package = ".;pb";
-import "mainline_db.proto";
-import "battle_msg.proto";
-// 查询关卡进度
-message MainlineGetListReq {
-
-}
-// 返回进度信息
-message MainlineGetListResp { 
-    repeated DBMainline data = 1; 
-}
-
-// 领取关卡宝箱
-message MainlineGetRewardReq {
-    string chapterObj = 1; // 章节唯一对象id
-}
-
-message MainlineGetRewardResp {
-    DBMainline data = 1; //当前章节信息
-}
-
-// 挑战关卡
-message MainlineChallengeReq {
-    string chapterObj = 1; // 章节唯一对象id
-    uint32 mainlineId = 2; // 小关ID
-    int32 leadpos = 3;           //队长位置
-    repeated string teamids = 4; //阵容信息
-}
-
-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; //战报
-}
-
-message MainlineChallengeOverResp {
-    DBMainline data = 1; //当前章节信息
-    repeated string newheros = 2;   //获得的新英雄
-    int32 olv = 3;                  //以前的等级
-}
-
-// 推送新章节
-message MainlineNewChapterPush{
-    DBMainline data = 1; 
-}
--- a/src/pb/temop/oldtimes_db.proto
+++ b/src/pb/temop/oldtimes_db.proto
@ -0,0 +1,19 @@
+syntax = "proto3";
+option go_package = ".;pb";
+
+message DBOldtimes{
+ string uid = 1;//@go_tags(`bson:"uid"`) 玩家ID
+ repeated Chapter chapters = 2; //@go_tags(`bson:"chapters"`)  章节
+}
+
+message Chapter{
+    int32 cid=1; //@go_tags(`bson:"cid"`) 章节ID
+    int32 status = 2; //@go_tags(`bson:"status"`) 状态 0锁定 1已解锁 2进行中 3已完成
+    int32 received = 3; //@go_tags(`bson:"received"`) 奖励领取状态0未领取 1已领取
+    repeated Level levels = 4; //@go_tags(`bson:"levels"`) 关卡
+}
+
+message Level{
+    int32 lid = 1; //@go_tags(`bson:"lid"`) 关卡ID
+    int32 status = 2; //@go_tags(`bson:"status"`) 状态 0锁定 1已解锁 2进行中 3已完成
+}
--- a/src/pb/temop/oldtimes_msg.proto
+++ b/src/pb/temop/oldtimes_msg.proto
@ -0,0 +1,42 @@
+syntax = "proto3";
+option go_package = ".;pb";
+import "oldtimes_db.proto";
+
+// 旧时光章节和关卡数据
+message OldtimesGetallReq{}
+
+message OldtimesGetallResp{
+    DBOldtimes data = 1;
+}
+
+//进入关卡
+message OldtimesEnterReq{
+    int32 chapterId = 1;
+    int32 levelId = 2;
+}
+
+message OldtimesEnterResp{
+    int32 code = 1;
+}
+
+//关卡通过
+message OldtimesFinishReq{
+    int32 chapterId = 1; //章节ID
+    int32 levelId = 2; //关卡ID
+}
+
+message OldtimesFinishResp{
+    int32 code = 1;
+}
+
+//领取章节奖励
+message OldtimesReceiveReq{
+    int32 chapterId = 1; //章节ID
+}
+
+message OldtimesReceiveResp{
+    int32 code = 1;
+
+}
+
+
--- a/src/pb/temop/pagoda_db.proto
+++ b/src/pb/temop/pagoda_db.proto
@ -27,4 +27,5 @@ message DBPagodaRecord {
  int32 leadpos = 8; //队长位置
  repeated LineUp line = 9; // 阵容数据
  int32 costTime = 10; //@go_tags(`bson:"costTime"`) 闯关耗时 单位s
+  int32 tab = 11; // 页签
 }
--- a/src/pb/temop/parkour_db.proto
+++ b/src/pb/temop/parkour_db.proto
@ -19,19 +19,22 @@ message DBRaceMember {
    string uid = 1;                         //用户id
    string name = 2;                        //用户名称
    string avatar = 3;                      //用户头像
-    string mount = 4;                       //上阵坐骑
-    int32 hp = 5;                           //初始血量
-    int32 innermost = 6;                    //里程数
-    bool ready = 7;                         //是否准备
-    bool isai = 8;                          //是否是ai
-    bool isoff = 9;                         //是否离线
+    int32 lv = 4;                           //等级
+    string mount = 5;                       //上阵坐骑
+    int32 maxhp = 6;                        //初始血量
+    int32 currhp = 7;                       //当前血量
+    int32 innermost = 8;                    //里程数
+    bool ready = 9;                         //是否准备
+    bool isai = 10;                          //是否是ai
+    bool isoff = 11;                        //是否离线
 }

 message DBRaceInvite {
    string uid = 1;                         //用户id
    string name = 2;                        //用户名称
    string avatar = 3;                      //用户头像
-    int64 expired = 4;                      //过期时间
+    int32 lv = 4;                           //等级
+    int64 expired = 5;                      //过期时间
 }

 //个人竞赛信息
@ -45,7 +48,8 @@ message DBParkour {
    int32 integral = 7;                     //积分
    string captainid = 8;                   //队长id 当前所在队伍
    repeated DBRaceInvite invite = 9;       //邀请列表
-    repeated DBRaceMember member = 10;       //成员列表
+    repeated DBRaceMember member = 10;      //成员列表
+    int32 reward = 11;// 积分信息奖励
 }

 //比赛数据
--- a/src/pb/temop/parkour_msg.proto
+++ b/src/pb/temop/parkour_msg.proto
@ -9,8 +9,26 @@ message ParkourInfoReq {

 //请求比赛信息请求
 message ParkourInfoResp {
-    DBParkour info = 1;
-    repeated DBParkour recommend = 2;
+    bool isopen = 1;                        //当前赛事是否开启
+    DBParkour info = 2;
+    repeated DBRaceMember recommend = 3;
+}
+
+// 观察其他玩家信息
+message ParkourViewPlayerReq{
+    repeated string uid = 1;
+}
+
+message ParkourData {
+    string uid = 1;
+    string name = 2;  //用户名称
+    string avatar = 3; //用户头像
+    int32 lv = 4; //等级
+    int64 offlineTime = 5; //最近一次下线时间 -1在线
+}
+
+message ParkourViewPlayerResp{
+    repeated ParkourData player = 1;
 }

 //变更坐骑请求
@ -23,10 +41,10 @@ message ParkourChangeMtsResp {
    string mtsid = 2;
 }

-//推送捕羊大赛用户信息改变
-message ParkourInfoChangePush {
-    DBParkour info = 1;
-}
+// //推送捕羊大赛用户信息改变
+// message ParkourInfoChangePush {
+//     DBParkour info = 1;
+// }

 //组队邀请请求
 message ParkourInviteReq {
@ -78,9 +96,9 @@ message ParkourTeamDisbandNoticePush {
    
 }

-//匹配请求
+//匹配请求 只有队长有权限
 message ParkourRaceMatchReq {
-
+    string captainid = 1;     //队长id
 }

 //匹配请求
@ -88,6 +106,34 @@ message ParkourRaceMatchResp {

 }

+//匹配取消请求  只有队长有权限
+message ParkourRaceMatchCancelReq {
+    string captainid = 1;     //队长id
+}
+
+
+// 加入某个队伍
+message ParkourJoinTeamReq{
+    string uid = 1;
+}
+
+message ParkourJoinTeamResp{
+    DBParkour team = 1;
+}
+
+//匹配取消请求
+message ParkourRaceMatchCancelResp {
+
+}
+
+//匹配成功
+message ParkourRaceMatchStartPush {
+    DBParkour team = 1;
+}
+//匹配取消通知
+message ParkourRaceMatchCancelPush {
+    DBParkour team = 1;
+}
 //匹配成功
 message ParkourRaceMatchSuccPush {
    DBRace race = 1;
@ -95,7 +141,7 @@ message ParkourRaceMatchSuccPush {

 //准备完毕
 message ParkourReadyReq {
-    string id = 1;
+    string battleid = 1;
 }
 //准备完毕
 message ParkourReadyResp {
@ -109,7 +155,7 @@ message ParkourRaceStartPush {

 //射门请求
 message ParkourShotReq {
-    string id = 1;
+    string battleid = 1;
 }

 //射门请求
@ -117,10 +163,19 @@ message ParkourShotResp {
    
 }

+// 领取奖励
+message ParkourGetRewardReq {
+    int32 rid = 1;              //领奖id
+}
+
+message ParkourGetRewardResp {
+    DBParkour info =1;
+}
+
 //躲避障碍请求
 message ParkourAvoidReq {
-    string id = 1;
-    int32 distance = 2;
+    string battleid = 1;
+    float distance = 2;
 }

 //躲避障碍请求 回应
@ -128,20 +183,36 @@ message ParkourAvoidResp {
    
 }

+//恢复Hp请求
+message ParkourRecoverHpReq {
+    string battleid = 1;
+}
+
+//恢复Hp请求
+message ParkourRecoverHpResp {
+    bool issucc = 1;            //恢复成功
+}
+
 //全员冲刺
 message ParkourAllSprintsPush {
    int32 left = 1;                 //剩余时间
 }
+message ParkourInfoChangePush  {
+    DBParkour	Info =1  ;
+}

 //玩家hp变化通知
 message ParkourPlayerHPChanagePush {
-    string uid = 1;
-    int32 hp = 2;
+    map<string,int32> change = 1; //key是uid,value是hp
+    // string uid = 1;
+    // int32 hp = 2;
 }
 //比赛分值变化
 message ParkourScoreChanagePush {
-    int32 red = 1;
-    int32 blue = 2;
+    int32 redscore = 1;
+    int32 redenergy = 2;
+    int32 bluescore = 3;
+    int32 blueenergy = 4;
 }

 //比赛结束通知
--- a/src/pb/temop/privilege_msg.proto
+++ b/src/pb/temop/privilege_msg.proto
@ -35,4 +35,8 @@ message PrivilegeVipListReq {

 message PrivilegeVipListResp { 
    DBVip data = 1; 
+}
+
+message PrivilegeChangePush { 
+    map<int32,PrivilegeList> privilege = 1;
 }
--- a/src/pb/temop/pvp_msg.proto
+++ b/src/pb/temop/pvp_msg.proto
@ -106,12 +106,11 @@ message PvpFinishPush {
    string battleid = 1;
 }

-
 message RPC_PVPTrusteeshipReq {
    repeated string battleid = 1;
    string uid = 2;
 }

 message RPC_PVPTrusteeshipResp {
-
+    
 }
--- a/src/pb/temop/reputation_msg.proto
+++ b/src/pb/temop/reputation_msg.proto
@ -15,6 +15,7 @@ message reputationTalenttestResp{
 //天赋树升级
 message reputationUpgradeReq{
    int32 nodeId = 1; //节点ID
+    int32 raceType =2; //阵营ID
 }

 message reputationUpgradeResp{}
@ -29,3 +30,9 @@ message reputationTalentResp{
    Camp camp = 2;
 }

+// 阵营天赋树重置
+message reputationTalentresetReq{
+    int32 raceType =1;
+}
+
+message reputationTalentresetResp{}
--- a/src/pb/temop/smithy_msg.proto
+++ b/src/pb/temop/smithy_msg.proto
@ -21,6 +21,7 @@ message SmithyForgeEquipReq{
    int32 suiteId = 4;// 套装ID (非定制传0 )
    int32 position = 5; // 装备位置(没有指定位置传 -1)
    map<int32,int32> hit = 6;// 敲击数据 key 敲打 cid value 敲打次数
+    int32 count  = 7;// 打造多个装备
 }

 message SmithyForgeEquipResp{
--- a/src/pb/temop/sociaty_msg.proto
+++ b/src/pb/temop/sociaty_msg.proto
@ -26,9 +26,15 @@ enum SociatyListFilter {
  NOAPPLY = 2;  //无审批
  APPLYING = 3; //申请中
 }
+
+message SociatyInfo {
+  DBSociaty dbSociaty = 1;
+  SociatyMemberInfo master = 2;
+}
+
 // 公会列表
 message SociatyListReq { SociatyListFilter filter = 1; }
-message SociatyListResp { repeated DBSociaty list = 1; }
+message SociatyListResp { repeated SociatyInfo list = 1; }

 // 搜索公会
 message SociatySearchReq {
--- a/src/pb/temop/sys_msg.proto
+++ b/src/pb/temop/sys_msg.proto
@ -1,13 +1,7 @@
 syntax = "proto3";
 option go_package = ".;pb";

-message SysFuncListReq {
-  repeated string keys = 1; //功能ID
-}

-message SysFuncListResp {
-  repeated string funcIds = 1; //功能ID
-}

 message SysFuncGetListReq {
  repeated string keys = 1; //功能ID
@ -24,3 +18,7 @@ message SysFuncActivateReq {
 message SysFuncActivateResp {
  string cid  = 1;
 }
+
+message SysFuncOpnePush {
+  repeated string cid  = 1;
+}
--- a/src/pb/temop/task_msg.proto
+++ b/src/pb/temop/task_msg.proto
@ -50,4 +50,9 @@ message TaskActiveReceiveResp {


 //任务完成推送
-message TaskFinishedPush { int32 taskId = 1; }
+message TaskFinishedPush { int32 taskId = 1; }
+
+message TaskActiveReceivePush {
+  int32 taskTag = 1;
+  int32 id = 2;
+}
--- a/src/pb/temop/troll_db.proto
+++ b/src/pb/temop/troll_db.proto
@ -35,20 +35,3 @@ message DBTrollRecord{
  int64 time = 5; // 交易时间
 }

-message DBGoods{
-  string id = 1; //@go_tags(`bson:"_id"`) ID
-  int32 period = 2; // 变动周期
-  int32 curPeriod = 3; // 当前变动周期
-  int32 weight = 4; // 周期权重
-  int32 price = 5; // 当前价格
-  int32 time = 6; // 刷新时间
-}
-
-message DBTroll {
-  string id = 1; //@go_tags(`bson:"_id"`) ID
-  string uid = 2; //@go_tags(`bson:"uid"`) 用户ID
-  int32 useCount = 3; // 当前背包使用的数量
-  map<int32,int32> items = 4; // 背包数据
-  map<int32,DBGoods> goods = 5; // 货物 key 货物ID
-  int32 lv = 6;// 商队等级
-}
--- a/src/pb/temop/user_db.proto
+++ b/src/pb/temop/user_db.proto
@ -43,6 +43,11 @@ message DBUser {
  int32 talent2 = 29; //@go_tags(`bson:"talent2"`) 阵营2天赋点
  int32 talent3 = 30; //@go_tags(`bson:"talent3"`) 阵营3天赋点
  int32 talent4 = 31; //@go_tags(`bson:"talent4"`) 阵营4天赋点
+  int32 merchantmoney=32; //@go_tags(`bson:"merchantmoney"`) 虚拟币（商队)
+  repeated string perlist = 33;  //@go_tags(`bson:"perlist"`) 皮肤,动作,背景
+  string defper1 = 34;    //@go_tags(`bson:"defper1"`) 默认皮肤
+  string defper2 = 35;    //@go_tags(`bson:"defper2"`) 默认动作
+  string defper3 = 36;    //@go_tags(`bson:"defper3"`) 默认背景
 }

 message DBUserSetting {
@ -70,6 +75,6 @@ message DBSign {
  int32 signCount = 4; //@go_tags(`bson:"signCount"`) 玩家累计签到次数
  int32 group = 5;     //记录循环签到值
  int32 day = 6;       // 今天是这个月第几天
-  repeated int32 puzzle= 7; //@go_tags(`bson:"puzzle"`) 拼图游戏完成情况 // 0 未签到 1 已签到 2 玩了游戏
+  repeated int32 puzzle= 7; //@go_tags(`bson:"puzzle"`) 拼图游戏完成情况 // 0 没玩游戏 1 玩了游戏
  int32 tips = 8; // 提示次数
 }
--- a/src/pb/temop/user_msg.proto
+++ b/src/pb/temop/user_msg.proto
@ -7,6 +7,7 @@ import "pagoda_db.proto";
 import "viking_db.proto";
 import "hunting_db.proto";
 import "serverdata.proto";
+import "comm.proto";
 //用户登录
 message UserLoginReq {
  string account = 1; //账号
@ -70,6 +71,8 @@ message UserResChangedPush {
  int32 talent2 = 12; //@go_tags(`bson:"talent2"`) 阵营2天赋点
  int32 talent3 = 13; //@go_tags(`bson:"talent3"`) 阵营3天赋点
  int32 talent4 = 14; //@go_tags(`bson:"talent4"`) 阵营4天赋点
+  int32 merchantmoney = 15;//@go_tags(`bson:"merchantmoney"`) 商队虚拟币
+  repeated string perlist = 16;//@go_tags(`bson:"perlist"`) 皮肤资源
 }
 // 玩家在其它终端登录的通知
 message UserOtherTermLoginPush { string uid = 1; }
@ -218,4 +221,29 @@ message UserChangeTipsReq {

 message UserChangeTipsResp {
  DBSign data = 1;
+}
+
+
+//出售资源
+message UserSellResReq { repeated UserAtno atno = 1; }
+
+//出售资源 回应
+message UserSellResResp { 
+  repeated UserAssets atn = 1;
+  bool IsSucc = 2; 
+}
+
+//请求设置默认皮肤
+message UserSwitchDefPerReq{
+  string defper1 = 1;
+  string defper2 = 2;
+  string defper3 = 3;
+}
+
+//请求设置默认皮肤
+message UserSwitchDefPerResp{
+  bool issucc = 1;
+  string defper1 =2;
+  string defper2 = 3;
+  string defper3 = 4;
 }
--- a/src/views/protocol/Index.vue
+++ b/src/views/protocol/Index.vue
@ -226,6 +226,7 @@ export default defineComponent({
      { mainType: 'hunting', subs: [] },
      { mainType: 'horoscope', subs: [] },
      { mainType: 'pay', subs: [] },
+      { mainType: 'arena', subs: [] },
      { mainType: 'reddot', subs: [] },
      { mainType: 'combat', subs: [] },
      { mainType: 'library', subs: [] },