mirror of
https://github.com/Leahnaya/TheKingsRace.git
synced 2026-04-25 07:57:08 -05:00
Idk what Ive done
This commit is contained in:
Melbyj1125
parent
534661973a
commit
ecc0ea7e00
|
|
@ -178,7 +178,7 @@ RectTransform:
|
|||
m_GameObject: {fileID: 8588054010754274200}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_LocalScale: {x: 0.75, y: 0.75, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 1975447176985812107}
|
||||
- {fileID: 7154711580899908832}
|
||||
|
|
|
|||
|
|
@ -204,7 +204,7 @@ MonoBehaviour:
|
|||
m_Calls: []
|
||||
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 3
|
||||
m_PreserveAspect: 0
|
||||
m_PreserveAspect: 1
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
|
|
|
|||
|
|
@ -73,10 +73,10 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_UiScaleMode: 0
|
||||
m_UiScaleMode: 1
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 800, y: 600}
|
||||
m_ReferenceResolution: {x: 1920, y: 1080}
|
||||
m_ScreenMatchMode: 0
|
||||
m_MatchWidthOrHeight: 0
|
||||
m_PhysicalUnit: 3
|
||||
|
|
|
|||
|
|
@ -1167,6 +1167,7 @@ MonoBehaviour:
|
|||
curJumpNum: 0
|
||||
jumpHeld: 0
|
||||
canJump: 1
|
||||
jumpPressed: 0
|
||||
coyJumpTimer: 0.1
|
||||
curCoyJumpTimer: 0.13
|
||||
lowJumpMultiplier: 0.001
|
||||
|
|
@ -3658,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: 715, y: -340}
|
||||
m_SizeDelta: {x: 536, y: 464}
|
||||
m_AnchoredPosition: {x: 675, y: -415}
|
||||
m_SizeDelta: {x: 600, y: 300}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1710959632299265877
|
||||
CanvasRenderer:
|
||||
|
|
@ -4627,10 +4628,10 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_UiScaleMode: 0
|
||||
m_UiScaleMode: 1
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 800, y: 600}
|
||||
m_ReferenceResolution: {x: 1920, y: 1080}
|
||||
m_ScreenMatchMode: 0
|
||||
m_MatchWidthOrHeight: 0
|
||||
m_PhysicalUnit: 3
|
||||
|
|
|
|||
|
|
@ -280,8 +280,8 @@ MonoBehaviour:
|
|||
|
||||
'
|
||||
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: []
|
||||
|
|
@ -305,8 +305,8 @@ MonoBehaviour:
|
|||
m_faceColor:
|
||||
serializedVersion: 2
|
||||
rgba: 4294967295
|
||||
m_fontSize: 30
|
||||
m_fontSizeBase: 30
|
||||
m_fontSize: 40
|
||||
m_fontSizeBase: 40
|
||||
m_fontWeight: 400
|
||||
m_enableAutoSizing: 0
|
||||
m_fontSizeMin: 18
|
||||
|
|
@ -341,7 +341,7 @@ MonoBehaviour:
|
|||
m_VertexBufferAutoSizeReduction: 0
|
||||
m_useMaxVisibleDescender: 1
|
||||
m_pageToDisplay: 1
|
||||
m_margin: {x: 66.04541, y: 0, z: 66.29382, w: 0}
|
||||
m_margin: {x: -5.0638504, y: 0, z: 4.768982, w: 0}
|
||||
m_isUsingLegacyAnimationComponent: 0
|
||||
m_isVolumetricText: 0
|
||||
m_hasFontAssetChanged: 0
|
||||
|
|
@ -2388,10 +2388,10 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_UiScaleMode: 0
|
||||
m_UiScaleMode: 1
|
||||
m_ReferencePixelsPerUnit: 100
|
||||
m_ScaleFactor: 1
|
||||
m_ReferenceResolution: {x: 800, y: 600}
|
||||
m_ReferenceResolution: {x: 1920, y: 1080}
|
||||
m_ScreenMatchMode: 0
|
||||
m_MatchWidthOrHeight: 0
|
||||
m_PhysicalUnit: 3
|
||||
|
|
@ -3743,8 +3743,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: 715, y: -340}
|
||||
m_SizeDelta: {x: 536, y: 464}
|
||||
m_AnchoredPosition: {x: 675, y: -415}
|
||||
m_SizeDelta: {x: 600, y: 300}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2264754566127494481
|
||||
CanvasRenderer:
|
||||
|
|
@ -5303,7 +5303,7 @@ MonoBehaviour:
|
|||
mSM: {fileID: 0}
|
||||
curJumpNum: 0
|
||||
jumpHeld: 0
|
||||
canJump: 1
|
||||
jumpPressed: 0
|
||||
coyJumpTimer: 0.13
|
||||
curCoyJumpTimer: 0.13
|
||||
lowJumpMultiplier: 0.001
|
||||
|
|
@ -6314,8 +6314,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: 871, y: -509}
|
||||
m_SizeDelta: {x: 160, y: 160}
|
||||
m_AnchoredPosition: {x: 810, y: -480}
|
||||
m_SizeDelta: {x: 230, y: 160}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &909838618087020997
|
||||
CanvasRenderer:
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load Diff
|
|
@ -3625,6 +3625,58 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 420218350421039198, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 160
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 420218350421039198, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1707207228499037468, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
propertyPath: hasDash
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1707207228499037468, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
propertyPath: hasNitro
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1707207228499037468, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
propertyPath: hasGlider
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1707207228499037468, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
propertyPath: hasGrapple
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1707207228499037468, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
propertyPath: hasWallrun
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5082014531075731820, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
propertyPath: m_fontSize
|
||||
value: 40
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5082014531075731820, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
propertyPath: m_margin.x
|
||||
value: -5.729248
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5082014531075731820, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
propertyPath: m_margin.z
|
||||
value: 0.47424316
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5082014531075731820, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
propertyPath: m_fontAsset
|
||||
value:
|
||||
objectReference: {fileID: 11400000, guid: c9c6ab728bbf8974783d3354922a042f, type: 2}
|
||||
- target: {fileID: 5082014531075731820, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
propertyPath: m_fontSizeBase
|
||||
value: 40
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5082014531075731820, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
propertyPath: m_sharedMaterial
|
||||
value:
|
||||
objectReference: {fileID: -1126714427571281196, guid: c9c6ab728bbf8974783d3354922a042f, type: 2}
|
||||
- target: {fileID: 5759777694531189237, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 13
|
||||
|
|
@ -3673,5 +3725,33 @@ PrefabInstance:
|
|||
propertyPath: m_Name
|
||||
value: DebugSMPlayerPrefab
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8370702511891240678, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 650
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8370702511891240678, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 310
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8370702511891240678, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 660
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8370702511891240678, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -420
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9000899855765473272, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 230
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9000899855765473272, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 810
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 9000899855765473272, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -480
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 0ea305f96ab853340bb9f0ed320dac08, type: 3}
|
||||
|
|
|
|||
|
|
@ -173,7 +173,7 @@ MonoBehaviour:
|
|||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_Maskable: 1
|
||||
|
|
@ -181,7 +181,7 @@ MonoBehaviour:
|
|||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_FontData:
|
||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Font: {fileID: 12800000, guid: 353e251299fb13c44b479a40dce9522d, type: 3}
|
||||
m_FontSize: 100
|
||||
m_FontStyle: 2
|
||||
m_BestFit: 0
|
||||
|
|
@ -2592,7 +2592,7 @@ MonoBehaviour:
|
|||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 1
|
||||
m_Transition: 2
|
||||
m_Colors:
|
||||
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
|
||||
|
|
@ -2603,7 +2603,7 @@ MonoBehaviour:
|
|||
m_FadeDuration: 0.1
|
||||
m_SpriteState:
|
||||
m_HighlightedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 0}
|
||||
m_PressedSprite: {fileID: 3013060722868002094, guid: 129d6de3c52ce5747b4594049bbc9a0b, type: 3}
|
||||
m_SelectedSprite: {fileID: 0}
|
||||
m_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
|
|
@ -2649,9 +2649,9 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_Sprite: {fileID: -3778901795496232556, guid: 129d6de3c52ce5747b4594049bbc9a0b, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 1
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
|
|
@ -3006,10 +3006,10 @@ RectTransform:
|
|||
m_Father: {fileID: 280187771}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -102}
|
||||
m_SizeDelta: {x: -800, y: -900}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: -100}
|
||||
m_SizeDelta: {x: 1200, y: 300}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1795530227
|
||||
MonoBehaviour:
|
||||
|
|
@ -3031,9 +3031,9 @@ MonoBehaviour:
|
|||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_Type: 1
|
||||
m_PreserveAspect: 0
|
||||
m_Sprite: {fileID: -262484171651407337, guid: 3e65d02cc41473143be6130fc686e619, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 1
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
|
|
@ -3162,7 +3162,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: 0, y: 55}
|
||||
m_AnchoredPosition: {x: 0, y: 71}
|
||||
m_SizeDelta: {x: 160, y: 30}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &2034990731
|
||||
|
|
@ -3186,7 +3186,7 @@ MonoBehaviour:
|
|||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_FontData:
|
||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Font: {fileID: 12800000, guid: 353e251299fb13c44b479a40dce9522d, type: 3}
|
||||
m_FontSize: 100
|
||||
m_FontStyle: 1
|
||||
m_BestFit: 0
|
||||
|
|
@ -3368,7 +3368,7 @@ MonoBehaviour:
|
|||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_FontData:
|
||||
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
|
||||
m_Font: {fileID: 12800000, guid: 353e251299fb13c44b479a40dce9522d, type: 3}
|
||||
m_FontSize: 70
|
||||
m_FontStyle: 0
|
||||
m_BestFit: 0
|
||||
|
|
|
|||
|
|
@ -99,26 +99,27 @@ public class CoolDown : MonoBehaviour
|
|||
//set parent as highlight
|
||||
temp3.transform.SetParent(boxHighlight.transform);
|
||||
temp3.name = kickItem.name;
|
||||
temp3.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f);
|
||||
temp3.transform.localRotation = Quaternion.identity;
|
||||
//due to low number, gonna hardcode this to be first
|
||||
temp3.transform.localPosition = new Vector3(100, -100);
|
||||
temp3.transform.localPosition = new Vector3(-90, -40);
|
||||
temp3.transform.localScale = new Vector3(.75f,.75f,.75f);
|
||||
//set icon to ui icon
|
||||
temp3.transform.GetComponent<Image>().sprite = kickItem.itemSprite;
|
||||
temp3.transform.GetComponentInChildren<TMPro.TextMeshProUGUI>().text = "F";
|
||||
|
||||
|
||||
//slide
|
||||
GameObject temp4 = Instantiate(uiPrebab);
|
||||
//set parent as highlight
|
||||
temp4.transform.SetParent(boxHighlight.transform);
|
||||
temp4.name = "slide";
|
||||
temp4.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f);
|
||||
temp4.transform.localRotation = Quaternion.identity;
|
||||
//due to low number, gonna hardcode this to be first
|
||||
temp4.transform.localPosition = new Vector3(-75, -100);
|
||||
temp4.transform.localPosition = new Vector3(-240, -40);
|
||||
temp4.transform.localScale = new Vector3(.75f,.75f,.75f);
|
||||
temp4.transform.GetComponent<Image>().sprite = slide;
|
||||
//set icon to ui icon
|
||||
//doesn't exists
|
||||
temp4.transform.GetComponentInChildren<TMPro.TextMeshProUGUI>().text = "Slide \n Q";
|
||||
|
||||
|
||||
////check if items are there
|
||||
//grapple
|
||||
|
|
@ -130,8 +131,8 @@ public class CoolDown : MonoBehaviour
|
|||
temp.transform.SetParent(boxHighlight.transform);
|
||||
temp.name = nitroItem.name;
|
||||
temp.transform.localRotation = Quaternion.identity;
|
||||
temp.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f);
|
||||
temp.transform.localRotation.Set(0f, 0f, 0f, 0f);
|
||||
temp.transform.localScale = new Vector3(.75f,.75f,.75f);
|
||||
temp.GetComponent<UICoolDown>().setCoolDownTime(nitroItem.cooldownM);
|
||||
//set position on canvas
|
||||
//due to low number, gonna hardcode this to be first
|
||||
|
|
@ -139,46 +140,44 @@ public class CoolDown : MonoBehaviour
|
|||
//increment items
|
||||
if (itemsAdded == 0)
|
||||
{
|
||||
temp.transform.localPosition = new Vector3(-250, -100);
|
||||
temp.transform.localPosition = new Vector3(210, 80);
|
||||
itemsAdded++;
|
||||
}
|
||||
//increment items
|
||||
else if (itemsAdded >= 1)
|
||||
{
|
||||
temp.transform.localPosition = new Vector3(100 + posTemp, 100);
|
||||
posTemp -= 175;
|
||||
temp.transform.localPosition = new Vector3(60 + posTemp, 80);
|
||||
posTemp -= 150;
|
||||
itemsAdded++;
|
||||
}
|
||||
//set icon to ui icon
|
||||
temp.transform.GetComponent<Image>().sprite = nitroItem.itemSprite;
|
||||
//set button control (hard coded)
|
||||
temp.transform.GetComponentInChildren<TMPro.TextMeshProUGUI>().text = "Shift";
|
||||
}
|
||||
if (stats.HasDash == true)
|
||||
{
|
||||
GameObject temp2 = Instantiate(uiPrebab);
|
||||
temp2.transform.SetParent(boxHighlight.transform);
|
||||
temp2.name = dashItem.name;
|
||||
temp2.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f);
|
||||
temp2.transform.localRotation = Quaternion.identity;
|
||||
temp2.transform.localScale = new Vector3(.75f,.75f,.75f);
|
||||
//increment items
|
||||
if (itemsAdded == 0)
|
||||
{
|
||||
temp2.transform.localPosition = new Vector3(-250, -100);
|
||||
temp2.transform.localPosition = new Vector3(210, 80);
|
||||
itemsAdded++;
|
||||
}
|
||||
//increment items
|
||||
else if (itemsAdded >= 1)
|
||||
{
|
||||
temp2.transform.localPosition = new Vector3(100 + posTemp, 100);
|
||||
posTemp -= 175;
|
||||
temp2.transform.localPosition = new Vector3(60 + posTemp, 80);
|
||||
posTemp -= 150;
|
||||
itemsAdded++;
|
||||
}
|
||||
temp2.GetComponent<UICoolDown>().setCoolDownTime(dashItem.cooldownM);
|
||||
//set image
|
||||
temp2.transform.GetComponent<Image>().sprite = dashItem.itemSprite;
|
||||
//set button control
|
||||
temp2.transform.GetComponentInChildren<TMPro.TextMeshProUGUI>().text = "R";
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -188,25 +187,24 @@ public class CoolDown : MonoBehaviour
|
|||
//set parent as highlight
|
||||
temp5.transform.SetParent(boxHighlight.transform);
|
||||
temp5.name = grapple.itemName;
|
||||
temp5.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f);
|
||||
temp5.transform.localRotation = Quaternion.identity;
|
||||
temp5.transform.localScale = new Vector3(.75f,.75f,.75f);
|
||||
//increment items
|
||||
if (itemsAdded == 0)
|
||||
{
|
||||
temp5.transform.localPosition = new Vector3(-250, -100);
|
||||
temp5.transform.localPosition = new Vector3(210, 80);
|
||||
itemsAdded++;
|
||||
}
|
||||
//increment items
|
||||
else if (itemsAdded >= 1)
|
||||
{
|
||||
temp5.transform.localPosition = new Vector3(100 + posTemp, 100);
|
||||
posTemp -= 175;
|
||||
temp5.transform.localPosition = new Vector3(60 + posTemp, 80);
|
||||
posTemp -= 150;
|
||||
itemsAdded++;
|
||||
}
|
||||
//set icon to ui icon
|
||||
temp5.transform.GetComponent<Image>().sprite = grapple.itemSprite;
|
||||
//doesn't exists
|
||||
temp5.transform.GetComponentInChildren<TMPro.TextMeshProUGUI>().text = "E";
|
||||
//increment counter
|
||||
}
|
||||
//glider
|
||||
|
|
@ -216,25 +214,24 @@ public class CoolDown : MonoBehaviour
|
|||
//set parent as highlight
|
||||
temp6.transform.SetParent(boxHighlight.transform);
|
||||
temp6.name = Glide.itemName;
|
||||
temp6.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f);
|
||||
temp6.transform.localRotation = Quaternion.identity;
|
||||
temp6.transform.localScale = new Vector3(.75f,.75f,.75f);
|
||||
//increment items
|
||||
if (itemsAdded == 0)
|
||||
{
|
||||
temp6.transform.localPosition = new Vector3(-250, -100);
|
||||
temp6.transform.localPosition = new Vector3(210, 80);
|
||||
itemsAdded++;
|
||||
}
|
||||
//increment items
|
||||
else if (itemsAdded >= 1)
|
||||
{
|
||||
temp6.transform.localPosition = new Vector3(100 + posTemp, 100);
|
||||
posTemp -= 175;
|
||||
temp6.transform.localPosition = new Vector3(60 + posTemp, 80);
|
||||
posTemp -= 150;
|
||||
itemsAdded++;
|
||||
}
|
||||
//set icon to ui icon
|
||||
temp6.transform.GetComponent<Image>().sprite = Glide.itemSprite;
|
||||
//doesn't exists
|
||||
temp6.transform.GetComponentInChildren<TMPro.TextMeshProUGUI>().text = "Hold Space";
|
||||
//increment counter
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -67,7 +67,7 @@ public class dMoveStateManager : NetworkBehaviour
|
|||
private Vector3 lastVel; // previous vel
|
||||
private bool firstWallHit = false; // hit the wall for the first time
|
||||
private float tempCurVel;
|
||||
private bool setTempVel = false;
|
||||
private bool setTempVel = false;//
|
||||
|
||||
//Camera Variables
|
||||
private Vector3 camRotation; // cameras camera rotation vector
|
||||
|
|
|
|||
|
|
@ -4,13 +4,19 @@ using UnityEngine;
|
|||
|
||||
public class SwitchMenuControls : MonoBehaviour
|
||||
{
|
||||
public GameObject currentMenu;
|
||||
public GameObject nextMenu;
|
||||
public GameObject playerMenu;
|
||||
public GameObject kingMenu;
|
||||
// Update is called once per frame
|
||||
public void enable()
|
||||
{
|
||||
nextMenu.SetActive(true);
|
||||
currentMenu.SetActive(false);
|
||||
if(playerMenu.active){
|
||||
kingMenu.SetActive(true);
|
||||
playerMenu.SetActive(false);
|
||||
}
|
||||
else{
|
||||
kingMenu.SetActive(false);
|
||||
playerMenu.SetActive(true);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,17 @@
|
|||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using TMPro;
|
||||
using UnityEngine;
|
||||
|
||||
public class ControlsMenuScript : MonoBehaviour
|
||||
{
|
||||
public GameObject keyboardControlsMenu;
|
||||
public GameObject gamePadControlsMenu;
|
||||
public GameObject keyboardRunnerControlsMenu;
|
||||
public GameObject gamePadRunnerControlsMenu;
|
||||
public GameObject keyboardKingControlsMenu;
|
||||
public GameObject gamePadKingControlsMenu;
|
||||
|
||||
public TextMeshProUGUI buttonText;
|
||||
private bool isKing = false;
|
||||
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
|
|
@ -19,21 +25,78 @@ public class ControlsMenuScript : MonoBehaviour
|
|||
//if vertical input from right analog
|
||||
if (Input.GetAxis("KingVerticalMouseMove") != 0 || Input.GetAxis("KingHorizontalMouseMove") != 0)
|
||||
{
|
||||
//if off, turn it on
|
||||
if(gamePadControlsMenu.activeInHierarchy == false)
|
||||
{
|
||||
keyboardControlsMenu.SetActive(false);
|
||||
gamePadControlsMenu.SetActive(true);
|
||||
if(isKing){
|
||||
//if off, turn it on
|
||||
if(gamePadKingControlsMenu.activeInHierarchy == false)
|
||||
{
|
||||
keyboardKingControlsMenu.SetActive(false);
|
||||
gamePadKingControlsMenu.SetActive(true);
|
||||
}
|
||||
//if off, turn it on
|
||||
if(gamePadKingControlsMenu.activeInHierarchy == false)
|
||||
{
|
||||
keyboardKingControlsMenu.SetActive(false);
|
||||
gamePadKingControlsMenu.SetActive(true);
|
||||
}
|
||||
}
|
||||
else{
|
||||
//if off, turn it on
|
||||
if(gamePadRunnerControlsMenu.activeInHierarchy == false)
|
||||
{
|
||||
keyboardRunnerControlsMenu.SetActive(false);
|
||||
gamePadRunnerControlsMenu.SetActive(true);
|
||||
}
|
||||
//if off, turn it on
|
||||
if(gamePadRunnerControlsMenu.activeInHierarchy == false)
|
||||
{
|
||||
keyboardRunnerControlsMenu.SetActive(false);
|
||||
gamePadRunnerControlsMenu.SetActive(true);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
//check if mouse movement if so (turn off pointer)
|
||||
if (Input.GetAxis("Mouse X") != 0 || Input.GetAxis("Mouse Y") != 0)
|
||||
{
|
||||
if (keyboardControlsMenu.activeInHierarchy == false)
|
||||
{
|
||||
keyboardControlsMenu.SetActive(true);
|
||||
gamePadControlsMenu.SetActive(false);
|
||||
if(isKing){
|
||||
//if off, turn it on
|
||||
if(gamePadKingControlsMenu.activeInHierarchy == false)
|
||||
{
|
||||
keyboardKingControlsMenu.SetActive(true);
|
||||
gamePadKingControlsMenu.SetActive(false);
|
||||
}
|
||||
//if off, turn it on
|
||||
if(gamePadKingControlsMenu.activeInHierarchy == false)
|
||||
{
|
||||
keyboardKingControlsMenu.SetActive(true);
|
||||
gamePadKingControlsMenu.SetActive(false);
|
||||
}
|
||||
}
|
||||
else{
|
||||
//if off, turn it on
|
||||
if(gamePadRunnerControlsMenu.activeInHierarchy == false)
|
||||
{
|
||||
keyboardRunnerControlsMenu.SetActive(true);
|
||||
gamePadRunnerControlsMenu.SetActive(false);
|
||||
}
|
||||
//if off, turn it on
|
||||
if(gamePadRunnerControlsMenu.activeInHierarchy == false)
|
||||
{
|
||||
keyboardRunnerControlsMenu.SetActive(true);
|
||||
gamePadRunnerControlsMenu.SetActive(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
public void SwapButtonText(){
|
||||
if(!isKing){
|
||||
buttonText.text = "Runner Controls";
|
||||
isKing = true;
|
||||
}
|
||||
else{
|
||||
buttonText.text = "King Controls";
|
||||
isKing = false;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -99,10 +99,9 @@ public class dCoolDown : MonoBehaviour
|
|||
//set parent as highlight
|
||||
temp3.transform.SetParent(boxHighlight.transform);
|
||||
temp3.name = kickItem.name;
|
||||
temp3.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f);
|
||||
temp3.transform.localRotation = Quaternion.identity;
|
||||
//due to low number, gonna hardcode this to be first
|
||||
temp3.transform.localPosition = new Vector3(165, -56);
|
||||
temp3.transform.localPosition = new Vector3(-90, -40);
|
||||
//set icon to ui icon
|
||||
temp3.transform.GetComponent<Image>().sprite = kickItem.itemSprite;
|
||||
//temp3.transform.GetComponentInChildren<TMPro.TextMeshProUGUI>().text = "F";
|
||||
|
|
@ -112,10 +111,9 @@ public class dCoolDown : MonoBehaviour
|
|||
//set parent as highlight
|
||||
temp4.transform.SetParent(boxHighlight.transform);
|
||||
temp4.name = "slide";
|
||||
temp4.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f);
|
||||
temp4.transform.localRotation = Quaternion.identity;
|
||||
//due to low number, gonna hardcode this to be first
|
||||
temp4.transform.localPosition = new Vector3(-10, -56);
|
||||
temp4.transform.localPosition = new Vector3(-240, -40);
|
||||
//set icon to ui icon
|
||||
//doesn't exists
|
||||
temp4.transform.GetComponent<Image>().sprite = slideSprite;
|
||||
|
|
@ -131,7 +129,6 @@ public class dCoolDown : MonoBehaviour
|
|||
temp.transform.SetParent(boxHighlight.transform);
|
||||
temp.name = nitroItem.name;
|
||||
temp.transform.localRotation = Quaternion.identity;
|
||||
temp.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f);
|
||||
temp.transform.localRotation.Set(0f, 0f, 0f, 0f);
|
||||
temp.GetComponent<UICoolDown>().setCoolDownTime(nitroItem.cooldownM);
|
||||
//set position on canvas
|
||||
|
|
@ -140,14 +137,14 @@ public class dCoolDown : MonoBehaviour
|
|||
//increment items
|
||||
if (itemsAdded == 0)
|
||||
{
|
||||
temp.transform.localPosition = new Vector3(-184, -56);
|
||||
temp.transform.localPosition = new Vector3(210, 80);
|
||||
itemsAdded++;
|
||||
}
|
||||
//increment items
|
||||
else if (itemsAdded >= 1)
|
||||
{
|
||||
temp.transform.localPosition = new Vector3(165 + posTemp, 144);
|
||||
posTemp -= 175;
|
||||
temp.transform.localPosition = new Vector3(60 + posTemp, 80);
|
||||
posTemp -= 150;
|
||||
itemsAdded++;
|
||||
}
|
||||
//set icon to ui icon
|
||||
|
|
@ -160,19 +157,18 @@ public class dCoolDown : MonoBehaviour
|
|||
GameObject temp2 = Instantiate(uiPrebab);
|
||||
temp2.transform.SetParent(boxHighlight.transform);
|
||||
temp2.name = dashItem.name;
|
||||
temp2.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f);
|
||||
temp2.transform.localRotation = Quaternion.identity;
|
||||
//increment items
|
||||
if (itemsAdded == 0)
|
||||
{
|
||||
temp2.transform.localPosition = new Vector3(-184, -56);
|
||||
temp2.transform.localPosition = new Vector3(210, 80);
|
||||
itemsAdded++;
|
||||
}
|
||||
//increment items
|
||||
else if (itemsAdded >= 1)
|
||||
{
|
||||
temp2.transform.localPosition = new Vector3(165 + posTemp, 144);
|
||||
posTemp -= 175;
|
||||
temp2.transform.localPosition = new Vector3(60 + posTemp, 80);
|
||||
posTemp -= 150;
|
||||
itemsAdded++;
|
||||
}
|
||||
temp2.GetComponent<UICoolDown>().setCoolDownTime(dashItem.cooldownM);
|
||||
|
|
@ -189,19 +185,18 @@ public class dCoolDown : MonoBehaviour
|
|||
//set parent as highlight
|
||||
temp5.transform.SetParent(boxHighlight.transform);
|
||||
temp5.name = grapple.itemName;
|
||||
temp5.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f);
|
||||
temp5.transform.localRotation = Quaternion.identity;
|
||||
//increment items
|
||||
if (itemsAdded == 0)
|
||||
{
|
||||
temp5.transform.localPosition = new Vector3(-184, -56);
|
||||
temp5.transform.localPosition = new Vector3(210, 80);
|
||||
itemsAdded++;
|
||||
}
|
||||
//increment items
|
||||
else if (itemsAdded >= 1)
|
||||
{
|
||||
temp5.transform.localPosition = new Vector3(165 + posTemp, 144);
|
||||
posTemp -= 175;
|
||||
temp5.transform.localPosition = new Vector3(60 + posTemp, 80);
|
||||
posTemp -= 150;
|
||||
itemsAdded++;
|
||||
}
|
||||
//set icon to ui icon
|
||||
|
|
@ -217,19 +212,18 @@ public class dCoolDown : MonoBehaviour
|
|||
//set parent as highlight
|
||||
temp6.transform.SetParent(boxHighlight.transform);
|
||||
temp6.name = Glide.itemName;
|
||||
temp6.transform.localScale = new Vector3(1.0f, 1.0f, 1.0f);
|
||||
temp6.transform.localRotation = Quaternion.identity;
|
||||
//increment items
|
||||
if (itemsAdded == 0)
|
||||
{
|
||||
temp6.transform.localPosition = new Vector3(-184, -56);
|
||||
temp6.transform.localPosition = new Vector3(210, 80);
|
||||
itemsAdded++;
|
||||
}
|
||||
//increment items
|
||||
else if (itemsAdded >= 1)
|
||||
{
|
||||
temp6.transform.localPosition = new Vector3(165 + posTemp, 144);
|
||||
posTemp -= 175;
|
||||
temp6.transform.localPosition = new Vector3(60 + posTemp, 80);
|
||||
posTemp -= 150;
|
||||
itemsAdded++;
|
||||
}
|
||||
//set icon to ui icon
|
||||
|
|
|
|||
|
|
@ -15,19 +15,19 @@ EditorUserSettings:
|
|||
value: 22424703114646680e0b0227036c6f1f05033f2b212d68252320092a
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-3:
|
||||
value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9
|
||||
value: 22424703114646680e0b0227036c7000021e17243f66333e243d04
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-4:
|
||||
value: 22424703114646680e0b0227036c7000021e17243f66333e243d04
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-5:
|
||||
value: 22424703114646680e0b0227036c7c1f18030a25203b68252320092a
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-5:
|
||||
value: 22424703114646680e0b0227036c6b19021b1d192f2d2835633c133af6f9
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-6:
|
||||
value: 22424703114646680e0b0227036c7000021e17243f66333e243d04
|
||||
value: 22424703114646680e0b0227036c731f1415016439262f2434
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-7:
|
||||
value: 22424703114646680e0b0227036c731f1415016439262f2434
|
||||
value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26
|
||||
flags: 0
|
||||
RecentlyUsedScenePath-8:
|
||||
value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user