diff --git a/Assets/uDesktopDuplication/Examples/Prefabs/Monitor Board.prefab b/Assets/uDesktopDuplication/Examples/Prefabs/Monitor Board.prefab index 40eae04..20279a2 100644 Binary files a/Assets/uDesktopDuplication/Examples/Prefabs/Monitor Board.prefab and b/Assets/uDesktopDuplication/Examples/Prefabs/Monitor Board.prefab differ diff --git a/Assets/uDesktopDuplication/Examples/Prefabs/Monitor Plane for Displacement Mapping.prefab b/Assets/uDesktopDuplication/Examples/Prefabs/Monitor Plane for Displacement Mapping.prefab index 77909af..6de5524 100644 Binary files a/Assets/uDesktopDuplication/Examples/Prefabs/Monitor Plane for Displacement Mapping.prefab and b/Assets/uDesktopDuplication/Examples/Prefabs/Monitor Plane for Displacement Mapping.prefab differ diff --git a/Assets/uDesktopDuplication/Examples/Prefabs/Monitor Unity Plane.prefab b/Assets/uDesktopDuplication/Examples/Prefabs/Monitor Unity Plane.prefab index 7edf16c..569068d 100644 Binary files a/Assets/uDesktopDuplication/Examples/Prefabs/Monitor Unity Plane.prefab and b/Assets/uDesktopDuplication/Examples/Prefabs/Monitor Unity Plane.prefab differ diff --git a/Assets/uDesktopDuplication/Examples/Scenes/Displacement.unity b/Assets/uDesktopDuplication/Examples/Scenes/Displacement.unity index e216f7e..0385e50 100644 Binary files a/Assets/uDesktopDuplication/Examples/Scenes/Displacement.unity and b/Assets/uDesktopDuplication/Examples/Scenes/Displacement.unity differ diff --git a/Assets/uDesktopDuplication/Examples/Scenes/GetPixels.unity b/Assets/uDesktopDuplication/Examples/Scenes/GetPixels.unity index 1855e9a..4d04895 100644 Binary files a/Assets/uDesktopDuplication/Examples/Scenes/GetPixels.unity and b/Assets/uDesktopDuplication/Examples/Scenes/GetPixels.unity differ diff --git a/Assets/uDesktopDuplication/Examples/Scenes/Meta Data.unity b/Assets/uDesktopDuplication/Examples/Scenes/Meta Data.unity index dea210a..d58a3ab 100644 Binary files a/Assets/uDesktopDuplication/Examples/Scenes/Meta Data.unity and b/Assets/uDesktopDuplication/Examples/Scenes/Meta Data.unity differ diff --git a/Assets/uDesktopDuplication/Examples/Scenes/Multiple Monitors Roundly.unity b/Assets/uDesktopDuplication/Examples/Scenes/Multiple Monitors Roundly.unity index a001cef..7ea48f5 100644 Binary files a/Assets/uDesktopDuplication/Examples/Scenes/Multiple Monitors Roundly.unity and b/Assets/uDesktopDuplication/Examples/Scenes/Multiple Monitors Roundly.unity differ diff --git a/Assets/uDesktopDuplication/Examples/Scenes/Multiple Monitors.unity b/Assets/uDesktopDuplication/Examples/Scenes/Multiple Monitors.unity index 09f5588..ec4a399 100644 Binary files a/Assets/uDesktopDuplication/Examples/Scenes/Multiple Monitors.unity and b/Assets/uDesktopDuplication/Examples/Scenes/Multiple Monitors.unity differ diff --git a/Assets/uDesktopDuplication/Examples/Scenes/Primary Monitor.unity b/Assets/uDesktopDuplication/Examples/Scenes/Primary Monitor.unity index 04c757c..81185d2 100644 Binary files a/Assets/uDesktopDuplication/Examples/Scenes/Primary Monitor.unity and b/Assets/uDesktopDuplication/Examples/Scenes/Primary Monitor.unity differ diff --git a/Assets/uDesktopDuplication/Examples/Scenes/Raycast.unity b/Assets/uDesktopDuplication/Examples/Scenes/Raycast.unity index 17d1e2b..83a56e2 100644 Binary files a/Assets/uDesktopDuplication/Examples/Scenes/Raycast.unity and b/Assets/uDesktopDuplication/Examples/Scenes/Raycast.unity differ diff --git a/Assets/uDesktopDuplication/Examples/Scenes/Shaders.unity b/Assets/uDesktopDuplication/Examples/Scenes/Shaders.unity index c6ebaee..d675182 100644 Binary files a/Assets/uDesktopDuplication/Examples/Scenes/Shaders.unity and b/Assets/uDesktopDuplication/Examples/Scenes/Shaders.unity differ diff --git a/Assets/uDesktopDuplication/Examples/Scenes/Switch Scenes.unity b/Assets/uDesktopDuplication/Examples/Scenes/Switch Scenes.unity index 2a222da..dcf0c0a 100644 Binary files a/Assets/uDesktopDuplication/Examples/Scenes/Switch Scenes.unity and b/Assets/uDesktopDuplication/Examples/Scenes/Switch Scenes.unity differ diff --git a/Assets/uDesktopDuplication/Examples/Scenes/Toggle Monitors.unity b/Assets/uDesktopDuplication/Examples/Scenes/Toggle Monitors.unity index 8064600..288af7a 100644 Binary files a/Assets/uDesktopDuplication/Examples/Scenes/Toggle Monitors.unity and b/Assets/uDesktopDuplication/Examples/Scenes/Toggle Monitors.unity differ diff --git a/Assets/uDesktopDuplication/Examples/Scenes/Zoom.unity b/Assets/uDesktopDuplication/Examples/Scenes/Zoom.unity index 58d5dda..19c40b8 100644 Binary files a/Assets/uDesktopDuplication/Examples/Scenes/Zoom.unity and b/Assets/uDesktopDuplication/Examples/Scenes/Zoom.unity differ diff --git a/Assets/uDesktopDuplication/Examples/Scripts/MultipleMonitorAnalyzer.cs b/Assets/uDesktopDuplication/Examples/Scripts/MultipleMonitorAnalyzer.cs index 1e3f8ac..733dd60 100644 --- a/Assets/uDesktopDuplication/Examples/Scripts/MultipleMonitorAnalyzer.cs +++ b/Assets/uDesktopDuplication/Examples/Scripts/MultipleMonitorAnalyzer.cs @@ -1,41 +1,41 @@ -using UnityEngine; - -[RequireComponent(typeof(MultipleMonitorCreator))] -public class MultipleMonitorAnalyzer : MonoBehaviour -{ - MultipleMonitorCreator creator_; - Vector3 gazePoint_ = Vector3.zero; - public Vector3 gazePoint - { - get { return gazePoint_; } - private set +using UnityEngine; + +[RequireComponent(typeof(MultipleMonitorCreator))] +public class MultipleMonitorAnalyzer : MonoBehaviour +{ + MultipleMonitorCreator creator_; + Vector3 gazePoint_ = Vector3.zero; + public Vector3 gazePoint + { + get { return gazePoint_; } + private set { gazePoint_ += (value - gazePoint) * (gazePointFilter / (1f / 60 / Time.deltaTime)); - } - } - - [Header("Filters")] - [Range(0f, 1f)] public float gazePointFilter = 0.1f; - [Range(0f, 1f)] public float moveRectFilter = 0.05f; - [Range(0f, 1f)] public float mouseFilter = 0.05f; - [Range(0f, 1f)] public float dirtyRectFilter = 0.01f; - [Range(0f, 1f)] public float noEventFilter = 0.01f; - [Range(0f, 1f)] public float velocityFilter = 0.1f; - - [Header("Debug")] - [SerializeField] bool drawGazePoint; - [SerializeField] bool drawAveragePos; - [SerializeField] bool drawMoveRects; - [SerializeField] bool drawDirtyRects; - - void Start() + } + } + + [Header("Filters")] + [Range(0f, 1f)] public float gazePointFilter = 0.1f; + [Range(0f, 1f)] public float moveRectFilter = 0.05f; + [Range(0f, 1f)] public float mouseFilter = 0.05f; + [Range(0f, 1f)] public float dirtyRectFilter = 0.01f; + [Range(0f, 1f)] public float noEventFilter = 0.01f; + [Range(0f, 1f)] public float velocityFilter = 0.1f; + + [Header("Debug")] + [SerializeField] bool drawGazePoint; + [SerializeField] bool drawAveragePos; + [SerializeField] bool drawMoveRects; + [SerializeField] bool drawDirtyRects; + + void Start() { creator_ = GetComponent(); - } - - void Update() - { - var cursorMonitorId = uDesktopDuplication.Manager.cursorMonitorId; + } + + void Update() + { + var cursorMonitorId = uDesktopDuplication.Manager.cursorMonitorId; for (int i = 0; i < creator_.monitors.Count; ++i) { var info = creator_.monitors[i]; var analyzer = @@ -44,18 +44,18 @@ public class MultipleMonitorAnalyzer : MonoBehaviour UpdateAnalyzer(analyzer); if (info.uddTexture.monitorId == cursorMonitorId) { gazePoint = analyzer.averagePos; - } - } - - if (drawGazePoint) DrawGazePoint(); - } - - void DrawGazePoint() + } + } + + if (drawGazePoint) DrawGazePoint(); + } + + void DrawGazePoint() { Debug.DrawLine(transform.position, gazePoint, Color.magenta); - } - - void UpdateAnalyzer(GazePointAnalyzer analyzer) + } + + void UpdateAnalyzer(GazePointAnalyzer analyzer) { analyzer.moveRectFilter = moveRectFilter; analyzer.mouseFilter = mouseFilter; @@ -65,5 +65,5 @@ public class MultipleMonitorAnalyzer : MonoBehaviour analyzer.drawAveragePos = drawAveragePos; analyzer.drawMoveRects = drawMoveRects; analyzer.drawDirtyRects = drawDirtyRects; - } -} + } +} diff --git a/Assets/uDesktopDuplication/Materials/uDD_Screen_Standard.mat b/Assets/uDesktopDuplication/Materials/uDD_Screen_Standard.mat index 7db5f72..6e7dc28 100644 Binary files a/Assets/uDesktopDuplication/Materials/uDD_Screen_Standard.mat and b/Assets/uDesktopDuplication/Materials/uDD_Screen_Standard.mat differ diff --git a/Assets/uDesktopDuplication/Materials/uDD_Screen_Unlit.mat b/Assets/uDesktopDuplication/Materials/uDD_Screen_Unlit.mat index 207ef58..0708fc8 100644 Binary files a/Assets/uDesktopDuplication/Materials/uDD_Screen_Unlit.mat and b/Assets/uDesktopDuplication/Materials/uDD_Screen_Unlit.mat differ diff --git a/Assets/uDesktopDuplication/Materials/uDD_Screen_Unlit_BlackMask.mat b/Assets/uDesktopDuplication/Materials/uDD_Screen_Unlit_BlackMask.mat index f2f862f..49d89c6 100644 Binary files a/Assets/uDesktopDuplication/Materials/uDD_Screen_Unlit_BlackMask.mat and b/Assets/uDesktopDuplication/Materials/uDD_Screen_Unlit_BlackMask.mat differ diff --git a/Assets/uDesktopDuplication/Materials/uDD_Screen_Unlit_Displacement.mat b/Assets/uDesktopDuplication/Materials/uDD_Screen_Unlit_Displacement.mat index e0e6ab0..4ae9955 100644 Binary files a/Assets/uDesktopDuplication/Materials/uDD_Screen_Unlit_Displacement.mat and b/Assets/uDesktopDuplication/Materials/uDD_Screen_Unlit_Displacement.mat differ diff --git a/Assets/uDesktopDuplication/Materials/uDD_Screen_Unlit_Transparent.mat b/Assets/uDesktopDuplication/Materials/uDD_Screen_Unlit_Transparent.mat index c1bfbbf..de0c687 100644 Binary files a/Assets/uDesktopDuplication/Materials/uDD_Screen_Unlit_Transparent.mat and b/Assets/uDesktopDuplication/Materials/uDD_Screen_Unlit_Transparent.mat differ diff --git a/Assets/uDesktopDuplication/Plugins/x86/uDesktopDuplication.dll b/Assets/uDesktopDuplication/Plugins/x86/uDesktopDuplication.dll index 91325e8..e53766a 100644 Binary files a/Assets/uDesktopDuplication/Plugins/x86/uDesktopDuplication.dll and b/Assets/uDesktopDuplication/Plugins/x86/uDesktopDuplication.dll differ diff --git a/Assets/uDesktopDuplication/Plugins/x86/uDesktopDuplication.dll.meta b/Assets/uDesktopDuplication/Plugins/x86/uDesktopDuplication.dll.meta index ca37394..195a84f 100644 --- a/Assets/uDesktopDuplication/Plugins/x86/uDesktopDuplication.dll.meta +++ b/Assets/uDesktopDuplication/Plugins/x86/uDesktopDuplication.dll.meta @@ -1,53 +1,122 @@ fileFormatVersion: 2 -guid: 19d4c78204afead44b6de11427d7f2f6 -timeCreated: 1480693943 +guid: d3ab0ac3a3d6bb643af0a464a93be957 +timeCreated: 1503496900 licenseType: Pro PluginImporter: - serializedVersion: 1 + serializedVersion: 2 iconMap: {} executionOrder: {} isPreloaded: 0 + isOverridable: 0 platformData: - Any: - enabled: 1 - settings: {} - Editor: - enabled: 0 - settings: - CPU: x86 - DefaultValueInitialized: true - Linux: - enabled: 1 - settings: - CPU: x86 - Linux64: - enabled: 0 - settings: - CPU: None - LinuxUniversal: - enabled: 1 - settings: - CPU: x86 - OSXIntel: - enabled: 1 - settings: - CPU: AnyCPU - OSXIntel64: - enabled: 0 - settings: - CPU: None - OSXUniversal: - enabled: 0 - settings: - CPU: x86 - Win: - enabled: 1 - settings: - CPU: AnyCPU - Win64: - enabled: 0 - settings: - CPU: None + data: + first: + '': Any + second: + enabled: 0 + settings: + Exclude Android: 0 + Exclude Editor: 0 + Exclude Linux: 0 + Exclude Linux64: 0 + Exclude LinuxUniversal: 0 + Exclude OSXIntel: 0 + Exclude OSXIntel64: 0 + Exclude OSXUniversal: 0 + Exclude Win: 0 + Exclude Win64: 1 + data: + first: + Android: Android + second: + enabled: 1 + settings: + CPU: ARMv7 + data: + first: + Any: + second: + enabled: 1 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 1 + settings: + CPU: x86 + DefaultValueInitialized: true + OS: Windows + data: + first: + Facebook: Win + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Facebook: Win64 + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: Linux + second: + enabled: 1 + settings: + CPU: x86 + data: + first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: None + data: + first: + Standalone: LinuxUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Standalone: OSXIntel + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Standalone: OSXIntel64 + second: + enabled: 1 + settings: + CPU: None + data: + first: + Standalone: OSXUniversal + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Standalone: Win + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Standalone: Win64 + second: + enabled: 0 + settings: + CPU: None userData: assetBundleName: assetBundleVariant: diff --git a/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll b/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll index c25ac4f..ad16881 100644 Binary files a/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll and b/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll differ diff --git a/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll.meta b/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll.meta index 3eb76cc..9ebde99 100644 --- a/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll.meta +++ b/Assets/uDesktopDuplication/Plugins/x86_64/uDesktopDuplication.dll.meta @@ -1,54 +1,98 @@ fileFormatVersion: 2 -guid: 02fc121822cf2ea4e82e16c4a28bf711 -timeCreated: 1477546714 +guid: 7cb91c9ae744dc5429005b20e11f4f37 +timeCreated: 1503505907 licenseType: Pro PluginImporter: - serializedVersion: 1 + serializedVersion: 2 iconMap: {} executionOrder: {} isPreloaded: 0 + isOverridable: 0 platformData: - Any: - enabled: 1 - settings: {} - Editor: - enabled: 0 - settings: - CPU: AnyCPU - DefaultValueInitialized: true - OS: AnyOS - Linux: - enabled: 0 - settings: - CPU: x86 - Linux64: - enabled: 0 - settings: - CPU: x86_64 - LinuxUniversal: - enabled: 0 - settings: - CPU: None - OSXIntel: - enabled: 0 - settings: - CPU: AnyCPU - OSXIntel64: - enabled: 0 - settings: - CPU: AnyCPU - OSXUniversal: - enabled: 0 - settings: - CPU: None - Win: - enabled: 0 - settings: - CPU: AnyCPU - Win64: - enabled: 1 - settings: - CPU: AnyCPU + data: + first: + Any: + second: + enabled: 1 + settings: {} + data: + first: + Editor: Editor + second: + enabled: 0 + settings: + CPU: x86_64 + DefaultValueInitialized: true + data: + first: + Facebook: Win + second: + enabled: 0 + settings: + CPU: None + data: + first: + Facebook: Win64 + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Standalone: Linux + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: Linux64 + second: + enabled: 1 + settings: + CPU: x86_64 + data: + first: + Standalone: LinuxUniversal + second: + enabled: 1 + settings: + CPU: x86_64 + data: + first: + Standalone: OSXIntel + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: OSXIntel64 + second: + enabled: 1 + settings: + CPU: AnyCPU + data: + first: + Standalone: OSXUniversal + second: + enabled: 0 + settings: + CPU: x86_64 + data: + first: + Standalone: Win + second: + enabled: 0 + settings: + CPU: None + data: + first: + Standalone: Win64 + second: + enabled: 1 + settings: + CPU: AnyCPU userData: assetBundleName: assetBundleVariant: diff --git a/Assets/uDesktopDuplication/Scripts/Texture.cs b/Assets/uDesktopDuplication/Scripts/Texture.cs index 6d0ccec..dff472b 100644 --- a/Assets/uDesktopDuplication/Scripts/Texture.cs +++ b/Assets/uDesktopDuplication/Scripts/Texture.cs @@ -271,7 +271,10 @@ public class Texture : MonoBehaviour void RequireUpdate() { - monitor.shouldBeUpdated = true; + if (monitor != null) + { + monitor.shouldBeUpdated = true; + } } void Reinitialize() @@ -283,7 +286,9 @@ public class Texture : MonoBehaviour void UpdateMaterial() { width = transform.localScale.x; - rotation = monitor.rotation; + if (monitor != null) { + rotation = monitor.rotation; + } material.SetVector("_ClipPositionScale", new Vector4(clipPos.x, clipPos.y, clipScale.x, clipScale.y)); } diff --git a/Assets/uDesktopDuplication/Shaders/uDD_Unlit_Displacement.shader b/Assets/uDesktopDuplication/Shaders/uDD_Unlit_Displacement.shader index 12d1d3b..8005cca 100644 --- a/Assets/uDesktopDuplication/Shaders/uDD_Unlit_Displacement.shader +++ b/Assets/uDesktopDuplication/Shaders/uDD_Unlit_Displacement.shader @@ -142,7 +142,7 @@ DsOutput domain( float disp = length(_DispTex.SampleLevel(sampler_DispTex, o.f2TexCoord, 0)) * _DispFactor; f3Position.xyz += f3Normal * disp; - o.f4Position = mul(UNITY_MATRIX_MVP, float4(f3Position.xyz, 1.0)); + o.f4Position = UnityObjectToClipPos(float4(f3Position.xyz, 1.0)); return o; } diff --git a/Plugins/uDesktopDuplication/uDesktopDuplication.def b/Plugins/uDesktopDuplication/uDesktopDuplication.def new file mode 100644 index 0000000..bd07bb0 --- /dev/null +++ b/Plugins/uDesktopDuplication/uDesktopDuplication.def @@ -0,0 +1,5 @@ +LIBRARY + +EXPORTS + UnityPluginLoad + UnityPluginUnload diff --git a/Plugins/uDesktopDuplication/uDesktopDuplication/MonitorManager.cpp b/Plugins/uDesktopDuplication/uDesktopDuplication/MonitorManager.cpp index 26fd47c..20643c9 100644 --- a/Plugins/uDesktopDuplication/uDesktopDuplication/MonitorManager.cpp +++ b/Plugins/uDesktopDuplication/uDesktopDuplication/MonitorManager.cpp @@ -84,6 +84,7 @@ void MonitorManager::Update() void MonitorManager::RequireReinitilization() { + Debug::Log("MonitorManager::Reinitialize() was required."); isReinitializationRequired_ = true; } diff --git a/Plugins/uDesktopDuplication/uDesktopDuplication/uDesktopDuplication.vcxproj b/Plugins/uDesktopDuplication/uDesktopDuplication/uDesktopDuplication.vcxproj index 687c7e8..3f6f612 100644 --- a/Plugins/uDesktopDuplication/uDesktopDuplication/uDesktopDuplication.vcxproj +++ b/Plugins/uDesktopDuplication/uDesktopDuplication/uDesktopDuplication.vcxproj @@ -82,6 +82,8 @@ $(VC_IncludePath);$(WindowsSDK_IncludePath);include + $(SolutionDir)$(Platform)\$(Configuration)\ + $(Platform)\$(Configuration)\ @@ -92,6 +94,10 @@ copy /Y "$(SolutionDir)$(Platform)\$(Configuration)\$(TargetFileName)" "$(SolutionDir)..\..\Assets\$(ProjectName)\Plugins\x86_64" + + + + @@ -100,8 +106,11 @@ true - copy /Y "$(SolutionDir)$(Platform)\$(Configuration)\$(TargetFileName)" "$(SolutionDir)..\..\Assets\$(ProjectName)\Plugins\x86_64" + copy /Y "$(SolutionDir)$(Platform)\$(Configuration)\$(TargetFileName)" "$(SolutionDir)..\..\Assets\$(ProjectName)\Plugins\x86" + + $(SolutionDir)$(ProjectName).def + @@ -115,6 +124,8 @@ true true + + copy /Y "$(SolutionDir)$(Platform)\$(Configuration)\$(TargetFileName)" "$(SolutionDir)..\..\Assets\$(ProjectName)\Plugins\x86_64" @@ -132,6 +143,7 @@ true true + $(SolutionDir)$(ProjectName).def copy /Y "$(SolutionDir)$(Platform)\$(Configuration)\$(TargetFileName)" "$(SolutionDir)..\..\Assets\$(ProjectName)\Plugins\x86" diff --git a/ProjectSettings/AudioManager.asset b/ProjectSettings/AudioManager.asset index fe6cc1d..da61125 100644 Binary files a/ProjectSettings/AudioManager.asset and b/ProjectSettings/AudioManager.asset differ diff --git a/ProjectSettings/ClusterInputManager.asset b/ProjectSettings/ClusterInputManager.asset index 60e3abb..e7886b2 100644 Binary files a/ProjectSettings/ClusterInputManager.asset and b/ProjectSettings/ClusterInputManager.asset differ diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset index 4fed4b8..1931946 100644 Binary files a/ProjectSettings/DynamicsManager.asset and b/ProjectSettings/DynamicsManager.asset differ diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset index f646865..25e8859 100644 Binary files a/ProjectSettings/EditorBuildSettings.asset and b/ProjectSettings/EditorBuildSettings.asset differ diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset index b1beb2a..a49719a 100644 Binary files a/ProjectSettings/EditorSettings.asset and b/ProjectSettings/EditorSettings.asset differ diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 5bbdb35..d74737e 100644 Binary files a/ProjectSettings/GraphicsSettings.asset and b/ProjectSettings/GraphicsSettings.asset differ diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 3789778..17c8f53 100644 Binary files a/ProjectSettings/InputManager.asset and b/ProjectSettings/InputManager.asset differ diff --git a/ProjectSettings/NavMeshAreas.asset b/ProjectSettings/NavMeshAreas.asset index 6f16283..6dd520f 100644 Binary files a/ProjectSettings/NavMeshAreas.asset and b/ProjectSettings/NavMeshAreas.asset differ diff --git a/ProjectSettings/NetworkManager.asset b/ProjectSettings/NetworkManager.asset index 6b7e77f..5dc6a83 100644 Binary files a/ProjectSettings/NetworkManager.asset and b/ProjectSettings/NetworkManager.asset differ diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset index 9d64e14..e3b2d0b 100644 Binary files a/ProjectSettings/Physics2DSettings.asset and b/ProjectSettings/Physics2DSettings.asset differ diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 71fa213..df2acea 100644 Binary files a/ProjectSettings/ProjectSettings.asset and b/ProjectSettings/ProjectSettings.asset differ diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 66e05aa..fd37049 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 5.5.0f3 +m_EditorVersion: 2017.1.0b5 diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset index d6ee4c3..86c047f 100644 Binary files a/ProjectSettings/QualitySettings.asset and b/ProjectSettings/QualitySettings.asset differ diff --git a/ProjectSettings/TagManager.asset b/ProjectSettings/TagManager.asset index 315f235..1c92a78 100644 Binary files a/ProjectSettings/TagManager.asset and b/ProjectSettings/TagManager.asset differ diff --git a/ProjectSettings/TimeManager.asset b/ProjectSettings/TimeManager.asset index b7b21cb..558a017 100644 Binary files a/ProjectSettings/TimeManager.asset and b/ProjectSettings/TimeManager.asset differ diff --git a/ProjectSettings/UnityAdsSettings.asset b/ProjectSettings/UnityAdsSettings.asset deleted file mode 100644 index d9a4f06..0000000 Binary files a/ProjectSettings/UnityAdsSettings.asset and /dev/null differ diff --git a/ProjectSettings/UnityConnectSettings.asset b/ProjectSettings/UnityConnectSettings.asset index bd9e618..1cc5485 100644 Binary files a/ProjectSettings/UnityConnectSettings.asset and b/ProjectSettings/UnityConnectSettings.asset differ