Browse Source

Merge pull request #534 from snozbot/refactor-folders

Refactor project folder structure
master
Chris Gregan 8 years ago committed by GitHub
parent
commit
6cbdd3cc56
  1. 5
      Assets/Fungus/Animation.meta
  2. 5
      Assets/Fungus/Animation/Scripts.meta
  3. 5
      Assets/Fungus/Animation/Scripts/Commands.meta
  4. 5
      Assets/Fungus/Audio/Audio.meta
  5. 0
      Assets/Fungus/Audio/Click.wav
  6. 0
      Assets/Fungus/Audio/Click.wav.meta
  7. 0
      Assets/Fungus/Audio/Click2.wav
  8. 0
      Assets/Fungus/Audio/Click2.wav.meta
  9. 5
      Assets/Fungus/Audio/Editor.meta
  10. 0
      Assets/Fungus/Audio/HighVoice.wav
  11. 0
      Assets/Fungus/Audio/HighVoice.wav.meta
  12. 0
      Assets/Fungus/Audio/LowVoice.wav
  13. 0
      Assets/Fungus/Audio/LowVoice.wav.meta
  14. 0
      Assets/Fungus/Audio/MidVoice.wav
  15. 0
      Assets/Fungus/Audio/MidVoice.wav.meta
  16. 5
      Assets/Fungus/Audio/Scripts.meta
  17. 5
      Assets/Fungus/Audio/Scripts/Commands.meta
  18. 5
      Assets/Fungus/Camera.meta
  19. 5
      Assets/Fungus/Camera/Editor.meta
  20. 5
      Assets/Fungus/Camera/Scripts.meta
  21. 5
      Assets/Fungus/Camera/Scripts/Commands.meta
  22. 4
      Assets/Fungus/Docs.meta
  23. 0
      Assets/Fungus/Docs/CHANGELOG.txt
  24. 0
      Assets/Fungus/Docs/CHANGELOG.txt.meta
  25. 0
      Assets/Fungus/Docs/LICENSE.txt
  26. 0
      Assets/Fungus/Docs/LICENSE.txt.meta
  27. 0
      Assets/Fungus/Docs/README.txt
  28. 0
      Assets/Fungus/Docs/README.txt.meta
  29. 5
      Assets/Fungus/Flowchart.meta
  30. 5
      Assets/Fungus/Flowchart/Editor.meta
  31. 9
      Assets/Fungus/Flowchart/Editor/Extensions.meta
  32. 5
      Assets/Fungus/Flowchart/Editor/Resources.meta
  33. 5
      Assets/Fungus/Flowchart/Scripts.meta
  34. 5
      Assets/Fungus/Flowchart/Scripts/Commands.meta
  35. 5
      Assets/Fungus/Flowchart/Scripts/EventHandlers.meta
  36. 5
      Assets/Fungus/Flowchart/Sprites.meta
  37. 0
      Assets/Fungus/Fonts.meta
  38. 0
      Assets/Fungus/Fonts/Amaranth.meta
  39. 0
      Assets/Fungus/Fonts/Amaranth/Amaranth-Bold.otf
  40. 0
      Assets/Fungus/Fonts/Amaranth/Amaranth-Bold.otf.meta
  41. 0
      Assets/Fungus/Fonts/Amaranth/Amaranth-BoldItalic.otf
  42. 0
      Assets/Fungus/Fonts/Amaranth/Amaranth-BoldItalic.otf.meta
  43. 0
      Assets/Fungus/Fonts/Amaranth/Amaranth-Italic.otf
  44. 0
      Assets/Fungus/Fonts/Amaranth/Amaranth-Italic.otf.meta
  45. 0
      Assets/Fungus/Fonts/Amaranth/Amaranth-Regular.otf
  46. 0
      Assets/Fungus/Fonts/Amaranth/Amaranth-Regular.otf.meta
  47. 0
      Assets/Fungus/Fonts/Amaranth/SIL Open Font License.txt
  48. 0
      Assets/Fungus/Fonts/Amaranth/SIL Open Font License.txt.meta
  49. 0
      Assets/Fungus/Fonts/Exo2.meta
  50. 0
      Assets/Fungus/Fonts/Exo2/Exo2-Bold.ttf
  51. 0
      Assets/Fungus/Fonts/Exo2/Exo2-Bold.ttf.meta
  52. 0
      Assets/Fungus/Fonts/Exo2/Exo2-Regular.ttf
  53. 0
      Assets/Fungus/Fonts/Exo2/Exo2-Regular.ttf.meta
  54. 0
      Assets/Fungus/Fonts/Exo2/OFL.txt
  55. 0
      Assets/Fungus/Fonts/Exo2/OFL.txt.meta
  56. 101
      Assets/Fungus/Lua/Scripts/LuaExtensions.cs
  57. 5
      Assets/Fungus/Narrative.meta
  58. 5
      Assets/Fungus/Narrative/Audio.meta
  59. 5
      Assets/Fungus/Narrative/Editor.meta
  60. 5
      Assets/Fungus/Narrative/Images.meta
  61. 5
      Assets/Fungus/Narrative/Resources.meta
  62. 5
      Assets/Fungus/Narrative/Scripts.meta
  63. 5
      Assets/Fungus/Narrative/Scripts/Commands.meta
  64. 9
      Assets/Fungus/Narrative/Scripts/Interfaces.meta
  65. 0
      Assets/Fungus/Resources.meta
  66. 0
      Assets/Fungus/Resources/GLLineDraw.mat
  67. 0
      Assets/Fungus/Resources/GLLineDraw.mat.meta
  68. 0
      Assets/Fungus/Resources/GLLineDraw.shader
  69. 0
      Assets/Fungus/Resources/GLLineDraw.shader.meta
  70. 0
      Assets/Fungus/Resources/Icons.meta
  71. 0
      Assets/Fungus/Resources/Icons/ResizeHandle.png
  72. 0
      Assets/Fungus/Resources/Icons/ResizeHandle.png.meta
  73. 0
      Assets/Fungus/Resources/Icons/add.png
  74. 0
      Assets/Fungus/Resources/Icons/add.png.meta
  75. 0
      Assets/Fungus/Resources/Icons/add_small.png
  76. 0
      Assets/Fungus/Resources/Icons/add_small.png.meta
  77. 0
      Assets/Fungus/Resources/Icons/delete.png
  78. 0
      Assets/Fungus/Resources/Icons/delete.png.meta
  79. 0
      Assets/Fungus/Resources/Icons/down.png
  80. 0
      Assets/Fungus/Resources/Icons/down.png.meta
  81. 0
      Assets/Fungus/Resources/Icons/duplicate.png
  82. 0
      Assets/Fungus/Resources/Icons/duplicate.png.meta
  83. 0
      Assets/Fungus/Resources/Icons/left.png
  84. 0
      Assets/Fungus/Resources/Icons/left.png.meta
  85. 0
      Assets/Fungus/Resources/Icons/right.png
  86. 0
      Assets/Fungus/Resources/Icons/right.png.meta
  87. 0
      Assets/Fungus/Resources/Icons/up.png
  88. 0
      Assets/Fungus/Resources/Icons/up.png.meta
  89. 4
      Assets/Fungus/Resources/Prefabs.meta
  90. 8
      Assets/Fungus/Resources/Prefabs/AudioTag.prefab
  91. 0
      Assets/Fungus/Resources/Prefabs/AudioTag.prefab.meta
  92. 5
      Assets/Fungus/Resources/Prefabs/Character.prefab
  93. 0
      Assets/Fungus/Resources/Prefabs/Character.prefab.meta
  94. 30
      Assets/Fungus/Resources/Prefabs/ClickableSprite.prefab
  95. 0
      Assets/Fungus/Resources/Prefabs/ClickableSprite.prefab.meta
  96. 30
      Assets/Fungus/Resources/Prefabs/DragTargetSprite.prefab
  97. 0
      Assets/Fungus/Resources/Prefabs/DragTargetSprite.prefab.meta
  98. 41
      Assets/Fungus/Resources/Prefabs/DraggableSprite.prefab
  99. 0
      Assets/Fungus/Resources/Prefabs/DraggableSprite.prefab.meta
  100. 6
      Assets/Fungus/Resources/Prefabs/EventSystem.prefab
  101. Some files were not shown because too many files have changed in this diff Show More

5
Assets/Fungus/Animation.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: 623a31d1ed64f48c18a2941fb2e6bb4b
folderAsset: yes
DefaultImporter:
userData:

5
Assets/Fungus/Animation/Scripts.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: c464247e0cb064d63ba47e22509fc0b0
folderAsset: yes
DefaultImporter:
userData:

5
Assets/Fungus/Animation/Scripts/Commands.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: 3e8003ca74cfb4a99983b0084a826c72
folderAsset: yes
DefaultImporter:
userData:

5
Assets/Fungus/Audio/Audio.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: 0c0251f25261847649112eb90bdc787c
folderAsset: yes
DefaultImporter:
userData:

0
Assets/Fungus/Audio/Audio/Click.wav → Assets/Fungus/Audio/Click.wav

0
Assets/Fungus/Audio/Audio/Click.wav.meta → Assets/Fungus/Audio/Click.wav.meta

0
Assets/Fungus/Narrative/Audio/Click.wav → Assets/Fungus/Audio/Click2.wav

0
Assets/Fungus/Narrative/Audio/Click.wav.meta → Assets/Fungus/Audio/Click2.wav.meta

5
Assets/Fungus/Audio/Editor.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: 5a4fe51b67cee49b28f6a0231dae2352
folderAsset: yes
DefaultImporter:
userData:

0
Assets/Fungus/Narrative/Audio/HighVoice.wav → Assets/Fungus/Audio/HighVoice.wav

0
Assets/Fungus/Narrative/Audio/HighVoice.wav.meta → Assets/Fungus/Audio/HighVoice.wav.meta

0
Assets/Fungus/Narrative/Audio/LowVoice.wav → Assets/Fungus/Audio/LowVoice.wav

0
Assets/Fungus/Narrative/Audio/LowVoice.wav.meta → Assets/Fungus/Audio/LowVoice.wav.meta

0
Assets/Fungus/Narrative/Audio/MidVoice.wav → Assets/Fungus/Audio/MidVoice.wav

0
Assets/Fungus/Narrative/Audio/MidVoice.wav.meta → Assets/Fungus/Audio/MidVoice.wav.meta

5
Assets/Fungus/Audio/Scripts.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: 3dd9a7f66888345859cf2db40ceee354
folderAsset: yes
DefaultImporter:
userData:

5
Assets/Fungus/Audio/Scripts/Commands.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: d4ee6befb080e414984229c6b24358ae
folderAsset: yes
DefaultImporter:
userData:

5
Assets/Fungus/Camera.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: 6e9a956b0b8294e4f82ab030bb93a8e4
folderAsset: yes
DefaultImporter:
userData:

5
Assets/Fungus/Camera/Editor.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: 3d2b8d81dbfb54c02a92a0966802a55a
folderAsset: yes
DefaultImporter:
userData:

5
Assets/Fungus/Camera/Scripts.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: e3391e010f66a4399adbe2bd0de43a83
folderAsset: yes
DefaultImporter:
userData:

5
Assets/Fungus/Camera/Scripts/Commands.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: 42741b4e7e5d44f8b8268e93d23ee33e
folderAsset: yes
DefaultImporter:
userData:

4
Assets/Fungus/Camera/Scripts/Interfaces.meta → Assets/Fungus/Docs.meta

@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 02938c86564af4507b9db82f939ff484
guid: 5441286d76a2f47c7a2ea683709ea59e
folderAsset: yes
timeCreated: 1473756679
timeCreated: 1473781211
licenseType: Free
DefaultImporter:
userData:

0
Assets/Fungus/CHANGELOG.txt → Assets/Fungus/Docs/CHANGELOG.txt

0
Assets/Fungus/CHANGELOG.txt.meta → Assets/Fungus/Docs/CHANGELOG.txt.meta

0
Assets/Fungus/LICENSE.txt → Assets/Fungus/Docs/LICENSE.txt

0
Assets/Fungus/LICENSE.txt.meta → Assets/Fungus/Docs/LICENSE.txt.meta

0
Assets/Fungus/README.txt → Assets/Fungus/Docs/README.txt

0
Assets/Fungus/README.txt.meta → Assets/Fungus/Docs/README.txt.meta

5
Assets/Fungus/Flowchart.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: 57bf29b4215da4cf9b7c331fe6283c12
folderAsset: yes
DefaultImporter:
userData:

5
Assets/Fungus/Flowchart/Editor.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: ef11f1c72b929498e835aa270145bf96
folderAsset: yes
DefaultImporter:
userData:

9
Assets/Fungus/Flowchart/Editor/Extensions.meta

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 895ead76bb3488c4481a5ae7d88c03df
folderAsset: yes
timeCreated: 1462775995
licenseType: Pro
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

5
Assets/Fungus/Flowchart/Editor/Resources.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: 10357f1ebe4137642ab1716a03b5737c
folderAsset: yes
DefaultImporter:
userData:

5
Assets/Fungus/Flowchart/Scripts.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: 791c611829c954bc8bacad62f4ed4b71
folderAsset: yes
DefaultImporter:
userData:

5
Assets/Fungus/Flowchart/Scripts/Commands.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: f79fc50442aef4dc7a950abab31ec36a
folderAsset: yes
DefaultImporter:
userData:

5
Assets/Fungus/Flowchart/Scripts/EventHandlers.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: cb76d2003b2004cd3ace7c8a0b5fd276
folderAsset: yes
DefaultImporter:
userData:

5
Assets/Fungus/Flowchart/Sprites.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: 95007f6e545624b21a39aa21c579dcee
folderAsset: yes
DefaultImporter:
userData:

0
Assets/Fungus/Narrative/Fonts.meta → Assets/Fungus/Fonts.meta

0
Assets/Fungus/Narrative/Fonts/Amaranth.meta → Assets/Fungus/Fonts/Amaranth.meta

0
Assets/Fungus/Narrative/Fonts/Amaranth/Amaranth-Bold.otf → Assets/Fungus/Fonts/Amaranth/Amaranth-Bold.otf

0
Assets/Fungus/Narrative/Fonts/Amaranth/Amaranth-Bold.otf.meta → Assets/Fungus/Fonts/Amaranth/Amaranth-Bold.otf.meta

0
Assets/Fungus/Narrative/Fonts/Amaranth/Amaranth-BoldItalic.otf → Assets/Fungus/Fonts/Amaranth/Amaranth-BoldItalic.otf

0
Assets/Fungus/Narrative/Fonts/Amaranth/Amaranth-BoldItalic.otf.meta → Assets/Fungus/Fonts/Amaranth/Amaranth-BoldItalic.otf.meta

0
Assets/Fungus/Narrative/Fonts/Amaranth/Amaranth-Italic.otf → Assets/Fungus/Fonts/Amaranth/Amaranth-Italic.otf

0
Assets/Fungus/Narrative/Fonts/Amaranth/Amaranth-Italic.otf.meta → Assets/Fungus/Fonts/Amaranth/Amaranth-Italic.otf.meta

0
Assets/Fungus/Narrative/Fonts/Amaranth/Amaranth-Regular.otf → Assets/Fungus/Fonts/Amaranth/Amaranth-Regular.otf

0
Assets/Fungus/Narrative/Fonts/Amaranth/Amaranth-Regular.otf.meta → Assets/Fungus/Fonts/Amaranth/Amaranth-Regular.otf.meta

0
Assets/Fungus/Narrative/Fonts/Amaranth/SIL Open Font License.txt → Assets/Fungus/Fonts/Amaranth/SIL Open Font License.txt

0
Assets/Fungus/Narrative/Fonts/Amaranth/SIL Open Font License.txt.meta → Assets/Fungus/Fonts/Amaranth/SIL Open Font License.txt.meta

0
Assets/Fungus/Narrative/Fonts/Exo2.meta → Assets/Fungus/Fonts/Exo2.meta

0
Assets/Fungus/Narrative/Fonts/Exo2/Exo2-Bold.ttf → Assets/Fungus/Fonts/Exo2/Exo2-Bold.ttf

0
Assets/Fungus/Narrative/Fonts/Exo2/Exo2-Bold.ttf.meta → Assets/Fungus/Fonts/Exo2/Exo2-Bold.ttf.meta

0
Assets/Fungus/Narrative/Fonts/Exo2/Exo2-Regular.ttf → Assets/Fungus/Fonts/Exo2/Exo2-Regular.ttf

0
Assets/Fungus/Narrative/Fonts/Exo2/Exo2-Regular.ttf.meta → Assets/Fungus/Fonts/Exo2/Exo2-Regular.ttf.meta

0
Assets/Fungus/Narrative/Fonts/Exo2/OFL.txt → Assets/Fungus/Fonts/Exo2/OFL.txt

0
Assets/Fungus/Narrative/Fonts/Exo2/OFL.txt.meta → Assets/Fungus/Fonts/Exo2/OFL.txt.meta

101
Assets/Fungus/Lua/Scripts/LuaExtensions.cs

@ -1,101 +0,0 @@
// This code is part of the Fungus library (http://fungusgames.com) maintained by Chris Gregan (http://twitter.com/gofungus).
// It is released for free under the MIT open source license (https://github.com/snozbot/fungus/blob/master/LICENSE)
using UnityEngine;
using UnityEngine.UI;
using System.Collections;
using Fungus;
using MoonSharp.Interpreter;
namespace Fungus
{
public static class LuaExtensions
{
/// <summary>
/// Extension for MenuDialog that allows AddOption to call a Lua function when an option is selected.
/// </summary>
public static bool AddOption(this MenuDialog menuDialog, string text, bool interactable, ILuaEnvironment luaEnv, Closure callBack)
{
if (!menuDialog.gameObject.activeSelf)
{
menuDialog.gameObject.SetActive(true);
}
bool addedOption = false;
foreach (Button button in menuDialog.CachedButtons)
{
if (!button.gameObject.activeSelf)
{
button.gameObject.SetActive(true);
button.interactable = interactable;
Text textComponent = button.GetComponentInChildren<Text>();
if (textComponent != null)
{
textComponent.text = text;
}
button.onClick.AddListener(delegate {
menuDialog.StopAllCoroutines(); // Stop timeout
menuDialog.Clear();
menuDialog.HideSayDialog();
if (callBack != null)
{
luaEnv.RunLuaFunction(callBack, true);
}
});
addedOption = true;
break;
}
}
return addedOption;
}
/// <summary>
/// Extension for MenuDialog that allows ShowTimer to call a Lua function when the timer expires.
/// </summary>
public static IEnumerator ShowTimer(this MenuDialog menuDialog, float duration, ILuaEnvironment luaEnv, Closure callBack)
{
if (menuDialog.CachedSlider == null ||
duration <= 0f)
{
yield break;
}
menuDialog.CachedSlider.gameObject.SetActive(true);
menuDialog.StopAllCoroutines();
float elapsedTime = 0;
Slider timeoutSlider = menuDialog.GetComponentInChildren<Slider>();
while (elapsedTime < duration)
{
if (timeoutSlider != null)
{
float t = 1f - elapsedTime / duration;
timeoutSlider.value = t;
}
elapsedTime += Time.deltaTime;
yield return null;
}
menuDialog.Clear();
menuDialog.gameObject.SetActive(false);
menuDialog.HideSayDialog();
if (callBack != null)
{
luaEnv.RunLuaFunction(callBack, true);
}
}
}
}

5
Assets/Fungus/Narrative.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: 382433a04f0cc44d1b777c359b0242a3
folderAsset: yes
DefaultImporter:
userData:

5
Assets/Fungus/Narrative/Audio.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: 6b96d35ab90bb48fc9c41a3a2d147736
folderAsset: yes
DefaultImporter:
userData:

5
Assets/Fungus/Narrative/Editor.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: 805471f08101f4ad8a705fc863435758
folderAsset: yes
DefaultImporter:
userData:

5
Assets/Fungus/Narrative/Images.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: bbcb57c04f3008e4391c6b2866a718fb
folderAsset: yes
DefaultImporter:
userData:

5
Assets/Fungus/Narrative/Resources.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: 92e86c1e0db8e4ea29c05df76d0cff9e
folderAsset: yes
DefaultImporter:
userData:

5
Assets/Fungus/Narrative/Scripts.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: 04b9ccf7cc1a64058ad9340ed03b4a8b
folderAsset: yes
DefaultImporter:
userData:

5
Assets/Fungus/Narrative/Scripts/Commands.meta

@ -1,5 +0,0 @@
fileFormatVersion: 2
guid: 0bb03bbaacb014e7399075a2d6ecad3f
folderAsset: yes
DefaultImporter:
userData:

9
Assets/Fungus/Narrative/Scripts/Interfaces.meta

@ -1,9 +0,0 @@
fileFormatVersion: 2
guid: 84aaac902c28b47f89fefe8205397661
folderAsset: yes
timeCreated: 1473756719
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:

0
Assets/Fungus/Camera/Resources.meta → Assets/Fungus/Resources.meta

0
Assets/Fungus/Flowchart/Editor/Resources/GLLineDraw.mat → Assets/Fungus/Resources/GLLineDraw.mat

0
Assets/Fungus/Flowchart/Editor/Resources/GLLineDraw.mat.meta → Assets/Fungus/Resources/GLLineDraw.mat.meta

0
Assets/Fungus/Flowchart/Editor/Resources/GLLineDraw.shader → Assets/Fungus/Resources/GLLineDraw.shader

0
Assets/Fungus/Flowchart/Editor/Resources/GLLineDraw.shader.meta → Assets/Fungus/Resources/GLLineDraw.shader.meta

0
Assets/Fungus/Flowchart/Editor/Resources/Icons.meta → Assets/Fungus/Resources/Icons.meta

0
Assets/Fungus/Flowchart/Editor/Resources/Icons/ResizeHandle.png → Assets/Fungus/Resources/Icons/ResizeHandle.png

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
Assets/Fungus/Flowchart/Editor/Resources/Icons/ResizeHandle.png.meta → Assets/Fungus/Resources/Icons/ResizeHandle.png.meta

0
Assets/Fungus/Flowchart/Editor/Resources/Icons/add.png → Assets/Fungus/Resources/Icons/add.png

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

0
Assets/Fungus/Flowchart/Editor/Resources/Icons/add.png.meta → Assets/Fungus/Resources/Icons/add.png.meta

0
Assets/Fungus/Flowchart/Editor/Resources/Icons/add_small.png → Assets/Fungus/Resources/Icons/add_small.png

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

0
Assets/Fungus/Flowchart/Editor/Resources/Icons/add_small.png.meta → Assets/Fungus/Resources/Icons/add_small.png.meta

0
Assets/Fungus/Flowchart/Editor/Resources/Icons/delete.png → Assets/Fungus/Resources/Icons/delete.png

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
Assets/Fungus/Flowchart/Editor/Resources/Icons/delete.png.meta → Assets/Fungus/Resources/Icons/delete.png.meta

0
Assets/Fungus/Flowchart/Editor/Resources/Icons/down.png → Assets/Fungus/Resources/Icons/down.png

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
Assets/Fungus/Flowchart/Editor/Resources/Icons/down.png.meta → Assets/Fungus/Resources/Icons/down.png.meta

0
Assets/Fungus/Flowchart/Editor/Resources/Icons/duplicate.png → Assets/Fungus/Resources/Icons/duplicate.png

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
Assets/Fungus/Flowchart/Editor/Resources/Icons/duplicate.png.meta → Assets/Fungus/Resources/Icons/duplicate.png.meta

0
Assets/Fungus/Flowchart/Editor/Resources/Icons/left.png → Assets/Fungus/Resources/Icons/left.png

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

0
Assets/Fungus/Flowchart/Editor/Resources/Icons/left.png.meta → Assets/Fungus/Resources/Icons/left.png.meta

0
Assets/Fungus/Flowchart/Editor/Resources/Icons/right.png → Assets/Fungus/Resources/Icons/right.png

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 2.8 KiB

0
Assets/Fungus/Flowchart/Editor/Resources/Icons/right.png.meta → Assets/Fungus/Resources/Icons/right.png.meta

0
Assets/Fungus/Flowchart/Editor/Resources/Icons/up.png → Assets/Fungus/Resources/Icons/up.png

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

0
Assets/Fungus/Flowchart/Editor/Resources/Icons/up.png.meta → Assets/Fungus/Resources/Icons/up.png.meta

4
Assets/Fungus/Lua.meta → Assets/Fungus/Resources/Prefabs.meta

@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: eb9106aaabbf94f978cec3f7bf29790e
guid: fc921ee1d765948f0b788694e06b4a4a
folderAsset: yes
timeCreated: 1459937141
timeCreated: 1473780677
licenseType: Free
DefaultImporter:
userData:

8
Assets/Fungus/Narrative/Resources/AudioTag.prefab → Assets/Fungus/Resources/Prefabs/AudioTag.prefab

@ -24,8 +24,9 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 177196}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: .0389058143, y: -4.39559603, z: 0}
m_LocalPosition: {x: 0.038905814, y: -4.395596, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
@ -44,6 +45,7 @@ AudioSource:
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
@ -68,6 +70,7 @@ AudioSource:
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
@ -78,6 +81,7 @@ AudioSource:
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
spreadCustomCurve:
serializedVersion: 2
m_Curve:
@ -88,6 +92,7 @@ AudioSource:
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
@ -98,6 +103,7 @@ AudioSource:
tangentMode: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
--- !u!114 &11477196
MonoBehaviour:
m_ObjectHideFlags: 1

0
Assets/Fungus/Narrative/Resources/AudioTag.prefab.meta → Assets/Fungus/Resources/Prefabs/AudioTag.prefab.meta

5
Assets/Fungus/Narrative/Resources/Character.prefab → Assets/Fungus/Resources/Prefabs/Character.prefab

@ -25,6 +25,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
@ -42,10 +43,10 @@ MonoBehaviour:
nameText: Character Name
nameColor: {r: 1, g: 1, b: 1, a: 1}
soundEffect: {fileID: 0}
profileSprite: {fileID: 0}
portraits: []
portraitsFace: 0
notes:
setSayDialog: {fileID: 0}
description:
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1

0
Assets/Fungus/Narrative/Resources/Character.prefab.meta → Assets/Fungus/Resources/Prefabs/Character.prefab.meta

30
Assets/Fungus/Sprite/Resources/ClickableSprite.prefab → Assets/Fungus/Resources/Prefabs/ClickableSprite.prefab

@ -27,6 +27,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
@ -37,10 +38,13 @@ BoxCollider2D:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Size: {x: 3, y: 3}
m_Center: {x: 0, y: 0}
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 1
@ -53,6 +57,8 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
clickEnabled: 1
hoverCursor: {fileID: 0}
useEventSystem: 0
--- !u!212 &21200000
SpriteRenderer:
m_ObjectHideFlags: 1
@ -62,19 +68,30 @@ SpriteRenderer:
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
m_LightProbeAnchor: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedWireframeHidden: 1
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
@ -86,4 +103,3 @@ Prefab:
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 100000}
m_IsPrefabParent: 1
m_IsExploded: 1

0
Assets/Fungus/Sprite/Resources/ClickableSprite.prefab.meta → Assets/Fungus/Resources/Prefabs/ClickableSprite.prefab.meta

30
Assets/Fungus/Sprite/Resources/DragTargetSprite.prefab → Assets/Fungus/Resources/Prefabs/DragTargetSprite.prefab

@ -24,8 +24,9 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -8.60999966, y: -4.46999979, z: 0}
m_LocalPosition: {x: -8.61, y: -4.47, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
@ -36,10 +37,13 @@ CircleCollider2D:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 0
m_UsedByEffector: 0
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Radius: 1.5
m_Center: {x: 0, y: 0}
--- !u!212 &21200000
SpriteRenderer:
m_ObjectHideFlags: 1
@ -49,19 +53,30 @@ SpriteRenderer:
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
m_LightProbeAnchor: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedWireframeHidden: 1
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
@ -73,4 +88,3 @@ Prefab:
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 100000}
m_IsPrefabParent: 1
m_IsExploded: 1

0
Assets/Fungus/Sprite/Resources/DragTargetSprite.prefab.meta → Assets/Fungus/Resources/Prefabs/DragTargetSprite.prefab.meta

41
Assets/Fungus/Sprite/Resources/DraggableSprite.prefab → Assets/Fungus/Resources/Prefabs/DraggableSprite.prefab

@ -26,26 +26,29 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -.730000019, y: .360000014, z: 0}
m_LocalPosition: {x: -0.73, y: 0.36, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
--- !u!50 &5000000
Rigidbody2D:
serializedVersion: 2
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
m_UseAutoMass: 0
m_Mass: 1
m_LinearDrag: 0
m_AngularDrag: .0500000007
m_AngularDrag: 0.05
m_GravityScale: 1
m_FixedAngle: 0
m_IsKinematic: 1
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
--- !u!61 &6100000
BoxCollider2D:
m_ObjectHideFlags: 1
@ -53,10 +56,13 @@ BoxCollider2D:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100000}
m_Enabled: 1
m_Density: 1
m_Material: {fileID: 0}
m_IsTrigger: 1
m_UsedByEffector: 0
m_Offset: {x: 0, y: 0}
serializedVersion: 2
m_Size: {x: 3, y: 3}
m_Center: {x: 0, y: 0}
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 1
@ -69,8 +75,11 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
dragEnabled: 1
returnToStartPos: 1
returnOnCancelled: 1
returnOnCompleted: 1
returnDuration: 1
hoverCursor: {fileID: 0}
useEventSystem: 0
--- !u!212 &21200000
SpriteRenderer:
m_ObjectHideFlags: 1
@ -80,19 +89,30 @@ SpriteRenderer:
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_LightmapIndex: 255
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_Materials:
- {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0}
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
m_SubsetIndices:
m_StaticBatchRoot: {fileID: 0}
m_UseLightProbes: 0
m_LightProbeAnchor: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_SelectedWireframeHidden: 1
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingOrder: 0
m_Sprite: {fileID: 21300000, guid: ea8f56c43254d41728f5ac4e8299b6c9, type: 3}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_FlipX: 0
m_FlipY: 0
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
@ -104,4 +124,3 @@ Prefab:
m_ParentPrefab: {fileID: 0}
m_RootGameObject: {fileID: 100000}
m_IsPrefabParent: 1
m_IsExploded: 1

0
Assets/Fungus/Sprite/Resources/DraggableSprite.prefab.meta → Assets/Fungus/Resources/Prefabs/DraggableSprite.prefab.meta

6
Assets/Fungus/Narrative/Resources/EventSystem.prefab → Assets/Fungus/Resources/Prefabs/EventSystem.prefab

@ -27,6 +27,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
@ -60,7 +61,8 @@ MonoBehaviour:
m_SubmitButton: Submit
m_CancelButton: Cancel
m_InputActionsPerSecond: 10
m_AllowActivationOnMobileDevice: 0
m_RepeatDelay: 0.5
m_ForceModuleActive: 0
--- !u!114 &11479528
MonoBehaviour:
m_ObjectHideFlags: 1
@ -72,7 +74,7 @@ MonoBehaviour:
m_Script: {fileID: 1997211142, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
m_Name:
m_EditorClassIdentifier:
m_AllowActivationOnStandalone: 0
m_ForceModuleActive: 0
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save