diff --git a/Tenebrissilva/Assets/_Project/Scenes/Player.unity b/Tenebrissilva/Assets/_Project/Scenes/Player.unity index e5c034611d7b57fefa28b13e6f30f0058e5ea6a4..0970027edf3936cf533c882714e8e7a8884a495b 100644 --- a/Tenebrissilva/Assets/_Project/Scenes/Player.unity +++ b/Tenebrissilva/Assets/_Project/Scenes/Player.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0, g: 0.99999905, b: 0.99999905, a: 1} + m_IndirectSpecularColor: {r: 0.18028334, g: 0.22571336, b: 0.3069219, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -134,7 +134,7 @@ GameObject: - component: {fileID: 215427356} - component: {fileID: 215427358} - component: {fileID: 215427357} - m_Layer: 5 + m_Layer: 0 m_Name: Background m_TagString: Untagged m_Icon: {fileID: 0} @@ -157,8 +157,8 @@ RectTransform: 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.00051069, y: -0.00013733} - m_SizeDelta: {x: 112.11, y: 315.32} + m_AnchoredPosition: {x: -0.00024223, y: 0.00075364} + m_SizeDelta: {x: 60.04, y: 140.69} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &215427357 MonoBehaviour: @@ -173,7 +173,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.6792453, g: 0.63759345, b: 0.63759345, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 @@ -198,6 +198,53 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 215427355} m_CullTransparentMesh: 1 +--- !u!1 &498679184 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 498679186} + - component: {fileID: 498679185} + m_Layer: 0 + m_Name: ItemAssets + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &498679185 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 498679184} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 152d9b1e38fad4c48a09c92953bedbad, type: 3} + m_Name: + m_EditorClassIdentifier: + axtSprite: {fileID: 21300000, guid: 9751b8828bf3047feaf91fffc69f3bcb, type: 3} + pergamentSprite: {fileID: 21300000, guid: ff47b3096e3414337af981fea65d1eba, type: 3} + astSprite: {fileID: 21300000, guid: ed247b974f25e4685a70819867e0620c, type: 3} + lightballSprite: {fileID: 21300000, guid: 88697ac3155ce4777862799cb98e7391, type: 3} +--- !u!4 &498679186 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 498679184} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 337.74524, y: 310.79266, z: -1476.8138} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 5 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &681266155 GameObject: m_ObjectHideFlags: 0 @@ -391,7 +438,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1020245537} - m_LocalRotation: {x: -0.000000011175473, y: -4.656613e-10, z: -1.0186341e-10, w: 1} + m_LocalRotation: {x: 0.0000000074501827, y: -4.656613e-10, z: 2.0372681e-10, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -670,6 +717,10 @@ PrefabInstance: propertyPath: playerCam value: objectReference: {fileID: 1544265574} + - target: {fileID: 1819512947, guid: 654c4249798f8414895ba124bb3fe28a, type: 3} + propertyPath: uiInventory + value: + objectReference: {fileID: 1545762623} - target: {fileID: 1819512947, guid: 654c4249798f8414895ba124bb3fe28a, type: 3} propertyPath: movementForce value: 1 @@ -802,7 +853,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1298647801} - m_LocalRotation: {x: 0.09095978, y: -0.0035464456, z: 0.0007773891, w: 0.995848} + m_LocalRotation: {x: 0.090959795, y: -0.0035392258, z: 0.0007758069, w: 0.995848} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -900,7 +951,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1434818653} - m_LocalRotation: {x: 0.054725606, y: -0.0035723515, z: 0.000648053, w: 0.99849486} + m_LocalRotation: {x: 0.05472561, y: -0.0035650895, z: 0.00064673595, w: 0.99849486} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -919,7 +970,7 @@ GameObject: - component: {fileID: 1479232963} - component: {fileID: 1479232965} - component: {fileID: 1479232964} - m_Layer: 5 + m_Layer: 0 m_Name: ItemSlotTemplate m_TagString: Untagged m_Icon: {fileID: 0} @@ -942,8 +993,8 @@ RectTransform: 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: -310.2, y: -54} - m_SizeDelta: {x: 100, y: 100} + m_AnchoredPosition: {x: 0.00000059605, y: 0.000021577} + m_SizeDelta: {x: 60.04, y: 54.331} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1479232964 MonoBehaviour: @@ -958,14 +1009,14 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0.9150943, g: 0.9150943, b: 0.9150943, a: 1} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} m_Maskable: 1 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 77ea5bd39d5c54857b7d97f8feb55e95, type: 3} + m_Sprite: {fileID: 21300000, guid: 9751b8828bf3047feaf91fffc69f3bcb, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -992,8 +1043,8 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1484557394} - m_Layer: 5 - m_Name: itemSlotContainer + m_Layer: 0 + m_Name: ItemSlotContainer m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1016,8 +1067,8 @@ RectTransform: 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: 310.94, y: 157.06} - m_SizeDelta: {x: 90.382, y: 79.375} + m_AnchoredPosition: {x: -0.00011253, y: 43.1793} + m_SizeDelta: {x: 60.04, y: 54.3305} m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &1519960948 GameObject: @@ -1192,7 +1243,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1544265572} - m_LocalRotation: {x: -0.00022623027, y: 0.9980502, z: -0.06231075, w: -0.0036236015} + m_LocalRotation: {x: -0.00022577068, y: 0.9980502, z: -0.062310748, w: -0.0036162355} m_LocalPosition: {x: 0, y: 2.89, z: 9.12} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: @@ -1395,7 +1446,7 @@ GameObject: m_Component: - component: {fileID: 1545762622} - component: {fileID: 1545762623} - m_Layer: 5 + m_Layer: 0 m_Name: UI_Inventory m_TagString: Untagged m_Icon: {fileID: 0} @@ -1420,8 +1471,8 @@ RectTransform: 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: 330.9441, y: 57.339783} - m_SizeDelta: {x: 112.1118, y: 315.3204} + m_AnchoredPosition: {x: 181, y: 43} + m_SizeDelta: {x: 60.0391, y: 140.6889} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1545762623 MonoBehaviour: @@ -1435,6 +1486,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 46caa29f307d64cd38328ae89495dd28, type: 3} m_Name: m_EditorClassIdentifier: + itemSlotContainer: {fileID: 1484557394} + itemSlotTemplate: {fileID: 1479232963} --- !u!1 &1712659170 GameObject: m_ObjectHideFlags: 0