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

Merge branch 'RebindingControls'

Browse Source
This commit is contained in:
Melbyj1125
2022-04-27 19:00:53 -05:00
parent 030cd225bf ae7116c1aa
commit 911707f761
9 changed files with 113 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Assets/Prefabs/Game/PopUp.prefab
View File

@@ -47,6 +47,7 @@ MonoBehaviour:
item: {fileID: 0}
uiPrebab: {fileID: 5756063885148329735, guid: 8150580546fbb0d48bcd414238e2be89, type: 3}
message:
slideSprite: {fileID: -8570435183877795321, guid: afc7e66828e7a4a49b3e6609a02bd820, type: 3}
--- !u!65 &7386518789294782352
BoxCollider:
m_ObjectHideFlags: 0

28
Assets/Prefabs/Game/UIPopUpPrefab.prefab
View File

@@ -34,8 +34,8 @@ 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: 0, y: 142}
m_SizeDelta: {x: 161.3906, y: 50}
m_AnchoredPosition: {x: 292.6726, y: 0.000031471}
m_SizeDelta: {x: 403.3167, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &438105934820313976
CanvasRenderer:
@@ -65,19 +65,17 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: '
'
m_text:
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontAsset: {fileID: 11400000, guid: c9c6ab728bbf8974783d3354922a042f, type: 2}
m_sharedMaterial: {fileID: -1126714427571281196, guid: c9c6ab728bbf8974783d3354922a042f, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4278321666
m_fontColor: {r: 0.009433985, g: 0.009433985, b: 0.009433985, a: 1}
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -94,15 +92,15 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontSize: 45
m_fontSizeBase: 45
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 1024
m_VerticalAlignment: 512
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
@@ -130,7 +128,7 @@ MonoBehaviour:
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: -69.87891, y: -65.0387, z: -65.66089, w: 0}
m_margin: {x: -0.9182129, y: 0.14468384, z: 0.2602539, w: 1.4232788}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
@@ -171,8 +169,8 @@ 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: 0, y: 0}
m_SizeDelta: {x: 200, y: 200}
m_AnchoredPosition: {x: -217, y: -421}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5756063885148329754
CanvasRenderer:

6
Assets/Prefabs/Player/DebugSMPlayerPrefab.prefab
View File

@@ -3659,8 +3659,8 @@ 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: 675, y: -415}
m_SizeDelta: {x: 600, y: 300}
m_AnchoredPosition: {x: 630, y: -415}
m_SizeDelta: {x: 750, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1710959632299265877
CanvasRenderer:
@@ -4858,7 +4858,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: 885, y: -507}
m_AnchoredPosition: {x: 851, y: -494}
m_SizeDelta: {x: 160, y: 160}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6578614756615956982

5
Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab
View File

@@ -2434,6 +2434,7 @@ MonoBehaviour:
nitroItem: {fileID: 11400000, guid: a1c26807795a7ac4f83567455ce978ce, type: 2}
kickItem: {fileID: 11400000, guid: a96dfb1a70e0d0a4f84c15378f38ce99, type: 2}
slide: {fileID: -8570435183877795321, guid: afc7e66828e7a4a49b3e6609a02bd820, type: 3}
spaceBarIcon: {fileID: -5974897767074471648, guid: 333692572c859df4a8f79e4e00fa57ec, type: 3}
grapple: {fileID: 11400000, guid: 3c5f77adbd146274281d636352eb5018, type: 2}
Glide: {fileID: 11400000, guid: 8fe830ac457225a4ab1031a499db94fc, type: 2}
boxHighlight: {fileID: 5887255329340465546}
@@ -3743,8 +3744,8 @@ 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: 675, y: -415}
m_SizeDelta: {x: 600, y: 300}
m_AnchoredPosition: {x: 625, y: -415}
m_SizeDelta: {x: 750, y: 300}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2264754566127494481
CanvasRenderer:

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

@@ -3727,7 +3727,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8370702511891240678, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
propertyPath: m_SizeDelta.x
value: 650
value: 750
objectReference: {fileID: 0}
- target: {fileID: 8370702511891240678, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
propertyPath: m_SizeDelta.y
@@ -3735,7 +3735,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8370702511891240678, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
propertyPath: m_AnchoredPosition.x
value: 660
value: 618
objectReference: {fileID: 0}
- target: {fileID: 8370702511891240678, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
propertyPath: m_AnchoredPosition.y

84
Assets/Scripts/CoolDown.cs
View File

@@ -16,6 +16,7 @@ public class CoolDown : MonoBehaviour
//regular items with buttons
public Item kickItem;
public Sprite slide;
public Sprite spaceBarIcon;
public Item grapple;
public Item Glide;
public GameObject boxHighlight;
@@ -101,9 +102,21 @@ public class CoolDown : MonoBehaviour
temp3.name = kickItem.name;
temp3.transform.localRotation = Quaternion.identity;
//due to low number, gonna hardcode this to be first
temp3.transform.localPosition = new Vector3(-90, -40);
temp3.transform.localPosition = new Vector3(-100, -40);
temp3.transform.localScale = new Vector3(.75f,.75f,.75f);
//set icon to ui icon
if (GameManager.GM.bindableActions["kickKey"] == KeyCode.LeftShift)
{
temp3.transform.Find("keyBoardIcon").GetComponent<RectTransform>().sizeDelta = new Vector2(145, 100);
}
//else set to regular size
else
{
temp3.transform.Find("keyBoardIcon").GetComponent<RectTransform>().sizeDelta = new Vector2(100, 100);
}
temp3.transform.Find("keyBoardIcon").GetComponent<Image>().sprite = GameManager.GM.keyToSpriteDict[GameManager.GM.bindableActions["kickKey"]];
temp3.transform.GetComponent<Image>().sprite = kickItem.itemSprite;
@@ -114,8 +127,20 @@ public class CoolDown : MonoBehaviour
temp4.name = "slide";
temp4.transform.localRotation = Quaternion.identity;
//due to low number, gonna hardcode this to be first
temp4.transform.localPosition = new Vector3(-240, -40);
temp4.transform.localPosition = new Vector3(-260, -40);
temp4.transform.localScale = new Vector3(.75f,.75f,.75f);
if (GameManager.GM.bindableActions["slideKey"] == KeyCode.LeftShift)
{
temp4.transform.Find("keyBoardIcon").GetComponent<RectTransform>().sizeDelta = new Vector2(145, 100);
}
//else set to regular size
else
{
temp4.transform.Find("keyBoardIcon").GetComponent<RectTransform>().sizeDelta = new Vector2(100, 100);
}
temp4.transform.Find("keyBoardIcon").GetComponent<Image>().sprite = GameManager.GM.keyToSpriteDict[GameManager.GM.bindableActions["slideKey"]];
temp4.transform.GetComponent<Image>().sprite = slide;
//set icon to ui icon
//doesn't exists
@@ -140,17 +165,29 @@ public class CoolDown : MonoBehaviour
//increment items
if (itemsAdded == 0)
{
temp.transform.localPosition = new Vector3(210, 80);
temp.transform.localPosition = new Vector3(220, 80);
itemsAdded++;
}
//increment items
else if (itemsAdded >= 1)
{
temp.transform.localPosition = new Vector3(60 + posTemp, 80);
posTemp -= 150;
posTemp -= 160;
itemsAdded++;
}
if (GameManager.GM.bindableActions["nitroKey"] == KeyCode.LeftShift)
{
temp.transform.Find("keyBoardIcon").GetComponent<RectTransform>().sizeDelta = new Vector2(145, 100);
}
//else set to regular size
else
{
temp.transform.Find("keyBoardIcon").GetComponent<RectTransform>().sizeDelta = new Vector2(100, 100);
}
//set icon to ui icon
temp.transform.Find("keyBoardIcon").GetComponent<Image>().sprite = GameManager.GM.keyToSpriteDict[GameManager.GM.bindableActions["nitroKey"]];
temp.transform.GetComponent<Image>().sprite = nitroItem.itemSprite;
//set button control (hard coded)
}
@@ -164,18 +201,31 @@ public class CoolDown : MonoBehaviour
//increment items
if (itemsAdded == 0)
{
temp2.transform.localPosition = new Vector3(210, 80);
temp2.transform.localPosition = new Vector3(220, 80);
itemsAdded++;
}
//increment items
else if (itemsAdded >= 1)
{
temp2.transform.localPosition = new Vector3(60 + posTemp, 80);
posTemp -= 150;
posTemp -= 160;
itemsAdded++;
}
temp2.GetComponent<UICoolDown>().setCoolDownTime(dashItem.cooldownM);
//set image
if (GameManager.GM.bindableActions["dashKey"] == KeyCode.LeftShift)
{
temp2.transform.Find("keyBoardIcon").GetComponent<RectTransform>().sizeDelta = new Vector2(145, 100);
}
//else set to regular size
else
{
temp2.transform.Find("keyBoardIcon").GetComponent<RectTransform>().sizeDelta = new Vector2(100, 100);
}
temp2.transform.Find("keyBoardIcon").GetComponent<Image>().sprite = GameManager.GM.keyToSpriteDict[GameManager.GM.bindableActions["dashKey"]];
temp2.transform.GetComponent<Image>().sprite = dashItem.itemSprite;
//set button control
@@ -192,17 +242,29 @@ public class CoolDown : MonoBehaviour
//increment items
if (itemsAdded == 0)
{
temp5.transform.localPosition = new Vector3(210, 80);
temp5.transform.localPosition = new Vector3(220, 80);
itemsAdded++;
}
//increment items
else if (itemsAdded >= 1)
{
temp5.transform.localPosition = new Vector3(60 + posTemp, 80);
posTemp -= 150;
posTemp -= 160;
itemsAdded++;
}
//set icon to ui icon
if (GameManager.GM.bindableActions["grappleKey"] == KeyCode.LeftShift)
{
temp5.transform.Find("keyBoardIcon").GetComponent<RectTransform>().sizeDelta = new Vector2(145, 100);
}
//else set to regular size
else
{
temp5.transform.Find("keyBoardIcon").GetComponent<RectTransform>().sizeDelta = new Vector2(100, 100);
}
temp5.transform.Find("keyBoardIcon").GetComponent<Image>().sprite = GameManager.GM.keyToSpriteDict[GameManager.GM.bindableActions["grappleKey"]];
temp5.transform.GetComponent<Image>().sprite = grapple.itemSprite;
//doesn't exists
//increment counter
@@ -219,17 +281,19 @@ public class CoolDown : MonoBehaviour
//increment items
if (itemsAdded == 0)
{
temp6.transform.localPosition = new Vector3(210, 80);
temp6.transform.localPosition = new Vector3(220, 80);
itemsAdded++;
}
//increment items
else if (itemsAdded >= 1)
{
temp6.transform.localPosition = new Vector3(60 + posTemp, 80);
posTemp -= 150;
posTemp -= 160;
itemsAdded++;
}
//set icon to ui icon
temp6.transform.Find("keyBoardIcon").GetComponent<Image>().sprite = spaceBarIcon;
temp6.transform.Find("keyBoardIcon").GetComponent<RectTransform>().sizeDelta = new Vector2(145, 100);
temp6.transform.GetComponent<Image>().sprite = Glide.itemSprite;
//doesn't exists
//increment counter

2
Assets/Scripts/PlayerScripts/NetworkedStateMachines/AerialState/Grapple/AerialGrappleAirState.cs
View File

@@ -120,7 +120,7 @@ public class AerialGrappleAirState : AerialBaseState
Vector3 throwDir = (aSM.hookPoint.transform.position - aSM.stickyHandParent.transform.position).normalized;
aSM.stickyHandParent.GetComponent<CharacterController>().Move(throwDir * 120 * Time.deltaTime);
aSM.stickyHandParent.GetComponent<CharacterController>().Move(throwDir * 130 * Time.deltaTime);
if(Vector3.Distance(aSM.hookPoint.transform.position, aSM.stickyHandParent.transform.position) <= 3f){
Vector3 updatedXHookPointDirection = (new Vector3(aSM.transform.position.x, 0, aSM.transform.position.z) - new Vector3(aSM.hookPoint.transform.position.x, 0, aSM.hookPoint.transform.position.z)).normalized;

7
Assets/Scripts/PopUpScript.cs
View File

@@ -9,6 +9,7 @@ public class PopUpScript : MonoBehaviour
public Item item;
public GameObject uiPrebab;
public string message;
public Sprite slideSprite;
//for some reason on enter was triggering twice (shouldn't happen but couldn't figure out why
private bool isPop = false;
@@ -72,7 +73,7 @@ public class PopUpScript : MonoBehaviour
temp.name = item.name + "PopUp";
temp.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f);
//due to low number, gonna hardcode this to be first
temp.transform.localPosition = new Vector3(0, 0);
temp.transform.localPosition = new Vector3(-250, -430);
temp.transform.localRotation = Quaternion.identity;
//set icon to ui icon
temp.transform.GetComponent<Image>().sprite = item.itemSprite;
@@ -105,7 +106,9 @@ public class PopUpScript : MonoBehaviour
temp.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f);
temp.transform.localRotation = Quaternion.identity;
//due to low number, gonna hardcode this to be first
temp.transform.localPosition = new Vector3(0, 0);
temp.transform.localPosition = new Vector3(-250, -430);
//set icon to ui icon
temp.transform.GetComponent<Image>().sprite = slideSprite;
//set text
temp.transform.Find("Prompt").GetComponent<TMPro.TextMeshProUGUI>().text = message;
//no longer allow instnatiation

22
UserSettings/EditorUserSettings.asset
View File

@@ -6,34 +6,34 @@ EditorUserSettings:
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedScenePath-0:
value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a
value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a
flags: 0
RecentlyUsedScenePath-1:
value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a
value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a
flags: 0
RecentlyUsedScenePath-2:
value: 22424703114646680e0b0227036c7000021e17243f66333e243d04
flags: 0
RecentlyUsedScenePath-3:
value: 22424703114646680e0b0227036c7000021e17243f66333e243d04
flags: 0
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9
flags: 0
RecentlyUsedScenePath-6:
RecentlyUsedScenePath-4:
value: 22424703114646680e0b0227036c731f1415016439262f2434
flags: 0
RecentlyUsedScenePath-5:
value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a
flags: 0
RecentlyUsedScenePath-6:
value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a
flags: 0
RecentlyUsedScenePath-7:
value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-9:
value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a
value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
flags: 0
vcSharedLogLevel:
value: 0d5e400f0650