From dbcd1a11e074149dc89ec014f39311b8ade150df Mon Sep 17 00:00:00 2001 From: tonyomendoza Date: Tue, 14 Feb 2023 15:44:55 -0800 Subject: [PATCH] Another rotation update --- .../Crafting Barter/Aluminum UI 1.prefab | 907 ------------------ .../Crafting Barter/Aluminum UI 1.prefab.meta | 7 - .../Gear/Tactical Rigs/Hunting Vest UI.prefab | 6 +- Assets/Inventory System/Scripts/UI/ItemUI.cs | 86 +- 4 files changed, 58 insertions(+), 948 deletions(-) delete mode 100644 Assets/Inventory System/Prefabs/Item UI/Crafting Barter/Aluminum UI 1.prefab delete mode 100644 Assets/Inventory System/Prefabs/Item UI/Crafting Barter/Aluminum UI 1.prefab.meta diff --git a/Assets/Inventory System/Prefabs/Item UI/Crafting Barter/Aluminum UI 1.prefab b/Assets/Inventory System/Prefabs/Item UI/Crafting Barter/Aluminum UI 1.prefab deleted file mode 100644 index 7b1a3c1f..00000000 --- a/Assets/Inventory System/Prefabs/Item UI/Crafting Barter/Aluminum UI 1.prefab +++ /dev/null @@ -1,907 +0,0 @@ -%YAML 1.1 -%TAG !u! tag:unity3d.com,2011: ---- !u!1 &8715477175483360852 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8715477175483360853} - - component: {fileID: 8715477175483360842} - - component: {fileID: 8715477175483360843} - - component: {fileID: 47521878755422833} - - component: {fileID: 2245991356252128075} - m_Layer: 5 - m_Name: Aluminum UI 1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8715477175483360853 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8715477175483360852} - 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_Children: - - {fileID: 1491862847934857702} - - {fileID: 4008412058978157412} - - {fileID: 8715477176133586256} - - {fileID: 3624698190764655067} - - {fileID: 6434767883817457733} - - {fileID: 1355518234711850548} - m_Father: {fileID: 0} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 75, y: 75} - m_Pivot: {x: 0, y: 1} ---- !u!114 &8715477175483360842 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8715477175483360852} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: cc11508cb979f8b4b8253855ce8a0bc5, type: 3} - m_Name: - m_EditorClassIdentifier: - itemName: Aluminum - displayName: Al - image: {fileID: 8715477176133586257} - rarity: 0 - ItemTag: 0 - StackLimit: 10 - width: 1 - height: 1 - weight: 0.06857 - monetaryValue: 300 - containerUIPrefab: {fileID: 0} - backdropImage: {fileID: 8623007654356922553} - emptyGridContainer: {fileID: 1491862847934857702} - titleText: {fileID: 8706359484083257019} - stackText: {fileID: 5002941200848283672} - interactable: 1 - overrideSortingCanvas: {fileID: 0} - Equipped: 0 - ContainedItems: [] - ParentContainer: {fileID: 0} - container: {fileID: 0} - canvas: {fileID: 0} - PickedUpOnFrame: 0 - ContextWindows: [] - StorageWindow: {fileID: 0} - limitStackSlotCapacity: {fileID: 0} - pickUp: {fileID: 0} - targetAttachment: {fileID: 0} - Inventory: {fileID: 0} ---- !u!225 &8715477175483360843 -CanvasGroup: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8715477175483360852} - m_Enabled: 1 - m_Alpha: 1 - m_Interactable: 1 - m_BlocksRaycasts: 1 - m_IgnoreParentGroups: 0 ---- !u!222 &47521878755422833 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8715477175483360852} - m_CullTransparentMesh: 0 ---- !u!114 &2245991356252128075 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8715477175483360852} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.39215687} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a1d2194621e086a4e851331477134ef2, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1 &8715477176133586259 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8715477176133586256} - - component: {fileID: 8715477176133586262} - - component: {fileID: 8715477176133586257} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &8715477176133586256 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8715477176133586259} - 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_Children: [] - m_Father: {fileID: 8715477175483360853} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 75, y: 75} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &8715477176133586262 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8715477176133586259} - m_CullTransparentMesh: 1 ---- !u!114 &8715477176133586257 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8715477176133586259} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: a1d2194621e086a4e851331477134ef2, type: 3} - m_Type: 0 - m_PreserveAspect: 1 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!1001 &1561533354936407657 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8715477175483360853} - m_Modifications: - - target: {fileID: 80931800656517007, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 80931800656517007, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 80931800656517007, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 80931800656517007, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 80931800656517007, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 80931800656517007, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 80931800656517007, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 80931800656517007, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 80931800656517007, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 80931800656517007, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 80931800656517007, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 80931800656517007, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 80931800656517007, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 80931800656517007, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_SizeDelta.x - value: 75 - objectReference: {fileID: 0} - - target: {fileID: 80931800656517007, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_SizeDelta.y - value: 75 - objectReference: {fileID: 0} - - target: {fileID: 80931800656517007, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 80931800656517007, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 80931800656517007, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 80931800656517007, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 80931800656517007, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 80931800656517007, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 860381808568854092, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 860381808568854092, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 860381808568854092, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 860381808568854092, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 860381808568854092, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 860381808568854092, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4686011728059556148, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - propertyPath: m_Name - value: Empty_Grid_1x1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6858ee0163bb6074ebcab8e7a1ce9582, type: 3} ---- !u!224 &1491862847934857702 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 80931800656517007, guid: 6858ee0163bb6074ebcab8e7a1ce9582, - type: 3} - m_PrefabInstance: {fileID: 1561533354936407657} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &2852974119895712687 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8715477175483360853} - m_Modifications: - - target: {fileID: 1024175503732169149, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - propertyPath: m_Name - value: Title - objectReference: {fileID: 0} - - target: {fileID: 1024175503732169149, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - propertyPath: m_RootOrder - value: 4 - objectReference: {fileID: 0} - - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 75 - objectReference: {fileID: 0} - - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - propertyPath: m_SizeDelta.x - value: 75 - objectReference: {fileID: 0} - - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - propertyPath: m_SizeDelta.y - value: 75 - objectReference: {fileID: 0} - - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - propertyPath: m_AnchorMin.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - propertyPath: m_Pivot.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - propertyPath: m_Pivot.y - value: 1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6d39ffa05d35e0642ac719964743afc9, type: 3} ---- !u!224 &6434767883817457733 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 9140952183775976426, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - m_PrefabInstance: {fileID: 2852974119895712687} - m_PrefabAsset: {fileID: 0} ---- !u!114 &8706359484083257019 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6864892151078518036, guid: 6d39ffa05d35e0642ac719964743afc9, - type: 3} - m_PrefabInstance: {fileID: 2852974119895712687} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1001 &4354350238321830718 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8715477175483360853} - m_Modifications: - - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, - type: 3} - propertyPath: m_RootOrder - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, - type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, - type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, - type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, - type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 6284063249306081589, guid: 2e9ec475d21131b48bbd9f90db858c68, - type: 3} - propertyPath: m_Name - value: Border - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 2e9ec475d21131b48bbd9f90db858c68, type: 3} ---- !u!224 &1355518234711850548 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 3360255829979632906, guid: 2e9ec475d21131b48bbd9f90db858c68, - type: 3} - m_PrefabInstance: {fileID: 4354350238321830718} - m_PrefabAsset: {fileID: 0} ---- !u!1001 &6750408894450144188 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8715477175483360853} - m_Modifications: - - target: {fileID: 2030810625184518788, guid: 59b559a6ad6a2484ba403bc000a38428, - type: 3} - propertyPath: m_Name - value: StackCount - objectReference: {fileID: 0} - - target: {fileID: 8062506367947231847, guid: 59b559a6ad6a2484ba403bc000a38428, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8062506367947231847, guid: 59b559a6ad6a2484ba403bc000a38428, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8062506367947231847, guid: 59b559a6ad6a2484ba403bc000a38428, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8062506367947231847, guid: 59b559a6ad6a2484ba403bc000a38428, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8062506367947231847, guid: 59b559a6ad6a2484ba403bc000a38428, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8062506367947231847, guid: 59b559a6ad6a2484ba403bc000a38428, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8062506367947231847, guid: 59b559a6ad6a2484ba403bc000a38428, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8062506367947231847, guid: 59b559a6ad6a2484ba403bc000a38428, - type: 3} - propertyPath: m_RootOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 8062506367947231847, guid: 59b559a6ad6a2484ba403bc000a38428, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8062506367947231847, guid: 59b559a6ad6a2484ba403bc000a38428, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8062506367947231847, guid: 59b559a6ad6a2484ba403bc000a38428, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8062506367947231847, guid: 59b559a6ad6a2484ba403bc000a38428, - type: 3} - propertyPath: m_AnchoredPosition.x - value: -2 - objectReference: {fileID: 0} - - target: {fileID: 8062506367947231847, guid: 59b559a6ad6a2484ba403bc000a38428, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8062506367947231847, guid: 59b559a6ad6a2484ba403bc000a38428, - type: 3} - propertyPath: m_SizeDelta.x - value: 73 - objectReference: {fileID: 0} - - target: {fileID: 8062506367947231847, guid: 59b559a6ad6a2484ba403bc000a38428, - type: 3} - propertyPath: m_SizeDelta.y - value: 75 - objectReference: {fileID: 0} - - target: {fileID: 8062506367947231847, guid: 59b559a6ad6a2484ba403bc000a38428, - type: 3} - propertyPath: m_AnchorMin.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8062506367947231847, guid: 59b559a6ad6a2484ba403bc000a38428, - type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8062506367947231847, guid: 59b559a6ad6a2484ba403bc000a38428, - type: 3} - propertyPath: m_AnchorMax.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8062506367947231847, guid: 59b559a6ad6a2484ba403bc000a38428, - type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 8062506367947231847, guid: 59b559a6ad6a2484ba403bc000a38428, - type: 3} - propertyPath: m_Pivot.x - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 8062506367947231847, guid: 59b559a6ad6a2484ba403bc000a38428, - type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 59b559a6ad6a2484ba403bc000a38428, type: 3} ---- !u!224 &3624698190764655067 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 8062506367947231847, guid: 59b559a6ad6a2484ba403bc000a38428, - type: 3} - m_PrefabInstance: {fileID: 6750408894450144188} - m_PrefabAsset: {fileID: 0} ---- !u!114 &5002941200848283672 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 1783497591362485156, guid: 59b559a6ad6a2484ba403bc000a38428, - type: 3} - m_PrefabInstance: {fileID: 6750408894450144188} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: ---- !u!1001 &6779208583214897904 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 8715477175483360853} - m_Modifications: - - target: {fileID: 7352792399522662056, guid: 0a6f22dac390afc4b865b7c5efcd062e, - type: 3} - propertyPath: m_Name - value: Backdrop - objectReference: {fileID: 0} - - target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e, - type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e, - type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e, - type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e, - type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e, - type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e, - type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e, - type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e, - type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e, - type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e, - type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e, - type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e, - type: 3} - propertyPath: m_SizeDelta.x - value: 75 - objectReference: {fileID: 0} - - target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e, - type: 3} - propertyPath: m_SizeDelta.y - value: 75 - objectReference: {fileID: 0} - - target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e, - type: 3} - propertyPath: m_AnchorMin.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e, - type: 3} - propertyPath: m_AnchorMin.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e, - type: 3} - propertyPath: m_AnchorMax.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e, - type: 3} - propertyPath: m_AnchorMax.y - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e, - type: 3} - propertyPath: m_Pivot.x - value: 0.5 - objectReference: {fileID: 0} - - target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e, - type: 3} - propertyPath: m_Pivot.y - value: 0.5 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0a6f22dac390afc4b865b7c5efcd062e, type: 3} ---- !u!224 &4008412058978157412 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e, - type: 3} - m_PrefabInstance: {fileID: 6779208583214897904} - m_PrefabAsset: {fileID: 0} ---- !u!114 &8623007654356922553 stripped -MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 3008269927508781641, guid: 0a6f22dac390afc4b865b7c5efcd062e, - type: 3} - m_PrefabInstance: {fileID: 6779208583214897904} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: diff --git a/Assets/Inventory System/Prefabs/Item UI/Crafting Barter/Aluminum UI 1.prefab.meta b/Assets/Inventory System/Prefabs/Item UI/Crafting Barter/Aluminum UI 1.prefab.meta deleted file mode 100644 index 9491e30e..00000000 --- a/Assets/Inventory System/Prefabs/Item UI/Crafting Barter/Aluminum UI 1.prefab.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: da4e671bd85d532479bea93384e3f7ee -PrefabImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Hunting Vest UI.prefab b/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Hunting Vest UI.prefab index d817ecef..d92e9f26 100644 --- a/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Hunting Vest UI.prefab +++ b/Assets/Inventory System/Prefabs/Item UI/Gear/Tactical Rigs/Hunting Vest UI.prefab @@ -120,14 +120,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.39215687} + m_Color: {r: 1, g: 0, b: 0, a: 1} m_RaycastTarget: 1 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 034661875748b374ba06a2cbf142a98a, type: 3} - m_Type: 0 + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 diff --git a/Assets/Inventory System/Scripts/UI/ItemUI.cs b/Assets/Inventory System/Scripts/UI/ItemUI.cs index 0ec2c019..75fa27d5 100644 --- a/Assets/Inventory System/Scripts/UI/ItemUI.cs +++ b/Assets/Inventory System/Scripts/UI/ItemUI.cs @@ -68,6 +68,22 @@ namespace SimpleInventorySystem private Size imageSizeOnGrid; private Orientation imageOrientation = Orientation.Portrait; [HideInInspector] public Inventory Inventory; + private int rotationIndex; + public int RotationIndex + { + get { return rotationIndex; } + set + { + // these values are cyclic + if (value < 0) + rotationIndex = 3; + else if (value > 3) + { + rotationIndex = 0; + } + else rotationIndex = value; + } + } // archived variables //public Item itemPrefab; @@ -132,10 +148,10 @@ namespace SimpleInventorySystem Debug.LogError("Inventory ItemUI must contain a positive integer value for Width and Height: " + name); } - int eulerAngle = Mathf.Abs(Mathf.CeilToInt(transform.rotation.eulerAngles.z)); + /*eulerAngle = Mathf.Abs(Mathf.CeilToInt(transform.rotation.eulerAngles.z)); switch (eulerAngle) { - case 270: + case -90: imageOrientation = (height > width) ? Orientation.Portrait : Orientation.Landscape; break; case 180: @@ -147,7 +163,11 @@ namespace SimpleInventorySystem default: imageOrientation = (width > height) ? Orientation.Landscape : Orientation.Portrait; break; - } + }*/ + + imageOrientation = (width > height) ? Orientation.Landscape : Orientation.Portrait; + rotationIndex = 0; + //rectTransform.pivot = pivot; //InstantiateItem(); @@ -744,10 +764,34 @@ namespace SimpleInventorySystem RectTransform handler = (RectTransform)transform; eulerAngle = Mathf.Abs(Mathf.CeilToInt(handler.rotation.eulerAngles.z)) - 90; //Debug.Log("euler" + eulerAngle); - switch (eulerAngle) + RotationIndex++; + switch (RotationIndex) { - case -90: - Debug.Log(-90); + case 0: + Debug.Log(RotationIndex); + //handler.localPosition = new Vector3(0, 0, 0); + // Item rect transform + pivot = handler.pivot = new Vector2(0, 1); + handler.Rotate(new Vector3(0, 0, 1), -90); + // title rect transform + if (titleText != null) + { + titleText.rectTransform.pivot = new Vector2(1, 1); + titleText.rectTransform.Rotate(new Vector3(0, 0, 1), 90); + titleText.rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, imageSizeOnGrid.Width); + } + // stack count transform + if (stackText != null) + { + stackText.rectTransform.pivot = new Vector2(1, 0); + stackText.rectTransform.Rotate(new Vector3(0, 0, 1), 90); + stackText.rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, imageSizeOnGrid.Height); + } + // image Orientation + imageOrientation = (width > height) ? Orientation.Landscape : Orientation.Portrait; + break; + case 1: + Debug.Log(RotationIndex); // Item rect transform pivot = rectTransform.pivot = new Vector2(0, 0); rectTransform.Rotate(new Vector3(0, 0, 1), -90); @@ -768,8 +812,8 @@ namespace SimpleInventorySystem // image Orientation imageOrientation = (width > height) ? Orientation.Portrait : Orientation.Landscape; break; - case 180: - Debug.Log(180); + case 2: + Debug.Log(RotationIndex); // Item rect transform pivot = rectTransform.pivot = new Vector2(1, 0); handler.Rotate(new Vector3(0, 0, 1), -90); @@ -790,8 +834,8 @@ namespace SimpleInventorySystem // image Orientation imageOrientation = (width > height) ? Orientation.Landscape : Orientation.Portrait; break; - case 90: - Debug.Log(90); + case 3: + Debug.Log(RotationIndex); // Item rect transform pivot = rectTransform.pivot = new Vector2(1, 1); handler.Rotate(new Vector3(0, 0, 1), -90); @@ -813,27 +857,7 @@ namespace SimpleInventorySystem imageOrientation = (width > height) ? Orientation.Portrait : Orientation.Landscape; break; default: - Debug.Log(0); - //handler.localPosition = new Vector3(0, 0, 0); - // Item rect transform - pivot = handler.pivot = new Vector2(0, 1); - handler.Rotate(new Vector3(0, 0, 1), -90); - // title rect transform - if (titleText != null) - { - titleText.rectTransform.pivot = new Vector2(1, 1); - titleText.rectTransform.Rotate(new Vector3(0, 0, 1), 90); - titleText.rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, imageSizeOnGrid.Width); - } - // stack count transform - if (stackText != null) - { - stackText.rectTransform.pivot = new Vector2(1, 0); - stackText.rectTransform.Rotate(new Vector3(0, 0, 1), 90); - stackText.rectTransform.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, imageSizeOnGrid.Height); - } - // image Orientation - imageOrientation = (width > height) ? Orientation.Landscape : Orientation.Portrait; + Debug.Log($"This rotation recieved an error: {RotationIndex}"); break; } }