Browse Source

改了不少bug

wartheking 1 year ago
parent
commit
73a1d76da5

+ 130 - 2
Assets/Prefabs/MiniMap.prefab

@@ -24,7 +24,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 970675354}
   m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0.40016234, y: -6.5742188, z: -0.4000244}
+  m_LocalPosition: {x: 4.89, y: 13.78, z: -0.4000244}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -41,7 +41,7 @@ GameObject:
   m_Component:
   - component: {fileID: 1644283074}
   m_Layer: 0
-  m_Name: StaticPoint
+  m_Name: FixPoint
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -63,8 +63,101 @@ Transform:
   - {fileID: 1060248767511300627}
   - {fileID: 970675355}
   m_Father: {fileID: 7069582396450853087}
+  m_RootOrder: 5
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &788774413769781883
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 5026639989605541792}
+  m_Layer: 0
+  m_Name: StaticPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &5026639989605541792
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 788774413769781883}
+  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: 7069582396450853087}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &4444992682839687692
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 7963525554212561013}
+  m_Layer: 0
+  m_Name: SWPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7963525554212561013
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4444992682839687692}
+  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: 7069582396450853087}
+  m_RootOrder: 6
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &5608233843928584891
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 1829979977482383576}
+  m_Layer: 0
+  m_Name: SWPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1829979977482383576
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5608233843928584891}
+  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: 7069582396450853087}
+  m_RootOrder: 8
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6012870164663179780
 GameObject:
   m_ObjectHideFlags: 0
@@ -177,7 +270,11 @@ Transform:
   - {fileID: 7069582396136518861}
   - {fileID: 7069582397022505400}
   - {fileID: 7069582396837082649}
+  - {fileID: 5026639989605541792}
   - {fileID: 1644283074}
+  - {fileID: 7963525554212561013}
+  - {fileID: 4541662238408593204}
+  - {fileID: 1829979977482383576}
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -344,6 +441,37 @@ MonoBehaviour:
   x_Count: 8
   y_Count: 8
   ab_Name: l14
+--- !u!1 &8307865863041227054
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 4541662238408593204}
+  m_Layer: 0
+  m_Name: QXPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4541662238408593204
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8307865863041227054}
+  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: 7069582396450853087}
+  m_RootOrder: 7
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8396125779924330567
 GameObject:
   m_ObjectHideFlags: 0

File diff suppressed because it is too large
+ 98 - 1
Assets/Scene 1.unity


+ 5 - 5
Assets/Scripts/UI/UIView/GCJK/GCJKLayer.cs

@@ -457,7 +457,7 @@ public class GCJKLayer : YZTRootLayer
                     dropUnits.Add(dropUnit);
 
                     dropUnit.bingObj = Instantiate(runtimePointObj).gameObject;
-                    dropUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(0));
+                    dropUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(6));
                     dropUnit.bingObj.transform.localEulerAngles = Vector3.zero;
                     dropUnit.bingObj.transform.localScale = Vector3.one;
                     dropUnit.bingObj.transform.localPosition = CoordinateConverter.GeoToUGUISmall(GlobalData.qXZDatas[i].LGTD, GlobalData.qXZDatas[i].LTTD);
@@ -473,11 +473,11 @@ public class GCJKLayer : YZTRootLayer
                     dropUnits.Add(dropUnit);
 
                     dropUnit.bingObj = Instantiate(runtimePointObj).gameObject;
-                    dropUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(0));
+                    dropUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(7));
                     dropUnit.bingObj.transform.localEulerAngles = Vector3.zero;
                     dropUnit.bingObj.transform.localScale = Vector3.one;
-                    dropUnit.bingObj.transform.localPosition = CoordinateConverter.GeoToUGUISmall(GlobalData.qXZDatas[i].LGTD, GlobalData.qXZDatas[i].LTTD);
-                    dropUnit.bingObj.name = GlobalData.qXZDatas[i].STNM;
+                    dropUnit.bingObj.transform.localPosition = CoordinateConverter.GeoToUGUISmall(GlobalData.sWZDatas[i].LGTD, GlobalData.sWZDatas[i].LTTD);
+                    dropUnit.bingObj.name = GlobalData.sWZDatas[i].STNM;
                 }
             }
             else {
@@ -501,7 +501,7 @@ public class GCJKLayer : YZTRootLayer
                     weatherUnits.Add(weatherUnit);
 
                     weatherUnit.bingObj = Instantiate(runtimePointObj).gameObject;
-                    weatherUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(0));
+                    weatherUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(7));
                     weatherUnit.bingObj.transform.localEulerAngles = Vector3.zero;
                     weatherUnit.bingObj.transform.localScale = Vector3.one;
                     weatherUnit.bingObj.transform.localPosition = CoordinateConverter.GeoToUGUISmall(GlobalData.sWZDatas[i].LGTD, GlobalData.sWZDatas[i].LTTD);

+ 1 - 1
Assets/Scripts/UI/UIView/SWYJ/SWYJLayer.cs

@@ -352,7 +352,7 @@ public class StationData:IComparable
                     sWHeightUnits.Add(swHUnit);
 
                     swHUnit.bingObj = Instantiate(runtimePointObj).gameObject;
-                    swHUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(0));
+                    swHUnit.bingObj.transform.SetParent(shaPan.transform.GetChild(8));
                     swHUnit.bingObj.transform.localEulerAngles = Vector3.zero;
                     swHUnit.bingObj.transform.localScale = Vector3.one;
                     swHUnit.bingObj.transform.localPosition = CoordinateConverter.GeoToUGUISmall(GlobalData.swDatas[i].LGTD, GlobalData.swDatas[i].LTTD);

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

@@ -40,9 +40,9 @@ public class OnePicNav : MonoBehaviour
     void InitButton() {
         shaPan = GameObject.FindGameObjectWithTag("ShaPan");
         Debug.Log(shaPan);
-        runtimePointStaticBind.Add(shaPan.transform.GetChild(4).GetChild(0));
-        runtimePointStaticBind.Add(shaPan.transform.GetChild(4).GetChild(1));
-        runtimePointStaticBind.Add(shaPan.transform.GetChild(4).GetChild(2));
+        runtimePointStaticBind.Add(shaPan.transform.GetChild(5).GetChild(0));
+        runtimePointStaticBind.Add(shaPan.transform.GetChild(5).GetChild(1));
+        runtimePointStaticBind.Add(shaPan.transform.GetChild(5).GetChild(2));
         CameraManager.SwitchCamera(1);
         btns = new List<Button>();
         Button[] bts = this.GetComponentsInChildren<Button>();

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

@@ -264,7 +264,7 @@ public class YZTLayer : YZTRootLayer
             newPoint.InitPoint(layerSprite[(int)(temp.type)], temp.name_pri, temp.name);;
             newPoint.layerIDs.Add((int)(temp.type));
             newPoint.bingObj = Instantiate(runtimePointObj).gameObject;
-            newPoint.bingObj.transform.SetParent(shaPan.transform);
+            newPoint.bingObj.transform.SetParent(shaPan.transform.GetChild(4));
             newPoint.bingObj.transform.localEulerAngles = Vector3.zero;
             newPoint.bingObj.transform.localScale = Vector3.one;
             newPoint.bingObj.transform.localPosition = CoordinateConverter.GeoToUGUISmall(temp.longitude, temp.latitude);

Some files were not shown because too many files changed in this diff