feat: #83 adding nuclear explosion action trigger

ChristyanS · Jun 12, 2021 · 4e0ed3c · 4e0ed3c
1 parent 3415b96
commit 4e0ed3c
Show file tree

Hide file tree

Showing 65 changed files with 1,050 additions and 173 deletions.
diff --git a/Assets/Animation/Models.meta b/Assets/Animation/Models.meta
diff --git a/Assets/Animation/Weapons.meta → Assets/Animation/Models/Weapons.meta b/Assets/Animation/Weapons.meta → Assets/Animation/Models/Weapons.meta
diff --git a/Assets/Animation/Weapons/Ak47.meta → Assets/Animation/Models/Weapons/Ak47.meta b/Assets/Animation/Weapons/Ak47.meta → Assets/Animation/Models/Weapons/Ak47.meta
diff --git a/...ts/Animation/Weapons/Ak47/AK74.controller → ...ation/Models/Weapons/Ak47/AK74.controller b/...ts/Animation/Weapons/Ak47/AK74.controller → ...ation/Models/Weapons/Ak47/AK74.controller
@@ -59,7 +59,7 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: -5508310538012890402}
-    m_Position: {x: 200, y: 0, z: 0}
+    m_Position: {x: 280, y: 120, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []

diff --git a/...imation/Weapons/Ak47/AK74.controller.meta → .../Models/Weapons/Ak47/AK74.controller.meta b/...imation/Weapons/Ak47/AK74.controller.meta → .../Models/Weapons/Ak47/AK74.controller.meta
diff --git a/Assets/Animation/Weapons/Ak47/rotate.anim → ...Animation/Models/Weapons/Ak47/rotate.anim b/Assets/Animation/Weapons/Ak47/rotate.anim → ...Animation/Models/Weapons/Ak47/rotate.anim
diff --git a/...s/Animation/Weapons/Ak47/rotate.anim.meta → ...tion/Models/Weapons/Ak47/rotate.anim.meta b/...s/Animation/Weapons/Ak47/rotate.anim.meta → ...tion/Models/Weapons/Ak47/rotate.anim.meta
diff --git a/Assets/Animation/Weapons/M107.meta → Assets/Animation/Models/Weapons/M107.meta b/Assets/Animation/Weapons/M107.meta → Assets/Animation/Models/Weapons/M107.meta
diff --git a/...ts/Animation/Weapons/M107/M107.controller → ...ation/Models/Weapons/M107/M107.controller b/...ts/Animation/Weapons/M107/M107.controller → ...ation/Models/Weapons/M107/M107.controller
diff --git a/...imation/Weapons/M107/M107.controller.meta → .../Models/Weapons/M107/M107.controller.meta b/...imation/Weapons/M107/M107.controller.meta → .../Models/Weapons/M107/M107.controller.meta
diff --git a/Assets/Animation/Weapons/M107/rotate.anim → ...Animation/Models/Weapons/M107/rotate.anim b/Assets/Animation/Weapons/M107/rotate.anim → ...Animation/Models/Weapons/M107/rotate.anim
diff --git a/...s/Animation/Weapons/M107/rotate.anim.meta → ...tion/Models/Weapons/M107/rotate.anim.meta b/...s/Animation/Weapons/M107/rotate.anim.meta → ...tion/Models/Weapons/M107/rotate.anim.meta
diff --git a/Assets/Animation/Weapons/M1911.meta → Assets/Animation/Models/Weapons/M1911.meta b/Assets/Animation/Weapons/M1911.meta → Assets/Animation/Models/Weapons/M1911.meta
diff --git a/.../Animation/Weapons/M1911/M1911.controller → ...ion/Models/Weapons/M1911/M1911.controller b/.../Animation/Weapons/M1911/M1911.controller → ...ion/Models/Weapons/M1911/M1911.controller
diff --git a/...ation/Weapons/M1911/M1911.controller.meta → ...odels/Weapons/M1911/M1911.controller.meta b/...ation/Weapons/M1911/M1911.controller.meta → ...odels/Weapons/M1911/M1911.controller.meta
diff --git a/Assets/Animation/Weapons/M1911/rotate.anim → ...nimation/Models/Weapons/M1911/rotate.anim b/Assets/Animation/Weapons/M1911/rotate.anim → ...nimation/Models/Weapons/M1911/rotate.anim
diff --git a/.../Animation/Weapons/M1911/rotate.anim.meta → ...ion/Models/Weapons/M1911/rotate.anim.meta b/.../Animation/Weapons/M1911/rotate.anim.meta → ...ion/Models/Weapons/M1911/rotate.anim.meta
diff --git a/Assets/Animation/Models/Weapons/Nuke.meta b/Assets/Animation/Models/Weapons/Nuke.meta
diff --git a/Assets/Animation/Models/Weapons/Nuke/Nuke.controller b/Assets/Animation/Models/Weapons/Nuke/Nuke.controller
@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1107 &-7544852842515634445
+AnimatorStateMachine:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 7930983961739686761}
+    m_Position: {x: 200, y: 0, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 7930983961739686761}
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Nuke
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -7544852842515634445}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1102 &7930983961739686761
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: NukeRotate
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 753c3f7854dd7694daeeb9ada2e784d9, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
diff --git a/Assets/Animation/Models/Weapons/Nuke/Nuke.controller.meta b/Assets/Animation/Models/Weapons/Nuke/Nuke.controller.meta
diff --git a/Assets/Animation/Weapons/Uzi/rotate.anim → ...Animation/Models/Weapons/Nuke/rotate.anim b/Assets/Animation/Weapons/Uzi/rotate.anim → ...Animation/Models/Weapons/Nuke/rotate.anim
diff --git a/Assets/Animation/Models/Weapons/Nuke/rotate.anim.meta b/Assets/Animation/Models/Weapons/Nuke/rotate.anim.meta
diff --git a/Assets/Animation/Weapons/Uzi.meta → Assets/Animation/Models/Weapons/Uzi.meta b/Assets/Animation/Weapons/Uzi.meta → Assets/Animation/Models/Weapons/Uzi.meta
diff --git a/Assets/Animation/Weapons/Uzi/Uzi.controller → ...imation/Models/Weapons/Uzi/Uzi.controller b/Assets/Animation/Weapons/Uzi/Uzi.controller → ...imation/Models/Weapons/Uzi/Uzi.controller
diff --git a/...Animation/Weapons/Uzi/Uzi.controller.meta → ...on/Models/Weapons/Uzi/Uzi.controller.meta b/...Animation/Weapons/Uzi/Uzi.controller.meta → ...on/Models/Weapons/Uzi/Uzi.controller.meta
diff --git a/Assets/Animation/Models/Weapons/Uzi/rotate.anim b/Assets/Animation/Models/Weapons/Uzi/rotate.anim
@@ -0,0 +1,271 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: rotate
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: {x: 0, y: 0, z: 0}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, 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: 0.25
+        value: {x: 0, y: 90, z: 0}
+        inSlope: {x: 0, y: 360, z: 0}
+        outSlope: {x: 0, y: 360, 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: 0.5
+        value: {x: 0, y: 180, z: 0}
+        inSlope: {x: 0, y: 360, z: 0}
+        outSlope: {x: 0, y: 360, 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: 0.75
+        value: {x: 0, y: 270, z: 0}
+        inSlope: {x: 0, y: 360, z: 0}
+        outSlope: {x: 0, y: 360, 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: 0, y: 360, z: 0}
+        inSlope: {x: 0, y: 0, z: 0}
+        outSlope: {x: 0, 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}
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    path: 
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves: []
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 4
+      script: {fileID: 0}
+      typeID: 4
+      customType: 4
+      isPPtrCurve: 0
+    pptrCurveMapping: []
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 1
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.25
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: localEulerAnglesRaw.x
+    path: 
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.25
+        value: 90
+        inSlope: 360
+        outSlope: 360
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5
+        value: 180
+        inSlope: 360
+        outSlope: 360
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.75
+        value: 270
+        inSlope: 360
+        outSlope: 360
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 1
+        value: 360
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: localEulerAnglesRaw.y
+    path: 
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.25
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.5
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 136
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: localEulerAnglesRaw.z
+    path: 
+    classID: 4
+    script: {fileID: 0}
+  m_EulerEditorCurves:
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.x
+    path: 
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.y
+    path: 
+    classID: 4
+    script: {fileID: 0}
+  - curve:
+      serializedVersion: 2
+      m_Curve: []
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    attribute: m_LocalEulerAngles.z
+    path: 
+    classID: 4
+    script: {fileID: 0}
+  m_HasGenericRootTransform: 1
+  m_HasMotionFloatCurves: 0
+  m_Events: []
diff --git a/...ts/Animation/Weapons/Uzi/rotate.anim.meta → ...ation/Models/Weapons/Uzi/rotate.anim.meta b/...ts/Animation/Weapons/Uzi/rotate.anim.meta → ...ation/Models/Weapons/Uzi/rotate.anim.meta