mirror of
https://github.com/Leahnaya/TheKingsRace.git
synced 2026-04-26 02:00:54 -05:00
fixed king ui issue and player collision
This commit is contained in:
parent
80f76a30ff
commit
ab1bcb18fb
|
|
@ -12,7 +12,7 @@ GameObject:
|
|||
- component: {fileID: 4134528544430328929}
|
||||
- component: {fileID: 7328327193641429076}
|
||||
- component: {fileID: 720915480393061250}
|
||||
m_Layer: 0
|
||||
m_Layer: 2
|
||||
m_Name: Arrow
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -95,3 +95,4 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
speed: 90
|
||||
bumpPower: 30
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ GameObject:
|
|||
- component: {fileID: 8808368135834717660}
|
||||
- component: {fileID: 8808368135834717661}
|
||||
- component: {fileID: 8808368135834717634}
|
||||
m_Layer: 0
|
||||
m_Layer: 2
|
||||
m_Name: Boulder Spawn
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -45,6 +45,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
RespawnTimer: 10
|
||||
boulderScaleMultiplier: 1
|
||||
spawnForce: {x: -4000, y: 0, z: 0}
|
||||
SpawnLocation: {x: 380, y: 40, z: 370}
|
||||
BoulderPrefab: {fileID: 1779316379582440844, guid: e19c0f39cc7704141bb264ff339eb336, type: 3}
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ GameObject:
|
|||
- component: {fileID: 5342244697037577531}
|
||||
- component: {fileID: 3689559005048040261}
|
||||
- component: {fileID: 7288458195488485932}
|
||||
m_Layer: 0
|
||||
m_Layer: 2
|
||||
m_Name: Boulder
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -141,6 +141,7 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 502e1c22be3238645a39762fd220d3b4, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
bumpPower: 70
|
||||
--- !u!114 &3689559005048040261
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -17,7 +17,7 @@ GameObject:
|
|||
- component: {fileID: 7760003910215335808}
|
||||
- component: {fileID: 22253098690442845}
|
||||
- component: {fileID: 2979632417842190257}
|
||||
m_Layer: 0
|
||||
m_Layer: 2
|
||||
m_Name: BoulderNoGrav
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 423476493589425655}
|
||||
m_Layer: 0
|
||||
m_Layer: 2
|
||||
m_Name: RespawnPoint
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ GameObject:
|
|||
- component: {fileID: 729017849394081224}
|
||||
- component: {fileID: -7350152320695563460}
|
||||
- component: {fileID: 7386518789294782352}
|
||||
m_Layer: 0
|
||||
m_Layer: 2
|
||||
m_Name: PopUp
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ GameObject:
|
|||
- component: {fileID: 3173415395027047140}
|
||||
- component: {fileID: 3173415395027047142}
|
||||
- component: {fileID: 3173415395027047143}
|
||||
m_Layer: 5
|
||||
m_Layer: 10
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -230,7 +230,7 @@ GameObject:
|
|||
- component: {fileID: 3173415395421141914}
|
||||
- component: {fileID: 3173415395421141915}
|
||||
- component: {fileID: 3173415395421141912}
|
||||
m_Layer: 5
|
||||
m_Layer: 10
|
||||
m_Name: 'King Canvas '
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -267,7 +267,7 @@ Canvas:
|
|||
m_GameObject: {fileID: 3173415395421141913}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_RenderMode: 0
|
||||
m_RenderMode: 1
|
||||
m_Camera: {fileID: 3173415396083440353}
|
||||
m_PlaneDistance: 2.33
|
||||
m_PixelPerfect: 0
|
||||
|
|
@ -331,7 +331,7 @@ GameObject:
|
|||
- component: {fileID: 3173415395512048815}
|
||||
- component: {fileID: 3173415395512048812}
|
||||
- component: {fileID: 3173415395512048813}
|
||||
m_Layer: 5
|
||||
m_Layer: 10
|
||||
m_Name: Box
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -464,7 +464,7 @@ GameObject:
|
|||
- component: {fileID: 3173415395658836172}
|
||||
- component: {fileID: 3173415395658836173}
|
||||
- component: {fileID: 3173415395658836170}
|
||||
m_Layer: 5
|
||||
m_Layer: 10
|
||||
m_Name: Slime
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -596,7 +596,7 @@ GameObject:
|
|||
- component: {fileID: 3173415395758803272}
|
||||
- component: {fileID: 3173415395758803274}
|
||||
- component: {fileID: 3173415395758803275}
|
||||
m_Layer: 5
|
||||
m_Layer: 10
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -727,7 +727,7 @@ Camera:
|
|||
m_Depth: -1
|
||||
m_CullingMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_Bits: 63487
|
||||
m_RenderingPath: -1
|
||||
m_TargetTexture: {fileID: 0}
|
||||
m_TargetDisplay: 0
|
||||
|
|
@ -759,7 +759,7 @@ GameObject:
|
|||
- component: {fileID: 3173415396104633696}
|
||||
- component: {fileID: 3173415396104633697}
|
||||
- component: {fileID: 3173415396104633698}
|
||||
m_Layer: 5
|
||||
m_Layer: 10
|
||||
m_Name: Panel
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -774,7 +774,7 @@ RectTransform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3173415396104633710}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 500}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 1513}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 3173415395512048810}
|
||||
|
|
@ -840,6 +840,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
King: {fileID: 3173415395305450996}
|
||||
cam: {fileID: 3173415396083440353}
|
||||
UItext: {fileID: 3173415396260468956}
|
||||
--- !u!1 &3173415396146687108
|
||||
GameObject:
|
||||
|
|
@ -852,7 +853,7 @@ GameObject:
|
|||
- component: {fileID: 3173415396146687111}
|
||||
- component: {fileID: 3173415396146687129}
|
||||
- component: {fileID: 3173415396146687110}
|
||||
m_Layer: 5
|
||||
m_Layer: 10
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -931,7 +932,7 @@ GameObject:
|
|||
- component: {fileID: 3173415396260468957}
|
||||
- component: {fileID: 3173415396260468959}
|
||||
- component: {fileID: 3173415396260468956}
|
||||
m_Layer: 5
|
||||
m_Layer: 10
|
||||
m_Name: UIText
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -946,7 +947,7 @@ RectTransform:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3173415396260468954}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 1513}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 3173415395030910393}
|
||||
|
|
@ -954,7 +955,7 @@ RectTransform:
|
|||
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: -350, y: 240}
|
||||
m_AnchoredPosition: {x: 17, y: 407}
|
||||
m_SizeDelta: {x: 400, y: 80}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3173415396260468959
|
||||
|
|
@ -1011,7 +1012,7 @@ GameObject:
|
|||
- component: {fileID: 3173415396865756789}
|
||||
- component: {fileID: 3173415396865756786}
|
||||
- component: {fileID: 3173415396865756787}
|
||||
m_Layer: 5
|
||||
m_Layer: 10
|
||||
m_Name: Thunder
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -1143,7 +1144,7 @@ GameObject:
|
|||
- component: {fileID: 3173415396963551135}
|
||||
- component: {fileID: 3173415396963551121}
|
||||
- component: {fileID: 3173415396963551134}
|
||||
m_Layer: 5
|
||||
m_Layer: 10
|
||||
m_Name: Text
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -1223,7 +1224,7 @@ GameObject:
|
|||
- component: {fileID: 3173415397010263562}
|
||||
- component: {fileID: 3173415397010263563}
|
||||
- component: {fileID: 3173415397010263560}
|
||||
m_Layer: 5
|
||||
m_Layer: 10
|
||||
m_Name: Hail
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -1351,10 +1352,22 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 3173415395305450956}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1087737418930352205, guid: d5667529149c5e945afdabd32b7d86ae, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 11
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2034026810393381438, guid: d5667529149c5e945afdabd32b7d86ae, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 11
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2715093778034557172, guid: d5667529149c5e945afdabd32b7d86ae, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: KingHeadUVd
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2715093778034557172, guid: d5667529149c5e945afdabd32b7d86ae, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 11
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 2
|
||||
|
|
@ -1411,6 +1424,34 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4122512599611449400, guid: d5667529149c5e945afdabd32b7d86ae, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 11
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4520587546158782462, guid: d5667529149c5e945afdabd32b7d86ae, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 11
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4769080702442509336, guid: d5667529149c5e945afdabd32b7d86ae, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 11
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5903559442808772186, guid: d5667529149c5e945afdabd32b7d86ae, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 11
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7949831522861242146, guid: d5667529149c5e945afdabd32b7d86ae, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 11
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8278050581718577614, guid: d5667529149c5e945afdabd32b7d86ae, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 11
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9017173250570832128, guid: d5667529149c5e945afdabd32b7d86ae, type: 3}
|
||||
propertyPath: m_Layer
|
||||
value: 11
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: d5667529149c5e945afdabd32b7d86ae, type: 3}
|
||||
--- !u!4 &210578149258778874 stripped
|
||||
|
|
|
|||
|
|
@ -3466,7 +3466,7 @@ GameObject:
|
|||
- component: {fileID: 5975360321271394397}
|
||||
- component: {fileID: 5975360321271394396}
|
||||
- component: {fileID: 5975360321271394395}
|
||||
m_Layer: 3
|
||||
m_Layer: 10
|
||||
m_Name: Player Indicator Box
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -3559,7 +3559,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 5975360321733016165}
|
||||
- component: {fileID: 5975360321733016166}
|
||||
m_Layer: 3
|
||||
m_Layer: 5
|
||||
m_Name: Player Indicator
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -3607,7 +3607,7 @@ GameObject:
|
|||
- component: {fileID: 5975360322223408463}
|
||||
- component: {fileID: 5975360322223408462}
|
||||
- component: {fileID: 5975360322223408461}
|
||||
m_Layer: 3
|
||||
m_Layer: 10
|
||||
m_Name: Player Indicator Line
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -1198,6 +1198,67 @@ Transform:
|
|||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1001 &781507019
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 3173415395305450956, guid: d23bf55f2a40d494487eb188930f895d, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 12
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3173415395305450956, guid: d23bf55f2a40d494487eb188930f895d, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 350
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3173415395305450956, guid: d23bf55f2a40d494487eb188930f895d, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 825
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3173415395305450956, guid: d23bf55f2a40d494487eb188930f895d, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 1130
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3173415395305450956, guid: d23bf55f2a40d494487eb188930f895d, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3173415395305450956, guid: d23bf55f2a40d494487eb188930f895d, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3173415395305450956, guid: d23bf55f2a40d494487eb188930f895d, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3173415395305450956, guid: d23bf55f2a40d494487eb188930f895d, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3173415395305450956, guid: d23bf55f2a40d494487eb188930f895d, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3173415395305450956, guid: d23bf55f2a40d494487eb188930f895d, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 180
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3173415395305450956, guid: d23bf55f2a40d494487eb188930f895d, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3173415395305450996, guid: d23bf55f2a40d494487eb188930f895d, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: King
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3173415395305450996, guid: d23bf55f2a40d494487eb188930f895d, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: d23bf55f2a40d494487eb188930f895d, type: 3}
|
||||
--- !u!1 &827706392
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2981,7 +3042,7 @@ GameObject:
|
|||
- component: {fileID: 2007460322}
|
||||
- component: {fileID: 2007460321}
|
||||
- component: {fileID: 2007460320}
|
||||
m_Layer: 6
|
||||
m_Layer: 0
|
||||
m_Name: Block
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
|
|
@ -3234,7 +3295,7 @@ PrefabInstance:
|
|||
m_Modifications:
|
||||
- target: {fileID: 5759777694531189237, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 12
|
||||
value: 13
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5759777694531189237, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
|
@ -3280,5 +3341,9 @@ PrefabInstance:
|
|||
propertyPath: m_Name
|
||||
value: DebugSMPlayerPrefab
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7053551988629990270, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
|
|
|
|||
|
|
@ -640,6 +640,14 @@ PrefabInstance:
|
|||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4957707499148469022, guid: f04855a6b3fae4f478846139aa5cf621, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5370275191292842160, guid: f04855a6b3fae4f478846139aa5cf621, type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7203582894680926279, guid: f04855a6b3fae4f478846139aa5cf621, type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0
|
||||
|
|
|
|||
|
|
@ -8,13 +8,19 @@ public class RadialMenu : MonoBehaviour
|
|||
|
||||
bool UIOn = false;
|
||||
public GameObject King;
|
||||
public Camera cam;
|
||||
|
||||
Vector3 screenPoint;
|
||||
|
||||
[SerializeField]
|
||||
private Text UItext;
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
if (UIOn == false) {
|
||||
transform.position = Input.mousePosition;//Moved the UI to where the mouse is
|
||||
screenPoint = Input.mousePosition;
|
||||
screenPoint.z = 120f;
|
||||
transform.position = cam.ScreenToWorldPoint(screenPoint);//Moved the UI to where the mouse is
|
||||
}
|
||||
if(Input.GetAxis("RadialMenu") > 0) {//Pressing Q makes the UI appear
|
||||
if (King.GetComponent<KingPlace>().FirstPlacing == true) {
|
||||
|
|
|
|||
|
|
@ -101,8 +101,8 @@ public class dMoveStateManager : NetworkBehaviour
|
|||
////
|
||||
|
||||
////Initialize Variables
|
||||
layerMask = (1 << 3) | (1 << 6);
|
||||
layerMask = ~layerMask;
|
||||
layerMask = (1 << 0);
|
||||
//layerMask = ~layerMask;
|
||||
////
|
||||
|
||||
}
|
||||
|
|
@ -230,7 +230,7 @@ public class dMoveStateManager : NetworkBehaviour
|
|||
|
||||
|
||||
//Check if wall is in direction player is moving
|
||||
if (((Physics.Raycast(gameObject.transform.position + new Vector3(0,.4f,0) + rayOffset, driftVel.normalized, out wallHitBot, .5f, layerMask) == true) || ((currentState != SlideState || currentState != CrouchState) && (Physics.Raycast(gameObject.transform.position + new Vector3(0,2.2f,0), driftVel.normalized, out wallHitTop, .5f, layerMask) == true))) && !firstWallHit){
|
||||
if (((Physics.Raycast(gameObject.transform.position + new Vector3(0,.4f,0) + rayOffset, driftVel.normalized, out wallHitBot, .35f, layerMask) == true) || ((currentState != SlideState || currentState != CrouchState) && (Physics.Raycast(gameObject.transform.position + new Vector3(0,2.2f,0), driftVel.normalized, out wallHitTop, .35f, layerMask) == true))) && !firstWallHit){
|
||||
CancelMomentum();
|
||||
//Debug.Log(wallHitBot.collider.name);
|
||||
firstWallHit = true;
|
||||
|
|
|
|||
|
|
@ -101,8 +101,8 @@ public class MoveStateManager : NetworkBehaviour
|
|||
////
|
||||
|
||||
////Initialize Variables
|
||||
layerMask = (1 << 3) | (1 << 6);
|
||||
layerMask = ~layerMask;
|
||||
layerMask = (1 << 0);
|
||||
//layerMask = ~layerMask;
|
||||
////
|
||||
|
||||
}
|
||||
|
|
@ -226,7 +226,7 @@ public class MoveStateManager : NetworkBehaviour
|
|||
|
||||
|
||||
//Check if wall is in direction player is moving
|
||||
if (((Physics.Raycast(gameObject.transform.position + new Vector3(0,.4f,0) + rayOffset, driftVel.normalized, out wallHitBot, .5f, layerMask) == true) || ((currentState != SlideState || currentState != CrouchState) && (Physics.Raycast(gameObject.transform.position + new Vector3(0,2.2f,0), driftVel.normalized, out wallHitTop, .5f, layerMask) == true))) && !firstWallHit){
|
||||
if (((Physics.Raycast(gameObject.transform.position + new Vector3(0,.4f,0) + rayOffset, driftVel.normalized, out wallHitBot, .35f, layerMask) == true) || ((currentState != SlideState || currentState != CrouchState) && (Physics.Raycast(gameObject.transform.position + new Vector3(0,2.2f,0), driftVel.normalized, out wallHitTop, .35f, layerMask) == true))) && !firstWallHit){
|
||||
CancelMomentum();
|
||||
//Debug.Log(wallHitBot.collider.name);
|
||||
firstWallHit = true;
|
||||
|
|
|
|||
|
|
@ -9,31 +9,31 @@ EditorUserSettings:
|
|||
value: 22424703114646680e0b0227036c7b151b180b650721283704240d14f0e12d3aedff78fce9332b25
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-1:
|
||||
value: 22424703114646680e0b0227036c731f1415016439262f2434
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-2:
|
||||
value: 22424703114646680e0b0227036c7b151b180b652b3a27292f260573f1e33136e7a923e7ee2e26
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-3:
|
||||
RecentlyUsedScenePath-2:
|
||||
value: 22424703114646680e0b0227036c7b151b180b650e3a233126281f3fe7c23837e1ec25a7f234362820
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-4:
|
||||
value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-5:
|
||||
RecentlyUsedScenePath-3:
|
||||
value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-4:
|
||||
value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-5:
|
||||
value: 22424703114646680e0b0227036c731f1415016439262f2434
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-6:
|
||||
value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
|
||||
value: 22424703114646680e0b0227036c731f1415016439262f2434
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-7:
|
||||
value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
|
||||
value: 22424703114646680e0b0227036c731f1415016439262f2434
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-8:
|
||||
value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-9:
|
||||
value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
|
||||
value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
|
||||
flags: 0
|
||||
vcSharedLogLevel:
|
||||
value: 0d5e400f0650
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user