Skip to content

Commit 05b794c

Browse files
committed
Revert files
1 parent 370b459 commit 05b794c

File tree

10 files changed

+53
-574
lines changed

10 files changed

+53
-574
lines changed

testproject/Assets/Scenes/CommandLineOverrideTest.unity

Lines changed: 0 additions & 435 deletions
This file was deleted.

testproject/Assets/Scenes/CommandLineOverrideTest.unity.meta

Lines changed: 0 additions & 7 deletions
This file was deleted.

testproject/Assets/Scripts/ServerTest.cs

Lines changed: 0 additions & 24 deletions
This file was deleted.

testproject/Assets/Scripts/ServerTest.cs.meta

Lines changed: 0 additions & 2 deletions
This file was deleted.

testproject/Packages/manifest.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"com.unity.addressables": "2.7.4",
55
"com.unity.ai.navigation": "2.0.9",
66
"com.unity.collab-proxy": "2.10.1",
7-
"com.unity.dedicated-server": "1.6.1",
87
"com.unity.ide.rider": "3.0.38",
98
"com.unity.ide.visualstudio": "2.0.25",
109
"com.unity.mathematics": "1.3.3",

testproject/Packages/packages-lock.json

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,6 @@
5555
},
5656
"url": "https://packages.unity.com"
5757
},
58-
"com.unity.dedicated-server": {
59-
"version": "1.6.1",
60-
"depth": 0,
61-
"source": "registry",
62-
"dependencies": {},
63-
"url": "https://packages.unity.com"
64-
},
6558
"com.unity.ext.nunit": {
6659
"version": "2.0.5",
6760
"depth": 1,

testproject/ProjectSettings/EditorBuildSettings.asset

Lines changed: 51 additions & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -5,162 +5,159 @@ EditorBuildSettings:
55
m_ObjectHideFlags: 0
66
serializedVersion: 2
77
m_Scenes:
8-
- enabled: 0
8+
- enabled: 1
99
path: Assets/MainMenu.unity
1010
guid: 21c7fd68cda9dd9488fc0cc01f885e39
11-
- enabled: 0
11+
- enabled: 1
1212
path: Assets/Scenes/ZooSam.unity
1313
guid: 4683469c9a191411fbda5e426765b2fc
14-
- enabled: 0
14+
- enabled: 1
1515
path: Assets/Samples/SamplesMenu.unity
1616
guid: 037562c9b1a469f498dfb34256ddf86f
17-
- enabled: 0
17+
- enabled: 1
1818
path: Assets/Tests/Manual/ManualTestsMenu.unity
1919
guid: 197ba614e9ae3054a8dea7b2bdacad6a
20-
- enabled: 0
20+
- enabled: 1
2121
path: Assets/Tests/Manual/SceneTransitioning/SceneTransitioningTest.unity
2222
guid: 1c2375a896b2e8c4a841aa61224b8494
23-
- enabled: 0
23+
- enabled: 1
2424
path: Assets/Scenes/SampleScene.unity
2525
guid: 9fc0d4010bbf28b4594072e72b8655ab
26-
- enabled: 0
26+
- enabled: 1
2727
path: Assets/Tests/Manual/SceneTransitioning/SecondSceneToLoad.unity
2828
guid: 79c2bf7d6b7a06a42a94982aaf1904d8
29-
- enabled: 0
29+
- enabled: 1
3030
path: Assets/Tests/Manual/RpcTesting/RpcTesting.unity
3131
guid: 931469794d88a874998f1d5edd265522
32-
- enabled: 0
32+
- enabled: 1
3333
path: Assets/Tests/Manual/SceneTransitioning/ThirdSceneToLoad.unity
3434
guid: 637ab8340e96a2949adfe5bfdd42b924
35-
- enabled: 0
35+
- enabled: 1
3636
path: Assets/Tests/Manual/ConnectionApproval/ConnectionApprovalTest.unity
3737
guid: dd570b5916593cb41bab8beb1c9d9315
38-
- enabled: 0
38+
- enabled: 1
3939
path: Assets/Samples/EnableDisableNetworkObject/EnableDisableSceneNetworkObject.unity
4040
guid: 619b9eba5892d5a4e9dd1d6cafb0059a
41-
- enabled: 0
41+
- enabled: 1
4242
path: Assets/Tests/Manual/NetworkSceneManagerCallbacks/SceneWeAreSwitchingTo.unity
4343
guid: ee4d4a69e7f79bc4c861cd9a4b99dd0f
44-
- enabled: 0
44+
- enabled: 1
4545
path: Assets/Tests/Manual/NetworkSceneManagerCallbacks/SceneWeAreSwitchingFrom.unity
4646
guid: 073bd2111475c0643be45b7abe6a97ad
47-
- enabled: 0
47+
- enabled: 1
4848
path: Assets/Scenes/MultiprocessTestScene.unity
4949
guid: 76743cb7b342c49279327834918a9c6e
50-
- enabled: 0
50+
- enabled: 1
5151
path: Assets/Scenes/EmptyScene.unity
5252
guid: a2545a872c007404fbb6b0393ab74974
53-
- enabled: 0
53+
- enabled: 1
5454
path: Assets/Tests/Manual/SceneTransitioningAdditive/SceneTransitioningBase1.unity
5555
guid: 780f96a61e8ac8e41b638ae8ec3a3236
56-
- enabled: 0
56+
- enabled: 1
5757
path: Assets/Tests/Manual/SceneTransitioningAdditive/SceneTransitioningBase2.unity
5858
guid: 9e437cc704801bc47add735d743985f5
59-
- enabled: 0
59+
- enabled: 1
6060
path: Assets/Tests/Manual/SceneTransitioningAdditive/AdditiveScene1.unity
6161
guid: 41a0239b0c49e2047b7063c822f0df8a
62-
- enabled: 0
62+
- enabled: 1
6363
path: Assets/Tests/Manual/SceneTransitioningAdditive/AdditiveScene2.unity
6464
guid: c6a3d883c8253ee43bca4f2b03797d7b
65-
- enabled: 0
65+
- enabled: 1
6666
path: Assets/Tests/Manual/SceneTransitioningAdditive/AdditiveScene3.unity
6767
guid: 7da3dd618f5b5a34db1f6d3c9511e221
68-
- enabled: 0
68+
- enabled: 1
6969
path: Assets/Tests/Manual/SceneTransitioningAdditive/AdditiveScene4.unity
7070
guid: dc7e17c86f5ca81478043be306027c13
71-
- enabled: 0
71+
- enabled: 1
7272
path: Assets/Samples/PrefabPool/PrefabPoolExample.unity
7373
guid: e4732b28c18f52c4dbe06c8a37f7997f
74-
- enabled: 0
74+
- enabled: 1
7575
path: Assets/Samples/PrefabPool/PrefabPoolOverrideExample.unity
7676
guid: 8c9bee1332e0526429d8a2c929945d60
77-
- enabled: 0
77+
- enabled: 1
7878
path: Assets/Tests/Manual/SceneTransitioningAdditive/AdditiveSceneMultiInstance.unity
7979
guid: 0ae94f636016d3b40bfbecad57d99553
80-
- enabled: 0
80+
- enabled: 1
8181
path: Assets/Tests/Manual/DontDestroyOnLoad/DontDestroyOnLoadTest.unity
8282
guid: ff98b91da4ee7ff44bc3aa8a57ad5c12
83-
- enabled: 0
83+
- enabled: 1
8484
path: Assets/Tests/Manual/DontDestroyOnLoad/DontDestroyOnLoad_DestroyNetworkManagerTest.unity
8585
guid: 7dc1ab12373402546befc7d54e447258
86-
- enabled: 0
86+
- enabled: 1
8787
path: Assets/Tests/Manual/PreserveNetworkObjectsOnShutdown/PreserveNetworkObjects.unity
8888
guid: 3efb2ada1190a234d801b415fb526ec3
89-
- enabled: 0
89+
- enabled: 1
9090
path: Assets/Samples/Physics/PhysicsSample.unity
9191
guid: 2c76877ad66aa22458c62a0d74514a91
92-
- enabled: 0
92+
- enabled: 1
9393
path: Assets/Tests/Manual/IntegrationTestScenes/UnitTestBaseScene.unity
9494
guid: fa0b4956a4a0aee48ae43f9116d28354
95-
- enabled: 0
95+
- enabled: 1
9696
path: Assets/Tests/Manual/IntegrationTestScenes/InSceneNetworkObject.unity
9797
guid: 136692aa47cd577499d03a2b0dabbf28
98-
- enabled: 0
98+
- enabled: 1
9999
path: Assets/Tests/Manual/InSceneObjectParentingTests/InSceneNetworkObjectParentingTest.unity
100100
guid: f112d7c4abed6c34ca1287cf5ff15b9c
101-
- enabled: 0
101+
- enabled: 1
102102
path: Assets/Tests/Manual/InSceneObjectParentingTests/InSceneNetworkObjectToLoad.unity
103103
guid: f06a8525a4b5200459f62905c29ce09e
104-
- enabled: 0
104+
- enabled: 1
105105
path: Assets/Tests/Manual/NetworkAnimatorTests/NetworkAnimatorServerOwnerTest.unity
106106
guid: f88da8bb8d07e11418eaad6524d5cc12
107-
- enabled: 0
107+
- enabled: 1
108108
path: Assets/Samples/Teleport/TeleportSample.unity
109109
guid: efa247d1f78ca694f8d2dcb5672e8f8b
110-
- enabled: 0
110+
- enabled: 1
111111
path: Assets/Tests/Manual/NestedNetworkTransforms/NestedNetworkTransforms.unity
112112
guid: 92b8cccf28cbaba40854a025b66e2ac3
113-
- enabled: 0
113+
- enabled: 1
114114
path: Assets/Tests/Runtime/NetworkTransform/NestedNetworkTransformTestScene.unity
115115
guid: 14235ed18eff0964cbb3ff7ae2ed1933
116-
- enabled: 0
116+
- enabled: 1
117117
path: Assets/Tests/Manual/DeltaPositionNetworkTransform/DeltaPositionTest.unity
118118
guid: 19c7c7fb95b74684d8d8f8429b8d4ee5
119-
- enabled: 0
119+
- enabled: 1
120120
path: Assets/Tests/Manual/NestedNetworkTransforms/LerpVsSlerpScene.unity
121121
guid: 54ca4944ec2b95640a68bc35403a4977
122-
- enabled: 0
122+
- enabled: 1
123123
path: Assets/Tests/Runtime/ObjectParenting/ParentingInSceneObjects.unity
124124
guid: d04d395e163705441935990f702c782f
125-
- enabled: 0
125+
- enabled: 1
126126
path: Assets/Tests/Manual/IntegrationTestScenes/GenericInScenePlacedObject.unity
127127
guid: 43c36dc1d38660e4d9879e84e580e22f
128-
- enabled: 0
128+
- enabled: 1
129129
path: Assets/Tests/Manual/IntegrationTestScenes/EmptyScene1.unity
130130
guid: 057ba2cc37faa0b43aa7051d9f555caa
131-
- enabled: 0
131+
- enabled: 1
132132
path: Assets/Tests/Manual/IntegrationTestScenes/EmptyScene2.unity
133133
guid: 17b92153f7381d34fa48c4d5c0393d13
134-
- enabled: 0
134+
- enabled: 1
135135
path: Assets/Tests/Manual/IntegrationTestScenes/EmptyScene3.unity
136136
guid: abd4c8b51c445d54faa16c67ac973f1b
137-
- enabled: 0
137+
- enabled: 1
138138
path: Assets/Samples/SpawnObject/SimpleSpawn.unity
139139
guid: 2a46f77814044a6448d9c8872d851905
140-
- enabled: 0
140+
- enabled: 1
141141
path: Assets/Tests/Manual/PrefabTestAssets/PrefabTestScene.unity
142142
guid: 6449955dcdde54944ba1cdb97a23bd29
143-
- enabled: 0
143+
- enabled: 1
144144
path: Assets/Tests/Runtime/ObjectParenting/NetworkObjectParentingTests.unity
145145
guid: abe92ece17d830e41a66dff7edc9245d
146-
- enabled: 0
146+
- enabled: 1
147147
path: Assets/Tests/Manual/IntegrationTestScenes/InSceneUnderGameObject.unity
148148
guid: 778ea62ad5daee5408d1ec1fce28673f
149-
- enabled: 0
149+
- enabled: 1
150150
path: Assets/Tests/Manual/IntegrationTestScenes/InSceneUnderGameObjectWithNT.unity
151151
guid: 5a4f489df08d16c4d8c0167b099de2ca
152-
- enabled: 0
152+
- enabled: 1
153153
path: Assets/Tests/Manual/IntegrationTestScenes/SessionSynchronize.unity
154154
guid: 468b795904b98234593ebc31bf0d578a
155-
- enabled: 0
155+
- enabled: 1
156156
path: Assets/Tests/Manual/IntegrationTestScenes/NetworkObjectSpawnerTest.unity
157157
guid: 28ec9a0d98d9db64a9c57a79f38d6e0a
158-
- enabled: 0
158+
- enabled: 1
159159
path: Assets/Tests/Manual/NetworkAnimatorTests/AnimationBidirectionalTriggers/NetworkAnimatorDualTriggerCheer.unity
160160
guid: e12df855278120245a8a936a6a52b5bd
161-
- enabled: 1
162-
path: Assets/Scenes/CommandLineOverrideTest.unity
163-
guid: 9a4c20895a6e8e4458ac97be10fc7ffd
164161
m_configObjects:
165162
com.unity.addressableassets: {fileID: 11400000, guid: 5a3d5c53c25349c48912726ae850f3b0,
166163
type: 2}

testproject/ProjectSettings/MultiplayerManager.asset

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,5 @@
33
--- !u!655991488 &1
44
MultiplayerManager:
55
m_ObjectHideFlags: 0
6-
m_EnableMultiplayerRoles: 1
7-
m_StrippingTypes:
8-
1: []
9-
2: []
6+
m_EnableMultiplayerRoles: 0
7+
m_StrippingTypes: {}

testproject/ProjectSettings/Packages/com.unity.dedicated-server/ContentSelectionSettings.asset

Lines changed: 0 additions & 22 deletions
This file was deleted.

testproject/ProjectSettings/Packages/com.unity.dedicated-server/MultiplayerRolesSettings.asset

Lines changed: 0 additions & 18 deletions
This file was deleted.

0 commit comments

Comments
 (0)