cgvr/DeltaVR
1
0
Fork 1
Code Issues 7 Pull Requests Actions Packages Projects Releases Wiki Activity

merging

Browse Source
This commit is contained in:
mxssw
2025-06-21 14:00:36 +03:00
parent 0fab2c9722 ee0b46f451
commit 7cdb281c23
8 changed files with 66 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Assets/_PROJECT/Multiplayer/CustomNetworkManager.prefab
View File

@@ -65,6 +65,7 @@ MonoBehaviour:
m_GameObject: {fileID: 876842842715561968}
m_Enabled: 1
m_EditorHideFlags: 0
<<<<<<< HEAD
m_Script: {fileID: 11500000, guid: 98cc0a7a6d6d7314c8e390e45a9e1483, type: 3}
m_Name:
m_EditorClassIdentifier:
@@ -72,6 +73,12 @@ MonoBehaviour:
port: 1
discoveryInterval: 0
automatic: 0
=======
m_Script: {fileID: 11500000, guid: 2883099670a13fa4397b2335c51bc792, type: 3}
m_Name:
m_EditorClassIdentifier:
networkDiscovery: {fileID: 3580593382982171501}
>>>>>>> master
--- !u!114 &3580593382982171501
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -81,10 +88,17 @@ MonoBehaviour:
m_GameObject: {fileID: 876842842715561968}
m_Enabled: 1
m_EditorHideFlags: 0
<<<<<<< HEAD
m_Script: {fileID: 11500000, guid: 846c98250226ef949b5c0c499e9334da, type: 3}
=======
m_Script: {fileID: 11500000, guid: 81d12db8c9730a74a923496476cfbf80, type: 3}
>>>>>>> master
m_Name:
m_EditorClassIdentifier:
networkDiscovery: {fileID: 4784684551416650039}
secret: deltavr
port: 0
discoveryInterval: 0
automatic: 0
--- !u!114 &3642215892935434233
MonoBehaviour:
m_ObjectHideFlags: 0