From e7e1816efd2abbb976c647b71571c05c7c27f1a1 Mon Sep 17 00:00:00 2001 From: max Date: Thu, 31 Oct 2019 18:37:03 +0100 Subject: [PATCH] Animator Tryout --- .../.idea.UnityProject/.idea/contentModel.xml | 322 +----------- .../.idea.UnityProject/.idea/workspace.xml | 111 +---- UnityProject/Assembly-CSharp-Editor.csproj | 460 +++++++++--------- UnityProject/Assembly-CSharp.csproj | 431 ++++++++-------- .../Assets/Animations/Cube.controller | 156 ++++++ .../Assets/Animations/Cube.controller.meta | 8 + .../Animations/OrangeBoxAnimation1.anim | 199 ++++++++ .../Animations/OrangeBoxAnimation1.anim.meta | 8 + .../Assets/Scenes/Examples/MIDI/MIDI.unity | 154 ++++++ .../Examples/MIDI/script/OrangeCubeScript.cs | 30 ++ .../MIDI/script/OrangeCubeScript.cs.meta | 11 + .../Construction_Site_Column/Materials.meta} | 2 +- 12 files changed, 1058 insertions(+), 834 deletions(-) create mode 100644 UnityProject/Assets/Animations/Cube.controller create mode 100644 UnityProject/Assets/Animations/Cube.controller.meta create mode 100644 UnityProject/Assets/Animations/OrangeBoxAnimation1.anim create mode 100644 UnityProject/Assets/Animations/OrangeBoxAnimation1.anim.meta create mode 100644 UnityProject/Assets/Scenes/Examples/MIDI/script/OrangeCubeScript.cs create mode 100644 UnityProject/Assets/Scenes/Examples/MIDI/script/OrangeCubeScript.cs.meta rename UnityProject/Assets/{Scripts/VideoInput/Editor.meta => ThridParty/Assets/Construction_Site_Column/Materials.meta} (77%) diff --git a/UnityProject/.idea/.idea.UnityProject/.idea/contentModel.xml b/UnityProject/.idea/.idea.UnityProject/.idea/contentModel.xml index 39d977f..bfc19c3 100644 --- a/UnityProject/.idea/.idea.UnityProject/.idea/contentModel.xml +++ b/UnityProject/.idea/.idea.UnityProject/.idea/contentModel.xml @@ -1,9 +1,9 @@ - - - + + + @@ -14,6 +14,7 @@ + @@ -34,6 +35,11 @@ + + + + + @@ -43,12 +49,17 @@ + + + + + @@ -83,15 +94,18 @@ - + + + + @@ -111,21 +125,14 @@ - - - - - - - + - + - @@ -171,291 +178,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -541,10 +263,6 @@ - - - - diff --git a/UnityProject/.idea/.idea.UnityProject/.idea/workspace.xml b/UnityProject/.idea/.idea.UnityProject/.idea/workspace.xml index 2dbf783..0d08cce 100644 --- a/UnityProject/.idea/.idea.UnityProject/.idea/workspace.xml +++ b/UnityProject/.idea/.idea.UnityProject/.idea/workspace.xml @@ -2,101 +2,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - +