update submodule

master
chwan1 6 years ago
parent 36033525e7
commit 924522cb36
  1. 7
      .gitmodules
  2. 4
      Unity-19050-05-BallPool/ProjectSettings/EditorBuildSettings.asset
  3. 16
      Unity-19050-05-BallPool/ProjectSettings/UnityConnectSettings.asset

7
.gitmodules vendored

@ -21,19 +21,12 @@
path = Unity-19050-01_ForstCoronation/Packages/com.ultracombos.osc path = Unity-19050-01_ForstCoronation/Packages/com.ultracombos.osc
url = https://github.com/UltraCombos/com.ultracombos.osc.git url = https://github.com/UltraCombos/com.ultracombos.osc.git
branch = master branch = master
[submodule "Unity-19050-01_ForstCoronation/Packages/KlakSpout"]
path = Unity-19050-01_ForstCoronation/Packages/KlakSpout
url = https://github.com/UltraCombos/KlakSpout
branch = upm
[submodule "_Package/com.ultracombos.osc"] [submodule "_Package/com.ultracombos.osc"]
path = _Package/com.ultracombos.osc path = _Package/com.ultracombos.osc
url = https://github.com/UltraCombos/com.ultracombos.osc url = https://github.com/UltraCombos/com.ultracombos.osc
[submodule "_Package/com.ultracombos.tuio"] [submodule "_Package/com.ultracombos.tuio"]
path = _Package/com.ultracombos.tuio path = _Package/com.ultracombos.tuio
url = https://github.com/UltraCombos/com.ultracombos.tuio url = https://github.com/UltraCombos/com.ultracombos.tuio
[submodule "_Package/jp.keijiro.klak.spout"]
path = _Package/jp.keijiro.klak.spout
url = "https://github.com/keijiro/KlakSpout#upm"
[submodule "_Package/com.ultracombos.configuration"] [submodule "_Package/com.ultracombos.configuration"]
path = _Package/com.ultracombos.configuration path = _Package/com.ultracombos.configuration
url = https://github.com/UltraCombos/com.ultracombos.configuration.git url = https://github.com/UltraCombos/com.ultracombos.configuration.git

@ -8,6 +8,4 @@ EditorBuildSettings:
- enabled: 1 - enabled: 1
path: Assets/Frozen/Frozen.unity path: Assets/Frozen/Frozen.unity
guid: 34b4afb9026442541b75a5cc9009882b guid: 34b4afb9026442541b75a5cc9009882b
- enabled: 0 m_configObjects: {}
path:
guid: 00000000000000000000000000000000

@ -3,25 +3,25 @@
--- !u!310 &1 --- !u!310 &1
UnityConnectSettings: UnityConnectSettings:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_Enabled: 0 serializedVersion: 1
m_Enabled: 1
m_TestMode: 0 m_TestMode: 0
m_TestEventUrl: m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
m_TestConfigUrl: m_EventUrl: https://cdp.cloud.unity3d.com/v1/events
m_ConfigUrl: https://config.uca.cloud.unity3d.com
m_TestInitMode: 0 m_TestInitMode: 0
CrashReportingSettings: CrashReportingSettings:
m_EventUrl: https://perf-events.cloud.unity3d.com/api/events/crashes m_EventUrl: https://perf-events.cloud.unity3d.com
m_NativeEventUrl: https://perf-events.cloud.unity3d.com/symbolicate
m_Enabled: 0 m_Enabled: 0
m_LogBufferSize: 10
m_CaptureEditorExceptions: 1 m_CaptureEditorExceptions: 1
UnityPurchasingSettings: UnityPurchasingSettings:
m_Enabled: 0 m_Enabled: 0
m_TestMode: 0 m_TestMode: 0
UnityAnalyticsSettings: UnityAnalyticsSettings:
m_Enabled: 0 m_Enabled: 0
m_InitializeOnStartup: 1
m_TestMode: 0 m_TestMode: 0
m_TestEventUrl: m_InitializeOnStartup: 1
m_TestConfigUrl:
UnityAdsSettings: UnityAdsSettings:
m_Enabled: 0 m_Enabled: 0
m_InitializeOnStartup: 1 m_InitializeOnStartup: 1

Loading…
Cancel
Save