From 0ab514a4906ac31fa2cb69d10fd67055b1fb2306 Mon Sep 17 00:00:00 2001 From: Karim Ajouz <kajou001@gold.ac.uk> Date: Sat, 13 Apr 2019 20:27:29 +0100 Subject: [PATCH] Playtest-build edits; Made Penelope change colour when selected; Stopped us from being able to double corroborate; --- .../Materials/Pen_Selected.mat | 77 + .../Materials/Pen_Selected.mat.meta | 8 + TTCS_Prot/Assets/Scenes/SampleScene.unity | 1238 ++++++++++++++++- .../Assets/Scenes/SampleScene/NavMesh.asset | Bin 11964 -> 11732 bytes TTCS_Prot/Assets/Scenes/example.meta | 8 + .../Assets/Scripts/Classes/EvidenceHandler.cs | 4 +- .../Scripts/Classes/SelectionBoxHandler.cs | 6 +- TTCS_Prot/Assets/example.meta | 8 + 8 files changed, 1312 insertions(+), 37 deletions(-) create mode 100644 TTCS_Prot/Assets/CharacterAssets/Materials/Pen_Selected.mat create mode 100644 TTCS_Prot/Assets/CharacterAssets/Materials/Pen_Selected.mat.meta create mode 100644 TTCS_Prot/Assets/Scenes/example.meta create mode 100644 TTCS_Prot/Assets/example.meta diff --git a/TTCS_Prot/Assets/CharacterAssets/Materials/Pen_Selected.mat b/TTCS_Prot/Assets/CharacterAssets/Materials/Pen_Selected.mat new file mode 100644 index 0000000..4b9e641 --- /dev/null +++ b/TTCS_Prot/Assets/CharacterAssets/Materials/Pen_Selected.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pen_Selected + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 44e4b9f73e2c9604289adf9efd1106bc, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Floats: + - _BumpScale: 1 + - _Cutoff: 0.5 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _GlossMapScale: 1 + - _Glossiness: 0.5 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 0.9830491, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/TTCS_Prot/Assets/CharacterAssets/Materials/Pen_Selected.mat.meta b/TTCS_Prot/Assets/CharacterAssets/Materials/Pen_Selected.mat.meta new file mode 100644 index 0000000..ff2be8a --- /dev/null +++ b/TTCS_Prot/Assets/CharacterAssets/Materials/Pen_Selected.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b1a2c1f044d68fc43aa3aca9dbd0c620 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/TTCS_Prot/Assets/Scenes/SampleScene.unity b/TTCS_Prot/Assets/Scenes/SampleScene.unity index a2ad5a5..b6b6ccc 100644 --- a/TTCS_Prot/Assets/Scenes/SampleScene.unity +++ b/TTCS_Prot/Assets/Scenes/SampleScene.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.43667564, g: 0.48427135, b: 0.5645232, a: 1} + m_IndirectSpecularColor: {r: 0.4366757, g: 0.48427194, b: 0.5645252, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -98,7 +98,7 @@ NavMeshSettings: serializedVersion: 2 agentTypeID: 0 agentRadius: 0.2 - agentHeight: 2 + agentHeight: 1.07 agentSlope: 45 agentClimb: 0.4 ledgeDropHeight: 1 @@ -112,6 +112,165 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 23800000, guid: dc8b1c27d3f3e6d4d96ff8ba5c428810, type: 2} +--- !u!1 &28310707 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 28310708} + - component: {fileID: 28310711} + - component: {fileID: 28310710} + - component: {fileID: 28310709} + m_Layer: 5 + m_Name: Scrollbar (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &28310708 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 28310707} + m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 29389337} + m_Father: {fileID: 2038262307} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 100, y: -0.5000534} + m_SizeDelta: {x: 250, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &28310709 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 28310707} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -2061169968, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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_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_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 801194751} + m_HandleRect: {fileID: 801194750} + m_Direction: 0 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Scrollbar+ScrollEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &28310710 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 28310707} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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 +--- !u!222 &28310711 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 28310707} + m_CullTransparentMesh: 0 +--- !u!1 &29389336 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 29389337} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &29389337 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 29389336} + 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: 801194750} + m_Father: {fileID: 28310708} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &31964004 GameObject: m_ObjectHideFlags: 0 @@ -399,6 +558,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 49374210} m_CullTransparentMesh: 0 +--- !u!1 &50356237 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 50356238} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &50356238 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 50356237} + 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: 1625105926} + m_Father: {fileID: 1515718676} + 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.5} + m_SizeDelta: {x: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &51112063 GameObject: m_ObjectHideFlags: 0 @@ -487,6 +682,42 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 51112063} m_CullTransparentMesh: 0 +--- !u!1 &55934078 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 55934079} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &55934079 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 55934078} + 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: 725263077} + m_Father: {fileID: 1757199324} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1 &57848172 GameObject: m_ObjectHideFlags: 0 @@ -827,6 +1058,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 193758841} + - {fileID: 1757199324} m_Father: {fileID: 786045760} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -869,7 +1101,7 @@ MonoBehaviour: m_ScrollSensitivity: 1 m_Viewport: {fileID: 103061877} m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 1757199325} m_HorizontalScrollbarVisibility: 0 m_VerticalScrollbarVisibility: 0 m_HorizontalScrollbarSpacing: 0 @@ -990,6 +1222,129 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 117671462} m_CullTransparentMesh: 0 +--- !u!1 &143958340 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 143958341} + - component: {fileID: 143958344} + - component: {fileID: 143958343} + - component: {fileID: 143958342} + m_Layer: 5 + m_Name: Scrollbar + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &143958341 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 143958340} + m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1363784197} + m_Father: {fileID: 747386774} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 100, y: -0.50001144} + m_SizeDelta: {x: 250, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &143958342 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 143958340} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -2061169968, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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_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_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 2079997975} + m_HandleRect: {fileID: 2079997974} + m_Direction: 0 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Scrollbar+ScrollEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &143958343 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 143958340} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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 +--- !u!222 &143958344 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 143958340} + m_CullTransparentMesh: 0 --- !u!1 &170076733 GameObject: m_ObjectHideFlags: 0 @@ -1130,7 +1485,7 @@ RectTransform: m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} m_AnchoredPosition: {x: 4, y: 0.0000076293945} - m_SizeDelta: {x: -8, y: 0} + m_SizeDelta: {x: -8, y: -205.00003} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &193758842 MonoBehaviour: @@ -1182,7 +1537,7 @@ GameObject: - component: {fileID: 208997533} - component: {fileID: 208997532} - component: {fileID: 208997531} - m_Layer: 0 + m_Layer: 9 m_Name: Floor m_TagString: Untagged m_Icon: {fileID: 0} @@ -1287,14 +1642,14 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 221490959} - m_LocalRotation: {x: 0, y: -0, z: 0.7071068, w: -0.7071068} + m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1.1823, y: 1, z: 1} m_Children: - {fileID: 186678051} m_Father: {fileID: 1132042695} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 270} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} m_AnchoredPosition: {x: 100, y: 3} @@ -1878,6 +2233,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 234521554} + - {fileID: 614996071} m_Father: {fileID: 2131789980} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1920,7 +2276,7 @@ MonoBehaviour: m_ScrollSensitivity: 1 m_Viewport: {fileID: 262724279} m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 614996072} m_HorizontalScrollbarVisibility: 0 m_VerticalScrollbarVisibility: 0 m_HorizontalScrollbarSpacing: 0 @@ -2009,6 +2365,80 @@ RectTransform: m_AnchoredPosition: {x: 143, y: -124} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &268235675 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 268235676} + - component: {fileID: 268235678} + - component: {fileID: 268235677} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &268235676 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268235675} + 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: 829900489} + 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: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &268235677 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268235675} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, 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 +--- !u!222 &268235678 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 268235675} + m_CullTransparentMesh: 0 --- !u!1001 &293264978 PrefabInstance: m_ObjectHideFlags: 0 @@ -2034,7 +2464,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 400002, guid: f758c800fb7e44b5e8cd9bdcdb7ee41f, type: 3} propertyPath: m_LocalPosition.x - value: 0.24 + value: 0.01 objectReference: {fileID: 0} - target: {fileID: 400002, guid: f758c800fb7e44b5e8cd9bdcdb7ee41f, type: 3} propertyPath: m_LocalPosition.y @@ -2831,6 +3261,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1151227947} + - {fileID: 1515718676} m_Father: {fileID: 1903071180} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -2873,7 +3304,7 @@ MonoBehaviour: m_ScrollSensitivity: 1 m_Viewport: {fileID: 335156269} m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 1515718677} m_HorizontalScrollbarVisibility: 0 m_VerticalScrollbarVisibility: 0 m_HorizontalScrollbarSpacing: 0 @@ -5252,6 +5683,129 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 585411774} m_CullTransparentMesh: 0 +--- !u!1 &614996070 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 614996071} + - component: {fileID: 614996074} + - component: {fileID: 614996073} + - component: {fileID: 614996072} + m_Layer: 5 + m_Name: Scrollbar (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &614996071 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 614996070} + m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: -4} + m_LocalScale: {x: 1.1823025, y: 1, z: 1} + m_Children: + - {fileID: 829900489} + m_Father: {fileID: 262724279} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 101.3, y: 28} + m_SizeDelta: {x: 160, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &614996072 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 614996070} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -2061169968, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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_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_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 268235677} + m_HandleRect: {fileID: 268235676} + m_Direction: 0 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Scrollbar+ScrollEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &614996073 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 614996070} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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 +--- !u!222 &614996074 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 614996070} + m_CullTransparentMesh: 0 --- !u!1 &616912025 GameObject: m_ObjectHideFlags: 0 @@ -5784,8 +6338,82 @@ MeshFilter: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 712426263} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} + m_GameObject: {fileID: 712426263} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &725263076 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 725263077} + - component: {fileID: 725263079} + - component: {fileID: 725263078} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &725263077 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 725263076} + 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: 55934079} + 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: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &725263078 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 725263076} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, 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 +--- !u!222 &725263079 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 725263076} + m_CullTransparentMesh: 0 --- !u!1 &734794666 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3761742374809534363, guid: f4ad175d0facffa459f806cdddc12632, @@ -6014,8 +6642,8 @@ BoxCollider: m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} + m_Size: {x: 1, y: 3.0234332, z: 1} + m_Center: {x: -0, y: 0.00017428398, z: 0} --- !u!114 &738989161 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6371,6 +6999,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1563812111} + - {fileID: 143958341} m_Father: {fileID: 1073223182} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -6413,7 +7042,7 @@ MonoBehaviour: m_ScrollSensitivity: 1 m_Viewport: {fileID: 747386774} m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 143958342} m_HorizontalScrollbarVisibility: 0 m_VerticalScrollbarVisibility: 0 m_HorizontalScrollbarSpacing: 0 @@ -6546,7 +7175,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &786045758 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6697,6 +7326,80 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 796296744} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &801194749 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 801194750} + - component: {fileID: 801194752} + - component: {fileID: 801194751} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &801194750 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 801194749} + 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: 29389337} + 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: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &801194751 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 801194749} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, 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 +--- !u!222 &801194752 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 801194749} + m_CullTransparentMesh: 0 --- !u!114 &812067857 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 1647485941896142737, guid: 2ac9b89df8286c44097e02a92a1c2b1a, @@ -7009,6 +7712,42 @@ Transform: type: 3} m_PrefabInstance: {fileID: 829659905} m_PrefabAsset: {fileID: 0} +--- !u!1 &829900488 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 829900489} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &829900489 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 829900488} + 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: 268235676} + m_Father: {fileID: 614996071} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!1001 &846792984 PrefabInstance: m_ObjectHideFlags: 0 @@ -7970,7 +8709,7 @@ 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: -260, y: 210.1} + m_AnchoredPosition: {x: -113, y: 210.1} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &884381234 @@ -9457,7 +10196,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!114 &1073223180 MonoBehaviour: m_ObjectHideFlags: 0 @@ -11828,6 +12567,42 @@ Transform: m_Father: {fileID: 367328162} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1363784196 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1363784197} + m_Layer: 5 + m_Name: Sliding Area + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1363784197 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1363784196} + 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: 2079997974} + m_Father: {fileID: 143958341} + 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: -20, y: -20} + m_Pivot: {x: 0.5, y: 0.5} --- !u!4 &1365693929 stripped Transform: m_CorrespondingSourceObject: {fileID: 400000, guid: f25c22c85e65dc244bead999516dd413, @@ -12560,18 +13335,141 @@ Transform: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1483546413} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: -20} - m_LocalScale: {x: 1, y: 1, z: 1} - m_Children: - - {fileID: 1633099652} - - {fileID: 2113891588} - - {fileID: 1341408451} - - {fileID: 1791370258} - m_Father: {fileID: 367328162} - m_RootOrder: 3 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_GameObject: {fileID: 1483546413} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: -20} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 1633099652} + - {fileID: 2113891588} + - {fileID: 1341408451} + - {fileID: 1791370258} + m_Father: {fileID: 367328162} + m_RootOrder: 3 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1515718675 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1515718676} + - component: {fileID: 1515718679} + - component: {fileID: 1515718678} + - component: {fileID: 1515718677} + m_Layer: 5 + m_Name: Scrollbar (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1515718676 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1515718675} + m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.182303, y: 1, z: 1} + m_Children: + - {fileID: 50356238} + m_Father: {fileID: 335156269} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 99.5, y: 28} + m_SizeDelta: {x: 160, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1515718677 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1515718675} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -2061169968, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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_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_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 1625105927} + m_HandleRect: {fileID: 1625105926} + m_Direction: 0 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Scrollbar+ScrollEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1515718678 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1515718675} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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 +--- !u!222 &1515718679 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1515718675} + m_CullTransparentMesh: 0 --- !u!1 &1516850862 GameObject: m_ObjectHideFlags: 0 @@ -12855,8 +13753,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 4, y: -0.000015258789} - m_SizeDelta: {x: -8, y: -255} + m_AnchoredPosition: {x: 4, y: 0.000015258789} + m_SizeDelta: {x: -8, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1563812112 MonoBehaviour: @@ -13480,6 +14378,80 @@ MonoBehaviour: selection: 0 yourDets: - {fileID: 1318366873} +--- !u!1 &1625105925 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1625105926} + - component: {fileID: 1625105928} + - component: {fileID: 1625105927} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1625105926 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1625105925} + 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: 50356238} + 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: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1625105927 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1625105925} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, 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 +--- !u!222 &1625105928 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1625105925} + m_CullTransparentMesh: 0 --- !u!1 &1625353410 GameObject: m_ObjectHideFlags: 0 @@ -14311,6 +15283,129 @@ MonoBehaviour: m_EditorClassIdentifier: _camera: {fileID: 534669907} cutscene: {fileID: 848200922} +--- !u!1 &1757199323 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1757199324} + - component: {fileID: 1757199327} + - component: {fileID: 1757199326} + - component: {fileID: 1757199325} + m_Layer: 5 + m_Name: Scrollbar (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1757199324 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1757199323} + m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 55934079} + m_Father: {fileID: 103061877} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 100, y: -25.499994} + m_SizeDelta: {x: 250, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1757199325 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1757199323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -2061169968, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + 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_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_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 725263078} + m_HandleRect: {fileID: 725263077} + m_Direction: 0 + m_Value: 0 + m_Size: 1 + m_NumberOfSteps: 0 + m_OnValueChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Scrollbar+ScrollEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null +--- !u!114 &1757199326 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1757199323} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + 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 +--- !u!222 &1757199327 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1757199323} + m_CullTransparentMesh: 0 --- !u!1 &1757282213 GameObject: m_ObjectHideFlags: 0 @@ -15668,7 +16763,7 @@ GameObject: - component: {fileID: 1941924560} - component: {fileID: 1941924559} - component: {fileID: 1941924558} - m_Layer: 0 + m_Layer: 9 m_Name: Floor m_TagString: Untagged m_Icon: {fileID: 0} @@ -16260,6 +17355,7 @@ RectTransform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 2044682873} + - {fileID: 28310708} m_Father: {fileID: 863962179} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -16302,7 +17398,7 @@ MonoBehaviour: m_ScrollSensitivity: 1 m_Viewport: {fileID: 2038262307} m_HorizontalScrollbar: {fileID: 0} - m_VerticalScrollbar: {fileID: 0} + m_VerticalScrollbar: {fileID: 28310709} m_HorizontalScrollbarVisibility: 0 m_VerticalScrollbarVisibility: 0 m_HorizontalScrollbarSpacing: 0 @@ -16430,6 +17526,80 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2103384087} m_PrefabAsset: {fileID: 0} +--- !u!1 &2079997973 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2079997974} + - component: {fileID: 2079997976} + - component: {fileID: 2079997975} + m_Layer: 5 + m_Name: Handle + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2079997974 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2079997973} + 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: 1363784197} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 20, y: 20} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &2079997975 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2079997973} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, + Version=1.0.0.0, Culture=neutral, PublicKeyToken=null + m_Sprite: {fileID: 10905, 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 +--- !u!222 &2079997976 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2079997973} + m_CullTransparentMesh: 0 --- !u!1001 &2103384087 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/TTCS_Prot/Assets/Scenes/SampleScene/NavMesh.asset b/TTCS_Prot/Assets/Scenes/SampleScene/NavMesh.asset index be6cc6516fc0da34674c9f32a47129d7bf9246d6..b91b5be94b8ad728d46f2c64d904aceac660f1ae 100755 GIT binary patch delta 1799 zcmZWqO>7%g5T3O+_9p(>&D!p+f8sS2kl1lZdupOWBBUneP`Drp5<)`i300^^IAI@s zC~CwAiE`o`IJEMmhzJRZ1Baws8X*J%MT!tYC2fUJOB!mvncdA=;z`f@zW2?{o0&In zy!F<dH!UJ(hiKu>P3t=+wcp@9=M3L>?4dvXiD_Kro0WRu1QAVQ%5aB2R!WA~9}K?U z7+5Q^)gM^ldgsE>_6&nh&6w3JWvC=9MjA8KCo=Gz;06C(BhA;!r+M3di9aj*)|XTS z^Mv^M>IW%&wyG=gIjT0@Co}`Se@COy-w=8%LfzU@`)-!#;)}1GbD#%qgpZDC{05lv zl~Y^%VeP#}?Chu4udmX*19kTH_V$YGbGQCQ`t!|A{;B?PF9)Y#IT}+m5v{~=F=rtS zQ_&t#rvHC_igJ+!Gtv=p(HESjf`%%4$vGhp`!47_`NCpkFelmYOFb_U?o;GIY_ddU zNEV>wLSCH9!iCVJSf~JJAS1&<5b-_6`ZeUrg?1Hu9&?<R@M>iD$kBuXsrO<&iK&4b zl55b>4<%$B=d1zNR+2Qlc%AUJ%8H1TL2N7G*=;tnb!vcY@|osYRM>fc5x<MG-f2l| ztd!EV<ROKt6XanUh*~bMh6%*KHW#@TtaCqbc%$nae{Te>g2<&bSc6i$6U=|qx;xQ^ zR*@gH>X&py%ZP($7v6fbkLcSZ_4&gwp4Dp*{%P7%UNW|)(UCC&{d<uAP4N+Um;Q;c zLq~k&sh}6`N&pYXq~w$YXEdk;yINs#3KF2FJcRuIG4|EV5dV%-JuR@qF<vTC^_L<8 zk6}QbolD|SO>1NP0C6b9kHDWKYq)mOPN#2gU*OlD8Kwp=4D-*f8@yRA^4qg-^bDB# zg*p%=<1eU=V>wEMXhL41k493}WD(wEXUmCr-|56wl01K>l=Xozja&@YY>g+nrV zZSK;-w<w>ukI0enkatwUj32x7lQQql1*Y^3el)jq9#O8u9Z=L{jXts(uOYa)_0`!` z*}wSO?(td-+&?%_UGRLl{WAaDzG_VJJDnga&ku+4wN7PTic$Je+;z-8Hlm&+36kd- zc9a}{->FX8csps7Z;l^yyonsLV{>7?o|OlVHo;fsUoB{2_2!XZzU(jZiEf8mEsHk- zpEt^<(3Bm%(arb%M8?Axc?%g_CaEUD849u7NQiUbtC3$tyoOtlTGnEb8za3jljMfS zu~c`6r=f3Zb&lcnsDX%qf(l@P!;27=5~`|0Ar?NT20|<j<@7mZ_?v|_&sTXVnUV%j Q11^$<zq(mI_uTvc0Ync#^#A|> delta 1975 zcmZ`)O=w(I6h3ce^4?1_d6~&fGJk#ZCO>t4(wexkA($YjEm-YBaHFE&y3n0=<IKXv zbXDabT35xDqzZ=FD2=WalhTD!x)B1k)PgZZLbX-K@4I(iCkkE|?m74S&UxqDd(N33 zUfFuh7s>31JifK*f162chq{}2Qui~Hy<+yGlyg}(rz;Z$5gEmgE7!X@opa{pLig+U zy8fCy6fyG7>2Ii0?sU7oWWjNC|46Fji7PqDi*!ViASAFm*j=41o^?`sv3Oq3<!k;| z65v!EZIs?gVEeSR#_dk2IwejB;O~CFe*n@$l8WUMO+olCKmFn}8JGd<)0``dUv04S zi?e#Z{8l3l`r}KN)&;>b&<ow}T6}(O`?QfYUHL3IKlh1Vt$c9SN9toT4kvcGos<!n z03{z-T0C>cPmLJKCP+Mu<Sk0TGd7fHPyPh*ndAYMulEYMc0r2ZxiZ6}4n5kh(}Lau z*p#qyx%kCT6MM|dG|mHXazJV8BLn+I@+&e0q$Fj?Y5We`!+#s*GsZD6Ebm_ghFp;h zZg|R|3`dOnValOY%?lVp$1*6#0fs>NVq6mlAx_`o^CBT&DqM6QlOH+Idtu}q0Z$~- zLUq+i=<C&`rx+Yva#?#*P=h;XzzN)70y|5Z9Lhx_CH4F2lINH=iS(fQyq>Gq^zvdu z_ZNNbL^b^)YIx*3GOahFUq==ohWcHtva%q%h^1-n`bR_z@2J-mVZBmsLJy!bvKt1! z1%6#dHJmMF`;e#PPjGJo%Sc~O&PHu}$_l!VQ<S%1(c@vA84vZ8$!8aQ<Z2?g5B^Y} zGZ9(+5BQs7{|GzE@{8u#4X!`WX6p~YDVxU~`mkBuGB$UB7sTs@bCb#B{@$K09qlFj zwcf3x&pBFN2=r7vqsviI->5IQ6EOKnS}+mkcZ6m2z~~R5rwpEk{=hugVVr3X@w;}4 zfX~$F4_Tm21Gzi!&&xcl!#*$ve+>w(hK)Cmzl(B@#|K@+i(SDA;m*ZAD(dHrD0O9{ zwXWA2CsvW|T08(bLnvR_*jV4Xy1M>f`P%k2u$DQ;jL|dA7j&VSH(gCGN6m-L_Z?rG zt;pk(jEbjcTGNYsevXg0MaLhF7n?MnpW|mj#`I#VG|EwuL=lYXW~(qVhVwvoT9uP7 z9yo3yjIB;Q&f<p3nt>BD+(AFvZ!iW<Z%hUKt@V=bJ+|<~|23LzI@`}|6+4O1cDf!l zQ3V;jUYyg7{EVJLRV+stt<_u&j=Ak$@M5;vzr>5K$iYC*iPc#l#GBCBN;ZQ4k&T02 zGKEb%huR6z()Pvz#BFg7Kvs~L0?12TacP6++vZ|fGM11s4y~Sr!<4D9!#L9$>LnAf z)hEEW9~kPqM2^V-o-EFiwmJj!@&G{4o5!9llyMN4*34mdkqt9+@z-3}SC7B_4+|<n AKL7v# diff --git a/TTCS_Prot/Assets/Scenes/example.meta b/TTCS_Prot/Assets/Scenes/example.meta new file mode 100644 index 0000000..2938a2c --- /dev/null +++ b/TTCS_Prot/Assets/Scenes/example.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: bebd874866a254106aae17e52a06ac6e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/TTCS_Prot/Assets/Scripts/Classes/EvidenceHandler.cs b/TTCS_Prot/Assets/Scripts/Classes/EvidenceHandler.cs index f4a1985..2197ea9 100644 --- a/TTCS_Prot/Assets/Scripts/Classes/EvidenceHandler.cs +++ b/TTCS_Prot/Assets/Scripts/Classes/EvidenceHandler.cs @@ -115,6 +115,8 @@ public class EvidenceHandler : MonoBehaviour { //For all potential corroborations... for (int i = 0; i < potentialMatches.Count; i++) { + + //If either of the current potential corroboration's evidence ID's match to the second evidence input... if (potentialMatches[i].e1_id == e2.id || potentialMatches[i].e2_id == e2.id) { @@ -122,7 +124,7 @@ public class EvidenceHandler : MonoBehaviour { for(int j = 0; j < foundCorroborations.Count; j++) { //If they match the current potential corroboration we are looking at... - if (foundCorroborations[j] == potentialMatches[i]) + if (foundCorroborations[j].id == potentialMatches[i].id) { //Then the item already exists in the found corroborations list, therefore return Null Evidence; nothing new has been discovered. return nEvidence; diff --git a/TTCS_Prot/Assets/Scripts/Classes/SelectionBoxHandler.cs b/TTCS_Prot/Assets/Scripts/Classes/SelectionBoxHandler.cs index e2bda7e..eb1a69f 100755 --- a/TTCS_Prot/Assets/Scripts/Classes/SelectionBoxHandler.cs +++ b/TTCS_Prot/Assets/Scripts/Classes/SelectionBoxHandler.cs @@ -10,6 +10,8 @@ public class SelectionBoxHandler : MonoBehaviour public Material defaultMaterial; public Material selectedMaterial; + public GameObject detectiveBox; + public List<GameObject> selectedDetectives; public List<GameObject> _allDetectives; @@ -61,7 +63,7 @@ public class SelectionBoxHandler : MonoBehaviour { for (int i = 0; i < selectedDetectives.Count; i++) { - selectedDetectives[i].GetComponent<Renderer>().material = defaultMaterial; + detectiveBox.GetComponent<Renderer>().material = defaultMaterial; } _isSelecting = true; @@ -75,7 +77,7 @@ public class SelectionBoxHandler : MonoBehaviour { if (IsWithinSelectionBounds(_allDetectives[i])) { - _allDetectives[i].GetComponent<Renderer>().material = selectedMaterial; + detectiveBox.GetComponent<Renderer>().material = selectedMaterial; selectedDetectives.Add(_allDetectives[i]); checkMovement = true; } diff --git a/TTCS_Prot/Assets/example.meta b/TTCS_Prot/Assets/example.meta new file mode 100644 index 0000000..2cb0640 --- /dev/null +++ b/TTCS_Prot/Assets/example.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 1c66af92d50784d799545bc86c9b8590 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: -- GitLab