diff --git a/Assets/Samples/DecoratorRepeatWithWait.cs b/Assets/Samples/DecoratorRepeatWithWait.cs index f40a02f2..a9cc3625 100644 --- a/Assets/Samples/DecoratorRepeatWithWait.cs +++ b/Assets/Samples/DecoratorRepeatWithWait.cs @@ -1,15 +1,15 @@ using CleverCrow.Fluid.BTs.Tasks; using CleverCrow.Fluid.BTs.Trees; using UnityEngine; -using Random = UnityEngine.Random; namespace CleverCrow.Fluid.BTs.Samples { public class DecoratorRepeatWithWait : MonoBehaviour { [SerializeField] private BehaviorTree _tree; + [Tooltip("Setting to success will cause the task to succeed")] [SerializeField] - private bool _toggle; + private bool _isTaskSuccess; void Start () { _tree = new BehaviorTreeBuilder(gameObject) @@ -17,24 +17,18 @@ void Start () { .Parallel() .Sequence() - .Do(() => { - _toggle = true; - return TaskStatus.Success; - }) + .Do(() => TaskStatus.Success) .WaitTime() - .Do(() => { - _toggle = false; - return TaskStatus.Success; - }) + .Do(() => TaskStatus.Success) .WaitTime() .End() - .Sequence() + .Sequence("Repeat until success is checked") .Do(() => TaskStatus.Success) .RepeatUntilSuccess() .Sequence() .WaitTime() - .Do(() => Random.value > 0.5f ? TaskStatus.Success : TaskStatus.Failure) + .Do(() => _isTaskSuccess ? TaskStatus.Success : TaskStatus.Failure) .End() .End() .End() diff --git a/Packages/manifest.json b/Packages/manifest.json index 157637a8..d6b675fb 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -12,17 +12,17 @@ "clever-crow.nsubstitute": "2.0.3", "com.unity.2d.sprite": "1.0.0", "com.unity.2d.tilemap": "1.0.0", - "com.unity.ads": "3.7.1", - "com.unity.analytics": "3.5.3", - "com.unity.collab-proxy": "1.5.7", - "com.unity.ide.rider": "3.0.6", - "com.unity.ide.visualstudio": "2.0.8", - "com.unity.ide.vscode": "1.2.3", - "com.unity.purchasing": "3.1.0", - "com.unity.test-framework": "1.1.24", - "com.unity.textmeshpro": "3.0.6", - "com.unity.timeline": "1.5.5", - "com.unity.ugui": "1.0.0", + "com.unity.ads": "4.4.2", + "com.unity.ai.navigation": "2.0.4", + "com.unity.analytics": "3.8.1", + "com.unity.collab-proxy": "2.3.1", + "com.unity.ide.rider": "3.0.34", + "com.unity.ide.visualstudio": "2.0.22", + "com.unity.purchasing": "4.11.0", + "com.unity.test-framework": "1.3.9", + "com.unity.timeline": "1.8.7", + "com.unity.ugui": "2.0.0", + "com.unity.modules.accessibility": "1.0.0", "com.unity.modules.ai": "1.0.0", "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.animation": "1.0.0", diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json index e667fbee..98ff3e21 100644 --- a/Packages/packages-lock.json +++ b/Packages/packages-lock.json @@ -17,10 +17,13 @@ "version": "1.0.0", "depth": 0, "source": "builtin", - "dependencies": {} + "dependencies": { + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.uielements": "1.0.0" + } }, "com.unity.ads": { - "version": "3.7.1", + "version": "4.4.2", "depth": 0, "source": "registry", "dependencies": { @@ -28,33 +31,41 @@ }, "url": "https://packages.unity.com" }, - "com.unity.analytics": { - "version": "3.5.3", + "com.unity.ai.navigation": { + "version": "2.0.4", "depth": 0, "source": "registry", "dependencies": { - "com.unity.ugui": "1.0.0" + "com.unity.modules.ai": "1.0.0" }, "url": "https://packages.unity.com" }, - "com.unity.collab-proxy": { - "version": "1.5.7", + "com.unity.analytics": { + "version": "3.8.1", "depth": 0, "source": "registry", "dependencies": { - "com.unity.nuget.newtonsoft-json": "2.0.0" + "com.unity.ugui": "1.0.0", + "com.unity.services.analytics": "1.0.4" }, "url": "https://packages.unity.com" }, + "com.unity.collab-proxy": { + "version": "2.3.1", + "depth": 0, + "source": "registry", + "dependencies": {}, + "url": "https://packages.unity.com" + }, "com.unity.ext.nunit": { - "version": "1.0.6", + "version": "2.0.5", "depth": 1, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.ide.rider": { - "version": "3.0.6", + "version": "3.0.34", "depth": 0, "source": "registry", "dependencies": { @@ -63,7 +74,7 @@ "url": "https://packages.unity.com" }, "com.unity.ide.visualstudio": { - "version": "2.0.8", + "version": "2.0.22", "depth": 0, "source": "registry", "dependencies": { @@ -71,67 +82,73 @@ }, "url": "https://packages.unity.com" }, - "com.unity.ide.vscode": { - "version": "1.2.3", - "depth": 0, - "source": "registry", - "dependencies": {}, - "url": "https://packages.unity.com" - }, "com.unity.nuget.newtonsoft-json": { - "version": "3.0.2", - "depth": 1, + "version": "3.2.1", + "depth": 2, "source": "registry", "dependencies": {}, "url": "https://packages.unity.com" }, "com.unity.purchasing": { - "version": "3.1.0", + "version": "4.11.0", "depth": 0, "source": "registry", "dependencies": { "com.unity.ugui": "1.0.0", - "com.unity.modules.unityanalytics": "1.0.0", - "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.services.core": "1.8.2", + "com.unity.modules.androidjni": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.androidjni": "1.0.0" + "com.unity.modules.unitywebrequest": "1.0.0" }, "url": "https://packages.unity.com" }, - "com.unity.test-framework": { - "version": "1.1.24", - "depth": 0, + "com.unity.services.analytics": { + "version": "4.4.0", + "depth": 1, "source": "registry", "dependencies": { - "com.unity.ext.nunit": "1.0.6", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.ugui": "1.0.0", + "com.unity.services.core": "1.8.1", + "com.unity.nuget.newtonsoft-json": "3.0.2" }, "url": "https://packages.unity.com" }, - "com.unity.textmeshpro": { - "version": "3.0.6", + "com.unity.services.core": { + "version": "1.12.4", + "depth": 1, + "source": "registry", + "dependencies": { + "com.unity.modules.androidjni": "1.0.0", + "com.unity.nuget.newtonsoft-json": "3.2.1", + "com.unity.modules.unitywebrequest": "1.0.0" + }, + "url": "https://packages.unity.com" + }, + "com.unity.test-framework": { + "version": "1.3.9", "depth": 0, "source": "registry", "dependencies": { - "com.unity.ugui": "1.0.0" + "com.unity.ext.nunit": "2.0.3", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.timeline": { - "version": "1.5.5", + "version": "1.8.7", "depth": 0, "source": "registry", "dependencies": { + "com.unity.modules.audio": "1.0.0", "com.unity.modules.director": "1.0.0", "com.unity.modules.animation": "1.0.0", - "com.unity.modules.audio": "1.0.0", "com.unity.modules.particlesystem": "1.0.0" }, "url": "https://packages.unity.com" }, "com.unity.ugui": { - "version": "1.0.0", + "version": "2.0.0", "depth": 0, "source": "builtin", "dependencies": { @@ -139,6 +156,12 @@ "com.unity.modules.imgui": "1.0.0" } }, + "com.unity.modules.accessibility": { + "version": "1.0.0", + "depth": 0, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.ai": { "version": "1.0.0", "depth": 0, @@ -186,6 +209,12 @@ "com.unity.modules.animation": "1.0.0" } }, + "com.unity.modules.hierarchycore": { + "version": "1.0.0", + "depth": 1, + "source": "builtin", + "dependencies": {} + }, "com.unity.modules.imageconversion": { "version": "1.0.0", "depth": 0, @@ -275,17 +304,7 @@ "com.unity.modules.ui": "1.0.0", "com.unity.modules.imgui": "1.0.0", "com.unity.modules.jsonserialize": "1.0.0", - "com.unity.modules.uielementsnative": "1.0.0" - } - }, - "com.unity.modules.uielementsnative": { - "version": "1.0.0", - "depth": 1, - "source": "builtin", - "dependencies": { - "com.unity.modules.ui": "1.0.0", - "com.unity.modules.imgui": "1.0.0", - "com.unity.modules.jsonserialize": "1.0.0" + "com.unity.modules.hierarchycore": "1.0.0" } }, "com.unity.modules.umbra": { diff --git a/ProjectSettings/MultiplayerManager.asset b/ProjectSettings/MultiplayerManager.asset new file mode 100644 index 00000000..8073753a --- /dev/null +++ b/ProjectSettings/MultiplayerManager.asset @@ -0,0 +1,7 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!655991488 &1 +MultiplayerManager: + m_ObjectHideFlags: 0 + m_EnableMultiplayerRoles: 0 + m_ActiveMultiplayerRole: 0 diff --git a/ProjectSettings/PackageManagerSettings.asset b/ProjectSettings/PackageManagerSettings.asset index 3c789a17..622aa7db 100644 --- a/ProjectSettings/PackageManagerSettings.asset +++ b/ProjectSettings/PackageManagerSettings.asset @@ -13,11 +13,12 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_EnablePreReleasePackages: 0 - m_EnablePackageDependencies: 0 m_AdvancedSettingsExpanded: 1 m_ScopedRegistriesSettingsExpanded: 1 m_SeeAllPackageVersions: 0 + m_DismissPreviewPackagesInUse: 0 oneTimeWarningShown: 0 + oneTimeDeprecatedPopUpShown: 0 m_Registries: - m_Id: main m_Name: @@ -25,29 +26,20 @@ MonoBehaviour: m_Scopes: [] m_IsDefault: 1 m_Capabilities: 7 - - m_Id: scoped:NPM + m_ConfigSource: 0 + - m_Id: scoped:project:NPM m_Name: NPM m_Url: https://registry.npmjs.org m_Scopes: - clever-crow m_IsDefault: 0 m_Capabilities: 0 - m_UserSelectedRegistryName: + m_ConfigSource: 4 + m_UserSelectedRegistryName: NPM m_UserAddingNewScopedRegistry: 0 m_RegistryInfoDraft: - m_ErrorMessage: - m_Original: - m_Id: scoped:NPM - m_Name: NPM - m_Url: https://registry.npmjs.org - m_Scopes: - - clever-crow - m_IsDefault: 0 - m_Capabilities: 0 m_Modified: 0 - m_Name: NPM - m_Url: https://registry.npmjs.org - m_Scopes: - - clever-crow - m_SelectedScopeIndex: 0 + m_ErrorMessage: + m_UserModificationsInstanceId: -850 + m_OriginalInstanceId: -854 m_LoadAssets: 0 diff --git a/ProjectSettings/boot.config b/ProjectSettings/Packages/com.unity.services.core/Settings.json similarity index 100% rename from ProjectSettings/boot.config rename to ProjectSettings/Packages/com.unity.services.core/Settings.json diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index f015b2d3..cd8dbd1c 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 2021.1.9f1 -m_EditorVersionWithRevision: 2021.1.9f1 (7a790e367ab3) +m_EditorVersion: 2023.2.19f1 +m_EditorVersionWithRevision: 2023.2.19f1 (95c298372b1e) diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index b875e510..6d563cd3 100644 Binary files a/UserSettings/EditorUserSettings.asset and b/UserSettings/EditorUserSettings.asset differ diff --git a/package-lock.json b/package-lock.json index 893e957c..5383b89e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -6972,11 +6972,6 @@ "once": "^1.3.1" } }, - "node_modules/npm/node_modules/punycode": { - "version": "1.4.1", - "dev": true, - "license": "MIT" - }, "node_modules/npm/node_modules/qrcode-terminal": { "version": "0.12.0", "dev": true, @@ -15337,10 +15332,6 @@ } } }, - "punycode": { - "version": "1.4.1", - "dev": true - }, "qrcode-terminal": { "version": "0.12.0", "bundled": true,