fix: address screenshot PR feedback

Author: KennerMiner

MCPForUnity/Editor/Tools/ManageScene.cs

@@ -602,23 +602,7 @@ private static object CaptureScreenshot(SceneCommand cmd)
 
                     AssetDatabase.ImportAsset(result.AssetsRelativePath, ImportAssetOptions.ForceSynchronousImport);
                     string message = $"Screenshot captured to '{result.AssetsRelativePath}' (camera: {targetCamera.name}).";
-
-                    var data = new Dictionary<string, object>
-                    {
-                        { "path", result.AssetsRelativePath },
-                        { "fullPath", result.FullPath },
-                        { "superSize", result.SuperSize },
-                        { "isAsync", false },
-                        { "camera", targetCamera.name },
-                        { "captureSource", "game_view" },
-                    };
-                    if (includeImage && result.ImageBase64 != null)
-                    {
-                        data["imageBase64"] = result.ImageBase64;
-                        data["imageWidth"] = result.ImageWidth;
-                        data["imageHeight"] = result.ImageHeight;
-                    }
-                    return new SuccessResponse(message, data);
+                    return new SuccessResponse(message, BuildScreenshotResponseData(result, targetCamera.name, includeImage));
                 }
 
                 if (includeImage && Application.isPlaying)
@@ -632,23 +616,7 @@ private static object CaptureScreenshot(SceneCommand cmd)
                     AssetDatabase.ImportAsset(result.AssetsRelativePath, ImportAssetOptions.ForceSynchronousImport);
                     string cameraName = Camera.main != null ? Camera.main.name : "composited";
                     string message = $"Screenshot captured to '{result.AssetsRelativePath}' (camera: {cameraName}).";
-
-                    var data = new Dictionary<string, object>
-                    {
-                        { "path", result.AssetsRelativePath },
-                        { "fullPath", result.FullPath },
-                        { "superSize", result.SuperSize },
-                        { "isAsync", false },
-                        { "camera", cameraName },
-                        { "captureSource", "game_view" },
-                    };
-                    if (result.ImageBase64 != null)
-                    {
-                        data["imageBase64"] = result.ImageBase64;
-                        data["imageWidth"] = result.ImageWidth;
-                        data["imageHeight"] = result.ImageHeight;
-                    }
-                    return new SuccessResponse(message, data);
+                    return new SuccessResponse(message, BuildScreenshotResponseData(result, cameraName, includeImage: true));
                 }
 
                 if (includeImage)
@@ -673,23 +641,7 @@ private static object CaptureScreenshot(SceneCommand cmd)
 
                     AssetDatabase.ImportAsset(result.AssetsRelativePath, ImportAssetOptions.ForceSynchronousImport);
                     string message = $"Screenshot captured to '{result.AssetsRelativePath}' (camera: {targetCamera.name}).";
-
-                    var data = new Dictionary<string, object>
-                    {
-                        { "path", result.AssetsRelativePath },
-                        { "fullPath", result.FullPath },
-                        { "superSize", result.SuperSize },
-                        { "isAsync", false },
-                        { "camera", targetCamera.name },
-                        { "captureSource", "game_view" },
-                    };
-                    if (includeImage && result.ImageBase64 != null)
-                    {
-                        data["imageBase64"] = result.ImageBase64;
-                        data["imageWidth"] = result.ImageWidth;
-                        data["imageHeight"] = result.ImageHeight;
-                    }
-                    return new SuccessResponse(message, data);
+                    return new SuccessResponse(message, BuildScreenshotResponseData(result, targetCamera.name, includeImage));
                 }
 
                 // Default path: use ScreenCapture API if available, camera fallback otherwise
@@ -746,6 +698,31 @@ private static object CaptureScreenshot(SceneCommand cmd)
             }
         }
 
+        private static Dictionary<string, object> BuildScreenshotResponseData(
+            ScreenshotCaptureResult result,
+            string cameraName,
+            bool includeImage)
+        {
+            var data = new Dictionary<string, object>
+            {
+                { "path", result.AssetsRelativePath },
+                { "fullPath", result.FullPath },
+                { "superSize", result.SuperSize },
+                { "isAsync", false },
+                { "camera", cameraName },
+                { "captureSource", "game_view" },
+            };
+
+            if (includeImage && result.ImageBase64 != null)
+            {
+                data["imageBase64"] = result.ImageBase64;
+                data["imageWidth"] = result.ImageWidth;
+                data["imageHeight"] = result.ImageHeight;
+            }
+
+            return data;
+        }
+
         private static object CaptureSceneViewScreenshot(
             SceneCommand cmd,
             string fileName,

MCPForUnity/Runtime/Helpers/ScreenshotUtility.cs

@@ -236,6 +236,15 @@ public static ScreenshotCaptureResult CaptureComposited(
             bool includeImage = false,
             int maxResolution = 0)
         {
+            if (!IsScreenCaptureModuleAvailable)
+            {
+                var fallbackCamera = FindAvailableCamera();
+                if (fallbackCamera != null)
+                    return CaptureFromCameraToAssetsFolder(fallbackCamera, fileName, superSize, ensureUniqueFileName, includeImage, maxResolution);
+
+                throw new InvalidOperationException("ScreenCapture module is unavailable and no fallback camera found.");
+            }
+
             ScreenshotCaptureResult result = PrepareCaptureResult(fileName, superSize, ensureUniqueFileName, isAsync: false);
             Texture2D tex = null;
             Texture2D downscaled = null;
@@ -247,7 +256,7 @@ public static ScreenshotCaptureResult CaptureComposited(
                 if (tex == null)
                 {
                     // Fallback to camera-based if ScreenCapture fails
-                    var cam = Camera.main;
+                    var cam = FindAvailableCamera();
                     if (cam != null)
                         return CaptureFromCameraToAssetsFolder(cam, fileName, superSize, ensureUniqueFileName, includeImage, maxResolution);
                     throw new InvalidOperationException("ScreenCapture.CaptureScreenshotAsTexture returned null and no fallback camera available.");