|
@@ -252,13 +252,6 @@ void card_list::load_his_card_postion_vehicle()
|
|
|
//m_area_hover = std::make_shared<area_hover>( area, pt,speed);
|
|
|
//auto area_hover_ptr = card_ptr->get_area_hover();
|
|
|
|
|
|
- auto e_t = tool_time::to_time_ex(enter_time);
|
|
|
- auto area_hover_ptr = std::make_shared<area_hover>();
|
|
|
- area_hover_ptr->m_area = area;
|
|
|
- area_hover_ptr->m_enter_time = tool_time::to_ms(e_t);
|
|
|
- card_ptr->m_area_tool->m_hover_list.push_back(area_hover_ptr);
|
|
|
- area_hover_ptr->m_area->on_enter(area_hover_ptr, temp_ptr);
|
|
|
-
|
|
|
//int map_id = 0;
|
|
|
//int state = 0;
|
|
|
card_ptr->m_speed = speed;
|
|
@@ -275,6 +268,14 @@ void card_list::load_his_card_postion_vehicle()
|
|
|
//area_hover_ptr->landmark_dis = landmark_dist;
|
|
|
|
|
|
card_ptr->m_time = tool_time::now_to_ms();
|
|
|
+
|
|
|
+ //要放到最后
|
|
|
+ auto e_t = tool_time::to_time_ex(enter_time);
|
|
|
+ auto area_hover_ptr = std::make_shared<area_hover>();
|
|
|
+ area_hover_ptr->m_area = area;
|
|
|
+ area_hover_ptr->m_enter_time = tool_time::to_ms(e_t);
|
|
|
+ card_ptr->m_area_tool->m_hover_list.push_back(area_hover_ptr);
|
|
|
+ area_hover_ptr->m_area->on_enter(area_hover_ptr, temp_ptr);
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -375,14 +376,6 @@ void card_list::load_his_card_postion_staff()
|
|
|
//card_ptr->m_area_tool->init_area(area,pt,temp_ptr);
|
|
|
// m_area_hover = std::make_shared<area_hover>(area,pt,speed);
|
|
|
|
|
|
- auto e_t = tool_time::to_time_ex(enter_time);
|
|
|
-
|
|
|
- auto area_hover_ptr = std::make_shared<area_hover>();
|
|
|
- area_hover_ptr->m_area = area;
|
|
|
- area_hover_ptr->m_enter_time = tool_time::to_ms(e_t);
|
|
|
- card_ptr->m_area_tool->m_hover_list.push_back(area_hover_ptr);
|
|
|
- area_hover_ptr->m_area->on_enter(area_hover_ptr, temp_ptr);
|
|
|
-
|
|
|
log_info("load_staff...%d,areaid:%d,mapid:%d",id,area->id(),area->mapid());
|
|
|
|
|
|
//int map_id = 0;
|
|
@@ -401,6 +394,14 @@ void card_list::load_his_card_postion_staff()
|
|
|
//area_hover_ptr->landmark_dis = landmark_dist;
|
|
|
|
|
|
card_ptr->m_time = tool_time::now_to_ms();
|
|
|
+
|
|
|
+ //要放到最后
|
|
|
+ auto e_t = tool_time::to_time_ex(enter_time);
|
|
|
+ auto area_hover_ptr = std::make_shared<area_hover>();
|
|
|
+ area_hover_ptr->m_area = area;
|
|
|
+ area_hover_ptr->m_enter_time = tool_time::to_ms(e_t);
|
|
|
+ card_ptr->m_area_tool->m_hover_list.push_back(area_hover_ptr);
|
|
|
+ area_hover_ptr->m_area->on_enter(area_hover_ptr, temp_ptr);
|
|
|
}
|
|
|
}
|
|
|
}
|