Merge branch 'master' of http://172.16.1.12/taosuqi/ZhangZhouSpecialEquipment

Assets/Scenes/Scenes/起重机_tsq.unity

@@ -268,7 +268,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8776679792339269714, guid: 610b16e54d3019a459bf7ea796944abe, type: 3}
       propertyPath: m_RootOrder
-      value: 15
+      value: 14
       objectReference: {fileID: 0}
     - target: {fileID: 8776679792339269714, guid: 610b16e54d3019a459bf7ea796944abe, type: 3}
       propertyPath: m_LocalPosition.x
@@ -1568,7 +1568,7 @@ Transform:
   - {fileID: 1130828741}
   - {fileID: 1199911445}
   m_Father: {fileID: 0}
-  m_RootOrder: 12
+  m_RootOrder: 11
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &235650345
 GameObject:
@@ -1839,7 +1839,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 16
+  m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &287894956
 GameObject:
@@ -2298,7 +2298,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 14
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &413568124
 GameObject:
@@ -2441,7 +2441,7 @@ MonoBehaviour:
         m_Calls:
         - m_Target: {fileID: 573975659}
           m_TargetAssemblyTypeName: CraneController, Assembly-CSharp
-          m_MethodName: StartHookRight
+          m_MethodName: StartHookLeft
           m_Mode: 1
           m_Arguments:
             m_ObjectArgument: {fileID: 0}
@@ -2457,7 +2457,7 @@ MonoBehaviour:
         m_Calls:
         - m_Target: {fileID: 573975659}
           m_TargetAssemblyTypeName: CraneController, Assembly-CSharp
-          m_MethodName: StopHookRight
+          m_MethodName: StopHookLeft
           m_Mode: 1
           m_Arguments:
             m_ObjectArgument: {fileID: 0}
@@ -3703,7 +3703,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 0}
-  m_RootOrder: 10
+  m_RootOrder: 16
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &790027891
 GameObject:
@@ -5547,7 +5547,7 @@ RectTransform:
   - {fileID: 1841785320}
   - {fileID: 676480028}
   m_Father: {fileID: 0}
-  m_RootOrder: 13
+  m_RootOrder: 12
   m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -5563,7 +5563,7 @@ PrefabInstance:
     m_Modifications:
     - target: {fileID: -8679921383154817045, guid: 90a266a05fd8c2940b7d5825f72d926b, type: 3}
       propertyPath: m_RootOrder
-      value: 11
+      value: 10
       objectReference: {fileID: 0}
     - target: {fileID: -8679921383154817045, guid: 90a266a05fd8c2940b7d5825f72d926b, type: 3}
       propertyPath: m_LocalPosition.x
@@ -6228,7 +6228,7 @@ MonoBehaviour:
         m_Calls:
         - m_Target: {fileID: 573975659}
           m_TargetAssemblyTypeName: CraneController, Assembly-CSharp
-          m_MethodName: StartHookLeft
+          m_MethodName: StartHookRight
           m_Mode: 1
           m_Arguments:
             m_ObjectArgument: {fileID: 0}
@@ -6244,7 +6244,7 @@ MonoBehaviour:
         m_Calls:
         - m_Target: {fileID: 573975659}
           m_TargetAssemblyTypeName: CraneController, Assembly-CSharp
-          m_MethodName: StopHookLeft
+          m_MethodName: StopHookRight
           m_Mode: 1
           m_Arguments:
             m_ObjectArgument: {fileID: 0}