Leahnaya/TheKingsRace
1
0
Fork 0
mirror of https://github.com/Leahnaya/TheKingsRace.git synced 2026-09-08 18:35:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixed dPlayerMovement & dWallrun references

Browse Source
This commit is contained in:
Vincent Wheat
2021-11-05 13:35:26 -05:00
parent 81abd7bfe8
commit 2fe2fa5764
6 changed files with 65 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Materials/LightningBolt.mat.meta
View File

@@ -1,6 +1,6 @@
fileFormatVersion: 2
<<<<<<< HEAD:Assets/Scripts/PlayerScripts/DebugPlayer.meta
guid: 236528fef9e9ed54fa77a41f6facd741
guid: 32239afa6c492fe45853313c2d499e7d
folderAsset: yes
DefaultImporter:
=======

120
Assets/Scenes/Demos/UI-UX_Demos.unity
View File

@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -123,6 +123,63 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1001 &28406466
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 5633209979457551608, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
propertyPath: m_Name
value: DebugPlayerPrefab
objectReference: {fileID: 0}
- target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
propertyPath: m_LocalPosition.y
value: 10
objectReference: {fileID: 0}
- target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6926740475113451123, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 362ca97b75c291a47ab81d628a81f440, type: 3}
--- !u!1 &109409391
GameObject:
m_ObjectHideFlags: 0
@@ -46073,67 +46130,6 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
vectorLabel1_3: W
--- !u!1001 &2018672504
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 701079060217590907, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3}
propertyPath: m_LocalPosition.y
value: 10
objectReference: {fileID: 0}
- target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7188906082087890184, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3}
propertyPath: m_Name
value: PlayerPrefab
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3}
--- !u!1 &2062754075
GameObject:
m_ObjectHideFlags: 0

2
Assets/Scripts/PlayerScripts/DebugPlayer.meta
View File

@@ -1,6 +1,6 @@
fileFormatVersion: 2
<<<<<<< HEAD:Assets/Scripts/PlayerScripts/DebugPlayer.meta
guid: 236528fef9e9ed54fa77a41f6facd741
guid: 4cd5ae7ca30110140ac070f8d0126019
folderAsset: yes
DefaultImporter:
=======

4
Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dWallRun.cs
View File

@@ -21,7 +21,7 @@ public class dWallRun : NetworkBehaviour
public float wallGravityDownForce = 20f;
[Space]
PlayerMovement playerMovementController;
dPlayerMovement playerMovementController;
Vector3[] directions;
RaycastHit[] hits;
@@ -53,7 +53,7 @@ public class dWallRun : NetworkBehaviour
void Start()
{
playerMovementController = GetComponent<PlayerMovement>();
playerMovementController = GetComponent<dPlayerMovement>();
directions = new Vector3[]{
Vector3.right,

6
Assets/Scripts/PlayerScripts/DebugPlayer/dPlayerMovement.cs
View File

@@ -37,7 +37,7 @@ public class dPlayerMovement : NetworkBehaviour
private float distToGround;
//Wallrunning
private WallRun wallRun;
private dWallRun wallRun;
//Ground Check
public bool isGrounded; //Better custom is grounded
@@ -91,7 +91,7 @@ public class dPlayerMovement : NetworkBehaviour
capCol.enabled = false;
//Wallrun
wallRun = gameObject.GetComponent<WallRun>();
wallRun = gameObject.GetComponent<dWallRun>();
up = this.gameObject.GetComponentInParent<Transform>().up;
}
@@ -239,7 +239,7 @@ public class dPlayerMovement : NetworkBehaviour
public void AddImpact(Vector3 dir, float force)
{
if (!IsLocalPlayer) { return; }
//if (!IsLocalPlayer) { return; }
dir.Normalize();
if (dir.y < 0) dir.y = -dir.y; // reflect down force on the ground

4
Assets/Scripts/PlayerScripts/PlayerMovement.cs
View File

@@ -101,10 +101,6 @@ public class PlayerMovement : NetworkBehaviour
// Don't do movement unless this is the local player controlling it
// Otherwise we let the server handle moving us
<<<<<<< HEAD
=======
>>>>>>> Particles
//if (!IsLocalPlayer) { return; }
// Don't lock the cursor multiple times if this isn't the local player