|
|
@@ -285,28 +285,8 @@ class AnimeService
|
|
|
$episode['scenes'] = json_decode($episode['scenes'], true);
|
|
|
|
|
|
// 获取分镜信息
|
|
|
- $segments = DB::table('mp_episode_segments')->where('anime_id', $anime_id)->where('episode_id', getProp($episode, 'episode_id'))->orderBy('segment_number')->select(
|
|
|
- 'act_number',
|
|
|
- 'act_title',
|
|
|
- 'segment_id',
|
|
|
- 'segment_number',
|
|
|
- 'segment_content',
|
|
|
- 'description',
|
|
|
- 'composition',
|
|
|
- 'camera_movement',
|
|
|
- 'voice_actor',
|
|
|
- 'dialogue',
|
|
|
- 'frame_type',
|
|
|
- 'scene',
|
|
|
- 'characters',
|
|
|
- 'tail_frame',
|
|
|
- 'emotion',
|
|
|
- 'gender',
|
|
|
- 'speed_ratio',
|
|
|
- 'loudness_ratio',
|
|
|
- 'emotion_scale',
|
|
|
- 'pitch'
|
|
|
- )->get()->map(function ($value) {
|
|
|
+ $segments = DB::table('mp_episode_segments')->where('anime_id', $anime_id)->where('episode_id', getProp($episode, 'episode_id'))->orderBy('segment_number')
|
|
|
+ ->select('*')->get()->map(function ($value) {
|
|
|
return (array)$value;
|
|
|
})->toArray();
|
|
|
|
|
|
@@ -332,6 +312,9 @@ class AnimeService
|
|
|
'loudness_ratio' => getProp($segment, 'loudness_ratio'),
|
|
|
'emotion_scale' => getProp($segment, 'emotion_scale'),
|
|
|
'pitch' => getProp($segment, 'pitch'),
|
|
|
+ 'voice_name' => getProp($segment, 'voice_name'),
|
|
|
+ 'voice_type' => getProp($segment, 'voice_type'),
|
|
|
+ 'voice_audio_url' => getProp($segment, 'voice_audio_url'),
|
|
|
];
|
|
|
}else {
|
|
|
$acts[getProp($segment, 'act_number')]= [
|
|
|
@@ -357,6 +340,9 @@ class AnimeService
|
|
|
'loudness_ratio' => getProp($segment, 'loudness_ratio'),
|
|
|
'emotion_scale' => getProp($segment, 'emotion_scale'),
|
|
|
'pitch' => getProp($segment, 'pitch'),
|
|
|
+ 'voice_name' => getProp($segment, 'voice_name'),
|
|
|
+ 'voice_type' => getProp($segment, 'voice_type'),
|
|
|
+ 'voice_audio_url' => getProp($segment, 'voice_audio_url'),
|
|
|
]
|
|
|
]
|
|
|
];
|
lh