Unity-Technologies · julianunity · Jun 15, 2023 · Jun 15, 2023 · Jun 15, 2023 · Jun 15, 2023
diff --git a/Assets/Art/Textures/Effects/LensDirt_HDR.exr b/Assets/Art/Textures/Effects/LensDirt_HDR.exr
diff --git a/Assets/Art/Textures/Effects/LensDirt_HDR.exr.meta b/Assets/Art/Textures/Effects/LensDirt_HDR.exr.meta
diff --git a/Assets/Scripts/Gameplay/UI/MonoBehaviours/Settings/UIGraphicsSettings.cs b/Assets/Scripts/Gameplay/UI/MonoBehaviours/Settings/UIGraphicsSettings.cs
@@ -14,7 +14,6 @@ namespace Unity.MegaCity.UI
     ///  - Texture Detail
     ///  - Shadow Quality
     ///  - Level of Detail
-    ///  - Motion Blur
     ///  - Reflections
     ///  - Fog
     ///  - VSync
@@ -34,7 +33,6 @@ public class UIGraphicsSettings : UISettingsTab
         private Toggle m_PostprocesingValue;
         private Toggle m_VolumetricFogValue;
         private Toggle m_ReflectionsValue;
-        private Toggle m_MotionBlurValue;
         private Toggle m_VerticalSyncValue;
 
         private DropdownField m_QualityValue;
@@ -44,7 +42,6 @@ public class UIGraphicsSettings : UISettingsTab
         private DropdownField m_ShadowQualityValue;
         private DropdownField m_LevelOfDetailValue;
 
-        private MotionBlur m_MotionBlur;
         private VisualElement m_MainRoot;
 
         public override string TabName => "graphics";
@@ -57,7 +54,6 @@ protected override void Initialization()
             m_PostprocesingValue = root.Q<GroupBox>().Q<Toggle>("postprocessing");
             m_VolumetricFogValue = root.Q<GroupBox>().Q<Toggle>("volumetric-fog");
             m_ReflectionsValue = root.Q<GroupBox>().Q<Toggle>("reflections");
-            m_MotionBlurValue = root.Q<GroupBox>().Q<Toggle>("motion-blur");
             m_VerticalSyncValue = root.Q<GroupBox>().Q<Toggle>("vertical-sync");
 
             m_QualityValue = root.Q<DropdownField>("quality-settings");
@@ -74,15 +70,13 @@ protected override void Initialization()
             m_PostprocesingValue.RegisterValueChangedCallback(OnPostprocessingChanged);
             m_VolumetricFogValue.RegisterValueChangedCallback(OnVolumetricFogChanged);
             m_ReflectionsValue.RegisterValueChangedCallback(OnReflectionsChanged);
-            m_MotionBlurValue.RegisterValueChangedCallback(OnMotionBlurChanged);
             m_VerticalSyncValue.RegisterValueChangedCallback(OnVsyncChanged);
 
             m_QualityValue.RegisterValueChangedCallback(OnGraphicsQualityChanged);
             m_ScreenmodeValue.RegisterValueChangedCallback(OnScreenModeChanged);
             m_TextureDetailsValue.RegisterValueChangedCallback(OnTextureDetailsChanged);
             m_ShadowQualityValue.RegisterValueChangedCallback(OnShadowQualityChanged);
             m_LevelOfDetailValue.RegisterValueChangedCallback(LevelOfDetailChanged);
-            m_PostProcessing.profile.TryGet(out m_MotionBlur);
 
             switch (QualitySettings.GetQualityLevel())
             {
@@ -120,7 +114,6 @@ protected override void SaveCurrentState()
             UpdateCurrentToggleState(m_PostprocesingValue);
             UpdateCurrentToggleState(m_VolumetricFogValue);
             UpdateCurrentToggleState(m_ReflectionsValue);
-            UpdateCurrentToggleState(m_MotionBlurValue);
             UpdateCurrentToggleState(m_VerticalSyncValue);
 
             UpdateCurrentDropdownFieldState(m_ScreenmodeValue);
@@ -137,7 +130,6 @@ public override void Reset()
             ResetCurrentToggleState(m_PostprocesingValue);
             ResetCurrentToggleState(m_VolumetricFogValue);
             ResetCurrentToggleState(m_ReflectionsValue);
-            ResetCurrentToggleState(m_MotionBlurValue);
             ResetCurrentToggleState(m_VerticalSyncValue);
 
             ResetCurrentDropdownFieldState(m_ScreenmodeValue);
@@ -151,7 +143,6 @@ private void OnHighButtonOnClicked()
             m_CanSetAsCustom = false;
             QualitySettings.SetQualityLevel(2);
             m_VerticalSyncValue.value = true;
-            m_MotionBlurValue.value = true;
             m_VolumetricFogValue.value = true;
             m_PostprocesingValue.value = true;
             m_ReflectionsValue.value = true;
@@ -167,7 +158,6 @@ private void OnMediumButtonOnClicked()
             m_CanSetAsCustom = false;
             QualitySettings.SetQualityLevel(1);
             m_VerticalSyncValue.value = false;
-            m_MotionBlurValue.value = false;
             m_VolumetricFogValue.value = true;
             m_PostprocesingValue.value = true;
             m_ReflectionsValue.value = true;
@@ -183,7 +173,6 @@ private void OnLowButtonOnClicked()
             m_CanSetAsCustom = false;
             QualitySettings.SetQualityLevel(0);
             m_VerticalSyncValue.value = false;
-            m_MotionBlurValue.value = false;
             m_VolumetricFogValue.value = false;
             m_PostprocesingValue.value = false;
             m_ReflectionsValue.value = false;
@@ -201,7 +190,6 @@ private void OnDestroy()
                 m_PostprocesingValue.UnregisterValueChangedCallback(OnPostprocessingChanged);
                 m_VolumetricFogValue.UnregisterValueChangedCallback(OnVolumetricFogChanged);
                 m_ReflectionsValue.UnregisterValueChangedCallback(OnReflectionsChanged);
-                m_MotionBlurValue.UnregisterValueChangedCallback(OnMotionBlurChanged);
                 m_VerticalSyncValue.UnregisterValueChangedCallback(OnVsyncChanged);
 
                 m_ScreenmodeValue.UnregisterValueChangedCallback(OnScreenModeChanged);
@@ -242,12 +230,6 @@ private void OnVsyncChanged(ChangeEvent<bool> value)
             SetCustom();
         }
 
-        private void OnMotionBlurChanged(ChangeEvent<bool> value)
-        {
-            m_MotionBlur.active = value.newValue;
-            SetCustom();
-        }
-
         private void OnVolumetricFogChanged(ChangeEvent<bool> value)
         {
             RenderSettings.fog = value.newValue;
@@ -367,4 +349,4 @@ private void SetCustom()
                 m_QualityValue.value = m_QualityValue.choices[3];
         }
     }
-}
+}
diff --git a/Assets/Scripts/Gameplay/Vivox/InitializedVivoxSystem.cs b/Assets/Scripts/Gameplay/Vivox/InitializedVivoxSystem.cs
@@ -42,11 +42,11 @@ public void OnUpdate(ref SystemState state)
                          .WithNone<VivoxConnectionStatus>()
                          .WithEntityAccess())
             {
-                var vivoxPlayerName = PlayerInfoController.Instance.Name;
-                if (string.IsNullOrEmpty(playerName.ValueRO.Name.ToString()))
-                    vivoxPlayerName = playerName.ValueRO.Name.ToString();
-                cmdBuffer.AddComponent<VivoxConnectionStatus>(entity);
-                VivoxManager.Instance.Session.Login(vivoxPlayerName);
+                if (!string.IsNullOrEmpty(playerName.ValueRO.Name.ToString()))
+                {
+                    VivoxManager.Instance.Session.Login(playerName.ValueRO.Name.ToString());
+                    cmdBuffer.AddComponent<VivoxConnectionStatus>(entity);
+                }
             }
 
             cmdBuffer.Playback(state.EntityManager);

diff --git a/Assets/Scripts/Gameplay/Vivox/MonoBehaviours/VivoxSession.cs b/Assets/Scripts/Gameplay/Vivox/MonoBehaviours/VivoxSession.cs
@@ -26,14 +26,14 @@ public class VivoxSession : MonoBehaviour
 
         private Account m_Account;
 
-        public void Login(string displayName = null)
+        public void Login(string displayName)
         {
             if (IsConnecting)
                 return;
 
             if (string.IsNullOrEmpty(displayName))
             {
-                Debug.LogWarning("DisplayName is null or empty, using default value");
+                Debug.LogWarning("[VIVOX] The user's DisplayName is missing or invalid. Vivox will utilize the default value as a fallback.");
                 displayName = "Player";
             }
 

diff --git a/Assets/Settings/Graphics/Volumes/EnvironmentProfile.asset b/Assets/Settings/Graphics/Volumes/EnvironmentProfile.asset
diff --git a/Assets/Settings/Graphics/Volumes/PostProcessingProfile.asset b/Assets/Settings/Graphics/Volumes/PostProcessingProfile.asset
diff --git a/Assets/Tutorial/Welcome.asset b/Assets/Tutorial/Welcome.asset
diff --git a/Assets/UI/MainMenu/Styles.uss b/Assets/UI/MainMenu/Styles.uss
@@ -107,6 +107,10 @@
     width: 80px;
     height: 80px;
     padding: 5px;
+    margin-left: 10px;
+    margin-right: 10px;
+    margin-top: 10px;
+    margin-bottom: 10px;
 }
 
 .checkbox > Label {

diff --git a/Assets/UI/Settings/GameSettings.uxml b/Assets/UI/Settings/GameSettings.uxml
@@ -109,9 +109,6 @@
                             <ui:Instance template="Label">
                                 <AttributeOverrides element-name="Label" text="Reflections" />
                             </ui:Instance>
-                            <ui:Instance template="Label">
-                                <AttributeOverrides element-name="Label" text="Motion Blur" />
-                            </ui:Instance>
                             <ui:Instance template="Label">
                                 <AttributeOverrides element-name="Label" text="Vertical Sync " />
                             </ui:Instance>
@@ -127,7 +124,6 @@
                                 <ui:Toggle label="Postprocessing" name="postprocessing" class="checkbox" style="-unity-background-scale-mode: scale-and-crop;" />
                                 <ui:Toggle label="Volumetric Fog" name="volumetric-fog" class="checkbox" />
                                 <ui:Toggle label="Reflections" name="reflections" class="checkbox" style="display: flex;" />
-                                <ui:Toggle label="Motion Blur" name="motion-blur" class="checkbox" />
                                 <ui:Toggle label="Vsync" name="vertical-sync" class="checkbox" />
                             </ui:GroupBox>
                         </ui:VisualElement>

diff --git a/Packages/manifest.json b/Packages/manifest.json
@@ -5,16 +5,17 @@
     "com.unity.2d.psdimporter": "8.0.2",
     "com.unity.2d.sprite": "1.0.0",
     "com.unity.2d.tilemap": "1.0.0",
-    "com.unity.burst": "1.8.4",
+    "com.unity.burst": "1.8.7",
     "com.unity.cinemachine": "2.9.7",
     "com.unity.collections": "2.1.4",
     "com.unity.entities": "1.0.10",
     "com.unity.entities.graphics": "1.0.10",
     "com.unity.ext.nunit": "1.0.6",
-    "com.unity.ide.rider": "3.0.22",
+    "com.unity.ide.rider": "3.0.24",
     "com.unity.ide.visualstudio": "2.0.18",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.learn.iet-framework": "3.1.3",
+    "com.unity.learn.iet-framework.authoring": "1.2.2",
     "com.unity.logging": "1.0.11",
     "com.unity.netcode": "1.0.11",
     "com.unity.performance.profile-analyzer": "1.2.2",

diff --git a/Packages/packages-lock.json b/Packages/packages-lock.json
@@ -60,7 +60,7 @@
       }
     },
     "com.unity.burst": {
-      "version": "1.8.4",
+      "version": "1.8.7",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -132,7 +132,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.rider": {
-      "version": "3.0.22",
+      "version": "3.0.24",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -166,6 +166,15 @@
       },
       "url": "https://packages.unity.com"
     },
+    "com.unity.learn.iet-framework.authoring": {
+      "version": "1.2.2",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.learn.iet-framework": "3.1.3"
+      },
+      "url": "https://packages.unity.com"
+    },
     "com.unity.logging": {
       "version": "1.0.11",
       "depth": 0,

diff --git a/ProjectSettings/Packages/com.unity.services.core/Settings.json b/ProjectSettings/Packages/com.unity.services.core/Settings.json
@@ -1 +0,0 @@
-{"EnvironmentName":""}

diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt
@@ -1,2 +1,2 @@
-m_EditorVersion: 2022.3.1f1
-m_EditorVersionWithRevision: 2022.3.1f1 (f18e0c1b5784)
+m_EditorVersion: 2022.3.2f1
+m_EditorVersionWithRevision: 2022.3.2f1 (d74737c6db50)