From b2cba807cccb72a63ddd6fec38939e319d806a40 Mon Sep 17 00:00:00 2001 From: GraphicEdit Date: Sat, 30 Dec 2023 03:39:25 +0000 Subject: [PATCH 1/2] camera fix --- .../Assets/Characters/1_Mutant/Mutant.prefab | 5 +- .../2_Erika/Animator_Erika.controller | 57 +---- DarkFlow/Assets/Characters/3_Abe/Abe.prefab | 2 +- .../Characters/3_Abe/Animator_Abe.controller | 57 +---- .../4_Michelle/Animator_Michelle.controller | 57 +---- .../Characters/4_Michelle/Michelle.prefab | 2 +- DarkFlow/Assets/Scenes/Bootstrap.unity | 4 +- DarkFlow/Assets/Scenes/MainMenu.unity | 208 ++++++++++++------ .../Assets/Scripts/ClientPlayerSetings.cs | 19 +- .../ProjectSettings/ProjectSettings.asset | 6 +- 10 files changed, 154 insertions(+), 263 deletions(-) diff --git a/DarkFlow/Assets/Characters/1_Mutant/Mutant.prefab b/DarkFlow/Assets/Characters/1_Mutant/Mutant.prefab index 9ef2f82..66bd386 100644 --- a/DarkFlow/Assets/Characters/1_Mutant/Mutant.prefab +++ b/DarkFlow/Assets/Characters/1_Mutant/Mutant.prefab @@ -842,7 +842,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} m_Name: m_EditorClassIdentifier: - GlobalObjectIdHash: 2201899939 + GlobalObjectIdHash: 3596108808 AlwaysReplicateAsRoot: 0 SynchronizeTransform: 1 ActiveSceneSynchronization: 0 @@ -978,8 +978,7 @@ MonoBehaviour: BottomClamp: -30 CameraAngleOverride: 0 LockCameraPosition: 0 - _mainCamera: {fileID: 6818833442393802118, guid: 154519ab488f20d468de4e06396e2441, - type: 3} + _mainCamera: {fileID: 0} --- !u!114 &6233464797961255142 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/DarkFlow/Assets/Characters/2_Erika/Animator_Erika.controller b/DarkFlow/Assets/Characters/2_Erika/Animator_Erika.controller index c0d82e8..2c4ece6 100644 --- a/DarkFlow/Assets/Characters/2_Erika/Animator_Erika.controller +++ b/DarkFlow/Assets/Characters/2_Erika/Animator_Erika.controller @@ -9,12 +9,9 @@ AnimatorStateMachine: m_PrefabAsset: {fileID: 0} m_Name: Base Layer m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 1898023701926295212} - m_Position: {x: -70, y: 160, z: 0} - serializedVersion: 1 m_State: {fileID: -3398653591857322796} - m_Position: {x: 30, y: 290, z: 0} + m_Position: {x: 20, y: 200, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -24,7 +21,7 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 40, y: -70, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 1898023701926295212} + m_DefaultState: {fileID: -3398653591857322796} --- !u!1102 &-3398653591857322796 AnimatorState: serializedVersion: 6 @@ -73,53 +70,3 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1101 &1543293529280915144 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -3398653591857322796} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.8828125 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1102 &1898023701926295212 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: Falling To Roll - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 1543293529280915144} - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: -203655887218126122, guid: 4f52f003eca24b843924f016ea500470, - type: 3} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: diff --git a/DarkFlow/Assets/Characters/3_Abe/Abe.prefab b/DarkFlow/Assets/Characters/3_Abe/Abe.prefab index 001418d..9d9f5bf 100644 --- a/DarkFlow/Assets/Characters/3_Abe/Abe.prefab +++ b/DarkFlow/Assets/Characters/3_Abe/Abe.prefab @@ -152,7 +152,7 @@ Animator: m_GameObject: {fileID: 5840646621225449203} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 0801b5f58e558704c824e6e3653de5bc, type: 2} + m_Controller: {fileID: 9100000, guid: 469b0ff8216d21e44a84438fb82a155f, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 diff --git a/DarkFlow/Assets/Characters/3_Abe/Animator_Abe.controller b/DarkFlow/Assets/Characters/3_Abe/Animator_Abe.controller index 1f439b1..ff66fc2 100644 --- a/DarkFlow/Assets/Characters/3_Abe/Animator_Abe.controller +++ b/DarkFlow/Assets/Characters/3_Abe/Animator_Abe.controller @@ -1,33 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-3737686386148095878 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: mixamo_com - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: 5382852967497091833} - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: -203655887218126122, guid: 099d2c319885aab4289cb07ca04d3096, - type: 3} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1102 &-1535688060429802730 AnimatorState: serializedVersion: 6 @@ -85,12 +57,9 @@ AnimatorStateMachine: m_PrefabAsset: {fileID: 0} m_Name: Base Layer m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: -3737686386148095878} - m_Position: {x: 30, y: 200, z: 0} - serializedVersion: 1 m_State: {fileID: -1535688060429802730} - m_Position: {x: 190, y: 280, z: 0} + m_Position: {x: 40, y: 220, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -100,26 +69,4 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: 70, y: 350, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: -3737686386148095878} ---- !u!1101 &5382852967497091833 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -1535688060429802730} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.9264706 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 + m_DefaultState: {fileID: -1535688060429802730} diff --git a/DarkFlow/Assets/Characters/4_Michelle/Animator_Michelle.controller b/DarkFlow/Assets/Characters/4_Michelle/Animator_Michelle.controller index bdb8ebe..3a59365 100644 --- a/DarkFlow/Assets/Characters/4_Michelle/Animator_Michelle.controller +++ b/DarkFlow/Assets/Characters/4_Michelle/Animator_Michelle.controller @@ -9,12 +9,9 @@ AnimatorStateMachine: m_PrefabAsset: {fileID: 0} m_Name: Base Layer m_ChildStates: - - serializedVersion: 1 - m_State: {fileID: 441504851432735876} - m_Position: {x: 30, y: 200, z: 0} - serializedVersion: 1 m_State: {fileID: 9046759933113473744} - m_Position: {x: 170, y: 290, z: 0} + m_Position: {x: 40, y: 200, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -24,29 +21,7 @@ AnimatorStateMachine: m_EntryPosition: {x: 50, y: 120, z: 0} m_ExitPosition: {x: -10, y: 310, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 441504851432735876} ---- !u!1101 &-217593068308516005 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: [] - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 9046759933113473744} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.91847825 - m_HasExitTime: 1 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 + m_DefaultState: {fileID: 9046759933113473744} --- !u!91 &9100000 AnimatorController: m_ObjectHideFlags: 0 @@ -69,34 +44,6 @@ AnimatorController: m_IKPass: 0 m_SyncedLayerAffectsTiming: 0 m_Controller: {fileID: 9100000} ---- !u!1102 &441504851432735876 -AnimatorState: - serializedVersion: 6 - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: mixamo_com - m_Speed: 1 - m_CycleOffset: 0 - m_Transitions: - - {fileID: -217593068308516005} - m_StateMachineBehaviours: [] - m_Position: {x: 50, y: 50, z: 0} - m_IKOnFeet: 0 - m_WriteDefaultValues: 1 - m_Mirror: 0 - m_SpeedParameterActive: 0 - m_MirrorParameterActive: 0 - m_CycleOffsetParameterActive: 0 - m_TimeParameterActive: 0 - m_Motion: {fileID: -203655887218126122, guid: 5835956e5977e884b949ea01aba989d6, - type: 3} - m_Tag: - m_SpeedParameter: - m_MirrorParameter: - m_CycleOffsetParameter: - m_TimeParameter: --- !u!1102 &9046759933113473744 AnimatorState: serializedVersion: 6 diff --git a/DarkFlow/Assets/Characters/4_Michelle/Michelle.prefab b/DarkFlow/Assets/Characters/4_Michelle/Michelle.prefab index 3223f3f..9e69e2e 100644 --- a/DarkFlow/Assets/Characters/4_Michelle/Michelle.prefab +++ b/DarkFlow/Assets/Characters/4_Michelle/Michelle.prefab @@ -152,7 +152,7 @@ Animator: m_GameObject: {fileID: 2829942877377803283} m_Enabled: 1 m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: f9e34bb7d7613b94fbe5d76fd1083d75, type: 2} + m_Controller: {fileID: 9100000, guid: 469b0ff8216d21e44a84438fb82a155f, type: 2} m_CullingMode: 0 m_UpdateMode: 0 m_ApplyRootMotion: 0 diff --git a/DarkFlow/Assets/Scenes/Bootstrap.unity b/DarkFlow/Assets/Scenes/Bootstrap.unity index 3fbd6ab..c2a8b9b 100644 --- a/DarkFlow/Assets/Scenes/Bootstrap.unity +++ b/DarkFlow/Assets/Scenes/Bootstrap.unity @@ -537,12 +537,12 @@ PrefabInstance: - target: {fileID: 6485963998722371857, guid: d3062ecfb0bd4bf4da5e175e5a3e2e8f, type: 3} propertyPath: m_ProtocolType - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 6485963998722371857, guid: d3062ecfb0bd4bf4da5e175e5a3e2e8f, type: 3} propertyPath: ConnectionData.Port - value: 9998 + value: 7777 objectReference: {fileID: 0} - target: {fileID: 6485963998722371857, guid: d3062ecfb0bd4bf4da5e175e5a3e2e8f, type: 3} diff --git a/DarkFlow/Assets/Scenes/MainMenu.unity b/DarkFlow/Assets/Scenes/MainMenu.unity index 6c536d5..a9cb25b 100644 --- a/DarkFlow/Assets/Scenes/MainMenu.unity +++ b/DarkFlow/Assets/Scenes/MainMenu.unity @@ -123,79 +123,143 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &1455209554 -PrefabInstance: +--- !u!1 &1323246180 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1323246184} + - component: {fileID: 1323246183} + - component: {fileID: 1323246182} + - component: {fileID: 1323246181} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1323246181 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1323246180} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 + m_TaaSettings: + quality: 3 + frameInfluence: 0.1 + jitterScale: 1 + mipBias: 0 + varianceClampScale: 0.9 + contrastAdaptiveSharpening: 0 +--- !u!81 &1323246182 +AudioListener: m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1323246180} + m_Enabled: 1 +--- !u!20 &1323246183 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1323246180} + m_Enabled: 1 serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 6818833442393802118, guid: 154519ab488f20d468de4e06396e2441, - type: 3} - propertyPath: m_Name - value: MainCamera - objectReference: {fileID: 0} - - target: {fileID: 6818833442393802123, guid: 154519ab488f20d468de4e06396e2441, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 6818833442393802123, guid: 154519ab488f20d468de4e06396e2441, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6818833442393802123, guid: 154519ab488f20d468de4e06396e2441, - type: 3} - propertyPath: m_LocalPosition.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6818833442393802123, guid: 154519ab488f20d468de4e06396e2441, - type: 3} - propertyPath: m_LocalPosition.z - value: -10 - objectReference: {fileID: 0} - - target: {fileID: 6818833442393802123, guid: 154519ab488f20d468de4e06396e2441, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 6818833442393802123, guid: 154519ab488f20d468de4e06396e2441, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6818833442393802123, guid: 154519ab488f20d468de4e06396e2441, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6818833442393802123, guid: 154519ab488f20d468de4e06396e2441, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6818833442393802123, guid: 154519ab488f20d468de4e06396e2441, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6818833442393802123, guid: 154519ab488f20d468de4e06396e2441, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6818833442393802123, guid: 154519ab488f20d468de4e06396e2441, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 154519ab488f20d468de4e06396e2441, type: 3} + 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_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 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: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1323246184 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1323246180} + serializedVersion: 2 + 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_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2447298741252462749 PrefabInstance: m_ObjectHideFlags: 0 @@ -978,4 +1042,4 @@ SceneRoots: m_Roots: - {fileID: 2447298741252462749} - {fileID: 8485872566173289498} - - {fileID: 1455209554} + - {fileID: 1323246184} diff --git a/DarkFlow/Assets/Scripts/ClientPlayerSetings.cs b/DarkFlow/Assets/Scripts/ClientPlayerSetings.cs index c5f1434..1b2db4d 100644 --- a/DarkFlow/Assets/Scripts/ClientPlayerSetings.cs +++ b/DarkFlow/Assets/Scripts/ClientPlayerSetings.cs @@ -1,15 +1,10 @@ -using System; using Cinemachine; using StarterAssets; -using Unity.Jobs; using Unity.Netcode; using UnityEngine; using UnityEngine.InputSystem; -/// Assumes client authority -//[DefaultExecutionOrder(1)] // after server component public class ClientPlayerSetings : NetworkBehaviour -//public class ClientPlayerSetings : MonoBehaviour { [SerializeField] @@ -18,7 +13,6 @@ public class ClientPlayerSetings : NetworkBehaviour [SerializeField] ThirdPersonController m_ThirdPersonController; - [SerializeField] Transform m_CameraFollow; @@ -26,32 +20,25 @@ public class ClientPlayerSetings : NetworkBehaviour PlayerInput m_PlayerInput; - public override void OnNetworkSpawn() { - - m_ThirdPersonController.enabled = false; - Invoke("Initialize", .5f); - } void Initialize() + //void Update() { Debug.Log(".......... ClientPlayerSeting 1"); if (!IsOwner) { return; } - // player input is only enabled on owning players m_PlayerInput.enabled = true; m_ThirdPersonController.enabled = true; m_CharacterController.enabled = true; - GetComponent()._mainCamera = GameObject.FindGameObjectWithTag("MainCamera"); - - //var cinemachineVirtualCamera = FindObjectOfType(); - //cinemachineVirtualCamera.Follow = m_CameraFollow; FindObjectOfType().Follow = m_CameraFollow; + if (IsSpawned) { return; } Debug.Log(".......... ClientPlayerSeting 2"); + } diff --git a/DarkFlow/ProjectSettings/ProjectSettings.asset b/DarkFlow/ProjectSettings/ProjectSettings.asset index c5f4a13..8cc64d1 100644 --- a/DarkFlow/ProjectSettings/ProjectSettings.asset +++ b/DarkFlow/ProjectSettings/ProjectSettings.asset @@ -137,8 +137,7 @@ PlayerSettings: vulkanEnableCommandBufferRecycling: 1 loadStoreDebugModeEnabled: 0 bundleVersion: 0.1.0 - preloadedAssets: - - {fileID: 11400000, guid: 9e7be553448fa2546aea5752021cbcf7, type: 2} + preloadedAssets: [] metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1 @@ -815,7 +814,8 @@ PlayerSettings: XboxOne: UNITY_MP_TOOLS_NET_STATS_MONITOR_ENABLED_IN_RELEASE;UNITY_MP_TOOLS_NETSIM_ENABLED_IN_RELEASE iPhone: UNITY_MP_TOOLS_NET_STATS_MONITOR_ENABLED_IN_RELEASE;UNITY_MP_TOOLS_NETSIM_ENABLED_IN_RELEASE tvOS: UNITY_MP_TOOLS_NET_STATS_MONITOR_ENABLED_IN_RELEASE;UNITY_MP_TOOLS_NETSIM_ENABLED_IN_RELEASE - additionalCompilerArguments: {} + additionalCompilerArguments: + Standalone: [] platformArchitecture: {} scriptingBackend: {} il2cppCompilerConfiguration: {} From ca84421d17f528bd17d0efc97a6b706d05b1eb41 Mon Sep 17 00:00:00 2001 From: GraphicEdit Date: Sat, 30 Dec 2023 10:47:38 +0000 Subject: [PATCH 2/2] all Char Working --- .../Assets/Characters/2_Erika/Erika.prefab | 5 +- DarkFlow/Assets/Characters/3_Abe/Abe.prefab | 540 +++++++++++++++++- .../Characters/4_Michelle/Michelle.prefab | 540 +++++++++++++++++- .../UI/CharacterSelect/CharacterSelect.prefab | 2 +- DarkFlow/Assets/Scenes/MainMenu.unity | 2 +- DarkFlow/Assets/Scenes/Menu.unity | 4 +- .../Assets/Scripts/ClientPlayerSetings.cs | 9 +- 7 files changed, 1088 insertions(+), 14 deletions(-) diff --git a/DarkFlow/Assets/Characters/2_Erika/Erika.prefab b/DarkFlow/Assets/Characters/2_Erika/Erika.prefab index ba04ec2..ea1df86 100644 --- a/DarkFlow/Assets/Characters/2_Erika/Erika.prefab +++ b/DarkFlow/Assets/Characters/2_Erika/Erika.prefab @@ -24,7 +24,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2034699475712123807} serializedVersion: 2 - m_LocalRotation: {x: -0.088634305, y: 0.8976513, z: 0.21136884, w: 0.37641641} + m_LocalRotation: {x: -0.07656788, y: 0.91476274, z: 0.2069897, w: 0.3383813} m_LocalPosition: {x: 0, y: 1.44, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 1 @@ -1306,7 +1306,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} m_Name: m_EditorClassIdentifier: - GlobalObjectIdHash: 638232703 + GlobalObjectIdHash: 3916998080 AlwaysReplicateAsRoot: 0 SynchronizeTransform: 1 ActiveSceneSynchronization: 0 @@ -1426,6 +1426,7 @@ MonoBehaviour: BottomClamp: -30 CameraAngleOverride: 0 LockCameraPosition: 0 + _mainCamera: {fileID: 0} --- !u!114 &2021050794510230391 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/DarkFlow/Assets/Characters/3_Abe/Abe.prefab b/DarkFlow/Assets/Characters/3_Abe/Abe.prefab index 9d9f5bf..3af0718 100644 --- a/DarkFlow/Assets/Characters/3_Abe/Abe.prefab +++ b/DarkFlow/Assets/Characters/3_Abe/Abe.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 2737093771475482313} - m_Layer: 0 + m_Layer: 3 m_Name: PlayerCameraRoot m_TagString: Untagged m_Icon: {fileID: 0} @@ -39,6 +39,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -9070493210130169274, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 099d2c319885aab4289cb07ca04d3096, type: 3} propertyPath: m_RootOrder @@ -94,11 +99,345 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -8183481454299698827, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -8006009767450596044, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -7657966619581158213, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -7360747449169001873, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -7121769801107515815, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -6621945745981909287, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -6370085079684087283, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -6234591296559379751, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -6170625038081293824, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -6056541330796499132, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -5857696854640597626, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -5561550452697079657, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -5195048882033904264, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -4999088201633142198, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -4728426434207774260, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -4501530691011011137, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -4332706925441422008, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -4278032810995721380, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -3799395697873186154, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -3542885339558904099, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -3478013746326755454, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -3214267034143217929, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -3086436065929644917, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -2084811680363313996, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1781356600409242780, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1703473491307067327, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1425791611860619382, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1268151995469589007, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1200856079203341021, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -751476226918971245, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -552831747908440785, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -346142337343115430, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -290750445479886849, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -203856693384778745, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -76546954072915012, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 9171100556185337, guid: 099d2c319885aab4289cb07ca04d3096, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 414117464747255840, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 099d2c319885aab4289cb07ca04d3096, type: 3} propertyPath: m_Name value: Abe objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_TagString + value: Player + objectReference: {fileID: 0} + - target: {fileID: 1082271958561512970, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1339101018200438765, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1711505207429034123, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2158975759703390516, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2586065998465600510, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2715566404302941441, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2898355158428612036, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3047284246813455858, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3135921509060577837, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3588849560313704984, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3614653200513675785, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3882815353823017779, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3948933247560734027, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3974016661214395164, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4114030615378554161, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4237274458221626025, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4441848305933595309, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4549111882529890269, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5120724536234783804, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6240733294840144465, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6514210125699187276, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7363479242261063072, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7542137907003004905, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7732535366517880319, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7776229726456038893, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8817898888258712963, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8953972740105248388, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 9037727976738196030, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -115,6 +454,34 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 7198427504626268916} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8233975707920289379} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + insertIndex: -1 + addedObject: {fileID: -5631135255458382128} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + insertIndex: -1 + addedObject: {fileID: -654104070884300783} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + insertIndex: -1 + addedObject: {fileID: -4543274755017880572} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + insertIndex: -1 + addedObject: {fileID: 6941161486813739840} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + insertIndex: -1 + addedObject: {fileID: 8542987235555846249} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 099d2c319885aab4289cb07ca04d3096, + type: 3} + insertIndex: -1 + addedObject: {fileID: -2575381966240177009} m_SourcePrefab: {fileID: 100100000, guid: 099d2c319885aab4289cb07ca04d3096, type: 3} --- !u!1 &5840646621225449203 stripped GameObject: @@ -163,6 +530,177 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!143 &8233975707920289379 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5840646621225449203} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 0 + serializedVersion: 3 + m_Height: 1.47 + m_Radius: 0.35 + m_SlopeLimit: 45 + m_StepOffset: 0.25 + m_SkinWidth: 0.25 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: 0.9, z: 0} +--- !u!114 &-5631135255458382128 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5840646621225449203} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: 42bbd845906c9dd4fa77e979ee644342, + type: 3} + m_NotificationBehavior: 0 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: [] + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: Player + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} +--- !u!114 &-654104070884300783 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5840646621225449203} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 08144b7c84957034f941f3355775a20d, type: 3} + m_Name: + m_EditorClassIdentifier: + MoveSpeed: 2 + SprintSpeed: 5.335 + RotationSmoothTime: 0.12 + SpeedChangeRate: 10 + LandingAudioClip: {fileID: 0} + FootstepAudioClips: [] + FootstepAudioVolume: 0.5 + JumpHeight: 1.2 + Gravity: -15 + JumpTimeout: 0.5 + FallTimeout: 0.15 + Grounded: 1 + GroundedOffset: -0.14 + GroundedRadius: 0.28 + GroundLayers: + serializedVersion: 2 + m_Bits: 1 + CinemachineCameraTarget: {fileID: 1453911877039704325} + TopClamp: 70 + BottomClamp: -30 + CameraAngleOverride: 0 + LockCameraPosition: 0 + _mainCamera: {fileID: 0} +--- !u!114 &-4543274755017880572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5840646621225449203} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e087ecce43ebbff45a1b360637807d93, type: 3} + m_Name: + m_EditorClassIdentifier: + move: {x: 0, y: 0} + look: {x: 0, y: 0} + jump: 0 + sprint: 0 + analogMovement: 0 + cursorLocked: 1 + cursorInputForLook: 1 +--- !u!114 &6941161486813739840 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5840646621225449203} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dcbf6eee32d3ec54fa1b9fd9929b7bec, type: 3} + m_Name: + m_EditorClassIdentifier: + SyncPositionX: 1 + SyncPositionY: 1 + SyncPositionZ: 1 + SyncRotAngleX: 0 + SyncRotAngleY: 1 + SyncRotAngleZ: 0 + SyncScaleX: 0 + SyncScaleY: 0 + SyncScaleZ: 0 + PositionThreshold: 0.001 + RotAngleThreshold: 0.01 + ScaleThreshold: 0.01 + UseQuaternionSynchronization: 0 + UseQuaternionCompression: 0 + UseHalfFloatPrecision: 0 + InLocalSpace: 0 + Interpolate: 1 + SlerpPosition: 0 +--- !u!114 &8542987235555846249 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5840646621225449203} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b02d2af4a8667b7439dfdd74d286fa7c, type: 3} + m_Name: + m_EditorClassIdentifier: + TransitionStateInfoList: [] + m_Animator: {fileID: 7198427504626268916} +--- !u!114 &-2575381966240177009 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5840646621225449203} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 854c882e4139d184fbbe7fef3fa272e2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_CharacterController: {fileID: 8233975707920289379} + m_ThirdPersonController: {fileID: -654104070884300783} + m_CameraFollow: {fileID: 2737093771475482313} + m_PlayerInput: {fileID: -5631135255458382128} --- !u!4 &6504875187145157705 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 099d2c319885aab4289cb07ca04d3096, diff --git a/DarkFlow/Assets/Characters/4_Michelle/Michelle.prefab b/DarkFlow/Assets/Characters/4_Michelle/Michelle.prefab index 9e69e2e..74fbfbd 100644 --- a/DarkFlow/Assets/Characters/4_Michelle/Michelle.prefab +++ b/DarkFlow/Assets/Characters/4_Michelle/Michelle.prefab @@ -9,7 +9,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8514511327028145236} - m_Layer: 0 + m_Layer: 3 m_Name: PlayerCameraRoot m_TagString: Untagged m_Icon: {fileID: 0} @@ -39,6 +39,11 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: -9070493210130169274, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 5835956e5977e884b949ea01aba989d6, type: 3} propertyPath: m_RootOrder @@ -94,11 +99,345 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -8183481454299698827, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -8006009767450596044, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -7657966619581158213, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -7360747449169001873, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -7121769801107515815, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -6621945745981909287, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -6370085079684087283, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -6234591296559379751, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -6170625038081293824, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -6056541330796499132, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -5857696854640597626, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -5561550452697079657, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -5195048882033904264, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -4999088201633142198, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -4728426434207774260, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -4501530691011011137, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -4332706925441422008, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -4278032810995721380, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -3799395697873186154, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -3542885339558904099, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -3478013746326755454, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -3214267034143217929, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -3086436065929644917, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -2084811680363313996, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1781356600409242780, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1703473491307067327, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1425791611860619382, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1268151995469589007, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -1200856079203341021, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -751476226918971245, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -552831747908440785, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -398367143235661068, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -290750445479886849, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -203856693384778745, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: -76546954072915012, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 9171100556185337, guid: 5835956e5977e884b949ea01aba989d6, type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 414117464747255840, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 5835956e5977e884b949ea01aba989d6, type: 3} propertyPath: m_Name value: Michelle objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_TagString + value: Player + objectReference: {fileID: 0} + - target: {fileID: 1082271958561512970, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1339101018200438765, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 1711505207429034123, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2158975759703390516, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2586065998465600510, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2715566404302941441, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 2898355158428612036, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3047284246813455858, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3135921509060577837, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3588849560313704984, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3614653200513675785, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3882815353823017779, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3948933247560734027, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 3974016661214395164, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4114030615378554161, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4237274458221626025, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4441848305933595309, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 4549111882529890269, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5120724536234783804, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6240733294840144465, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6514210125699187276, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7363479242261063072, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7542137907003004905, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7732535366517880319, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 7776229726456038893, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8817898888258712963, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 8953972740105248388, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 9037727976738196030, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + propertyPath: m_Layer + value: 3 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: @@ -115,6 +454,34 @@ PrefabInstance: type: 3} insertIndex: -1 addedObject: {fileID: 4854052400576405664} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + insertIndex: -1 + addedObject: {fileID: -938282308307960600} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + insertIndex: -1 + addedObject: {fileID: -1551711338477591970} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + insertIndex: -1 + addedObject: {fileID: 2391770118937145383} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + insertIndex: -1 + addedObject: {fileID: -6536939744767882745} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + insertIndex: -1 + addedObject: {fileID: 3391256892142023987} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + insertIndex: -1 + addedObject: {fileID: -5380458303530302668} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 5835956e5977e884b949ea01aba989d6, + type: 3} + insertIndex: -1 + addedObject: {fileID: 7538726871190720740} m_SourcePrefab: {fileID: 100100000, guid: 5835956e5977e884b949ea01aba989d6, type: 3} --- !u!1 &2829942877377803283 stripped GameObject: @@ -163,6 +530,177 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!143 &-938282308307960600 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2829942877377803283} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 0 + serializedVersion: 3 + m_Height: 1.47 + m_Radius: 0.35 + m_SlopeLimit: 45 + m_StepOffset: 0.25 + m_SkinWidth: 0.25 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: 0.9, z: 0} +--- !u!114 &-1551711338477591970 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2829942877377803283} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 62899f850307741f2a39c98a8b639597, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Actions: {fileID: -944628639613478452, guid: 42bbd845906c9dd4fa77e979ee644342, + type: 3} + m_NotificationBehavior: 0 + m_UIInputModule: {fileID: 0} + m_DeviceLostEvent: + m_PersistentCalls: + m_Calls: [] + m_DeviceRegainedEvent: + m_PersistentCalls: + m_Calls: [] + m_ControlsChangedEvent: + m_PersistentCalls: + m_Calls: [] + m_ActionEvents: [] + m_NeverAutoSwitchControlSchemes: 0 + m_DefaultControlScheme: + m_DefaultActionMap: Player + m_SplitScreenIndex: -1 + m_Camera: {fileID: 0} +--- !u!114 &2391770118937145383 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2829942877377803283} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 08144b7c84957034f941f3355775a20d, type: 3} + m_Name: + m_EditorClassIdentifier: + MoveSpeed: 2 + SprintSpeed: 5.335 + RotationSmoothTime: 0.12 + SpeedChangeRate: 10 + LandingAudioClip: {fileID: 0} + FootstepAudioClips: [] + FootstepAudioVolume: 0.5 + JumpHeight: 1.2 + Gravity: -15 + JumpTimeout: 0.5 + FallTimeout: 0.15 + Grounded: 1 + GroundedOffset: -0.14 + GroundedRadius: 0.28 + GroundLayers: + serializedVersion: 2 + m_Bits: 1 + CinemachineCameraTarget: {fileID: 2577633691729716698} + TopClamp: 70 + BottomClamp: -30 + CameraAngleOverride: 0 + LockCameraPosition: 0 + _mainCamera: {fileID: 0} +--- !u!114 &-6536939744767882745 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2829942877377803283} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e087ecce43ebbff45a1b360637807d93, type: 3} + m_Name: + m_EditorClassIdentifier: + move: {x: 0, y: 0} + look: {x: 0, y: 0} + jump: 0 + sprint: 0 + analogMovement: 0 + cursorLocked: 1 + cursorInputForLook: 1 +--- !u!114 &3391256892142023987 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2829942877377803283} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dcbf6eee32d3ec54fa1b9fd9929b7bec, type: 3} + m_Name: + m_EditorClassIdentifier: + SyncPositionX: 1 + SyncPositionY: 1 + SyncPositionZ: 1 + SyncRotAngleX: 0 + SyncRotAngleY: 1 + SyncRotAngleZ: 0 + SyncScaleX: 0 + SyncScaleY: 0 + SyncScaleZ: 0 + PositionThreshold: 0.001 + RotAngleThreshold: 0.01 + ScaleThreshold: 0.01 + UseQuaternionSynchronization: 0 + UseQuaternionCompression: 0 + UseHalfFloatPrecision: 0 + InLocalSpace: 0 + Interpolate: 1 + SlerpPosition: 0 +--- !u!114 &-5380458303530302668 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2829942877377803283} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: b02d2af4a8667b7439dfdd74d286fa7c, type: 3} + m_Name: + m_EditorClassIdentifier: + TransitionStateInfoList: [] + m_Animator: {fileID: 4854052400576405664} +--- !u!114 &7538726871190720740 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2829942877377803283} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 854c882e4139d184fbbe7fef3fa272e2, type: 3} + m_Name: + m_EditorClassIdentifier: + m_CharacterController: {fileID: -938282308307960600} + m_ThirdPersonController: {fileID: 2391770118937145383} + m_CameraFollow: {fileID: 8514511327028145236} + m_PlayerInput: {fileID: -1551711338477591970} --- !u!4 &3174521659368435369 stripped Transform: m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 5835956e5977e884b949ea01aba989d6, diff --git a/DarkFlow/Assets/Prefabs/UI/CharacterSelect/CharacterSelect.prefab b/DarkFlow/Assets/Prefabs/UI/CharacterSelect/CharacterSelect.prefab index 8220a7f..9e7cecb 100644 --- a/DarkFlow/Assets/Prefabs/UI/CharacterSelect/CharacterSelect.prefab +++ b/DarkFlow/Assets/Prefabs/UI/CharacterSelect/CharacterSelect.prefab @@ -184,7 +184,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3} m_Name: m_EditorClassIdentifier: - GlobalObjectIdHash: 3279208134 + GlobalObjectIdHash: 2731206212 AlwaysReplicateAsRoot: 0 SynchronizeTransform: 1 ActiveSceneSynchronization: 0 diff --git a/DarkFlow/Assets/Scenes/MainMenu.unity b/DarkFlow/Assets/Scenes/MainMenu.unity index a9cb25b..a161ff9 100644 --- a/DarkFlow/Assets/Scenes/MainMenu.unity +++ b/DarkFlow/Assets/Scenes/MainMenu.unity @@ -959,7 +959,7 @@ PrefabInstance: - target: {fileID: 8485872567407563619, guid: eb5b6c3dd18201c49b8253253b2733fe, type: 3} propertyPath: m_text - value: ' Character Select' + value: DarkFlow objectReference: {fileID: 0} - target: {fileID: 8485872567407563629, guid: eb5b6c3dd18201c49b8253253b2733fe, type: 3} diff --git a/DarkFlow/Assets/Scenes/Menu.unity b/DarkFlow/Assets/Scenes/Menu.unity index 4a5def1..2ceca12 100644 --- a/DarkFlow/Assets/Scenes/Menu.unity +++ b/DarkFlow/Assets/Scenes/Menu.unity @@ -419,7 +419,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: Just Stop + m_text: End m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -453,7 +453,7 @@ MonoBehaviour: m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 - m_HorizontalAlignment: 1 + m_HorizontalAlignment: 2 m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 diff --git a/DarkFlow/Assets/Scripts/ClientPlayerSetings.cs b/DarkFlow/Assets/Scripts/ClientPlayerSetings.cs index 1b2db4d..9c1066d 100644 --- a/DarkFlow/Assets/Scripts/ClientPlayerSetings.cs +++ b/DarkFlow/Assets/Scripts/ClientPlayerSetings.cs @@ -28,7 +28,7 @@ public override void OnNetworkSpawn() void Initialize() //void Update() { - Debug.Log(".......... ClientPlayerSeting 1"); + //Debug.Log(".......... ClientPlayerSeting 1"); if (!IsOwner) { return; } // player input is only enabled on owning players m_PlayerInput.enabled = true; @@ -36,12 +36,9 @@ void Initialize() m_CharacterController.enabled = true; GetComponent()._mainCamera = GameObject.FindGameObjectWithTag("MainCamera"); FindObjectOfType().Follow = m_CameraFollow; - if (IsSpawned) { return; } - Debug.Log(".......... ClientPlayerSeting 2"); + //if (IsSpawned) { return; } + //Debug.Log(".......... ClientPlayerSeting 2"); } - - - }