This commit is contained in:
aozhiwei 2021-04-12 10:32:37 +08:00
parent df5bf5a5d0
commit 793918631d
2 changed files with 7 additions and 7 deletions

View File

@ -86,9 +86,9 @@ void Room::Init()
CreateDropObjs(); CreateDropObjs();
InitObstacleDatas(); InitObstacleDatas();
ShuaAndroid(); ShuaAndroid();
refresh_rule_ = new Incubator(); incubator_ = new Incubator();
refresh_rule_->room = this; incubator_->room = this;
refresh_rule_->Init(); incubator_->Init();
if (room_type_ == RT_NewBrid && creator_game_times_ <= 0) { if (room_type_ == RT_NewBrid && creator_game_times_ <= 0) {
CreateLevel0RoomSpecThings(); CreateLevel0RoomSpecThings();
} }
@ -99,12 +99,12 @@ void Room::Init()
void Room::UnInit() void Room::UnInit()
{ {
refresh_rule_->UnInit(); incubator_->UnInit();
#ifdef DEBUG #ifdef DEBUG
UnInitDebugInfo(); UnInitDebugInfo();
#endif #endif
refresh_rule_->UnInit(); incubator_->UnInit();
A8_SAFE_DELETE(refresh_rule_); A8_SAFE_DELETE(incubator_);
timer_attacher.ClearTimerList(); timer_attacher.ClearTimerList();
xtimer_attacher_.ClearTimerList(); xtimer_attacher_.ClearTimerList();
for (auto& pair : accountid_hash_) { for (auto& pair : accountid_hash_) {

View File

@ -320,7 +320,7 @@ private:
xtimer_list* auto_jump_timer_ = nullptr; xtimer_list* auto_jump_timer_ = nullptr;
Incubator* refresh_rule_ = nullptr; Incubator* incubator_ = nullptr;
friend class Incubator; friend class Incubator;
}; };