xio/dungeons
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix player components injection. Add lobby reloading when clients change

Browse Source
This commit is contained in:
Jan Švec
2024-09-11 21:03:47 +02:00
parent 9250b7b5dd
commit e428d3a9f9
10 changed files with 284 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

130
Assets/Scenes/Lobby.unity
View File

@@ -1240,7 +1240,7 @@ PrefabInstance:
- target: {fileID: 1823291527766241088, guid: 8c558b450b0d54df8b6a2608aa29a87b,
type: 3}
propertyPath: m_Name
value: Button_Rectangle_01_Convex_Red
value: LeaveButton
objectReference: {fileID: 0}
- target: {fileID: 1823291527766241091, guid: 8c558b450b0d54df8b6a2608aa29a87b,
type: 3}
@@ -2810,6 +2810,37 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 212601291}
m_PrefabAsset: {fileID: 0}
--- !u!1 &216372457
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 216372458}
m_Layer: 0
m_Name: Character_Sample_04 (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &216372458
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 216372457}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &217767396
PrefabInstance:
m_ObjectHideFlags: 0
@@ -4369,7 +4400,7 @@ PrefabInstance:
- target: {fileID: 3163847993249717490, guid: 693918f5252cc9543ad4901c66a265ed,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3163847993249717490, guid: 693918f5252cc9543ad4901c66a265ed,
type: 3}
@@ -4379,7 +4410,7 @@ PrefabInstance:
- target: {fileID: 3163847993249717490, guid: 693918f5252cc9543ad4901c66a265ed,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3163847993249717490, guid: 693918f5252cc9543ad4901c66a265ed,
type: 3}
@@ -4444,12 +4475,12 @@ PrefabInstance:
- target: {fileID: 3163847993249717490, guid: 693918f5252cc9543ad4901c66a265ed,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 478
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3163847993249717490, guid: 693918f5252cc9543ad4901c66a265ed,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -329
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3163847993249717490, guid: 693918f5252cc9543ad4901c66a265ed,
type: 3}
@@ -4476,6 +4507,37 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 693918f5252cc9543ad4901c66a265ed, type: 3}
--- !u!1 &310335279
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 310335280}
m_Layer: 0
m_Name: Character_Sample_04
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &310335280
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 310335279}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &313084521
PrefabInstance:
m_ObjectHideFlags: 0
@@ -7726,7 +7788,7 @@ PrefabInstance:
- target: {fileID: 8218563352662433355, guid: 0b2f49667301602429912df646dccb54,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8218563352662433355, guid: 0b2f49667301602429912df646dccb54,
type: 3}
@@ -7736,7 +7798,7 @@ PrefabInstance:
- target: {fileID: 8218563352662433355, guid: 0b2f49667301602429912df646dccb54,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8218563352662433355, guid: 0b2f49667301602429912df646dccb54,
type: 3}
@@ -7786,7 +7848,7 @@ PrefabInstance:
- target: {fileID: 8218563352662433355, guid: 0b2f49667301602429912df646dccb54,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 200
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8218563352662433355, guid: 0b2f49667301602429912df646dccb54,
type: 3}
@@ -15328,7 +15390,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1142897203
RectTransform:
m_ObjectHideFlags: 0
@@ -17131,6 +17193,18 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1250291034}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1253047056 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 1823291527766241090, guid: 8c558b450b0d54df8b6a2608aa29a87b,
type: 3}
m_PrefabInstance: {fileID: 114580583}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1255715122
PrefabInstance:
m_ObjectHideFlags: 0
@@ -20080,7 +20154,7 @@ PrefabInstance:
- target: {fileID: 5164178704720697696, guid: 24e15d0d27d6f4c678cbb5bfb748e0d6,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5164178704720697696, guid: 24e15d0d27d6f4c678cbb5bfb748e0d6,
type: 3}
@@ -20090,7 +20164,7 @@ PrefabInstance:
- target: {fileID: 5164178704720697696, guid: 24e15d0d27d6f4c678cbb5bfb748e0d6,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5164178704720697696, guid: 24e15d0d27d6f4c678cbb5bfb748e0d6,
type: 3}
@@ -20140,12 +20214,12 @@ PrefabInstance:
- target: {fileID: 5164178704720697696, guid: 24e15d0d27d6f4c678cbb5bfb748e0d6,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 478
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5164178704720697696, guid: 24e15d0d27d6f4c678cbb5bfb748e0d6,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -497.7
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5164178704720697696, guid: 24e15d0d27d6f4c678cbb5bfb748e0d6,
type: 3}
@@ -20717,6 +20791,18 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 538604535}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1474707919 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8218563352662433352, guid: 0b2f49667301602429912df646dccb54,
type: 3}
m_PrefabInstance: {fileID: 538604535}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2da0c512f12947e489f739169773d7ca, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1481416243
PrefabInstance:
m_ObjectHideFlags: 0
@@ -20803,7 +20889,7 @@ PrefabInstance:
- target: {fileID: 5164178704720697696, guid: 24e15d0d27d6f4c678cbb5bfb748e0d6,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5164178704720697696, guid: 24e15d0d27d6f4c678cbb5bfb748e0d6,
type: 3}
@@ -20813,7 +20899,7 @@ PrefabInstance:
- target: {fileID: 5164178704720697696, guid: 24e15d0d27d6f4c678cbb5bfb748e0d6,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5164178704720697696, guid: 24e15d0d27d6f4c678cbb5bfb748e0d6,
type: 3}
@@ -20863,12 +20949,12 @@ PrefabInstance:
- target: {fileID: 5164178704720697696, guid: 24e15d0d27d6f4c678cbb5bfb748e0d6,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 535
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5164178704720697696, guid: 24e15d0d27d6f4c678cbb5bfb748e0d6,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -50
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5164178704720697696, guid: 24e15d0d27d6f4c678cbb5bfb748e0d6,
type: 3}
@@ -26979,7 +27065,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 478, y: -160.3}
m_SizeDelta: {x: 635, y: 100}
m_SizeDelta: {x: 635, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1870248540
MonoBehaviour:
@@ -30995,16 +31081,16 @@ MonoBehaviour:
gameManager: {fileID: 0}
canvas: {fileID: 0}
joinOrHost: {fileID: 1142897202}
roomCodeInput: {fileID: 0}
roomCodeInput: {fileID: 1474707919}
joinButton: {fileID: 1705793166}
hostButton: {fileID: 1173017140}
connected: {fileID: 711782649}
connected: {fileID: 1350483113}
playerItems:
- {fileID: 759219683049267180}
- {fileID: 959645604}
- {fileID: 204172856}
- {fileID: 2064238308}
leaveButton: {fileID: 0}
leaveButton: {fileID: 1253047056}
--- !u!1001 &2097871276
PrefabInstance:
m_ObjectHideFlags: 0
@@ -35294,3 +35380,5 @@ SceneRoots:
- {fileID: 2770940432321735806}
- {fileID: 2097484082}
- {fileID: 856515705}
- {fileID: 310335280}
- {fileID: 216372458}