diff --git a/Unity-19050-05-BallPool/Assets/UnityUtils/3rdParty/PostProcessing/Editor/PropertyDrawers/MinDrawer.cs b/Unity-19050-05-BallPool/Assets/UnityUtils/3rdParty/PostProcessing/Editor/PropertyDrawers/MinDrawer.cs index 59791f5..8a916fd 100644 --- a/Unity-19050-05-BallPool/Assets/UnityUtils/3rdParty/PostProcessing/Editor/PropertyDrawers/MinDrawer.cs +++ b/Unity-19050-05-BallPool/Assets/UnityUtils/3rdParty/PostProcessing/Editor/PropertyDrawers/MinDrawer.cs @@ -3,12 +3,12 @@ using UnityEngine.PostProcessing; namespace UnityEditor.PostProcessing { - [CustomPropertyDrawer(typeof(MinAttribute))] + [CustomPropertyDrawer(typeof(UnityEngine.PostProcessing.MinAttribute))] sealed class MinDrawer : PropertyDrawer { public override void OnGUI(Rect position, SerializedProperty property, GUIContent label) { - MinAttribute attribute = (MinAttribute)base.attribute; + UnityEngine.PostProcessing.MinAttribute attribute = (UnityEngine.PostProcessing.MinAttribute)base.attribute; if (property.propertyType == SerializedPropertyType.Integer) { diff --git a/Unity-19050-05-BallPool/Logs/Packages-Update.log b/Unity-19050-05-BallPool/Logs/Packages-Update.log new file mode 100644 index 0000000..3be76d1 --- /dev/null +++ b/Unity-19050-05-BallPool/Logs/Packages-Update.log @@ -0,0 +1,43 @@ + +=== Wed Nov 20 12:49:29 2019 + +Packages were changed. +Update Mode: updateDependencies + +The following packages were added: + com.unity.analytics@3.2.2 + com.unity.purchasing@2.0.3 + com.unity.ads@2.0.8 + com.unity.textmeshpro@1.4.1 + com.unity.package-manager-ui@2.0.8 + com.unity.collab-proxy@1.2.15 + com.unity.modules.ai@1.0.0 + com.unity.modules.animation@1.0.0 + com.unity.modules.assetbundle@1.0.0 + com.unity.modules.audio@1.0.0 + com.unity.modules.cloth@1.0.0 + com.unity.modules.director@1.0.0 + com.unity.modules.imageconversion@1.0.0 + com.unity.modules.imgui@1.0.0 + com.unity.modules.jsonserialize@1.0.0 + com.unity.modules.particlesystem@1.0.0 + com.unity.modules.physics@1.0.0 + com.unity.modules.physics2d@1.0.0 + com.unity.modules.screencapture@1.0.0 + com.unity.modules.terrain@1.0.0 + com.unity.modules.terrainphysics@1.0.0 + com.unity.modules.tilemap@1.0.0 + com.unity.modules.ui@1.0.0 + com.unity.modules.uielements@1.0.0 + com.unity.modules.umbra@1.0.0 + com.unity.modules.unityanalytics@1.0.0 + com.unity.modules.unitywebrequest@1.0.0 + com.unity.modules.unitywebrequestassetbundle@1.0.0 + com.unity.modules.unitywebrequestaudio@1.0.0 + com.unity.modules.unitywebrequesttexture@1.0.0 + com.unity.modules.unitywebrequestwww@1.0.0 + com.unity.modules.vehicles@1.0.0 + com.unity.modules.video@1.0.0 + com.unity.modules.vr@1.0.0 + com.unity.modules.wind@1.0.0 + com.unity.modules.xr@1.0.0 diff --git a/Unity-19050-05-BallPool/Packages/manifest.json b/Unity-19050-05-BallPool/Packages/manifest.json new file mode 100644 index 0000000..215430d --- /dev/null +++ b/Unity-19050-05-BallPool/Packages/manifest.json @@ -0,0 +1,40 @@ +{ + "dependencies": { + "com.unity.ads": "2.0.8", + "com.unity.analytics": "3.2.2", + "com.unity.collab-proxy": "1.2.15", + "com.unity.package-manager-ui": "2.0.8", + "com.unity.purchasing": "2.0.3", + "com.unity.textmeshpro": "1.4.1", + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } +} diff --git a/Unity-19050-05-BallPool/ProjectSettings/PresetManager.asset b/Unity-19050-05-BallPool/ProjectSettings/PresetManager.asset new file mode 100644 index 0000000..de7e261 Binary files /dev/null and b/Unity-19050-05-BallPool/ProjectSettings/PresetManager.asset differ diff --git a/Unity-19050-05-BallPool/ProjectSettings/ProjectVersion.txt b/Unity-19050-05-BallPool/ProjectSettings/ProjectVersion.txt index 0ad334d..31a1862 100644 --- a/Unity-19050-05-BallPool/ProjectSettings/ProjectVersion.txt +++ b/Unity-19050-05-BallPool/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2017.4.16f1 +m_EditorVersion: 2018.4.11f1 diff --git a/Unity-19050-05-BallPool/ProjectSettings/VFXManager.asset b/Unity-19050-05-BallPool/ProjectSettings/VFXManager.asset new file mode 100644 index 0000000..4951a05 Binary files /dev/null and b/Unity-19050-05-BallPool/ProjectSettings/VFXManager.asset differ diff --git a/Unity-19050-05-BallPool/UnityPackageManager/manifest.json b/Unity-19050-05-BallPool/UnityPackageManager/manifest.json deleted file mode 100644 index 526aca6..0000000 --- a/Unity-19050-05-BallPool/UnityPackageManager/manifest.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "dependencies": { - } -}