|
|
@@ -20730,6 +20730,39 @@ CanvasRenderer:
|
|
|
m_PrefabAsset: {fileID: 0}
|
|
|
m_GameObject: {fileID: 2079368485}
|
|
|
m_CullTransparentMesh: 0
|
|
|
+<<<<<<<< HEAD:ModeDisplay/Assets/Scenes/运行原理/机械联动特性/220kV变压器-机械联动特性_old.unity
|
|
|
+========
|
|
|
+--- !u!1 &2079797490
|
|
|
+GameObject:
|
|
|
+ m_ObjectHideFlags: 0
|
|
|
+ m_CorrespondingSourceObject: {fileID: 0}
|
|
|
+ m_PrefabInstance: {fileID: 0}
|
|
|
+ m_PrefabAsset: {fileID: 0}
|
|
|
+ serializedVersion: 6
|
|
|
+ m_Component:
|
|
|
+ - component: {fileID: 2079797491}
|
|
|
+ m_Layer: 0
|
|
|
+ m_Name: GameObject
|
|
|
+ m_TagString: Untagged
|
|
|
+ m_Icon: {fileID: 0}
|
|
|
+ m_NavMeshLayer: 0
|
|
|
+ m_StaticEditorFlags: 0
|
|
|
+ m_IsActive: 1
|
|
|
+--- !u!4 &2079797491
|
|
|
+Transform:
|
|
|
+ m_ObjectHideFlags: 0
|
|
|
+ m_CorrespondingSourceObject: {fileID: 0}
|
|
|
+ m_PrefabInstance: {fileID: 0}
|
|
|
+ m_PrefabAsset: {fileID: 0}
|
|
|
+ m_GameObject: {fileID: 2079797490}
|
|
|
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
|
+ m_LocalPosition: {x: 1031.4003, y: 902.6642, z: 0.9291332}
|
|
|
+ m_LocalScale: {x: 1, y: 1, z: 1}
|
|
|
+ m_Children: []
|
|
|
+ m_Father: {fileID: 0}
|
|
|
+ m_RootOrder: 16
|
|
|
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
|
+>>>>>>>> LQD_合并前分支:ModeDisplay/Assets/Scenes/运行原理/机械联动特性/220kV变压器-机械联动特性_oldstest.unity
|
|
|
--- !u!1 &2085814483
|
|
|
GameObject:
|
|
|
m_ObjectHideFlags: 0
|
