diff --git a/.gitignore b/.gitignore index 67f8dbd..6ef3f94 100644 --- a/.gitignore +++ b/.gitignore @@ -29,3 +29,4 @@ # Builds **/*.apk **/*.unitypackage +**/UnityPackageManager/ diff --git a/Project Undercover/Assets/Materials/UI.mat b/Project Undercover/Assets/Materials/UI.mat old mode 100644 new mode 100755 index 43d88ed..12dbb71 --- a/Project Undercover/Assets/Materials/UI.mat +++ b/Project Undercover/Assets/Materials/UI.mat @@ -7,7 +7,7 @@ Material: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 0} m_Name: UI - m_Shader: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 4800000, guid: a0427fb9da4c72a418dc62beaf086294, type: 3} m_ShaderKeywords: m_LightmapFlags: 4 m_EnableInstancingVariants: 0 diff --git a/Project Undercover/Assets/Resources/Guard Camera.prefab b/Project Undercover/Assets/Resources/Guard Camera.prefab index 372c39d..ba26cf7 100755 --- a/Project Undercover/Assets/Resources/Guard Camera.prefab +++ b/Project Undercover/Assets/Resources/Guard Camera.prefab @@ -11,6 +11,42 @@ Prefab: m_ParentPrefab: {fileID: 0} m_RootGameObject: {fileID: 1889434021946074} m_IsPrefabParent: 1 +--- !u!1 &1002941015032580 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224424466063770242} + - component: {fileID: 223842615197851596} + - component: {fileID: 114137535134960880} + - component: {fileID: 114957169318180170} + m_Layer: 0 + m_Name: CameraUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &1207964487639616 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224828917623348380} + - component: {fileID: 222280648911112164} + - component: {fileID: 114108550545748738} + - component: {fileID: 114806494459964590} + m_Layer: 0 + m_Name: Panel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1374339161963754 GameObject: m_ObjectHideFlags: 0 @@ -28,6 +64,23 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 +--- !u!1 &1706951542144962 +GameObject: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + serializedVersion: 5 + m_Component: + - component: {fileID: 224003334026830312} + - component: {fileID: 222660614382546832} + - component: {fileID: 114826556738018834} + m_Layer: 0 + m_Name: Text + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 --- !u!1 &1889434021946074 GameObject: m_ObjectHideFlags: 0 @@ -38,7 +91,6 @@ GameObject: - component: {fileID: 4661043116803332} - component: {fileID: 20437103875467350} - component: {fileID: 124909405360866564} - - component: {fileID: 92524413853108834} - component: {fileID: 81070402336043930} - component: {fileID: 114214698486704570} - component: {fileID: 114503650767683602} @@ -75,15 +127,16 @@ Transform: m_PrefabParentObject: {fileID: 0} m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1889434021946074} - m_LocalRotation: {x: -0.18472917, y: 0.3749558, z: -0.07651737, w: -0.9052229} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 9, y: 3, z: -9} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4695271445839178} - {fileID: 4663376666333470} + - {fileID: 224424466063770242} m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 33.817, y: -139.944, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: -0, z: 0} --- !u!4 &4663376666333470 Transform: m_ObjectHideFlags: 1 @@ -145,7 +198,6 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 - m_StereoMirrorMode: 0 --- !u!20 &20960955616270498 Camera: m_ObjectHideFlags: 1 @@ -181,7 +233,6 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 - m_StereoMirrorMode: 0 --- !u!23 &23118308228354854 MeshRenderer: m_ObjectHideFlags: 1 @@ -191,6 +242,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -206,6 +258,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -240,13 +293,6 @@ AudioListener: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1889434021946074} m_Enabled: 0 ---- !u!92 &92524413853108834 -Behaviour: - m_ObjectHideFlags: 1 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 100100000} - m_GameObject: {fileID: 1889434021946074} - m_Enabled: 1 --- !u!108 &108796398514616960 Light: m_ObjectHideFlags: 1 @@ -283,6 +329,54 @@ Light: m_UseColorTemperature: 0 m_ShadowRadius: 0 m_ShadowAngle: 0 +--- !u!114 &114108550545748738 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1207964487639616} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: a3c9ba309d7999b489463b2ebe102c8b, type: 2} + m_Color: {r: 1, g: 1, b: 1, a: 0.392} + 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 +--- !u!114 &114137535134960880 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1002941015032580} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 0 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 800, y: 600} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 --- !u!114 &114214698486704570 MonoBehaviour: m_ObjectHideFlags: 1 @@ -294,7 +388,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5b4e3fd11940c1048a7e28e5dfc80560, type: 3} m_Name: m_EditorClassIdentifier: - mCamera: {fileID: 0} + cameraStatusText: {fileID: 114826556738018834} glowPrePassCamera: {fileID: 1374339161963754} --- !u!114 &114503650767683602 MonoBehaviour: @@ -348,6 +442,77 @@ MonoBehaviour: m_EditorClassIdentifier: glowShader: {fileID: 4800000, guid: 39d85d8c36c331e46af6e70a2b4e8d80, type: 3} blurShader: {fileID: 4800000, guid: f956270686a9d9e45bea04cd985135cc, type: 3} +--- !u!114 &114806494459964590 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1207964487639616} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Padding: + m_Left: 0 + m_Right: 0 + m_Top: 0 + m_Bottom: 0 + m_ChildAlignment: 0 + m_Spacing: 0 + m_ChildForceExpandWidth: 1 + m_ChildForceExpandHeight: 1 + m_ChildControlWidth: 1 + m_ChildControlHeight: 1 +--- !u!114 &114826556738018834 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1706951542144962} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 2100000, guid: a3c9ba309d7999b489463b2ebe102c8b, type: 2} + m_Color: {r: 0, g: 0, b: 0, 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_FontData: + m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} + m_FontSize: 14 + m_FontStyle: 0 + 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: Sample Text +--- !u!114 &114957169318180170 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1002941015032580} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 --- !u!124 &124909405360866564 Behaviour: m_ObjectHideFlags: 1 @@ -355,3 +520,91 @@ Behaviour: m_PrefabInternal: {fileID: 100100000} m_GameObject: {fileID: 1889434021946074} m_Enabled: 1 +--- !u!222 &222280648911112164 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1207964487639616} +--- !u!222 &222660614382546832 +CanvasRenderer: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1706951542144962} +--- !u!223 &223842615197851596 +Canvas: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1002941015032580} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 1 + m_Camera: {fileID: 20437103875467350} + m_PlaneDistance: 2 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_AdditionalShaderChannelsFlag: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!224 &224003334026830312 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1706951542144962} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -513.4081, y: 217.19734, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 224828917623348380} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -513.4081, y: 217.19734} + m_SizeDelta: {x: 160, y: 30} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224424466063770242 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1002941015032580} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 9} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 224828917623348380} + m_Father: {fileID: 4661043116803332} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!224 &224828917623348380 +RectTransform: + m_ObjectHideFlags: 1 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1207964487639616} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -15.300003, y: -16.099998, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 224003334026830312} + m_Father: {fileID: 224424466063770242} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -65.3, y: 33.9} + m_SizeDelta: {x: 130, y: 70} + m_Pivot: {x: 0.5, y: 0.5} diff --git a/Project Undercover/Assets/Scenes/GameScene.unity b/Project Undercover/Assets/Scenes/GameScene.unity index 9d9a530..04fb74a 100755 --- a/Project Undercover/Assets/Scenes/GameScene.unity +++ b/Project Undercover/Assets/Scenes/GameScene.unity @@ -77,15 +77,17 @@ LightmapSettings: m_PVRDirectSampleCount: 32 m_PVRSampleCount: 500 m_PVRBounces: 2 - m_PVRFiltering: 0 + m_PVRFilterTypeDirect: 0 + m_PVRFilterTypeIndirect: 0 + m_PVRFilterTypeAO: 0 m_PVRFilteringMode: 1 m_PVRCulling: 1 m_PVRFilteringGaussRadiusDirect: 1 m_PVRFilteringGaussRadiusIndirect: 5 m_PVRFilteringGaussRadiusAO: 2 - m_PVRFilteringAtrousColorSigma: 1 - m_PVRFilteringAtrousNormalSigma: 1 - m_PVRFilteringAtrousPositionSigma: 1 + m_PVRFilteringAtrousPositionSigmaDirect: 0.5 + m_PVRFilteringAtrousPositionSigmaIndirect: 2 + m_PVRFilteringAtrousPositionSigmaAO: 1 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 @@ -107,6 +109,8 @@ NavMeshSettings: manualTileSize: 0 tileSize: 256 accuratePlacement: 0 + debug: + m_Flags: 0 m_NavMeshData: {fileID: 23800000, guid: 81dcf7f0f9bbf8d489e54b8112156b28, type: 2} --- !u!1 &40329368 GameObject: @@ -142,7 +146,6 @@ MonoBehaviour: cameraRigPrefab: {fileID: 1009033979625728, guid: 1764211b5690c164d82aa46fa4ec707d, type: 2} numNpcs: 10 - guardCameraPanel: {fileID: 164040928} --- !u!4 &40329370 Transform: m_ObjectHideFlags: 0 @@ -154,8 +157,34 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 15 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &40329371 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 40329368} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} + m_Name: + m_EditorClassIdentifier: + ownerId: 0 + group: 0 + OwnerShipWasTransfered: 0 + prefixBackup: -1 + synchronization: 0 + onSerializeTransformOption: 3 + onSerializeRigidBodyOption: 2 + ownershipTransfer: 0 + ObservedComponents: + - {fileID: 0} + ObservedComponentsFoldoutOpen: 1 + viewIdField: 7 + instantiationId: 7 + currentMasterID: -1 + isRuntimeInstantiated: 0 --- !u!1 &61897354 GameObject: m_ObjectHideFlags: 0 @@ -223,7 +252,6 @@ Camera: m_OcclusionCulling: 1 m_StereoConvergence: 10 m_StereoSeparation: 0.022 - m_StereoMirrorMode: 0 --- !u!4 &61897358 Transform: m_ObjectHideFlags: 0 @@ -235,33 +263,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 26 + m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &40329371 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 40329368} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: aa584fbee541324448dd18d8409c7a41, type: 3} - m_Name: - m_EditorClassIdentifier: - ownerId: 0 - group: 0 - OwnerShipWasTransfered: 0 - prefixBackup: -1 - synchronization: 0 - onSerializeTransformOption: 3 - onSerializeRigidBodyOption: 2 - ownershipTransfer: 0 - ObservedComponents: [] - ObservedComponentsFoldoutOpen: 1 - viewIdField: 7 - instantiationId: 7 - currentMasterID: -1 - isRuntimeInstantiated: 0 --- !u!1 &81075120 GameObject: m_ObjectHideFlags: 0 @@ -302,6 +305,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -317,6 +321,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -371,6 +376,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -386,6 +392,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -424,7 +431,7 @@ Transform: m_LocalScale: {x: 20, y: 0.5, z: 20} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 19 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &119593627 GameObject: @@ -466,6 +473,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -481,6 +489,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -548,6 +557,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -563,6 +573,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -590,98 +601,6 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 120822015} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &164040928 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 164040929} - - component: {fileID: 164040932} - - component: {fileID: 164040931} - - component: {fileID: 164040930} - m_Layer: 5 - m_Name: CameraStatusPanel - m_TagString: GuardPanel - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!224 &164040929 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 164040928} - 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: 854709136} - m_Father: {fileID: 1184926818} - m_RootOrder: 4 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -50, y: 25} - m_SizeDelta: {x: 100, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &164040930 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 164040928} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1297475563, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Padding: - m_Left: 0 - m_Right: 0 - m_Top: 0 - m_Bottom: 0 - m_ChildAlignment: 0 - m_Spacing: 0 - m_ChildForceExpandWidth: 1 - m_ChildForceExpandHeight: 1 - m_ChildControlWidth: 1 - m_ChildControlHeight: 1 ---- !u!114 &164040931 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 164040928} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 0.392} - 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 ---- !u!222 &164040932 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 164040928} --- !u!1 &188709145 GameObject: m_ObjectHideFlags: 0 @@ -722,6 +641,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -737,6 +657,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -869,6 +790,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -884,6 +806,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -951,6 +874,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -966,6 +890,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -998,7 +923,7 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1569234902} m_Modifications: - target: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, type: 2} propertyPath: m_LocalPosition.x @@ -1014,11 +939,11 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, type: 2} propertyPath: m_LocalRotation.x - value: -0.18472917 + value: -0.18472919 objectReference: {fileID: 0} - target: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, type: 2} propertyPath: m_LocalRotation.y - value: 0.3749558 + value: 0.37495583 objectReference: {fileID: 0} - target: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, type: 2} propertyPath: m_LocalRotation.z @@ -1030,11 +955,11 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, type: 2} propertyPath: m_RootOrder - value: 5 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1889434021946074, guid: c67fa24334c0f364cad8798522e92116, type: 2} propertyPath: m_Name - value: Guard Camera 1 + value: West Hall objectReference: {fileID: 0} - target: {fileID: 20960955616270498, guid: c67fa24334c0f364cad8798522e92116, type: 2} @@ -1061,9 +986,57 @@ Prefab: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 224003334026830312, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224424466063770242, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224424466063770242, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224003334026830312, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224424466063770242, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + propertyPath: m_LocalPosition.z + value: 5.8550987 + objectReference: {fileID: 0} + - target: {fileID: 224828917623348380, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + propertyPath: m_LocalPosition.x + value: 462.7 + objectReference: {fileID: 0} + - target: {fileID: 224828917623348380, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + propertyPath: m_LocalPosition.y + value: -236.6 + objectReference: {fileID: 0} + - target: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, type: 2} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, type: 2} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: c67fa24334c0f364cad8798522e92116, type: 2} m_IsPrefabParent: 0 +--- !u!4 &220044988 stripped +Transform: + m_PrefabParentObject: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + m_PrefabInternal: {fileID: 220044987} --- !u!1 &245333018 GameObject: m_ObjectHideFlags: 0 @@ -1104,6 +1077,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1119,6 +1093,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -1177,7 +1152,7 @@ Transform: - {fileID: 422777569} - {fileID: 748159508} m_Father: {fileID: 0} - m_RootOrder: 22 + m_RootOrder: 20 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &275339324 GameObject: @@ -1219,6 +1194,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1234,6 +1210,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -1434,6 +1411,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1449,6 +1427,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -1720,7 +1699,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 25 + m_RootOrder: 23 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &324022483 GameObject: @@ -1762,6 +1741,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1777,6 +1757,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -1845,6 +1826,7 @@ MeshRenderer: m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1860,6 +1842,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -1927,6 +1910,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -1942,6 +1926,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -2050,6 +2035,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2065,6 +2051,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -2103,7 +2090,7 @@ Transform: m_LocalScale: {x: 2, y: 3, z: 0.5} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &678649002 GameObject: @@ -2132,6 +2119,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2147,6 +2135,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -2187,7 +2176,7 @@ Transform: m_LocalScale: {x: 3, y: 1, z: 5} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 12 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: -20} --- !u!1 &710257908 GameObject: @@ -2229,6 +2218,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2244,6 +2234,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -2363,7 +2354,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 828c2a73d6549534cb33b938c6964162, type: 3} m_Name: m_EditorClassIdentifier: - cameraStatusText: {fileID: 854709137} --- !u!4 &740274926 Transform: m_ObjectHideFlags: 0 @@ -2417,6 +2407,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2432,6 +2423,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -2500,6 +2492,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2515,6 +2508,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -2583,6 +2577,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2598,6 +2593,7 @@ MeshRenderer: m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -2669,6 +2665,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2684,6 +2681,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -2751,6 +2749,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2766,6 +2765,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -2833,6 +2833,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -2848,6 +2849,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -2875,80 +2877,6 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 825477183} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &854709135 -GameObject: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 - m_Component: - - component: {fileID: 854709136} - - component: {fileID: 854709138} - - component: {fileID: 854709137} - m_Layer: 5 - m_Name: CameraStatusText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &854709136 -RectTransform: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 854709135} - 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: 164040929} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 50, y: -25} - m_SizeDelta: {x: 100, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &854709137 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 854709135} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, 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_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI, - Version=1.0.0.0, Culture=neutral, PublicKeyToken=null - m_FontData: - m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0} - m_FontSize: 14 - m_FontStyle: 0 - 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: ---- !u!222 &854709138 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - m_GameObject: {fileID: 854709135} --- !u!1 &857845273 GameObject: m_ObjectHideFlags: 0 @@ -2989,6 +2917,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3004,6 +2933,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -3094,7 +3024,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 16 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &919019020 GameObject: @@ -3123,6 +3053,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3138,6 +3069,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -3176,7 +3108,7 @@ Transform: m_LocalScale: {x: 1.5, y: 1, z: 3} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &948654262 GameObject: @@ -3219,6 +3151,7 @@ MeshRenderer: m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3234,6 +3167,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -3301,6 +3235,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3316,6 +3251,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -3475,6 +3411,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3490,6 +3427,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -3522,7 +3460,7 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1569234902} m_Modifications: - target: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, type: 2} propertyPath: m_LocalPosition.x @@ -3554,11 +3492,11 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, type: 2} propertyPath: m_RootOrder - value: 7 + value: 1 objectReference: {fileID: 0} - target: {fileID: 1889434021946074, guid: c67fa24334c0f364cad8798522e92116, type: 2} propertyPath: m_Name - value: Guard Camera 2 + value: North Hall objectReference: {fileID: 0} - target: {fileID: 114503650767683602, guid: c67fa24334c0f364cad8798522e92116, type: 2} @@ -3619,9 +3557,57 @@ Prefab: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 224003334026830312, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224424466063770242, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224424466063770242, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224003334026830312, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 0} + propertyPath: m_Enabled + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 224424466063770242, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + propertyPath: m_LocalPosition.z + value: 1.412919 + objectReference: {fileID: 0} + - target: {fileID: 224828917623348380, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + propertyPath: m_LocalPosition.x + value: 462.7 + objectReference: {fileID: 0} + - target: {fileID: 224828917623348380, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + propertyPath: m_LocalPosition.y + value: -236.6 + objectReference: {fileID: 0} + - target: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, type: 2} + propertyPath: m_LocalScale.y + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: c67fa24334c0f364cad8798522e92116, type: 2} m_IsPrefabParent: 0 +--- !u!4 &1130209639 stripped +Transform: + m_PrefabParentObject: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + m_PrefabInternal: {fileID: 1130209638} --- !u!1 &1171927422 GameObject: m_ObjectHideFlags: 0 @@ -3662,6 +3648,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3677,6 +3664,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -3749,7 +3737,7 @@ Prefab: - target: {fileID: 224257512679546302, guid: 2e0806d99e91f374fb64a63401c2eb5d, type: 2} propertyPath: m_RootOrder - value: 10 + value: 8 objectReference: {fileID: 0} - target: {fileID: 224257512679546302, guid: 2e0806d99e91f374fb64a63401c2eb5d, type: 2} @@ -3867,11 +3855,6 @@ Prefab: m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: 2e0806d99e91f374fb64a63401c2eb5d, type: 2} m_IsPrefabParent: 0 ---- !u!224 &1184926818 stripped -RectTransform: - m_PrefabParentObject: {fileID: 224257512679546302, guid: 2e0806d99e91f374fb64a63401c2eb5d, - type: 2} - m_PrefabInternal: {fileID: 1184926817} --- !u!114 &1184926819 stripped MonoBehaviour: m_PrefabParentObject: {fileID: 114999102298893536, guid: 2e0806d99e91f374fb64a63401c2eb5d, @@ -3920,7 +3903,7 @@ Transform: - {fileID: 245333019} - {fileID: 1703113350} m_Father: {fileID: 0} - m_RootOrder: 24 + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1244254395 GameObject: @@ -3962,6 +3945,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -3977,6 +3961,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -4044,6 +4029,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4059,6 +4045,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -4113,6 +4100,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4128,6 +4116,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -4166,7 +4155,7 @@ Transform: m_LocalScale: {x: 0.5, y: 1, z: 0.5} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 18 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1337664802 GameObject: @@ -4208,6 +4197,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4223,6 +4213,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -4290,6 +4281,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4305,6 +4297,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -4337,7 +4330,7 @@ Prefab: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 1569234902} m_Modifications: - target: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, type: 2} propertyPath: m_LocalPosition.x @@ -4369,7 +4362,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, type: 2} propertyPath: m_RootOrder - value: 8 + value: 2 objectReference: {fileID: 0} - target: {fileID: 20437103875467350, guid: c67fa24334c0f364cad8798522e92116, type: 2} @@ -4378,7 +4371,7 @@ Prefab: objectReference: {fileID: 0} - target: {fileID: 1889434021946074, guid: c67fa24334c0f364cad8798522e92116, type: 2} propertyPath: m_Name - value: Guard Camera 3 + value: Lounge objectReference: {fileID: 0} - target: {fileID: 0} propertyPath: m_TargetTexture @@ -4414,9 +4407,57 @@ Prefab: propertyPath: m_Enabled value: 0 objectReference: {fileID: 0} + - target: {fileID: 224003334026830312, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224424466063770242, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224424466063770242, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224003334026830312, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 224424466063770242, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + propertyPath: m_LocalPosition.z + value: 5.723283 + objectReference: {fileID: 0} + - target: {fileID: 224828917623348380, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + propertyPath: m_LocalPosition.x + value: 462.7 + objectReference: {fileID: 0} + - target: {fileID: 224828917623348380, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + propertyPath: m_LocalPosition.y + value: -236.6 + objectReference: {fileID: 0} + - target: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, type: 2} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, type: 2} + propertyPath: m_LocalScale.z + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_ParentPrefab: {fileID: 100100000, guid: c67fa24334c0f364cad8798522e92116, type: 2} m_IsPrefabParent: 0 +--- !u!4 &1391762870 stripped +Transform: + m_PrefabParentObject: {fileID: 4661043116803332, guid: c67fa24334c0f364cad8798522e92116, + type: 2} + m_PrefabInternal: {fileID: 1391762869} --- !u!1 &1486219886 GameObject: m_ObjectHideFlags: 0 @@ -4444,6 +4485,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4459,6 +4501,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -4497,7 +4540,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 2} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 23 + m_RootOrder: 21 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1500738973 GameObject: @@ -4539,6 +4582,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4554,6 +4598,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -4581,6 +4626,37 @@ MeshFilter: m_PrefabInternal: {fileID: 0} m_GameObject: {fileID: 1500738973} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1569234901 +GameObject: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + serializedVersion: 5 + m_Component: + - component: {fileID: 1569234902} + m_Layer: 0 + m_Name: GuardCameras + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1569234902 +Transform: + m_ObjectHideFlags: 0 + m_PrefabParentObject: {fileID: 0} + m_PrefabInternal: {fileID: 0} + m_GameObject: {fileID: 1569234901} + 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: 220044988} + - {fileID: 1130209639} + - {fileID: 1391762870} + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1572730681 GameObject: m_ObjectHideFlags: 0 @@ -4644,7 +4720,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 17 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &1607716621 GameObject: @@ -4673,6 +4749,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4688,6 +4765,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -4726,7 +4804,7 @@ Transform: m_LocalScale: {x: 5, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1622088805 GameObject: @@ -4769,6 +4847,7 @@ MeshRenderer: m_Enabled: 0 m_CastShadows: 0 m_ReceiveShadows: 0 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4784,6 +4863,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -4852,7 +4932,7 @@ Transform: - {fileID: 1337664803} - {fileID: 1171927423} m_Father: {fileID: 0} - m_RootOrder: 21 + m_RootOrder: 19 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1694395104 GameObject: @@ -4894,6 +4974,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4909,6 +4990,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -4976,6 +5058,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -4991,6 +5074,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -5059,6 +5143,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5074,6 +5159,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -5214,6 +5300,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5229,6 +5316,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -5296,6 +5384,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5311,6 +5400,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -5498,7 +5588,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!84 &1979078171 RenderTexture: @@ -5632,6 +5722,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5647,6 +5738,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -5701,6 +5793,7 @@ MeshRenderer: m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 + m_DynamicOccludee: 1 m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 @@ -5716,6 +5809,7 @@ MeshRenderer: m_PreserveUVs: 1 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 + m_StitchLightmapSeams: 0 m_SelectedEditorRenderState: 3 m_MinimumChartSize: 4 m_AutoUVMaxDistance: 0.5 @@ -5754,7 +5848,7 @@ Transform: m_LocalScale: {x: 20, y: 0.1, z: 20} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 20 + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2120177222 GameObject: @@ -5783,5 +5877,5 @@ Transform: m_Children: - {fileID: 751788724} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Project Undercover/Assets/Scripts/Guard/GuardCamera.cs b/Project Undercover/Assets/Scripts/Guard/GuardCamera.cs index 27cd48b..c61a337 100755 --- a/Project Undercover/Assets/Scripts/Guard/GuardCamera.cs +++ b/Project Undercover/Assets/Scripts/Guard/GuardCamera.cs @@ -1,10 +1,22 @@ using System.Collections.Generic; using UnityEngine; +using UnityEngine.UI; public class GuardCamera : Photon.PunBehaviour { - public Camera mCamera; + const string AVAILABLE_TEXT = "(Available)"; + const string IN_CONTROL_TEXT = "(In-Control)"; + const string LOCKED_TEXT = "(Locked)"; + Color AVAILABLE_COLOR = Color.black; + Color IN_CONTROL_COLOR = Color.black; + Color LOCKED_COLOR = Color.red; + + public Text cameraStatusText; + + public Camera Camera { get { return mCamera; } } + + private Camera mCamera; private Light mSpotlight; private AudioListener mListener; @@ -39,6 +51,9 @@ public class GuardCamera : Photon.PunBehaviour { // Initialize empty player queue mPlayers = new List(); + + // Set the camera status text/color. + UpdateCameraText(); } void Update() @@ -138,6 +153,32 @@ public class GuardCamera : Photon.PunBehaviour { photonView.RPC("UpdateRotation", PhotonTargets.Others, this.xRotation, this.yRotation); } + /** + * Set the text in the bottom-right corner, denoting the lock-status of the Camera. + */ + void UpdateCameraText() + { + // First set the camera name + cameraStatusText.text = this.gameObject.name + "\n"; + + // Then set the status text + if (mPlayers.Count == 0) + { + cameraStatusText.text += AVAILABLE_TEXT; + cameraStatusText.color = AVAILABLE_COLOR; + } + else if (InControl()) + { + cameraStatusText.text += IN_CONTROL_TEXT; + cameraStatusText.color = IN_CONTROL_COLOR; + } + else + { + cameraStatusText.text += LOCKED_TEXT; + cameraStatusText.color = LOCKED_COLOR; + } + } + /* * Called via RPC to add a player to this camera. */ @@ -149,6 +190,9 @@ public class GuardCamera : Photon.PunBehaviour { // Because there is now a player, make sure the spotlight is on. mSpotlight.enabled = true; + + // Update camera text as necessary. + UpdateCameraText(); } /* @@ -165,6 +209,9 @@ public class GuardCamera : Photon.PunBehaviour { { mSpotlight.enabled = false; } + + // Update camera text as necessary. + UpdateCameraText(); } /** diff --git a/Project Undercover/Assets/Scripts/Guard/GuardController.cs b/Project Undercover/Assets/Scripts/Guard/GuardController.cs index a20ea08..473e4b5 100755 --- a/Project Undercover/Assets/Scripts/Guard/GuardController.cs +++ b/Project Undercover/Assets/Scripts/Guard/GuardController.cs @@ -4,8 +4,6 @@ using UnityEngine.UI; public class GuardController : Photon.PunBehaviour { - public Text cameraStatusText; - const float CAMERA_SENSITIVITY = 120.0f; private int mCurrentCamera; // -1 means preview mode @@ -69,24 +67,6 @@ public class GuardController : Photon.PunBehaviour { } } - /** - * Set the text in the bottom-right corner, denoting if the camera is locked. - */ - void SetCameraText() - { - // TODO - GuardCamera should be responsible for text. - // Each GuardCamera should display its name in colored text. - // Red denotes that it is owned by another player, Green denotes free. - if (mInControl) - { - cameraStatusText.text = "In-Control"; - } - else - { - cameraStatusText.text = "Locked"; - } - } - /** * Cycle the player to a specific camera, or just the next one. */ @@ -109,7 +89,6 @@ public class GuardController : Photon.PunBehaviour { // Determine if we are in control. mInControl = mCameras[mCurrentCamera].InControl(); - SetCameraText(); } GuardCamera GetCurrentGuardCamera() @@ -176,13 +155,12 @@ public class GuardController : Photon.PunBehaviour { if (newInControl != mInControl) { mInControl = newInControl; - SetCameraText(); } if (Input.GetButtonDown("Fire1")) { RaycastHit hit; - Ray ray = GetCurrentGuardCamera().mCamera.ScreenPointToRay(Input.mousePosition); + Ray ray = GetCurrentGuardCamera().Camera.ScreenPointToRay(Input.mousePosition); if (Physics.Raycast(ray, out hit, 100.0f)) { diff --git a/Project Undercover/Assets/Scripts/Lobby/GameManager.cs b/Project Undercover/Assets/Scripts/Lobby/GameManager.cs index 92aab32..81f90cb 100644 --- a/Project Undercover/Assets/Scripts/Lobby/GameManager.cs +++ b/Project Undercover/Assets/Scripts/Lobby/GameManager.cs @@ -9,7 +9,6 @@ public class GameManager : Photon.PunBehaviour { public GameObject guardController; public GameObject spyPrefab, NPCPrefab, cameraRigPrefab; public int numNpcs = 9; - public GameObject guardCameraPanel; private static GameManager _activeManager = null; public override void OnLeftRoom() @@ -53,7 +52,6 @@ public class GameManager : Photon.PunBehaviour { if (PersistantPlayerSettings.character == PersistantPlayerSettings.Character.Guard) { guardController.SetActive(true); - guardCameraPanel.SetActive(true); //guardPanel.SetActive(true); } else diff --git a/Project Undercover/Assets/Shaders/Default_OverlayNoZTest.shader b/Project Undercover/Assets/Shaders/Default_OverlayNoZTest.shader new file mode 100755 index 0000000..c58b4d3 --- /dev/null +++ b/Project Undercover/Assets/Shaders/Default_OverlayNoZTest.shader @@ -0,0 +1,93 @@ +// Upgrade NOTE: replaced 'mul(UNITY_MATRIX_MVP,*)' with 'UnityObjectToClipPos(*)' + +Shader "UI/Default_OverlayNoZTest" + { + Properties + { + [PerRendererData] _MainTex ("Sprite Texture", 2D) = "white" {} + _Color ("Tint", Color) = (1,1,1,1) + + _StencilComp ("Stencil Comparison", Float) = 8 + _Stencil ("Stencil ID", Float) = 0 + _StencilOp ("Stencil Operation", Float) = 0 + _StencilWriteMask ("Stencil Write Mask", Float) = 255 + _StencilReadMask ("Stencil Read Mask", Float) = 255 + + _ColorMask ("Color Mask", Float) = 15 + } + + SubShader + { + Tags + { + "Queue"="Overlay" + "IgnoreProjector"="True" + "RenderType"="Transparent" + "PreviewType"="Plane" + "CanUseSpriteAtlas"="True" + } + + Stencil + { + Ref [_Stencil] + Comp [_StencilComp] + Pass [_StencilOp] + ReadMask [_StencilReadMask] + WriteMask [_StencilWriteMask] + } + + Cull Off + Lighting Off + ZWrite Off + ZTest Off + Blend SrcAlpha OneMinusSrcAlpha + ColorMask [_ColorMask] + + Pass + { + CGPROGRAM + #pragma vertex vert + #pragma fragment frag + #include "UnityCG.cginc" + + struct appdata_t + { + float4 vertex : POSITION; + float4 color : COLOR; + float2 texcoord : TEXCOORD0; + }; + + struct v2f + { + float4 vertex : SV_POSITION; + fixed4 color : COLOR; + half2 texcoord : TEXCOORD0; + }; + + fixed4 _Color; + fixed4 _TextureSampleAdd; //Added for font color support + + v2f vert(appdata_t IN) + { + v2f OUT; + OUT.vertex = UnityObjectToClipPos(IN.vertex); + OUT.texcoord = IN.texcoord; + #ifdef UNITY_HALF_TEXEL_OFFSET + OUT.vertex.xy += (_ScreenParams.zw-1.0)*float2(-1,1); + #endif + OUT.color = IN.color * _Color; + return OUT; + } + + sampler2D _MainTex; + + fixed4 frag(v2f IN) : SV_Target + { + half4 color = (tex2D(_MainTex, IN.texcoord) + _TextureSampleAdd) * IN.color; //Added for font color support + clip (color.a - 0.01); + return color; + } + ENDCG + } + } + } \ No newline at end of file diff --git a/Project Undercover/Assets/Shaders/Default_OverlayNoZTest.shader.meta b/Project Undercover/Assets/Shaders/Default_OverlayNoZTest.shader.meta new file mode 100755 index 0000000..b5590ca --- /dev/null +++ b/Project Undercover/Assets/Shaders/Default_OverlayNoZTest.shader.meta @@ -0,0 +1,10 @@ +fileFormatVersion: 2 +guid: a0427fb9da4c72a418dc62beaf086294 +timeCreated: 1511750787 +licenseType: Free +ShaderImporter: + externalObjects: {} + defaultTextures: [] + userData: + assetBundleName: + assetBundleVariant: diff --git a/Project Undercover/ProjectSettings/ProjectSettings.asset b/Project Undercover/ProjectSettings/ProjectSettings.asset index 8bb7197..37676ab 100755 --- a/Project Undercover/ProjectSettings/ProjectSettings.asset +++ b/Project Undercover/ProjectSettings/ProjectSettings.asset @@ -3,9 +3,10 @@ --- !u!129 &1 PlayerSettings: m_ObjectHideFlags: 0 - serializedVersion: 12 + serializedVersion: 13 productGUID: 76402d7a02fa81c4db5a1e750e046c1d AndroidProfiler: 0 + AndroidFilterTouchesWhenObscured: 0 defaultScreenOrientation: 4 targetDevice: 2 useOnDemandResources: 0 @@ -38,8 +39,6 @@ PlayerSettings: width: 1 height: 1 m_SplashScreenLogos: [] - m_SplashScreenBackgroundLandscape: {fileID: 0} - m_SplashScreenBackgroundPortrait: {fileID: 0} m_VirtualRealitySplashScreen: {fileID: 0} m_HolographicTrackingLossScreen: {fileID: 0} defaultScreenWidth: 1024 @@ -49,7 +48,6 @@ PlayerSettings: m_StereoRenderingPath: 0 m_ActiveColorSpace: 0 m_MTRendering: 1 - m_MobileMTRendering: 0 m_StackTraceTypes: 010000000100000001000000010000000100000001000000 iosShowActivityIndicatorOnLoading: -1 androidShowActivityIndicatorOnLoading: -1 @@ -64,8 +62,10 @@ PlayerSettings: useOSAutorotation: 1 use32BitDisplayBuffer: 1 disableDepthAndStencilBuffers: 0 + androidBlitType: 0 defaultIsFullScreen: 1 defaultIsNativeResolution: 1 + macRetinaSupport: 1 runInBackground: 0 captureSingleScreen: 0 muteOtherAudioSources: 0 @@ -95,6 +95,7 @@ PlayerSettings: xboxEnableHeadOrientation: 0 xboxEnableGuest: 0 xboxEnablePIXSampling: 0 + metalFramebufferOnly: 0 n3dsDisableStereoscopicView: 0 n3dsEnableSharedListOpt: 1 n3dsEnableVSync: 0 @@ -103,6 +104,7 @@ PlayerSettings: xboxOneMonoLoggingLevel: 0 xboxOneLoggingLevel: 1 xboxOneDisableEsram: 0 + xboxOnePresentImmediateThreshold: 0 videoMemoryForVertexBuffers: 0 psp2PowerMode: 0 psp2AcquireBGM: 1 @@ -134,12 +136,17 @@ PlayerSettings: daydream: depthFormat: 0 useSustainedPerformanceMode: 0 + enableVideoLayer: 0 + useProtectedVideoMemory: 0 hololens: depthFormat: 1 protectGraphicsMemory: 0 useHDRDisplay: 0 + m_ColorGamuts: 00000000 targetPixelDensity: 0 resolutionScalingMode: 0 + androidSupportedAspectRatio: 1 + androidMaxAspectRatio: 2.1 applicationIdentifier: {} buildNumber: {} AndroidBundleVersionCode: 1 @@ -160,10 +167,10 @@ PlayerSettings: serializedVersion: 2 m_Bits: 238 iPhoneSdkVersion: 988 - iOSTargetOSVersionString: + iOSTargetOSVersionString: 7.0 tvOSSdkVersion: 0 tvOSRequireExtendedGameController: 0 - tvOSTargetOSVersionString: + tvOSTargetOSVersionString: 9.0 uIPrerenderedIcon: 0 uIRequiresPersistentWiFi: 0 uIRequiresFullScreen: 1 @@ -220,7 +227,9 @@ PlayerSettings: AndroidKeyaliasName: AndroidTVCompatibility: 1 AndroidIsGame: 1 + AndroidEnableTango: 0 androidEnableBanner: 1 + androidUseLowAccuracyLocation: 0 m_AndroidBanners: - width: 320 height: 180 @@ -231,10 +240,14 @@ PlayerSettings: m_BuildTargetBatching: [] m_BuildTargetGraphicsAPIs: [] m_BuildTargetVRSettings: [] + m_BuildTargetEnableVuforiaSettings: [] openGLRequireES31: 0 openGLRequireES31AEP: 0 - webPlayerTemplate: APPLICATION:Default m_TemplateCustomTags: {} + mobileMTRendering: + Android: 1 + iPhone: 1 + tvOS: 1 wiiUTitleID: 0005000011000000 wiiUGroupID: 00010000 wiiUCommonSaveSize: 4096 diff --git a/Project Undercover/ProjectSettings/ProjectVersion.txt b/Project Undercover/ProjectSettings/ProjectVersion.txt index a211ccd..7a6fffb 100644 --- a/Project Undercover/ProjectSettings/ProjectVersion.txt +++ b/Project Undercover/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2017.1.1f1 +m_EditorVersion: 2017.2.0f3