1
This commit is contained in:
parent
af05d79522
commit
0c5868cc4e
@ -2068,9 +2068,7 @@ void SandTable::FillMFSandTable(cs::SMUpdate* msg, Human* hum, FrameData* framed
|
|||||||
if (hum->send_msg_times <= 0) {
|
if (hum->send_msg_times <= 0) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (room_->IsPveRoom() ||
|
if (!room_->IsSandTableRoom()) {
|
||||||
room_->IsNewBieRoom() ||
|
|
||||||
!room_->SupportSandTable()) {
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3789,3 +3789,15 @@ bool Room::SupportSandTable()
|
|||||||
{
|
{
|
||||||
return PBUtils::SupportSandTable(creator_proto_version_);
|
return PBUtils::SupportSandTable(creator_proto_version_);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void Room::OnAddHuman(Human* hum)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
bool Room::IsSandTableRoom()
|
||||||
|
{
|
||||||
|
return !IsPveRoom() &&
|
||||||
|
!IsNewBieRoom() &&
|
||||||
|
SupportSandTable();
|
||||||
|
}
|
||||||
|
@ -241,6 +241,7 @@ public:
|
|||||||
void ForceOver();
|
void ForceOver();
|
||||||
bool SupportSandTable();
|
bool SupportSandTable();
|
||||||
std::shared_ptr<SandTable> GetSandTable() { return sand_table_; }
|
std::shared_ptr<SandTable> GetSandTable() { return sand_table_; }
|
||||||
|
bool IsSandTableRoom();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void ShuaAndroid();
|
void ShuaAndroid();
|
||||||
@ -317,6 +318,7 @@ private:
|
|||||||
void InternalRemoveObjectLater(Entity* entity, a8::Attacher& entity_xtimer_attacher);
|
void InternalRemoveObjectLater(Entity* entity, a8::Attacher& entity_xtimer_attacher);
|
||||||
void OnBattleStart();
|
void OnBattleStart();
|
||||||
void ClearPostBattleAutoFreeList();
|
void ClearPostBattleAutoFreeList();
|
||||||
|
void OnAddHuman(Human* hum);
|
||||||
|
|
||||||
#ifdef DEBUG
|
#ifdef DEBUG
|
||||||
void InitDebugInfo();
|
void InitDebugInfo();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user