Skip to content

Commit 4f12176

Browse files
committed
Revert "Revert files" + test project
This reverts commit 05b794c.
1 parent 9efec5f commit 4f12176

19 files changed

+752
-53
lines changed

testproject/Assets/PortOverrideCLI.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 19101, guid: 0000000000000000e000000000000000, type: 0}
13+
m_Name: CLI-Override-Panel Settings
14+
m_EditorClassIdentifier:
15+
themeUss: {fileID: -4733365628477956816, guid: d42e41277d2c0f7458e242e733a9129e,
16+
type: 3}
17+
m_DisableNoThemeWarning: 0
18+
m_TargetTexture: {fileID: 0}
19+
m_RenderMode: 0
20+
m_WorldSpaceLayer: 0
21+
m_ScaleMode: 1
22+
m_ReferenceSpritePixelsPerUnit: 100
23+
m_PixelsPerUnit: 100
24+
m_Scale: 1
25+
m_ReferenceDpi: 96
26+
m_FallbackDpi: 96
27+
m_ReferenceResolution: {x: 1200, y: 800}
28+
m_ScreenMatchMode: 0
29+
m_Match: 0
30+
m_SortingOrder: 0
31+
m_TargetDisplay: 0
32+
m_BindingLogLevel: 0
33+
m_ClearDepthStencil: 1
34+
m_ClearColor: 0
35+
m_ColorClearValue: {r: 0, g: 0, b: 0, a: 0}
36+
m_VertexBudget: 0
37+
m_DynamicAtlasSettings:
38+
m_MinAtlasSize: 64
39+
m_MaxAtlasSize: 4096
40+
m_MaxSubTextureSize: 64
41+
m_ActiveFilters: -1
42+
m_AtlasBlitShader: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0}
43+
m_RuntimeShader: {fileID: 9100, guid: 0000000000000000f000000000000000, type: 0}
44+
m_RuntimeWorldShader: {fileID: 9102, guid: 0000000000000000f000000000000000, type: 0}
45+
m_SDFShader: {fileID: 19011, guid: 0000000000000000f000000000000000, type: 0}
46+
m_BitmapShader: {fileID: 9001, guid: 0000000000000000f000000000000000, type: 0}
47+
m_SpriteShader: {fileID: 19012, guid: 0000000000000000f000000000000000, type: 0}
48+
m_ICUDataAsset: {fileID: 0}
49+
forceGammaRendering: 0
50+
textSettings: {fileID: 0}

testproject/Assets/PortOverrideCLI/CLI-Override-Panel Settings.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<ui:UXML xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:ui="UnityEngine.UIElements" xmlns:uie="UnityEditor.UIElements" noNamespaceSchemaLocation="../../UIElementsSchema/UIElements.xsd" editor-extension-mode="False">
2+
<ui:Label text="1" name="1" />
3+
<ui:Label text="2" name="2" />
4+
</ui:UXML>

testproject/Assets/PortOverrideCLI/CLI-Override-UI.uxml.meta

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
using Unity.Netcode;
2+
using Unity.Netcode.Transports.UTP;
3+
using UnityEngine;
4+
using UnityEngine.UIElements;
5+
6+
public class ServerTest : MonoBehaviour
7+
{
8+
private NetworkManager m_Network;
9+
private UnityTransport m_Transport;
10+
11+
public UIDocument Doc;
12+
public string First;
13+
public string Second;
14+
15+
private void Awake()
16+
{
17+
m_Network = GetComponent<NetworkManager>();
18+
m_Transport = GetComponent<UnityTransport>();
19+
}
20+
21+
private void Start()
22+
{
23+
ushort port = 8889;
24+
25+
First = "Start Server Port " + port;
26+
Debug.Log(First); // <---- Start Server Port 8888
27+
//m_Transport.SetConnectionData("0.0.0.0", port, forceOverrideCommandLineArgs: true); // <---- Port set to true 8888 false what is set in cli
28+
m_Network.StartServer();
29+
Second = "Server listening on port: " + m_Transport.ConnectionData.Port;
30+
Debug.Log(Second); // <---- Shows Server listening on port: 7777
31+
32+
Doc.rootVisualElement.Q<Label>("1").text = First;
33+
Doc.rootVisualElement.Q<Label>("2").text = Second;
34+
}
35+
}
36+
37+

testproject/Assets/PortOverrideCLI/CLI-Override-test.cs.meta

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)