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 2022-05-27 15:28:10 +08:00
commit 90c77a1da1
5 changed files with 29 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
server/gameserver/hero.cc
View File

@ -292,7 +292,18 @@ void Hero::BeKill(int killer_id, const std::string& killer_name, int weapon_id)
void Hero::OnAddToTargetPartObject(Entity* target) void Hero::OnAddToTargetPartObject(Entity* target)
{ {
if (delete_frameno > 0) { if (delete_frameno > 0) {
#if 1
a8::UdpLog::Instance()->Warning
("Hero::OnAddToTargetPartObject "
"delete_frameno:%d "
"room.frameno:%d",
{
delete_frameno,
room->GetFrameNo()
});
#else
A8_ABORT(); A8_ABORT();
#endif
} }
} }

1
server/gameserver/matchteam.cc
View File

@ -123,6 +123,7 @@ void MatchTeam::_CMMatchChoose(f8::MsgHdr& hdr, const cs::CMMatchChoose& msg)
auto member = GetMemberBySocket(hdr.socket_handle); auto member = GetMemberBySocket(hdr.socket_handle);
if (member && master_team_->phase_ == kMatchChoose) { if (member && master_team_->phase_ == kMatchChoose) {
member->msg->set_hero_id(msg.hero_id()); member->msg->set_hero_id(msg.hero_id());
member->msg->set_hero_uniid(msg.hero_uniid());
*member->msg->mutable_weapons() = msg.weapons(); *member->msg->mutable_weapons() = msg.weapons();
*member->msg->mutable_skins() = msg.skins(); *member->msg->mutable_skins() = msg.skins();
*member->msg->mutable_skill_list() = msg.skill_list(); *member->msg->mutable_skill_list() = msg.skill_list();

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

@ -1151,6 +1151,7 @@ message CMMatchChoose
repeated MFPair skill_list = 4; //技能列表 key:技能id value:预留给之后扩展,目前传0就行 repeated MFPair skill_list = 4; //技能列表 key:技能id value:预留给之后扩展,目前传0就行
repeated int32 baseskin = 5; //皮肤id repeated int32 baseskin = 5; //皮肤id
optional int32 hero_skin = 6; //头像框 optional int32 hero_skin = 6; //头像框
optional string hero_uniid = 7; //英雄唯一id
} }
//组队匹配-出击 //组队匹配-出击

1
server/tools/protobuild/out/cs_proto.proto
View File

@ -916,6 +916,7 @@ message CMMatchChoose
repeated MFPair skill_list = 4; repeated MFPair skill_list = 4;
repeated int32 baseskin = 5; repeated int32 baseskin = 5;
optional int32 hero_skin = 6; optional int32 hero_skin = 6;
optional string hero_uniid = 7;
} }
message CMMatchStartGame message CMMatchStartGame

15
server/tools/protobuild/out/metatable.proto
View File

@ -126,6 +126,7 @@ message Item
optional int32 skinid = 6; optional int32 skinid = 6;
optional int32 isdefaultskin = 7; optional int32 isdefaultskin = 7;
optional int32 playerid = 8; optional int32 playerid = 8;
optional int32 relationship = 9;
} }
message Equip message Equip
@ -428,6 +429,20 @@ message GunTalentGrow
optional string addattr = 5; optional string addattr = 5;
} }
message HeroQuality
{
optional int32 id = 1;
optional int32 quality = 2;
optional int32 gold_limit = 3;
}
message GunQuality
{
optional int32 id = 1;
optional int32 quality = 2;
optional int32 gold_limit = 3;
}
message DoorObjJson message DoorObjJson
{ {