diff --git a/Assets/Prefabs/Player/PlayerPrefab.prefab b/Assets/Prefabs/Player/PlayerPrefab.prefab index 862d09e..70ac2ee 100644 --- a/Assets/Prefabs/Player/PlayerPrefab.prefab +++ b/Assets/Prefabs/Player/PlayerPrefab.prefab @@ -98,6 +98,14 @@ GameObject: - component: {fileID: 471272923182148881} - component: {fileID: 1292213096936070766} - component: {fileID: 7623511089535041046} + - component: {fileID: 1602186932439279558} + - component: {fileID: 4910425103423673310} + - component: {fileID: 1122837021074491360} + - component: {fileID: 1006370620272136424} + - component: {fileID: 623466146960117777} + - component: {fileID: 1121632309457683679} + - component: {fileID: 7442108947324986527} + - component: {fileID: 3454731726544993114} m_Layer: 3 m_Name: PlayerPrefab m_TagString: Player @@ -238,7 +246,7 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7188906082087890184} - m_Enabled: 1 + m_Enabled: 0 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: e96cb6065543e43c4a752faaa1468eb1, type: 3} m_Name: @@ -279,6 +287,118 @@ MonoBehaviour: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 +--- !u!114 &1602186932439279558 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7188906082087890184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5162a84172831f4449df60b9ad0ce22f, type: 3} + m_Name: + m_EditorClassIdentifier: + controller: {fileID: 0} +--- !u!114 &4910425103423673310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7188906082087890184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 980b3f40ede2d8a4c96587100cf71d02, type: 3} + m_Name: + m_EditorClassIdentifier: + moveDirection: {x: 0, y: 0, z: 0} + dashDistance: 10 + dashStoppingSpeed: 0.1 +--- !u!114 &1122837021074491360 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7188906082087890184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cee70ea30de57ec43a325c1ca6257526, type: 3} + m_Name: + m_EditorClassIdentifier: + maxGrappleDistance: 25 +--- !u!114 &1006370620272136424 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7188906082087890184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f9b52b0ade3c44e47a3a4dc48c47ec1c, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &623466146960117777 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7188906082087890184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0c0aad94b3b1332408ef8e7d07f3b321, type: 3} + m_Name: + m_EditorClassIdentifier: + leg: {fileID: 0} +--- !u!114 &1121632309457683679 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7188906082087890184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1a8c22589436d2449a89cf3a40b6d252, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &7442108947324986527 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7188906082087890184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aa419fd069f632e479eda138a7764362, type: 3} + m_Name: + m_EditorClassIdentifier: + playerCam: {fileID: 0} +--- !u!114 &3454731726544993114 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7188906082087890184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 535009eaa735a4c4e95c6fc270e32741, type: 3} + m_Name: + m_EditorClassIdentifier: + wallMaxDistance: 1 + wallSpeedMultiplier: 1.2 + minimumHeight: 1.2 + maxAngleRoll: 20 + normalizedAngleThreshold: 0.1 + jumpDuration: 1 + wallBouncing: 3 + cameraTransitionDuration: 1 + wallGravityDownForce: 20 --- !u!1 &7188906082643956521 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Demos/InventorySelection.unity b/Assets/Scenes/Demos/InventorySelection.unity index 1b6d5ae..dd77da2 100644 --- a/Assets/Scenes/Demos/InventorySelection.unity +++ b/Assets/Scenes/Demos/InventorySelection.unity @@ -388,6 +388,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: itemOptPrefab: {fileID: 8447329698821624902, guid: 51a78c57dc85625428c8f1e6448d113f, type: 3} + moveScripts: [] --- !u!114 &526839288 MonoBehaviour: m_ObjectHideFlags: 0 @@ -501,6 +502,34 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 623466146960117777, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1006370620272136424, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1121632309457683679, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1122837021074491360, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 1602186932439279558, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3454731726544993114, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4910425103423673310, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} propertyPath: m_RootOrder value: 3 @@ -549,6 +578,14 @@ PrefabInstance: propertyPath: m_Name value: PlayerPrefab objectReference: {fileID: 0} + - target: {fileID: 7442108947324986527, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7623511089535041046, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} + propertyPath: m_Enabled + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} --- !u!1 &591528209 diff --git a/Assets/Scenes/Demos/MovementScene.unity b/Assets/Scenes/Demos/MovementScene.unity index 561cfa5..beeee65 100644 --- a/Assets/Scenes/Demos/MovementScene.unity +++ b/Assets/Scenes/Demos/MovementScene.unity @@ -313,79 +313,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 228851343} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1001 &279177648 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2274833863450849408, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} - propertyPath: m_Enabled - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} - propertyPath: m_LocalPosition.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} - propertyPath: m_LocalPosition.y - value: 1.8 - objectReference: {fileID: 0} - - target: {fileID: 7188906082087890177, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} - propertyPath: m_LocalPosition.z - value: -0.2 - 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: 7188906082087890183, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} - propertyPath: items.Array.size - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7188906082087890183, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} - propertyPath: items.Array.data[0] - value: - objectReference: {fileID: 0} - - target: {fileID: 7188906082087890184, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} - propertyPath: m_Name - value: PlayerPrefab - objectReference: {fileID: 0} - - target: {fileID: 7188906082087890184, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: a9840baa4cc526b44bfef27c6fea042a, type: 3} --- !u!1 &478416584 GameObject: m_ObjectHideFlags: 0 @@ -1060,7 +987,7 @@ GameObject: - component: {fileID: 1493944131} m_Layer: 0 m_Name: Platforms - m_TagString: Untagged + m_TagString: Floor m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/InventoryManager.cs b/Assets/Scripts/PlayerScripts/ItemScripts/InventoryManager.cs index 5e153e9..061f336 100644 --- a/Assets/Scripts/PlayerScripts/ItemScripts/InventoryManager.cs +++ b/Assets/Scripts/PlayerScripts/ItemScripts/InventoryManager.cs @@ -4,15 +4,17 @@ using UnityEngine; public class InventoryManager : MonoBehaviour { - public Item[] allItems; - private List itemList; - public List ItemList{ + public Item[] allItems; + private List itemList; + public List ItemList{ get{ return itemList; } set{ itemList = value; } - } - void Awake(){ - allItems = Resources.LoadAll("ItemObjects"); + } + + + void Awake(){ + allItems = Resources.LoadAll("ItemObjects"); - itemList = new List(allItems); - } + itemList = new List(allItems); + } } diff --git a/Assets/Scripts/PlayerScripts/ItemScripts/SpecialItem.cs b/Assets/Scripts/PlayerScripts/ItemScripts/SpecialItem.cs index ac74a2e..7441ae5 100644 --- a/Assets/Scripts/PlayerScripts/ItemScripts/SpecialItem.cs +++ b/Assets/Scripts/PlayerScripts/ItemScripts/SpecialItem.cs @@ -13,7 +13,7 @@ public class SpecialItem : Item public bool hasNitroM; public bool hasDashM; public float cooldownM; - public MonoScript scriptM; + //public TextAsset scriptM; public override void Equip(PlayerStats p, GameObject player){ if(maxVelM != 0){ @@ -61,9 +61,11 @@ public class SpecialItem : Item if(hasDashM != false){ p.HasDash = hasDashM; } + /* if(scriptM != null){ - player.AddComponent(scriptM.GetClass()); + player.AddComponent(scriptM); } + */ } public override void Unequip(PlayerStats p, GameObject player){ @@ -112,9 +114,11 @@ public class SpecialItem : Item if(hasDashM != false){ p.HasDash = false; } + /* if(scriptM != null){ - Destroy(player.GetComponent(scriptM.GetClass())); + Destroy(player.GetComponent(scriptM)); } + */ } } diff --git a/Assets/Scripts/PlayerScripts/Player.cs b/Assets/Scripts/PlayerScripts/Player.cs deleted file mode 100644 index 06a0ed3..0000000 --- a/Assets/Scripts/PlayerScripts/Player.cs +++ /dev/null @@ -1,7 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Player : MonoBehaviour -{ -} diff --git a/Assets/Scripts/PlayerScripts/Player.cs.meta b/Assets/Scripts/PlayerScripts/Player.cs.meta deleted file mode 100644 index e75b2ac..0000000 --- a/Assets/Scripts/PlayerScripts/Player.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: c2c2e0314365de34c923bb88c9b334ca -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/PlayerScripts/PlayerInventory.cs b/Assets/Scripts/PlayerScripts/PlayerInventory.cs index 8589700..c9f81b2 100644 --- a/Assets/Scripts/PlayerScripts/PlayerInventory.cs +++ b/Assets/Scripts/PlayerScripts/PlayerInventory.cs @@ -30,7 +30,6 @@ public class PlayerInventory : MonoBehaviour Debug.Log("Item Removed"); RemoveItem(item); } - } public void AddSpecialItem(T itemCandidate) { // Unless we don't want the four special items to be handled by inventory/inventory manager? diff --git a/Assets/Scripts/PlayerScripts/PlayerMovement.cs b/Assets/Scripts/PlayerScripts/PlayerMovement.cs index 96aabf4..69f0d25 100644 --- a/Assets/Scripts/PlayerScripts/PlayerMovement.cs +++ b/Assets/Scripts/PlayerScripts/PlayerMovement.cs @@ -62,6 +62,8 @@ public class PlayerMovement : MonoBehaviour private CapsuleCollider capCol; private bool firstHit = false; private bool heldDown = false; + private bool beginRagTimer = false; + private float ragTime; private Vector3 prevRot; private Vector3 hitForce; @@ -78,7 +80,7 @@ public class PlayerMovement : MonoBehaviour capCol.enabled = false; //Wallrun - //wallRun = gameObject.GetComponent(); + wallRun = gameObject.GetComponent(); } void Start() @@ -90,7 +92,7 @@ public class PlayerMovement : MonoBehaviour // Update is called once per frame void FixedUpdate() { - + //Controls for camera Rotation(); @@ -107,7 +109,7 @@ public class PlayerMovement : MonoBehaviour } else{ - if (rB.velocity.magnitude < 0.2f){ + if (RagdollTimer() == 0){ firstHit = false; DisableRagdoll(); @@ -258,12 +260,15 @@ public class PlayerMovement : MonoBehaviour //Camera and Player Rotation private void Rotation() { - transform.Rotate(Vector3.up * sensitivity * Time.deltaTime * Input.GetAxis("Mouse X")); + Vector3 lastCamPos = new Vector3(0,0,0); + if(moveController.enabled){ + transform.Rotate(Vector3.up * sensitivity * Time.deltaTime * Input.GetAxis("Mouse X")); - camRotation.x -= Input.GetAxis("Mouse Y") * sensitivity * Time.deltaTime; - camRotation.x = Mathf.Clamp(camRotation.x, minAngle, maxAngle); + camRotation.x -= Input.GetAxis("Mouse Y") * sensitivity * Time.deltaTime; + camRotation.x = Mathf.Clamp(camRotation.x, minAngle, maxAngle); - cam.transform.localEulerAngles = camRotation; + cam.transform.localEulerAngles = camRotation; + } } @@ -344,20 +349,40 @@ public class PlayerMovement : MonoBehaviour } } private void EnableRagdoll(){ - prevRot = transform.localEulerAngles; - capCol.enabled = true; - moveController.enabled = false; - rB.isKinematic = false; - rB.detectCollisions = true; + ragTime = pStats.RecovTime; + prevRot = transform.localEulerAngles; + capCol.enabled = true; + moveController.enabled = false; + rB.isKinematic = false; + rB.detectCollisions = true; } private void DisableRagdoll(){ - capCol.enabled = false; - moveController.enabled = true; - rB.isKinematic = true; - rB.detectCollisions = false; - transform.localEulerAngles = prevRot; + capCol.enabled = false; + moveController.enabled = true; + rB.isKinematic = true; + rB.detectCollisions = false; + transform.localEulerAngles = prevRot; } + //When to begin the ragdoll timer + private float RagdollTimer(){ + if(beginRagTimer == false){ + beginRagTimer = Physics.Raycast(transform.position, -Vector3.up, distToGround + 0.1f); + } + + else if(ragTime <= 0){ + ragTime = 0; + beginRagTimer = false; + } + + if(beginRagTimer == true){ + ragTime -= Time.deltaTime; + } + + return ragTime; + } + + } diff --git a/Assets/Scripts/PlayerScripts/PlayerStats.cs b/Assets/Scripts/PlayerScripts/PlayerStats.cs index b0da84e..76d1935 100644 --- a/Assets/Scripts/PlayerScripts/PlayerStats.cs +++ b/Assets/Scripts/PlayerScripts/PlayerStats.cs @@ -62,7 +62,7 @@ public class PlayerStats : MonoBehaviour } //Player Recovery Time When Knocked Down - private float recovTime; + private float recovTime = 5; public float RecovTime{ get{ return recovTime; } set{ recovTime = value; } diff --git a/Assets/Scripts/PlayerScripts/Setup.cs b/Assets/Scripts/PlayerScripts/Setup.cs deleted file mode 100644 index aa28d53..0000000 --- a/Assets/Scripts/PlayerScripts/Setup.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class Setup : MonoBehaviour -{ - private PlayerStats pstats; - public bool hasWallRun; - [Range( 1, 50)] - public float maxSpeed; - // Start is called before the first frame update - void Start() - { - pstats = this.gameObject.GetComponent(); - pstats.HasWallrun = hasWallRun; - pstats.MaxVel = maxSpeed; - } -} diff --git a/Assets/Scripts/PlayerScripts/Setup.cs.meta b/Assets/Scripts/PlayerScripts/Setup.cs.meta deleted file mode 100644 index 84b5c93..0000000 --- a/Assets/Scripts/PlayerScripts/Setup.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: ed382e04d00059e40a6803fa4ad43469 -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/SetInvScene/InvSceneSettings.cs b/Assets/Scripts/SetInvScene/InvSceneSettings.cs index 123f5db..cbb0bbb 100644 --- a/Assets/Scripts/SetInvScene/InvSceneSettings.cs +++ b/Assets/Scripts/SetInvScene/InvSceneSettings.cs @@ -29,11 +29,16 @@ public class InvSceneSettings : MonoBehaviour } void Start(){ + player1.GetComponent().enabled = true; InitializeItemB(); pointsLeft = pStats.PlayerPoints; pointText.text = "Points Left: " + pointsLeft; } + void FixedUpdate(){ + itemToEnable(); + } + private void InitializeItemB(){ int index = 0; if(itemOptPrefab != null){ @@ -82,8 +87,26 @@ public class InvSceneSettings : MonoBehaviour } } + + //Enables Script on player + //NEEDS TO BE CLEANED UP AND IMPROVED + public void itemToEnable(){ + if(pStats.HasBlink != player1.GetComponent().enabled) + player1.GetComponent().enabled = pStats.HasBlink; + if(pStats.HasDash != player1.GetComponent().enabled) + player1.GetComponent().enabled = pStats.HasDash; + if(pStats.HasWallrun != player1.GetComponent().enabled) + player1.GetComponent().enabled = pStats.HasWallrun; + if(pStats.HasGrapple != player1.GetComponent().enabled) + player1.GetComponent().enabled = pStats.HasGrapple; + if(pStats.HasNitro != player1.GetComponent().enabled) + player1.GetComponent().enabled = pStats.HasNitro; + + } + public void nextScene(){ player1.GetComponent().enabled = true; + player1.GetComponent().enabled = false; player1.transform.GetChild(0).gameObject.SetActive(true); SceneManager.LoadScene (SceneManager.GetActiveScene().buildIndex + 1); } diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index ab274e7..d6fbece 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -8,6 +8,7 @@ TagManager: - kickable - PlayerCam - HookPoint + - Floor layers: - Default - TransparentFX @@ -15,7 +16,7 @@ TagManager: - Player - Water - UI - - + - Floor - - - diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index d0e822a..71a6fbf 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -21,10 +21,10 @@ EditorUserSettings: value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c7b151b180b6505263035233d1221fbd33134e7e422e0e8347129370bfb25 + value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-6: - value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 + value: 22424703114646680e0b0227036c7b151b180b6505263035233d1221fbd33134e7e422e0e8347129370bfb25 flags: 0 UnityRemoteCompression: value: 337f73