Skip to content
Snippets Groups Projects
Commit 62ea1487 authored by Matthewit Dechatech's avatar Matthewit Dechatech
Browse files

Quick quick fix

parent ca7f4c0f
No related branches found
No related tags found
No related merge requests found
Loading
Loading
@@ -30388,131 +30388,131 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 460528, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.x
value: 5.6820893
value: 1.6676158
objectReference: {fileID: 0}
- target: {fileID: 460528, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.y
value: 2.9922347
value: -3.1177
objectReference: {fileID: 0}
- target: {fileID: 470062, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.x
value: 7.3793707
value: 1.9369829
objectReference: {fileID: 0}
- target: {fileID: 470062, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.y
value: 2.9922347
value: -3.1177
objectReference: {fileID: 0}
- target: {fileID: 446106, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.x
value: 8.893866
value: 2.177341
objectReference: {fileID: 0}
- target: {fileID: 446106, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.y
value: 2.9922347
value: -3.1177
objectReference: {fileID: 0}
- target: {fileID: 483802, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.x
value: 10.253595
value: 2.3931372
objectReference: {fileID: 0}
- target: {fileID: 483802, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.y
value: 2.9922347
value: -3.1177
objectReference: {fileID: 0}
- target: {fileID: 438648, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.x
value: 11.481131
value: 2.587953
objectReference: {fileID: 0}
- target: {fileID: 438648, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.y
value: 2.9922347
value: -3.1177
objectReference: {fileID: 0}
- target: {fileID: 488482, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.x
value: 12.594852
value: 2.7647064
objectReference: {fileID: 0}
- target: {fileID: 488482, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.y
value: 2.9922347
value: -3.1177
objectReference: {fileID: 0}
- target: {fileID: 415032, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.x
value: 13.609891
value: 2.9257982
objectReference: {fileID: 0}
- target: {fileID: 415032, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.y
value: 2.9922347
value: -3.1177
objectReference: {fileID: 0}
- target: {fileID: 412700, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.x
value: 14.538804
value: 3.0732214
objectReference: {fileID: 0}
- target: {fileID: 412700, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.y
value: 2.9922347
value: -3.1177
objectReference: {fileID: 0}
- target: {fileID: 403452, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.x
value: 15.39211
value: 3.2086453
objectReference: {fileID: 0}
- target: {fileID: 403452, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.y
value: 2.9922347
value: -3.1177
objectReference: {fileID: 0}
- target: {fileID: 407054, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.x
value: 16.178675
value: 3.333477
objectReference: {fileID: 0}
- target: {fileID: 407054, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.y
value: 2.9922347
value: -3.1177
objectReference: {fileID: 0}
- target: {fileID: 429100, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.x
value: 16.906036
value: 3.448913
objectReference: {fileID: 0}
- target: {fileID: 429100, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.y
value: 2.9922347
value: -3.1177
objectReference: {fileID: 0}
- target: {fileID: 487998, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.x
value: 17.580637
value: 3.5559757
objectReference: {fileID: 0}
- target: {fileID: 487998, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.y
value: 2.9922347
value: -3.1177
objectReference: {fileID: 0}
- target: {fileID: 428628, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.x
value: 18.208015
value: 3.6555438
objectReference: {fileID: 0}
- target: {fileID: 428628, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.y
value: 2.9922347
value: -3.1177
objectReference: {fileID: 0}
- target: {fileID: 422262, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.x
value: 34.59541
value: 5.490467
objectReference: {fileID: 0}
- target: {fileID: 422262, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.y
value: 2.9922347
value: -3.1177
objectReference: {fileID: 0}
- target: {fileID: 402174, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.x
value: 17.297705
value: 2.7452335
objectReference: {fileID: 0}
- target: {fileID: 402174, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.y
value: 2.9922347
value: -3.1177
objectReference: {fileID: 0}
- target: {fileID: 416372, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.x
value: 23.063606
value: 3.6603112
objectReference: {fileID: 0}
- target: {fileID: 416372, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.y
value: 2.9922347
value: -3.1177
objectReference: {fileID: 0}
- target: {fileID: 482354, guid: 4ce16cb00cbe5c444ab9214ba05766a7, type: 2}
propertyPath: m_LocalPosition.y
Loading
Loading
@@ -252,7 +252,9 @@ public override void OnActiveFixedUpdate()
Mathf.Abs(Controller.GroundVelocity) > MinSlopeGravitySpeed);
 
// Disable ground friction while we have player input
Controller.DisableGroundFriction = Accelerating || Braking;
Controller.DisableGroundFriction =
(!DisableAcceleration && Accelerating) ||
(!DisableDeceleration && Braking);
 
// Orient the player in the direction we're moving (not graphics-wise, just internally!)
if (!ControlLockTimerOn && !DMath.Equalsf(_axis))
Loading
Loading
Loading
Loading
@@ -1261,7 +1261,7 @@ MonoBehaviour:
AntiTunnelingSpeed: 3.5
SlopeGravityBeginAngle: 10
DetachSpeed: 1.5
MaxClimbAngle: 70
MaxClimbAngle: 50
DisableNotifyPlatforms: 0
DisableEvents: 0
DisableCeilingCheck: 0
Loading
Loading
Loading
Loading
@@ -12,6 +12,7 @@ AnimationClip:
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
Loading
Loading
@@ -19,15 +20,15 @@ AnimationClip:
- curve:
- time: 0
value: {fileID: 21300000, guid: 2a9b2b5a1a8b4644ca3efdbec6501ca8, type: 3}
- time: .0333333351
- time: 0.033333335
value: {fileID: 0}
- time: .0666666701
- time: 0.06666667
value: {fileID: 21300002, guid: 2a9b2b5a1a8b4644ca3efdbec6501ca8, type: 3}
- time: .100000001
- time: 0.1
value: {fileID: 0}
- time: .13333334
- time: 0.13333334
value: {fileID: 21300004, guid: 2a9b2b5a1a8b4644ca3efdbec6501ca8, type: 3}
- time: .166666672
- time: 0.16666667
value: {fileID: 0}
attribute: m_Sprite
path: Sprite
Loading
Loading
@@ -55,11 +56,14 @@ AnimationClip:
- {fileID: 0}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: .200000003
m_StopTime: 0.2
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
Loading
Loading
Loading
Loading
@@ -54,14 +54,14 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 110215590}
m_Position: {x: 200, y: 0, z: 0}
m_Position: {x: 24, y: 120, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_EntryPosition: {x: 48, y: 48, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 110215590}
Loading
Loading
@@ -10,7 +10,7 @@ TextureImporter:
serializedVersion: 2
mipmaps:
mipMapMode: 0
enableMipMap: 1
enableMipMap: 0
linearTexture: 0
correctGamma: 0
fadeOut: 0
Loading
Loading
@@ -20,7 +20,7 @@ TextureImporter:
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: .25
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
grayScaleToAlpha: 0
Loading
Loading
@@ -45,7 +45,7 @@ TextureImporter:
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: .5, y: .5}
spritePivot: {x: 0.5, y: 0.5}
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
alphaIsTransparency: 1
Loading
Loading
@@ -61,8 +61,16 @@ TextureImporter:
width: 46
height: 42
alignment: 0
pivot: {x: .5, y: .5}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline:
- - {x: -21, y: 21}
- {x: -23, y: 15}
- {x: -23, y: -16}
- {x: -16, y: -21}
- {x: 18, y: -21}
- {x: 23, y: -19}
- {x: 23, y: 21}
- name: s1_shield_02
rect:
serializedVersion: 2
Loading
Loading
@@ -71,8 +79,17 @@ TextureImporter:
width: 46
height: 42
alignment: 0
pivot: {x: .5, y: .5}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline:
- - {x: -15, y: 21}
- {x: -23, y: 13}
- {x: -23, y: -11}
- {x: -18, y: -21}
- {x: 20, y: -21}
- {x: 23, y: -15}
- {x: 23, y: 18}
- {x: 19, y: 21}
- name: s1_shield_03
rect:
serializedVersion: 2
Loading
Loading
@@ -81,8 +98,17 @@ TextureImporter:
width: 46
height: 42
alignment: 0
pivot: {x: .5, y: .5}
pivot: {x: 0.5, y: 0.5}
border: {x: 0, y: 0, z: 0, w: 0}
outline:
- - {x: -21, y: 21}
- {x: -23, y: 14}
- {x: -23, y: -20}
- {x: -22, y: -21}
- {x: 17, y: -21}
- {x: 23, y: -19}
- {x: 23, y: 21}
outline: []
spritePackingTag:
userData:
assetBundleName:
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment