From 0b058f92485e6178e186d9b430e71d59ecec148e Mon Sep 17 00:00:00 2001 From: TAASONI3 Date: Wed, 10 May 2023 16:50:27 +0200 Subject: [PATCH] bugfixing after playtest; v1.4.0 --- Assets/Prefabs/House.prefab | 102 +- Assets/Scenes/GameScene.unity | 1215 ++++-------------------- Assets/Scenes/MenuScene.unity | 8 +- Assets/Scripts/Controls.cs | 3 + Assets/Scripts/Door.cs | 2 + Assets/Scripts/Handler/UIHandler.cs | 10 +- Assets/Scripts/Inventory.cs | 7 + Assets/Scripts/InventorySlot.cs | 2 +- Assets/Scripts/PlayerCamera.cs | 10 +- Assets/Scripts/UIState.cs | 3 +- UserSettings/Layouts/default-2021.dwlt | 44 +- settings.txt | 2 +- 12 files changed, 329 insertions(+), 1079 deletions(-) diff --git a/Assets/Prefabs/House.prefab b/Assets/Prefabs/House.prefab index ae33d8e..e1d0515 100644 --- a/Assets/Prefabs/House.prefab +++ b/Assets/Prefabs/House.prefab @@ -11,7 +11,12 @@ GameObject: - component: {fileID: 2475709711252233216} - component: {fileID: 1944602544116445065} - component: {fileID: 7520107037247386643} - - component: {fileID: 4626187484870903098} + - component: {fileID: 954893319406625109} + - component: {fileID: 1767011682744252576} + - component: {fileID: 5010910893148806149} + - component: {fileID: 793041006294504099} + - component: {fileID: 3900849479010375039} + - component: {fileID: 1007100526981742462} m_Layer: 0 m_Name: House m_TagString: Object:House @@ -86,8 +91,8 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} ---- !u!64 &4626187484870903098 -MeshCollider: +--- !u!65 &954893319406625109 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -96,10 +101,74 @@ MeshCollider: m_Material: {fileID: 0} m_IsTrigger: 0 m_Enabled: 1 - serializedVersion: 4 - m_Convex: 0 - m_CookingOptions: 30 - m_Mesh: {fileID: 4887216478360415443, guid: 8e16fe9f84a3b4074820e5e1000c8454, type: 3} + serializedVersion: 2 + m_Size: {x: 0.02, y: 0.12, z: 0.020000005} + m_Center: {x: 0, y: 0.05, z: 0} +--- !u!65 &1767011682744252576 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7662282263901986782} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.12, y: 0.02, z: 0.020000005} + m_Center: {x: -0.05, y: 0.1, z: 0} +--- !u!65 &5010910893148806149 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7662282263901986782} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.02, y: 0.12, z: 0.020000005} + m_Center: {x: -0.1, y: 0.05, z: 0} +--- !u!65 &793041006294504099 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7662282263901986782} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.05, y: 0.02, z: 0.020000005} + m_Center: {x: -0.015, y: 0, z: 0} +--- !u!65 &3900849479010375039 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7662282263901986782} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.05, y: 0.02, z: 0.020000005} + m_Center: {x: -0.085, y: 0, z: 0} +--- !u!65 &1007100526981742462 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7662282263901986782} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.05, y: 0.02, z: 0.01} + m_Center: {x: -0.05, y: 0, z: 0.005} --- !u!1 &7955543730560905336 GameObject: m_ObjectHideFlags: 0 @@ -125,7 +194,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7955543730560905336} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -14.550851, y: 0.000005722046, z: 43.306564} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -191,6 +260,7 @@ GameObject: - component: {fileID: 7446729486537163711} - component: {fileID: 6658625636071885056} - component: {fileID: 115121537636242588} + - component: {fileID: 1282026774396919808} m_Layer: 0 m_Name: Door m_TagString: Object:Door @@ -274,7 +344,7 @@ MeshCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 4 - m_Convex: 0 + m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 2619086233303812490, guid: 8e16fe9f84a3b4074820e5e1000c8454, type: 3} --- !u!114 &6658625636071885056 @@ -289,6 +359,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 14e8c3bbd04c0574da570d1bc8d00649, type: 3} m_Name: m_EditorClassIdentifier: + hasInteracted: 0 --- !u!95 &115121537636242588 Animator: serializedVersion: 5 @@ -310,6 +381,19 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 +--- !u!65 &1282026774396919808 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8263785157974351812} + m_Material: {fileID: 0} + m_IsTrigger: 0 + m_Enabled: 1 + serializedVersion: 2 + m_Size: {x: 0.02, y: 0.04170223, z: 0.020000005} + m_Center: {x: 0, y: -0.010851122, z: 1.2354351e-17} --- !u!1001 &8303087274738875168 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 620dae4..da18a5e 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -587,6 +587,7 @@ GameObject: - component: {fileID: 66523174} - component: {fileID: 66523173} - component: {fileID: 66523175} + - component: {fileID: 66523176} m_Layer: 5 m_Name: Inventory m_TagString: Untagged @@ -612,7 +613,7 @@ RectTransform: - {fileID: 1991779060} - {fileID: 125253396} m_Father: {fileID: 1456932137} - m_RootOrder: 13 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.25, y: 0} m_AnchorMax: {x: 0.75, y: 1} @@ -703,6 +704,35 @@ MonoBehaviour: - {fileID: 1368274941} - {fileID: 1795422306} currentBag: -1 +--- !u!114 &66523176 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 66523171} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Delegates: + - eventID: 6 + callback: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 66523175} + m_TargetAssemblyTypeName: Assets.Scripts.Inventory, Assembly-CSharp + m_MethodName: OnMouseUp + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 --- !u!1001 &71849559 PrefabInstance: m_ObjectHideFlags: 0 @@ -2130,86 +2160,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 150766788} m_CullTransparentMesh: 1 ---- !u!1 &155448474 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 155448475} - - component: {fileID: 155448477} - - component: {fileID: 155448476} - m_Layer: 5 - m_Name: txt - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &155448475 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 155448474} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1084484349} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &155448476 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 155448474} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, 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_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 1 - m_BestFit: 0 - m_MinSize: 10 - m_MaxSize: 40 - m_Alignment: 4 - m_AlignByGeometry: 0 - m_RichText: 1 - m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 - m_LineSpacing: 1 - m_Text: INV ---- !u!222 &155448477 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 155448474} - m_CullTransparentMesh: 1 --- !u!1 &157345189 GameObject: m_ObjectHideFlags: 0 @@ -3565,79 +3515,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 234481275} m_CullTransparentMesh: 1 ---- !u!1 &240318489 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 240318490} - - component: {fileID: 240318492} - - component: {fileID: 240318491} - m_Layer: 5 - m_Name: Content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &240318490 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 240318489} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1919151599} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.3, y: 0.2} - m_AnchorMax: {x: 0.7, y: 0.8} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &240318491 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 240318489} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 2800000, guid: 933686d7661c37c4b879eaf40fd0a016, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &240318492 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 240318489} - m_CullTransparentMesh: 1 --- !u!1 &241018679 GameObject: m_ObjectHideFlags: 0 @@ -4092,79 +3969,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 257718088} m_CullTransparentMesh: 1 ---- !u!1 &282171590 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 282171591} - - component: {fileID: 282171593} - - component: {fileID: 282171592} - m_Layer: 5 - m_Name: Content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &282171591 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 282171590} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1655988707} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.3, y: 0.2} - m_AnchorMax: {x: 0.7, y: 0.8} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &282171592 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 282171590} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 2800000, guid: 893f84e302bddb74597e3eeaa23d5fbc, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &282171593 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 282171590} - m_CullTransparentMesh: 1 --- !u!1 &296355391 GameObject: m_ObjectHideFlags: 0 @@ -5956,12 +5760,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1924261799} - {fileID: 1030006308} - {fileID: 506672578} m_Father: {fileID: 1156143265} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.8, y: 0.85} + m_AnchorMin: {x: 0.8, y: 0.8} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} @@ -6319,7 +6124,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1456932137} - m_RootOrder: 15 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -6742,7 +6547,7 @@ RectTransform: m_Children: - {fileID: 2111801030} m_Father: {fileID: 1456932137} - m_RootOrder: 11 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0.25, y: 0.25} @@ -7475,10 +7280,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -7605,10 +7410,10 @@ RectTransform: - {fileID: 1937295866} - {fileID: 731152150} m_Father: {fileID: 357608761} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.1} - m_AnchorMax: {x: 1, y: 0.4} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0.3} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -7949,10 +7754,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -8440,79 +8245,6 @@ MonoBehaviour: m_StringArgument: m_BoolArgument: 0 m_CallState: 2 ---- !u!1 &590030398 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 590030399} - - component: {fileID: 590030401} - - component: {fileID: 590030400} - m_Layer: 5 - m_Name: Content - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &590030399 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 590030398} - 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_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1357906798} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.3, y: 0.2} - m_AnchorMax: {x: 0.7, y: 0.8} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &590030400 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 590030398} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 2800000, guid: 55f0b3436398ebf47a855d859148d3ed, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &590030401 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 590030398} - m_CullTransparentMesh: 1 --- !u!1 &604327341 GameObject: m_ObjectHideFlags: 0 @@ -8916,7 +8648,6 @@ GameObject: - component: {fileID: 640974227} - component: {fileID: 640974229} - component: {fileID: 640974228} - - component: {fileID: 640974230} m_Layer: 5 m_Name: pnlIntelligence m_TagString: Untagged @@ -8985,51 +8716,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 640974226} m_CullTransparentMesh: 1 ---- !u!114 &640974230 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 640974226} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: - - eventID: 0 - callback: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 322679542} - m_TargetAssemblyTypeName: Assets.Scripts.TooltipHandler, Assembly-CSharp - m_MethodName: showTooltip - m_Mode: 5 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: Primary attribute for mages. - m_BoolArgument: 0 - m_CallState: 2 - - eventID: 1 - callback: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 322679542} - m_TargetAssemblyTypeName: Assets.Scripts.TooltipHandler, Assembly-CSharp - m_MethodName: hideToolTip - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 --- !u!1001 &642942357 PrefabInstance: m_ObjectHideFlags: 0 @@ -9170,8 +8856,8 @@ RectTransform: m_Father: {fileID: 718596642} m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 0.1} + m_AnchorMin: {x: 0.3, y: 0.25} + m_AnchorMax: {x: 0.7, y: 0.35} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -9394,7 +9080,7 @@ RectTransform: m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.35, y: 0.35} - m_AnchorMax: {x: 0.67, y: 0.6} + m_AnchorMax: {x: 0.65, y: 0.6} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -9558,7 +9244,6 @@ MonoBehaviour: introduction: {fileID: 2038188361} tooltip: {fileID: 426763426} tutorial: {fileID: 718596641} - buttonsHUD: {fileID: 2104818969} inventory: {fileID: 66523171} waterLayer: {fileID: 395851979} state: 0 @@ -10503,7 +10188,7 @@ RectTransform: - {fileID: 653632098} - {fileID: 643073980} m_Father: {fileID: 1456932137} - m_RootOrder: 12 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -11220,10 +10905,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -14125,8 +13810,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: speed: 3 - xMaxLimit: 25 - xMinLimit: -25 + xMaxLimit: 5 + xMinLimit: -5 --- !u!1 &977259933 GameObject: m_ObjectHideFlags: 0 @@ -15016,10 +14701,10 @@ RectTransform: - {fileID: 387327089} - {fileID: 858582474} m_Father: {fileID: 357608761} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.6} - m_AnchorMax: {x: 1, y: 0.9} + m_AnchorMin: {x: 0, y: 0.4} + m_AnchorMax: {x: 1, y: 0.7} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -15791,137 +15476,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1063798841} m_CullTransparentMesh: 1 ---- !u!1 &1084484348 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1084484349} - - component: {fileID: 1084484352} - - component: {fileID: 1084484351} - - component: {fileID: 1084484350} - m_Layer: 5 - m_Name: btnInventory - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1084484349 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1084484348} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 155448475} - m_Father: {fileID: 2104818970} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -12.5} - m_SizeDelta: {x: -40, y: -225} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1084484350 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1084484348} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 2800000, guid: cb116eb6b0a00b3498e75469e4a3ac7f, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!114 &1084484351 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1084484348} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1084484350} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1706844940} - m_TargetAssemblyTypeName: Assets.Scripts.ButtonHandler, Assembly-CSharp - m_MethodName: switchInventory - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!222 &1084484352 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1084484348} - m_CullTransparentMesh: 1 --- !u!1 &1104803248 GameObject: m_ObjectHideFlags: 0 @@ -17265,10 +16819,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -17581,10 +17135,10 @@ MonoBehaviour: m_Calls: [] m_FontData: m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 + m_FontSize: 12 m_FontStyle: 0 m_BestFit: 0 - m_MinSize: 10 + m_MinSize: 1 m_MaxSize: 40 m_Alignment: 4 m_AlignByGeometry: 0 @@ -19377,7 +18931,6 @@ GameObject: - component: {fileID: 1343558895} - component: {fileID: 1343558897} - component: {fileID: 1343558896} - - component: {fileID: 1343558898} m_Layer: 5 m_Name: pnlStrength m_TagString: Untagged @@ -19446,182 +18999,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1343558894} m_CullTransparentMesh: 1 ---- !u!114 &1343558898 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1343558894} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: - - eventID: 0 - callback: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 322679542} - m_TargetAssemblyTypeName: Assets.Scripts.TooltipHandler, Assembly-CSharp - m_MethodName: showTooltip - m_Mode: 5 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: Primary attribute for warriors. - m_BoolArgument: 0 - m_CallState: 1 - - eventID: 1 - callback: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 322679542} - m_TargetAssemblyTypeName: Assets.Scripts.TooltipHandler, Assembly-CSharp - m_MethodName: hideToolTip - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!1 &1357906797 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1357906798} - - component: {fileID: 1357906801} - - component: {fileID: 1357906799} - - component: {fileID: 1357906800} - m_Layer: 5 - m_Name: btnQuestlog - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1357906798 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1357906797} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 590030399} - m_Father: {fileID: 2104818970} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 37.5} - m_SizeDelta: {x: -40, y: -225} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1357906799 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1357906797} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1357906800} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1706844940} - m_TargetAssemblyTypeName: Assets.Scripts.ButtonHandler, Assembly-CSharp - m_MethodName: switchQuestlog - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &1357906800 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1357906797} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 2800000, guid: cb116eb6b0a00b3498e75469e4a3ac7f, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &1357906801 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1357906797} - m_CullTransparentMesh: 1 --- !u!1001 &1365079343 PrefabInstance: m_ObjectHideFlags: 0 @@ -20518,6 +19895,86 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1420067069} m_CullTransparentMesh: 1 +--- !u!1 &1425477497 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1425477498} + - component: {fileID: 1425477500} + - component: {fileID: 1425477499} + m_Layer: 5 + m_Name: txtFightPlayerInformation + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1425477498 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1425477497} + 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_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1936911267} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.8} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1425477499 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1425477497} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 0, g: 0, b: 0, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Player +--- !u!222 &1425477500 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1425477497} + m_CullTransparentMesh: 1 --- !u!1 &1428948521 GameObject: m_ObjectHideFlags: 0 @@ -20959,7 +20416,6 @@ RectTransform: - {fileID: 521488631} - {fileID: 1855614203} - {fileID: 583695243} - - {fileID: 2104818970} - {fileID: 1568120507} - {fileID: 2038188362} - {fileID: 426763427} @@ -21657,10 +21113,10 @@ RectTransform: - {fileID: 414601098} - {fileID: 1209078835} m_Father: {fileID: 1936911267} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.1} - m_AnchorMax: {x: 1, y: 0.4} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 0.3} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -22015,7 +21471,7 @@ RectTransform: - {fileID: 106853744} - {fileID: 852073979} m_Father: {fileID: 1456932137} - m_RootOrder: 9 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.25, y: 0.1} m_AnchorMax: {x: 0.75, y: 0.9} @@ -22799,137 +22255,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1641262937} m_CullTransparentMesh: 1 ---- !u!1 &1655988706 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1655988707} - - component: {fileID: 1655988710} - - component: {fileID: 1655988708} - - component: {fileID: 1655988709} - m_Layer: 5 - m_Name: btnMenu - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1655988707 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1655988706} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 282171591} - m_Father: {fileID: 2104818970} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -87.5} - m_SizeDelta: {x: -40, y: -225} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1655988708 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1655988706} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1655988709} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1706844940} - m_TargetAssemblyTypeName: Assets.Scripts.ButtonHandler, Assembly-CSharp - m_MethodName: switchOptions - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &1655988709 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1655988706} - 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_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Texture: {fileID: 2800000, guid: cb116eb6b0a00b3498e75469e4a3ac7f, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &1655988710 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1655988706} - m_CullTransparentMesh: 1 --- !u!1 &1666134055 GameObject: m_ObjectHideFlags: 0 @@ -23399,7 +22724,6 @@ GameObject: - component: {fileID: 1692975129} - component: {fileID: 1692975131} - component: {fileID: 1692975130} - - component: {fileID: 1692975132} m_Layer: 5 m_Name: pnlDexterity m_TagString: Untagged @@ -23468,51 +22792,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1692975128} m_CullTransparentMesh: 1 ---- !u!114 &1692975132 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1692975128} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d0b148fe25e99eb48b9724523833bab1, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Delegates: - - eventID: 0 - callback: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 322679542} - m_TargetAssemblyTypeName: Assets.Scripts.TooltipHandler, Assembly-CSharp - m_MethodName: showTooltip - m_Mode: 5 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: Primary attribute for thieves - m_BoolArgument: 0 - m_CallState: 2 - - eventID: 1 - callback: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 322679542} - m_TargetAssemblyTypeName: Assets.Scripts.TooltipHandler, Assembly-CSharp - m_MethodName: hideToolTip - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 --- !u!1 &1695792615 GameObject: m_ObjectHideFlags: 0 @@ -23547,8 +22826,8 @@ RectTransform: m_Father: {fileID: 718596642} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.67, y: 0.76500005} - m_AnchorMax: {x: 0.825, y: 1} + m_AnchorMin: {x: 0.65, y: 0.76500005} + m_AnchorMax: {x: 0.8, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -24870,7 +24149,7 @@ RectTransform: - {fileID: 658537917} - {fileID: 881682940} m_Father: {fileID: 1456932137} - m_RootOrder: 14 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -26100,7 +25379,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1912768572} m_CullTransparentMesh: 1 ---- !u!1 &1919151598 +--- !u!1 &1924261798 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -26108,128 +25387,77 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1919151599} - - component: {fileID: 1919151602} - - component: {fileID: 1919151600} - - component: {fileID: 1919151601} + - component: {fileID: 1924261799} + - component: {fileID: 1924261801} + - component: {fileID: 1924261800} m_Layer: 5 - m_Name: btnCharactersheet + m_Name: txtFightEnemyInformation m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1919151599 +--- !u!224 &1924261799 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1919151598} + m_GameObject: {fileID: 1924261798} 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 240318490} - m_Father: {fileID: 2104818970} + m_Children: [] + m_Father: {fileID: 357608761} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} + m_AnchorMin: {x: 0, y: 0.8} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 87.5} - m_SizeDelta: {x: -40, y: -225} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1919151600 +--- !u!114 &1924261800 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1919151598} + m_GameObject: {fileID: 1924261798} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_WrapAround: 0 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_SelectedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_SelectedTrigger: Selected - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 1919151601} - m_OnClick: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1706844940} - m_TargetAssemblyTypeName: Assets.Scripts.ButtonHandler, Assembly-CSharp - m_MethodName: switchCharactersheet - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 ---- !u!114 &1919151601 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1919151598} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3} m_Name: m_EditorClassIdentifier: m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Color: {r: 0, g: 0, b: 0, 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_Texture: {fileID: 2800000, guid: cb116eb6b0a00b3498e75469e4a3ac7f, type: 3} - m_UVRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 1 - height: 1 ---- !u!222 &1919151602 + m_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 1 + m_BestFit: 0 + m_MinSize: 10 + m_MaxSize: 40 + m_Alignment: 4 + m_AlignByGeometry: 0 + m_RichText: 1 + m_HorizontalOverflow: 0 + m_VerticalOverflow: 0 + m_LineSpacing: 1 + m_Text: Enemy +--- !u!222 &1924261801 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1919151598} + m_GameObject: {fileID: 1924261798} m_CullTransparentMesh: 1 --- !u!1 &1928144699 GameObject: @@ -26392,12 +25620,13 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: + - {fileID: 1425477498} - {fileID: 1952068944} - {fileID: 1510172560} m_Father: {fileID: 1156143265} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.85} + m_AnchorMin: {x: 0, y: 0.8} m_AnchorMax: {x: 0.2, y: 1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} @@ -26550,10 +25779,10 @@ RectTransform: - {fileID: 197647520} - {fileID: 171713367} m_Father: {fileID: 1936911267} - m_RootOrder: 0 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.6} - m_AnchorMax: {x: 1, y: 0.9} + m_AnchorMin: {x: 0, y: 0.4} + m_AnchorMax: {x: 1, y: 0.7} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -27144,7 +26373,7 @@ RectTransform: - {fileID: 1703871789} - {fileID: 1004430127} m_Father: {fileID: 1456932137} - m_RootOrder: 10 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} @@ -27556,86 +26785,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2093014398} m_CullTransparentMesh: 1 ---- !u!1 &2104818969 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2104818970} - - component: {fileID: 2104818972} - - component: {fileID: 2104818971} - m_Layer: 5 - m_Name: pnlHUDButtons - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2104818970 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2104818969} - 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_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1919151599} - - {fileID: 1357906798} - - {fileID: 1084484349} - - {fileID: 1655988707} - m_Father: {fileID: 1456932137} - m_RootOrder: 8 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.9, y: 0.25} - m_AnchorMax: {x: 1, y: 0.7} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2104818971 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2104818969} - 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} - 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: 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!222 &2104818972 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2104818969} - m_CullTransparentMesh: 1 --- !u!1 &2108738125 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/MenuScene.unity b/Assets/Scenes/MenuScene.unity index 2ff963f..c642821 100644 --- a/Assets/Scenes/MenuScene.unity +++ b/Assets/Scenes/MenuScene.unity @@ -8091,8 +8091,8 @@ RectTransform: m_Father: {fileID: 1481292146} m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.25, y: 0} - m_AnchorMax: {x: 0.45, y: 0.1} + m_AnchorMin: {x: 0.55, y: 0} + m_AnchorMax: {x: 0.75, y: 0.1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} @@ -14540,8 +14540,8 @@ RectTransform: m_Father: {fileID: 1481292146} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.55, y: 0} - m_AnchorMax: {x: 0.75, y: 0.1} + m_AnchorMin: {x: 0.25, y: 0} + m_AnchorMax: {x: 0.45, y: 0.1} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} diff --git a/Assets/Scripts/Controls.cs b/Assets/Scripts/Controls.cs index f85a930..d66596f 100644 --- a/Assets/Scripts/Controls.cs +++ b/Assets/Scripts/Controls.cs @@ -3,6 +3,7 @@ using System.Collections; using System.Collections.Generic; using UnityEngine; using UnityEngine.EventSystems; +using UnityEngine.UI; public class Controls : MonoBehaviour { @@ -136,4 +137,6 @@ public class Controls : MonoBehaviour fight.GetComponent().playerAction(6); } } + + } diff --git a/Assets/Scripts/Door.cs b/Assets/Scripts/Door.cs index 6033bdb..425dc13 100644 --- a/Assets/Scripts/Door.cs +++ b/Assets/Scripts/Door.cs @@ -34,6 +34,7 @@ namespace Assets.Scripts int openChance = new System.Random().Next(4); if(openChance == 0){ gameObject.GetComponent().Play("DoorOpen"); + Destroy(gameObject.GetComponent()); isOpen = true; } else{ @@ -58,6 +59,7 @@ namespace Assets.Scripts transform.parent.Find("chest").Find("Body").GetComponent().loadChest(bool.Parse(json["gotItem"].ToString())); if(isOpen){ gameObject.GetComponent().Play("DoorOpen"); + Destroy(gameObject.GetComponent()); } } } diff --git a/Assets/Scripts/Handler/UIHandler.cs b/Assets/Scripts/Handler/UIHandler.cs index 43f779c..3a43c14 100644 --- a/Assets/Scripts/Handler/UIHandler.cs +++ b/Assets/Scripts/Handler/UIHandler.cs @@ -23,7 +23,6 @@ namespace Assets.Scripts public GameObject introduction; public GameObject tooltip; public GameObject tutorial; - public GameObject buttonsHUD; public GameObject inventory; public GameObject waterLayer; @@ -107,7 +106,7 @@ namespace Assets.Scripts introduction.transform.localScale = new Vector3(0, 0, 0); tutorial.transform.localScale = new Vector3(1, 1, 1); showHUD(); - state = UIState.GAME; + state = UIState.TUTORIAL; } public void switchCharactersheet() @@ -171,6 +170,7 @@ namespace Assets.Scripts public void closeInventory() { + inventory.GetComponent().OnMouseUp(); inventory.transform.localScale = new Vector3(0, 0, 0); showHUD(); state = UIState.GAME; @@ -194,7 +194,6 @@ namespace Assets.Scripts { playerHUD.transform.localScale = new Vector3(1,1,1); compass.transform.localScale = new Vector3(1, 1, 1); - buttonsHUD.transform.localScale = new Vector3(1, 1, 1); } public void openMainMenu() @@ -204,7 +203,7 @@ namespace Assets.Scripts public void switchPauseMenu() { - if (state == UIState.GAME || state == UIState.CHARACTER || state == UIState.PAUSE || state == UIState.QUEST) + if (state == UIState.GAME || state == UIState.CHARACTER || state == UIState.PAUSE || state == UIState.QUEST || state == UIState.INVENTORY || state == UIState.INTRODUCTION) { if (state == UIState.PAUSE) { @@ -533,7 +532,7 @@ namespace Assets.Scripts GameObject.Find("Player").GetComponent().generatePlayer(); GameObject.Find("Player").GetComponent().finishPlayerCreation(); hideOtherElements(introduction); - state = UIState.TUTORIAL; + state = UIState.INTRODUCTION; } else { @@ -550,6 +549,7 @@ namespace Assets.Scripts public void closeTutorial() { tutorial.transform.localScale = new Vector3(0,0,0); + state = UIState.GAME; } } } \ No newline at end of file diff --git a/Assets/Scripts/Inventory.cs b/Assets/Scripts/Inventory.cs index 5f0f842..2c55eb3 100644 --- a/Assets/Scripts/Inventory.cs +++ b/Assets/Scripts/Inventory.cs @@ -382,5 +382,12 @@ namespace Assets.Scripts } } } + public void OnMouseUp(){ + if(dragImage.GetComponent().texture != null){ + dragImage.GetComponent().color = new Color(0,0,0,0); + dragImage.GetComponent().texture = null; + dragImage.transform.position = new Vector3(0,0,0); + } + } } } \ No newline at end of file diff --git a/Assets/Scripts/InventorySlot.cs b/Assets/Scripts/InventorySlot.cs index b42a3ab..c38df67 100644 --- a/Assets/Scripts/InventorySlot.cs +++ b/Assets/Scripts/InventorySlot.cs @@ -110,7 +110,7 @@ namespace Assets.Scripts { inventory.dragImage.GetComponent().color = toMove.rarityColor; inventory.dragImage.GetComponent().texture = toMove.image; - inventory.dragImage.transform.position = new Vector3(Input.mousePosition.x - 50, Input.mousePosition.y - 50, 0); + inventory.dragImage.transform.position = new Vector3(Input.mousePosition.x + 50, Input.mousePosition.y - 50, 0); } } diff --git a/Assets/Scripts/PlayerCamera.cs b/Assets/Scripts/PlayerCamera.cs index bef7e0a..c988b46 100644 --- a/Assets/Scripts/PlayerCamera.cs +++ b/Assets/Scripts/PlayerCamera.cs @@ -11,8 +11,8 @@ namespace Assets.Scripts GameObject player; Vector2 rotation = Vector2.zero; public float speed = 1; //the sensibility - public float xMaxLimit = 25.0f; - public float xMinLimit = -25.0f; + public float xMaxLimit = 5.0f; + public float xMinLimit = -5.0f; GameObject interact; // Start is called before the first frame update @@ -26,13 +26,17 @@ namespace Assets.Scripts // Update is called once per frame void Update() - { + { if(uihandler.canPlayerRotate()){ + Cursor.lockState = CursorLockMode.Locked; rotation.y += Input.GetAxis("Mouse X"); rotation.x += -Input.GetAxis("Mouse Y"); rotation.x = Mathf.Clamp(rotation.x, xMinLimit, xMaxLimit); transform.eulerAngles = (Vector2)rotation * speed; } + else{ + Cursor.lockState = CursorLockMode.Confined; + } transform.position = new Vector3(transform.parent.transform.position.x, transform.position.y, transform.parent.transform.position.z); } diff --git a/Assets/Scripts/UIState.cs b/Assets/Scripts/UIState.cs index 2c5f5ea..28e46d4 100644 --- a/Assets/Scripts/UIState.cs +++ b/Assets/Scripts/UIState.cs @@ -17,6 +17,7 @@ namespace Assets.Scripts PAUSEOPTIONS, TUTORIAL, QUEST, - INVENTORY + INVENTORY, + INTRODUCTION } } diff --git a/UserSettings/Layouts/default-2021.dwlt b/UserSettings/Layouts/default-2021.dwlt index 0a3779c..53bd6f2 100644 --- a/UserSettings/Layouts/default-2021.dwlt +++ b/UserSettings/Layouts/default-2021.dwlt @@ -19,7 +19,7 @@ MonoBehaviour: width: 1920 height: 989 m_ShowMode: 4 - m_Title: Inspector + m_Title: Project m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 371} m_MaxSize: {x: 10000, y: 10000} @@ -119,7 +119,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 172 + controlID: 37 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -144,7 +144,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 177 + controlID: 38 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -169,7 +169,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 178 + controlID: 22 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -189,8 +189,8 @@ MonoBehaviour: y: 0 width: 306 height: 659 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -215,8 +215,8 @@ MonoBehaviour: y: 0 width: 1224 height: 659 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 202, y: 221} + m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 14} m_Panes: - {fileID: 14} @@ -270,8 +270,8 @@ MonoBehaviour: y: 0 width: 390 height: 939 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 18} m_Panes: - {fileID: 18} @@ -402,9 +402,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: c8590000 m_LastClickedID: 0 - m_ExpandedIDs: d23ff9ff2240f9ffbc42f9ffca42f9ff8244f9ffd244f9ff7247f9ff8047f9ffea4df9ff384ef9ffd250f9ffe050f9ff3e66f9ff3695f9ff8695f9ff2698f9ff3498f9fff2b6f9ff42b7f9ffdcb9f9ffeab9f9ffc6dcf9ff18ddf9fffedff9ff0ce0f9ff34f0f9ff84f0f9ff66f3f9ff74f3f9ff52f5f9ffa2f5f9ff84f8f9ff92f8f9ff7cfaf9ffcafaf9ffacfdf9ffbafdf9ffb401faff0402faffe604fafff404faff722efaff742efaff7c2efaff802efaffb02efaff7431fafff231faff4c34faffca36faffd639faff7a3bfaffce3ffaffc280faffc481faff1482fafff684faff0885faffe286faff3287faff228afaff388afaffaca1fdffd2d1fdfffa6cffffe08cffff188dffff8ec1ffffd2c1ffffacc2fffff2c2ffffaac9ffff24caffffdad0fffff8edffff56f0ffff8ef0ffff46f4ffff38fbffff9a8e0000ea8e00005c8f000088910000c0db000086dd00001c0e01007a140100067c0100524b0600844b0600424c0600e64c06007a4d0600064e06000e4e0600ac4e0600144f06002c4f0600cc4f0600d04f0600a250060050df0600caff0600240107003c010700b60a0700560e0700a6180700001a07006eaf0800f2af08002cb10800d24709005648090012bd0900dac20900dec50900e0240a000e4c0a00924c0a006cc20a00f4c50a009cca0a00 + m_ExpandedIDs: 38fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -738,7 +738,7 @@ MonoBehaviour: m_Rotation: m_Target: {x: 0.13015747, y: 0.006062416, z: -0.00087758794, w: 0.99141186} speed: 2 - m_Value: {x: 0.13016555, y: 0.006062792, z: -0.0008776424, w: 0.9914734} + m_Value: {x: -0.13015747, y: -0.006062416, z: 0.0008775879, w: -0.99141186} m_Size: m_Target: 1047.0226 speed: 2 @@ -908,22 +908,22 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets + - Assets/Scripts m_Globs: [] m_OriginalText: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/TextMesh Pro + - Assets/Scripts m_LastFoldersGridSize: -1 m_LastProjectPath: /home/nicola/Schreibtisch/TalesOfNovariel m_LockTracker: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 5} - m_SelectedIDs: 725a0000 - m_LastClickedID: 23154 - m_ExpandedIDs: 00000000725a000000ca9a3b + m_SelectedIDs: c8590000 + m_LastClickedID: 22984 + m_ExpandedIDs: 000000005a59000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -951,7 +951,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000725a000000ca9a3b + m_ExpandedIDs: 000000005a590000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -976,9 +976,9 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 0 + m_SelectedInstanceIDs: c8590000 + m_LastClickedInstanceID: 22984 + m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000d81c070080fe0000287f010000000000 m_RenameOverlay: m_UserAcceptedRename: 0 diff --git a/settings.txt b/settings.txt index 8f56e02..cdd687e 100644 --- a/settings.txt +++ b/settings.txt @@ -2,4 +2,4 @@ Resolution:2 Mode:2 Music:0.05210853 Effects:0.4071819 -Sensitivity:1 \ No newline at end of file +Sensitivity:10 \ No newline at end of file