diff --git a/BlueWater/Assets/AddressableAssetsData/link.xml b/BlueWater/Assets/AddressableAssetsData/link.xml deleted file mode 100644 index ba1b24e1d..000000000 --- a/BlueWater/Assets/AddressableAssetsData/link.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/BlueWater/Assets/AddressableAssetsData/link.xml.meta b/BlueWater/Assets/AddressableAssetsData/link.xml.meta deleted file mode 100644 index 6ffe9bf1b..000000000 --- a/BlueWater/Assets/AddressableAssetsData/link.xml.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: ef0786f47b506c54b9e650ad27494a51 -TextScriptImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/StreamingAssets/HotReload_BuildInfo.json.meta b/BlueWater/Assets/StreamingAssets/HotReload_BuildInfo.json.meta deleted file mode 100644 index e77ce42c8..000000000 --- a/BlueWater/Assets/StreamingAssets/HotReload_BuildInfo.json.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 28f4c0f3194a0d24997290ad3a7e230a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/BlueWater/Assets/StylizedWater2/_Demo/Underwater/DemoAssets/Terrain/SWS_UnderwaterTerrain.asset b/BlueWater/Assets/StylizedWater2/_Demo/Underwater/DemoAssets/Terrain/SWS_UnderwaterTerrain.asset index 6403aa133..488a51d7c 100644 Binary files a/BlueWater/Assets/StylizedWater2/_Demo/Underwater/DemoAssets/Terrain/SWS_UnderwaterTerrain.asset and b/BlueWater/Assets/StylizedWater2/_Demo/Underwater/DemoAssets/Terrain/SWS_UnderwaterTerrain.asset differ diff --git a/BlueWater/ProjectSettings/Packages/com.unity.muse.common/Settings.json b/BlueWater/ProjectSettings/Packages/com.unity.muse.common/Settings.json index 42ac089e9..9e91ec3ab 100644 --- a/BlueWater/ProjectSettings/Packages/com.unity.muse.common/Settings.json +++ b/BlueWater/ProjectSettings/Packages/com.unity.muse.common/Settings.json @@ -4,7 +4,7 @@ { "type": "Unity.Muse.Common.PreferenceDataWrapper`1[[System.Collections.Generic.List`1[[Unity.Muse.Common.Account.OrganizationInfo, Unity.Muse.Common, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]], mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089]]", "key": "Unity.Muse.Common.Preferences.organizations", - "value": "{\"value\":[{\"rid\":1000},{\"rid\":1001}],\"references\":{\"version\":2,\"RefIds\":[{\"rid\":1000,\"type\":{\"class\":\"OrganizationInfo\",\"ns\":\"Unity.Muse.Common.Account\",\"asm\":\"Unity.Muse.Common\"},\"data\":{\"org_id\":\"14568565657763\",\"org_name\":\"iwnc2020\",\"status\":\"trial-expired\"}},{\"rid\":1001,\"type\":{\"class\":\"OrganizationInfo\",\"ns\":\"Unity.Muse.Common.Account\",\"asm\":\"Unity.Muse.Common\"},\"data\":{\"org_id\":\"7971586351139\",\"org_name\":\"Ntion\",\"status\":\"not-entitled\"}}]}}" + "value": "{\"value\":[{\"rid\":1000},{\"rid\":1001},{\"rid\":1002}],\"references\":{\"version\":2,\"RefIds\":[{\"rid\":1000,\"type\":{\"class\":\"OrganizationInfo\",\"ns\":\"Unity.Muse.Common.Account\",\"asm\":\"Unity.Muse.Common\"},\"data\":{\"org_id\":\"14568565657763\",\"org_name\":\"iwnc2020\",\"status\":\"trial-expired\"}},{\"rid\":1001,\"type\":{\"class\":\"OrganizationInfo\",\"ns\":\"Unity.Muse.Common.Account\",\"asm\":\"Unity.Muse.Common\"},\"data\":{\"org_id\":\"2410602\",\"org_name\":\"CaperMovie\",\"status\":\"not-entitled\"}},{\"rid\":1002,\"type\":{\"class\":\"OrganizationInfo\",\"ns\":\"Unity.Muse.Common.Account\",\"asm\":\"Unity.Muse.Common\"},\"data\":{\"org_id\":\"14569403936621\",\"org_name\":\"CapersUnity\",\"status\":\"not-entitled\"}}]}}" }, { "type": "Unity.Muse.Common.PreferenceDataWrapper`1[[Unity.Muse.Common.Account.OrganizationInfo, Unity.Muse.Common, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]", diff --git a/BlueWater/ProjectSettings/ProjectSettings.asset b/BlueWater/ProjectSettings/ProjectSettings.asset index b702b27b2..0cddcaa4d 100644 --- a/BlueWater/ProjectSettings/ProjectSettings.asset +++ b/BlueWater/ProjectSettings/ProjectSettings.asset @@ -137,8 +137,7 @@ PlayerSettings: vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 bundleVersion: 0.1.0 - preloadedAssets: - - {fileID: 11400000, guid: e0caac234b4984d92bb375ffa95898bf, type: 2} + preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1