Skip to content

Commit 38a0d5e

Browse files
committed
Update
1 parent e360947 commit 38a0d5e

File tree

404 files changed

+41
-33
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

404 files changed

+41
-33
lines changed

DistanceServer/Assets/DistanceServerMainStarter.cs

Lines changed: 14 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,8 @@ void LoadServerBaseExternal()
3030
return null;
3131
};
3232
*/
33-
var file = new System.IO.FileInfo("DistanceServerBaseExternal.dll");
33+
var exeDir = new System.IO.DirectoryInfo(UnityEngine.Application.dataPath).Parent;
34+
var file = new System.IO.FileInfo(exeDir.FullName + "/DistanceServerBaseExternal.dll");
3435
using (System.IO.Stream stream = System.IO.File.OpenRead(file.FullName))
3536
{
3637
byte[] rawAssembly = new byte[stream.Length];
@@ -68,68 +69,68 @@ void LoadServerBaseExternal()
6869

6970
private void Update()
7071
{
71-
External.Update();
72+
External?.Update();
7273
}
7374

7475
void OnServerInitialized()
7576
{
76-
External.OnServerInitialized();
77+
External?.OnServerInitialized();
7778
}
7879

7980
void OnPlayerConnected(NetworkPlayer player)
8081
{
81-
External.OnPlayerConnected(player);
82+
External?.OnPlayerConnected(player);
8283
}
8384

8485
void OnPlayerDisconnected(NetworkPlayer player)
8586
{
86-
External.OnPlayerDisconnected(player);
87+
External?.OnPlayerDisconnected(player);
8788
}
8889

8990
private void OnDestroy()
9091
{
91-
External.OnDestroy();
92+
External?.OnDestroy();
9293
}
9394

9495
[RPC]
9596
void ReceiveBroadcastAllEvent(byte[] bytes)
9697
{
97-
External.ReceiveBroadcastAllEvent(bytes);
98+
External?.ReceiveBroadcastAllEvent(bytes);
9899
}
99100

100101
[RPC]
101102
void ReceiveClientToServerEvent(byte[] bytes)
102103
{
103-
External.ReceiveClientToServerEvent(bytes);
104+
External?.ReceiveClientToServerEvent(bytes);
104105
}
105106

106107
[RPC]
107108
void ReceiveServerToClientEvent(byte[] bytes)
108109
{
109-
External.ReceiveServerToClientEvent(bytes);
110+
External?.ReceiveServerToClientEvent(bytes);
110111
}
111112

112113
[RPC]
113114
void ReceiveTargetedEventServerToClient(byte[] bytes)
114115
{
115-
External.ReceiveTargetedEventServerToClient(bytes);
116+
External?.ReceiveTargetedEventServerToClient(bytes);
116117
}
117118

118119
[RPC]
119120
void ReceiveSerializeEvent(byte[] bytes)
120121
{
121-
External.ReceiveSerializeEvent(bytes);
122+
External?.ReceiveSerializeEvent(bytes);
122123
}
123124

124125
[RPC]
125126
void ReceiveServerNetworkTimeSync(int serverNetworkTimeIntHigh, int serverNetworkTimeIntLow, NetworkMessageInfo info)
126127
{
127-
External.ReceiveServerNetworkTimeSync(serverNetworkTimeIntHigh, serverNetworkTimeIntLow, info);
128+
External?.ReceiveServerNetworkTimeSync(serverNetworkTimeIntHigh, serverNetworkTimeIntLow, info);
128129
}
129130

130131
[RPC]
131132
void SubmitServerNetworkTimeSync(NetworkMessageInfo info)
132133
{
133-
External.SubmitServerNetworkTimeSync(info);
134+
External?.SubmitServerNetworkTimeSync(info);
134135
}
135136
}

DistanceServer/DistanceServerBaseExternal/DistanceServer.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public string MasterServerGameModeOverride
8686
}
8787
}
8888

89-
int distanceVersion = 6670;
89+
int distanceVersion = 6703;
9090
public int DistanceVersion
9191
{
9292
get
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
24;0;2228224;0;0
1+
19;0;4;0;0

DistanceServer/Library/CurrentLayout.dwlt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ MonoBehaviour:
4545
m_MinSize: {x: 683, y: 342}
4646
m_MaxSize: {x: 12008, y: 8042}
4747
vertical: 0
48-
controlID: 103
48+
controlID: 86
4949
--- !u!114 &3
5050
MonoBehaviour:
5151
m_ObjectHideFlags: 52
@@ -64,8 +64,8 @@ MonoBehaviour:
6464
y: 0
6565
width: 516
6666
height: 987
67-
m_MinSize: {x: 275, y: 50}
68-
m_MaxSize: {x: 4000, y: 4000}
67+
m_MinSize: {x: 277, y: 71}
68+
m_MaxSize: {x: 4002, y: 4021}
6969
m_ActualView: {fileID: 14}
7070
m_Panes:
7171
- {fileID: 14}
@@ -480,9 +480,9 @@ MonoBehaviour:
480480
m_PersistentViewDataDictionary: {fileID: 0}
481481
m_TreeViewState:
482482
scrollPos: {x: 0, y: 0}
483-
m_SelectedIDs: 72010000
483+
m_SelectedIDs:
484484
m_LastClickedID: 0
485-
m_ExpandedIDs: f0fbffff00000000
485+
m_ExpandedIDs: 08a9ffffbaa9ffffe2aaffffacb0ffff5cb1ffff84b2ffffdab6ffff8ab7ffffb2b8ffff12c1ffffbec1ffffe6c2ffff70c8ffff20c9ffff22c9ffff2ecbffffdecbffff06cdfffff6d1ffffa8d2ffffd0d3ffff38d8ffffead8ffff12daffff44e5fffff4e5ffff1ce7ffffc2edffff74eeffff9cefffff30f7ffffdef7ffff06f9fffff0fbffff00000000
486486
m_RenameOverlay:
487487
m_UserAcceptedRename: 0
488488
m_Name:
Binary file not shown.
7.83 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
player-connection-mode=Listen
2+
player-connection-guid=574949177
3+
player-connection-debug=0
4+
player-connection-ip=192.168.56.1
5+
player-connection-ip=169.254.199.201
6+
player-connection-ip=10.0.0.167
17
gfx-enable-native-gfx-jobs=
28
wait-for-native-debugger=0
39
scripting-runtime-version=latest
Binary file not shown.

DistanceServer/Library/PlayerDataCache/ScriptLayoutHashes.txt

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
WindowsStandalone
22
PlayerPath?
3-
D:/Development/Distance/DistanceServerStandalone/DistanceServer/Build/AutoServer/AutoServer.exe
3+
D:/Development/Distance/DistanceServerStandalonePublic/DistanceServer/Build/Windows/DistanceServer/DistanceServer.exe
44
SceneListBegin?
55
Assets/Scenes/Server.unity
66
SceneListEnd?
@@ -48,7 +48,6 @@ c63db43c730fa2cbb8ca07de15898cb6 UnityEngine.UI.dll:UnityEngine.UI.Toggle
4848
f61c0793411f10cf5fbfa1473fef5ef2 UnityEngine.UI.dll:UnityEngine.UI.ToggleGroup
4949
86d36c43c53541d667100dc90b89cfba UnityEngine.UI.dll:UnityEngine.EventSystems.TouchInputModule
5050
1b8c02d0aa82fbf036a2b9b2d713eec3 UnityEngine.UI.dll:UnityEngine.UI.VerticalLayoutGroup
51-
05524b8f659e7bfe5756d1335fec24ba Assembly-CSharp.dll:.VirusDropperDroneLogic
5251
a35dc9cca2faebc5f5f1aeb9e8e47bbe UnityEngine.UI.dll:UnityEngine.UI.AspectRatioFitter
5352
05524b8f659e7bfe5756d1335fec24ba UnityEngine.UI.dll:UnityEngine.EventSystems.BaseInput
5453
49cd62a578efc0a599b810a2b66cd49c UnityEngine.UI.dll:UnityEngine.UI.Button
@@ -82,7 +81,6 @@ f61c0793411f10cf5fbfa1473fef5ef2 UnityEngine.UI.dll:UnityEngine.UI.ToggleGroup
8281
86d36c43c53541d667100dc90b89cfba UnityEngine.UI.dll:UnityEngine.EventSystems.TouchInputModule
8382
1b8c02d0aa82fbf036a2b9b2d713eec3 UnityEngine.UI.dll:UnityEngine.UI.VerticalLayoutGroup
8483
05524b8f659e7bfe5756d1335fec24ba Assembly-CSharp.dll:.DistanceCarNetworkerBridge
85-
b278a1bb3b4897f05c16317d264ba2fe Assembly-CSharp.dll:.ColorChanger
8684
05524b8f659e7bfe5756d1335fec24ba UnityEngine.Timeline.dll:UnityEngine.Timeline.ActivationPlayableAsset
8785
cf455f7a806648c6ed4c7d3e3f8a0e03 UnityEngine.Timeline.dll:UnityEngine.Timeline.ActivationTrack
8886
13bdb7c23815c33a33b37b0ba8dd39be UnityEngine.Timeline.dll:UnityEngine.Timeline.AnimationPlayableAsset
@@ -117,7 +115,7 @@ bc68edb0af574bf79f9550ead8ebae5c UnityEngine.HoloLens.dll:UnityEngine.Audio.Audi
117115
463516d5b5fe8e67a0a24c48f2095b04 UnityEngine.HoloLens.dll:UnityEngine.EventSystems.HoloLensInputModule
118116
c2275a8bfbb9f9942cad75ecdfded41d UnityEngine.HoloLens.dll:UnityEngine.XR.WSA.SpatialMappingCollider
119117
45f3431f0103c41611e8d4eec3d439df UnityEngine.HoloLens.dll:UnityEngine.XR.WSA.SpatialMappingRenderer
120-
7257c22d5ef99eb7034afbe5bc488696 Assembly-CSharp.dll:.RigidbodyStateTransceiver
118+
79add398ec526b76784c363737b2755c Assembly-CSharp.dll:.NetworkStateTransceiverInternal
121119
fc1e0f4d8439d9928083474691511a13 UnityEngine.Networking.dll:UnityEngine.Networking.NetworkAnimator
122120
05524b8f659e7bfe5756d1335fec24ba UnityEngine.Networking.dll:UnityEngine.Networking.NetworkBehaviour
123121
60b2bb652410a5867a5ab9a01cd38461 UnityEngine.Networking.dll:UnityEngine.Networking.NetworkDiscovery
@@ -143,12 +141,10 @@ e0f7ffd5d5c2abe4b2e16569a21163da UnityEngine.GoogleAudioSpatializer.dll:UnityEng
143141
e0f7ffd5d5c2abe4b2e16569a21163da UnityEngine.GoogleAudioSpatializer.dll:UnityEngine.Experimental.Audio.Google.GvrAudioRoom
144142
67a5f2c97205d2e41a8ed7c7ce898f6e UnityEngine.GoogleAudioSpatializer.dll:UnityEngine.Experimental.Audio.Google.GvrAudioSoundfieldExtension
145143
67a5f2c97205d2e41a8ed7c7ce898f6e UnityEngine.GoogleAudioSpatializer.dll:UnityEngine.Experimental.Audio.Google.GvrAudioSourceExtension
146-
05524b8f659e7bfe5756d1335fec24ba Assembly-CSharp.dll:.DistanceServerMain
147-
42aa25d3651c8b521dc99551abbc906a Assembly-CSharp.dll:.CarStateTransceiver
144+
05524b8f659e7bfe5756d1335fec24ba Assembly-CSharp.dll:.DistanceServerMainStarter
148145
bc68edb0af574bf79f9550ead8ebae5c UnityEngine.HoloLens.dll:UnityEngine.Audio.AudioSpatializerMicrosoft
149146
05524b8f659e7bfe5756d1335fec24ba UnityEngine.HoloLens.dll:UnityEngine.EventSystems.HoloLensInput
150147
463516d5b5fe8e67a0a24c48f2095b04 UnityEngine.HoloLens.dll:UnityEngine.EventSystems.HoloLensInputModule
151148
c2275a8bfbb9f9942cad75ecdfded41d UnityEngine.HoloLens.dll:UnityEngine.XR.WSA.SpatialMappingCollider
152149
45f3431f0103c41611e8d4eec3d439df UnityEngine.HoloLens.dll:UnityEngine.XR.WSA.SpatialMappingRenderer
153150
9de3a22eca9aefadba2d10d5987cefe3 UnityEngine.SpatialTracking.dll:UnityEngine.SpatialTracking.TrackedPoseDriver
154-
05524b8f659e7bfe5756d1335fec24ba Assembly-CSharp.dll:.CarLogic
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 commit comments

Comments
 (0)