|
@@ -168,10 +168,10 @@ class GameLogic extends BaseLogic
|
|
|
$query->order('sort', 'desc');
|
|
$query->order('sort', 'desc');
|
|
|
$gameList = $this->getList($query);
|
|
$gameList = $this->getList($query);
|
|
|
|
|
|
|
|
- return $this->gameTree($gameList);
|
|
|
|
|
|
|
+ return $this->gameMainTree($gameList);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- public function gameTree($gameList)
|
|
|
|
|
|
|
+ public function gameMainTree($gameList): array
|
|
|
{
|
|
{
|
|
|
$mainGameMap = $this->gameMainLogic->getMainGameMap();
|
|
$mainGameMap = $this->gameMainLogic->getMainGameMap();
|
|
|
$groupedGames = [];
|
|
$groupedGames = [];
|
|
@@ -269,7 +269,7 @@ class GameLogic extends BaseLogic
|
|
|
}else{
|
|
}else{
|
|
|
$gameList = $this->model->where('id', 'in', $game_ids)->where('status', 1)->order('sort', 'desc')->select()->toArray();
|
|
$gameList = $this->model->where('id', 'in', $game_ids)->where('status', 1)->order('sort', 'desc')->select()->toArray();
|
|
|
}
|
|
}
|
|
|
- return $this->gameTree($gameList);
|
|
|
|
|
|
|
+ return $this->gameMainTree($gameList);
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|