Browse Source

outline beacons and users

Виктор 4 years ago
parent
commit
2a24ebeae8

+ 20 - 0
Assets/Resources/GameObjects/Beacon.prefab

@@ -92,6 +92,7 @@ GameObject:
   - component: {fileID: 4182038595796904783}
   - component: {fileID: -3562534023566770947}
   - component: {fileID: 4728083338205450714}
+  - component: {fileID: -7431641928989581008}
   m_Layer: 0
   m_Name: Beacon
   m_TagString: Untagged
@@ -205,6 +206,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   TrackMarker: 0
+  UserId: 0
 --- !u!114 &4728083338205450714
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -218,6 +220,24 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   selectionCircle: {fileID: 0}
+--- !u!114 &-7431641928989581008
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2242877738869790936}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5fea29bb7c508c244a1f805a5fd3fc4d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  outlineMode: 0
+  outlineColor: {r: 1, g: 1, b: 1, a: 1}
+  outlineWidth: 2
+  precomputeOutline: 0
+  bakeKeys: []
+  bakeValues: []
 --- !u!1 &7008440185145172815
 GameObject:
   m_ObjectHideFlags: 0

+ 19 - 0
Assets/Resources/GameObjects/Capsule.prefab

@@ -501,6 +501,7 @@ GameObject:
   - component: {fileID: 1797457609747257703}
   - component: {fileID: 1656913084783095314}
   - component: {fileID: 1519149894480221915}
+  - component: {fileID: 701857141936335525}
   m_Layer: 0
   m_Name: Capsule
   m_TagString: Untagged
@@ -598,6 +599,24 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   TrackMarker: 1
   UserId: 0
+--- !u!114 &701857141936335525
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8932573520704893167}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5fea29bb7c508c244a1f805a5fd3fc4d, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  outlineMode: 0
+  outlineColor: {r: 1, g: 1, b: 1, a: 1}
+  outlineWidth: 2
+  precomputeOutline: 0
+  bakeKeys: []
+  bakeValues: []
 --- !u!1001 &1421491235581791104
 PrefabInstance:
   m_ObjectHideFlags: 0

+ 4 - 1
Assets/Scripts/Controllers/BeaconController.cs

@@ -53,10 +53,13 @@ public class BeaconController : MonoBehaviour
             screenPoint = Camera.main.WorldToScreenPoint(gameObject.transform.position);
             offset = gameObject.transform.position - Camera.main.ScreenToWorldPoint(new Vector3(Input.mousePosition.x, Input.mousePosition.y, screenPoint.z));
             info = true;
+           
             text.gameObject.GetComponent<RectTransform>().SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, 100);
             text.gameObject.GetComponent<RectTransform>().SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, 15);
             transform.GetComponent<LabelObjectScript>().enabled = false;
-        }        
+        }
+
+        GetComponent<Outline>().enabled = info;
     }
 
     // Перемещение

+ 2 - 0
Assets/Scripts/Controllers/CameraController.cs

@@ -150,10 +150,12 @@ public class CameraController : MonoBehaviour
         transform.Translate(0, 0, Input.GetAxis("Mouse ScrollWheel") * zoomSpeed, Space.Self);
 
         var marker_offset = new Vector3(target.position.x, targetPosition.y, target.position.z);
+        if(!target.GetComponent<Outline>().enabled) target.GetComponent<Outline>().enabled = true;
         targetPosition =Vector3.Lerp(transform.position, /*targetPosition + target.position - */marker_offset, (1.0f - smoothness));
         transform.position = targetPosition;
         if (Input.GetMouseButton(1))
         {
+            target.GetComponent<Outline>().enabled = false;
             axes = RotationAxes.Mouse;
 
             var player = PlayerController.instance;