@atelierai/uco 1.0.6 → 1.0.8
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +32 -0
- package/README.md +7 -8
- package/bin/server.mjs +1 -1
- package/bin/stub-plugin.mjs +3 -3
- package/dist/codegen/coerce.js +1 -1
- package/dist/codegen/coerce.js.map +1 -1
- package/dist/codegen/emit.js +2 -2
- package/dist/codegen/emit.js.map +1 -1
- package/dist/codegen/refs.js +1 -1
- package/dist/codegen/refs.js.map +1 -1
- package/dist/codegen/types.js +1 -1
- package/dist/codegen/types.js.map +1 -1
- package/dist/commands/call.js +1 -1
- package/dist/commands/call.js.map +1 -1
- package/dist/commands/devops/configure.js +1 -1
- package/dist/commands/devops/configure.js.map +1 -1
- package/dist/commands/devops/index.js +0 -4
- package/dist/commands/devops/index.js.map +1 -1
- package/dist/commands/devops/install-plugin.js +1 -1
- package/dist/commands/devops/install-plugin.js.map +1 -1
- package/dist/commands/devops/open.js +7 -7
- package/dist/commands/devops/open.js.map +1 -1
- package/dist/commands/devops/status.js +3 -3
- package/dist/commands/devops/status.js.map +1 -1
- package/dist/commands/exec.js +1 -1
- package/dist/commands/exec.js.map +1 -1
- package/dist/commands/install.js +2 -2
- package/dist/commands/install.js.map +1 -1
- package/dist/commands/prompt.js +2 -2
- package/dist/commands/prompt.js.map +1 -1
- package/dist/commands/resource.js +2 -2
- package/dist/commands/resource.js.map +1 -1
- package/dist/commands/update.js +1 -26
- package/dist/commands/update.js.map +1 -1
- package/dist/config/port.js +2 -2
- package/dist/config/port.js.map +1 -1
- package/dist/config/resolve.d.ts +1 -2
- package/dist/config/resolve.js +0 -12
- package/dist/config/resolve.js.map +1 -1
- package/dist/devops/lib/configure.d.ts +1 -1
- package/dist/devops/lib/configure.js +2 -2
- package/dist/devops/lib/configure.js.map +1 -1
- package/dist/devops/lib/install-plugin.d.ts +1 -1
- package/dist/devops/lib/install-plugin.js +1 -1
- package/dist/devops/lib/install-plugin.js.map +1 -1
- package/dist/devops/lib/install.d.ts +2 -2
- package/dist/devops/lib/install.js +5 -5
- package/dist/devops/lib/install.js.map +1 -1
- package/dist/devops/lib/open.js +11 -32
- package/dist/devops/lib/open.js.map +1 -1
- package/dist/devops/lib/remove-plugin.d.ts +1 -1
- package/dist/devops/lib/remove-plugin.js +3 -3
- package/dist/devops/lib/remove-plugin.js.map +1 -1
- package/dist/devops/lib/run-tool.d.ts +2 -2
- package/dist/devops/lib/run-tool.js +2 -2
- package/dist/devops/lib/types.d.ts +17 -54
- package/dist/devops/lib/types.js +2 -2
- package/dist/devops/lib/types.js.map +1 -1
- package/dist/devops/lib/update.d.ts +0 -15
- package/dist/devops/lib/update.js +2 -91
- package/dist/devops/lib/update.js.map +1 -1
- package/dist/devops/utils/agents.d.ts +0 -28
- package/dist/devops/utils/agents.js +0 -462
- package/dist/devops/utils/agents.js.map +1 -1
- package/dist/devops/utils/config.d.ts +9 -18
- package/dist/devops/utils/config.js +7 -20
- package/dist/devops/utils/config.js.map +1 -1
- package/dist/devops/utils/editor-cache.js +1 -1
- package/dist/devops/utils/editor-cache.js.map +1 -1
- package/dist/devops/utils/launch-error-dismiss.d.ts +2 -2
- package/dist/devops/utils/launch-error-dismiss.js +5 -5
- package/dist/devops/utils/manifest.d.ts +2 -2
- package/dist/devops/utils/manifest.js +3 -3
- package/dist/devops/utils/manifest.js.map +1 -1
- package/dist/devops/utils/port.d.ts +1 -1
- package/dist/devops/utils/port.js +1 -1
- package/dist/devops/utils/probe.d.ts +1 -1
- package/dist/devops/utils/probe.js +1 -1
- package/dist/devops/utils/ui.js +2 -2
- package/dist/devops/utils/ui.js.map +1 -1
- package/dist/devops/utils/unity-editor.js +4 -4
- package/dist/devops/utils/unity-editor.js.map +1 -1
- package/dist/devops/utils/unity-hub.js +1 -1
- package/dist/devops/utils/unity-hub.js.map +1 -1
- package/dist/devops/utils/unity-shutdown.d.ts +1 -1
- package/dist/devops/utils/unity-shutdown.js +1 -1
- package/dist/devops/utils/update-check.js +3 -3
- package/dist/devops/utils/update-check.js.map +1 -1
- package/dist/devops/utils/vendor.d.ts +2 -2
- package/dist/devops/utils/vendor.js +4 -4
- package/dist/devops/utils/vendor.js.map +1 -1
- package/dist/generated/tools.js +1 -1
- package/dist/generated/tools.js.map +1 -1
- package/dist/program.js +3 -3
- package/dist/program.js.map +1 -1
- package/dist/server/app.d.ts +5 -5
- package/dist/server/app.js +3 -3
- package/dist/server/app.js.map +1 -1
- package/dist/server/index.d.ts +2 -2
- package/dist/server/index.js +2 -2
- package/dist/server/index.js.map +1 -1
- package/dist/server/rest/auth.d.ts +1 -1
- package/dist/server/rest/auth.js +3 -3
- package/dist/server/rest/auth.js.map +1 -1
- package/dist/server/rest/context.d.ts +2 -2
- package/dist/server/rest/forward.d.ts +2 -2
- package/dist/server/session/store.d.ts +3 -3
- package/dist/server/session/store.js +4 -4
- package/dist/server/session/store.js.map +1 -1
- package/dist/server/stub-client/scenarios.js +8 -8
- package/dist/server/stub-client/scenarios.js.map +1 -1
- package/dist/server/types.d.ts +11 -11
- package/dist/server/types.js +9 -9
- package/dist/server/types.js.map +1 -1
- package/dist/server/ws/hub.d.ts +8 -8
- package/dist/server/ws/hub.js +13 -13
- package/dist/server/ws/hub.js.map +1 -1
- package/dist/server/ws/rpc.d.ts +3 -3
- package/dist/server/ws/rpc.js +4 -4
- package/dist/server/ws/rpc.js.map +1 -1
- package/dist/transport/index.d.ts +1 -1
- package/dist/transport/index.js +3 -3
- package/dist/transport/index.js.map +1 -1
- package/dist/transport/rest.js +1 -1
- package/dist/transport/rest.js.map +1 -1
- package/docs/INSTALL.zh-CN.md +2 -3
- package/package.json +1 -1
- package/skills/uco-setup/SKILL.md +1 -1
- package/skills/unity-editor/references/diagnostics.md +24 -24
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/DependencyResolver/NuGetConfig.cs +132 -132
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/DependencyResolver/NuGetDependencyResolver.cs +237 -237
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/DependencyResolver/NuGetDownloader.cs +82 -82
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/API/Resource/MenuItems.cs +247 -247
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/API/Resource/ToolGroups.cs +153 -153
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/API/SystemTool/Skills.Create.SkillBody.cs +155 -155
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/API/Tool/Console.GetLogs.cs +95 -95
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/API/Tool/Docs.HttpFetcher.cs +139 -139
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/API/Tool/Instance.ListAll.cs +72 -72
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/API/Tool/PathReadHelper.cs +106 -106
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/API/Tool/Script.Validate.cs +252 -252
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/API/Tool/Tests/TestResultCollector.cs +537 -537
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/API/Tool/Tests.cs +400 -400
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/Branding/ProductInfo.cs +62 -62
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/CopilotServerManager.cs +1034 -1034
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/Skills/Skill_InitialSetup.cs +197 -197
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/Startup.Editor.cs +201 -201
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/Startup.cs +67 -67
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/UI/Components/ExtensionPanel.cs +379 -379
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/UI/MenuItems.cs +72 -72
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/UI/UnityCopilotProjectSettingsProvider.cs +64 -64
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/UI/Window/CopilotListWindowBase.cs +393 -393
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/UI/Window/CopilotWindowBase.cs +113 -113
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/UI/Window/MainWindowEditor.Connection.cs +3 -3
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/UI/Window/MainWindowEditor.CopilotFeatures.cs +195 -195
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/UI/Window/MainWindowEditor.CopilotServer.cs +372 -372
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/UI/Window/MainWindowEditor.CreateGUI.cs +354 -354
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/UI/Window/MainWindowEditor.cs +78 -78
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/UI/Window/MainWindowInitializer.cs +47 -47
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/UI/Window/SerializationCheckWindow.cs +190 -190
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/UnityCopilotPluginEditor.Build.cs +91 -91
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/UnityCopilotPluginEditor.Config.cs +298 -298
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/UnityCopilotPluginEditor.Static.cs +296 -296
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/UnityCopilotPluginEditor.cs +69 -69
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/Utils/PackageUtils.cs +168 -168
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/Utils/PrefsKeyMigration.cs +119 -119
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/Utils/SafeDefaultsGuard.cs +180 -180
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/Utils/ScriptUtils.cs +229 -229
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/Utils/ToolsManifestGenerator.cs +200 -200
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/Utils/UnityAuthoringAdapters.cs +1467 -1467
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/Utils/UnityAuthoringSafetyReloadGuard.cs +65 -65
- package/vendor/plugin/com.atelierai.unity.copilot/Editor/Scripts/Utils/UnityCopilotUpdateProjectSettings.cs +66 -66
- package/vendor/plugin/com.atelierai.unity.copilot/Plugins/ReflectorNet.dll +0 -0
- package/vendor/plugin/com.atelierai.unity.copilot/Plugins/Uco.Framework.Common.dll +0 -0
- package/vendor/plugin/com.atelierai.unity.copilot/Plugins/Uco.Framework.dll +0 -0
- package/vendor/plugin/com.atelierai.unity.copilot/Runtime/Converter/Json/Structures/EntityIdConverter.cs +120 -120
- package/vendor/plugin/com.atelierai.unity.copilot/Runtime/Data/GameObjectMetadata.cs +110 -110
- package/vendor/plugin/com.atelierai.unity.copilot/Runtime/Data/GameObjectMetadata.pre-Unity.6.5.cs +110 -110
- package/vendor/plugin/com.atelierai.unity.copilot/Runtime/Unity/Logs/FileLogStorage.cs +547 -547
- package/vendor/plugin/com.atelierai.unity.copilot/Runtime/UnityCopilotPlugin.Build.cs +243 -243
- package/vendor/plugin/com.atelierai.unity.copilot/Runtime/UnityCopilotPlugin.Config.cs +175 -175
- package/vendor/plugin/com.atelierai.unity.copilot/Runtime/UnityCopilotPlugin.cs +295 -295
- package/vendor/plugin/com.atelierai.unity.copilot/Runtime/UnityCopilotPluginBuilder.cs +105 -105
- package/vendor/plugin/com.atelierai.unity.copilot/Runtime/UnityCopilotPluginRuntime.Static.cs +155 -155
- package/vendor/plugin/com.atelierai.unity.copilot/Runtime/UnityCopilotPluginRuntime.cs +59 -59
- package/vendor/plugin/com.atelierai.unity.copilot/Runtime/Utils/EnvironmentUtils.cs +368 -368
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/AtomicApi/AtomicApiTestFixtures.cs +99 -99
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/AtomicApi/TryModifyAtTests.cs +227 -227
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/AuthoringSafetyPilotTests.cs +1050 -1050
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/DependencyResolver/NuGetLegacyMigrationTests.cs +304 -304
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/Environment/EnvironmentUtilsTests.cs +4 -4
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/ReflectionConverter/BlacklistTypeTests.cs +416 -416
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/ReflectionConverter/DataFieldScriptableObjectPopulationTests.cs +172 -172
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/ReflectionConverter/DataFieldScriptableObjectPopulationTests.pre-Unity.6.5.cs +169 -169
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/ReflectionConverter/DataPopulationTests.cs +182 -182
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/ReflectionConverter/DataPopulationTests.pre-Unity.6.5.cs +179 -179
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/ReflectionConverter/DataPropertyPopulationTests.cs +175 -175
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/ReflectionConverter/DataPropertyPopulationTests.pre-Unity.6.5.cs +174 -174
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/ReflectionConverter/DataPropertyScriptableObjectPopulationTests.cs +171 -171
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/ReflectionConverter/DataPropertyScriptableObjectPopulationTests.pre-Unity.6.5.cs +170 -170
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/Tool/Assets/AssetsCreateFolderTests.cs +243 -243
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/Tool/Assets/AssetsMaterialTests.cs +101 -101
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/Tool/Assets/AssetsPrefabCreateTests.cs +348 -348
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/Tool/Assets/AssetsPrefabCreateTests.pre-Unity.6.5.cs +348 -348
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/Tool/Assets/AssetsShaderTests.cs +194 -194
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/Tool/PathBasedToolTests.cs +573 -573
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/Tool/PathBasedToolTests.pre-Unity.6.5.cs +513 -513
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/Tool/Screenshot/ScreenshotCameraTests.cs +154 -154
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/Tool/Screenshot/ScreenshotCameraTests.pre-Unity.6.5.cs +154 -154
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/Tool/Screenshot/ScreenshotGameViewTests.cs +164 -164
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/Tool/Screenshot/ScreenshotSceneViewTests.cs +155 -155
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/Tool/ToolParameterTests.cs +56 -56
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/Tool/ToolThreadSafetyTests.cs +651 -651
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/Tool/ToolThreadSafetyTests.pre-Unity.6.5.cs +651 -651
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/ToolBatchExecutionIntegrationTests.cs +407 -407
- package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/{McpPluginTests.cs → UcoPluginTests.cs} +105 -105
- package/vendor/plugin/com.atelierai.unity.copilot/package.json +1 -1
- package/dist/commands/devops/login.d.ts +0 -2
- package/dist/commands/devops/login.js +0 -29
- package/dist/commands/devops/login.js.map +0 -1
- package/dist/commands/devops/setup-mcp.d.ts +0 -2
- package/dist/commands/devops/setup-mcp.js +0 -41
- package/dist/commands/devops/setup-mcp.js.map +0 -1
- package/dist/devops/commands-upstream/bootstrap-local.d.ts +0 -17
- package/dist/devops/commands-upstream/bootstrap-local.js +0 -87
- package/dist/devops/commands-upstream/bootstrap-local.js.map +0 -1
- package/dist/devops/commands-upstream/close.d.ts +0 -57
- package/dist/devops/commands-upstream/close.js +0 -188
- package/dist/devops/commands-upstream/close.js.map +0 -1
- package/dist/devops/commands-upstream/configure.d.ts +0 -2
- package/dist/devops/commands-upstream/configure.js +0 -87
- package/dist/devops/commands-upstream/configure.js.map +0 -1
- package/dist/devops/commands-upstream/create-project.d.ts +0 -2
- package/dist/devops/commands-upstream/create-project.js +0 -43
- package/dist/devops/commands-upstream/create-project.js.map +0 -1
- package/dist/devops/commands-upstream/install-plugin.d.ts +0 -2
- package/dist/devops/commands-upstream/install-plugin.js +0 -64
- package/dist/devops/commands-upstream/install-plugin.js.map +0 -1
- package/dist/devops/commands-upstream/install-unity.d.ts +0 -2
- package/dist/devops/commands-upstream/install-unity.js +0 -72
- package/dist/devops/commands-upstream/install-unity.js.map +0 -1
- package/dist/devops/commands-upstream/login.d.ts +0 -2
- package/dist/devops/commands-upstream/login.js +0 -33
- package/dist/devops/commands-upstream/login.js.map +0 -1
- package/dist/devops/commands-upstream/open.d.ts +0 -32
- package/dist/devops/commands-upstream/open.js +0 -282
- package/dist/devops/commands-upstream/open.js.map +0 -1
- package/dist/devops/commands-upstream/remove-plugin.d.ts +0 -2
- package/dist/devops/commands-upstream/remove-plugin.js +0 -41
- package/dist/devops/commands-upstream/remove-plugin.js.map +0 -1
- package/dist/devops/commands-upstream/run-system-tool.d.ts +0 -1
- package/dist/devops/commands-upstream/run-system-tool.js +0 -13
- package/dist/devops/commands-upstream/run-system-tool.js.map +0 -1
- package/dist/devops/commands-upstream/run-tool-builder.d.ts +0 -25
- package/dist/devops/commands-upstream/run-tool-builder.js +0 -125
- package/dist/devops/commands-upstream/run-tool-builder.js.map +0 -1
- package/dist/devops/commands-upstream/run-tool.d.ts +0 -1
- package/dist/devops/commands-upstream/run-tool.js +0 -13
- package/dist/devops/commands-upstream/run-tool.js.map +0 -1
- package/dist/devops/commands-upstream/setup-mcp.d.ts +0 -2
- package/dist/devops/commands-upstream/setup-mcp.js +0 -68
- package/dist/devops/commands-upstream/setup-mcp.js.map +0 -1
- package/dist/devops/commands-upstream/setup-skills.d.ts +0 -2
- package/dist/devops/commands-upstream/setup-skills.js +0 -167
- package/dist/devops/commands-upstream/setup-skills.js.map +0 -1
- package/dist/devops/commands-upstream/status.d.ts +0 -2
- package/dist/devops/commands-upstream/status.js +0 -87
- package/dist/devops/commands-upstream/status.js.map +0 -1
- package/dist/devops/commands-upstream/update.d.ts +0 -2
- package/dist/devops/commands-upstream/update.js +0 -77
- package/dist/devops/commands-upstream/update.js.map +0 -1
- package/dist/devops/commands-upstream/wait-for-ready.d.ts +0 -2
- package/dist/devops/commands-upstream/wait-for-ready.js +0 -93
- package/dist/devops/commands-upstream/wait-for-ready.js.map +0 -1
- package/dist/devops/lib/setup-mcp.d.ts +0 -35
- package/dist/devops/lib/setup-mcp.js +0 -177
- package/dist/devops/lib/setup-mcp.js.map +0 -1
- package/dist/devops/utils/cloud-login.d.ts +0 -7
- package/dist/devops/utils/cloud-login.js +0 -56
- package/dist/devops/utils/cloud-login.js.map +0 -1
- /package/vendor/plugin/com.atelierai.unity.copilot/Tests/Editor/{McpPluginTests.cs.meta → UcoPluginTests.cs.meta} +0 -0
|
@@ -1,171 +1,171 @@
|
|
|
1
|
-
|
|
2
|
-
#if UNITY_6000_5_OR_NEWER
|
|
3
|
-
using System.Collections;
|
|
4
|
-
using System.Collections.Generic;
|
|
5
|
-
using com.IvanMurzak.ReflectorNet.Model;
|
|
6
|
-
using com.AtelierAI.Unity.Copilot.Editor.API;
|
|
7
|
-
using com.AtelierAI.Unity.Copilot.Editor.Tests.Utils;
|
|
8
|
-
using AIGD;
|
|
9
|
-
using com.AtelierAI.Unity.Copilot.TestFiles;
|
|
10
|
-
using NUnit.Framework;
|
|
11
|
-
using UnityEngine;
|
|
12
|
-
using UnityEngine.TestTools;
|
|
13
|
-
|
|
14
|
-
namespace com.AtelierAI.Unity.Copilot.Editor.Tests
|
|
15
|
-
{
|
|
16
|
-
public class DataPropertyScriptableObjectPopulationTests : BaseTest
|
|
17
|
-
{
|
|
18
|
-
[UnitySetUp]
|
|
19
|
-
public override IEnumerator SetUp() => base.SetUp();
|
|
20
|
-
|
|
21
|
-
[UnityTearDown]
|
|
22
|
-
public override IEnumerator TearDown() => base.TearDown();
|
|
23
|
-
|
|
24
|
-
[UnityTest]
|
|
25
|
-
public IEnumerator Populate_All_Properties_SO_Test()
|
|
26
|
-
{
|
|
27
|
-
Debug.Log("[DataPropertyScriptableObjectPopulationTests] Running property population test for SO.");
|
|
28
|
-
// Executors for creating assets
|
|
29
|
-
var materialEx = new CreateMaterialExecutor("TestMaterialSOProp.mat", "Standard", "Assets", "Unity-
|
|
30
|
-
var textureEx = new CreateTextureExecutor("TestTextureSOProp.png", Color.magenta, 64, 64, "Assets", "Unity-
|
|
31
|
-
var spriteEx = new CreateSpriteExecutor("TestSpriteSOProp.png", Color.green, 64, 64, "Assets", "Unity-
|
|
32
|
-
|
|
33
|
-
// The SO we are testing
|
|
34
|
-
var soEx = new CreateScriptableObjectExecutor<DataPropertyPopulationTestScriptableObject>("TestSOProp.asset", "Assets", "Unity-
|
|
35
|
-
|
|
36
|
-
var prefabSourceGoEx = new CreateGameObjectExecutor("PrefabSourceSOProp");
|
|
37
|
-
var prefabEx = new CreatePrefabExecutor("TestPrefabSOProp.prefab", null, "Assets", "Unity-
|
|
38
|
-
|
|
39
|
-
// Target GameObject for reference
|
|
40
|
-
var targetGoName = "TargetGOSOProp";
|
|
41
|
-
var targetGoEx = new CreateGameObjectExecutor(targetGoName);
|
|
42
|
-
|
|
43
|
-
// Validation Executor
|
|
44
|
-
var validateEx = new LazyNodeExecutor();
|
|
45
|
-
validateEx.SetAction<object?>((input) =>
|
|
46
|
-
{
|
|
47
|
-
var so = soEx.Asset;
|
|
48
|
-
Assert.IsNotNull(so, "ScriptableObject should exist");
|
|
49
|
-
|
|
50
|
-
Assert.AreEqual(42, so!.intProperty, "intProperty not populated");
|
|
51
|
-
Assert.AreEqual("Hello World", so.stringProperty, "stringProperty not populated");
|
|
52
|
-
|
|
53
|
-
Assert.IsNotNull(so.materialProperty, "Material should be populated");
|
|
54
|
-
Assert.AreEqual(materialEx.Asset!.name, so.materialProperty.name);
|
|
55
|
-
|
|
56
|
-
Assert.IsNotNull(so.gameObjectProperty, "GameObject should be populated");
|
|
57
|
-
Assert.AreEqual(targetGoEx.GameObject!.name, so.gameObjectProperty.name);
|
|
58
|
-
|
|
59
|
-
Assert.IsNotNull(so.textureProperty, "Texture should be populated");
|
|
60
|
-
Assert.AreEqual(textureEx.Asset!.name, so.textureProperty.name);
|
|
61
|
-
|
|
62
|
-
Assert.IsNotNull(so.spriteProperty, "Sprite should be populated");
|
|
63
|
-
Assert.AreEqual(spriteEx.Sprite!.name, so.spriteProperty.name);
|
|
64
|
-
|
|
65
|
-
Assert.IsNotNull(so.scriptableObjectProperty, "SO should be populated");
|
|
66
|
-
Assert.AreEqual(soEx.Asset!.name, so.scriptableObjectProperty.name);
|
|
67
|
-
|
|
68
|
-
Assert.IsNotNull(so.prefabProperty, "Prefab should be populated");
|
|
69
|
-
Assert.AreEqual(prefabEx.Asset!.name, so.prefabProperty.name);
|
|
70
|
-
|
|
71
|
-
Assert.IsNotNull(so.materialArrayProperty, "Material array should be populated");
|
|
72
|
-
Assert.AreEqual(2, so.materialArrayProperty.Length);
|
|
73
|
-
Assert.AreEqual(materialEx.Asset.name, so.materialArrayProperty[0].name);
|
|
74
|
-
|
|
75
|
-
Assert.IsNotNull(so.gameObjectArrayProperty, "GameObject array should be populated");
|
|
76
|
-
Assert.AreEqual(2, so.gameObjectArrayProperty!.Length);
|
|
77
|
-
|
|
78
|
-
Assert.IsNotNull(so.materialListProperty, "Material list should be populated");
|
|
79
|
-
Assert.AreEqual(2, so.materialListProperty.Count);
|
|
80
|
-
Assert.AreEqual(materialEx.Asset.name, so.materialListProperty[0].name);
|
|
81
|
-
|
|
82
|
-
Assert.IsNotNull(so.gameObjectListProperty, "GameObject list should be populated");
|
|
83
|
-
Assert.AreEqual(2, so.gameObjectListProperty.Count);
|
|
84
|
-
});
|
|
85
|
-
|
|
86
|
-
// Chain creation
|
|
87
|
-
var modifyEx = new DynamicCallToolExecutor(
|
|
88
|
-
typeof(Tool_Assets).GetMethod(nameof(Tool_Assets.Modify)),
|
|
89
|
-
() =>
|
|
90
|
-
{
|
|
91
|
-
var plugin = UnityCopilotPluginEditor.Instance;
|
|
92
|
-
var
|
|
93
|
-
var manager =
|
|
94
|
-
var reflector = manager?.Reflector;
|
|
95
|
-
|
|
96
|
-
if (reflector == null)
|
|
97
|
-
{
|
|
98
|
-
Debug.LogError("[DataPropertyScriptableObjectPopulationTests] Reflector is null! Cannot proceed with serialization.");
|
|
99
|
-
return "{}";
|
|
100
|
-
}
|
|
101
|
-
|
|
102
|
-
var matRef = new AssetObjectRef() { AssetPath = materialEx.AssetPath };
|
|
103
|
-
var texRef = new AssetObjectRef() { AssetPath = textureEx.AssetPath };
|
|
104
|
-
var soRef = new AssetObjectRef() { AssetPath = soEx.AssetPath };
|
|
105
|
-
var prefabRef = new AssetObjectRef() { AssetPath = prefabEx.AssetPath };
|
|
106
|
-
var goRef = new ObjectRef(targetGoEx.GameObject!.GetEntityId());
|
|
107
|
-
var spriteRef = new AssetObjectRef() { AssetPath = spriteEx.AssetPath };
|
|
108
|
-
|
|
109
|
-
var soModification = SerializedMember.FromValue(
|
|
110
|
-
reflector: reflector,
|
|
111
|
-
name: "DataPropertyPopulationTestScriptableObject",
|
|
112
|
-
type: typeof(DataPropertyPopulationTestScriptableObject),
|
|
113
|
-
value: new AssetObjectRef() { AssetPath = soEx.AssetPath }
|
|
114
|
-
);
|
|
115
|
-
|
|
116
|
-
soModification.AddProperty(SerializedMember.FromValue(reflector: reflector, name: "spriteProperty", type: typeof(Sprite), value: spriteRef));
|
|
117
|
-
soModification.AddProperty(SerializedMember.FromValue(reflector: reflector, name: "materialProperty", type: typeof(Material), value: matRef));
|
|
118
|
-
soModification.AddProperty(SerializedMember.FromValue(reflector: reflector, name: "gameObjectProperty", type: typeof(GameObject), value: goRef));
|
|
119
|
-
soModification.AddProperty(SerializedMember.FromValue(reflector: reflector, name: "textureProperty", type: typeof(Texture2D), value: texRef));
|
|
120
|
-
soModification.AddProperty(SerializedMember.FromValue(reflector: reflector, name: "scriptableObjectProperty", type: typeof(DataPropertyPopulationTestScriptableObject), value: soRef));
|
|
121
|
-
soModification.AddProperty(SerializedMember.FromValue(reflector: reflector, name: "prefabProperty", type: typeof(GameObject), value: prefabRef));
|
|
122
|
-
soModification.AddProperty(SerializedMember.FromValue(reflector: reflector, name: "intProperty", type: typeof(int), value: 42));
|
|
123
|
-
soModification.AddProperty(SerializedMember.FromValue(reflector: reflector, name: "stringProperty", type: typeof(string), value: "Hello World"));
|
|
124
|
-
|
|
125
|
-
var matRefArrayItem = new AssetObjectRef(materialEx.AssetPath!);
|
|
126
|
-
var goRefArrayItem = new ObjectRef(targetGoEx.GameObject!.GetEntityId());
|
|
127
|
-
var prefabRefArrayItem = new AssetObjectRef(prefabEx.AssetPath!);
|
|
128
|
-
|
|
129
|
-
soModification.AddProperty(SerializedMember.FromValue(reflector: reflector, name: "materialArrayProperty", type: typeof(Material[]), value: new object[] { matRefArrayItem, matRefArrayItem }));
|
|
130
|
-
soModification.AddProperty(SerializedMember.FromValue(reflector: reflector, name: "gameObjectArrayProperty", type: typeof(GameObject[]), value: new object[] { goRefArrayItem, prefabRefArrayItem }));
|
|
131
|
-
|
|
132
|
-
soModification.AddProperty(SerializedMember.FromValue(reflector: reflector, name: "materialListProperty", type: typeof(List<Material>), value: new object[] { matRefArrayItem, matRefArrayItem }));
|
|
133
|
-
soModification.AddProperty(SerializedMember.FromValue(reflector: reflector, name: "gameObjectListProperty", type: typeof(List<GameObject>), value: new object[] { goRefArrayItem, prefabRefArrayItem }));
|
|
134
|
-
|
|
135
|
-
// Use the reflector's JsonSerializer so custom converters are applied
|
|
136
|
-
// (EntityId has only a private field and serializes as "{}" without them).
|
|
137
|
-
var assetRefJson = reflector.JsonSerializer.Serialize(new AssetObjectRef() { AssetPath = soEx.AssetPath });
|
|
138
|
-
var contentJson = reflector.JsonSerializer.Serialize(soModification);
|
|
139
|
-
|
|
140
|
-
var json = JsonTestUtils.Fill(@"{
|
|
141
|
-
""assetRef"": {assetRef},
|
|
142
|
-
""content"": {content}
|
|
143
|
-
}",
|
|
144
|
-
new Dictionary<string, object?>
|
|
145
|
-
{
|
|
146
|
-
{ "{assetRef}", assetRefJson },
|
|
147
|
-
{ "{content}", contentJson }
|
|
148
|
-
});
|
|
149
|
-
|
|
150
|
-
Debug.Log($"[DataPropertyScriptableObjectPopulationTests] JSON Input: {json}");
|
|
151
|
-
return json;
|
|
152
|
-
}
|
|
153
|
-
);
|
|
154
|
-
|
|
155
|
-
modifyEx.AddChild(validateEx);
|
|
156
|
-
soEx.AddChild(modifyEx);
|
|
157
|
-
targetGoEx.AddChild(soEx);
|
|
158
|
-
|
|
159
|
-
materialEx
|
|
160
|
-
.Nest(textureEx)
|
|
161
|
-
.Nest(spriteEx)
|
|
162
|
-
.Nest(prefabSourceGoEx)
|
|
163
|
-
.Nest(prefabEx)
|
|
164
|
-
.Nest(targetGoEx);
|
|
165
|
-
|
|
166
|
-
materialEx.Execute();
|
|
167
|
-
yield return null;
|
|
168
|
-
}
|
|
169
|
-
}
|
|
170
|
-
}
|
|
171
|
-
#endif
|
|
1
|
+
#nullable enable
|
|
2
|
+
#if UNITY_6000_5_OR_NEWER
|
|
3
|
+
using System.Collections;
|
|
4
|
+
using System.Collections.Generic;
|
|
5
|
+
using com.IvanMurzak.ReflectorNet.Model;
|
|
6
|
+
using com.AtelierAI.Unity.Copilot.Editor.API;
|
|
7
|
+
using com.AtelierAI.Unity.Copilot.Editor.Tests.Utils;
|
|
8
|
+
using AIGD;
|
|
9
|
+
using com.AtelierAI.Unity.Copilot.TestFiles;
|
|
10
|
+
using NUnit.Framework;
|
|
11
|
+
using UnityEngine;
|
|
12
|
+
using UnityEngine.TestTools;
|
|
13
|
+
|
|
14
|
+
namespace com.AtelierAI.Unity.Copilot.Editor.Tests
|
|
15
|
+
{
|
|
16
|
+
public class DataPropertyScriptableObjectPopulationTests : BaseTest
|
|
17
|
+
{
|
|
18
|
+
[UnitySetUp]
|
|
19
|
+
public override IEnumerator SetUp() => base.SetUp();
|
|
20
|
+
|
|
21
|
+
[UnityTearDown]
|
|
22
|
+
public override IEnumerator TearDown() => base.TearDown();
|
|
23
|
+
|
|
24
|
+
[UnityTest]
|
|
25
|
+
public IEnumerator Populate_All_Properties_SO_Test()
|
|
26
|
+
{
|
|
27
|
+
Debug.Log("[DataPropertyScriptableObjectPopulationTests] Running property population test for SO.");
|
|
28
|
+
// Executors for creating assets
|
|
29
|
+
var materialEx = new CreateMaterialExecutor("TestMaterialSOProp.mat", "Standard", "Assets", "Unity-Uco-Test", "DataPropertySOPopulation");
|
|
30
|
+
var textureEx = new CreateTextureExecutor("TestTextureSOProp.png", Color.magenta, 64, 64, "Assets", "Unity-Uco-Test", "DataPropertySOPopulation");
|
|
31
|
+
var spriteEx = new CreateSpriteExecutor("TestSpriteSOProp.png", Color.green, 64, 64, "Assets", "Unity-Uco-Test", "DataPropertySOPopulation");
|
|
32
|
+
|
|
33
|
+
// The SO we are testing
|
|
34
|
+
var soEx = new CreateScriptableObjectExecutor<DataPropertyPopulationTestScriptableObject>("TestSOProp.asset", "Assets", "Unity-Uco-Test", "DataPropertySOPopulation");
|
|
35
|
+
|
|
36
|
+
var prefabSourceGoEx = new CreateGameObjectExecutor("PrefabSourceSOProp");
|
|
37
|
+
var prefabEx = new CreatePrefabExecutor("TestPrefabSOProp.prefab", null, "Assets", "Unity-Uco-Test", "DataPropertySOPopulation");
|
|
38
|
+
|
|
39
|
+
// Target GameObject for reference
|
|
40
|
+
var targetGoName = "TargetGOSOProp";
|
|
41
|
+
var targetGoEx = new CreateGameObjectExecutor(targetGoName);
|
|
42
|
+
|
|
43
|
+
// Validation Executor
|
|
44
|
+
var validateEx = new LazyNodeExecutor();
|
|
45
|
+
validateEx.SetAction<object?>((input) =>
|
|
46
|
+
{
|
|
47
|
+
var so = soEx.Asset;
|
|
48
|
+
Assert.IsNotNull(so, "ScriptableObject should exist");
|
|
49
|
+
|
|
50
|
+
Assert.AreEqual(42, so!.intProperty, "intProperty not populated");
|
|
51
|
+
Assert.AreEqual("Hello World", so.stringProperty, "stringProperty not populated");
|
|
52
|
+
|
|
53
|
+
Assert.IsNotNull(so.materialProperty, "Material should be populated");
|
|
54
|
+
Assert.AreEqual(materialEx.Asset!.name, so.materialProperty.name);
|
|
55
|
+
|
|
56
|
+
Assert.IsNotNull(so.gameObjectProperty, "GameObject should be populated");
|
|
57
|
+
Assert.AreEqual(targetGoEx.GameObject!.name, so.gameObjectProperty.name);
|
|
58
|
+
|
|
59
|
+
Assert.IsNotNull(so.textureProperty, "Texture should be populated");
|
|
60
|
+
Assert.AreEqual(textureEx.Asset!.name, so.textureProperty.name);
|
|
61
|
+
|
|
62
|
+
Assert.IsNotNull(so.spriteProperty, "Sprite should be populated");
|
|
63
|
+
Assert.AreEqual(spriteEx.Sprite!.name, so.spriteProperty.name);
|
|
64
|
+
|
|
65
|
+
Assert.IsNotNull(so.scriptableObjectProperty, "SO should be populated");
|
|
66
|
+
Assert.AreEqual(soEx.Asset!.name, so.scriptableObjectProperty.name);
|
|
67
|
+
|
|
68
|
+
Assert.IsNotNull(so.prefabProperty, "Prefab should be populated");
|
|
69
|
+
Assert.AreEqual(prefabEx.Asset!.name, so.prefabProperty.name);
|
|
70
|
+
|
|
71
|
+
Assert.IsNotNull(so.materialArrayProperty, "Material array should be populated");
|
|
72
|
+
Assert.AreEqual(2, so.materialArrayProperty.Length);
|
|
73
|
+
Assert.AreEqual(materialEx.Asset.name, so.materialArrayProperty[0].name);
|
|
74
|
+
|
|
75
|
+
Assert.IsNotNull(so.gameObjectArrayProperty, "GameObject array should be populated");
|
|
76
|
+
Assert.AreEqual(2, so.gameObjectArrayProperty!.Length);
|
|
77
|
+
|
|
78
|
+
Assert.IsNotNull(so.materialListProperty, "Material list should be populated");
|
|
79
|
+
Assert.AreEqual(2, so.materialListProperty.Count);
|
|
80
|
+
Assert.AreEqual(materialEx.Asset.name, so.materialListProperty[0].name);
|
|
81
|
+
|
|
82
|
+
Assert.IsNotNull(so.gameObjectListProperty, "GameObject list should be populated");
|
|
83
|
+
Assert.AreEqual(2, so.gameObjectListProperty.Count);
|
|
84
|
+
});
|
|
85
|
+
|
|
86
|
+
// Chain creation
|
|
87
|
+
var modifyEx = new DynamicCallToolExecutor(
|
|
88
|
+
typeof(Tool_Assets).GetMethod(nameof(Tool_Assets.Modify)),
|
|
89
|
+
() =>
|
|
90
|
+
{
|
|
91
|
+
var plugin = UnityCopilotPluginEditor.Instance;
|
|
92
|
+
var pluginInstance = plugin?.UcoPluginInstance;
|
|
93
|
+
var manager = pluginInstance?.UcoManager;
|
|
94
|
+
var reflector = manager?.Reflector;
|
|
95
|
+
|
|
96
|
+
if (reflector == null)
|
|
97
|
+
{
|
|
98
|
+
Debug.LogError("[DataPropertyScriptableObjectPopulationTests] Reflector is null! Cannot proceed with serialization.");
|
|
99
|
+
return "{}";
|
|
100
|
+
}
|
|
101
|
+
|
|
102
|
+
var matRef = new AssetObjectRef() { AssetPath = materialEx.AssetPath };
|
|
103
|
+
var texRef = new AssetObjectRef() { AssetPath = textureEx.AssetPath };
|
|
104
|
+
var soRef = new AssetObjectRef() { AssetPath = soEx.AssetPath };
|
|
105
|
+
var prefabRef = new AssetObjectRef() { AssetPath = prefabEx.AssetPath };
|
|
106
|
+
var goRef = new ObjectRef(targetGoEx.GameObject!.GetEntityId());
|
|
107
|
+
var spriteRef = new AssetObjectRef() { AssetPath = spriteEx.AssetPath };
|
|
108
|
+
|
|
109
|
+
var soModification = SerializedMember.FromValue(
|
|
110
|
+
reflector: reflector,
|
|
111
|
+
name: "DataPropertyPopulationTestScriptableObject",
|
|
112
|
+
type: typeof(DataPropertyPopulationTestScriptableObject),
|
|
113
|
+
value: new AssetObjectRef() { AssetPath = soEx.AssetPath }
|
|
114
|
+
);
|
|
115
|
+
|
|
116
|
+
soModification.AddProperty(SerializedMember.FromValue(reflector: reflector, name: "spriteProperty", type: typeof(Sprite), value: spriteRef));
|
|
117
|
+
soModification.AddProperty(SerializedMember.FromValue(reflector: reflector, name: "materialProperty", type: typeof(Material), value: matRef));
|
|
118
|
+
soModification.AddProperty(SerializedMember.FromValue(reflector: reflector, name: "gameObjectProperty", type: typeof(GameObject), value: goRef));
|
|
119
|
+
soModification.AddProperty(SerializedMember.FromValue(reflector: reflector, name: "textureProperty", type: typeof(Texture2D), value: texRef));
|
|
120
|
+
soModification.AddProperty(SerializedMember.FromValue(reflector: reflector, name: "scriptableObjectProperty", type: typeof(DataPropertyPopulationTestScriptableObject), value: soRef));
|
|
121
|
+
soModification.AddProperty(SerializedMember.FromValue(reflector: reflector, name: "prefabProperty", type: typeof(GameObject), value: prefabRef));
|
|
122
|
+
soModification.AddProperty(SerializedMember.FromValue(reflector: reflector, name: "intProperty", type: typeof(int), value: 42));
|
|
123
|
+
soModification.AddProperty(SerializedMember.FromValue(reflector: reflector, name: "stringProperty", type: typeof(string), value: "Hello World"));
|
|
124
|
+
|
|
125
|
+
var matRefArrayItem = new AssetObjectRef(materialEx.AssetPath!);
|
|
126
|
+
var goRefArrayItem = new ObjectRef(targetGoEx.GameObject!.GetEntityId());
|
|
127
|
+
var prefabRefArrayItem = new AssetObjectRef(prefabEx.AssetPath!);
|
|
128
|
+
|
|
129
|
+
soModification.AddProperty(SerializedMember.FromValue(reflector: reflector, name: "materialArrayProperty", type: typeof(Material[]), value: new object[] { matRefArrayItem, matRefArrayItem }));
|
|
130
|
+
soModification.AddProperty(SerializedMember.FromValue(reflector: reflector, name: "gameObjectArrayProperty", type: typeof(GameObject[]), value: new object[] { goRefArrayItem, prefabRefArrayItem }));
|
|
131
|
+
|
|
132
|
+
soModification.AddProperty(SerializedMember.FromValue(reflector: reflector, name: "materialListProperty", type: typeof(List<Material>), value: new object[] { matRefArrayItem, matRefArrayItem }));
|
|
133
|
+
soModification.AddProperty(SerializedMember.FromValue(reflector: reflector, name: "gameObjectListProperty", type: typeof(List<GameObject>), value: new object[] { goRefArrayItem, prefabRefArrayItem }));
|
|
134
|
+
|
|
135
|
+
// Use the reflector's JsonSerializer so custom converters are applied
|
|
136
|
+
// (EntityId has only a private field and serializes as "{}" without them).
|
|
137
|
+
var assetRefJson = reflector.JsonSerializer.Serialize(new AssetObjectRef() { AssetPath = soEx.AssetPath });
|
|
138
|
+
var contentJson = reflector.JsonSerializer.Serialize(soModification);
|
|
139
|
+
|
|
140
|
+
var json = JsonTestUtils.Fill(@"{
|
|
141
|
+
""assetRef"": {assetRef},
|
|
142
|
+
""content"": {content}
|
|
143
|
+
}",
|
|
144
|
+
new Dictionary<string, object?>
|
|
145
|
+
{
|
|
146
|
+
{ "{assetRef}", assetRefJson },
|
|
147
|
+
{ "{content}", contentJson }
|
|
148
|
+
});
|
|
149
|
+
|
|
150
|
+
Debug.Log($"[DataPropertyScriptableObjectPopulationTests] JSON Input: {json}");
|
|
151
|
+
return json;
|
|
152
|
+
}
|
|
153
|
+
);
|
|
154
|
+
|
|
155
|
+
modifyEx.AddChild(validateEx);
|
|
156
|
+
soEx.AddChild(modifyEx);
|
|
157
|
+
targetGoEx.AddChild(soEx);
|
|
158
|
+
|
|
159
|
+
materialEx
|
|
160
|
+
.Nest(textureEx)
|
|
161
|
+
.Nest(spriteEx)
|
|
162
|
+
.Nest(prefabSourceGoEx)
|
|
163
|
+
.Nest(prefabEx)
|
|
164
|
+
.Nest(targetGoEx);
|
|
165
|
+
|
|
166
|
+
materialEx.Execute();
|
|
167
|
+
yield return null;
|
|
168
|
+
}
|
|
169
|
+
}
|
|
170
|
+
}
|
|
171
|
+
#endif
|