From 2953687180bd16de1d0812cff16e314cef190def Mon Sep 17 00:00:00 2001 From: Julia Butenhoff Date: Wed, 3 Nov 2021 14:03:43 -0500 Subject: [PATCH] Fixed NetworkTransforms and Added Host IP - Fixed placement of NetworkTransform on Prefab - Needs to be on the same level as the character controller and movement - Added a display of the host IP address in the lobby --- Assets/New Material.mat | 78 ----- Assets/New Material.mat.meta | 8 - Assets/Prefabs/Lobby/LobbyUI.prefab | 136 ++++++++ Assets/Prefabs/Player/PlayerPrefab 1.prefab | 298 ------------------ .../Prefabs/Player/PlayerPrefab 1.prefab.meta | 7 - Assets/Prefabs/Player/PlayerPrefab.prefab | 106 +++---- Assets/Scripts/Network/Game/SpawnManager.cs | 6 - .../PlayerScripts/MovementAbilities/Blink.cs | 5 +- .../PlayerScripts/MovementAbilities/Dash.cs | 5 +- .../MovementAbilities/WallRun.cs | 5 +- Assets/Scripts/PlayerScripts/PlayerCam.cs | 5 +- .../Scripts/PlayerScripts/PlayerMovement.cs | 5 +- Assets/Scripts/UI/Lobby/LobbyUI.cs | 36 +++ UserSettings/EditorUserSettings.asset | 18 +- 14 files changed, 252 insertions(+), 466 deletions(-) delete mode 100644 Assets/New Material.mat delete mode 100644 Assets/New Material.mat.meta delete mode 100644 Assets/Prefabs/Player/PlayerPrefab 1.prefab delete mode 100644 Assets/Prefabs/Player/PlayerPrefab 1.prefab.meta diff --git a/Assets/New Material.mat b/Assets/New Material.mat deleted file mode 100644 index 4685151..0000000 --- a/Assets/New Material.mat +++ /dev/null @@ -1,78 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!21 &2100000 -Material: - serializedVersion: 6 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: New Material - m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _BumpMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailAlbedoMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailMask: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _DetailNormalMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _EmissionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _MetallicGlossMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _OcclusionMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - - _ParallaxMap: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Floats: - - _BumpScale: 1 - - _Cutoff: 0.5 - - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _GlossMapScale: 1 - - _Glossiness: 0.5 - - _GlossyReflections: 1 - - _Metallic: 0 - - _Mode: 0 - - _OcclusionStrength: 1 - - _Parallax: 0.02 - - _SmoothnessTextureChannel: 0 - - _SpecularHighlights: 1 - - _SrcBlend: 1 - - _UVSec: 0 - - _ZWrite: 1 - m_Colors: - - _Color: {r: 1, g: 1, b: 1, a: 1} - - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - m_BuildTextureStacks: [] diff --git a/Assets/New Material.mat.meta b/Assets/New Material.mat.meta deleted file mode 100644 index 2dcb415..0000000 --- a/Assets/New Material.mat.meta +++ /dev/null @@ -1,8 +0,0 @@ -fileFormatVersion: 2 -guid: d198fbeb4d5e3f44389f5ebc0d6f47ac -NativeFormatImporter: - externalObjects: {} - mainObjectFileID: 2100000 - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/Lobby/LobbyUI.prefab b/Assets/Prefabs/Lobby/LobbyUI.prefab index 9fa492e..990f7a8 100644 --- a/Assets/Prefabs/Lobby/LobbyUI.prefab +++ b/Assets/Prefabs/Lobby/LobbyUI.prefab @@ -1151,6 +1151,7 @@ RectTransform: - {fileID: 964624740} - {fileID: 1882333065} - {fileID: 7575544244300364928} + - {fileID: 1466885265103402716} m_Father: {fileID: 2890392183066358573} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1288,6 +1289,141 @@ MonoBehaviour: - {fileID: 5410293111695408891} startGameButton: {fileID: 1619667364} lobbyStateText: {fileID: 880048951586292193} + hostIpAddressText: {fileID: 434891571574396255} +--- !u!1 &3651501461169106465 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1466885265103402716} + - component: {fileID: 2858686895091500711} + - component: {fileID: 434891571574396255} + m_Layer: 0 + m_Name: IPAddressText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1466885265103402716 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3651501461169106465} + 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_Children: [] + m_Father: {fileID: 2890392181480129904} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -829, y: 492} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2858686895091500711 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3651501461169106465} + m_CullTransparentMesh: 1 +--- !u!114 &434891571574396255 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3651501461169106465} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 'HOST IP: ' + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 48 + m_fontSizeBase: 48 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 1 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: -429.83545, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &7654155554909440221 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Player/PlayerPrefab 1.prefab b/Assets/Prefabs/Player/PlayerPrefab 1.prefab deleted file mode 100644 index 30d923c..0000000 --- a/Assets/Prefabs/Player/PlayerPrefab 1.prefab +++ /dev/null @@ -1,298 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &4814433541978696327 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 394725941300514827} - - component: {fileID: 3891196372269872751} - - component: {fileID: 1779614325098168083} - m_Layer: 0 - m_Name: PlayerModel - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &394725941300514827 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4814433541978696327} - 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_Children: [] - m_Father: {fileID: 7188906082087890177} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &3891196372269872751 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4814433541978696327} - m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &1779614325098168083 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4814433541978696327} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 1 - 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 - m_AdditionalVertexStreams: {fileID: 0} ---- !u!1 &7188906082087890184 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7188906082087890177} - - component: {fileID: 7188906082087890180} - - component: {fileID: 7188906082087890183} - - component: {fileID: 7188906082087890185} - - component: {fileID: 6558661690282462800} - - component: {fileID: 2274833863450849408} - - component: {fileID: 471272923182148881} - m_Layer: 3 - m_Name: PlayerPrefab - m_TagString: Player - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7188906082087890177 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7188906082087890184} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1, y: 1.8, z: -0.2} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7188906082643956518} - - {fileID: 394725941300514827} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &7188906082087890180 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7188906082087890184} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: addc2e37ff81c1b4989ec34b6150b4f7, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!114 &7188906082087890183 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7188906082087890184} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5a5d879591af1084ab5d3a35fcd53086, type: 3} - m_Name: - m_EditorClassIdentifier: - items: [] - pStats: {fileID: 0} ---- !u!114 &7188906082087890185 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7188906082087890184} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 22ae0d31c49624d4fb9990f2f5f72fd9, type: 3} - m_Name: - m_EditorClassIdentifier: - pStats: {fileID: 0} - groundCheckDistance: 0.05 - groundCheckLayers: - serializedVersion: 2 - m_Bits: 4294967295 - minAngle: -30 - maxAngle: 45 - sensitivity: 301 ---- !u!143 &6558661690282462800 -CharacterController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7188906082087890184} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Height: 2 - m_Radius: 0.5 - m_SlopeLimit: 45 - m_StepOffset: 0.3 - m_SkinWidth: 0.08 - m_MinMoveDistance: 0.001 - m_Center: {x: 0, y: 0, z: 0} ---- !u!136 &2274833863450849408 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7188906082087890184} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - m_Radius: 0.5 - m_Height: 2 - m_Direction: 1 - m_Center: {x: 0, y: 0, z: 0} ---- !u!54 &471272923182148881 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7188906082087890184} - serializedVersion: 2 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_UseGravity: 0 - m_IsKinematic: 1 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!1 &7188906082643956521 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7188906082643956518} - - component: {fileID: 7188906082643956516} - - component: {fileID: 7188906082643956519} - m_Layer: 3 - m_Name: PlayerCam - m_TagString: PlayerCam - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7188906082643956518 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7188906082643956521} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1.6, z: -4} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: [] - m_Father: {fileID: 7188906082087890177} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!20 &7188906082643956516 -Camera: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7188906082643956521} - m_Enabled: 1 - serializedVersion: 2 - m_ClearFlags: 1 - m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} - m_projectionMatrixMode: 1 - m_GateFitMode: 2 - m_FOVAxisMode: 0 - m_SensorSize: {x: 36, y: 24} - m_LensShift: {x: 0, y: 0} - m_FocalLength: 50 - 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: -1 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingPath: -1 - m_TargetTexture: {fileID: 0} - m_TargetDisplay: 0 - m_TargetEye: 3 - m_HDR: 1 - m_AllowMSAA: 1 - m_AllowDynamicResolution: 0 - m_ForceIntoRT: 0 - m_OcclusionCulling: 1 - m_StereoConvergence: 10 - m_StereoSeparation: 0.022 ---- !u!81 &7188906082643956519 -AudioListener: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7188906082643956521} - m_Enabled: 1 diff --git a/Assets/Prefabs/Player/PlayerPrefab 1.prefab.meta b/Assets/Prefabs/Player/PlayerPrefab 1.prefab.meta deleted file mode 100644 index 590db9e..0000000 --- a/Assets/Prefabs/Player/PlayerPrefab 1.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 18ef9e5b68364684c94ff1488b39d192 -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Prefabs/Player/PlayerPrefab.prefab b/Assets/Prefabs/Player/PlayerPrefab.prefab index 8a25bf6..bcc8197 100644 --- a/Assets/Prefabs/Player/PlayerPrefab.prefab +++ b/Assets/Prefabs/Player/PlayerPrefab.prefab @@ -24,6 +24,7 @@ GameObject: - component: {fileID: 8956701063868523892} - component: {fileID: 3772338269032432186} - component: {fileID: 5687943635225929219} + - component: {fileID: 1598497700760111941} m_Layer: 0 m_Name: PlayerModel m_TagString: Untagged @@ -286,64 +287,13 @@ CharacterController: m_SkinWidth: 0.08 m_MinMoveDistance: 0.001 m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &7188906082087890184 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7188906082087890177} - - component: {fileID: 5368328878093455966} - - component: {fileID: 701079060217590907} - m_Layer: 3 - m_Name: PlayerPrefab - m_TagString: Player - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7188906082087890177 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7188906082087890184} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1, y: 1.8, z: -0.2} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 7188906082643956518} - - {fileID: 394725941300514827} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &5368328878093455966 +--- !u!114 &1598497700760111941 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7188906082087890184} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} - m_Name: - m_EditorClassIdentifier: - NetworkInstanceId: 0 - PrefabHash: 8672539184207985188 - PrefabHashGenerator: PlayerPrefab - AlwaysReplicateAsRoot: 0 - DontDestroyWithOwner: 0 ---- !u!114 &701079060217590907 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7188906082087890184} + m_GameObject: {fileID: 4814433541978696327} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3} @@ -385,6 +335,56 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1 &7188906082087890184 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7188906082087890177} + - component: {fileID: 5368328878093455966} + m_Layer: 3 + m_Name: PlayerPrefab + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7188906082087890177 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7188906082087890184} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 1, y: 1.8, z: -0.2} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 7188906082643956518} + - {fileID: 394725941300514827} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &5368328878093455966 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7188906082087890184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} + m_Name: + m_EditorClassIdentifier: + NetworkInstanceId: 0 + PrefabHash: 8672539184207985188 + PrefabHashGenerator: PlayerPrefab + AlwaysReplicateAsRoot: 0 + DontDestroyWithOwner: 0 --- !u!1 &7188906082643956521 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Network/Game/SpawnManager.cs b/Assets/Scripts/Network/Game/SpawnManager.cs index 6152db4..3ab5df4 100644 --- a/Assets/Scripts/Network/Game/SpawnManager.cs +++ b/Assets/Scripts/Network/Game/SpawnManager.cs @@ -56,7 +56,6 @@ public class SpawnManager : NetworkBehaviour { // Spawn in each player [ServerRpc(RequireOwnership = false)] public void SpawnPlayerServerRpc(ulong clientId) { - Debug.Log("Called by player " + clientId); // Get the player data for the player calling the spawn if (ServerGameNetPortal.Instance.clientIdToGuid.TryGetValue(clientId, out string clientGuid)) { if (ServerGameNetPortal.Instance.clientData.TryGetValue(clientGuid, out PlayerData playerData)) { @@ -74,10 +73,5 @@ public class SpawnManager : NetworkBehaviour { } } } - - // Disable the character controllers and camera - //go.GetComponent().enabled = false; - //go.GetComponent().enabled = true; - //go.GetComponent().enabled = false; } } diff --git a/Assets/Scripts/PlayerScripts/MovementAbilities/Blink.cs b/Assets/Scripts/PlayerScripts/MovementAbilities/Blink.cs index f6a5dc5..620a6ef 100644 --- a/Assets/Scripts/PlayerScripts/MovementAbilities/Blink.cs +++ b/Assets/Scripts/PlayerScripts/MovementAbilities/Blink.cs @@ -1,10 +1,11 @@ using System.Collections; using System.Collections.Generic; +using MLAPI; using UnityEngine; -public class Blink : MonoBehaviour{ +public class Blink : NetworkBehaviour { // Start is called before the first frame update @@ -42,6 +43,8 @@ public class Blink : MonoBehaviour{ //blinks the player forwards private void BlinkMove() { + if (!IsLocalPlayer) { return; } + if (Input.GetMouseButton(1)) { // Finding the origin and end point of laser. diff --git a/Assets/Scripts/PlayerScripts/MovementAbilities/Dash.cs b/Assets/Scripts/PlayerScripts/MovementAbilities/Dash.cs index eef3377..43e6862 100644 --- a/Assets/Scripts/PlayerScripts/MovementAbilities/Dash.cs +++ b/Assets/Scripts/PlayerScripts/MovementAbilities/Dash.cs @@ -1,9 +1,10 @@ using System.Collections; using System.Collections.Generic; +using MLAPI; using UnityEngine; -public class Dash : MonoBehaviour{ +public class Dash : NetworkBehaviour { public Vector3 moveDirection; public const float maxDashTime = 1.0f; @@ -20,6 +21,8 @@ public class Dash : MonoBehaviour{ //UPDATE CHECK FOR MOVEMENT ONLY WHEN DASHING void FixedUpdate(){ + if (!IsLocalPlayer) { return; } + if (Input.GetKeyDown(KeyCode.E)) { currentDashTime = 0; diff --git a/Assets/Scripts/PlayerScripts/MovementAbilities/WallRun.cs b/Assets/Scripts/PlayerScripts/MovementAbilities/WallRun.cs index f9e3255..ef774c1 100644 --- a/Assets/Scripts/PlayerScripts/MovementAbilities/WallRun.cs +++ b/Assets/Scripts/PlayerScripts/MovementAbilities/WallRun.cs @@ -1,9 +1,10 @@ using UnityEngine; using System.Linq; +using MLAPI; using UnityEngine.Rendering; [RequireComponent (typeof(PlayerMovement))] -public class WallRun : MonoBehaviour +public class WallRun : NetworkBehaviour { public float wallMaxDistance = 1; @@ -67,6 +68,8 @@ public class WallRun : MonoBehaviour public void WallRunRoutine() { + if (!IsLocalPlayer) { return; } + isWallRunning = false; if(playerMovementController.GetJumpPressed()) diff --git a/Assets/Scripts/PlayerScripts/PlayerCam.cs b/Assets/Scripts/PlayerScripts/PlayerCam.cs index 1196014..22d080d 100644 --- a/Assets/Scripts/PlayerScripts/PlayerCam.cs +++ b/Assets/Scripts/PlayerScripts/PlayerCam.cs @@ -1,8 +1,9 @@ using System.Collections; using System.Collections.Generic; +using MLAPI; using UnityEngine; -public class PlayerCam : MonoBehaviour +public class PlayerCam : NetworkBehaviour { public GameObject player; @@ -16,6 +17,8 @@ public class PlayerCam : MonoBehaviour void Update () { + if (!IsLocalPlayer) { return; } + offset = transform.parent.forward * rad.magnitude; transform.position = new Vector3((player.transform.position.x - offset.x),((player.transform.position.y - offset.y)+2),(player.transform.position.z - offset.z)); diff --git a/Assets/Scripts/PlayerScripts/PlayerMovement.cs b/Assets/Scripts/PlayerScripts/PlayerMovement.cs index 779ef58..5534237 100644 --- a/Assets/Scripts/PlayerScripts/PlayerMovement.cs +++ b/Assets/Scripts/PlayerScripts/PlayerMovement.cs @@ -165,11 +165,8 @@ public class PlayerMovement : NetworkBehaviour //Checks if player should respawn Respawn(); - } - - //Reads inputs and moves player private void InputController() { @@ -235,6 +232,8 @@ public class PlayerMovement : NetworkBehaviour //Applies impact in a direction with the given force public void AddImpact(Vector3 dir, float force) { + if (!IsLocalPlayer) { return; } + dir.Normalize(); if (dir.y < 0) dir.y = -dir.y; // reflect down force on the ground impact += dir.normalized * force / mass; diff --git a/Assets/Scripts/UI/Lobby/LobbyUI.cs b/Assets/Scripts/UI/Lobby/LobbyUI.cs index 4728afc..c516a42 100644 --- a/Assets/Scripts/UI/Lobby/LobbyUI.cs +++ b/Assets/Scripts/UI/Lobby/LobbyUI.cs @@ -1,10 +1,13 @@ using System; +using System.Collections; using MLAPI; using MLAPI.Connection; using MLAPI.Messaging; +using MLAPI.NetworkVariable; using MLAPI.NetworkVariable.Collections; using TMPro; using UnityEngine; +using UnityEngine.Networking; using UnityEngine.UI; public class LobbyUI : NetworkBehaviour { @@ -13,8 +16,10 @@ public class LobbyUI : NetworkBehaviour { [SerializeField] private LobbyPlayerCard[] lobbyPlayerCards; [SerializeField] private Button startGameButton; [SerializeField] private TMP_Text lobbyStateText; + [SerializeField] private TMP_Text hostIpAddressText; private NetworkList lobbyPlayers = new NetworkList(); + private NetworkVariable hostIpAddress = new NetworkVariable(); public override void NetworkStart() { @@ -34,6 +39,9 @@ public class LobbyUI : NetworkBehaviour { { HandleClientConnected(client.ClientId); } + + // Get/Set the ip of the host + StartCoroutine(GetIPAddress()); } } @@ -243,4 +251,32 @@ public class LobbyUI : NetworkBehaviour { lobbyStateText.text = "All Players Need to Ready Up!"; } } + + //Taken from Goodgulf + IEnumerator GetIPAddress() { + UnityWebRequest www = UnityWebRequest.Get("http://checkip.dyndns.org"); + yield return www.SendWebRequest(); + + if (www.result == UnityWebRequest.Result.ConnectionError || www.result == UnityWebRequest.Result.ProtocolError) { + hostIpAddress.Value = "Host IP: Network Error"; + } else { + string result = www.downloadHandler.text; + + // This results in a string similar to this: Current IP CheckCurrent IP Address: 123.123.123.123 + // where 123.123.123.123 is your external IP Address. + // Debug.Log("" + result); + + string[] a = result.Split(':'); // Split into two substrings -> one before : and one after. + string a2 = a[1].Substring(1); // Get the substring after the : + string[] a3 = a2.Split('<'); // Now split to the first HTML tag after the IP address. + string a4 = a3[0]; // Get the substring before the tag. + + Debug.Log("External IP Address = " + a4); + hostIpAddress.Value = "Host IP: " + a4; + } + } + + void Update() { + hostIpAddressText.text = hostIpAddress.Value; + } } diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 8a05253..d0da7fd 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -18,22 +18,22 @@ EditorUserSettings: value: 224247031146466f181a033019225303593b17282e3169032e2c1336f1af073be7e933d6ca3f31297717e1351027 flags: 0 RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb - flags: 0 - RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c731f1415016439262f2434 - flags: 0 - RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9 flags: 0 - RecentlyUsedScenePath-7: + RecentlyUsedScenePath-5: value: 22424703114646680e0b0227036c7b151b180b6505263035233d1221fbd33134e7e422e0e8347129370bfb25 flags: 0 + RecentlyUsedScenePath-6: + value: 224247031146467c0c03096f3d2c4a1e02161124623d28393930 + flags: 0 + RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036c731f1415016439262f2434 + flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c7b151b180b65093e273e12190f3cf6ef2021f2e225a7f234362820 + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c5802170e1a25346835332827187df7ee3d2cfb + value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb flags: 0 UnityRemoteCompression: value: 337f73