1
This commit is contained in:
parent
9363febfc2
commit
b4b4af5985
@ -432,6 +432,7 @@ void Human::DecHP(float dec_hp, int killer_id, const std::string killer_name, in
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
GetTrigger()->HpChg();
|
GetTrigger()->HpChg();
|
||||||
|
room->OnHumanHpChg(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
void Human::AddToNewObjects(Entity* entity)
|
void Human::AddToNewObjects(Entity* entity)
|
||||||
|
@ -2634,6 +2634,16 @@ void Room::NotifyKillList(const std::vector<int>& uniid_list)
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Room::SendSMTeamFull(Human* hum)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
void Room::OnHumanHpChg(Human* hum)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
int Room::InitWithCustomBattle(long ip_saddr, int socket_handle, std::shared_ptr<cs::CMJoin> msg,
|
int Room::InitWithCustomBattle(long ip_saddr, int socket_handle, std::shared_ptr<cs::CMJoin> msg,
|
||||||
std::shared_ptr<CustomBattle> p)
|
std::shared_ptr<CustomBattle> p)
|
||||||
{
|
{
|
||||||
|
@ -285,6 +285,8 @@ public:
|
|||||||
void CreateAndroid(int android_num, std::shared_ptr<Team> team = nullptr);
|
void CreateAndroid(int android_num, std::shared_ptr<Team> team = nullptr);
|
||||||
int GetFullLevelIdx() { return ++curr_full_level_idx_;}
|
int GetFullLevelIdx() { return ++curr_full_level_idx_;}
|
||||||
std::shared_ptr<RoomOb> GetRoomOb();
|
std::shared_ptr<RoomOb> GetRoomOb();
|
||||||
|
void SendSMTeamFull(Human* hum);
|
||||||
|
void OnHumanHpChg(Human* hum);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void ShuaAndroid();
|
void ShuaAndroid();
|
||||||
@ -397,6 +399,7 @@ private:
|
|||||||
std::map<int, Human*> alive_human_hash_;
|
std::map<int, Human*> alive_human_hash_;
|
||||||
std::map<int, Human*> alive_player_hash_;
|
std::map<int, Human*> alive_player_hash_;
|
||||||
std::map<int, Human*> last_human_hash_;
|
std::map<int, Human*> last_human_hash_;
|
||||||
|
std::map<int, Human*> hpchg_human_hash_;
|
||||||
std::map<int, std::shared_ptr<BornPoint>> born_point_hash_;
|
std::map<int, std::shared_ptr<BornPoint>> born_point_hash_;
|
||||||
std::map<int, std::shared_ptr<a8::CommonCbProcEx>> task_hash_;
|
std::map<int, std::shared_ptr<a8::CommonCbProcEx>> task_hash_;
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user