diff --git a/Assets/Prefabs/InvSelection/ItemButtonPrefab.prefab b/Assets/Prefabs/InvSelection/ItemButtonPrefab.prefab index c9eb265..7d8cc50 100644 --- a/Assets/Prefabs/InvSelection/ItemButtonPrefab.prefab +++ b/Assets/Prefabs/InvSelection/ItemButtonPrefab.prefab @@ -349,7 +349,7 @@ RectTransform: m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 63.636303, y: 195.76013} - m_SizeDelta: {x: 97.5026, y: 82.4702} + m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &8447329698821624898 CanvasRenderer: diff --git a/Assets/Prefabs/King/King.prefab b/Assets/Prefabs/King/King.prefab index 3e28167..42f7dfb 100644 --- a/Assets/Prefabs/King/King.prefab +++ b/Assets/Prefabs/King/King.prefab @@ -728,7 +728,7 @@ Camera: m_Depth: -1 m_CullingMask: serializedVersion: 2 - m_Bits: 63487 + m_Bits: 194559 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 diff --git a/Assets/Prefabs/King/KingBlock.prefab b/Assets/Prefabs/King/KingBlock.prefab index 0c3ecef..2d72007 100644 --- a/Assets/Prefabs/King/KingBlock.prefab +++ b/Assets/Prefabs/King/KingBlock.prefab @@ -14,7 +14,7 @@ GameObject: - component: {fileID: 9166227934917151296} - component: {fileID: 6821132509801491322} - component: {fileID: 4537194815303208776} - m_Layer: 0 + m_Layer: 17 m_Name: KingBlock m_TagString: destroyable m_Icon: {fileID: 0} diff --git a/Assets/Prefabs/Player/DebugSMPlayerPrefab.prefab b/Assets/Prefabs/Player/DebugSMPlayerPrefab.prefab index f3ed0ec..6bc90c2 100644 --- a/Assets/Prefabs/Player/DebugSMPlayerPrefab.prefab +++ b/Assets/Prefabs/Player/DebugSMPlayerPrefab.prefab @@ -511,7 +511,7 @@ Camera: m_Depth: -1 m_CullingMask: serializedVersion: 2 - m_Bits: 27391 + m_Bits: 158463 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 diff --git a/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab b/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab index 0dbd454..903f547 100644 --- a/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab +++ b/Assets/Prefabs/Player/NetworkSMPlayerPrefab.prefab @@ -5526,7 +5526,7 @@ Camera: m_Depth: -1 m_CullingMask: serializedVersion: 2 - m_Bits: 27391 + m_Bits: 158463 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 diff --git a/Assets/Scenes/Lobby.unity b/Assets/Scenes/Lobby.unity index 5515b67..2d3d1cf 100644 --- a/Assets/Scenes/Lobby.unity +++ b/Assets/Scenes/Lobby.unity @@ -340,7 +340,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3669633515805984294, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} propertyPath: m_LocalRotation.w - value: 0 + value: -0.17364809 objectReference: {fileID: 0} - target: {fileID: 3669633515805984294, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} propertyPath: m_LocalRotation.x @@ -348,11 +348,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3669633515805984294, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} propertyPath: m_LocalRotation.y - value: 1 + value: 0.9848078 objectReference: {fileID: 0} - target: {fileID: 3669633515805984294, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3669633515805984294, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -360,7 +360,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3669633515805984294, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 180 + value: 200 objectReference: {fileID: 0} - target: {fileID: 3669633515805984294, guid: 1e178f956ddfe5143b2b9e77e76db7f0, type: 3} propertyPath: m_LocalEulerAnglesHint.z @@ -390,15 +390,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} propertyPath: m_LocalScale.x - value: 20 + value: 38 objectReference: {fileID: 0} - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} propertyPath: m_LocalScale.y - value: 20 + value: 38 objectReference: {fileID: 0} - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} propertyPath: m_LocalScale.z - value: 20 + value: 38 objectReference: {fileID: 0} - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} propertyPath: m_LocalPosition.x @@ -406,7 +406,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} propertyPath: m_LocalPosition.y - value: -9.76 + value: -25 objectReference: {fileID: 0} - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} propertyPath: m_LocalPosition.z @@ -414,7 +414,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} propertyPath: m_LocalRotation.w - value: 0 + value: -0.17364809 objectReference: {fileID: 0} - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} propertyPath: m_LocalRotation.x @@ -422,11 +422,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} propertyPath: m_LocalRotation.y - value: 1 + value: 0.9848078 objectReference: {fileID: 0} - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -434,7 +434,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 180 + value: 200 objectReference: {fileID: 0} - target: {fileID: 3379427927072430670, guid: d5667529149c5e945afdabd32b7d86ae, type: 3} propertyPath: m_LocalEulerAnglesHint.z diff --git a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugMoveState/dMoveStateManager.cs b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugMoveState/dMoveStateManager.cs index d1326e4..d0942b9 100644 --- a/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugMoveState/dMoveStateManager.cs +++ b/Assets/Scripts/PlayerScripts/DebugStateMachine/DebugMoveState/dMoveStateManager.cs @@ -101,7 +101,7 @@ public class dMoveStateManager : NetworkBehaviour //// ////Initialize Variables - layerMask = (1 << 0); + layerMask = (1 << 17); //layerMask = ~layerMask; //// diff --git a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/MoveStateManager.cs b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/MoveStateManager.cs index 184cd9c..f90fd64 100644 --- a/Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/MoveStateManager.cs +++ b/Assets/Scripts/PlayerScripts/NetworkedStateMachines/MovementState/MoveStateManager.cs @@ -100,7 +100,7 @@ public class MoveStateManager : NetworkBehaviour //// ////Initialize Variables - layerMask = (1 << 0); + layerMask = (1 << 17); //layerMask = ~layerMask; //// diff --git a/Assets/Scripts/PlayerScripts/PlayerInventory.cs b/Assets/Scripts/PlayerScripts/PlayerInventory.cs index d472328..c9a7f10 100644 --- a/Assets/Scripts/PlayerScripts/PlayerInventory.cs +++ b/Assets/Scripts/PlayerScripts/PlayerInventory.cs @@ -74,7 +74,13 @@ public class PlayerInventory : NetworkBehaviour foreach(string itemName in items){ if (itemName == "" || itemName == " ") { continue; } - AddItem(allItems[itemName]); + if(!playerItemDict.ContainsKey(itemName)){ + AddItem(allItems[itemName]); + } + else{ + Debug.Log("Attempted To Equip Item Already in Inventory"); + } + } } diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/StrongerKick.asset b/Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems/StrongerKick.asset similarity index 100% rename from Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/StrongerKick.asset rename to Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems/StrongerKick.asset diff --git a/Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/StrongerKick.asset.meta b/Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems/StrongerKick.asset.meta similarity index 100% rename from Assets/Scripts/PlayerScripts/PlayerItems/Resources/ItemObjects/StrongerKick.asset.meta rename to Assets/Scripts/PlayerScripts/PlayerItems/ObsoleteItems/StrongerKick.asset.meta diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 1450bc5..e42c8ec 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -45,7 +45,7 @@ TagManager: - DoorFrame - PlayerKicking - InvisibleWall - - + - KingBlock - - - diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 9456d1b..af8c7b4 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -21,16 +21,16 @@ EditorUserSettings: value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c731f1415016439262f2434 + value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 flags: 0 RecentlyUsedScenePath-7: - value: 22424703114646680e0b0227036c7b151b180b6501273035202c1327d1e33136e7a923e7ee2e26 + value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb flags: 0 RecentlyUsedScenePath-8: - value: 22424703114646680e0b0227036c78111b125507233d28242c20137df7ee3d2cfb + value: 22424703114646680e0b0227036c731f1415016439262f2434 flags: 0 RecentlyUsedScenePath-9: value: 22424703114646680e0b0227036c6f02131b172b282d347e38271427fb