lh 14 ore fa
parent
commit
31f64da8a1

+ 2 - 1
app/Services/Anime/AnimeService.php

@@ -607,7 +607,7 @@ class AnimeService
             Utils::throwError('1002:请选择剧集');
         }
 
-        $episode = DB::table('mp_anime_episodes')->where('anime_id', $anime_id)->where('id', $episode_id)->select('id as episode_id', 'anime_id', 'episode_number', 'title', 'intro', 'art_style', 'roles', 'scenes', 'is_generated')->first();
+        $episode = DB::table('mp_anime_episodes')->where('anime_id', $anime_id)->where('id', $episode_id)->select('id as episode_id', 'anime_id', 'episode_number', 'title', 'intro', 'art_style', 'roles', 'scenes', 'props', 'is_generated')->first();
         if (!$episode) Utils::throwError('20003:该剧集不存在!');
         $episode = (array)$episode;
         $episode['roles'] = json_decode($episode['roles'], true);
@@ -618,6 +618,7 @@ class AnimeService
         // foreach($episode['scenes'] as &$item) {
         //     if (isset($item['pic_prompt']) && mb_substr($item['pic_prompt'], 0, 3) != '写实。') $item['pic_prompt'] = '写实。'.$item['pic_prompt'];
         // }
+        $episode['props'] = $episode['props'] ? json_decode($episode['props'], true) : [];
         
         // 获取分镜信息
         $segments = DB::table('mp_episode_segments')->where('anime_id', $anime_id)->where('episode_id', getProp($episode, 'episode_id'))->orderBy('act_number')

+ 6 - 0
app/Services/DeepSeek/DeepSeekService.php

@@ -6669,6 +6669,7 @@ Q版卡通风格,头大身小,造型圆润可爱,线条简单,色彩明
                 $boolen5 = DB::table('mp_animes')->where('id', $anime_id)->update([
                     'roles' => json_encode($saveResult['merged_roles'], 256),
                     'scenes' => json_encode($saveResult['merged_scenes'], 256),
+                    'props' => json_encode($saveResult['merged_props'], 256),
                     'updated_at' => $now
                 ]);
                 if ($boolen5 === false) {
@@ -6677,6 +6678,7 @@ Q版卡通风格,头大身小,造型圆润可爱,线条简单,色彩明
 
                 $table_data['roles'] = json_encode($saveResult['merged_roles'], 256);
                 $table_data['scenes'] = json_encode($saveResult['merged_scenes'], 256);
+                $table_data['props'] = json_encode($saveResult['merged_props'], 256);
 
                 $episode_record_content = '确认分镜大纲';
                 if ($content !== '') {
@@ -7639,6 +7641,7 @@ Q版卡通风格,头大身小,造型圆润可爱,线条简单,色彩明
                 $boolen5 = DB::table('mp_animes')->where('id', $anime_id)->update([
                     'roles' => json_encode($saveResult['merged_roles'], 256),
                     'scenes' => json_encode($saveResult['merged_scenes'], 256),
+                    'props' => json_encode($saveResult['merged_props'], 256),
                     'updated_at' => $now
                 ]);
                 if ($boolen5 === false) {
@@ -7647,6 +7650,7 @@ Q版卡通风格,头大身小,造型圆润可爱,线条简单,色彩明
 
                 $table_data['roles'] = json_encode($saveResult['merged_roles'], 256);
                 $table_data['scenes'] = json_encode($saveResult['merged_scenes'], 256);
+                $table_data['props'] = json_encode($saveResult['merged_props'], 256);
 
                 $episode_record_content = '确认分镜大纲';
                 if ($content !== '') {
@@ -7713,6 +7717,7 @@ Q版卡通风格,头大身小,造型圆润可爱,线条简单,色彩明
         $table_data['anime_id'] = $anime_id;
         $table_data['roles'] = json_decode($table_data['roles'], true);
         $table_data['scenes'] = json_decode($table_data['scenes'], true);
+        $table_data['props'] = json_decode($table_data['props'], true);
         unset($table_data['updated_at']);
         unset($table_data['status']);
         yield [
@@ -10087,6 +10092,7 @@ Q版卡通风格,头大身小,造型圆润可爱,线条简单,色彩明
             'art_style' => getProp($script_arr, 'art_style'),
             'roles' => is_array(getProp($script_arr, 'roles')) ? getProp($script_arr, 'roles') : [],
             'scenes' => is_array(getProp($script_arr, 'scenes')) ? getProp($script_arr, 'scenes') : [],
+            'props' => is_array(getProp($script_arr, 'props')) ? getProp($script_arr, 'props') : [],
             'acts' => is_array(getProp($script_arr, 'acts')) ? getProp($script_arr, 'acts') : [],
         ];