diff --git a/src/pb/proto.js b/src/pb/proto.js index ec8b18a..855e04f 100644 --- a/src/pb/proto.js +++ b/src/pb/proto.js @@ -18,9 +18,12 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr }, PlayType: { values: { - mainline: 0, - pagoda: 1, - moonfantasy: 2 + moonfantasy: 0, + mainline: 1, + pagoda: 2, + viking: 3, + rtask: 4, + hunting: 5 } }, BBattleState: { @@ -36,6 +39,56 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr bule: 2 } }, + BattleRole: { + fields: { + tid: { + type: "int32", + id: 1 + }, + oid: { + type: "string", + id: 2 + }, + pos: { + type: "int32", + id: 3 + }, + heroID: { + type: "string", + id: 4 + }, + star: { + type: "int32", + id: 5 + }, + lv: { + type: "int32", + id: 6 + }, + captainSkill: { + type: "int32", + id: 7 + }, + mainSuitSkill: { + type: "int32", + id: 8 + }, + subSuitSkill: { + type: "int32", + id: 9 + }, + normalSkill: { + rule: "repeated", + type: "SkillData", + id: 10 + }, + property: { + keyType: "string", + type: "int32", + id: 11 + } + } + }, DBBattleFormt: { fields: { leadpos: { @@ -44,7 +97,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr }, team: { rule: "repeated", - type: "DBHero", + type: "BattleRole", id: 2 } } @@ -55,48 +108,52 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr type: "string", id: 1 }, + title: { + type: "string", + id: 2 + }, btype: { type: "BattleType", - id: 2 + id: 3 }, ptype: { type: "PlayType", - id: 3 + id: 4 }, plevel: { type: "string", - id: 4 + id: 5 }, state: { type: "BBattleState", - id: 5 + id: 6 }, redCompId: { type: "string", - id: 6 + id: 7 }, redflist: { rule: "repeated", type: "DBBattleFormt", - id: 7 + id: 8 }, blueCompId: { type: "string", - id: 8 + id: 9 }, buleflist: { rule: "repeated", type: "DBBattleFormt", - id: 9 + id: 10 }, roundresult: { rule: "repeated", type: "DBBattleComp", - id: 10 + id: 11 }, result: { type: "DBBattleComp", - id: 11 + id: 12 } } }, @@ -112,6 +169,12 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, + HeroType: { + values: { + HeroTypeNil: 0, + HeroTypeKongFu: 1 + } + }, DBHero: { fields: { id: { @@ -221,6 +284,26 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr keyType: "string", type: "int32", id: 25 + }, + status: { + type: "HeroType", + id: 26 + }, + suite1Star: { + type: "int32", + id: 27 + }, + suite2Star: { + type: "int32", + id: 28 + }, + suite1Lv: { + type: "int32", + id: 29 + }, + suite2Lv: { + type: "int32", + id: 30 } } }, @@ -264,25 +347,45 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, + LineUp: { + fields: { + cid: { + type: "string", + id: 1 + }, + star: { + type: "int32", + id: 2 + }, + lv: { + type: "int32", + id: 3 + } + } + }, BattlePVEReq: { fields: { ptype: { type: "PlayType", id: 1 }, + title: { + type: "string", + id: 2 + }, leadpos: { type: "int32", - id: 2 + id: 3 }, teamids: { rule: "repeated", type: "string", - id: 3 + id: 4 }, mformat: { rule: "repeated", type: "int32", - id: 4 + id: 5 } } }, @@ -292,36 +395,49 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr type: "string", id: 1 }, + title: { + type: "string", + id: 2 + }, btype: { type: "BattleType", - id: 2 + id: 3 }, ptype: { type: "PlayType", - id: 3 + id: 4 }, redCompId: { type: "string", - id: 4 + id: 5 }, redflist: { rule: "repeated", type: "DBBattleFormt", - id: 5 + id: 6 }, blueCompId: { type: "string", - id: 6 + id: 7 }, buleflist: { rule: "repeated", type: "DBBattleFormt", - id: 7 + id: 8 } } }, BattleReport: { - fields: {} + fields: { + info: { + type: "BattleInfo", + id: 1 + }, + Costtime: { + type: "int32", + id: 2 + } + } }, ChatChannel: { values: { @@ -335,7 +451,11 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr ChatType: { values: { Text: 0, - Moonfantasy: 1 + Moonfantasy: 1, + Share: 2, + HeroShare: 3, + EquipmentShare: 4, + ItemShare: 5 } }, DBChat: { @@ -403,6 +523,10 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr appendBool: { type: "string", id: 16 + }, + appendBytes: { + type: "bytes", + id: 17 } } }, @@ -466,6 +590,27 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, + ChatGetCrossListReq: { + fields: { + channel: { + type: "ChatChannel", + id: 1 + }, + channelId: { + type: "int32", + id: 2 + } + } + }, + ChatGetCrossListResp: { + fields: { + chats: { + rule: "repeated", + type: "DBChat", + id: 1 + } + } + }, ChatSendReq: { fields: { avatar: { @@ -488,9 +633,29 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr type: "string", id: 5 }, + ctype: { + type: "ChatType", + id: 6 + }, content: { type: "string", - id: 6 + id: 7 + }, + appendInt: { + type: "int64", + id: 8 + }, + appendStr: { + type: "string", + id: 9 + }, + appendBool: { + type: "string", + id: 10 + }, + appendBytes: { + type: "bytes", + id: 11 } } }, @@ -502,6 +667,62 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, + ChatSendCrossReq: { + fields: { + avatar: { + type: "string", + id: 1 + }, + uname: { + type: "string", + id: 2 + }, + ulv: { + type: "int32", + id: 3 + }, + channel: { + type: "ChatChannel", + id: 4 + }, + targetId: { + type: "string", + id: 5 + }, + ctype: { + type: "ChatType", + id: 6 + }, + content: { + type: "string", + id: 7 + }, + appendInt: { + type: "int64", + id: 8 + }, + appendStr: { + type: "string", + id: 9 + }, + appendBool: { + type: "string", + id: 10 + }, + appendBytes: { + type: "bytes", + id: 11 + } + } + }, + ChatSendCrossResp: { + fields: { + issucc: { + type: "bool", + id: 1 + } + } + }, UserMessage: { fields: { MainType: { @@ -661,6 +882,30 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, + NoticeUserLoginReq: { + fields: { + Ip: { + type: "string", + id: 1 + }, + UserSessionId: { + type: "string", + id: 2 + }, + UserId: { + type: "string", + id: 3 + }, + ServiceTag: { + type: "string", + id: 4 + }, + GatewayServiceId: { + type: "string", + id: 5 + } + } + }, NoticeUserCloseReq: { fields: { Ip: { @@ -722,6 +967,22 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, + RtaskParam: { + fields: { + param1: { + type: "int32", + id: 1 + }, + param2: { + type: "int32", + id: 2 + }, + param3: { + type: "int32", + id: 3 + } + } + }, ErrorCode: { values: { Success: 0, @@ -747,6 +1008,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr ResNoEnough: 102, ConfigurationException: 103, ConfigNoFound: 104, + UserLogined: 105, SecKeyInvalid: 1000, SecKey: 1001, BindUser: 1002, @@ -760,6 +1022,8 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr UserModiNameCount: 1010, UserNickNameEmpty: 1011, UserExpandNull: 1012, + UserExpNoEnough: 1013, + UserFriendNoEnough: 1014, FriendNotSelf: 1100, FriendSelfMax: 1101, FriendTargetMax: 1102, @@ -776,11 +1040,13 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr FriendZanreceived: 1113, FriendZanSelf: 1114, FriendPointLimit: 1115, + FriendNoreceived: 1116, ItemsNoEnough: 1200, ItemsNoFoundGird: 1201, ItemsGridNumUpper: 1202, ItemsGirdAmountUpper: 1203, ItemsUseNotSupported: 1204, + ItemsUseNoCanSell: 1205, HeroNoExist: 1300, HeroNoEnough: 1301, HeroMaxLv: 1302, @@ -809,6 +1075,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr EquipmentOnFoundEquipment: 1400, EquipmentLvlimitReached: 1401, EquipmentIsWorn: 1402, + EquipmentNoCanSell: 1403, MainlineNotFindChapter: 1500, MainlineIDFailed: 1501, MainlineNotFound: 1502, @@ -837,13 +1104,38 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr MartialhallNotUnlocked: 2000, MartialhallInUse: 2001, MartialhallUnlocked: 2002, + MartialhallNoUnlocked: 2003, GourmetMoreOrderTime: 2101, GourmetSkillMaxLv: 2102, RtaskFinished: 2201, RtaskUnFinished: 2202, RtaskNoRtask: 2203, RtaskRewarded: 2204, - RtaskPreNoFinish: 2205 + RtaskPreNoFinish: 2205, + RtaskCondiNoReach: 2206, + RtaskNoLastOne: 2207, + RtaskCondiNoFound: 2208, + VikingLvErr: 2301, + VikingBoosType: 2302, + VikingBuyMaxCount: 2303, + VikingMaxChallengeCount: 2304, + MoonfantasyHasExpired: 2401, + MoonfantasyJoinUp: 2402, + MoonfantasyDareUp: 2403, + MoonfantasyBattleNoEnd: 2404, + MoonfantasyBattleNoWin: 2405, + MoonfantasyNoJoin: 2406, + MoonfantasyNotEnoughbattles: 2407, + BattleNoFoundRecord: 2501, + LinestoryTaskFinished: 2601, + LinestorySubTaskFinished: 2602, + LinestoryTaskDisabledEnter: 2603, + LinestoryPreTaskNoFinished: 2604, + HuntingLvErr: 2701, + HuntingBoosType: 2702, + HuntingBuyMaxCount: 2703, + HuntingMaxChallengeCount: 2704, + LibraryMaxLv: 2801 } }, google: { @@ -1249,6 +1541,14 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr assistHeroId: { type: "string", id: 7 + }, + received: { + type: "int32", + id: 8 + }, + updateTime: { + type: "int64", + id: 9 } } }, @@ -1275,7 +1575,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr id: 5 }, serverId: { - type: "int32", + type: "string", id: 6 }, offlineTime: { @@ -1293,6 +1593,10 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr isGetZaned: { type: "bool", id: 10 + }, + heroObjId: { + type: "string", + id: 11 } } }, @@ -1305,10 +1609,6 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr rule: "repeated", type: "FriendBase", id: 1 - }, - heroObjId: { - type: "string", - id: 2 } } }, @@ -1557,6 +1857,37 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr heroObjId: { type: "string", id: 1 + }, + received: { + type: "int32", + id: 2 + } + } + }, + FriendAssistlistReq: { + fields: {} + }, + FriendAssistlistResp: { + fields: { + list: { + rule: "repeated", + type: "FriendBase", + id: 1 + }, + heroObjId: { + type: "string", + id: 2 + } + } + }, + FriendGetrewardReq: { + fields: {} + }, + FriendGetrewardResp: { + fields: { + received: { + type: "int32", + id: 1 } } }, @@ -1585,6 +1916,10 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr eTime: { type: "int64", id: 2 + }, + sTime: { + type: "int64", + id: 3 } } }, @@ -1933,24 +2268,6 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, - HeroChoukaReq: { - fields: { - heroIds: { - rule: "repeated", - type: "string", - id: 1 - } - } - }, - HeroChoukaResp: { - fields: { - heroes: { - rule: "repeated", - type: "DBHero", - id: 1 - } - } - }, HeroPropertyPush: { fields: { heroId: { @@ -2043,6 +2360,21 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, + HeroDrawCardFloorReq: { + fields: {} + }, + HeroDrawCardFloorResp: { + fields: { + star4: { + type: "int32", + id: 1 + }, + star5: { + type: "int32", + id: 2 + } + } + }, DBHunting: { fields: { id: { @@ -2057,7 +2389,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr type: "int32", id: 3 }, - boos: { + boss: { keyType: "int32", type: "int32", id: 4 @@ -2070,8 +2402,8 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr type: "int64", id: 6 }, - challengeTime: { - keyType: "int32", + bossTime: { + keyType: "string", type: "int32", id: 7 } @@ -2133,10 +2465,51 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr difficulty: { type: "int32", id: 2 + }, + leadpos: { + type: "int32", + id: 3 + }, + teamids: { + rule: "repeated", + type: "string", + id: 4 } } }, HuntingChallengeResp: { + fields: { + info: { + type: "BattleInfo", + id: 1 + }, + bossType: { + type: "int32", + id: 2 + }, + difficulty: { + type: "int32", + id: 3 + } + } + }, + HuntingChallengeOverReq: { + fields: { + bossType: { + type: "int32", + id: 1 + }, + difficulty: { + type: "int32", + id: 2 + }, + report: { + type: "BattleReport", + id: 3 + } + } + }, + HuntingChallengeOverResp: { fields: { data: { type: "DBHunting", @@ -2161,7 +2534,16 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } }, HuntingRankListReq: { - fields: {} + fields: { + boosType: { + type: "int32", + id: 1 + }, + friend: { + type: "bool", + id: 2 + } + } }, HuntingRankListResp: { fields: { @@ -2298,6 +2680,245 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, + DBLibrary: { + fields: { + id: { + type: "string", + id: 1 + }, + uid: { + type: "string", + id: 2 + }, + fid: { + type: "int32", + id: 3 + }, + hero: { + keyType: "string", + type: "int32", + id: 4 + }, + prize: { + keyType: "int32", + type: "int32", + id: 5 + }, + fetterlv: { + type: "int32", + id: 6 + }, + storyid: { + type: "int32", + id: 7 + }, + activation: { + type: "bool", + id: 8 + } + } + }, + DBHeroFetter: { + fields: { + id: { + type: "string", + id: 1 + }, + uid: { + type: "string", + id: 2 + }, + heroid: { + type: "string", + id: 3 + }, + history: { + rule: "repeated", + type: "int32", + id: 4 + }, + favorlv: { + type: "int32", + id: 5 + }, + favorexp: { + type: "int32", + id: 6 + }, + stroyprize: { + type: "int32", + id: 7 + } + } + }, + LibraryGetListReq: { + fields: {} + }, + LibraryGetListResp: { + fields: { + data: { + rule: "repeated", + type: "DBLibrary", + id: 1 + } + } + }, + LibraryGetFetterListReq: { + fields: {} + }, + LibraryGetFetterListResp: { + fields: { + data: { + rule: "repeated", + type: "DBHeroFetter", + id: 1 + } + } + }, + LibraryGetRewardReq: { + fields: { + objId: { + type: "string", + id: 1 + } + } + }, + LibraryGetRewardResp: { + fields: { + data: { + type: "DBLibrary", + id: 1 + } + } + }, + LibraryGetStoryRewardReq: { + fields: { + hid: { + type: "string", + id: 1 + }, + history: { + type: "int32", + id: 2 + }, + rightend: { + type: "int32", + id: 3 + } + } + }, + LibraryGetStoryRewardResp: { + fields: { + data: { + type: "DBLibrary", + id: 1 + } + } + }, + LibraryUseGiftReq: { + fields: { + heroid: { + type: "string", + id: 1 + }, + items: { + keyType: "string", + type: "int32", + id: 2 + } + } + }, + LibraryUseGiftResp: { + fields: { + data: { + type: "DBHeroFetter", + id: 1 + } + } + }, + TaskNode: { + fields: { + status: { + type: "int32", + id: 1 + }, + subtaskIds: { + rule: "repeated", + type: "int32", + id: 2 + } + } + }, + DBLinestory: { + fields: { + id: { + type: "string", + id: 1 + }, + uid: { + type: "string", + id: 2 + }, + jqId: { + type: "int32", + id: 3 + }, + tasks: { + keyType: "int32", + type: "TaskNode", + id: 4 + } + } + }, + LinestoryStartReq: { + fields: { + jqId: { + type: "int32", + id: 1 + } + } + }, + LinestoryStartResp: { + fields: { + jqId: { + type: "int32", + id: 1 + }, + taskIds: { + rule: "repeated", + type: "int32", + id: 2 + } + } + }, + LinestoryDotaskReq: { + fields: { + taskId: { + type: "int32", + id: 1 + }, + subtaskId: { + type: "int32", + id: 2 + } + } + }, + LinestoryDotaskResp: { + fields: { + taskId: { + type: "int32", + id: 1 + }, + subtaskId: { + type: "int32", + id: 2 + }, + resetTaskId: { + type: "int32", + id: 3 + } + } + }, DBMailData: { fields: { ObjId: { @@ -2424,6 +3045,13 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, + AwaredType: { + values: { + TypeNil: 0, + TypeAvailable: 1, + TypeReceived: 2 + } + }, DBMainline: { fields: { id: { @@ -2443,7 +3071,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr id: 4 }, awaredID: { - type: "int32", + type: "AwaredType", id: 5 }, branchID: { @@ -2511,6 +3139,14 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr info: { type: "BattleInfo", id: 1 + }, + chapterObj: { + type: "string", + id: 2 + }, + mainlineId: { + type: "uint32", + id: 3 } } }, @@ -2555,33 +3191,37 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr }, DBPillar: { fields: { + index: { + type: "int32", + id: 1 + }, isunlock: { type: "bool", - id: 1 + id: 2 }, state: { type: "PillarState", - id: 2 + id: 3 }, hero: { type: "string", - id: 3 + id: 4 }, start: { type: "int64", - id: 4 + id: 5 }, end: { type: "int64", - id: 5 + id: 6 }, lastbill: { type: "int64", - id: 6 + id: 7 }, reward: { type: "int32", - id: 7 + id: 8 } } }, @@ -2641,22 +3281,22 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr hero: { type: "string", id: 2 + }, + time: { + type: "int32", + id: 3 } } }, MartialhallPracticeResp: { fields: { - pillar: { - type: "int32", - id: 1 - }, - hero: { - type: "string", - id: 2 - }, issucc: { type: "bool", - id: 3 + id: 1 + }, + info: { + type: "DBMartialhall", + id: 2 } } }, @@ -2676,13 +3316,53 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr }, MartialhallUpgradeResp: { fields: { + issucc: { + type: "bool", + id: 1 + }, info: { type: "DBMartialhall", + id: 2 + } + } + }, + MartialhallUnLockReq: { + fields: { + pillar: { + type: "int32", id: 1 } } }, - DBMoonfantasy: { + MartialhallUnLockResp: { + fields: { + issucc: { + type: "bool", + id: 1 + }, + info: { + type: "DBMartialhall", + id: 2 + } + } + }, + UserInfo: { + fields: { + uid: { + type: "string", + id: 1 + }, + name: { + type: "string", + id: 2 + }, + avatar: { + type: "string", + id: 12 + } + } + }, + DBMoonFantasy: { fields: { id: { type: "string", @@ -2700,8 +3380,9 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr type: "int64", id: 4 }, - joinnum: { - type: "int32", + join: { + rule: "repeated", + type: "UserInfo", id: 5 }, numup: { @@ -2719,23 +3400,56 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, - MoonfantasyTriggerReq: { + DBUserMFantasy: { fields: { - avatar: { + id: { type: "string", id: 1 }, - uname: { + uid: { type: "string", id: 2 }, - ulv: { - type: "int32", + mfantasys: { + rule: "repeated", + type: "string", id: 3 + }, + triggerNum: { + type: "int32", + id: 4 + }, + battleNum: { + type: "int32", + id: 5 + }, + buyNum: { + type: "int32", + id: 6 + }, + lastTrigger: { + type: "int64", + id: 7 } } }, - MoonfantasyTriggerResp: { + MoonfantasyGetListReq: { + fields: {} + }, + MoonfantasyGetListResp: { + fields: { + battleNum: { + type: "int32", + id: 1 + }, + dfantasys: { + rule: "repeated", + type: "DBMoonFantasy", + id: 2 + } + } + }, + MoonfantasyTriggerPush: { fields: { issucc: { type: "bool", @@ -2753,13 +3467,9 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr }, MoonfantasyAskReq: { fields: { - uid: { - type: "string", - id: 1 - }, mid: { type: "string", - id: 2 + id: 1 } } }, @@ -2768,27 +3478,27 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr code: { type: "ErrorCode", id: 1 + }, + info: { + type: "DBMoonFantasy", + id: 2 } } }, MoonfantasyBattleReq: { fields: { - uid: { + mid: { type: "string", id: 1 }, - mid: { - type: "string", - id: 2 - }, leadpos: { type: "int32", - id: 3 + id: 2 }, teamids: { rule: "repeated", type: "string", - id: 4 + id: 3 } } }, @@ -2798,7 +3508,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr type: "ErrorCode", id: 1 }, - monster: { + mid: { type: "string", id: 2 }, @@ -2814,7 +3524,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr type: "string", id: 2 }, - monster: { + mid: { type: "string", id: 3 }, @@ -2832,6 +3542,26 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, + MoonfantasyBuyReq: { + fields: { + BuyNum: { + type: "int32", + id: 1 + } + } + }, + MoonfantasyBuyResp: { + fields: { + issucc: { + type: "bool", + id: 1 + }, + BattleNum: { + type: "int32", + id: 2 + } + } + }, DBSystemNotify: { fields: { id: { @@ -2922,6 +3652,80 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr keyType: "int32", type: "bool", id: 4 + }, + type: { + type: "int32", + id: 5 + } + } + }, + DBSeasonPagoda: { + fields: { + id: { + type: "string", + id: 1 + }, + uid: { + type: "string", + id: 2 + }, + pagodaId: { + type: "int32", + id: 3 + }, + reward: { + keyType: "int32", + type: "bool", + id: 4 + }, + type: { + type: "int32", + id: 5 + } + } + }, + DBPagodaRecord: { + fields: { + id: { + type: "string", + id: 1 + }, + uid: { + type: "string", + id: 2 + }, + pagodaId: { + type: "int32", + id: 3 + }, + type: { + type: "int32", + id: 4 + }, + nickname: { + type: "string", + id: 5 + }, + icon: { + type: "string", + id: 6 + }, + lv: { + type: "int32", + id: 7 + }, + leadpos: { + type: "int32", + id: 8 + }, + line: { + rule: "repeated", + type: "LineUp", + id: 9 + }, + costTime: { + type: "int32", + id: 10 } } }, @@ -2957,10 +3761,55 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr levelID: { type: "int32", id: 1 + }, + PagodaType: { + type: "int32", + id: 2 + }, + leadpos: { + type: "int32", + id: 3 + }, + teamids: { + rule: "repeated", + type: "string", + id: 4 } } }, PagodaChallengeResp: { + fields: { + info: { + type: "BattleInfo", + id: 1 + }, + levelID: { + type: "int32", + id: 2 + }, + PagodaType: { + type: "int32", + id: 3 + } + } + }, + PagodaChallengeOverReq: { + fields: { + levelID: { + type: "int32", + id: 1 + }, + PagodaType: { + type: "int32", + id: 2 + }, + report: { + type: "BattleReport", + id: 3 + } + } + }, + PagodaChallengeOverResp: { fields: { data: { type: "DBPagoda", @@ -2968,6 +3817,326 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, + PagodaRankListReq: { + fields: { + floorId: { + type: "int32", + id: 1 + }, + friend: { + type: "bool", + id: 2 + } + } + }, + PagodaRankListResp: { + fields: { + ranks: { + rule: "repeated", + type: "DBPagodaRecord", + id: 1 + } + } + }, + PagodaQueryRecordReq: { + fields: {} + }, + PagodaQueryRecordResp: { + fields: { + data: { + type: "DBPagodaRecord", + id: 1 + } + } + }, + frtaskIds: { + fields: { + rtaskIds: { + rule: "repeated", + type: "int32", + id: 1 + } + } + }, + DBRtask: { + fields: { + id: { + type: "string", + id: 1 + }, + uid: { + type: "string", + id: 2 + }, + frtaskIds: { + keyType: "int32", + type: "frtaskIds", + id: 3 + }, + nextRtaskId: { + type: "int32", + id: 4 + }, + isReward: { + type: "bool", + id: 5 + } + } + }, + rtaskData: { + fields: { + data: { + keyType: "int32", + type: "int32", + id: 1 + }, + rtype: { + type: "int32", + id: 2 + }, + timestamp: { + type: "int64", + id: 3 + } + } + }, + DBRtaskRecord: { + fields: { + id: { + type: "string", + id: 1 + }, + uid: { + type: "string", + id: 2 + }, + vals: { + keyType: "int32", + type: "rtaskData", + id: 3 + } + } + }, + RtaskApplyReq: { + fields: { + rtaskId: { + type: "int32", + id: 1 + }, + rtaskSubId: { + type: "int32", + id: 2 + } + } + }, + RtaskApplyResp: { + fields: { + rtaskId: { + type: "int32", + id: 1 + } + } + }, + RtasklistReq: { + fields: { + groupId: { + type: "int32", + id: 1 + } + } + }, + RtasklistResp: { + fields: { + rtaskIds: { + rule: "repeated", + type: "int32", + id: 1 + }, + groupId: { + type: "int32", + id: 2 + } + } + }, + RtaskChooseReq: { + fields: { + rtaskId: { + type: "int32", + id: 1 + }, + chooseId: { + type: "int32", + id: 2 + }, + rtaskSubId: { + type: "int32", + id: 3 + } + } + }, + RtaskChooseResp: { + fields: { + rtaskId: { + type: "int32", + id: 1 + }, + chooseId: { + type: "int32", + id: 2 + }, + rtaskSubId: { + type: "int32", + id: 3 + } + } + }, + RtaskFinishPush: { + fields: { + rtaskId: { + type: "int32", + id: 1 + } + } + }, + RtaskFinishIdsPush: { + fields: { + rtaskId: { + rule: "repeated", + type: "int32", + id: 1 + }, + groupId: { + type: "int32", + id: 2 + } + } + }, + RtaskGetRewardReq: { + fields: { + rtaskId: { + type: "int32", + id: 1 + }, + rtaskSubId: { + type: "int32", + id: 2 + } + } + }, + RtaskGetRewardResp: { + fields: { + rtaskId: { + type: "int32", + id: 1 + }, + rtaskSubId: { + type: "int32", + id: 2 + } + } + }, + RtaskBattleStartReq: { + fields: { + battleConfId: { + type: "int32", + id: 1 + }, + leadpos: { + type: "int32", + id: 3 + }, + teamids: { + rule: "repeated", + type: "string", + id: 4 + } + } + }, + RtaskBattleStartResp: { + fields: { + info: { + type: "BattleInfo", + id: 1 + } + } + }, + RtaskBattleFinishReq: { + fields: { + rtaskId: { + type: "int32", + id: 1 + }, + rtaskSubId: { + type: "int32", + id: 2 + }, + chooseId: { + type: "int32", + id: 3 + } + } + }, + RtaskBattleFinishResp: { + fields: { + rtaskId: { + type: "int32", + id: 1 + }, + rtaskSubId: { + type: "int32", + id: 2 + } + } + }, + RtaskGetrecordReq: { + fields: {} + }, + RtaskGetrecordResp: { + fields: { + record: { + type: "DBRtaskRecord", + id: 1 + } + } + }, + RtaskTestReq: { + fields: { + rtaskType: { + type: "int32", + id: 1 + }, + params: { + rule: "repeated", + type: "int32", + id: 2 + }, + condiId: { + type: "int32", + id: 3 + }, + groupId: { + type: "int32", + id: 4 + }, + rtaskIds: { + type: "string", + id: 5 + } + } + }, + RtaskTestResp: { + fields: { + flag: { + type: "bool", + id: 1 + }, + rtaskIds: { + rule: "repeated", + type: "int32", + id: 2 + } + } + }, ShopType: { values: { Null: 0, @@ -3124,6 +4293,10 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr eTime: { type: "int64", id: 2 + }, + sTime: { + type: "int64", + id: 3 } } }, @@ -3185,6 +4358,7 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr id: 9 }, deskFloor: { + keyType: "int32", type: "int32", id: 10 }, @@ -3233,15 +4407,15 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, - SmithySkillLvReq: { + SmithyDeskSkillLvReq: { fields: { - skillType: { + deskType: { type: "int32", id: 1 } } }, - SmithySkillLvResp: { + SmithyDeskSkillLvResp: { fields: { data: { type: "DBSmithy", @@ -3249,6 +4423,41 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, + SmithyStoveSkillLvReq: { + fields: {} + }, + SmithyStoveSkillLvResp: { + fields: { + data: { + type: "DBSmithy", + id: 1 + } + } + }, + SmithyGetRandUserReq: { + fields: {} + }, + SmithyGetRandUserResp: { + fields: { + user: { + rule: "repeated", + type: "string", + id: 1 + } + } + }, + SysFuncListReq: { + fields: {} + }, + SysFuncListResp: { + fields: { + funcIds: { + rule: "repeated", + type: "string", + id: 1 + } + } + }, DBTask: { fields: { id: { @@ -3490,20 +4699,16 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr type: "int64", id: 10 }, - friendPoint: { - type: "int32", - id: 11 - }, avatar: { type: "string", id: 12 }, gold: { - type: "int32", + type: "int64", id: 13 }, exp: { - type: "int32", + type: "int64", id: 14 }, created: { @@ -3519,12 +4724,24 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr id: 17 }, diamond: { - type: "int32", + type: "int64", id: 18 }, title: { type: "int32", id: 19 + }, + offlinetime: { + type: "int64", + id: 11 + }, + figure: { + type: "int32", + id: 20 + }, + bgp: { + type: "int32", + id: 21 } } }, @@ -3612,6 +4829,21 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, + UserInfoReq: { + fields: {} + }, + UserInfoResp: { + fields: { + data: { + type: "DBUser", + id: 1 + }, + ex: { + type: "DBUserExpand", + id: 2 + } + } + }, UserLogoutReq: { fields: {} }, @@ -3666,43 +4898,23 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, - UserAddResReq: { - fields: { - res: { - type: "UserAssets", - id: 1 - } - } - }, - UserAddResResp: { - fields: { - res: { - type: "UserAssets", - id: 1 - } - } - }, - UserResChangePush: { + UserResChangedPush: { fields: { gold: { - type: "int32", + type: "int64", id: 1 }, exp: { - type: "int32", + type: "int64", id: 2 }, - lv: { - type: "int32", - id: 3 - }, - vip: { - type: "int32", - id: 4 - }, diamond: { - type: "int32", + type: "int64", id: 5 + }, + friend: { + type: "int32", + id: 6 } } }, @@ -3777,6 +4989,70 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr count: { type: "uint32", id: 2 + }, + name: { + type: "string", + id: 3 + } + } + }, + UserModifyavatarReq: { + fields: { + avatarId: { + type: "string", + id: 1 + } + } + }, + UserModifyavatarResp: { + fields: { + uid: { + type: "string", + id: 1 + }, + avatarId: { + type: "string", + id: 2 + } + } + }, + UserModifybgpReq: { + fields: { + bgpId: { + type: "int32", + id: 1 + } + } + }, + UserModifybgpResp: { + fields: { + uid: { + type: "string", + id: 1 + }, + bgpId: { + type: "int32", + id: 2 + } + } + }, + UserModifyfigureReq: { + fields: { + figureId: { + type: "int32", + id: 1 + } + } + }, + UserModifyfigureResp: { + fields: { + uid: { + type: "string", + id: 1 + }, + figureId: { + type: "int32", + id: 2 } } }, @@ -3792,14 +5068,14 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, - UserChangedPush: { + UserLvChangedPush: { fields: { uid: { type: "string", id: 1 }, exp: { - type: "int32", + type: "int64", id: 2 }, lv: { @@ -3808,54 +5084,6 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, - UserFigureReq: { - fields: { - preinstall: { - type: "int32", - id: 1 - }, - action: { - type: "int32", - id: 2 - }, - hair: { - type: "Hair", - id: 3 - }, - eyes: { - type: "Eyes", - id: 4 - }, - mouth: { - type: "Mouth", - id: 5 - }, - body: { - type: "Body", - id: 6 - }, - complexion: { - type: "Complexion", - id: 7 - } - } - }, - UserFigureResp: { - fields: { - uid: { - type: "string", - id: 1 - }, - action: { - type: "int32", - id: 2 - }, - figure: { - type: "Figure", - id: 3 - } - } - }, UserModifysignReq: { fields: { sign: { @@ -3872,82 +5100,21 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, - Hair: { - fields: { - resId: { - type: "int32", - id: 1 - }, - color: { - type: "string", - id: 2 - } - } + UserBattlerecordReq: { + fields: {} }, - Eyes: { + UserBattlerecordResp: { fields: { - resId: { - type: "int32", - id: 1 - }, - color: { - type: "string", - id: 2 - } - } - }, - Mouth: { - fields: { - resId: { + uid: { type: "string", id: 1 - } - } - }, - Body: { - fields: { - high: { - type: "int32", - id: 1 }, - shape: { - type: "int32", + pagodaRecord: { + type: "DBPagodaRecord", id: 2 } } }, - Complexion: { - fields: { - color: { - type: "string", - id: 1 - } - } - }, - Figure: { - fields: { - hair: { - type: "Hair", - id: 1 - }, - eyes: { - type: "Eyes", - id: 2 - }, - mouth: { - type: "Mouth", - id: 3 - }, - body: { - type: "Body", - id: 4 - }, - complexion: { - type: "Complexion", - id: 5 - } - } - }, DBUserExpand: { fields: { id: { @@ -3980,17 +5147,8 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr }, tujian: { keyType: "string", - type: "bool", - id: 8 - }, - curFigure: { type: "int32", - id: 9 - }, - preinstall: { - keyType: "int32", - type: "Figure", - id: 10 + id: 8 }, activeday: { type: "int32", @@ -4003,6 +5161,34 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr sign: { type: "string", id: 13 + }, + friendPoint: { + type: "int32", + id: 14 + }, + friendPointID: { + type: "int32", + id: 15 + }, + friendPointOD: { + type: "int32", + id: 16 + }, + loginAddCount: { + type: "int32", + id: 19 + }, + loginContinueCount: { + type: "int32", + id: 20 + }, + completePagoda: { + type: "bool", + id: 21 + }, + rtaskId: { + type: "int32", + id: 22 } } }, @@ -4040,22 +5226,6 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr } } }, - LineUp: { - fields: { - cid: { - type: "string", - id: 1 - }, - star: { - type: "int32", - id: 2 - }, - lv: { - type: "int32", - id: 3 - } - } - }, DBVikingRank: { fields: { id: { @@ -4138,6 +5308,14 @@ var $root = ($protobuf.roots["default"] || ($protobuf.roots["default"] = new $pr info: { type: "BattleInfo", id: 1 + }, + bossType: { + type: "int32", + id: 2 + }, + difficulty: { + type: "int32", + id: 3 } } }, diff --git a/src/pb/proto/battle_db.proto b/src/pb/proto/battle_db.proto index ee450b5..f9eb9ec 100644 --- a/src/pb/proto/battle_db.proto +++ b/src/pb/proto/battle_db.proto @@ -11,9 +11,12 @@ enum BattleType { //玩法类型 enum PlayType { - mainline = 0; //主线玩法 - pagoda = 1; //爬塔 - moonfantasy = 2; //月之秘境 + moonfantasy = 0; //月之秘境 + mainline = 1; //主线玩法 + pagoda = 2; //爬塔 + viking = 3; //远征 + rtask = 4; //随机任务 + hunting = 5; //狩猎 } //战斗状态 @@ -29,23 +32,38 @@ enum DBBattleComp { bule = 2; //蓝方 } +message BattleRole { + int32 tid = 1; // 临时id + string oid = 2; // 玩家英雄数据库id + int32 pos = 3; // 站位坐标 + string heroID = 4; //@go_tags(`bson:"heroID"`) 英雄的配置表ID + int32 star = 5; // 英雄星级 + int32 lv = 6; // 英雄等级 + int32 captainSkill = 7; //@go_tags(`bson:"captainSkill"`) 队长技能 + int32 mainSuitSkill = 8; ///@go_tags(`bson:"mainSuitSkill"`) 主套装技能 + int32 subSuitSkill = 9; ///@go_tags(`bson:"subSuitSkill"`) 副套装技能 + repeated SkillData normalSkill = 10; //@go_tags(`bson:"normalSkill"`) 普通技能 + map property = 11; // 属性相关 +} + //战斗阵型信息 message DBBattleFormt { int32 leadpos = 1; //队长位置 - repeated DBHero team = 2; + repeated BattleRole team = 2; } //战斗记录 message DBBattleRecord { string id = 1; //战斗记录id - BattleType btype = 2; //战斗类型 - PlayType ptype = 3; //玩法类型 - string plevel = 4; //玩法关卡 - BBattleState state = 5; //战斗状态 - string redCompId = 6; //红方阵营id - repeated DBBattleFormt redflist = 7; //红方阵型列表 - string blueCompId = 8; //蓝方阵营id - repeated DBBattleFormt buleflist = 9; //红方阵型列表 - repeated DBBattleComp roundresult = 10; //战斗场次结果 - DBBattleComp result = 11; //最终结果 + string title = 2; //战斗标题 + BattleType btype = 3; //战斗类型 + PlayType ptype = 4; //玩法类型 + string plevel = 5; //玩法关卡 + BBattleState state = 6; //战斗状态 + string redCompId = 7; //红方阵营id + repeated DBBattleFormt redflist = 8; //红方阵型列表 + string blueCompId = 9; //蓝方阵营id + repeated DBBattleFormt buleflist = 10; //红方阵型列表 + repeated DBBattleComp roundresult = 11; //战斗场次结果 + DBBattleComp result = 12; //最终结果 } \ No newline at end of file diff --git a/src/pb/proto/battle_msg.proto b/src/pb/proto/battle_msg.proto index 2aeb29b..5ab3936 100644 --- a/src/pb/proto/battle_msg.proto +++ b/src/pb/proto/battle_msg.proto @@ -1,25 +1,35 @@ syntax = "proto3"; option go_package = ".;pb"; import "battle_db.proto"; +message LineUp { + string cid = 1; // 配置表id + int32 star = 2; // 星级 + int32 lv = 3; // 等级 +} // pve 战斗创建请求 (此请求 为服务端间使用 客户端可忽略) message BattlePVEReq { PlayType ptype = 1; //玩法类型 - int32 leadpos = 2; //队长位置 - repeated string teamids = 3; //阵容信息 - repeated int32 mformat = 4; //敌方增容信息 + string title = 2; //战斗标题 + int32 leadpos = 3; //队长位置 + repeated string teamids = 4; //阵容信息 + repeated int32 mformat = 5; //敌方增容信息 } //战斗开始推送 message BattleInfo { string id = 1; //战斗id - BattleType btype = 2; //战斗类型 - PlayType ptype = 3; //玩法类型 - string redCompId = 4; //红方阵营id - repeated DBBattleFormt redflist = 5; //红方阵型列表 - string blueCompId = 6; //蓝方阵营id - repeated DBBattleFormt buleflist = 7; //红方阵型列表 + string title = 2; //战斗标题 + BattleType btype = 3; //战斗类型 + PlayType ptype = 4; //玩法类型 + string redCompId = 5; //红方阵营id + repeated DBBattleFormt redflist = 6; //红方阵型列表 + string blueCompId = 7; //蓝方阵营id + repeated DBBattleFormt buleflist = 8; //红方阵型列表 } //战报数据 -message BattleReport {} +message BattleReport { + BattleInfo info = 1; + int32 Costtime = 2; //战斗时长 单位ms +} diff --git a/src/pb/proto/chat_db.proto b/src/pb/proto/chat_db.proto index 8e664f1..48fb0bc 100644 --- a/src/pb/proto/chat_db.proto +++ b/src/pb/proto/chat_db.proto @@ -11,8 +11,12 @@ enum ChatChannel { //聊天消息类型 enum ChatType { - Text = 0; //文泵聊天消息 - Moonfantasy = 1; //月子秘境消息 + Text = 0; //文泵聊天消息 + Moonfantasy = 1; //月子秘境消息 + Share = 2; //分享类型 + HeroShare = 3; //英雄分享 + EquipmentShare = 4; //装备分享 + ItemShare = 5; //道具分享 } message DBChat { @@ -32,4 +36,5 @@ message DBChat { int64 appendInt = 14; //@go_tags(`bson:"appendInt"`) 聊天附加数据 string appendStr = 15; //@go_tags(`bson:"appendStr"`) 聊天附加数据 string appendBool = 16; //@go_tags(`bson:"appendBool"`) 聊天附加数据 + bytes appendBytes = 17; //@go_tags(`bson:"appendInt"`) 聊天附加数据 } \ No newline at end of file diff --git a/src/pb/proto/chat_msg.proto b/src/pb/proto/chat_msg.proto index 040bf31..6d666c3 100644 --- a/src/pb/proto/chat_msg.proto +++ b/src/pb/proto/chat_msg.proto @@ -3,51 +3,75 @@ option go_package = ".;pb"; import "chat_db.proto"; //聊天消息推送 -message ChatMessagePush{ - DBChat chat = 1; -} +message ChatMessagePush { DBChat chat = 1; } //申请跨服频道号 -message ChatCrossChannelReq { - -} +message ChatCrossChannelReq {} //申请跨服频道号 回应 -message ChatCrossChannelResp { - int32 channelId = 1; -} +message ChatCrossChannelResp { int32 channelId = 1; } //申请切换频道 -message ChatChanageChannelReq { - int32 channelId = 1; -} +message ChatChanageChannelReq { int32 channelId = 1; } //申请切换频道 回应 message ChatChanageChannelResp { - int32 channelId = 1; - bool isSucc = 2; + int32 channelId = 1; + bool isSucc = 2; } //请求聊天消息 message ChatGetListReq { - ChatChannel channel = 1; //频道 - int32 channelId = 2; //跨服频道id + ChatChannel channel = 1; //频道 + int32 channelId = 2; //跨服频道id } //请求聊天消息 回应 -message ChatGetListResp { - repeated DBChat chats = 1; +message ChatGetListResp { repeated DBChat chats = 1; } + +//跨服请求聊天消息 +message ChatGetCrossListReq { + ChatChannel channel = 1; //频道 + int32 channelId = 2; //跨服频道id } +//跨服请求聊天消息 回应 +message ChatGetCrossListResp { repeated DBChat chats = 1; } + //消息发送请求 message ChatSendReq { - string avatar = 1; //用户头像 - string uname = 2; //用户名 - int32 ulv = 3; //用户等级 - ChatChannel channel = 4; //频道 - string targetId = 5; //目标用户id - string content = 6; //内容 + string avatar = 1; //用户头像 + string uname = 2; //用户名 + int32 ulv = 3; //用户等级 + ChatChannel channel = 4; //频道 + string targetId = 5; //目标用户id + ChatType ctype = 6; //消息类型 + string content = 7; //内容 + int64 appendInt = 8; //@go_tags(`bson:"appendInt"`) 聊天附加数据 + string appendStr = 9; //@go_tags(`bson:"appendStr"`) 聊天附加数据 + string appendBool = 10; //@go_tags(`bson:"appendBool"`) 聊天附加数据 + bytes appendBytes = 11; //@go_tags(`bson:"appendInt"`) 聊天附加数据 } //消息发送请求 回应 message ChatSendResp { - bool issucc = 1; //是否成功 + bool issucc = 1; //是否成功 +} + +//跨服消息发送请求 +message ChatSendCrossReq { + string avatar = 1; //用户头像 + string uname = 2; //用户名 + int32 ulv = 3; //用户等级 + ChatChannel channel = 4; //频道 + string targetId = 5; //目标用户id + ChatType ctype = 6; //消息类型 + string content = 7; //内容 + int64 appendInt = 8; //@go_tags(`bson:"appendInt"`) 聊天附加数据 + string appendStr = 9; //@go_tags(`bson:"appendStr"`) 聊天附加数据 + string appendBool = 10; //@go_tags(`bson:"appendBool"`) 聊天附加数据 + bytes appendBytes = 11; //@go_tags(`bson:"appendInt"`) 聊天附加数据 +} + +//跨服消息发送请求 回应 +message ChatSendCrossResp { + bool issucc = 1; //是否成功 } diff --git a/src/pb/proto/comm.proto b/src/pb/proto/comm.proto index ea69e79..d485d3e 100644 --- a/src/pb/proto/comm.proto +++ b/src/pb/proto/comm.proto @@ -65,6 +65,15 @@ message BroadCastMessageReq { //关闭用户代理 message AgentCloseeReq { string UserSessionId = 1; } +//通知用户登录 +message NoticeUserLoginReq { + string Ip = 1; + string UserSessionId = 2; + string UserId = 3; + string ServiceTag = 4; + string GatewayServiceId = 5; +} + //通知用户离线 message NoticeUserCloseReq { string Ip = 1; @@ -93,4 +102,10 @@ message UserAssets { message TaskParam { int32 first = 1; //限定条件 int32 second = 2; //次数 +} + +message RtaskParam { + int32 param1 = 1; + int32 param2 = 2; + int32 param3 = 3; } \ No newline at end of file diff --git a/src/pb/proto/errorcode.proto b/src/pb/proto/errorcode.proto index 426ca84..40fdab4 100644 --- a/src/pb/proto/errorcode.proto +++ b/src/pb/proto/errorcode.proto @@ -25,21 +25,24 @@ enum ErrorCode { ResNoEnough = 102; //资源不足 ConfigurationException = 103; //配置异常 ConfigNoFound = 104; //配置未找到 + UserLogined = 105; //已在其它终端登录 // user - SecKeyInvalid = 1000; //秘钥无效 - SecKey = 1001; //秘钥格式错误 - BindUser = 1002; //用户绑定错误 - GoldNoEnough = 1003; // 金币不足 - DiamondNoEnough = 1004; // 钻石不足 - RoleCreated = 1005; //已创角 - UserNickNameExist = 1006; //昵称已存在 - VeriCodeNoValid = 1007; //验证码无效 - VeriCodeExpired = 1008; //验证码过期 - UserResetData = 1009; //初始化用户失败 - UserModiNameCount = 1010; //名称修改次数不足 - UserNickNameEmpty = 1011; //昵称空 - UserExpandNull = 1012; //扩展数据空 + SecKeyInvalid = 1000; //秘钥无效 + SecKey = 1001; //秘钥格式错误 + BindUser = 1002; //用户绑定错误 + GoldNoEnough = 1003; // 金币不足 + DiamondNoEnough = 1004; // 钻石不足 + RoleCreated = 1005; //已创角 + UserNickNameExist = 1006; //昵称已存在 + VeriCodeNoValid = 1007; //验证码无效 + VeriCodeExpired = 1008; //验证码过期 + UserResetData = 1009; //初始化用户失败 + UserModiNameCount = 1010; //名称修改次数不足 + UserNickNameEmpty = 1011; //昵称空 + UserExpandNull = 1012; //扩展数据空 + UserExpNoEnough = 1013; //经验不足 + UserFriendNoEnough = 1014; //友情点不足 // friend FriendNotSelf = 1100; //不能是自己 @@ -58,6 +61,7 @@ enum ErrorCode { FriendZanreceived = 1113; //已领取点赞 FriendZanSelf = 1114; //不能给自己点赞 FriendPointLimit = 1115; //友情点上线 + FriendNoreceived = 1116; //未更换助战没有可领取的奖励 // item ItemsNoEnough = 1200; //背包物品不足 @@ -65,6 +69,7 @@ enum ErrorCode { ItemsGridNumUpper = 1202; //背包格子数量已达上限 ItemsGirdAmountUpper = 1203; //背包格子容量已达上限 ItemsUseNotSupported = 1204; //暂不支持使用 + ItemsUseNoCanSell = 1205; //道具不支持出售 // hero HeroNoExist = 1300; //英雄不存在 @@ -97,6 +102,7 @@ enum ErrorCode { EquipmentOnFoundEquipment = 1400; // 未找到武器 EquipmentLvlimitReached = 1401; // 武器等级已达上限 EquipmentIsWorn = 1402; // 武器已经穿戴 + EquipmentNoCanSell = 1403; // 装备不能出售 // mainMainline MainlineNotFindChapter = 1500; // 没有找到主线关卡信息 @@ -134,14 +140,49 @@ enum ErrorCode { MartialhallNotUnlocked = 2000; //没有解锁 MartialhallInUse = 2001; //已经在使用 MartialhallUnlocked = 2002; //已解锁 + MartialhallNoUnlocked = 2003; //有未解锁柱子 + // 美食馆 GourmetMoreOrderTime = 2101; // 超过订单时长 GourmetSkillMaxLv = 2102; // 技能已经达到满级 // rtask - RtaskFinished = 2201; //任务已完成 - RtaskUnFinished = 2202; //任务未完成 - RtaskNoRtask = 2203; //任务未开启 - RtaskRewarded = 2204; //已获取奖励 - RtaskPreNoFinish = 2205; //前置未完成 + RtaskFinished = 2201; //任务已完成 + RtaskUnFinished = 2202; //任务未完成 + RtaskNoRtask = 2203; //任务未开启 + RtaskRewarded = 2204; //已获取奖励 + RtaskPreNoFinish = 2205; //前置未完成 + RtaskCondiNoReach = 2206; //未达到限定条件 + RtaskNoLastOne = 2207; //不是最后一个任务 + RtaskCondiNoFound = 2208; //未找到符合的条件配置 + + // viking + VikingLvErr = 2301; // 关卡难度不匹配 + VikingBoosType = 2302; // BOSS 类型不对 + VikingBuyMaxCount = 2303; // 购买达到最大次数 + VikingMaxChallengeCount = 2304; // 挑战达到最大次数 + + // moonfantasy 月之秘境 + MoonfantasyHasExpired = 2401; // boos 连接已失效 + MoonfantasyJoinUp = 2402; // boos 参与人数已达上限 + MoonfantasyDareUp = 2403; // boos 挑战次数已达上限 + MoonfantasyBattleNoEnd = 2404; // boos 战斗未结束 + MoonfantasyBattleNoWin = 2405; // boos 战斗魏未胜利 + MoonfantasyNoJoin = 2406; // boos 未加入战斗序列 + MoonfantasyNotEnoughbattles = 2407; // boos 挑战次数不足 + + BattleNoFoundRecord = 2501; // 未找到记录 + + LinestoryTaskFinished = 2601; //任务已完成 + LinestorySubTaskFinished = 2602; //子任务已完成 + LinestoryTaskDisabledEnter = 2603; //禁止进入 + LinestoryPreTaskNoFinished = 2604; //前置任务未完成 + + // hunting + HuntingLvErr = 2701; // 关卡难度不匹配 + HuntingBoosType = 2702; // BOSS 类型不对 + HuntingBuyMaxCount = 2703; // 购买达到最大次数 + HuntingMaxChallengeCount = 2704; // 挑战达到最大次数 + // library + LibraryMaxLv = 2801; // 达到最大等级 } \ No newline at end of file diff --git a/src/pb/proto/forum_msg.proto b/src/pb/proto/forum_msg.proto index b7a5d63..13e7929 100644 --- a/src/pb/proto/forum_msg.proto +++ b/src/pb/proto/forum_msg.proto @@ -3,46 +3,53 @@ option go_package = ".;pb"; import "forum_db.proto"; import "hero_db.proto"; + //获取评论列表 message ForumGetListReq { - string herocid = 1; //英雄配置id + string herocid = 1; //英雄配置id } //获取评论回应 -message ForumGetListResp { repeated DBComment comment = 1; } +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; //评论内容 + string avatar = 1; //用户头像 + string uname = 2; //用户名 + string herocid = 3; //英雄的配置id + string herooid = 4; //英雄的实例id + string content = 5; //评论内容 } //发布评论回应 -message ForumReleaseCommentResp { DBComment comment = 1; } +message ForumReleaseCommentResp { + DBComment comment = 1; +} //查看英雄信息请求 message ForumWatchHeroReq { - string uid = 1; //用户id - string stag = 2; //区服id - string herocId = 3; //用户cid - string herooId = 4; //英雄实例id + string uid = 1; //用户id + string stag = 2; //区服id + string herocId = 3; //用户cid + string herooId = 4; //英雄实例id } //查看英雄信息回应 -message ForumWatchHeroResp { DBHero hero = 1; } +message ForumWatchHeroResp { + DBHero hero = 1; +} //请求点赞 请求 message ForumLikeReq { - string herocid = 1; //英雄配置id - string cid = 2; //评论id - bool islike = 3; //是否点赞 + string herocid = 1; //英雄配置id + string cid = 2; //评论id + bool islike = 3; //是否点赞 } //请求点赞 回应 message ForumLikeResp { - string cid = 1; //评论id - bool islike = 2; //是否点赞 - bool issucc = 3; //成功失败 + string cid = 1; //评论id + bool islike = 2; //是否点赞 + bool issucc = 3; //成功失败 } \ No newline at end of file diff --git a/src/pb/proto/friend_db.proto b/src/pb/proto/friend_db.proto index 01c1677..9eb0e3d 100644 --- a/src/pb/proto/friend_db.proto +++ b/src/pb/proto/friend_db.proto @@ -9,4 +9,6 @@ message DBFriend { 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 + int32 received = 8; //@go_tags(`bson:"received"`) 领取奖励状态0未领1可领2已领 + int64 updateTime = 9; //@go_tags(`bson:"updateTime"`) 更新时间 } \ No newline at end of file diff --git a/src/pb/proto/friend_msg.proto b/src/pb/proto/friend_msg.proto index 0c11771..9ec9858 100644 --- a/src/pb/proto/friend_msg.proto +++ b/src/pb/proto/friend_msg.proto @@ -7,20 +7,18 @@ message FriendBase { int32 level = 3; //等级 string avatar = 4; //头像 int64 strength = 5; //战力 - int32 serverId = 6; //服务编号 + string serverId = 6; //服务编号 int64 offlineTime = 7; //最近一次下线时间 0在线 bool isApplied = 8; //是否已申请加好友 bool isZaned = 9; //是否已点赞 bool isGetZaned = 10; //是否已获赞 + string heroObjId = 11; //助战英雄ID } //好友列表 message FriendListReq {} -message FriendListResp { - repeated FriendBase list = 1; - string heroObjId = 2; -} +message FriendListResp { repeated FriendBase list = 1; } // 随机的在线玩家 message FriendRandlistReq {} @@ -117,4 +115,18 @@ message FriendZanreceiveResp { bool flag = 1; } // 设置助战英雄 message FriendAssistheroReq { string heroObjId = 1; } -message FriendAssistheroResp { string heroObjId = 1; } \ No newline at end of file +message FriendAssistheroResp { + string heroObjId = 1; + int32 received = 2; //领取奖励状态0未领1可领2已领 +} + +//助战列表 +message FriendAssistlistReq {} +message FriendAssistlistResp { + repeated FriendBase list = 1; + string heroObjId = 2; +} + +// 助战奖励 +message FriendGetrewardReq {} +message FriendGetrewardResp { int32 received = 1; } \ No newline at end of file diff --git a/src/pb/proto/gourmet_db.proto b/src/pb/proto/gourmet_db.proto index dadaebc..3166213 100644 --- a/src/pb/proto/gourmet_db.proto +++ b/src/pb/proto/gourmet_db.proto @@ -6,6 +6,7 @@ import "comm.proto"; message Cooking{ int32 foodType = 1; // 料理类型 int64 eTime = 2; // 结束时间戳 + int64 sTime = 3; // 开始时间戳 } // 队列里的烹饪食品 @@ -15,12 +16,12 @@ message OrderCook{ 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 skill = 6;//@go_tags(`bson:"skill"`) 技能ID + string id = 1; //@go_tags(`bson:"_id"`) ID + string uid = 2; //@go_tags(`bson:"uid"`) 用户ID + Cooking cookingFood = 3; //@go_tags(`bson:"cooking"`) 正在烹饪的食品 + repeated OrderCook foods = 4; //@go_tags(`bson:"foods"`) 等待烹饪的食品 + repeated UserAssets items = 5; //@go_tags(`bson:"items"`) 已经做好的食品 + map skill = 6; //@go_tags(`bson:"skill"`) 技能ID map specialSkill = 7; //@go_tags(`bson:"specialSkill"`) 通用技能 int32 orderCostTime = 8; //@go_tags(`bson:"orderCostTime"`) 订单消耗的时常 int64 ctime = 9; // 订单创建时间 diff --git a/src/pb/proto/hero_db.proto b/src/pb/proto/hero_db.proto index 4d1f7ea..1f61bc5 100644 --- a/src/pb/proto/hero_db.proto +++ b/src/pb/proto/hero_db.proto @@ -6,10 +6,15 @@ message SkillData { int32 skillLv = 2; } +enum HeroType { + HeroTypeNil = 0; + HeroTypeKongFu = 1; +} + message DBHero { string id = 1; //@go_tags(`bson:"_id"`) ID string uid = 2; - string heroID = 3; //@go_tags(`bson:"heroID"`) 英雄的配置表ID + string heroID = 3; //@go_tags(`bson:"heroID"`) 英雄的配置表ID int32 star = 4; // 英雄星级 int32 lv = 5; // 英雄等级 int32 exp = 6; // 英雄经验 @@ -17,38 +22,39 @@ message DBHero { int32 captainSkill = 8; //@go_tags(`bson:"captainSkill"`) 队长技能 repeated SkillData normalSkill = 9; //@go_tags(`bson:"normalSkill"`) 普通技能 map property = 10; // 属性相关 - map addProperty = - 11; //@go_tags(`bson:"addProperty"`) 附加属性相关 - int32 cardType = - 12; //@go_tags(`bson:"cardType"`) 卡片类型(升星卡、经验卡、技能升级卡) + map addProperty = 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"`) 分配的共鸣能量 - map energy = - 19; // @go_tags(`bson:"energy"`)能量分配到哪里[hppro:0,atkpro:0,defpro:20] + int32 distributionResonate = 18; //@go_tags(`bson:"distributionResonate"`) 分配的共鸣能量 + map 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 energyProperty = 24; //@go_tags(`bson:"energyProperty"`) - map juexProperty = 25; //@go_tags(`bson:"juexProperty"`) //hp + map energyProperty = 24; //@go_tags(`bson:"energyProperty"`) + map juexProperty = 25; //@go_tags(`bson:"juexProperty"`) //hp + HeroType status = 26; //@go_tags(`bson:"status"`) 状态 (1 练功) + int32 suite1Star = 27; //@go_tags(`bson:"suite1Star"`) + int32 suite2Star = 28; //@go_tags(`bson:"suite2Star"`) + int32 suite1Lv = 29; //@go_tags(`bson:"suite1Lv"`) + int32 suite2Lv = 30; //@go_tags(`bson:"suite2Lv"`) } -message Floor { // 记录阵型保底数据 - int32 h4 = 1; // 4星次数 - int32 h5 = 2; // 5星次数 +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 - int32 star4 = 3; // 4星保底 - int32 star5 = 4; // 5星保底 - int64 mtime = 5; // 修改时间 - int32 drawcount = 6; // 普通卡牌累计抽取次数 + string id = 1; //@go_tags(`bson:"_id"`) ID 主键id + string uid = 2; //@go_tags(`bson:"uid"`) 用户ID + int32 star4 = 3; // 4星保底 + int32 star5 = 4; // 5星保底 + int64 mtime = 5; // 修改时间 + int32 drawcount = 6; // 普通卡牌累计抽取次数 } \ No newline at end of file diff --git a/src/pb/proto/hero_msg.proto b/src/pb/proto/hero_msg.proto index 3e3df22..7ed53b1 100644 --- a/src/pb/proto/hero_msg.proto +++ b/src/pb/proto/hero_msg.proto @@ -111,10 +111,6 @@ message HeroAwakenResp { DBHero hero = 1; // 英雄对象 } -//抽卡 -message HeroChoukaReq { repeated string heroIds = 1; } - -message HeroChoukaResp { repeated DBHero heroes = 1; } //英雄属性推送 message HeroPropertyPush { @@ -156,4 +152,13 @@ message HeroDrawCardResp { // 英雄变化推送 message HeroChangePush{ repeated DBHero list = 1; -} \ No newline at end of file +} + +message HeroDrawCardFloorReq { +} +// 获取抽卡保底次数 +message HeroDrawCardFloorResp { + int32 star4 = 1; + int32 star5 = 2; +} + diff --git a/src/pb/proto/hunting_db.proto b/src/pb/proto/hunting_db.proto index d7b2cb5..0de1e4b 100644 --- a/src/pb/proto/hunting_db.proto +++ b/src/pb/proto/hunting_db.proto @@ -6,10 +6,10 @@ message DBHunting { string id = 1; //@go_tags(`bson:"_id"`) ID string uid = 2; //@go_tags(`bson:"uid"`) 用户ID int32 challengeCount = 3; //@go_tags(`bson:"challengeCount"`) 挑战次数 - map boos = 4; // key boos 类型 value 难度 + map boss = 4; // key boss 类型 value 难度 int32 buyCount = 5;//@go_tags(`bson:"buyCount"`) 购买次数 int64 cTime = 6; //@go_tags(`bson:"cTime"`) 修改时间 - map challengeTime = 7; //@go_tags(`bson:"challengeTime"`) 每个难度通关时间 + map bossTime = 7; //@go_tags(`bson:"bossTime"`) } // 狩猎排行榜 diff --git a/src/pb/proto/hunting_msg.proto b/src/pb/proto/hunting_msg.proto index 07dac8e..e52e61f 100644 --- a/src/pb/proto/hunting_msg.proto +++ b/src/pb/proto/hunting_msg.proto @@ -1,29 +1,55 @@ syntax = "proto3"; option go_package = ".;pb"; import "hunting_db.proto"; +import "battle_msg.proto"; +message HuntingGetListReq { -message HuntingGetListReq {} +} -message HuntingGetListResp { DBHunting data = 1; } +message HuntingGetListResp { + DBHunting data = 1; +} // 挑战 message HuntingChallengeReq { - int32 bossType = 1; // boos 类型 - int32 difficulty = 2; // 难度 + int32 bossType = 1; // boos 类型 + int32 difficulty = 2; // 难度 + int32 leadpos = 3; //队长位置 + repeated string teamids = 4; //阵容信息 } -message HuntingChallengeResp { DBHunting data = 1; } +message HuntingChallengeResp { + BattleInfo info = 1; + int32 bossType = 2; // boos 类型 + int32 difficulty = 3; // 难度 +} + +message HuntingChallengeOverReq { + int32 bossType = 1; // boos 类型 + int32 difficulty = 2; // 难度 + BattleReport report = 3; //战报 +} + +// 客户端通知服务器打赢了 +message HuntingChallengeOverResp { + DBHunting data = 1; +} // 购买 message HuntingBuyReq { - int32 count = 1; // 购买次数 + int32 count = 1;// 购买次数 } -message HuntingBuyResp { DBHunting data = 1; } +message HuntingBuyResp { + DBHunting data = 1; +} // 排行榜 -message HuntingRankListReq {} +message HuntingRankListReq{ + int32 boosType = 1; // boss 类型 + bool friend = 2; // 是否是好友榜 +} -message HuntingRankListResp { - repeated DBHuntingRank ranks = 1; // 排行数据 有序的 注意boss类型 +message HuntingRankListResp{ + repeated DBHuntingRank ranks = 1; // 排行数据 有序的 注意boss类型 } \ No newline at end of file diff --git a/src/pb/proto/library_db.proto b/src/pb/proto/library_db.proto new file mode 100644 index 0000000..e225b97 --- /dev/null +++ b/src/pb/proto/library_db.proto @@ -0,0 +1,24 @@ +syntax = "proto3"; +option go_package = ".;pb"; + +message DBLibrary { + string id = 1; //@go_tags(`bson:"_id"`) ID + string uid = 2; //@go_tags(`bson:"uid"`) 用户ID + int32 fid = 3; // 配置表id 羁绊id + map hero = 4; // key: hid value: favorlv + map prize = 5; //是否领奖 key 好感度等级 + int32 fetterlv = 6; // 当前羁绊等级 + int32 storyid = 7; // 故事id 用来判断是否领奖 + bool activation = 8; // 是否激活 +} + +// 羁绊英雄数据 +message DBHeroFetter{ + string id = 1; //@go_tags(`bson:"_id"`) ID + string uid = 2; //@go_tags(`bson:"uid"`) 用户ID + string heroid = 3; // 英雄配置表id + repeated int32 history = 4; // 传记往事ID + int32 favorlv = 5; // 好感度等级 + int32 favorexp = 6; // 好感度经验 + int32 stroyprize = 7; // 剧情奖励 +} \ No newline at end of file diff --git a/src/pb/proto/library_msg.proto b/src/pb/proto/library_msg.proto new file mode 100644 index 0000000..b74a846 --- /dev/null +++ b/src/pb/proto/library_msg.proto @@ -0,0 +1,49 @@ +syntax = "proto3"; +option go_package = ".;pb"; +import "library_db.proto"; + +// 获取羁绊信息 +message LibraryGetListReq { + +} + +message LibraryGetListResp { + repeated DBLibrary data = 1; +} +// 获取英雄详细羁绊数据 +message LibraryGetFetterListReq { + +} + +message LibraryGetFetterListResp { + repeated DBHeroFetter data = 1; +} + +// 领取奖励 +message LibraryGetRewardReq { + string objId = 1; +} + +message LibraryGetRewardResp { + DBLibrary data = 1; +} +// 领取剧情奖励 +message LibraryGetStoryRewardReq { + string hid = 1; // 英雄ID + int32 history = 2; // 传记往事id + int32 rightend = 3; // 对应配置表 rightend +} + +message LibraryGetStoryRewardResp { + DBLibrary data = 1; +} + +// 给英雄赠送礼物 +message LibraryUseGiftReq{ + string heroid = 1; // 英雄id + map items = 2; // key 道具ID value 数量 +} + +message LibraryUseGiftResp{ + DBHeroFetter data = 1; +} \ No newline at end of file diff --git a/src/pb/proto/linestory_db.proto b/src/pb/proto/linestory_db.proto new file mode 100644 index 0000000..c9297f7 --- /dev/null +++ b/src/pb/proto/linestory_db.proto @@ -0,0 +1,15 @@ +syntax = "proto3"; +option go_package = ".;pb"; + +message TaskNode { + int32 status = 1; //@go_tags(`bson:"status"`) 状态 0未做 + // 1进行中(子任务没有全部完成) 2已做 3禁止进入 + repeated int32 subtaskIds = 2; //@go_tags(`bson:"subtasks"`) 子任务 +} + +message DBLinestory { + string id = 1; //@go_tags(`bson:"_id"`) ID + string uid = 2; //@go_tags(`bson:"uid"`) 用户ID + int32 jqId = 3; //@go_tags(`bson:"jqId"`) 剧情ID + map tasks = 4; //@go_tags(`bson:"tasks"`) 任务 +} \ No newline at end of file diff --git a/src/pb/proto/linestory_msg.proto b/src/pb/proto/linestory_msg.proto new file mode 100644 index 0000000..9d3a05a --- /dev/null +++ b/src/pb/proto/linestory_msg.proto @@ -0,0 +1,23 @@ +syntax = "proto3"; +option go_package = ".;pb"; + +// 剧情开始 +message LinestoryStartReq { + int32 jqId = 1; //剧情ID +} +message LinestoryStartResp { + int32 jqId = 1; + repeated int32 taskIds = 2; //已完成的任务ID +} + +// 做任务 +message LinestoryDotaskReq { + int32 taskId = 1; //任务ID + int32 subtaskId = 2; //子任务ID +} + +message LinestoryDotaskResp { + int32 taskId = 1; //任务ID + int32 subtaskId = 2; //子任务ID + int32 resetTaskId = 3; //重置任务起始ID +} diff --git a/src/pb/proto/mainline_db.proto b/src/pb/proto/mainline_db.proto index b1e972b..0c53b83 100644 --- a/src/pb/proto/mainline_db.proto +++ b/src/pb/proto/mainline_db.proto @@ -1,12 +1,17 @@ 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 - int32 awaredID = 5; //@go_tags(`bson:"awaredID"`) 是否领奖(设置int是考虑后续扩展有多个宝箱情况) - repeated int32 branchID = 6; // @go_tags(`bson:"branchID"`) 记录分支通关的情况 + AwaredType awaredID = 5; //@go_tags(`bson:"awaredID"`) 是否领奖(设置int是考虑后续扩展有多个宝箱情况) + repeated int32 branchID = 6; // @go_tags(`bson:"branchID"`) 记录所有通关的关卡数据 int32 intensity = 7; // 难度 } \ No newline at end of file diff --git a/src/pb/proto/mainline_msg.proto b/src/pb/proto/mainline_msg.proto index 563abab..e5fe2c5 100644 --- a/src/pb/proto/mainline_msg.proto +++ b/src/pb/proto/mainline_msg.proto @@ -3,39 +3,49 @@ option go_package = ".;pb"; import "mainline_db.proto"; import "battle_msg.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 - int32 leadpos = 3; //队长位置 - repeated string teamids = 4; //阵容信息 + string chapterObj = 1; // 章节唯一对象id + uint32 mainlineId = 2; // 小关ID + int32 leadpos = 3; //队长位置 + repeated string teamids = 4; //阵容信息 } -message MainlineChallengeResp { BattleInfo info = 1; } +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; //战报 + string chapterObj = 1; // 章节唯一对象id + uint32 mainlineId = 2; // 小关ID + BattleReport report = 3; //战报 } message MainlineChallengeOverResp { - 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/martialhall_db.proto b/src/pb/proto/martialhall_db.proto index f09dcaa..6900135 100644 --- a/src/pb/proto/martialhall_db.proto +++ b/src/pb/proto/martialhall_db.proto @@ -9,13 +9,14 @@ enum PillarState { ///练功柱子 message DBPillar { - bool isunlock = 1; //是否解锁 - PillarState state = 2; //状态 - string hero = 3; //当前练功英雄 - int64 start = 4; //开始时间 - int64 end = 5; //结束时间 - int64 lastbill = 6; //上次结账时间 - int32 reward = 7; //奖励 + int32 index = 1; //柱子下标 + bool isunlock = 2; //是否解锁 + PillarState state = 3; //状态 + string hero = 4; //当前练功英雄 + int64 start = 5; //开始时间 + int64 end = 6; //结束时间 + int64 lastbill = 7; //上次结账时间 + int32 reward = 8; //奖励 } //练功房 diff --git a/src/pb/proto/martialhall_msg.proto b/src/pb/proto/martialhall_msg.proto index e714450..8996882 100644 --- a/src/pb/proto/martialhall_msg.proto +++ b/src/pb/proto/martialhall_msg.proto @@ -10,12 +10,12 @@ message MartialhallInfoResp { DBMartialhall info = 1; } message MartialhallPracticeReq { int32 pillar = 1; //柱子 string hero = 2; //英雄 + int32 time = 3; //修炼时长 } ///练功请求 回应 message MartialhallPracticeResp { - int32 pillar = 1; //柱子 - string hero = 2; //英雄 - bool issucc = 3; //是否成功 + bool issucc = 1; //是否成功 + DBMartialhall info = 2; } ///领取 请求 @@ -27,4 +27,17 @@ message MartialhallReceiveResp {} message MartialhallUpgradeReq {} ///升级 请求回应 -message MartialhallUpgradeResp { DBMartialhall info = 1; } \ No newline at end of file +message MartialhallUpgradeResp { + bool issucc = 1; + DBMartialhall info = 2; +} + +///解锁 请求 +message MartialhallUnLockReq { + int32 pillar = 1; //柱子 +} +///解锁 请求 回应 +message MartialhallUnLockResp { + bool issucc = 1; + DBMartialhall info = 2; +} \ No newline at end of file diff --git a/src/pb/proto/moonfantasy_db.proto b/src/pb/proto/moonfantasy_db.proto index d03fcd9..127c1d6 100644 --- a/src/pb/proto/moonfantasy_db.proto +++ b/src/pb/proto/moonfantasy_db.proto @@ -1,13 +1,31 @@ syntax = "proto3"; option go_package = ".;pb"; -message DBMoonfantasy { +message UserInfo { + string uid = 1; //用户id + string name = 2; //昵称 + string avatar = 12; // 头像 +} + +//月之秘境 +message DBMoonFantasy { string id = 1; //@go_tags(`bson:"_id"`) ID string uid = 2; //用户id - string monster = 3; //英雄id + string monster = 3; //怪物id int64 ctime = 4; //创建时间 - int32 joinnum = 5; //参与人数 + repeated UserInfo join = 5; //参与人数 int32 numup = 6; //人数上限 int32 unitmup = 7; //单人可挑战次数 map record = 8; //挑战记录 +} + +//用户参与的月之秘境列表 +message DBUserMFantasy { + string id = 1; //@go_tags(`bson:"_id"`) ID + string uid = 2; //用户id + repeated string mfantasys = 3; //月之秘境列表 + int32 triggerNum = 4; //@go_tags(`bson:"triggerNum"`) 月之秘境触发次数 + int32 battleNum = 5; //@go_tags(`bson:"battleNum"`) 月之秘境挑战次数 + int32 buyNum = 6; //@go_tags(`bson:"buyNum"`) 月之秘境挑战次数 + int64 lastTrigger = 7; //@go_tags(`bson:"lastTrigger"`) 月之秘境最后触发时间 } \ No newline at end of file diff --git a/src/pb/proto/moonfantasy_msg.proto b/src/pb/proto/moonfantasy_msg.proto index 06a10e2..92a7902 100644 --- a/src/pb/proto/moonfantasy_msg.proto +++ b/src/pb/proto/moonfantasy_msg.proto @@ -1,54 +1,70 @@ syntax = "proto3"; option go_package = ".;pb"; import "errorcode.proto"; +import "moonfantasy_db.proto"; import "battle_msg.proto"; -///触发秘境 -message MoonfantasyTriggerReq { - string avatar = 1; //用户头像 - string uname = 2; //用户名 - int32 ulv = 3; //用户等级 +//获取装备列表请求 +message MoonfantasyGetListReq {} +//获取装备列表请求 回应 +message MoonfantasyGetListResp { + int32 battleNum = 1; + repeated DBMoonFantasy dfantasys = 2; //秘境列表 } +// ///触发秘境 +// message MoonfantasyTriggerReq { +// string avatar = 1; //用户头像 +// string uname = 2; //用户名 +// int32 ulv = 3; //用户等级 +// } + ///触发秘境 -message MoonfantasyTriggerResp { +message MoonfantasyTriggerPush { bool issucc = 1; //是否成功 string mid = 2; //唯一id //挑战时需要传递的数据 string monster = 3; //怪物id } -///挑战秘境 +///询问秘境 message MoonfantasyAskReq { - string uid = 1; //发布者用户id - string mid = 2; //唯一id + string mid = 1; //唯一id } message MoonfantasyAskResp { - ErrorCode code = 1; //是否成功 + ErrorCode code = 1; //是否成功 + DBMoonFantasy info = 2; //秘境信息 可能为空 } ///挑战秘境 message MoonfantasyBattleReq { - string uid = 1; //发布者用户id - string mid = 2; //唯一id - int32 leadpos = 3; //队长位置 - repeated string teamids = 4; //阵容信息 + string mid = 1; //唯一id + int32 leadpos = 2; //队长位置 + repeated string teamids = 3; //阵容信息 } message MoonfantasyBattleResp { ErrorCode code = 1; //是否成功 - string monster = 2; //怪物id + string mid = 2; //怪物id BattleInfo info = 3; } ///领取战斗奖励 message MoonfantasyReceiveReq { string bid = 2; //战斗id 后续需要这个id来领取奖励 - string monster = 3; //怪物id + string mid = 3; //怪物id BattleReport report = 4; //战报 } ///领取战斗奖励 message MoonfantasyReceiveResp { bool issucc = 1; //是否成功 +} + +///购买挑战次数 +message MoonfantasyBuyReq { int32 BuyNum = 1; } +///购买挑战次数 回应 +message MoonfantasyBuyResp { + bool issucc = 1; //是否成功 + int32 BattleNum = 2; //当前挑战次数 } \ No newline at end of file diff --git a/src/pb/proto/pagoda_db.proto b/src/pb/proto/pagoda_db.proto index 1a329ed..42b825b 100644 --- a/src/pb/proto/pagoda_db.proto +++ b/src/pb/proto/pagoda_db.proto @@ -1,9 +1,34 @@ syntax = "proto3"; option go_package = ".;pb"; - +import "battle_msg.proto"; +//普通塔 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 reward = 4; // 是否领奖 + int32 type = 5; +} + +// 赛季塔 赛季结束会清理 +message DBSeasonPagoda { + string id = 1; //@go_tags(`bson:"_id"`) ID + string uid = 2; //@go_tags(`bson:"uid"`) 用户ID + int32 pagodaId = 3; //@go_tags(`bson:"pagodaId"`) 塔层 + map reward = 4; // 是否领奖 + int32 type = 5; +} + +// 爬塔数据明细 +message DBPagodaRecord { + string id = 1; //@go_tags(`bson:"_id"`) ID + string uid = 2; //@go_tags(`bson:"uid"`) 用户ID + int32 pagodaId = 3; //@go_tags(`bson:"pagodaId"`) 塔层 + int32 type = 4; // 塔类型 + string nickname = 5;// 昵称 + string icon = 6; // 头像 + int32 lv = 7; // 等级 + int32 leadpos = 8; //队长位置 + repeated LineUp line = 9; // 阵容数据 + int32 costTime = 10; //@go_tags(`bson:"costTime"`) 闯关耗时 单位s } \ No newline at end of file diff --git a/src/pb/proto/pagoda_msg.proto b/src/pb/proto/pagoda_msg.proto index e17f098..af6401b 100644 --- a/src/pb/proto/pagoda_msg.proto +++ b/src/pb/proto/pagoda_msg.proto @@ -1,22 +1,65 @@ syntax = "proto3"; option go_package = ".;pb"; import "pagoda_db.proto"; - +import "battle_msg.proto"; // 查询塔进度 -message PagodaGetListReq {} +message PagodaGetListReq { + +} // 返回进度信息 -message PagodaGetListResp { DBPagoda data = 1; } +message PagodaGetListResp { + DBPagoda data = 1; +} // 领取关卡宝箱 message PagodaGetRewardReq { - int32 id = 1; // 对应 task_reward 表中的id + int32 id = 1; // 对应 task_reward 表中的id } -message PagodaGetRewardResp { DBPagoda data = 1; } +message PagodaGetRewardResp { + DBPagoda data = 1; +} -// 挑战 message PagodaChallengeReq { - int32 levelID = 1; // 挑战的关卡ID + int32 levelID = 1; // 挑战层数 + int32 PagodaType = 2; // 塔类型 + + int32 leadpos = 3; //队长位置 + repeated string teamids = 4; //阵容信息 } -message PagodaChallengeResp { DBPagoda data = 1; } +message PagodaChallengeResp { + BattleInfo info = 1; + int32 levelID = 2; // 挑战层数 + int32 PagodaType = 3; // 塔类型 +} + +// 客户端通知服务器打赢了 +message PagodaChallengeOverReq { + int32 levelID = 1; // 挑战层数 + int32 PagodaType = 2; // 塔类型 + BattleReport report = 3; //战报 +} + +message PagodaChallengeOverResp { + DBPagoda data = 1; +} + +// 排行榜 +message PagodaRankListReq{ + int32 floorId = 1; // 层数 0 标识总榜 + bool friend = 2; // true 好友榜 +} + +message PagodaRankListResp{ + repeated DBPagodaRecord ranks = 1; +} + +// 查询玩家最佳通关记录数据 +message PagodaQueryRecordReq{ + +} + +message PagodaQueryRecordResp{ + DBPagodaRecord data = 1; +} \ No newline at end of file diff --git a/src/pb/proto/protoc.exe b/src/pb/proto/protoc.exe deleted file mode 100644 index bfeb457..0000000 Binary files a/src/pb/proto/protoc.exe and /dev/null differ diff --git a/src/pb/proto/rtask_db.proto b/src/pb/proto/rtask_db.proto new file mode 100644 index 0000000..c058a07 --- /dev/null +++ b/src/pb/proto/rtask_db.proto @@ -0,0 +1,26 @@ +syntax = "proto3"; +option go_package = ".;pb"; + +message frtaskIds { repeated int32 rtaskIds = 1; } + +// 玩家任务状态 +message DBRtask { + string id = 1; //@go_tags(`bson:"_id"`) ID + string uid = 2; //@go_tags(`bson:"uid"`) 用户ID + map frtaskIds = + 3; //@go_tags(`bson:"frtaskIds"`) 已完成的任务Id + int32 nextRtaskId = 4; //@go_tags(`bson:"nextRtaskId"`) 下个任务Id + bool isReward = 5; //@go_tags(`bson:"isReward"`) 接收奖励 +} + +message rtaskData { + map data = 1; //@go_tags(`bson:"data"`) 当前任务值 + int32 rtype = 2; //@go_tags(`bson:"rtype"`) 任务类型 + int64 timestamp = 3; //@go_tasg(`bson:"timestamp"`) 时间戳 +} +// 玩家任务记录 +message DBRtaskRecord { + string id = 1; //@go_tags(`bson:"_id"`) ID + string uid = 2; //@go_tags(`bson:"uid"`) 用户ID + map vals = 3; //@go_tags(`bson:"vals"`) 任务记录值 +} \ No newline at end of file diff --git a/src/pb/proto/rtask_msg.proto b/src/pb/proto/rtask_msg.proto new file mode 100644 index 0000000..f4b097f --- /dev/null +++ b/src/pb/proto/rtask_msg.proto @@ -0,0 +1,96 @@ +syntax = "proto3"; +option go_package = ".;pb"; + +import "battle_msg.proto"; +import "rtask_db.proto"; + +// 申请做任务 +message RtaskApplyReq { + int32 rtaskId = 1; //任务ID + int32 rtaskSubId = 2; //支线任务ID +} + +message RtaskApplyResp { int32 rtaskId = 1; } + +// 任务列表 +message RtasklistReq { + int32 groupId = 1; //分组ID +} +message RtasklistResp { + repeated int32 rtaskIds = 1; + int32 groupId = 2; +} + +// 对话选项 +message RtaskChooseReq { + int32 rtaskId = 1; //任务ID + int32 chooseId = 2; //选项配置ID + int32 rtaskSubId = 3; //支线任务ID +} + +message RtaskChooseResp { + int32 rtaskId = 1; //任务ID + int32 chooseId = 2; //选项配置ID + int32 rtaskSubId = 3; //支线任务ID +} + +// 任务完成推送 +message RtaskFinishPush { int32 rtaskId = 1; } + +// 当前完成的任务列表推送 +message RtaskFinishIdsPush { + repeated int32 rtaskId = 1; + int32 groupId = 2; +} + +// 领奖 +message RtaskGetRewardReq { + int32 rtaskId = 1; + int32 rtaskSubId = 2; //支线任务ID +} +message RtaskGetRewardResp { + int32 rtaskId = 1; + int32 rtaskSubId = 2; //支线任务ID +} + +// 开始战斗 +message RtaskBattleStartReq { + int32 battleConfId = 1; //战斗配表ID + int32 leadpos = 3; //队长位置 + repeated string teamids = 4; //阵容信息 +} + +message RtaskBattleStartResp { + BattleInfo info = 1; //战斗信息 +} + +// 战斗完成 +message RtaskBattleFinishReq { + int32 rtaskId = 1; //任务ID + int32 rtaskSubId = 2; //支线任务ID + int32 chooseId = 3; //选项配置ID +} + +message RtaskBattleFinishResp { + int32 rtaskId = 1; //任务ID + int32 rtaskSubId = 2; //支线任务ID +} + +//获取玩家任务记录 +message RtaskGetrecordReq {} + +message RtaskGetrecordResp { DBRtaskRecord record = 1; } + +// 测试使用 +message RtaskTestReq { + int32 rtaskType = 1; //任务类型 + repeated int32 params = 2; //参数 + int32 condiId = 3; //条件ID + int32 groupId = 4; //分组编号 + string rtaskIds = 5; //已完成的任务ids +} + +message RtaskTestResp { + bool flag = 1; + repeated int32 rtaskIds = 2; +} \ No newline at end of file diff --git a/src/pb/proto/shop_msg.proto b/src/pb/proto/shop_msg.proto index d4cd340..c7ad768 100644 --- a/src/pb/proto/shop_msg.proto +++ b/src/pb/proto/shop_msg.proto @@ -1,6 +1,6 @@ syntax = "proto3"; option go_package = ".;pb"; -import "shop/shop_db.proto"; +import "shop_db.proto"; import "comm.proto"; diff --git a/src/pb/proto/smithy_db.proto b/src/pb/proto/smithy_db.proto index 05e7fd4..6d274cc 100644 --- a/src/pb/proto/smithy_db.proto +++ b/src/pb/proto/smithy_db.proto @@ -6,6 +6,8 @@ import "comm.proto"; message Clang{ int32 deskType = 1; // 台子类型 int64 eTime = 2; + int64 sTime = 3; // 订单开始时间 + } // 队列里的烹饪食品 @@ -24,6 +26,6 @@ message DBSmithy { int32 stoveLv = 7; //@go_tags(`bson:"stoveLv"`) 炉子等级 int32 orderCostTime = 8; //@go_tags(`bson:"orderCostTime"`) 订单消耗的时常 int64 ctime = 9; // 订单创建时间 - int32 deskFloor = 10;//@go_tags(`bson:"deskFloor"`)台子保底 + map deskFloor = 10;//@go_tags(`bson:"deskFloor"`)台子保底 int32 stoveFloor = 11;//@go_tags(`bson:"stoveFloor"`) 炉子保底 } \ No newline at end of file diff --git a/src/pb/proto/smithy_msg.proto b/src/pb/proto/smithy_msg.proto index 75ffbbf..9094a6a 100644 --- a/src/pb/proto/smithy_msg.proto +++ b/src/pb/proto/smithy_msg.proto @@ -29,10 +29,27 @@ message SmithyGetRewardResp{ } // 技能升级 -message SmithySkillLvReq{ - int32 skillType = 1; // 技能id +message SmithyDeskSkillLvReq{ + int32 deskType = 1; // 台子类型 } -message SmithySkillLvResp{ +message SmithyDeskSkillLvResp{ DBSmithy data = 1; +} + +// 炉子技能升级 +message SmithyStoveSkillLvReq{ + +} + +message SmithyStoveSkillLvResp{ + DBSmithy data = 1; +} + +message SmithyGetRandUserReq{ + +} + +message SmithyGetRandUserResp{ + repeated string user = 1; } \ No newline at end of file diff --git a/src/pb/proto/sys_msg.proto b/src/pb/proto/sys_msg.proto new file mode 100644 index 0000000..e99df98 --- /dev/null +++ b/src/pb/proto/sys_msg.proto @@ -0,0 +1,8 @@ +syntax = "proto3"; +option go_package = ".;pb"; + +message SysFuncListReq {} + +message SysFuncListResp { + repeated string funcIds = 1; //功能ID +} \ No newline at end of file diff --git a/src/pb/proto/user_db.proto b/src/pb/proto/user_db.proto index a383e41..d38115a 100644 --- a/src/pb/proto/user_db.proto +++ b/src/pb/proto/user_db.proto @@ -2,11 +2,12 @@ syntax = "proto3"; option go_package = ".;pb"; message CacheUser { - string uid = 1; //@go_tags(`json:"uid"`) 用户id - string SessionId = 2; //@go_tags(`json:"sessionId"`) 会话id - string ServiceTag = 3; //@go_tags(`json:"serviceTag"`) 所在服务集群 区服id - string GatewayServiceId = 4; //@go_tags(`json:"gatewayServiceId"`) 所在网关服务id - string ip = 5; //@go_tags(`json:"ip"`) 远程ip + string uid = 1; //@go_tags(`json:"uid"`) 用户id + string SessionId = 2; //@go_tags(`json:"sessionId"`) 会话id + string ServiceTag = 3; //@go_tags(`json:"serviceTag"`) 所在服务集群 区服id + string GatewayServiceId = + 4; //@go_tags(`json:"gatewayServiceId"`) 所在网关服务id + string ip = 5; //@go_tags(`json:"ip"`) 远程ip } message DBUser { @@ -15,20 +16,22 @@ message DBUser { string uuid = 3; //@go_tags(`bson:"uuid"`) 玩家唯一uuid string binduid = 4; //@go_tags(`bson:"binduid"`) 玩家账号 string name = 5; //@go_tags(`bson:"name"`) 玩家名 - string 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"`) 友情点 - 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"`) 创角 - int32 lv = 16; //@go_tags(`bson:"lv"`) 等级 - int32 vip = 17; //@go_tags(`bson:"vip"`) vip - int32 diamond = 18; //@go_tags(`bson:"diamond"`) 钻石 - int32 title = 19; //@go_tags(`bson:"title"`)头衔 + string avatar = 12; //@go_tags(`bson:"avatar"`) 头像 + int64 gold = 13; //@go_tags(`bson:"gold"`) 金币 + int64 exp = 14; //@go_tags(`bson:"exp"`) 经验 + bool created = 15; //@go_tags(`bson:"created"`) 创角 + int32 lv = 16; //@go_tags(`bson:"lv"`) 等级 + int32 vip = 17; //@go_tags(`bson:"vip"`) vip + int64 diamond = 18; //@go_tags(`bson:"diamond"`) 钻石 + int32 title = 19; //@go_tags(`bson:"title"`)头衔 + int64 offlinetime = 11; //@go_tags(`bson:"offlinetime"`) 离线时间 + int32 figure = 20; //@go_tags(`bson:"figure"`) 主角形象 + int32 bgp = 21; //@go_tags(`bson:"bgp"`) 背景 } message DBUserSetting { diff --git a/src/pb/proto/user_msg.proto b/src/pb/proto/user_msg.proto index 96225c7..763a9ce 100644 --- a/src/pb/proto/user_msg.proto +++ b/src/pb/proto/user_msg.proto @@ -2,8 +2,8 @@ syntax = "proto3"; option go_package = ".;pb"; import "errorcode.proto"; import "user_db.proto"; -import "comm.proto"; import "userexpand.proto"; +import "pagoda_db.proto"; //用户登录 message UserLoginReq { @@ -17,6 +17,14 @@ message UserLoginResp { int64 timeNow = 3; // 服务器时间 } +// 获取用户信息 +message UserInfoReq {} + +message UserInfoResp { + DBUser data = 1; + DBUserExpand ex = 2; //用户扩展 +} + //登出 message UserLogoutReq {} @@ -42,22 +50,12 @@ message UserCreateReq { message UserCreateResp { bool IsSucc = 1; } -//添加用户资源 -message UserAddResReq { - UserAssets res = 1; //资源类型 -} - -message UserAddResResp { - UserAssets res = 1; //资源类型 -} - // 玩家资源变更推送 -message UserResChangePush { - int32 gold = 1; //@go_tags(`bson:"gold"`) 金币 - int32 exp = 2; //@go_tags(`bson:"exp"`) 经验 - int32 lv = 3; //@go_tags(`bson:"lv"`) 等级 - int32 vip = 4; //@go_tags(`bson:"vip"`) vip - int32 diamond = 5; //@go_tags(`bson:"diamond"`) 钻石 +message UserResChangedPush { + int64 gold = 1; //@go_tags(`bson:"gold"`) 金币 + int64 exp = 2; //@go_tags(`bson:"exp"`) 经验 + int64 diamond = 5; //@go_tags(`bson:"diamond"`) 钻石 + int32 friend = 6; //@go_tags(`bson:"frined`) 友情点 } //用户设置获取 @@ -90,6 +88,35 @@ message UserModifynameReq { message UserModifynameResp { string uid = 1; uint32 count = 2; //剩余修改次数 + string name = 3; +} + +// 修改头像 +message UserModifyavatarReq { + string avatarId = 1; //头像ID +} + +message UserModifyavatarResp { + string uid = 1; + string avatarId = 2; +} + +// 修改背景图片 +message UserModifybgpReq { + int32 bgpId = 1; //背景图片ID +} + +message UserModifybgpResp { + string uid = 1; + int32 bgpId = 2; //背景图片ID +} + +// 修改形象 +message UserModifyfigureReq { int32 figureId = 1; } + +message UserModifyfigureResp { + string uid = 1; + int32 figureId = 2; } // 图鉴 @@ -97,30 +124,21 @@ message UserGetTujianReq {} message UserGetTujianResp { repeated string heroids = 1; } //玩家等级经验变化推送 -message UserChangedPush { +message UserLvChangedPush { string uid = 1; - int32 exp = 2; + int64 exp = 2; int32 lv = 3; } -//主角形象 -message UserFigureReq { - int32 preinstall = 1; //预设编号 1-5 - int32 action = 2; //部位 1-5 0不修改任何数据 - Hair hair = 3; //部位 1 - Eyes eyes = 4; //部位 2 - Mouth mouth = 5; //部位 3 - Body body = 6; //部位 4 - Complexion complexion = 7; //部位 5 -} - -message UserFigureResp { - string uid = 1; - int32 action = 2; //部位 - Figure figure = 3; -} - // 用户签名 message UserModifysignReq { string sign = 1; } -message UserModifysignResp { string uid = 1; } \ No newline at end of file +message UserModifysignResp { string uid = 1; } + +// 玩家战斗记录 +message UserBattlerecordReq {} + +message UserBattlerecordResp { + string uid = 1; + DBPagodaRecord pagodaRecord = 2; //爬塔战斗记录 +} \ No newline at end of file diff --git a/src/pb/proto/userexpand.proto b/src/pb/proto/userexpand.proto index aaa7ac0..5f07063 100644 --- a/src/pb/proto/userexpand.proto +++ b/src/pb/proto/userexpand.proto @@ -1,56 +1,25 @@ syntax = "proto3"; option go_package = ".;pb"; -// 发型 -message Hair { - int32 resId = 1; //资源ID - string color = 2; //颜色 -} - -// 眼睛 -message Eyes { - int32 resId = 1; //资源ID - string color = 2; //颜色 -} - -// 嘴巴 -message Mouth { - string resId = 1; //资源ID -} - -// 身体 -message Body { - int32 high = 1; //身高 - int32 shape = 2; //体型 -} - -// 肤色 -message Complexion { - string color = 1; //颜色值 -} - -// 形象 -message Figure { - Hair hair = 1; - Eyes eyes = 2; - Mouth mouth = 3; - Body body = 4; - Complexion complexion = 5; -} - //用户扩展数据 message DBUserExpand { - string id = 1; //主键id - string uid = 2; //用户id - int64 lastreadnotiftime = 3; //最后阅读公告时间 - int64 lastInitdataTime = 4; //上次初始数据时间 - uint32 initdataCount = 5; //今日初始累计次数 - int32 chatchannel = 6; //跨服聊天频道 - int32 modifynameCount = 7; //修改昵称次数 - map tujian = 8; // 图鉴 - int32 curFigure = 9; //当前形象 - map preinstall = 10; //形象预设 - int32 activeday = 11; //日活跃度 - int32 activeweek = 12; //周活跃度 - string sign = 13; //用户签名 + string id = 1; //主键id + string uid = 2; //用户id + int64 lastreadnotiftime = 3; //最后阅读公告时间 + int64 lastInitdataTime = 4; //上次初始数据时间 + uint32 initdataCount = 5; //今日初始累计次数 + int32 chatchannel = 6; //跨服聊天频道 + int32 modifynameCount = 7; //修改昵称次数 + map tujian = 8; //图鉴 + int32 activeday = 11; //日活跃度 + int32 activeweek = 12; //周活跃度 + string sign = 13; //用户签名 + int32 friendPoint = 14; //@go_tags(`bson:"friendPoint"`) 友情点 + int32 friendPointID = 15; //@go_tags(`bson:"friendPointID"`) 每日获赠友情点 + int32 friendPointOD = 16; //@go_tags(`bson:"friendPointOD"`) 每日送出友情点 + int32 loginAddCount = 19; //@go_tasgs(`bson:"loginAddCount"`) 累计登录天数 + int32 loginContinueCount = + 20; //@go_tasgs(`bson:"loginContinueCount"`) 连续登录天数 + bool completePagoda = 21; //@go_tags(`bson:"completePagoda"`) 通关普通塔 + int32 rtaskId = 22; //@go_tags(`bson:"rtaskId"`) 当前完成的随机任务ID } diff --git a/src/pb/proto/viking_db.proto b/src/pb/proto/viking_db.proto index e21bdc1..30964d1 100644 --- a/src/pb/proto/viking_db.proto +++ b/src/pb/proto/viking_db.proto @@ -1,6 +1,6 @@ syntax = "proto3"; option go_package = ".;pb"; - +import "battle_msg.proto"; //维京远征 message DBViking { string id = 1; //@go_tags(`bson:"_id"`) ID @@ -12,13 +12,6 @@ message DBViking { map bossTime = 7; //@go_tags(`bson:"bossTime"`) } -// 阵型数据 -message LineUp{ - string cid = 1; // 配置表id - int32 star = 2; // 星级 - int32 lv = 3; // 等级 -} - // 维京远征排行榜 message DBVikingRank { string id = 1; //@go_tags(`bson:"_id"`) ID diff --git a/src/pb/proto/viking_msg.proto b/src/pb/proto/viking_msg.proto index f0ded21..0ef7db9 100644 --- a/src/pb/proto/viking_msg.proto +++ b/src/pb/proto/viking_msg.proto @@ -14,7 +14,11 @@ message VikingChallengeReq { repeated string teamids = 4; //阵容信息 } -message VikingChallengeResp { BattleInfo info = 1; } +message VikingChallengeResp { + BattleInfo info = 1; + int32 bossType = 2; // boos 类型 + int32 difficulty = 3; // 难度 +} message VikingChallengeOverReq { int32 bossType = 1; // boos 类型