|
@@ -21,11 +21,10 @@ void area_business_count_checker::on_load_his(const std::shared_ptr<area_hover>&
|
|
if (c->is_person())
|
|
if (c->is_person())
|
|
{
|
|
{
|
|
a->m_area->m_person_count ++ ;
|
|
a->m_area->m_person_count ++ ;
|
|
- if (a->m_area->m_person_count > a->m_area->m_limit_person_count)
|
|
|
|
|
|
+ if (a->m_area->m_person_count > a->m_area->m_limit_person_count && !a->m_area->m_event_person_count)
|
|
{
|
|
{
|
|
EVENT_TYPE ev = a->m_area->is_mine()?EVENT_TYPE::ET_OVER_COUNT_PERSON : EVENT_TYPE::ET_AREA_OVER_COUNT_PERSON ;
|
|
EVENT_TYPE ev = a->m_area->is_mine()?EVENT_TYPE::ET_OVER_COUNT_PERSON : EVENT_TYPE::ET_AREA_OVER_COUNT_PERSON ;
|
|
auto ev_ptr_temp = event_list::instance()->get_event_area(a->m_area->id(),ev);
|
|
auto ev_ptr_temp = event_list::instance()->get_event_area(a->m_area->id(),ev);
|
|
- a->m_area->m_event_person_count = false;
|
|
|
|
if (ev_ptr_temp && !ev_ptr_temp->is_end())
|
|
if (ev_ptr_temp && !ev_ptr_temp->is_end())
|
|
{
|
|
{
|
|
a->m_area->m_event_person_count = true;
|
|
a->m_area->m_event_person_count = true;
|
|
@@ -35,10 +34,9 @@ void area_business_count_checker::on_load_his(const std::shared_ptr<area_hover>&
|
|
else if (c->is_vehicle())
|
|
else if (c->is_vehicle())
|
|
{
|
|
{
|
|
a->m_area->m_vehicle_count ++ ;
|
|
a->m_area->m_vehicle_count ++ ;
|
|
- if (a->m_area->m_vehicle_count > a->m_area->m_limit_vehicle_count)
|
|
|
|
|
|
+ if (a->m_area->m_vehicle_count > a->m_area->m_limit_vehicle_count && !a->m_area->m_event_vehicle_count)
|
|
{
|
|
{
|
|
EVENT_TYPE ev = a->m_area->is_mine()?EVENT_TYPE::ET_OVER_COUNT_VEHICLE : EVENT_TYPE::ET_AREA_OVER_COUNT_VEHICLE ;
|
|
EVENT_TYPE ev = a->m_area->is_mine()?EVENT_TYPE::ET_OVER_COUNT_VEHICLE : EVENT_TYPE::ET_AREA_OVER_COUNT_VEHICLE ;
|
|
- a->m_area->m_event_vehicle_count = false;
|
|
|
|
auto ev_ptr_temp = event_list::instance()->get_event_area(a->m_area->id(),ev);
|
|
auto ev_ptr_temp = event_list::instance()->get_event_area(a->m_area->id(),ev);
|
|
if (ev_ptr_temp && !ev_ptr_temp->is_end())
|
|
if (ev_ptr_temp && !ev_ptr_temp->is_end())
|
|
{
|
|
{
|