server/game2006
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
aozhiwei 2023-03-21 17:14:31 +08:00
parent 19faf96fc5
commit f0c0e4df6c
3 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
server/gameserver/constant.h
View File

@ -253,8 +253,9 @@ enum PropertyType_e
kPropEnergyShield = 40, kPropEnergyShield = 40,
kPropGemstone = 41, kPropGemstone = 41,
kPickUp = 42, kPropPickUp = 42,
kTeamNum = 43, kProTeamNum = 43,
kPropTeamId = 44,
}; };
enum SkinSlot_e enum SkinSlot_e

2
server/gameserver/human.cc
View File

@ -2963,7 +2963,7 @@ void Human::LootInteraction(Loot* entity)
room->frame_event.AddPropChg room->frame_event.AddPropChg
( (
GetWeakPtrRef(), GetWeakPtrRef(),
kPickUp, kPropPickUp,
0, 0,
target_uniid, target_uniid,
false); false);

8
server/tools/protobuild/cs_proto.proto
View File

@ -192,6 +192,8 @@ message MFVec3
value: 物品对象uniid value: 物品对象uniid
property_type: 43 队伍成员数 property_type: 43 队伍成员数
value: 成员数 value: 成员数
property_type: 44 队伍id
value: 队伍id
*/ */
message MFPropertyChg message MFPropertyChg
{ {
@ -314,6 +316,7 @@ message MFPlayerFull
optional int32 charid = 44; //人物id optional int32 charid = 44; //人物id
optional float speed = 45; //速度 optional float speed = 45; //速度
optional int32 team_id = 71; //队伍id
optional float shoot_offset_x = 50 [default = 0]; //射击偏移量-x optional float shoot_offset_x = 50 [default = 0]; //射击偏移量-x
optional float shoot_offset_y = 51 [default = 0]; //射击偏移量-y optional float shoot_offset_y = 51 [default = 0]; //射击偏移量-y
@ -366,6 +369,8 @@ message MFObstacleFull
optional int32 door_open_times = 29; //门开启次数,每次开/关 ++times 0:客户端自动开 optional int32 door_open_times = 29; //门开启次数,每次开/关 ++times 0:客户端自动开
optional string button_name = 30; //按钮名（不为空是显示按钮，靠近时显示） optional string button_name = 30; //按钮名（不为空是显示按钮，靠近时显示）
optional MFCollider collider = 31; //碰撞体（有值的时候读取没值的时候还是读取配置表里的碰撞） optional MFCollider collider = 31; //碰撞体（有值的时候读取没值的时候还是读取配置表里的碰撞）
optional int32 team_id = 41; //队伍id
} }
//建筑物-部分 //建筑物-部分
@ -430,6 +435,7 @@ message MFHeroFull
repeated MFBuff buff_list = 12; //buff列表 repeated MFBuff buff_list = 12; //buff列表
optional float max_health = 13; //最大血量 optional float max_health = 13; //最大血量
repeated MFEffect effect_list = 14; //特效列表 repeated MFEffect effect_list = 14; //特效列表
optional int32 team_id = 15; //队伍id
} }
//载具-部分 //载具-部分
@ -457,6 +463,7 @@ message MFCarFull
optional int32 max_oil = 15; //最大油量 optional int32 max_oil = 15; //最大油量
optional int32 bullet_num = 16; //子弹数量 optional int32 bullet_num = 16; //子弹数量
repeated MFEffect effect_list = 18; //特效列表 repeated MFEffect effect_list = 18; //特效列表
optional int32 team_id = 19; //队伍id
/* /*
乘客列表（包含驾驶员） 乘客列表（包含驾驶员）
@ -1495,6 +1502,7 @@ message SMGameOver
optional int32 match_mode = 32; //比赛模式 0: pvp 1:排位赛(只有吃鸡模式下该字段才有意义) optional int32 match_mode = 32; //比赛模式 0: pvp 1:排位赛(只有吃鸡模式下该字段才有意义)
optional MFSettlement settlement = 33; //结算信息 optional MFSettlement settlement = 33; //结算信息
optional MFSettlementNew settlement_new = 34; //结算信息new
} }
//离开 //离开