Skip to content

Commit f074376

Browse files
ccontinisioccontinisio
committed
Version 1.6.1
- Fixed issue with crate in Complex Hierarchies scene not syncing properly - Upgraded to coherence 1.5.0
1 parent 1645ef9 commit f074376

66 files changed

Lines changed: 10171 additions & 1669 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/Gameplay/Crate.prefab‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -289,8 +289,7 @@ MonoBehaviour:
289289
floatCompression: 0
290290
unityComponent: {fileID: 4939570989761225410}
291291
coherenceSync: {fileID: 0}
292-
interpolationSettings: {fileID: 11400000, guid: ae4419d1d9a8643709bf5f6b90c584a5,
293-
type: 2}
292+
interpolationSettings: {fileID: 0}
294293
- rid: 2919437089004584961
295294
type: {class: IntBinding, ns: Coherence.Toolkit.Bindings.ValueBindings, asm: Coherence.Toolkit}
296295
data:
@@ -313,8 +312,7 @@ MonoBehaviour:
313312
floatCompression: 0
314313
unityComponent: {fileID: 4939570989761225410}
315314
coherenceSync: {fileID: 0}
316-
interpolationSettings: {fileID: 11400000, guid: ae4419d1d9a8643709bf5f6b90c584a5,
317-
type: 2}
315+
interpolationSettings: {fileID: 0}
318316
- rid: 2919437089004584962
319317
type: {class: Descriptor, ns: Coherence.Toolkit.Bindings, asm: Coherence.Toolkit}
320318
data:

‎Assets/Prefabs/Gameplay/RobotArm_Crate.prefab‎

Lines changed: 148 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,148 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1001 &216943351981046892
4+
PrefabInstance:
5+
m_ObjectHideFlags: 0
6+
serializedVersion: 2
7+
m_Modification:
8+
m_TransformParent: {fileID: 0}
9+
m_Modifications:
10+
- target: {fileID: 294465140271106047, guid: 27f1ac5097d4ee4409fbb87ad14f76c2,
11+
type: 3}
12+
propertyPath: coherenceUUID
13+
value: special-crate
14+
objectReference: {fileID: 0}
15+
- target: {fileID: 294465140271106047, guid: 27f1ac5097d4ee4409fbb87ad14f76c2,
16+
type: 3}
17+
propertyPath: bakedScriptType
18+
value: Coherence.Generated.CoherenceSyncRobotArm_Crate_a0e6252c4d09f4fb28257804194356b6,
19+
Assembly-CSharp
20+
objectReference: {fileID: 0}
21+
- target: {fileID: 294465140271106047, guid: 27f1ac5097d4ee4409fbb87ad14f76c2,
22+
type: 3}
23+
propertyPath: bindings.Array.size
24+
value: 4
25+
objectReference: {fileID: 0}
26+
- target: {fileID: 294465140271106047, guid: 27f1ac5097d4ee4409fbb87ad14f76c2,
27+
type: 3}
28+
propertyPath: coherenceSyncConfig
29+
value:
30+
objectReference: {fileID: 960217107724943298, guid: 6d5bbaf3b191f417bb0570a2692c44e5,
31+
type: 2}
32+
- target: {fileID: 294465140271106047, guid: 27f1ac5097d4ee4409fbb87ad14f76c2,
33+
type: 3}
34+
propertyPath: archetype.archetypeName
35+
value: RobotArm_Crate_a0e6252c4d09f4fb28257804194356b6
36+
objectReference: {fileID: 0}
37+
- target: {fileID: 294465140271106047, guid: 27f1ac5097d4ee4409fbb87ad14f76c2,
38+
type: 3}
39+
propertyPath: scenePrefabInstanceUUID
40+
value: -192412
41+
objectReference: {fileID: 0}
42+
- target: {fileID: 294465140271106047, guid: 27f1ac5097d4ee4409fbb87ad14f76c2,
43+
type: 3}
44+
propertyPath: archetype.boundComponents.Array.size
45+
value: 8
46+
objectReference: {fileID: 0}
47+
- target: {fileID: 294465140271106047, guid: 27f1ac5097d4ee4409fbb87ad14f76c2,
48+
type: 3}
49+
propertyPath: archetype.boundComponents.Array.data[6].component
50+
value:
51+
objectReference: {fileID: 8169318893550734971}
52+
- target: {fileID: 294465140271106047, guid: 27f1ac5097d4ee4409fbb87ad14f76c2,
53+
type: 3}
54+
propertyPath: archetype.boundComponents.Array.data[7].component
55+
value:
56+
objectReference: {fileID: 5156161361901559470}
57+
- target: {fileID: 1522740331349769034, guid: 27f1ac5097d4ee4409fbb87ad14f76c2,
58+
type: 3}
59+
propertyPath: m_RootOrder
60+
value: 0
61+
objectReference: {fileID: 0}
62+
- target: {fileID: 1522740331349769034, guid: 27f1ac5097d4ee4409fbb87ad14f76c2,
63+
type: 3}
64+
propertyPath: m_LocalPosition.x
65+
value: 404.484
66+
objectReference: {fileID: 0}
67+
- target: {fileID: 1522740331349769034, guid: 27f1ac5097d4ee4409fbb87ad14f76c2,
68+
type: 3}
69+
propertyPath: m_LocalPosition.y
70+
value: 1.135
71+
objectReference: {fileID: 0}
72+
- target: {fileID: 1522740331349769034, guid: 27f1ac5097d4ee4409fbb87ad14f76c2,
73+
type: 3}
74+
propertyPath: m_LocalPosition.z
75+
value: -3.061
76+
objectReference: {fileID: 0}
77+
- target: {fileID: 1522740331349769034, guid: 27f1ac5097d4ee4409fbb87ad14f76c2,
78+
type: 3}
79+
propertyPath: m_LocalRotation.w
80+
value: 1
81+
objectReference: {fileID: 0}
82+
- target: {fileID: 1522740331349769034, guid: 27f1ac5097d4ee4409fbb87ad14f76c2,
83+
type: 3}
84+
propertyPath: m_LocalRotation.x
85+
value: 0
86+
objectReference: {fileID: 0}
87+
- target: {fileID: 1522740331349769034, guid: 27f1ac5097d4ee4409fbb87ad14f76c2,
88+
type: 3}
89+
propertyPath: m_LocalRotation.y
90+
value: 0
91+
objectReference: {fileID: 0}
92+
- target: {fileID: 1522740331349769034, guid: 27f1ac5097d4ee4409fbb87ad14f76c2,
93+
type: 3}
94+
propertyPath: m_LocalRotation.z
95+
value: 0
96+
objectReference: {fileID: 0}
97+
- target: {fileID: 1522740331349769034, guid: 27f1ac5097d4ee4409fbb87ad14f76c2,
98+
type: 3}
99+
propertyPath: m_LocalEulerAnglesHint.x
100+
value: 0
101+
objectReference: {fileID: 0}
102+
- target: {fileID: 1522740331349769034, guid: 27f1ac5097d4ee4409fbb87ad14f76c2,
103+
type: 3}
104+
propertyPath: m_LocalEulerAnglesHint.y
105+
value: 0
106+
objectReference: {fileID: 0}
107+
- target: {fileID: 1522740331349769034, guid: 27f1ac5097d4ee4409fbb87ad14f76c2,
108+
type: 3}
109+
propertyPath: m_LocalEulerAnglesHint.z
110+
value: 0
111+
objectReference: {fileID: 0}
112+
- target: {fileID: 2212572905728603600, guid: 27f1ac5097d4ee4409fbb87ad14f76c2,
113+
type: 3}
114+
propertyPath: m_Name
115+
value: RobotArm_Crate
116+
objectReference: {fileID: 0}
117+
- target: {fileID: 6157262914527108723, guid: 27f1ac5097d4ee4409fbb87ad14f76c2,
118+
type: 3}
119+
propertyPath: m_Materials.Array.data[0]
120+
value:
121+
objectReference: {fileID: 2100000, guid: b0106947e8e6caa488768d27ed8ac352, type: 2}
122+
m_RemovedComponents:
123+
- {fileID: 6525610836190113121, guid: 27f1ac5097d4ee4409fbb87ad14f76c2, type: 3}
124+
m_SourcePrefab: {fileID: 100100000, guid: 27f1ac5097d4ee4409fbb87ad14f76c2, type: 3}
125+
--- !u!114 &5156161361901559470 stripped
126+
MonoBehaviour:
127+
m_CorrespondingSourceObject: {fileID: 4939570989761225410, guid: 27f1ac5097d4ee4409fbb87ad14f76c2,
128+
type: 3}
129+
m_PrefabInstance: {fileID: 216943351981046892}
130+
m_PrefabAsset: {fileID: 0}
131+
m_GameObject: {fileID: 0}
132+
m_Enabled: 1
133+
m_EditorHideFlags: 0
134+
m_Script: {fileID: 11500000, guid: 50ac520fda41f43c7b508d780e58180a, type: 3}
135+
m_Name:
136+
m_EditorClassIdentifier:
137+
--- !u!114 &8169318893550734971 stripped
138+
MonoBehaviour:
139+
m_CorrespondingSourceObject: {fileID: 8241020607719600663, guid: 27f1ac5097d4ee4409fbb87ad14f76c2,
140+
type: 3}
141+
m_PrefabInstance: {fileID: 216943351981046892}
142+
m_PrefabAsset: {fileID: 0}
143+
m_GameObject: {fileID: 0}
144+
m_Enabled: 1
145+
m_EditorHideFlags: 0
146+
m_Script: {fileID: 11500000, guid: c46bab8fedf1749fa89a587831bb70aa, type: 3}
147+
m_Name:
148+
m_EditorClassIdentifier:

‎Assets/Prefabs/Gameplay/RobotArm_Crate.prefab.meta‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Samples/coherence/1.0.0.meta renamed to Assets/Samples/coherence/1.0.5.meta

File renamed without changes.

‎Assets/Samples/coherence/1.0.5/Connect Dialog_ Rooms.meta‎

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Samples/coherence/1.0.5/Connect Dialog_ Rooms/ConnectDialogRoomView.cs‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
// Copyright (c) coherence ApS.
2+
// See the license file in the package root for more information.
3+
4+
using Coherence.Cloud;
5+
6+
namespace Coherence.Samples.RoomsDialog
7+
{
8+
using UnityEngine;
9+
using UnityEngine.UI;
10+
using System;
11+
12+
public class ConnectDialogRoomView: MonoBehaviour
13+
{
14+
[SerializeField] protected Button selectButton;
15+
[SerializeField] private Image backgroundImage;
16+
[SerializeField] private Text roomNameText;
17+
[SerializeField] private Text roomPlayersText;
18+
[SerializeField] protected Color defaultColor = new Color(243, 247, 250);
19+
[SerializeField] protected Color selectedColor = new Color(122, 184, 240);
20+
21+
public RoomData RoomData
22+
{
23+
get => roomData;
24+
set
25+
{
26+
roomData = value;
27+
roomNameText.text = !String.IsNullOrEmpty(RoomData.RoomName) ? TruncateName(RoomData.RoomName) : RoomData.ToString();
28+
roomPlayersText.text = $"{RoomData.ConnectedPlayers}/{RoomData.MaxPlayers}";
29+
}
30+
}
31+
32+
public bool IsSelected
33+
{
34+
get => isSelected;
35+
set
36+
{
37+
isSelected = value;
38+
backgroundImage.color = isSelected ? selectedColor : defaultColor;
39+
}
40+
}
41+
42+
public Action OnClick
43+
{
44+
set
45+
{
46+
selectButton.onClick.RemoveAllListeners();
47+
selectButton.onClick.AddListener(() => value?.Invoke());
48+
}
49+
}
50+
51+
[SerializeField, HideInInspector] private bool isSelected;
52+
public RoomData roomData;
53+
54+
private static string TruncateName(string name, int maxLength = 30)
55+
{
56+
string newName = name;
57+
58+
if (newName.Length > maxLength)
59+
{
60+
newName = newName.Substring(0, maxLength) + "...";
61+
}
62+
63+
return newName;
64+
}
65+
}
66+
}

Assets/coherence/baked/Flower_a167402e36850884aa7ce3d374cd6c77_UnityEngine__char_46_Transform_7769937714867182896.gen.cs.meta renamed to Assets/Samples/coherence/1.0.5/Connect Dialog_ Rooms/ConnectDialogRoomView.cs.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)