diff --git a/Assets/Inventory System/Prefabs/UI Windows/Inspection Window.prefab b/Assets/Inventory System/Prefabs/UI Windows/Inspection Window.prefab index a1a33625..59c233df 100644 --- a/Assets/Inventory System/Prefabs/UI Windows/Inspection Window.prefab +++ b/Assets/Inventory System/Prefabs/UI Windows/Inspection Window.prefab @@ -30,7 +30,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3828836906028103513} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} @@ -523,6 +523,80 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &1129120940527636019 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3058925395021643782} + - component: {fileID: 5250244409810303239} + - component: {fileID: 8581711742178233417} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3058925395021643782 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129120940527636019} + 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: 4417106255924003218} + m_RootOrder: 0 + 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: 800, y: 600} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5250244409810303239 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129120940527636019} + m_CullTransparentMesh: 0 +--- !u!114 &8581711742178233417 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1129120940527636019} + 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: 0.184, g: 0.184, b: 0.184, a: 1} + m_RaycastTarget: 1 + m_Maskable: 0 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &1167366263984146165 GameObject: m_ObjectHideFlags: 0 @@ -1121,6 +1195,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 1624470144002321887} - {fileID: 7023481831168829119} - {fileID: 1379691910028968891} - {fileID: 2807429175744680340} @@ -1130,7 +1205,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 250} + m_SizeDelta: {x: 800, y: 250} m_Pivot: {x: 0.5, y: 1} --- !u!222 &165981492520315138 CanvasRenderer: @@ -1153,8 +1228,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.318, g: 0.318, b: 0.318, a: 1} - m_RaycastTarget: 1 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 0 m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: @@ -1586,6 +1661,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 3058925395021643782} - {fileID: 4417106256859116621} - {fileID: 4417106257405200099} m_Father: {fileID: 0} @@ -1617,7 +1693,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 0.21698111, g: 0.21698111, b: 0.21698111, a: 1} + m_Color: {r: 0.16600001, g: 0.16600001, b: 0.16600001, a: 1} m_RaycastTarget: 0 m_Maskable: 1 m_OnCullStateChanged: @@ -1788,7 +1864,7 @@ RectTransform: - {fileID: 4417106256853968311} - {fileID: 4417106255717838595} m_Father: {fileID: 4417106255924003218} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -2027,7 +2103,7 @@ RectTransform: - {fileID: 4862548972041178554} - {fileID: 57612678537637109} m_Father: {fileID: 4417106255924003218} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -2373,6 +2449,80 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &5606183435676029526 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1624470144002321887} + - component: {fileID: 2536620511769669567} + - component: {fileID: 6249789563051263675} + m_Layer: 5 + m_Name: GameObject + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1624470144002321887 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5606183435676029526} + 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: 3828836906028103513} + 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: 800, y: 250} + m_Pivot: {x: 0, y: 1} +--- !u!222 &2536620511769669567 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5606183435676029526} + m_CullTransparentMesh: 0 +--- !u!114 &6249789563051263675 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5606183435676029526} + 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: 0.318, g: 0.318, b: 0.318, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &5672717887992336363 GameObject: m_ObjectHideFlags: 0 @@ -2403,7 +2553,13 @@ RectTransform: 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_Children: + - {fileID: 7931978891060194436} + - {fileID: 1329778762450208686} + - {fileID: 2790771483615187273} + - {fileID: 435692728271633588} + - {fileID: 4371742292671762644} + - {fileID: 4802546782068692597} m_Father: {fileID: 4417106257405200099} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2655,8 +2811,8 @@ GameObject: m_Component: - component: {fileID: 57612678537637109} - component: {fileID: 72342906173179080} - - component: {fileID: 946512853107722745} - component: {fileID: 6467206952810242817} + - component: {fileID: 6141394233729121900} m_Layer: 5 m_Name: Description Scroll View m_TagString: Untagged @@ -2694,35 +2850,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6204336253067511618} m_CullTransparentMesh: 0 ---- !u!114 &946512853107722745 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6204336253067511618} - 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: 0.099, g: 0.099, b: 0.099, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 1 - 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!114 &6467206952810242817 MonoBehaviour: m_ObjectHideFlags: 0 @@ -2753,6 +2880,35 @@ MonoBehaviour: m_OnValueChanged: m_PersistentCalls: m_Calls: [] +--- !u!114 &6141394233729121900 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6204336253067511618} + 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: 0.318, g: 0.318, b: 0.318, a: 1} + m_RaycastTarget: 1 + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + 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 &6389333314364321508 GameObject: m_ObjectHideFlags: 0 @@ -3206,11 +3362,11 @@ RectTransform: - {fileID: 2219374380147682151} - {fileID: 1122531116662789424} m_Father: {fileID: 3828836906028103513} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 800, y: 0} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 150, y: 25} m_Pivot: {x: 1, y: 1} --- !u!1 &8001098130371845186 @@ -3390,8 +3546,8 @@ GameObject: m_Component: - component: {fileID: 7023481831168829119} - component: {fileID: 5100349277035640383} - - component: {fileID: 3037502900970124462} - component: {fileID: 8951387409254270480} + - component: {fileID: 4018056785454555471} m_Layer: 5 m_Name: DisplayImage m_TagString: Untagged @@ -3411,13 +3567,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 3828836906028103513} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 400, y: 0} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 800, y: 250} - m_Pivot: {x: 0.5, y: 1} + m_Pivot: {x: 0, y: 1} --- !u!222 &5100349277035640383 CanvasRenderer: m_ObjectHideFlags: 0 @@ -3426,35 +3582,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8865786133691891150} m_CullTransparentMesh: 0 ---- !u!114 &3037502900970124462 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 8865786133691891150} - 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: 0, g: 0, b: 0, a: 1} - m_RaycastTarget: 1 - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - 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!114 &8951387409254270480 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3467,6 +3594,32 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: f47e497dfc27e9947bc9e6a360f5d2dd, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &4018056785454555471 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8865786133691891150} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, 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_Texture: {fileID: 8400000, guid: 528ea652096d5a44aad6b5f1b0f9cd79, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &8913114282113217101 GameObject: m_ObjectHideFlags: 0 @@ -3700,3 +3853,753 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1001 &1850351490084485230 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4862548972041178554} + m_Modifications: + - target: {fileID: 3717231016165774062, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_Name + value: Item Trait (5) + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_RootOrder + value: 5 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0aa38845359c3c54893d097545be700d, type: 3} +--- !u!224 &4802546782068692597 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + m_PrefabInstance: {fileID: 1850351490084485230} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &3828018987274715807 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4862548972041178554} + m_Modifications: + - target: {fileID: 3717231016165774062, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_Name + value: Item Trait + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0aa38845359c3c54893d097545be700d, type: 3} +--- !u!224 &7931978891060194436 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + m_PrefabInstance: {fileID: 3828018987274715807} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &5296097403035445685 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4862548972041178554} + m_Modifications: + - target: {fileID: 3717231016165774062, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_Name + value: Item Trait (1) + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0aa38845359c3c54893d097545be700d, type: 3} +--- !u!224 &1329778762450208686 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + m_PrefabInstance: {fileID: 5296097403035445685} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &6701411222277198511 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4862548972041178554} + m_Modifications: + - target: {fileID: 3717231016165774062, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_Name + value: Item Trait (3) + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_RootOrder + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0aa38845359c3c54893d097545be700d, type: 3} +--- !u!224 &435692728271633588 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + m_PrefabInstance: {fileID: 6701411222277198511} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &7467067455957860047 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4862548972041178554} + m_Modifications: + - target: {fileID: 3717231016165774062, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_Name + value: Item Trait (4) + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_RootOrder + value: 4 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0aa38845359c3c54893d097545be700d, type: 3} +--- !u!224 &4371742292671762644 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + m_PrefabInstance: {fileID: 7467067455957860047} + m_PrefabAsset: {fileID: 0} +--- !u!1001 &9057048753140383570 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4862548972041178554} + m_Modifications: + - target: {fileID: 3717231016165774062, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_Name + value: Item Trait (2) + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + propertyPath: m_Pivot.y + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 0aa38845359c3c54893d097545be700d, type: 3} +--- !u!224 &2790771483615187273 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 6560572827303407131, guid: 0aa38845359c3c54893d097545be700d, + type: 3} + m_PrefabInstance: {fileID: 9057048753140383570} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Inventory System/Scripts/Inventory/InventorySystem.cs b/Assets/Inventory System/Scripts/Inventory/InventorySystem.cs index aba8f02c..c8e402fb 100644 --- a/Assets/Inventory System/Scripts/Inventory/InventorySystem.cs +++ b/Assets/Inventory System/Scripts/Inventory/InventorySystem.cs @@ -295,6 +295,7 @@ namespace SimpleInventorySystem public Transform DefaultItemSpawn; [HideInInspector] public bool IsDraggingItem; public List hResults; + public ItemViewer itemViewer; public enum States { Undefined, Loot, PickUp }; public States CurrentState = States.Undefined; @@ -388,7 +389,13 @@ namespace SimpleInventorySystem return Instantiate(InventorySystem.instance.StorageWindowPrefab, inventoryUI.transform); } else if(windowType == nameof(InspectionWindowUI) && InventorySystem.instance.InspectionWindowPrefab.GetComponent() != null) - return Instantiate(InventorySystem.instance.InspectionWindowPrefab, inventoryUI.transform); + { + if(itemViewer != null) + { + itemViewer.OpenCamera(); + } + return Instantiate(InventorySystem.instance.InspectionWindowPrefab, inventoryUI.transform); + } else return null; } diff --git a/Assets/Inventory System/Scripts/Inventory/ItemViewer.cs b/Assets/Inventory System/Scripts/Inventory/ItemViewer.cs new file mode 100644 index 00000000..0530aee2 --- /dev/null +++ b/Assets/Inventory System/Scripts/Inventory/ItemViewer.cs @@ -0,0 +1,24 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class ItemViewer : MonoBehaviour +{ + public Camera viewerCamera; + public GameObject cameraHolder; + + public void OpenCamera() + { + viewerCamera.gameObject.SetActive(true); + } + + public void CloseCamera() + { + viewerCamera.gameObject.SetActive(false); + } + + public void Update() + { + + } +} diff --git a/Assets/Inventory System/Scripts/Inventory/ItemViewer.cs.meta b/Assets/Inventory System/Scripts/Inventory/ItemViewer.cs.meta new file mode 100644 index 00000000..7823c9fd --- /dev/null +++ b/Assets/Inventory System/Scripts/Inventory/ItemViewer.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 1ab299478edec704f8d044dc7f79227e +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Inventory System/Scripts/Inventory/MouseOrbitImproved.cs b/Assets/Inventory System/Scripts/Inventory/MouseOrbitImproved.cs new file mode 100644 index 00000000..3c7a835a --- /dev/null +++ b/Assets/Inventory System/Scripts/Inventory/MouseOrbitImproved.cs @@ -0,0 +1,101 @@ +/* +Original script from: https://wiki.unity3d.com/index.php/MouseOrbitImproved +Just a few line modification by me: https://www.youtube.com/channel/UCjAFR8Gm-7GsMvtC_scsp8A/ +*/ + + +using UnityEngine; +using System.Collections; + +[AddComponentMenu("Camera-Control/Mouse Orbit with zoom")] +public class MouseOrbitImproved : MonoBehaviour +{ + + public Transform target; + public float distance = 5.0f; + public float xSpeed = 120.0f; + public float ySpeed = 120.0f; + + public float yMinLimit = -20f; + public float yMaxLimit = 80f; + + public float distanceMin = .5f; + public float distanceMax = 15f; + + private Rigidbody rigidbody; + + float x = 0.0f; + float y = 0.0f; + + bool orbitable; + + // Use this for initialization + void Start() + { + Vector3 angles = transform.eulerAngles; + x = angles.y; + y = angles.x; + + rigidbody = GetComponent(); + + // Make the rigid body not change rotation + if (rigidbody != null) + { + rigidbody.freezeRotation = true; + } + } + + void Update() + { + /* + if (Input.GetKeyDown(KeyCode.LeftControl) == true) + { + orbitable = true; + } + else if (Input.GetKeyUp(KeyCode.LeftControl) == true) + { + orbitable = false; + } + */ + + if (Input.GetMouseButtonDown(0)) + orbitable = true; + else if (Input.GetMouseButtonUp(0)) + orbitable = false; + + if (orbitable) + { + if (target) + { + x += Input.GetAxis("Mouse X") * xSpeed * distance * Time.deltaTime; + y -= Input.GetAxis("Mouse Y") * ySpeed * Time.deltaTime; + + y = ClampAngle(y, yMinLimit, yMaxLimit); + + Quaternion rotation = Quaternion.Euler(y, x, 0); + + distance = Mathf.Clamp(distance - Input.GetAxis("Mouse ScrollWheel") *Time.deltaTime, distanceMin, distanceMax); + + RaycastHit hit; + if (Physics.Linecast(target.position, transform.position, out hit)) + { + distance -= hit.distance; + } + Vector3 negDistance = new Vector3(0.0f, 0.0f, -distance); + Vector3 position = rotation * negDistance + target.position; + + transform.rotation = rotation; + transform.position = position; + } + } + } + + public static float ClampAngle(float angle, float min, float max) + { + if (angle < -360F) + angle += 360F; + if (angle > 360F) + angle -= 360F; + return Mathf.Clamp(angle, min, max); + } +} \ No newline at end of file diff --git a/Assets/Inventory System/Scripts/Inventory/MouseOrbitImproved.cs.meta b/Assets/Inventory System/Scripts/Inventory/MouseOrbitImproved.cs.meta new file mode 100644 index 00000000..3e2c0be3 --- /dev/null +++ b/Assets/Inventory System/Scripts/Inventory/MouseOrbitImproved.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: ab9c1c17ac31fe54f913563968700f16 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Prefabs/ItemViewerRenderTexture.renderTexture b/Assets/Prefabs/ItemViewerRenderTexture.renderTexture new file mode 100644 index 00000000..394741d6 --- /dev/null +++ b/Assets/Prefabs/ItemViewerRenderTexture.renderTexture @@ -0,0 +1,37 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ItemViewerRenderTexture + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + serializedVersion: 3 + m_Width: 2048 + m_Height: 512 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthFormat: 2 + m_ColorFormat: 8 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 diff --git a/Assets/Prefabs/ItemViewerRenderTexture.renderTexture.meta b/Assets/Prefabs/ItemViewerRenderTexture.renderTexture.meta new file mode 100644 index 00000000..a56dee53 --- /dev/null +++ b/Assets/Prefabs/ItemViewerRenderTexture.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 528ea652096d5a44aad6b5f1b0f9cd79 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Test Scene Tony.unity b/Assets/Scenes/Test Scene Tony.unity index 7d8c73fb..b51882f5 100644 --- a/Assets/Scenes/Test Scene Tony.unity +++ b/Assets/Scenes/Test Scene Tony.unity @@ -1883,6 +1883,12 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 106699460} m_Mesh: {fileID: 4300000, guid: 0e821fe9c748a3845a35720d67512bae, type: 3} +--- !u!4 &116436006 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6431934805223382759, guid: a173e349ae63c5a4d92337ea2872d13c, + type: 3} + m_PrefabInstance: {fileID: 1903067589} + m_PrefabAsset: {fileID: 0} --- !u!1001 &119691890 PrefabInstance: m_ObjectHideFlags: 0 @@ -3217,6 +3223,37 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 421f12c4cc2c4614f9e0616ef942cf44, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1 &182285666 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 182285667} + m_Layer: 0 + m_Name: Item + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &182285667 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 182285666} + 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: 116436006} + m_Father: {fileID: 952502937} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &184085248 PrefabInstance: m_ObjectHideFlags: 0 @@ -5378,6 +5415,110 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} +--- !u!1 &235689161 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 235689162} + - component: {fileID: 235689164} + - component: {fileID: 235689163} + - component: {fileID: 235689165} + m_Layer: 0 + m_Name: Camera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!4 &235689162 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 235689161} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: -0.15} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 952502937} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!81 &235689163 +AudioListener: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 235689161} + m_Enabled: 1 +--- !u!20 &235689164 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 235689161} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.1 + far clip plane: 1000 + field of view: 60 + orthographic: 0 + orthographic size: 5 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 8400000, guid: 528ea652096d5a44aad6b5f1b0f9cd79, type: 2} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!114 &235689165 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 235689161} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ab9c1c17ac31fe54f913563968700f16, type: 3} + m_Name: + m_EditorClassIdentifier: + target: {fileID: 182285667} + distance: 0.15 + xSpeed: 300 + ySpeed: 300 + yMinLimit: -20 + yMaxLimit: 80 + distanceMin: 0.15 + distanceMax: 1 --- !u!54 &236675544 Rigidbody: m_ObjectHideFlags: 0 @@ -23561,6 +23702,36 @@ Transform: type: 3} m_PrefabInstance: {fileID: 935467738} m_PrefabAsset: {fileID: 0} +--- !u!1 &936399551 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 936399552} + m_Layer: 0 + m_Name: CameraHolder + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &936399552 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 936399551} + 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: 952502937} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &937292165 PrefabInstance: m_ObjectHideFlags: 0 @@ -24010,6 +24181,54 @@ Transform: type: 3} m_PrefabInstance: {fileID: 690566991} m_PrefabAsset: {fileID: 0} +--- !u!1 &952502936 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 952502937} + - component: {fileID: 952502938} + m_Layer: 0 + m_Name: Item Viewer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &952502937 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 952502936} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -873.1286, y: -10535.676, z: 22.848022} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 235689162} + - {fileID: 936399552} + - {fileID: 182285667} + m_Father: {fileID: 1625489126} + m_RootOrder: 4 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &952502938 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 952502936} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1ab299478edec704f8d044dc7f79227e, type: 3} + m_Name: + m_EditorClassIdentifier: + viewerCamera: {fileID: 235689164} + cameraHolder: {fileID: 936399551} --- !u!1001 &953792832 PrefabInstance: m_ObjectHideFlags: 0 @@ -43717,6 +43936,12 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dfb70f42b1ba68342a1a2c7fa95a4095, type: 3} +--- !u!4 &1625489126 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 2770326605790841686, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + m_PrefabInstance: {fileID: 2770326605231792848} + m_PrefabAsset: {fileID: 0} --- !u!1001 &1625518134 PrefabInstance: m_ObjectHideFlags: 0 @@ -49428,6 +49653,110 @@ Transform: type: 3} m_PrefabInstance: {fileID: 1901829060} m_PrefabAsset: {fileID: 0} +--- !u!1001 &1903067589 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 182285667} + m_Modifications: + - target: {fileID: 3516595912989551378, guid: a173e349ae63c5a4d92337ea2872d13c, + type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3516595912989551378, guid: a173e349ae63c5a4d92337ea2872d13c, + type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3516595912989551378, guid: a173e349ae63c5a4d92337ea2872d13c, + type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3516595912989551378, guid: a173e349ae63c5a4d92337ea2872d13c, + type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3516595912989551378, guid: a173e349ae63c5a4d92337ea2872d13c, + type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3516595912989551378, guid: a173e349ae63c5a4d92337ea2872d13c, + type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6431934805223382759, guid: a173e349ae63c5a4d92337ea2872d13c, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6431934805223382759, guid: a173e349ae63c5a4d92337ea2872d13c, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6431934805223382759, guid: a173e349ae63c5a4d92337ea2872d13c, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6431934805223382759, guid: a173e349ae63c5a4d92337ea2872d13c, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6431934805223382759, guid: a173e349ae63c5a4d92337ea2872d13c, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6431934805223382759, guid: a173e349ae63c5a4d92337ea2872d13c, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6431934805223382759, guid: a173e349ae63c5a4d92337ea2872d13c, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6431934805223382759, guid: a173e349ae63c5a4d92337ea2872d13c, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6431934805223382759, guid: a173e349ae63c5a4d92337ea2872d13c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6431934805223382759, guid: a173e349ae63c5a4d92337ea2872d13c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6431934805223382759, guid: a173e349ae63c5a4d92337ea2872d13c, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6437227991555130963, guid: a173e349ae63c5a4d92337ea2872d13c, + type: 3} + propertyPath: m_Name + value: 1x1 Brown Pouch + objectReference: {fileID: 0} + - target: {fileID: 6479586328427631359, guid: a173e349ae63c5a4d92337ea2872d13c, + type: 3} + propertyPath: m_UseGravity + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a173e349ae63c5a4d92337ea2872d13c, type: 3} --- !u!1001 &1903575850 PrefabInstance: m_ObjectHideFlags: 0 @@ -57043,6 +57372,11 @@ PrefabInstance: value: objectReference: {fileID: 4417106255924003221, guid: 94f7925a9ec6ba94f991f7f462adb6f2, type: 3} + - target: {fileID: 2770326605790841687, guid: 9f005685dc17f4643b4a1156970fe2f6, + type: 3} + propertyPath: itemViewer + value: + objectReference: {fileID: 952502938} - target: {fileID: 2770326605790841688, guid: 9f005685dc17f4643b4a1156970fe2f6, type: 3} propertyPath: pauseMenu