Commit b82e0583 authored by Reto Spoerri - WorkPC's avatar Reto Spoerri - WorkPC
Browse files

fix error in netxr-example-v2 scene with bubblegun

parent 8de794db
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 1085173596083874}
m_IsPrefabParent: 1
--- !u!1 &1085173596083874
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4830850050061380}
- component: {fileID: 114613915215180794}
- component: {fileID: 54977732268111494}
- component: {fileID: 114063104103378706}
- component: {fileID: 114305464974737692}
- component: {fileID: 114722141679707040}
m_Layer: 0
m_Name: BubbleGun (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1102739953151744
GameObject:
m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4036902358417552}
- component: {fileID: 33785090723022044}
- component: {fileID: 23695051470617320}
- component: {fileID: 65743056161359488}
m_Layer: 0
m_Name: Cube.001
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1114119873378562
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4681798544845088}
m_Layer: 0
m_Name: Source
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1621370960550436
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4939172165518540}
- component: {fileID: 33321531812928086}
- component: {fileID: 23264927321669626}
- component: {fileID: 65887807030140086}
m_Layer: 0
m_Name: Cube.002
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4036902358417552
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1102739953151744}
m_LocalRotation: {x: -0.00000013767877, y: 0.7071068, z: 0.70710677, w: 0.00000013767878}
m_LocalPosition: {x: -0, y: -0.20000057, z: -0.00000055879354}
m_LocalScale: {x: 120.00001, y: 120.00001, z: 120.00001}
m_Children:
- {fileID: 4939172165518540}
m_Father: {fileID: 4830850050061380}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4681798544845088
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1114119873378562}
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0.132, z: 0.055}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4939172165518540}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!4 &4830850050061380
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1085173596083874}
m_LocalRotation: {x: -0, y: -0, z: 0.6824323, w: 0.7309488}
m_LocalPosition: {x: -1.541, y: 1.175, z: 1.091}
m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
m_Children:
- {fileID: 4036902358417552}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 86.068}
--- !u!4 &4939172165518540
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1621370960550436}
m_LocalRotation: {x: 1.7763568e-15, y: 1.872481e-22, z: -1.413684e-29, w: 1}
m_LocalPosition: {x: -3.699501e-17, y: 0.020000001, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4681798544845088}
m_Father: {fileID: 4036902358417552}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!23 &23264927321669626
MeshRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1621370960550436}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 2100000, guid: f078413ef19b8ff448b88cf4c6abadce, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!23 &23695051470617320
MeshRenderer:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1102739953151744}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_Materials:
- {fileID: 2100000, guid: f078413ef19b8ff448b88cf4c6abadce, type: 2}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 0
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &33321531812928086
MeshFilter:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1621370960550436}
m_Mesh: {fileID: 4300006, guid: f9f579fdcac5ff641a0aebec2d18fde8, type: 3}
--- !u!33 &33785090723022044
MeshFilter:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1102739953151744}
m_Mesh: {fileID: 4300004, guid: f9f579fdcac5ff641a0aebec2d18fde8, type: 3}
--- !u!54 &54977732268111494
Rigidbody:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1085173596083874}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 1
--- !u!65 &65743056161359488
BoxCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1102739953151744}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.020000014, y: 0.10937077, z: 0.08000004}
m_Center: {x: -0.00000011920929, y: 0.025314687, z: 0.000000117700424}
--- !u!65 &65887807030140086
BoxCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1621370960550436}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.04000003, y: 0.17, z: 0.040000014}
m_Center: {x: -0.00000005960464, y: 0.035000112, z: 0.060000136}
--- !u!114 &114063104103378706
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1085173596083874}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 372142912, guid: 870353891bb340e2b2a9c8707e7419ba, type: 3}
m_Name:
m_EditorClassIdentifier:
m_SceneId:
m_Value: 0
m_AssetId:
i0: 141
i1: 193
i2: 12
i3: 245
i4: 123
i5: 83
i6: 123
i7: 52
i8: 104
i9: 70
i10: 15
i11: 226
i12: 214
i13: 9
i14: 251
i15: 6
m_ServerOnly: 0
m_LocalPlayerAuthority: 0
--- !u!114 &114305464974737692
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1085173596083874}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 0a72ec8d0f95a6f469d0d180cc61d739, type: 3}
m_Name:
m_EditorClassIdentifier:
rigidbody: {fileID: 0}
moveXByDrag: 1
moveYByDrag: 1
moveZByDrag: 1
rotateXByDrag: 1
rotateYByDrag: 1
rotateZByDrag: 1
grabOnlyFirst: 1
onAttachStartEvent:
m_PersistentCalls:
m_Calls: []
m_TypeName: NetXr.UnityDeviceDataEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
onAttachRepeatEvent:
m_PersistentCalls:
m_Calls: []
m_TypeName: NetXr.UnityDeviceDataEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
onAttachStopEvent:
m_PersistentCalls:
m_Calls: []
m_TypeName: NetXr.UnityDeviceDataEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
onUseStartEvent:
m_PersistentCalls:
m_Calls: []
m_TypeName: NetXr.UnityDeviceDataEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
onUseRepeatEvent:
m_PersistentCalls:
m_Calls: []
m_TypeName: NetXr.UnityDeviceDataEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
onUseStopEvent:
m_PersistentCalls:
m_Calls: []
m_TypeName: NetXr.UnityDeviceDataEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
onTouchStartEvent:
m_PersistentCalls:
m_Calls: []
m_TypeName: NetXr.UnityDeviceDataEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
onTouchRepeatEvent:
m_PersistentCalls:
m_Calls: []
m_TypeName: NetXr.UnityDeviceDataEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
onTouchStopEvent:
m_PersistentCalls:
m_Calls: []
m_TypeName: NetXr.UnityDeviceDataEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
onEventOneStartEvent:
m_PersistentCalls:
m_Calls: []
m_TypeName: NetXr.UnityDeviceDataEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
onEventOneStopEvent:
m_PersistentCalls:
m_Calls: []
m_TypeName: NetXr.UnityDeviceDataEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
onEventTwoStartEvent:
m_PersistentCalls:
m_Calls: []
m_TypeName: NetXr.UnityDeviceDataEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
onEventTwoStopEvent:
m_PersistentCalls:
m_Calls: []
m_TypeName: NetXr.UnityDeviceDataEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
onEventThreeStartEvent:
m_PersistentCalls:
m_Calls: []
m_TypeName: NetXr.UnityDeviceDataEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
onEventThreeStopEvent:
m_PersistentCalls:
m_Calls: []
m_TypeName: NetXr.UnityDeviceDataEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
onHoverEnterEvent:
m_PersistentCalls:
m_Calls: []
m_TypeName: NetXr.UnityDeviceDataEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
onHoverRepeatEvent:
m_PersistentCalls:
m_Calls: []
m_TypeName: NetXr.UnityDeviceDataEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
onHoverExitEvent:
m_PersistentCalls:
m_Calls: []
m_TypeName: NetXr.UnityDeviceDataEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
onDragEnterEvent:
m_PersistentCalls:
m_Calls: []
m_TypeName: NetXr.UnityDeviceDataEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
onDragRepeatEvent:
m_PersistentCalls:
m_Calls: []
m_TypeName: NetXr.UnityDeviceDataEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
onDragExitEvent:
m_PersistentCalls:
m_Calls: []
m_TypeName: NetXr.UnityDeviceDataEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
disableDefaultApplyTransformEvent: 0
onApplyTransformOverrideEvent:
m_PersistentCalls:
m_Calls: []
m_TypeName: NetXr.UnityDeviceDataEvent, Assembly-CSharp, Version=0.0.0.0, Culture=neutral,
PublicKeyToken=null
onStartAuthorityCallback:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
onStopAuthorityCallback:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
onStartClientCallback:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
onStartServerCallback:
m_PersistentCalls:
m_Calls: []
m_TypeName: UnityEngine.Events.UnityEvent, UnityEngine.CoreModule, Version=0.0.0.0,
Culture=neutral, PublicKeyToken=null
--- !u!114 &114613915215180794
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1085173596083874}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ed8da7d41bbb0d24789d1bf770bf349f, type: 3}
m_Name:
m_EditorClassIdentifier:
BubbleShotPrefabName: BubbleShot
source: {fileID: 4681798544845088}
bubbleForce: 5
relativeRotation: {x: 0, y: 0, z: 0, w: 1}
relativePosition: {x: 0, y: 0, z: 0}
relativeTransformInitialized: 0
--- !u!114 &114722141679707040
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1085173596083874}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: -1768714887, guid: 870353891bb340e2b2a9c8707e7419ba, type: 3}
m_Name:
m_EditorClassIdentifier:
m_TransformSyncMode: 3
m_SendInterval: 0.1
m_SyncRotationAxis: 7
m_RotationSyncCompression: 0
m_SyncSpin: 0
m_MovementTheshold: 0.001
m_VelocityThreshold: 0.0001
m_SnapThreshold: 5
m_InterpolateRotation: 1
m_InterpolateMovement: 1
fileFormatVersion: 2
guid: 8dc10cf57b537b3468460fe2d609fb06
timeCreated: 1513121296
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
......@@ -57,6 +57,7 @@ MeshRenderer:
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 4294967295
m_Materials:
- {fileID: 2100000, guid: f078413ef19b8ff448b88cf4c6abadce, type: 2}
m_StaticBatchInfo:
......
fileFormatVersion: 2
guid: b368c5c6dd91b9a49b852f9bb74ab3fe
timeCreated: 1490374309
licenseType: Pro
guid: 8dc10cf57b537b3468460fe2d609fb06
timeCreated: 1513121296
licenseType: Free
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:
......@@ -339,14 +339,18 @@ namespace NetXr {
[Command]
public void CmdCreateNetworkObjectAuthForce(Vector3 createPosition, Quaternion createRotation, string networkObjectPrefabName, bool giveAuthority, Vector3 addForce, ForceMode forceMode) {
GameObject go = CreateNetworkObject(createPosition, createRotation, networkObjectPrefabName);
Rigidbody rb = go.GetComponent<Rigidbody>();
if (rb != null) {
rb.AddForce(addForce, forceMode);
}
if (go != null) {
Rigidbody rb = go.GetComponent<Rigidbody>();
if (rb != null) {
rb.AddForce(addForce, forceMode);
}
NetworkInstanceId netId = go.GetComponent<NetworkIdentity>().netId;
if (giveAuthority && (netId != null)) {
CmdGetAuthority(netId);
NetworkInstanceId netId = go.GetComponent<NetworkIdentity>().netId;
if (giveAuthority && (netId != null)) {
CmdGetAuthority(netId);
}
} else {
Debug.LogError("NetworkPlayerControllers.CmdCreateNetworkObjectAuthForce: could not instatiate networked object '" + networkObjectPrefabName+"'");
}
}
......
......@@ -7,3 +7,8 @@
/NetXr-UnityProject/.git
/NetXr-UnityProject/.vs
Builds
/.git/refs
/.git/objects
/.git/logs
/.git/hooks
.gitignore
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment