From 614358a362693ee95d6667e7ad1cc40fb5a08e4f Mon Sep 17 00:00:00 2001 From: DerTyp187 Date: Sat, 2 Oct 2021 14:52:59 +0200 Subject: [PATCH] updated --- Assets/HUD.meta | 8 ++ Assets/{ => HUD}/Minimap.meta | 0 Assets/{ => HUD}/Minimap/Minimap.cs | 0 Assets/{ => HUD}/Minimap/Minimap.cs.meta | 0 Assets/{ => HUD}/Minimap/MinimapPanel.prefab | 0 .../Minimap/MinimapPanel.prefab.meta | 0 .../Minimap/MinimapTexture.renderTexture | 6 +- .../Minimap/MinimapTexture.renderTexture.meta | 0 Assets/{ => HUD}/Minimap/cirlce_mask.png | Bin Assets/{ => HUD}/Minimap/cirlce_mask.png.meta | 0 Assets/Scenes/SampleScene.unity | 125 ++++++++++++++++-- 11 files changed, 128 insertions(+), 11 deletions(-) create mode 100644 Assets/HUD.meta rename Assets/{ => HUD}/Minimap.meta (100%) rename Assets/{ => HUD}/Minimap/Minimap.cs (100%) rename Assets/{ => HUD}/Minimap/Minimap.cs.meta (100%) rename Assets/{ => HUD}/Minimap/MinimapPanel.prefab (100%) rename Assets/{ => HUD}/Minimap/MinimapPanel.prefab.meta (100%) rename Assets/{ => HUD}/Minimap/MinimapTexture.renderTexture (93%) rename Assets/{ => HUD}/Minimap/MinimapTexture.renderTexture.meta (100%) rename Assets/{ => HUD}/Minimap/cirlce_mask.png (100%) rename Assets/{ => HUD}/Minimap/cirlce_mask.png.meta (100%) diff --git a/Assets/HUD.meta b/Assets/HUD.meta new file mode 100644 index 0000000..49ee877 --- /dev/null +++ b/Assets/HUD.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 5caaada627970db48bb75861ba0838b8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Minimap.meta b/Assets/HUD/Minimap.meta similarity index 100% rename from Assets/Minimap.meta rename to Assets/HUD/Minimap.meta diff --git a/Assets/Minimap/Minimap.cs b/Assets/HUD/Minimap/Minimap.cs similarity index 100% rename from Assets/Minimap/Minimap.cs rename to Assets/HUD/Minimap/Minimap.cs diff --git a/Assets/Minimap/Minimap.cs.meta b/Assets/HUD/Minimap/Minimap.cs.meta similarity index 100% rename from Assets/Minimap/Minimap.cs.meta rename to Assets/HUD/Minimap/Minimap.cs.meta diff --git a/Assets/Minimap/MinimapPanel.prefab b/Assets/HUD/Minimap/MinimapPanel.prefab similarity index 100% rename from Assets/Minimap/MinimapPanel.prefab rename to Assets/HUD/Minimap/MinimapPanel.prefab diff --git a/Assets/Minimap/MinimapPanel.prefab.meta b/Assets/HUD/Minimap/MinimapPanel.prefab.meta similarity index 100% rename from Assets/Minimap/MinimapPanel.prefab.meta rename to Assets/HUD/Minimap/MinimapPanel.prefab.meta diff --git a/Assets/Minimap/MinimapTexture.renderTexture b/Assets/HUD/Minimap/MinimapTexture.renderTexture similarity index 93% rename from Assets/Minimap/MinimapTexture.renderTexture rename to Assets/HUD/Minimap/MinimapTexture.renderTexture index 4c02518..55b47d0 100644 --- a/Assets/Minimap/MinimapTexture.renderTexture +++ b/Assets/HUD/Minimap/MinimapTexture.renderTexture @@ -14,11 +14,11 @@ RenderTexture: m_DownscaleFallback: 0 m_IsAlphaChannelOptional: 0 serializedVersion: 3 - m_Width: 256 - m_Height: 256 + m_Width: 200 + m_Height: 200 m_AntiAliasing: 1 m_MipCount: -1 - m_DepthFormat: 2 + m_DepthFormat: 0 m_ColorFormat: 8 m_MipMap: 0 m_GenerateMips: 1 diff --git a/Assets/Minimap/MinimapTexture.renderTexture.meta b/Assets/HUD/Minimap/MinimapTexture.renderTexture.meta similarity index 100% rename from Assets/Minimap/MinimapTexture.renderTexture.meta rename to Assets/HUD/Minimap/MinimapTexture.renderTexture.meta diff --git a/Assets/Minimap/cirlce_mask.png b/Assets/HUD/Minimap/cirlce_mask.png similarity index 100% rename from Assets/Minimap/cirlce_mask.png rename to Assets/HUD/Minimap/cirlce_mask.png diff --git a/Assets/Minimap/cirlce_mask.png.meta b/Assets/HUD/Minimap/cirlce_mask.png.meta similarity index 100% rename from Assets/Minimap/cirlce_mask.png.meta rename to Assets/HUD/Minimap/cirlce_mask.png.meta diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 25aebb3..9a1617f 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -139,7 +139,7 @@ CapsuleCollider: m_IsTrigger: 0 m_Enabled: 1 m_Radius: 0.8 - m_Height: 3.5 + m_Height: 4 m_Direction: 1 m_Center: {x: 0, y: 0, z: 0} --- !u!54 &95348670 @@ -172,6 +172,11 @@ MonoBehaviour: m_EditorClassIdentifier: terrain: {fileID: 1417065444} prefab: {fileID: 194332003443584216, guid: 1c0b2ac83b1c14641b7e9eee6c5776b3, type: 3} +--- !u!4 &95348674 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + m_PrefabInstance: {fileID: 8390537188401440993} + m_PrefabAsset: {fileID: 0} --- !u!1 &114639927 GameObject: m_ObjectHideFlags: 0 @@ -986,8 +991,8 @@ RectTransform: 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: -3.9089966} - m_SizeDelta: {x: 78.3094, y: 46.091} + m_AnchoredPosition: {x: 1.7000122, y: -0.016723633} + m_SizeDelta: {x: 72.6616, y: 13.0733} m_Pivot: {x: 0, y: 1} --- !u!114 &1395840126 MonoBehaviour: @@ -1050,14 +1055,14 @@ MonoBehaviour: m_faceColor: serializedVersion: 2 rgba: 4294967295 - m_fontSize: 15 - m_fontSizeBase: 15 + m_fontSize: 12 + m_fontSizeBase: 12 m_fontWeight: 400 m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 1 - m_HorizontalAlignment: 4 + m_HorizontalAlignment: 1 m_VerticalAlignment: 256 m_textAlignment: 65535 m_characterSpacing: 0 @@ -1100,6 +1105,94 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1395840124} m_CullTransparentMesh: 1 +--- !u!1 &1416366111 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1416366114} + - component: {fileID: 1416366112} + - component: {fileID: 1416366113} + m_Layer: 0 + m_Name: MinimapCamera + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!20 &1416366112 +Camera: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1416366111} + m_Enabled: 1 + serializedVersion: 2 + m_ClearFlags: 4 + m_BackGroundColor: {r: 0.19326274, g: 0.48865005, b: 0.9528302, 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.01 + far clip plane: 1000 + field of view: 60 + orthographic: 1 + orthographic size: 30 + m_Depth: -1 + m_CullingMask: + serializedVersion: 2 + m_Bits: 4294967295 + m_RenderingPath: -1 + m_TargetTexture: {fileID: 8400000, guid: 2528b91a6c8f85e44b612cc07ebb36ae, type: 2} + m_TargetDisplay: 0 + m_TargetEye: 3 + m_HDR: 1 + m_AllowMSAA: 0 + m_AllowDynamicResolution: 0 + m_ForceIntoRT: 0 + m_OcclusionCulling: 1 + m_StereoConvergence: 10 + m_StereoSeparation: 0.022 +--- !u!114 &1416366113 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1416366111} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: cae4d204e179a7d4d87a943ab285ac92, type: 3} + m_Name: + m_EditorClassIdentifier: + player: {fileID: 95348674} +--- !u!4 &1416366114 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1416366111} + m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} + m_LocalPosition: {x: 0, y: 100, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 7 + m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!1 &1417065444 stripped GameObject: m_CorrespondingSourceObject: {fileID: 7029954221290272535, guid: bb7ccf3dcb131ed4cbdc3e66d7f136a0, type: 3} @@ -1546,6 +1639,22 @@ PrefabInstance: propertyPath: mouseSensitivityY value: 600 objectReference: {fileID: 0} + - target: {fileID: 8390537187866079439, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + propertyPath: m_BackGroundColor.a + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8390537187866079439, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + propertyPath: m_BackGroundColor.b + value: 0.9528302 + objectReference: {fileID: 0} + - target: {fileID: 8390537187866079439, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + propertyPath: m_BackGroundColor.g + value: 0.48865005 + objectReference: {fileID: 0} + - target: {fileID: 8390537187866079439, guid: 6a86db7765f277243b912c20f451dc47, type: 3} + propertyPath: m_BackGroundColor.r + value: 0.19326274 + objectReference: {fileID: 0} - target: {fileID: 8390537188327132961, guid: 6a86db7765f277243b912c20f451dc47, type: 3} propertyPath: interactionText value: @@ -1608,7 +1717,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} propertyPath: m_LocalPosition.y - value: 25.47 + value: 25 objectReference: {fileID: 0} - target: {fileID: 8390537188327133022, guid: 6a86db7765f277243b912c20f451dc47, type: 3} propertyPath: m_LocalPosition.z @@ -1644,7 +1753,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8390537189371922023, guid: 6a86db7765f277243b912c20f451dc47, type: 3} propertyPath: m_LocalPosition.z - value: -18.4 + value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6a86db7765f277243b912c20f451dc47, type: 3}