Fix missing closing brace in SetComponentPropertiesInternal method
Scriptwonder
parent
68efdf1bfe
commit
37db670427
|
|
@ -10,7 +10,6 @@ using UnityEditorInternal;
|
|||
using UnityEngine;
|
||||
using UnityEngine.SceneManagement;
|
||||
using UnityMcpBridge.Editor.Helpers; // For Response class AND GameObjectSerializer
|
||||
using UnityMcpBridge.Runtime.Serialization; // <<< Keep for Converters access? Might not be needed here directly
|
||||
|
||||
namespace UnityMcpBridge.Editor.Tools
|
||||
{
|
||||
|
|
@ -23,10 +22,6 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
|
||||
public static object HandleCommand(JObject @params)
|
||||
{
|
||||
// --- DEBUG --- Log the raw parameter value ---
|
||||
// JToken rawIncludeFlag = @params["includeNonPublicSerialized"];
|
||||
// Debug.Log($"[HandleCommand Debug] Raw includeNonPublicSerialized parameter: Type={rawIncludeFlag?.Type.ToString() ?? "Null"}, Value={rawIncludeFlag?.ToString() ?? "N/A"}");
|
||||
// --- END DEBUG ---
|
||||
|
||||
string action = @params["action"]?.ToString().ToLower();
|
||||
if (string.IsNullOrEmpty(action))
|
||||
|
|
@ -219,17 +214,22 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
$"[ManageGameObject.Create] Provided prefabPath '{prefabPath}' does not end with .prefab. Assuming it's missing and appending."
|
||||
);
|
||||
prefabPath += ".prefab";
|
||||
// Note: This path might still not exist, AssetDatabase.LoadAssetAtPath will handle that.
|
||||
}
|
||||
// The logic above now handles finding or assuming the .prefab extension.
|
||||
|
||||
GameObject prefabAsset = AssetDatabase.LoadAssetAtPath<GameObject>(prefabPath);
|
||||
if (prefabAsset != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
// Instantiate the prefab, initially place it at the root
|
||||
// Parent will be set later if specified
|
||||
newGo = PrefabUtility.InstantiatePrefab(prefabAsset) as GameObject;
|
||||
|
||||
if (newGo == null)
|
||||
{
|
||||
// This might happen if the asset exists but isn't a valid GameObject prefab somehow
|
||||
Debug.LogError(
|
||||
$"[ManageGameObject.Create] Failed to instantiate prefab at '{prefabPath}', asset might be corrupted or not a GameObject."
|
||||
);
|
||||
|
|
@ -237,12 +237,12 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
$"Failed to instantiate prefab at '{prefabPath}'."
|
||||
);
|
||||
}
|
||||
|
||||
// Name the instance based on the 'name' parameter, not the prefab's default name
|
||||
if (!string.IsNullOrEmpty(name))
|
||||
{
|
||||
newGo.name = name;
|
||||
}
|
||||
|
||||
// Register Undo for prefab instantiation
|
||||
Undo.RegisterCreatedObjectUndo(
|
||||
newGo,
|
||||
$"Instantiate Prefab '{prefabAsset.name}' as '{newGo.name}'"
|
||||
|
|
@ -260,9 +260,12 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
}
|
||||
else
|
||||
{
|
||||
// Only return error if prefabPath was specified but not found.
|
||||
// If prefabPath was empty/null, we proceed to create primitive/empty.
|
||||
Debug.LogWarning(
|
||||
$"[ManageGameObject.Create] Prefab asset not found at path: '{prefabPath}'. Will proceed to create new object if specified."
|
||||
);
|
||||
// Do not return error here, allow fallback to primitive/empty creation
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -277,6 +280,7 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
PrimitiveType type = (PrimitiveType)
|
||||
Enum.Parse(typeof(PrimitiveType), primitiveType, true);
|
||||
newGo = GameObject.CreatePrimitive(type);
|
||||
// Set name *after* creation for primitives
|
||||
if (!string.IsNullOrEmpty(name))
|
||||
newGo.name = name;
|
||||
else
|
||||
|
|
@ -309,18 +313,21 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
newGo = new GameObject(name);
|
||||
createdNewObject = true;
|
||||
}
|
||||
|
||||
// Record creation for Undo *only* if we created a new object
|
||||
if (createdNewObject)
|
||||
{
|
||||
Undo.RegisterCreatedObjectUndo(newGo, $"Create GameObject '{newGo.name}'");
|
||||
}
|
||||
}
|
||||
|
||||
// --- Common Setup (Parent, Transform, Tag, Components) - Applied AFTER object exists ---
|
||||
if (newGo == null)
|
||||
{
|
||||
// Should theoretically not happen if logic above is correct, but safety check.
|
||||
return Response.Error("Failed to create or instantiate the GameObject.");
|
||||
}
|
||||
|
||||
// Record potential changes to the existing prefab instance or the new GO
|
||||
// Record transform separately in case parent changes affect it
|
||||
Undo.RecordObject(newGo.transform, "Set GameObject Transform");
|
||||
Undo.RecordObject(newGo, "Set GameObject Properties");
|
||||
|
||||
|
|
@ -352,6 +359,7 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
// Set Tag (added for create action)
|
||||
if (!string.IsNullOrEmpty(tag))
|
||||
{
|
||||
// Similar logic as in ModifyGameObject for setting/creating tags
|
||||
string tagToSet = string.IsNullOrEmpty(tag) ? "Untagged" : tag;
|
||||
try
|
||||
{
|
||||
|
|
@ -448,13 +456,16 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
if (createdNewObject && saveAsPrefab)
|
||||
{
|
||||
string finalPrefabPath = prefabPath; // Use a separate variable for saving path
|
||||
// This check should now happen *before* attempting to save
|
||||
if (string.IsNullOrEmpty(finalPrefabPath))
|
||||
{
|
||||
// Clean up the created object before returning error
|
||||
UnityEngine.Object.DestroyImmediate(newGo);
|
||||
return Response.Error(
|
||||
"'prefabPath' is required when 'saveAsPrefab' is true and creating a new object."
|
||||
);
|
||||
}
|
||||
// Ensure the *saving* path ends with .prefab
|
||||
if (!finalPrefabPath.EndsWith(".prefab", StringComparison.OrdinalIgnoreCase))
|
||||
{
|
||||
Debug.Log(
|
||||
|
|
@ -465,6 +476,7 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
|
||||
try
|
||||
{
|
||||
// Ensure directory exists using the final saving path
|
||||
string directoryPath = System.IO.Path.GetDirectoryName(finalPrefabPath);
|
||||
if (
|
||||
!string.IsNullOrEmpty(directoryPath)
|
||||
|
|
@ -477,7 +489,7 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
$"[ManageGameObject.Create] Created directory for prefab: {directoryPath}"
|
||||
);
|
||||
}
|
||||
|
||||
// Use SaveAsPrefabAssetAndConnect with the final saving path
|
||||
finalInstance = PrefabUtility.SaveAsPrefabAssetAndConnect(
|
||||
newGo,
|
||||
finalPrefabPath,
|
||||
|
|
@ -486,6 +498,7 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
|
||||
if (finalInstance == null)
|
||||
{
|
||||
// Destroy the original if saving failed somehow (shouldn't usually happen if path is valid)
|
||||
UnityEngine.Object.DestroyImmediate(newGo);
|
||||
return Response.Error(
|
||||
$"Failed to save GameObject '{name}' as prefab at '{finalPrefabPath}'. Check path and permissions."
|
||||
|
|
@ -494,16 +507,21 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
Debug.Log(
|
||||
$"[ManageGameObject.Create] GameObject '{name}' saved as prefab to '{finalPrefabPath}' and instance connected."
|
||||
);
|
||||
// Mark the new prefab asset as dirty? Not usually necessary, SaveAsPrefabAsset handles it.
|
||||
// EditorUtility.SetDirty(finalInstance); // Instance is handled by SaveAsPrefabAssetAndConnect
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
// Clean up the instance if prefab saving fails
|
||||
UnityEngine.Object.DestroyImmediate(newGo); // Destroy the original attempt
|
||||
return Response.Error($"Error saving prefab '{finalPrefabPath}': {e.Message}");
|
||||
}
|
||||
}
|
||||
|
||||
// Select the instance in the scene (either prefab instance or newly created/saved one)
|
||||
Selection.activeGameObject = finalInstance;
|
||||
|
||||
// Determine appropriate success message using the potentially updated or original path
|
||||
string messagePrefabPath =
|
||||
finalInstance == null
|
||||
? originalPrefabPath
|
||||
|
|
@ -529,6 +547,7 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
}
|
||||
|
||||
// Use the new serializer helper
|
||||
//return Response.Success(successMessage, GetGameObjectData(finalInstance));
|
||||
return Response.Success(successMessage, Helpers.GameObjectSerializer.GetGameObjectData(finalInstance));
|
||||
}
|
||||
|
||||
|
|
@ -546,6 +565,7 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
);
|
||||
}
|
||||
|
||||
// Record state for Undo *before* modifications
|
||||
Undo.RecordObject(targetGo.transform, "Modify GameObject Transform");
|
||||
Undo.RecordObject(targetGo, "Modify GameObject Properties");
|
||||
|
||||
|
|
@ -564,6 +584,7 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
if (parentToken != null)
|
||||
{
|
||||
GameObject newParentGo = FindObjectInternal(parentToken, "by_id_or_name_or_path");
|
||||
// Check for hierarchy loops
|
||||
if (
|
||||
newParentGo == null
|
||||
&& !(
|
||||
|
|
@ -600,8 +621,11 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
|
||||
// Change Tag (using consolidated 'tag' parameter)
|
||||
string tag = @params["tag"]?.ToString();
|
||||
// Only attempt to change tag if a non-null tag is provided and it's different from the current one.
|
||||
// Allow setting an empty string to remove the tag (Unity uses "Untagged").
|
||||
if (tag != null && targetGo.tag != tag)
|
||||
{
|
||||
// Ensure the tag is not empty, if empty, it means "Untagged" implicitly
|
||||
string tagToSet = string.IsNullOrEmpty(tag) ? "Untagged" : tag;
|
||||
try
|
||||
{
|
||||
|
|
@ -610,6 +634,7 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
}
|
||||
catch (UnityException ex)
|
||||
{
|
||||
// Check if the error is specifically because the tag doesn't exist
|
||||
if (ex.Message.Contains("is not defined"))
|
||||
{
|
||||
Debug.LogWarning(
|
||||
|
|
@ -617,7 +642,12 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
);
|
||||
try
|
||||
{
|
||||
// Attempt to create the tag using internal utility
|
||||
InternalEditorUtility.AddTag(tagToSet);
|
||||
// Wait a frame maybe? Not strictly necessary but sometimes helps editor updates.
|
||||
// yield return null; // Cannot yield here, editor script limitation
|
||||
|
||||
// Retry setting the tag immediately after creation
|
||||
targetGo.tag = tagToSet;
|
||||
modified = true;
|
||||
Debug.Log(
|
||||
|
|
@ -626,6 +656,7 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
}
|
||||
catch (Exception innerEx)
|
||||
{
|
||||
// Handle failure during tag creation or the second assignment attempt
|
||||
Debug.LogError(
|
||||
$"[ManageGameObject] Failed to create or assign tag '{tagToSet}' after attempting creation: {innerEx.Message}"
|
||||
);
|
||||
|
|
@ -636,6 +667,7 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
}
|
||||
else
|
||||
{
|
||||
// If the exception was for a different reason, return the original error
|
||||
return Response.Error($"Failed to set tag to '{tagToSet}': {ex.Message}.");
|
||||
}
|
||||
}
|
||||
|
|
@ -681,12 +713,14 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
}
|
||||
|
||||
// --- Component Modifications ---
|
||||
// Note: These might need more specific Undo recording per component
|
||||
|
||||
// Remove Components
|
||||
if (@params["componentsToRemove"] is JArray componentsToRemoveArray)
|
||||
{
|
||||
foreach (var compToken in componentsToRemoveArray)
|
||||
{
|
||||
// ... (parsing logic as in CreateGameObject) ...
|
||||
string typeName = compToken.ToString();
|
||||
if (!string.IsNullOrEmpty(typeName))
|
||||
{
|
||||
|
|
@ -747,6 +781,10 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
if (!modified)
|
||||
{
|
||||
// Use the new serializer helper
|
||||
// return Response.Success(
|
||||
// $"No modifications applied to GameObject '{targetGo.name}'.",
|
||||
// GetGameObjectData(targetGo));
|
||||
|
||||
return Response.Success(
|
||||
$"No modifications applied to GameObject '{targetGo.name}'.",
|
||||
Helpers.GameObjectSerializer.GetGameObjectData(targetGo)
|
||||
|
|
@ -759,6 +797,10 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
$"GameObject '{targetGo.name}' modified successfully.",
|
||||
Helpers.GameObjectSerializer.GetGameObjectData(targetGo)
|
||||
);
|
||||
// return Response.Success(
|
||||
// $"GameObject '{targetGo.name}' modified successfully.",
|
||||
// GetGameObjectData(targetGo));
|
||||
|
||||
}
|
||||
|
||||
private static object DeleteGameObject(JToken targetToken, string searchMethod)
|
||||
|
|
@ -821,11 +863,12 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
}
|
||||
|
||||
// Use the new serializer helper
|
||||
//var results = foundObjects.Select(go => GetGameObjectData(go)).ToList();
|
||||
var results = foundObjects.Select(go => Helpers.GameObjectSerializer.GetGameObjectData(go)).ToList();
|
||||
return Response.Success($"Found {results.Count} GameObject(s).", results);
|
||||
}
|
||||
|
||||
private static object GetComponentsFromTarget(string target, string searchMethod, bool includeNonPublicSerialized)
|
||||
private static object GetComponentsFromTarget(string target, string searchMethod, bool includeNonPublicSerialized = true)
|
||||
{
|
||||
GameObject targetGo = FindObjectInternal(target, searchMethod);
|
||||
if (targetGo == null)
|
||||
|
|
@ -1443,6 +1486,8 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
Debug.LogWarning(
|
||||
$"[ManageGameObject] Could not set property '{propName}' on component '{compName}' ('{targetComponent.GetType().Name}'). Property might not exist, be read-only, or type mismatch."
|
||||
);
|
||||
// Optionally return an error here instead of just logging
|
||||
// return Response.Error($"Could not set property '{propName}' on component '{compName}'.");
|
||||
}
|
||||
}
|
||||
catch (Exception e)
|
||||
|
|
@ -1450,6 +1495,8 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
Debug.LogError(
|
||||
$"[ManageGameObject] Error setting property '{propName}' on '{compName}': {e.Message}"
|
||||
);
|
||||
// Optionally return an error here
|
||||
// return Response.Error($"Error setting property '{propName}' on '{compName}': {e.Message}");
|
||||
}
|
||||
}
|
||||
EditorUtility.SetDirty(targetComponent);
|
||||
|
|
@ -1488,6 +1535,7 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
try
|
||||
{
|
||||
// Handle special case for materials with dot notation (material.property)
|
||||
// Examples: material.color, sharedMaterial.color, materials[0].color
|
||||
if (memberName.Contains('.') || memberName.Contains('['))
|
||||
{
|
||||
// Pass the inputSerializer down for nested conversions
|
||||
|
|
@ -1539,6 +1587,7 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
/// Sets a nested property using dot notation (e.g., "material.color") or array access (e.g., "materials[0]")
|
||||
/// </summary>
|
||||
// Pass the input serializer for conversions
|
||||
//Using the serializer helper
|
||||
private static bool SetNestedProperty(object target, string path, JToken value, JsonSerializer inputSerializer)
|
||||
{
|
||||
try
|
||||
|
|
@ -1560,6 +1609,7 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
bool isArray = false;
|
||||
int arrayIndex = -1;
|
||||
|
||||
// Check if this part contains array indexing
|
||||
if (part.Contains("["))
|
||||
{
|
||||
int startBracket = part.IndexOf('[');
|
||||
|
|
@ -1577,7 +1627,7 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Get the property/field
|
||||
PropertyInfo propInfo = currentType.GetProperty(part, flags);
|
||||
FieldInfo fieldInfo = null;
|
||||
if (propInfo == null)
|
||||
|
|
@ -1592,11 +1642,12 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
}
|
||||
}
|
||||
|
||||
// Get the value
|
||||
currentObject =
|
||||
propInfo != null
|
||||
? propInfo.GetValue(currentObject)
|
||||
: fieldInfo.GetValue(currentObject);
|
||||
|
||||
//Need to stop if current property is null
|
||||
if (currentObject == null)
|
||||
{
|
||||
Debug.LogWarning(
|
||||
|
|
@ -1604,7 +1655,7 @@ namespace UnityMcpBridge.Editor.Tools
|
|||
);
|
||||
return false;
|
||||
}
|
||||
|
||||
// If this part was an array or list, access the specific index
|
||||
if (isArray)
|
||||
{
|
||||
if (currentObject is Material[])
|
||||
|
|
|
|||
Loading…
Reference in New Issue