Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PlayerPickUp items over the network #4

Merged
merged 3 commits into from
Oct 2, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -57,4 +57,3 @@ sysinfo.txt

# Crashlytics generated file
crashlytics-build.properties

3 changes: 2 additions & 1 deletion Assets/FishNet/Runtime/DefaultPrefabObjects.asset
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@ MonoBehaviour:
m_Name: DefaultPrefabObjects
m_EditorClassIdentifier:
_prefabs:
- {fileID: 6595566800893028757, guid: 61ee112838ff295478507eca79c81e4c, type: 3}
- {fileID: 9003799652436270358, guid: 235c2bc0a57601e4ebbce1fb8af68214, type: 3}
- {fileID: 611616139817875448, guid: bf5f023b4017a5e41a9815ec5745df3d, type: 3}
- {fileID: 9117857247562382210, guid: b2991431a5f893e49937d01b6da44ff8, type: 3}
- {fileID: 201277550, guid: d904f93bc171bb144ba33c5155282f6f, type: 3}
- {fileID: 27039729695437543, guid: f820efff6a2871447b961fc755212ba3, type: 3}
- {fileID: 9003799652436270358, guid: 235c2bc0a57601e4ebbce1fb8af68214, type: 3}
122 changes: 75 additions & 47 deletions Assets/Prefabs/ObjToSpawn.prefab
Original file line number Diff line number Diff line change
@@ -1,86 +1,54 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3197648202846545645
--- !u!1 &8581456211051995216
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7229026364367963899}
m_Layer: 0
m_Name: ObjToSpawn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7229026364367963899
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3197648202846545645}
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:
- {fileID: 2693772622228609124}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5077904771366052752
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2693772622228609124}
- component: {fileID: 8745043918893833156}
- component: {fileID: 6814773247153359719}
- component: {fileID: 7039482001145209116}
- component: {fileID: 110463965622217153}
- component: {fileID: 8906082689220934727}
- component: {fileID: 3827403934757369434}
- component: {fileID: 1880324698331291801}
m_Layer: 0
m_Name: Sphere
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2693772622228609124
--- !u!4 &110463965622217153
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5077904771366052752}
m_GameObject: {fileID: 8581456211051995216}
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: 7229026364367963899}
m_Father: {fileID: 6319790708797604708}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &8745043918893833156
--- !u!33 &8906082689220934727
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5077904771366052752}
m_GameObject: {fileID: 8581456211051995216}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &6814773247153359719
--- !u!23 &3827403934757369434
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5077904771366052752}
m_GameObject: {fileID: 8581456211051995216}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
Expand All @@ -94,7 +62,7 @@ MeshRenderer:
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 2100000, guid: 99d34c5009fb1be439eb7f3afe8c4d96, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
Expand All @@ -116,16 +84,76 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!135 &7039482001145209116
--- !u!135 &1880324698331291801
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5077904771366052752}
m_GameObject: {fileID: 8581456211051995216}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.5
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &9194961504702266790
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6319790708797604708}
- component: {fileID: 6595566800893028757}
m_Layer: 0
m_Name: objToSpawn
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6319790708797604708
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9194961504702266790}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -96.43001, y: -32.4, z: -40.58177}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 110463965622217153}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6595566800893028757
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9194961504702266790}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 26b716c41e9b56b4baafaf13a523ba2e, type: 3}
m_Name:
m_EditorClassIdentifier:
<IsNested>k__BackingField: 0
<ComponentIndex>k__BackingField: 0
_networkBehaviours: []
<ParentNetworkObject>k__BackingField: {fileID: 0}
<ChildNetworkObjects>k__BackingField: []
_isNetworked: 1
_isGlobal: 0
_disableOnDespawn: 0
NetworkObserver: {fileID: 0}
<PrefabId>k__BackingField: -1
_scenePathHash: 0
<SceneId>k__BackingField: 0
<AssetPathHash>k__BackingField: 2929042894771040993
_sceneNetworkObjects:
- {fileID: 6595566800893028757}
120 changes: 115 additions & 5 deletions Assets/Prefabs/Player.prefab
Original file line number Diff line number Diff line change
@@ -1,5 +1,36 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &161703150363686572
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 96893298700572673}
m_Layer: 0
m_Name: pickupPosition
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &96893298700572673
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 161703150363686572}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0.098, y: 0.025, z: 0.462}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1539972787299460984}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1033419573884902068
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -27,7 +58,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1033419573884902068}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 2.723, z: 0.568}
m_LocalPosition: {x: 0, y: 0.52, z: 0.367}
m_LocalScale: {x: 1, y: 0.3, z: 0.3}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down Expand Up @@ -109,6 +140,10 @@ GameObject:
- component: {fileID: 3819422031274780394}
- component: {fileID: 33040312667340268}
- component: {fileID: 9003799652436270358}
- component: {fileID: 4885871082938872568}
- component: {fileID: 9121035790669026733}
- component: {fileID: 3514346791190040436}
- component: {fileID: 1871061000397317257}
m_Layer: 0
m_Name: Player
m_TagString: Untagged
Expand All @@ -124,12 +159,13 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4060396885843017221}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalPosition: {x: 0, y: 1.32, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 869272574806322484}
- {fileID: 7376252923673402894}
- {fileID: 96893298700572673}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -190,18 +226,92 @@ MonoBehaviour:
<ComponentIndex>k__BackingField: 0
_networkBehaviours:
- {fileID: 33040312667340268}
- {fileID: 9121035790669026733}
- {fileID: 3514346791190040436}
- {fileID: 1871061000397317257}
<ParentNetworkObject>k__BackingField: {fileID: 0}
<ChildNetworkObjects>k__BackingField: []
_isNetworked: 1
_isGlobal: 0
_disableOnDespawn: 0
NetworkObserver: {fileID: 0}
<PrefabId>k__BackingField: -1
_scenePathHash: 584410112
<PrefabId>k__BackingField: 3
_scenePathHash: 0
<SceneId>k__BackingField: 0
<AssetPathHash>k__BackingField: 7807759643866311769
_sceneNetworkObjects:
- {fileID: 9003799652436270358}
--- !u!114 &4885871082938872568
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4060396885843017221}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c71fd7f855ec523429999fc4e14a1928, type: 3}
m_Name:
m_EditorClassIdentifier:
_overrideType: 3
_updateHostVisibility: 1
_observerConditions: []
--- !u!114 &9121035790669026733
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4060396885843017221}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: c1a3bf90255c99446a5b3a1646fdfa9c, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 1
_addedNetworkObject: {fileID: 9003799652436270358}
_networkObjectCache: {fileID: 9003799652436270358}
body: {fileID: 4894888765721445481}
endColor: {r: 0, g: 0, b: 0, a: 0}
--- !u!114 &3514346791190040436
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4060396885843017221}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5b469edc101de7d46a131b332850f17e, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 2
_addedNetworkObject: {fileID: 9003799652436270358}
_networkObjectCache: {fileID: 9003799652436270358}
objToSpawn: {fileID: 9194961504702266790, guid: 61ee112838ff295478507eca79c81e4c, type: 3}
spawnedObject: {fileID: 0}
--- !u!114 &1871061000397317257
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4060396885843017221}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8c6302a7b9f271244ba9ead968a2766f, type: 3}
m_Name:
m_EditorClassIdentifier:
_componentIndexCache: 3
_addedNetworkObject: {fileID: 9003799652436270358}
_networkObjectCache: {fileID: 9003799652436270358}
raycastDistance: 2
pickupLayer:
serializedVersion: 2
m_Bits: 64
pickupPosition: {fileID: 96893298700572673}
pickupButton: 101
dropButton: 113
--- !u!1 &4894888765721445481
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -229,7 +339,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4894888765721445481}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 2.25, z: 0}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Expand Down
Loading