tmp

Basic/ClientDriven/Assets/Scenes/Bootstrap.unity

@@ -1049,7 +1049,7 @@ GameObject:
   - component: {fileID: 533285802}
   - component: {fileID: 533285801}
   m_Layer: 0
-  m_Name: PacketDelayInputField
+  m_Name: RelayClientTextField
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1157,7 +1157,7 @@ MonoBehaviour:
       m_Calls:
       - m_Target: {fileID: 7616418622323388811}
         m_TargetAssemblyTypeName: InfoPanel, Assembly-CSharp
-        m_MethodName: OnUpdatePacketDelay
+        m_MethodName: OnUpdateJoinRelayAsClient
         m_Mode: 1
         m_Arguments:
           m_ObjectArgument: {fileID: 0}
@@ -2867,7 +2867,7 @@ GameObject:
   - component: {fileID: 1742131482}
   - component: {fileID: 1742131481}
   m_Layer: 0
-  m_Name: PacketDelayTextLabel
+  m_Name: RelayClientTextLabel
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -2912,7 +2912,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_text: Debug Simulator MS
+  m_text: Relay Join Code
   m_isRightToLeft: 0
   m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
   m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
@@ -5038,6 +5038,7 @@ MonoBehaviour:
   PacketDelayMSInputField: {fileID: 533285801}
   PacketJitterMSInputField: {fileID: 334014642}
   PacketDropRateInputField: {fileID: 256540559}
+  RelayClientJoinCode: {fileID: 0}
 --- !u!1 &7616418622323388912
 GameObject:
   m_ObjectHideFlags: 0

Basic/ClientDriven/Assets/Scripts/HostJoinUI.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Text.RegularExpressions;
 using Unity.Netcode;
+using Unity.Netcode.Components;
 using Unity.Netcode.Transports.UTP;
 using UnityEngine;
 using UnityEngine.UIElements;
@@ -27,6 +28,8 @@ public class HostJoinUI : MonoBehaviour
 
     TextField m_PortTextField;
 
+    TextField m_RelayClientJoinCode;
+
     void Awake()
     {
         m_MainMenuRootVisualElement = m_MainMenuUIDocument.rootVisualElement;
@@ -37,17 +40,19 @@ void Awake()
         m_ServerButton = m_MainMenuRootVisualElement.Query<Button>("ServerButton");
         m_IPAddressTextField = m_MainMenuRootVisualElement.Query<TextField>("IPAddressField");
         m_PortTextField = m_MainMenuRootVisualElement.Query<TextField>("PortField");
+        m_RelayClientJoinCode = m_MainMenuRootVisualElement.Query<TextField>("RelayClientTextField");
 
         m_HostButton.clickable.clickedWithEventInfo += StartHost;
         m_ServerButton.clickable.clickedWithEventInfo += StartServer;
-        m_ClientButton.clickable.clickedWithEventInfo += StartClient;
+        m_ClientButton.clickable.clickedWithEventInfo += CustomStartClientWithRelay;
     }
 
     void OnDestroy()
     {
         m_HostButton.clickable.clickedWithEventInfo -= StartHost;
         m_ServerButton.clickable.clickedWithEventInfo -= StartServer;
-        m_ClientButton.clickable.clickedWithEventInfo -= StartClient;
+        //m_ClientButton.clickable.clickedWithEventInfo -= StartClient;
+        m_ClientButton.clickable.clickedWithEventInfo -= CustomStartClientWithRelay;
     }
 
     void Start()
@@ -78,6 +83,20 @@ void StartClient(EventBase obj)
         }
     }
 
+    void CustomStartClientWithRelay(EventBase obj)
+    {
+        //var test = m_RelayClientJoinCode.text;
+        var test1 = m_IPAddressTextField.text;
+        NetworkManagerRelayIntegration.StartClientWithRelay(NetworkManager.Singleton, test1);
+        ToggleInGameUI(true);
+        ToggleMainMenuUI(false);
+        /*if (result)
+        {
+            ToggleInGameUI(true);
+            ToggleMainMenuUI(false);
+        }*/
+    }
+
     void StartServer(EventBase obj)
     {
         SetUtpConnectionData();

Basic/ClientDriven/Assets/Scripts/InfoPanel.cs

@@ -2,7 +2,9 @@
 using TMPro;
 using Unity.Multiplayer.Samples.Utilities.ClientAuthority;
 using Unity.Netcode;
+using Unity.Netcode.Components;
 using Unity.Netcode.Transports.UTP;
+using Unity.Networking.Transport.Utilities;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -15,7 +17,8 @@ public class InfoPanel : MonoBehaviour
     public TMP_InputField PacketDelayMSInputField;
     public TMP_InputField PacketJitterMSInputField;
     public TMP_InputField PacketDropRateInputField;
-
+    public TMP_InputField RelayClientJoinCode;
+
     private UnityTransport.SimulatorParameters SimulatorParameters;
     private ClientNetworkTransform ClientNetworkTransform;
 
@@ -48,7 +51,7 @@ void Update()
             QuatCompToggle.isOn = !QuatCompToggle.isOn;
         }
 
-        PacketDelayMSInputField = GameObject.Find("PacketDelayInputField").GetComponent<TMP_InputField>();
+        RelayClientJoinCode = GameObject.Find("RelayClientTextField").GetComponent<TMP_InputField>();
     }
     private void OnClientPlayerNetworkSpawn(ClientNetworkTransform clientNetworkTransform)
     {
@@ -134,4 +137,10 @@ public void OnUpdatePacketDropRate()
         }
         NetworkManager.Singleton.GetComponent<UnityTransport>().DebugSimulator = SimulatorParameters;
     }
+
+    public void OnUpdateJoinRelayAsClient()
+    {
+        var test = RelayClientJoinCode.text;
+        //NetworkManager.Singleton.StartClientWithRelay(RelayClientJoinCode.text);
+    }
 }

Basic/ClientDriven/Assets/URP/UniversalRenderPipelineAsset.asset

@@ -72,6 +72,7 @@ MonoBehaviour:
   m_ColorGradingMode: 1
   m_ColorGradingLutSize: 32
   m_UseFastSRGBLinearConversion: 0
+  m_SupportDataDrivenLensFlare: 1
   m_ShadowType: 1
   m_LocalShadowsSupported: 0
   m_LocalShadowsAtlasResolution: 256
@@ -83,7 +84,7 @@ MonoBehaviour:
     bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
   m_PrefilteringModeMainLightShadows: 3
   m_PrefilteringModeAdditionalLight: 3
-  m_PrefilteringModeAdditionalLightShadows: 2
+  m_PrefilteringModeAdditionalLightShadows: 0
   m_PrefilterXRKeywords: 1
   m_PrefilteringModeForwardPlus: 0
   m_PrefilteringModeDeferredRendering: 0

Basic/ClientDriven/Packages/manifest.json

@@ -8,7 +8,7 @@
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.inputsystem": "1.7.0",
     "com.unity.multiplayer.samples.coop": "https://github.com/Unity-Technologies/com.unity.multiplayer.samples.coop.git?path=/Packages/com.unity.multiplayer.samples.coop#v2.3.0",
-    "com.unity.netcode.gameobjects": "1.6.0",
+    "com.unity.netcode.gameobjects": "file:C:/Users/Frank/Documents/GitHub/com.unity.netcode.gameobjects/com.unity.netcode.gameobjects",
     "com.unity.render-pipelines.universal": "14.0.8",
     "com.unity.test-framework": "1.1.33",
     "com.unity.textmeshpro": "3.0.6",

Basic/ClientDriven/Packages/packages-lock.json

@@ -135,14 +135,13 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.netcode.gameobjects": {
-      "version": "1.6.0",
+      "version": "file:C:/Users/Frank/Documents/GitHub/com.unity.netcode.gameobjects/com.unity.netcode.gameobjects",
       "depth": 0,
-      "source": "registry",
+      "source": "local",
       "dependencies": {
         "com.unity.nuget.mono-cecil": "1.10.1",
-        "com.unity.transport": "1.3.4"
-      },
-      "url": "https://packages.unity.com"
+        "com.unity.transport": "1.4.0"
+      }
     },
     "com.unity.nuget.mono-cecil": {
       "version": "1.11.4",
@@ -297,7 +296,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.transport": {
-      "version": "1.3.4",
+      "version": "1.4.0",
       "depth": 1,
       "source": "registry",
       "dependencies": {

Basic/ClientDriven/ProjectSettings/ProjectSettings.asset

@@ -830,11 +830,11 @@ PlayerSettings:
   apiCompatibilityLevel: 6
   activeInputHandler: 2
   windowsGamepadBackendHint: 0
-  cloudProjectId: 
+  cloudProjectId: 10156f5c-aae7-4681-80fc-ed6d34b0955d
   framebufferDepthMemorylessMode: 0
   qualitySettingsNames: []
-  projectName: 
-  organizationId: 
+  projectName: BossRoomDotNotLeak
+  organizationId: ericktest
   cloudEnabled: 0
   legacyClampBlendShapeWeights: 0
   hmiLoadingImage: {fileID: 0}

Basic/ClientDriven/Window_Build/ClientDriven_Data/ClientDriven_Data/RuntimeInitializeOnLoads.json

@@ -0,0 +1 @@
+{"root":[{"assemblyName":"Assembly-CSharp","nameSpace":"__GEN","className":"NetworkVariableSerializationHelper","methodName":"InitializeSerialization","loadTypes":0,"isUnityClass":false},{"assemblyName":"Bootstrap","nameSpace":"__GEN","className":"NetworkVariableSerializationHelper","methodName":"InitializeSerialization","loadTypes":0,"isUnityClass":false},{"assemblyName":"Cinemachine","nameSpace":"Cinemachine","className":"CinemachineStoryboard","methodName":"InitializeModule","loadTypes":0,"isUnityClass":false},{"assemblyName":"Cinemachine","nameSpace":"Cinemachine","className":"CinemachineCore","methodName":"InitializeModule","loadTypes":0,"isUnityClass":false},{"assemblyName":"Cinemachine","nameSpace":"Cinemachine","className":"UpdateTracker","methodName":"InitializeModule","loadTypes":0,"isUnityClass":false},{"assemblyName":"Cinemachine","nameSpace":"Cinemachine","className":"CinemachineImpulseManager","methodName":"InitializeModule","loadTypes":0,"isUnityClass":false},{"assemblyName":"Cinemachine","nameSpace":"Cinemachine.PostFX","className":"CinemachineVolumeSettings","methodName":"InitializeModule","loadTypes":0,"isUnityClass":false},{"assemblyName":"Unity.Collections","nameSpace":"","className":"$BurstDirectCallInitializer","methodName":"Initialize","loadTypes":2,"isUnityClass":true},{"assemblyName":"Unity.InputSystem","nameSpace":"UnityEngine.InputSystem","className":"InputSystem","methodName":"RunInitializeInPlayer","loadTypes":4,"isUnityClass":true},{"assemblyName":"Unity.InputSystem","nameSpace":"UnityEngine.InputSystem","className":"InputSystem","methodName":"RunInitialUpdate","loadTypes":1,"isUnityClass":true},{"assemblyName":"Unity.Multiplayer.Samples.Utilities.ClientAuthority","nameSpace":"__GEN","className":"NetworkVariableSerializationHelper","methodName":"InitializeSerialization","loadTypes":0,"isUnityClass":true},{"assemblyName":"Unity.Multiplayer.Samples.Utilities","nameSpace":"__GEN","className":"NetworkVariableSerializationHelper","methodName":"InitializeSerialization","loadTypes":0,"isUnityClass":true},{"assemblyName":"Unity.Multiplayer.Tools.Adapters.Ngo1","nameSpace":"Unity.Multiplayer.Tools.Adapters.Ngo1","className":"Ngo1AdapterInitializer","methodName":"InitializeAdapter","loadTypes":0,"isUnityClass":true},{"assemblyName":"Unity.Multiplayer.Tools.Adapters.Ngo1","nameSpace":"__GEN","className":"NetworkVariableSerializationHelper","methodName":"InitializeSerialization","loadTypes":0,"isUnityClass":true},{"assemblyName":"Unity.Multiplayer.Tools.Initialization","nameSpace":"Unity.Multiplayer.Tools.Context","className":"ContextsInitializer","methodName":"EnableRuntimeContexts","loadTypes":0,"isUnityClass":true},{"assemblyName":"Unity.Multiplayer.Tools.NetworkProfiler.Runtime","nameSpace":"Unity.Multiplayer.Tools.NetworkProfiler.Runtime","className":"ProfilerAdapterEventListener","methodName":"SubscribeToAdapterAndMetricEvents","loadTypes":0,"isUnityClass":true},{"assemblyName":"Unity.Netcode.Components","nameSpace":"__GEN","className":"NetworkVariableSerializationHelper","methodName":"InitializeSerialization","loadTypes":0,"isUnityClass":true},{"assemblyName":"Unity.Netcode.Runtime","nameSpace":"Unity.Netcode","className":"NetworkUpdateLoop","methodName":"Initialize","loadTypes":4,"isUnityClass":true},{"assemblyName":"Unity.Netcode.Runtime","nameSpace":"Unity.Netcode","className":"NetworkVariableSerializationTypes","methodName":"InitializeIntegerSerialization","loadTypes":2,"isUnityClass":true},{"assemblyName":"Unity.Netcode.Runtime","nameSpace":"__GEN","className":"INetworkMessageHelper","methodName":"InitializeMessages","loadTypes":0,"isUnityClass":true},{"assemblyName":"Unity.RenderPipelines.Core.Runtime","nameSpace":"UnityEngine.Experimental.Rendering","className":"XRSystem","methodName":"XRSystemInit","loadTypes":3,"isUnityClass":true},{"assemblyName":"Unity.RenderPipelines.Core.Runtime","nameSpace":"UnityEngine.Rendering","className":"DebugUpdater","methodName":"RuntimeInit","loadTypes":0,"isUnityClass":true},{"assemblyName":"Unity.Services.Authentication","nameSpace":"Unity.Services.Authentication","className":"AuthenticationPackageInitializer","methodName":"Register","loadTypes":1,"isUnityClass":true},{"assemblyName":"Unity.Services.Core","nameSpace":"Unity.Services.Core","className":"UnityThreadUtils","methodName":"CaptureUnityThreadInfo","loadTypes":4,"isUnityClass":true},{"assemblyName":"Unity.Services.Core.Internal","nameSpace":"Unity.Services.Core.Internal","className":"TaskAsyncOperation","methodName":"SetScheduler","loadTypes":1,"isUnityClass":true},{"assemblyName":"Unity.Services.Core.Internal","nameSpace":"Unity.Services.Core.Internal","className":"UnityServicesInitializer","methodName":"CreateStaticInstance","loadTypes":2,"isUnityClass":true},{"assemblyName":"Unity.Services.Core.Internal","nameSpace":"Unity.Services.Core.Internal","className":"UnityServicesInitializer","methodName":"EnableServicesInitializationAsync","loadTypes":0,"isUnityClass":true},{"assemblyName":"Unity.Services.Core.Registration","nameSpace":"Unity.Services.Core.Registration","className":"CorePackageInitializer","methodName":"Register","loadTypes":1,"isUnityClass":true},{"assemblyName":"Unity.Services.QoS","nameSpace":"Unity.Services.Qos","className":"QosPackageInitializer","methodName":"Register","loadTypes":1,"isUnityClass":true},{"assemblyName":"Unity.Services.QoS","nameSpace":"Unity.Services.Qos.Scheduler","className":"EngineStateHelper","methodName":"Init","loadTypes":1,"isUnityClass":true},{"assemblyName":"Unity.Services.QoS","nameSpace":"Unity.Services.Qos.Scheduler","className":"ThreadHelper","methodName":"Init","loadTypes":1,"isUnityClass":true},{"assemblyName":"Unity.Services.QoS","nameSpace":"Unity.Services.Qos.Http","className":"JsonHelpers","methodName":"RegisterTypesForAOT","loadTypes":3,"isUnityClass":true},{"assemblyName":"Unity.Services.Relay","nameSpace":"Unity.Services.Relay","className":"RelayServiceProvider","methodName":"Register","loadTypes":1,"isUnityClass":true},{"assemblyName":"Unity.Services.Relay","nameSpace":"Unity.Services.Relay.Scheduler","className":"EngineStateHelper","methodName":"Init","loadTypes":1,"isUnityClass":true},{"assemblyName":"Unity.Services.Relay","nameSpace":"Unity.Services.Relay.Scheduler","className":"ThreadHelper","methodName":"Init","loadTypes":1,"isUnityClass":true},{"assemblyName":"Unity.Services.Relay","nameSpace":"Unity.Services.Relay.Http","className":"JsonHelpers","methodName":"RegisterTypesForAOT","loadTypes":3,"isUnityClass":true}]}

Basic/ClientDriven/Window_Build/ClientDriven_Data/ClientDriven_Data/ScriptingAssemblies.json

@@ -0,0 +1 @@
+{"names":["UnityEngine.dll","UnityEngine.AIModule.dll","UnityEngine.ARModule.dll","UnityEngine.AccessibilityModule.dll","UnityEngine.AndroidJNIModule.dll","UnityEngine.AnimationModule.dll","UnityEngine.AssetBundleModule.dll","UnityEngine.AudioModule.dll","UnityEngine.ClothModule.dll","UnityEngine.ClusterInputModule.dll","UnityEngine.ClusterRendererModule.dll","UnityEngine.ContentLoadModule.dll","UnityEngine.CoreModule.dll","UnityEngine.CrashReportingModule.dll","UnityEngine.DSPGraphModule.dll","UnityEngine.DirectorModule.dll","UnityEngine.GIModule.dll","UnityEngine.GameCenterModule.dll","UnityEngine.GridModule.dll","UnityEngine.HotReloadModule.dll","UnityEngine.IMGUIModule.dll","UnityEngine.ImageConversionModule.dll","UnityEngine.InputModule.dll","UnityEngine.InputLegacyModule.dll","UnityEngine.JSONSerializeModule.dll","UnityEngine.LocalizationModule.dll","UnityEngine.NVIDIAModule.dll","UnityEngine.ParticleSystemModule.dll","UnityEngine.PerformanceReportingModule.dll","UnityEngine.PhysicsModule.dll","UnityEngine.Physics2DModule.dll","UnityEngine.ProfilerModule.dll","UnityEngine.PropertiesModule.dll","UnityEngine.RuntimeInitializeOnLoadManagerInitializerModule.dll","UnityEngine.ScreenCaptureModule.dll","UnityEngine.SharedInternalsModule.dll","UnityEngine.SpriteMaskModule.dll","UnityEngine.SpriteShapeModule.dll","UnityEngine.StreamingModule.dll","UnityEngine.SubstanceModule.dll","UnityEngine.SubsystemsModule.dll","UnityEngine.TLSModule.dll","UnityEngine.TerrainModule.dll","UnityEngine.TerrainPhysicsModule.dll","UnityEngine.TextCoreFontEngineModule.dll","UnityEngine.TextCoreTextEngineModule.dll","UnityEngine.TextRenderingModule.dll","UnityEngine.TilemapModule.dll","UnityEngine.UIModule.dll","UnityEngine.UIElementsModule.dll","UnityEngine.UmbraModule.dll","UnityEngine.UnityAnalyticsModule.dll","UnityEngine.UnityAnalyticsCommonModule.dll","UnityEngine.UnityConnectModule.dll","UnityEngine.UnityCurlModule.dll","UnityEngine.UnityTestProtocolModule.dll","UnityEngine.UnityWebRequestModule.dll","UnityEngine.UnityWebRequestAssetBundleModule.dll","UnityEngine.UnityWebRequestAudioModule.dll","UnityEngine.UnityWebRequestTextureModule.dll","UnityEngine.UnityWebRequestWWWModule.dll","UnityEngine.VFXModule.dll","UnityEngine.VRModule.dll","UnityEngine.VehiclesModule.dll","UnityEngine.VideoModule.dll","UnityEngine.VirtualTexturingModule.dll","UnityEngine.WindModule.dll","UnityEngine.XRModule.dll","Assembly-CSharp.dll","Unity.RenderPipelines.Core.Runtime.dll","Unity.AI.Navigation.dll","Unity.Services.Core.Environments.Internal.dll","Unity.Services.Core.dll","Unity.Multiplayer.Tools.NetworkSolutionInterface.dll","Unity.Services.Core.Networking.dll","Unity.Networking.Transport.dll","Unity.Netcode.Components.dll","Unity.Multiplayer.Tools.NetStatsMonitor.Configuration.dll","Unity.Services.Core.Scheduler.dll","Unity.Services.Core.Environments.dll","Bootstrap.dll","Unity.Services.Relay.dll","Unity.Services.Core.Configuration.dll","Unity.Multiplayer.Tools.NetStats.dll","Unity.RenderPipelines.Core.ShaderLibrary.dll","Unity.Collections.dll","Unity.Netcode.Runtime.dll","Unity.Multiplayer.Samples.Utilities.RNSM.dll","Unity.Multiplayer.Tools.MetricTestData.dll","Unity.TextMeshPro.dll","Unity.Multiplayer.Samples.Utilities.dll","Unity.Services.Core.Analytics.dll","Unity.Multiplayer.Tools.Common.dll","Unity.Profiling.Core.dll","Unity.RenderPipelines.ShaderGraph.ShaderGraphLibrary.dll","Unity.RenderPipelines.Universal.Runtime.dll","Unity.Burst.dll","Unity.Multiplayer.Samples.Utilities.ClientAuthority.dll","Unity.Services.Core.Internal.dll","Unity.Services.Core.Device.dll","Unity.Tutorials.Core.dll","Unity.Services.Core.Threading.dll","Unity.Services.QoS.dll","UnityEngine.UI.dll","Unity.Multiplayer.Tools.NetworkProfiler.Runtime.dll","Unity.Services.Core.Telemetry.dll","Unity.Multiplayer.Tools.Adapters.Ngo1.dll","Unity.RenderPipeline.Universal.ShaderLibrary.dll","Unity.Timeline.dll","Unity.Multiplayer.Tools.NetStatsMonitor.Implementation.dll","Unity.InputSystem.dll","Unity.InputSystem.ForUI.dll","Unity.Multiplayer.Tools.Initialization.dll","Unity.Multiplayer.Tools.Adapters.dll","Unity.Services.Authentication.dll","Unity.Mathematics.dll","Unity.RenderPipelines.Universal.Shaders.dll","Unity.Multiplayer.Tools.MetricTypes.dll","Unity.Services.Core.Registration.dll","Cinemachine.dll","Unity.Multiplayer.Tools.NetStatsReporting.dll","Unity.Multiplayer.Tools.MetricEvents.dll","Unity.Multiplayer.Tools.NetStatsMonitor.Component.dll","Unity.Collections.LowLevel.ILSupport.dll","Unity.Burst.Unsafe.dll","Newtonsoft.Json.dll"],"types":[2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16,16]}