From 5179c24d5222cfafb0237277f666350e759a7360 Mon Sep 17 00:00:00 2001 From: Pedro Gomes Date: Sun, 4 Aug 2024 10:36:15 +0100 Subject: [PATCH] Mini map first iteration --- .../MinimapRenderTexture.renderTexture | 39 +++ .../MinimapRenderTexture.renderTexture.meta | 8 + .../Prefabs/Board_Interactable.prefab | 178 ++++++++++++ .../Prefabs/Persistent Objects.prefab | 104 ++++++- .../Prefabs/UI/DragonsLair-Button.prefab | 14 +- .../Developer/Prefabs/UI/MinimapCanvas.prefab | 192 +++++++++++++ .../Prefabs/UI/MinimapCanvas.prefab.meta | 7 + .../Main_Camera_PostProcessing.prefab | 2 +- .../Resources/-Cameras/MinimapCamera.prefab | 77 +++++ .../-Cameras/MinimapCamera.prefab.meta | 7 + .../FishingSpotInteractable.prefab | 103 +++++++ .../PlayerPrefab_Barbarian Variant.prefab | 4 + .../PlayerPrefab_Knight Variant.prefab | 4 + .../PlayerPrefab_Mage Variant.prefab | 4 + .../PlayerPrefab_Necromancer Variant.prefab | 4 + .../PlayerPrefab_Priest Variant.prefab | 4 + .../PlayerPrefab_Vampire Variant.prefab | 6 +- Assets/Resources/PlayerPrefab.prefab | 103 +++++++ .../Resources/Vendors/Vendor_Template.prefab | 107 +++++++ Assets/Scenes/4-Dayard.unity | 61 ++++ Assets/Scenes/4-DragonsLair.unity | 61 ++++ Assets/Scenes/4-RiftHuntersInn.unity | 61 ++++ Assets/Scenes/4-RiverAve.unity | 270 +++++++++++++++++- Assets/Scenes/4-RiverAve_Profiles.meta | 8 + .../GameObject Profile.asset | 60 ++++ .../GameObject Profile.asset.meta | 8 + Assets/Scenes/4-Skellyard.unity | 61 ++++ Assets/Scenes/4-VampsDen.unity | 61 ++++ Assets/Scripts/UI/MinimapBillboardZ.cs | 21 ++ Assets/Scripts/UI/MinimapBillboardZ.cs.meta | 11 + Assets/Starfield Skybox/Skybox.mat | 2 +- ProjectSettings/TagManager.asset | 2 +- 32 files changed, 1622 insertions(+), 32 deletions(-) create mode 100644 Assets/-DungeonAssets/Materials/MinimapRenderTexture.renderTexture create mode 100644 Assets/-DungeonAssets/Materials/MinimapRenderTexture.renderTexture.meta create mode 100644 Assets/Developer/Prefabs/UI/MinimapCanvas.prefab create mode 100644 Assets/Developer/Prefabs/UI/MinimapCanvas.prefab.meta create mode 100644 Assets/Resources/-Cameras/MinimapCamera.prefab create mode 100644 Assets/Resources/-Cameras/MinimapCamera.prefab.meta create mode 100644 Assets/Scenes/4-RiverAve_Profiles.meta create mode 100644 Assets/Scenes/4-RiverAve_Profiles/GameObject Profile.asset create mode 100644 Assets/Scenes/4-RiverAve_Profiles/GameObject Profile.asset.meta create mode 100644 Assets/Scripts/UI/MinimapBillboardZ.cs create mode 100644 Assets/Scripts/UI/MinimapBillboardZ.cs.meta diff --git a/Assets/-DungeonAssets/Materials/MinimapRenderTexture.renderTexture b/Assets/-DungeonAssets/Materials/MinimapRenderTexture.renderTexture new file mode 100644 index 00000000..93792b71 --- /dev/null +++ b/Assets/-DungeonAssets/Materials/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_ForcedFallbackFormat: 4 + m_DownscaleFallback: 0 + m_IsAlphaChannelOptional: 0 + serializedVersion: 5 + m_Width: 4096 + m_Height: 4096 + m_AntiAliasing: 2 + 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 diff --git a/Assets/-DungeonAssets/Materials/MinimapRenderTexture.renderTexture.meta b/Assets/-DungeonAssets/Materials/MinimapRenderTexture.renderTexture.meta new file mode 100644 index 00000000..bb25f2e8 --- /dev/null +++ b/Assets/-DungeonAssets/Materials/MinimapRenderTexture.renderTexture.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 498dbac209529d745a451a1420d01d9d +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 8400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Developer/Prefabs/Board_Interactable.prefab b/Assets/Developer/Prefabs/Board_Interactable.prefab index f9562990..2e59bb3c 100644 --- a/Assets/Developer/Prefabs/Board_Interactable.prefab +++ b/Assets/Developer/Prefabs/Board_Interactable.prefab @@ -1,5 +1,182 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &983211065875569593 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7092115566383396392} + - component: {fileID: 1569159744202761643} + - component: {fileID: 4461945195923398560} + m_Layer: 14 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7092115566383396392 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 983211065875569593} + 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: 8436916970780249321} + 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: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1569159744202761643 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 983211065875569593} + m_CullTransparentMesh: 1 +--- !u!114 &4461945195923398560 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 983211065875569593} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: ece0bfa79862ff143a9a9fbeaa1d97b8, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5454146098484456677 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8436916970780249321} + - component: {fileID: 110081580761074380} + - component: {fileID: 1713337658297769104} + - component: {fileID: 9090948055460477364} + m_Layer: 14 + m_Name: Canvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8436916970780249321 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5454146098484456677} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.024999999, y: 0.024999999, z: 0.024999999} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 7092115566383396392} + m_Father: {fileID: 5747291697774216031} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 2.5} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &110081580761074380 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5454146098484456677} + 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: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &1713337658297769104 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5454146098484456677} + 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 &9090948055460477364 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5454146098484456677} + m_Enabled: 0 + 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 &5747291696703053363 GameObject: m_ObjectHideFlags: 0 @@ -161,6 +338,7 @@ Transform: m_Children: - {fileID: 5747291697647577950} - {fileID: 5747291698265800633} + - {fileID: 8436916970780249321} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Developer/Prefabs/Persistent Objects.prefab b/Assets/Developer/Prefabs/Persistent Objects.prefab index 198e5408..b26ee350 100644 --- a/Assets/Developer/Prefabs/Persistent Objects.prefab +++ b/Assets/Developer/Prefabs/Persistent Objects.prefab @@ -996,6 +996,79 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1493622591950221911 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2306657105594587368} + - component: {fileID: 5921036481685343511} + - component: {fileID: 1688107512854989067} + m_Layer: 5 + m_Name: Minimap + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2306657105594587368 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1493622591950221911} + 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: 7475116342604559439} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 350, y: 350} + m_Pivot: {x: 0, y: 1} +--- !u!222 &5921036481685343511 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1493622591950221911} + m_CullTransparentMesh: 1 +--- !u!114 &1688107512854989067 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1493622591950221911} + 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: 0 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Texture: {fileID: 8400000, guid: 498dbac209529d745a451a1420d01d9d, type: 2} + m_UVRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 --- !u!1 &2260362402963569666 GameObject: m_ObjectHideFlags: 0 @@ -1886,7 +1959,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7475116342604559439} - m_RootOrder: 15 + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -2133,7 +2206,7 @@ RectTransform: - {fileID: 4890003738069786330} - {fileID: 8379006236797950134} m_Father: {fileID: 7475116342604559439} - m_RootOrder: 12 + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} @@ -2173,7 +2246,7 @@ RectTransform: - {fileID: 4943063684750461661} - {fileID: 3362226694287797821} m_Father: {fileID: 7475116342604559439} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} @@ -3007,7 +3080,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7475116342604559439} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -3190,7 +3263,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7475116342604559439} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -4281,7 +4354,7 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 7475116342604559439} - m_RootOrder: 16 + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} @@ -6032,7 +6105,7 @@ RectTransform: - {fileID: 7475116341708744575} - {fileID: 7475116342385688832} m_Father: {fileID: 7475116342604559439} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 0} @@ -6515,6 +6588,7 @@ RectTransform: m_Children: - {fileID: 7475116342091226272} - {fileID: 7296629863741618491} + - {fileID: 2306657105594587368} - {fileID: 1083758498388601188} - {fileID: 7475116342305776693} - {fileID: 7475116342296380174} @@ -8127,7 +8201,7 @@ RectTransform: - {fileID: 8885583946733780527} - {fileID: 6721807673608699080} m_Father: {fileID: 7475116342604559439} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0} m_AnchorMax: {x: 0.5, y: 1} @@ -8684,7 +8758,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4228710720008241671, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_RootOrder - value: 9 + value: 10 objectReference: {fileID: 0} - target: {fileID: 4228710720008241671, guid: e565cec5c5ea98249bbb59d06ac4f04b, type: 3} propertyPath: m_AnchorMax.x @@ -10354,7 +10428,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5924497174362473166, guid: a192502938b6c6e40b392778d5967de0, type: 3} propertyPath: m_RootOrder - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: 5924497174362473166, guid: a192502938b6c6e40b392778d5967de0, type: 3} propertyPath: m_LocalPosition.x @@ -11806,7 +11880,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22490916, guid: bfad9eb7536d8bb4d9de9422d5f46df0, type: 3} propertyPath: m_RootOrder - value: 5 + value: 6 objectReference: {fileID: 0} - target: {fileID: 22490916, guid: bfad9eb7536d8bb4d9de9422d5f46df0, type: 3} propertyPath: m_AnchorMax.x @@ -11929,7 +12003,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7545422915176773811, guid: 00f01757a3b553844ac0908a8d140ec5, type: 3} propertyPath: m_RootOrder - value: 2 + value: 3 objectReference: {fileID: 0} - target: {fileID: 7545422915176773811, guid: 00f01757a3b553844ac0908a8d140ec5, type: 3} propertyPath: m_AnchorMax.x @@ -12092,7 +12166,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22405792, guid: 98484fbd97870af4d8569162460a89bb, type: 3} propertyPath: m_RootOrder - value: 4 + value: 5 objectReference: {fileID: 0} - target: {fileID: 22405792, guid: 98484fbd97870af4d8569162460a89bb, type: 3} propertyPath: m_AnchorMax.x @@ -12999,7 +13073,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 22492918, guid: 369f87c2a2dd3b246b04552b05534a04, type: 3} propertyPath: m_RootOrder - value: 3 + value: 4 objectReference: {fileID: 0} - target: {fileID: 22492918, guid: 369f87c2a2dd3b246b04552b05534a04, type: 3} propertyPath: m_AnchorMax.x @@ -14295,7 +14369,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8188602677875481951, guid: 88bbe6812edcc4c4988a269e560879b7, type: 3} propertyPath: m_RootOrder - value: 8 + value: 9 objectReference: {fileID: 0} - target: {fileID: 8188602677875481951, guid: 88bbe6812edcc4c4988a269e560879b7, type: 3} propertyPath: m_LocalPosition.x diff --git a/Assets/Developer/Prefabs/UI/DragonsLair-Button.prefab b/Assets/Developer/Prefabs/UI/DragonsLair-Button.prefab index 6bbfa08b..1d25ea5e 100644 --- a/Assets/Developer/Prefabs/UI/DragonsLair-Button.prefab +++ b/Assets/Developer/Prefabs/UI/DragonsLair-Button.prefab @@ -7,6 +7,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 689173770939794846, guid: 89d2a0d314362244dac86ad842cb8f59, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 4320327642779395806, guid: 89d2a0d314362244dac86ad842cb8f59, type: 3} propertyPath: zoneData value: @@ -115,13 +119,21 @@ PrefabInstance: propertyPath: m_SizeDelta.y value: 35 objectReference: {fileID: 0} + - target: {fileID: 5261700515755460075, guid: 89d2a0d314362244dac86ad842cb8f59, type: 3} + propertyPath: m_AnchoredPosition.x + value: -45 + objectReference: {fileID: 0} + - target: {fileID: 5261700516312486724, guid: 89d2a0d314362244dac86ad842cb8f59, type: 3} + propertyPath: m_Color.a + value: 1 + objectReference: {fileID: 0} - target: {fileID: 5261700516312486724, guid: 89d2a0d314362244dac86ad842cb8f59, type: 3} propertyPath: m_Color.b value: 0 objectReference: {fileID: 0} - target: {fileID: 5261700516312486724, guid: 89d2a0d314362244dac86ad842cb8f59, type: 3} propertyPath: m_Color.g - value: 0.9370694 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5261700516312486724, guid: 89d2a0d314362244dac86ad842cb8f59, type: 3} propertyPath: m_Color.r diff --git a/Assets/Developer/Prefabs/UI/MinimapCanvas.prefab b/Assets/Developer/Prefabs/UI/MinimapCanvas.prefab new file mode 100644 index 00000000..32b05453 --- /dev/null +++ b/Assets/Developer/Prefabs/UI/MinimapCanvas.prefab @@ -0,0 +1,192 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2502607748536849467 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2253537212328274657} + - component: {fileID: 4217174627449453803} + - component: {fileID: 2464649666680496483} + m_Layer: 14 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2253537212328274657 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2502607748536849467} + 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: 3293080220566330622} + 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: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4217174627449453803 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2502607748536849467} + m_CullTransparentMesh: 1 +--- !u!114 &2464649666680496483 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2502607748536849467} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 73f08b22fb7907e4b9792619826609b0, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6321403963943988171 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3293080220566330622} + - component: {fileID: 4163717074174228201} + - component: {fileID: 921287751983194665} + - component: {fileID: 6229034846967240991} + - component: {fileID: 5437257998073639169} + m_Layer: 14 + m_Name: MinimapCanvas + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3293080220566330622 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6321403963943988171} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0.024999999, y: 0.024999999, z: 0.024999999} + m_ConstrainProportionsScale: 1 + m_Children: + - {fileID: 2253537212328274657} + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0.8500061} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!223 &4163717074174228201 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6321403963943988171} + 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: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &921287751983194665 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6321403963943988171} + 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: 0 +--- !u!114 &6229034846967240991 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6321403963943988171} + m_Enabled: 0 + 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!114 &5437257998073639169 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6321403963943988171} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 55b760a06ef69a0409d4840c8d741034, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Developer/Prefabs/UI/MinimapCanvas.prefab.meta b/Assets/Developer/Prefabs/UI/MinimapCanvas.prefab.meta new file mode 100644 index 00000000..14867c37 --- /dev/null +++ b/Assets/Developer/Prefabs/UI/MinimapCanvas.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: bcfe29e3c555af649b88f28ca841a414 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/-Cameras/Main_Camera_PostProcessing.prefab b/Assets/Resources/-Cameras/Main_Camera_PostProcessing.prefab index aabd9588..beed36d8 100644 --- a/Assets/Resources/-Cameras/Main_Camera_PostProcessing.prefab +++ b/Assets/Resources/-Cameras/Main_Camera_PostProcessing.prefab @@ -65,7 +65,7 @@ Camera: m_Depth: -1 m_CullingMask: serializedVersion: 2 - m_Bits: 4294967295 + m_Bits: 3749717119 m_RenderingPath: -1 m_TargetTexture: {fileID: 0} m_TargetDisplay: 0 diff --git a/Assets/Resources/-Cameras/MinimapCamera.prefab b/Assets/Resources/-Cameras/MinimapCamera.prefab new file mode 100644 index 00000000..1110a473 --- /dev/null +++ b/Assets/Resources/-Cameras/MinimapCamera.prefab @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2878385681087962802 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2878385681087962799} + - component: {fileID: 2878385681087962796} + m_Layer: 14 + m_Name: MinimapCamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &2878385681087962799 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2878385681087962802} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: -6.6, y: 20, z: 5.4} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} +--- !u!20 &2878385681087962796 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2878385681087962802} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 2 + m_BackGroundColor: {r: 0.3529412, g: 0.65882355, b: 0.7725491, a: 0} + m_projectionMatrixMode: 1 + m_GateFitMode: 2 + m_FOVAxisMode: 0 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_FocalLength: 50 + m_NormalizedViewPortRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 1 + height: 1 + near clip plane: 0.3 + far clip plane: 25 + field of view: 60 + orthographic: 1 + orthographic size: 43 + m_Depth: 0 + m_CullingMask: + serializedVersion: 2 + m_Bits: 17497 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 8400000, guid: 498dbac209529d745a451a1420d01d9d, type: 2} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 0 + m_AllowMSAA: 1 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 diff --git a/Assets/Resources/-Cameras/MinimapCamera.prefab.meta b/Assets/Resources/-Cameras/MinimapCamera.prefab.meta new file mode 100644 index 00000000..6424881c --- /dev/null +++ b/Assets/Resources/-Cameras/MinimapCamera.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: eca68943932ada3419bfdc71ae805f66 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Interactables/FishingSpotInteractable.prefab b/Assets/Resources/Interactables/FishingSpotInteractable.prefab index 2bbcbe9f..d89f7bc6 100644 --- a/Assets/Resources/Interactables/FishingSpotInteractable.prefab +++ b/Assets/Resources/Interactables/FishingSpotInteractable.prefab @@ -32,6 +32,7 @@ Transform: m_Children: - {fileID: 4977534291536289859} - {fileID: 4977534290851014630} + - {fileID: 2205044848729624493} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -262,3 +263,105 @@ MeshRenderer: m_SortingLayer: 0 m_SortingOrder: 0 m_AdditionalVertexStreams: {fileID: 0} +--- !u!1001 &3686965507303215955 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4977534290162099535} + m_Modifications: + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0.85 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6321403963943988171, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_Name + value: MinimapCanvas + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} +--- !u!224 &2205044848729624493 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + m_PrefabInstance: {fileID: 3686965507303215955} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Barbarian Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Barbarian Variant.prefab index 10f5af1a..887185d4 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Barbarian Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Barbarian Variant.prefab @@ -288,6 +288,10 @@ PrefabInstance: propertyPath: m_Name value: PlayerPrefab_Barbarian Variant objectReference: {fileID: 0} + - target: {fileID: 1486121347253432021, guid: 9c432d220280f704684a6d5b9354c782, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 23ef5a7692693cd428d87441042dfa2e, type: 3} - target: {fileID: 3337123064848582692, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: ability value: diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Knight Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Knight Variant.prefab index 463fd172..ad60c350 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Knight Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Knight Variant.prefab @@ -11,6 +11,10 @@ PrefabInstance: propertyPath: m_Name value: PlayerPrefab_Knight Variant objectReference: {fileID: 0} + - target: {fileID: 1486121347253432021, guid: 9c432d220280f704684a6d5b9354c782, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 43ec3f0dab32b934bb86fd4614e3872c, type: 3} - target: {fileID: 3337123064848582692, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: ability value: diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Mage Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Mage Variant.prefab index 5025ad65..bb8a332f 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Mage Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Mage Variant.prefab @@ -280,6 +280,10 @@ PrefabInstance: propertyPath: m_Name value: PlayerPrefab_Mage Variant objectReference: {fileID: 0} + - target: {fileID: 1486121347253432021, guid: 9c432d220280f704684a6d5b9354c782, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 2069f54d7d670874ebddb4f776599fca, type: 3} - target: {fileID: 3411510181381743576, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: abilityPriorityList.Array.size value: 1 diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Necromancer Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Necromancer Variant.prefab index 2c4a1d89..0411386b 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Necromancer Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Necromancer Variant.prefab @@ -11,6 +11,10 @@ PrefabInstance: propertyPath: m_Name value: PlayerPrefab_Necromancer Variant objectReference: {fileID: 0} + - target: {fileID: 1486121347253432021, guid: 9c432d220280f704684a6d5b9354c782, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 6c8be842333009248bffecfeffd379af, type: 3} - target: {fileID: 3337123064848582692, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: ability value: diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Priest Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Priest Variant.prefab index a887805e..4e1d9103 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Priest Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Priest Variant.prefab @@ -11,6 +11,10 @@ PrefabInstance: propertyPath: m_Name value: PlayerPrefab_Priest Variant objectReference: {fileID: 0} + - target: {fileID: 1486121347253432021, guid: 9c432d220280f704684a6d5b9354c782, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 33125492031e5d14db4af431fd116869, type: 3} - target: {fileID: 3337123064848582692, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: ability value: diff --git a/Assets/Resources/PlayableCharacters/PlayerPrefab_Vampire Variant.prefab b/Assets/Resources/PlayableCharacters/PlayerPrefab_Vampire Variant.prefab index c0e53b71..0757264f 100644 --- a/Assets/Resources/PlayableCharacters/PlayerPrefab_Vampire Variant.prefab +++ b/Assets/Resources/PlayableCharacters/PlayerPrefab_Vampire Variant.prefab @@ -218,6 +218,10 @@ PrefabInstance: propertyPath: m_Name value: PlayerPrefab_Vampire Variant objectReference: {fileID: 0} + - target: {fileID: 1486121347253432021, guid: 9c432d220280f704684a6d5b9354c782, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: bc7a108ed5f68644cba88a08acfdcaed, type: 3} - target: {fileID: 3337123064848582692, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: ability value: @@ -252,7 +256,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3456938604268513836, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: m_RootOrder - value: 23 + value: 24 objectReference: {fileID: 0} - target: {fileID: 4486792688999778717, guid: 9c432d220280f704684a6d5b9354c782, type: 3} propertyPath: onStartFishing.m_PersistentCalls.m_Calls.Array.size diff --git a/Assets/Resources/PlayerPrefab.prefab b/Assets/Resources/PlayerPrefab.prefab index 92c07990..571acf2e 100644 --- a/Assets/Resources/PlayerPrefab.prefab +++ b/Assets/Resources/PlayerPrefab.prefab @@ -259,6 +259,7 @@ Transform: - {fileID: 5521421693679146049} - {fileID: 6451869876329639159} - {fileID: 3456938604268513836} + - {fileID: 1952501404687160136} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -3145,6 +3146,108 @@ ParticleSystem: m_CorrespondingSourceObject: {fileID: 9016596440161212763, guid: b197ddc3f3f9fde488980766678344bb, type: 3} m_PrefabInstance: {fileID: 3127215453118507185} m_PrefabAsset: {fileID: 0} +--- !u!1001 &3939509126365499318 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 8785094005405139760} + m_Modifications: + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_RootOrder + value: 23 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchoredPosition.y + value: 2.6 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6321403963943988171, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_Name + value: MinimapCanvas + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} +--- !u!224 &1952501404687160136 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + m_PrefabInstance: {fileID: 3939509126365499318} + m_PrefabAsset: {fileID: 0} --- !u!1001 &4051717963886074447 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Vendors/Vendor_Template.prefab b/Assets/Resources/Vendors/Vendor_Template.prefab index c02bb8ee..c43cb37a 100644 --- a/Assets/Resources/Vendors/Vendor_Template.prefab +++ b/Assets/Resources/Vendors/Vendor_Template.prefab @@ -32,6 +32,7 @@ Transform: m_Children: - {fileID: 1303668240061310614} - {fileID: 123645170697907933} + - {fileID: 5539393934865746281} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -399,3 +400,109 @@ MonoBehaviour: m_hasFontAssetChanged: 0 m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1001 &7020195290583455127 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1303668238710525334} + m_Modifications: + - target: {fileID: 2464649666680496483, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_Sprite + value: + objectReference: {fileID: 21300000, guid: 9d5365d85f9ac2e46b561528dae6e5ab, type: 3} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_Pivot.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_Pivot.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_SizeDelta.x + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_SizeDelta.y + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_AnchoredPosition.y + value: 2.5 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6321403963943988171, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + propertyPath: m_Name + value: MinimapCanvas + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} +--- !u!224 &5539393934865746281 stripped +RectTransform: + m_CorrespondingSourceObject: {fileID: 3293080220566330622, guid: bcfe29e3c555af649b88f28ca841a414, type: 3} + m_PrefabInstance: {fileID: 7020195290583455127} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scenes/4-Dayard.unity b/Assets/Scenes/4-Dayard.unity index 43733847..08c4a1f6 100644 --- a/Assets/Scenes/4-Dayard.unity +++ b/Assets/Scenes/4-Dayard.unity @@ -693,6 +693,67 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 908355485} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &934200398 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2878385681087962796, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: orthographic size + value: 16.15 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalPosition.x + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalPosition.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalPosition.z + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962802, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_Name + value: MinimapCamera + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eca68943932ada3419bfdc71ae805f66, type: 3} --- !u!1 &1062985037 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/4-DragonsLair.unity b/Assets/Scenes/4-DragonsLair.unity index dd77b162..3b8e7b54 100644 --- a/Assets/Scenes/4-DragonsLair.unity +++ b/Assets/Scenes/4-DragonsLair.unity @@ -420,6 +420,67 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1598401637 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2878385681087962796, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: orthographic size + value: 55 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalPosition.x + value: 32.4 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalPosition.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalPosition.z + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962802, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_Name + value: MinimapCamera + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eca68943932ada3419bfdc71ae805f66, type: 3} --- !u!1 &1661122844 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/4-RiftHuntersInn.unity b/Assets/Scenes/4-RiftHuntersInn.unity index 1656e489..bcda21bd 100644 --- a/Assets/Scenes/4-RiftHuntersInn.unity +++ b/Assets/Scenes/4-RiftHuntersInn.unity @@ -1255,6 +1255,67 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &1592549856 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2878385681087962796, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: orthographic size + value: 15.5 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalPosition.x + value: -6 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalPosition.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962802, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_Name + value: MinimapCamera + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eca68943932ada3419bfdc71ae805f66, type: 3} --- !u!1 &1661122844 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/4-RiverAve.unity b/Assets/Scenes/4-RiverAve.unity index 5d9a2e26..72ccb9d7 100644 --- a/Assets/Scenes/4-RiverAve.unity +++ b/Assets/Scenes/4-RiverAve.unity @@ -2504,7 +2504,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} propertyPath: m_LocalPosition.x - value: -12.15 + value: -0.32 objectReference: {fileID: 0} - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} propertyPath: m_LocalPosition.y @@ -2512,7 +2512,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} propertyPath: m_LocalPosition.z - value: 38.16 + value: 32.22 objectReference: {fileID: 0} - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} propertyPath: m_LocalRotation.w @@ -4498,7 +4498,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} propertyPath: m_LocalPosition.x - value: -0.44 + value: 2.58 objectReference: {fileID: 0} - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} propertyPath: m_LocalPosition.y @@ -4506,7 +4506,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} propertyPath: m_LocalPosition.z - value: 29.18 + value: 25.28 objectReference: {fileID: 0} - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} propertyPath: m_LocalRotation.w @@ -4621,6 +4621,68 @@ Transform: m_CorrespondingSourceObject: {fileID: 6463103279978990837, guid: 87b04a6b131597e4db952f9810390439, type: 3} m_PrefabInstance: {fileID: 499944906} m_PrefabAsset: {fileID: 0} +--- !u!1001 &503051347 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1298481383} + m_Modifications: + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalPosition.x + value: -14.07 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalPosition.y + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalPosition.z + value: 40.65 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099537, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_Name + value: FishingSpotInteractable (12) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} +--- !u!4 &503051348 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + m_PrefabInstance: {fileID: 503051347} + m_PrefabAsset: {fileID: 0} --- !u!1001 &507368056 PrefabInstance: m_ObjectHideFlags: 0 @@ -8115,6 +8177,68 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 946408586} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &948168443 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1298481383} + m_Modifications: + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_RootOrder + value: 11 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalPosition.x + value: -6.37 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalPosition.y + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalPosition.z + value: 37.51 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099537, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_Name + value: FishingSpotInteractable (11) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} +--- !u!4 &948168444 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + m_PrefabInstance: {fileID: 948168443} + m_PrefabAsset: {fileID: 0} --- !u!1001 &952735235 PrefabInstance: m_ObjectHideFlags: 0 @@ -8892,7 +9016,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} propertyPath: m_LocalPosition.x - value: 2.88 + value: 3.27 objectReference: {fileID: 0} - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} propertyPath: m_LocalPosition.y @@ -8900,7 +9024,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} propertyPath: m_LocalPosition.z - value: -15.49 + value: -15.3 objectReference: {fileID: 0} - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} propertyPath: m_LocalRotation.w @@ -10625,6 +10749,9 @@ Transform: - {fileID: 863021164} - {fileID: 496643423} - {fileID: 230716197} + - {fileID: 948168444} + - {fileID: 503051348} + - {fileID: 1668910757} m_Father: {fileID: 0} m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -12132,7 +12259,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} propertyPath: m_LocalPosition.x - value: 5.53 + value: 6 objectReference: {fileID: 0} - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} propertyPath: m_LocalPosition.y @@ -12140,7 +12267,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} propertyPath: m_LocalPosition.z - value: -22.6 + value: -21.41 objectReference: {fileID: 0} - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} propertyPath: m_LocalRotation.w @@ -13700,6 +13827,68 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1645933807} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &1668910756 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 1298481383} + m_Modifications: + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalPosition.x + value: -21.06 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalPosition.y + value: 0.1 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalPosition.z + value: 42.23 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4977534290162099537, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + propertyPath: m_Name + value: FishingSpotInteractable (13) + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} +--- !u!4 &1668910757 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} + m_PrefabInstance: {fileID: 1668910756} + m_PrefabAsset: {fileID: 0} --- !u!850595691 &1669982700 LightingSettings: m_ObjectHideFlags: 0 @@ -15107,7 +15296,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} propertyPath: m_LocalPosition.x - value: 4.96 + value: 5.83 objectReference: {fileID: 0} - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} propertyPath: m_LocalPosition.y @@ -15115,7 +15304,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} propertyPath: m_LocalPosition.z - value: -28.23 + value: -27.12 objectReference: {fileID: 0} - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} propertyPath: m_LocalRotation.w @@ -18228,6 +18417,63 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f01337c4b1a6e774cb6a6f4c3dd02910, type: 3} +--- !u!1001 &2878385679964988285 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_RootOrder + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalPosition.x + value: -6.6 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalPosition.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalPosition.z + value: 5.4 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962802, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_Name + value: MinimapCamera + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eca68943932ada3419bfdc71ae805f66, type: 3} --- !u!1001 &4674286093509825516 PrefabInstance: m_ObjectHideFlags: 0 @@ -18302,7 +18548,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} propertyPath: m_LocalPosition.x - value: 2.67 + value: 4.08 objectReference: {fileID: 0} - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} propertyPath: m_LocalPosition.y @@ -18310,7 +18556,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} propertyPath: m_LocalPosition.z - value: -34.13 + value: -32.42 objectReference: {fileID: 0} - target: {fileID: 4977534290162099535, guid: beca7d9115b1d0b459ede23c77452a4b, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/Scenes/4-RiverAve_Profiles.meta b/Assets/Scenes/4-RiverAve_Profiles.meta new file mode 100644 index 00000000..be17c7eb --- /dev/null +++ b/Assets/Scenes/4-RiverAve_Profiles.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ad64fc91b5d35274984c408a2839d86d +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/4-RiverAve_Profiles/GameObject Profile.asset b/Assets/Scenes/4-RiverAve_Profiles/GameObject Profile.asset new file mode 100644 index 00000000..3115d1cd --- /dev/null +++ b/Assets/Scenes/4-RiverAve_Profiles/GameObject Profile.asset @@ -0,0 +1,60 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-3611894514340755389 +MonoBehaviour: + m_ObjectHideFlags: 3 + 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: 40b924e2dad56384a8df2a1e111bb675, type: 3} + m_Name: Vignette + m_EditorClassIdentifier: + active: 1 + enabled: + overrideState: 1 + value: 1 + mode: + overrideState: 1 + value: 0 + color: + overrideState: 1 + value: {r: 0, g: 0, b: 0, a: 1} + center: + overrideState: 1 + value: {x: 0.5, y: 0.5} + intensity: + overrideState: 1 + value: 0 + smoothness: + overrideState: 1 + value: 0.405 + roundness: + overrideState: 1 + value: 1 + rounded: + overrideState: 0 + value: 0 + mask: + overrideState: 0 + value: {fileID: 0} + defaultState: 1 + opacity: + overrideState: 0 + value: 1 +--- !u!114 &11400000 +MonoBehaviour: + m_ObjectHideFlags: 0 + 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: 8e6292b2c06870d4495f009f912b9600, type: 3} + m_Name: GameObject Profile + m_EditorClassIdentifier: + settings: + - {fileID: -3611894514340755389} diff --git a/Assets/Scenes/4-RiverAve_Profiles/GameObject Profile.asset.meta b/Assets/Scenes/4-RiverAve_Profiles/GameObject Profile.asset.meta new file mode 100644 index 00000000..56e835c8 --- /dev/null +++ b/Assets/Scenes/4-RiverAve_Profiles/GameObject Profile.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: dd0c92ab27fa00a47b8e6de0cc2f7ac6 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/4-Skellyard.unity b/Assets/Scenes/4-Skellyard.unity index 646beb06..3cab11a7 100644 --- a/Assets/Scenes/4-Skellyard.unity +++ b/Assets/Scenes/4-Skellyard.unity @@ -497,6 +497,67 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} +--- !u!1001 &820281663 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2878385681087962796, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: orthographic size + value: 16.15 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalPosition.x + value: -2 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalPosition.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalPosition.z + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962802, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_Name + value: MinimapCamera + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eca68943932ada3419bfdc71ae805f66, type: 3} --- !u!1 &851517553 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/4-VampsDen.unity b/Assets/Scenes/4-VampsDen.unity index 63513fd0..f108779b 100644 --- a/Assets/Scenes/4-VampsDen.unity +++ b/Assets/Scenes/4-VampsDen.unity @@ -1614,6 +1614,67 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1837129068} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!1001 &1884992066 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2878385681087962796, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: orthographic size + value: 35 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_RootOrder + value: 15 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalPosition.x + value: -14 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalPosition.y + value: 20 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalPosition.z + value: 6 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalRotation.x + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 90 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962799, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2878385681087962802, guid: eca68943932ada3419bfdc71ae805f66, type: 3} + propertyPath: m_Name + value: MinimapCamera + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: eca68943932ada3419bfdc71ae805f66, type: 3} --- !u!1 &2039545540 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UI/MinimapBillboardZ.cs b/Assets/Scripts/UI/MinimapBillboardZ.cs new file mode 100644 index 00000000..9284fba0 --- /dev/null +++ b/Assets/Scripts/UI/MinimapBillboardZ.cs @@ -0,0 +1,21 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class MinimapBillboardZ : MonoBehaviour +{ + Vector3 lookat; + Quaternion lookRotation; + + // Update is called once per frame + void Update() + { + lookat = Vector3.up; + + // Make the object face the camera only in the Y-axis + lookRotation = Quaternion.LookRotation(new Vector3(lookat.x, -lookat.y, 0)); + + // Apply the rotation to the object + transform.rotation = lookRotation; + } +} diff --git a/Assets/Scripts/UI/MinimapBillboardZ.cs.meta b/Assets/Scripts/UI/MinimapBillboardZ.cs.meta new file mode 100644 index 00000000..7660cc10 --- /dev/null +++ b/Assets/Scripts/UI/MinimapBillboardZ.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 55b760a06ef69a0409d4840c8d741034 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Starfield Skybox/Skybox.mat b/Assets/Starfield Skybox/Skybox.mat index 1ca42efa..195f73e5 100644 --- a/Assets/Starfield Skybox/Skybox.mat +++ b/Assets/Starfield Skybox/Skybox.mat @@ -94,7 +94,7 @@ Material: - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 - - _Rotation: 5.423718 + - _Rotation: 8.205798 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 1765ee10..ca8daa26 100644 --- a/ProjectSettings/TagManager.asset +++ b/ProjectSettings/TagManager.asset @@ -20,7 +20,7 @@ TagManager: - - - PostProcessing - - + - MiniMap - - -