Browse Source

camera postion default

Виктор 4 years ago
parent
commit
ad8aee4b50

BIN
Assets/New Terrain.asset


+ 8 - 0
Assets/New Terrain.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: d8e8d91a0a78c2d458fbbd1d4b91bd62
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 248 - 1
Assets/Scenes/Player.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.4465782, g: 0.49641252, b: 0.5748167, a: 1}
+  m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -2363,6 +2363,7 @@ RectTransform:
   - {fileID: 935354066}
   - {fileID: 583944820}
   - {fileID: 2098093787}
+  - {fileID: 1186343482}
   m_Father: {fileID: 0}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -12724,7 +12725,9 @@ MonoBehaviour:
   movementSpeed: 0.1
   mouseSpeed: 4
   smoothness: 0.85
+  ButtonCameraCenter: {fileID: 1186343484}
   target: {fileID: 0}
+  location: {fileID: 0}
   lookSpeedH: 2
   lookSpeedV: 2
   zoomSpeed: 25
@@ -17148,6 +17151,126 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 748258783}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1001 &749979592
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 1186343482}
+    m_Modifications:
+    - target: {fileID: -7895018046615233804, guid: 723cf9e542843a7419a5cf41be875cee,
+        type: 3}
+      propertyPath: m_Name
+      value: control_camera-24px
+      objectReference: {fileID: 0}
+    - target: {fileID: -7665670506678497605, guid: 723cf9e542843a7419a5cf41be875cee,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -7665670506678497605, guid: 723cf9e542843a7419a5cf41be875cee,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -7665670506678497605, guid: 723cf9e542843a7419a5cf41be875cee,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -7665670506678497605, guid: 723cf9e542843a7419a5cf41be875cee,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -7665670506678497605, guid: 723cf9e542843a7419a5cf41be875cee,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -7665670506678497605, guid: 723cf9e542843a7419a5cf41be875cee,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -7665670506678497605, guid: 723cf9e542843a7419a5cf41be875cee,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -7665670506678497605, guid: 723cf9e542843a7419a5cf41be875cee,
+        type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -7665670506678497605, guid: 723cf9e542843a7419a5cf41be875cee,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -7665670506678497605, guid: 723cf9e542843a7419a5cf41be875cee,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -7665670506678497605, guid: 723cf9e542843a7419a5cf41be875cee,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -7665670506678497605, guid: 723cf9e542843a7419a5cf41be875cee,
+        type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -7665670506678497605, guid: 723cf9e542843a7419a5cf41be875cee,
+        type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -7665670506678497605, guid: 723cf9e542843a7419a5cf41be875cee,
+        type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: -7665670506678497605, guid: 723cf9e542843a7419a5cf41be875cee,
+        type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 20
+      objectReference: {fileID: 0}
+    - target: {fileID: -7665670506678497605, guid: 723cf9e542843a7419a5cf41be875cee,
+        type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: -7665670506678497605, guid: 723cf9e542843a7419a5cf41be875cee,
+        type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: -7665670506678497605, guid: 723cf9e542843a7419a5cf41be875cee,
+        type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: -7665670506678497605, guid: 723cf9e542843a7419a5cf41be875cee,
+        type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: -7665670506678497605, guid: 723cf9e542843a7419a5cf41be875cee,
+        type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: -7665670506678497605, guid: 723cf9e542843a7419a5cf41be875cee,
+        type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 7243324766535440047, guid: 723cf9e542843a7419a5cf41be875cee,
+    type: 3}
 --- !u!1 &750472231
 GameObject:
   m_ObjectHideFlags: 0
@@ -27231,6 +27354,12 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: 
+--- !u!224 &1170208991 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: -7665670506678497605, guid: 723cf9e542843a7419a5cf41be875cee,
+    type: 3}
+  m_PrefabInstance: {fileID: 749979592}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1180778091
 GameObject:
   m_ObjectHideFlags: 0
@@ -27495,6 +27624,124 @@ MeshFilter:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1185099739}
   m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!1 &1186343481
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1186343482}
+  - component: {fileID: 1186343486}
+  - component: {fileID: 1186343485}
+  - component: {fileID: 1186343484}
+  m_Layer: 5
+  m_Name: ButtonCameraCenter
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1186343482
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1186343481}
+  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_Children:
+  - {fileID: 1170208991}
+  m_Father: {fileID: 100471033}
+  m_RootOrder: 15
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 1, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: -46, y: -16}
+  m_SizeDelta: {x: 30, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &1186343484
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1186343481}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1186343485}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &1186343485
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1186343481}
+  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_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
+  m_Type: 1
+  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!222 &1186343486
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1186343481}
+  m_CullTransparentMesh: 0
 --- !u!1 &1188673579
 GameObject:
   m_ObjectHideFlags: 0

+ 7 - 15
Assets/Scripts/Controllers/CameraController.cs

@@ -216,20 +216,13 @@ public class CameraController : MonoBehaviour
             var pos = location.transform.position;
             var scale = location.transform.localScale;
 
-            //float distance = Mathf.Max(pos.x, pos.y, pos.z);
-            //distance /= Mathf.Tan(0.5f * GetComponent<Camera>().fieldOfView * Mathf.Deg2Rad);
-            //// Move camera in -z-direction; change '2.0f' to your needs
-           
-            transform.position = new Vector3(pos.x - scale.x / 2, transform.position.y, pos.z - scale.z / 2);
-
-            //if(Screen.width > Screen.height)
-            //transform.position = new Vector3(Mathf.Clamp(transform.position.x, Screen.width / 2, Screen.width / 2), transform.position.y, transform.position.z);
-            //transform.position = Camera.main.ScreenToWorldPoint(new Vector3(Screen.width / 2, location.transform.position.z, Screen.height / 2));
-            //Vector3 centerPos = Camera.main.ViewportToWorldPoint(new Vector3(0.5f, 0.5f, -Vector3.Distance(location.transform.position, Camera.main.nearClipPlane)));
-            //transform.position = centerPos;
-            //transform.localScale = initialScale * dist * objectScale;
-
-            //transform.position = new Vector3(pos.x - scale.x/2, 12, pos.z - scale.z / 2);
+            var x = pos.x - scale.x / 2;
+            float y;
+            var z = pos.z - scale.z / 2;
+            if (x >= z)
+                y = scale.x * 8;
+            else y = scale.z * 8;
+            transform.position = new Vector3(x, y, z);
         }
         else
             transform.position = new Vector3(5, 12, 5);
@@ -240,5 +233,4 @@ public class CameraController : MonoBehaviour
         pitch = transform.eulerAngles.x;
     }
 
-    
 }

+ 5 - 1
Assets/Scripts/Models/Location.cs

@@ -156,7 +156,11 @@ public class Location
                     var lz = lzs.ZoneInfos[z.id];
                     lz.gameObject.SetActive(active);
                 }
-        if (active) Camera.main.GetComponent<CameraController>().location = plane;
+        if (active)
+        {
+            Camera.main.GetComponent<CameraController>().location = plane;
+            Camera.main.GetComponent<CameraController>().CameraCenter();
+        }
     }
 }