Skip to content

Arbalet shoot run #170

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OlegBakulin wants to merge 1 commit into
base: MVP/february-22
Choose a base branch
from
Open

Arbalet shoot run #170

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Assets/Prefabs/Camera/AimingCameraSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"m_ExcludedPropertiesInInspector":["m_Script"],"m_LockStageInInspector":[],"m_StreamingVersion":20170927,"m_Priority":0,"m_StandbyUpdate":2,"m_LookAt":{"instanceID":-78730},"m_Follow":{"instanceID":-78748},"m_Lens":{"FieldOfView":40.0,"OrthographicSize":10.0,"NearClipPlane":0.10000000149011612,"FarClipPlane":5000.0,"Dutch":0.0,"LensShift":{"x":0.0,"y":0.0}},"m_Transitions":{"m_BlendHint":0,"m_InheritPosition":false,"m_OnCameraLive":{"m_PersistentCalls":{"m_Calls":[]}}},"m_LegacyBlendHint":0,"m_ComponentOwner":{"instanceID":-78954}}
{"m_ExcludedPropertiesInInspector":["m_Script"],"m_LockStageInInspector":[],"m_StreamingVersion":20170927,"m_Priority":0,"m_StandbyUpdate":2,"m_LookAt":{"instanceID":-130794},"m_Follow":{"instanceID":-130812},"m_Lens":{"FieldOfView":40.0,"OrthographicSize":10.0,"NearClipPlane":0.10000000149011612,"FarClipPlane":5000.0,"Dutch":0.0,"LensShift":{"x":0.0,"y":0.0}},"m_Transitions":{"m_BlendHint":0,"m_InheritPosition":false,"m_OnCameraLive":{"m_PersistentCalls":{"m_Calls":[]}}},"m_LegacyBlendHint":0,"m_ComponentOwner":{"instanceID":-131018}}
2 changes: 1 addition & 1 deletion Assets/Prefabs/Camera/FreeLookCameraSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"m_ExcludedPropertiesInInspector":["m_Script"],"m_LockStageInInspector":[],"m_StreamingVersion":20170927,"m_Priority":1,"m_StandbyUpdate":0,"m_LookAt":{"instanceID":-78748},"m_Follow":{"instanceID":-78748},"m_CommonLens":true,"m_Lens":{"FieldOfView":40.0,"OrthographicSize":10.0,"NearClipPlane":0.10000000149011612,"FarClipPlane":5000.0,"Dutch":0.0,"LensShift":{"x":0.0,"y":0.0}},"m_Transitions":{"m_BlendHint":0,"m_InheritPosition":false,"m_OnCameraLive":{"m_PersistentCalls":{"m_Calls":[]}}},"m_LegacyBlendHint":0,"m_YAxis":{"Value":5.695676184825755e-20,"m_SpeedMode":0,"m_MaxSpeed":2.0,"m_AccelTime":0.20000000298023225,"m_DecelTime":0.10000000149011612,"m_InputAxisName":"Mouse Y","m_InputAxisValue":0.0,"m_InvertInput":true,"m_MinValue":0.0,"m_MaxValue":1.0,"m_Wrap":false,"m_Recentering":{"m_enabled":false,"m_WaitTime":1.0,"m_RecenteringTime":2.0,"m_LegacyHeadingDefinition":-1,"m_LegacyVelocityFilterStrength":-1}},"m_YAxisRecentering":{"m_enabled":true,"m_WaitTime":1.0,"m_RecenteringTime":2.0,"m_LegacyHeadingDefinition":-1,"m_LegacyVelocityFilterStrength":-1},"m_XAxis":{"Value":95.9837417602539,"m_SpeedMode":0,"m_MaxSpeed":400.0,"m_AccelTime":0.10000000149011612,"m_DecelTime":0.10000000149011612,"m_InputAxisName":"Mouse X","m_InputAxisValue":0.0,"m_InvertInput":false,"m_MinValue":-180.0,"m_MaxValue":180.0,"m_Wrap":true,"m_Recentering":{"m_enabled":false,"m_WaitTime":1.0,"m_RecenteringTime":2.0,"m_LegacyHeadingDefinition":-1,"m_LegacyVelocityFilterStrength":-1}},"m_Heading":{"m_Definition":2,"m_VelocityFilterStrength":4,"m_Bias":0.0},"m_RecenterToTargetHeading":{"m_enabled":false,"m_WaitTime":1.0,"m_RecenteringTime":0.0,"m_LegacyHeadingDefinition":-1,"m_LegacyVelocityFilterStrength":-1},"m_BindingMode":4,"m_SplineCurvature":0.20000000298023225,"m_Orbits":[{"m_Height":5.0,"m_Radius":3.0},{"m_Height":2.0,"m_Radius":5.0},{"m_Height":-1.0,"m_Radius":3.0}],"m_LegacyHeadingBias":3.4028234663852887e38,"m_Rigs":[{"instanceID":-78884},{"instanceID":-78900},{"instanceID":-78916}]}
{"m_ExcludedPropertiesInInspector":["m_Script"],"m_LockStageInInspector":[],"m_StreamingVersion":20170927,"m_Priority":1,"m_StandbyUpdate":0,"m_LookAt":{"instanceID":-130812},"m_Follow":{"instanceID":-130812},"m_CommonLens":true,"m_Lens":{"FieldOfView":40.0,"OrthographicSize":10.0,"NearClipPlane":0.10000000149011612,"FarClipPlane":5000.0,"Dutch":0.0,"LensShift":{"x":0.0,"y":0.0}},"m_Transitions":{"m_BlendHint":0,"m_InheritPosition":false,"m_OnCameraLive":{"m_PersistentCalls":{"m_Calls":[]}}},"m_LegacyBlendHint":0,"m_YAxis":{"Value":4.2383021536807066e-7,"m_SpeedMode":0,"m_MaxSpeed":2.0,"m_AccelTime":0.20000000298023225,"m_DecelTime":0.10000000149011612,"m_InputAxisName":"Mouse Y","m_InputAxisValue":0.0,"m_InvertInput":true,"m_MinValue":0.0,"m_MaxValue":1.0,"m_Wrap":false,"m_Recentering":{"m_enabled":false,"m_WaitTime":1.0,"m_RecenteringTime":2.0,"m_LegacyHeadingDefinition":-1,"m_LegacyVelocityFilterStrength":-1}},"m_YAxisRecentering":{"m_enabled":true,"m_WaitTime":1.0,"m_RecenteringTime":2.0,"m_LegacyHeadingDefinition":-1,"m_LegacyVelocityFilterStrength":-1},"m_XAxis":{"Value":-53.56781768798828,"m_SpeedMode":0,"m_MaxSpeed":400.0,"m_AccelTime":0.10000000149011612,"m_DecelTime":0.10000000149011612,"m_InputAxisName":"Mouse X","m_InputAxisValue":0.0,"m_InvertInput":false,"m_MinValue":-180.0,"m_MaxValue":180.0,"m_Wrap":true,"m_Recentering":{"m_enabled":false,"m_WaitTime":1.0,"m_RecenteringTime":2.0,"m_LegacyHeadingDefinition":-1,"m_LegacyVelocityFilterStrength":-1}},"m_Heading":{"m_Definition":2,"m_VelocityFilterStrength":4,"m_Bias":0.0},"m_RecenterToTargetHeading":{"m_enabled":false,"m_WaitTime":1.0,"m_RecenteringTime":0.0,"m_LegacyHeadingDefinition":-1,"m_LegacyVelocityFilterStrength":-1},"m_BindingMode":4,"m_SplineCurvature":0.20000000298023225,"m_Orbits":[{"m_Height":5.0,"m_Radius":3.0},{"m_Height":2.0,"m_Radius":5.0},{"m_Height":-1.0,"m_Radius":3.0}],"m_LegacyHeadingBias":3.4028234663852887e38,"m_Rigs":[{"instanceID":-130948},{"instanceID":-130964},{"instanceID":-130980}]}
2 changes: 1 addition & 1 deletion Assets/Prefabs/Camera/TargetingCameraSettings
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"m_ExcludedPropertiesInInspector":["m_Script"],"m_LockStageInInspector":[],"m_StreamingVersion":20170927,"m_Priority":0,"m_StandbyUpdate":2,"m_LookAt":{"instanceID":-78748},"m_Follow":{"instanceID":-78748},"m_Lens":{"FieldOfView":40.0,"OrthographicSize":10.0,"NearClipPlane":0.10000000149011612,"FarClipPlane":5000.0,"Dutch":0.0,"LensShift":{"x":0.0,"y":0.0}},"m_Transitions":{"m_BlendHint":0,"m_InheritPosition":false,"m_OnCameraLive":{"m_PersistentCalls":{"m_Calls":[]}}},"m_LegacyBlendHint":0,"m_ComponentOwner":{"instanceID":-78936}}
{"m_ExcludedPropertiesInInspector":["m_Script"],"m_LockStageInInspector":[],"m_StreamingVersion":20170927,"m_Priority":0,"m_StandbyUpdate":2,"m_LookAt":{"instanceID":-130812},"m_Follow":{"instanceID":-130812},"m_Lens":{"FieldOfView":40.0,"OrthographicSize":10.0,"NearClipPlane":0.10000000149011612,"FarClipPlane":5000.0,"Dutch":0.0,"LensShift":{"x":0.0,"y":0.0}},"m_Transitions":{"m_BlendHint":0,"m_InheritPosition":false,"m_OnCameraLive":{"m_PersistentCalls":{"m_Calls":[]}}},"m_LegacyBlendHint":0,"m_ComponentOwner":{"instanceID":-131000}}
12 changes: 9 additions & 3 deletions Assets/Resources/Data/Weapons/Crossbow.asset
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,19 @@ MonoBehaviour:
_volume: 0
_pitch: 0
_doLoop: 0
_weaponDamage:
PhysicalDamageType: 0
PhysicalDamageValue: 0
ElementDamageType: 0
ElementDamageValue: 0
_simpleAttacks:
- Name: Simple shot
AnimationName: Shoot
AttackDamage:
PhysicalDamage: 3
StunProbability: 0
FireDamage: 0
PhysicalDamageType: 0
PhysicalDamageValue: 0
ElementDamageType: 0
ElementDamageValue: 0
WeaponItem: {fileID: 11400000, guid: e2a1624ec5a336945b8c75bb80548e57, type: 2}
AttackType: 3
AttackTime: 0.5
Expand Down
Loading