From 9745a4b2c8bcb11ab8be1d3047ff8615e7fb374f Mon Sep 17 00:00:00 2001 From: tigerchen Date: Tue, 10 Dec 2019 11:02:30 +0800 Subject: [PATCH] [submudule] Updated. --- .gitmodules | 8 -------- .../Assets/Visual Effect Graphs/iceVFX_2018.vfx | 6 +++--- .../Packages/com.ultracombos.osc | 1 - Unity-19050-01_ForstCoronation/Packages/manifest.json | 2 ++ 4 files changed, 5 insertions(+), 12 deletions(-) delete mode 160000 Unity-19050-01_ForstCoronation/Packages/com.ultracombos.osc diff --git a/.gitmodules b/.gitmodules index 332832c..8608425 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,14 +13,6 @@ [submodule "_Package/com.ultracombos.movie-player"] path = _Package/com.ultracombos.movie-player url = https://github.com/UltraCombos/com.ultracombos.movie-player -[submodule "Unity-19050-01_ForstCoronation/Packages/com.ultracombos.tuio"] - path = 01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Packages/com.ultracombos.tuio - url = https://github.com/UltraCombos/com.ultracombos.tuio.git - branch = master -[submodule "Unity-19050-01_ForstCoronation/Packages/com.ultracombos.osc"] - path = 01_ForstCoronation/Unity-19050-01_ForstCoronation/19050-01_ForstCoronation/Packages/com.ultracombos.osc - url = https://github.com/UltraCombos/com.ultracombos.osc.git - branch = master [submodule "_Package/com.ultracombos.osc"] path = _Package/com.ultracombos.osc url = https://github.com/UltraCombos/com.ultracombos.osc diff --git a/Unity-19050-01_ForstCoronation/Assets/Visual Effect Graphs/iceVFX_2018.vfx b/Unity-19050-01_ForstCoronation/Assets/Visual Effect Graphs/iceVFX_2018.vfx index 31c136d..1d25641 100644 --- a/Unity-19050-01_ForstCoronation/Assets/Visual Effect Graphs/iceVFX_2018.vfx +++ b/Unity-19050-01_ForstCoronation/Assets/Visual Effect Graphs/iceVFX_2018.vfx @@ -211,10 +211,10 @@ MonoBehaviour: categories: [] uiBounds: serializedVersion: 2 - x: -1542 + x: -1517 y: -422 - width: 4586 - height: 3776 + width: 4561 + height: 3828 --- !u!114 &114350483966674976 MonoBehaviour: m_ObjectHideFlags: 1 diff --git a/Unity-19050-01_ForstCoronation/Packages/com.ultracombos.osc b/Unity-19050-01_ForstCoronation/Packages/com.ultracombos.osc deleted file mode 160000 index e594dfc..0000000 --- a/Unity-19050-01_ForstCoronation/Packages/com.ultracombos.osc +++ /dev/null @@ -1 +0,0 @@ -Subproject commit e594dfc8647586530b53cd990d56caa0d07adde2 diff --git a/Unity-19050-01_ForstCoronation/Packages/manifest.json b/Unity-19050-01_ForstCoronation/Packages/manifest.json index 6eeadb7..fd2d9c7 100644 --- a/Unity-19050-01_ForstCoronation/Packages/manifest.json +++ b/Unity-19050-01_ForstCoronation/Packages/manifest.json @@ -2,6 +2,8 @@ "dependencies": { "com.ultracombos.configuration": "file:/../../../_Package/com.ultracombos.configuration", "com.ultracombos.grpc": "file:/../../../_Package/com.ultracombos.grpc", + "com.ultracombos.osc": "file:/../../../_Package/com.ultracombos.osc", + "com.ultracombos.tuio": "file:/../../../_Package/com.ultracombos.tuio", "jp.keijiro.klak.spout": "file:/../../../_Package/KlakSpout", "com.unity.ads": "2.0.8", "com.unity.analytics": "3.2.2",