From 4803a945645c8c295c8ea25f1e56de9bd1070fe8 Mon Sep 17 00:00:00 2001 From: Taliayaya Date: Sat, 5 Aug 2023 21:56:44 +0200 Subject: [PATCH] scavenger and Keybinds.asset --- Assets/Resources/Prefabs/Scavenger.prefab | 708 ++++++------------ .../ScriptableObjects/Tutorial/Keybinds.asset | 6 + Assets/ZoomRender.renderTexture | 39 + 3 files changed, 269 insertions(+), 484 deletions(-) create mode 100644 Assets/ZoomRender.renderTexture diff --git a/Assets/Resources/Prefabs/Scavenger.prefab b/Assets/Resources/Prefabs/Scavenger.prefab index a8282857..c9545990 100644 --- a/Assets/Resources/Prefabs/Scavenger.prefab +++ b/Assets/Resources/Prefabs/Scavenger.prefab @@ -1,6 +1,6 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &7185235680245453263 +--- !u!1 &1969537526640855378 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -8,232 +8,44 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7185235680245453256} - - component: {fileID: 7185235680245453259} - - component: {fileID: 7185235680245453258} - - component: {fileID: 7185235680245453257} - m_Layer: 0 - m_Name: Head + - component: {fileID: 1969537526640855379} + - component: {fileID: 1969537526640855376} + m_Layer: 6 + m_Name: TriggerArea m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7185235680245453256 +--- !u!4 &1969537526640855379 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7185235680245453263} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.032, y: 0.217, z: 0.41} - m_LocalScale: {x: 0.9467626, y: 0.54923, z: 0.54923} + m_GameObject: {fileID: 1969537526640855378} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 2.14, z: 0} + m_LocalScale: {x: 6.35602, y: 6.35602, z: 6.35602} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7185235681313060789} - m_Father: {fileID: 7185235680749625518} - m_RootOrder: 0 + m_Children: [] + m_Father: {fileID: 1969537527645906364} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &7185235680245453259 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7185235680245453263} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &7185235680245453258 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7185235680245453263} - 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_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, 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!65 &7185235680245453257 -BoxCollider: +--- !u!135 &1969537526640855376 +SphereCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7185235680245453263} + m_GameObject: {fileID: 1969537526640855378} m_Material: {fileID: 0} - m_IsTrigger: 0 + m_IsTrigger: 1 m_Enabled: 1 serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} + m_Radius: 1 m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &7185235680387925729 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7185235680387925730} - - component: {fileID: 7185235680387925740} - - component: {fileID: 7185235680387925731} - m_Layer: 5 - m_Name: Text (TMP) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7185235680387925730 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7185235680387925729} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.7} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 7185235681313060789} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: -6.39} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &7185235680387925740 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7185235680387925729} - m_CullTransparentMesh: 1 ---- !u!114 &7185235680387925731 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7185235680387925729} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: Scavenger - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 4.15 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 1 - m_fontSizeMin: 2 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 1 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!1 &7185235680749625506 +--- !u!1 &1969537527645906367 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -241,14 +53,12 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 7185235680749625518} - - component: {fileID: 7185235680749625517} - - component: {fileID: 7185235680749625516} - - component: {fileID: 7185235680749625507} - - component: {fileID: 7185235680749625519} - - component: {fileID: 7185235679240484811} - - component: {fileID: 3543803260516109167} - - component: {fileID: 7417532540270308} + - component: {fileID: 1969537527645906364} + - component: {fileID: 1969537527645906363} + - component: {fileID: 1969537527645906362} + - component: {fileID: 1969537527645906365} + - component: {fileID: 105574978142867672} + - component: {fileID: 4197895979958827067} m_Layer: 7 m_Name: Scavenger m_TagString: Untagged @@ -256,95 +66,48 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &7185235680749625518 +--- !u!4 &1969537527645906364 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7185235680749625506} + m_GameObject: {fileID: 1969537527645906367} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 6.3560195, y: 6.3560195, z: 6.3560195} + m_LocalPosition: {x: 32.46, y: 0, z: 236.38} + m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 7185235680245453256} - - {fileID: 2387336478717723308} - - {fileID: 8729372384015735085} - - {fileID: 8906261181086658241} + - {fileID: 6034681598782727541} + - {fileID: 1969537526640855379} + - {fileID: 1969537528261316024} + - {fileID: 6468193649891365229} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &7185235680749625517 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7185235680749625506} - m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!23 &7185235680749625516 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7185235680749625506} - 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_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, 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!65 &7185235680749625507 -BoxCollider: +--- !u!54 &1969537527645906363 +Rigidbody: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7185235680749625506} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 + m_GameObject: {fileID: 1969537527645906367} serializedVersion: 2 - m_Size: {x: 1, y: 1, z: 1} - m_Center: {x: 0, y: 0, z: 0} ---- !u!114 &7185235680749625519 + m_Mass: 100 + m_Drag: 1 + m_AngularDrag: 0.05 + m_UseGravity: 1 + m_IsKinematic: 0 + m_Interpolate: 0 + m_Constraints: 112 + m_CollisionDetection: 0 +--- !u!114 &1969537527645906362 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7185235680749625506} + m_GameObject: {fileID: 1969537527645906367} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: adc4508225174f7780d48a1f18b02ae9, type: 3} @@ -353,7 +116,7 @@ MonoBehaviour: onHealthChange: m_PersistentCalls: m_Calls: - - m_Target: {fileID: 2387336478376160807} + - m_Target: {fileID: 6468193650249203174} m_TargetAssemblyTypeName: UI.HealthBar, Assembly-CSharp m_MethodName: OnHealthChange m_Mode: 0 @@ -368,7 +131,7 @@ MonoBehaviour: onUnitDeath: m_PersistentCalls: m_Calls: [] - engineAudioSource: {fileID: 7417532540270308} + engineAudioSource: {fileID: 105574978142867672} engineAudioSo: {fileID: 11400000, guid: cdbf35fdc54510f4e8c98c65ac06db71, type: 2} faction: 0 ammoStacks: @@ -380,60 +143,43 @@ MonoBehaviour: m_PersistentCalls: m_Calls: [] emitEvents: 1 ---- !u!195 &7185235679240484811 +--- !u!195 &1969537527645906365 NavMeshAgent: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7185235680749625506} + m_GameObject: {fileID: 1969537527645906367} m_Enabled: 1 m_AgentTypeID: 0 - m_Radius: 0.5 - m_Speed: 20 + m_Radius: 2.5 + m_Speed: 10 m_Acceleration: 8 avoidancePriority: 50 - m_AngularSpeed: 120 - m_StoppingDistance: 0 + m_AngularSpeed: 240 + m_StoppingDistance: 1 m_AutoTraverseOffMeshLink: 1 m_AutoBraking: 1 m_AutoRepath: 1 - m_Height: 1 - m_BaseOffset: 0.5 - m_WalkableMask: 4294967295 + m_Height: 4 + m_BaseOffset: 0 + m_WalkableMask: 1 m_ObstacleAvoidanceType: 4 ---- !u!54 &3543803260516109167 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7185235680749625506} - serializedVersion: 2 - m_Mass: 100 - m_Drag: 1 - m_AngularDrag: 0.05 - m_UseGravity: 1 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 112 - m_CollisionDetection: 0 ---- !u!82 &7417532540270308 +--- !u!82 &105574978142867672 AudioSource: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7185235680749625506} + m_GameObject: {fileID: 1969537527645906367} m_Enabled: 1 serializedVersion: 4 - OutputAudioMixerGroup: {fileID: -5566782973873335814, guid: 86627ef9b19d90447a04b809d9fb5949, - type: 2} - m_audioClip: {fileID: 8300000, guid: d6323de1d74d99c4cb3dc14e494e3640, type: 3} + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 - Loop: 1 + Loop: 0 Mute: 0 Spatialize: 0 SpatializePostEffects: 0 @@ -475,7 +221,7 @@ AudioSource: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: 0 inSlope: 0 outSlope: 0 tangentMode: 0 @@ -515,153 +261,20 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!1 &7185235681313060788 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7185235681313060789} - - component: {fileID: 7185235681313060784} - - component: {fileID: 7185235681313060791} - - component: {fileID: 7185235681313060790} - m_Layer: 5 - m_Name: Canvas - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &7185235681313060789 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7185235681313060788} - m_LocalRotation: {x: 0, y: 1, z: 0, w: 0} - m_LocalPosition: {x: 0, y: 0, z: 0.562} - m_LocalScale: {x: 0.042322688, y: 0.07295585, z: 0.07295585} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7185235680387925730} - m_Father: {fileID: 7185235680245453256} - m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 20, y: 20} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!223 &7185235681313060784 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7185235681313060788} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 2 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 25 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!114 &7185235681313060791 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7185235681313060788} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, 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 - m_PresetInfoIsWorld: 1 ---- !u!114 &7185235681313060790 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7185235681313060788} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!1 &7662034066870704825 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 8729372384015735085} - - component: {fileID: 1069144814903884409} - m_Layer: 6 - m_Name: TriggerArea - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &8729372384015735085 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7662034066870704825} - 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: 7185235680749625518} - m_RootOrder: 2 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!135 &1069144814903884409 -SphereCollider: +--- !u!65 &4197895979958827067 +BoxCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7662034066870704825} + m_GameObject: {fileID: 1969537527645906367} m_Material: {fileID: 0} - m_IsTrigger: 1 + m_IsTrigger: 0 m_Enabled: 1 serializedVersion: 2 - m_Radius: 3 - m_Center: {x: 0, y: 0, z: 0} ---- !u!1 &9167019530811759741 + m_Size: {x: 4, y: 5, z: 6} + m_Center: {x: 0, y: 2, z: 0} +--- !u!1 &1969537528261316027 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -669,8 +282,8 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 8906261181086658241} - - component: {fileID: 1634329216763429599} + - component: {fileID: 1969537528261316024} + - component: {fileID: 1969537528261316025} m_Layer: 8 m_Name: MinimapGFX m_TagString: Untagged @@ -678,28 +291,28 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!4 &8906261181086658241 +--- !u!4 &1969537528261316024 Transform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9167019530811759741} + m_GameObject: {fileID: 1969537528261316027} m_LocalRotation: {x: 0.0363738, y: 0.7061707, z: -0.7061707, w: 0.0363738} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 23.599686, y: 23.599686, z: 23.599678} + m_LocalPosition: {x: -4.571724, y: 2.14, z: -6.5783386} + m_LocalScale: {x: 150.00014, y: 150.0001, z: 150.00006} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 7185235680749625518} - m_RootOrder: 3 + m_Father: {fileID: 1969537527645906364} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} ---- !u!212 &1634329216763429599 +--- !u!212 &1969537528261316025 SpriteRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 9167019530811759741} + m_GameObject: {fileID: 1969537528261316027} m_Enabled: 1 m_CastShadows: 0 m_ReceiveShadows: 0 @@ -745,13 +358,28 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1001 &7185235679487414083 +--- !u!1001 &1969537527361854594 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 7185235680749625518} + m_TransformParent: {fileID: 1969537527645906364} m_Modifications: + - target: {fileID: 4798180957372309064, guid: c3388bd425b69384abab65cc860f0d46, + type: 3} + propertyPath: m_Color.b + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4798180957372309064, guid: c3388bd425b69384abab65cc860f0d46, + type: 3} + propertyPath: m_Color.g + value: 0.5660378 + objectReference: {fileID: 0} + - target: {fileID: 4798180957372309064, guid: c3388bd425b69384abab65cc860f0d46, + type: 3} + propertyPath: m_Color.r + value: 0.12608373 + objectReference: {fileID: 0} - target: {fileID: 4798180957372309065, guid: c3388bd425b69384abab65cc860f0d46, type: 3} propertyPath: m_AnchorMax.x @@ -780,7 +408,7 @@ PrefabInstance: - target: {fileID: 4798180958677372399, guid: c3388bd425b69384abab65cc860f0d46, type: 3} propertyPath: m_RootOrder - value: 1 + value: 3 objectReference: {fileID: 0} - target: {fileID: 4798180958677372399, guid: c3388bd425b69384abab65cc860f0d46, type: 3} @@ -815,17 +443,17 @@ PrefabInstance: - target: {fileID: 4798180958677372399, guid: c3388bd425b69384abab65cc860f0d46, type: 3} propertyPath: m_LocalScale.x - value: 0.008212591 + value: 0.027746385 objectReference: {fileID: 0} - target: {fileID: 4798180958677372399, guid: c3388bd425b69384abab65cc860f0d46, type: 3} propertyPath: m_LocalScale.y - value: 0.008212591 + value: 0.027746385 objectReference: {fileID: 0} - target: {fileID: 4798180958677372399, guid: c3388bd425b69384abab65cc860f0d46, type: 3} propertyPath: m_LocalScale.z - value: 0.008212591 + value: 0.027746385 objectReference: {fileID: 0} - target: {fileID: 4798180958677372399, guid: c3388bd425b69384abab65cc860f0d46, type: 3} @@ -840,7 +468,7 @@ PrefabInstance: - target: {fileID: 4798180958677372399, guid: c3388bd425b69384abab65cc860f0d46, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.9 objectReference: {fileID: 0} - target: {fileID: 4798180958677372399, guid: c3388bd425b69384abab65cc860f0d46, type: 3} @@ -850,17 +478,17 @@ PrefabInstance: - target: {fileID: 4798180958677372399, guid: c3388bd425b69384abab65cc860f0d46, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4798180958677372399, guid: c3388bd425b69384abab65cc860f0d46, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4798180958677372399, guid: c3388bd425b69384abab65cc860f0d46, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4798180958677372399, guid: c3388bd425b69384abab65cc860f0d46, type: 3} @@ -870,7 +498,7 @@ PrefabInstance: - target: {fileID: 4798180958677372399, guid: c3388bd425b69384abab65cc860f0d46, type: 3} propertyPath: m_AnchoredPosition.y - value: 0.972 + value: 4.33 objectReference: {fileID: 0} - target: {fileID: 4798180958677372399, guid: c3388bd425b69384abab65cc860f0d46, type: 3} @@ -889,11 +517,17 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c3388bd425b69384abab65cc860f0d46, type: 3} ---- !u!114 &2387336478376160807 stripped +--- !u!224 &6468193649891365229 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 4798180958677372399, guid: c3388bd425b69384abab65cc860f0d46, + type: 3} + m_PrefabInstance: {fileID: 1969537527361854594} + m_PrefabAsset: {fileID: 0} +--- !u!114 &6468193650249203174 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4798180958505148772, guid: c3388bd425b69384abab65cc860f0d46, type: 3} - m_PrefabInstance: {fileID: 7185235679487414083} + m_PrefabInstance: {fileID: 1969537527361854594} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} m_Enabled: 1 @@ -901,9 +535,115 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 23b421902ab546a4b53d361caa3ae8f7, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!224 &2387336478717723308 stripped -RectTransform: - m_CorrespondingSourceObject: {fileID: 4798180958677372399, guid: c3388bd425b69384abab65cc860f0d46, +--- !u!1001 &1969537528479331647 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1969537527645906364} + m_Modifications: + - target: {fileID: 4873349642617096944, guid: caf1fd9d8560db14b8a88aa0b5c452e5, + type: 3} + propertyPath: m_Name + value: Fido + objectReference: {fileID: 0} + - target: {fileID: 5254096588695425098, guid: caf1fd9d8560db14b8a88aa0b5c452e5, + type: 3} + propertyPath: m_RootOrder + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5254096588695425098, guid: caf1fd9d8560db14b8a88aa0b5c452e5, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5254096588695425098, guid: caf1fd9d8560db14b8a88aa0b5c452e5, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5254096588695425098, guid: caf1fd9d8560db14b8a88aa0b5c452e5, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5254096588695425098, guid: caf1fd9d8560db14b8a88aa0b5c452e5, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5254096588695425098, guid: caf1fd9d8560db14b8a88aa0b5c452e5, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5254096588695425098, guid: caf1fd9d8560db14b8a88aa0b5c452e5, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5254096588695425098, guid: caf1fd9d8560db14b8a88aa0b5c452e5, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 5254096588695425098, guid: caf1fd9d8560db14b8a88aa0b5c452e5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5254096588695425098, guid: caf1fd9d8560db14b8a88aa0b5c452e5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5254096588695425098, guid: caf1fd9d8560db14b8a88aa0b5c452e5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5719840357059213189, guid: caf1fd9d8560db14b8a88aa0b5c452e5, + type: 3} + propertyPath: stepSize + value: 3 + objectReference: {fileID: 0} + - target: {fileID: 5719840357059213189, guid: caf1fd9d8560db14b8a88aa0b5c452e5, + type: 3} + propertyPath: stepHeight + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5719840357059213189, guid: caf1fd9d8560db14b8a88aa0b5c452e5, + type: 3} + propertyPath: groundLayer.m_Bits + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 5719840357059213189, guid: caf1fd9d8560db14b8a88aa0b5c452e5, + type: 3} + propertyPath: legTargets.Array.data[2] + value: + objectReference: {fileID: 6067975485427848950} + - target: {fileID: 5719840357059213189, guid: caf1fd9d8560db14b8a88aa0b5c452e5, + type: 3} + propertyPath: legTargets.Array.data[3] + value: + objectReference: {fileID: 6067975484995985891} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: caf1fd9d8560db14b8a88aa0b5c452e5, type: 3} +--- !u!4 &6034681598782727541 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5254096588695425098, guid: caf1fd9d8560db14b8a88aa0b5c452e5, + type: 3} + m_PrefabInstance: {fileID: 1969537528479331647} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6067975484995985891 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5719840355947992284, guid: caf1fd9d8560db14b8a88aa0b5c452e5, + type: 3} + m_PrefabInstance: {fileID: 1969537528479331647} + m_PrefabAsset: {fileID: 0} +--- !u!4 &6067975485427848950 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5719840355314770889, guid: caf1fd9d8560db14b8a88aa0b5c452e5, type: 3} - m_PrefabInstance: {fileID: 7185235679487414083} + m_PrefabInstance: {fileID: 1969537528479331647} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/ScriptableObjects/Tutorial/Keybinds.asset b/Assets/Resources/ScriptableObjects/Tutorial/Keybinds.asset index 7fb036fb..00c28d8d 100644 --- a/Assets/Resources/ScriptableObjects/Tutorial/Keybinds.asset +++ b/Assets/Resources/ScriptableObjects/Tutorial/Keybinds.asset @@ -62,3 +62,9 @@ MonoBehaviour: - description: Key used to respawn after death. inputActionReference: {fileID: 3814143314724051539, guid: f0941c9159ab44549ae4a15211db10be, type: 3} + - description: The key used to enter HUD edit mode. + inputActionReference: {fileID: -3230914321788345851, guid: f0941c9159ab44549ae4a15211db10be, + type: 3} + - description: The key used to exit HUD edit mode. + inputActionReference: {fileID: 7841187140576067907, guid: f0941c9159ab44549ae4a15211db10be, + type: 3} diff --git a/Assets/ZoomRender.renderTexture b/Assets/ZoomRender.renderTexture new file mode 100644 index 00000000..031dd679 --- /dev/null +++ b/Assets/ZoomRender.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: ZoomRender + m_ImageContentsHash: + serializedVersion: 2 + Hash: 00000000000000000000000000000000 + m_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 5 + m_Width: 1480 + m_Height: 750 + m_AntiAliasing: 1 + m_MipCount: -1 + m_DepthStencilFormat: 94 + m_ColorFormat: 8 + m_MipMap: 0 + m_GenerateMips: 1 + m_SRGB: 0 + m_UseDynamicScale: 0 + m_BindMS: 0 + m_EnableCompatibleFormat: 1 + 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