Merge pull request #53 from hackerspace-ntnu/lightning-turret-update

Lightning turret update
hackerspace-ntnu · Oct 20, 2021 · 3ea8ef4 · 3ea8ef4
2 parents 76b18a0 + 83698b6
commit 3ea8ef4
Show file tree

Hide file tree

Showing 20 changed files with 29,195 additions and 358 deletions.
diff --git a/Assets/Animations/Towers/LightningTurret/Ligningturret.controller b/Assets/Animations/Towers/LightningTurret/Ligningturret.controller
@@ -1,31 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1102 &-2347728340251618517
-AnimatorState:
-  serializedVersion: 5
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Shoot_lightning
-  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: 00e3c3ef989fcbf4c9212eebaa1b7de6, type: 2}
-  m_Tag: 
-  m_SpeedParameter: 
-  m_MirrorParameter: 
-  m_CycleOffsetParameter: 
-  m_TimeParameter: 
 --- !u!91 &9100000
 AnimatorController:
   m_ObjectHideFlags: 0
@@ -58,8 +32,8 @@ AnimatorStateMachine:
   m_Name: Default
   m_ChildStates:
   - serializedVersion: 1
-    m_State: {fileID: -2347728340251618517}
-    m_Position: {x: 285.2, y: 130, z: 0}
+    m_State: {fileID: 9194048226351009108}
+    m_Position: {x: 310, y: 150, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -69,4 +43,30 @@ AnimatorStateMachine:
   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: -2347728340251618517}
+  m_DefaultState: {fileID: 9194048226351009108}
+--- !u!1102 &9194048226351009108
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Armature_Shoot
+  m_Speed: 1.2
+  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: c524eb00725d26547a5fb9c989d39fe5, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
diff --git a/Assets/Models/Armature_Shoot.anim b/Assets/Models/Armature_Shoot.anim
diff --git a/Assets/Models/Armature_Shoot.anim.meta b/Assets/Models/Armature_Shoot.anim.meta
diff --git a/Assets/Models/Dahl/dahlsBaseColor.png b/Assets/Models/Dahl/dahlsBaseColor.png
diff --git a/Assets/Models/Dummy.fbx b/Assets/Models/Dummy.fbx
diff --git a/Assets/Models/Dummy.fbx.meta b/Assets/Models/Dummy.fbx.meta
diff --git a/Assets/Models/LowPolyLightning.fbx b/Assets/Models/LowPolyLightning.fbx
diff --git a/Assets/Models/LowPolyLightning.fbx.meta b/Assets/Models/LowPolyLightning.fbx.meta
diff --git a/Assets/Prefabs/Players/Dahl_Player.prefab b/Assets/Prefabs/Players/Dahl_Player.prefab
@@ -498,8 +498,8 @@ BoxCollider:
   m_IsTrigger: 1
   m_Enabled: 1
   serializedVersion: 2
-  m_Size: {x: 2.196698, y: 2.196026, z: 1.849935}
-  m_Center: {x: 0.075591445, y: 0.25867486, z: 0.21112931}
+  m_Size: {x: 2.196698, y: 2.196026, z: 2.2490091}
+  m_Center: {x: 0.075591445, y: 0.25867486, z: 0.41066945}
 --- !u!1 &1880419294969973392
 GameObject:
   m_ObjectHideFlags: 0