diff --git a/dist.rar b/dist.rar index 1a07ea1..210fe3a 100644 Binary files a/dist.rar and b/dist.rar differ diff --git a/src/pb/proto.js b/src/pb/proto.js index cdccb21..e794a73 100644 --- a/src/pb/proto.js +++ b/src/pb/proto.js @@ -47,8 +47,8 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr type: "string", id: 7 }, - headid: { - type: "int32", + avatar: { + type: "string", id: 8 }, uname: { @@ -144,17 +144,25 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr }, ChatSendReq: { fields: { - channel: { - type: "ChatChannel", + avatar: { + type: "string", id: 1 }, - targetId: { + uname: { type: "string", id: 2 }, + channel: { + type: "ChatChannel", + id: 3 + }, + targetId: { + type: "string", + id: 4 + }, content: { type: "string", - id: 3 + id: 5 } } }, @@ -163,13 +171,21 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr }, ChatSpanSendReq: { fields: { + avatar: { + type: "string", + id: 1 + }, + uname: { + type: "string", + id: 2 + }, channel: { type: "ChatChannel", - id: 1 + id: 3 }, content: { type: "string", - id: 2 + id: 4 } } }, @@ -433,6 +449,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr UserResetData: 1009, UserModiNameCount: 1010, UserNickNameEmpty: 1011, + UserExpandNull: 1012, FriendNotSelf: 1100, FriendSelfMax: 1101, FriendTargetMax: 1102, @@ -473,6 +490,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr HeroStarLvErr: 1320, HeroMaxStarLv: 1321, DrawCardTypeNotFound: 1322, + HeroMaxSkillLv: 1323, EquipmentOnFoundEquipment: 1400, EquipmentLvlimitReached: 1401, EquipmentIsWorn: 1402, @@ -493,6 +511,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr TaskFinished: 1608, TaskTagEmpty: 1609, TaskIdEmpty: 1610, + TaskNotFound: 1611, ShopGoodsIsSoldOut: 1700, ShopNoSurplusRefreshNum: 1701, MailErr: 1800 @@ -651,6 +670,312 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, + CommentState: { + values: { + Release: 0, + Offline: 1 + } + }, + DBComment: { + fields: { + id: { + type: "string", + id: 1 + }, + heroid: { + type: "string", + id: 2 + }, + heroobjid: { + type: "string", + id: 3 + }, + uid: { + type: "string", + id: 4 + }, + stage: { + type: "string", + id: 5 + }, + avatar: { + type: "string", + id: 6 + }, + uname: { + type: "string", + id: 7 + }, + state: { + type: "CommentState", + id: 8 + }, + ctime: { + type: "int64", + id: 9 + }, + content: { + type: "string", + id: 10 + }, + starlist: { + type: "int32", + id: 11 + } + } + }, + ForumGetListReq: { + fields: { + herocid: { + type: "string", + id: 1 + } + } + }, + ForumGetListResp: { + fields: { + comment: { + rule: "repeated", + type: "DBComment", + id: 1 + } + } + }, + ForumReleaseCommentReq: { + fields: { + avatar: { + type: "string", + id: 1 + }, + uname: { + type: "string", + id: 2 + }, + herocid: { + type: "string", + id: 3 + }, + herooid: { + type: "string", + id: 4 + }, + content: { + type: "string", + id: 5 + } + } + }, + ForumReleaseCommentResp: { + fields: { + comment: { + type: "DBComment", + id: 1 + } + } + }, + ForumWatchHeroReq: { + fields: { + uid: { + type: "string", + id: 1 + }, + stag: { + type: "string", + id: 2 + }, + herocId: { + type: "string", + id: 3 + }, + herooId: { + type: "string", + id: 4 + } + } + }, + ForumWatchHeroResp: { + fields: { + hero: { + type: "DBHero", + id: 1 + } + } + }, + SkillData: { + fields: { + skillID: { + type: "int32", + id: 1 + }, + skillLv: { + type: "int32", + id: 2 + } + } + }, + DBHero: { + fields: { + id: { + type: "string", + id: 1 + }, + uid: { + type: "string", + id: 2 + }, + heroID: { + type: "string", + id: 3 + }, + star: { + type: "int32", + id: 4 + }, + lv: { + type: "int32", + id: 5 + }, + exp: { + type: "int32", + id: 6 + }, + juexingLv: { + type: "int32", + id: 7 + }, + captainSkill: { + type: "int32", + id: 8 + }, + normalSkill: { + rule: "repeated", + type: "SkillData", + id: 9 + }, + property: { + keyType: "string", + type: "int32", + id: 10 + }, + addProperty: { + keyType: "string", + type: "int32", + id: 11 + }, + cardType: { + type: "int32", + id: 12 + }, + curSkin: { + type: "int32", + id: 13 + }, + skins: { + rule: "repeated", + type: "int32", + id: 14 + }, + block: { + type: "bool", + id: 15 + }, + equipID: { + rule: "repeated", + type: "string", + id: 16 + }, + resonateNum: { + type: "int32", + id: 17 + }, + distributionResonate: { + type: "int32", + id: 18 + }, + energy: { + keyType: "int32", + type: "int32", + id: 19 + }, + sameCount: { + type: "int32", + id: 20 + }, + suiteId: { + type: "int32", + id: 21 + }, + suiteExtId: { + type: "int32", + id: 22 + }, + isOverlying: { + type: "bool", + id: 23 + }, + energyProperty: { + keyType: "string", + type: "int32", + id: 24 + } + } + }, + Floor: { + fields: { + h4: { + type: "int32", + id: 1 + }, + h5: { + type: "int32", + id: 2 + } + } + }, + DBHeroRecord: { + fields: { + id: { + type: "string", + id: 1 + }, + uid: { + type: "string", + id: 2 + }, + race0: { + type: "Floor", + id: 3 + }, + race1: { + type: "Floor", + id: 4 + }, + race2: { + type: "Floor", + id: 5 + }, + race3: { + type: "Floor", + id: 6 + }, + race4: { + type: "Floor", + id: 7 + }, + triggernum: { + type: "int32", + id: 8 + }, + activityid: { + type: "int32", + id: 9 + }, + mtime: { + type: "int64", + id: 10 + } + } + }, DBFriend: { fields: { uid: { @@ -948,120 +1273,6 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, - SkillData: { - fields: { - skillID: { - type: "int32", - id: 1 - }, - skillLv: { - type: "int32", - id: 2 - } - } - }, - DBHero: { - fields: { - id: { - type: "string", - id: 1 - }, - uid: { - type: "string", - id: 2 - }, - heroID: { - type: "string", - id: 3 - }, - star: { - type: "int32", - id: 4 - }, - lv: { - type: "int32", - id: 5 - }, - exp: { - type: "int32", - id: 6 - }, - juexingLv: { - type: "int32", - id: 7 - }, - captainSkill: { - type: "int32", - id: 8 - }, - normalSkill: { - rule: "repeated", - type: "SkillData", - id: 9 - }, - property: { - keyType: "string", - type: "int32", - id: 10 - }, - addProperty: { - keyType: "string", - type: "int32", - id: 11 - }, - cardType: { - type: "int32", - id: 12 - }, - curSkin: { - type: "int32", - id: 13 - }, - skins: { - rule: "repeated", - type: "int32", - id: 14 - }, - block: { - type: "bool", - id: 15 - }, - equipID: { - rule: "repeated", - type: "string", - id: 16 - }, - resonateNum: { - type: "int32", - id: 17 - }, - distributionResonate: { - type: "int32", - id: 18 - }, - energy: { - keyType: "int32", - type: "int32", - id: 19 - }, - sameCount: { - type: "int32", - id: 20 - }, - suiteId: { - type: "int32", - id: 21 - }, - suiteExtId: { - type: "int32", - id: 22 - }, - isOverlying: { - type: "bool", - id: 23 - } - } - }, HeroInfoReq: { fields: { heroId: { @@ -1180,6 +1391,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr id: 1 }, costCardObj: { + rule: "repeated", type: "string", id: 2 } @@ -1623,6 +1835,23 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, + MailGetAllMailAttachmentReq: { + fields: {} + }, + MailGetAllMailAttachmentResp: { + fields: { + res: { + rule: "repeated", + type: "UserAssets", + id: 1 + }, + ids: { + rule: "repeated", + type: "string", + id: 2 + } + } + }, DBMainline: { fields: { id: { @@ -2170,7 +2399,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr id: 5 }, sid: { - type: "int32", + type: "string", id: 6 }, createip: { @@ -2194,7 +2423,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr id: 11 }, avatar: { - type: "int32", + type: "string", id: 12 }, gold: { @@ -2290,7 +2519,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr id: 1 }, sid: { - type: "int32", + type: "string", id: 2 } } @@ -2304,6 +2533,10 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr ex: { type: "DBUserExpand", id: 2 + }, + timeNow: { + type: "int64", + id: 3 } } }, @@ -2320,7 +2553,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr id: 1 }, sid: { - type: "int32", + type: "string", id: 2 } } @@ -2700,62 +2933,6 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr id: 13 } } - }, - Floor: { - fields: { - h4: { - type: "int32", - id: 1 - }, - h5: { - type: "int32", - id: 2 - } - } - }, - DBUserRecord: { - fields: { - id: { - type: "string", - id: 1 - }, - uid: { - type: "string", - id: 2 - }, - race0: { - type: "Floor", - id: 3 - }, - race1: { - type: "Floor", - id: 4 - }, - race2: { - type: "Floor", - id: 5 - }, - race3: { - type: "Floor", - id: 6 - }, - race4: { - type: "Floor", - id: 7 - }, - triggernum: { - type: "int32", - id: 8 - }, - activityid: { - type: "int32", - id: 9 - }, - mtime: { - type: "int64", - id: 10 - } - } } }); diff --git a/src/pb/proto/chat_db.proto b/src/pb/proto/chat_db.proto index 758cbc2..ebe31fe 100644 --- a/src/pb/proto/chat_db.proto +++ b/src/pb/proto/chat_db.proto @@ -2,24 +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 + int32 slv = 4; //发送者等级 + string ruid = 5; //接收用户id channel == Private 有效 + int32 channelId = 6; //跨服频道 频道Id + string unionId = 7; //工会id + string stag = 8; //区服id + string avatar = 9; //用户头像 + string uname = 10; //用户名 + string content = 11; //内容 + int64 ctime = 12; //创建时间 } \ No newline at end of file diff --git a/src/pb/proto/chat_msg.proto b/src/pb/proto/chat_msg.proto index 7a3233c..b4b1f55 100644 --- a/src/pb/proto/chat_msg.proto +++ b/src/pb/proto/chat_msg.proto @@ -21,31 +21,23 @@ message ChatChanageChannelResp { //请求聊天消息 message ChatGetListReq { ChatChannel channel = 1; //频道 + int32 channelId = 2; //跨服频道id } + //请求聊天消息 回应 message ChatGetListResp { repeated DBChat chats = 1; } -//请求跨服聊天消息 -message ChatSpanGetListReq { - ChatChannel channel = 1; //频道 - int32 channelId = 2; //跨服频道id -} -//请求跨服聊天消息 回应 -message ChatSpanGetListResp { repeated DBChat chats = 1; } - //消息发送请求 message ChatSendReq { - ChatChannel channel = 1; //频道 - string targetId = 2; //目标用户id - string content = 3; //内容 + string avatar = 1; //用户头像 + string uname = 2; //用户名 + int32 ulv = 3; //用户等级 + ChatChannel channel = 4; //频道 + string targetId = 5; //目标用户id + string content = 6; //内容 } -//消息发送请求 回应 -message ChatSendResp {} -//跨服消息发送请求 -message ChatSpanSendReq { - ChatChannel channel = 1; //频道 - string content = 2; //内容 +//消息发送请求 回应 +message ChatSendResp { + bool issucc = 1; //是否成功 } -//跨服消息发送请求 回应 -message ChatSpanSendResp {} diff --git a/src/pb/proto/equipment_msg.proto b/src/pb/proto/equipment_msg.proto index e8cdbe7..cce15e5 100644 --- a/src/pb/proto/equipment_msg.proto +++ b/src/pb/proto/equipment_msg.proto @@ -3,36 +3,37 @@ option go_package = ".;pb"; import "equipment_db.proto"; //获取装备列表请求 -message EquipmentGetListReq {} +message EquipmentGetListReq { + +} //获取装备列表请求 回应 message EquipmentGetListResp { - repeated DB_Equipment Equipments = 1; //装备列表 + repeated DB_Equipment Equipments = 1; //装备列表 } //推送装备背包变化 message EquipmentChangePush { - repeated DB_Equipment Equipments = 1; //装备列表 + repeated DB_Equipment Equipments = 1; //装备列表 } //装备挂在到英雄上 -message EquipmentEquipReq { - string HeroCardId = 1; //英雄卡Id - repeated string EquipmentId = 2; //装备Id 固定长度的数组 0-5 对应的装备栏 +message EquipmentEquipReq{ + string HeroCardId = 1; //英雄卡Id + repeated string EquipmentId = 2; //装备Id 固定长度的数组 0-5 对应的装备栏 } //装备挂在到英雄上 回应 -message EquipmentEquipResp { - repeated DB_Equipment Equipments = 1; //挂在装备列表 +message EquipmentEquipResp{ + repeated DB_Equipment Equipments = 1; //挂在装备列表 } //装备升级 -message EquipmentUpgradeReq { - string EquipmentId = 1; //装备Id +message EquipmentUpgradeReq{ + string EquipmentId = 1; //装备Id } //装备升级 回应 -message EquipmentUpgradeResp { - bool IsSucc = 1; - repeated DB_Equipment Equipment = - 2; //由于装备可以叠加 升级后会创建一个新的装备出来 所以可能影响两个装备 +message EquipmentUpgradeResp{ + bool IsSucc = 1; + repeated DB_Equipment Equipment = 2; //由于装备可以叠加 升级后会创建一个新的装备出来 所以可能影响两个装备 } \ No newline at end of file diff --git a/src/pb/proto/errorcode.proto b/src/pb/proto/errorcode.proto index 286a51d..a6eb478 100644 --- a/src/pb/proto/errorcode.proto +++ b/src/pb/proto/errorcode.proto @@ -39,6 +39,7 @@ enum ErrorCode { UserResetData = 1009; //初始化用户失败 UserModiNameCount = 1010; //名称修改次数不足 UserNickNameEmpty = 1011; //昵称空 + UserExpandNull = 1012; //扩展数据空 // friend FriendNotSelf = 1100; //不能是自己 @@ -85,6 +86,7 @@ enum ErrorCode { HeroStarLvErr = 1320; // 升星等级不够 HeroMaxStarLv = 1321; // 达到最大升星等级 DrawCardTypeNotFound = 1322; // 抽卡类型不匹配 + HeroMaxSkillLv = 1323; // 达到最大技能等级 // equipment EquipmentOnFoundEquipment = 1400; // 未找到武器 @@ -111,6 +113,7 @@ enum ErrorCode { TaskFinished = 1608; //已完成 TaskTagEmpty = 1609; //任务类型空 TaskIdEmpty = 1610; //任务ID空 + TaskNotFound = 1611; //未找到用户任务 // shop ShopGoodsIsSoldOut = 1700; //商品已售罄 diff --git a/src/pb/proto/forum_db.proto b/src/pb/proto/forum_db.proto index f3d2253..8093470 100644 --- a/src/pb/proto/forum_db.proto +++ b/src/pb/proto/forum_db.proto @@ -1,3 +1,24 @@ syntax = "proto3"; option go_package = ".;pb"; +enum CommentState { + Release = 0; //发布 + Offline = 1; //下架 +} + +//评论数据 +message DBComment { + string id =1; //主键id + string heroid = 2; //英雄id + string heroobjid = 3; //目标英雄的实例id + string uid =4; //发送用户id + string stage =5; //区服id + string avatar = 6; //用户头像 + string uname = 7; //用户名 + CommentState state = 8; //状态 + int64 ctime = 9; //发布时间 + string content = 10; //内容 + int32 starlist = 11; //点赞数 +} + + diff --git a/src/pb/proto/forum_msg.proto b/src/pb/proto/forum_msg.proto index fbeb202..e166151 100644 --- a/src/pb/proto/forum_msg.proto +++ b/src/pb/proto/forum_msg.proto @@ -1,2 +1,39 @@ syntax = "proto3"; -option go_package = ".;pb"; \ No newline at end of file +option go_package = ".;pb"; +import "forum_db.proto"; +import "hero_db.proto"; +//获取评论列表 +message ForumGetListReq { + string herocid = 1; //英雄配置id +} + +//获取评论回应 +message ForumGetListResp { + repeated DBComment comment = 1; +} + +//发布评论请求 +message ForumReleaseCommentReq { + string avatar = 1; //用户头像 + string uname = 2; //用户名 + string herocid = 3; //英雄的配置id + string herooid = 4; //英雄的实例id + string content = 5; //评论内容 +} + +//发布评论回应 +message ForumReleaseCommentResp { + DBComment comment = 1; +} + +//查看英雄信息请求 +message ForumWatchHeroReq { + string uid = 1; //用户id + string stag = 2; //区服id + string herocId = 3; //用户cid + string herooId = 4; //英雄实例id +} +//查看英雄信息回应 +message ForumWatchHeroResp { + DBHero hero = 1; +} \ No newline at end of file diff --git a/src/pb/proto/hero_db.proto b/src/pb/proto/hero_db.proto index 1902874..9abbe52 100644 --- a/src/pb/proto/hero_db.proto +++ b/src/pb/proto/hero_db.proto @@ -30,5 +30,24 @@ message DBHero { int32 suiteId = 21; //@go_tags(`bson:"suiteId"`) 套装Id int32 suiteExtId = 22; // go_tags(`bson:"suiteExtId"`) 扩展套装Id bool isOverlying = 23; // go_tags(`bson:"isOverlying"`) 是否允许叠加 默认true - //map energyProperty = 24; //@go_tags(`bson:"energyProperty"`) + map energyProperty = 24; //@go_tags(`bson:"energyProperty"`) +} + +message Floor{ // 记录阵型保底数据 + int32 h4 = 1; // 4星次数 + int32 h5 = 2; // 5星次数 +} + +//英雄扩展数据 +message DBHeroRecord { + string id = 1; //@go_tags(`bson:"_id"`) ID 主键id + string uid = 2; //@go_tags(`bson:"uid"`) 用户ID + Floor race0 = 3; // 普通卡池 + Floor race1 = 4; // 阵型1卡池 + Floor race2 = 5; // 阵型2卡池 + Floor race3 = 6; // 阵型3卡池 + Floor race4 = 7; // 阵型4卡池 + int32 triggernum = 8; // 活动数据 存放没有触发次数 + int32 activityid = 9; // 活动id + int64 mtime = 10; // 修改时间 } \ No newline at end of file diff --git a/src/pb/proto/hero_msg.proto b/src/pb/proto/hero_msg.proto index 5152afa..25240a3 100644 --- a/src/pb/proto/hero_msg.proto +++ b/src/pb/proto/hero_msg.proto @@ -57,7 +57,7 @@ message HeroStrengthenUpStarResp { // 卡牌技能升级 message HeroStrengthenUpSkillReq { string heroObjID = 1; // 英雄对象ID - string costCardObj = 2; // 消耗技能升级卡 + repeated string costCardObj = 2; // 消耗技能升级卡 } // 卡牌技能升级返回 @@ -131,9 +131,9 @@ message HeroLockResp { // 测试用（获取指定星级等级的英雄） message HeroGetSpecifiedReq { string heroCoinfigID = 1; // 英雄配置ID - int32 Amount = 2; // 数量 - int32 star = 3; // 星级 - int32 lv = 4; // 等级 + int32 Amount = 2; // 数量 + int32 star = 3; // 星级 + int32 lv = 4; // 等级 } message HeroGetSpecifiedResp { @@ -141,13 +141,15 @@ message HeroGetSpecifiedResp { } // 抽卡 -message HeroDrawCardReq { +message HeroDrawCardReq { int32 drawType = 1; // 抽卡类型 见drawCardCost表 } -message HeroDrawCardResp { - repeated string heroes = 1; // 返回英雄的configID +message HeroDrawCardResp { + repeated string heroes = 1; // 返回英雄的configID } // 英雄变化推送 -message HeroChangePush { repeated DBHero list = 1; } \ No newline at end of file +message HeroChangePush{ + repeated DBHero list = 1; +} \ No newline at end of file diff --git a/src/pb/proto/items_msg.proto b/src/pb/proto/items_msg.proto index 5061b88..44eb864 100644 --- a/src/pb/proto/items_msg.proto +++ b/src/pb/proto/items_msg.proto @@ -4,43 +4,43 @@ import "items_db.proto"; //查询用户背包请求 message ItemsGetlistReq { - int32 IType = 1; //道具类型 + int32 IType = 1; //道具类型 } //查询用户背包请求 回应 message ItemsGetlistResp { - repeated DB_UserItemData Grids = 1; //用户背包列表 + repeated DB_UserItemData Grids = 1; //用户背包列表 } //背包变化推送 message ItemsChangePush { - repeated DB_UserItemData Grids = 1; //变化数据 + repeated DB_UserItemData Grids = 1; //变化数据 } //使用物品请求 message ItemsUseItemReq { - string GridId = 1; //格子Id - uint32 Amount = 2; //使用数量 - int32 Select = 3; //选择下标 + string GridId = 1; //格子Id + uint32 Amount = 2; //使用数量 + int32 Select = 3; //选择下标 } //使用物品请求 回应 message ItemsUseItemResp { - string GridId = 1; //格子Id - uint32 Amount = 2; //使用数量 - bool issucc = 3; //是否成功 + string GridId = 1; //格子Id + uint32 Amount = 2; //使用数量 + bool issucc = 3; //是否成功 } //出售道具请求sailitem message ItemsSellItemReq { - string GridId = 1; //格子Id - string ItemId = 2; //物品Id - uint32 Amount = 3; //使用数量 + string GridId = 1; //格子Id + string ItemId = 2; //物品Id + uint32 Amount = 3; //使用数量 } //出售道具请求 回应 message ItemsSellItemResp { - string GridId = 1; //格子Id - uint32 Amount = 2; //使用数量 - bool issucc = 3; //是否成功 + string GridId = 1; //格子Id + uint32 Amount = 2; //使用数量 + bool issucc = 3; //是否成功 } \ No newline at end of file diff --git a/src/pb/proto/mail_msg.proto b/src/pb/proto/mail_msg.proto index 4ccd829..ef1a5fc 100644 --- a/src/pb/proto/mail_msg.proto +++ b/src/pb/proto/mail_msg.proto @@ -1,30 +1,54 @@ syntax = "proto3"; option go_package = ".;pb"; import "mail_db.proto"; +import "comm.proto"; -message MailGetListReq {} +message MailGetListReq { + +} // 查询邮件信息 -message MailGetListResp { repeated DBMailData Mails = 1; } +message MailGetListResp { + repeated DBMailData Mails = 1; +} // 查看邮件 -message MailReadMailReq { string ObjID = 1; } +message MailReadMailReq { + string ObjID = 1; +} -message MailReadMailResp { DBMailData Mail = 1; } +message MailReadMailResp { + DBMailData Mail = 1; +} // 领取附件 -message MailGetUserMailAttachmentReq { string ObjID = 1; } +message MailGetUserMailAttachmentReq { + string ObjID = 1; +} -message MailGetUserMailAttachmentResp { DBMailData Mail = 1; } +message MailGetUserMailAttachmentResp { + DBMailData Mail = 1; +} // 删除某个邮件 -message MailDelMailReq { string ObjID = 1; } +message MailDelMailReq { + string ObjID = 1; +} message MailDelMailResp { - string ObjID = 1; // 返回删除邮件id + string ObjID = 1; // 返回删除邮件id } // 推送邮件 -message MailGetNewMailPush { - DBMailData Mail = 1; // 推送新的邮件信息 +message MailGetNewMailPush{ + DBMailData Mail = 1; // 推送新的邮件信息 +} +// 领取所有附件 +message MailGetAllMailAttachmentReq { + +} + +message MailGetAllMailAttachmentResp { + repeated UserAssets res = 1; //资源类型 + repeated string ids = 2; // 已经领取的邮件唯一id } \ No newline at end of file diff --git a/src/pb/proto/mainline_msg.proto b/src/pb/proto/mainline_msg.proto index 6a21c46..90d7f77 100644 --- a/src/pb/proto/mainline_msg.proto +++ b/src/pb/proto/mainline_msg.proto @@ -3,28 +3,34 @@ option go_package = ".;pb"; import "mainline_db.proto"; // 查询关卡进度 -message MainlineGetListReq {} +message MainlineGetListReq { + +} // 返回进度信息 -message MainlineGetListResp { repeated DBMainline data = 1; } +message MainlineGetListResp { + repeated DBMainline data = 1; +} // 领取关卡宝箱 message MainlineGetRewardReq { - string chapterObj = 1; // 章节唯一对象id + string chapterObj = 1; // 章节唯一对象id } message MainlineGetRewardResp { - DBMainline data = 1; //当前章节信息 + DBMainline data = 1; //当前章节信息 } // 挑战关卡 message MainlineChallengeReq { - string chapterObj = 1; // 章节唯一对象id - uint32 mainlineId = 2; // 小关ID + string chapterObj = 1; // 章节唯一对象id + uint32 mainlineId = 2; // 小关ID } message MainlineChallengeResp { - DBMainline data = 1; //当前章节信息 + DBMainline data = 1; //当前章节信息 } // 推送新章节 -message MainlineNewChapterPush { 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_msg.proto b/src/pb/proto/shop_msg.proto index bbccc9d..d4cd340 100644 --- a/src/pb/proto/shop_msg.proto +++ b/src/pb/proto/shop_msg.proto @@ -1,39 +1,40 @@ syntax = "proto3"; option go_package = ".;pb"; -import "shop_db.proto"; +import "shop/shop_db.proto"; import "comm.proto"; + //商品对象数据 message ShopItem { - int32 GoodsId = 1; //商品Id - repeated UserAssets Items = 2; //货物 - repeated UserAssets Consume = 3; //消耗 - int32 Sale = 4; //打折 - int32 LeftBuyNum = 5; //还可购买次数 + int32 GoodsId = 1; //商品Id + repeated UserAssets Items = 2; //货物 + repeated UserAssets Consume = 3; //消耗 + int32 Sale = 4; //打折 + int32 LeftBuyNum = 5; //还可购买次数 } //获取装备列表请求 message ShopGetListReq { - ShopType sType = 1; //商城类型 - bool IsManualRefresh = 2; //是否手动刷新 + ShopType sType = 1; //商城类型 + bool IsManualRefresh = 2; //是否手动刷新 } //获取装备列表请求 message ShopGetListResp { - ShopType sType = 1; //商城类型 - bool IsManualRefresh = 2; //是否手动刷新 - repeated ShopItem Goods = 4; //商品列表 - int32 SurplusRefreshNum = 5; //剩余手动刷新次数 + ShopType sType = 1; //商城类型 + bool IsManualRefresh = 2; //是否手动刷新 + repeated ShopItem Goods = 4; //商品列表 + int32 SurplusRefreshNum = 5; //剩余手动刷新次数 } //购买商品 请求 message ShopBuyReq { - ShopType ShopType = 1; //商店类型 - int32 GoodsId = 2; //商品Id - int32 BuyNum = 3; //商品购买数量 + ShopType ShopType = 1; //商店类型 + int32 GoodsId = 2; //商品Id + int32 BuyNum = 3; //商品购买数量 } //购买商品 回应 message ShopBuyResp { - bool IsSucc = 1; //是否成功 + bool IsSucc = 1; //是否成功 } diff --git a/src/pb/proto/task_msg.proto b/src/pb/proto/task_msg.proto index 58a0505..e67a3bd 100644 --- a/src/pb/proto/task_msg.proto +++ b/src/pb/proto/task_msg.proto @@ -46,4 +46,6 @@ message TaskDoStrategyResp { } //任务完成推送 -message TaskFinishedPush { int32 taskId = 1; } \ 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 0724e33..a383e41 100644 --- a/src/pb/proto/user_db.proto +++ b/src/pb/proto/user_db.proto @@ -15,13 +15,13 @@ message DBUser { string uuid = 3; //@go_tags(`bson:"uuid"`) 玩家唯一uuid string binduid = 4; //@go_tags(`bson:"binduid"`) 玩家账号 string name = 5; //@go_tags(`bson:"name"`) 玩家名 - int32 sid = 6; //@go_tags(`bson:"sid"`) 区服id + string sid = 6; //@go_tags(`bson:"sid"`) 区服id string createip = 7; //@go_tags(`bson:"createip"`) 创建账号时的ip string lastloginip = 8; //@go_tags(`bson:"lastloginip"`) 最后一次登录时的ip int64 ctime = 9; //@go_tags(`bson:"ctime"`) 玩家创号时间戳 int64 logintime = 10; //@go_tags(`bson:"logintime"`) 最后一次登录时间 int32 friendPoint = 11; //@go_tags(`bson:"friendPoint"`) 友情点 - int32 avatar = 12; //@go_tags(`bson:"avatar"`) 头像 + string avatar = 12; //@go_tags(`bson:"avatar"`) 头像 int32 gold = 13; //@go_tags(`bson:"gold"`) 金币 int32 exp = 14; //@go_tags(`bson:"exp"`) 经验 bool created = 15; //@go_tags(`bson:"created"`) 创角 diff --git a/src/pb/proto/user_msg.proto b/src/pb/proto/user_msg.proto index 934feb1..96225c7 100644 --- a/src/pb/proto/user_msg.proto +++ b/src/pb/proto/user_msg.proto @@ -8,12 +8,13 @@ import "userexpand.proto"; //用户登录 message UserLoginReq { string account = 1; //账号 - int32 sid = 2; //区服编号 + string sid = 2; //区服编号 } message UserLoginResp { DBUser data = 1; DBUserExpand ex = 2; //用户扩展 + int64 timeNow = 3; // 服务器时间 } //登出 @@ -24,7 +25,7 @@ message UserLogoutResp {} //注册 message UserRegisterReq { string account = 1; - int32 sid = 2; + string sid = 2; } message UserRegisterResp { diff --git a/src/pb/proto/userrecord.proto b/src/pb/proto/userrecord.proto deleted file mode 100644 index 717ded3..0000000 --- a/src/pb/proto/userrecord.proto +++ /dev/null @@ -1,21 +0,0 @@ -syntax = "proto3"; -option go_package = ".;pb"; - -message Floor{ // 记录阵型保底数据 - int32 h4 = 1; // 4星次数 - int32 h5 = 2; // 5星次数 -} - -//用户扩展数据 -message DBUserRecord { - string id = 1; //@go_tags(`bson:"_id"`) ID 主键id - string uid = 2; //@go_tags(`bson:"uid"`) 用户ID - Floor race0 = 3; // 普通卡池 - Floor race1 = 4; // 阵型1卡池 - Floor race2 = 5; // 阵型2卡池 - Floor race3 = 6; // 阵型3卡池 - Floor race4 = 7; // 阵型4卡池 - int32 triggernum = 8; // 活动数据 存放没有触发次数 - int32 activityid = 9; // 活动id - int64 mtime = 10; // 修改时间 -} \ No newline at end of file diff --git a/src/views/protocol/Index.vue b/src/views/protocol/Index.vue index 9cf41a5..65e854d 100644 --- a/src/views/protocol/Index.vue +++ b/src/views/protocol/Index.vue @@ -214,6 +214,8 @@ export default defineComponent({ { mainType: 'stak', subs: [] }, { mainType: 'mainline', subs: [] }, { mainType: 'chat', subs: [] }, + { mainType: 'gm', subs: [] }, + { mainType: 'forum', subs: [] }, ]) for (const v of Object.keys(proto)) { for (const v1 of proto_models) {