diff --git a/protos/CommonProto.proto b/protos/CommonProto.proto index 68cecb3..fcbc235 100644 --- a/protos/CommonProto.proto +++ b/protos/CommonProto.proto @@ -33,10 +33,6 @@ option optimize_for = SPEED; optional int32 endingTime = 3; } - message Buff{ - optional int32 buffId = 1; - } - message SpecialEffects{ optional int32 propertyId = 1; @@ -68,21 +64,18 @@ option optimize_for = SPEED; } - message HeroFightInfo { - optional Hero hero = 1; - optional float attack = 2; - optional float physicalDefence = 3; - optional float magicDefence = 4; - optional float hp = 5; - optional float speed = 6; + message FightTeamInfo { + repeated FightUnitInfo fightUnitList = 1; + optional string teamSkillList = 2;//异妖(队伍技能)技能1#技能2#技能3 } - message Monster{ - optional string monsterId = 1; // 怪物id - repeated int32 monsterSkill = 2 ; //怪物技能 - repeated int32 monsterProperty = 3; // 怪物属性 + message FightUnitInfo { + optional string unitId = 1;//单位静态id + optional string unitSkillIds = 2;//点技#滑技#被动技能1#被动技能2#被动技能3.... + 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 } + message EventBehaviorValues{ repeated int32 behaviorValues = 1; } @@ -127,10 +120,6 @@ option optimize_for = SPEED; } - message Family{ - optional string id = 1; - } - message Drop{ repeated Item itemlist = 1; repeated Equip equipId = 2; diff --git a/protos/FightInfoProto.proto b/protos/FightInfoProto.proto index a843d89..04fd5db 100644 --- a/protos/FightInfoProto.proto +++ b/protos/FightInfoProto.proto @@ -35,12 +35,13 @@ import "CommonProto.proto"; // 怪物的属性 //repeated Monster monsterList = 1; } + // 战斗结束 message FightEndRequest { // 怪物组id(接战斗验证后可删除) optional int32 monsterGroupId = 1; - // 战斗序列帧 14#1#0 - repeated string frames = 2; + // 战斗序列帧 14#1#0|14#1#0|14#1#0|...|14#1#0 + optional string frames = 2; } message FightEndResponse { // 获得的道具 diff --git a/protos/MapInfoProto.proto b/protos/MapInfoProto.proto index 2bdd016..1415c6d 100644 --- a/protos/MapInfoProto.proto +++ b/protos/MapInfoProto.proto @@ -46,11 +46,13 @@ import "CommonProto.proto"; // 更新主线任务 repeated Mission mission = 4; // 战斗属性 - repeated HeroFightInfo heroFightInfos = 5; + optional FightTeamInfo heroFightInfos = 5; // 怪物属性 - repeated Monster monsterList = 6; + repeated FightTeamInfo monsterList = 6; // 剩余步数 optional int32 leftStep = 7; + //战斗随机种子 + optional int32 fightSeed = 8; } // 更新地图状态