Skip to content

fix: Remove root portrait-image completely and enforce sprite display via #portrait #300

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
oco777 merged 1 commit into from
Nov 15, 2025
Merged

fix: Remove root portrait-image completely and enforce sprite display via #portrait #300

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions Runtime/Core/FUnityManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
// Updated: 2025-02-14
using System.Collections.Generic;
using System.Linq;
using UnityEngine;
using UnityEngine.UIElements;
using FUnity.Runtime.Integrations.VisualScripting;
Expand Down Expand Up @@ -138,6 +139,9 @@ public sealed class FUnityManager : MonoBehaviour
/// <summary>既定で探索するポートレート要素名。</summary>
private const string PortraitElementName = "portrait";

/// <summary>ポートレート Image 要素に使用する既定の名前。</summary>
private const string PortraitImageElementName = "portrait-image";

/// <summary>既定で探索するルート要素名。</summary>
private const string RootElementName = "root";

Expand Down Expand Up @@ -1128,13 +1132,18 @@ private void ApplyActorSprite(VisualElement element, FUnityActorData data)
return;
}

var rootImage = element.Q<Image>("portrait-image");
if (rootImage != null && rootImage.parent == element)
var root = ResolveActorRootElement(element) ?? element;

var wrongPortraitImage = root.hierarchy.Children()
.OfType<Image>()
.FirstOrDefault(img => img.name == PortraitImageElementName);

if (wrongPortraitImage != null)
{
element.Remove(rootImage);
wrongPortraitImage.RemoveFromHierarchy();
}

var portrait = element.Q<VisualElement>(PortraitElementName);
var portrait = root.Q<VisualElement>(PortraitElementName);
if (portrait == null)
{
return;
Expand All @@ -1144,7 +1153,7 @@ private void ApplyActorSprite(VisualElement element, FUnityActorData data)

var img = new Image()
{
name = "portrait-image",
name = PortraitImageElementName,
scaleMode = ScaleMode.ScaleToFit,
pickingMode = PickingMode.Ignore
};
Expand Down