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-09-06 16:03:07 +08:00
parent d7ae16f29e
commit 732a58ec91
7 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/gameserver/android.cc
View File

@ -44,6 +44,7 @@ void Android::Initialize()
0, 0,
nullptr nullptr
); );
GetBattleContext()->Init(this);
} }
} }

2
server/gameserver/battledatacontext.cc
View File

@ -397,7 +397,7 @@ void BattleDataContext::ForceInit(long long hero_uniid,
} }
} }
void BattleDataContext::Init() void BattleDataContext::Init(Creature* c)
{ {
} }

4
server/gameserver/battledatacontext.h
View File

@ -1,5 +1,6 @@
#pragma once #pragma once
#include "weakptr.h"
/* /*
子弹命中逻辑 子弹命中逻辑
@ -61,7 +62,7 @@ struct BattleDataContext
MetaData::Equip* weapon1_meta, MetaData::Equip* weapon1_meta,
long long weapon2_uniid, long long weapon2_uniid,
MetaData::Equip* weapon2_meta); MetaData::Equip* weapon2_meta);
void Init(); void Init(Creature* c);
private: private:
void Clear(); void Clear();
@ -79,6 +80,7 @@ private:
std::shared_ptr<WeaponAbility> GetWeaponByUniId(long long weapon_uniid); std::shared_ptr<WeaponAbility> GetWeaponByUniId(long long weapon_uniid);
private: private:
CreatureWeakPtr owner_;
std::shared_ptr<HeroAbility> hero_ability_; std::shared_ptr<HeroAbility> hero_ability_;
std::shared_ptr<WeaponAbility> weapon1_ability_; std::shared_ptr<WeaponAbility> weapon1_ability_;

1
server/gameserver/car.cc
View File

@ -65,6 +65,7 @@ void Car::Initialize()
0, 0,
nullptr nullptr
); );
GetBattleContext()->Init(this);
} }
} }

1
server/gameserver/hero.cc
View File

@ -61,6 +61,7 @@ void Hero::Initialize()
0, 0,
nullptr nullptr
); );
GetBattleContext()->Init(this);
} }
} }

2
server/gameserver/room.cc
View File

@ -4084,7 +4084,9 @@ void Room::AddTeam(class MatchTeam* team)
} }
hum->room = this; hum->room = this;
AddPlayer(hum, init_born_point, true); AddPlayer(hum, init_born_point, true);
hum->SetBattleContext(member->battle_context); hum->SetBattleContext(member->battle_context);
hum->GetBattleContext()->Init(hum);
hum->ProcPrepareItems(msg.prepare_items()); hum->ProcPrepareItems(msg.prepare_items());
hum->ProcPrepareItems2(msg.prepare_items2()); hum->ProcPrepareItems2(msg.prepare_items2());
hum->ProcSkillList(msg.skill_list()); hum->ProcSkillList(msg.skill_list());

1
server/gameserver/roommgr.cc
View File

@ -202,6 +202,7 @@ void RoomMgr::_CMJoin(f8::MsgHdr& hdr, const cs::CMJoin& msg)
hum->room = room; hum->room = room;
room->AddPlayer(hum); room->AddPlayer(hum);
hum->SetBattleContext(results.at(0)); hum->SetBattleContext(results.at(0));
hum->GetBattleContext()->Init(hum);
hum->ProcPrepareItems(msg.prepare_items()); hum->ProcPrepareItems(msg.prepare_items());
hum->ProcPrepareItems2(msg.prepare_items2()); hum->ProcPrepareItems2(msg.prepare_items2());
hum->ProcSkillList(msg.skill_list()); hum->ProcSkillList(msg.skill_list());