From 76085d61ab29ab5c8d3e6590d5154b19bf0796ad Mon Sep 17 00:00:00 2001 From: chwan1 Date: Wed, 20 Nov 2019 13:44:01 +0800 Subject: [PATCH] upgrade to 2018.4.11 --- .../Editor/PropertyDrawers/MinDrawer.cs | 4 +- .../Logs/Packages-Update.log | 43 ++++++++++++++++++ .../Packages/manifest.json | 40 ++++++++++++++++ .../ProjectSettings/PresetManager.asset | Bin 0 -> 4104 bytes .../ProjectSettings/ProjectVersion.txt | 2 +- .../ProjectSettings/VFXManager.asset | Bin 0 -> 4148 bytes .../UnityPackageManager/manifest.json | 4 -- 7 files changed, 86 insertions(+), 7 deletions(-) create mode 100644 Unity-19050-05-BallPool/Logs/Packages-Update.log create mode 100644 Unity-19050-05-BallPool/Packages/manifest.json create mode 100644 Unity-19050-05-BallPool/ProjectSettings/PresetManager.asset create mode 100644 Unity-19050-05-BallPool/ProjectSettings/VFXManager.asset delete mode 100644 Unity-19050-05-BallPool/UnityPackageManager/manifest.json 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 0000000000000000000000000000000000000000..de7e261167493a003949c94d63f934fd06c07cda GIT binary patch literal 4104 zcmeH_yGlbr5Qb-S^?uhzL41Me5%B^NEP^Orh+-d(=4fJ~s5uH2!gfA^wlHWBGZL=c&t^5!!$8PD7I6yX^DL!&`3csy_QZf~6NYTWE748e1Y$XmTa>xacP(IswQ&>qZ_~Hi|u*L#L6CAs#mRlZ2W)AsM6#aL!2~TAnm>vM4ztO%79% zlu}Ie2J$XA1)(WPnf?ND_O~0R4bR{%CDiQgX!4}2fS;n~xt)mi+*HfEc!pZy{B+B^ zy2*{FWeYp`F4ok^@`Tat8a3zlA~xRDGT;1?OWb4c|D#(!`(fm_h@8*63=qP2pL@hd zIQbx)rtnJY|D(f@VcPKDIt({>{w$~k;f8+e;hXpgn?Ypo{>CoS5g rEGF6vFQVD6Nt^!#Te+`Oz$xGqa0)mDoB~b(r+`zyDc}_N-wJ#KK|Z5$ literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4951a05672f8ae045346f5173b15b98956c51138 GIT binary patch literal 4148 zcmeH_O-chn5QVEv;{PuQE?l^9A2Je%LJVR=6colpgF6{bCmAu5VbX%)W|j$FKwJoJ zJb)MQ0(u4Ay7UB&uX-dxasW47P)yaAsyE#)Lp0PSn#~f?9G-X(tz@j#bT(~SHH*HZ zC=vp2JoS;IC|Wp7KHS|F=D$8G?b6F~geAI1@(4$cD8x#nn~=Gnrv!!1g2E&q&&4Td z0`(Gd5;=tA5UAdvkwMM#3C%*y)6iK%Kl=L{B*9~yO)%C;AvyYWhBX`18R_v@=LkLP z@H;sAb;dLs)EVz_K|46-DSGyS?}%fvj<8U1GUs=Q4dw}b-$m^3eW#e~Owa*l&yn0u z_qd=(up9I|KZE38ADG{wW*+~OM3wF1eaCa^G9cSlLB7~(`j<+U8%|XQ1!|t`dQ~@& zXDTKD+wO(j-9lkIs-cTw%fH^dtkq=D8!ESgzm1agAZEM1EK8+auioZWEp;WUhi+4r zmGsf?J6BusLOG1|E#tfL`8oI_G+`Vt4j2cF1I7X4fN{V$U>q