diff --git a/Assets/Prefabs/Axe.prefab b/Assets/Prefabs/Axe.prefab index 8e7268c..676dfc6 100644 --- a/Assets/Prefabs/Axe.prefab +++ b/Assets/Prefabs/Axe.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 6685588177341926650} - component: {fileID: 446580309450626146} - component: {fileID: 7006137615273775628} - m_Layer: 0 + m_Layer: 11 m_Name: Axe m_TagString: Untagged m_Icon: {fileID: 0} @@ -73,7 +73,7 @@ GameObject: - component: {fileID: 7936118471956355810} - component: {fileID: 7936118471955224610} - component: {fileID: 7936118471966684450} - m_Layer: 0 + m_Layer: 11 m_Name: twoHandedAxe m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Prefabs/Canvas.prefab b/Assets/Prefabs/Canvas.prefab index ee8a31e..a501a8b 100644 --- a/Assets/Prefabs/Canvas.prefab +++ b/Assets/Prefabs/Canvas.prefab @@ -2474,8 +2474,8 @@ MonoBehaviour: m_TargetGraphic: {fileID: 2932101238483661020} m_HandleRect: {fileID: 2932101238483661021} m_Direction: 2 - m_Value: 0.9999997 - m_Size: 0.8337894 + m_Value: 0 + m_Size: 1 m_NumberOfSteps: 0 m_OnValueChanged: m_PersistentCalls: @@ -5542,797 +5542,6 @@ Transform: m_Father: {fileID: 2932101239374365858} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &299494736858170779 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8765991317591082346} - m_Modifications: - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_RootOrder - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8945184982436415985, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_Name - value: InventorySlot_UI (6) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} ---- !u!224 &334632692600610144 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - m_PrefabInstance: {fileID: 299494736858170779} - m_PrefabAsset: {fileID: 0} ---- !u!114 &964547777974520114 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 669567360999853225, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - m_PrefabInstance: {fileID: 299494736858170779} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f7da1af33e660a44f8469b5a4355a07f, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1001 &602720908447722057 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8765991317591082346} - m_Modifications: - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8945184982436415985, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_Name - value: InventorySlot_UI (5) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} ---- !u!114 &78686062954522336 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 669567360999853225, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - m_PrefabInstance: {fileID: 602720908447722057} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f7da1af33e660a44f8469b5a4355a07f, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &635453057446769330 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - m_PrefabInstance: {fileID: 602720908447722057} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &677986668399841722 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8765991317591082346} - m_Modifications: - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8945184982436415985, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_Name - value: InventorySlot_UI (3) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} ---- !u!114 &9700715240611091 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 669567360999853225, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - m_PrefabInstance: {fileID: 677986668399841722} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f7da1af33e660a44f8469b5a4355a07f, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &712816691290736961 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - m_PrefabInstance: {fileID: 677986668399841722} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &1865193148350943326 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8765991317591082346} - m_Modifications: - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8945184982436415985, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_Name - value: InventorySlot_UI (4) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} ---- !u!114 &1200412430726126839 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 669567360999853225, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - m_PrefabInstance: {fileID: 1865193148350943326} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f7da1af33e660a44f8469b5a4355a07f, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &1832579120476031141 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - m_PrefabInstance: {fileID: 1865193148350943326} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &2567000216977830893 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8765991317591082346} - m_Modifications: - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_RootOrder - value: 8 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8945184982436415985, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_Name - value: InventorySlot_UI (8) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} ---- !u!224 &2527380659293825814 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - m_PrefabInstance: {fileID: 2567000216977830893} - m_PrefabAsset: {fileID: 0} ---- !u!114 &3086398337109720900 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 669567360999853225, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - m_PrefabInstance: {fileID: 2567000216977830893} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f7da1af33e660a44f8469b5a4355a07f, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1001 &3186904970516113627 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8765991317591082346} - m_Modifications: - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8945184982436415985, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_Name - value: InventorySlot_UI (2) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} ---- !u!114 &2697918789032191090 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 669567360999853225, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - m_PrefabInstance: {fileID: 3186904970516113627} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f7da1af33e660a44f8469b5a4355a07f, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &3222034604692926496 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - m_PrefabInstance: {fileID: 3186904970516113627} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &4063173964377413142 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8765991317591082346} - m_Modifications: - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_RootOrder - value: 7 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_SizeDelta.x - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_SizeDelta.y - value: 100 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8945184982436415985, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - propertyPath: m_Name - value: InventorySlot_UI (7) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} ---- !u!114 &3542517367269710527 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 669567360999853225, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - m_PrefabInstance: {fileID: 4063173964377413142} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f7da1af33e660a44f8469b5a4355a07f, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!224 &4102662128343846637 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 39650903702558971, guid: 721d77fc5da8e6343850fe1900f864b9, type: 3} - m_PrefabInstance: {fileID: 4063173964377413142} - m_PrefabAsset: {fileID: 0} --- !u!1001 &4708662863280681047 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Player.prefab b/Assets/Prefabs/Player.prefab index ae9bd73..9f72f6c 100644 --- a/Assets/Prefabs/Player.prefab +++ b/Assets/Prefabs/Player.prefab @@ -622,6 +622,22 @@ PrefabInstance: propertyPath: m_Name value: DogPolyart objectReference: {fileID: 0} + - target: {fileID: 3032346553416182967, guid: 45288819fde2143449a96207b14db0bb, type: 3} + propertyPath: m_Layer + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 3147410555160727232, guid: 45288819fde2143449a96207b14db0bb, type: 3} + propertyPath: m_Layer + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 7266968559165696462, guid: 45288819fde2143449a96207b14db0bb, type: 3} + propertyPath: m_Layer + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 7328551799785179063, guid: 45288819fde2143449a96207b14db0bb, type: 3} + propertyPath: m_Layer + value: 11 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 45288819fde2143449a96207b14db0bb, type: 3} --- !u!4 &260737732969928480 stripped diff --git a/Assets/Prefabs/Sword.prefab b/Assets/Prefabs/Sword.prefab index 8f23adb..6c65e2c 100644 --- a/Assets/Prefabs/Sword.prefab +++ b/Assets/Prefabs/Sword.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 8513638719123101813} - component: {fileID: 3784773851534332480} - component: {fileID: 6771067920353623198} - m_Layer: 0 + m_Layer: 11 m_Name: Sword m_TagString: Untagged m_Icon: {fileID: 0} @@ -73,7 +73,7 @@ GameObject: - component: {fileID: 4741400950137544111} - component: {fileID: 4741400950138511215} - component: {fileID: 4741400950127161967} - m_Layer: 0 + m_Layer: 11 m_Name: sword1 m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Scripts/PlayerScript.cs b/Assets/Scripts/PlayerScript.cs index 8e6262e..69e85d4 100644 --- a/Assets/Scripts/PlayerScript.cs +++ b/Assets/Scripts/PlayerScript.cs @@ -26,7 +26,7 @@ public class PlayerScript : MonoBehaviour // Getters de referĂȘncia. public PlayerInput? GetPlayerInput => playerInput; public PlayerBuffs GetPlayerBuffs() => playerBuffs; - InventoryHolder InventoryHolder; + InventoryHolder? InventoryHolder; System.Collections.IEnumerator AttackRoutine() { @@ -219,7 +219,8 @@ void HandleAttack() { InventoryHolder = GetComponent(); var weaponDamage = 1f; - if(InventoryHolder.InventorySystem.InventorySlots[0].ItemData != null){ + if (InventoryHolder.InventorySystem.InventorySlots[0].ItemData != null) + { weaponDamage = InventoryHolder.InventorySystem.InventorySlots[0].ItemData.Damage; } Debug.Log("weaponDamage = " + weaponDamage); @@ -526,11 +527,12 @@ void OnGUI() GUI.Label(new Rect(100, 16, 100, 20), $"Kill count: {killCount}"); } - void SetWeapon(){ - + void SetWeapon() + { InventoryHolder = GetComponent(); var equippedWeaponName = "empty"; - if(InventoryHolder.InventorySystem.InventorySlots[0].ItemData != null){ + if (InventoryHolder.InventorySystem.InventorySlots[0].ItemData != null) + { equippedWeaponName = InventoryHolder.InventorySystem.InventorySlots[0].ItemData.DisplayName; } var weapons = transform.Find("DogPolyart/root/pelvis/Weapon").gameObject; @@ -541,7 +543,9 @@ void SetWeapon(){ if (child.name != equippedWeaponName) { child.SetActive(false); - }else{ + } + else + { child.SetActive(true); } } diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index 8be1ff2..6c1d3a1 100644 --- a/ProjectSettings/DynamicsManager.asset +++ b/ProjectSettings/DynamicsManager.asset @@ -18,7 +18,7 @@ PhysicsManager: m_ClothInterCollisionDistance: 0 m_ClothInterCollisionStiffness: 0 m_ContactsGeneration: 1 - m_LayerCollisionMatrix: fff9fffffff8fffffff8fffffffffffffff8fffffff8fffffff8fffffffbffff89f8ffff88fcffff08faffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff + m_LayerCollisionMatrix: fff9fffffff8fffffff8fffffffffffffff8fffffff8fffffff8fffffffbffff89f0ffff88fcffff08fafffffffeffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff m_AutoSimulation: 1 m_AutoSyncTransforms: 0 m_ReuseCollisionCallbacks: 1 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 71f522d..5f6efec 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -16,7 +16,7 @@ TagManager: - EnemyProjectile - Drop - DropCollector - - + - Weapon - - -