Merge branch 'master' of http://git.umayle.com:2023/yulong/NewN_UAVPlane

Assets/Zion/Scenes/Contingenc_yediting_panl.unity

@@ -38,7 +38,7 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
-  m_IndirectSpecularColor: {r: 0.16836107, g: 0.30774397, b: 0.6377696, a: 1}
+  m_IndirectSpecularColor: {r: 0.16836116, g: 0.3077437, b: 0.6377673, a: 1}
   m_UseRadianceAmbientProbe: 0
 --- !u!157 &3
 LightmapSettings:
@@ -927653,7 +927653,7 @@ MonoBehaviour:
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
-  randSeed: 1807823968
+  randSeed: 1812595703
   isDoingTransition: 0
   minimumHeight: 0
 --- !u!114 &1820978574
@@ -1049151,6 +1049151,11 @@ PrefabInstance:
       propertyPath: m_Name
       value: Deviceinformation (2)
       objectReference: {fileID: 0}
+    - target: {fileID: 8515206956283252547, guid: 63dc87f8e483151438ee2bce2f42d317,
+        type: 3}
+      propertyPath: m_CharacterLimit
+      value: 2
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: 63dc87f8e483151438ee2bce2f42d317, type: 3}
 --- !u!224 &2039072614 stripped