fix sorting bug in editor

This commit is contained in:
2015-07-11 01:52:33 +06:00
parent 8aeca49513
commit ff2db6d279
10 changed files with 103 additions and 53 deletions

View File

@@ -19,7 +19,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>Temp\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;UNITY_5_0_1;UNITY_5_0;UNITY_5;ENABLE_LICENSE_RENAME;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_NEW_HIERARCHY;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_NONPRO;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX</DefineConstants>
<DefineConstants>DEBUG;TRACE;UNITY_5_1_1;UNITY_5_1;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_LICENSE;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_EDITOR_METRICS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;DEVELOPMENT_BUILD;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
@@ -53,6 +53,15 @@
<Reference Include="UnityEditor.UI">
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/Editor/UnityEditor.UI.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Networking">
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.Networking">
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Networking/Editor/UnityEditor.Networking.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Analytics">
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.Graphs">
<HintPath>/Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEditor.Graphs.dll</HintPath>
</Reference>
@@ -60,11 +69,14 @@
<HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.iOS.Extensions">
<HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/iossupport/UnityEditor.iOS.Extensions.dll</HintPath>
<HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.BB10.Extensions">
<HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/BlackBerryPlayer/UnityEditor.BB10.Extensions.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.SamsungTV.Extensions">
<HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/STVPlayer/STVPlayer/UnityEditor.SamsungTV.Extensions.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.WebGL.Extensions">
<HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll</HintPath>
</Reference>
@@ -78,7 +90,7 @@
<HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/MacStandaloneSupport/UnityEditor.OSXStandalone.Extensions.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.iOS.Extensions.Xcode">
<HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/iossupport/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
<HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

View File

@@ -19,7 +19,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>Temp\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;UNITY_5_0_1;UNITY_5_0;UNITY_5;ENABLE_LICENSE_RENAME;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_NEW_HIERARCHY;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_NONPRO;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX</DefineConstants>
<DefineConstants>DEBUG;TRACE;UNITY_5_1_1;UNITY_5_1;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_LICENSE;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_EDITOR_METRICS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;DEVELOPMENT_BUILD;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
@@ -53,6 +53,15 @@
<Reference Include="UnityEditor.UI">
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/Editor/UnityEditor.UI.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Networking">
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.Networking">
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Networking/Editor/UnityEditor.Networking.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Analytics">
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.Graphs">
<HintPath>/Applications/Unity/Unity.app/Contents/Frameworks/Managed/UnityEditor.Graphs.dll</HintPath>
</Reference>
@@ -60,11 +69,14 @@
<HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/AndroidPlayer/UnityEditor.Android.Extensions.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.iOS.Extensions">
<HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/iossupport/UnityEditor.iOS.Extensions.dll</HintPath>
<HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.BB10.Extensions">
<HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/BlackBerryPlayer/UnityEditor.BB10.Extensions.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.SamsungTV.Extensions">
<HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/STVPlayer/STVPlayer/UnityEditor.SamsungTV.Extensions.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.WebGL.Extensions">
<HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/WebGLSupport/UnityEditor.WebGL.Extensions.dll</HintPath>
</Reference>
@@ -78,7 +90,7 @@
<HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/MacStandaloneSupport/UnityEditor.OSXStandalone.Extensions.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.iOS.Extensions.Xcode">
<HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/iossupport/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
<HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>

View File

@@ -19,7 +19,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>Temp\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;UNITY_5_0_1;UNITY_5_0;UNITY_5;ENABLE_LICENSE_RENAME;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_NEW_HIERARCHY;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_NONPRO;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX</DefineConstants>
<DefineConstants>DEBUG;TRACE;UNITY_5_1_1;UNITY_5_1;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_LICENSE;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_EDITOR_METRICS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;DEVELOPMENT_BUILD;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
@@ -67,8 +67,14 @@
<Reference Include="UnityEngine.UI">
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Networking">
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Analytics">
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.iOS.Extensions.Xcode">
<HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/iossupport/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
<HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

View File

@@ -19,7 +19,7 @@
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>Temp\bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE;UNITY_5_0_1;UNITY_5_0;UNITY_5;ENABLE_LICENSE_RENAME;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_NEW_HIERARCHY;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNITYEVENTS;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_NONPRO;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_MONO;ENABLE_PROFILER;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX</DefineConstants>
<DefineConstants>DEBUG;TRACE;UNITY_5_1_1;UNITY_5_1;UNITY_5;ENABLE_NEW_BUGREPORTER;ENABLE_2D_PHYSICS;ENABLE_4_6_FEATURES;ENABLE_AUDIO;ENABLE_CACHING;ENABLE_CLOTH;ENABLE_DUCK_TYPING;ENABLE_FRAME_DEBUGGER;ENABLE_GENERICS;ENABLE_HOME_SCREEN;ENABLE_IMAGEEFFECTS;ENABLE_LIGHT_PROBES_LEGACY;ENABLE_MICROPHONE;ENABLE_MULTIPLE_DISPLAYS;ENABLE_PHYSICS;ENABLE_PHYSICS_PHYSX3;ENABLE_PLUGIN_INSPECTOR;ENABLE_SHADOWS;ENABLE_SINGLE_INSTANCE_BUILD_SETTING;ENABLE_SPRITES;ENABLE_TERRAIN;ENABLE_UNET;ENABLE_UNITYEVENTS;ENABLE_VR;ENABLE_WEBCAM;ENABLE_WWW;ENABLE_CLOUD_SERVICES;ENABLE_CLOUD_SERVICES_ANALYTICS;ENABLE_CLOUD_SERVICES_UNET;ENABLE_CLOUD_LICENSE;ENABLE_AUDIOMIXER_SUSPEND;ENABLE_EDITOR_METRICS;INCLUDE_DYNAMIC_GI;INCLUDE_GI;INCLUDE_IL2CPP;INCLUDE_DIRECTX12;PLATFORM_SUPPORTS_MONO;RENDER_SOFTWARE_CURSOR;ENABLE_LOCALIZATION;UNITY_STANDALONE_OSX;UNITY_STANDALONE;ENABLE_SUBSTANCE;ENABLE_GAMECENTER;ENABLE_TEXTUREID_MAP;ENABLE_RUNTIME_GI;ENABLE_MOVIES;ENABLE_NETWORK;ENABLE_CRUNCH_TEXTURE_COMPRESSION;ENABLE_WEBSOCKET_HOST;ENABLE_MONO;DEVELOPMENT_BUILD;ENABLE_PROFILER;DEBUG;TRACE;UNITY_ASSERTIONS;UNITY_EDITOR;UNITY_EDITOR_64;UNITY_EDITOR_OSX</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
@@ -67,8 +67,14 @@
<Reference Include="UnityEngine.UI">
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/GUISystem/UnityEngine.UI.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Networking">
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/Networking/UnityEngine.Networking.dll</HintPath>
</Reference>
<Reference Include="UnityEngine.Analytics">
<HintPath>/Applications/Unity/Unity.app/Contents/UnityExtensions/Unity/UnityAnalytics/UnityEngine.Analytics.dll</HintPath>
</Reference>
<Reference Include="UnityEditor.iOS.Extensions.Xcode">
<HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/iossupport/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
<HintPath>/Applications/Unity/Unity.app/Contents/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.Xcode.dll</HintPath>
</Reference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

View File

@@ -104,7 +104,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 86.1111298
value: 77.7777939
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -162,7 +162,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 414844, guid: 04fdbaa6703674aa59a45e7b9fa9fff6, type: 2}
propertyPath: m_LocalPosition.z
value: 16.666666
value: 27.7777805
objectReference: {fileID: 0}
- target: {fileID: 414844, guid: 04fdbaa6703674aa59a45e7b9fa9fff6, type: 2}
propertyPath: m_LocalRotation.x
@@ -246,7 +246,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 417898, guid: 434e7ad177e254961b75f8d87241b959, type: 2}
propertyPath: m_LocalPosition.z
value: 13.8888884
value: 19.4444447
objectReference: {fileID: 0}
- target: {fileID: 417898, guid: 434e7ad177e254961b75f8d87241b959, type: 2}
propertyPath: m_LocalRotation.x
@@ -304,7 +304,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 77.7777939
value: 75.0000153
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -362,7 +362,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 414844, guid: 04fdbaa6703674aa59a45e7b9fa9fff6, type: 2}
propertyPath: m_LocalPosition.z
value: 63.8889008
value: 72.2222366
objectReference: {fileID: 0}
- target: {fileID: 414844, guid: 04fdbaa6703674aa59a45e7b9fa9fff6, type: 2}
propertyPath: m_LocalRotation.x
@@ -424,7 +424,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 414844, guid: 04fdbaa6703674aa59a45e7b9fa9fff6, type: 2}
propertyPath: m_LocalPosition.z
value: 55.5555649
value: 61.1111221
objectReference: {fileID: 0}
- target: {fileID: 414844, guid: 04fdbaa6703674aa59a45e7b9fa9fff6, type: 2}
propertyPath: m_LocalRotation.x
@@ -540,7 +540,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 33.3333359
value: 38.8888931
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -598,7 +598,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 44.4444504
value: 55.5555649
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -656,7 +656,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 83.3333511
value: 66.6666794
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -766,7 +766,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 50.0000076
value: 8.33333302
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -824,7 +824,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 27.7777805
value: 36.1111145
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -940,7 +940,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 11.1111107
value: 16.666666
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -998,7 +998,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 8.33333302
value: 13.8888884
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -1056,7 +1056,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 414844, guid: 04fdbaa6703674aa59a45e7b9fa9fff6, type: 2}
propertyPath: m_LocalPosition.z
value: 72.2222366
value: 88.8889084
objectReference: {fileID: 0}
- target: {fileID: 414844, guid: 04fdbaa6703674aa59a45e7b9fa9fff6, type: 2}
propertyPath: m_LocalRotation.x
@@ -1118,7 +1118,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 88.8889084
value: 94.4444656
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -1176,7 +1176,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 91.666687
value: 69.444458
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -1234,7 +1234,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 417898, guid: 434e7ad177e254961b75f8d87241b959, type: 2}
propertyPath: m_LocalPosition.z
value: 38.8888931
value: 52.7777863
objectReference: {fileID: 0}
- target: {fileID: 417898, guid: 434e7ad177e254961b75f8d87241b959, type: 2}
propertyPath: m_LocalRotation.x
@@ -1292,7 +1292,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 52.7777863
value: 22.2222233
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -1350,7 +1350,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 69.444458
value: 86.1111298
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -1408,7 +1408,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 80.5555725
value: 91.666687
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -1466,7 +1466,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 414844, guid: 04fdbaa6703674aa59a45e7b9fa9fff6, type: 2}
propertyPath: m_LocalPosition.z
value: 19.4444447
value: 33.3333359
objectReference: {fileID: 0}
- target: {fileID: 414844, guid: 04fdbaa6703674aa59a45e7b9fa9fff6, type: 2}
propertyPath: m_LocalRotation.x
@@ -1582,7 +1582,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 417898, guid: 434e7ad177e254961b75f8d87241b959, type: 2}
propertyPath: m_LocalPosition.z
value: 30.5555592
value: 50.0000076
objectReference: {fileID: 0}
- target: {fileID: 417898, guid: 434e7ad177e254961b75f8d87241b959, type: 2}
propertyPath: m_LocalRotation.x
@@ -1640,7 +1640,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 94.4444656
value: 80.5555725
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -1698,7 +1698,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 75.0000153
value: 63.8889008
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -1756,7 +1756,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 58.3333435
value: 11.1111107
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -1814,7 +1814,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 41.6666718
value: 44.4444504
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -1872,7 +1872,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 66.6666794
value: 83.3333511
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -1930,7 +1930,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 423784, guid: c661fecd10ab043299884339c3ee62c5, type: 2}
propertyPath: m_LocalPosition.z
value: 22.2222233
value: 47.222229
objectReference: {fileID: 0}
- target: {fileID: 423784, guid: c661fecd10ab043299884339c3ee62c5, type: 2}
propertyPath: m_LocalRotation.x
@@ -2098,6 +2098,7 @@ Camera:
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: .0219999999
m_StereoMirrorMode: 0
--- !u!4 &1768303660
Transform:
m_ObjectHideFlags: 0
@@ -2141,7 +2142,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 25.0000019
value: 30.5555592
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -2199,7 +2200,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 417898, guid: 434e7ad177e254961b75f8d87241b959, type: 2}
propertyPath: m_LocalPosition.z
value: 47.222229
value: 58.3333435
objectReference: {fileID: 0}
- target: {fileID: 417898, guid: 434e7ad177e254961b75f8d87241b959, type: 2}
propertyPath: m_LocalRotation.x
@@ -2257,7 +2258,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 36.1111145
value: 41.6666718
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x
@@ -2315,7 +2316,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalPosition.z
value: 61.1111221
value: 25.0000019
objectReference: {fileID: 0}
- target: {fileID: 436736, guid: 30a269be2fc864c9ea00c7a65636d543, type: 2}
propertyPath: m_LocalRotation.x

View File

@@ -417,6 +417,12 @@ namespace IsoTools {
MinDepth = _minDepth;
MaxDepth = _maxDepth;
}
void OnRenderObject() {
if ( Camera.current && Camera.current.name == "SceneCamera" ) {
StepSort();
}
}
#endif
}
} // namespace IsoTools

View File

@@ -3,17 +3,14 @@
--- !u!129 &1
PlayerSettings:
m_ObjectHideFlags: 0
serializedVersion: 6
serializedVersion: 7
AndroidProfiler: 0
defaultScreenOrientation: 4
targetDevice: 2
targetGlesGraphics: -1
targetIOSGraphics: -1
targetResolution: 0
accelerometerFrequency: 60
companyName: BlackMat
productName: UnityIso
cloudProjectId:
defaultCursor: {fileID: 0}
cursorHotspot: {x: 0, y: 0}
m_ShowUnitySplashScreen: 1
@@ -26,7 +23,6 @@ PlayerSettings:
m_ActiveColorSpace: 0
m_MTRendering: 1
m_MobileMTRendering: 0
m_UseDX11: 1
m_Stereoscopic3D: 0
iosShowActivityIndicatorOnLoading: -1
androidShowActivityIndicatorOnLoading: -1
@@ -81,6 +77,7 @@ PlayerSettings:
metroEnableIndependentInputSource: 0
metroEnableLowLatencyPresentationAPI: 0
xboxOneDisableKinectGpuReservation: 0
virtualRealitySupported: 0
productGUID: 0ae4d8e5611a65d45bd97550aa4471af
AndroidBundleVersionCode: 1
AndroidMinSdkVersion: 9
@@ -123,6 +120,7 @@ PlayerSettings:
iOSLaunchScreenCustomXibPath:
AndroidTargetDevice: 0
AndroidSplashScreenScale: 0
androidSplashScreen: {fileID: 0}
AndroidKeystoreName:
AndroidKeyaliasName:
AndroidTVCompatibility: 1
@@ -140,6 +138,7 @@ PlayerSettings:
- m_Icon: {fileID: 0}
m_Size: 128
m_BuildTargetBatching: []
m_BuildTargetGraphicsAPIs: []
webPlayerTemplate: APPLICATION:Default
m_TemplateCustomTags: {}
actionOnDotNetUnhandledException: 1
@@ -201,6 +200,7 @@ PlayerSettings:
ps4ApplicationParam2: 0
ps4ApplicationParam3: 0
ps4ApplicationParam4: 0
ps4GarlicHeapSize: 2048
ps4Passcode: KgSnOxla5PMvVHtMgwLFr7qLEJsRxHBI
ps4pnSessions: 1
ps4pnPresence: 1
@@ -212,6 +212,7 @@ PlayerSettings:
psp2NPTrophyPackPath:
psp2NPSupportGBMorGJP: 0
psp2NPAgeRating: 12
psp2NPTitleDatPath:
psp2NPCommsID:
psp2NPCommunicationsID:
psp2NPCommsPassphrase:
@@ -226,6 +227,7 @@ PlayerSettings:
psp2PatchOriginalPackage:
psp2PackagePassword:
psp2KeystoneFile:
psp2MemoryExpansionMode: 0
psp2DRMType: 0
psp2StorageType: 0
psp2MediaCapacity: 0
@@ -342,8 +344,7 @@ PlayerSettings:
blackberrySquareSplashScreen: {fileID: 0}
tizenProductDescription:
tizenProductURL:
tizenCertificatePath:
tizenCertificatePassword:
tizenSigningProfileName:
tizenGPSPermissions: 0
tizenMicrophonePermissions: 0
stvDeviceAddress:
@@ -362,6 +363,7 @@ PlayerSettings:
XboxOnePackagingOverridePath:
XboxOneAppManifestOverridePath:
XboxOnePackageEncryption: 0
XboxOnePackageUpdateGranularity: 2
XboxOneDescription:
XboxOneIsContentPackage: 0
XboxOneEnableGPUVariability: 0
@@ -394,4 +396,9 @@ PlayerSettings:
- WebGL::template
WebGL::emscriptenArgs:
WebGL::template: APPLICATION:Default
firstStreamedLevelWithResources: 0
firstStreamedSceneWithResources: 0
cloudProjectId:
projectId:
projectName:
organizationId:
cloudEnabled: 0

View File

@@ -1,2 +1,2 @@
m_EditorVersion: 5.0.1f1
m_EditorVersion: 5.1.1f1
m_StandardAssetsVersion: 0

View File

@@ -23,7 +23,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = Assembly-CSharp.csproj
Policies = $0
$0.TextStylePolicy = $1

View File

@@ -23,7 +23,7 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(MonoDevelopProperties) = preSolution
GlobalSection(MonoDevelopProperties) = preSolution
StartupItem = Assembly-CSharp.csproj
Policies = $0
$0.TextStylePolicy = $1