移植超时坦克技能协议

This commit is contained in:
aozhiwei 2020-03-02 12:54:19 +08:00
parent 72da641375
commit 12d61da7e4
3 changed files with 67 additions and 47 deletions

View File

@ -4,13 +4,13 @@
namespace TypeConvert namespace TypeConvert
{ {
void ToPb(const a8::Vec2& v, cs::MFVector2D* pb_obj) void ToPb(const a8::Vec2& v, cs::MFVec2* pb_obj)
{ {
pb_obj->set_x(v.x); pb_obj->set_x(v.x);
pb_obj->set_y(v.y); pb_obj->set_y(v.y);
} }
void FromPb(a8::Vec2& v, const cs::MFVector2D* pb_obj) void FromPb(a8::Vec2& v, const cs::MFVec2* pb_obj)
{ {
v.x = pb_obj->x(); v.x = pb_obj->x();
v.y = pb_obj->y(); v.y = pb_obj->y();

View File

@ -2,11 +2,11 @@
namespace cs namespace cs
{ {
class MFVector2D; class MFVec2;
} }
namespace TypeConvert namespace TypeConvert
{ {
void ToPb(const a8::Vec2& v, cs::MFVector2D* pb_obj); void ToPb(const a8::Vec2& v, cs::MFVec2* pb_obj);
void FromPb(a8::Vec2& v, const cs::MFVector2D* pb_obj); void FromPb(a8::Vec2& v, const cs::MFVec2* pb_obj);
} }

View File

@ -88,7 +88,7 @@ message MFPair64
} }
// //
message MFVector2D message MFVec2
{ {
optional float x = 1; //x轴 optional float x = 1; //x轴
optional float y = 2; //y轴 optional float y = 2; //y轴
@ -119,7 +119,7 @@ message MFPropertyChg
message MFMapObject message MFMapObject
{ {
optional int32 object_id = 1; //id(mapThing表id) optional int32 object_id = 1; //id(mapThing表id)
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
} }
// //
@ -163,16 +163,16 @@ message MFSkin
message MFPlayerPart message MFPlayerPart
{ {
optional int32 obj_uniid = 1; //id optional int32 obj_uniid = 1; //id
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
optional MFVector2D dir = 3; // optional MFVec2 dir = 3; //
} }
//- //-
message MFPlayerFull message MFPlayerFull
{ {
optional int32 obj_uniid = 1; //id optional int32 obj_uniid = 1; //id
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
optional MFVector2D dir = 3; // optional MFVec2 dir = 3; //
optional float max_health = 5; // optional float max_health = 5; //
optional float health = 6; // optional float health = 6; //
@ -208,7 +208,7 @@ message MFPlayerFull
message MFObstaclePart message MFObstaclePart
{ {
optional int32 obj_uniid = 1; //id optional int32 obj_uniid = 1; //id
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
optional float scale = 3; // optional float scale = 3; //
} }
@ -216,7 +216,7 @@ message MFObstaclePart
message MFObstacleFull message MFObstacleFull
{ {
optional int32 obj_uniid = 1; //id optional int32 obj_uniid = 1; //id
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
optional float scale = 3; // optional float scale = 3; //
optional int32 obstacle_id = 6; //id optional int32 obstacle_id = 6; //id
@ -242,14 +242,14 @@ message MFObstacleFull
message MFBuildingPart message MFBuildingPart
{ {
optional int32 obj_uniid = 1; //id optional int32 obj_uniid = 1; //id
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
} }
//- //-
message MFBuildingFull message MFBuildingFull
{ {
optional int32 obj_uniid = 1; //id optional int32 obj_uniid = 1; //id
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
optional int32 building_id = 3; //id optional int32 building_id = 3; //id
optional bool ceiling_dead = 6; optional bool ceiling_dead = 6;
@ -259,7 +259,7 @@ message MFBuildingFull
message MFLootSpawnerPart message MFLootSpawnerPart
{ {
optional int32 obj_uniid = 1; //id optional int32 obj_uniid = 1; //id
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
optional int32 loot_id = 3; //id optional int32 loot_id = 3; //id
} }
@ -267,7 +267,7 @@ message MFLootSpawnerPart
message MFLootSpawnerFull message MFLootSpawnerFull
{ {
optional int32 obj_uniid = 1; //id optional int32 obj_uniid = 1; //id
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
optional int32 loot_id = 3; //id optional int32 loot_id = 3; //id
} }
@ -275,14 +275,14 @@ message MFLootSpawnerFull
message MFLootPart message MFLootPart
{ {
optional int32 obj_uniid = 1; //id optional int32 obj_uniid = 1; //id
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
} }
//loot- //loot-
message MFLootFull message MFLootFull
{ {
optional int32 obj_uniid = 1; //id optional int32 obj_uniid = 1; //id
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
optional int32 item_id = 6; optional int32 item_id = 6;
optional int32 count = 7; optional int32 count = 7;
@ -293,14 +293,14 @@ message MFLootFull
message MFDeadBodyPart message MFDeadBodyPart
{ {
optional int32 obj_uniid = 1; //id optional int32 obj_uniid = 1; //id
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
} }
//- //-
message MFDeadBodyFull message MFDeadBodyFull
{ {
optional int32 obj_uniid = 1; //id optional int32 obj_uniid = 1; //id
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
optional int32 player_id = 3; //id optional int32 player_id = 3; //id
optional int32 inkjet = 6; optional int32 inkjet = 6;
@ -310,7 +310,7 @@ message MFDeadBodyFull
message MFDecalPart message MFDecalPart
{ {
optional int32 obj_uniid = 1; //id optional int32 obj_uniid = 1; //id
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
optional int32 decal_id = 3; //id optional int32 decal_id = 3; //id
} }
@ -318,7 +318,7 @@ message MFDecalPart
message MFDecalFull message MFDecalFull
{ {
optional int32 obj_uniid = 1; //id optional int32 obj_uniid = 1; //id
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
optional int32 decal_id = 3; //id optional int32 decal_id = 3; //id
} }
@ -326,7 +326,7 @@ message MFDecalFull
message MFProjectilePart message MFProjectilePart
{ {
optional int32 obj_uniid = 1; //id optional int32 obj_uniid = 1; //id
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
optional float pos_z = 3; // optional float pos_z = 3; //
} }
@ -334,7 +334,7 @@ message MFProjectilePart
message MFProjectileFull message MFProjectileFull
{ {
optional int32 obj_uniid = 1; //id optional int32 obj_uniid = 1; //id
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
optional float pos_z = 3; // optional float pos_z = 3; //
} }
@ -342,8 +342,8 @@ message MFProjectileFull
message MFHeroPart message MFHeroPart
{ {
optional int32 obj_uniid = 1; //id optional int32 obj_uniid = 1; //id
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
optional MFVector2D dir = 3; // optional MFVec2 dir = 3; //
} }
@ -351,8 +351,8 @@ message MFHeroPart
message MFHeroFull message MFHeroFull
{ {
optional int32 obj_uniid = 1; //id optional int32 obj_uniid = 1; //id
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
optional MFVector2D dir = 3; // optional MFVec2 dir = 3; //
optional int32 masert_uniid = 4; //id optional int32 masert_uniid = 4; //id
optional MFSkin skin = 13; //id optional MFSkin skin = 13; //id
@ -367,7 +367,7 @@ message MFHeroFull
message MFSmokePart message MFSmokePart
{ {
optional int32 obj_uniid = 1; //id optional int32 obj_uniid = 1; //id
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
optional float rad = 3; // optional float rad = 3; //
} }
@ -375,7 +375,7 @@ message MFSmokePart
message MFSmokeFull message MFSmokeFull
{ {
optional int32 obj_uniid = 1; //id optional int32 obj_uniid = 1; //id
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
optional float rad = 3; // optional float rad = 3; //
} }
@ -478,8 +478,8 @@ message MFGasData
*/ */
optional int32 mode = 1; //0:inactive 1:waiting 2:moving 3:jump optional int32 mode = 1; //0:inactive 1:waiting 2:moving 3:jump
optional float duration = 2; //() optional float duration = 2; //()
optional MFVector2D pos_old = 3; // optional MFVec2 pos_old = 3; //
optional MFVector2D pos_new = 4; // optional MFVec2 pos_new = 4; //
optional float rad_old = 5; // optional float rad_old = 5; //
optional float rad_new = 6; // optional float rad_new = 6; //
} }
@ -488,8 +488,8 @@ message MFGasData
message MFTeamData message MFTeamData
{ {
optional int32 player_id = 1; //id optional int32 player_id = 1; //id
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
optional MFVector2D dir = 3; // optional MFVec2 dir = 3; //
optional float health = 4; // optional float health = 4; //
optional bool disconnected = 5 [default = false]; //线 optional bool disconnected = 5 [default = false]; //线
optional bool dead = 6 [default = false]; // optional bool dead = 6 [default = false]; //
@ -503,8 +503,8 @@ message MFBullet
{ {
optional int32 player_id = 1; //id optional int32 player_id = 1; //id
optional int32 bullet_id = 2; //id optional int32 bullet_id = 2; //id
optional MFVector2D pos = 3; // optional MFVec2 pos = 3; //
optional MFVector2D dir = 4; // optional MFVec2 dir = 4; //
optional int32 gun_lv = 5; // optional int32 gun_lv = 5; //
optional int32 bulletskin = 6; // optional int32 bulletskin = 6; //
optional bool crit = 7; optional bool crit = 7;
@ -527,7 +527,7 @@ message MFShot
message MFExplosion message MFExplosion
{ {
optional int32 item_id = 1; //id optional int32 item_id = 1; //id
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
optional int32 player_id = 3; //id optional int32 player_id = 3; //id
optional int32 effect = 4 [default = 0]; // 0 1: optional int32 effect = 4 [default = 0]; // 0 1:
} }
@ -536,7 +536,7 @@ message MFExplosion
message MFSmoke message MFSmoke
{ {
optional int32 item_id = 1; //id optional int32 item_id = 1; //id
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
optional int32 player_id = 4; //id optional int32 player_id = 4; //id
} }
@ -587,7 +587,23 @@ message MFAirDrop
{ {
optional int32 appear_time = 1; //() optional int32 appear_time = 1; //()
optional int32 box_id = 2; //id optional int32 box_id = 2; //id
optional MFVector2D pos = 3; // optional MFVec2 pos = 3; //
}
//buff
message MFBuff
{
optional int32 buff_id = 1; //buff id
optional float left_time = 2; //()
optional float lasting_time = 3; //()
}
//buff变更
message MFBuffChg
{
optional int32 obj_id = 1; //id
optional int32 chg = 2; //0:/ 1:
optional MFBuff buff = 3; //buff
} }
//() //()
@ -615,15 +631,15 @@ message MFBodyState
// //
message MFPlane message MFPlane
{ {
optional MFVector2D start_point = 1; // optional MFVec2 start_point = 1; //
optional MFVector2D end_point = 2; // optional MFVec2 end_point = 2; //
} }
// //
message MFCar message MFCar
{ {
optional int32 car_id = 1; //id(equip表) optional int32 car_id = 1; //id(equip表)
optional MFVector2D pos = 2; // optional MFVec2 pos = 2; //
} }
//end mfmsg //end mfmsg
@ -645,6 +661,7 @@ message CMJoin
optional int32 energy_shield = 12; // optional int32 energy_shield = 12; //
repeated int32 baseskin = 13; //id repeated int32 baseskin = 13; //id
optional int32 basemelee = 14; //xx optional int32 basemelee = 14; //xx
repeated int32 buff_list = 15; //
repeated MFWeapon weapons = 17; // repeated MFWeapon weapons = 17; //
repeated MFSkin skins = 18; // key: id value: repeated MFSkin skins = 18; // key: id value:
repeated int32 prepare_items = 19; // energy_shield repeated int32 prepare_items = 19; // energy_shield
@ -664,8 +681,8 @@ message CMMove
{ {
optional int32 seq = 1; // optional int32 seq = 1; //
optional MFVector2D move_dir = 24; //- optional MFVec2 move_dir = 24; //-
optional MFVector2D attack_dir = 20; //() optional MFVec2 attack_dir = 20; //()
optional bool shot_start = 6; //- optional bool shot_start = 6; //-
optional bool shot_hold = 7; //- optional bool shot_hold = 7; //-
@ -684,6 +701,9 @@ message CMMove
optional bool aiming = 2; // optional bool aiming = 2; //
optional bool use_skill = 29; //使 optional bool use_skill = 29; //使
optional int32 skill_target_id = 21; //()
optional MFVec2 skill_dir = 34; //
optional float skill_param1 = 35; //
optional bool spectate = 30; // optional bool spectate = 30; //
@ -704,7 +724,7 @@ message CMDropItem
message CMEmote message CMEmote
{ {
optional int32 type = 1; optional int32 type = 1;
optional MFVector2D pos = 2; optional MFVec2 pos = 2;
optional bool team_only = 4; optional bool team_only = 4;
} }
@ -792,7 +812,7 @@ message SMUpdate
optional MFActivePlayerData active_player_data = 6; //() optional MFActivePlayerData active_player_data = 6; //()
optional int32 alive_count = 15; // optional int32 alive_count = 15; //
optional int32 gas_progress = 16; //,(gas_data.mode == moving时才会发进度) optional int32 gas_progress = 16; //,(gas_data.mode == moving时才会发进度)
optional MFVector2D gas_pos_old = 30; // optional MFVec2 gas_pos_old = 30; //
optional MFGasData gas_data = 17; // optional MFGasData gas_data = 17; //
repeated MFTeamData team_data = 18; // repeated MFTeamData team_data = 18; //
repeated MFBullet bullets = 20; // repeated MFBullet bullets = 20; //