Leahnaya/TheKingsRace
1
0
Fork 0
mirror of https://github.com/Leahnaya/TheKingsRace.git synced 2026-04-24 23:37:29 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'sprint3MelbySpring'

Browse Source
This commit is contained in:
Melbyj1125 2022-01-31 14:23:48 -06:00
commit b2bd9783d4
4 changed files with 17 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Assets/Scenes/Demos/MovementScene.unity
View File

@ -1604,6 +1604,14 @@ PrefabInstance:
propertyPath: hasGrapple
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6664667533527261801, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3}
propertyPath: hasWallrun
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6664667533527262099, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 6adb8bcc65ee3a54da64d7c65225f219, type: 3}
--- !u!1 &1493944130
@ -1973,18 +1981,6 @@ PrefabInstance:
propertyPath: m_RootOrder
value: 4
objectReference: {fileID: 0}
- target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
propertyPath: m_LocalScale.x
value: 3
objectReference: {fileID: 0}
- target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
propertyPath: m_LocalScale.y
value: 2
objectReference: {fileID: 0}
- target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
propertyPath: m_LocalScale.z
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6150409029086178024, guid: b95800967feee2a46a6c25838eb2fc6c, type: 3}
propertyPath: m_LocalPosition.x
value: -6.95

2
Assets/Scripts/PlayerScripts/DebugPlayer/DebugItems/dDash.cs
View File

@ -33,7 +33,7 @@ public class dDash : NetworkBehaviour{
void DashPlayer(){
//if (!IsLocalPlayer) { return; }
if(characterController.enabled == true){
if (Input.GetKeyDown(KeyCode.E) && isOnCoolDown == false)
if (Input.GetKeyDown(KeyCode.R) && isOnCoolDown == false)
{
currentDashTime = 0;
StartCoroutine(startCoolDown());

2
Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/Dash.asset
View File

@ -14,7 +14,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
id: 11
itemName: Dash
description: Press F to quickly dash your player forward.
description: Press R to quickly dash your player forward.
itemSprite: {fileID: 2061666376165797104, guid: 6752962b9a0f4984fa08cb5a13e7bdfa, type: 3}
maxVelM: 0
minVelM: 0

17
UserSettings/EditorUserSettings.asset
View File

@ -6,22 +6,19 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c731f1415016439262f2434
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
flags: 0
RecentlyUsedScenePath-3:
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
flags: 0
RecentlyUsedScenePath-4:
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c7b151b180b650721283704240d14f0e12d3aedff78fce9332b25
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650