diff --git a/Assets/BlenderModels/SmallWindowWall.blend b/Assets/BlenderModels/SmallWindowWall.blend index 0e7caea1..5b148248 100644 Binary files a/Assets/BlenderModels/SmallWindowWall.blend and b/Assets/BlenderModels/SmallWindowWall.blend differ diff --git a/Assets/BlenderModels/SmallWindowWall.blend1 b/Assets/BlenderModels/SmallWindowWall.blend1 index 52ca176b..0e7caea1 100644 Binary files a/Assets/BlenderModels/SmallWindowWall.blend1 and b/Assets/BlenderModels/SmallWindowWall.blend1 differ diff --git a/Assets/Materials/MiniMapPlayer.mat b/Assets/Materials/MiniMapPlayer.mat new file mode 100644 index 00000000..f0deecd0 --- /dev/null +++ b/Assets/Materials/MiniMapPlayer.mat @@ -0,0 +1,136 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MiniMapPlayer + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: + - MOTIONVECTORS + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: cd9c04c78aec4b848a49a0e50719ca3f, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _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: 0} + 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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AddPrecomputedVelocity: 0 + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 0.9764706, b: 0, a: 1} + - _Color: {r: 1, g: 0.97647053, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} + m_BuildTextureStacks: [] + m_AllowLocking: 1 +--- !u!114 &4824553479970619922 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 9 diff --git a/Assets/Materials/MiniMapPlayer.mat.meta b/Assets/Materials/MiniMapPlayer.mat.meta new file mode 100644 index 00000000..ae4e6eb9 --- /dev/null +++ b/Assets/Materials/MiniMapPlayer.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c1fd45e2ba20ac044b335abfe08f670e +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Materials/Store.mat b/Assets/Materials/Store.mat index a99dfd84..0436a89e 100644 --- a/Assets/Materials/Store.mat +++ b/Assets/Materials/Store.mat @@ -50,7 +50,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 2800000, guid: cd9c04c78aec4b848a49a0e50719ca3f, type: 3} + m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: @@ -83,6 +83,7 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - _AddPrecomputedVelocity: 0 - _AlphaClip: 0 - _AlphaToMask: 0 - _Blend: 0 diff --git a/Assets/Resources/WayPointSign.prefab b/Assets/Resources/WayPointSign.prefab index fd23122c..224297ee 100644 --- a/Assets/Resources/WayPointSign.prefab +++ b/Assets/Resources/WayPointSign.prefab @@ -11,7 +11,7 @@ GameObject: - component: {fileID: 3948087370635043577} - component: {fileID: 7420742204238459125} - component: {fileID: 2894253145962193840} - m_Layer: 0 + m_Layer: 5 m_Name: Particles m_TagString: Untagged m_Icon: {fileID: 0} @@ -4900,7 +4900,7 @@ GameObject: m_Component: - component: {fileID: 5837907904023371798} - component: {fileID: 1382740785751171219} - m_Layer: 0 + m_Layer: 5 m_Name: WayPointSign m_TagString: Untagged m_Icon: {fileID: 0} diff --git a/Assets/Scenes/City.unity b/Assets/Scenes/City.unity index 80fb8207..f6153f98 100644 --- a/Assets/Scenes/City.unity +++ b/Assets/Scenes/City.unity @@ -1868,7 +1868,7 @@ GameObject: - component: {fileID: 311736550} - component: {fileID: 311736549} m_Layer: 5 - m_Name: UISystem + m_Name: HUD m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -1889,6 +1889,7 @@ RectTransform: - {fileID: 1803835668} - {fileID: 661798881} - {fileID: 549385893} + - {fileID: 696871957} m_Father: {fileID: 495189437} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -3643,7 +3644,7 @@ GameObject: m_Component: - component: {fileID: 685159828} - component: {fileID: 685159830} - - component: {fileID: 685159829} + - component: {fileID: 685159831} m_Layer: 0 m_Name: EventSystem m_TagString: Untagged @@ -3666,26 +3667,6 @@ Transform: m_Children: [] m_Father: {fileID: 495189437} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!114 &685159829 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 685159827} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3} - m_Name: - m_EditorClassIdentifier: - m_SendPointerHoverToParent: 1 - m_HorizontalAxis: Horizontal - m_VerticalAxis: Vertical - m_SubmitButton: Submit - m_CancelButton: Cancel - m_InputActionsPerSecond: 10 - m_RepeatDelay: 0.5 - m_ForceModuleActive: 0 --- !u!114 &685159830 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3701,6 +3682,119 @@ MonoBehaviour: m_FirstSelected: {fileID: 0} m_sendNavigationEvents: 1 m_DragThreshold: 10 +--- !u!114 &685159831 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 685159827} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 01614664b831546d2ae94a42149d80ac, type: 3} + m_Name: + m_EditorClassIdentifier: + m_SendPointerHoverToParent: 1 + m_MoveRepeatDelay: 0.5 + m_MoveRepeatRate: 0.1 + m_XRTrackingOrigin: {fileID: 0} + m_ActionsAsset: {fileID: -944628639613478452, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_PointAction: {fileID: -1654692200621890270, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MoveAction: {fileID: -8784545083839296357, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_SubmitAction: {fileID: 392368643174621059, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_CancelAction: {fileID: 7727032971491509709, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_LeftClickAction: {fileID: 3001919216989983466, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_MiddleClickAction: {fileID: -2185481485913320682, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_RightClickAction: {fileID: -4090225696740746782, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_ScrollWheelAction: {fileID: 6240969308177333660, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDevicePositionAction: {fileID: 6564999863303420839, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_TrackedDeviceOrientationAction: {fileID: 7970375526676320489, guid: ca9f5fa95ffab41fb9a615ab714db018, + type: 3} + m_DeselectOnBackgroundClick: 1 + m_PointerBehavior: 0 + m_CursorLockBehavior: 0 +--- !u!1 &696871956 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 696871957} + - component: {fileID: 696871959} + - component: {fileID: 696871958} + m_Layer: 5 + m_Name: MiniMap + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &696871957 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 696871956} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 311736548} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -220, y: 150} + m_SizeDelta: {x: 250, y: 250} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &696871958 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 696871956} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 8400000, guid: da3a3810115bd6549964b40675e0a337, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 +--- !u!222 &696871959 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 696871956} + m_CullTransparentMesh: 1 --- !u!1 &705618095 GameObject: m_ObjectHideFlags: 0 @@ -4128,7 +4222,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 749553635} serializedVersion: 2 - m_LocalRotation: {x: 0.38268346, y: -0.000000022481213, z: 0.000000009312023, w: 0.92387956} + m_LocalRotation: {x: 0.38268346, y: 0.000000022481224, z: -0.0000000093120285, w: 0.92387956} m_LocalPosition: {x: 29.11, y: 5, z: -5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -4260,7 +4354,7 @@ Camera: m_Depth: -1 m_CullingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 127 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 @@ -4280,6 +4374,56 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 10760883169552622, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 93178573295783447, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 209559121937223116, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 243084749019352060, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 330568144128246382, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 548045960940999900, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 559823762142242719, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 573921972654186634, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 615069448452942548, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 655190636299885247, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 662032107352504808, guid: 7df4c91b7961f794da5a651e64cc8ac5, type: 3} propertyPath: m_LocalPosition.x @@ -4330,11 +4474,676 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: 763479229171045715, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1017051862848702307, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1086514476905341518, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1167066362511717000, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1323964028176958940, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1332406392312436281, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1759942533895432911, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1835486059685082202, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1936235667841449662, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 1997390489231530206, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2003950193755741865, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2016990356491837230, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2027716214136687340, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2064402323250816201, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2111883155696172931, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2113435336079078311, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2165455232134592573, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2176694931432669071, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2255255102753605985, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2436559101500869421, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2447104937151494907, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2561327136968088111, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2573071155057218614, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2616487534120061813, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2660660418787948591, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2792397350651544102, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2856142447149819295, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2934453509965697972, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2990528000800277753, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3039411264453872768, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3061582835085647322, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3073893219652171185, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3081259441903078672, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3259161474028090519, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3363723783725295325, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3409330991441123695, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3412798742846051526, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3506309032200660460, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3617197023000992383, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3664628558661405630, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3675515642268221036, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3871013373410243784, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 3880350816662069707, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4133562785665604466, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4184462675388145370, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4184462675934182969, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4184462677020188395, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4249492388215523543, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4249763876899534331, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4249862661275573503, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4250101397140006059, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4250149361047672625, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4250191861435906125, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4250208009873296871, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4250434976706998121, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4250511634248650113, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4287318765223297002, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4349311165495564688, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4510931064713359516, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4537264568122387046, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4544588511124483254, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4621211101125863370, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4621297961093893584, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4658200331783926262, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4772086061587673988, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4811695334553244130, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4845803895028915578, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4969827166930589989, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 4995141907451358498, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5042211038295542247, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5045753633511562413, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5215005749940560213, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5219063316295058752, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5280816860339018031, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5286551128914886795, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5437460437420272161, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5516205509838577389, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5574166969978606567, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5633058937058502423, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5682377925295834360, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5864743624213070464, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5885584489349813034, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 5929931109234397854, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6002819599954878175, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6120898541114808378, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6138250558015678310, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6220470860270375357, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6398099575428661966, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6414349481876491312, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6703616159416560561, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6703698862240608615, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6703735801000730139, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6703791080967029501, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6703970168849431209, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6704157189045556141, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6704443692931034753, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6705608074299534295, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6705673876310264127, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6736002469212041990, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6764952451205093487, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6764952451749984396, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6764952452291115197, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6774985292240149075, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6810674328920706423, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6813844632189040214, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6822005137393519707, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6895241095966184947, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6933052437223473609, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 6998130483208131990, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7010921864665414699, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7053079728534587540, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7107084066526072989, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7178387769998921485, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7240057627988454241, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7328272492229944516, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7344978190454115968, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7470795002867464833, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7703654931726144970, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7789613548807319235, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7848333295053290576, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7852558124330112248, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 7877470637868688317, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8497920195681757202, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8519650095246833445, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8629321743942702302, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} - target: {fileID: 8759329460999808753, guid: 7df4c91b7961f794da5a651e64cc8ac5, type: 3} propertyPath: m_Name value: OfficeWorkerTable objectReference: {fileID: 0} + - target: {fileID: 8787785678748093523, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8838222967110587889, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8844269506503481813, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8921674760253467834, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8939091936951056760, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 8952229028521179391, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 9059909862935613207, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 9065483089977305194, guid: 7df4c91b7961f794da5a651e64cc8ac5, + type: 3} + propertyPath: m_Layer + value: 6 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] @@ -4728,7 +5537,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 835327588} serializedVersion: 2 - m_LocalRotation: {x: 0.38268346, y: -0.000000022481213, z: 0.000000009312023, w: 0.92387956} + m_LocalRotation: {x: 0.38268346, y: 0.000000022481224, z: -0.0000000093120285, w: 0.92387956} m_LocalPosition: {x: 29.11, y: 5, z: -5} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -5246,6 +6055,12 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 953289704} m_Mesh: {fileID: 6966450866789282503, guid: b012bf224421b074fbc3ee5693d35ddc, type: 3} +--- !u!4 &959365028 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3284961431740112560, guid: c0021857f236ae341a3c917b9da4dfaf, + type: 3} + m_PrefabInstance: {fileID: 1291994925} + m_PrefabAsset: {fileID: 0} --- !u!1 &1003929998 GameObject: m_ObjectHideFlags: 0 @@ -5588,6 +6403,113 @@ GameObject: type: 3} m_PrefabInstance: {fileID: 1932383618} m_PrefabAsset: {fileID: 0} +--- !u!1 &1112075238 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1112075239} + - component: {fileID: 1112075242} + - component: {fileID: 1112075241} + - component: {fileID: 1112075240} + m_Layer: 7 + m_Name: MiniMapSign + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1112075239 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1112075238} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 1, z: 0} + m_LocalScale: {x: 2, y: 2, z: 2} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 959365028} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!135 &1112075240 +SphereCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1112075238} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 0 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Radius: 0.5 + m_Center: {x: 0, y: 0, z: 0} +--- !u!23 &1112075241 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1112075238} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: c1fd45e2ba20ac044b335abfe08f670e, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1112075242 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1112075238} + m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0} --- !u!1001 &1132079549 PrefabInstance: m_ObjectHideFlags: 0 @@ -6179,7 +7101,11 @@ PrefabInstance: m_RemovedComponents: - {fileID: 3658533965490984325, guid: c0021857f236ae341a3c917b9da4dfaf, type: 3} m_RemovedGameObjects: [] - m_AddedGameObjects: [] + m_AddedGameObjects: + - targetCorrespondingSourceObject: {fileID: 3284961431740112560, guid: c0021857f236ae341a3c917b9da4dfaf, + type: 3} + insertIndex: -1 + addedObject: {fileID: 1112075239} m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c0021857f236ae341a3c917b9da4dfaf, type: 3} --- !u!1 &1305860724 @@ -7215,6 +8141,147 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1593401351} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1 &1598414010 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1598414014} + - component: {fileID: 1598414013} + - component: {fileID: 1598414011} + - component: {fileID: 1598414015} + m_Layer: 0 + m_Name: MiniMapCamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &1598414011 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1598414010} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3} + m_Name: + m_EditorClassIdentifier: + m_RenderShadows: 1 + m_RequiresDepthTextureOption: 2 + m_RequiresOpaqueTextureOption: 2 + m_CameraType: 0 + m_Cameras: [] + m_RendererIndex: -1 + m_VolumeLayerMask: + serializedVersion: 2 + m_Bits: 1 + m_VolumeTrigger: {fileID: 0} + m_VolumeFrameworkUpdateModeOption: 2 + m_RenderPostProcessing: 0 + m_Antialiasing: 0 + m_AntialiasingQuality: 2 + m_StopNaN: 0 + m_Dithering: 0 + m_ClearDepth: 1 + m_AllowXRRendering: 1 + m_AllowHDROutput: 1 + m_UseScreenCoordOverride: 0 + m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0} + m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0} + m_RequiresDepthTexture: 0 + m_RequiresColorTexture: 0 + m_Version: 2 + m_TaaSettings: + quality: 3 + frameInfluence: 0.1 + jitterScale: 1 + mipBias: 0 + varianceClampScale: 0.9 + contrastAdaptiveSharpening: 0 +--- !u!20 &1598414013 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1598414010} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_Iso: 200 + m_ShutterSpeed: 0.005 + m_Aperture: 16 + m_FocusDistance: 10 + m_FocalLength: 50 + m_BladeCount: 5 + m_Curvature: {x: 2, y: 11} + m_BarrelClipping: 0.25 + m_Anamorphism: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 15 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 217 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 8400000, guid: da3a3810115bd6549964b40675e0a337, type: 2} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!4 &1598414014 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1598414010} + serializedVersion: 2 + m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5} + m_LocalPosition: {x: 148.4, y: 30, z: 243.6} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 90, y: 90, z: 0} +--- !u!114 &1598414015 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1598414010} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6e81c6202b4f1294cb16972d7a25eeb8, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1 &1638430361 GameObject: m_ObjectHideFlags: 0 @@ -8912,6 +9979,7 @@ SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 554572622} + - {fileID: 1598414014} - {fileID: 271108798} - {fileID: 464115413} - {fileID: 1455074789} diff --git a/Assets/Scripts/Managers/CameraPlayerFollow.cs b/Assets/Scripts/Managers/CameraPlayerFollow.cs index 8a66bb28..b780519f 100644 --- a/Assets/Scripts/Managers/CameraPlayerFollow.cs +++ b/Assets/Scripts/Managers/CameraPlayerFollow.cs @@ -2,44 +2,11 @@ using UnityEngine; public class CameraPlayerFollow : MonoBehaviour { - private Vector3 _cameraOffset; - - private Transform _obstruction; - - [SerializeField] - [Range(0.01f, 1.0f)] - private float _smoothFactor = 0.5f; - // Start is called before the first frame update - void Start() - { - _obstruction = null; - _cameraOffset = transform.position - Player.Instance.transform.position; - // .LookAt(_player); - } + private Vector3 _cameraOffset = new(0, 15, 0); void LateUpdate() { - Vector3 newPosition = Player.Instance.transform.position + _cameraOffset; - - transform.position = Vector3.Slerp(transform.position, newPosition, _smoothFactor); - ViewObstructed(); - } - - private void ViewObstructed() - { - RaycastHit hit; - if (Physics.Raycast(transform.position, Player.Instance.transform.position - transform.position, out hit, 3.5f)) - { - if (hit.collider.gameObject.tag != "Player") - { - _obstruction = hit.transform; - _obstruction.gameObject.GetComponent().shadowCastingMode = UnityEngine.Rendering.ShadowCastingMode.ShadowsOnly; - } - } - else if (_obstruction != null) - { - _obstruction.gameObject.GetComponent().shadowCastingMode = UnityEngine.Rendering.ShadowCastingMode.On; - _obstruction = null; - } + Vector3 newPosition = + transform.position = Player.Instance.transform.position + _cameraOffset; } } diff --git a/Assets/Textures/MinimapRenderTexture.renderTexture b/Assets/Textures/MinimapRenderTexture.renderTexture new file mode 100644 index 00000000..cda7ce1c --- /dev/null +++ b/Assets/Textures/MinimapRenderTexture.renderTexture @@ -0,0 +1,39 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!84 &8400000 +RenderTexture: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: MinimapRenderTexture + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_IsAlphaChannelOptional: 0 + serializedVersion: 6 + m_Width: 256 + m_Height: 256 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthStencilFormat: 0 + m_ColorFormat: 8 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_UseDynamicScaleExplicit: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + m_EnableRandomWrite: 0 + m_TextureSettings: + serializedVersion: 2 + m_FilterMode: 1 + m_Aniso: 0 + m_MipBias: 0 + m_WrapU: 1 + m_WrapV: 1 + m_WrapW: 1 + m_Dimension: 2 + m_VolumeDepth: 1 + m_ShadowSamplingMode: 2 diff --git a/Assets/Textures/MinimapRenderTexture.renderTexture.meta b/Assets/Textures/MinimapRenderTexture.renderTexture.meta new file mode 100644 index 00000000..2dab490d --- /dev/null +++ b/Assets/Textures/MinimapRenderTexture.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: da3a3810115bd6549964b40675e0a337 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index fdd14bc6..9ab871a7 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -13,7 +13,7 @@ TagManager: - Water - UI - Selectable - - + - MiniMap - - -