Merge branch 'master_test_gn' into master_test_gn_godsoul

# Conflicts:
#	protos/CommonProto.proto
#	protos/HeroInfoProto.proto
master_huanxiang
yuanshuai 2021-10-21 16:31:21 +08:00
commit fdce1162e1
6 changed files with 139 additions and 7 deletions

View File

@ -126,4 +126,39 @@ import "CommonProto.proto";
repeated int32 hitList = 1;
}
//
message RidingSwardActivityRequest{
optional int32 activityId = 1;//id
}
message RidingSwardActivityResponse{
optional int32 state = 1;//012
optional int64 time = 2;//
repeated ModelUserInfo modelInfo = 3;//
optional int32 rankId = 4;//
optional int32 betCount = 5;//
}
//
message RidingSwardInfoRequest{
}
//
message RidingSwardRewardRequest{
optional int32 round = 1;//,-1
optional int32 swardId = 2;//
}
message RidingSwardRewardResponse{
optional Drop drop = 1;//
}
//
message RidingSwardBetRequest{
optional int32 swardId = 1;//
optional int32 costNum = 2;//
}
//
message RidingSwardInfoResponse{
repeated RidingSwardRecord recordLsit = 1;//
repeated RidingSwardBet betList = 2;//
optional RidingSwardLastRank lastRank = 3;//
optional int32 betCount = 4;//
}

View File

@ -149,6 +149,7 @@ import "CommonProto.proto";
}
//
message CrossYuXuLunDaoGetInfoRequest{
optional int32 type = 1; //0: 1:
}
message CrossYuXuLunDaoGetInfoResponse{
optional bool isFirst= 1;//

View File

@ -1,4 +1,3 @@
package rpc.protocols;
option optimize_for = SPEED;
@ -120,12 +119,13 @@ option optimize_for = SPEED;
message FightUnitInfo {
optional string unitId = 1;//id
optional string unitSkillIds = 2;//##1#2#3....
optional string unitSkillIds = 2;//##1#2#3....(PlayerSkillid)
optional string property = 3;//1#2390#2390#169#271#95#176#0#0#0.3#0.15#0.3#1.5#1#0.05#0#0#0#0#0#0.05#0#0#0#0#0
optional int32 position = 4; //
optional int32 position = 4; // ( position10)
optional int32 star = 5; //
optional int32 skinId = 6;//
optional string realId = 7;//id
optional int64 forceScore = 8;//
}
@ -135,6 +135,7 @@ option optimize_for = SPEED;
optional string teamPassiveList = 3 ; //
optional string specialPassive = 4; //
optional int32 firstCamp = 5;// 0
optional int64 forceScore = 6;//
}
@ -1050,6 +1051,8 @@ option optimize_for = SPEED;
optional string serverName = 16; //
repeated int32 result = 17; //
optional string myServerName = 18; //
repeated int32 yxldMyForce = 19;//
repeated int32 yxldDefForce = 20;//
}
@ -1098,6 +1101,7 @@ option optimize_for = SPEED;
optional int32 heroStaticid = 1;//id
optional int32 likableNum = 2;//
}
///
message HeroGodSoulInfo{
optional int32 level = 1;//
@ -1108,4 +1112,47 @@ option optimize_for = SPEED;
message HeroBeBindGodSoulInfo{
optional int32 level = 1;//
optional string heroId = 2;//
}
}
//
message ModelUserInfo{
optional string userName = 1;//
optional int32 practiceLevel = 2;//
optional int32 sex = 3;//
}
//
message RidingSwardLastRank{
optional int64 rankTime = 1;//
optional int32 rankId = 2;//id
}
//
message RidingSwardRecord{
optional int64 time = 1;//
optional int32 result = 2;//
optional int32 winnerId = 3;//
optional int32 costNum = 4;//
optional int32 getNum = 5;//
optional int32 state = 6;//
optional int32 betSwardId = 7;//id
optional int32 round = 8;//
}
//
message RidingSwardBet{
optional int32 swardId = 1;//
optional int32 costNum = 2;//
}
//
message EquipBookInfo{
optional int32 equipId = 1;//id
optional int32 num = 2;//
}
///
message PracticeSkillInfo{
optional int32 skillId = 1;//id
optional int32 skillLv = 2;//
}

View File

@ -162,6 +162,7 @@ import "CommonProto.proto";
message GetAllPropertyInfoResponse{
repeated int32 allBookEnabled = 1;//
repeated int32 equipGot = 2;//
repeated EquipBookInfo equipList = 3;//
}
@ -372,6 +373,11 @@ import "CommonProto.proto";
message UpPracticeLevelResponse{
optional int32 practiceLevel = 1;//
}
//
message XiuxianLevelUpResponse{
optional int32 xiuxianLevel = 1;//
}
//
@ -456,8 +462,12 @@ import "CommonProto.proto";
optional int32 itemId = 2;//id
optional int32 itemNum = 3;//
}
///
message EquipBookIndication{
repeated EquipBookInfo changeEquipList = 1;//()
}
//
message HeroGodSoulBindRequest{
optional string heroId = 1;//
@ -465,6 +475,12 @@ import "CommonProto.proto";
repeated string bindHeros=3;//
}
//
message PracticeSkillUpRequest{
optional int32 skillId = 1;
}

View File

@ -572,6 +572,8 @@ enum MessageType{
HONGMENG_STELE_NEW_HAND_INDICATION = 10725;//鸿
HARD_STAGE_TAKE_DAILY_REWAR_REQUEST = 10726;//
HARD_STAGE_TAKE_DAILY_REWAR_RESPONSE = 10727;
// I 10800
// J 10900
@ -749,6 +751,7 @@ enum MessageType{
ALL_BOOK_ENABLE_REQUEST = 11514;//
ALL_BOOK_ENABLE_REPONSE = 11515;
EQUIP_BOOK_INDICATION = 11516;//
// Q 11600
QUESTION_INDICATION = 11600;//
QUICK_START_MONSTERFIGHTER_REQUEST = 11601;//
@ -1052,6 +1055,9 @@ enum MessageType{
TAI_CHU_SECRET_VOLUME_RESPONSE = 12231;//
// X 12300
XIUXIAN_XIUWEI_UP_REQUEST = 12300; //
XIUXIAN_XIUWEI_UP_RESPONSE = 12301; //
// Y 12400
// Z 12500
@ -1112,6 +1118,9 @@ enum MessageType{
GET_LIKABLE_DATA_REQUEST = 20207;//
GET_LIKABLE_DATA_RESPONSE = 20208;
PRACTICE_SKILL_UP_REQUEST=20209;//
PRACTICE_SKILL_UP_RESPONSE=20210;
HERO_GOD_SOUL_BIND_REQUEST = 20209;//
HERO_GOD_SOUL_BIND_RESPONSE = 20210;
@ -1322,6 +1331,20 @@ enum MessageType{
SevenWorldChallengeResponse = 3050011;
//
RidingSwardActivityRequest = 3050012;
RidingSwardActivityResponse = 3050013;
// -
RidingSwardInfoRequest = 3050014;
//
RidingSwardRewardRequest = 3050015;
RidingSwardRewardResponse = 3050018;
//
RidingSwardBetRequest = 3050016;
//
RidingSwardInfoResponse = 3050017;
//800000global

View File

@ -86,6 +86,8 @@ import "CommonProto.proto";
repeated HelpFightList helpFightList = 45;//
repeated SixiangxinfaInfo sixiangInfos = 46;//
optional int32 serverOpenTime = 47; //
optional int32 xiuweiLevel = 48; //
repeated PracticeSkillInfo practiceSkillInfos = 49;//
}
@ -539,7 +541,8 @@ import "CommonProto.proto";
message UpdateUserExpIndicaiton{
optional int32 level = 1 ;//
optional int64 exp =2 ; //
optional int64 exp = 2 ; //
optional Drop drop = 3; //
}
@ -677,6 +680,7 @@ import "CommonProto.proto";
repeated SpecialEffects SpecialEffects = 3;//
optional int32 force = 4 ; //
optional int32 guildSkill = 5;//
optional int32 treeLevel = 6;//
}
message RankRequest{
optional int32 type = 1;//
@ -715,6 +719,7 @@ import "CommonProto.proto";
optional double amount = 1;//
optional double monthSaveAmt = 2 ; //
optional double smonthSaveAmt = 3 ; //
optional double sincereMonth = 4 ; //
}
message VipTakeDilyRequest{
@ -915,6 +920,7 @@ import "CommonProto.proto";
}
message HardStageResponse{
optional HardStageInfo info = 1;
optional bool isTake = 2; // false :
}
//
message HardStageFightRequest{
@ -942,6 +948,10 @@ import "CommonProto.proto";
message HardStageReportResponse{
repeated HardStagePlayerInfo player = 1;
}
//
message HardStageDailyRewardResponse{
optional Drop drop = 1;
}
//
message VipLevelStateRequset{
}