Merge branch 'master_test_gn' into master_test_gn_godsoul

# Conflicts:
#	protos/CommonProto.proto
master_huanxiang
yuanshuai 2021-10-29 11:36:50 +08:00
commit 3b91b30cca
4 changed files with 36 additions and 2 deletions

View File

@ -138,6 +138,7 @@ option optimize_for = SPEED;
optional int32 skinId = 6;//
optional string realId = 7;//id
optional int64 forceScore = 8;//
optional int32 playerSex=9;//
}
@ -148,6 +149,7 @@ option optimize_for = SPEED;
optional string specialPassive = 4; //
optional int32 firstCamp = 5;// 0
optional int64 forceScore = 6;//
}
@ -1160,3 +1162,11 @@ option optimize_for = SPEED;
optional int32 skillId = 1;//id
optional int32 skillLv = 2;//
}
//
message WeekCard{
optional int32 id = 1; //id
optional bool isBuy = 2;
optional int32 leaveGetRewardDays = 3; //
}

View File

@ -227,8 +227,8 @@ import "CommonProto.proto";
}
message FastFightChallengeResponse{
optional int32 score = 1; //
optional int32 hurt = 2 ;//
optional int64 score = 1; //
optional int64 hurt = 2 ;//
optional FightData fightData = 3;
}

View File

@ -1346,6 +1346,13 @@ enum MessageType{
//
RidingSwardInfoResponse = 3050017;
//
WeekCardInfoRequest = 3050030;
WeekCardInfoResponse = 3050031;
WeekCardRewardRequest = 3050032;
WeekCardRewardResponse = 3050033;
//800000global
GetWorldServerRequest = 800001;//ip

View File

@ -1044,3 +1044,20 @@ import "CommonProto.proto";
optional int32 round = 6;//
}
//
message WeekCardInfoRequest{
}
message WeekCardInfoResponse{
repeated WeekCard allWeekCardInfo = 1;
}
message WeekCardRewardRequest{
optional int32 id = 1; //id
}
message WeekCardRewardResponse{
optional Drop drop = 1;
}