wartheking 9 сар өмнө
parent
commit
324bb3108b

+ 34 - 3
Assets/Prefabs/MiniMap.prefab

@@ -30,7 +30,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7069582396450853087}
-  m_RootOrder: 11
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &4078470270552625224
 MonoBehaviour:
@@ -259,6 +259,37 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &2353585198443455908
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1217287279818896347}
+  m_Layer: 0
+  m_Name: MovePath1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1217287279818896347
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2353585198443455908}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.5, y: -6.7, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7069582396450853087}
+  m_RootOrder: 11
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &3793048173667531158
 GameObject:
   m_ObjectHideFlags: 0
@@ -653,6 +684,7 @@ Transform:
   - {fileID: 7963525554212561013}
   - {fileID: 1829979977482383576}
   - {fileID: 1216517146}
+  - {fileID: 1217287279818896347}
   - {fileID: 249304408}
   - {fileID: 5621129756599565973}
   m_Father: {fileID: 0}
@@ -693,7 +725,6 @@ MonoBehaviour:
     max_X_Range: {x: 9.541028, y: 13.84961}
     min_Y_Range: {x: 62.98047, y: -67.97656}
     max_Y_Range: {x: 44.17188, y: -39.76172}
-  currentMapIndex: 2
   MapStayList:
   - map: {fileID: 4078470270552625224}
     cameraDistanceMin: 1
@@ -828,7 +859,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 5621129755424649727, guid: 466bb753b62a3ff4e984a9a361241e70, type: 3}
       propertyPath: m_RootOrder
-      value: 12
+      value: 13
       objectReference: {fileID: 0}
     - target: {fileID: 5621129755424649727, guid: 466bb753b62a3ff4e984a9a361241e70, type: 3}
       propertyPath: m_LocalScale.x

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 240 - 240
Assets/Prefabs/UI/XHYZT/YZT.prefab


+ 4 - 4
Assets/Scripts/UI/UIView/FHSS/FHSSLayer.cs

@@ -49,10 +49,10 @@ public class FHSSLayer : YZTRootLayer
     private void LateUpdate()
     {
         if (hotPoints.Length > 3) {
-            hotPoints[0].anchoredPosition = CameraManager.instance.mainCamera.WorldToScreenPoint(StaticLod.instance.staticImportants[0].transform.position);
-            hotPoints[1].anchoredPosition = CameraManager.instance.mainCamera.WorldToScreenPoint(StaticLod.instance.staticImportants[1].transform.position);
-            hotPoints[2].anchoredPosition = CameraManager.instance.mainCamera.WorldToScreenPoint(StaticLod.instance.staticImportants[3].transform.position);
-            hotPoints[3].anchoredPosition = CameraManager.instance.mainCamera.WorldToScreenPoint(StaticLod.instance.staticImportants[6].transform.position);
+            hotPoints[0].anchoredPosition = CameraManager.instance.mainCamera.WorldToScreenPoint(StaticLod.instance.staticImportants[0].transform.position) / Screen.width * 1920.0f; ;
+            hotPoints[1].anchoredPosition = CameraManager.instance.mainCamera.WorldToScreenPoint(StaticLod.instance.staticImportants[1].transform.position) / Screen.width * 1920.0f; ;
+            hotPoints[2].anchoredPosition = CameraManager.instance.mainCamera.WorldToScreenPoint(StaticLod.instance.staticImportants[3].transform.position) / Screen.width * 1920.0f; ;
+            hotPoints[3].anchoredPosition = CameraManager.instance.mainCamera.WorldToScreenPoint(StaticLod.instance.staticImportants[6].transform.position) / Screen.width * 1920.0f; ;
         }
     }
 }

+ 3 - 3
Assets/Scripts/UI/UIView/YZT/YZTLayer.cs

@@ -769,21 +769,21 @@ public class YZTLayer : YZTRootLayer
         for (int i = 0; i < regionLayerInfo.Length; i++) 
         {
             if (regionLayerInfo[i].gameObject.activeSelf) {
-                regionLayerInfo[i].anchoredPosition = CameraManager.instance.secondCamera.WorldToScreenPoint(regionLayerObj[i].transform.position);
+                regionLayerInfo[i].anchoredPosition = CameraManager.instance.secondCamera.WorldToScreenPoint(regionLayerObj[i].transform.position) / Screen.width * 1920.0f;
             }
         }
         for (int i = 0; i < riverLayerInfo.Length; i++)
         {
             if (riverLayerInfo[i].gameObject.activeSelf)
             {
-                riverLayerInfo[i].anchoredPosition = CameraManager.instance.secondCamera.WorldToScreenPoint(riverLayerObj[i].transform.position);
+                riverLayerInfo[i].anchoredPosition = CameraManager.instance.secondCamera.WorldToScreenPoint(riverLayerObj[i].transform.position) / Screen.width * 1920.0f;
             }
         }
         for (int i = 0; i < lakeLayerInfo.Length; i++)
         {
             if (lakeLayerInfo[i].gameObject.activeSelf)
             {
-                lakeLayerInfo[i].anchoredPosition = CameraManager.instance.secondCamera.WorldToScreenPoint(lakeLayerObj[i].transform.position);
+                lakeLayerInfo[i].anchoredPosition = CameraManager.instance.secondCamera.WorldToScreenPoint(lakeLayerObj[i].transform.position) / Screen.width * 1920.0f;
             }
         }
     }

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно