Skip to content

Commit a3bfb00

Browse files
authored
Merge pull request #5 from coherence/feat/sdk-1.4.2
feat: updated to coherence 1.4.2
2 parents ef83a4e + 834bba4 commit a3bfb00

208 files changed

Lines changed: 1963 additions & 863 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/Prefabs/Logic/FlowersCounter.prefab

Lines changed: 98 additions & 106 deletions
Original file line numberDiff line numberDiff line change
@@ -106,10 +106,10 @@ MonoBehaviour:
106106
unsyncedNetworkEntityPriority: 0
107107
preserveChildren: 0
108108
bindings:
109-
- rid: 2368829912872124468
110-
- rid: 2368829912872124469
111-
- rid: 2368829912872124470
112109
- rid: 2368829912872124471
110+
- rid: 6129763270525976576
111+
- rid: 6129763270525976578
112+
- rid: 6129763270525976580
113113
onNetworkedInstantiation:
114114
m_PersistentCalls:
115115
m_Calls: []
@@ -132,78 +132,6 @@ MonoBehaviour:
132132
RefIds:
133133
- rid: -2
134134
type: {class: , ns: , asm: }
135-
- rid: 2368829912872124468
136-
type: {class: CommandBinding, ns: Coherence.Toolkit.Bindings, asm: Coherence.Toolkit}
137-
data:
138-
descriptor:
139-
rid: 2368829912872124472
140-
routing: 1
141-
syncMode: 0
142-
isPredicted: 0
143-
predictionMode: 0
144-
guid: 2f75e99488a84da2aebe765c3648d9d8
145-
archetypeData:
146-
type: 0
147-
minRange: 0
148-
maxRange: 0
149-
sampleRate: 20
150-
floatCompression: 0
151-
fields:
152-
- type: 0
153-
bits: 0
154-
precision: 0
155-
floatCompression: 0
156-
unityComponent: {fileID: 5847726189716557621}
157-
coherenceSync: {fileID: 0}
158-
interpolationSettings: {fileID: 0}
159-
- rid: 2368829912872124469
160-
type: {class: CommandBinding, ns: Coherence.Toolkit.Bindings, asm: Coherence.Toolkit}
161-
data:
162-
descriptor:
163-
rid: 2368829912872124473
164-
routing: 1
165-
syncMode: 0
166-
isPredicted: 0
167-
predictionMode: 0
168-
guid: 7ce8b858d0074d868da45a67d2d9a68b
169-
archetypeData:
170-
type: 0
171-
minRange: 0
172-
maxRange: 0
173-
sampleRate: 20
174-
floatCompression: 0
175-
fields:
176-
- type: 0
177-
bits: 0
178-
precision: 0
179-
floatCompression: 0
180-
unityComponent: {fileID: 5847726189716557621}
181-
coherenceSync: {fileID: 0}
182-
interpolationSettings: {fileID: 0}
183-
- rid: 2368829912872124470
184-
type: {class: IntBinding, ns: Coherence.Toolkit.Bindings.ValueBindings, asm: Coherence.Toolkit}
185-
data:
186-
descriptor:
187-
rid: 2368829912872124474
188-
routing: 1
189-
syncMode: 0
190-
isPredicted: 0
191-
predictionMode: 0
192-
guid: 7711bc2e3be74b03a7060692d306fce7
193-
archetypeData:
194-
type: 1
195-
minRange: 0
196-
maxRange: 40
197-
sampleRate: 10
198-
floatCompression: 0
199-
fields:
200-
- type: 1
201-
bits: 6
202-
precision: 0
203-
floatCompression: 0
204-
unityComponent: {fileID: 5847726189716557621}
205-
coherenceSync: {fileID: 0}
206-
interpolationSettings: {fileID: 0}
207135
- rid: 2368829912872124471
208136
type: {class: PositionBinding, ns: Coherence.Toolkit.Bindings.TransformBindings,
209137
asm: Coherence.Toolkit}
@@ -230,28 +158,48 @@ MonoBehaviour:
230158
coherenceSync: {fileID: 0}
231159
interpolationSettings: {fileID: 11400000, guid: ae4419d1d9a8643709bf5f6b90c584a5,
232160
type: 2}
233-
- rid: 2368829912872124472
161+
- rid: 2368829912872124475
234162
type: {class: Descriptor, ns: Coherence.Toolkit.Bindings, asm: Coherence.Toolkit}
235163
data:
236-
name: ResetToZero
237-
monoAssemblyType:
238-
required: 0
239-
enforcesLODingWhenFieldsOverriden: 0
164+
name: position
165+
monoAssemblyType: UnityEngine.Vector3, UnityEngine
166+
required: 1
167+
enforcesLODingWhenFieldsOverriden: 1
240168
valueSyncCallbackName:
241-
memberType: 8
169+
memberType: 64
242170
parameterAssemblyTypes: []
243171
ownerType:
244-
assemblyQualifiedName: Counter, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
245-
PublicKeyToken=null
172+
assemblyQualifiedName: UnityEngine.Transform, UnityEngine.CoreModule, Version=0.0.0.0,
173+
Culture=neutral, PublicKeyToken=null
246174
defaultSyncMode: 0
247175
CustomData:
248176
rid: -2
249177
bindingType:
250-
assemblyQualifiedName: Coherence.Toolkit.Bindings.CommandBinding, Coherence.Toolkit,
251-
Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
178+
assemblyQualifiedName: Coherence.Toolkit.Bindings.TransformBindings.PositionBinding,
179+
Coherence.Toolkit, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
252180
oldName:
253181
oldParameterAssemblyTypes: []
254-
- rid: 2368829912872124473
182+
- rid: 6129763270525976576
183+
type: {class: CommandBinding, ns: Coherence.Toolkit.Bindings, asm: Coherence.Toolkit}
184+
data:
185+
descriptor:
186+
rid: 6129763270525976577
187+
routing: 1
188+
syncMode: 0
189+
isPredicted: 0
190+
predictionMode: 0
191+
guid: 51bbdff1d75844e38e05ad8d40305814
192+
archetypeData:
193+
type: 0
194+
minRange: 0
195+
maxRange: 0
196+
sampleRate: 0
197+
floatCompression: 0
198+
fields: []
199+
unityComponent: {fileID: 5847726189716557621}
200+
coherenceSync: {fileID: 1812707281308532839}
201+
interpolationSettings: {fileID: 0}
202+
- rid: 6129763270525976577
255203
type: {class: Descriptor, ns: Coherence.Toolkit.Bindings, asm: Coherence.Toolkit}
256204
data:
257205
name: AddOne
@@ -262,8 +210,8 @@ MonoBehaviour:
262210
memberType: 8
263211
parameterAssemblyTypes: []
264212
ownerType:
265-
assemblyQualifiedName: Counter, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
266-
PublicKeyToken=null
213+
assemblyQualifiedName: Coherence.FirstSteps.Counter, Assembly-CSharp, Version=0.0.0.0,
214+
Culture=neutral, PublicKeyToken=null
267215
defaultSyncMode: 0
268216
CustomData:
269217
rid: -2
@@ -272,45 +220,89 @@ MonoBehaviour:
272220
Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
273221
oldName:
274222
oldParameterAssemblyTypes: []
275-
- rid: 2368829912872124474
223+
- rid: 6129763270525976578
224+
type: {class: CommandBinding, ns: Coherence.Toolkit.Bindings, asm: Coherence.Toolkit}
225+
data:
226+
descriptor:
227+
rid: 6129763270525976579
228+
routing: 1
229+
syncMode: 0
230+
isPredicted: 0
231+
predictionMode: 0
232+
guid: cec10b75335d48519f4b958f85ca6685
233+
archetypeData:
234+
type: 0
235+
minRange: 0
236+
maxRange: 0
237+
sampleRate: 0
238+
floatCompression: 0
239+
fields: []
240+
unityComponent: {fileID: 5847726189716557621}
241+
coherenceSync: {fileID: 1812707281308532839}
242+
interpolationSettings: {fileID: 0}
243+
- rid: 6129763270525976579
276244
type: {class: Descriptor, ns: Coherence.Toolkit.Bindings, asm: Coherence.Toolkit}
277245
data:
278-
name: count
279-
monoAssemblyType: System.Int32, mscorlib
246+
name: ResetToZero
247+
monoAssemblyType:
280248
required: 0
281-
enforcesLODingWhenFieldsOverriden: 1
282-
valueSyncCallbackName: OnValueSyncedRemotely
283-
memberType: 4
249+
enforcesLODingWhenFieldsOverriden: 0
250+
valueSyncCallbackName:
251+
memberType: 8
284252
parameterAssemblyTypes: []
285253
ownerType:
286-
assemblyQualifiedName: Counter, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
287-
PublicKeyToken=null
254+
assemblyQualifiedName: Coherence.FirstSteps.Counter, Assembly-CSharp, Version=0.0.0.0,
255+
Culture=neutral, PublicKeyToken=null
288256
defaultSyncMode: 0
289257
CustomData:
290258
rid: -2
291259
bindingType:
292-
assemblyQualifiedName: Coherence.Toolkit.Bindings.ValueBindings.IntBinding,
293-
Coherence.Toolkit, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
260+
assemblyQualifiedName: Coherence.Toolkit.Bindings.CommandBinding, Coherence.Toolkit,
261+
Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
294262
oldName:
295263
oldParameterAssemblyTypes: []
296-
- rid: 2368829912872124475
264+
- rid: 6129763270525976580
265+
type: {class: IntBinding, ns: Coherence.Toolkit.Bindings.ValueBindings, asm: Coherence.Toolkit}
266+
data:
267+
descriptor:
268+
rid: 6129763270525976581
269+
routing: 0
270+
syncMode: 0
271+
isPredicted: 0
272+
predictionMode: 0
273+
guid: 64c2e2c02f7f4ed9a1c5d5ce2b9ca101
274+
archetypeData:
275+
type: 1
276+
minRange: -2147483648
277+
maxRange: 2147483647
278+
sampleRate: 20
279+
floatCompression: 0
280+
fields:
281+
- type: 1
282+
bits: 32
283+
precision: 0
284+
floatCompression: 0
285+
unityComponent: {fileID: 5847726189716557621}
286+
coherenceSync: {fileID: 1812707281308532839}
287+
interpolationSettings: {fileID: 0}
288+
- rid: 6129763270525976581
297289
type: {class: Descriptor, ns: Coherence.Toolkit.Bindings, asm: Coherence.Toolkit}
298290
data:
299-
name: position
300-
monoAssemblyType: UnityEngine.Vector3, UnityEngine
301-
required: 1
291+
name: count
292+
monoAssemblyType: System.Int32, mscorlib
293+
required: 0
302294
enforcesLODingWhenFieldsOverriden: 1
303-
valueSyncCallbackName:
304-
memberType: 64
295+
valueSyncCallbackName: OnValueSyncedRemotely
296+
memberType: 4
305297
parameterAssemblyTypes: []
306298
ownerType:
307-
assemblyQualifiedName: UnityEngine.Transform, UnityEngine.CoreModule, Version=0.0.0.0,
299+
assemblyQualifiedName: Coherence.FirstSteps.Counter, Assembly-CSharp, Version=0.0.0.0,
308300
Culture=neutral, PublicKeyToken=null
309301
defaultSyncMode: 0
310302
CustomData:
311303
rid: -2
312304
bindingType:
313-
assemblyQualifiedName: Coherence.Toolkit.Bindings.TransformBindings.PositionBinding,
305+
assemblyQualifiedName: Coherence.Toolkit.Bindings.ValueBindings.IntBinding,
314306
Coherence.Toolkit, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
315307
oldName:
316308
oldParameterAssemblyTypes: []

Assets/Prefabs/Nature/Flower.prefab

Lines changed: 46 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -10254,10 +10254,10 @@ MonoBehaviour:
1025410254
unsyncedNetworkEntityPriority: 0
1025510255
preserveChildren: 0
1025610256
bindings:
10257-
- rid: 2368829912872124516
1025810257
- rid: 2368829912872124517
1025910258
- rid: 2368829912872124518
1026010259
- rid: 8889060605055205380
10260+
- rid: 6129763270525976587
1026110261
onNetworkedInstantiation:
1026210262
m_PersistentCalls:
1026310263
m_Calls: []
@@ -10280,30 +10280,6 @@ MonoBehaviour:
1028010280
RefIds:
1028110281
- rid: -2
1028210282
type: {class: , ns: , asm: }
10283-
- rid: 2368829912872124516
10284-
type: {class: UIntBinding, ns: Coherence.Toolkit.Bindings.ValueBindings, asm: Coherence.Toolkit}
10285-
data:
10286-
descriptor:
10287-
rid: 2368829912872124519
10288-
routing: 1
10289-
syncMode: 0
10290-
isPredicted: 0
10291-
predictionMode: 0
10292-
guid: 880aae33d8da49c2b9d4e0c68eb7a369
10293-
archetypeData:
10294-
type: 12
10295-
minRange: 0
10296-
maxRange: 4294967295
10297-
sampleRate: 10
10298-
floatCompression: 0
10299-
fields:
10300-
- type: 12
10301-
bits: 32
10302-
precision: 0
10303-
floatCompression: 0
10304-
unityComponent: {fileID: 6689584802229134021}
10305-
coherenceSync: {fileID: 0}
10306-
interpolationSettings: {fileID: 0}
1030710283
- rid: 2368829912872124517
1030810284
type: {class: PositionBinding, ns: Coherence.Toolkit.Bindings.TransformBindings,
1030910285
asm: Coherence.Toolkit}
@@ -10356,27 +10332,6 @@ MonoBehaviour:
1035610332
coherenceSync: {fileID: 0}
1035710333
interpolationSettings: {fileID: 11400000, guid: ae4419d1d9a8643709bf5f6b90c584a5,
1035810334
type: 2}
10359-
- rid: 2368829912872124519
10360-
type: {class: Descriptor, ns: Coherence.Toolkit.Bindings, asm: Coherence.Toolkit}
10361-
data:
10362-
name: timePlanted
10363-
monoAssemblyType: System.UInt32, mscorlib
10364-
required: 0
10365-
enforcesLODingWhenFieldsOverriden: 1
10366-
valueSyncCallbackName: SetInitialState
10367-
memberType: 4
10368-
parameterAssemblyTypes: []
10369-
ownerType:
10370-
assemblyQualifiedName: Flower, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
10371-
PublicKeyToken=null
10372-
defaultSyncMode: 0
10373-
CustomData:
10374-
rid: -2
10375-
bindingType:
10376-
assemblyQualifiedName: Coherence.Toolkit.Bindings.ValueBindings.UIntBinding,
10377-
Coherence.Toolkit, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
10378-
oldName:
10379-
oldParameterAssemblyTypes: []
1038010335
- rid: 2368829912872124520
1038110336
type: {class: Descriptor, ns: Coherence.Toolkit.Bindings, asm: Coherence.Toolkit}
1038210337
data:
@@ -10419,6 +10374,51 @@ MonoBehaviour:
1041910374
Coherence.Toolkit, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
1042010375
oldName:
1042110376
oldParameterAssemblyTypes: []
10377+
- rid: 6129763270525976587
10378+
type: {class: UIntBinding, ns: Coherence.Toolkit.Bindings.ValueBindings, asm: Coherence.Toolkit}
10379+
data:
10380+
descriptor:
10381+
rid: 6129763270525976588
10382+
routing: 0
10383+
syncMode: 0
10384+
isPredicted: 0
10385+
predictionMode: 0
10386+
guid: 0425840f9cb7425197a777ce07e33845
10387+
archetypeData:
10388+
type: 12
10389+
minRange: 0
10390+
maxRange: 4294967295
10391+
sampleRate: 20
10392+
floatCompression: 0
10393+
fields:
10394+
- type: 12
10395+
bits: 32
10396+
precision: 0
10397+
floatCompression: 0
10398+
unityComponent: {fileID: 6689584802229134021}
10399+
coherenceSync: {fileID: 5346888412588970518}
10400+
interpolationSettings: {fileID: 0}
10401+
- rid: 6129763270525976588
10402+
type: {class: Descriptor, ns: Coherence.Toolkit.Bindings, asm: Coherence.Toolkit}
10403+
data:
10404+
name: timePlanted
10405+
monoAssemblyType: System.UInt32, mscorlib
10406+
required: 0
10407+
enforcesLODingWhenFieldsOverriden: 1
10408+
valueSyncCallbackName: SetInitialState
10409+
memberType: 4
10410+
parameterAssemblyTypes: []
10411+
ownerType:
10412+
assemblyQualifiedName: Coherence.FirstSteps.Flower, Assembly-CSharp, Version=0.0.0.0,
10413+
Culture=neutral, PublicKeyToken=null
10414+
defaultSyncMode: 0
10415+
CustomData:
10416+
rid: -2
10417+
bindingType:
10418+
assemblyQualifiedName: Coherence.Toolkit.Bindings.ValueBindings.UIntBinding,
10419+
Coherence.Toolkit, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null
10420+
oldName:
10421+
oldParameterAssemblyTypes: []
1042210422
- rid: 8889060605055205380
1042310423
type: {class: ScaleBinding, ns: Coherence.Toolkit.Bindings.TransformBindings,
1042410424
asm: Coherence.Toolkit}

0 commit comments

Comments
 (0)