上传代码

src/pb/proto.js

@@ -31,15 +31,15 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         type: "string",
         id: 3
       },
-      ruid: {
+      slv: {
-        type: "string",
+        type: "int32",
         id: 4
       },
-      groud: {
+      ruid: {
-        type: "int32",
+        type: "string",
         id: 5
       },
-      areaId: {
+      channelId: {
         type: "int32",
         id: 6
       },
@@ -47,21 +47,25 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         type: "string",
         id: 7
       },
-      avatar: {
+      stag: {
         type: "string",
         id: 8
       },
-      uname: {
+      avatar: {
         type: "string",
         id: 9
       },
-      content: {
+      uname: {
         type: "string",
         id: 10
       },
+      content: {
+        type: "string",
+        id: 11
+      },
       ctime: {
         type: "int64",
-        id: 11
+        id: 12
       }
     }
   },
@@ -105,23 +109,6 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
     }
   },
   ChatGetListReq: {
-    fields: {
-      channel: {
-        type: "ChatChannel",
-        id: 1
-      }
-    }
-  },
-  ChatGetListResp: {
-    fields: {
-      chats: {
-        rule: "repeated",
-        type: "DBChat",
-        id: 1
-      }
-    }
-  },
-  ChatSpanGetListReq: {
     fields: {
       channel: {
         type: "ChatChannel",
@@ -133,7 +120,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       }
     }
   },
-  ChatSpanGetListResp: {
+  ChatGetListResp: {
     fields: {
       chats: {
         rule: "repeated",
@@ -152,46 +139,32 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         type: "string",
         id: 2
       },
+      ulv: {
+        type: "int32",
+        id: 3
+      },
       channel: {
         type: "ChatChannel",
-        id: 3
+        id: 4
       },
       targetId: {
         type: "string",
-        id: 4
+        id: 5
       },
       content: {
         type: "string",
-        id: 5
+        id: 6
       }
     }
   },
   ChatSendResp: {
-    fields: {}
-  },
-  ChatSpanSendReq: {
     fields: {
-      avatar: {
+      issucc: {
-        type: "string",
+        type: "bool",
         id: 1
-      },
-      uname: {
-        type: "string",
-        id: 2
-      },
-      channel: {
-        type: "ChatChannel",
-        id: 3
-      },
-      content: {
-        type: "string",
-        id: 4
       }
     }
   },
-  ChatSpanSendResp: {
-    fields: {}
-  },
   UserMessage: {
     fields: {
       MainType: {
@@ -462,6 +435,10 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       FriendApplyError: 1109,
       FriendBlackMax: 1110,
       FriendSearchNameEmpty: 1111,
+      FriendZaned: 1112,
+      FriendZanreceived: 1113,
+      FriendZanSelf: 1114,
+      FriendPointLimit: 1115,
       ItemsNoEnough: 1200,
       ItemsNoFoundGird: 1201,
       ItemsGridNumUpper: 1202,
@@ -514,7 +491,16 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       TaskNotFound: 1611,
       ShopGoodsIsSoldOut: 1700,
       ShopNoSurplusRefreshNum: 1701,
-      MailErr: 1800
+      MailErr: 1800,
+      PagodaNotFound: 1900,
+      PagodaLevlErr: 1901,
+      PagodaGetRewardErr: 1902,
+      PagodaConditionErr: 1903,
+      MartialhallNotUnlocked: 2000,
+      MartialhallInUse: 2001,
+      MartialhallUnlocked: 2002,
+      GourmetMoreOrderTime: 2101,
+      GourmetSkillMaxLv: 2102
     }
   },
   google: {
@@ -801,6 +787,38 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       }
     }
   },
+  ForumLikeReq: {
+    fields: {
+      herocid: {
+        type: "string",
+        id: 1
+      },
+      cid: {
+        type: "string",
+        id: 2
+      },
+      islike: {
+        type: "bool",
+        id: 3
+      }
+    }
+  },
+  ForumLikeResp: {
+    fields: {
+      cid: {
+        type: "string",
+        id: 1
+      },
+      islike: {
+        type: "bool",
+        id: 2
+      },
+      issucc: {
+        type: "bool",
+        id: 3
+      }
+    }
+  },
   SkillData: {
     fields: {
       skillID: {
@@ -893,7 +911,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         id: 18
       },
       energy: {
-        keyType: "int32",
+        keyType: "string",
         type: "int32",
         id: 19
       },
@@ -917,6 +935,11 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         keyType: "string",
         type: "int32",
         id: 24
+      },
+      juexProperty: {
+        keyType: "string",
+        type: "int32",
+        id: 25
       }
     }
   },
@@ -942,37 +965,21 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         type: "string",
         id: 2
       },
-      race0: {
+      star4: {
-        type: "Floor",
+        type: "int32",
         id: 3
       },
-      race1: {
+      star5: {
-        type: "Floor",
+        type: "int32",
         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
+        id: 5
+      },
+      drawcount: {
+        type: "int32",
+        id: 6
       }
     }
   },
@@ -996,6 +1003,20 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         rule: "repeated",
         type: "string",
         id: 4
+      },
+      zanIds: {
+        rule: "repeated",
+        type: "string",
+        id: 5
+      },
+      getZandIds: {
+        rule: "repeated",
+        type: "string",
+        id: 6
+      },
+      assistHeroId: {
+        type: "string",
+        id: 7
       }
     }
   },
@@ -1014,7 +1035,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
         id: 3
       },
       avatar: {
-        type: "int32",
+        type: "string",
         id: 4
       },
       strength: {
@@ -1028,6 +1049,18 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       offlineTime: {
         type: "int64",
         id: 7
+      },
+      isApplied: {
+        type: "bool",
+        id: 8
+      },
+      isZaned: {
+        type: "bool",
+        id: 9
+      },
+      isGetZaned: {
+        type: "bool",
+        id: 10
       }
     }
   },
@@ -1035,6 +1068,22 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
     fields: {}
   },
   FriendListResp: {
+    fields: {
+      list: {
+        rule: "repeated",
+        type: "FriendBase",
+        id: 1
+      },
+      heroObjId: {
+        type: "string",
+        id: 2
+      }
+    }
+  },
+  FriendRandlistReq: {
+    fields: {}
+  },
+  FriendRandlistResp: {
     fields: {
       list: {
         rule: "repeated",
@@ -1157,7 +1206,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       }
     }
   },
-  FriendBlackAddReq: {
+  FriendAddBlackReq: {
     fields: {
       friendId: {
         type: "string",
@@ -1165,7 +1214,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       }
     }
   },
-  FriendBlackAddResp: {
+  FriendAddBlackResp: {
     fields: {
       friendId: {
         type: "string",
@@ -1197,46 +1246,6 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       }
     }
   },
-  FriendReceiveReq: {
-    fields: {
-      friendId: {
-        type: "string",
-        id: 1
-      }
-    }
-  },
-  FriendReceiveResp: {
-    fields: {
-      friendId: {
-        type: "string",
-        id: 1
-      },
-      userId: {
-        type: "string",
-        id: 2
-      }
-    }
-  },
-  FriendGiveReq: {
-    fields: {
-      friendId: {
-        type: "string",
-        id: 1
-      }
-    }
-  },
-  FriendGiveResp: {
-    fields: {
-      friendId: {
-        type: "string",
-        id: 1
-      },
-      userId: {
-        type: "string",
-        id: 2
-      }
-    }
-  },
   FriendTotalReq: {
     fields: {
       friendId: {
@@ -1257,6 +1266,68 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       }
     }
   },
+  FriendZanlistReq: {
+    fields: {}
+  },
+  FriendZanlistResp: {
+    fields: {
+      list: {
+        rule: "repeated",
+        type: "FriendBase",
+        id: 1
+      }
+    }
+  },
+  FriendZanReq: {
+    fields: {
+      friendIds: {
+        rule: "repeated",
+        type: "string",
+        id: 1
+      }
+    }
+  },
+  FriendZanResp: {
+    fields: {
+      flag: {
+        type: "bool",
+        id: 1
+      }
+    }
+  },
+  FriendZanreceiveReq: {
+    fields: {
+      friendIds: {
+        rule: "repeated",
+        type: "string",
+        id: 1
+      }
+    }
+  },
+  FriendZanreceiveResp: {
+    fields: {
+      flag: {
+        type: "bool",
+        id: 1
+      }
+    }
+  },
+  FriendAssistheroReq: {
+    fields: {
+      heroObjId: {
+        type: "string",
+        id: 1
+      }
+    }
+  },
+  FriendAssistheroResp: {
+    fields: {
+      heroObjId: {
+        type: "string",
+        id: 1
+      }
+    }
+  },
   GMCmdReq: {
     fields: {
       Cmod: {
@@ -1273,6 +1344,133 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       }
     }
   },
+  Cooking: {
+    fields: {
+      foodType: {
+        type: "int32",
+        id: 1
+      },
+      eTime: {
+        type: "int64",
+        id: 2
+      }
+    }
+  },
+  OrderCook: {
+    fields: {
+      foodType: {
+        type: "int32",
+        id: 1
+      },
+      foodCount: {
+        type: "int32",
+        id: 2
+      },
+      cookTime: {
+        type: "int32",
+        id: 3
+      }
+    }
+  },
+  DBGourmet: {
+    fields: {
+      id: {
+        type: "string",
+        id: 1
+      },
+      uid: {
+        type: "string",
+        id: 2
+      },
+      cookingFood: {
+        type: "Cooking",
+        id: 3
+      },
+      foods: {
+        rule: "repeated",
+        type: "OrderCook",
+        id: 4
+      },
+      items: {
+        rule: "repeated",
+        type: "UserAssets",
+        id: 5
+      },
+      skill: {
+        keyType: "int32",
+        type: "int32",
+        id: 6
+      },
+      specialSkill: {
+        keyType: "int32",
+        type: "int32",
+        id: 7
+      },
+      orderCostTime: {
+        type: "int32",
+        id: 8
+      },
+      ctime: {
+        type: "int64",
+        id: 9
+      }
+    }
+  },
+  GourmetGetListReq: {
+    fields: {}
+  },
+  GourmetGetListResp: {
+    fields: {
+      data: {
+        type: "DBGourmet",
+        id: 1
+      }
+    }
+  },
+  GourmetCreateOrderReq: {
+    fields: {
+      order: {
+        rule: "repeated",
+        type: "OrderCook",
+        id: 1
+      }
+    }
+  },
+  GourmetCreateOrderResp: {
+    fields: {
+      data: {
+        type: "DBGourmet",
+        id: 1
+      }
+    }
+  },
+  GourmetGetRewardReq: {
+    fields: {}
+  },
+  GourmetGetRewardResp: {
+    fields: {
+      data: {
+        type: "DBGourmet",
+        id: 1
+      }
+    }
+  },
+  GourmetSkillLvReq: {
+    fields: {
+      skillType: {
+        type: "int32",
+        id: 1
+      }
+    }
+  },
+  GourmetSkillLvResp: {
+    fields: {
+      data: {
+        type: "DBGourmet",
+        id: 1
+      }
+    }
+  },
   HeroInfoReq: {
     fields: {
       heroId: {
@@ -1454,19 +1652,28 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       }
     }
   },
+  EnergyData: {
+    fields: {
+      useEnergy: {
+        type: "int32",
+        id: 1
+      },
+      useType: {
+        type: "string",
+        id: 2
+      }
+    }
+  },
   HeroResonanceUseEnergyReq: {
     fields: {
       heroObjID: {
         type: "string",
         id: 1
       },
-      useEnergy: {
+      energy: {
-        type: "int32",
+        rule: "repeated",
+        type: "EnergyData",
         id: 2
-      },
-      useType: {
-        type: "int32",
-        id: 3
       }
     }
   },
@@ -1579,6 +1786,10 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       drawType: {
         type: "int32",
         id: 1
+      },
+      drawCount: {
+        type: "int32",
+        id: 2
       }
     }
   },
@@ -1937,6 +2148,142 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       }
     }
   },
+  PillarState: {
+    values: {
+      NoUse: 0,
+      Useing: 1,
+      Receive: 2
+    }
+  },
+  DBPillar: {
+    fields: {
+      isunlock: {
+        type: "bool",
+        id: 1
+      },
+      state: {
+        type: "PillarState",
+        id: 2
+      },
+      hero: {
+        type: "string",
+        id: 3
+      },
+      start: {
+        type: "int64",
+        id: 4
+      },
+      end: {
+        type: "int64",
+        id: 5
+      },
+      lastbill: {
+        type: "int64",
+        id: 6
+      },
+      reward: {
+        type: "int32",
+        id: 7
+      }
+    }
+  },
+  DBMartialhall: {
+    fields: {
+      id: {
+        type: "string",
+        id: 1
+      },
+      uid: {
+        type: "string",
+        id: 2
+      },
+      lv: {
+        type: "int32",
+        id: 3
+      },
+      pillar1: {
+        type: "DBPillar",
+        id: 4
+      },
+      pillar2: {
+        type: "DBPillar",
+        id: 5
+      },
+      pillar3: {
+        type: "DBPillar",
+        id: 6
+      },
+      pillar4: {
+        type: "DBPillar",
+        id: 7
+      },
+      pillar5: {
+        type: "DBPillar",
+        id: 8
+      }
+    }
+  },
+  MartialhallInfoReq: {
+    fields: {}
+  },
+  MartialhallInfoResp: {
+    fields: {
+      info: {
+        type: "DBMartialhall",
+        id: 1
+      }
+    }
+  },
+  MartialhallPracticeReq: {
+    fields: {
+      pillar: {
+        type: "int32",
+        id: 1
+      },
+      hero: {
+        type: "string",
+        id: 2
+      }
+    }
+  },
+  MartialhallPracticeResp: {
+    fields: {
+      pillar: {
+        type: "int32",
+        id: 1
+      },
+      hero: {
+        type: "string",
+        id: 2
+      },
+      issucc: {
+        type: "bool",
+        id: 3
+      }
+    }
+  },
+  MartialhallReceiveReq: {
+    fields: {
+      pillar: {
+        type: "int32",
+        id: 1
+      }
+    }
+  },
+  MartialhallReceiveResp: {
+    fields: {}
+  },
+  MartialhallUpgradeReq: {
+    fields: {}
+  },
+  MartialhallUpgradeResp: {
+    fields: {
+      info: {
+        type: "DBMartialhall",
+        id: 1
+      }
+    }
+  },
   DBSystemNotify: {
     fields: {
       id: {
@@ -2009,6 +2356,70 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr
       }
     }
   },
+  DBPagoda: {
+    fields: {
+      id: {
+        type: "string",
+        id: 1
+      },
+      uid: {
+        type: "string",
+        id: 2
+      },
+      pagodaId: {
+        type: "int32",
+        id: 3
+      },
+      reward: {
+        keyType: "int32",
+        type: "bool",
+        id: 4
+      }
+    }
+  },
+  PagodaGetListReq: {
+    fields: {}
+  },
+  PagodaGetListResp: {
+    fields: {
+      data: {
+        type: "DBPagoda",
+        id: 1
+      }
+    }
+  },
+  PagodaGetRewardReq: {
+    fields: {
+      id: {
+        type: "int32",
+        id: 1
+      }
+    }
+  },
+  PagodaGetRewardResp: {
+    fields: {
+      data: {
+        type: "DBPagoda",
+        id: 1
+      }
+    }
+  },
+  PagodaChallengeReq: {
+    fields: {
+      levelID: {
+        type: "int32",
+        id: 1
+      }
+    }
+  },
+  PagodaChallengeResp: {
+    fields: {
+      data: {
+        type: "DBPagoda",
+        id: 1
+      }
+    }
+  },
   ShopType: {
     values: {
       Null: 0,

src/pb/proto/chat_db.proto

@@ -9,6 +9,7 @@ enum ChatChannel {
     System = 4;             //系统频道
 }
 
+
 message DBChat {
     string id =1;               //主键id
     ChatChannel channel = 2;    //频道

src/pb/proto/errorcode.proto

@@ -54,6 +54,10 @@ enum ErrorCode {
   FriendApplyError = 1109;      //申请失败
   FriendBlackMax = 1110;        //黑名单最大数量
   FriendSearchNameEmpty = 1111; //查询昵称为空
+  FriendZaned = 1112;           //已点赞
+  FriendZanreceived = 1113;     //已领取点赞
+  FriendZanSelf = 1114;         //不能给自己点赞
+  FriendPointLimit = 1115;      //友情点上线
 
   // item
   ItemsNoEnough = 1200;        //背包物品不足
@@ -120,4 +124,16 @@ enum ErrorCode {
   ShopNoSurplusRefreshNum = 1701; //剩余刷新次数已用完
   // mail
   MailErr = 1800; // 邮件不存在
+  // pagoda
+  PagodaNotFound = 1900;     // 找不到塔数据
+  PagodaLevlErr = 1901;      // 挑战关卡数据不匹配
+  PagodaGetRewardErr = 1902; // 重复领取
+  PagodaConditionErr = 1903; // 条件不足
+  // martialhall
+  MartialhallNotUnlocked = 2000; //没有解锁
+  MartialhallInUse = 2001;       //已经在使用
+  MartialhallUnlocked = 2002;    //已解锁
+  // 美食馆
+  GourmetMoreOrderTime = 2101;// 超过订单时长
+  GourmetSkillMaxLv = 2102; // 技能已经达到满级
 }

src/pb/proto/forum_db.proto

@@ -8,7 +8,7 @@ enum CommentState {
 
 //评论数据
 message DBComment {
-    string id =1;                   //主键id
+  string id = 1;          //@go_tags(`bson:"_id"`) ID
   string heroid = 2;      //英雄id
   string heroobjid = 3;   //目标英雄的实例id
   string uid = 4;         //发送用户id
@@ -20,5 +20,3 @@ message DBComment {
   string content = 10;    //内容
   int32 starlist = 11;    //点赞数
 }
-
-

src/pb/proto/forum_msg.proto

@@ -2,15 +2,14 @@ syntax = "proto3";
 option go_package = ".;pb";
 import "forum_db.proto";
 import "hero_db.proto";
+
 //获取评论列表
 message ForumGetListReq {
   string herocid = 1; //英雄配置id
 }
 
 //获取评论回应
-message ForumGetListResp {
+message ForumGetListResp { repeated DBComment comment = 1; }
-    repeated DBComment comment = 1; 
-}
 
 //发布评论请求
 message ForumReleaseCommentReq {
@@ -22,9 +21,7 @@ message ForumReleaseCommentReq {
 }
 
 //发布评论回应
-message ForumReleaseCommentResp {
+message ForumReleaseCommentResp { DBComment comment = 1; }
-    DBComment comment = 1; 
-}
 
 //查看英雄信息请求
 message ForumWatchHeroReq {
@@ -34,6 +31,18 @@ message ForumWatchHeroReq {
   string herooId = 4; //英雄实例id
 }
 //查看英雄信息回应
-message ForumWatchHeroResp {
+message ForumWatchHeroResp { DBHero hero = 1; }
-    DBHero hero = 1;
+
+//请求点赞 请求
+message ForumLikeReq {
+  string herocid = 1; //英雄配置id
+  string cid = 2;     //评论id
+  bool islike = 3;    //是否点赞
+}
+
+//请求点赞 回应
+message ForumLikeResp {
+  string cid = 1;  //评论id
+  bool islike = 2; //是否点赞
+  bool issucc = 3; //成功失败
 }

src/pb/proto/friend_db.proto

@@ -6,4 +6,7 @@ message DBFriend {
   repeated string friendIds = 2; //@go_tags(`bson:"friendIds"`) 好友ID
   repeated string applyIds = 3;  //@go_tags(`bson:"applyIds"`) 申请用户ID
   repeated string blackIds = 4;  //@go_tags(`bson:"blackIds"`) 黑名单ID
+  repeated string zanIds = 5;    //@go_tags(`bson:"zanIds"`) 点赞好友ID
+  repeated string getZandIds = 6; //@go_tags(`bson:"getZandIds"`) 已接收赞好友ID
+  string assistHeroId = 7; //@go_tags(`bson:"assistHeroId"`) 助战英雄ID
 }

src/pb/proto/friend_msg.proto

@@ -5,16 +5,26 @@ message FriendBase {
   string userId = 1;     // ID
   string NickName = 2;   //昵称
   int32 level = 3;       //等级
-  int32 avatar = 4;      //头像
+  string avatar = 4;     //头像
   int64 strength = 5;    //战力
   int32 serverId = 6;    //服务编号
   int64 offlineTime = 7; //最近一次下线时间 0在线
+  bool isApplied = 8;    //是否已申请加好友
+  bool isZaned = 9;      //是否已点赞
+  bool isGetZaned = 10;  //是否已获赞
 }
 
 //好友列表
 message FriendListReq {}
 
-message FriendListResp { repeated FriendBase list = 1; }
+message FriendListResp {
+  repeated FriendBase list = 1;
+  string heroObjId = 2;
+}
+
+// 随机的在线玩家
+message FriendRandlistReq {}
+message FriendRandlistResp { repeated FriendBase list = 1; }
 
 //申请好友
 message FriendApplyReq {
@@ -68,9 +78,9 @@ message FriendBlackListReq {}
 message FriendBlackListResp { repeated FriendBase friends = 1; }
 
 //添加黑名单
-message FriendBlackAddReq { string friendId = 1; }
+message FriendAddBlackReq { string friendId = 1; }
 
-message FriendBlackAddResp {
+message FriendAddBlackResp {
   string friendId = 1;
   string userId = 2;
 }
@@ -83,22 +93,6 @@ message FriendDelBlackResp {
   string userId = 2;
 }
 
-//接收
-message FriendReceiveReq { string friendId = 1; }
-
-message FriendReceiveResp {
-  string friendId = 1;
-  string userId = 2;
-}
-
-//赠送
-message FriendGiveReq { string friendId = 1; }
-
-message FriendGiveResp {
-  string friendId = 1;
-  string userId = 2;
-}
-
 //好友数量
 message FriendTotalReq { string friendId = 1; }
 
@@ -106,3 +100,21 @@ message FriendTotalResp {
   string friendId = 1;
   int32 total = 2; //好友数量
 }
+
+// 点赞列表
+message FriendZanlistReq {}
+message FriendZanlistResp { repeated FriendBase list = 1; }
+
+// 点赞
+message FriendZanReq { repeated string friendIds = 1; }
+
+message FriendZanResp { bool flag = 1; }
+
+//接收点赞
+message FriendZanreceiveReq { repeated string friendIds = 1; }
+
+message FriendZanreceiveResp { bool flag = 1; }
+
+// 设置助战英雄
+message FriendAssistheroReq { string heroObjId = 1; }
+message FriendAssistheroResp { string heroObjId = 1; }

src/pb/proto/gourmet_db.proto

@@ -0,0 +1,27 @@
+syntax = "proto3";
+option go_package = ".;pb";
+import "comm.proto";
+
+// 正在烹饪的食物
+message Cooking{
+  int32 foodType = 1; // 料理类型
+  int64 eTime = 2; // 结束时间戳
+}
+
+// 队列里的烹饪食品
+message OrderCook{
+  int32 foodType = 1; // 料理类型
+  int32 foodCount = 2; // 料理数量
+  int32 cookTime = 3; // 剩余烹饪时间
+}
+message DBGourmet {
+  string id = 1;        //@go_tags(`bson:"_id"`) ID
+  string uid = 2;       //@go_tags(`bson:"uid"`) 用户ID
+  Cooking cookingFood = 3;//@go_tags(`bson:"cookingFood"`) 正在烹饪的食品
+  repeated OrderCook foods = 4; // 等待烹饪的食品
+  repeated UserAssets items = 5; // 已经做好的食品
+  map<int32,int32> skill = 6;//@go_tags(`bson:"skill"`) 技能ID
+  map<int32,int32> specialSkill = 7; //@go_tags(`bson:"specialSkill"`) 通用技能
+  int32 orderCostTime = 8; //@go_tags(`bson:"orderCostTime"`) 订单消耗的时常
+  int64 ctime = 9; // 订单创建时间
+}

src/pb/proto/gourmet_msg.proto

@@ -0,0 +1,38 @@
+syntax = "proto3";
+option go_package = ".;pb";
+import "gourmet_db.proto";
+
+// 查询塔进度
+message GourmetGetListReq {
+
+}
+// 返回进度信息
+message GourmetGetListResp { 
+    DBGourmet data = 1; 
+}
+
+// 创建订单
+message GourmetCreateOrderReq {
+    repeated OrderCook order = 1;// 烹饪时间不用传 后端会重新计算
+}
+
+message GourmetCreateOrderResp {
+    DBGourmet data = 1;
+}
+
+// 领取奖励
+message GourmetGetRewardReq{
+}
+
+message GourmetGetRewardResp{
+    DBGourmet data = 1;
+}
+
+// 技能升级
+message GourmetSkillLvReq{
+    int32 skillType = 1; // 技能id
+}
+
+message GourmetSkillLvResp{
+    DBGourmet data = 1;
+}

src/pb/proto/hero_db.proto

@@ -17,20 +17,25 @@ message DBHero {
   int32 captainSkill = 8; //@go_tags(`bson:"captainSkill"`) 队长技能
   repeated SkillData normalSkill = 9; //@go_tags(`bson:"normalSkill"`) 普通技能
   map<string, int32> property = 10; // 属性相关
-  map<string, int32> addProperty = 11;               //@go_tags(`bson:"addProperty"`) 附加属性相关
+  map<string, int32> addProperty =
-  int32 cardType = 12; //@go_tags(`bson:"cardType"`) 卡片类型(升星卡、经验卡、技能升级卡)
+      11; //@go_tags(`bson:"addProperty"`) 附加属性相关
+  int32 cardType =
+      12; //@go_tags(`bson:"cardType"`) 卡片类型(升星卡、经验卡、技能升级卡)
   int32 curSkin = 13; //@go_tags(`bson:"curSkin"`) 当前装备的皮肤ID
   repeated int32 skins = 14;    // 所有皮肤ID
   bool block = 15;              // 锁定
   repeated string equipID = 16; //@go_tags(`bson:"equipID"`) 装备 objID
   int32 resonateNum = 17;       //@go_tags(`bson:"resonateNum"`) 共鸣次数
-  int32 distributionResonate = 18; //@go_tags(`bson:"distributionResonate"`) 分配的共鸣能量
+  int32 distributionResonate =
-  map<int32, int32> energy = 19; // @go_tags(`bson:"energy"`)能量分配到哪里[1,0]
+      18; //@go_tags(`bson:"distributionResonate"`) 分配的共鸣能量
+  map<string, int32> energy =
+      19; // @go_tags(`bson:"energy"`)能量分配到哪里[hppro:0,atkpro:0,defpro:20]
   int32 sameCount = 20;  // @go_tags(`bson:"sameCount"`) 卡片叠加数量
   int32 suiteId = 21;    //@go_tags(`bson:"suiteId"`)  套装Id
   int32 suiteExtId = 22; // go_tags(`bson:"suiteExtId"`) 扩展套装Id
   bool isOverlying = 23; // go_tags(`bson:"isOverlying"`) 是否允许叠加 默认true
   map<string, int32> energyProperty = 24; //@go_tags(`bson:"energyProperty"`)
+  map<string, int32> juexProperty = 25;   //@go_tags(`bson:"juexProperty"`) //hp
 }
 
 message Floor { // 记录阵型保底数据
@@ -42,12 +47,8 @@ message Floor{ // 记录阵型保底数据
 message DBHeroRecord {
   string id = 1;       //@go_tags(`bson:"_id"`) ID 主键id
   string uid = 2;      //@go_tags(`bson:"uid"`) 用户ID
-  Floor race0 = 3;    // 普通卡池
+  int32 star4 = 3;     // 4星保底
-  Floor race1 = 4;    // 阵型1卡池
+  int32 star5 = 4;     // 5星保底
-  Floor race2 = 5;    // 阵型2卡池
+  int64 mtime = 5;     // 修改时间
-  Floor race3 = 6;    // 阵型3卡池
+  int32 drawcount = 6; // 普通卡牌累计抽取次数
-  Floor race4 = 7;    // 阵型4卡池
-  int32 triggernum = 8;           // 活动数据 存放没有触发次数 
-  int32 activityid = 9;           // 活动id
-  int64 mtime = 10;                // 修改时间
 }

src/pb/proto/hero_msg.proto

@@ -87,11 +87,14 @@ message HeroResonanceResetResp {
   int32 energy = 2; // 能量点数
 }
 
+message EnergyData{
+  int32 useEnergy = 1;  // 使用的能量点数
+  string useType = 2;    // 使用的类型 （攻击、血量、防御）
+}
 // 使用能量点数
 message HeroResonanceUseEnergyReq {
   string heroObjID = 1; // 英雄对象ID
-  int32 useEnergy = 2;  // 使用的能量点数
+  repeated EnergyData energy = 2;
-  int32 useType = 3;    // 使用的类型 （攻击、血量、防御）
 }
 
 message HeroResonanceUseEnergyResp {
@@ -142,7 +145,8 @@ message HeroGetSpecifiedResp {
 
 // 抽卡
 message HeroDrawCardReq { 
-  int32 drawType = 1; // 抽卡类型 见drawCardCost表
+  int32 drawType = 1; // 抽卡类型 0 普通
+  int32 drawCount = 2;// 抽卡次数
 }
 
 message HeroDrawCardResp { 

src/pb/proto/martialhall_db.proto

@@ -0,0 +1,31 @@
+syntax = "proto3";
+option go_package = ".;pb";
+
+enum PillarState {
+  NoUse = 0;   //未使用
+  Useing = 1;  //使用中
+  Receive = 2; //待领取
+}
+
+///练功柱子
+message DBPillar {
+  bool isunlock = 1;     //是否解锁
+  PillarState state = 2; //状态
+  string hero = 3;       //当前练功英雄
+  int64 start = 4;       //开始时间
+  int64 end = 5;         //结束时间
+  int64 lastbill = 6;    //上次结账时间
+  int32 reward = 7;      //奖励
+}
+
+//练功房
+message DBMartialhall {
+  string id = 1;        //组件id
+  string uid = 2;       //用户id
+  int32 lv = 3;         //武馆等级
+  DBPillar pillar1 = 4; //柱子1
+  DBPillar pillar2 = 5; //柱子2
+  DBPillar pillar3 = 6; //柱子3
+  DBPillar pillar4 = 7; //柱子4
+  DBPillar pillar5 = 8; //柱子5
+}

src/pb/proto/martialhall_msg.proto

@@ -0,0 +1,30 @@
+syntax = "proto3";
+option go_package = ".;pb";
+import "martialhall_db.proto";
+
+///信息请求
+message MartialhallInfoReq {}
+///信息请求 回应
+message MartialhallInfoResp { DBMartialhall info = 1; }
+///练功请求
+message MartialhallPracticeReq {
+  int32 pillar = 1; //柱子
+  string hero = 2;  //英雄
+}
+///练功请求 回应
+message MartialhallPracticeResp {
+  int32 pillar = 1; //柱子
+  string hero = 2;  //英雄
+  bool issucc = 3;  //是否成功
+}
+
+///领取 请求
+message MartialhallReceiveReq { int32 pillar = 1; }
+///领取 回应
+message MartialhallReceiveResp {}
+
+///升级 请求
+message MartialhallUpgradeReq {}
+
+///升级 请求回应
+message MartialhallUpgradeResp { DBMartialhall info = 1; }

src/pb/proto/pagoda_db.proto

@@ -0,0 +1,9 @@
+syntax = "proto3";
+option go_package = ".;pb";
+
+message DBPagoda {
+  string id = 1;        //@go_tags(`bson:"_id"`) ID
+  string uid = 2;       //@go_tags(`bson:"uid"`) 用户ID
+  int32 pagodaId = 3;  //@go_tags(`bson:"pagodaId"`) 塔层
+  map<int32,bool> reward = 4; // 是否领奖
+}

src/pb/proto/pagoda_msg.proto

@@ -0,0 +1,22 @@
+syntax = "proto3";
+option go_package = ".;pb";
+import "pagoda_db.proto";
+
+// 查询塔进度
+message PagodaGetListReq {}
+// 返回进度信息
+message PagodaGetListResp { DBPagoda data = 1; }
+
+// 领取关卡宝箱
+message PagodaGetRewardReq {
+  int32 id = 1; // 对应 task_reward 表中的id
+}
+
+message PagodaGetRewardResp { DBPagoda data = 1; }
+
+// 挑战
+message PagodaChallengeReq {
+  int32 levelID = 1; // 挑战的关卡ID
+}
+
+message PagodaChallengeResp { DBPagoda data = 1; }

src/views/protocol/Index.vue

@@ -216,6 +216,9 @@ export default defineComponent({
       { mainType: 'chat', subs: [] },
       { mainType: 'gm', subs: [] },
       { mainType: 'forum', subs: [] },
+      { mainType: 'pagoda', subs: [] },
+      { mainType: 'martialhall', subs: [] },
+      { mainType: 'gourmet', subs: [] },
     ])
     for (const v of Object.keys(proto)) {
       for (const v1 of proto_models) {