diff --git a/Assets/Prefabs/Networking/Arrow.prefab b/Assets/Prefabs/Networking/Arrow.prefab index 3d7797d..03b460c 100644 --- a/Assets/Prefabs/Networking/Arrow.prefab +++ b/Assets/Prefabs/Networking/Arrow.prefab @@ -38,6 +38,7 @@ GameObject: m_Component: - component: {fileID: 4062715202900884} - component: {fileID: 114417069065412072} + - component: {fileID: 114439400493581264} m_Layer: 0 m_Name: Arrow m_TagString: Untagged @@ -175,6 +176,8 @@ GameObject: - component: {fileID: 4680998009117434} - component: {fileID: 114977662502901678} - component: {fileID: 95744645274962312} + - component: {fileID: 114686908955056482} + - component: {fileID: 114210224786363254} m_Layer: 0 m_Name: Lit m_TagString: Untagged @@ -638,6 +641,26 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 +--- !u!114 &114210224786363254 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1960419639055392} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1768714887, guid: dc443db3e92b4983b9738c1131f555cb, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TransformSyncMode: 1 + m_SendInterval: 0.1 + m_SyncRotationAxis: 7 + m_RotationSyncCompression: 0 + m_SyncSpin: 0 + m_MovementTheshold: 0.001 + m_SnapThreshold: 5 + m_InterpolateRotation: 1 + m_InterpolateMovement: 1 --- !u!114 &114417069065412072 MonoBehaviour: m_ObjectHideFlags: 1 @@ -670,6 +693,58 @@ MonoBehaviour: i15: 99 m_ServerOnly: 0 m_LocalPlayerAuthority: 1 +--- !u!114 &114439400493581264 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1166831496739124} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1768714887, guid: dc443db3e92b4983b9738c1131f555cb, type: 3} + m_Name: + m_EditorClassIdentifier: + m_TransformSyncMode: 1 + m_SendInterval: 0.1 + m_SyncRotationAxis: 7 + m_RotationSyncCompression: 0 + m_SyncSpin: 0 + m_MovementTheshold: 0.001 + m_SnapThreshold: 5 + m_InterpolateRotation: 1 + m_InterpolateMovement: 1 +--- !u!114 &114686908955056482 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1960419639055392} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 372142912, guid: dc443db3e92b4983b9738c1131f555cb, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SceneId: + m_Value: 0 + m_AssetId: + i0: 145 + i1: 179 + i2: 164 + i3: 137 + i4: 210 + i5: 92 + i6: 178 + i7: 148 + i8: 104 + i9: 157 + i10: 164 + i11: 160 + i12: 45 + i13: 179 + i14: 224 + i15: 99 + m_ServerOnly: 0 + m_LocalPlayerAuthority: 0 --- !u!114 &114977662502901678 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Scene/Test Scenes/Networking Test.unity b/Assets/Scene/Test Scenes/Networking Test.unity index 64ed142..75647af 100644 --- a/Assets/Scene/Test Scenes/Networking Test.unity +++ b/Assets/Scene/Test Scenes/Networking Test.unity @@ -146,11 +146,11 @@ MonoBehaviour: m_PlayerPrefab: {fileID: 1395371510902202, guid: 499e753ae5a54d84ab76d12e40cda9e8, type: 2} m_AutoCreatePlayer: 1 - m_PlayerSpawnMethod: 0 + m_PlayerSpawnMethod: 1 m_OfflineScene: m_OnlineScene: m_SpawnPrefabs: - - {fileID: 1627837743720578, guid: 43877f32af5efef4b84770a02b17302b, type: 2} + - {fileID: 1166831496739124, guid: 91b3a489d25cb294689da4a02db3e063, type: 2} m_CustomConfig: 0 m_MaxConnections: 4 m_ConnectionConfig: @@ -453,6 +453,36 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 206475221} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &232495125 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 232495126} + m_Layer: 0 + m_Name: SpawnPoints + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &232495126 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 232495125} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -1.8033338, y: 11.864638, z: 8.530304} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 365695197} + - {fileID: 1816605294} + m_Father: {fileID: 0} + m_RootOrder: 8 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &284033577 GameObject: m_ObjectHideFlags: 0 @@ -615,6 +645,46 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 304202735} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &365695195 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 365695197} + - component: {fileID: 365695196} + m_Layer: 0 + m_Name: host + m_TagString: Untagged + m_Icon: {fileID: 5721338939258241955, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &365695196 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 365695195} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1050975500, guid: dc443db3e92b4983b9738c1131f555cb, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &365695197 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 365695195} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 3.0633337, y: -6.8046384, z: -20.430304} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 232495126} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &421965463 GameObject: m_ObjectHideFlags: 0 @@ -2419,6 +2489,12 @@ Prefab: propertyPath: m_LocalPlayerAuthority value: 0 objectReference: {fileID: 0} + - target: {fileID: 114397541545836234, guid: 2add31784925e5e4d9fdf41525eadf67, + type: 2} + propertyPath: s + value: + objectReference: {fileID: 114539929307018324, guid: 499e753ae5a54d84ab76d12e40cda9e8, + type: 2} m_RemovedComponents: - {fileID: 114107881548352036, guid: 2add31784925e5e4d9fdf41525eadf67, type: 2} m_ParentPrefab: {fileID: 100100000, guid: 2add31784925e5e4d9fdf41525eadf67, type: 2} @@ -2465,6 +2541,46 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 1f5a5c2f5a2e05644b7560c9e2f70755, type: 2} m_IsPrefabParent: 0 +--- !u!1 &1816605293 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1816605294} + - component: {fileID: 1816605295} + m_Layer: 0 + m_Name: OverlordGround + m_TagString: Untagged + m_Icon: {fileID: 5721338939258241955, guid: 0000000000000000d000000000000000, type: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1816605294 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1816605293} + m_LocalRotation: {x: -0.1580882, y: -0.64888084, z: 0.14034115, w: -0.73093516} + m_LocalPosition: {x: -34.79156, y: -3.667571, z: -10.377402} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 232495126} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &1816605295 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1816605293} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -1050975500, guid: dc443db3e92b4983b9738c1131f555cb, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &2019267321 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Controls/OverSeer/OSPointer.cs b/Assets/Scripts/Controls/OverSeer/OSPointer.cs index 6ede821..09711e0 100644 --- a/Assets/Scripts/Controls/OverSeer/OSPointer.cs +++ b/Assets/Scripts/Controls/OverSeer/OSPointer.cs @@ -67,7 +67,7 @@ void Update() { if (!beaconInUse) { - CmdSpawnBeacon(); + SpawnBeacon(); } } @@ -78,11 +78,13 @@ void Update() } // [Command] - void CmdSpawnBeacon() + public spawner s; + void SpawnBeacon() { var beacon = Instantiate(beaconPrefab, pointer.position, Quaternion.identity); beaconInUse = true; + s.CmdSpawn(beacon); // NetworkServer.Spawn(beacon); } } diff --git a/Assets/Third Party/Standard Assets/Characters/FirstPersonCharacter/Scripts/FirstPersonController.cs b/Assets/Third Party/Standard Assets/Characters/FirstPersonCharacter/Scripts/FirstPersonController.cs index 996d8bb..a305cba 100644 --- a/Assets/Third Party/Standard Assets/Characters/FirstPersonCharacter/Scripts/FirstPersonController.cs +++ b/Assets/Third Party/Standard Assets/Characters/FirstPersonCharacter/Scripts/FirstPersonController.cs @@ -113,7 +113,13 @@ private void Start() //deactivate yourself if (client) { - gameObject.SetActive(false); + //gameObject.SetActive(false); + transform.GetChild(0).GetComponent().enabled = false; + foreach (var comp in DisableOnClientsHost) + { + comp.enabled = false; + } + //GetComponent().enabled = true; } //Disable other persons camera...what? diff --git a/Assets/Prefabs/Networking/GroundController.prefab b/Assets/hanisstuff/prefab/GroundController.prefab similarity index 96% rename from Assets/Prefabs/Networking/GroundController.prefab rename to Assets/hanisstuff/prefab/GroundController.prefab index dfda585..d2c2ef4 100644 --- a/Assets/Prefabs/Networking/GroundController.prefab +++ b/Assets/hanisstuff/prefab/GroundController.prefab @@ -44,6 +44,7 @@ GameObject: - component: {fileID: 114251896190925116} - component: {fileID: 114552154234673556} - component: {fileID: 114154350679959722} + - component: {fileID: 114539929307018324} m_Layer: 0 m_Name: GroundController m_TagString: Untagged @@ -328,6 +329,17 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: recordedTransform: {fileID: 4636740846740818} +--- !u!114 &114539929307018324 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1395371510902202} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7c7960f1218ec574f983feeb881ebd44, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!114 &114552154234673556 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Assets/Prefabs/Networking/GroundController.prefab.meta b/Assets/hanisstuff/prefab/GroundController.prefab.meta similarity index 100% rename from Assets/Prefabs/Networking/GroundController.prefab.meta rename to Assets/hanisstuff/prefab/GroundController.prefab.meta diff --git a/Assets/hanisstuff/prefab/OverSeer 1.prefab b/Assets/hanisstuff/prefab/OverSeer 1.prefab deleted file mode 100644 index d82891e..0000000 --- a/Assets/hanisstuff/prefab/OverSeer 1.prefab +++ /dev/null @@ -1,328 +0,0 @@ -%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: 1160636433780828} - m_IsPrefabParent: 1 ---- !u!1 &1160636433780828 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4208188299822980} - - component: {fileID: 114240789570247746} - - component: {fileID: 114129776080327562} - m_Layer: 0 - m_Name: OverSeer 1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!1 &1629658822747872 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4184999941574928} - - component: {fileID: 20796292359210696} - - component: {fileID: 92765881767736954} - - component: {fileID: 124195701947815980} - - component: {fileID: 81460285797784998} - - component: {fileID: 114553470762294084} - - component: {fileID: 114671247793944376} - m_Layer: 0 - m_Name: Main Camera - m_TagString: MainCamera - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4184999941574928 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1629658822747872} - m_LocalRotation: {x: 0.57810473, y: -0, z: -0, w: 0.8159626} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 4208188299822980} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 70.635, y: 0, z: 0} ---- !u!4 &4208188299822980 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1160636433780828} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 4.17, y: 21.74, z: -2.97} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 4184999941574928} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!20 &20796292359210696 -Camera: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1629658822747872} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0.019607844} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 84.6 - orthographic: 0 - orthographic size: 5 - m_Depth: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 - m_StereoMirrorMode: 0 ---- !u!81 &81460285797784998 -AudioListener: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1629658822747872} - m_Enabled: 1 ---- !u!92 &92765881767736954 -Behaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1629658822747872} - m_Enabled: 1 ---- !u!114 &114129776080327562 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1160636433780828} - 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: 8 - i1: 207 - i2: 210 - i3: 100 - i4: 145 - i5: 217 - i6: 116 - i7: 212 - i8: 232 - i9: 11 - i10: 141 - i11: 90 - i12: 235 - i13: 66 - i14: 0 - i15: 226 - m_ServerOnly: 0 - m_LocalPlayerAuthority: 1 ---- !u!114 &114240789570247746 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1160636433780828} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8d0c0adc65134bd41baa2ad1f403bd5b, type: 3} - m_Name: - m_EditorClassIdentifier: - actionButtonX: Overseer X - actionButtonA: Overseer A - actionButtonB: Overseer B - actionButtonY: Overseer Y - controllablesX: - - {fileID: 0} - controllablesA: - - {fileID: 0} - controllablesB: [] - controllablesY: [] ---- !u!114 &114553470762294084 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1629658822747872} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1a1e7d423b55f5b41b39d40c3a4690cd, type: 3} - m_Name: - m_EditorClassIdentifier: - verticalAxis: Vertical Overseer - horizontalAxis: Horizontal Right Stick Overseer - rotateAxis: Vertical Right - tiltAxis: Vertical Right Stick Overseer - directionAxis: Mouse ScrollWheel - mouseXAxis: Mouse X - mouseYAxis: Mouse Y - orbitAxis: Inverted Horizontal - forwardKey: 119 - backwardKey: 115 - orbitLeftKey: 0 - orbitRightKey: 0 - leftKey: 97 - rightKey: 100 - tiltIncKey: 270 - tiltDecKey: 269 - rotateLeftKey: 113 - rotateRightKey: 101 - directionPositiveKey: 0 - directionNegativeKey: 0 - resetKey: 8 - directionToMove: {x: 0, y: -1, z: 1} - directionMultiplier: {x: 500, y: 500, z: 500} - middleMouseLocksMouse: 1 - invertMouseX: 0 - invertMouseY: 0 - clampMiddleMouseInput: 1 - middleMouseInputMultiplier: 1 - verticalSetup: 1 - horizontalSetup: 1 - rotateSetup: 0 - tiltSetup: 1 - directionSetup: 0 - orbitSetup: 1 - mouseXSetup: 0 - mouseYSetup: 0 - cloudStartAtHeightPercent: 90 - cloudFinishAtHeightPercent: 100 - cloudStartAtHeight: 200 - cloudFinishAtHeight: 250 - cloudMaxAlpha: 0.15 - movementSpeed: 90 - rotateSpeed: 180 - minHeightDistance: 5 - maxHeightDistance: 250 - tiltMaxHeight: 10 - lowTilt: 15 - highTilt: 60 - tiltSpeed: 50 - useDeltaTimeToOne: 1 - groundMask: - serializedVersion: 2 - m_Bits: 9 - autoAdjustState: 2 - adjustTiltWhenHit: 1 - distanceFromGroundFinishAdjust: 20 - distanceFromGroundStartAdjust: 50 - groundHeightTiltAdjustCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 2 - time: 0 - value: 0 - inSlope: 0 - outSlope: 1 - tangentMode: 0 - - serializedVersion: 2 - time: 1 - value: 1 - inSlope: 1 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - adjustHeightMin: 0 - adjustHeightMax: 100 - heightTiltAdjustCurve: - serializedVersion: 2 - m_Curve: - - serializedVersion: 2 - time: 0 - value: 0 - inSlope: 0 - outSlope: 1 - tangentMode: 0 - - serializedVersion: 2 - time: 1 - value: 1 - inSlope: 1 - outSlope: 0 - tangentMode: 0 - m_PreInfinity: 2 - m_PostInfinity: 2 - m_RotationOrder: 4 - smoothPosition: 1 - smoothTilt: 1 - smoothRotate: 1 - movementAdjustSpeed: 0.25 - tiltAdjustSpeed: 0.25 - rotateAdjustSpeed: 0.1 - heightAdjustState: 1 - followTarget: {fileID: 0} - followOffset: {x: -11.32307, y: 17.88, z: -17.027557} - shouldFollow: 1 - shouldLookAt: 1 - movementAdjustsOffset: 1 - xEdgeSpeed: 0 - yEdgeSpeed: 0 - cloudDrawState: 1 - terrainAdjustTilt: 0 ---- !u!114 &114671247793944376 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1629658822747872} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c6105b301e2c24f4ea1a64d9a5359a0c, type: 3} - m_Name: - m_EditorClassIdentifier: - target: {fileID: 0} - leftAxisKey: Left Room Autoaim - rightAxisKey: Right Room Autoaim - delayTime: 0.2 - currentDelayTime: 0 - horizontalAxis: - verticalAxis: - pointer: {fileID: 0} - speed: 0.1 ---- !u!124 &124195701947815980 -Behaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1629658822747872} - m_Enabled: 1 diff --git a/Assets/hanisstuff/prefab/OverSeer 1.prefab.meta b/Assets/hanisstuff/prefab/OverSeer 1.prefab.meta deleted file mode 100644 index 4f5f1e9..0000000 --- a/Assets/hanisstuff/prefab/OverSeer 1.prefab.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 08cfd26491d974d4e80b8d5aeb4200e2 -timeCreated: 1486861852 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/Networking/OverseerController.prefab b/Assets/hanisstuff/prefab/OverseerController.prefab similarity index 100% rename from Assets/Prefabs/Networking/OverseerController.prefab rename to Assets/hanisstuff/prefab/OverseerController.prefab diff --git a/Assets/Prefabs/Networking/OverseerController.prefab.meta b/Assets/hanisstuff/prefab/OverseerController.prefab.meta similarity index 100% rename from Assets/Prefabs/Networking/OverseerController.prefab.meta rename to Assets/hanisstuff/prefab/OverseerController.prefab.meta diff --git a/Assets/hanisstuff/prefab/UntilWeGetCameraWorking.prefab b/Assets/hanisstuff/prefab/UntilWeGetCameraWorking.prefab deleted file mode 100644 index 7f69712..0000000 --- a/Assets/hanisstuff/prefab/UntilWeGetCameraWorking.prefab +++ /dev/null @@ -1,152 +0,0 @@ -%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: 1694764451233036} - m_IsPrefabParent: 1 ---- !u!1 &1694764451233036 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - serializedVersion: 5 - m_Component: - - component: {fileID: 4463854952855402} - - component: {fileID: 114666243920910858} - - component: {fileID: 20503174897372772} - - component: {fileID: 114247133789226836} - - component: {fileID: 114808406192285354} - m_Layer: 0 - m_Name: UntilWeGetCameraWorking - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4463854952855402 -Transform: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1694764451233036} - m_LocalRotation: {x: -0.38322484, y: -0.010533333, z: 0.0043703318, w: -0.9235847} - m_LocalPosition: {x: -1.1521372, y: 41.284744, z: -37.83934} - m_LocalScale: {x: 1.0000005, y: 1, z: 1.0000005} - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} ---- !u!20 &20503174897372772 -Camera: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1694764451233036} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_NormalizedViewPortRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 - near clip plane: 0.3 - far clip plane: 1000 - field of view: 60 - orthographic: 0 - orthographic size: 5 - m_Depth: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 - m_StereoMirrorMode: 0 ---- !u!114 &114247133789226836 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1694764451233036} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 372142912, guid: dc443db3e92b4983b9738c1131f555cb, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SceneId: - m_Value: 0 - m_AssetId: - i0: 104 - i1: 38 - i2: 169 - i3: 103 - i4: 133 - i5: 214 - i6: 66 - i7: 52 - i8: 75 - i9: 193 - i10: 123 - i11: 153 - i12: 36 - i13: 178 - i14: 58 - i15: 20 - m_ServerOnly: 0 - m_LocalPlayerAuthority: 1 ---- !u!114 &114666243920910858 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1694764451233036} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 8d0c0adc65134bd41baa2ad1f403bd5b, type: 3} - m_Name: - m_EditorClassIdentifier: - actionButtonX: Overseer X - actionButtonA: Overseer A - actionButtonB: Overseer B - actionButtonY: Overseer Y - controllablesX: - - {fileID: 0} - controllablesA: - - {fileID: 0} - controllablesB: [] - controllablesY: [] ---- !u!114 &114808406192285354 -MonoBehaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1694764451233036} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -1768714887, guid: dc443db3e92b4983b9738c1131f555cb, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TransformSyncMode: 1 - m_SendInterval: 0.1 - m_SyncRotationAxis: 7 - m_RotationSyncCompression: 0 - m_SyncSpin: 0 - m_MovementTheshold: 0.001 - m_SnapThreshold: 5 - m_InterpolateRotation: 1 - m_InterpolateMovement: 1 diff --git a/Assets/hanisstuff/prefab/UntilWeGetCameraWorking.prefab.meta b/Assets/hanisstuff/prefab/UntilWeGetCameraWorking.prefab.meta deleted file mode 100644 index e7cb010..0000000 --- a/Assets/hanisstuff/prefab/UntilWeGetCameraWorking.prefab.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: 6826a96785d642344bc17b9924b23a14 -timeCreated: 1486868996 -licenseType: Free -NativeFormatImporter: - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/spawner.cs b/Assets/spawner.cs new file mode 100644 index 0000000..b9c8008 --- /dev/null +++ b/Assets/spawner.cs @@ -0,0 +1,15 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Networking; + +public class spawner : NetworkBehaviour +{ + [Command] + public void CmdSpawn(GameObject o) + { + Debug.Log(gameObject.name); + Debug.Log("FWIOEHDFWOEUFHOUWEFHUOEFHEHW"); + NetworkServer.Spawn(o); + } +} diff --git a/Assets/spawner.cs.meta b/Assets/spawner.cs.meta new file mode 100644 index 0000000..4cde5bb --- /dev/null +++ b/Assets/spawner.cs.meta @@ -0,0 +1,12 @@ +fileFormatVersion: 2 +guid: 7c7960f1218ec574f983feeb881ebd44 +timeCreated: 1487193348 +licenseType: Free +MonoImporter: + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: