diff --git a/Assets/Character/Controller/Alive.prefab b/Assets/Character/Controller/Alive.prefab index 177f00c..870b0e0 100644 --- a/Assets/Character/Controller/Alive.prefab +++ b/Assets/Character/Controller/Alive.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &4543879589545926057 +--- !u!1 &629738007313910614 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,31 +8,36 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4543879589545926062} - m_Layer: 3 - m_Name: Colliders + - component: {fileID: 629738007313910615} + m_Layer: 5 + m_Name: Fill Area m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4543879589545926062 -Transform: +--- !u!224 &629738007313910615 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4543879589545926057} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 629738007313910614} + 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: 0 m_Children: - - {fileID: 4543879590078346522} - m_Father: {fileID: 4543879589747665830} + - {fileID: 629738008946854243} + m_Father: {fileID: 629738008022663166} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4543879589747665825 + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &629738007374924540 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -40,78 +45,75 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4543879589747665830} - m_Layer: 3 - m_Name: PCPlayerBody + - component: {fileID: 629738007374924541} + - component: {fileID: 629738007374924543} + - component: {fileID: 629738007374924542} + m_Layer: 5 + m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4543879589747665830 -Transform: +--- !u!224 &629738007374924541 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4543879589747665825} + m_GameObject: {fileID: 629738007374924540} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.5, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 4543879590191569906} - - {fileID: 4543879589545926062} - m_Father: {fileID: 4543879591548074798} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4543879590078346597 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4543879590078346522} - - component: {fileID: 4543879590078346523} - m_Layer: 3 - m_Name: EnviormentCollider - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4543879590078346522 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4543879590078346597} - 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: 0 m_Children: [] - m_Father: {fileID: 4543879589545926062} + m_Father: {fileID: 629738007606502688} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!136 &4543879590078346523 -CapsuleCollider: + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &629738007374924543 +CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4543879590078346597} - m_Material: {fileID: 13400000, guid: c67f223e1c1ff6d44956ef766851951c, type: 2} - m_IsTrigger: 0 + m_GameObject: {fileID: 629738007374924540} + m_CullTransparentMesh: 1 +--- !u!114 &629738007374924542 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629738007374924540} m_Enabled: 1 - m_Radius: 0.4 - m_Height: 1.6 - m_Direction: 1 - m_Center: {x: 0, y: 0.2, z: 0} ---- !u!1 &4543879590191569917 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.20784315, g: 0.20784315, b: 0.20784315, 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_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &629738007566526440 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -119,62 +121,36 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4543879590191569906} - m_Layer: 3 - m_Name: PlayerModel + - component: {fileID: 629738007566526441} + m_Layer: 5 + m_Name: Fill Area m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4543879590191569906 -Transform: +--- !u!224 &629738007566526441 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4543879590191569917} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 629738007566526440} + 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: 0 m_Children: - - {fileID: 4543879590948140777} - m_Father: {fileID: 4543879589747665830} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4543879590884227133 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4543879590884227122} - m_Layer: 3 - m_Name: GroundCheck - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4543879590884227122 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4543879590884227133} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.47099996, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4543879591548074798} + - {fileID: 629738008825320772} + m_Father: {fileID: 629738007606502688} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &4543879590948140776 + m_AnchorMin: {x: 0, y: 0.25} + m_AnchorMax: {x: 1, y: 0.75} + m_AnchoredPosition: {x: -5, y: 0} + m_SizeDelta: {x: -20, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &629738007606502695 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -182,288 +158,90 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 4543879590948140777} - - component: {fileID: 4543879590948140780} - - component: {fileID: 4543879590948140783} - m_Layer: 3 - m_Name: Capsule + - component: {fileID: 629738007606502688} + - component: {fileID: 629738007606502689} + m_Layer: 5 + m_Name: HealthBar m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &4543879590948140777 -Transform: +--- !u!224 &629738007606502688 +RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4543879590948140776} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.8, y: 1, z: 0.8} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 4543879590191569906} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &4543879590948140780 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4543879590948140776} - m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &4543879590948140783 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4543879590948140776} - m_Enabled: 1 - m_CastShadows: 1 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 1 - m_ReflectionProbeUsage: 1 - m_RayTracingMode: 2 - m_RayTraceProcedural: 0 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} - 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 &4543879591548074793 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4543879591548074798} - - component: {fileID: 171762596665493912} - - component: {fileID: 4543879591548074799} - - component: {fileID: 4543879591548074786} - - component: {fileID: 4543879591548074796} - - component: {fileID: 4543879591548074785} - - component: {fileID: 171762596665493911} - - component: {fileID: 4543879591548074784} - - component: {fileID: 8622019229504054619} - m_Layer: 3 - m_Name: Alive - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4543879591548074798 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4543879591548074793} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_GameObject: {fileID: 629738007606502695} + 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: 0 m_Children: - - {fileID: 4543879589747665830} - - {fileID: 4543879590884227122} - - {fileID: 7071905972904880797} - m_Father: {fileID: 0} + - {fileID: 629738007374924541} + - {fileID: 629738007566526441} + - {fileID: 629738008916260624} + m_Father: {fileID: 629738008411625369} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &171762596665493912 + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -0.9837036, y: -1.1799774} + m_SizeDelta: {x: 160, y: 43.0909} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &629738007606502689 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4543879591548074793} + m_GameObject: {fileID: 629738007606502695} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4a3c4a8867cd2f64e9f17bd9abc1f72a, type: 3} + m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} m_Name: m_EditorClassIdentifier: - characterMovementConfig: {fileID: 4543879591548074786} - characterStateMachine: {fileID: 4543879591548074799} - characterHover: {fileID: 171762596665493911} - characterStateChanger: {fileID: 8622019229504054619} ---- !u!114 &4543879591548074799 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4543879591548074793} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 11afecc1cbbd8e8449477483a5577cb0, type: 3} - m_Name: - m_EditorClassIdentifier: - characterState: 1 - movementStates: 0 - ceilingDetected: 0 - eligibleForStep: 0 - onLadder: 0 - topOnLadder: 0 - bottomOnLadder: 0 - enteredLadderFromBottom: 0 - enteredLadderFromTop: 0 - topLadder: {fileID: 0} - bottomLadder: {fileID: 0} ---- !u!114 &4543879591548074786 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4543879591548074793} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: e45920ac9f4c62c4da00d5c902c10bd2, type: 3} - m_Name: - m_EditorClassIdentifier: - moveForce: 0.5 - crouchMoveForce: 0.2 - sprintMoveForce: 0.7 - ladderClimbingForce: 0 - desieredHoverHight: 1.2 - crouchHeight: 0.7 - allowSprint: 0 - jumpForce: 3 - standingColliderPosition: 0.2 - standingColliderHight: 1.6 - crouchedColliderPosition: 0.3 - crouchedColliderHight: 1.4 - idleDrag: 10 - moveDrag: 5 - inAirDrag: 1 - groundCheckLength: 1.1 - hoverStrenght: 0.43 - hoverDampening: 5 - airControlForce: 0.4 - airControlCounterForce: 0.2 - lookVerticalSpeed: 300 - lookHorizontalSpeed: 300 - aimVerticalSpeed: 0 - aimHorizontalSpeed: 0 ---- !u!114 &4543879591548074796 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4543879591548074793} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 948a89cb4226cc044872eaa020bb8b57, type: 3} - m_Name: - m_EditorClassIdentifier: - _playerGhostReffrenceHub: {fileID: 0} - _aliveReffrenceHub: {fileID: 171762596665493912} - _autoB_Hop: 0 - _hoverForceMode: 3 - _moveForceMode: 2 - _characterDrag: 10 ---- !u!114 &4543879591548074785 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4543879591548074793} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 68e69a066cfcd3b45b91db0b5825eea3, type: 3} - m_Name: - m_EditorClassIdentifier: - _aliveReffrenceHub: {fileID: 0} - _characterEnviormentCollider: {fileID: 4543879590078346523} ---- !u!114 &171762596665493911 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4543879591548074793} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ee10fff50205c76408a349d5521b6095, type: 3} - m_Name: - m_EditorClassIdentifier: - _capsuleCastHight: 0.22 - _capsuleCastRadius: 0.35 - _aliveReffrenceHub: {fileID: 171762596665493912} - _groundCheckOrigin: {fileID: 4543879590884227122} - _layerMask: - serializedVersion: 2 - m_Bits: 576 - currentHoverHight: 1.3 - _capsuleMesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} ---- !u!114 &4543879591548074784 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4543879591548074793} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 11afecc1cbbd8e8449477483a5577cb0, type: 3} - m_Name: - m_EditorClassIdentifier: - characterState: 0 - movementStates: 0 - ceilingDetected: 0 - eligibleForStep: 0 - onLadder: 0 - topOnLadder: 0 - bottomOnLadder: 0 - enteredLadderFromBottom: 0 - enteredLadderFromTop: 0 - topLadder: {fileID: 0} - bottomLadder: {fileID: 0} ---- !u!114 &8622019229504054619 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4543879591548074793} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1b1224eb420c67a48aa00d1fc76c7662, type: 3} - m_Name: - m_EditorClassIdentifier: - _aliveReffrenceHub: {fileID: 171762596665493912} ---- !u!1 &7071905972822205735 + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 0 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 0 + m_TargetGraphic: {fileID: 0} + m_FillRect: {fileID: 629738008825320772} + m_HandleRect: {fileID: 0} + m_Direction: 0 + m_MinValue: 0 + m_MaxValue: 100 + m_WholeNumbers: 1 + m_Value: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] +--- !u!1 &629738007659103188 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -471,9 +249,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7071905972822205734} - - component: {fileID: 7071905972822205732} - - component: {fileID: 7071905972822205733} + - component: {fileID: 629738007659103189} + - component: {fileID: 629738007659103191} + - component: {fileID: 629738007659103190} m_Layer: 5 m_Name: Text (TMP) m_TagString: Untagged @@ -481,19 +259,19 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7071905972822205734 +--- !u!224 &629738007659103189 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905972822205735} + m_GameObject: {fileID: 629738007659103188} 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: 0 m_Children: [] - m_Father: {fileID: 7071905974832247950} + m_Father: {fileID: 629738008358425213} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -501,21 +279,21 @@ RectTransform: m_AnchoredPosition: {x: -0.1484, y: -0.1487} m_SizeDelta: {x: 92.0841, y: 21.6896} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7071905972822205732 +--- !u!222 &629738007659103191 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905972822205735} + m_GameObject: {fileID: 629738007659103188} m_CullTransparentMesh: 1 ---- !u!114 &7071905972822205733 +--- !u!114 &629738007659103190 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905972822205735} + m_GameObject: {fileID: 629738007659103188} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -598,7 +376,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7071905972904880798 +--- !u!1 &629738007740009581 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -606,10 +384,11 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7071905972904880797} - - component: {fileID: 7071905972904880794} - - component: {fileID: 7071905972904880795} - - component: {fileID: 7071905972904880796} + - component: {fileID: 629738007740009582} + - component: {fileID: 629738007740009577} + - component: {fileID: 629738007740009576} + - component: {fileID: 629738007740009583} + - component: {fileID: 6723509958817744454} m_Layer: 5 m_Name: UI m_TagString: Untagged @@ -617,20 +396,21 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7071905972904880797 +--- !u!224 &629738007740009582 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905972904880798} + m_GameObject: {fileID: 629738007740009581} 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_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7071905974918672746} - m_Father: {fileID: 4543879591548074798} + - {fileID: 629738008411625369} + - {fileID: 254138618732735393} + m_Father: {fileID: 6167160771052314077} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -638,13 +418,13 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!223 &7071905972904880794 +--- !u!223 &629738007740009577 Canvas: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905972904880798} + m_GameObject: {fileID: 629738007740009581} m_Enabled: 1 serializedVersion: 3 m_RenderMode: 0 @@ -659,13 +439,13 @@ Canvas: m_SortingLayerID: 0 m_SortingOrder: 0 m_TargetDisplay: 0 ---- !u!114 &7071905972904880795 +--- !u!114 &629738007740009576 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905972904880798} + m_GameObject: {fileID: 629738007740009581} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} @@ -682,13 +462,13 @@ MonoBehaviour: m_DefaultSpriteDPI: 96 m_DynamicPixelsPerUnit: 1 m_PresetInfoIsWorld: 0 ---- !u!114 &7071905972904880796 +--- !u!114 &629738007740009583 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905972904880798} + m_GameObject: {fileID: 629738007740009581} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} @@ -699,90 +479,66 @@ MonoBehaviour: m_BlockingMask: serializedVersion: 2 m_Bits: 4294967295 ---- !u!1 &7071905972930871579 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7071905972930871578} - m_Layer: 5 - m_Name: Fill Area - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7071905972930871578 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905972930871579} - 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: 0 - m_Children: - - {fileID: 7071905973954868151} - m_Father: {fileID: 7071905973037695955} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: -5, y: 0} - m_SizeDelta: {x: -20, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &7071905973037695956 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7071905973037695955} - - component: {fileID: 7071905973037695954} - m_Layer: 5 - m_Name: HealthBar - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7071905973037695955 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905973037695956} - 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: 0 - m_Children: - - {fileID: 7071905973781638158} - - {fileID: 7071905972930871578} - - {fileID: 7071905974248886755} - m_Father: {fileID: 7071905974918672746} - 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.9837036, y: -1.1799774} - m_SizeDelta: {x: 160, y: 43.0909} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &7071905973037695954 +--- !u!114 &6723509958817744454 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905973037695956} + m_GameObject: {fileID: 629738007740009581} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 081c9ad28f2a28443a0b9bb2fed1da05, type: 3} + m_Name: + m_EditorClassIdentifier: + _healthDisplay: {fileID: 629738008916260625} + _healthBar: {fileID: 629738007606502689} +--- !u!1 &629738008022663165 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 629738008022663166} + - component: {fileID: 629738008022663167} + m_Layer: 5 + m_Name: Stamina + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &629738008022663166 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629738008022663165} + 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: 0 + m_Children: + - {fileID: 629738008891293881} + - {fileID: 629738007313910615} + m_Father: {fileID: 629738008411625369} + m_RootOrder: 4 + 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: -47} + m_SizeDelta: {x: 160, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &629738008022663167 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629738008022663165} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} @@ -817,17 +573,17 @@ MonoBehaviour: m_DisabledTrigger: Disabled m_Interactable: 0 m_TargetGraphic: {fileID: 0} - m_FillRect: {fileID: 7071905973954868151} + m_FillRect: {fileID: 629738008946854243} m_HandleRect: {fileID: 0} m_Direction: 0 m_MinValue: 0 - m_MaxValue: 100 + m_MaxValue: 1 m_WholeNumbers: 0 m_Value: 0 m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!1 &7071905973133930383 +--- !u!1 &629738008036166012 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -835,29 +591,29 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7071905973133930382} - - component: {fileID: 7071905973133930380} - - component: {fileID: 7071905973133930381} + - component: {fileID: 629738008036166013} + - component: {fileID: 629738008036166015} + - component: {fileID: 629738008036166014} m_Layer: 5 - m_Name: AmmoCount + m_Name: AmmoInBackpack m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7071905973133930382 +--- !u!224 &629738008036166013 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905973133930383} + m_GameObject: {fileID: 629738008036166012} 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: 0 m_Children: [] - m_Father: {fileID: 7071905974376823164} + m_Father: {fileID: 629738008943517583} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -865,21 +621,21 @@ RectTransform: m_AnchoredPosition: {x: 43.4, y: 0} m_SizeDelta: {x: 61.4637, y: 12.5417} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7071905973133930380 +--- !u!222 &629738008036166015 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905973133930383} + m_GameObject: {fileID: 629738008036166012} m_CullTransparentMesh: 1 ---- !u!114 &7071905973133930381 +--- !u!114 &629738008036166014 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905973133930383} + m_GameObject: {fileID: 629738008036166012} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -893,7 +649,7 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_text: 0/0 +0 + m_text: ' +0' m_isRightToLeft: 0 m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} @@ -962,7 +718,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7071905973154224398 +--- !u!1 &629738008289054580 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -970,97 +726,7 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7071905973154224397} - - component: {fileID: 7071905973154224396} - m_Layer: 5 - m_Name: Stamina - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7071905973154224397 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905973154224398} - 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: 0 - m_Children: - - {fileID: 7071905974291113546} - - {fileID: 7071905973720362404} - m_Father: {fileID: 7071905974918672746} - m_RootOrder: 4 - 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: -47} - m_SizeDelta: {x: 160, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &7071905973154224396 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905973154224398} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 0 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 0 - m_TargetGraphic: {fileID: 0} - m_FillRect: {fileID: 7071905974378065808} - m_HandleRect: {fileID: 0} - m_Direction: 0 - m_MinValue: 0 - m_MaxValue: 1 - m_WholeNumbers: 0 - m_Value: 0 - m_OnValueChanged: - m_PersistentCalls: - m_Calls: [] ---- !u!1 &7071905973720362405 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7071905973720362404} + - component: {fileID: 629738008289054581} m_Layer: 5 m_Name: Fill Area m_TagString: Untagged @@ -1068,20 +734,20 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7071905973720362404 +--- !u!224 &629738008289054581 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905973720362405} + m_GameObject: {fileID: 629738008289054580} 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: 0 m_Children: - - {fileID: 7071905974378065808} - m_Father: {fileID: 7071905973154224397} + - {fileID: 629738008648056830} + m_Father: {fileID: 629738008943517583} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} @@ -1089,7 +755,7 @@ RectTransform: m_AnchoredPosition: {x: -5, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &7071905973781638159 +--- !u!1 &629738008358425212 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1097,9 +763,243 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7071905973781638158} - - component: {fileID: 7071905973781638156} - - component: {fileID: 7071905973781638157} + - component: {fileID: 629738008358425213} + - component: {fileID: 629738008358425215} + - component: {fileID: 629738008358425214} + m_Layer: 5 + m_Name: Role + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &629738008358425213 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629738008358425212} + 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: 0 + m_Children: + - {fileID: 629738007659103189} + m_Father: {fileID: 629738008411625369} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -30.3353, y: 37.02} + m_SizeDelta: {x: -78.6635, y: -91.954} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &629738008358425215 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629738008358425212} + m_CullTransparentMesh: 1 +--- !u!114 &629738008358425214 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629738008358425212} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.43921572, g: 0.43921572, b: 0.43921572, 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_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &629738008411625368 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 629738008411625369} + - component: {fileID: 629738008411625371} + - component: {fileID: 629738008411625370} + m_Layer: 5 + m_Name: AlivePlayerInfo + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &629738008411625369 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629738008411625368} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.75251, y: 0.75251, z: 0.75251} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 629738007606502688} + - {fileID: 629738008943517583} + - {fileID: 629738008748429242} + - {fileID: 629738008358425213} + - {fileID: 629738008022663166} + m_Father: {fileID: 629738007740009582} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -314, y: -168} + m_SizeDelta: {x: -620.0392, y: -330.77} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &629738008411625371 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629738008411625368} + m_CullTransparentMesh: 1 +--- !u!114 &629738008411625370 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629738008411625368} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0.21698111, g: 0.21698111, b: 0.21698111, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &629738008648056829 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 629738008648056830} + - component: {fileID: 629738008648056824} + - component: {fileID: 629738008648056831} + m_Layer: 5 + m_Name: Fill + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &629738008648056830 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629738008648056829} + 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: 0 + m_Children: [] + m_Father: {fileID: 629738008289054581} + 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: 10, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &629738008648056824 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629738008648056829} + m_CullTransparentMesh: 1 +--- !u!114 &629738008648056831 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 629738008648056829} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 0.8493134, b: 0, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &629738008650606297 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 629738008650606298} + - component: {fileID: 629738008650606292} + - component: {fileID: 629738008650606299} m_Layer: 5 m_Name: Background m_TagString: Untagged @@ -1107,19 +1007,19 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7071905973781638158 +--- !u!224 &629738008650606298 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905973781638159} + m_GameObject: {fileID: 629738008650606297} 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: 0 m_Children: [] - m_Father: {fileID: 7071905973037695955} + m_Father: {fileID: 629738008943517583} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} @@ -1127,21 +1027,21 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7071905973781638156 +--- !u!222 &629738008650606292 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905973781638159} + m_GameObject: {fileID: 629738008650606297} m_CullTransparentMesh: 1 ---- !u!114 &7071905973781638157 +--- !u!114 &629738008650606299 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905973781638159} + m_GameObject: {fileID: 629738008650606297} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -1165,7 +1065,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7071905973879810378 +--- !u!1 &629738008748429241 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1173,9 +1073,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7071905973879810377} - - component: {fileID: 7071905973879810375} - - component: {fileID: 7071905973879810376} + - component: {fileID: 629738008748429242} + - component: {fileID: 629738008748429236} + - component: {fileID: 629738008748429243} m_Layer: 5 m_Name: TimeLeft m_TagString: Untagged @@ -1183,19 +1083,19 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7071905973879810377 +--- !u!224 &629738008748429242 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905973879810378} + m_GameObject: {fileID: 629738008748429241} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.44537035, y: 0.44537035, z: 0.44537035} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 7071905974918672746} + m_Father: {fileID: 629738008411625369} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1203,21 +1103,21 @@ RectTransform: m_AnchoredPosition: {x: 56.2, y: 37.02001} m_SizeDelta: {x: 120.4757, y: 45.2514} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7071905973879810375 +--- !u!222 &629738008748429236 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905973879810378} + m_GameObject: {fileID: 629738008748429241} m_CullTransparentMesh: 1 ---- !u!114 &7071905973879810376 +--- !u!114 &629738008748429243 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905973879810378} + m_GameObject: {fileID: 629738008748429241} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -1300,7 +1200,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7071905973954868152 +--- !u!1 &629738008825320779 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1308,9 +1208,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7071905973954868151} - - component: {fileID: 7071905973954868149} - - component: {fileID: 7071905973954868150} + - component: {fileID: 629738008825320772} + - component: {fileID: 629738008825320774} + - component: {fileID: 629738008825320773} m_Layer: 5 m_Name: Fill m_TagString: Untagged @@ -1318,41 +1218,41 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7071905973954868151 +--- !u!224 &629738008825320772 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905973954868152} + m_GameObject: {fileID: 629738008825320779} 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: 0 m_Children: [] - m_Father: {fileID: 7071905972930871578} + m_Father: {fileID: 629738007566526441} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 10, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 5.4575, y: 0} + m_SizeDelta: {x: 20.7666, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7071905973954868149 +--- !u!222 &629738008825320774 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905973954868152} + m_GameObject: {fileID: 629738008825320779} m_CullTransparentMesh: 1 ---- !u!114 &7071905973954868150 +--- !u!114 &629738008825320773 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905973954868152} + m_GameObject: {fileID: 629738008825320779} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -1376,7 +1276,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7071905973980748046 +--- !u!1 &629738008891293880 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1384,85 +1284,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7071905973980748045} - - component: {fileID: 7071905973980748043} - - component: {fileID: 7071905973980748044} - m_Layer: 5 - m_Name: Fill - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7071905973980748045 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905973980748046} - 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: 0 - m_Children: [] - m_Father: {fileID: 7071905974494374278} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 10, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7071905973980748043 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905973980748046} - m_CullTransparentMesh: 1 ---- !u!114 &7071905973980748044 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905973980748046} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 0.8493134, b: 0, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7071905973983297578 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7071905973983297577} - - component: {fileID: 7071905973983297575} - - component: {fileID: 7071905973983297576} + - component: {fileID: 629738008891293881} + - component: {fileID: 629738008891293883} + - component: {fileID: 629738008891293882} m_Layer: 5 m_Name: Background m_TagString: Untagged @@ -1470,19 +1294,19 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7071905973983297577 +--- !u!224 &629738008891293881 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905973983297578} + m_GameObject: {fileID: 629738008891293880} 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: 0 m_Children: [] - m_Father: {fileID: 7071905974376823164} + m_Father: {fileID: 629738008022663166} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.25} @@ -1490,21 +1314,21 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7071905973983297575 +--- !u!222 &629738008891293883 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905973983297578} + m_GameObject: {fileID: 629738008891293880} m_CullTransparentMesh: 1 ---- !u!114 &7071905973983297576 +--- !u!114 &629738008891293882 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905973983297578} + m_GameObject: {fileID: 629738008891293880} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -1528,7 +1352,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7071905974248886756 +--- !u!1 &629738008916260631 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1536,9 +1360,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7071905974248886755} - - component: {fileID: 7071905974248886753} - - component: {fileID: 7071905974248886754} + - component: {fileID: 629738008916260624} + - component: {fileID: 629738008916260626} + - component: {fileID: 629738008916260625} m_Layer: 5 m_Name: HealthCount m_TagString: Untagged @@ -1546,19 +1370,19 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7071905974248886755 +--- !u!224 &629738008916260624 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905974248886756} + m_GameObject: {fileID: 629738008916260631} 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: 0 m_Children: [] - m_Father: {fileID: 7071905973037695955} + m_Father: {fileID: 629738007606502688} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1566,21 +1390,21 @@ RectTransform: m_AnchoredPosition: {x: 42.809483, y: 0.0001} m_SizeDelta: {x: 61.4637, y: 12.5417} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7071905974248886753 +--- !u!222 &629738008916260626 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905974248886756} + m_GameObject: {fileID: 629738008916260631} m_CullTransparentMesh: 1 ---- !u!114 &7071905974248886754 +--- !u!114 &629738008916260625 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905974248886756} + m_GameObject: {fileID: 629738008916260631} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} @@ -1663,7 +1487,7 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7071905974291113547 +--- !u!1 &629738008943517582 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1671,84 +1495,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7071905974291113546} - - component: {fileID: 7071905974291113544} - - component: {fileID: 7071905974291113545} - m_Layer: 5 - m_Name: Background - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7071905974291113546 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905974291113547} - 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: 0 - m_Children: [] - m_Father: {fileID: 7071905973154224397} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7071905974291113544 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905974291113547} - m_CullTransparentMesh: 1 ---- !u!114 &7071905974291113545 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905974291113547} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.20784315, g: 0.20784315, b: 0.20784315, 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_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7071905974376823165 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7071905974376823164} - - component: {fileID: 7071905974376823163} + - component: {fileID: 629738008943517583} + - component: {fileID: 629738008943517576} m_Layer: 5 m_Name: AmmoBar m_TagString: Untagged @@ -1756,22 +1504,23 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7071905974376823164 +--- !u!224 &629738008943517583 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905974376823165} + m_GameObject: {fileID: 629738008943517582} 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: 0 m_Children: - - {fileID: 7071905973983297577} - - {fileID: 7071905974494374278} - - {fileID: 7071905973133930382} - m_Father: {fileID: 7071905974918672746} + - {fileID: 629738008650606298} + - {fileID: 629738008289054581} + - {fileID: 629738008036166013} + - {fileID: 3989901453065616171} + m_Father: {fileID: 629738008411625369} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -1779,13 +1528,13 @@ RectTransform: m_AnchoredPosition: {x: -0.98376465, y: -23.3} m_SizeDelta: {x: 160, y: 43.0909} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &7071905974376823163 +--- !u!114 &629738008943517576 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905974376823165} + m_GameObject: {fileID: 629738008943517582} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 67db9e8f0e2ae9c40bc1e2b64352a6b4, type: 3} @@ -1820,7 +1569,7 @@ MonoBehaviour: m_DisabledTrigger: Disabled m_Interactable: 0 m_TargetGraphic: {fileID: 0} - m_FillRect: {fileID: 7071905973980748045} + m_FillRect: {fileID: 629738008648056830} m_HandleRect: {fileID: 0} m_Direction: 0 m_MinValue: 0 @@ -1830,7 +1579,7 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] ---- !u!1 &7071905974378065809 +--- !u!1 &629738008946854242 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1838,9 +1587,9 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7071905974378065808} - - component: {fileID: 7071905974378065838} - - component: {fileID: 7071905974378065839} + - component: {fileID: 629738008946854243} + - component: {fileID: 629738008946854237} + - component: {fileID: 629738008946854236} m_Layer: 5 m_Name: Fill m_TagString: Untagged @@ -1848,41 +1597,41 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7071905974378065808 +--- !u!224 &629738008946854243 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905974378065809} + m_GameObject: {fileID: 629738008946854242} 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: 0 m_Children: [] - m_Father: {fileID: 7071905973720362404} + m_Father: {fileID: 629738007313910615} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 10, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7071905974378065838 +--- !u!222 &629738008946854237 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905974378065809} + m_GameObject: {fileID: 629738008946854242} m_CullTransparentMesh: 1 ---- !u!114 &7071905974378065839 +--- !u!114 &629738008946854236 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905974378065809} + m_GameObject: {fileID: 629738008946854242} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -1906,7 +1655,7 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7071905974494374279 +--- !u!1 &2339597199891704813 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1914,36 +1663,134 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7071905974494374278} + - component: {fileID: 3989901453065616171} + - component: {fileID: 1394429110246610473} + - component: {fileID: 7375640638158873817} m_Layer: 5 - m_Name: Fill Area + m_Name: AmmoInWeapon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7071905974494374278 +--- !u!224 &3989901453065616171 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905974494374279} + m_GameObject: {fileID: 2339597199891704813} 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: 0 - m_Children: - - {fileID: 7071905973980748045} - m_Father: {fileID: 7071905974376823164} - m_RootOrder: 1 + m_Children: [] + m_Father: {fileID: 629738008943517583} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.25} - m_AnchorMax: {x: 1, y: 0.75} - m_AnchoredPosition: {x: -5, y: 0} - m_SizeDelta: {x: -20, y: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 34.005013, y: 0} + m_SizeDelta: {x: 42.6737, y: 12.5417} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &7071905974832247951 +--- !u!222 &1394429110246610473 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2339597199891704813} + m_CullTransparentMesh: 1 +--- !u!114 &7375640638158873817 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2339597199891704813} + 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: 0/0 + 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: 10.2 + m_fontSizeBase: 10.2 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 512 + 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: 0, 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 &6167160769597586702 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1951,76 +1798,31 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7071905974832247950} - - component: {fileID: 7071905974832247948} - - component: {fileID: 7071905974832247949} - m_Layer: 5 - m_Name: Role + - component: {fileID: 6167160769597586689} + m_Layer: 3 + m_Name: PlayerModel m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &7071905974832247950 -RectTransform: +--- !u!4 &6167160769597586689 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905974832247951} + m_GameObject: {fileID: 6167160769597586702} 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: 0 m_Children: - - {fileID: 7071905972822205734} - m_Father: {fileID: 7071905974918672746} - m_RootOrder: 3 + - {fileID: 6167160771526447130} + m_Father: {fileID: 6167160770562624853} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -30.3353, y: 37.02} - m_SizeDelta: {x: -78.6635, y: -91.954} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7071905974832247948 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905974832247951} - m_CullTransparentMesh: 1 ---- !u!114 &7071905974832247949 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905974832247951} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.43921572, g: 0.43921572, b: 0.43921572, 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_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &7071905974918672747 +--- !u!1 &6167160769853445014 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -2028,76 +1830,515 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7071905974918672746} - - component: {fileID: 7071905974918672744} - - component: {fileID: 7071905974918672745} - m_Layer: 5 - m_Name: AlivePlayerInfo + - component: {fileID: 6167160769853445097} + - component: {fileID: 6167160769853445096} + m_Layer: 3 + m_Name: EnviormentCollider m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &7071905974918672746 -RectTransform: + m_IsActive: 1 +--- !u!4 &6167160769853445097 +Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905974918672747} + m_GameObject: {fileID: 6167160769853445014} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.75251, y: 0.75251, z: 0.75251} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7071905973037695955} - - {fileID: 7071905974376823164} - - {fileID: 7071905973879810377} - - {fileID: 7071905974832247950} - - {fileID: 7071905973154224397} - m_Father: {fileID: 7071905972904880797} + m_Children: [] + m_Father: {fileID: 6167160770361228125} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -314, y: -168} - m_SizeDelta: {x: -620.0392, y: -330.77} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7071905974918672744 -CanvasRenderer: +--- !u!136 &6167160769853445096 +CapsuleCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905974918672747} - m_CullTransparentMesh: 1 ---- !u!114 &7071905974918672745 + m_GameObject: {fileID: 6167160769853445014} + m_Material: {fileID: 13400000, guid: c67f223e1c1ff6d44956ef766851951c, type: 2} + m_IsTrigger: 0 + m_Enabled: 1 + m_Radius: 0.4 + m_Height: 1.6 + m_Direction: 1 + m_Center: {x: 0, y: 0.2, z: 0} +--- !u!1 &6167160770361228122 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6167160770361228125} + m_Layer: 3 + m_Name: Colliders + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6167160770361228125 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6167160770361228122} + 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: 0 + m_Children: + - {fileID: 6167160769853445097} + m_Father: {fileID: 6167160770562624853} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6167160770562624850 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6167160770562624853} + m_Layer: 3 + m_Name: PCPlayerBody + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6167160770562624853 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6167160770562624850} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.5, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 6167160769597586689} + - {fileID: 6167160770361228125} + m_Father: {fileID: 6167160771052314077} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &6167160771052314074 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6167160771052314077} + - component: {fileID: 7564652410562457451} + - component: {fileID: 6167160771052314076} + - component: {fileID: 6167160771052314065} + - component: {fileID: 6167160771052314079} + - component: {fileID: 6167160771052314066} + - component: {fileID: 7564652410562457444} + - component: {fileID: 6167160771052314067} + - component: {fileID: 2107300539136967592} + m_Layer: 3 + m_Name: Alive + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6167160771052314077 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6167160771052314074} + 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: 0 + m_Children: + - {fileID: 6167160770562624853} + - {fileID: 6167160771733069505} + - {fileID: 629738007740009582} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &7564652410562457451 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7071905974918672747} + m_GameObject: {fileID: 6167160771052314074} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Script: {fileID: 11500000, guid: 4a3c4a8867cd2f64e9f17bd9abc1f72a, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.21698111, g: 0.21698111, b: 0.21698111, 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_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 + characterMovementConfig: {fileID: 6167160771052314065} + characterStateMachine: {fileID: 6167160771052314076} + characterHover: {fileID: 7564652410562457444} + characterStateChanger: {fileID: 2107300539136967592} +--- !u!114 &6167160771052314076 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6167160771052314074} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 11afecc1cbbd8e8449477483a5577cb0, type: 3} + m_Name: + m_EditorClassIdentifier: + characterState: 1 + movementStates: 0 + ceilingDetected: 0 + eligibleForStep: 0 + onLadder: 0 + topOnLadder: 0 + bottomOnLadder: 0 + enteredLadderFromBottom: 0 + enteredLadderFromTop: 0 + topLadder: {fileID: 0} + bottomLadder: {fileID: 0} +--- !u!114 &6167160771052314065 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6167160771052314074} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: e45920ac9f4c62c4da00d5c902c10bd2, type: 3} + m_Name: + m_EditorClassIdentifier: + moveForce: 0.5 + crouchMoveForce: 0.2 + sprintMoveForce: 0.7 + ladderClimbingForce: 0 + desieredHoverHight: 1.2 + crouchHeight: 0.7 + allowSprint: 0 + jumpForce: 3 + standingColliderPosition: 0.2 + standingColliderHight: 1.6 + crouchedColliderPosition: 0.3 + crouchedColliderHight: 1.4 + idleDrag: 10 + moveDrag: 5 + inAirDrag: 1 + groundCheckLength: 1.1 + hoverStrenght: 0.43 + hoverDampening: 5 + airControlForce: 0.4 + airControlCounterForce: 0.2 + lookVerticalSpeed: 300 + lookHorizontalSpeed: 300 + aimVerticalSpeed: 0 + aimHorizontalSpeed: 0 +--- !u!114 &6167160771052314079 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6167160771052314074} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 948a89cb4226cc044872eaa020bb8b57, type: 3} + m_Name: + m_EditorClassIdentifier: + _playerGhostReffrenceHub: {fileID: 0} + _aliveReffrenceHub: {fileID: 7564652410562457451} + _autoB_Hop: 0 + _hoverForceMode: 3 + _moveForceMode: 2 + _characterDrag: 10 +--- !u!114 &6167160771052314066 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6167160771052314074} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 68e69a066cfcd3b45b91db0b5825eea3, type: 3} + m_Name: + m_EditorClassIdentifier: + _aliveReffrenceHub: {fileID: 0} + _characterEnviormentCollider: {fileID: 6167160769853445096} +--- !u!114 &7564652410562457444 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6167160771052314074} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ee10fff50205c76408a349d5521b6095, type: 3} + m_Name: + m_EditorClassIdentifier: + _capsuleCastHight: 0.22 + _capsuleCastRadius: 0.35 + _aliveReffrenceHub: {fileID: 7564652410562457451} + _groundCheckOrigin: {fileID: 6167160771733069505} + _layerMask: + serializedVersion: 2 + m_Bits: 576 + currentHoverHight: 1.3 + _capsuleMesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &6167160771052314067 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6167160771052314074} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 11afecc1cbbd8e8449477483a5577cb0, type: 3} + m_Name: + m_EditorClassIdentifier: + characterState: 0 + movementStates: 0 + ceilingDetected: 0 + eligibleForStep: 0 + onLadder: 0 + topOnLadder: 0 + bottomOnLadder: 0 + enteredLadderFromBottom: 0 + enteredLadderFromTop: 0 + topLadder: {fileID: 0} + bottomLadder: {fileID: 0} +--- !u!114 &2107300539136967592 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6167160771052314074} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1b1224eb420c67a48aa00d1fc76c7662, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!1 &6167160771526447131 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6167160771526447130} + - component: {fileID: 6167160771526447135} + - component: {fileID: 6167160771526447132} + m_Layer: 3 + m_Name: Capsule + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6167160771526447130 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6167160771526447131} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.8, y: 1, z: 0.8} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6167160769597586689} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6167160771526447135 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6167160771526447131} + m_Mesh: {fileID: 10208, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &6167160771526447132 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6167160771526447131} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + 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 &6167160771733069518 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6167160771733069505} + m_Layer: 3 + m_Name: GroundCheck + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &6167160771733069505 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6167160771733069518} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.47099996, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 6167160771052314077} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &4872858478319365533 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 629738007740009582} + m_Modifications: + - target: {fileID: 4618792496510273084, guid: a6c9897145ea93b41abf3c531f857e3b, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4618792496510273084, guid: a6c9897145ea93b41abf3c531f857e3b, + type: 3} + propertyPath: m_LocalScale.x + value: 0.53296775 + objectReference: {fileID: 0} + - target: {fileID: 4618792496510273084, guid: a6c9897145ea93b41abf3c531f857e3b, + type: 3} + propertyPath: m_LocalScale.y + value: 0.53296775 + objectReference: {fileID: 0} + - target: {fileID: 4618792496510273084, guid: a6c9897145ea93b41abf3c531f857e3b, + type: 3} + propertyPath: m_LocalScale.z + value: 0.53296775 + objectReference: {fileID: 0} + - target: {fileID: 4618792496510273084, guid: a6c9897145ea93b41abf3c531f857e3b, + type: 3} + propertyPath: m_LocalPosition.x + value: 49 + objectReference: {fileID: 0} + - target: {fileID: 4618792496510273084, guid: a6c9897145ea93b41abf3c531f857e3b, + type: 3} + propertyPath: m_LocalPosition.y + value: -112 + objectReference: {fileID: 0} + - target: {fileID: 4618792496510273084, guid: a6c9897145ea93b41abf3c531f857e3b, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4618792496510273084, guid: a6c9897145ea93b41abf3c531f857e3b, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4618792496510273084, guid: a6c9897145ea93b41abf3c531f857e3b, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4618792496510273084, guid: a6c9897145ea93b41abf3c531f857e3b, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4618792496510273084, guid: a6c9897145ea93b41abf3c531f857e3b, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4618792496510273084, guid: a6c9897145ea93b41abf3c531f857e3b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4618792496510273084, guid: a6c9897145ea93b41abf3c531f857e3b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4618792496510273084, guid: a6c9897145ea93b41abf3c531f857e3b, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4618792496510273085, guid: a6c9897145ea93b41abf3c531f857e3b, + type: 3} + propertyPath: m_Name + value: Inventory + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a6c9897145ea93b41abf3c531f857e3b, type: 3} +--- !u!4 &254138618732735393 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4618792496510273084, guid: a6c9897145ea93b41abf3c531f857e3b, + type: 3} + m_PrefabInstance: {fileID: 4872858478319365533} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Character/Controller/PlayerInputMap.inputactions b/Assets/Character/Controller/PlayerInputMap.inputactions index 45d7c67..58723a9 100644 --- a/Assets/Character/Controller/PlayerInputMap.inputactions +++ b/Assets/Character/Controller/PlayerInputMap.inputactions @@ -447,7 +447,7 @@ "id": "2cc562f6-1b6c-4033-b783-2a481ab11dec", "actions": [ { - "name": "SpeedDown", + "name": "FlyFast", "type": "PassThrough", "id": "1e150f46-f771-4738-92fc-2fc13b6697b7", "expectedControlType": "Button", @@ -456,7 +456,7 @@ "initialStateCheck": false }, { - "name": "SpeedUp", + "name": "FlySlow", "type": "PassThrough", "id": "4ec09521-b697-424d-b042-16c4c355012c", "expectedControlType": "Button", @@ -481,6 +481,15 @@ "processors": "", "interactions": "", "initialStateCheck": false + }, + { + "name": "ScrollSpeedControlw", + "type": "PassThrough", + "id": "c6404499-255c-4521-abfa-5fb829afd1e0", + "expectedControlType": "Vector2", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ @@ -491,7 +500,7 @@ "interactions": "", "processors": "", "groups": "KeyboardAndMouse", - "action": "SpeedDown", + "action": "FlyFast", "isComposite": false, "isPartOfComposite": false }, @@ -502,7 +511,7 @@ "interactions": "", "processors": "", "groups": "Gamepad", - "action": "SpeedDown", + "action": "FlyFast", "isComposite": false, "isPartOfComposite": false }, @@ -513,7 +522,7 @@ "interactions": "", "processors": "", "groups": "KeyboardAndMouse", - "action": "SpeedUp", + "action": "FlySlow", "isComposite": false, "isPartOfComposite": false }, @@ -524,7 +533,7 @@ "interactions": "", "processors": "", "groups": "Gamepad", - "action": "SpeedUp", + "action": "FlySlow", "isComposite": false, "isPartOfComposite": false }, @@ -549,6 +558,17 @@ "action": "FlyDown", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "cd457b70-a6c0-4b36-ae23-a86735c06bee", + "path": "/scroll", + "interactions": "", + "processors": "", + "groups": "", + "action": "ScrollSpeedControlw", + "isComposite": false, + "isPartOfComposite": false } ] } diff --git a/Assets/Roles.meta b/Assets/Roles.meta new file mode 100644 index 0000000..c26a91d --- /dev/null +++ b/Assets/Roles.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 96abcc748c6e1f844bdafc9894b7fb75 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Roles/Detective.asset b/Assets/Roles/Detective.asset new file mode 100644 index 0000000..ae32ec0 --- /dev/null +++ b/Assets/Roles/Detective.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ffe32805eb7bde24bb85bb43c12614e6, type: 3} + m_Name: Detective + m_EditorClassIdentifier: + roleName: Detective + roleId: 1 + roleColor: {r: 0, g: 0, b: 1, a: 0} + roleTeam: 0 diff --git a/Assets/Roles/Detective.asset.meta b/Assets/Roles/Detective.asset.meta new file mode 100644 index 0000000..46fd8e3 --- /dev/null +++ b/Assets/Roles/Detective.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 87d3bd07dfb8cad4abc8d1e45c65ad38 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Roles/Innocent.asset b/Assets/Roles/Innocent.asset new file mode 100644 index 0000000..ef22e2c --- /dev/null +++ b/Assets/Roles/Innocent.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ffe32805eb7bde24bb85bb43c12614e6, type: 3} + m_Name: Innocent + m_EditorClassIdentifier: + roleName: Innocent + roleId: 0 + roleColor: {r: 0, g: 1, b: 0, a: 0} + roleTeam: 0 diff --git a/Assets/Roles/Innocent.asset.meta b/Assets/Roles/Innocent.asset.meta new file mode 100644 index 0000000..b476547 --- /dev/null +++ b/Assets/Roles/Innocent.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 902c73643e40b48499e05ccd846b6e7c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Roles/Traitor.asset b/Assets/Roles/Traitor.asset new file mode 100644 index 0000000..08bcad6 --- /dev/null +++ b/Assets/Roles/Traitor.asset @@ -0,0 +1,18 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ffe32805eb7bde24bb85bb43c12614e6, type: 3} + m_Name: Traitor + m_EditorClassIdentifier: + roleName: Traitor + roleId: 2 + roleColor: {r: 1, g: 0, b: 0, a: 0} + roleTeam: 1 diff --git a/Assets/Roles/Traitor.asset.meta b/Assets/Roles/Traitor.asset.meta new file mode 100644 index 0000000..27dbfe8 --- /dev/null +++ b/Assets/Roles/Traitor.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 65f5156730f95fa46856a6c9fca543db +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/MovementTesting.unity b/Assets/Scenes/MovementTesting.unity index ba80d14..722a388 100644 --- a/Assets/Scenes/MovementTesting.unity +++ b/Assets/Scenes/MovementTesting.unity @@ -125,133 +125,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &35876192 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 35876193} - - component: {fileID: 35876196} - - component: {fileID: 35876195} - - component: {fileID: 35876194} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &35876193 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 35876192} - 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: 0 - m_Children: [] - m_Father: {fileID: 1756702561} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &35876194 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 35876192} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.6 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 ---- !u!114 &35876195 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 35876192} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BindingMode: 1 - m_FollowOffset: {x: 0, y: 0, z: -10} - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 0 - m_RollDamping: 0 - m_AngularDamping: 0 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_LegacyRadius: 3.4028235e+38 - m_LegacyHeightOffset: 3.4028235e+38 - m_LegacyHeadingBias: 3.4028235e+38 - m_HeadingIsSlave: 1 ---- !u!114 &35876196 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 35876192} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &104422633 GameObject: m_ObjectHideFlags: 0 @@ -373,16 +246,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 161730254} - m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: -30.742, y: 0, z: -37.52} + m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068} + m_LocalPosition: {x: -945.6286, y: 213.34412, z: -329.9045} m_LocalScale: {x: 1, y: 1, z: 0.5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 104422634} - {fileID: 1990566412} - {fileID: 1142073786} - m_Father: {fileID: 0} - m_RootOrder: 10 + m_Father: {fileID: 188713835} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!1 &188390504 GameObject: @@ -418,6 +291,40 @@ Transform: m_Father: {fileID: 1793039742} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &188713834 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 188713835} + m_Layer: 0 + m_Name: Map + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &188713835 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 188713834} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 914.8866, y: -213.34412, z: 292.38452} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 161730255} + - {fileID: 2057082606} + - {fileID: 1152588314} + m_Father: {fileID: 0} + m_RootOrder: 9 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &351313843 GameObject: m_ObjectHideFlags: 0 @@ -669,133 +576,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &590044015 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 590044016} - - component: {fileID: 590044019} - - component: {fileID: 590044018} - - component: {fileID: 590044017} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &590044016 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 590044015} - 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: 0 - m_Children: [] - m_Father: {fileID: 1659178892} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &590044017 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 590044015} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.5 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 ---- !u!114 &590044018 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 590044015} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BindingMode: 1 - m_FollowOffset: {x: 0, y: 0, z: -10} - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 0 - m_RollDamping: 0 - m_AngularDamping: 0 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_LegacyRadius: 3.4028235e+38 - m_LegacyHeightOffset: 3.4028235e+38 - m_LegacyHeadingBias: 3.4028235e+38 - m_HeadingIsSlave: 1 ---- !u!114 &590044019 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 590044015} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &619197885 GameObject: m_ObjectHideFlags: 0 @@ -1444,84 +1224,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 970391838} m_Mesh: {fileID: 4300000, guid: 08258afcf0b38f34a93780d9aac149f8, type: 3} ---- !u!1 &989489469 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 989489471} - - component: {fileID: 989489470} - m_Layer: 0 - m_Name: MiddleRig - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &989489470 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 989489469} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - - Header - - Extensions - - m_Priority - - m_Transitions - - m_Follow - - m_StandbyUpdate - - m_Lens - m_LockStageInInspector: 00000000 - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 1564543370} ---- !u!4 &989489471 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 989489469} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 22.697678, y: -4.84, z: 18.96164} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1564543370} - m_Father: {fileID: 1615074256} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1067556768 GameObject: m_ObjectHideFlags: 0 @@ -1620,81 +1322,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1067556768} m_Mesh: {fileID: 4300000, guid: bb8c7438a4ec94b458e043eea4341d0f, type: 3} ---- !u!1001 &1126554888 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 1551772755} - m_Modifications: - - target: {fileID: 1135382073684329176, guid: b615186e864b86245a99d5258f67ae27, - type: 3} - propertyPath: m_Name - value: Spectator - objectReference: {fileID: 0} - - target: {fileID: 1135382073684329177, guid: b615186e864b86245a99d5258f67ae27, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1135382073684329177, guid: b615186e864b86245a99d5258f67ae27, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1135382073684329177, guid: b615186e864b86245a99d5258f67ae27, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1135382073684329177, guid: b615186e864b86245a99d5258f67ae27, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1135382073684329177, guid: b615186e864b86245a99d5258f67ae27, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1135382073684329177, guid: b615186e864b86245a99d5258f67ae27, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1135382073684329177, guid: b615186e864b86245a99d5258f67ae27, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1135382073684329177, guid: b615186e864b86245a99d5258f67ae27, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1135382073684329177, guid: b615186e864b86245a99d5258f67ae27, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1135382073684329177, guid: b615186e864b86245a99d5258f67ae27, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1135382073684329177, guid: b615186e864b86245a99d5258f67ae27, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: b615186e864b86245a99d5258f67ae27, type: 3} ---- !u!4 &1126554889 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1135382073684329177, guid: b615186e864b86245a99d5258f67ae27, - type: 3} - m_PrefabInstance: {fileID: 1126554888} - m_PrefabAsset: {fileID: 0} --- !u!1 &1142073785 GameObject: m_ObjectHideFlags: 0 @@ -1816,16 +1443,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1152588313} - m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: -30.742, y: 0, z: -47.52} + m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068} + m_LocalPosition: {x: -945.6286, y: 213.34412, z: -339.9045} m_LocalScale: {x: 1, y: 0.5, z: 0.5} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1531232576} - {fileID: 351313844} - {fileID: 1244159271} - m_Father: {fileID: 0} - m_RootOrder: 12 + m_Father: {fileID: 188713835} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!1 &1179389436 GameObject: @@ -2552,7 +2179,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1126554889} - {fileID: 1681013546} m_Father: {fileID: 0} m_RootOrder: 8 @@ -2585,8 +2211,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: abe7058362b44e043b66c7ddc42a22c2, type: 3} m_Name: m_EditorClassIdentifier: - currentPlayerPlayState: 0 - currentPlayerClass: 1 --- !u!114 &1551772758 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2599,7 +2223,12 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 293f9b619cc75c24f93ceaf1ed5d04de, type: 3} m_Name: m_EditorClassIdentifier: - alivePlayerPrefab: {fileID: 0} + _playerGhostReffrenceHub: {fileID: 1551772760} + _playerInfoData: {fileID: 0} + _aliveBodyPrefab: {fileID: 6167160771052314074, guid: 0c51ca6cd6963b14eaa25c9a60dc3c30, + type: 3} + _spectatorBodyPrefab: {fileID: 1135382073684329176, guid: b615186e864b86245a99d5258f67ae27, + type: 3} --- !u!114 &1551772760 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2614,6 +2243,7 @@ MonoBehaviour: m_EditorClassIdentifier: characterRigidbody: {fileID: 1551772756} cameraTransform: {fileID: 963194228} + playerGhost: {fileID: 1551772761} playerStateEnforcrer: {fileID: 1551772758} playerStateMachine: {fileID: 1551772757} playerInputReceiver: {fileID: 1551772752} @@ -2629,135 +2259,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 121b5a9ec69d4a342a5f5527121e6d72, type: 3} m_Name: m_EditorClassIdentifier: - _playerGhostReffrenceHub: {fileID: 1551772760} - shoopCoins: 0 ---- !u!1 &1564543369 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1564543370} - - component: {fileID: 1564543373} - - component: {fileID: 1564543372} - - component: {fileID: 1564543371} - m_Layer: 0 - m_Name: cm - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1564543370 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1564543369} - 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: 0 - m_Children: [] - m_Father: {fileID: 989489471} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1564543371 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1564543369} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_TrackedObjectOffset: {x: 0, y: 0, z: 0} - m_LookaheadTime: 0 - m_LookaheadSmoothing: 0 - m_LookaheadIgnoreY: 0 - m_HorizontalDamping: 0 - m_VerticalDamping: 0 - m_ScreenX: 0.5 - m_ScreenY: 0.55 - m_DeadZoneWidth: 0 - m_DeadZoneHeight: 0 - m_SoftZoneWidth: 0.8 - m_SoftZoneHeight: 0.8 - m_BiasX: 0 - m_BiasY: 0 - m_CenterOnActivate: 1 ---- !u!114 &1564543372 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1564543369} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 9384ab8608cdc3d479fe89cd51eed48f, type: 3} - m_Name: - m_EditorClassIdentifier: - m_BindingMode: 1 - m_FollowOffset: {x: 0, y: 0, z: -10} - m_XDamping: 1 - m_YDamping: 1 - m_ZDamping: 1 - m_AngularDampingMode: 0 - m_PitchDamping: 0 - m_YawDamping: 0 - m_RollDamping: 0 - m_AngularDamping: 0 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_LegacyRadius: 3.4028235e+38 - m_LegacyHeightOffset: 3.4028235e+38 - m_LegacyHeadingBias: 3.4028235e+38 - m_HeadingIsSlave: 1 ---- !u!114 &1564543373 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1564543369} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3} - m_Name: - m_EditorClassIdentifier: + playerGhostReffrenceHub: {fileID: 1551772760} + playerInfoData: {fileID: 0} --- !u!1 &1591108313 GameObject: m_ObjectHideFlags: 0 @@ -2794,239 +2297,6 @@ Transform: m_Father: {fileID: 1793039742} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1615074254 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1615074256} - - component: {fileID: 1615074255} - - component: {fileID: 1615074257} - m_Layer: 0 - m_Name: CM FreeLook1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!114 &1615074255 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1615074254} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 319d2fe34a804e245819465c9505ea59, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - m_LockStageInInspector: - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_CommonLens: 1 - m_Lens: - FieldOfView: 80 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_YAxis: - Value: 0.5 - m_SpeedMode: 0 - m_MaxSpeed: 2 - m_AccelTime: 0.2 - m_DecelTime: 0.1 - m_InputAxisName: Mouse Y - m_InputAxisValue: 0 - m_InvertInput: 0 - m_MinValue: 0 - m_MaxValue: 1 - m_Wrap: 0 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_YAxisRecentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_XAxis: - Value: 0 - m_SpeedMode: 0 - m_MaxSpeed: 300 - m_AccelTime: 0.1 - m_DecelTime: 0.1 - m_InputAxisName: Mouse X - m_InputAxisValue: 0 - m_InvertInput: 1 - m_MinValue: -180 - m_MaxValue: 180 - m_Wrap: 1 - m_Recentering: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_Heading: - m_Definition: 2 - m_VelocityFilterStrength: 4 - m_Bias: 0 - m_RecenterToTargetHeading: - m_enabled: 0 - m_WaitTime: 1 - m_RecenteringTime: 2 - m_LegacyHeadingDefinition: -1 - m_LegacyVelocityFilterStrength: -1 - m_BindingMode: 5 - m_SplineCurvature: 0.2 - m_Orbits: - - m_Height: 4.5 - m_Radius: 1.75 - - m_Height: 2.5 - m_Radius: 3 - - m_Height: 0.4 - m_Radius: 1.3 - m_LegacyHeadingBias: 3.4028235e+38 - m_Rigs: - - {fileID: 1659178891} - - {fileID: 989489470} - - {fileID: 1756702560} ---- !u!4 &1615074256 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1615074254} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -22.697678, y: 4.84, z: -18.96164} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1659178892} - - {fileID: 989489471} - - {fileID: 1756702561} - m_Father: {fileID: 0} - m_RootOrder: 9 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &1615074257 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1615074254} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fb7194dc27b9df64c8beca7482ee8e0d, type: 3} - m_Name: - m_EditorClassIdentifier: - PlayerIndex: -1 - XYAxis: {fileID: -5071585641737908446, guid: 41299b30b984a8149a093185cececee8, type: 3} - ZAxis: {fileID: 0} ---- !u!1 &1659178890 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1659178892} - - component: {fileID: 1659178891} - m_Layer: 0 - m_Name: TopRig - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1659178891 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1659178890} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - - Header - - Extensions - - m_Priority - - m_Transitions - - m_Follow - - m_StandbyUpdate - - m_Lens - m_LockStageInInspector: 00000000 - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 590044016} ---- !u!4 &1659178892 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1659178890} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 22.697678, y: -4.84, z: 18.96164} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 590044016} - m_Father: {fileID: 1615074256} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1681013545 GameObject: m_ObjectHideFlags: 0 @@ -3056,7 +2326,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1551772755} - m_RootOrder: 1 + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1740455084 GameObject: @@ -3094,84 +2364,6 @@ Transform: m_Father: {fileID: 619197886} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1756702559 -GameObject: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1756702561} - - component: {fileID: 1756702560} - m_Layer: 0 - m_Name: BottomRig - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1756702560 -MonoBehaviour: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1756702559} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3} - m_Name: - m_EditorClassIdentifier: - m_ExcludedPropertiesInInspector: - - m_Script - - Header - - Extensions - - m_Priority - - m_Transitions - - m_Follow - - m_StandbyUpdate - - m_Lens - m_LockStageInInspector: 00000000 - m_StreamingVersion: 20170927 - m_Priority: 10 - m_StandbyUpdate: 2 - m_LookAt: {fileID: 0} - m_Follow: {fileID: 0} - m_Lens: - FieldOfView: 40 - OrthographicSize: 10 - NearClipPlane: 0.1 - FarClipPlane: 5000 - Dutch: 0 - ModeOverride: 0 - LensShift: {x: 0, y: 0} - GateFit: 2 - m_SensorSize: {x: 1, y: 1} - m_Transitions: - m_BlendHint: 0 - m_InheritPosition: 0 - m_OnCameraLive: - m_PersistentCalls: - m_Calls: [] - m_LegacyBlendHint: 0 - m_ComponentOwner: {fileID: 35876193} ---- !u!4 &1756702561 -Transform: - m_ObjectHideFlags: 3 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1756702559} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 22.697678, y: -4.84, z: 18.96164} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 35876193} - m_Father: {fileID: 1615074256} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1793039741 GameObject: m_ObjectHideFlags: 0 @@ -3763,16 +2955,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2057082605} - m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} - m_LocalPosition: {x: -30.74, y: 0, z: -57.52} + m_LocalRotation: {x: -0, y: -0.7071068, z: -0, w: 0.7071068} + m_LocalPosition: {x: -945.6266, y: 213.34412, z: -349.9045} m_LocalScale: {x: 1, y: 0.5, z: 0.25} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 970391839} - {fileID: 1199281839} - {fileID: 1067556769} - m_Father: {fileID: 0} - m_RootOrder: 11 + m_Father: {fileID: 188713835} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!1 &2100293015 GameObject: diff --git a/Assets/Scripts/GameEventSystem/GameEventData.cs b/Assets/Scripts/GameEventSystem/GameEventData.cs index ad60701..bae43f3 100644 --- a/Assets/Scripts/GameEventSystem/GameEventData.cs +++ b/Assets/Scripts/GameEventSystem/GameEventData.cs @@ -1,10 +1,6 @@ using System; -using System.Collections; -using System.Collections.Generic; using UnityEngine; using MyBox; -using UnityEditor; -using UnityEditorInternal; using System.Threading.Tasks; [Serializable] diff --git a/Assets/Scripts/Player/Character/Controller/Alive/CharacterMover.cs b/Assets/Scripts/Player/Character/Controller/Alive/CharacterMover.cs index 9d1ef7a..74cf77c 100644 --- a/Assets/Scripts/Player/Character/Controller/Alive/CharacterMover.cs +++ b/Assets/Scripts/Player/Character/Controller/Alive/CharacterMover.cs @@ -34,7 +34,7 @@ namespace TTTSC.Player.Character.Controller.Alive private bool _performingMoveInput; private Vector3 _moveDirection; - private void Awake() + private void Start() { _playerGhostReffrenceHub = GetComponentInParent(); _characterRigidbody = _playerGhostReffrenceHub.characterRigidbody; @@ -48,11 +48,20 @@ namespace TTTSC.Player.Character.Controller.Alive _playerInputReceiver.MoveInputEvent += MoveInput; _playerInputReceiver.JumpInputEvent += JumpInput; + + _characterRigidbody = _playerGhostReffrenceHub.characterRigidbody; } - void Start() + private void OnDisable() { - _characterRigidbody = _playerGhostReffrenceHub.characterRigidbody; + _playerInputReceiver.MoveInputEvent -= MoveInput; + _playerInputReceiver.JumpInputEvent -= JumpInput; + } + + private void OnDestroy() + { + _playerInputReceiver.MoveInputEvent -= MoveInput; + _playerInputReceiver.JumpInputEvent -= JumpInput; } #region Input event listeners diff --git a/Assets/Scripts/Player/Character/Controller/CharacterStateChanger.cs b/Assets/Scripts/Player/Character/Controller/CharacterStateChanger.cs index 0b209ca..b2ebff8 100644 --- a/Assets/Scripts/Player/Character/Controller/CharacterStateChanger.cs +++ b/Assets/Scripts/Player/Character/Controller/CharacterStateChanger.cs @@ -13,15 +13,11 @@ namespace TTTSC.Player.Character.Controller private bool _walkIsPerforming, _crouchIsHeld, _sprintIsPerforming; - private void Awake() + private void Start() { _playerGhostReffrenceHub = GetComponentInParent(); _playerInputReceiver = _playerGhostReffrenceHub.playerInputReceiver; _characterStateMachine = GetComponent(); - } - - private void Start() - { _playerInputReceiver.MoveInputEvent += Walk; _playerInputReceiver.CrouchInputEvent += Crouch; _playerInputReceiver.SprintInputEvent += Sprint; diff --git a/Assets/Scripts/Player/Character/Controller/PlayerInputReceiver.cs b/Assets/Scripts/Player/Character/Controller/PlayerInputReceiver.cs index a979798..93cb477 100644 --- a/Assets/Scripts/Player/Character/Controller/PlayerInputReceiver.cs +++ b/Assets/Scripts/Player/Character/Controller/PlayerInputReceiver.cs @@ -15,9 +15,10 @@ namespace TTTSC.Player.Character.Controller #region SpectatorControls + public event Action SpectatorScrollSpeedInputEvent; public event Action SpectatorSpeedUpInputEvent, SpectatorSlowDownEvent, FlyUpInputEvent, FlyDownInputEvent; bool _spectatorSpeedUpIsHeld, _spectatorSlowDownIsHeld, _flyUpIsHeld, _flyDownIsHeld; - float _spectatorSpeedUpStageValue, _spectatorSlowDownStageValue, _flyUpStageValue, _flyDownStageValue; + float _spectatorFlyFastStageValue, _spectatorFlySlowStageValue, _flyUpStageValue, _flyDownStageValue; #endregion public PlayerInputSender playerInputEvents; @@ -52,8 +53,8 @@ namespace TTTSC.Player.Character.Controller // #region SpectatorControls - playerInputEvents.SpectatorControls.SpeedUp.performed += SpectatorSpeedUp; - playerInputEvents.SpectatorControls.SpeedDown.performed += SpectatorSlowDown; + playerInputEvents.SpectatorControls.FlyFast.performed += SpectatorFlyFast; + playerInputEvents.SpectatorControls.FlySlow.performed += SpectatorFlySlow; playerInputEvents.SpectatorControls.FlyUp.performed += SpectatorFlyUp; playerInputEvents.SpectatorControls.FlyDown.performed += SpectatorFlyDown; @@ -87,8 +88,8 @@ namespace TTTSC.Player.Character.Controller // #region SpectatorControls - playerInputEvents.SpectatorControls.SpeedUp.performed -= SpectatorSpeedUp; - playerInputEvents.SpectatorControls.SpeedDown.performed -= SpectatorSlowDown; + playerInputEvents.SpectatorControls.FlyFast.performed -= SpectatorFlyFast; + playerInputEvents.SpectatorControls.FlySlow.performed -= SpectatorFlySlow; playerInputEvents.SpectatorControls.FlyUp.performed -= SpectatorFlyUp; playerInputEvents.SpectatorControls.FlyDown.performed -= SpectatorFlyDown; @@ -182,6 +183,7 @@ namespace TTTSC.Player.Character.Controller private void FixedUpdate() { + // #region AliveControls playerInputEvents.AliveControls.Sprint.started += ctx => _sprintStageValue = 1; @@ -207,17 +209,17 @@ namespace TTTSC.Player.Character.Controller // #region SpectatorControls - playerInputEvents.SpectatorControls.SpeedUp.started += ctx => _spectatorSpeedUpStageValue = 1; - playerInputEvents.SpectatorControls.SpeedUp.performed += ctx => _spectatorSpeedUpStageValue = 2; - playerInputEvents.SpectatorControls.SpeedUp.canceled += ctx => _spectatorSpeedUpStageValue = 0; + playerInputEvents.SpectatorControls.FlyFast.started += ctx => _spectatorFlyFastStageValue = 1; + playerInputEvents.SpectatorControls.FlyFast.performed += ctx => _spectatorFlyFastStageValue = 2; + playerInputEvents.SpectatorControls.FlyFast.canceled += ctx => _spectatorFlyFastStageValue = 0; - SpectatorSpeedUpInputEvent?.Invoke(_spectatorSpeedUpIsHeld, _spectatorSpeedUpStageValue); + SpectatorSpeedUpInputEvent?.Invoke(_spectatorSpeedUpIsHeld, _spectatorFlyFastStageValue); - playerInputEvents.SpectatorControls.SpeedDown.started += ctx => _spectatorSlowDownStageValue = 1; - playerInputEvents.SpectatorControls.SpeedDown.performed += ctx => _spectatorSlowDownStageValue = 2; - playerInputEvents.SpectatorControls.SpeedDown.canceled += ctx => _spectatorSlowDownStageValue = 0; + playerInputEvents.SpectatorControls.FlySlow.started += ctx => _spectatorFlySlowStageValue = 1; + playerInputEvents.SpectatorControls.FlySlow.performed += ctx => _spectatorFlySlowStageValue = 2; + playerInputEvents.SpectatorControls.FlySlow.canceled += ctx => _spectatorFlySlowStageValue = 0; - SpectatorSlowDownEvent?.Invoke(_spectatorSlowDownIsHeld, _spectatorSlowDownStageValue); + SpectatorSlowDownEvent?.Invoke(_spectatorSlowDownIsHeld, _spectatorFlySlowStageValue); playerInputEvents.SpectatorControls.FlyUp.started += ctx => _flyUpStageValue = 1; playerInputEvents.SpectatorControls.FlyUp.performed += ctx => _flyUpStageValue = 2; @@ -303,14 +305,14 @@ namespace TTTSC.Player.Character.Controller #region SpectatorControls - private void SpectatorSpeedUp(InputAction.CallbackContext ctx) + private void SpectatorFlyFast(InputAction.CallbackContext ctx) { float value = ctx.ReadValue(); _spectatorSpeedUpIsHeld = FloatBool(value, "==", 1); } - private void SpectatorSlowDown(InputAction.CallbackContext ctx) + private void SpectatorFlySlow(InputAction.CallbackContext ctx) { float value = ctx.ReadValue(); diff --git a/Assets/Scripts/Player/Character/Controller/PlayerInputSender.cs b/Assets/Scripts/Player/Character/Controller/PlayerInputSender.cs index d19d8ed..48fb1da 100644 --- a/Assets/Scripts/Player/Character/Controller/PlayerInputSender.cs +++ b/Assets/Scripts/Player/Character/Controller/PlayerInputSender.cs @@ -471,7 +471,7 @@ namespace TTTSC.Player.Character.Controller ""id"": ""2cc562f6-1b6c-4033-b783-2a481ab11dec"", ""actions"": [ { - ""name"": ""SpeedDown"", + ""name"": ""FlyFast"", ""type"": ""PassThrough"", ""id"": ""1e150f46-f771-4738-92fc-2fc13b6697b7"", ""expectedControlType"": ""Button"", @@ -480,7 +480,7 @@ namespace TTTSC.Player.Character.Controller ""initialStateCheck"": false }, { - ""name"": ""SpeedUp"", + ""name"": ""FlySlow"", ""type"": ""PassThrough"", ""id"": ""4ec09521-b697-424d-b042-16c4c355012c"", ""expectedControlType"": ""Button"", @@ -505,6 +505,15 @@ namespace TTTSC.Player.Character.Controller ""processors"": """", ""interactions"": """", ""initialStateCheck"": false + }, + { + ""name"": ""ScrollSpeedControlw"", + ""type"": ""PassThrough"", + ""id"": ""c6404499-255c-4521-abfa-5fb829afd1e0"", + ""expectedControlType"": ""Vector2"", + ""processors"": """", + ""interactions"": """", + ""initialStateCheck"": false } ], ""bindings"": [ @@ -515,7 +524,7 @@ namespace TTTSC.Player.Character.Controller ""interactions"": """", ""processors"": """", ""groups"": ""KeyboardAndMouse"", - ""action"": ""SpeedDown"", + ""action"": ""FlyFast"", ""isComposite"": false, ""isPartOfComposite"": false }, @@ -526,7 +535,7 @@ namespace TTTSC.Player.Character.Controller ""interactions"": """", ""processors"": """", ""groups"": ""Gamepad"", - ""action"": ""SpeedDown"", + ""action"": ""FlyFast"", ""isComposite"": false, ""isPartOfComposite"": false }, @@ -537,7 +546,7 @@ namespace TTTSC.Player.Character.Controller ""interactions"": """", ""processors"": """", ""groups"": ""KeyboardAndMouse"", - ""action"": ""SpeedUp"", + ""action"": ""FlySlow"", ""isComposite"": false, ""isPartOfComposite"": false }, @@ -548,7 +557,7 @@ namespace TTTSC.Player.Character.Controller ""interactions"": """", ""processors"": """", ""groups"": ""Gamepad"", - ""action"": ""SpeedUp"", + ""action"": ""FlySlow"", ""isComposite"": false, ""isPartOfComposite"": false }, @@ -573,6 +582,17 @@ namespace TTTSC.Player.Character.Controller ""action"": ""FlyDown"", ""isComposite"": false, ""isPartOfComposite"": false + }, + { + ""name"": """", + ""id"": ""cd457b70-a6c0-4b36-ae23-a86735c06bee"", + ""path"": ""/scroll"", + ""interactions"": """", + ""processors"": """", + ""groups"": """", + ""action"": ""ScrollSpeedControlw"", + ""isComposite"": false, + ""isPartOfComposite"": false } ] } @@ -631,10 +651,11 @@ namespace TTTSC.Player.Character.Controller m_AliveControls_DropAmmo = m_AliveControls.FindAction("DropAmmo", throwIfNotFound: true); // SpectatorControls m_SpectatorControls = asset.FindActionMap("SpectatorControls", throwIfNotFound: true); - m_SpectatorControls_SpeedDown = m_SpectatorControls.FindAction("SpeedDown", throwIfNotFound: true); - m_SpectatorControls_SpeedUp = m_SpectatorControls.FindAction("SpeedUp", throwIfNotFound: true); + m_SpectatorControls_FlyFast = m_SpectatorControls.FindAction("FlyFast", throwIfNotFound: true); + m_SpectatorControls_FlySlow = m_SpectatorControls.FindAction("FlySlow", throwIfNotFound: true); m_SpectatorControls_FlyUp = m_SpectatorControls.FindAction("FlyUp", throwIfNotFound: true); m_SpectatorControls_FlyDown = m_SpectatorControls.FindAction("FlyDown", throwIfNotFound: true); + m_SpectatorControls_ScrollSpeedControlw = m_SpectatorControls.FindAction("ScrollSpeedControlw", throwIfNotFound: true); } public void Dispose() @@ -848,18 +869,20 @@ namespace TTTSC.Player.Character.Controller // SpectatorControls private readonly InputActionMap m_SpectatorControls; private ISpectatorControlsActions m_SpectatorControlsActionsCallbackInterface; - private readonly InputAction m_SpectatorControls_SpeedDown; - private readonly InputAction m_SpectatorControls_SpeedUp; + private readonly InputAction m_SpectatorControls_FlyFast; + private readonly InputAction m_SpectatorControls_FlySlow; private readonly InputAction m_SpectatorControls_FlyUp; private readonly InputAction m_SpectatorControls_FlyDown; + private readonly InputAction m_SpectatorControls_ScrollSpeedControlw; public struct SpectatorControlsActions { private @PlayerInputSender m_Wrapper; public SpectatorControlsActions(@PlayerInputSender wrapper) { m_Wrapper = wrapper; } - public InputAction @SpeedDown => m_Wrapper.m_SpectatorControls_SpeedDown; - public InputAction @SpeedUp => m_Wrapper.m_SpectatorControls_SpeedUp; + public InputAction @FlyFast => m_Wrapper.m_SpectatorControls_FlyFast; + public InputAction @FlySlow => m_Wrapper.m_SpectatorControls_FlySlow; public InputAction @FlyUp => m_Wrapper.m_SpectatorControls_FlyUp; public InputAction @FlyDown => m_Wrapper.m_SpectatorControls_FlyDown; + public InputAction @ScrollSpeedControlw => m_Wrapper.m_SpectatorControls_ScrollSpeedControlw; public InputActionMap Get() { return m_Wrapper.m_SpectatorControls; } public void Enable() { Get().Enable(); } public void Disable() { Get().Disable(); } @@ -869,34 +892,40 @@ namespace TTTSC.Player.Character.Controller { if (m_Wrapper.m_SpectatorControlsActionsCallbackInterface != null) { - @SpeedDown.started -= m_Wrapper.m_SpectatorControlsActionsCallbackInterface.OnSpeedDown; - @SpeedDown.performed -= m_Wrapper.m_SpectatorControlsActionsCallbackInterface.OnSpeedDown; - @SpeedDown.canceled -= m_Wrapper.m_SpectatorControlsActionsCallbackInterface.OnSpeedDown; - @SpeedUp.started -= m_Wrapper.m_SpectatorControlsActionsCallbackInterface.OnSpeedUp; - @SpeedUp.performed -= m_Wrapper.m_SpectatorControlsActionsCallbackInterface.OnSpeedUp; - @SpeedUp.canceled -= m_Wrapper.m_SpectatorControlsActionsCallbackInterface.OnSpeedUp; + @FlyFast.started -= m_Wrapper.m_SpectatorControlsActionsCallbackInterface.OnFlyFast; + @FlyFast.performed -= m_Wrapper.m_SpectatorControlsActionsCallbackInterface.OnFlyFast; + @FlyFast.canceled -= m_Wrapper.m_SpectatorControlsActionsCallbackInterface.OnFlyFast; + @FlySlow.started -= m_Wrapper.m_SpectatorControlsActionsCallbackInterface.OnFlySlow; + @FlySlow.performed -= m_Wrapper.m_SpectatorControlsActionsCallbackInterface.OnFlySlow; + @FlySlow.canceled -= m_Wrapper.m_SpectatorControlsActionsCallbackInterface.OnFlySlow; @FlyUp.started -= m_Wrapper.m_SpectatorControlsActionsCallbackInterface.OnFlyUp; @FlyUp.performed -= m_Wrapper.m_SpectatorControlsActionsCallbackInterface.OnFlyUp; @FlyUp.canceled -= m_Wrapper.m_SpectatorControlsActionsCallbackInterface.OnFlyUp; @FlyDown.started -= m_Wrapper.m_SpectatorControlsActionsCallbackInterface.OnFlyDown; @FlyDown.performed -= m_Wrapper.m_SpectatorControlsActionsCallbackInterface.OnFlyDown; @FlyDown.canceled -= m_Wrapper.m_SpectatorControlsActionsCallbackInterface.OnFlyDown; + @ScrollSpeedControlw.started -= m_Wrapper.m_SpectatorControlsActionsCallbackInterface.OnScrollSpeedControlw; + @ScrollSpeedControlw.performed -= m_Wrapper.m_SpectatorControlsActionsCallbackInterface.OnScrollSpeedControlw; + @ScrollSpeedControlw.canceled -= m_Wrapper.m_SpectatorControlsActionsCallbackInterface.OnScrollSpeedControlw; } m_Wrapper.m_SpectatorControlsActionsCallbackInterface = instance; if (instance != null) { - @SpeedDown.started += instance.OnSpeedDown; - @SpeedDown.performed += instance.OnSpeedDown; - @SpeedDown.canceled += instance.OnSpeedDown; - @SpeedUp.started += instance.OnSpeedUp; - @SpeedUp.performed += instance.OnSpeedUp; - @SpeedUp.canceled += instance.OnSpeedUp; + @FlyFast.started += instance.OnFlyFast; + @FlyFast.performed += instance.OnFlyFast; + @FlyFast.canceled += instance.OnFlyFast; + @FlySlow.started += instance.OnFlySlow; + @FlySlow.performed += instance.OnFlySlow; + @FlySlow.canceled += instance.OnFlySlow; @FlyUp.started += instance.OnFlyUp; @FlyUp.performed += instance.OnFlyUp; @FlyUp.canceled += instance.OnFlyUp; @FlyDown.started += instance.OnFlyDown; @FlyDown.performed += instance.OnFlyDown; @FlyDown.canceled += instance.OnFlyDown; + @ScrollSpeedControlw.started += instance.OnScrollSpeedControlw; + @ScrollSpeedControlw.performed += instance.OnScrollSpeedControlw; + @ScrollSpeedControlw.canceled += instance.OnScrollSpeedControlw; } } } @@ -940,10 +969,11 @@ namespace TTTSC.Player.Character.Controller } public interface ISpectatorControlsActions { - void OnSpeedDown(InputAction.CallbackContext context); - void OnSpeedUp(InputAction.CallbackContext context); + void OnFlyFast(InputAction.CallbackContext context); + void OnFlySlow(InputAction.CallbackContext context); void OnFlyUp(InputAction.CallbackContext context); void OnFlyDown(InputAction.CallbackContext context); + void OnScrollSpeedControlw(InputAction.CallbackContext context); } } } diff --git a/Assets/Scripts/Player/Character/Controller/Spectator/SpectatorMover.cs b/Assets/Scripts/Player/Character/Controller/Spectator/SpectatorMover.cs index 16ec196..58ca3bb 100644 --- a/Assets/Scripts/Player/Character/Controller/Spectator/SpectatorMover.cs +++ b/Assets/Scripts/Player/Character/Controller/Spectator/SpectatorMover.cs @@ -22,8 +22,7 @@ namespace TTTSC.Player.Character.Controller private bool _performingMoveInput; private Vector2 _moveDirection; - // Awake is called before the first frame - void Awake() + private void Start() { _playerGhostReffrenceHub = GetComponentInParent(); _cameraTransform = _playerGhostReffrenceHub.cameraTransform; @@ -32,7 +31,20 @@ namespace TTTSC.Player.Character.Controller _playerInputReceiver.MoveInputEvent += MoveInput; _playerInputReceiver.FlyUpInputEvent += FlyUpInput; _playerInputReceiver.FlyDownInputEvent += FlyDownInput; + } + private void OnDisable() + { + _playerInputReceiver.MoveInputEvent -= MoveInput; + _playerInputReceiver.FlyUpInputEvent -= FlyUpInput; + _playerInputReceiver.FlyDownInputEvent -= FlyDownInput; + } + + private void OnDestroy() + { + _playerInputReceiver.MoveInputEvent -= MoveInput; + _playerInputReceiver.FlyUpInputEvent -= FlyUpInput; + _playerInputReceiver.FlyDownInputEvent -= FlyDownInput; } // Update is called once per frame diff --git a/Assets/Scripts/Player/Character/PlayerGhost.cs b/Assets/Scripts/Player/Character/PlayerGhost.cs index 5cc3118..6932e4a 100644 --- a/Assets/Scripts/Player/Character/PlayerGhost.cs +++ b/Assets/Scripts/Player/Character/PlayerGhost.cs @@ -6,14 +6,16 @@ namespace TTTSC.Player.Character { public class PlayerGhost : MonoBehaviour { - public PlayerGhostReffrenceHub _playerGhostReffrenceHub; - public int shoopCoins; + [SerializeField] + private PlayerGhostReffrenceHub playerGhostReffrenceHub; + [SerializeField] + public PlayerInfo.PlayerInfoData playerInfoData; // Start is called before the first frame update - void Start() + void Awake() { - + playerInfoData = ScriptableObject.CreateInstance(); } // Update is called once per frame diff --git a/Assets/Scripts/Player/Character/PlayerGhostReffrenceHub.cs b/Assets/Scripts/Player/Character/PlayerGhostReffrenceHub.cs index dcaf9f8..59de739 100644 --- a/Assets/Scripts/Player/Character/PlayerGhostReffrenceHub.cs +++ b/Assets/Scripts/Player/Character/PlayerGhostReffrenceHub.cs @@ -8,6 +8,7 @@ namespace TTTSC.Player.Character public Rigidbody characterRigidbody; public Transform cameraTransform; [Header("----------Scripts-----------")] + public PlayerGhost playerGhost; public PlayerStateEnforcer playerStateEnforcrer; public PlayerStateMachine playerStateMachine; public Controller.PlayerInputReceiver playerInputReceiver; diff --git a/Assets/Scripts/Player/Character/PlayerInfo.meta b/Assets/Scripts/Player/Character/PlayerInfo.meta new file mode 100644 index 0000000..61c7a81 --- /dev/null +++ b/Assets/Scripts/Player/Character/PlayerInfo.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 87339120655d19d42a1007274a98a866 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/Character/PlayerInfo/PlayerInfoData.cs b/Assets/Scripts/Player/Character/PlayerInfo/PlayerInfoData.cs new file mode 100644 index 0000000..9728f6b --- /dev/null +++ b/Assets/Scripts/Player/Character/PlayerInfo/PlayerInfoData.cs @@ -0,0 +1,17 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +namespace TTTSC.Player.Character.PlayerInfo +{ + [CreateAssetMenu(menuName = "TTTSC/Player/Character/Player Info")] + public class PlayerInfoData : ScriptableObject + { + public int helth; + public int armor; + + public PlayerStateMachine.playerPlayStates currentPlayerPlayState; + + public PlayerStateMachine.playerClass currentPlayerClass; + } +} \ No newline at end of file diff --git a/Assets/Scripts/Player/Character/PlayerInfo/PlayerInfoData.cs.meta b/Assets/Scripts/Player/Character/PlayerInfo/PlayerInfoData.cs.meta new file mode 100644 index 0000000..0282a82 --- /dev/null +++ b/Assets/Scripts/Player/Character/PlayerInfo/PlayerInfoData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: e5e7e3247b0f48746b86aa879cc08a47 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/Character/PlayerInfo/RoleData.cs b/Assets/Scripts/Player/Character/PlayerInfo/RoleData.cs new file mode 100644 index 0000000..7501871 --- /dev/null +++ b/Assets/Scripts/Player/Character/PlayerInfo/RoleData.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +[CreateAssetMenu(menuName = "TTTSC/Player/Character/Role")] +public class RoleData : ScriptableObject +{ + public string roleName; + public int roleId; + public Color roleColor; + + public enum RoleTeam + { + Innocent, + Traitor + } + + public RoleTeam roleTeam; +} diff --git a/Assets/Scripts/Player/Character/PlayerInfo/RoleData.cs.meta b/Assets/Scripts/Player/Character/PlayerInfo/RoleData.cs.meta new file mode 100644 index 0000000..5399591 --- /dev/null +++ b/Assets/Scripts/Player/Character/PlayerInfo/RoleData.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ffe32805eb7bde24bb85bb43c12614e6 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/Character/PlayerStateEnforcer.cs b/Assets/Scripts/Player/Character/PlayerStateEnforcer.cs index c4c9336..b02889f 100644 --- a/Assets/Scripts/Player/Character/PlayerStateEnforcer.cs +++ b/Assets/Scripts/Player/Character/PlayerStateEnforcer.cs @@ -2,40 +2,53 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace TTTSC.Player +namespace TTTSC.Player.Character { public class PlayerStateEnforcer : MonoBehaviour { - private PlayerStateMachine _playerStateMachine; + [SerializeField] + private PlayerGhostReffrenceHub _playerGhostReffrenceHub; + [SerializeField] + private PlayerInfo.PlayerInfoData _playerInfoData; + private PlayerGhost _playerGhost; + private Rigidbody _characterRigidbody; [SerializeField][Tooltip("assign the 'alive' prefab here")] - private GameObject alivePlayerPrefab; - private GameObject spectatorPlayerPrefab; + private GameObject _aliveBodyPrefab; + [SerializeField][Tooltip("assign the 'dead' prefab here")] + private GameObject _spectatorBodyPrefab; + private GameObject _aliveBody; + private GameObject _spectatorBody; + + private void Start() + { + _playerGhost = _playerGhostReffrenceHub.playerGhost; + _playerInfoData = _playerGhost.playerInfoData; + _characterRigidbody = _playerGhostReffrenceHub.characterRigidbody; + CheckPlayerState(); + } void CheckPlayerState() { - switch (_playerStateMachine.currentPlayerPlayState) + switch (_playerInfoData.currentPlayerPlayState) { case PlayerStateMachine.playerPlayStates.Spectator: - //add logic for turning player in to a spectator + SpawnSpectatorPlayerBody(); + _characterRigidbody.useGravity = false; break; case PlayerStateMachine.playerPlayStates.Alive: - //add logic for making player "alive" - //basicaly just reset player's stats + SpawnAlivePlayerBody(); + _characterRigidbody.useGravity = true; break; } } void CheckPlayerClass() { - switch (_playerStateMachine.currentPlayerClass) + switch (_playerInfoData.currentPlayerClass) { - case PlayerStateMachine.playerClass.Spectator: - //this class is used when player excedes the max AFK time before being turned in to a spectator - //or when player just wants to spactate the game. - break; case PlayerStateMachine.playerClass.Preparing: - //this is the default class for everyone right before the round starts + //this is the default class for everyone before the round starts break; case PlayerStateMachine.playerClass.Innocent: //TODO @@ -49,14 +62,33 @@ namespace TTTSC.Player } } - void SpawnPlayerBody() + void SpawnAlivePlayerBody() { + _playerInfoData.helth = 100; + if (_spectatorBody != null) + { + Destroy(_spectatorBody); + } + _aliveBody = Instantiate(_aliveBodyPrefab, transform.position, transform.rotation); + _aliveBody.transform.SetParent(transform); } - void SpawnPlayerRagdoll() + void SpawnSpectatorPlayerBody() { + if (_aliveBody != null) + { + Destroy(_aliveBody); + SpawnDeadBody(); + } + _spectatorBody = Instantiate(_spectatorBodyPrefab, transform.position, transform.rotation); + _spectatorBody.transform.SetParent(transform); + } + + void SpawnDeadBody() + { + //Add logic for spawning ragdoll and the dead body } } } \ No newline at end of file diff --git a/Assets/Scripts/Player/Character/PlayerStateMachine.cs b/Assets/Scripts/Player/Character/PlayerStateMachine.cs index 548951c..ad7063c 100644 --- a/Assets/Scripts/Player/Character/PlayerStateMachine.cs +++ b/Assets/Scripts/Player/Character/PlayerStateMachine.cs @@ -2,28 +2,24 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; -namespace TTTSC.Player +namespace TTTSC.Player.Character { public class PlayerStateMachine : MonoBehaviour { public enum playerPlayStates { - Spectator, - Alive + Alive, + Spectator }; - public playerPlayStates currentPlayerPlayState; - public enum playerClass { - Spectator, Preparing, Innocent, Detective, Traitor }; - public playerClass currentPlayerClass; } } diff --git a/Assets/Scripts/Player/Character/UI.meta b/Assets/Scripts/Player/Character/UI.meta new file mode 100644 index 0000000..c9b3247 --- /dev/null +++ b/Assets/Scripts/Player/Character/UI.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 6ed8dc1605db3094b8948f3b0685e58a +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/Character/UI/AliveUi.cs b/Assets/Scripts/Player/Character/UI/AliveUi.cs new file mode 100644 index 0000000..978989c --- /dev/null +++ b/Assets/Scripts/Player/Character/UI/AliveUi.cs @@ -0,0 +1,36 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.UI; +using TMPro; + +namespace TTTSC.Player.Character +{ + public class AliveUi : MonoBehaviour + { + private PlayerGhostReffrenceHub _playerGhostReffrenceHub; + private PlayerGhost _playerGhost; + private PlayerInfo.PlayerInfoData _playerInfoData; + [SerializeField] + private TMP_Text _healthDisplay; + private TMP_Text _roleDisplay; + [SerializeField] + private Slider _healthBar; + + // Start is called before the first frame update + void Start() + { + _playerGhostReffrenceHub = GetComponentInParent(); + _playerGhost = _playerGhostReffrenceHub.playerGhost; + _playerInfoData = _playerGhost.playerInfoData; + } + + // Update is called once per frame + void Update() + { + _healthDisplay.text = _playerInfoData.helth.ToString(); + _healthBar.value = _playerInfoData.helth; + } + } +} + diff --git a/Assets/Scripts/Player/Character/UI/AliveUi.cs.meta b/Assets/Scripts/Player/Character/UI/AliveUi.cs.meta new file mode 100644 index 0000000..f3520b0 --- /dev/null +++ b/Assets/Scripts/Player/Character/UI/AliveUi.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 081c9ad28f2a28443a0b9bb2fed1da05 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/BurstAotSettings_StandaloneWindows.json b/ProjectSettings/BurstAotSettings_StandaloneWindows.json index 2144f6d..e02ae33 100644 --- a/ProjectSettings/BurstAotSettings_StandaloneWindows.json +++ b/ProjectSettings/BurstAotSettings_StandaloneWindows.json @@ -1,6 +1,6 @@ { "MonoBehaviour": { - "Version": 3, + "Version": 4, "EnableBurstCompilation": true, "EnableOptimisations": true, "EnableSafetyChecks": false, @@ -11,6 +11,7 @@ "CpuMinTargetX64": 0, "CpuMaxTargetX64": 0, "CpuTargetsX32": 6, - "CpuTargetsX64": 72 + "CpuTargetsX64": 72, + "OptimizeFor": 0 } } diff --git a/ProjectSettings/CommonBurstAotSettings.json b/ProjectSettings/CommonBurstAotSettings.json index 3dffdba..0293daf 100644 --- a/ProjectSettings/CommonBurstAotSettings.json +++ b/ProjectSettings/CommonBurstAotSettings.json @@ -1,6 +1,6 @@ { "MonoBehaviour": { - "Version": 3, + "Version": 4, "DisabledWarnings": "" } } diff --git a/ProjectSettings/TimelineSettings.asset b/ProjectSettings/TimelineSettings.asset new file mode 100644 index 0000000..cfaebd7 --- /dev/null +++ b/ProjectSettings/TimelineSettings.asset @@ -0,0 +1,16 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &1 +MonoBehaviour: + m_ObjectHideFlags: 61 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a287be6c49135cd4f9b2b8666c39d999, type: 3} + m_Name: + m_EditorClassIdentifier: + assetDefaultFramerate: 60 + m_DefaultFrameRate: 60