refactor(20038-05): upgrading to unity 2019

5 years ago · 1dc3cd53f0
parent 7b714f08ee
commit 1dc3cd53f0
15 changed files with 1241 additions and 505 deletions
--- a/Unity-20038-05-BallPool-8M/Assets/Frozen/Flake.prefab
+++ b/Unity-20038-05-BallPool-8M/Assets/Frozen/Flake.prefab
@ -16,6 +16,8 @@ GameObject:
  - component: {fileID: 114582606103199088}
  - component: {fileID: 114660513081991560}
  - component: {fileID: 114090349892134162}
+  - component: {fileID: 5979152525433802045}
+  - component: {fileID: 4872882552227186811}
  m_Layer: 12
  m_Name: Flake
  m_TagString: Untagged
@ -75,12 +77,13 @@ MonoBehaviour:
  m_GameObject: {fileID: 7076451182801938125}
  m_Enabled: 1
  m_EditorHideFlags: 0
-  m_Script: {fileID: -98529514, guid: f70555f144d8491a825f0804e09c671c, type: 3}
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
  m_Material: {fileID: 0}
  m_Color: {r: 1, g: 1, b: 1, a: 1}
  m_RaycastTarget: 1
+  m_Maskable: 1
  m_OnCullStateChanged:
    m_PersistentCalls:
      m_Calls: []
@ -104,8 +107,10 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  target: 0
+  m_bSetEmission: 0
  materials: []
  attributeName: 
+  m_rendererAttributeNames: []
  targetObject: {fileID: 7076451182801938125}
 --- !u!114 &114582606103199088
 MonoBehaviour:
@ -139,7 +144,18 @@ MonoBehaviour:
        m_CallState: 2
  onStartRunning:
    m_PersistentCalls:
-      m_Calls: []
+      m_Calls:
+      - m_Target: {fileID: 4872882552227186811}
+        m_MethodName: FadeIn
+        m_Mode: 1
+        m_Arguments:
+          m_ObjectArgument: {fileID: 0}
+          m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
+          m_IntArgument: 0
+          m_FloatArgument: 0
+          m_StringArgument: 
+          m_BoolArgument: 0
+        m_CallState: 2
  onStopRunning:
    m_PersistentCalls:
      m_Calls: []
@ -156,6 +172,8 @@ MonoBehaviour:
    m_PersistentCalls:
      m_Calls: []
  elapsedTime: 0
+  remainedTime: 0
+  remainedTimeNormalized: 0
 --- !u!114 &114660513081991560
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -197,3 +215,63 @@ MonoBehaviour:
          m_StringArgument: 
          m_BoolArgument: 0
        m_CallState: 2
+--- !u!225 &5979152525433802045
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7076451182801938125}
+  m_Enabled: 1
+  m_Alpha: 0
+  m_Interactable: 0
+  m_BlocksRaycasts: 0
+  m_IgnoreParentGroups: 0
+--- !u!114 &4872882552227186811
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7076451182801938125}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 94a0f81357995194db23441a83c23f0f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  curve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 0
+      inSlope: 22.96968
+      outSlope: 22.96968
+      tangentMode: 34
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    - serializedVersion: 3
+      time: 0.04353565
+      value: 1
+      inSlope: 22.96968
+      outSlope: 22.96968
+      tangentMode: 34
+      weightedMode: 0
+      inWeight: 0.33333334
+      outWeight: 0.33333334
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  initialState: 1
+  onFadedIn:
+    m_PersistentCalls:
+      m_Calls: []
+  onFadedOut:
+    m_PersistentCalls:
+      m_Calls: []
+  transientInStrategy: 1
+  inStrategy: 1
+  transientOutStrategy: 0
+  outStrategy: 0
+  cursor: 0
--- a/Unity-20038-05-BallPool-8M/Assets/Frozen/Frozen.unity
+++ b/Unity-20038-05-BallPool-8M/Assets/Frozen/Frozen.unity
--- a/Unity-20038-05-BallPool-8M/Assets/Frozen/Script/FlakeSpawner.cs
+++ b/Unity-20038-05-BallPool-8M/Assets/Frozen/Script/FlakeSpawner.cs
@ -8,37 +8,14 @@ using UnityEngine.EventSystems;
 public class FlakeSpawner : MonoBehaviour
 {
    // Start is called before the first frame update
-    public Rect roiFilterSrc;
-    public Rect roiFilterDst;
-
    public GameObject prefab;

    public DShowClip[] clips;

-    void Update()
-    {
-        if (EventSystem.current == null || EventSystem.current.currentInputModule == null)
-            return;
-
-        BaseInput input = EventSystem.current.currentInputModule.input;
-
-        if (input.GetMouseButton(0))
-        {
-            TrySpawn(input.mousePosition);
-        }
-
-        for (int i = 0; i < input.touchCount; i++)
-        {
-            Touch t = input.GetTouch(i);
-            TrySpawn(t.position);
-        }
-    }
    List<RaycastResult> raycastResults = new List<RaycastResult>();

-    void TrySpawn(Vector2 position)
+    public void TrySpawn(Vector2 position)
    {
-        position = Rect.PointToNormalized(roiFilterSrc, position);
-        position = Rect.NormalizedToPoint(roiFilterDst, position);
        PointerEventData data = new PointerEventData(EventSystem.current);
        data.position = position;
        raycastResults.Clear();
--- a/Unity-20038-05-BallPool-8M/Assets/Frozen/Script/FlakeSpawner.cs.meta
+++ b/Unity-20038-05-BallPool-8M/Assets/Frozen/Script/FlakeSpawner.cs.meta
@ -1,11 +1,11 @@
 fileFormatVersion: 2
-guid: a2d08f0f27462644280b24b6dc59dbe0
+guid: a2d08f0f27462644280b24b6dc59dbe1
 MonoImporter:
  externalObjects: {}
  serializedVersion: 2
  defaultReferences: []
  executionOrder: 0
  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
+  userData:
+  assetBundleName:
+  assetBundleVariant:
--- a/Unity-20038-05-BallPool-8M/Assets/Frozen/Script/InputVisualizer.cs
+++ b/Unity-20038-05-BallPool-8M/Assets/Frozen/Script/InputVisualizer.cs
@ -1,103 +0,0 @@
-using System.Collections;
-using System.Collections.Generic;
-using UnityEngine;
-using UnityEngine.EventSystems;
-using UnityEngine.UI;
-
-namespace UltraCombos
-{
-    public class InputVisualizer : MaskableGraphic
-    //event system visualizer
-    {
-        [SerializeField]
-        Texture m_texture;
-
-        //event camera
-
-        public override Texture mainTexture
-        {
-            get
-            {
-                return m_texture == null ? s_WhiteTexture : m_texture;
-            }
-        }
-
-        void Update()
-        {
-            if (EventSystem.current == null || EventSystem.current.currentInputModule == null)
-                return;
-
-            BaseInput input = EventSystem.current.currentInputModule.input;
-
-            pointers2.Clear();
-            if (input.GetMouseButton(0))
-            {
-                pointers2.Add(input.mousePosition);
-            }
-
-            for (int i = 0; i < input.touchCount; i++)
-            {
-                Touch t = input.GetTouch(i);
-                pointers2.Add(t.position);
-            }
-            SetVerticesDirty();
-        }
-
-        public void Toggle()
-        {
-            enabled = !enabled;
-        }
-
-        public void Toggle2()
-        {
-            enabled = !enabled;
-        }
-
-        UIVertex[] CreateQuad(Vector2[] _vertices, Vector2[] _uvs)
-        {
-            if (_vertices.Length == 4 && _uvs.Length == 4)
-            {
-                UIVertex[] _quad = new UIVertex[4];
-                for (var i = 0; i < _quad.Length; i++)
-                {
-                    var _vert = UIVertex.simpleVert;
-                    _vert.color = Color.white;
-                    _vert.position = _vertices[i];
-                    _vert.uv0 = _uvs[i];
-                    _quad[i] = _vert;
-                }
-                return _quad;
-            }
-            else
-                return null;
-        }
-
-        void AddPoint(VertexHelper vh, Vector2 position)
-        {
-            Rect r = new Rect(0, 0, 100 / transform.localScale.x, 100 / transform.localScale.y);
-            r.center = position;
-            // Debug.Log(position);
-            r.center -= new Vector2(1630, 800 / 2);
-
-            vh.AddUIVertexQuad(CreateQuad(new[] {
-                Rect.NormalizedToPoint(r, _uv0),
-                Rect.NormalizedToPoint(r, _uv1),
-                Rect.NormalizedToPoint(r, _uv2),
-                Rect.NormalizedToPoint(r, _uv3),
-            }, new[] { _uv0, _uv1, _uv2, _uv3 }));
-        }
-
-        Vector2 _uv0 = new Vector2(0, 0);
-        Vector2 _uv1 = new Vector2(0, 1);
-        Vector2 _uv2 = new Vector2(1, 1);
-        Vector2 _uv3 = new Vector2(1, 0);
-
-        private HashSet<Vector2> pointers2 = new HashSet<Vector2>();
-        protected override void OnPopulateMesh(VertexHelper vh)
-        {
-            vh.Clear();
-            foreach (var point in pointers2)
-                AddPoint(vh, point);
-        }
-    }
-}
--- a/Unity-20038-05-BallPool-8M/Assets/Frozen/Script/InputVisualizer.cs.meta
+++ b/Unity-20038-05-BallPool-8M/Assets/Frozen/Script/InputVisualizer.cs.meta
@ -1,11 +0,0 @@
-fileFormatVersion: 2
-guid: 8aa2387c8e5d92a4581feaf81f0d5da9
-MonoImporter:
-  externalObjects: {}
-  serializedVersion: 2
-  defaultReferences: []
-  executionOrder: 0
-  icon: {instanceID: 0}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
--- a/Unity-20038-05-BallPool-8M/Logs/Packages-Update.log
+++ b/Unity-20038-05-BallPool-8M/Logs/Packages-Update.log
@ -6,3 +6,28 @@ Update Mode: updateDependencies

 The following packages were updated:
  com.unity.analytics from version 3.2.2 to 3.2.3
+
+=== Tue Oct 27 19:09:48 2020
+
+Packages were changed.
+Update Mode: updateDependencies
+
+The following packages were added:
+  com.unity.2d.sprite@1.0.0
+  com.unity.2d.tilemap@1.0.0
+  com.unity.ide.rider@1.1.4
+  com.unity.ide.vscode@1.2.1
+  com.unity.modules.androidjni@1.0.0
+  com.unity.multiplayer-hlapi@1.0.6
+  com.unity.test-framework@1.1.16
+  com.unity.timeline@1.2.6
+  com.unity.ugui@1.0.0
+  com.unity.xr.legacyinputhelpers@2.1.4
+The following packages were updated:
+  com.unity.ads from version 2.0.8 to 3.4.9
+  com.unity.analytics from version 3.2.2 to 3.3.5
+  com.unity.collab-proxy from version 1.2.15 to 1.2.16
+  com.unity.purchasing from version 2.0.3 to 2.1.0
+  com.unity.textmeshpro from version 1.4.1 to 2.0.1
+The following packages were removed:
+  com.unity.package-manager-ui@2.0.8
--- a/Unity-20038-05-BallPool-8M/Packages/com.ultracombos.chwan1
+++ b/Unity-20038-05-BallPool-8M/Packages/com.ultracombos.chwan1
@ -1 +1 @@
-Subproject commit 606f26de5c827cc625098cff9995d523e5d6cdc5
+Subproject commit cfddddb0279462591fd6c92d242e132f8bdc2be3
--- a/Unity-20038-05-BallPool-8M/Packages/manifest.json
+++ b/Unity-20038-05-BallPool-8M/Packages/manifest.json
@ -1,21 +1,30 @@
 {
  "dependencies": {
+    "com.ultracombos.activity": "file:<project>/../../../_Package/com.ultracombos.activity",
    "com.ultracombos.generic-grpc": "file:<project>/../../../_Package/com.ultracombos.generic-grpc",
    "com.ultracombos.grpc": "file:<project>/../../../_Package/com.ultracombos.grpc",
    "com.ultracombos.movie-player": "file:<project>/../../../_Package/com.ultracombos.movie-player",
    "com.ultracombos.osc": "file:<project>/../../../_Package/com.ultracombos.osc",
    "com.ultracombos.tuio": "file:<project>/../../../_Package/com.ultracombos.tuio",
    "com.ultracombos.utility": "file:<project>/../../../_Package/com.ultracombos.utility",
-    "com.ultracombos.activity": "file:<project>/../../../_Package/com.ultracombos.activity",
-    "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.2d.sprite": "1.0.0",
+    "com.unity.2d.tilemap": "1.0.0",
+    "com.unity.ads": "3.4.9",
+    "com.unity.analytics": "3.3.5",
+    "com.unity.collab-proxy": "1.2.16",
+    "com.unity.ide.rider": "1.1.4",
+    "com.unity.ide.vscode": "1.2.1",
+    "com.unity.multiplayer-hlapi": "1.0.6",
    "com.unity.postprocessing": "2.2.2",
-    "com.unity.purchasing": "2.0.3",
-    "com.unity.textmeshpro": "1.4.1",
+    "com.unity.purchasing": "2.1.0",
+    "com.unity.test-framework": "1.1.16",
+    "com.unity.textmeshpro": "2.0.1",
+    "com.unity.timeline": "1.2.6",
+    "com.unity.ugui": "1.0.0",
+    "com.unity.xr.legacyinputhelpers": "2.1.4",
    "jp.keijiro.klak.spout": "file:<project>/../../../_Package/KlakSpout",
    "com.unity.modules.ai": "1.0.0",
+    "com.unity.modules.androidjni": "1.0.0",
    "com.unity.modules.animation": "1.0.0",
    "com.unity.modules.assetbundle": "1.0.0",
    "com.unity.modules.audio": "1.0.0",
@ -46,4 +55,4 @@
    "com.unity.modules.wind": "1.0.0",
    "com.unity.modules.xr": "1.0.0"
  }
-}
+}
--- a/Unity-20038-05-BallPool-8M/Packages/packages-lock.json
+++ b/Unity-20038-05-BallPool-8M/Packages/packages-lock.json
@ -0,0 +1,443 @@
+{
+  "dependencies": {
+    "com.ultracombos.activity": {
+      "version": "file:<project>/../../../_Package/com.ultracombos.activity",
+      "depth": 0,
+      "source": "local",
+      "dependencies": {}
+    },
+    "com.ultracombos.chwan1": {
+      "version": "file:com.ultracombos.chwan1",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {}
+    },
+    "com.ultracombos.control-panel": {
+      "version": "file:com.ultracombos.control-panel",
+      "depth": 0,
+      "source": "embedded",
+      "dependencies": {}
+    },
+    "com.ultracombos.generic-grpc": {
+      "version": "file:<project>/../../../_Package/com.ultracombos.generic-grpc",
+      "depth": 0,
+      "source": "local",
+      "dependencies": {}
+    },
+    "com.ultracombos.grpc": {
+      "version": "file:<project>/../../../_Package/com.ultracombos.grpc",
+      "depth": 0,
+      "source": "local",
+      "dependencies": {}
+    },
+    "com.ultracombos.movie-player": {
+      "version": "file:<project>/../../../_Package/com.ultracombos.movie-player",
+      "depth": 0,
+      "source": "local",
+      "dependencies": {
+        "com.unity.timeline": "1.0.0"
+      }
+    },
+    "com.ultracombos.osc": {
+      "version": "file:<project>/../../../_Package/com.ultracombos.osc",
+      "depth": 0,
+      "source": "local",
+      "dependencies": {}
+    },
+    "com.ultracombos.tuio": {
+      "version": "file:<project>/../../../_Package/com.ultracombos.tuio",
+      "depth": 0,
+      "source": "local",
+      "dependencies": {}
+    },
+    "com.ultracombos.utility": {
+      "version": "file:<project>/../../../_Package/com.ultracombos.utility",
+      "depth": 0,
+      "source": "local",
+      "dependencies": {}
+    },
+    "com.unity.2d.sprite": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.2d.tilemap": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.ads": {
+      "version": "3.4.9",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.ugui": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.analytics": {
+      "version": "3.3.5",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.ugui": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.collab-proxy": {
+      "version": "1.2.16",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.ext.nunit": {
+      "version": "1.0.0",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.ide.rider": {
+      "version": "1.1.4",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.test-framework": "1.1.1"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.ide.vscode": {
+      "version": "1.2.1",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.multiplayer-hlapi": {
+      "version": "1.0.6",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "nuget.mono-cecil": "0.1.6-preview"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.postprocessing": {
+      "version": "2.2.2",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.purchasing": {
+      "version": "2.1.0",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.ugui": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.test-framework": {
+      "version": "1.1.16",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.ext.nunit": "1.0.0",
+        "com.unity.modules.imgui": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.textmeshpro": {
+      "version": "2.0.1",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {
+        "com.unity.ugui": "1.0.0"
+      },
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.timeline": {
+      "version": "1.2.6",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.ugui": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.ui": "1.0.0",
+        "com.unity.modules.imgui": "1.0.0"
+      }
+    },
+    "com.unity.xr.legacyinputhelpers": {
+      "version": "2.1.4",
+      "depth": 0,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "jp.keijiro.klak.spout": {
+      "version": "file:<project>/../../../_Package/KlakSpout",
+      "depth": 0,
+      "source": "local",
+      "dependencies": {}
+    },
+    "nuget.mono-cecil": {
+      "version": "0.1.6-preview",
+      "depth": 1,
+      "source": "registry",
+      "dependencies": {},
+      "url": "https://packages.unity.com"
+    },
+    "com.unity.modules.ai": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.androidjni": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.animation": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.assetbundle": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.audio": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.cloth": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.physics": "1.0.0"
+      }
+    },
+    "com.unity.modules.director": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.audio": "1.0.0",
+        "com.unity.modules.animation": "1.0.0"
+      }
+    },
+    "com.unity.modules.imageconversion": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.imgui": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.jsonserialize": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.particlesystem": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.physics": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.physics2d": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.screencapture": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.imageconversion": "1.0.0"
+      }
+    },
+    "com.unity.modules.subsystems": {
+      "version": "1.0.0",
+      "depth": 1,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.jsonserialize": "1.0.0"
+      }
+    },
+    "com.unity.modules.terrain": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.terrainphysics": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.physics": "1.0.0",
+        "com.unity.modules.terrain": "1.0.0"
+      }
+    },
+    "com.unity.modules.tilemap": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.physics2d": "1.0.0"
+      }
+    },
+    "com.unity.modules.ui": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.uielements": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.imgui": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0"
+      }
+    },
+    "com.unity.modules.umbra": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.unityanalytics": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0"
+      }
+    },
+    "com.unity.modules.unitywebrequest": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.unitywebrequestassetbundle": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.assetbundle": "1.0.0",
+        "com.unity.modules.unitywebrequest": "1.0.0"
+      }
+    },
+    "com.unity.modules.unitywebrequestaudio": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.modules.audio": "1.0.0"
+      }
+    },
+    "com.unity.modules.unitywebrequesttexture": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.modules.imageconversion": "1.0.0"
+      }
+    },
+    "com.unity.modules.unitywebrequestwww": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.unitywebrequest": "1.0.0",
+        "com.unity.modules.unitywebrequestassetbundle": "1.0.0",
+        "com.unity.modules.unitywebrequestaudio": "1.0.0",
+        "com.unity.modules.audio": "1.0.0",
+        "com.unity.modules.assetbundle": "1.0.0",
+        "com.unity.modules.imageconversion": "1.0.0"
+      }
+    },
+    "com.unity.modules.vehicles": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.physics": "1.0.0"
+      }
+    },
+    "com.unity.modules.video": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.audio": "1.0.0",
+        "com.unity.modules.ui": "1.0.0",
+        "com.unity.modules.unitywebrequest": "1.0.0"
+      }
+    },
+    "com.unity.modules.vr": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.physics": "1.0.0",
+        "com.unity.modules.xr": "1.0.0"
+      }
+    },
+    "com.unity.modules.wind": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {}
+    },
+    "com.unity.modules.xr": {
+      "version": "1.0.0",
+      "depth": 0,
+      "source": "builtin",
+      "dependencies": {
+        "com.unity.modules.physics": "1.0.0",
+        "com.unity.modules.jsonserialize": "1.0.0",
+        "com.unity.modules.subsystems": "1.0.0"
+      }
+    }
+  }
+}
--- a/Unity-20038-05-BallPool-8M/ProjectSettings/EditorSettings.asset
+++ b/Unity-20038-05-BallPool-8M/ProjectSettings/EditorSettings.asset
@ -3,19 +3,33 @@
 --- !u!159 &1
 EditorSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 7
+  serializedVersion: 9
  m_ExternalVersionControlSupport: Visible Meta Files
  m_SerializationMode: 2
  m_LineEndingsForNewScripts: 2
  m_DefaultBehaviorMode: 0
+  m_PrefabRegularEnvironment: {fileID: 0}
+  m_PrefabUIEnvironment: {fileID: 0}
  m_SpritePackerMode: 0
  m_SpritePackerPaddingPower: 1
  m_EtcTextureCompressorBehavior: 1
  m_EtcTextureFastCompressor: 1
  m_EtcTextureNormalCompressor: 2
  m_EtcTextureBestCompressor: 4
-  m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;rsp
+  m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd;asmdef;rsp;asmref
  m_ProjectGenerationRootNamespace: 
-  m_UserGeneratedProjectSuffix: 
  m_CollabEditorSettings:
    inProgressEnabled: 1
+  m_EnableTextureStreamingInEditMode: 1
+  m_EnableTextureStreamingInPlayMode: 1
+  m_AsyncShaderCompilation: 1
+  m_EnterPlayModeOptionsEnabled: 0
+  m_EnterPlayModeOptions: 3
+  m_ShowLightmapResolutionOverlay: 1
+  m_UseLegacyProbeSampleCount: 1
+  m_AssetPipelineMode: 1
+  m_CacheServerMode: 0
+  m_CacheServerEndpoint: 
+  m_CacheServerNamespacePrefix: default
+  m_CacheServerEnableDownload: 1
+  m_CacheServerEnableUpload: 1
--- a/Unity-20038-05-BallPool-8M/ProjectSettings/ProjectSettings.asset
+++ b/Unity-20038-05-BallPool-8M/ProjectSettings/ProjectSettings.asset
@ -3,7 +3,7 @@
 --- !u!129 &1
 PlayerSettings:
  m_ObjectHideFlags: 0
-  serializedVersion: 18
+  serializedVersion: 20
  productGUID: 9c702f23d5e32a1488584e86173f6a39
  AndroidProfiler: 0
  AndroidFilterTouchesWhenObscured: 0
@ -52,7 +52,6 @@ PlayerSettings:
  m_StackTraceTypes: 010000000100000001000000010000000100000001000000
  iosShowActivityIndicatorOnLoading: -1
  androidShowActivityIndicatorOnLoading: -1
-  displayResolutionDialog: 0
  iosUseCustomAppBackgroundBehavior: 0
  iosAllowHTTPDownload: 1
  allowedAutorotateToPortrait: 1
@ -65,6 +64,7 @@ PlayerSettings:
  disableDepthAndStencilBuffers: 0
  androidStartInFullscreen: 1
  androidRenderOutsideSafeArea: 0
+  androidUseSwappy: 0
  androidBlitType: 0
  defaultIsNativeResolution: 1
  macRetinaSupport: 1
@ -79,11 +79,11 @@ PlayerSettings:
  usePlayerLog: 1
  bakeCollisionMeshes: 0
  forceSingleInstance: 0
+  useFlipModelSwapchain: 1
  resizableWindow: 0
  useMacAppStoreValidation: 0
  macAppStoreCategory: public.app-category.games
  gpuSkinning: 0
-  graphicsJobs: 1
  xboxPIXTextureCapture: 0
  xboxEnableAvatar: 0
  xboxEnableKinect: 0
@ -91,7 +91,6 @@ PlayerSettings:
  xboxEnableFitness: 0
  visibleInBackground: 1
  allowFullscreenSwitch: 1
-  graphicsJobMode: 0
  fullscreenMode: 1
  xboxSpeechDB: 0
  xboxEnableHeadOrientation: 0
@ -104,6 +103,7 @@ PlayerSettings:
  xboxOneMonoLoggingLevel: 0
  xboxOneLoggingLevel: 1
  xboxOneDisableEsram: 0
+  xboxOneEnableTypeOptimization: 0
  xboxOnePresentImmediateThreshold: 0
  switchQueueCommandMemory: 1048576
  switchQueueControlMemory: 16384
@ -111,7 +111,13 @@ PlayerSettings:
  switchNVNShaderPoolsGranularity: 33554432
  switchNVNDefaultPoolsGranularity: 16777216
  switchNVNOtherPoolsGranularity: 16777216
+  switchNVNMaxPublicTextureIDCount: 0
+  switchNVNMaxPublicSamplerIDCount: 0
+  stadiaPresentMode: 0
+  stadiaTargetFramerate: 0
+  vulkanNumSwapchainBuffers: 3
  vulkanEnableSetSRGBWrite: 0
+  vulkanEnableLateAcquireNextImage: 0
  m_SupportedAspectRatios:
    4:3: 1
    5:4: 1
@ -125,7 +131,6 @@ PlayerSettings:
  m_HolographicPauseOnTrackingLoss: 1
  xboxOneDisableKinectGpuReservation: 0
  xboxOneEnable7thCore: 0
-  isWsaHolographicRemotingEnabled: 0
  vrSettings:
    cardboard:
      depthFormat: 0
@ -140,6 +145,12 @@ PlayerSettings:
    hololens:
      depthFormat: 1
      depthBufferSharingEnabled: 0
+    lumin:
+      depthFormat: 0
+      frameTiming: 2
+      enableGLCache: 0
+      glCacheMaxBlobSize: 524288
+      glCacheMaxFileSize: 8388608
    oculus:
      sharedDepthBuffer: 0
      dashSupport: 0
@ -147,9 +158,10 @@ PlayerSettings:
      protectedContext: 0
      v2Signing: 0
    enable360StereoCapture: 0
-  protectGraphicsMemory: 0
+  isWsaHolographicRemotingEnabled: 0
  enableFrameTimingStats: 0
  useHDRDisplay: 0
+  D3DHDRBitDepth: 0
  m_ColorGamuts: 00000000
  targetPixelDensity: 30
  resolutionScalingMode: 0
@ -158,7 +170,7 @@ PlayerSettings:
  applicationIdentifier: {}
  buildNumber: {}
  AndroidBundleVersionCode: 1
-  AndroidMinSdkVersion: 16
+  AndroidMinSdkVersion: 19
  AndroidTargetSdkVersion: 0
  AndroidPreferredInstallLocation: 1
  aotOptions: 
@ -173,28 +185,16 @@ PlayerSettings:
  StripUnusedMeshComponents: 0
  VertexChannelCompressionMask: 214
  iPhoneSdkVersion: 988
-  iOSTargetOSVersionString: 9.0
+  iOSTargetOSVersionString: 10.0
  tvOSSdkVersion: 0
  tvOSRequireExtendedGameController: 0
-  tvOSTargetOSVersionString: 9.0
+  tvOSTargetOSVersionString: 10.0
  uIPrerenderedIcon: 0
  uIRequiresPersistentWiFi: 0
  uIRequiresFullScreen: 1
  uIStatusBarHidden: 1
  uIExitOnSuspend: 0
  uIStatusBarStyle: 0
-  iPhoneSplashScreen: {fileID: 0}
-  iPhoneHighResSplashScreen: {fileID: 0}
-  iPhoneTallHighResSplashScreen: {fileID: 0}
-  iPhone47inSplashScreen: {fileID: 0}
-  iPhone55inPortraitSplashScreen: {fileID: 0}
-  iPhone55inLandscapeSplashScreen: {fileID: 0}
-  iPhone58inPortraitSplashScreen: {fileID: 0}
-  iPhone58inLandscapeSplashScreen: {fileID: 0}
-  iPadPortraitSplashScreen: {fileID: 0}
-  iPadHighResPortraitSplashScreen: {fileID: 0}
-  iPadLandscapeSplashScreen: {fileID: 0}
-  iPadHighResLandscapeSplashScreen: {fileID: 0}
  appleTVSplashScreen: {fileID: 0}
  appleTVSplashScreen2x: {fileID: 0}
  tvOSSmallIconLayers: []
@ -254,23 +254,59 @@ PlayerSettings:
  AndroidEnableTango: 0
  androidEnableBanner: 1
  androidUseLowAccuracyLocation: 0
+  androidUseCustomKeystore: 0
  m_AndroidBanners:
  - width: 320
    height: 180
    banner: {fileID: 0}
  androidGamepadSupportLevel: 0
-  resolutionDialogBanner: {fileID: 0}
+  AndroidValidateAppBundleSize: 1
+  AndroidAppBundleSizeToValidate: 150
  m_BuildTargetIcons: []
  m_BuildTargetPlatformIcons: []
  m_BuildTargetBatching: []
+  m_BuildTargetGraphicsJobs:
+  - m_BuildTarget: MacStandaloneSupport
+    m_GraphicsJobs: 0
+  - m_BuildTarget: Switch
+    m_GraphicsJobs: 1
+  - m_BuildTarget: MetroSupport
+    m_GraphicsJobs: 1
+  - m_BuildTarget: AppleTVSupport
+    m_GraphicsJobs: 0
+  - m_BuildTarget: BJMSupport
+    m_GraphicsJobs: 1
+  - m_BuildTarget: LinuxStandaloneSupport
+    m_GraphicsJobs: 1
+  - m_BuildTarget: PS4Player
+    m_GraphicsJobs: 1
+  - m_BuildTarget: iOSSupport
+    m_GraphicsJobs: 0
+  - m_BuildTarget: WindowsStandaloneSupport
+    m_GraphicsJobs: 1
+  - m_BuildTarget: XboxOnePlayer
+    m_GraphicsJobs: 1
+  - m_BuildTarget: LuminSupport
+    m_GraphicsJobs: 0
+  - m_BuildTarget: CloudRendering
+    m_GraphicsJobs: 1
+  - m_BuildTarget: AndroidPlayer
+    m_GraphicsJobs: 0
+  - m_BuildTarget: WebGLSupport
+    m_GraphicsJobs: 0
+  m_BuildTargetGraphicsJobMode:
+  - m_BuildTarget: PS4Player
+    m_GraphicsJobMode: 0
+  - m_BuildTarget: XboxOnePlayer
+    m_GraphicsJobMode: 0
  m_BuildTargetGraphicsAPIs:
  - m_BuildTarget: WindowsStandaloneSupport
    m_APIs: 02000000
    m_Automatic: 1
  m_BuildTargetVRSettings: []
-  m_BuildTargetEnableVuforiaSettings: []
  openGLRequireES31: 0
  openGLRequireES31AEP: 0
+  openGLRequireES32: 0
  m_TemplateCustomTags: {}
  mobileMTRendering:
    Android: 1
@ -386,6 +422,7 @@ PlayerSettings:
  switchRatingsInt_9: 0
  switchRatingsInt_10: 0
  switchRatingsInt_11: 0
+  switchRatingsInt_12: 0
  switchLocalCommunicationIds_0: 
  switchLocalCommunicationIds_1: 
  switchLocalCommunicationIds_2: 
@ -442,6 +479,7 @@ PlayerSettings:
  ps4ShareFilePath: 
  ps4ShareOverlayImagePath: 
  ps4PrivacyGuardImagePath: 
+  ps4ExtraSceSysFile: 
  ps4NPtitleDatPath: 
  ps4RemotePlayKeyAssignment: -1
  ps4RemotePlayKeyMappingDir: 
@ -454,6 +492,7 @@ PlayerSettings:
  ps4DownloadDataSize: 0
  ps4GarlicHeapSize: 2048
  ps4ProGarlicHeapSize: 2560
+  playerPrefsMaxSize: 32768
  ps4Passcode: frAQBc8Wsa1xVPfvJcrgRYwTiizs2trQ
  ps4pnSessions: 1
  ps4pnPresence: 1
@ -466,6 +505,7 @@ PlayerSettings:
  ps4UseResolutionFallback: 0
  ps4ReprojectionSupport: 0
  ps4UseAudio3dBackend: 0
+  ps4UseLowGarlicFragmentationMode: 1
  ps4SocialScreenEnabled: 0
  ps4ScriptOptimizationLevel: 0
  ps4Audio3dVirtualSpeakerCount: 14
@ -482,11 +522,15 @@ PlayerSettings:
  ps4disableAutoHideSplash: 0
  ps4videoRecordingFeaturesUsed: 0
  ps4contentSearchFeaturesUsed: 0
+  ps4CompatibilityPS5: 0
+  ps4GPU800MHz: 1
  ps4attribEyeToEyeDistanceSettingVR: 0
  ps4IncludedModules: []
+  ps4attribVROutputEnabled: 0
  monoEnv: 
  splashScreenBackgroundSourceLandscape: {fileID: 0}
  splashScreenBackgroundSourcePortrait: {fileID: 0}
+  blurSplashScreenBackground: 1
  spritePackerPolicy: 
  webGLMemorySize: 256
  webGLExceptionSupport: 1
@ -501,11 +545,13 @@ PlayerSettings:
  webGLCompressionFormat: 1
  webGLLinkerTarget: 1
  webGLThreadsSupport: 0
+  webGLWasmStreaming: 0
  scriptingDefineSymbols:
    1: UNITY_POST_PROCESSING_STACK_V2
    4: UNITY_POST_PROCESSING_STACK_V2
    7: UNITY_POST_PROCESSING_STACK_V2
    13: UNITY_POST_PROCESSING_STACK_V2
+    14: UNITY_POST_PROCESSING_STACK_V2
    17: UNITY_POST_PROCESSING_STACK_V2
    18: UNITY_POST_PROCESSING_STACK_V2
    19: UNITY_POST_PROCESSING_STACK_V2
@ -517,6 +563,8 @@ PlayerSettings:
    26: UNITY_POST_PROCESSING_STACK_V2
    27: UNITY_POST_PROCESSING_STACK_V2
    28: UNITY_POST_PROCESSING_STACK_V2
+    29: UNITY_POST_PROCESSING_STACK_V2
+    30: UNITY_POST_PROCESSING_STACK_V2
  platformArchitecture: {}
  scriptingBackend: {}
  il2cppCompilerConfiguration: {}
@ -525,6 +573,8 @@ PlayerSettings:
  allowUnsafeCode: 0
  additionalIl2CppArgs: 
  scriptingRuntimeVersion: 1
+  gcIncremental: 0
+  gcWBarrierValidation: 0
  apiCompatibilityLevelPerPlatform:
    Standalone: 3
  m_RenderingPath: 1
@ -556,7 +606,6 @@ PlayerSettings:
  metroFTAName: 
  metroFTAFileTypes: []
  metroProtocolName: 
-  metroCompilationOverrides: 1
  XboxOneProductId: 
  XboxOneUpdateKey: 
  XboxOneSandboxId: 
@ -581,8 +630,8 @@ PlayerSettings:
  XboxOneAllowedProductIds: []
  XboxOnePersistentLocalStorageSize: 0
  XboxOneXTitleMemory: 8
-  xboxOneScriptCompiler: 0
  XboxOneOverrideIdentityName: 
+  XboxOneOverrideIdentityPublisher: 
  vrEditorSettings:
    daydream:
      daydreamIconForeground: {fileID: 0}
@ -594,18 +643,11 @@ PlayerSettings:
    m_PortalFolderPath: 
  luminCert:
    m_CertPath: 
-    m_PrivateKeyPath: 
+    m_SignPackage: 1
  luminIsChannelApp: 0
  luminVersion:
    m_VersionCode: 1
    m_VersionName: 
-  facebookSdkVersion: 7.9.4
-  facebookAppId: 
-  facebookCookies: 1
-  facebookLogging: 1
-  facebookStatus: 1
-  facebookXfbml: 0
-  facebookFrictionlessRequests: 1
  apiCompatibilityLevel: 3
  cloudProjectId: 
  framebufferDepthMemorylessMode: 0
--- a/Unity-20038-05-BallPool-8M/ProjectSettings/ProjectVersion.txt
+++ b/Unity-20038-05-BallPool-8M/ProjectSettings/ProjectVersion.txt
@ -1 +1,2 @@
-m_EditorVersion: 2018.4.11f1
+m_EditorVersion: 2019.4.10f1
+m_EditorVersionWithRevision: 2019.4.10f1 (5311b3af6f69)
--- a/Unity-20038-05-BallPool-8M/ProjectSettings/XRSettings.asset
+++ b/Unity-20038-05-BallPool-8M/ProjectSettings/XRSettings.asset
@ -0,0 +1,10 @@
+{
+    "m_SettingKeys": [
+        "VR Device Disabled",
+        "VR Device User Alert"
+    ],
+    "m_SettingValues": [
+        "False",
+        "False"
+    ]
+}
--- a/_Package/com.ultracombos.movie-player
+++ b/_Package/com.ultracombos.movie-player
@ -1 +1 @@
-Subproject commit ae67451532935d299c85afcf96c3b2e6b9b1497e
+Subproject commit 6be018c3884a8680b4ed53d67bdb0b6931ade995