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

1

Browse Source
This commit is contained in:
aozhiwei 2021-04-09 11:22:54 +08:00
parent 507a6d469f
commit d8f1e8d569
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/gameserver/human.cc
View File

@ -1048,6 +1048,7 @@ bool Human::CanUseSkill(int skill_id)
void Human::DoJump() void Human::DoJump()
{ {
if (HasBuffEffect(kBET_Fly)) { if (HasBuffEffect(kBET_Fly)) {
a8::UnSetBitFlag(status, HS_DisableAttack);
RemoveBuffByEffectId(kBET_Fly); RemoveBuffByEffectId(kBET_Fly);
MustBeAddBuff(this, kThroughWall_BUFFID); MustBeAddBuff(this, kThroughWall_BUFFID);
MustBeAddBuff(this, JUMP_BUFFID); MustBeAddBuff(this, JUMP_BUFFID);

10
server/gameserver/room.cc
View File

@ -2193,11 +2193,11 @@ void Room::NotifyGameStart()
[] (const a8::XParams& param) [] (const a8::XParams& param)
{ {
Room* room = (Room*)param.sender.GetUserData(); Room* room = (Room*)param.sender.GetUserData();
for (int buff_id : room->map_meta_->buff_list) { for (auto& pair : room->human_hash_) {
MetaData::Buff* buff_meta = MetaMgr::Instance()->GetBuff(buff_id); a8::UnSetBitFlag(pair.second->status, HS_DisableAttack);
if (buff_meta) { for (int buff_id : room->map_meta_->buff_list) {
for (auto& pair : room->human_hash_) { MetaData::Buff* buff_meta = MetaMgr::Instance()->GetBuff(buff_id);
a8::UnSetBitFlag(pair.second->status, HS_DisableAttack); if (buff_meta) {
pair.second->AddBuff(pair.second, pair.second->AddBuff(pair.second,
buff_meta, buff_meta,
1, 1,

2
server/tools/protobuild/metatable.proto
View File

@ -110,7 +110,7 @@ message Equip
optional string param1 = 43; optional string param1 = 43;
optional string param2 = 44; optional string param2 = 44;
optional int32 reloadtype = 46; optional int32 reloadtype = 46;
optional float Recoil_force = 47; optional float recoil_force = 47;
optional int32 missiles_time = 48; optional int32 missiles_time = 48;
optional int32 heroid = 49; optional int32 heroid = 49;