fix: polish bark battle creation flow
This commit is contained in:
@@ -532,7 +532,9 @@ fn build_config_from_message(
|
||||
}
|
||||
}
|
||||
|
||||
pub(super) fn resolve_config_or_default(config: Option<&Match3DCreatorConfigRecord>) -> Match3DConfigJson {
|
||||
pub(super) fn resolve_config_or_default(
|
||||
config: Option<&Match3DCreatorConfigRecord>,
|
||||
) -> Match3DConfigJson {
|
||||
config
|
||||
.map(|config| Match3DConfigJson {
|
||||
theme_text: config.theme_text.clone(),
|
||||
@@ -595,7 +597,10 @@ fn build_match3d_assistant_reply(config: &Match3DConfigJson) -> String {
|
||||
)
|
||||
}
|
||||
|
||||
pub(super) fn build_match3d_assistant_reply_for_turn(config: &Match3DConfigJson, current_turn: u32) -> String {
|
||||
pub(super) fn build_match3d_assistant_reply_for_turn(
|
||||
config: &Match3DConfigJson,
|
||||
current_turn: u32,
|
||||
) -> String {
|
||||
match current_turn {
|
||||
0 => MATCH3D_QUESTION_THEME.to_string(),
|
||||
1 => MATCH3D_QUESTION_CLEAR_COUNT.to_string(),
|
||||
|
||||
@@ -1040,7 +1040,10 @@ pub(super) fn build_fallback_match3d_background_prompt(config: &Match3DConfigJso
|
||||
)
|
||||
}
|
||||
|
||||
pub(super) fn build_fallback_match3d_item_sound_prompt(config: &Match3DConfigJson, item_name: &str) -> String {
|
||||
pub(super) fn build_fallback_match3d_item_sound_prompt(
|
||||
config: &Match3DConfigJson,
|
||||
item_name: &str,
|
||||
) -> String {
|
||||
let theme = config.theme_text.trim();
|
||||
let normalized_theme = if theme.is_empty() { "抓大鹅" } else { theme };
|
||||
normalize_match3d_audio_prompt(
|
||||
@@ -1416,7 +1419,9 @@ fn resolve_match3d_material_cell_crop(
|
||||
crop.to_crop_tuple()
|
||||
}
|
||||
|
||||
pub(super) fn crop_match3d_material_view_edge_matte(image: image::DynamicImage) -> image::DynamicImage {
|
||||
pub(super) fn crop_match3d_material_view_edge_matte(
|
||||
image: image::DynamicImage,
|
||||
) -> image::DynamicImage {
|
||||
let mut image = image.to_rgba8();
|
||||
let (width, height) = image.dimensions();
|
||||
remove_match3d_material_view_edge_matte(image.as_mut(), width as usize, height as usize);
|
||||
|
||||
@@ -134,12 +134,11 @@ pub(super) fn map_match3d_draft_response(
|
||||
draft: Match3DResultDraftRecord,
|
||||
) -> Match3DResultDraftResponse {
|
||||
// 中文注释:session draft 自身也可能携带生成素材快照,不能只依赖 work detail 回读补齐 UI 背景和容器图。
|
||||
let generated_item_assets = parse_match3d_generated_item_assets(
|
||||
draft.generated_item_assets_json.as_deref(),
|
||||
)
|
||||
.into_iter()
|
||||
.map(Match3DGeneratedItemAsset::from)
|
||||
.collect::<Vec<_>>();
|
||||
let generated_item_assets =
|
||||
parse_match3d_generated_item_assets(draft.generated_item_assets_json.as_deref())
|
||||
.into_iter()
|
||||
.map(Match3DGeneratedItemAsset::from)
|
||||
.collect::<Vec<_>>();
|
||||
let background_asset = find_match3d_generated_background_asset(&generated_item_assets);
|
||||
let mut response = Match3DResultDraftResponse {
|
||||
profile_id: draft.profile_id,
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -587,7 +587,10 @@ async fn load_match3d_container_reference_image() -> Result<OpenAiReferenceImage
|
||||
})
|
||||
}
|
||||
|
||||
pub(super) fn build_match3d_background_generation_prompt(config: &Match3DConfigJson, prompt: &str) -> String {
|
||||
pub(super) fn build_match3d_background_generation_prompt(
|
||||
config: &Match3DConfigJson,
|
||||
prompt: &str,
|
||||
) -> String {
|
||||
let style_clause = resolve_match3d_asset_style_prompt(config)
|
||||
.map(|style| format!("整体美术风格参考:{style}。"))
|
||||
.unwrap_or_default();
|
||||
@@ -596,7 +599,10 @@ pub(super) fn build_match3d_background_generation_prompt(config: &Match3DConfigJ
|
||||
)
|
||||
}
|
||||
|
||||
pub(super) fn build_match3d_container_generation_prompt(config: &Match3DConfigJson, prompt: &str) -> String {
|
||||
pub(super) fn build_match3d_container_generation_prompt(
|
||||
config: &Match3DConfigJson,
|
||||
prompt: &str,
|
||||
) -> String {
|
||||
let style_clause = resolve_match3d_asset_style_prompt(config)
|
||||
.map(|style| format!("整体美术风格参考:{style}。"))
|
||||
.unwrap_or_default();
|
||||
@@ -1183,7 +1189,9 @@ pub(super) async fn persist_match3d_generated_bytes(
|
||||
})
|
||||
}
|
||||
|
||||
pub(super) fn require_match3d_oss_client(state: &AppState) -> Result<&platform_oss::OssClient, AppError> {
|
||||
pub(super) fn require_match3d_oss_client(
|
||||
state: &AppState,
|
||||
) -> Result<&platform_oss::OssClient, AppError> {
|
||||
state
|
||||
.oss_client()
|
||||
.ok_or_else(|| match3d_oss_config_error(&state.config))
|
||||
|
||||
Reference in New Issue
Block a user