From 62c9a9ee3b8c944d9aa089c4108bf628313db6e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jo=C3=A3o=20Buratto?= <46575243+joaoburatto@users.noreply.github.com> Date: Wed, 30 Oct 2024 08:43:12 -0300 Subject: [PATCH] [Feature] Add open close interactions with lockers (#1459) --- .../Addressables/AssetGroups/Scenes.asset | 6 +- Assets/Content/Data/Databases/Scenes.asset | 29 ----- .../Content/Data/Databases/Scenes.asset.meta | 8 -- .../Furniture/Storage/Lockers/Locker.prefab | 28 ++++- .../Storage/Lockers/LockerSecure.prefab | 6 +- .../Storage/Lockers/SecurityLocker.prefab | 8 +- Assets/Scripts/SS3D/Data/Generated/Scenes.cs | 9 +- .../Scripts/SS3D/Interactions/Interaction.cs | 1 + .../SS3D/SceneManagement/SceneSystem.cs | 4 +- .../Furniture/LockLockerInteraction.cs | 53 +++++---- .../Scripts/SS3D/Systems/Furniture/Locker.cs | 109 ++++++++++++++---- .../Furniture/LockerDoorInteraction.cs | 44 +++++++ .../Furniture/LockerDoorInteraction.cs.meta | 3 + .../Furniture/UnlockLockerInteraction.cs | 19 +-- Assets/Settings/AssetDatabaseSettings.asset | 1 - ProjectSettings/EditorBuildSettings.asset | 2 +- ProjectSettings/ProjectSettings.asset | 12 +- 17 files changed, 229 insertions(+), 113 deletions(-) delete mode 100644 Assets/Content/Data/Databases/Scenes.asset delete mode 100644 Assets/Content/Data/Databases/Scenes.asset.meta create mode 100644 Assets/Scripts/SS3D/Systems/Furniture/LockerDoorInteraction.cs create mode 100644 Assets/Scripts/SS3D/Systems/Furniture/LockerDoorInteraction.cs.meta diff --git a/Assets/Content/Addressables/AssetGroups/Scenes.asset b/Assets/Content/Addressables/AssetGroups/Scenes.asset index b69abcca74..06d5695634 100644 --- a/Assets/Content/Addressables/AssetGroups/Scenes.asset +++ b/Assets/Content/Addressables/AssetGroups/Scenes.asset @@ -16,11 +16,7 @@ MonoBehaviour: m_Data: m_SerializedData: [] m_GUID: e18ea8489b90bd7488de5c242bac11c6 - m_SerializeEntries: - - m_GUID: d03a300180bde5646b09bfa4c392679f - m_Address: Assets/Content/Scenes/Launcher.unity - m_ReadOnly: 0 - m_SerializedLabels: [] + m_SerializeEntries: [] m_ReadOnly: 0 m_Settings: {fileID: 11400000, guid: ddc57d0f5f9fb874e8a26db0c5b215e0, type: 2} m_SchemaSet: diff --git a/Assets/Content/Data/Databases/Scenes.asset b/Assets/Content/Data/Databases/Scenes.asset deleted file mode 100644 index 0492e7ea3b..0000000000 --- a/Assets/Content/Data/Databases/Scenes.asset +++ /dev/null @@ -1,29 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!114 &11400000 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 3c9b6c8ad6324c838c1743c2a2e2abc4, type: 3} - m_Name: Scenes - m_EditorClassIdentifier: - DatabaseName: Scenes - AssetGroup: {fileID: 11400000, guid: bacca0c47905ef441803065410c8978e, type: 2} - Assets: - _list: - - _key: Intro - _value: {fileID: 102900000, guid: 61687ab4465bb6e4d8164057bedc63db, type: 3} - - _key: Game - _value: {fileID: 102900000, guid: c7d05c35cd4853643a09333ecceff608, type: 3} - - _key: Boot - _value: {fileID: 102900000, guid: 9fc0d4010bbf28b4594072e72b8655ab, type: 3} - - _key: Empty - _value: {fileID: 102900000, guid: a7a0fb29f301d364a822be64003a90cb, type: 3} - - _key: Launcher - _value: {fileID: 102900000, guid: d03a300180bde5646b09bfa4c392679f, type: 3} - _new: diff --git a/Assets/Content/Data/Databases/Scenes.asset.meta b/Assets/Content/Data/Databases/Scenes.asset.meta deleted file mode 100644 index dc07352e6e..0000000000 --- a/Assets/Content/Data/Databases/Scenes.asset.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 3fc0db940ed0bd14cb905a5e15dd32fe -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 11400000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Content/WorldObjects/Furniture/Storage/Lockers/Locker.prefab b/Assets/Content/WorldObjects/Furniture/Storage/Lockers/Locker.prefab index d40f6a093f..9c2e4ac008 100644 --- a/Assets/Content/WorldObjects/Furniture/Storage/Lockers/Locker.prefab +++ b/Assets/Content/WorldObjects/Furniture/Storage/Lockers/Locker.prefab @@ -179,6 +179,9 @@ GameObject: - component: {fileID: 3298710121668139635} - component: {fileID: 3258417366846669140} - component: {fileID: 7727612398117917681} + - component: {fileID: -4835600395219085227} + - component: {fileID: 6047447789156998695} + - component: {fileID: 2063239018469568408} m_Layer: 0 m_Name: Locker m_TagString: Untagged @@ -281,6 +284,7 @@ MonoBehaviour: k__BackingField: {fileID: 0} _networkBehaviours: - {fileID: 3298710121668139635} + - {fileID: 2063239018469568408} k__BackingField: {fileID: 0} k__BackingField: [] SerializedTransformProperties: @@ -292,7 +296,7 @@ MonoBehaviour: _initializeOrder: 0 _defaultDespawnType: 0 NetworkObserver: {fileID: 0} - k__BackingField: 168 + k__BackingField: 200 k__BackingField: 0 _scenePathHash: 0 k__BackingField: 0 @@ -335,3 +339,25 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: key: {fileID: 11400000, guid: ee4264e6206f48b40bd5a390dc1ffe2e, type: 2} +--- !u!114 &2063239018469568408 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5533951594911835035} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 135ecf6db6e77e945ac1a661c0831cd5, type: 3} + m_Name: + m_EditorClassIdentifier: + _componentIndexCache: 1 + _addedNetworkObject: {fileID: 3258417366846669140} + _networkObjectCache: {fileID: 3258417366846669140} + IsLocked: 0 + IsOpen: 0 + _lockable: 0 + permissionToUnlock: {fileID: 0} + _door: {fileID: 4547560682629165049} + _doorChangePunch: {x: -0.1, y: -0.05, z: 0} + LockLight: {fileID: 0} diff --git a/Assets/Content/WorldObjects/Furniture/Storage/Lockers/LockerSecure.prefab b/Assets/Content/WorldObjects/Furniture/Storage/Lockers/LockerSecure.prefab index 5cc2efba02..72e85558e6 100644 --- a/Assets/Content/WorldObjects/Furniture/Storage/Lockers/LockerSecure.prefab +++ b/Assets/Content/WorldObjects/Furniture/Storage/Lockers/LockerSecure.prefab @@ -238,8 +238,12 @@ MonoBehaviour: _componentIndexCache: 0 _addedNetworkObject: {fileID: 3258417366846669140} _networkObjectCache: {fileID: 3258417366846669140} - Locked: 0 + IsLocked: 0 + IsOpen: 0 + _lockable: 1 permissionToUnlock: {fileID: 11400000, guid: 921240e0c27686d4eaf2ff761944c5eb, type: 2} + _door: {fileID: 4547560682629165049} + _doorChangePunch: {x: -0.1, y: -0.05, z: 0} LockLight: {fileID: 4199049305641312543} --- !u!114 &3298710121668139635 MonoBehaviour: diff --git a/Assets/Content/WorldObjects/Furniture/Storage/Lockers/SecurityLocker.prefab b/Assets/Content/WorldObjects/Furniture/Storage/Lockers/SecurityLocker.prefab index c187b14912..df3155eea8 100644 --- a/Assets/Content/WorldObjects/Furniture/Storage/Lockers/SecurityLocker.prefab +++ b/Assets/Content/WorldObjects/Furniture/Storage/Lockers/SecurityLocker.prefab @@ -181,6 +181,8 @@ GameObject: - component: {fileID: 3298710121668139635} - component: {fileID: 3258417366846669140} - component: {fileID: 7727612398117917681} + - component: {fileID: -802098285113866164} + - component: {fileID: 5133152519004721145} m_Layer: 0 m_Name: SecurityLocker m_TagString: Untagged @@ -236,8 +238,12 @@ MonoBehaviour: _componentIndexCache: 0 _addedNetworkObject: {fileID: 3258417366846669140} _networkObjectCache: {fileID: 3258417366846669140} - Locked: 0 + IsLocked: 0 + IsOpen: 0 + _lockable: 1 permissionToUnlock: {fileID: 11400000, guid: 6f6e80ff9f87f7e4d810b2e9dcb013df, type: 2} + _door: {fileID: 4547560682629165049} + _doorChangePunch: {x: -0.1, y: -0.05, z: 0} LockLight: {fileID: 4459199731998976186} --- !u!114 &3298710121668139635 MonoBehaviour: diff --git a/Assets/Scripts/SS3D/Data/Generated/Scenes.cs b/Assets/Scripts/SS3D/Data/Generated/Scenes.cs index 10bcee386c..97506e6177 100644 --- a/Assets/Scripts/SS3D/Data/Generated/Scenes.cs +++ b/Assets/Scripts/SS3D/Data/Generated/Scenes.cs @@ -2,13 +2,12 @@ ; namespace SS3D.Data.Generated { - // This class is autogenerated. Do not modify manually. public static class Scenes { - public static DatabaseAsset Boot = new DatabaseAsset("Boot", "Scenes"); - public static DatabaseAsset Game = new DatabaseAsset("Game", "Scenes"); - public static DatabaseAsset Launcher = new DatabaseAsset("Launcher", "Scenes"); - public static DatabaseAsset Intro = new DatabaseAsset("Intro", "Scenes"); + public const string Boot = "Boot"; + public const string Intro = "Intro"; + public const string Game = "Game"; + public const string Launcher = "Launcher"; } } diff --git a/Assets/Scripts/SS3D/Interactions/Interaction.cs b/Assets/Scripts/SS3D/Interactions/Interaction.cs index a5417aa0d3..8c1b8d8214 100644 --- a/Assets/Scripts/SS3D/Interactions/Interaction.cs +++ b/Assets/Scripts/SS3D/Interactions/Interaction.cs @@ -9,6 +9,7 @@ namespace SS3D.Interactions /// public class Interaction : IInteraction { + public string Name; public Sprite Icon; /// diff --git a/Assets/Scripts/SS3D/SceneManagement/SceneSystem.cs b/Assets/Scripts/SS3D/SceneManagement/SceneSystem.cs index cfef219f39..39e4cd2f34 100644 --- a/Assets/Scripts/SS3D/SceneManagement/SceneSystem.cs +++ b/Assets/Scripts/SS3D/SceneManagement/SceneSystem.cs @@ -41,9 +41,9 @@ private void LoadMainScene() isUsingCommandLineArgs = Environment.GetCommandLineArgs().Length > 1; } - DatabaseAsset sceneToLoad = isUsingCommandLineArgs ? Scenes.Intro : Scenes.Launcher; + string sceneToLoad = isUsingCommandLineArgs ? Scenes.Intro : Scenes.Launcher; - Log.Information(this, $"Loading main scene as {sceneToLoad.Name}", Logs.Important); + Log.Information(this, $"Loading main scene as {sceneToLoad}", Logs.Important); if (applicationSettings.ForceLauncher) { diff --git a/Assets/Scripts/SS3D/Systems/Furniture/LockLockerInteraction.cs b/Assets/Scripts/SS3D/Systems/Furniture/LockLockerInteraction.cs index e758e59ae1..80b51a5b31 100644 --- a/Assets/Scripts/SS3D/Systems/Furniture/LockLockerInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Furniture/LockLockerInteraction.cs @@ -12,15 +12,13 @@ namespace SS3D.Systems.Inventory.Interactions { public sealed class LockLockerInteraction : Interaction { - private IDPermission permissionToUnlock; - - public event EventHandler OnOpenStateChanged; - Locker locker; + private readonly IDPermission _permissionToUnlock; + private readonly Locker _locker; public LockLockerInteraction(Locker locker, IDPermission permission) { - this.locker = locker; - this.permissionToUnlock = permission; + _locker = locker; + _permissionToUnlock = permission; } public override string GetName(InteractionEvent interactionEvent) @@ -39,33 +37,42 @@ public override bool CanInteract(InteractionEvent interactionEvent) { return false; } + + if (!_locker.Lockable) + { + return false; + } - return !locker.Locked; + return !_locker.IsLocked && !_locker.IsOpen; } public override bool Start(InteractionEvent interactionEvent, InteractionReference reference) { IInteractionSource source = interactionEvent.Source; - if (source is IGameObjectProvider sourceGameObjectProvider) + + if (source is not IGameObjectProvider sourceGameObjectProvider) { - Hands hands = sourceGameObjectProvider.GameObject.GetComponentInParent(); - - if (hands != null) - { - if (hands.Inventory.HasPermission(permissionToUnlock)) - { - Log.Information(this, "Locker has been locked!"); - locker.Locked = true; - } else - { - Log.Information(this, "No permission to lock Locker!"); - return false; - } - } + return false; + } + Hands hands = sourceGameObjectProvider.GameObject.GetComponentInParent(); + if (hands == null) + { return true; } - return false; + + if (hands.Inventory.HasPermission(_permissionToUnlock)) + { + Log.Information(this, "Locker has been locked!"); + _locker.IsLocked = true; + } + else + { + Log.Information(this, "No permission to lock Locker!"); + return false; + } + + return true; } } } \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Systems/Furniture/Locker.cs b/Assets/Scripts/SS3D/Systems/Furniture/Locker.cs index 94fc946e00..e99b3146cb 100644 --- a/Assets/Scripts/SS3D/Systems/Furniture/Locker.cs +++ b/Assets/Scripts/SS3D/Systems/Furniture/Locker.cs @@ -1,9 +1,15 @@ +using Coimbra; +using DG.Tweening; using FishNet.Object.Synchronizing; +using JetBrains.Annotations; using SS3D.Core.Behaviours; using SS3D.Interactions; using SS3D.Interactions.Interfaces; using SS3D.Systems.Inventory.Interactions; +using System; +using System.Collections.Generic; using UnityEngine; +using UnityEngine.Serialization; namespace SS3D.Systems.Furniture { @@ -12,42 +18,103 @@ namespace SS3D.Systems.Furniture /// public class Locker : NetworkActor, IInteractionTarget { - [SyncVar(OnChange = nameof(OnLocked))] public bool Locked; - [SerializeField, SyncVar] private IDPermission permissionToUnlock; + private static readonly int ColorPropertyIndex = Shader.PropertyToID("_Color"); + + [FormerlySerializedAs("Locked")] + [SyncVar(OnChange = nameof(OnLocked))] + public bool IsLocked; + + [SyncVar(OnChange = nameof(SyncIsOpen))] + public bool IsOpen; + + [FormerlySerializedAs("_lockable")] + [SerializeField] + [SyncVar] + [Header("Define if the locker is lockable")] + public bool Lockable; + + [SerializeField] + [SyncVar] + [Header("Optional")] + private IDPermission permissionToUnlock; + + [SerializeField] + private GameObject _door; + + [SerializeField] + private Vector3 _doorChangePunch = new Vector3(-.1f, -.05f, 0); + + [CanBeNull] + [Header("Optional")] public GameObject LockLight; - private MaterialPropertyBlock propertyBlock; - private Renderer _renderer; - private void OnLocked(bool prev, bool next, bool asServer) + private Material _lightMaterial; + + protected override void OnStart() { - if(next) + base.OnStart(); + + if (LockLight != null) { - propertyBlock.SetColor("_Color", Color.red); - _renderer.SetPropertyBlock(propertyBlock); + _lightMaterial = LockLight.GetComponent().material; } - else + } + + private void SyncIsOpen(bool prev, bool next, bool asServer) + { + if (asServer) { - propertyBlock.SetColor("_Color", Color.green); - _renderer.SetPropertyBlock(propertyBlock); + return; } - } + + bool isOpen = next; - protected override void OnStart() + DOTween.Kill(_door.transform); + DOTween.Kill(transform, true); + + Vector3 doorRotation = _door.transform.localEulerAngles; + + // end value + doorRotation = new Vector3(doorRotation.x, isOpen ? 130 : 0, doorRotation.z); + Vector3 doorChangePunch = new Vector3(_doorChangePunch.x, isOpen ? -_doorChangePunch.y : _doorChangePunch.y, _doorChangePunch.z); + + transform.DOPunchScale(doorChangePunch, .25f).SetEase(Ease.OutExpo); + _door.transform.DOLocalRotate(doorRotation, .45f).SetEase(Ease.OutExpo); + } + + private void OnLocked(bool prev, bool next, bool asServer) { - base.OnStart(); - propertyBlock = new MaterialPropertyBlock(); - _renderer = LockLight.GetComponent(); + if (LockLight == null) + { + return; + } + + DOTween.Kill(_lightMaterial); + + _lightMaterial.DOColor(next ? Color.red : Color.green, ColorPropertyIndex, 0.25f); } public IInteraction[] CreateTargetInteractions(InteractionEvent interactionEvent) { - LockLockerInteraction lockLockerInteraction = - new LockLockerInteraction(this, permissionToUnlock); + List interactions = ListPool.Pop(); - UnlockLockerInteraction unlockLockerInteraction = - new UnlockLockerInteraction(this, permissionToUnlock); + LockLockerInteraction lockLockerInteraction = new(this, permissionToUnlock); + UnlockLockerInteraction unlockLockerInteraction = new(this, permissionToUnlock); + + LockerDoorInteraction lockerDoorInteraction = new(this) + { + Name = IsOpen ? "Close Locker" : "Open Locker", + }; + + interactions.Add(lockLockerInteraction); + interactions.Add(unlockLockerInteraction); + + interactions.Add(lockerDoorInteraction); + + IInteraction[] targetInteractions = interactions.ToArray(); + ListPool.Push(interactions); - return new IInteraction[] { lockLockerInteraction, unlockLockerInteraction }; + return targetInteractions; } } } \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Systems/Furniture/LockerDoorInteraction.cs b/Assets/Scripts/SS3D/Systems/Furniture/LockerDoorInteraction.cs new file mode 100644 index 0000000000..25e3ec547a --- /dev/null +++ b/Assets/Scripts/SS3D/Systems/Furniture/LockerDoorInteraction.cs @@ -0,0 +1,44 @@ +using SS3D.Data.Generated; +using SS3D.Interactions; +using SS3D.Interactions.Extensions; +using UnityEngine; + +namespace SS3D.Systems.Furniture +{ + public class LockerDoorInteraction : Interaction + { + private readonly Locker _locker; + + public LockerDoorInteraction(Locker locker) + { + _locker = locker; + } + + public override string GetName(InteractionEvent interactionEvent) + { + return !string.IsNullOrEmpty(Name) ? Name : "Open or Close Locker"; + } + + public override Sprite GetIcon(InteractionEvent interactionEvent) + { + return Icon != null ? Icon : InteractionIcons.Open; + } + + public override bool CanInteract(InteractionEvent interactionEvent) + { + if (_locker.IsLocked) + { + return false; + } + + return InteractionExtensions.RangeCheck(interactionEvent); + } + + public override bool Start(InteractionEvent interactionEvent, InteractionReference reference) + { + _locker.IsOpen = !_locker.IsOpen; + + return true; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Systems/Furniture/LockerDoorInteraction.cs.meta b/Assets/Scripts/SS3D/Systems/Furniture/LockerDoorInteraction.cs.meta new file mode 100644 index 0000000000..206ef931cc --- /dev/null +++ b/Assets/Scripts/SS3D/Systems/Furniture/LockerDoorInteraction.cs.meta @@ -0,0 +1,3 @@ +fileFormatVersion: 2 +guid: 1fe89c2a1b1a4f31a90a9b418d4d80b2 +timeCreated: 1729348324 \ No newline at end of file diff --git a/Assets/Scripts/SS3D/Systems/Furniture/UnlockLockerInteraction.cs b/Assets/Scripts/SS3D/Systems/Furniture/UnlockLockerInteraction.cs index 2f355c6a94..0da1cbf769 100644 --- a/Assets/Scripts/SS3D/Systems/Furniture/UnlockLockerInteraction.cs +++ b/Assets/Scripts/SS3D/Systems/Furniture/UnlockLockerInteraction.cs @@ -12,15 +12,15 @@ namespace SS3D.Systems.Inventory.Interactions { public sealed class UnlockLockerInteraction : Interaction { - private IDPermission permissionToUnlock; + private readonly IDPermission _permissionToUnlock; + private readonly Locker _locker; public event EventHandler OnOpenStateChanged; - Locker locker; public UnlockLockerInteraction(Locker locker, IDPermission permission) { - this.locker = locker; - this.permissionToUnlock = permission; + _locker = locker; + _permissionToUnlock = permission; } public override string GetName(InteractionEvent interactionEvent) { @@ -39,7 +39,12 @@ public override bool CanInteract(InteractionEvent interactionEvent) return false; } - return locker.Locked; + if (!_locker.Lockable) + { + return false; + } + + return _locker.IsLocked && !_locker.IsOpen; } public override bool Start(InteractionEvent interactionEvent, InteractionReference reference) @@ -51,10 +56,10 @@ public override bool Start(InteractionEvent interactionEvent, InteractionReferen if (hands != null) { - if (hands.Inventory.HasPermission(permissionToUnlock)) + if (hands.Inventory.HasPermission(_permissionToUnlock)) { Log.Information(this, "Locker has been unlocked!"); - locker.Locked = false; + _locker.IsLocked = false; } else { Log.Information(this, "No permission to unlock Locker!"); diff --git a/Assets/Settings/AssetDatabaseSettings.asset b/Assets/Settings/AssetDatabaseSettings.asset index f0ce416cce..b1c805cb9e 100644 --- a/Assets/Settings/AssetDatabaseSettings.asset +++ b/Assets/Settings/AssetDatabaseSettings.asset @@ -20,7 +20,6 @@ MonoBehaviour: - {fileID: 11400000, guid: c2644d7b34e956743a0bc485e7ca5e37, type: 2} - {fileID: 11400000, guid: acbbffb4c89caec469bb21b6197c7626, type: 2} - {fileID: 11400000, guid: 099b9943e9299d54b82d2c1163500458, type: 2} - - {fileID: 11400000, guid: 3fc0db940ed0bd14cb905a5e15dd32fe, type: 2} - {fileID: 11400000, guid: 43b69e36c49203a44bf20042cd83de81, type: 2} - {fileID: 11400000, guid: 830650063081cdf4d90087fc2ac74d24, type: 2} _skipCodeGeneration: 0 diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index c08845ab4f..06b0c5819c 100644 --- a/ProjectSettings/EditorBuildSettings.asset +++ b/ProjectSettings/EditorBuildSettings.asset @@ -11,7 +11,7 @@ EditorBuildSettings: - enabled: 1 path: Assets/Content/Scenes/Intro.unity guid: 61687ab4465bb6e4d8164057bedc63db - - enabled: 0 + - enabled: 1 path: Assets/Content/Scenes/Launcher.unity guid: d03a300180bde5646b09bfa4c392679f - enabled: 1 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 0aa22c4b29..d547e036e5 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -138,19 +138,15 @@ PlayerSettings: Others: 1 bundleVersion: 0.0.7.5 preloadedAssets: + - {fileID: 11400000, guid: b60ebf47fee797845ac53b5122978922, type: 2} + - {fileID: 11400000, guid: 7e95d9e343a711348b669c67be95eade, type: 2} - {fileID: 11400000, guid: 2024dd0c65f45424f98ac0c8a6979181, type: 2} + - {fileID: 11400000, guid: 71d1eb78bf0499946bccc4daad2531fa, type: 2} - {fileID: 11400000, guid: 3c59f55e6898e694083e7a1ede49fe18, type: 2} - {fileID: 11400000, guid: 443046479504c5640b8f5902a102c09f, type: 2} - - {fileID: 11400000, guid: c15209f668bbfab479eb5184981c2bf7, type: 2} - - {fileID: 11400000, guid: 97967903e9bd51b499aaa39639cc9bb2, type: 2} - {fileID: 11400000, guid: 2b55e2e913cc78044a828c6fb589fb9e, type: 2} - - {fileID: 11400000, guid: 443046479504c5640b8f5902a102c09f, type: 2} - - {fileID: 11400000, guid: 3c59f55e6898e694083e7a1ede49fe18, type: 2} - - {fileID: 11400000, guid: 2024dd0c65f45424f98ac0c8a6979181, type: 2} - {fileID: 11400000, guid: 97967903e9bd51b499aaa39639cc9bb2, type: 2} - - {fileID: 11400000, guid: 71d1eb78bf0499946bccc4daad2531fa, type: 2} - - {fileID: 11400000, guid: b60ebf47fee797845ac53b5122978922, type: 2} - - {fileID: 11400000, guid: 7e95d9e343a711348b669c67be95eade, type: 2} + - {fileID: 11400000, guid: c15209f668bbfab479eb5184981c2bf7, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1