Merge branch 'master_test_gn_practiceSkill' into master_test_gn

# Conflicts:
#	protos/CommonProto.proto
#	protos/PlayerInfoProto.proto
yuanshuai 2021-10-20 18:41:12 +08:00
commit 260fe178c2
4 changed files with 18 additions and 2 deletions

View File

@ -117,9 +117,9 @@ 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
@ -132,6 +132,7 @@ option optimize_for = SPEED;
optional string teamPassiveList = 3 ; //
optional string specialPassive = 4; //
optional int32 firstCamp = 5;// 0
optional int64 forceScore = 6;//
}
@ -1135,3 +1136,9 @@ option optimize_for = SPEED;
optional int32 num = 2;//
}
///
message PracticeSkillInfo{
optional int32 skillId = 1;//id
optional int32 skillLv = 2;//
}

View File

@ -469,6 +469,11 @@ import "CommonProto.proto";
}
//
message PracticeSkillUpRequest{
optional int32 skillId = 1;
}

View File

@ -1119,6 +1119,9 @@ enum MessageType{
GET_LIKABLE_DATA_REQUEST = 20207;//
GET_LIKABLE_DATA_RESPONSE = 20208;
PRACTICE_SKILL_UP_REQUEST=20209;//
PRACTICE_SKILL_UP_RESPONSE=20210;

View File

@ -87,6 +87,7 @@ import "CommonProto.proto";
repeated SixiangxinfaInfo sixiangInfos = 46;//
optional int32 serverOpenTime = 47; //
optional int32 xiuweiLevel = 48; //
repeated PracticeSkillInfo practiceSkillInfos = 49;//
}