From c20b6059e850fd9fa7e6552055df6dd7ad3b2e67 Mon Sep 17 00:00:00 2001 From: chrisgregan Date: Wed, 20 Aug 2014 11:55:57 +0100 Subject: [PATCH] Command scripts now stored in module folders --- .../Commands.meta} | 2 +- .../Audio/{Scripts => Commands}/PlayMusic.cs | 0 .../{Scripts => Commands}/PlayMusic.cs.meta | 0 .../Audio/{Scripts => Commands}/PlaySound.cs | 0 .../{Scripts => Commands}/PlaySound.cs.meta | 0 .../{Scripts => Commands}/SetMusicVolume.cs | 0 .../SetMusicVolume.cs.meta | 0 .../Audio/{Scripts => Commands}/StopMusic.cs | 0 .../{Scripts => Commands}/StopMusic.cs.meta | 0 Assets/Fungus/Camera/Commands.meta | 5 +++++ .../Scripts => Camera/Commands}/SetView.cs | 0 .../Commands}/SetView.cs.meta | 0 Assets/Fungus/Dialog/Commands.meta | 5 +++++ .../Scripts => Dialog/Commands}/AddOption.cs | 0 .../Commands}/AddOption.cs.meta | 0 .../Scripts => Dialog/Commands}/Say.cs | 0 .../Scripts => Dialog/Commands}/Say.cs.meta | 0 Assets/Fungus/Sprite/Commands.meta | 5 +++++ .../Scripts => Sprite/Commands}/FadeSprite.cs | 0 .../Commands}/FadeSprite.cs.meta | 0 .../{FungusCommands => Sprite}/Scripts.meta | 2 +- .../Sprite/{ => Scripts}/AnimationListener.cs | 0 .../{ => Scripts}/AnimationListener.cs.meta | 0 Assets/Fungus/Sprite/{ => Scripts}/Button.cs | 0 .../Sprite/{ => Scripts}/Button.cs.meta | 0 .../Fungus/Sprite/{ => Scripts}/GUIButton.cs | 0 .../Sprite/{ => Scripts}/GUIButton.cs.meta | 0 .../Fungus/Sprite/{ => Scripts}/Parallax.cs | 0 .../Sprite/{ => Scripts}/Parallax.cs.meta | 0 .../Sprite/{ => Scripts}/SpriteFader.cs | 0 .../Sprite/{ => Scripts}/SpriteFader.cs.meta | 0 Assets/Shuttle/ShuttleGame.unity | Bin 87636 -> 87636 bytes 32 files changed, 17 insertions(+), 2 deletions(-) rename Assets/Fungus/{FungusCommands.meta => Audio/Commands.meta} (63%) rename Assets/Fungus/Audio/{Scripts => Commands}/PlayMusic.cs (100%) rename Assets/Fungus/Audio/{Scripts => Commands}/PlayMusic.cs.meta (100%) rename Assets/Fungus/Audio/{Scripts => Commands}/PlaySound.cs (100%) rename Assets/Fungus/Audio/{Scripts => Commands}/PlaySound.cs.meta (100%) rename Assets/Fungus/Audio/{Scripts => Commands}/SetMusicVolume.cs (100%) rename Assets/Fungus/Audio/{Scripts => Commands}/SetMusicVolume.cs.meta (100%) rename Assets/Fungus/Audio/{Scripts => Commands}/StopMusic.cs (100%) rename Assets/Fungus/Audio/{Scripts => Commands}/StopMusic.cs.meta (100%) create mode 100644 Assets/Fungus/Camera/Commands.meta rename Assets/Fungus/{FungusCommands/Scripts => Camera/Commands}/SetView.cs (100%) rename Assets/Fungus/{FungusCommands/Scripts => Camera/Commands}/SetView.cs.meta (100%) create mode 100644 Assets/Fungus/Dialog/Commands.meta rename Assets/Fungus/{FungusCommands/Scripts => Dialog/Commands}/AddOption.cs (100%) rename Assets/Fungus/{FungusCommands/Scripts => Dialog/Commands}/AddOption.cs.meta (100%) rename Assets/Fungus/{FungusCommands/Scripts => Dialog/Commands}/Say.cs (100%) rename Assets/Fungus/{FungusCommands/Scripts => Dialog/Commands}/Say.cs.meta (100%) create mode 100644 Assets/Fungus/Sprite/Commands.meta rename Assets/Fungus/{FungusCommands/Scripts => Sprite/Commands}/FadeSprite.cs (100%) rename Assets/Fungus/{FungusCommands/Scripts => Sprite/Commands}/FadeSprite.cs.meta (100%) rename Assets/Fungus/{FungusCommands => Sprite}/Scripts.meta (63%) rename Assets/Fungus/Sprite/{ => Scripts}/AnimationListener.cs (100%) rename Assets/Fungus/Sprite/{ => Scripts}/AnimationListener.cs.meta (100%) rename Assets/Fungus/Sprite/{ => Scripts}/Button.cs (100%) rename Assets/Fungus/Sprite/{ => Scripts}/Button.cs.meta (100%) rename Assets/Fungus/Sprite/{ => Scripts}/GUIButton.cs (100%) rename Assets/Fungus/Sprite/{ => Scripts}/GUIButton.cs.meta (100%) rename Assets/Fungus/Sprite/{ => Scripts}/Parallax.cs (100%) rename Assets/Fungus/Sprite/{ => Scripts}/Parallax.cs.meta (100%) rename Assets/Fungus/Sprite/{ => Scripts}/SpriteFader.cs (100%) rename Assets/Fungus/Sprite/{ => Scripts}/SpriteFader.cs.meta (100%) diff --git a/Assets/Fungus/FungusCommands.meta b/Assets/Fungus/Audio/Commands.meta similarity index 63% rename from Assets/Fungus/FungusCommands.meta rename to Assets/Fungus/Audio/Commands.meta index 593a2457..74aea98a 100644 --- a/Assets/Fungus/FungusCommands.meta +++ b/Assets/Fungus/Audio/Commands.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 0e8e8de5785db46fc89683d8b6d3ffec +guid: d4ee6befb080e414984229c6b24358ae folderAsset: yes DefaultImporter: userData: diff --git a/Assets/Fungus/Audio/Scripts/PlayMusic.cs b/Assets/Fungus/Audio/Commands/PlayMusic.cs similarity index 100% rename from Assets/Fungus/Audio/Scripts/PlayMusic.cs rename to Assets/Fungus/Audio/Commands/PlayMusic.cs diff --git a/Assets/Fungus/Audio/Scripts/PlayMusic.cs.meta b/Assets/Fungus/Audio/Commands/PlayMusic.cs.meta similarity index 100% rename from Assets/Fungus/Audio/Scripts/PlayMusic.cs.meta rename to Assets/Fungus/Audio/Commands/PlayMusic.cs.meta diff --git a/Assets/Fungus/Audio/Scripts/PlaySound.cs b/Assets/Fungus/Audio/Commands/PlaySound.cs similarity index 100% rename from Assets/Fungus/Audio/Scripts/PlaySound.cs rename to Assets/Fungus/Audio/Commands/PlaySound.cs diff --git a/Assets/Fungus/Audio/Scripts/PlaySound.cs.meta b/Assets/Fungus/Audio/Commands/PlaySound.cs.meta similarity index 100% rename from Assets/Fungus/Audio/Scripts/PlaySound.cs.meta rename to Assets/Fungus/Audio/Commands/PlaySound.cs.meta diff --git a/Assets/Fungus/Audio/Scripts/SetMusicVolume.cs b/Assets/Fungus/Audio/Commands/SetMusicVolume.cs similarity index 100% rename from Assets/Fungus/Audio/Scripts/SetMusicVolume.cs rename to Assets/Fungus/Audio/Commands/SetMusicVolume.cs diff --git a/Assets/Fungus/Audio/Scripts/SetMusicVolume.cs.meta b/Assets/Fungus/Audio/Commands/SetMusicVolume.cs.meta similarity index 100% rename from Assets/Fungus/Audio/Scripts/SetMusicVolume.cs.meta rename to Assets/Fungus/Audio/Commands/SetMusicVolume.cs.meta diff --git a/Assets/Fungus/Audio/Scripts/StopMusic.cs b/Assets/Fungus/Audio/Commands/StopMusic.cs similarity index 100% rename from Assets/Fungus/Audio/Scripts/StopMusic.cs rename to Assets/Fungus/Audio/Commands/StopMusic.cs diff --git a/Assets/Fungus/Audio/Scripts/StopMusic.cs.meta b/Assets/Fungus/Audio/Commands/StopMusic.cs.meta similarity index 100% rename from Assets/Fungus/Audio/Scripts/StopMusic.cs.meta rename to Assets/Fungus/Audio/Commands/StopMusic.cs.meta diff --git a/Assets/Fungus/Camera/Commands.meta b/Assets/Fungus/Camera/Commands.meta new file mode 100644 index 00000000..8c5117e8 --- /dev/null +++ b/Assets/Fungus/Camera/Commands.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 42741b4e7e5d44f8b8268e93d23ee33e +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/Fungus/FungusCommands/Scripts/SetView.cs b/Assets/Fungus/Camera/Commands/SetView.cs similarity index 100% rename from Assets/Fungus/FungusCommands/Scripts/SetView.cs rename to Assets/Fungus/Camera/Commands/SetView.cs diff --git a/Assets/Fungus/FungusCommands/Scripts/SetView.cs.meta b/Assets/Fungus/Camera/Commands/SetView.cs.meta similarity index 100% rename from Assets/Fungus/FungusCommands/Scripts/SetView.cs.meta rename to Assets/Fungus/Camera/Commands/SetView.cs.meta diff --git a/Assets/Fungus/Dialog/Commands.meta b/Assets/Fungus/Dialog/Commands.meta new file mode 100644 index 00000000..9e87cc9a --- /dev/null +++ b/Assets/Fungus/Dialog/Commands.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 0bb03bbaacb014e7399075a2d6ecad3f +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/Fungus/FungusCommands/Scripts/AddOption.cs b/Assets/Fungus/Dialog/Commands/AddOption.cs similarity index 100% rename from Assets/Fungus/FungusCommands/Scripts/AddOption.cs rename to Assets/Fungus/Dialog/Commands/AddOption.cs diff --git a/Assets/Fungus/FungusCommands/Scripts/AddOption.cs.meta b/Assets/Fungus/Dialog/Commands/AddOption.cs.meta similarity index 100% rename from Assets/Fungus/FungusCommands/Scripts/AddOption.cs.meta rename to Assets/Fungus/Dialog/Commands/AddOption.cs.meta diff --git a/Assets/Fungus/FungusCommands/Scripts/Say.cs b/Assets/Fungus/Dialog/Commands/Say.cs similarity index 100% rename from Assets/Fungus/FungusCommands/Scripts/Say.cs rename to Assets/Fungus/Dialog/Commands/Say.cs diff --git a/Assets/Fungus/FungusCommands/Scripts/Say.cs.meta b/Assets/Fungus/Dialog/Commands/Say.cs.meta similarity index 100% rename from Assets/Fungus/FungusCommands/Scripts/Say.cs.meta rename to Assets/Fungus/Dialog/Commands/Say.cs.meta diff --git a/Assets/Fungus/Sprite/Commands.meta b/Assets/Fungus/Sprite/Commands.meta new file mode 100644 index 00000000..148d43a4 --- /dev/null +++ b/Assets/Fungus/Sprite/Commands.meta @@ -0,0 +1,5 @@ +fileFormatVersion: 2 +guid: 64930440b47ca4f1e85e62d2c8b1b38f +folderAsset: yes +DefaultImporter: + userData: diff --git a/Assets/Fungus/FungusCommands/Scripts/FadeSprite.cs b/Assets/Fungus/Sprite/Commands/FadeSprite.cs similarity index 100% rename from Assets/Fungus/FungusCommands/Scripts/FadeSprite.cs rename to Assets/Fungus/Sprite/Commands/FadeSprite.cs diff --git a/Assets/Fungus/FungusCommands/Scripts/FadeSprite.cs.meta b/Assets/Fungus/Sprite/Commands/FadeSprite.cs.meta similarity index 100% rename from Assets/Fungus/FungusCommands/Scripts/FadeSprite.cs.meta rename to Assets/Fungus/Sprite/Commands/FadeSprite.cs.meta diff --git a/Assets/Fungus/FungusCommands/Scripts.meta b/Assets/Fungus/Sprite/Scripts.meta similarity index 63% rename from Assets/Fungus/FungusCommands/Scripts.meta rename to Assets/Fungus/Sprite/Scripts.meta index bf223d18..6cf58c9a 100644 --- a/Assets/Fungus/FungusCommands/Scripts.meta +++ b/Assets/Fungus/Sprite/Scripts.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: b7cacfabea94e487ea051fd27c5f7410 +guid: 601ceabb5df6040c59cf2a8d00a9f91d folderAsset: yes DefaultImporter: userData: diff --git a/Assets/Fungus/Sprite/AnimationListener.cs b/Assets/Fungus/Sprite/Scripts/AnimationListener.cs similarity index 100% rename from Assets/Fungus/Sprite/AnimationListener.cs rename to Assets/Fungus/Sprite/Scripts/AnimationListener.cs diff --git a/Assets/Fungus/Sprite/AnimationListener.cs.meta b/Assets/Fungus/Sprite/Scripts/AnimationListener.cs.meta similarity index 100% rename from Assets/Fungus/Sprite/AnimationListener.cs.meta rename to Assets/Fungus/Sprite/Scripts/AnimationListener.cs.meta diff --git a/Assets/Fungus/Sprite/Button.cs b/Assets/Fungus/Sprite/Scripts/Button.cs similarity index 100% rename from Assets/Fungus/Sprite/Button.cs rename to Assets/Fungus/Sprite/Scripts/Button.cs diff --git a/Assets/Fungus/Sprite/Button.cs.meta b/Assets/Fungus/Sprite/Scripts/Button.cs.meta similarity index 100% rename from Assets/Fungus/Sprite/Button.cs.meta rename to Assets/Fungus/Sprite/Scripts/Button.cs.meta diff --git a/Assets/Fungus/Sprite/GUIButton.cs b/Assets/Fungus/Sprite/Scripts/GUIButton.cs similarity index 100% rename from Assets/Fungus/Sprite/GUIButton.cs rename to Assets/Fungus/Sprite/Scripts/GUIButton.cs diff --git a/Assets/Fungus/Sprite/GUIButton.cs.meta b/Assets/Fungus/Sprite/Scripts/GUIButton.cs.meta similarity index 100% rename from Assets/Fungus/Sprite/GUIButton.cs.meta rename to Assets/Fungus/Sprite/Scripts/GUIButton.cs.meta diff --git a/Assets/Fungus/Sprite/Parallax.cs b/Assets/Fungus/Sprite/Scripts/Parallax.cs similarity index 100% rename from Assets/Fungus/Sprite/Parallax.cs rename to Assets/Fungus/Sprite/Scripts/Parallax.cs diff --git a/Assets/Fungus/Sprite/Parallax.cs.meta b/Assets/Fungus/Sprite/Scripts/Parallax.cs.meta similarity index 100% rename from Assets/Fungus/Sprite/Parallax.cs.meta rename to Assets/Fungus/Sprite/Scripts/Parallax.cs.meta diff --git a/Assets/Fungus/Sprite/SpriteFader.cs b/Assets/Fungus/Sprite/Scripts/SpriteFader.cs similarity index 100% rename from Assets/Fungus/Sprite/SpriteFader.cs rename to Assets/Fungus/Sprite/Scripts/SpriteFader.cs diff --git a/Assets/Fungus/Sprite/SpriteFader.cs.meta b/Assets/Fungus/Sprite/Scripts/SpriteFader.cs.meta similarity index 100% rename from Assets/Fungus/Sprite/SpriteFader.cs.meta rename to Assets/Fungus/Sprite/Scripts/SpriteFader.cs.meta diff --git a/Assets/Shuttle/ShuttleGame.unity b/Assets/Shuttle/ShuttleGame.unity index 0d5fed16791f9d01fb607c4eb272f1a6cb52d302..9d19030da1f0175ad92c09e9fec7e17b0f9c1fa8 100644 GIT binary patch delta 21 dcmcbzhV{xC)`l&NB__-a3_{z>O&ISg0svg(2VMXG delta 21 dcmcbzhV{xC)`l&NB__-n|D?8;n=sy01ORBX2+RNg