[ZS-117] Training Level (#60)

* Initalizing Branch * ZS-118 Basic Tutorial Level set up with base dummy, exit door. * ZS-119 Dummy takes damage, flashes appropriately, bullets pass through it while invincibile. * ZS-120 Instructions implemented, moved boundary of training level closer so megaman can't walk off screen * Re-aligned instructions so they line up better. * Fixed player contiuning to move after being damaged. * Fixed Training Level to work with recent changes. Fixed some tests failing. * Added Training Level to build, added ability to go to Training Level from Main Menu, and ability to go back to Main Menu by touching the exit door. Updated Analytics Manager to send Week 3 and open the new Form.
itcgames · Mar 21, 2022 · bdae1f4 · bdae1f4
1 parent 3ea1319
commit bdae1f4
Show file tree

Hide file tree

Showing 51 changed files with 5,084 additions and 23 deletions.
diff --git a/RWM-P2-TEAM-C/Assets/Animations/Dummy.meta b/RWM-P2-TEAM-C/Assets/Animations/Dummy.meta
diff --git a/RWM-P2-TEAM-C/Assets/Animations/Dummy/Dummy.controller b/RWM-P2-TEAM-C/Assets/Animations/Dummy/Dummy.controller
@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-6179522885598223090
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Dummy_Idle
+  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: 22d03491137806f43b53f10c79ff5231, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Dummy
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 8120093577353055202}
+    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!1107 &8120093577353055202
+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: -6179522885598223090}
+    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: -6179522885598223090}
diff --git a/RWM-P2-TEAM-C/Assets/Animations/Dummy/Dummy.controller.meta b/RWM-P2-TEAM-C/Assets/Animations/Dummy/Dummy.controller.meta
diff --git a/RWM-P2-TEAM-C/Assets/Animations/Dummy/Dummy_Idle.anim b/RWM-P2-TEAM-C/Assets/Animations/Dummy/Dummy_Idle.anim
@@ -0,0 +1,89 @@
+%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: Dummy_Idle
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 5463189583543264802, guid: e6e597292622df5489e0925b3c9a3ecb,
+        type: 3}
+    - time: 0.1
+      value: {fileID: 5463189583543264802, guid: e6e597292622df5489e0925b3c9a3ecb,
+        type: 3}
+    - time: 0.2
+      value: {fileID: -4815338781847372184, guid: e6e597292622df5489e0925b3c9a3ecb,
+        type: 3}
+    - time: 0.3
+      value: {fileID: 2331914284563532042, guid: e6e597292622df5489e0925b3c9a3ecb,
+        type: 3}
+    - time: 0.4
+      value: {fileID: -2766716539995522894, guid: e6e597292622df5489e0925b3c9a3ecb,
+        type: 3}
+    - time: 0.5
+      value: {fileID: 5463189583543264802, guid: e6e597292622df5489e0925b3c9a3ecb,
+        type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  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: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: 5463189583543264802, guid: e6e597292622df5489e0925b3c9a3ecb, type: 3}
+    - {fileID: 5463189583543264802, guid: e6e597292622df5489e0925b3c9a3ecb, type: 3}
+    - {fileID: -4815338781847372184, guid: e6e597292622df5489e0925b3c9a3ecb, type: 3}
+    - {fileID: 2331914284563532042, guid: e6e597292622df5489e0925b3c9a3ecb, type: 3}
+    - {fileID: -2766716539995522894, guid: e6e597292622df5489e0925b3c9a3ecb, type: 3}
+    - {fileID: 5463189583543264802, guid: e6e597292622df5489e0925b3c9a3ecb, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 0.51666665
+    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: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
diff --git a/RWM-P2-TEAM-C/Assets/Animations/Dummy/Dummy_Idle.anim.meta b/RWM-P2-TEAM-C/Assets/Animations/Dummy/Dummy_Idle.anim.meta
diff --git a/RWM-P2-TEAM-C/Assets/Animations/Instructions.meta b/RWM-P2-TEAM-C/Assets/Animations/Instructions.meta
diff --git a/RWM-P2-TEAM-C/Assets/Animations/Instructions/A.controller b/RWM-P2-TEAM-C/Assets/Animations/Instructions/A.controller
@@ -0,0 +1,72 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: A
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: 5711479157857687826}
+    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!1107 &5711479157857687826
+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: 8390509612341940999}
+    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: 8390509612341940999}
+--- !u!1102 &8390509612341940999
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: A_Animation
+  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: 0aef207aaddcc164e9cc616d0e66b669, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
diff --git a/RWM-P2-TEAM-C/Assets/Animations/Instructions/A.controller.meta b/RWM-P2-TEAM-C/Assets/Animations/Instructions/A.controller.meta
diff --git a/RWM-P2-TEAM-C/Assets/Animations/Instructions/A_Animation.anim b/RWM-P2-TEAM-C/Assets/Animations/Instructions/A_Animation.anim
@@ -0,0 +1,77 @@
+%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: A_Animation
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: 2195181502708293399, guid: 4724b9ed2088b5f48b399fc47afb2b82,
+        type: 3}
+    - time: 0.5833333
+      value: {fileID: -5783998272453548447, guid: 4724b9ed2088b5f48b399fc47afb2b82,
+        type: 3}
+    - time: 1.0833334
+      value: {fileID: 2195181502708293399, guid: 4724b9ed2088b5f48b399fc47afb2b82,
+        type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  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: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: 2195181502708293399, guid: 4724b9ed2088b5f48b399fc47afb2b82, type: 3}
+    - {fileID: -5783998272453548447, guid: 4724b9ed2088b5f48b399fc47afb2b82, type: 3}
+    - {fileID: 2195181502708293399, guid: 4724b9ed2088b5f48b399fc47afb2b82, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1.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: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
diff --git a/RWM-P2-TEAM-C/Assets/Animations/Instructions/A_Animation.anim.meta b/RWM-P2-TEAM-C/Assets/Animations/Instructions/A_Animation.anim.meta