root
/
miduo_protocol
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master_test_hw_arean' of http://60.1.1.230/backend/jieling_protocol into master_test_hw_arean 

# Conflicts:
#	protos/MessageTypeProto.proto
master_huanxiang
lvxinran 2020-12-12 11:14:23 +08:00
parent a8506cb603 df927056d0
commit 1919fce306
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
protos/CommonProto.proto
View File

@ -303,7 +303,6 @@ option optimize_for = SPEED;
optional int32 totalForce =7;
optional int32 headFrame = 8;
optional string servername = 9;//服务器名称
optional int32 worshipTime = 10;//膜拜次数 -1未膜拜
}
@ -314,6 +313,8 @@ option optimize_for = SPEED;
message ArenaEnemy{
optional ArenaPersonInfo personInfo =1;
optional Team team =2; //队伍展示信息
optional int32 worshipTime = 3;//膜拜次数
optional bool hadProud= 4;//我是否膜拜
}

3
protos/MessageTypeProto.proto
View File

@ -957,8 +957,6 @@ enum MessageType{
WORKSHOP_TECHNOLOGY_RESET_REQUEST = 12212; //科技树重置
WORKSHOP_TECHNOLOGY_RESET_RESPONSE = 12213;
@ -1130,6 +1128,7 @@ enum MessageType{
AddDeathPathRankRequest = 900012;
GetDeathPathFirstRequest = 900013;
}

7
protos/gtwprotos/WorldProto.proto
View File

@ -57,13 +57,14 @@ import "CommonProto.proto";
//跨服天梯挑战与被挑战 战斗记录
message WroldBattleRecord {
optional int32 recordId = 1;
optional rpc.protocols.TeamOneInfo myInfo = 2; //我的信息
optional rpc.protocols.TeamOneInfo enemyInfo = 3; //对手信息
optional string recordId = 1;
optional rpc.protocols.ArenaEnemy redEnemy = 2; //我的信息 或者攻击者信息
optional rpc.protocols.ArenaEnemy blueEnemy = 3; //对方信息
optional int32 result = 4;
optional rpc.protocols.FightData fightData =5;//战斗数据
optional int32 oldrank = 6;//战斗胜利之前排名
optional int32 rank = 7;//战斗胜利后排名
optional int32 attackTime =8 ; //进攻时间
}
message GetWorldArenaRecordInfoRequest{