heliblade spin direction fixes, latejoiner stuff for weapons

Sacchan-VRC · Nov 7, 2021 · 2eb47dc · 2eb47dc
1 parent 7da4bef
commit 2eb47dc
Show file tree

Hide file tree

Showing 10 changed files with 132 additions and 123 deletions.
diff --git a/Prefabs/SH-1Main.prefab b/Prefabs/SH-1Main.prefab
@@ -95808,7 +95808,7 @@ BoxCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 0.02, y: 0.125, z: 2.042}
+  m_Size: {x: 0.02, y: 0.125, z: 2.3}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!65 &8333115239245534707
 BoxCollider:
@@ -95821,7 +95821,7 @@ BoxCollider:
   m_IsTrigger: 0
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 0.02, y: 2.042, z: 0.125}
+  m_Size: {x: 0.02, y: 2.3, z: 0.125}
   m_Center: {x: 0, y: 0, z: 0}
 --- !u!65 &8333115239245534704
 BoxCollider:

diff --git a/SH-1/Animations/BladeSpin.anim b/SH-1/Animations/BladeSpin.anim
@@ -19,18 +19,18 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: {x: 0, y: 0, z: 0}
-        inSlope: {x: 0, y: 0, z: 0}
-        outSlope: {x: -359.999, y: 0, z: 0}
+        value: {x: -359.999, y: 0, z: 0}
+        inSlope: {x: -635.29236, y: -0, z: -0}
+        outSlope: {x: 359.999, y: 0, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
         outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 1
-        value: {x: -359.999, y: 0, z: 0}
-        inSlope: {x: -359.999, y: -0, z: -0}
-        outSlope: {x: 0, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        inSlope: {x: 359.999, y: -0, z: -0}
+        outSlope: {x: -635.29236, y: 0, z: 0}
         tangentMode: 0
         weightedMode: 0
         inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
@@ -116,18 +116,18 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
-        inSlope: 0
-        outSlope: -359.999
+        value: -359.999
+        inSlope: -635.29236
+        outSlope: 359.999
         tangentMode: 69
         weightedMode: 0
         inWeight: 0.33333334
         outWeight: 0.33333334
       - serializedVersion: 3
         time: 1
-        value: -359.999
-        inSlope: -359.999
-        outSlope: 0
+        value: 0
+        inSlope: 359.999
+        outSlope: -635.29236
         tangentMode: 69
         weightedMode: 0
         inWeight: 0.33333334
@@ -145,7 +145,7 @@ AnimationClip:
       - serializedVersion: 3
         time: 0
         value: 0
-        inSlope: 0
+        inSlope: -0
         outSlope: 0
         tangentMode: 69
         weightedMode: 0
@@ -173,7 +173,7 @@ AnimationClip:
       - serializedVersion: 3
         time: 0
         value: 0
-        inSlope: 0
+        inSlope: -0
         outSlope: 0
         tangentMode: 69
         weightedMode: 0
@@ -287,7 +287,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: SH-1/Blade2
+    path: SH-1/HeliBladeTiltEmpty/Blade
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -297,7 +297,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: SH-1/Blade2
+    path: SH-1/HeliBladeTiltEmpty/Blade
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -307,7 +307,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.x
-    path: SH-1/Blade2
+    path: SH-1/HeliBladeTiltEmpty/Blade
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -317,7 +317,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.x
-    path: SH-1/HeliBladeTiltEmpty/Blade
+    path: SH-1/Blade2
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -327,7 +327,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: SH-1/HeliBladeTiltEmpty/Blade
+    path: SH-1/Blade2
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -337,7 +337,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: SH-1/HeliBladeTiltEmpty/Blade
+    path: SH-1/Blade2
     classID: 4
     script: {fileID: 0}
   m_HasGenericRootTransform: 0

diff --git a/SH-1/Animations/BladeSpinDown.anim b/SH-1/Animations/BladeSpinDown.anim
@@ -44,22 +44,22 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: {x: 3600, y: 0, z: 0}
-        inSlope: {x: -1188.8411, y: 0, z: 0}
-        outSlope: {x: -1188.8411, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        inSlope: {x: 1330.6595, y: 0, z: 0}
+        outSlope: {x: 1330.6595, y: 0, z: 0}
         tangentMode: 0
         weightedMode: 0
-        inWeight: {x: 0.1395408, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.1327334, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 3.5
-        value: {x: 0, y: 0, z: 0}
-        inSlope: {x: -7.6977096, y: 0, z: 0}
-        outSlope: {x: -7.6977096, y: 0, z: 0}
+        value: {x: 3600, y: 0, z: 0}
+        inSlope: {x: 0.006764918, y: 0, z: 0}
+        outSlope: {x: 0.006764918, y: 0, z: 0}
         tangentMode: 0
         weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.0019196152, y: 0.33333334, z: 0.33333334}
+        inWeight: {x: 0.061867237, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -200,22 +200,22 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 3600
-        inSlope: -1188.8411
-        outSlope: -1188.8411
+        value: 0
+        inSlope: 1330.6595
+        outSlope: 1330.6595
         tangentMode: 0
         weightedMode: 0
-        inWeight: 0.1395408
-        outWeight: 0.33333334
+        inWeight: 0.33333334
+        outWeight: 0.1327334
       - serializedVersion: 3
         time: 3.5
-        value: 0
-        inSlope: -7.6977096
-        outSlope: -7.6977096
+        value: 3600
+        inSlope: 0.006764918
+        outSlope: 0.006764918
         tangentMode: 0
         weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.0019196152
+        inWeight: 0.061867237
+        outWeight: 0.33333334
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -287,7 +287,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: SH-1/Blade2
+    path: SH-1/HeliBladeTiltEmpty/Blade
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -297,7 +297,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: SH-1/Blade2
+    path: SH-1/HeliBladeTiltEmpty/Blade
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -307,7 +307,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.x
-    path: SH-1/Blade2
+    path: SH-1/HeliBladeTiltEmpty/Blade
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -317,7 +317,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.x
-    path: SH-1/HeliBladeTiltEmpty/Blade
+    path: SH-1/Blade2
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -327,7 +327,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.y
-    path: SH-1/HeliBladeTiltEmpty/Blade
+    path: SH-1/Blade2
     classID: 4
     script: {fileID: 0}
   - curve:
@@ -337,7 +337,7 @@ AnimationClip:
       m_PostInfinity: 2
       m_RotationOrder: 4
     attribute: m_LocalEulerAngles.z
-    path: SH-1/HeliBladeTiltEmpty/Blade
+    path: SH-1/Blade2
     classID: 4
     script: {fileID: 0}
   m_HasGenericRootTransform: 0

diff --git a/SH-1/Animations/BladeSpinUp.anim b/SH-1/Animations/BladeSpinUp.anim
@@ -44,22 +44,22 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: {x: 0, y: 0, z: 0}
-        inSlope: {x: -7.6977096, y: 0, z: 0}
-        outSlope: {x: -7.6977096, y: 0, z: 0}
+        value: {x: -3600, y: 0, z: 0}
+        inSlope: {x: 112.223495, y: 0, z: 0}
+        outSlope: {x: 112.223495, y: 0, z: 0}
         tangentMode: 0
         weightedMode: 0
-        inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.0019196152, y: 0.33333334, z: 0.33333334}
+        inWeight: {x: 0.1395408, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.15138398, y: 0.33333334, z: 0.33333334}
       - serializedVersion: 3
         time: 3.5
-        value: {x: -3600, y: 0, z: 0}
-        inSlope: {x: -1188.8411, y: 0, z: 0}
-        outSlope: {x: -1188.8411, y: 0, z: 0}
+        value: {x: 0, y: 0, z: 0}
+        inSlope: {x: 1550.1218, y: 0, z: 0}
+        outSlope: {x: 1550.1218, y: 0, z: 0}
         tangentMode: 0
         weightedMode: 0
-        inWeight: {x: 0.1395408, y: 0.33333334, z: 0.33333334}
-        outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334}
+        inWeight: {x: 0.12550034, y: 0.33333334, z: 0.33333334}
+        outWeight: {x: 0.0019196152, y: 0.33333334, z: 0.33333334}
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4
@@ -200,22 +200,22 @@ AnimationClip:
       m_Curve:
       - serializedVersion: 3
         time: 0
-        value: 0
-        inSlope: -7.6977096
-        outSlope: -7.6977096
+        value: -3600
+        inSlope: 112.223495
+        outSlope: 112.223495
         tangentMode: 0
         weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.0019196152
+        inWeight: 0.1395408
+        outWeight: 0.15138398
       - serializedVersion: 3
         time: 3.5
-        value: -3600
-        inSlope: -1188.8411
-        outSlope: -1188.8411
+        value: 0
+        inSlope: 1550.1218
+        outSlope: 1550.1218
         tangentMode: 0
         weightedMode: 0
-        inWeight: 0.1395408
-        outWeight: 0.33333334
+        inWeight: 0.12550034
+        outWeight: 0.0019196152
       m_PreInfinity: 2
       m_PostInfinity: 2
       m_RotationOrder: 4