Merge branch 'master' of http://gitea.umayle.com/huangjiayu/ElectricityBusinessHall_DigitalTwin

Assets/GameAssets/Scenes/南京/国网南京江北供电营业厅/国网南京江北供电营业厅.unity

@@ -190413,7 +190413,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 6
+  m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1001 &842656106
 PrefabInstance:
@@ -190549,7 +190549,7 @@ GameObject:
   m_Component:
   - component: {fileID: 846809139}
   m_Layer: 0
-  m_Name: Before
+  m_Name: U3DPoint
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -190562,14 +190562,15 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 846809138}
-  m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.00010684131}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 5.45, y: 1.56, z: -1.07}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
-  - {fileID: 1748901024}
+  - {fileID: 1390999389}
+  - {fileID: 113650027469655907}
   m_Father: {fileID: 0}
-  m_RootOrder: 4
+  m_RootOrder: 3
-  m_LocalEulerAnglesHint: {x: 0, y: 179.988, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &867044633
 GameObject:
   m_ObjectHideFlags: 0
@@ -277595,8 +277596,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1390999388}
-  m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.00000058114523}
+  m_LocalRotation: {x: -0, y: 1, z: -0, w: 0.00010684131}
-  m_LocalPosition: {x: 9.859238, y: -1.6640834, z: 3.4343498}
+  m_LocalPosition: {x: 1.4270172, y: 0, z: -0.7171215}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 2049324790}
@@ -277616,7 +277617,7 @@ Transform:
   - {fileID: 1518896166}
   - {fileID: 2029558974}
   - {fileID: 2112606416}
-  m_Father: {fileID: 1748901024}
+  m_Father: {fileID: 846809139}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1390999390
@@ -386394,37 +386395,6 @@ Transform:
   m_Father: {fileID: 1426672772}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1748901023
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1748901024}
-  m_Layer: 0
-  m_Name: GameObject
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1748901024
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1748901023}
-  m_LocalRotation: {x: -0, y: -1, z: -0, w: 0.00000058114523}
-  m_LocalPosition: {x: 9.8592415, y: 1.6640834, z: 3.4343383}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_Children:
-  - {fileID: 1390999389}
-  m_Father: {fileID: 846809139}
-  m_RootOrder: 0
-  m_LocalEulerAnglesHint: {x: 0, y: -180, z: 0}
 --- !u!1 &1751023671
 GameObject:
   m_ObjectHideFlags: 0
@@ -396165,7 +396135,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: 5227766042945756937, guid: 70fa000e1b3ac5a4ea53111d457606ab, type: 3}
       propertyPath: m_RootOrder
-      value: 5
+      value: 4
       objectReference: {fileID: 0}
     - target: {fileID: 5227766042945756937, guid: 70fa000e1b3ac5a4ea53111d457606ab, type: 3}
       propertyPath: m_LocalPosition.x
@@ -456388,7 +456358,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 113650027469655906}
   m_LocalRotation: {x: -0, y: -0.000106260166, z: -0, w: 1}
-  m_LocalPosition: {x: -14.267018, y: 1.56, z: -7.9428787}
+  m_LocalPosition: {x: -18.29, y: 0, z: -7.59}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 113650029200047605}
@@ -456396,8 +456366,8 @@ Transform:
   - {fileID: 113650028014665164}
   - {fileID: 113650028169862394}
   - {fileID: 1295623776}
-  m_Father: {fileID: 0}
+  m_Father: {fileID: 846809139}
-  m_RootOrder: 3
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &113650027471124819
 GameObject:
@@ -457379,8 +457349,8 @@ Transform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1195741018845190179}
-  m_LocalRotation: {x: -0.49242103, y: 0.0029090059, z: -0.0016458365, w: -0.8703507}
+  m_LocalRotation: {x: -0.4924212, y: 0.0029089858, z: -0.0016458264, w: -0.8703506}
-  m_LocalPosition: {x: 3.91, y: 21.72, z: -12.69}
+  m_LocalPosition: {x: -0.120000005, y: 19.62, z: -12.34}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children:
   - {fileID: 1195741020097080469}

Assets/Resources/Scripts/Main.cs

@@ -579,7 +579,7 @@ public class Main : UIBase
                 GlobalRoam(true);
             }
         }
-        
+
 
     }