maint: character model/animations working

slight changes

Assets/Scenes/CombatTest.unity

@@ -392,6 +392,7 @@ MonoBehaviour:
   m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
+  m_characterHorizontalScale: 1
   m_wordSpacing: 0
   m_lineSpacing: 0
   m_lineSpacingMax: 0
@@ -531,6 +532,7 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+  m_MaskInteraction: 0
   m_AdditionalVertexStreams: {fileID: 0}
 --- !u!114 &65649610
 MonoBehaviour:
@@ -2672,6 +2674,7 @@ MonoBehaviour:
   m_VerticalAlignment: 256
   m_textAlignment: 65535
   m_characterSpacing: 0
+  m_characterHorizontalScale: 1
   m_wordSpacing: 0
   m_lineSpacing: 0
   m_lineSpacingMax: 0
@@ -3284,6 +3287,7 @@ MonoBehaviour:
   m_VerticalAlignment: 256
   m_textAlignment: 65535
   m_characterSpacing: 0
+  m_characterHorizontalScale: 1
   m_wordSpacing: 0
   m_lineSpacing: 0
   m_lineSpacingMax: 0
@@ -3680,6 +3684,7 @@ MonoBehaviour:
   m_VerticalAlignment: 256
   m_textAlignment: 65535
   m_characterSpacing: 0
+  m_characterHorizontalScale: 1
   m_wordSpacing: 0
   m_lineSpacing: 0
   m_lineSpacingMax: 0
@@ -5854,6 +5859,71 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &1307609322
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 4714064585667986351, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: -2.7329168
+      objectReference: {fileID: 0}
+    - target: {fileID: 4714064585667986351, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: -0.00000013260546
+      objectReference: {fileID: 0}
+    - target: {fileID: 4714064585667986351, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -1.7336471
+      objectReference: {fileID: 0}
+    - target: {fileID: 4714064585667986351, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4714064585667986351, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4714064585667986351, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4714064585667986351, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4714064585667986351, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4714064585667986351, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4714064585667986351, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5341383984788871445, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
+      propertyPath: m_Name
+      value: Player (4)
+      objectReference: {fileID: 0}
+    - target: {fileID: 6200870592378592354, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
+      propertyPath: GlobalObjectIdHash
+      value: 1532506581
+      objectReference: {fileID: 0}
+    - target: {fileID: 6200870592378592354, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
+      propertyPath: InScenePlacedSourceGlobalObjectIdHash
+      value: 999748856
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 00a3f73dca17403479ee59f90449d8d2, type: 3}
 --- !u!1 &1379726749
 GameObject:
   m_ObjectHideFlags: 0
@@ -5930,6 +6000,7 @@ MonoBehaviour:
   m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
+  m_characterHorizontalScale: 1
   m_wordSpacing: 0
   m_lineSpacing: 0
   m_lineSpacingMax: 0
@@ -6235,6 +6306,7 @@ MonoBehaviour:
   m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
+  m_characterHorizontalScale: 1
   m_wordSpacing: 0
   m_lineSpacing: 0
   m_lineSpacingMax: 0
@@ -7324,14 +7396,14 @@ Light:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1698015116}
   m_Enabled: 1
-  serializedVersion: 11
+  serializedVersion: 12
   m_Type: 1
   m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
   m_Intensity: 1
   m_Range: 10
   m_SpotAngle: 30
   m_InnerSpotAngle: 21.80208
-  m_CookieSize: 10
+  m_CookieSize2D: {x: 10, y: 10}
   m_Shadows:
     m_Type: 2
     m_Resolution: -1
@@ -8127,6 +8199,7 @@ MonoBehaviour:
   m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
+  m_characterHorizontalScale: 1
   m_wordSpacing: 0
   m_lineSpacing: 0
   m_lineSpacingMax: 0
@@ -8742,83 +8815,6 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1843414408}
   m_CullTransparentMesh: 1
---- !u!1001 &1846394380
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: -8679921383154817045, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 4.5884867
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: -3.5206754
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -8679921383154817045, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -3466146719752687185, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 0.81649655
-      objectReference: {fileID: 0}
-    - target: {fileID: -3466146719752687185, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: -3466146719752687185, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0.57735026
-      objectReference: {fileID: 0}
-    - target: {fileID: -3466146719752687185, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 919132149155446097, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
-      propertyPath: m_Name
-      value: CharacterModelSimplified (1)
-      objectReference: {fileID: 0}
-    - target: {fileID: 5866666021909216657, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
-      propertyPath: m_Controller
-      value: 
-      objectReference: {fileID: 9100000, guid: 0bc31e0717cb9b04aa98f63222c2fa17, type: 2}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: a4609a80d9c9c72489c602cc90e3f76a, type: 3}
 --- !u!1 &1895301033
 GameObject:
   m_ObjectHideFlags: 0
@@ -8988,6 +8984,7 @@ MeshRenderer:
   m_SortingLayerID: 0
   m_SortingLayer: 0
   m_SortingOrder: 0
+  m_MaskInteraction: 0
   m_AdditionalVertexStreams: {fileID: 0}
 --- !u!33 &1941815223
 MeshFilter:
@@ -9270,6 +9267,7 @@ MonoBehaviour:
   m_VerticalAlignment: 256
   m_textAlignment: 65535
   m_characterSpacing: 0
+  m_characterHorizontalScale: 1
   m_wordSpacing: 0
   m_lineSpacing: 0
   m_lineSpacingMax: 0
@@ -10218,4 +10216,4 @@ SceneRoots:
   - {fileID: 8269163115880052268}
   - {fileID: 425641350}
   - {fileID: 1594729518}
-  - {fileID: 1846394380}
+  - {fileID: 1307609322}