upgrade 5.4.3

zuohu · Jan 12, 2017 · 475dc6b · 475dc6b
1 parent 41b971a
commit 475dc6b
Show file tree

Hide file tree

Showing 6 changed files with 172 additions and 54 deletions.
diff --git a/Assets/Demo/DemoScene.unity b/Assets/Demo/DemoScene.unity
@@ -13,7 +13,7 @@ SceneSettings:
 --- !u!104 &2
 RenderSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 6
+  serializedVersion: 7
   m_Fog: 0
   m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
   m_FogMode: 3
@@ -37,12 +37,12 @@ RenderSettings:
   m_ReflectionIntensity: 1
   m_CustomReflection: {fileID: 0}
   m_Sun: {fileID: 0}
+  m_IndirectSpecularColor: {r: 0, g: 0, b: 0, a: 1}
 --- !u!157 &4
 LightmapSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 6
+  serializedVersion: 7
   m_GIWorkflowMode: 1
-  m_LightmapsMode: 1
   m_GISettings:
     serializedVersion: 2
     m_BounceScale: 1
@@ -53,17 +53,22 @@ LightmapSettings:
     m_EnableBakedLightmaps: 1
     m_EnableRealtimeLightmaps: 1
   m_LightmapEditorSettings:
-    serializedVersion: 3
+    serializedVersion: 4
     m_Resolution: 2
     m_BakeResolution: 40
     m_TextureWidth: 1024
     m_TextureHeight: 1024
+    m_AO: 0
     m_AOMaxDistance: 1
-    m_Padding: 2
     m_CompAOExponent: 0
+    m_CompAOExponentDirect: 0
+    m_Padding: 2
     m_LightmapParameters: {fileID: 0}
+    m_LightmapsBakeMode: 1
     m_TextureCompression: 1
+    m_DirectLightInLightProbes: 1
     m_FinalGather: 0
+    m_FinalGatherFiltering: 1
     m_FinalGatherRayCount: 1024
     m_ReflectionCompression: 2
   m_LightingDataAsset: {fileID: 0}
@@ -554,9 +559,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ab7b38d60c9f6a944831d24146f39793, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  prefabPool: {fileID: 0}
-  prefabPoolName: ScrollCell2
+  prefabName: ScrollCell2
   totalCount: 30
+  poolSize: 5
   threshold: 100
   reverseDirection: 0
   rubberScale: 1
@@ -958,9 +963,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ce71017a2903f7c4c9a699e438d0b897, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  prefabPool: {fileID: 0}
-  prefabPoolName: ScrollCell1
+  prefabName: ScrollCell1
   totalCount: 50
+  poolSize: 5
   threshold: 100
   reverseDirection: 1
   rubberScale: 1
@@ -1061,9 +1066,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ab7b38d60c9f6a944831d24146f39793, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  prefabPool: {fileID: 0}
-  prefabPoolName: ScrollCell3
+  prefabName: ScrollCell2
   totalCount: 30
+  poolSize: 5
   threshold: 100
   reverseDirection: 0
   rubberScale: 1
@@ -1412,9 +1417,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ce71017a2903f7c4c9a699e438d0b897, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  prefabPool: {fileID: 0}
-  prefabPoolName: ScrollCell1
+  prefabName: ScrollCell1
   totalCount: 50
+  poolSize: 5
   threshold: 100
   reverseDirection: 0
   rubberScale: 1
@@ -1804,9 +1809,9 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: ce71017a2903f7c4c9a699e438d0b897, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  prefabPool: {fileID: 0}
-  prefabPoolName: ScrollCell3
+  prefabName: ScrollCell3
   totalCount: 54
+  poolSize: 5
   threshold: 100
   reverseDirection: 0
   rubberScale: 1

diff --git a/Assets/Scripts/Editor/LoopScrollRectInspector.cs b/Assets/Scripts/Editor/LoopScrollRectInspector.cs
@@ -11,11 +11,6 @@ public override void OnInspectorGUI ()
         EditorGUILayout.Space();
 
         LoopScrollRect scroll = (LoopScrollRect)target;
-		scroll.prefabName = EditorGUILayout.TextField("Prefab Name", scroll.prefabName);
-        scroll.totalCount = EditorGUILayout.IntField("Total Count", scroll.totalCount);
-        scroll.threshold = Mathf.Max(10, EditorGUILayout.FloatField("Threshold", scroll.threshold));
-        scroll.reverseDirection = EditorGUILayout.Toggle("Reverse Direction", scroll.reverseDirection);
-        scroll.rubberScale = Mathf.Max(0.01f, EditorGUILayout.FloatField("Rubber Scale", scroll.rubberScale));
         EditorGUILayout.BeginHorizontal();
         if(GUILayout.Button("Clear"))
         {

diff --git a/Assets/Scripts/LoopScrollRect.cs b/Assets/Scripts/LoopScrollRect.cs
@@ -13,24 +13,24 @@ public abstract class LoopScrollRect : UIBehaviour, IInitializePotentialDragHand
         //==========LoopScrollRect==========
         public delegate string prefabNameDelegate(int idx);
         public delegate int prefabCountDelegate(int idx);
-        [HideInInspector]
+        [Tooltip("Prefab Name in Resources")]
         public string prefabName;
         [HideInInspector]
         public prefabNameDelegate prefabNameFunc = null;
         [HideInInspector]
         public prefabCountDelegate prefabCountFunc = null;
-        [HideInInspector]
-        public int totalCount;  //negative means INFINITE mode
+        [Tooltip("Total count, negative means INFINITE mode")]
+        public int totalCount;
         [HideInInspector]
         public int poolSize = 5;
         [HideInInspector]
         [NonSerialized]
         public object[] objectsToFill = null;
-        [HideInInspector]
+        [Tooltip("Threshold for preloading")]
         public float threshold = 100;
-        [HideInInspector]
+        [Tooltip("Reverse direction for dragging")]
         public bool reverseDirection = false;
-        [HideInInspector]
+        [Tooltip("Rubber scale for outside")]
         public float rubberScale = 1;
 
         protected int itemTypeStart = 0;

diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
@@ -3,16 +3,31 @@
 --- !u!30 &1
 GraphicsSettings:
   m_ObjectHideFlags: 0
-  serializedVersion: 5
+  serializedVersion: 7
   m_Deferred:
     m_Mode: 1
     m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
   m_DeferredReflections:
     m_Mode: 1
     m_Shader: {fileID: 74, guid: 0000000000000000f000000000000000, type: 0}
+  m_ScreenSpaceShadows:
+    m_Mode: 1
+    m_Shader: {fileID: 64, guid: 0000000000000000f000000000000000, type: 0}
   m_LegacyDeferred:
     m_Mode: 1
     m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0}
+  m_DepthNormals:
+    m_Mode: 1
+    m_Shader: {fileID: 62, guid: 0000000000000000f000000000000000, type: 0}
+  m_MotionVectors:
+    m_Mode: 1
+    m_Shader: {fileID: 75, guid: 0000000000000000f000000000000000, type: 0}
+  m_LightHalo:
+    m_Mode: 1
+    m_Shader: {fileID: 105, guid: 0000000000000000f000000000000000, type: 0}
+  m_LensFlare:
+    m_Mode: 1
+    m_Shader: {fileID: 102, guid: 0000000000000000f000000000000000, type: 0}
   m_AlwaysIncludedShaders:
   - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
@@ -21,8 +36,23 @@ GraphicsSettings:
   - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
-  m_ShaderSettings:
-    useScreenSpaceShadows: 1
+  m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
+    type: 0}
+  m_ShaderSettings_Tier1:
+    useCascadedShadowMaps: 1
+    standardShaderQuality: 2
+    useReflectionProbeBoxProjection: 1
+    useReflectionProbeBlending: 1
+  m_ShaderSettings_Tier2:
+    useCascadedShadowMaps: 1
+    standardShaderQuality: 2
+    useReflectionProbeBoxProjection: 1
+    useReflectionProbeBlending: 1
+  m_ShaderSettings_Tier3:
+    useCascadedShadowMaps: 1
+    standardShaderQuality: 2
+    useReflectionProbeBoxProjection: 1
+    useReflectionProbeBlending: 1
   m_BuildTargetShaderSettings: []
   m_LightmapStripping: 0
   m_FogStripping: 0