Merge branch 'release/v1.1'

fireotters · Aug 20, 2020 · 6a4f141 · 6a4f141
2 parents 1605842 + 9744777
commit 6a4f141
Show file tree

Hide file tree

Showing 511 changed files with 50,257 additions and 38,313 deletions.
diff --git a/Assets/Art/Placeholder.meta → Assets/Animations/Enemies.meta b/Assets/Art/Placeholder.meta → Assets/Animations/Enemies.meta
diff --git a/Assets/Art/Enemies/basic.meta → Assets/Animations/Enemies/basic.meta b/Assets/Art/Enemies/basic.meta → Assets/Animations/Enemies/basic.meta
diff --git a/Assets/Art/Enemies/basic/Enemy.controller → ...Animations/Enemies/basic/Enemy.controller b/Assets/Art/Enemies/basic/Enemy.controller → ...Animations/Enemies/basic/Enemy.controller
diff --git a/...s/Art/Enemies/basic/Enemy.controller.meta → ...tions/Enemies/basic/Enemy.controller.meta b/...s/Art/Enemies/basic/Enemy.controller.meta → ...tions/Enemies/basic/Enemy.controller.meta
diff --git a/Assets/Art/Enemies/basic/walking.anim → Assets/Animations/Enemies/basic/walking.anim b/Assets/Art/Enemies/basic/walking.anim → Assets/Animations/Enemies/basic/walking.anim
diff --git a/Assets/Art/Enemies/basic/walking.anim.meta → ...nimations/Enemies/basic/walking.anim.meta b/Assets/Art/Enemies/basic/walking.anim.meta → ...nimations/Enemies/basic/walking.anim.meta
diff --git a/Assets/Art/Enemies/big chungus.meta → Assets/Animations/Enemies/big chungus.meta b/Assets/Art/Enemies/big chungus.meta → Assets/Animations/Enemies/big chungus.meta
diff --git a/...nemies/big chungus/Big Chungus.controller → ...nemies/big chungus/Big Chungus.controller b/...nemies/big chungus/Big Chungus.controller → ...nemies/big chungus/Big Chungus.controller
diff --git a/...s/big chungus/Big Chungus.controller.meta → ...s/big chungus/Big Chungus.controller.meta b/...s/big chungus/Big Chungus.controller.meta → ...s/big chungus/Big Chungus.controller.meta
diff --git a/Assets/Art/Enemies/big chungus/walking.anim → ...imations/Enemies/big chungus/walking.anim b/Assets/Art/Enemies/big chungus/walking.anim → ...imations/Enemies/big chungus/walking.anim
diff --git a/...Art/Enemies/big chungus/walking.anim.meta → ...ons/Enemies/big chungus/walking.anim.meta b/...Art/Enemies/big chungus/walking.anim.meta → ...ons/Enemies/big chungus/walking.anim.meta
diff --git a/Assets/Art/Enemies/sanic.meta → Assets/Animations/Enemies/sanic.meta b/Assets/Art/Enemies/sanic.meta → Assets/Animations/Enemies/sanic.meta
diff --git a/Assets/Art/Enemies/sanic/Sanic.controller → ...Animations/Enemies/sanic/Sanic.controller b/Assets/Art/Enemies/sanic/Sanic.controller → ...Animations/Enemies/sanic/Sanic.controller
diff --git a/...s/Art/Enemies/sanic/Sanic.controller.meta → ...tions/Enemies/sanic/Sanic.controller.meta b/...s/Art/Enemies/sanic/Sanic.controller.meta → ...tions/Enemies/sanic/Sanic.controller.meta
diff --git a/Assets/Art/Enemies/sanic/walking.anim → Assets/Animations/Enemies/sanic/walking.anim b/Assets/Art/Enemies/sanic/walking.anim → Assets/Animations/Enemies/sanic/walking.anim
diff --git a/Assets/Art/Enemies/sanic/walking.anim.meta → ...nimations/Enemies/sanic/walking.anim.meta b/Assets/Art/Enemies/sanic/walking.anim.meta → ...nimations/Enemies/sanic/walking.anim.meta
diff --git a/Assets/Scripts/MainTower.meta → Assets/Animations/Other.meta b/Assets/Scripts/MainTower.meta → Assets/Animations/Other.meta
diff --git a/Assets/Animations/Other/DamageIndicator.anim b/Assets/Animations/Other/DamageIndicator.anim
@@ -0,0 +1,53 @@
+%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: DamageIndicator
+  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: []
+  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: []
+    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: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
diff --git a/Assets/Animations/Other/DamageIndicator.anim.meta b/Assets/Animations/Other/DamageIndicator.anim.meta
diff --git a/...Animations/Placeholders/Player.controller → Assets/Animations/Other/Dialog.controller b/...Animations/Placeholders/Player.controller → Assets/Animations/Other/Dialog.controller
@@ -1,42 +1,42 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
---- !u!1101 &-9125716461714713996
-AnimatorStateTransition:
+--- !u!1107 &-7890974560541092339
+AnimatorStateMachine:
+  serializedVersion: 5
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  m_Conditions:
-  - m_ConditionMode: 4
-    m_ConditionEvent: Speed
-    m_EventTreshold: 0.01
-  m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: 2873900566634304233}
-  m_Solo: 0
-  m_Mute: 0
-  m_IsExit: 0
-  serializedVersion: 3
-  m_TransitionDuration: 0
-  m_TransitionOffset: 0
-  m_ExitTime: 0
-  m_HasExitTime: 0
-  m_HasFixedDuration: 1
-  m_InterruptionSource: 0
-  m_OrderedInterruption: 1
-  m_CanTransitionToSelf: 1
---- !u!1102 &-8212977427413950288
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 3844919013413116629}
+    m_Position: {x: 360, y: 100, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -7661700068017898452}
+    m_Position: {x: 387.55377, y: 196.5423, 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: -7661700068017898452}
+--- !u!1102 &-7661700068017898452
 AnimatorState:
   serializedVersion: 5
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Movement
+  m_Name: New State
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions:
-  - {fileID: -9125716461714713996}
+  - {fileID: 1955267584699859649}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -46,7 +46,7 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 3062287156370796352}
+  m_Motion: {fileID: 0}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
@@ -58,31 +58,19 @@ AnimatorController:
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Player
+  m_Name: Dialog
   serializedVersion: 5
   m_AnimatorParameters:
-  - m_Name: Horizontal
-    m_Type: 1
+  - m_Name: RoundFinished
+    m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
-  - m_Name: Vertical
-    m_Type: 1
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
-  - m_Name: Speed
-    m_Type: 1
-    m_DefaultFloat: 0
-    m_DefaultInt: 0
-    m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
-    m_StateMachine: {fileID: 5771780812377302372}
+    m_StateMachine: {fileID: -7890974560541092339}
     m_Mask: {fileID: 0}
     m_Motions: []
     m_Behaviours: []
@@ -92,43 +80,65 @@ AnimatorController:
     m_IKPass: 0
     m_SyncedLayerAffectsTiming: 0
     m_Controller: {fileID: 9100000}
---- !u!1101 &1107186774593696617
+--- !u!1101 &1758256765233865971
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: -7661700068017898452}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9166667
+  m_HasExitTime: 1
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
+--- !u!1101 &1955267584699859649
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: 
   m_Conditions:
-  - m_ConditionMode: 3
-    m_ConditionEvent: Speed
-    m_EventTreshold: 0.01
+  - m_ConditionMode: 1
+    m_ConditionEvent: RoundFinished
+    m_EventTreshold: 0
   m_DstStateMachine: {fileID: 0}
-  m_DstState: {fileID: -8212977427413950288}
+  m_DstState: {fileID: 3844919013413116629}
   m_Solo: 0
   m_Mute: 0
   m_IsExit: 0
   serializedVersion: 3
-  m_TransitionDuration: 0
+  m_TransitionDuration: 0.25
   m_TransitionOffset: 0
-  m_ExitTime: 0
+  m_ExitTime: 0.75
   m_HasExitTime: 0
   m_HasFixedDuration: 1
   m_InterruptionSource: 0
   m_OrderedInterruption: 1
   m_CanTransitionToSelf: 1
---- !u!1102 &2873900566634304233
+--- !u!1102 &3844919013413116629
 AnimatorState:
   serializedVersion: 5
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_Name: Idle
+  m_Name: RoundComplete
   m_Speed: 1
   m_CycleOffset: 0
   m_Transitions:
-  - {fileID: 1107186774593696617}
+  - {fileID: 1758256765233865971}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 0
@@ -138,81 +148,9 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: 95955e75a592d3f42a05681a8ac559be, type: 2}
+  m_Motion: {fileID: 7400000, guid: 573a1191fb9612d4aaba1e12d3f86221, type: 2}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
---- !u!206 &3062287156370796352
-BlendTree:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: Blend Tree
-  m_Childs:
-  - serializedVersion: 2
-    m_Motion: {fileID: 7400000, guid: b208d1ef8e948b142a82139b1a7b84cf, type: 2}
-    m_Threshold: -1
-    m_Position: {x: 0, y: -1}
-    m_TimeScale: 1
-    m_CycleOffset: 0
-    m_DirectBlendParameter: Horizontal
-    m_Mirror: 0
-  - serializedVersion: 2
-    m_Motion: {fileID: 7400000, guid: d8d767b23aee3cb4ab474849b7364cbd, type: 2}
-    m_Threshold: 1
-    m_Position: {x: 0, y: 1}
-    m_TimeScale: 1
-    m_CycleOffset: 0
-    m_DirectBlendParameter: Horizontal
-    m_Mirror: 0
-  - serializedVersion: 2
-    m_Motion: {fileID: 7400000, guid: 916f387a0aec0394ebd5e1eb764d7863, type: 2}
-    m_Threshold: 3
-    m_Position: {x: -1, y: 0}
-    m_TimeScale: 1
-    m_CycleOffset: 0
-    m_DirectBlendParameter: Horizontal
-    m_Mirror: 0
-  - serializedVersion: 2
-    m_Motion: {fileID: 7400000, guid: f96415c6327e3ff4c8e638fd76dc7e4c, type: 2}
-    m_Threshold: 5
-    m_Position: {x: 1, y: 0}
-    m_TimeScale: 1
-    m_CycleOffset: 0
-    m_DirectBlendParameter: Horizontal
-    m_Mirror: 0
-  m_BlendParameter: Horizontal
-  m_BlendParameterY: Vertical
-  m_MinThreshold: -1
-  m_MaxThreshold: 5
-  m_UseAutomaticThresholds: 0
-  m_NormalizedBlendValues: 0
-  m_BlendType: 1
---- !u!1107 &5771780812377302372
-AnimatorStateMachine:
-  serializedVersion: 5
-  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: 2873900566634304233}
-    m_Position: {x: 120, y: 250, z: 0}
-  - serializedVersion: 1
-    m_State: {fileID: -8212977427413950288}
-    m_Position: {x: 270, y: 100, z: 0}
-  m_ChildStateMachines: []
-  m_AnyStateTransitions: []
-  m_EntryTransitions: []
-  m_StateMachineTransitions: {}
-  m_StateMachineBehaviours: []
-  m_AnyStatePosition: {x: 40, y: 10, 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: 2873900566634304233}
diff --git a/Assets/Animations/Other/Dialog.controller.meta b/Assets/Animations/Other/Dialog.controller.meta