diff --git a/Assets/Prefabs/King/KingPrefab.prefab b/Assets/Prefabs/King/KingPrefab.prefab index 20eb0a5..0f8ec83 100644 --- a/Assets/Prefabs/King/KingPrefab.prefab +++ b/Assets/Prefabs/King/KingPrefab.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &7758200544476425999 +--- !u!1 &6649144231394212704 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,48 +8,45 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7758200544476426229} - - component: {fileID: 7758200544476426228} - - component: {fileID: 7758200544476425995} - - component: {fileID: 7758200544476425994} - - component: {fileID: 7758200544476425993} - - component: {fileID: 7758200544476425992} + - component: {fileID: 6649144231394212714} + - component: {fileID: 6649144231394212720} + - component: {fileID: 6649144231394212722} m_Layer: 0 - m_Name: KingPrefab + m_Name: PlayerModel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7758200544476426229 +--- !u!4 &6649144231394212714 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7758200544476425999} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -8.473417, y: 14.03985, z: -9.079439} + m_GameObject: {fileID: 6649144231394212704} + 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: 0} - m_RootOrder: 0 + m_Father: {fileID: 6649144231394212726} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &7758200544476426228 +--- !u!33 &6649144231394212720 MeshFilter: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7758200544476425999} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &7758200544476425995 + m_GameObject: {fileID: 6649144231394212704} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6649144231394212722 MeshRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7758200544476425999} + m_GameObject: {fileID: 6649144231394212704} m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 @@ -84,26 +81,98 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!65 &7758200544476425994 -BoxCollider: +--- !u!1 &6649144231394212716 +GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7758200544476425999} + serializedVersion: 6 + m_Component: + - component: {fileID: 6649144231394212726} + - component: {fileID: 6649144231394212729} + - component: {fileID: 6649144231394212730} + - component: {fileID: 6649144231394212734} + - component: {fileID: 6649144231394212676} + - component: {fileID: 6649144231394212673} + m_Layer: 3 + m_Name: KingPrefab + m_TagString: Player + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6649144231394212726 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6649144231394212716} + 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: 6649144231394212727} + - {fileID: 6649144231394212714} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!143 &6649144231394212729 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6649144231394212716} m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} + 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!114 &7758200544476425993 +--- !u!136 &6649144231394212730 +CapsuleCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6649144231394212716} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 0 + m_Radius: 0.5 + m_Height: 2 + m_Direction: 1 + m_Center: {x: 0, y: 0, z: 0} +--- !u!54 &6649144231394212734 +Rigidbody: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6649144231394212716} + 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!114 &6649144231394212676 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7758200544476425999} + m_GameObject: {fileID: 6649144231394212716} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} @@ -114,13 +183,13 @@ MonoBehaviour: PrefabHashGenerator: KingPrefab AlwaysReplicateAsRoot: 0 DontDestroyWithOwner: 0 ---- !u!114 &7758200544476425992 +--- !u!114 &6649144231394212673 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7758200544476425999} + m_GameObject: {fileID: 6649144231394212716} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3} @@ -162,3 +231,86 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!1 &6649144231394212717 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6649144231394212727} + - component: {fileID: 6649144231394212725} + - component: {fileID: 6649144231394212733} + m_Layer: 3 + m_Name: PlayerCam + m_TagString: PlayerCam + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6649144231394212727 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6649144231394212717} + 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: 6649144231394212726} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!20 &6649144231394212725 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6649144231394212717} + 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 &6649144231394212733 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6649144231394212717} + m_Enabled: 1 diff --git a/Assets/Scenes/Preloader.unity b/Assets/Scenes/Preloader.unity index 13a5429..cfe183a 100644 --- a/Assets/Scenes/Preloader.unity +++ b/Assets/Scenes/Preloader.unity @@ -212,7 +212,7 @@ MonoBehaviour: runnerSpawnPoints: - {x: 0, y: 2, z: 0} - {x: 2, y: 2, z: 2} - kingSpawnPoint: {x: 5, y: 7, z: 5} + kingSpawnPoint: {x: -2, y: 2, z: -2} --- !u!1 &1494071116 GameObject: m_ObjectHideFlags: 0 @@ -283,7 +283,7 @@ MonoBehaviour: NetworkPrefabs: - Prefab: {fileID: 7188906082087890184, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} PlayerPrefab: 0 - - Prefab: {fileID: 7758200544476425999, guid: 31aeb41a00441214ca42c9eb5647395e, type: 3} + - Prefab: {fileID: 6649144231394212716, guid: 31aeb41a00441214ca42c9eb5647395e, type: 3} PlayerPrefab: 0 PlayerPrefabHash: id: 0 @@ -361,7 +361,7 @@ MonoBehaviour: m_EditorClassIdentifier: maxPlayers: 3 runnerPrefab: {fileID: 1292213096936070766, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} - kingPrefab: {fileID: 7758200544476425993, guid: 31aeb41a00441214ca42c9eb5647395e, type: 3} + kingPrefab: {fileID: 6649144231394212676, guid: 31aeb41a00441214ca42c9eb5647395e, type: 3} --- !u!114 &1566574284 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Network/ServerGameNetPortal.cs b/Assets/Scripts/Network/ServerGameNetPortal.cs index 89a545a..5409f8c 100644 --- a/Assets/Scripts/Network/ServerGameNetPortal.cs +++ b/Assets/Scripts/Network/ServerGameNetPortal.cs @@ -121,14 +121,14 @@ public class ServerGameNetPortal : MonoBehaviour { // Spawn in the prefab for the player based on king or runner NetworkObject go = null; if (pData.IsKing) { - //go = Instantiate(kingPrefab, kingSpawnPoint, Quaternion.identity); - + go = Instantiate(kingPrefab, kingSpawnPoint, Quaternion.identity); + } else { go = Instantiate(runnerPrefab, runnersSpawnPoints[runnerSpawnIndex], Quaternion.identity); // Increment the runner spawn index runnerSpawnIndex++; - } + } // Disable the character controllers and camera //go.GetComponent().enabled = false;