Skip to content

Commit 5fbdbf2

Browse files
authored
PlayerPickUp items over the network #4 from Underewarrr/player-pickupObject-network
PlayerPickUp items over the network
2 parents 0f71300 + 503d7b7 commit 5fbdbf2

File tree

9 files changed

+491
-64
lines changed

9 files changed

+491
-64
lines changed

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,3 @@ sysinfo.txt
5757

5858
# Crashlytics generated file
5959
crashlytics-build.properties
60-

Assets/FishNet/Runtime/DefaultPrefabObjects.asset

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,9 @@ MonoBehaviour:
1313
m_Name: DefaultPrefabObjects
1414
m_EditorClassIdentifier:
1515
_prefabs:
16+
- {fileID: 6595566800893028757, guid: 61ee112838ff295478507eca79c81e4c, type: 3}
17+
- {fileID: 9003799652436270358, guid: 235c2bc0a57601e4ebbce1fb8af68214, type: 3}
1618
- {fileID: 611616139817875448, guid: bf5f023b4017a5e41a9815ec5745df3d, type: 3}
1719
- {fileID: 9117857247562382210, guid: b2991431a5f893e49937d01b6da44ff8, type: 3}
1820
- {fileID: 201277550, guid: d904f93bc171bb144ba33c5155282f6f, type: 3}
1921
- {fileID: 27039729695437543, guid: f820efff6a2871447b961fc755212ba3, type: 3}
20-
- {fileID: 9003799652436270358, guid: 235c2bc0a57601e4ebbce1fb8af68214, type: 3}

Assets/Prefabs/ObjToSpawn.prefab

Lines changed: 75 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -1,86 +1,54 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!1 &3197648202846545645
3+
--- !u!1 &8581456211051995216
44
GameObject:
55
m_ObjectHideFlags: 0
66
m_CorrespondingSourceObject: {fileID: 0}
77
m_PrefabInstance: {fileID: 0}
88
m_PrefabAsset: {fileID: 0}
99
serializedVersion: 6
1010
m_Component:
11-
- component: {fileID: 7229026364367963899}
12-
m_Layer: 0
13-
m_Name: ObjToSpawn
14-
m_TagString: Untagged
15-
m_Icon: {fileID: 0}
16-
m_NavMeshLayer: 0
17-
m_StaticEditorFlags: 0
18-
m_IsActive: 1
19-
--- !u!4 &7229026364367963899
20-
Transform:
21-
m_ObjectHideFlags: 0
22-
m_CorrespondingSourceObject: {fileID: 0}
23-
m_PrefabInstance: {fileID: 0}
24-
m_PrefabAsset: {fileID: 0}
25-
m_GameObject: {fileID: 3197648202846545645}
26-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
27-
m_LocalPosition: {x: 0, y: 0, z: 0}
28-
m_LocalScale: {x: 1, y: 1, z: 1}
29-
m_ConstrainProportionsScale: 0
30-
m_Children:
31-
- {fileID: 2693772622228609124}
32-
m_Father: {fileID: 0}
33-
m_RootOrder: 0
34-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
35-
--- !u!1 &5077904771366052752
36-
GameObject:
37-
m_ObjectHideFlags: 0
38-
m_CorrespondingSourceObject: {fileID: 0}
39-
m_PrefabInstance: {fileID: 0}
40-
m_PrefabAsset: {fileID: 0}
41-
serializedVersion: 6
42-
m_Component:
43-
- component: {fileID: 2693772622228609124}
44-
- component: {fileID: 8745043918893833156}
45-
- component: {fileID: 6814773247153359719}
46-
- component: {fileID: 7039482001145209116}
11+
- component: {fileID: 110463965622217153}
12+
- component: {fileID: 8906082689220934727}
13+
- component: {fileID: 3827403934757369434}
14+
- component: {fileID: 1880324698331291801}
4715
m_Layer: 0
4816
m_Name: Sphere
4917
m_TagString: Untagged
5018
m_Icon: {fileID: 0}
5119
m_NavMeshLayer: 0
5220
m_StaticEditorFlags: 0
5321
m_IsActive: 1
54-
--- !u!4 &2693772622228609124
22+
--- !u!4 &110463965622217153
5523
Transform:
5624
m_ObjectHideFlags: 0
5725
m_CorrespondingSourceObject: {fileID: 0}
5826
m_PrefabInstance: {fileID: 0}
5927
m_PrefabAsset: {fileID: 0}
60-
m_GameObject: {fileID: 5077904771366052752}
28+
m_GameObject: {fileID: 8581456211051995216}
6129
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
6230
m_LocalPosition: {x: 0, y: 0, z: 0}
6331
m_LocalScale: {x: 1, y: 1, z: 1}
6432
m_ConstrainProportionsScale: 0
6533
m_Children: []
66-
m_Father: {fileID: 7229026364367963899}
34+
m_Father: {fileID: 6319790708797604708}
6735
m_RootOrder: 0
6836
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
69-
--- !u!33 &8745043918893833156
37+
--- !u!33 &8906082689220934727
7038
MeshFilter:
7139
m_ObjectHideFlags: 0
7240
m_CorrespondingSourceObject: {fileID: 0}
7341
m_PrefabInstance: {fileID: 0}
7442
m_PrefabAsset: {fileID: 0}
75-
m_GameObject: {fileID: 5077904771366052752}
43+
m_GameObject: {fileID: 8581456211051995216}
7644
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
77-
--- !u!23 &6814773247153359719
45+
--- !u!23 &3827403934757369434
7846
MeshRenderer:
7947
m_ObjectHideFlags: 0
8048
m_CorrespondingSourceObject: {fileID: 0}
8149
m_PrefabInstance: {fileID: 0}
8250
m_PrefabAsset: {fileID: 0}
83-
m_GameObject: {fileID: 5077904771366052752}
51+
m_GameObject: {fileID: 8581456211051995216}
8452
m_Enabled: 1
8553
m_CastShadows: 1
8654
m_ReceiveShadows: 1
@@ -94,7 +62,7 @@ MeshRenderer:
9462
m_RenderingLayerMask: 1
9563
m_RendererPriority: 0
9664
m_Materials:
97-
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
65+
- {fileID: 2100000, guid: 99d34c5009fb1be439eb7f3afe8c4d96, type: 2}
9866
m_StaticBatchInfo:
9967
firstSubMesh: 0
10068
subMeshCount: 0
@@ -116,16 +84,76 @@ MeshRenderer:
11684
m_SortingLayer: 0
11785
m_SortingOrder: 0
11886
m_AdditionalVertexStreams: {fileID: 0}
119-
--- !u!135 &7039482001145209116
87+
--- !u!135 &1880324698331291801
12088
SphereCollider:
12189
m_ObjectHideFlags: 0
12290
m_CorrespondingSourceObject: {fileID: 0}
12391
m_PrefabInstance: {fileID: 0}
12492
m_PrefabAsset: {fileID: 0}
125-
m_GameObject: {fileID: 5077904771366052752}
93+
m_GameObject: {fileID: 8581456211051995216}
12694
m_Material: {fileID: 0}
12795
m_IsTrigger: 0
12896
m_Enabled: 1
12997
serializedVersion: 2
13098
m_Radius: 0.5
13199
m_Center: {x: 0, y: 0, z: 0}
100+
--- !u!1 &9194961504702266790
101+
GameObject:
102+
m_ObjectHideFlags: 0
103+
m_CorrespondingSourceObject: {fileID: 0}
104+
m_PrefabInstance: {fileID: 0}
105+
m_PrefabAsset: {fileID: 0}
106+
serializedVersion: 6
107+
m_Component:
108+
- component: {fileID: 6319790708797604708}
109+
- component: {fileID: 6595566800893028757}
110+
m_Layer: 0
111+
m_Name: objToSpawn
112+
m_TagString: Untagged
113+
m_Icon: {fileID: 0}
114+
m_NavMeshLayer: 0
115+
m_StaticEditorFlags: 0
116+
m_IsActive: 1
117+
--- !u!4 &6319790708797604708
118+
Transform:
119+
m_ObjectHideFlags: 0
120+
m_CorrespondingSourceObject: {fileID: 0}
121+
m_PrefabInstance: {fileID: 0}
122+
m_PrefabAsset: {fileID: 0}
123+
m_GameObject: {fileID: 9194961504702266790}
124+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
125+
m_LocalPosition: {x: -96.43001, y: -32.4, z: -40.58177}
126+
m_LocalScale: {x: 1, y: 1, z: 1}
127+
m_ConstrainProportionsScale: 0
128+
m_Children:
129+
- {fileID: 110463965622217153}
130+
m_Father: {fileID: 0}
131+
m_RootOrder: 0
132+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
133+
--- !u!114 &6595566800893028757
134+
MonoBehaviour:
135+
m_ObjectHideFlags: 0
136+
m_CorrespondingSourceObject: {fileID: 0}
137+
m_PrefabInstance: {fileID: 0}
138+
m_PrefabAsset: {fileID: 0}
139+
m_GameObject: {fileID: 9194961504702266790}
140+
m_Enabled: 1
141+
m_EditorHideFlags: 0
142+
m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3}
143+
m_Name:
144+
m_EditorClassIdentifier:
145+
<IsNested>k__BackingField: 0
146+
<ComponentIndex>k__BackingField: 0
147+
_networkBehaviours: []
148+
<ParentNetworkObject>k__BackingField: {fileID: 0}
149+
<ChildNetworkObjects>k__BackingField: []
150+
_isNetworked: 1
151+
_isGlobal: 0
152+
_disableOnDespawn: 0
153+
NetworkObserver: {fileID: 0}
154+
<PrefabId>k__BackingField: -1
155+
_scenePathHash: 0
156+
<SceneId>k__BackingField: 0
157+
<AssetPathHash>k__BackingField: 2929042894771040993
158+
_sceneNetworkObjects:
159+
- {fileID: 6595566800893028757}

Assets/Prefabs/Player.prefab

Lines changed: 115 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,36 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &161703150363686572
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 96893298700572673}
12+
m_Layer: 0
13+
m_Name: pickupPosition
14+
m_TagString: Untagged
15+
m_Icon: {fileID: 0}
16+
m_NavMeshLayer: 0
17+
m_StaticEditorFlags: 0
18+
m_IsActive: 1
19+
--- !u!4 &96893298700572673
20+
Transform:
21+
m_ObjectHideFlags: 0
22+
m_CorrespondingSourceObject: {fileID: 0}
23+
m_PrefabInstance: {fileID: 0}
24+
m_PrefabAsset: {fileID: 0}
25+
m_GameObject: {fileID: 161703150363686572}
26+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
27+
m_LocalPosition: {x: 0.098, y: 0.025, z: 0.462}
28+
m_LocalScale: {x: 1, y: 1, z: 1}
29+
m_ConstrainProportionsScale: 0
30+
m_Children: []
31+
m_Father: {fileID: 1539972787299460984}
32+
m_RootOrder: 2
33+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
334
--- !u!1 &1033419573884902068
435
GameObject:
536
m_ObjectHideFlags: 0
@@ -27,7 +58,7 @@ Transform:
2758
m_PrefabAsset: {fileID: 0}
2859
m_GameObject: {fileID: 1033419573884902068}
2960
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
30-
m_LocalPosition: {x: 0, y: 2.723, z: 0.568}
61+
m_LocalPosition: {x: 0, y: 0.52, z: 0.367}
3162
m_LocalScale: {x: 1, y: 0.3, z: 0.3}
3263
m_ConstrainProportionsScale: 0
3364
m_Children: []
@@ -109,6 +140,10 @@ GameObject:
109140
- component: {fileID: 3819422031274780394}
110141
- component: {fileID: 33040312667340268}
111142
- component: {fileID: 9003799652436270358}
143+
- component: {fileID: 4885871082938872568}
144+
- component: {fileID: 9121035790669026733}
145+
- component: {fileID: 3514346791190040436}
146+
- component: {fileID: 1871061000397317257}
112147
m_Layer: 0
113148
m_Name: Player
114149
m_TagString: Untagged
@@ -124,12 +159,13 @@ Transform:
124159
m_PrefabAsset: {fileID: 0}
125160
m_GameObject: {fileID: 4060396885843017221}
126161
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
127-
m_LocalPosition: {x: 0, y: 0, z: 0}
162+
m_LocalPosition: {x: 0, y: 1.32, z: 0}
128163
m_LocalScale: {x: 1, y: 1, z: 1}
129164
m_ConstrainProportionsScale: 0
130165
m_Children:
131166
- {fileID: 869272574806322484}
132167
- {fileID: 7376252923673402894}
168+
- {fileID: 96893298700572673}
133169
m_Father: {fileID: 0}
134170
m_RootOrder: 0
135171
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -190,18 +226,92 @@ MonoBehaviour:
190226
<ComponentIndex>k__BackingField: 0
191227
_networkBehaviours:
192228
- {fileID: 33040312667340268}
229+
- {fileID: 9121035790669026733}
230+
- {fileID: 3514346791190040436}
231+
- {fileID: 1871061000397317257}
193232
<ParentNetworkObject>k__BackingField: {fileID: 0}
194233
<ChildNetworkObjects>k__BackingField: []
195234
_isNetworked: 1
196235
_isGlobal: 0
197236
_disableOnDespawn: 0
198237
NetworkObserver: {fileID: 0}
199-
<PrefabId>k__BackingField: -1
200-
_scenePathHash: 584410112
238+
<PrefabId>k__BackingField: 3
239+
_scenePathHash: 0
201240
<SceneId>k__BackingField: 0
202241
<AssetPathHash>k__BackingField: 7807759643866311769
203242
_sceneNetworkObjects:
204243
- {fileID: 9003799652436270358}
244+
--- !u!114 &4885871082938872568
245+
MonoBehaviour:
246+
m_ObjectHideFlags: 0
247+
m_CorrespondingSourceObject: {fileID: 0}
248+
m_PrefabInstance: {fileID: 0}
249+
m_PrefabAsset: {fileID: 0}
250+
m_GameObject: {fileID: 4060396885843017221}
251+
m_Enabled: 1
252+
m_EditorHideFlags: 0
253+
m_Script: {fileID: 11500000, guid: c71fd7f855ec523429999fc4e14a1928, type: 3}
254+
m_Name:
255+
m_EditorClassIdentifier:
256+
_overrideType: 3
257+
_updateHostVisibility: 1
258+
_observerConditions: []
259+
--- !u!114 &9121035790669026733
260+
MonoBehaviour:
261+
m_ObjectHideFlags: 0
262+
m_CorrespondingSourceObject: {fileID: 0}
263+
m_PrefabInstance: {fileID: 0}
264+
m_PrefabAsset: {fileID: 0}
265+
m_GameObject: {fileID: 4060396885843017221}
266+
m_Enabled: 1
267+
m_EditorHideFlags: 0
268+
m_Script: {fileID: 11500000, guid: c1a3bf90255c99446a5b3a1646fdfa9c, type: 3}
269+
m_Name:
270+
m_EditorClassIdentifier:
271+
_componentIndexCache: 1
272+
_addedNetworkObject: {fileID: 9003799652436270358}
273+
_networkObjectCache: {fileID: 9003799652436270358}
274+
body: {fileID: 4894888765721445481}
275+
endColor: {r: 0, g: 0, b: 0, a: 0}
276+
--- !u!114 &3514346791190040436
277+
MonoBehaviour:
278+
m_ObjectHideFlags: 0
279+
m_CorrespondingSourceObject: {fileID: 0}
280+
m_PrefabInstance: {fileID: 0}
281+
m_PrefabAsset: {fileID: 0}
282+
m_GameObject: {fileID: 4060396885843017221}
283+
m_Enabled: 1
284+
m_EditorHideFlags: 0
285+
m_Script: {fileID: 11500000, guid: 5b469edc101de7d46a131b332850f17e, type: 3}
286+
m_Name:
287+
m_EditorClassIdentifier:
288+
_componentIndexCache: 2
289+
_addedNetworkObject: {fileID: 9003799652436270358}
290+
_networkObjectCache: {fileID: 9003799652436270358}
291+
objToSpawn: {fileID: 9194961504702266790, guid: 61ee112838ff295478507eca79c81e4c, type: 3}
292+
spawnedObject: {fileID: 0}
293+
--- !u!114 &1871061000397317257
294+
MonoBehaviour:
295+
m_ObjectHideFlags: 0
296+
m_CorrespondingSourceObject: {fileID: 0}
297+
m_PrefabInstance: {fileID: 0}
298+
m_PrefabAsset: {fileID: 0}
299+
m_GameObject: {fileID: 4060396885843017221}
300+
m_Enabled: 1
301+
m_EditorHideFlags: 0
302+
m_Script: {fileID: 11500000, guid: 8c6302a7b9f271244ba9ead968a2766f, type: 3}
303+
m_Name:
304+
m_EditorClassIdentifier:
305+
_componentIndexCache: 3
306+
_addedNetworkObject: {fileID: 9003799652436270358}
307+
_networkObjectCache: {fileID: 9003799652436270358}
308+
raycastDistance: 2
309+
pickupLayer:
310+
serializedVersion: 2
311+
m_Bits: 64
312+
pickupPosition: {fileID: 96893298700572673}
313+
pickupButton: 101
314+
dropButton: 113
205315
--- !u!1 &4894888765721445481
206316
GameObject:
207317
m_ObjectHideFlags: 0
@@ -229,7 +339,7 @@ Transform:
229339
m_PrefabAsset: {fileID: 0}
230340
m_GameObject: {fileID: 4894888765721445481}
231341
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
232-
m_LocalPosition: {x: 0, y: 2.25, z: 0}
342+
m_LocalPosition: {x: 0, y: 0, z: 0}
233343
m_LocalScale: {x: 1, y: 1, z: 1}
234344
m_ConstrainProportionsScale: 0
235345
m_Children: []

0 commit comments

Comments
 (0)