Skip to content

Commit f2de9c3

Browse files
committed
Upgrading project to coherence SDK 2.0.0
1 parent 58c00c9 commit f2de9c3

259 files changed

Lines changed: 13732 additions & 20983 deletions

File tree

Some content is hidden

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

Assets/Art/Shaders/Stylized Water For URP/Demos/Buoyancy/BuoyantObject.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public class BuoyantObject : MonoBehaviour
2121
private float[] directions = new float[4];
2222

2323
[Header("Water Object")]
24-
public StylizedWater.StylizedWaterURP water;
24+
public StylizedWaterURP water;
2525

2626
[Header("Buoyancy")]
2727
[Range(1, 5)] public float strength = 1f;

Assets/Prefabs/Characters/KeeperRobot.prefab

Lines changed: 43 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -26,14 +26,14 @@ Transform:
2626
m_PrefabInstance: {fileID: 0}
2727
m_PrefabAsset: {fileID: 0}
2828
m_GameObject: {fileID: 118496468477875266}
29-
serializedVersion: 2
3029
m_LocalRotation: {x: -0, y: 0.70710665, z: -0, w: 0.70710695}
3130
m_LocalPosition: {x: 0, y: 0.39899993, z: 0}
3231
m_LocalScale: {x: 1, y: 1, z: 1}
3332
m_ConstrainProportionsScale: 0
3433
m_Children:
3534
- {fileID: 2659856684815926954}
3635
m_Father: {fileID: 6342975798731359634}
36+
m_RootOrder: 5
3737
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
3838
--- !u!114 &8984313321826824917
3939
MonoBehaviour:
@@ -59,18 +59,10 @@ BoxCollider:
5959
m_PrefabAsset: {fileID: 0}
6060
m_GameObject: {fileID: 118496468477875266}
6161
m_Material: {fileID: 0}
62-
m_IncludeLayers:
63-
serializedVersion: 2
64-
m_Bits: 0
65-
m_ExcludeLayers:
66-
serializedVersion: 2
67-
m_Bits: 0
68-
m_LayerOverridePriority: 0
6962
m_IsTrigger: 1
70-
m_ProvidesContacts: 0
7163
m_Enabled: 1
72-
serializedVersion: 3
73-
m_Size: {x: 1, y: 1, z: 1}
64+
serializedVersion: 2
65+
m_Size: {x: 2, y: 2, z: 2}
7466
m_Center: {x: 0, y: -0.42, z: 0}
7567
--- !u!114 &8551261703447512967
7668
MonoBehaviour:
@@ -110,13 +102,13 @@ Transform:
110102
m_PrefabInstance: {fileID: 0}
111103
m_PrefabAsset: {fileID: 0}
112104
m_GameObject: {fileID: 258220021027912687}
113-
serializedVersion: 2
114105
m_LocalRotation: {x: 0.000000029802322, y: 0.000000029802322, z: -0.7071067, w: 0.70710695}
115106
m_LocalPosition: {x: 1.39, y: -0.65, z: -0}
116107
m_LocalScale: {x: 1, y: 1, z: 1}
117108
m_ConstrainProportionsScale: 0
118109
m_Children: []
119110
m_Father: {fileID: 6342975798731359634}
111+
m_RootOrder: 4
120112
m_LocalEulerAnglesHint: {x: 0, y: 0, z: -90}
121113
--- !u!1 &5133252935554715310
122114
GameObject:
@@ -144,7 +136,6 @@ Transform:
144136
m_PrefabInstance: {fileID: 0}
145137
m_PrefabAsset: {fileID: 0}
146138
m_GameObject: {fileID: 5133252935554715310}
147-
serializedVersion: 2
148139
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
149140
m_LocalPosition: {x: 0, y: 5, z: 0}
150141
m_LocalScale: {x: 1, y: 1, z: 1}
@@ -153,6 +144,7 @@ Transform:
153144
- {fileID: 6342975798731359634}
154145
- {fileID: 7901216971521108104}
155146
m_Father: {fileID: 0}
147+
m_RootOrder: 0
156148
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
157149
--- !u!114 &5450002341135503407
158150
MonoBehaviour:
@@ -189,6 +181,18 @@ MonoBehaviour:
189181
m_Script: {fileID: 11500000, guid: ff62c046a053f416a8dc48ad6483a25e, type: 3}
190182
m_Name:
191183
m_EditorClassIdentifier:
184+
OnAuthorityRequest:
185+
m_PersistentCalls:
186+
m_Calls: []
187+
OnNetworkedInstantiation:
188+
m_PersistentCalls:
189+
m_Calls: []
190+
OnBeforeNetworkedInstantiation:
191+
m_PersistentCalls:
192+
m_Calls: []
193+
OnNetworkedDestruction:
194+
m_PersistentCalls:
195+
m_Calls: []
192196
OnStateRemote:
193197
m_PersistentCalls:
194198
m_Calls: []
@@ -207,12 +211,24 @@ MonoBehaviour:
207211
OnAuthTransferComplete:
208212
m_PersistentCalls:
209213
m_Calls: []
210-
OnConnectedEntityChanged:
214+
OnNetworkedParentChanged:
211215
m_PersistentCalls:
212216
m_Calls: []
213217
OnInputSimulatorConnected:
214218
m_PersistentCalls:
215219
m_Calls: []
220+
OnRigidbody2DPositionUpdate:
221+
m_PersistentCalls:
222+
m_Calls: []
223+
OnRigidbody3DPositionUpdate:
224+
m_PersistentCalls:
225+
m_Calls: []
226+
OnRigidbody2DRotationUpdate:
227+
m_PersistentCalls:
228+
m_Calls: []
229+
OnRigidbody3DRotationUpdate:
230+
m_PersistentCalls:
231+
m_Calls: []
216232
coherenceSyncConfig: {fileID: 11400000, guid: 597f1a34caf1c47ac8f3effc95d11e6a,
217233
type: 2}
218234
archetype:
@@ -282,23 +298,12 @@ MonoBehaviour:
282298
GeneratesArchetypeDefinition: 0
283299
interpolationLocation: 1
284300
RigidbodyUpdateMode: 0
285-
OnRigidbody2DPositionUpdate:
286-
m_PersistentCalls:
287-
m_Calls: []
288-
OnRigidbody3DPositionUpdate:
289-
m_PersistentCalls:
290-
m_Calls: []
291-
OnRigidbody2DRotationUpdate:
292-
m_PersistentCalls:
293-
m_Calls: []
294-
OnRigidbody3DRotationUpdate:
295-
m_PersistentCalls:
296-
m_Calls: []
297301
bakedScriptType: Coherence.Generated.CoherenceSync_a857fd6c221f7f04fa9ed500e317642a,
298302
Assembly-CSharp
303+
isGlobal: 0
299304
approveAuthorityTransferRequests: 1
300305
simulationType: 2
301-
authorityTransferType: 2
306+
authorityTransferConfig: 2
302307
orphanedBehavior: 0
303308
lifetimeType: 0
304309
uniquenessType: 1
@@ -316,25 +321,16 @@ MonoBehaviour:
316321
- rid: 8975625202164826113
317322
- rid: 3041628591939387454
318323
- rid: 3041628591939387480
319-
onNetworkedInstantiation:
320-
m_PersistentCalls:
321-
m_Calls: []
322-
onBeforeNetworkedInstantiation:
323-
m_PersistentCalls:
324-
m_Calls: []
325-
onNetworkedDestruction:
326-
m_PersistentCalls:
327-
m_Calls: []
328324
scenePrefabInstanceUUID:
329325
coherenceUUID: keeper-robot
330-
assetVersion:
331-
usingReflection: 0
326+
assetVersion: 20
332327
coherenceTag:
333328
componentActions:
334329
- rid: 8975625062529892403
335330
- rid: 8975625202164826112
336331
floatingOriginMode: 0
337332
floatingOriginParentedMode: 1
333+
synchronizationChannel: Default
338334
references:
339335
version: 2
340336
RefIds:
@@ -399,7 +395,7 @@ MonoBehaviour:
399395
type: 0
400396
minRange: 0
401397
maxRange: 0
402-
sampleRate: 0
398+
sampleRate: 20
403399
floatCompression: 0
404400
fields: []
405401
unityComponent: {fileID: 8551261703447512967}
@@ -488,7 +484,7 @@ MonoBehaviour:
488484
type: 0
489485
minRange: 0
490486
maxRange: 0
491-
sampleRate: 0
487+
sampleRate: 20
492488
floatCompression: 0
493489
fields: []
494490
unityComponent: {fileID: 5450002341135503407}
@@ -529,7 +525,7 @@ MonoBehaviour:
529525
type: 0
530526
minRange: 0
531527
maxRange: 0
532-
sampleRate: 0
528+
sampleRate: 20
533529
floatCompression: 0
534530
fields: []
535531
unityComponent: {fileID: 5450002341135503407}
@@ -570,7 +566,7 @@ MonoBehaviour:
570566
type: 0
571567
minRange: 0
572568
maxRange: 0
573-
sampleRate: 0
569+
sampleRate: 20
574570
floatCompression: 0
575571
fields: []
576572
unityComponent: {fileID: 5450002341135503407}
@@ -762,7 +758,7 @@ MonoBehaviour:
762758
type: 0
763759
minRange: 0
764760
maxRange: 0
765-
sampleRate: 0
761+
sampleRate: 20
766762
floatCompression: 0
767763
fields: []
768764
unityComponent: {fileID: 5450002341135503407}
@@ -834,13 +830,13 @@ Transform:
834830
m_PrefabInstance: {fileID: 0}
835831
m_PrefabAsset: {fileID: 0}
836832
m_GameObject: {fileID: 5609846739691108691}
837-
serializedVersion: 2
838833
m_LocalRotation: {x: -0, y: 0.9253529, z: -0, w: 0.37910697}
839834
m_LocalPosition: {x: 0.441, y: 0.843, z: -0.582}
840835
m_LocalScale: {x: 1, y: 1, z: 1}
841836
m_ConstrainProportionsScale: 0
842837
m_Children: []
843838
m_Father: {fileID: 9173246137270503472}
839+
m_RootOrder: 0
844840
m_LocalEulerAnglesHint: {x: 0, y: 135.443, z: 0}
845841
--- !u!1 &8481490009137765611
846842
GameObject:
@@ -867,13 +863,13 @@ Transform:
867863
m_PrefabInstance: {fileID: 0}
868864
m_PrefabAsset: {fileID: 0}
869865
m_GameObject: {fileID: 8481490009137765611}
870-
serializedVersion: 2
871866
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
872867
m_LocalPosition: {x: 0, y: 0, z: 0}
873868
m_LocalScale: {x: 1, y: 1, z: 1}
874869
m_ConstrainProportionsScale: 0
875870
m_Children: []
876871
m_Father: {fileID: 844632473942023379}
872+
m_RootOrder: 1
877873
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
878874
--- !u!82 &8616105651080933863
879875
AudioSource:
@@ -989,7 +985,6 @@ PrefabInstance:
989985
m_ObjectHideFlags: 0
990986
serializedVersion: 2
991987
m_Modification:
992-
serializedVersion: 3
993988
m_TransformParent: {fileID: 6342975798731359634}
994989
m_Modifications:
995990
- target: {fileID: -8679921383154817045, guid: 273da6808809bed4687514875c3096d7,
@@ -1063,9 +1058,6 @@ PrefabInstance:
10631058
value:
10641059
objectReference: {fileID: 2100000, guid: b292368e01bf7054c9fb2f38d2fea452, type: 2}
10651060
m_RemovedComponents: []
1066-
m_RemovedGameObjects: []
1067-
m_AddedGameObjects: []
1068-
m_AddedComponents: []
10691061
m_SourcePrefab: {fileID: 100100000, guid: 273da6808809bed4687514875c3096d7, type: 3}
10701062
--- !u!4 &716587355426130216 stripped
10711063
Transform:
@@ -1096,7 +1088,6 @@ PrefabInstance:
10961088
m_ObjectHideFlags: 0
10971089
serializedVersion: 2
10981090
m_Modification:
1099-
serializedVersion: 3
11001091
m_TransformParent: {fileID: 6342975798731359634}
11011092
m_Modifications:
11021093
- target: {fileID: -8679921383154817045, guid: 29124e5471b90604c984f1f609d660ff,
@@ -1170,9 +1161,6 @@ PrefabInstance:
11701161
value:
11711162
objectReference: {fileID: 2100000, guid: 34293d0076f087841b212c3b1c35382a, type: 2}
11721163
m_RemovedComponents: []
1173-
m_RemovedGameObjects: []
1174-
m_AddedGameObjects: []
1175-
m_AddedComponents: []
11761164
m_SourcePrefab: {fileID: 100100000, guid: 29124e5471b90604c984f1f609d660ff, type: 3}
11771165
--- !u!33 &1004110871619724765 stripped
11781166
MeshFilter:
@@ -1203,7 +1191,6 @@ PrefabInstance:
12031191
m_ObjectHideFlags: 0
12041192
serializedVersion: 2
12051193
m_Modification:
1206-
serializedVersion: 3
12071194
m_TransformParent: {fileID: 844632473942023379}
12081195
m_Modifications:
12091196
- target: {fileID: -8679921383154817045, guid: fc9bfcf4fd832af4eb9f6f3a8cfb9303,
@@ -1292,37 +1279,6 @@ PrefabInstance:
12921279
value:
12931280
objectReference: {fileID: 2100000, guid: 34293d0076f087841b212c3b1c35382a, type: 2}
12941281
m_RemovedComponents: []
1295-
m_RemovedGameObjects: []
1296-
m_AddedGameObjects:
1297-
- targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: fc9bfcf4fd832af4eb9f6f3a8cfb9303,
1298-
type: 3}
1299-
insertIndex: -1
1300-
addedObject: {fileID: 4905534418964468302}
1301-
- targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: fc9bfcf4fd832af4eb9f6f3a8cfb9303,
1302-
type: 3}
1303-
insertIndex: -1
1304-
addedObject: {fileID: 716587355426130216}
1305-
- targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: fc9bfcf4fd832af4eb9f6f3a8cfb9303,
1306-
type: 3}
1307-
insertIndex: -1
1308-
addedObject: {fileID: 7192210636250522378}
1309-
- targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: fc9bfcf4fd832af4eb9f6f3a8cfb9303,
1310-
type: 3}
1311-
insertIndex: -1
1312-
addedObject: {fileID: 8693188804916679657}
1313-
- targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: fc9bfcf4fd832af4eb9f6f3a8cfb9303,
1314-
type: 3}
1315-
insertIndex: -1
1316-
addedObject: {fileID: 9173246137270503472}
1317-
m_AddedComponents:
1318-
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: fc9bfcf4fd832af4eb9f6f3a8cfb9303,
1319-
type: 3}
1320-
insertIndex: -1
1321-
addedObject: {fileID: 2961422939109578538}
1322-
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: fc9bfcf4fd832af4eb9f6f3a8cfb9303,
1323-
type: 3}
1324-
insertIndex: -1
1325-
addedObject: {fileID: 4667129514690375174}
13261282
m_SourcePrefab: {fileID: 100100000, guid: fc9bfcf4fd832af4eb9f6f3a8cfb9303, type: 3}
13271283
--- !u!4 &560288793512968899 stripped
13281284
Transform:
@@ -1362,18 +1318,10 @@ BoxCollider:
13621318
m_PrefabAsset: {fileID: 0}
13631319
m_GameObject: {fileID: 6002478400419667752}
13641320
m_Material: {fileID: 0}
1365-
m_IncludeLayers:
1366-
serializedVersion: 2
1367-
m_Bits: 0
1368-
m_ExcludeLayers:
1369-
serializedVersion: 2
1370-
m_Bits: 0
1371-
m_LayerOverridePriority: 0
13721321
m_IsTrigger: 0
1373-
m_ProvidesContacts: 0
13741322
m_Enabled: 1
1375-
serializedVersion: 3
1376-
m_Size: {x: 1, y: 1, z: 1.6619525}
1323+
serializedVersion: 2
1324+
m_Size: {x: 2, y: 2, z: 2}
13771325
m_Center: {x: 0, y: 0, z: 0}
13781326
--- !u!95 &4667129514690375174
13791327
Animator:
@@ -1407,7 +1355,6 @@ PrefabInstance:
14071355
m_ObjectHideFlags: 0
14081356
serializedVersion: 2
14091357
m_Modification:
1410-
serializedVersion: 3
14111358
m_TransformParent: {fileID: 6342975798731359634}
14121359
m_Modifications:
14131360
- target: {fileID: -8679921383154817045, guid: 29124e5471b90604c984f1f609d660ff,
@@ -1491,9 +1438,6 @@ PrefabInstance:
14911438
value:
14921439
objectReference: {fileID: 2100000, guid: 34293d0076f087841b212c3b1c35382a, type: 2}
14931440
m_RemovedComponents: []
1494-
m_RemovedGameObjects: []
1495-
m_AddedGameObjects: []
1496-
m_AddedComponents: []
14971441
m_SourcePrefab: {fileID: 100100000, guid: 29124e5471b90604c984f1f609d660ff, type: 3}
14981442
--- !u!23 &1059530868633019359 stripped
14991443
MeshRenderer:

0 commit comments

Comments
 (0)