Skip to content

Commit 9da9739

Browse files
committed
Package Python server under UnityMcpServer~; remove redundant .meta files; delete old root UnityMcpServer; update editor lookup for tilde path; adjust deploy/restore scripts; remove orphan meta
1 parent c0de38e commit 9da9739

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

60 files changed

+21
-3198
lines changed

UnityMcpBridge/Editor/Helpers/ServerInstaller.cs

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,15 @@ private static bool TryGetEmbeddedServerSource(out string srcPath)
147147
{
148148
string packagePath = pkg.resolvedPath; // e.g., Library/PackageCache/... or local path
149149

150-
// Preferred: UnityMcpServer embedded alongside Editor/Runtime within the package
150+
// Preferred: UnityMcpServer~ embedded alongside Editor/Runtime within the package (ignored by Unity import)
151+
string embeddedTilde = Path.Combine(packagePath, "UnityMcpServer~", "src");
152+
if (Directory.Exists(embeddedTilde) && File.Exists(Path.Combine(embeddedTilde, "server.py")))
153+
{
154+
srcPath = embeddedTilde;
155+
return true;
156+
}
157+
158+
// Fallback: legacy non-tilde folder name inside the package
151159
string embedded = Path.Combine(packagePath, "UnityMcpServer", "src");
152160
if (Directory.Exists(embedded) && File.Exists(Path.Combine(embedded, "server.py")))
153161
{

UnityMcpBridge/Editor/Windows/UnityMcpEditorWindow.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1000,7 +1000,14 @@ private string FindPackagePythonDirectory()
10001000
{
10011001
string packagePath = package.resolvedPath;
10021002

1003-
// Check for local package structure (UnityMcpServer/src)
1003+
// Preferred: check for tilde folder inside package
1004+
string packagedTildeDir = Path.Combine(packagePath, "UnityMcpServer~", "src");
1005+
if (Directory.Exists(packagedTildeDir) && File.Exists(Path.Combine(packagedTildeDir, "server.py")))
1006+
{
1007+
return packagedTildeDir;
1008+
}
1009+
1010+
// Fallback: legacy local package structure (UnityMcpServer/src)
10041011
string localPythonDir = Path.Combine(Path.GetDirectoryName(packagePath), "UnityMcpServer", "src");
10051012
if (Directory.Exists(localPythonDir) && File.Exists(Path.Combine(localPythonDir, "server.py")))
10061013
{

UnityMcpBridge/UnityMcpServer.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

UnityMcpBridge/UnityMcpServer/src.meta

Lines changed: 0 additions & 8 deletions
This file was deleted.

UnityMcpBridge/UnityMcpServer/src/Dockerfile

Lines changed: 0 additions & 27 deletions
This file was deleted.

UnityMcpBridge/UnityMcpServer/src/Dockerfile.meta

Lines changed: 0 additions & 7 deletions
This file was deleted.

UnityMcpBridge/UnityMcpServer/src/__init__.py

Lines changed: 0 additions & 3 deletions
This file was deleted.

UnityMcpBridge/UnityMcpServer/src/__init__.py.meta

Lines changed: 0 additions & 7 deletions
This file was deleted.

UnityMcpBridge/UnityMcpServer/src/config.py

Lines changed: 0 additions & 30 deletions
This file was deleted.

UnityMcpBridge/UnityMcpServer/src/config.py.meta

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)