diff --git a/Assets/_Content/Models/Characters/Bot/Animations/bot.controller b/Assets/_Content/Models/Characters/Bot/Animations/bot.controller index a4bb395..87c2688 100644 --- a/Assets/_Content/Models/Characters/Bot/Animations/bot.controller +++ b/Assets/_Content/Models/Characters/Bot/Animations/bot.controller @@ -127,7 +127,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: looe + m_Name: lose m_Speed: 1 m_CycleOffset: 0 m_Transitions: [] diff --git a/Assets/_Content/Models/Characters/Bot/Sources/bot.fbx b/Assets/_Content/Models/Characters/Bot/Sources/bot.fbx index 2c1e236..0ba2d0b 100644 --- a/Assets/_Content/Models/Characters/Bot/Sources/bot.fbx +++ b/Assets/_Content/Models/Characters/Bot/Sources/bot.fbx @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:315ba34fc29677d5fcc6791f242553a05fe0b47443738a2863fac0bc6e0ec701 -size 797056 +oid sha256:8c267eca01e65aac8b9ea4ac3df3f577527e27c84b5cfae088f8cd5f499d0e8f +size 802080 diff --git a/Assets/_Content/Prefabs/Player.prefab b/Assets/_Content/Prefabs/Player.prefab new file mode 100644 index 0000000..1901203 --- /dev/null +++ b/Assets/_Content/Prefabs/Player.prefab @@ -0,0 +1,410 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &886772969514976338 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1662003535732374871} + m_Layer: 0 + m_Name: RocketOrigin + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &1662003535732374871 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 886772969514976338} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.0333, z: 0} + m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 2592525053918716320} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &2655230295984012906 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 232018979661267359} + - component: {fileID: 3549797287168068031} + - component: {fileID: 8598809244101507902} + - component: {fileID: 6639460185623605846} + m_Layer: 0 + m_Name: Player + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &232018979661267359 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2655230295984012906} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 976033826937375306} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!143 &3549797287168068031 +CharacterController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2655230295984012906} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Height: 1.2 + m_Radius: 0.35 + m_SlopeLimit: 45 + m_StepOffset: 0.3 + m_SkinWidth: 0.08 + m_MinMoveDistance: 0.001 + m_Center: {x: 0, y: 0.68, z: 0} +--- !u!114 &8598809244101507902 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2655230295984012906} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: edfeb0b45c53d0a4b822d757c7a7aa80, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::Player + _settings: + WalkSpeed: 15 + RunSpeed: 30 + JumpForce: 8 + RotationSpeed: 10 + GroundTolerance: 0.2 + GroundLayer: + serializedVersion: 2 + m_Bits: 64 + DeathLayer: + serializedVersion: 2 + m_Bits: 256 + ExtraForcesDrag: 8 + StateLogs: 0 + WallRun: + CanRunOnWalls: 1 + WallLayer: + serializedVersion: 2 + m_Bits: 128 + StickDuration: 3 + StickedGravity: -5 + _references: + Controller: {fileID: 3549797287168068031} + InputActions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} + _state: + CurrentState: 0 + IsPaused: 0 + IsStickedToWall: 0 + CanStickToWalls: 0 + Running: 0 + AnimationCenter: 0 + StickedTime: 0 + Velocity: {x: 0, y: 0, z: 0} + Ground: {fileID: 0} +--- !u!114 &6639460185623605846 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2655230295984012906} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 49dc81798e7cf0e49a7711d9fbe04cfb, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::PlayerRockerLauncher + _settings: + InfiniteAmo: 1 + _references: + InputActions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} + RocketPrefab: {fileID: 2436197850869798173, guid: 3a9cec4651de297468e58cfec6662a0b, type: 3} + LauncherMesh: {fileID: 1105882668151863864} + HatchJoint: {fileID: 4161410122587910839} + RootJoint: {fileID: 1829310025744159904} + YawJoint: {fileID: 1846035206279843412} + PitchJoint: {fileID: 2592525053918716320} + RocketOrigin: {fileID: 1662003535732374871} + _state: + RocketCount: 0 +--- !u!1001 &7837648570767575713 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 232018979661267359} + m_Modifications: + - target: {fileID: 268460015814896494, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -15.164258 + objectReference: {fileID: 0} + - target: {fileID: 515651249267132972, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -2.1471262 + objectReference: {fileID: 0} + - target: {fileID: 515651249267132972, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -78.473274 + objectReference: {fileID: 0} + - target: {fileID: 515651249267132972, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -17.946148 + objectReference: {fileID: 0} + - target: {fileID: 1023976236318260526, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 19.022964 + objectReference: {fileID: 0} + - target: {fileID: 1085018038773518629, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 2.2170444 + objectReference: {fileID: 0} + - target: {fileID: 1196437872353818382, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 2.1471004 + objectReference: {fileID: 0} + - target: {fileID: 1196437872353818382, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -0.6677202 + objectReference: {fileID: 0} + - target: {fileID: 1196437872353818382, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 162.05385 + objectReference: {fileID: 0} + - target: {fileID: 1359220671651305999, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1359220671651305999, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -14.294655 + objectReference: {fileID: 0} + - target: {fileID: 1359220671651305999, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1926761924806370936, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 2.2170444 + objectReference: {fileID: 0} + - target: {fileID: 3796740718803257271, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 13.271196 + objectReference: {fileID: 0} + - target: {fileID: 3796740718803257271, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -58.92919 + objectReference: {fileID: 0} + - target: {fileID: 3796740718803257271, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 58.843697 + objectReference: {fileID: 0} + - target: {fileID: 4621082995820886609, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: -15.164258 + objectReference: {fileID: 0} + - target: {fileID: 5732306035247200757, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 19.022953 + objectReference: {fileID: 0} + - target: {fileID: 6268899434028451206, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_Avatar + value: + objectReference: {fileID: 0} + - target: {fileID: 6268899434028451206, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_WarningMessage + value: + objectReference: {fileID: 0} + - target: {fileID: 7011957565800906987, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7011957565800906987, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7011957565800906987, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7011957565800906987, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7011957565800906987, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7011957565800906987, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7011957565800906987, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7011957565800906987, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7011957565800906987, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7011957565800906987, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7177622575231594649, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7257265485733381636, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: -13.271184 + objectReference: {fileID: 0} + - target: {fileID: 7257265485733381636, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0.08320768 + objectReference: {fileID: 0} + - target: {fileID: 7257265485733381636, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0.16870025 + objectReference: {fileID: 0} + - target: {fileID: 7639418806218873425, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + propertyPath: m_Name + value: Bot + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 5710164197763132161, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + insertIndex: -1 + addedObject: {fileID: 1662003535732374871} + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 7639418806218873425, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + insertIndex: -1 + addedObject: {fileID: 6474252187578256928} + m_SourcePrefab: {fileID: 100100000, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} +--- !u!1 &486460454536630512 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7639418806218873425, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + m_PrefabInstance: {fileID: 7837648570767575713} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6474252187578256928 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 486460454536630512} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 93c878c5a040b354b810ab5d574d7dc6, type: 3} + m_Name: + m_EditorClassIdentifier: Assembly-CSharp::PlayerAnimation + _references: + Anim: {fileID: 4196071771211484967} + _stateMapper: + - PlayerState: 0 + AnimatorState: move + BlockingState: + Trigger: trigger_move + - PlayerState: 1 + AnimatorState: move + BlockingState: + Trigger: trigger_move + - PlayerState: 2 + AnimatorState: jump + BlockingState: fall + Trigger: trigger_jump + - PlayerState: 3 + AnimatorState: fall + BlockingState: jump + Trigger: trigger_fall + - PlayerState: 4 + AnimatorState: stun + BlockingState: + Trigger: trigger_stun + - PlayerState: 5 + AnimatorState: eliminate + BlockingState: + Trigger: trigger_eliminate + - PlayerState: 6 + AnimatorState: lose + BlockingState: + Trigger: trigger_lose + - PlayerState: 7 + AnimatorState: win + BlockingState: + Trigger: trigger_win +--- !u!4 &976033826937375306 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7011957565800906987, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + m_PrefabInstance: {fileID: 7837648570767575713} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1105882668151863864 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 7177622575231594649, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + m_PrefabInstance: {fileID: 7837648570767575713} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1829310025744159904 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8478000046786846209, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + m_PrefabInstance: {fileID: 7837648570767575713} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1846035206279843412 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8456217366200567029, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + m_PrefabInstance: {fileID: 7837648570767575713} + m_PrefabAsset: {fileID: 0} +--- !u!4 &2592525053918716320 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5710164197763132161, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + m_PrefabInstance: {fileID: 7837648570767575713} + m_PrefabAsset: {fileID: 0} +--- !u!4 &4161410122587910839 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6126205751101896726, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + m_PrefabInstance: {fileID: 7837648570767575713} + m_PrefabAsset: {fileID: 0} +--- !u!95 &4196071771211484967 stripped +Animator: + m_CorrespondingSourceObject: {fileID: 6268899434028451206, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} + m_PrefabInstance: {fileID: 7837648570767575713} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/_Content/Prefabs/Player.prefab.meta b/Assets/_Content/Prefabs/Player.prefab.meta new file mode 100644 index 0000000..81fbfa1 --- /dev/null +++ b/Assets/_Content/Prefabs/Player.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: d8fb485c76a17d24cbc1041fb5f07452 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/_Content/Scenes/Player.unity b/Assets/_Content/Scenes/Player.unity index f608b4a..ebdd5cf 100644 --- a/Assets/_Content/Scenes/Player.unity +++ b/Assets/_Content/Scenes/Player.unity @@ -9009,137 +9009,11 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1215103923} m_Mesh: {fileID: 89712945287117100, guid: 3d620c9bb0ffa294392346026c6ab8cf, type: 3} ---- !u!1 &1241925580 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1241925581} - - component: {fileID: 1241925582} - - component: {fileID: 1241925583} - - component: {fileID: 1241925584} - m_Layer: 0 - m_Name: Player - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1241925581 +--- !u!4 &1241925581 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 232018979661267359, guid: d8fb485c76a17d24cbc1041fb5f07452, type: 3} + m_PrefabInstance: {fileID: 7509459121321357906} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1241925580} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.060596474, y: 1.1800001, z: 3.8179} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1297534484} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!143 &1241925582 -CharacterController: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1241925580} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 3 - m_Height: 1.2 - m_Radius: 0.35 - m_SlopeLimit: 45 - m_StepOffset: 0.3 - m_SkinWidth: 0.08 - m_MinMoveDistance: 0.001 - m_Center: {x: 0, y: 0.68, z: 0} ---- !u!114 &1241925583 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1241925580} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: edfeb0b45c53d0a4b822d757c7a7aa80, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::Player - _settings: - WalkSpeed: 15 - RunSpeed: 30 - JumpForce: 8 - RotationSpeed: 10 - GroundTolerance: 0.2 - GroundLayer: - serializedVersion: 2 - m_Bits: 64 - DeathLayer: - serializedVersion: 2 - m_Bits: 256 - ExtraForcesDrag: 8 - StateLogs: 0 - WallRun: - CanRunOnWalls: 1 - WallLayer: - serializedVersion: 2 - m_Bits: 128 - StickDuration: 3 - StickedGravity: -5 - _references: - Controller: {fileID: 1241925582} - InputActions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} - _state: - CurrentState: 0 - IsPaused: 0 - IsStickedToWall: 0 - CanStickToWalls: 0 - Running: 0 - AnimationCenter: 0 - StickedTime: 0 - Velocity: {x: 0, y: 0, z: 0} - Ground: {fileID: 0} ---- !u!114 &1241925584 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1241925580} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 49dc81798e7cf0e49a7711d9fbe04cfb, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::PlayerRockerLauncher - _settings: - InfiniteAmo: 1 - _references: - InputActions: {fileID: -944628639613478452, guid: 052faaac586de48259a63d0c4782560b, type: 3} - RocketPrefab: {fileID: 2436197850869798173, guid: 3a9cec4651de297468e58cfec6662a0b, type: 3} - LauncherMesh: {fileID: 1983512537} - HatchJoint: {fileID: 1983512538} - RootJoint: {fileID: 1983512536} - YawJoint: {fileID: 1983512535} - PitchJoint: {fileID: 1983512534} - RocketOrigin: {fileID: 1674411728} - _state: - RocketCount: 0 --- !u!1 &1255611636 GameObject: m_ObjectHideFlags: 0 @@ -9631,68 +9505,6 @@ Transform: m_Children: [] m_Father: {fileID: 987553818} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1297534483 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7639418806218873425, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - m_PrefabInstance: {fileID: 1983512533} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1297534484 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 7011957565800906987, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - m_PrefabInstance: {fileID: 1983512533} - m_PrefabAsset: {fileID: 0} ---- !u!95 &1297534485 stripped -Animator: - m_CorrespondingSourceObject: {fileID: 6268899434028451206, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - m_PrefabInstance: {fileID: 1983512533} - m_PrefabAsset: {fileID: 0} ---- !u!114 &1297534486 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1297534483} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 93c878c5a040b354b810ab5d574d7dc6, type: 3} - m_Name: - m_EditorClassIdentifier: Assembly-CSharp::PlayerAnimation - _references: - Anim: {fileID: 1297534485} - _stateMapper: - - PlayerState: 0 - AnimatorState: move - BlockingState: - Trigger: trigger_move - - PlayerState: 1 - AnimatorState: move - BlockingState: - Trigger: trigger_move - - PlayerState: 2 - AnimatorState: jump - BlockingState: fall - Trigger: trigger_jump - - PlayerState: 3 - AnimatorState: fall - BlockingState: jump - Trigger: trigger_fall - - PlayerState: 4 - AnimatorState: stun - BlockingState: - Trigger: trigger_stun - - PlayerState: 5 - AnimatorState: eliminate - BlockingState: - Trigger: trigger_eliminate - - PlayerState: 6 - AnimatorState: lose - BlockingState: - Trigger: trigger_lose - - PlayerState: 7 - AnimatorState: win - BlockingState: - Trigger: trigger_win --- !u!1001 &1299451869 PrefabInstance: m_ObjectHideFlags: 0 @@ -11419,37 +11231,6 @@ Transform: m_Children: [] m_Father: {fileID: 987553818} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1674411727 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1674411728} - m_Layer: 0 - m_Name: RocketOrigin - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1674411728 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1674411727} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.0333, z: 0} - m_LocalScale: {x: 0.25, y: 0.25, z: 0.25} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1983512534} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1685812789 GameObject: m_ObjectHideFlags: 0 @@ -13184,190 +12965,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1957617751} m_Mesh: {fileID: 89712945287117100, guid: 3d620c9bb0ffa294392346026c6ab8cf, type: 3} ---- !u!1001 &1983512533 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 1241925581} - m_Modifications: - - target: {fileID: 268460015814896494, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -15.164258 - objectReference: {fileID: 0} - - target: {fileID: 515651249267132972, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -2.1471262 - objectReference: {fileID: 0} - - target: {fileID: 515651249267132972, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -78.473274 - objectReference: {fileID: 0} - - target: {fileID: 515651249267132972, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -17.946148 - objectReference: {fileID: 0} - - target: {fileID: 1023976236318260526, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 19.022964 - objectReference: {fileID: 0} - - target: {fileID: 1085018038773518629, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 2.2170444 - objectReference: {fileID: 0} - - target: {fileID: 1196437872353818382, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 2.1471004 - objectReference: {fileID: 0} - - target: {fileID: 1196437872353818382, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -0.6677202 - objectReference: {fileID: 0} - - target: {fileID: 1196437872353818382, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 162.05385 - objectReference: {fileID: 0} - - target: {fileID: 1359220671651305999, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1359220671651305999, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -14.294655 - objectReference: {fileID: 0} - - target: {fileID: 1359220671651305999, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1926761924806370936, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 2.2170444 - objectReference: {fileID: 0} - - target: {fileID: 3796740718803257271, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 13.271196 - objectReference: {fileID: 0} - - target: {fileID: 3796740718803257271, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -58.92919 - objectReference: {fileID: 0} - - target: {fileID: 3796740718803257271, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 58.843697 - objectReference: {fileID: 0} - - target: {fileID: 4621082995820886609, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: -15.164258 - objectReference: {fileID: 0} - - target: {fileID: 5732306035247200757, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 19.022953 - objectReference: {fileID: 0} - - target: {fileID: 6268899434028451206, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_Avatar - value: - objectReference: {fileID: 0} - - target: {fileID: 6268899434028451206, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_WarningMessage - value: - objectReference: {fileID: 0} - - target: {fileID: 7011957565800906987, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7011957565800906987, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7011957565800906987, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7011957565800906987, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7011957565800906987, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7011957565800906987, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7011957565800906987, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7011957565800906987, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7011957565800906987, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7011957565800906987, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7177622575231594649, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7257265485733381636, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: -13.271184 - objectReference: {fileID: 0} - - target: {fileID: 7257265485733381636, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0.08320768 - objectReference: {fileID: 0} - - target: {fileID: 7257265485733381636, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0.16870025 - objectReference: {fileID: 0} - - target: {fileID: 7639418806218873425, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - propertyPath: m_Name - value: Bot - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: - - targetCorrespondingSourceObject: {fileID: 5710164197763132161, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - insertIndex: -1 - addedObject: {fileID: 1674411728} - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 7639418806218873425, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - insertIndex: -1 - addedObject: {fileID: 1297534486} - m_SourcePrefab: {fileID: 100100000, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} ---- !u!4 &1983512534 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 5710164197763132161, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - m_PrefabInstance: {fileID: 1983512533} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1983512535 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8456217366200567029, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - m_PrefabInstance: {fileID: 1983512533} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1983512536 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8478000046786846209, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - m_PrefabInstance: {fileID: 1983512533} - m_PrefabAsset: {fileID: 0} ---- !u!1 &1983512537 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 7177622575231594649, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - m_PrefabInstance: {fileID: 1983512533} - m_PrefabAsset: {fileID: 0} ---- !u!4 &1983512538 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 1922065289920262768, guid: dce89e082ea7b9c48ab0fe0f0d38f147, type: 3} - m_PrefabInstance: {fileID: 1983512533} - m_PrefabAsset: {fileID: 0} --- !u!1 &1997368252 GameObject: m_ObjectHideFlags: 0 @@ -13856,6 +13453,63 @@ PrefabInstance: m_AddedGameObjects: [] m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f5e63c372a243fb4e86e3557dbf7a2af, type: 3} +--- !u!1001 &7509459121321357906 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 232018979661267359, guid: d8fb485c76a17d24cbc1041fb5f07452, type: 3} + propertyPath: m_LocalPosition.x + value: 0.060596474 + objectReference: {fileID: 0} + - target: {fileID: 232018979661267359, guid: d8fb485c76a17d24cbc1041fb5f07452, type: 3} + propertyPath: m_LocalPosition.y + value: 1.1800001 + objectReference: {fileID: 0} + - target: {fileID: 232018979661267359, guid: d8fb485c76a17d24cbc1041fb5f07452, type: 3} + propertyPath: m_LocalPosition.z + value: 3.8179 + objectReference: {fileID: 0} + - target: {fileID: 232018979661267359, guid: d8fb485c76a17d24cbc1041fb5f07452, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 232018979661267359, guid: d8fb485c76a17d24cbc1041fb5f07452, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 232018979661267359, guid: d8fb485c76a17d24cbc1041fb5f07452, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 232018979661267359, guid: d8fb485c76a17d24cbc1041fb5f07452, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 232018979661267359, guid: d8fb485c76a17d24cbc1041fb5f07452, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 232018979661267359, guid: d8fb485c76a17d24cbc1041fb5f07452, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 232018979661267359, guid: d8fb485c76a17d24cbc1041fb5f07452, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2655230295984012906, guid: d8fb485c76a17d24cbc1041fb5f07452, type: 3} + propertyPath: m_Name + value: Player + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: d8fb485c76a17d24cbc1041fb5f07452, type: 3} --- !u!1001 &9152878523533857829 PrefabInstance: m_ObjectHideFlags: 0 @@ -13928,6 +13582,6 @@ SceneRoots: - {fileID: 203844589} - {fileID: 1856557089} - {fileID: 961739753} - - {fileID: 1241925581} + - {fileID: 7509459121321357906} - {fileID: 1860867013} - {fileID: 278774735} diff --git a/Assets/_Content/Settings/InputSystem_Actions.inputactions b/Assets/_Content/Settings/InputSystem_Actions.inputactions index 1a12cb9..5790bb0 100644 --- a/Assets/_Content/Settings/InputSystem_Actions.inputactions +++ b/Assets/_Content/Settings/InputSystem_Actions.inputactions @@ -1,4 +1,5 @@ { + "version": 1, "name": "InputSystem_Actions", "maps": [ { @@ -85,6 +86,15 @@ "processors": "", "interactions": "", "initialStateCheck": false + }, + { + "name": "Target", + "type": "Button", + "id": "7576ea14-9151-4ce2-aa38-4c95fe4465ca", + "expectedControlType": "", + "processors": "", + "interactions": "", + "initialStateCheck": false } ], "bindings": [ @@ -472,6 +482,28 @@ "action": "Crouch", "isComposite": false, "isPartOfComposite": false + }, + { + "name": "", + "id": "93669eb0-78be-44a2-b505-c9d2f5529493", + "path": "/rightButton", + "interactions": "", + "processors": "", + "groups": ";Keyboard&Mouse", + "action": "Target", + "isComposite": false, + "isPartOfComposite": false + }, + { + "name": "", + "id": "f1828ddc-910d-40a2-8cf4-065118a94e6e", + "path": "/dpad/left", + "interactions": "", + "processors": "", + "groups": "Gamepad", + "action": "Target", + "isComposite": false, + "isPartOfComposite": false } ] },