Merge pull request #9 from Gizmotronn/master

#1 Inscope Movement 1.2
Gizmotronn · Aug 3, 2020 · 513d6ce · 513d6ce
2 parents d5f2080 + eaedf10
commit 513d6ce
Show file tree

Hide file tree

Showing 1,686 changed files with 140,467 additions and 1,012 deletions.
diff --git a/InscopeRPG/Assets/Animations.meta b/InscopeRPG/Assets/Animations.meta
diff --git a/InscopeRPG/Assets/Animations/Idle_Down.anim b/InscopeRPG/Assets/Animations/Idle_Down.anim
@@ -3,9 +3,8 @@
 --- !u!74 &7400000
 AnimationClip:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
   m_Name: Idle_Down
   serializedVersion: 6
   m_Legacy: 0
@@ -20,47 +19,47 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 21300000, guid: 4e66e051c6fd6114389a60cc69fae05e, type: 3}
+      value: {fileID: 21300000, guid: 41ce6529087a1734689f78ef1dbb1567, type: 3}
     - time: 0.083333336
-      value: {fileID: 21300000, guid: 8162614f15325e14f9e0da91a8746abf, type: 3}
+      value: {fileID: 21300000, guid: 0bb2c9b161c7a524e876ab70009535ca, type: 3}
     - time: 0.16666667
-      value: {fileID: 21300000, guid: 7c52d3e58f1ff8b48a75012fb3730cca, type: 3}
+      value: {fileID: 21300000, guid: da0cbede2ac777a489e2cf6757bf1f8a, type: 3}
     - time: 0.25
-      value: {fileID: 21300000, guid: 822cd7fd54c5e554aa287b565094918a, type: 3}
+      value: {fileID: 21300000, guid: 2e3318cc950e493429218432e44a644c, type: 3}
     - time: 0.33333334
-      value: {fileID: 21300000, guid: e76767736591fac46aaa76ed5038be6f, type: 3}
+      value: {fileID: 21300000, guid: 0f84161099a44aa4b98703ea2d6b6a8a, type: 3}
     - time: 0.41666666
-      value: {fileID: 21300000, guid: 85c2159ccd7362c49b948be23d6e938b, type: 3}
+      value: {fileID: 21300000, guid: 62be1351f4e1b0043bac01cce5c014a1, type: 3}
     - time: 0.5
-      value: {fileID: 21300000, guid: 1e680ed30e0debf409be1de5bab91276, type: 3}
+      value: {fileID: 21300000, guid: 5fe328b7a4557414283343e86a675bc1, type: 3}
     - time: 0.5833333
-      value: {fileID: 21300000, guid: 1c23806532bf1aa46a0deef1bc4ebc86, type: 3}
+      value: {fileID: 21300000, guid: 1a8c12cff6fd2604998d5d2176d64cd1, type: 3}
     - time: 0.6666667
-      value: {fileID: 21300000, guid: a8de67c4afbc9514791364757b62bff3, type: 3}
+      value: {fileID: 21300000, guid: 359937d3a5604084d93a3804d0dbc479, type: 3}
     - time: 0.75
-      value: {fileID: 21300000, guid: ee81459cfa9cc44488b2206afe83bc9f, type: 3}
+      value: {fileID: 21300000, guid: 6e3ff02e9c2685c498c889ea5bc2f167, type: 3}
     - time: 0.8333333
-      value: {fileID: 21300000, guid: 3926d0060aca71b47bfd0bbb8be14f41, type: 3}
+      value: {fileID: 21300000, guid: abfe5a1690f96494c9380b25f1edf65d, type: 3}
     - time: 0.9166667
-      value: {fileID: 21300000, guid: f5021a85cb366e146bb4f7059a6f67bf, type: 3}
+      value: {fileID: 21300000, guid: efc655537fbafb7419a55867d26652ad, type: 3}
     - time: 1
-      value: {fileID: 21300000, guid: f2f37eed8b7e90c48a6f15a52fc30baf, type: 3}
+      value: {fileID: 21300000, guid: 1b39298944df9d94ba3c531bd4464780, type: 3}
     - time: 1.0833334
-      value: {fileID: 21300000, guid: 07b2abea0bb597a4588c4448a8c238fd, type: 3}
+      value: {fileID: 21300000, guid: 24b65030398c92f4e9b679e577432c52, type: 3}
     - time: 1.1666666
-      value: {fileID: 21300000, guid: f9f932a936aa520438314d7dab7d53cf, type: 3}
+      value: {fileID: 21300000, guid: 4a7e2f763824a4d47b01c5a9b013c038, type: 3}
     - time: 1.25
-      value: {fileID: 21300000, guid: a4a00497ed8df2c4bbe290b8f7793f3f, type: 3}
+      value: {fileID: 21300000, guid: 3daa4c905cce362489c27198e75f2260, type: 3}
     - time: 1.3333334
-      value: {fileID: 21300000, guid: ef1cd5f3803f531439b0ec5426015515, type: 3}
+      value: {fileID: 21300000, guid: 97403fb019422154392eb11c50e978d1, type: 3}
     - time: 1.4166666
-      value: {fileID: 21300000, guid: a8fedf224deff83458ecc33012e3088d, type: 3}
+      value: {fileID: 21300000, guid: d343b3e86472db74cbb1c9ba9447b7b9, type: 3}
     - time: 1.5
-      value: {fileID: 21300000, guid: f04dfc5f22a16824d8c6a16c5796772f, type: 3}
+      value: {fileID: 21300000, guid: 29f11037a71858c4f9a33accd0638dd3, type: 3}
     - time: 1.5833334
-      value: {fileID: 21300000, guid: a50ab88e577fadd458940701b2c4952a, type: 3}
+      value: {fileID: 21300000, guid: 9354f94c94a113042a137ce2a1a66a0d, type: 3}
     - time: 1.6666666
-      value: {fileID: 21300000, guid: c13f13ff9ae7787499af80c2bb96dfde, type: 3}
+      value: {fileID: 21300000, guid: db1958cf26aea2f43a64d61de26bf800, type: 3}
     attribute: m_Sprite
     path: 
     classID: 212
@@ -80,27 +79,27 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 21300000, guid: 4e66e051c6fd6114389a60cc69fae05e, type: 3}
-    - {fileID: 21300000, guid: 8162614f15325e14f9e0da91a8746abf, type: 3}
-    - {fileID: 21300000, guid: 7c52d3e58f1ff8b48a75012fb3730cca, type: 3}
-    - {fileID: 21300000, guid: 822cd7fd54c5e554aa287b565094918a, type: 3}
-    - {fileID: 21300000, guid: e76767736591fac46aaa76ed5038be6f, type: 3}
-    - {fileID: 21300000, guid: 85c2159ccd7362c49b948be23d6e938b, type: 3}
-    - {fileID: 21300000, guid: 1e680ed30e0debf409be1de5bab91276, type: 3}
-    - {fileID: 21300000, guid: 1c23806532bf1aa46a0deef1bc4ebc86, type: 3}
-    - {fileID: 21300000, guid: a8de67c4afbc9514791364757b62bff3, type: 3}
-    - {fileID: 21300000, guid: ee81459cfa9cc44488b2206afe83bc9f, type: 3}
-    - {fileID: 21300000, guid: 3926d0060aca71b47bfd0bbb8be14f41, type: 3}
-    - {fileID: 21300000, guid: f5021a85cb366e146bb4f7059a6f67bf, type: 3}
-    - {fileID: 21300000, guid: f2f37eed8b7e90c48a6f15a52fc30baf, type: 3}
-    - {fileID: 21300000, guid: 07b2abea0bb597a4588c4448a8c238fd, type: 3}
-    - {fileID: 21300000, guid: f9f932a936aa520438314d7dab7d53cf, type: 3}
-    - {fileID: 21300000, guid: a4a00497ed8df2c4bbe290b8f7793f3f, type: 3}
-    - {fileID: 21300000, guid: ef1cd5f3803f531439b0ec5426015515, type: 3}
-    - {fileID: 21300000, guid: a8fedf224deff83458ecc33012e3088d, type: 3}
-    - {fileID: 21300000, guid: f04dfc5f22a16824d8c6a16c5796772f, type: 3}
-    - {fileID: 21300000, guid: a50ab88e577fadd458940701b2c4952a, type: 3}
-    - {fileID: 21300000, guid: c13f13ff9ae7787499af80c2bb96dfde, type: 3}
+    - {fileID: 21300000, guid: 41ce6529087a1734689f78ef1dbb1567, type: 3}
+    - {fileID: 21300000, guid: 0bb2c9b161c7a524e876ab70009535ca, type: 3}
+    - {fileID: 21300000, guid: da0cbede2ac777a489e2cf6757bf1f8a, type: 3}
+    - {fileID: 21300000, guid: 2e3318cc950e493429218432e44a644c, type: 3}
+    - {fileID: 21300000, guid: 0f84161099a44aa4b98703ea2d6b6a8a, type: 3}
+    - {fileID: 21300000, guid: 62be1351f4e1b0043bac01cce5c014a1, type: 3}
+    - {fileID: 21300000, guid: 5fe328b7a4557414283343e86a675bc1, type: 3}
+    - {fileID: 21300000, guid: 1a8c12cff6fd2604998d5d2176d64cd1, type: 3}
+    - {fileID: 21300000, guid: 359937d3a5604084d93a3804d0dbc479, type: 3}
+    - {fileID: 21300000, guid: 6e3ff02e9c2685c498c889ea5bc2f167, type: 3}
+    - {fileID: 21300000, guid: abfe5a1690f96494c9380b25f1edf65d, type: 3}
+    - {fileID: 21300000, guid: efc655537fbafb7419a55867d26652ad, type: 3}
+    - {fileID: 21300000, guid: 1b39298944df9d94ba3c531bd4464780, type: 3}
+    - {fileID: 21300000, guid: 24b65030398c92f4e9b679e577432c52, type: 3}
+    - {fileID: 21300000, guid: 4a7e2f763824a4d47b01c5a9b013c038, type: 3}
+    - {fileID: 21300000, guid: 3daa4c905cce362489c27198e75f2260, type: 3}
+    - {fileID: 21300000, guid: 97403fb019422154392eb11c50e978d1, type: 3}
+    - {fileID: 21300000, guid: d343b3e86472db74cbb1c9ba9447b7b9, type: 3}
+    - {fileID: 21300000, guid: 29f11037a71858c4f9a33accd0638dd3, type: 3}
+    - {fileID: 21300000, guid: 9354f94c94a113042a137ce2a1a66a0d, type: 3}
+    - {fileID: 21300000, guid: db1958cf26aea2f43a64d61de26bf800, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
@@ -125,4 +124,5 @@ AnimationClip:
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
   m_Events: []
diff --git a/InscopeRPG/Assets/Animations/Idle_Down.anim.meta b/InscopeRPG/Assets/Animations/Idle_Down.anim.meta
diff --git a/InscopeRPG/Assets/Animations/Idle_Left.anim b/InscopeRPG/Assets/Animations/Idle_Left.anim
@@ -3,9 +3,8 @@
 --- !u!74 &7400000
 AnimationClip:
   m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
   m_Name: Idle_Left
   serializedVersion: 6
   m_Legacy: 0
@@ -20,47 +19,47 @@ AnimationClip:
   m_PPtrCurves:
   - curve:
     - time: 0
-      value: {fileID: 21300000, guid: 07672136ca6a89b4699516d117fa8a5d, type: 3}
+      value: {fileID: 21300000, guid: 0ea22b2bb9995244bbef3ad4aa941555, type: 3}
     - time: 0.083333336
-      value: {fileID: 21300000, guid: 6a0ab5fbbb4312245b98324935b90f32, type: 3}
+      value: {fileID: 21300000, guid: 8d2f32929fba4374f828b1128bf47a18, type: 3}
     - time: 0.16666667
-      value: {fileID: 21300000, guid: f1b13f4b600c82d44a66e56862161332, type: 3}
+      value: {fileID: 21300000, guid: 07b5dcb014b119f44b91e2f0104f8e5f, type: 3}
     - time: 0.25
-      value: {fileID: 21300000, guid: f6dbe41eb0182a54ea8debd3169b5b35, type: 3}
+      value: {fileID: 21300000, guid: 716acde48f215504b928955b9c305126, type: 3}
     - time: 0.33333334
-      value: {fileID: 21300000, guid: bf530f8ebbdec1445a638b5a06b8f0f8, type: 3}
+      value: {fileID: 21300000, guid: 1b412c1590fe7c54a84cd8a0d6ccfdb5, type: 3}
     - time: 0.41666666
-      value: {fileID: 21300000, guid: 93c9cfd95d5cc7340b2b99cf6625e121, type: 3}
+      value: {fileID: 21300000, guid: 67a2e46a8073a8d408093498f55b2890, type: 3}
     - time: 0.5
-      value: {fileID: 21300000, guid: e47ae3e147d78be4f8bf08d7c02eefcd, type: 3}
+      value: {fileID: 21300000, guid: bb38da15c1469e54794bcad6c15005ec, type: 3}
     - time: 0.5833333
-      value: {fileID: 21300000, guid: f03e86f82dd0d644da028c32509abb00, type: 3}
+      value: {fileID: 21300000, guid: 6d24b796a7c51fd40b920d554e9b4795, type: 3}
     - time: 0.6666667
-      value: {fileID: 21300000, guid: 705689dfd67ab9647ba8f08224eaa69d, type: 3}
+      value: {fileID: 21300000, guid: d0e035f19eba7234db997664d88b27ef, type: 3}
     - time: 0.75
-      value: {fileID: 21300000, guid: 4a8298792597f9545aa0897161a9708e, type: 3}
+      value: {fileID: 21300000, guid: 648844e0dbf7291428fa48b5f3439853, type: 3}
     - time: 0.8333333
-      value: {fileID: 21300000, guid: c6392db561345364889dd7cbf6d6599d, type: 3}
+      value: {fileID: 21300000, guid: 2bb9cd52fd0c1564f8a1aa380b9d9dd5, type: 3}
     - time: 0.9166667
-      value: {fileID: 21300000, guid: d0411a17d007fcf4aa61b8dfb49c68f4, type: 3}
+      value: {fileID: 21300000, guid: 195ca89f448ba264084685a652e4ff08, type: 3}
     - time: 1
-      value: {fileID: 21300000, guid: 9443290fc366b664b9995f4a33b6247c, type: 3}
+      value: {fileID: 21300000, guid: 1be1709fae25d214fa3ca72cec303918, type: 3}
     - time: 1.0833334
-      value: {fileID: 21300000, guid: 8af4bd512fe5608448fc7b337e447975, type: 3}
+      value: {fileID: 21300000, guid: b879c58fcec964a4c9a0fea11a39c088, type: 3}
     - time: 1.1666666
-      value: {fileID: 21300000, guid: 4a2f7f8fb5c45a444be55c757806b783, type: 3}
+      value: {fileID: 21300000, guid: a8028da281405b644ac1f073cc94c7ff, type: 3}
     - time: 1.25
-      value: {fileID: 21300000, guid: d19768692cf800346aa5240309065884, type: 3}
+      value: {fileID: 21300000, guid: 20c71e2dac2603342a2d0b30ccb45eb2, type: 3}
     - time: 1.3333334
-      value: {fileID: 21300000, guid: a897be7b07ce31e4da3204f30704f74c, type: 3}
+      value: {fileID: 21300000, guid: 2bc07c33fe240034986ff175714383b8, type: 3}
     - time: 1.4166666
-      value: {fileID: 21300000, guid: e4f7e0598b635124fb64d45c22e6f93e, type: 3}
+      value: {fileID: 21300000, guid: b162cba9bf5a6bb499d009367a1c11a1, type: 3}
     - time: 1.5
-      value: {fileID: 21300000, guid: db5fc3bce81dbad41b306366578bbd73, type: 3}
+      value: {fileID: 21300000, guid: acbd7e9a42758ff46a4636f99f4f5325, type: 3}
     - time: 1.5833334
-      value: {fileID: 21300000, guid: 47ecc6ce181c61d449a2e2012092e518, type: 3}
+      value: {fileID: 21300000, guid: aad464b0e0874224ab0d1b13fb1e460b, type: 3}
     - time: 1.6666666
-      value: {fileID: 21300000, guid: fa52e4e9148b757449534b1afa073f69, type: 3}
+      value: {fileID: 21300000, guid: c7851b471a92f5641997cf2c8b101b5e, type: 3}
     attribute: m_Sprite
     path: 
     classID: 212
@@ -80,27 +79,27 @@ AnimationClip:
       customType: 23
       isPPtrCurve: 1
     pptrCurveMapping:
-    - {fileID: 21300000, guid: 07672136ca6a89b4699516d117fa8a5d, type: 3}
-    - {fileID: 21300000, guid: 6a0ab5fbbb4312245b98324935b90f32, type: 3}
-    - {fileID: 21300000, guid: f1b13f4b600c82d44a66e56862161332, type: 3}
-    - {fileID: 21300000, guid: f6dbe41eb0182a54ea8debd3169b5b35, type: 3}
-    - {fileID: 21300000, guid: bf530f8ebbdec1445a638b5a06b8f0f8, type: 3}
-    - {fileID: 21300000, guid: 93c9cfd95d5cc7340b2b99cf6625e121, type: 3}
-    - {fileID: 21300000, guid: e47ae3e147d78be4f8bf08d7c02eefcd, type: 3}
-    - {fileID: 21300000, guid: f03e86f82dd0d644da028c32509abb00, type: 3}
-    - {fileID: 21300000, guid: 705689dfd67ab9647ba8f08224eaa69d, type: 3}
-    - {fileID: 21300000, guid: 4a8298792597f9545aa0897161a9708e, type: 3}
-    - {fileID: 21300000, guid: c6392db561345364889dd7cbf6d6599d, type: 3}
-    - {fileID: 21300000, guid: d0411a17d007fcf4aa61b8dfb49c68f4, type: 3}
-    - {fileID: 21300000, guid: 9443290fc366b664b9995f4a33b6247c, type: 3}
-    - {fileID: 21300000, guid: 8af4bd512fe5608448fc7b337e447975, type: 3}
-    - {fileID: 21300000, guid: 4a2f7f8fb5c45a444be55c757806b783, type: 3}
-    - {fileID: 21300000, guid: d19768692cf800346aa5240309065884, type: 3}
-    - {fileID: 21300000, guid: a897be7b07ce31e4da3204f30704f74c, type: 3}
-    - {fileID: 21300000, guid: e4f7e0598b635124fb64d45c22e6f93e, type: 3}
-    - {fileID: 21300000, guid: db5fc3bce81dbad41b306366578bbd73, type: 3}
-    - {fileID: 21300000, guid: 47ecc6ce181c61d449a2e2012092e518, type: 3}
-    - {fileID: 21300000, guid: fa52e4e9148b757449534b1afa073f69, type: 3}
+    - {fileID: 21300000, guid: 0ea22b2bb9995244bbef3ad4aa941555, type: 3}
+    - {fileID: 21300000, guid: 8d2f32929fba4374f828b1128bf47a18, type: 3}
+    - {fileID: 21300000, guid: 07b5dcb014b119f44b91e2f0104f8e5f, type: 3}
+    - {fileID: 21300000, guid: 716acde48f215504b928955b9c305126, type: 3}
+    - {fileID: 21300000, guid: 1b412c1590fe7c54a84cd8a0d6ccfdb5, type: 3}
+    - {fileID: 21300000, guid: 67a2e46a8073a8d408093498f55b2890, type: 3}
+    - {fileID: 21300000, guid: bb38da15c1469e54794bcad6c15005ec, type: 3}
+    - {fileID: 21300000, guid: 6d24b796a7c51fd40b920d554e9b4795, type: 3}
+    - {fileID: 21300000, guid: d0e035f19eba7234db997664d88b27ef, type: 3}
+    - {fileID: 21300000, guid: 648844e0dbf7291428fa48b5f3439853, type: 3}
+    - {fileID: 21300000, guid: 2bb9cd52fd0c1564f8a1aa380b9d9dd5, type: 3}
+    - {fileID: 21300000, guid: 195ca89f448ba264084685a652e4ff08, type: 3}
+    - {fileID: 21300000, guid: 1be1709fae25d214fa3ca72cec303918, type: 3}
+    - {fileID: 21300000, guid: b879c58fcec964a4c9a0fea11a39c088, type: 3}
+    - {fileID: 21300000, guid: a8028da281405b644ac1f073cc94c7ff, type: 3}
+    - {fileID: 21300000, guid: 20c71e2dac2603342a2d0b30ccb45eb2, type: 3}
+    - {fileID: 21300000, guid: 2bc07c33fe240034986ff175714383b8, type: 3}
+    - {fileID: 21300000, guid: b162cba9bf5a6bb499d009367a1c11a1, type: 3}
+    - {fileID: 21300000, guid: acbd7e9a42758ff46a4636f99f4f5325, type: 3}
+    - {fileID: 21300000, guid: aad464b0e0874224ab0d1b13fb1e460b, type: 3}
+    - {fileID: 21300000, guid: c7851b471a92f5641997cf2c8b101b5e, type: 3}
   m_AnimationClipSettings:
     serializedVersion: 2
     m_AdditiveReferencePoseClip: {fileID: 0}
@@ -125,4 +124,5 @@ AnimationClip:
   m_EulerEditorCurves: []
   m_HasGenericRootTransform: 0
   m_HasMotionFloatCurves: 0
+  m_GenerateMotionCurves: 0
   m_Events: []
diff --git a/InscopeRPG/Assets/Animations/Idle_Left.anim.meta b/InscopeRPG/Assets/Animations/Idle_Left.anim.meta