fixed missing tags and materials

sonejilab · Feb 6, 2018 · bef690a · bef690a
1 parent 7986976
commit bef690a
Show file tree

Hide file tree

Showing 461 changed files with 4,803 additions and 72,025 deletions.
diff --git a/Assets/Handcrafted Mobile/CurvedVRKeyboard/Resources/Meshes/QuadForSpaceFront.asset b/Assets/Handcrafted Mobile/CurvedVRKeyboard/Resources/Meshes/QuadForSpaceFront.asset
@@ -12,6 +12,7 @@ Mesh:
     firstByte: 0
     indexCount: 180
     topology: 0
+    baseVertex: 0
     firstVertex: 0
     vertexCount: 44
     localAABB:
@@ -29,6 +30,7 @@ Mesh:
   m_IsReadable: 1
   m_KeepVertices: 1
   m_KeepIndices: 1
+  m_IndexFormat: 0
   m_IndexBuffer: 040001000000010004000500050002000100020005000600060003000200030006000700080005000400050008000900090006000500060009000a000a000700060007000a000b000c000900080009000c000d000d000a0009000a000d000e000e000b000a000b000e000f0010000d000c000d001000110011000e000d000e001100120012000f000e000f0012001300140011001000110014001500150012001100120015001600160013001200130016001700180015001400150018001900190016001500160019001a001a001700160017001a001b001c001900180019001c001d001d001a0019001a001d001e001e001b001a001b001e001f0020001d001c001d002000210021001e001d001e002100220022001f001e001f0022002300240021002000210024002500250022002100220025002600260023002200230026002700280025002400250028002900290026002500260029002a002a002700260027002a002b00
   m_Skin: []
   m_VertexData:

diff --git a/...gbow/Materials/ItemPickupOutlineThick.mat → Assets/Materials/ItemPickupOutlineThick.mat b/...gbow/Materials/ItemPickupOutlineThick.mat → Assets/Materials/ItemPickupOutlineThick.mat
diff --git a/.../Prefabs/[CameraRig]_modified.prefab.meta → ...Materials/ItemPickupOutlineThick.mat.meta b/.../Prefabs/[CameraRig]_modified.prefab.meta → ...Materials/ItemPickupOutlineThick.mat.meta
diff --git a/Assets/Photon Unity Networking/Editor/PhotonNetwork/PhotonEditor.cs b/Assets/Photon Unity Networking/Editor/PhotonNetwork/PhotonEditor.cs
@@ -480,7 +480,7 @@ protected virtual void UiMainWizard()
             GUILayout.Space(15);
         }
 #if !(UNITY_5_0 || UNITY_5 || UNITY_5_3_AND_NEWER)
-        else if (!InternalEditorUtility.HasAdvancedLicenseOnBuildTarget(BuildTarget.Android) || !InternalEditorUtility.HasAdvancedLicenseOnBuildTarget(BuildTarget.iPhone))
+        else if (!InternalEditorUtility.HasAdvancedLicenseOnBuildTarget(BuildTarget.Android) || !InternalEditorUtility.HasAdvancedLicenseOnBuildTarget(BuildTarget.iOS))
         {
             GUILayout.Label(CurrentLang.MobileExportNoteLabel);
             GUILayout.Space(15);

diff --git a/Assets/Prefabs/Cage.prefab b/Assets/Prefabs/Cage.prefab
@@ -115,6 +115,7 @@ MeshRenderer:
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -130,6 +131,7 @@ MeshRenderer:
   m_PreserveUVs: 0
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
   m_SelectedEditorRenderState: 3
   m_MinimumChartSize: 4
   m_AutoUVMaxDistance: 0.5
@@ -147,11 +149,12 @@ MeshRenderer:
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
   m_Materials:
-  - {fileID: 2100000, guid: 2102d5ed8ac150d4f8dc15381bd95b6b, type: 2}
+  - {fileID: 2100000, guid: 1a6f191f4c608ce4e9c8182a885102c1, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -162,6 +165,7 @@ MeshRenderer:
   m_PreserveUVs: 1
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
   m_SelectedEditorRenderState: 3
   m_MinimumChartSize: 4
   m_AutoUVMaxDistance: 0.5
@@ -179,6 +183,7 @@ MeshRenderer:
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
@@ -194,6 +199,7 @@ MeshRenderer:
   m_PreserveUVs: 1
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
   m_SelectedEditorRenderState: 3
   m_MinimumChartSize: 4
   m_AutoUVMaxDistance: 0.5