IsoUnity updated, animations and database cleaned

- IsoUnity updated - Demo animations (idle, walk, death) - Skills editor animation name - Debug messages - Clean database - Fixes
Narratech · Jun 10, 2018 · cb30130 · cb30130
1 parent 6ac90a0
commit cb30130
Show file tree

Hide file tree

Showing 72 changed files with 1,270 additions and 704 deletions.
diff --git a/Assets/IsoUnity/Source/Entity/EventedEntityScript.cs b/Assets/IsoUnity/Source/Entity/EventedEntityScript.cs
@@ -30,6 +30,9 @@ private static IEnumerator CoroutineController(IGameEvent ge, IEnumerator toRun,
             // We wrap the coroutine
             while (toRun.MoveNext())
             {
+                // If current is null, finish the iteration
+                if (toRun.Current == null)
+                    break;
                 // Free the current value
                 eventedES.Current = null;
                 yield return toRun.Current;

diff --git a/Assets/IsoUnity/Source/Entity/Scripts/DecorationAnimator.cs b/Assets/IsoUnity/Source/Entity/Scripts/DecorationAnimator.cs
@@ -56,8 +56,8 @@ public IEnumerator AnimateEntity(string animation, string then = null)
 
 			// Find the animation
 			var isoAnimation = isoAnimations.Find(n => n.name.Equals(animation, StringComparison.InvariantCultureIgnoreCase));
-			if(isoAnimation == null)
-				yield return null;
+            if (isoAnimation == null || isoAnimation.isoAnimation == null)
+                yield return null;
 
 			// Find a sheet
 			IsoDecoration sheet = isoAnimation.isoAnimation.overrideSheet;

diff --git a/Assets/IsoUnity/Source/EvenManagers/EventedEventManager.cs b/Assets/IsoUnity/Source/EvenManagers/EventedEventManager.cs
@@ -32,6 +32,9 @@ private static IEnumerator CoroutineController(IGameEvent ge, IEnumerator toRun,
             // We wrap the coroutine
             while (toRun.MoveNext())
             {
+                // If current is null, finish the iteration
+                if (toRun.Current == null)
+                    break;
                 // Free the current value
                 eventedEM.Current = null;
                 yield return toRun.Current;

diff --git a/Assets/Scenes/Demo/Animation_archer_die.asset b/Assets/Scenes/Demo/Animation_archer_die.asset
@@ -0,0 +1,43 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3}
+  m_Name: Animation_archer_die
+  m_EditorClassIdentifier: 
+  loop: 0
+  frames:
+  - column: 0
+    duration: 0.05
+  - column: 1
+    duration: 0.05
+  - column: 2
+    duration: 0.05
+  - column: 3
+    duration: 0.05
+  - column: 4
+    duration: 0.05
+  - column: 5
+    duration: 0.05
+  - column: 6
+    duration: 0.05
+  - column: 7
+    duration: 0.05
+  - column: 8
+    duration: 0.05
+  - column: 9
+    duration: 0.05
+  - column: 10
+    duration: 0.05
+  - column: 11
+    duration: 0.05
+  - column: 12
+    duration: 0.05
+  sheet: 
+  overrideSheet: {fileID: 11400000, guid: 1930c6dbb77a15549aef5a42a2be2780, type: 2}
diff --git a/...ase/Characters/NewCharacter(1).asset.meta → ...enes/Demo/Animation_archer_die.asset.meta b/...ase/Characters/NewCharacter(1).asset.meta → ...enes/Demo/Animation_archer_die.asset.meta
diff --git a/Assets/Scenes/Demo/Animation_archer_idle.asset b/Assets/Scenes/Demo/Animation_archer_idle.asset
@@ -0,0 +1,43 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3}
+  m_Name: Animation_archer_idle
+  m_EditorClassIdentifier: 
+  loop: 1
+  frames:
+  - column: 0
+    duration: 0.05
+  - column: 1
+    duration: 0.05
+  - column: 2
+    duration: 0.05
+  - column: 3
+    duration: 0.05
+  - column: 4
+    duration: 0.05
+  - column: 5
+    duration: 0.05
+  - column: 6
+    duration: 0.05
+  - column: 7
+    duration: 0.05
+  - column: 8
+    duration: 0.05
+  - column: 9
+    duration: 0.05
+  - column: 10
+    duration: 0.05
+  - column: 11
+    duration: 0.05
+  - column: 12
+    duration: 0.05
+  sheet: 
+  overrideSheet: {fileID: 11400000, guid: 59c484766bef31d4cab5b8cf73ba55c7, type: 2}
diff --git a/...ase/Characters/NewCharacter(2).asset.meta → ...nes/Demo/Animation_archer_idle.asset.meta b/...ase/Characters/NewCharacter(2).asset.meta → ...nes/Demo/Animation_archer_idle.asset.meta
diff --git a/Assets/Scenes/Demo/Animation_archer_run.asset b/Assets/Scenes/Demo/Animation_archer_run.asset
@@ -0,0 +1,41 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3}
+  m_Name: Animation_archer_run
+  m_EditorClassIdentifier: 
+  loop: 0
+  frames:
+  - column: 0
+    duration: 0.05
+  - column: 1
+    duration: 0.05
+  - column: 2
+    duration: 0.05
+  - column: 3
+    duration: 0.05
+  - column: 4
+    duration: 0.05
+  - column: 5
+    duration: 0.05
+  - column: 6
+    duration: 0.05
+  - column: 7
+    duration: 0.05
+  - column: 8
+    duration: 0.05
+  - column: 9
+    duration: 0.05
+  - column: 10
+    duration: 0.05
+  - column: 11
+    duration: 0.05
+  sheet: 
+  overrideSheet: {fileID: 11400000, guid: 862f95a5b3e081b48abefe6ed5f30358, type: 2}
diff --git a/...e/Attributes/New Attribute 002.asset.meta → ...enes/Demo/Animation_archer_run.asset.meta b/...e/Attributes/New Attribute 002.asset.meta → ...enes/Demo/Animation_archer_run.asset.meta
diff --git a/Assets/Scenes/Demo/Animation_crusader_die.asset b/Assets/Scenes/Demo/Animation_crusader_die.asset
@@ -0,0 +1,35 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3}
+  m_Name: Animation_crusader_die
+  m_EditorClassIdentifier: 
+  loop: 0
+  frames:
+  - column: 0
+    duration: 0.05
+  - column: 1
+    duration: 0.05
+  - column: 2
+    duration: 0.05
+  - column: 3
+    duration: 0.05
+  - column: 4
+    duration: 0.05
+  - column: 5
+    duration: 0.05
+  - column: 6
+    duration: 0.05
+  - column: 7
+    duration: 0.05
+  - column: 8
+    duration: 0.05
+  sheet: 
+  overrideSheet: {fileID: 11400000, guid: 72f2ab05b7a26ba49bef1986a4f4e9ca, type: 2}
diff --git a/...ase/Characters/NewCharacter(3).asset.meta → ...es/Demo/Animation_crusader_die.asset.meta b/...ase/Characters/NewCharacter(3).asset.meta → ...es/Demo/Animation_crusader_die.asset.meta
diff --git a/Assets/Scenes/Demo/Animation_crusader_idle.asset b/Assets/Scenes/Demo/Animation_crusader_idle.asset
@@ -0,0 +1,79 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3}
+  m_Name: Animation_crusader_idle
+  m_EditorClassIdentifier: 
+  loop: 1
+  frames:
+  - column: 0
+    duration: 0.05
+  - column: 1
+    duration: 0.05
+  - column: 2
+    duration: 0.05
+  - column: 3
+    duration: 0.05
+  - column: 4
+    duration: 0.05
+  - column: 5
+    duration: 0.05
+  - column: 6
+    duration: 0.05
+  - column: 7
+    duration: 0.05
+  - column: 8
+    duration: 0.05
+  - column: 9
+    duration: 0.05
+  - column: 10
+    duration: 0.05
+  - column: 11
+    duration: 0.05
+  - column: 12
+    duration: 0.05
+  - column: 13
+    duration: 0.05
+  - column: 14
+    duration: 0.05
+  - column: 15
+    duration: 0.05
+  - column: 14
+    duration: 0.05
+  - column: 13
+    duration: 0.05
+  - column: 12
+    duration: 0.05
+  - column: 11
+    duration: 0.05
+  - column: 10
+    duration: 0.05
+  - column: 9
+    duration: 0.05
+  - column: 8
+    duration: 0.05
+  - column: 7
+    duration: 0.05
+  - column: 6
+    duration: 0.05
+  - column: 5
+    duration: 0.05
+  - column: 4
+    duration: 0.05
+  - column: 3
+    duration: 0.05
+  - column: 2
+    duration: 0.05
+  - column: 1
+    duration: 0.05
+  - column: 0
+    duration: 0.05
+  sheet: 
+  overrideSheet: {fileID: 11400000, guid: 380ff992df170b842b2956c0227855fa, type: 2}
diff --git a/Assets/Scenes/Demo/Animation_crusader_idle.asset.meta b/Assets/Scenes/Demo/Animation_crusader_idle.asset.meta
diff --git a/Assets/Scenes/Demo/Animation_crusader_run.asset b/Assets/Scenes/Demo/Animation_crusader_run.asset
@@ -0,0 +1,51 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d3a9a02dbd6a69445a57c833e33785c1, type: 3}
+  m_Name: Animation_crusader_run
+  m_EditorClassIdentifier: 
+  loop: 0
+  frames:
+  - column: 0
+    duration: 0.1
+  - column: 1
+    duration: 0.05
+  - column: 2
+    duration: 0.05
+  - column: 3
+    duration: 0.05
+  - column: 4
+    duration: 0.05
+  - column: 5
+    duration: 0.05
+  - column: 6
+    duration: 0.05
+  - column: 7
+    duration: 0.05
+  - column: 8
+    duration: 0.05
+  - column: 9
+    duration: 0.05
+  - column: 10
+    duration: 0.05
+  - column: 11
+    duration: 0.05
+  - column: 12
+    duration: 0.05
+  - column: 13
+    duration: 0.05
+  - column: 14
+    duration: 0.05
+  - column: 15
+    duration: 0.05
+  - column: 16
+    duration: 0.05
+  sheet: 
+  overrideSheet: {fileID: 11400000, guid: b41baff0b9fc803419d50a1b17402857, type: 2}
diff --git a/Assets/Scenes/Demo/Animation_crusader_run.asset.meta b/Assets/Scenes/Demo/Animation_crusader_run.asset.meta