diff --git a/client/Assets/Prefebs/DummyPlayer.prefab b/client/Assets/Prefebs/DummyPlayer.prefab index f9b4a80..cdca9d8 100644 --- a/client/Assets/Prefebs/DummyPlayer.prefab +++ b/client/Assets/Prefebs/DummyPlayer.prefab @@ -2437,6 +2437,7 @@ MonoBehaviour: m_GameObject: {fileID: 6511677816748885591} m_Enabled: 0 m_EditorHideFlags: 0 + m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: 6ad3c3ef0935a4e4ea8031ac86b69e05, type: 3} m_Name: m_EditorClassIdentifier: diff --git a/client/Assets/Prefebs/PlayerDetails.prefab b/client/Assets/Prefebs/PlayerDetails.prefab new file mode 100644 index 0000000..3bf921a --- /dev/null +++ b/client/Assets/Prefebs/PlayerDetails.prefab @@ -0,0 +1,322 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2068279824740471015 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6346169891839382890} + - component: {fileID: 1383748798549774427} + - component: {fileID: 3145332868835098574} + - component: {fileID: 6930460883286058915} + m_Layer: 5 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6346169891839382890 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2068279824740471015} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_Children: + - {fileID: 297754571123289069} + m_Father: {fileID: 821436885121556862} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &1383748798549774427 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2068279824740471015} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &3145332868835098574 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2068279824740471015} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_GeneratorAsset: {fileID: 0} + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 +--- !u!114 &6930460883286058915 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2068279824740471015} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_GeneratorAsset: {fileID: 0} + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &2891580957106614680 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 821436885121556862} + - component: {fileID: 484019012611297926} + m_Layer: 0 + m_Name: PlayerDetails + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &821436885121556862 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2891580957106614680} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1.7, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 6346169891839382890} + - {fileID: 4609384591168037481} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &484019012611297926 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2891580957106614680} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_GeneratorAsset: {fileID: 0} + m_Script: {fileID: 11500000, guid: ae5fec6d4acd64822b01525f7340327d, type: 3} + m_Name: + m_EditorClassIdentifier: + nameLabel: {fileID: 5355489152282665767} + placeholder: {fileID: 8765769489255248958} +--- !u!1 &6264184138843379988 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 297754571123289069} + - component: {fileID: 6556312100185379373} + - component: {fileID: 5355489152282665767} + m_Layer: 5 + m_Name: NameLabel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &297754571123289069 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6264184138843379988} + 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: 6346169891839382890} + m_RootOrder: 0 + 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: 0, y: 0} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6556312100185379373 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6264184138843379988} + m_CullTransparentMesh: 0 +--- !u!114 &5355489152282665767 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6264184138843379988} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_GeneratorAsset: {fileID: 0} + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 1 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Ruven#1 +--- !u!1 &8765769489255248958 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4609384591168037481} + - component: {fileID: 8547015547022903539} + - component: {fileID: 3100639542614509342} + - component: {fileID: 7220861950460368971} + m_Layer: 0 + m_Name: DetailsPlaceholder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &4609384591168037481 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8765769489255248958} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} + m_Children: [] + m_Father: {fileID: 821436885121556862} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &8547015547022903539 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8765769489255248958} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &3100639542614509342 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8765769489255248958} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + 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_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!135 &7220861950460368971 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8765769489255248958} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + serializedVersion: 2 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} diff --git a/client/Assets/Prefebs/PlayerDetails.prefab.meta b/client/Assets/Prefebs/PlayerDetails.prefab.meta new file mode 100644 index 0000000..97f8a47 --- /dev/null +++ b/client/Assets/Prefebs/PlayerDetails.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 96469d0340f384a5dbb868d923a310cb +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/Assets/Prefebs/ZombieRig Variant.prefab b/client/Assets/Prefebs/ZombieRig Variant.prefab index 45bbed5..7d57a7d 100644 --- a/client/Assets/Prefebs/ZombieRig Variant.prefab +++ b/client/Assets/Prefebs/ZombieRig Variant.prefab @@ -133,6 +133,7 @@ MonoBehaviour: m_GameObject: {fileID: 7812552267367925331} m_Enabled: 0 m_EditorHideFlags: 0 + m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: 6ad3c3ef0935a4e4ea8031ac86b69e05, type: 3} m_Name: m_EditorClassIdentifier: @@ -146,6 +147,7 @@ MonoBehaviour: m_GameObject: {fileID: 7812552267367925331} m_Enabled: 0 m_EditorHideFlags: 0 + m_GeneratorAsset: {fileID: 0} m_Script: {fileID: 11500000, guid: e15e66f175258064d944ae13e92576b6, type: 3} m_Name: m_EditorClassIdentifier: @@ -153,6 +155,90 @@ MonoBehaviour: childCamera: {fileID: 534669904} LookSensitivity: 3 LookSmooth: 2 +--- !u!1001 &3197307871112342975 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 7812552267368028723} + m_Modifications: + - target: {fileID: 821436885121556862, guid: 96469d0340f384a5dbb868d923a310cb, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 821436885121556862, guid: 96469d0340f384a5dbb868d923a310cb, + type: 3} + propertyPath: m_LocalPosition.y + value: 1.7 + objectReference: {fileID: 0} + - target: {fileID: 821436885121556862, guid: 96469d0340f384a5dbb868d923a310cb, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 821436885121556862, guid: 96469d0340f384a5dbb868d923a310cb, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 821436885121556862, guid: 96469d0340f384a5dbb868d923a310cb, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 821436885121556862, guid: 96469d0340f384a5dbb868d923a310cb, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 821436885121556862, guid: 96469d0340f384a5dbb868d923a310cb, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 821436885121556862, guid: 96469d0340f384a5dbb868d923a310cb, + type: 3} + propertyPath: m_RootOrder + value: 8 + objectReference: {fileID: 0} + - target: {fileID: 821436885121556862, guid: 96469d0340f384a5dbb868d923a310cb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 821436885121556862, guid: 96469d0340f384a5dbb868d923a310cb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 821436885121556862, guid: 96469d0340f384a5dbb868d923a310cb, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2891580957106614680, guid: 96469d0340f384a5dbb868d923a310cb, + type: 3} + propertyPath: m_Name + value: PlayerDetails + objectReference: {fileID: 0} + - target: {fileID: 6346169891839382890, guid: 96469d0340f384a5dbb868d923a310cb, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4609384591168037481, guid: 96469d0340f384a5dbb868d923a310cb, + type: 3} + propertyPath: m_LocalPosition.y + value: 3.97 + objectReference: {fileID: 0} + - target: {fileID: 3100639542614509342, guid: 96469d0340f384a5dbb868d923a310cb, + type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 96469d0340f384a5dbb868d923a310cb, type: 3} --- !u!1001 &7812552267367891225 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/client/Assets/Scripts/Game/ColyseusGame.cs b/client/Assets/Scripts/Game/ColyseusGame.cs index c21f408..4ee2232 100644 --- a/client/Assets/Scripts/Game/ColyseusGame.cs +++ b/client/Assets/Scripts/Game/ColyseusGame.cs @@ -24,32 +24,32 @@ IEnumerator Start() ColyseusRoom.Instance.Room.Listen("players/:id/rotation", Room_OnPlayerMove); } - void Unsubscribe() - { - ColyseusRoom.Instance.OnJoin -= Room_OnJoin; - ColyseusRoom.Instance.OnError -= Room_OnError; - ColyseusRoom.Instance.OnLeave -= Room_OnLeave; - ColyseusRoom.Instance.OnMessage -= Room_OnMessage; - ColyseusRoom.Instance.OnStateChange -= Room_OnStateChange; - } - - public void OnPlayerMove(Transform player) - { - ColyseusRoom.Instance?.Room?.Send(CreateMoveAction(player)); - } - - static object CreateMoveAction(Transform player) - { - return new IndexedDictionary - { - {"action", "move"}, - {"position", new IndexedDictionary { - {"x", player.position.x}, - {"y", player.position.y}, - {"z", player.position.z}, - }}, - {"rotation", player.rotation.eulerAngles.y}, - }; + void Unsubscribe() + { + ColyseusRoom.Instance.OnJoin -= Room_OnJoin; + ColyseusRoom.Instance.OnError -= Room_OnError; + ColyseusRoom.Instance.OnLeave -= Room_OnLeave; + ColyseusRoom.Instance.OnMessage -= Room_OnMessage; + ColyseusRoom.Instance.OnStateChange -= Room_OnStateChange; + } + + public void OnPlayerMove(Transform player) + { + ColyseusRoom.Instance?.Room?.Send(CreateMoveAction(player)); + } + + static object CreateMoveAction(Transform player) + { + return new IndexedDictionary + { + {"action", "move"}, + {"position", new IndexedDictionary { + {"x", player.position.x}, + {"y", player.position.y}, + {"z", player.position.z}, + }}, + {"rotation", player.rotation.eulerAngles.y}, + }; } readonly Dictionary players = new Dictionary(); @@ -116,17 +116,18 @@ static void UpdatePlayer(DataChange change, GameObject cube) var eular = cube.transform.rotation.eulerAngles; eular.y = update.Rotation; cube.transform.SetPositionAndRotation(update.Position, Quaternion.Euler(eular)); + cube.transform.Find("PlayerDetails").transform.GetComponent().UpdatePlayer(update); } - void Room_OnLeave(object sender, EventArgs e) - { - Unsubscribe(); - } - - void Room_OnError(object sender, ErrorEventArgs e) - { - Unsubscribe(); - } + void Room_OnLeave(object sender, EventArgs e) + { + Unsubscribe(); + } + + void Room_OnError(object sender, ErrorEventArgs e) + { + Unsubscribe(); + } void Room_OnStateChange(object sender, RoomUpdateEventArgs e) { @@ -136,7 +137,7 @@ void Room_OnMessage(object sender, MessageEventArgs e) { } - void Room_OnJoin(object sender, EventArgs e) - { + void Room_OnJoin(object sender, EventArgs e) + { } } diff --git a/client/Assets/Scripts/Game/PlayerDetails.cs b/client/Assets/Scripts/Game/PlayerDetails.cs new file mode 100644 index 0000000..d56691b --- /dev/null +++ b/client/Assets/Scripts/Game/PlayerDetails.cs @@ -0,0 +1,22 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; + +public class PlayerDetails : MonoBehaviour +{ + public Text nameLabel; + public GameObject placeholder; + + void Update() + { + Vector3 namePos = Camera.main.WorldToScreenPoint(placeholder.transform.position); + nameLabel.transform.position = namePos; + } + + public void UpdatePlayer(PlayerUpdate player) + { + nameLabel.text = player.Name; + } + +} diff --git a/client/Assets/Scripts/Game/PlayerDetails.cs.meta b/client/Assets/Scripts/Game/PlayerDetails.cs.meta new file mode 100644 index 0000000..7c6510b --- /dev/null +++ b/client/Assets/Scripts/Game/PlayerDetails.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ae5fec6d4acd64822b01525f7340327d +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/client/Assets/Scripts/Game/PlayerUpdate.cs b/client/Assets/Scripts/Game/PlayerUpdate.cs index 6b0f13a..56c3ee5 100644 --- a/client/Assets/Scripts/Game/PlayerUpdate.cs +++ b/client/Assets/Scripts/Game/PlayerUpdate.cs @@ -8,10 +8,12 @@ public class PlayerUpdate public Vector3 Position { get; private set; } public float Rotation { get; private set; } + public string Name {get; private set;} public static PlayerUpdate FromColyseus(object update) { var updateObj = ReadObject(update); + var playerName = updateObj["name"].ToString(); var positionObj = ReadObject(updateObj["position"]); var position = new Vector3( Convert.ToSingle(positionObj["x"]), @@ -23,6 +25,7 @@ public static PlayerUpdate FromColyseus(object update) { Rotation = rotation, Position = position, + Name = playerName, }; } } diff --git a/client/ProjectSettings/ProjectVersion.txt b/client/ProjectSettings/ProjectVersion.txt index d645691..18931e3 100644 --- a/client/ProjectSettings/ProjectVersion.txt +++ b/client/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2019.1.0a7 +m_EditorVersion: 2019.1.0a8 diff --git a/server/.vscode/launch.json b/server/.vscode/launch.json new file mode 100644 index 0000000..e4fe492 --- /dev/null +++ b/server/.vscode/launch.json @@ -0,0 +1,23 @@ +{ + // Use IntelliSense to learn about possible attributes. + // Hover to view descriptions of existing attributes. + // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 + "version": "0.2.0", + "configurations": [ + { + "type": "node", + "request": "attach", + "name": "Attach by Process ID", + "processId": "${command:PickProcess}" + }, + { + "type": "node", + "request": "launch", + "name": "Launch Program", + "program": "${workspaceFolder}/index.js", + "outFiles": [ + "${workspaceFolder}/**/*.js" + ] + } + ] +} \ No newline at end of file diff --git a/server/src/Rooms/GameRoom/Player.ts b/server/src/Rooms/GameRoom/Player.ts index 135c9ff..fab6f42 100644 --- a/server/src/Rooms/GameRoom/Player.ts +++ b/server/src/Rooms/GameRoom/Player.ts @@ -1,7 +1,7 @@ import { Position } from './Position'; export class Player { - private static playerCounter: number; + private static playerCounter: number = 0; public name: string; @@ -9,7 +9,7 @@ export class Player { public position: Position = new Position(), public rotation = 0, ) { - this.name = `player${Player.playerCounter}`; + this.name = `ruven#${Player.playerCounter}`; Player.playerCounter += 1; } }