diff --git a/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1DeathAni.anim b/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1DeathAni.anim index 7f81a7d..ec29935 100644 --- a/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1DeathAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1.1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.23333333 - value: {x: 0, y: 0, z: 0} + value: {x: -1.1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -90,7 +90,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.33333334 + m_StopTime: 0.41666666 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -112,7 +112,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1.1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -121,7 +121,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.23333333 - value: 0 + value: -1.1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -200,7 +200,7 @@ AnimationClip: m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 m_Events: - - time: 0.33333334 + - time: 0.41666666 functionName: DestroyGameobject data: objectReferenceParameter: {fileID: 0} diff --git a/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1StrangleAni.anim b/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1StrangleAni.anim index c482c48..d18adbf 100644 --- a/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1.1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1.1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2DeathAni.anim b/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2DeathAni.anim index 5059793..44142c7 100644 --- a/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2DeathAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1.1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.23333333 - value: {x: 0, y: 0, z: 0} + value: {x: -1.1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -90,7 +90,7 @@ AnimationClip: m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.33333334 + m_StopTime: 0.41666666 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -112,7 +112,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1.1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -121,7 +121,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.23333333 - value: 0 + value: -1.1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -200,7 +200,7 @@ AnimationClip: m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 m_Events: - - time: 0.33333334 + - time: 0.41666666 functionName: DestroyGameobject data: objectReferenceParameter: {fileID: 0} diff --git a/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2StrangleAni.anim b/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2StrangleAni.anim index 7d3e35f..dda63fc 100644 --- a/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/3/v2/Enemy3v2StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1.1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1.1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3.controller b/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3.controller index 25cbdaa..3a258f9 100644 --- a/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3.controller +++ b/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3.controller @@ -62,7 +62,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: Strangler + m_ConditionEvent: Strangle m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 5001590403131153829} @@ -119,13 +119,13 @@ AnimatorController: m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 - m_Controller: {fileID: 9100000} - - m_Name: Strangler + m_Controller: {fileID: 0} + - m_Name: Strangle m_Type: 9 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 diff --git a/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3DeathAni.anim b/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3DeathAni.anim index 74eb911..d62df83 100644 --- a/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3DeathAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1.1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,16 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.23333333 - value: {x: 0, y: 0, z: 0} + value: {x: -1.1, 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.5 + value: {x: -1.1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -47,10 +56,10 @@ AnimationClip: curve: - time: 0 value: {fileID: 21300000, guid: 52bfa0c35d09d3d4ea7707eb897af446, type: 3} - - time: 0.11666667 - value: {fileID: 21300000, guid: 5fb5a5ee14104284abd140c8254a3489, type: 3} - time: 0.23333333 value: {fileID: 21300000, guid: 13cac21306a78c94a968940a189e23ef, type: 3} + - time: 0.5 + value: {fileID: 21300000, guid: 13cac21306a78c94a968940a189e23ef, type: 3} attribute: m_Sprite path: classID: 212 @@ -83,14 +92,14 @@ AnimationClip: isSerializeReferenceCurve: 0 pptrCurveMapping: - {fileID: 21300000, guid: 52bfa0c35d09d3d4ea7707eb897af446, type: 3} - - {fileID: 21300000, guid: 5fb5a5ee14104284abd140c8254a3489, type: 3} + - {fileID: 21300000, guid: 13cac21306a78c94a968940a189e23ef, type: 3} - {fileID: 21300000, guid: 13cac21306a78c94a968940a189e23ef, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.33333334 + m_StopTime: 0.51666665 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 @@ -112,7 +121,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1.1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -121,7 +130,16 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.23333333 - value: 0 + value: -1.1 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 0.5 + value: -1.1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -158,6 +176,15 @@ AnimationClip: 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 @@ -188,6 +215,15 @@ AnimationClip: 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 @@ -200,7 +236,7 @@ AnimationClip: m_HasGenericRootTransform: 1 m_HasMotionFloatCurves: 0 m_Events: - - time: 0.33333334 + - time: 0.5 functionName: DestroyGameobject data: objectReferenceParameter: {fileID: 0} diff --git a/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3StrangleAni.anim b/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3StrangleAni.anim index 38584b2..7f3b12b 100644 --- a/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/3/v3/Enemy3v3StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1.1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1.1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1DeathAni.anim b/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1DeathAni.anim index 959dabf..8f8c49a 100644 --- a/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1DeathAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.3 - value: {x: 0, y: 0, z: 0} + value: {x: -1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -115,7 +115,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -124,7 +124,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.3 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1StrangleAni.anim b/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1StrangleAni.anim index c14fb21..515d085 100644 --- a/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/4/v1/Enemy4v1StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2DeathAni.anim b/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2DeathAni.anim index 26c6de6..fdad478 100644 --- a/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2DeathAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.3 - value: {x: 0, y: 0, z: 0} + value: {x: -1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -115,7 +115,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -124,7 +124,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.3 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2StrangleAni.anim b/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2StrangleAni.anim index 60a7bc5..23b9246 100644 --- a/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/4/v2/Enemy4v2StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3DeathAni.anim b/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3DeathAni.anim index f132b2f..9148c4a 100644 --- a/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3DeathAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.3 - value: {x: 0, y: 0, z: 0} + value: {x: -1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -115,7 +115,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -124,7 +124,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.3 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3StrangleAni.anim b/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3StrangleAni.anim index 030646a..24e7063 100644 --- a/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/4/v3/Enemy4v3StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -1, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1DeathAni.anim b/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1DeathAni.anim index 0e07d59..33bf013 100644 --- a/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1DeathAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -2.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.3 - value: {x: 0, y: 0, z: 0} + value: {x: -2.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -115,7 +115,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -2.2 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -124,7 +124,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.3 - value: 0 + value: -2.2 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1StrangleAni.anim b/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1StrangleAni.anim index 1dc3c6e..9545b70 100644 --- a/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/5/v1/Enemy5v1StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -2.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -2.2 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2DeathAni.anim b/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2DeathAni.anim index 461b078..191acf3 100644 --- a/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2DeathAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -2.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.3 - value: {x: 0, y: 0, z: 0} + value: {x: -2.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -115,7 +115,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -2.2 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -124,7 +124,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.3 - value: 0 + value: -2.2 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2StrangleAni.anim b/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2StrangleAni.anim index 99beca8..20b5cd7 100644 --- a/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/5/v2/Enemy5v2StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -2.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -2.2 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3DeathAni.anim b/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3DeathAni.anim index 8226c21..bc72e18 100644 --- a/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3DeathAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -2.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.3 - value: {x: 0, y: 0, z: 0} + value: {x: -2.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -115,7 +115,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -2.2 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -124,7 +124,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.3 - value: 0 + value: -2.2 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3StrangleAni.anim b/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3StrangleAni.anim index 5968a8d..deeef10 100644 --- a/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/5/v3/Enemy5v3StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 0, y: 0, z: 0} + value: {x: -2.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 0 + value: -2.2 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/6/v1/Enemy6v1DeathAni.anim b/Assets/Animations/EnemyAnimations/6/v1/Enemy6v1DeathAni.anim index 13429fd..238b55a 100644 --- a/Assets/Animations/EnemyAnimations/6/v1/Enemy6v1DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/6/v1/Enemy6v1DeathAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1, y: 0, z: 0} + value: {x: -1.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.23333333 - value: {x: 1, y: 0, z: 0} + value: {x: -1.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -112,7 +112,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: -1.2 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -121,7 +121,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.23333333 - value: 1 + value: -1.2 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/6/v1/Enemy6v1StrangleAni.anim b/Assets/Animations/EnemyAnimations/6/v1/Enemy6v1StrangleAni.anim index 7f83616..499e4b5 100644 --- a/Assets/Animations/EnemyAnimations/6/v1/Enemy6v1StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/6/v1/Enemy6v1StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1, y: 0, z: 0} + value: {x: -1.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: -1.2 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/6/v2/Enemy6v2DeathAni.anim b/Assets/Animations/EnemyAnimations/6/v2/Enemy6v2DeathAni.anim index 95802c9..351a9c4 100644 --- a/Assets/Animations/EnemyAnimations/6/v2/Enemy6v2DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/6/v2/Enemy6v2DeathAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1, y: 0, z: 0} + value: {x: -1.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.23333333 - value: {x: 1, y: 0, z: 0} + value: {x: -1.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -112,7 +112,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: -1.2 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -121,7 +121,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.23333333 - value: 1 + value: -1.2 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/6/v2/Enemy6v2StrangleAni.anim b/Assets/Animations/EnemyAnimations/6/v2/Enemy6v2StrangleAni.anim index db379d8..284a648 100644 --- a/Assets/Animations/EnemyAnimations/6/v2/Enemy6v2StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/6/v2/Enemy6v2StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1, y: 0, z: 0} + value: {x: -1.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: -1.2 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/6/v3/Enemy6v3DeathAni.anim b/Assets/Animations/EnemyAnimations/6/v3/Enemy6v3DeathAni.anim index 6de0c29..53782c3 100644 --- a/Assets/Animations/EnemyAnimations/6/v3/Enemy6v3DeathAni.anim +++ b/Assets/Animations/EnemyAnimations/6/v3/Enemy6v3DeathAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1, y: 0, z: 0} + value: {x: -1.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -29,7 +29,7 @@ AnimationClip: outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 0.23333333 - value: {x: 1, y: 0, z: 0} + value: {x: -1.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -112,7 +112,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: -1.2 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -121,7 +121,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.23333333 - value: 1 + value: -1.2 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/EnemyAnimations/6/v3/Enemy6v3StrangleAni.anim b/Assets/Animations/EnemyAnimations/6/v3/Enemy6v3StrangleAni.anim index 5faaa8a..b28b633 100644 --- a/Assets/Animations/EnemyAnimations/6/v3/Enemy6v3StrangleAni.anim +++ b/Assets/Animations/EnemyAnimations/6/v3/Enemy6v3StrangleAni.anim @@ -20,7 +20,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: {x: 1, y: 0, z: 0} + value: {x: -1.2, y: 0, z: 0} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} tangentMode: 0 @@ -97,7 +97,7 @@ AnimationClip: m_Curve: - serializedVersion: 3 time: 0 - value: 1 + value: -1.2 inSlope: 0 outSlope: 0 tangentMode: 136 diff --git a/Assets/Animations/PlayerAnimations/Player1/PlayerAnimations1.controller b/Assets/Animations/PlayerAnimations/Player1/PlayerAnimations1.controller index 08c43f1..20fb4ae 100644 --- a/Assets/Animations/PlayerAnimations/Player1/PlayerAnimations1.controller +++ b/Assets/Animations/PlayerAnimations/Player1/PlayerAnimations1.controller @@ -1,6 +1,43 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1102 &-8349034508235637004 +--- !u!1107 &-4590016191452643091 +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: 9123080415032741332} + m_Position: {x: -150, y: 60, z: 0} + - serializedVersion: 1 + m_State: {fileID: 548892628922324246} + m_Position: {x: 750, y: 130, z: 0} + - serializedVersion: 1 + m_State: {fileID: 5718945116413065706} + m_Position: {x: 130, y: 110, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3308394434488297487} + m_Position: {x: 700, y: 190, z: 0} + - serializedVersion: 1 + m_State: {fileID: -4512082985165587279} + m_Position: {x: 130, y: -20, z: 0} + - serializedVersion: 1 + m_State: {fileID: 3256446757496701682} + m_Position: {x: 60, y: 200, z: 0} + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: -180, y: -80, z: 0} + m_EntryPosition: {x: -300, y: 210, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 9123080415032741332} +--- !u!1102 &-4512082985165587279 AnimatorState: serializedVersion: 6 m_ObjectHideFlags: 1 @@ -10,7 +47,8 @@ AnimatorState: m_Name: Swing m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 4529714568082305897} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -26,7 +64,7 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &-6173615721886091892 +--- !u!1101 &-3889731097132723099 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -35,7 +73,35 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: Idle + m_ConditionEvent: IsRunning + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: IsPulling + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3256446757496701682} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0 + m_HasExitTime: 0 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-2150761196750939476 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: IsRunning m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 9123080415032741332} @@ -45,97 +111,8 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0.25 m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1107 &-4590016191452643091 -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: 9123080415032741332} - m_Position: {x: -150, y: 60, z: 0} - - serializedVersion: 1 - m_State: {fileID: 548892628922324246} - m_Position: {x: 470, y: 80, z: 0} - - serializedVersion: 1 - m_State: {fileID: 5718945116413065706} - m_Position: {x: 360, y: 220, z: 0} - - serializedVersion: 1 - m_State: {fileID: -8349034508235637004} - m_Position: {x: 400, y: 10, z: 0} - - serializedVersion: 1 - m_State: {fileID: 3308394434488297487} - m_Position: {x: 420, y: 140, z: 0} - m_ChildStateMachines: [] - m_AnyStateTransitions: - - {fileID: -6173615721886091892} - - {fileID: 5712453572289168545} - - {fileID: -2232175589853228148} - - {fileID: 4210568570521344070} - - {fileID: -2601431713474190462} - m_EntryTransitions: [] - m_StateMachineTransitions: {} - m_StateMachineBehaviours: [] - m_AnyStatePosition: {x: 170, y: 80, z: 0} - m_EntryPosition: {x: -160, y: 180, z: 0} - m_ExitPosition: {x: 800, y: 120, z: 0} - m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} - m_DefaultState: {fileID: 9123080415032741332} ---- !u!1101 &-2601431713474190462 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: Run - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 5718945116413065706} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 0 - m_HasFixedDuration: 1 - m_InterruptionSource: 0 - m_OrderedInterruption: 1 - m_CanTransitionToSelf: 1 ---- !u!1101 &-2232175589853228148 -AnimatorStateTransition: - m_ObjectHideFlags: 1 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: - m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: Mop - m_EventTreshold: 0 - m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 548892628922324246} - m_Solo: 0 - m_Mute: 0 - m_IsExit: 0 - serializedVersion: 3 - m_TransitionDuration: 0.25 - m_TransitionOffset: 0 - m_ExitTime: 0.75 - m_HasExitTime: 0 + m_ExitTime: 0.516129 + m_HasExitTime: 1 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 @@ -149,42 +126,24 @@ AnimatorController: m_Name: PlayerAnimations1 serializedVersion: 5 m_AnimatorParameters: - - m_Name: Idle - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: Run - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: Mop - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: RunMop - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: Swing - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - m_Name: IsRunning m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} + - m_Name: IsSwinging + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: IsPulling + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -224,6 +183,58 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!1101 &2302923505755761183 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: IsPulling + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 9123080415032741332} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.75 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &3256446757496701682 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pull + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: 2302923505755761183} + 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: 4200442a72ca8864c8350aee86e93148, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1102 &3308394434488297487 AnimatorState: serializedVersion: 6 @@ -250,7 +261,7 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: ---- !u!1101 &4210568570521344070 +--- !u!1101 &4529714568082305897 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -258,24 +269,24 @@ AnimatorStateTransition: m_PrefabAsset: {fileID: 0} m_Name: m_Conditions: - - m_ConditionMode: 1 - m_ConditionEvent: RunMop + - m_ConditionMode: 2 + m_ConditionEvent: IsSwinging m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: 3308394434488297487} + m_DstState: {fileID: 9123080415032741332} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 m_TransitionDuration: 0.25 m_TransitionOffset: 0 - m_ExitTime: 0.75 + m_ExitTime: 0 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 ---- !u!1101 &5712453572289168545 +--- !u!1101 &5149346213670764323 AnimatorStateTransition: m_ObjectHideFlags: 1 m_CorrespondingSourceObject: {fileID: 0} @@ -284,22 +295,53 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: Swing + m_ConditionEvent: IsRunning + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: IsSwinging + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: IsPulling m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} - m_DstState: {fileID: -8349034508235637004} + m_DstState: {fileID: 5718945116413065706} m_Solo: 0 m_Mute: 0 m_IsExit: 0 serializedVersion: 3 m_TransitionDuration: 0.25 m_TransitionOffset: 0 - m_ExitTime: 0.75 + m_ExitTime: 0 m_HasExitTime: 0 m_HasFixedDuration: 1 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &5296502382817736391 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsPulling + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3256446757496701682} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.516129 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1102 &5718945116413065706 AnimatorState: serializedVersion: 6 @@ -310,7 +352,9 @@ AnimatorState: m_Name: Running m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -2150761196750939476} + - {fileID: 5296502382817736391} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -336,7 +380,9 @@ AnimatorState: m_Name: Idle m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: 5149346213670764323} + - {fileID: -3889731097132723099} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/Assets/Animations/PlayerAnimations/Player1/Pulling.meta b/Assets/Animations/PlayerAnimations/Player1/Pulling.meta new file mode 100644 index 0000000..3bb92cc --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player1/Pulling.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 80e4b633fa7793e4ea654ba8c4c604f8 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player1/Pulling/PlayerPull0001.png b/Assets/Animations/PlayerAnimations/Player1/Pulling/PlayerPull0001.png new file mode 100644 index 0000000..9a124fb Binary files /dev/null and b/Assets/Animations/PlayerAnimations/Player1/Pulling/PlayerPull0001.png differ diff --git a/Assets/Animations/PlayerAnimations/Player1/Pulling/PlayerPull0001.png.meta b/Assets/Animations/PlayerAnimations/Player1/Pulling/PlayerPull0001.png.meta new file mode 100644 index 0000000..4400cec --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player1/Pulling/PlayerPull0001.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 82daa2c7f7a55924abe39c2873fb0cce +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player1/Pulling/PlayerPull0002.png b/Assets/Animations/PlayerAnimations/Player1/Pulling/PlayerPull0002.png new file mode 100644 index 0000000..16e288f Binary files /dev/null and b/Assets/Animations/PlayerAnimations/Player1/Pulling/PlayerPull0002.png differ diff --git a/Assets/Animations/PlayerAnimations/Player1/Pulling/PlayerPull0002.png.meta b/Assets/Animations/PlayerAnimations/Player1/Pulling/PlayerPull0002.png.meta new file mode 100644 index 0000000..74458b7 --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player1/Pulling/PlayerPull0002.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 63585fcf7a979ad4fbcf6aac10f082ed +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player1/Pulling/PlayerPull0003.png b/Assets/Animations/PlayerAnimations/Player1/Pulling/PlayerPull0003.png new file mode 100644 index 0000000..2705d4e Binary files /dev/null and b/Assets/Animations/PlayerAnimations/Player1/Pulling/PlayerPull0003.png differ diff --git a/Assets/Animations/PlayerAnimations/Player1/Pulling/PlayerPull0003.png.meta b/Assets/Animations/PlayerAnimations/Player1/Pulling/PlayerPull0003.png.meta new file mode 100644 index 0000000..aa449a9 --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player1/Pulling/PlayerPull0003.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: a88591dceb2ec2d49a8cba834aa70258 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player1/Pulling/Pull.anim b/Assets/Animations/PlayerAnimations/Player1/Pulling/Pull.anim new file mode 100644 index 0000000..aae61c3 --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player1/Pulling/Pull.anim @@ -0,0 +1,78 @@ +%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: Pull + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: 82daa2c7f7a55924abe39c2873fb0cce, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 63585fcf7a979ad4fbcf6aac10f082ed, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: a88591dceb2ec2d49a8cba834aa70258, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + 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 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: 82daa2c7f7a55924abe39c2873fb0cce, type: 3} + - {fileID: 21300000, guid: 63585fcf7a979ad4fbcf6aac10f082ed, type: 3} + - {fileID: 21300000, guid: a88591dceb2ec2d49a8cba834aa70258, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.35000002 + 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/PlayerAnimations/Player1/Pulling/Pull.anim.meta b/Assets/Animations/PlayerAnimations/Player1/Pulling/Pull.anim.meta new file mode 100644 index 0000000..683e68a --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player1/Pulling/Pull.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4200442a72ca8864c8350aee86e93148 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player1/Swing/Swing.anim b/Assets/Animations/PlayerAnimations/Player1/Swing/Swing.anim index 3e63c65..cf181f4 100644 --- a/Assets/Animations/PlayerAnimations/Player1/Swing/Swing.anim +++ b/Assets/Animations/PlayerAnimations/Player1/Swing/Swing.anim @@ -31,7 +31,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.85 + time: 0.5 value: 1 inSlope: Infinity outSlope: Infinity @@ -39,6 +39,15 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 @@ -52,20 +61,18 @@ AnimationClip: curve: - time: 0 value: {fileID: 21300000, guid: 240c3a2ef21982f4590d6cd434d91f27, type: 3} - - time: 0.11666667 - value: {fileID: 21300000, guid: 0bac1dfd4dd5df344ade6d0dfc5aa77f, type: 3} - - time: 0.25 + - time: 0.16666667 value: {fileID: 21300000, guid: 2f7b336ea4b22104b831a5aa4ce63e65, type: 3} - - time: 0.36666667 - value: {fileID: 21300000, guid: db90fe6a45c83a74b88da01e595e40ed, type: 3} - - time: 0.48333332 + - time: 0.33333334 value: {fileID: 21300000, guid: d8c1ff9b90b62814bbb6894bfcf4b2bb, type: 3} - - time: 0.6 - value: {fileID: 21300000, guid: de98b85f0c0593e4389e93a6542ba161, type: 3} - - time: 0.73333335 + - time: 0.5 value: {fileID: 21300000, guid: b9a4237d2fdcb3044a222171250fa5fc, type: 3} - - time: 0.85 - value: {fileID: 21300000, guid: 670971dc022801d4aa435f32749cdf05, type: 3} + - time: 0.6666667 + value: {fileID: 21300000, guid: b9a4237d2fdcb3044a222171250fa5fc, type: 3} + - time: 0.8333333 + value: {fileID: 21300000, guid: d8c1ff9b90b62814bbb6894bfcf4b2bb, type: 3} + - time: 1 + value: {fileID: 21300000, guid: 240c3a2ef21982f4590d6cd434d91f27, type: 3} attribute: m_Sprite path: classID: 212 @@ -98,24 +105,23 @@ AnimationClip: isSerializeReferenceCurve: 0 pptrCurveMapping: - {fileID: 21300000, guid: 240c3a2ef21982f4590d6cd434d91f27, type: 3} - - {fileID: 21300000, guid: 0bac1dfd4dd5df344ade6d0dfc5aa77f, type: 3} - {fileID: 21300000, guid: 2f7b336ea4b22104b831a5aa4ce63e65, type: 3} - - {fileID: 21300000, guid: db90fe6a45c83a74b88da01e595e40ed, type: 3} - {fileID: 21300000, guid: d8c1ff9b90b62814bbb6894bfcf4b2bb, type: 3} - - {fileID: 21300000, guid: de98b85f0c0593e4389e93a6542ba161, type: 3} - {fileID: 21300000, guid: b9a4237d2fdcb3044a222171250fa5fc, type: 3} - - {fileID: 21300000, guid: 670971dc022801d4aa435f32749cdf05, type: 3} + - {fileID: 21300000, guid: b9a4237d2fdcb3044a222171250fa5fc, type: 3} + - {fileID: 21300000, guid: d8c1ff9b90b62814bbb6894bfcf4b2bb, type: 3} + - {fileID: 21300000, guid: 240c3a2ef21982f4590d6cd434d91f27, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.8666667 + m_StopTime: 1.0166667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 1 + m_LoopTime: 0 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 @@ -140,7 +146,7 @@ AnimationClip: inWeight: 0 outWeight: 0 - serializedVersion: 3 - time: 0.85 + time: 0.5 value: 1 inSlope: Infinity outSlope: Infinity @@ -148,6 +154,15 @@ AnimationClip: weightedMode: 0 inWeight: 0 outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 diff --git a/Assets/Animations/PlayerAnimations/Player2/Idle/Idle.anim b/Assets/Animations/PlayerAnimations/Player2/Idle/Idle.anim index f444aeb..042ce95 100644 --- a/Assets/Animations/PlayerAnimations/Player2/Idle/Idle.anim +++ b/Assets/Animations/PlayerAnimations/Player2/Idle/Idle.anim @@ -17,21 +17,64 @@ AnimationClip: m_PositionCurves: [] m_ScaleCurves: [] m_FloatCurves: [] - m_PPtrCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: 718f5294a4376b64cb1b4cb93b2b1ea1, type: 3} + - time: 0.083333336 + value: {fileID: 21300000, guid: 927cd4e90ba89684f84229f89f220660, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: a625fc2e591f7094da80bdc3fd188d06, type: 3} + - time: 0.25 + value: {fileID: 21300000, guid: eb7c2944822958b4fa3ad0023fd8164a, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: 98f2e9a668168094bbfdbe8ba57620a8, type: 3} + - time: 0.4 + value: {fileID: 21300000, guid: 2e7e60ee50a68f94c94136dbe15a0447, type: 3} + - time: 0.48333332 + value: {fileID: 21300000, guid: b8376989601bc5e44af322802fef6db9, type: 3} + - time: 0.56666666 + value: {fileID: 21300000, guid: 897ff56abdcb11a46844ac4f9cf6e86a, type: 3} + - time: 0.65 + value: {fileID: 21300000, guid: a199fca6ae9a9d04bb5b55861ba9cc93, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 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: [] + genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 0 + script: {fileID: 0} + typeID: 212 + customType: 23 + isPPtrCurve: 1 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: 718f5294a4376b64cb1b4cb93b2b1ea1, type: 3} + - {fileID: 21300000, guid: 927cd4e90ba89684f84229f89f220660, type: 3} + - {fileID: 21300000, guid: a625fc2e591f7094da80bdc3fd188d06, type: 3} + - {fileID: 21300000, guid: eb7c2944822958b4fa3ad0023fd8164a, type: 3} + - {fileID: 21300000, guid: 98f2e9a668168094bbfdbe8ba57620a8, type: 3} + - {fileID: 21300000, guid: 2e7e60ee50a68f94c94136dbe15a0447, type: 3} + - {fileID: 21300000, guid: b8376989601bc5e44af322802fef6db9, type: 3} + - {fileID: 21300000, guid: 897ff56abdcb11a46844ac4f9cf6e86a, type: 3} + - {fileID: 21300000, guid: a199fca6ae9a9d04bb5b55861ba9cc93, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 1 + m_StopTime: 0.6666666 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 diff --git a/Assets/Animations/PlayerAnimations/Player2/PlayerAnimations2.controller b/Assets/Animations/PlayerAnimations/Player2/PlayerAnimations2.controller index 053efc1..fd34d5a 100644 --- a/Assets/Animations/PlayerAnimations/Player2/PlayerAnimations2.controller +++ b/Assets/Animations/PlayerAnimations/Player2/PlayerAnimations2.controller @@ -1,5 +1,30 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1101 &-8828174110587883696 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsPulling + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5284532121480509893} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.516129 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 --- !u!1101 &-8701045174356781676 AnimatorStateTransition: m_ObjectHideFlags: 1 @@ -11,12 +36,71 @@ AnimatorStateTransition: - m_ConditionMode: 1 m_ConditionEvent: IsRunning m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: IsSwinging + m_EventTreshold: 0 + - m_ConditionMode: 2 + m_ConditionEvent: IsPulling + m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 8304111510876962717} 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!1101 &-6837655869494622995 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 1 + m_ConditionEvent: IsRunning + m_EventTreshold: 0 + - m_ConditionMode: 1 + m_ConditionEvent: IsPulling + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: -5284532121480509893} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.625 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1101 &-6657721395533146128 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: IsPulling + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3357306648811348641} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 m_TransitionDuration: 0.25 m_TransitionOffset: 0 m_ExitTime: 0.75 @@ -25,6 +109,58 @@ AnimatorStateTransition: m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 +--- !u!1101 &-5519219387846060971 +AnimatorStateTransition: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: + m_Conditions: + - m_ConditionMode: 2 + m_ConditionEvent: IsSwinging + m_EventTreshold: 0 + m_DstStateMachine: {fileID: 0} + m_DstState: {fileID: 3357306648811348641} + m_Solo: 0 + m_Mute: 0 + m_IsExit: 0 + serializedVersion: 3 + m_TransitionDuration: 0.25 + m_TransitionOffset: 0 + m_ExitTime: 0.516129 + m_HasExitTime: 1 + m_HasFixedDuration: 1 + m_InterruptionSource: 0 + m_OrderedInterruption: 1 + m_CanTransitionToSelf: 1 +--- !u!1102 &-5284532121480509893 +AnimatorState: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Pull + m_Speed: 1 + m_CycleOffset: 0 + m_Transitions: + - {fileID: -6657721395533146128} + 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: 577769f888c2e3d4f806053d36a7b228, type: 2} + m_Tag: + m_SpeedParameter: + m_MirrorParameter: + m_CycleOffsetParameter: + m_TimeParameter: --- !u!1107 &-4590016191452643091 AnimatorStateMachine: serializedVersion: 6 @@ -39,16 +175,19 @@ AnimatorStateMachine: m_Position: {x: 20, y: -30, z: 0} - serializedVersion: 1 m_State: {fileID: -944807189804630194} - m_Position: {x: 530, y: 80, z: 0} + m_Position: {x: 210, y: -190, z: 0} - serializedVersion: 1 m_State: {fileID: 3748437463534410733} m_Position: {x: 530, y: 170, z: 0} - serializedVersion: 1 m_State: {fileID: 8304111510876962717} - m_Position: {x: 300, y: 80, z: 0} + m_Position: {x: 270, y: -100, z: 0} - serializedVersion: 1 m_State: {fileID: 2168268571006691905} m_Position: {x: 530, y: 20, z: 0} + - serializedVersion: 1 + m_State: {fileID: -5284532121480509893} + m_Position: {x: 250, y: 80, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -78,9 +217,9 @@ AnimatorStateTransition: serializedVersion: 3 m_TransitionDuration: 0.25 m_TransitionOffset: 0 - m_ExitTime: 0.516129 + m_ExitTime: 0 m_HasExitTime: 1 - m_HasFixedDuration: 1 + m_HasFixedDuration: 0 m_InterruptionSource: 0 m_OrderedInterruption: 1 m_CanTransitionToSelf: 1 @@ -94,7 +233,8 @@ AnimatorState: m_Name: Swing m_Speed: 1 m_CycleOffset: 0 - m_Transitions: [] + m_Transitions: + - {fileID: -5519219387846060971} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -119,42 +259,24 @@ AnimatorController: m_Name: PlayerAnimations2 serializedVersion: 5 m_AnimatorParameters: - - m_Name: Idle - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: Run - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: Mop - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: Swing - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - - m_Name: RunMop - m_Type: 9 - m_DefaultFloat: 0 - m_DefaultInt: 0 - m_DefaultBool: 0 - m_Controller: {fileID: 0} - m_Name: IsRunning m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} + - m_Name: IsSwinging + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} + - m_Name: IsPulling + m_Type: 4 + m_DefaultFloat: 0 + m_DefaultInt: 0 + m_DefaultBool: 0 + m_Controller: {fileID: 0} m_AnimatorLayers: - serializedVersion: 5 m_Name: Base Layer @@ -206,6 +328,7 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: -8701045174356781676} + - {fileID: -6837655869494622995} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 @@ -259,6 +382,7 @@ AnimatorState: m_CycleOffset: 0 m_Transitions: - {fileID: -2173210327374923992} + - {fileID: -8828174110587883696} m_StateMachineBehaviours: [] m_Position: {x: 50, y: 50, z: 0} m_IKOnFeet: 0 diff --git a/Assets/Animations/PlayerAnimations/Player2/Pulling.meta b/Assets/Animations/PlayerAnimations/Player2/Pulling.meta new file mode 100644 index 0000000..8ff3cd7 --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player2/Pulling.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ec94f7aeaaa863a48ba8e505dfbf7d31 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player2/Pulling/PlayerPull_P20001.png b/Assets/Animations/PlayerAnimations/Player2/Pulling/PlayerPull_P20001.png new file mode 100644 index 0000000..85a6b9c Binary files /dev/null and b/Assets/Animations/PlayerAnimations/Player2/Pulling/PlayerPull_P20001.png differ diff --git a/Assets/Animations/PlayerAnimations/Player2/Pulling/PlayerPull_P20001.png.meta b/Assets/Animations/PlayerAnimations/Player2/Pulling/PlayerPull_P20001.png.meta new file mode 100644 index 0000000..cef5570 --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player2/Pulling/PlayerPull_P20001.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 92ed9437014d6184583bb9f4fc722844 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player2/Pulling/PlayerPull_P20002.png b/Assets/Animations/PlayerAnimations/Player2/Pulling/PlayerPull_P20002.png new file mode 100644 index 0000000..591097c Binary files /dev/null and b/Assets/Animations/PlayerAnimations/Player2/Pulling/PlayerPull_P20002.png differ diff --git a/Assets/Animations/PlayerAnimations/Player2/Pulling/PlayerPull_P20002.png.meta b/Assets/Animations/PlayerAnimations/Player2/Pulling/PlayerPull_P20002.png.meta new file mode 100644 index 0000000..ac0a5c3 --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player2/Pulling/PlayerPull_P20002.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: 080b336dfa8e4084b98f329857cc7394 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player2/Pulling/PlayerPull_P20003.png b/Assets/Animations/PlayerAnimations/Player2/Pulling/PlayerPull_P20003.png new file mode 100644 index 0000000..308f3db Binary files /dev/null and b/Assets/Animations/PlayerAnimations/Player2/Pulling/PlayerPull_P20003.png differ diff --git a/Assets/Animations/PlayerAnimations/Player2/Pulling/PlayerPull_P20003.png.meta b/Assets/Animations/PlayerAnimations/Player2/Pulling/PlayerPull_P20003.png.meta new file mode 100644 index 0000000..e216904 --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player2/Pulling/PlayerPull_P20003.png.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: f62604eb5be67f64699ff54aa2db6bb2 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 0 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 0 + lightmap: 0 + compressionQuality: 50 + spriteMode: 1 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 1 + spriteTessellationDetail: -1 + textureType: 8 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: 5e97eb03825dee720800000000000000 + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player2/Pulling/Pull.anim b/Assets/Animations/PlayerAnimations/Player2/Pulling/Pull.anim new file mode 100644 index 0000000..6920eeb --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player2/Pulling/Pull.anim @@ -0,0 +1,78 @@ +%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: Pull + serializedVersion: 7 + m_Legacy: 0 + m_Compressed: 0 + m_UseHighQualityCurve: 1 + m_RotationCurves: [] + m_CompressedRotationCurves: [] + m_EulerCurves: [] + m_PositionCurves: [] + m_ScaleCurves: [] + m_FloatCurves: [] + m_PPtrCurves: + - serializedVersion: 2 + curve: + - time: 0 + value: {fileID: 21300000, guid: 92ed9437014d6184583bb9f4fc722844, type: 3} + - time: 0.16666667 + value: {fileID: 21300000, guid: 080b336dfa8e4084b98f329857cc7394, type: 3} + - time: 0.33333334 + value: {fileID: 21300000, guid: f62604eb5be67f64699ff54aa2db6bb2, type: 3} + attribute: m_Sprite + path: + classID: 212 + script: {fileID: 0} + flags: 2 + 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 + isIntCurve: 0 + isSerializeReferenceCurve: 0 + pptrCurveMapping: + - {fileID: 21300000, guid: 92ed9437014d6184583bb9f4fc722844, type: 3} + - {fileID: 21300000, guid: 080b336dfa8e4084b98f329857cc7394, type: 3} + - {fileID: 21300000, guid: f62604eb5be67f64699ff54aa2db6bb2, type: 3} + m_AnimationClipSettings: + serializedVersion: 2 + m_AdditiveReferencePoseClip: {fileID: 0} + m_AdditiveReferencePoseTime: 0 + m_StartTime: 0 + m_StopTime: 0.35000002 + 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/PlayerAnimations/Player2/Pulling/Pull.anim.meta b/Assets/Animations/PlayerAnimations/Player2/Pulling/Pull.anim.meta new file mode 100644 index 0000000..67d2c30 --- /dev/null +++ b/Assets/Animations/PlayerAnimations/Player2/Pulling/Pull.anim.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 577769f888c2e3d4f806053d36a7b228 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 7400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Animations/PlayerAnimations/Player2/Running/Running.anim b/Assets/Animations/PlayerAnimations/Player2/Running/Running.anim index 85a83fe..b5bf4de 100644 --- a/Assets/Animations/PlayerAnimations/Player2/Running/Running.anim +++ b/Assets/Animations/PlayerAnimations/Player2/Running/Running.anim @@ -82,7 +82,7 @@ AnimationClip: m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 diff --git a/Assets/Animations/PlayerAnimations/Player2/Swing/Swing.anim b/Assets/Animations/PlayerAnimations/Player2/Swing/Swing.anim index cb510f2..59d0c7b 100644 --- a/Assets/Animations/PlayerAnimations/Player2/Swing/Swing.anim +++ b/Assets/Animations/PlayerAnimations/Player2/Swing/Swing.anim @@ -16,26 +16,63 @@ AnimationClip: m_EulerCurves: [] m_PositionCurves: [] m_ScaleCurves: [] - m_FloatCurves: [] + m_FloatCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: + classID: 212 + script: {fileID: 0} + flags: 0 m_PPtrCurves: - serializedVersion: 2 curve: - time: 0 value: {fileID: 21300000, guid: eae7bedc4ba0bb44da9664f6f2ae65b0, type: 3} - - time: 0.06666667 - value: {fileID: 21300000, guid: a37285ebdc2fd7e419c0bfe4733bc263, type: 3} - - time: 0.15 + - time: 0.16666667 value: {fileID: 21300000, guid: 6c5d88e222f01644c974b1fe56678bc4, type: 3} - - time: 0.21666667 - value: {fileID: 21300000, guid: d84da234fa9972e44a5a5af15235039d, type: 3} - - time: 0.28333333 - value: {fileID: 21300000, guid: 497fefedd06d8be4585f1a3cd1eeeb3f, type: 3} - - time: 0.35 + - time: 0.33333334 value: {fileID: 21300000, guid: 61363c0901fc4ea469121a6c5e829f24, type: 3} - - time: 0.43333334 - value: {fileID: 21300000, guid: 587fa26a589bca040b756dae3592887a, type: 3} - time: 0.5 value: {fileID: 21300000, guid: d011fbed2a802ed4c87033485707790d, type: 3} + - time: 0.6666667 + value: {fileID: 21300000, guid: 587fa26a589bca040b756dae3592887a, type: 3} + - time: 0.8333333 + value: {fileID: 21300000, guid: a37285ebdc2fd7e419c0bfe4733bc263, type: 3} + - time: 1 + value: {fileID: 21300000, guid: 497fefedd06d8be4585f1a3cd1eeeb3f, type: 3} attribute: m_Sprite path: classID: 212 @@ -48,6 +85,15 @@ AnimationClip: m_Extent: {x: 0, y: 0, z: 0} m_ClipBindingConstant: genericBindings: + - serializedVersion: 2 + path: 0 + attribute: 555744692 + script: {fileID: 0} + typeID: 212 + customType: 0 + isPPtrCurve: 0 + isIntCurve: 0 + isSerializeReferenceCurve: 0 - serializedVersion: 2 path: 0 attribute: 0 @@ -59,24 +105,23 @@ AnimationClip: isSerializeReferenceCurve: 0 pptrCurveMapping: - {fileID: 21300000, guid: eae7bedc4ba0bb44da9664f6f2ae65b0, type: 3} - - {fileID: 21300000, guid: a37285ebdc2fd7e419c0bfe4733bc263, type: 3} - {fileID: 21300000, guid: 6c5d88e222f01644c974b1fe56678bc4, type: 3} - - {fileID: 21300000, guid: d84da234fa9972e44a5a5af15235039d, type: 3} - - {fileID: 21300000, guid: 497fefedd06d8be4585f1a3cd1eeeb3f, type: 3} - {fileID: 21300000, guid: 61363c0901fc4ea469121a6c5e829f24, type: 3} - - {fileID: 21300000, guid: 587fa26a589bca040b756dae3592887a, type: 3} - {fileID: 21300000, guid: d011fbed2a802ed4c87033485707790d, type: 3} + - {fileID: 21300000, guid: 587fa26a589bca040b756dae3592887a, type: 3} + - {fileID: 21300000, guid: a37285ebdc2fd7e419c0bfe4733bc263, type: 3} + - {fileID: 21300000, guid: 497fefedd06d8be4585f1a3cd1eeeb3f, type: 3} m_AnimationClipSettings: serializedVersion: 2 m_AdditiveReferencePoseClip: {fileID: 0} m_AdditiveReferencePoseTime: 0 m_StartTime: 0 - m_StopTime: 0.51666665 + m_StopTime: 1.0166667 m_OrientationOffsetY: 0 m_Level: 0 m_CycleOffset: 0 m_HasAdditiveReferencePose: 0 - m_LoopTime: 0 + m_LoopTime: 1 m_LoopBlend: 0 m_LoopBlendOrientation: 0 m_LoopBlendPositionY: 0 @@ -86,7 +131,46 @@ AnimationClip: m_KeepOriginalPositionXZ: 0 m_HeightFromFeet: 0 m_Mirror: 0 - m_EditorCurves: [] + m_EditorCurves: + - serializedVersion: 2 + curve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 0.5 + value: 0 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + - serializedVersion: 3 + time: 1 + value: 1 + inSlope: Infinity + outSlope: Infinity + tangentMode: 103 + weightedMode: 0 + inWeight: 0 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + attribute: m_FlipX + path: + classID: 212 + script: {fileID: 0} + flags: 0 m_EulerEditorCurves: [] m_HasGenericRootTransform: 0 m_HasMotionFloatCurves: 0 diff --git a/Assets/Audio/AudioLibrary.asset b/Assets/Audio/AudioLibrary.asset index eb3f45f..fc959b9 100644 --- a/Assets/Audio/AudioLibrary.asset +++ b/Assets/Audio/AudioLibrary.asset @@ -36,7 +36,6 @@ MonoBehaviour: - {fileID: 8300000, guid: 2fc5510c93077614ea99731a8e690f6b, type: 3} - {fileID: 8300000, guid: 27f2cebd20efe6a4faf50b23ad487154, type: 3} - {fileID: 8300000, guid: fc82c40acffc19741a0707c947a1d767, type: 3} - - {fileID: 8300000, guid: 2a5efb61897b6af4ab3ecae350829b5c, type: 3} - {fileID: 8300000, guid: 6778ae1bc0a92c64d8ba759c3c13727d, type: 3} - {fileID: 8300000, guid: 7182af998117fba4fa696e5fd33ad99a, type: 3} - {fileID: 8300000, guid: 88b0c2079547b85458daa063fb59e720, type: 3} @@ -44,3 +43,4 @@ MonoBehaviour: - {fileID: 8300000, guid: 8abb5f3f03f30f842b9d673933bdafb4, type: 3} - {fileID: 8300000, guid: f68b9fed55ed886479faaf1b33c59651, type: 3} - {fileID: 8300000, guid: e24c2fccb4285ab4eacc6da16f5c62eb, type: 3} + - {fileID: 8300000, guid: fd92966d4cde3244d9a711094cb947f6, type: 3} diff --git a/Assets/Audio/Rope_Tight_SFX.mp3 b/Assets/Audio/Rope_Tight_SFX.mp3 deleted file mode 100644 index 8671c7b..0000000 Binary files a/Assets/Audio/Rope_Tight_SFX.mp3 and /dev/null differ diff --git a/Assets/Audio/Rope_Tight_SFX.wav b/Assets/Audio/Rope_Tight_SFX.wav new file mode 100644 index 0000000..747139d Binary files /dev/null and b/Assets/Audio/Rope_Tight_SFX.wav differ diff --git a/Assets/Audio/Rope_Tight_SFX.mp3.meta b/Assets/Audio/Rope_Tight_SFX.wav.meta similarity index 91% rename from Assets/Audio/Rope_Tight_SFX.mp3.meta rename to Assets/Audio/Rope_Tight_SFX.wav.meta index ad7066d..1c8b47f 100644 --- a/Assets/Audio/Rope_Tight_SFX.mp3.meta +++ b/Assets/Audio/Rope_Tight_SFX.wav.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 4d9817ed7f73fc14db871e07a93a5931 +guid: fd92966d4cde3244d9a711094cb947f6 AudioImporter: externalObjects: {} serializedVersion: 7 diff --git a/Assets/Prefabs/Blood.prefab b/Assets/Prefabs/Blood.prefab index 76ea929..e91cf65 100644 --- a/Assets/Prefabs/Blood.prefab +++ b/Assets/Prefabs/Blood.prefab @@ -186,6 +186,7 @@ MonoBehaviour: squeakPlayer: {fileID: 582883990552898231} splatterVolume: 0 splatterPlayer: {fileID: 1223555600225150777} + RumbleAmount: 100 CleanRadius: 2 bufferLookPointer: 0 --- !u!82 &1223555600225150777 diff --git a/Assets/Prefabs/CameraRig.prefab b/Assets/Prefabs/CameraRig.prefab index 0798d41..2e83e06 100644 --- a/Assets/Prefabs/CameraRig.prefab +++ b/Assets/Prefabs/CameraRig.prefab @@ -14,6 +14,7 @@ GameObject: - component: {fileID: 5510899577631708383} - component: {fileID: 4289092251764458493} - component: {fileID: 3603265075407754381} + - component: {fileID: 7140252695900592518} m_Layer: 0 m_Name: MainCamera m_TagString: MainCamera @@ -118,7 +119,7 @@ MonoBehaviour: m_Bits: 1 m_VolumeTrigger: {fileID: 0} m_VolumeFrameworkUpdateModeOption: 2 - m_RenderPostProcessing: 0 + m_RenderPostProcessing: 1 m_Antialiasing: 0 m_AntialiasingQuality: 2 m_StopNaN: 0 @@ -187,8 +188,7 @@ MonoBehaviour: m_EditorClassIdentifier: Wave: 0 difficulty: 1 - difficultyIncreasePerWave: 1 - difficultyMultiplyDecreasePerWave: 0.05 + difficultyIncreasePerWave: 3 WaveTime: 20 enemyDifficulties: [] SpawnRadius: 22.6 @@ -198,6 +198,66 @@ MonoBehaviour: - {fileID: 0} initialSpawnDelay: 5 enemyList: [] +--- !u!114 &7140252695900592518 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2173372557174057003} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3} + m_Name: + m_EditorClassIdentifier: + volumeTrigger: {fileID: 8946450710138871461} + volumeLayer: + serializedVersion: 2 + m_Bits: 257 + stopNaNPropagation: 1 + finalBlitToCameraTarget: 0 + antialiasingMode: 0 + temporalAntialiasing: + jitterSpread: 0.75 + sharpness: 0.25 + stationaryBlending: 0.95 + motionBlending: 0.85 + subpixelMorphologicalAntialiasing: + quality: 2 + fastApproximateAntialiasing: + fastMode: 0 + keepAlpha: 0 + fog: + enabled: 1 + excludeSkybox: 1 + debugLayer: + lightMeter: + width: 512 + height: 256 + showCurves: 1 + histogram: + width: 512 + height: 256 + channel: 3 + waveform: + exposure: 0.12 + height: 256 + vectorscope: + size: 256 + exposure: 0.12 + overlaySettings: + linearDepth: 0 + motionColorIntensity: 4 + motionGridSize: 64 + colorBlindnessType: 0 + colorBlindnessStrength: 1 + m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2} + m_ShowToolkit: 0 + m_ShowCustomSorter: 0 + breakBeforeColorGrading: 0 + m_BeforeTransparentBundles: [] + m_BeforeStackBundles: [] + m_AfterStackBundles: [] --- !u!1 &2607936989766580656 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Managers.prefab b/Assets/Prefabs/Managers.prefab index bc71297..b78a411 100644 --- a/Assets/Prefabs/Managers.prefab +++ b/Assets/Prefabs/Managers.prefab @@ -10,6 +10,8 @@ GameObject: m_Component: - component: {fileID: 3032075919872812610} - component: {fileID: 6372697238776542044} + - component: {fileID: 1114532058491094574} + - component: {fileID: 2042633577611342856} m_Layer: 0 m_Name: Managers m_TagString: Untagged @@ -44,4 +46,31 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d07fc52b48ce953488ecef079872f5b7, type: 3} m_Name: m_EditorClassIdentifier: - audioLibrary: {fileID: 0} + audioLibrary: {fileID: 11400000, guid: 90a0ccefc407688499165286d0638124, type: 2} +--- !u!114 &1114532058491094574 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 809911508645467208} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 6cf314e58a8539a448e6ddeb3ad48149, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &2042633577611342856 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 809911508645467208} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aab27275f26e5e244856836f6d17b909, type: 3} + m_Name: + m_EditorClassIdentifier: + textParent: {fileID: 0} + damageTextPrefab: {fileID: 8357464303304312906, guid: 25c9a2db8fc5b7c4f8feebba5c73e7a3, type: 3} + lifeTime: 3 diff --git a/Assets/Prefabs/Rope.prefab b/Assets/Prefabs/Rope.prefab index eab5300..48d61c6 100644 --- a/Assets/Prefabs/Rope.prefab +++ b/Assets/Prefabs/Rope.prefab @@ -11,6 +11,8 @@ GameObject: - component: {fileID: 144529238244638330} - component: {fileID: 7717684785049474632} - component: {fileID: 901761791259710742} + - component: {fileID: 4976294692568481572} + - component: {fileID: 2066655509941542230} m_Layer: 0 m_Name: Rope m_TagString: Untagged @@ -64,9 +66,34 @@ MonoBehaviour: ropeExtendSpeed: 10 ropeShrinkSpeed: 15 squezeDamage: 1 + swingSpeedToDamageMultiplier: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0.39527363 + outSlope: 0.39527363 + tangentMode: 0 + weightedMode: 0 + inWeight: 0 + outWeight: 0.04244307 + - serializedVersion: 3 + time: 30 + value: 5 + inSlope: 0.01896792 + outSlope: 0.01896792 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.066252515 + outWeight: 0 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 ropeMaxLength: 50 ropeMinLength: 20 lineRenderer: {fileID: 901761791259710742} + pullAnimationOvershootThreshold: 0.2 --- !u!120 &901761791259710742 LineRenderer: serializedVersion: 2 @@ -169,3 +196,112 @@ LineRenderer: m_UseWorldSpace: 1 m_Loop: 0 m_ApplyActiveColorSpace: 1 +--- !u!114 &4976294692568481572 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5991265243222894942} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8766ad5393174fa488ef4a58b62181b4, type: 3} + m_Name: + m_EditorClassIdentifier: + PlayTime: 1 +--- !u!82 &2066655509941542230 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5991265243222894942} + m_Enabled: 1 + serializedVersion: 4 + OutputAudioMixerGroup: {fileID: 0} + m_audioClip: {fileID: 8300000, guid: fd92966d4cde3244d9a711094cb947f6, type: 3} + m_PlayOnAwake: 0 + m_Volume: 0.107 + m_Pitch: 1 + Loop: 1 + Mute: 0 + Spatialize: 0 + SpatializePostEffects: 0 + Priority: 128 + DopplerLevel: 1 + MinDistance: 1 + MaxDistance: 500 + Pan2D: 0 + rolloffMode: 0 + BypassEffects: 0 + BypassListenerEffects: 0 + BypassReverbZones: 0 + rolloffCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 1 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + panLevelCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + spreadCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 0 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 + reverbZoneMixCustomCurve: + serializedVersion: 2 + m_Curve: + - serializedVersion: 3 + time: 0 + value: 1 + inSlope: 0 + outSlope: 0 + tangentMode: 0 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + m_PreInfinity: 2 + m_PostInfinity: 2 + m_RotationOrder: 4 diff --git a/Assets/Prefabs/UI/UI.prefab b/Assets/Prefabs/UI/UI.prefab new file mode 100644 index 0000000..ea77e05 --- /dev/null +++ b/Assets/Prefabs/UI/UI.prefab @@ -0,0 +1,1446 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &203935764274243221 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3315624217225912576} + m_Layer: 5 + m_Name: TimerUI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3315624217225912576 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 203935764274243221} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5677237464973182813} + m_Father: {fileID: 2603779566095873902} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 100, y: 100} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1248969778910303151 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7960612824616970528} + - component: {fileID: 7854329290917371908} + - component: {fileID: 7382410609929538833} + m_Layer: 5 + m_Name: Upgrade6 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7960612824616970528 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1248969778910303151} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5758936918037227603} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 44, y: 44} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7854329290917371908 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1248969778910303151} + m_CullTransparentMesh: 1 +--- !u!114 &7382410609929538833 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1248969778910303151} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1675436534311602027 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6794383479209706177} + - component: {fileID: 2847182396038304585} + - component: {fileID: 5990406615332546172} + m_Layer: 5 + m_Name: Upgrade4 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6794383479209706177 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1675436534311602027} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5758936918037227603} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0} + m_AnchorMax: {x: 1, y: 0} + m_AnchoredPosition: {x: -44, y: 44} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2847182396038304585 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1675436534311602027} + m_CullTransparentMesh: 1 +--- !u!114 &5990406615332546172 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1675436534311602027} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &1924363349637789314 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 6303512888481769756} + - component: {fileID: 2645005677866927188} + - component: {fileID: 8197579949334750501} + m_Layer: 5 + m_Name: Description + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &6303512888481769756 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1924363349637789314} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5758936918037227603} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: 25} + m_SizeDelta: {x: 200, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2645005677866927188 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1924363349637789314} + m_CullTransparentMesh: 1 +--- !u!114 &8197579949334750501 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1924363349637789314} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &2384726743621304389 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8234912166402692201} + - component: {fileID: 4683878371462587613} + - component: {fileID: 3897306156122669883} + m_Layer: 5 + m_Name: Player1 Cursor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8234912166402692201 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2384726743621304389} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5758936918037227603} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4683878371462587613 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2384726743621304389} + m_CullTransparentMesh: 1 +--- !u!114 &3897306156122669883 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2384726743621304389} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: dbfcdfb387a761a92804bee52849f89d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2472511513873419818 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5330981716967833427} + - component: {fileID: 6092166792499224974} + - component: {fileID: 1850105569971028983} + m_Layer: 5 + m_Name: Upgrade1 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5330981716967833427 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2472511513873419818} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5758936918037227603} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 1} + m_AnchorMax: {x: 0.5, y: 1} + m_AnchoredPosition: {x: 0, y: -12} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6092166792499224974 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2472511513873419818} + m_CullTransparentMesh: 1 +--- !u!114 &1850105569971028983 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2472511513873419818} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &2761260308462380619 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1491513232649094651} + - component: {fileID: 5772753089367175023} + - component: {fileID: 8083657407598743478} + m_Layer: 5 + m_Name: Upgrade2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1491513232649094651 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2761260308462380619} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5758936918037227603} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -44, y: -44} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5772753089367175023 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2761260308462380619} + m_CullTransparentMesh: 1 +--- !u!114 &8083657407598743478 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2761260308462380619} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &3640358284557774269 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7917923381260767623} + - component: {fileID: 6477547333222603518} + - component: {fileID: 1870959525951980438} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &7917923381260767623 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3640358284557774269} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3867231112581398669} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6477547333222603518 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3640358284557774269} + m_CullTransparentMesh: 1 +--- !u!114 &1870959525951980438 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3640358284557774269} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 460eb439e506a884899dec7f7d98a082, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4192688031360747154 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5677237464973182813} + - component: {fileID: 7239109184084746232} + - component: {fileID: 5558345568148303310} + m_Layer: 5 + m_Name: TimerText + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5677237464973182813 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4192688031360747154} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 3315624217225912576} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 660, y: 390} + m_SizeDelta: {x: 500, y: 200} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7239109184084746232 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4192688031360747154} + m_CullTransparentMesh: 1 +--- !u!114 &5558345568148303310 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4192688031360747154} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 00:00 + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: c0b8103094a9f3440aa4c34a7256e147, type: 2} + m_sharedMaterial: {fileID: -2157513429875108333, guid: c0b8103094a9f3440aa4c34a7256e147, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 36 + m_fontSizeBase: 36 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_HorizontalAlignment: 4 + m_VerticalAlignment: 256 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &4754923251870561132 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 253726512155280609} + - component: {fileID: 381497455797550140} + - component: {fileID: 575855012900421447} + m_Layer: 5 + m_Name: Upgrade5 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &253726512155280609 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4754923251870561132} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5758936918037227603} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0} + m_AnchorMax: {x: 0.5, y: 0} + m_AnchoredPosition: {x: 0, y: 12} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &381497455797550140 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4754923251870561132} + m_CullTransparentMesh: 1 +--- !u!114 &575855012900421447 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4754923251870561132} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &4760772395907937168 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5546627774568093431} + - component: {fileID: 1397971573269133618} + - component: {fileID: 3896078212624194470} + m_Layer: 5 + m_Name: Upgrade8 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5546627774568093431 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4760772395907937168} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5758936918037227603} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 1} + m_AnchorMax: {x: 0, y: 1} + m_AnchoredPosition: {x: 44, y: -44} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1397971573269133618 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4760772395907937168} + m_CullTransparentMesh: 1 +--- !u!114 &3896078212624194470 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4760772395907937168} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &5939205376842203019 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 54616445617796643} + - component: {fileID: 2302354072361108998} + - component: {fileID: 457789816507878383} + m_Layer: 5 + m_Name: Player2 Cursor + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &54616445617796643 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5939205376842203019} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5758936918037227603} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &2302354072361108998 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5939205376842203019} + m_CullTransparentMesh: 1 +--- !u!114 &457789816507878383 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5939205376842203019} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: e8a488ad26ec5db1588b96ef7816283d, type: 3} + m_Type: 0 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &6910246373966366672 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3867231112581398669} + - component: {fileID: 8596173611471731620} + - component: {fileID: 562279769276080804} + m_Layer: 5 + m_Name: DiabloBlood + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3867231112581398669 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6910246373966366672} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 7917923381260767623} + m_Father: {fileID: 5758936918037227603} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 150, y: 150} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8596173611471731620 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6910246373966366672} + m_CullTransparentMesh: 1 +--- !u!114 &562279769276080804 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6910246373966366672} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 92b791df6229fa882ab01fc4ec5e82d2, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 1 + m_FillAmount: 0 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &7301411897347746173 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 2603779566095873902} + - component: {fileID: 3829147617141221472} + - component: {fileID: 8067116145730438707} + - component: {fileID: 1150396837806670114} + m_Layer: 5 + m_Name: UI + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &2603779566095873902 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7301411897347746173} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 0, y: 0, z: 0} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5758936918037227603} + - {fileID: 3315624217225912576} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0, y: 0} +--- !u!223 &3829147617141221472 +Canvas: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7301411897347746173} + m_Enabled: 1 + serializedVersion: 3 + m_RenderMode: 0 + m_Camera: {fileID: 0} + m_PlaneDistance: 100 + m_PixelPerfect: 0 + m_ReceivesEvents: 1 + m_OverrideSorting: 0 + m_OverridePixelPerfect: 0 + m_SortingBucketNormalizedSize: 0 + m_VertexColorAlwaysGammaSpace: 0 + m_AdditionalShaderChannelsFlag: 25 + m_UpdateRectTransformForStandalone: 0 + m_SortingLayerID: 0 + m_SortingOrder: 0 + m_TargetDisplay: 0 +--- !u!114 &8067116145730438707 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7301411897347746173} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} + m_Name: + m_EditorClassIdentifier: + m_UiScaleMode: 1 + m_ReferencePixelsPerUnit: 100 + m_ScaleFactor: 1 + m_ReferenceResolution: {x: 1920, y: 1080} + m_ScreenMatchMode: 0 + m_MatchWidthOrHeight: 0.5 + m_PhysicalUnit: 3 + m_FallbackScreenDPI: 96 + m_DefaultSpriteDPI: 96 + m_DynamicPixelsPerUnit: 1 + m_PresetInfoIsWorld: 0 +--- !u!114 &1150396837806670114 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7301411897347746173} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} + m_Name: + m_EditorClassIdentifier: + m_IgnoreReversedGraphics: 1 + m_BlockingObjects: 0 + m_BlockingMask: + serializedVersion: 2 + m_Bits: 4294967295 +--- !u!1 &7671763227494701576 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5587333876082993771} + - component: {fileID: 8930545977018761391} + - component: {fileID: 2232971966692360234} + m_Layer: 5 + m_Name: Upgrade7 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5587333876082993771 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7671763227494701576} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5758936918037227603} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0.5} + m_AnchorMax: {x: 0, y: 0.5} + m_AnchoredPosition: {x: 12, y: 0} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &8930545977018761391 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7671763227494701576} + m_CullTransparentMesh: 1 +--- !u!114 &2232971966692360234 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7671763227494701576} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!1 &8805328679230352364 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5758936918037227603} + - component: {fileID: 1107145590061588416} + - component: {fileID: 5470986410072706937} + - component: {fileID: 2458716502903188221} + - component: {fileID: 4857048527743277236} + m_Layer: 5 + m_Name: MenuForUpgrades + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5758936918037227603 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8805328679230352364} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1.9407643, y: 1.9407643, z: 1.9407643} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 5330981716967833427} + - {fileID: 1491513232649094651} + - {fileID: 3303235675138397227} + - {fileID: 6794383479209706177} + - {fileID: 253726512155280609} + - {fileID: 7960612824616970528} + - {fileID: 5587333876082993771} + - {fileID: 5546627774568093431} + - {fileID: 3867231112581398669} + - {fileID: 54616445617796643} + - {fileID: 8234912166402692201} + - {fileID: 6303512888481769756} + m_Father: {fileID: 2603779566095873902} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 291.11456, y: 291.1147} + m_SizeDelta: {x: 250, y: 250} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1107145590061588416 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8805328679230352364} + m_CullTransparentMesh: 1 +--- !u!114 &5470986410072706937 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8805328679230352364} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 21300000, guid: 511830d939da6620a9dfbaba9ceb7938, type: 3} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &2458716502903188221 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8805328679230352364} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 723cbd9d3229f69d79e38cebc5eabf45, type: 3} + m_Name: + m_EditorClassIdentifier: + player1: {fileID: 0} + player2: {fileID: 0} + bloodManager: {fileID: 0} + rope: {fileID: 0} + mopSizeIncrease: 1.1 + speedIncrease: 1.1 + ropeIncrease: 2 + healthIncrease: 1.1 + damageIncrease: 1.1 + bloodIncrease: 1.1 + reelIncrease: 1.1 + upgradeCost: 100000 + BloodMeter: {fileID: 562279769276080804} + description: {fileID: 8197579949334750501} +--- !u!95 &4857048527743277236 +Animator: + serializedVersion: 5 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8805328679230352364} + m_Enabled: 1 + m_Avatar: {fileID: 0} + m_Controller: {fileID: 9100000, guid: 7866120a2d012ae3db02cdb779b1ea00, type: 2} + m_CullingMode: 0 + m_UpdateMode: 0 + m_ApplyRootMotion: 0 + m_LinearVelocityBlending: 0 + m_StabilizeFeet: 0 + m_WarningMessage: + m_HasTransformHierarchy: 1 + m_AllowConstantClipSamplingOptimization: 1 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 +--- !u!1 &9099911085227657178 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3303235675138397227} + - component: {fileID: 6304739004283285274} + - component: {fileID: 8719281185926900685} + m_Layer: 5 + m_Name: Upgrade3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3303235675138397227 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9099911085227657178} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 5758936918037227603} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 0.5} + m_AnchorMax: {x: 1, y: 0.5} + m_AnchoredPosition: {x: -12, y: 0} + m_SizeDelta: {x: 50, y: 50} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &6304739004283285274 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9099911085227657178} + m_CullTransparentMesh: 1 +--- !u!114 &8719281185926900685 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 9099911085227657178} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 3 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 diff --git a/Assets/Prefabs/UI/UI.prefab.meta b/Assets/Prefabs/UI/UI.prefab.meta new file mode 100644 index 0000000..086cd02 --- /dev/null +++ b/Assets/Prefabs/UI/UI.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 48e0e53445d42474895d37a321c39d1c +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Resources/Enemies/1/Enemy1V1.prefab b/Assets/Resources/Enemies/1/Enemy1V1.prefab index 4b05a53..6171d9d 100644 --- a/Assets/Resources/Enemies/1/Enemy1V1.prefab +++ b/Assets/Resources/Enemies/1/Enemy1V1.prefab @@ -203,6 +203,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} m_Name: m_EditorClassIdentifier: + healthBar: {fileID: 0} --- !u!1 &6905705041633878913 GameObject: m_ObjectHideFlags: 0 @@ -327,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &3477818934881411113 MonoBehaviour: m_ObjectHideFlags: 0 @@ -340,7 +341,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c66441ada081b6c4c841000e83cc2b7a, type: 3} m_Name: m_EditorClassIdentifier: - invert: 0 + flipTrans: {fileID: 3920219362688286786} + body: {fileID: 8428770856484636299} --- !u!70 &58401337460216238 CapsuleCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/1/Enemy1V2.prefab b/Assets/Resources/Enemies/1/Enemy1V2.prefab index cafcf11..2e1383a 100644 --- a/Assets/Resources/Enemies/1/Enemy1V2.prefab +++ b/Assets/Resources/Enemies/1/Enemy1V2.prefab @@ -119,6 +119,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} m_Name: m_EditorClassIdentifier: + healthBar: {fileID: 0} --- !u!1 &6905705041633878913 GameObject: m_ObjectHideFlags: 0 @@ -219,7 +220,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &1203571175389907979 MonoBehaviour: m_ObjectHideFlags: 0 @@ -232,7 +233,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c66441ada081b6c4c841000e83cc2b7a, type: 3} m_Name: m_EditorClassIdentifier: - invert: 0 + flipTrans: {fileID: 3920219362688286786} + body: {fileID: 8111329671581128041} --- !u!70 &4546369442828517320 CapsuleCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/1/Enemy1V3.prefab b/Assets/Resources/Enemies/1/Enemy1V3.prefab index 6d4ab0f..897cb0a 100644 --- a/Assets/Resources/Enemies/1/Enemy1V3.prefab +++ b/Assets/Resources/Enemies/1/Enemy1V3.prefab @@ -119,6 +119,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} m_Name: m_EditorClassIdentifier: + healthBar: {fileID: 0} --- !u!1 &5264004513177534146 GameObject: m_ObjectHideFlags: 0 @@ -303,7 +304,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &7065122129502476799 MonoBehaviour: m_ObjectHideFlags: 0 @@ -316,7 +317,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c66441ada081b6c4c841000e83cc2b7a, type: 3} m_Name: m_EditorClassIdentifier: - invert: 0 + flipTrans: {fileID: 3920219362688286786} + body: {fileID: 7639895946029500357} --- !u!70 &1757117162005437690 CapsuleCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/2/Enemy2V1.prefab b/Assets/Resources/Enemies/2/Enemy2V1.prefab index cc2aa50..c957718 100644 --- a/Assets/Resources/Enemies/2/Enemy2V1.prefab +++ b/Assets/Resources/Enemies/2/Enemy2V1.prefab @@ -119,6 +119,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} m_Name: m_EditorClassIdentifier: + healthBar: {fileID: 0} --- !u!1 &6905705041633878913 GameObject: m_ObjectHideFlags: 0 @@ -172,7 +173,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 110 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -243,7 +244,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &8407687426537136098 MonoBehaviour: m_ObjectHideFlags: 0 @@ -256,7 +257,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c66441ada081b6c4c841000e83cc2b7a, type: 3} m_Name: m_EditorClassIdentifier: - invert: 0 + flipTrans: {fileID: 3920219362688286786} + body: {fileID: 8131507713407366277} --- !u!70 &5347138904714296145 CapsuleCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/2/Enemy2V2.prefab b/Assets/Resources/Enemies/2/Enemy2V2.prefab index 25f7f22..345b52d 100644 --- a/Assets/Resources/Enemies/2/Enemy2V2.prefab +++ b/Assets/Resources/Enemies/2/Enemy2V2.prefab @@ -119,6 +119,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} m_Name: m_EditorClassIdentifier: + healthBar: {fileID: 0} --- !u!1 &6240986660682715275 GameObject: m_ObjectHideFlags: 0 @@ -256,7 +257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 110 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -327,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &2239829156743597080 MonoBehaviour: m_ObjectHideFlags: 0 @@ -340,7 +341,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c66441ada081b6c4c841000e83cc2b7a, type: 3} m_Name: m_EditorClassIdentifier: - invert: 0 + flipTrans: {fileID: 3920219362688286786} + body: {fileID: 833665078815953586} --- !u!70 &9116721273772261298 CapsuleCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/2/Enemy2V3.prefab b/Assets/Resources/Enemies/2/Enemy2V3.prefab index 5389a4d..56b04ae 100644 --- a/Assets/Resources/Enemies/2/Enemy2V3.prefab +++ b/Assets/Resources/Enemies/2/Enemy2V3.prefab @@ -119,6 +119,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} m_Name: m_EditorClassIdentifier: + healthBar: {fileID: 0} --- !u!1 &737291232160764410 GameObject: m_ObjectHideFlags: 0 @@ -256,7 +257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 110 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -327,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &2593167518683313509 MonoBehaviour: m_ObjectHideFlags: 0 @@ -340,7 +341,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c66441ada081b6c4c841000e83cc2b7a, type: 3} m_Name: m_EditorClassIdentifier: - invert: 0 + flipTrans: {fileID: 3920219362688286786} + body: {fileID: 7183425510269105097} --- !u!70 &1597969697045467354 CapsuleCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/3/Enemy3V1.prefab b/Assets/Resources/Enemies/3/Enemy3V1.prefab index f6cdd25..4c13326 100644 --- a/Assets/Resources/Enemies/3/Enemy3V1.prefab +++ b/Assets/Resources/Enemies/3/Enemy3V1.prefab @@ -119,6 +119,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} m_Name: m_EditorClassIdentifier: + healthBar: {fileID: 0} --- !u!1 &6905705041633878913 GameObject: m_ObjectHideFlags: 0 @@ -129,7 +130,6 @@ GameObject: m_Component: - component: {fileID: 3920219362688286786} - component: {fileID: 2938081276856164938} - - component: {fileID: 944314729512195366} - component: {fileID: 8373694659570615877} - component: {fileID: -1793628155013383594} - component: {fileID: 5601190281078907372} @@ -172,30 +172,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 - damageTickDelay: 0.25 - OnHealthZero: - m_PersistentCalls: - m_Calls: [] - OnHealthChange: - m_PersistentCalls: - m_Calls: [] - minThreshold: 1 - squezeDamageScalor: 1 ---- !u!114 &944314729512195366 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 6905705041633878913} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3} - m_Name: - m_EditorClassIdentifier: - onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 130 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -243,7 +220,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &5601190281078907372 MonoBehaviour: m_ObjectHideFlags: 0 @@ -256,7 +233,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c66441ada081b6c4c841000e83cc2b7a, type: 3} m_Name: m_EditorClassIdentifier: - invert: 1 + flipTrans: {fileID: 3920219362688286786} + body: {fileID: 1792220776575088205} --- !u!70 &5775148875117303771 CapsuleCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/3/Enemy3V2.prefab b/Assets/Resources/Enemies/3/Enemy3V2.prefab index 1b5fbea..b088150 100644 --- a/Assets/Resources/Enemies/3/Enemy3V2.prefab +++ b/Assets/Resources/Enemies/3/Enemy3V2.prefab @@ -119,6 +119,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} m_Name: m_EditorClassIdentifier: + healthBar: {fileID: 0} --- !u!1 &5163044581904956856 GameObject: m_ObjectHideFlags: 0 @@ -256,7 +257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 130 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -327,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &5537633588480359369 MonoBehaviour: m_ObjectHideFlags: 0 @@ -340,7 +341,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c66441ada081b6c4c841000e83cc2b7a, type: 3} m_Name: m_EditorClassIdentifier: - invert: 1 + flipTrans: {fileID: 3920219362688286786} + body: {fileID: 799119378079257124} --- !u!70 &629574706924414947 CapsuleCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/3/Enemy3V3.prefab b/Assets/Resources/Enemies/3/Enemy3V3.prefab index 855c6d7..f473198 100644 --- a/Assets/Resources/Enemies/3/Enemy3V3.prefab +++ b/Assets/Resources/Enemies/3/Enemy3V3.prefab @@ -119,6 +119,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} m_Name: m_EditorClassIdentifier: + healthBar: {fileID: 0} --- !u!1 &5743397826554235676 GameObject: m_ObjectHideFlags: 0 @@ -256,7 +257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 130 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -327,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &5342177024833758816 MonoBehaviour: m_ObjectHideFlags: 0 @@ -340,7 +341,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c66441ada081b6c4c841000e83cc2b7a, type: 3} m_Name: m_EditorClassIdentifier: - invert: 1 + flipTrans: {fileID: 3920219362688286786} + body: {fileID: 8845322091694779043} --- !u!70 &9180341162620792323 CapsuleCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/4/Enemy4V1.prefab b/Assets/Resources/Enemies/4/Enemy4V1.prefab index eb0ec98..d3ba780 100644 --- a/Assets/Resources/Enemies/4/Enemy4V1.prefab +++ b/Assets/Resources/Enemies/4/Enemy4V1.prefab @@ -119,6 +119,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} m_Name: m_EditorClassIdentifier: + healthBar: {fileID: 0} --- !u!1 &6905705041633878913 GameObject: m_ObjectHideFlags: 0 @@ -172,7 +173,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 160 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -243,7 +244,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &6703538002322560484 MonoBehaviour: m_ObjectHideFlags: 0 @@ -256,7 +257,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c66441ada081b6c4c841000e83cc2b7a, type: 3} m_Name: m_EditorClassIdentifier: - invert: 1 + flipTrans: {fileID: 3920219362688286786} + body: {fileID: 6845376844323151706} --- !u!70 &1593837753105570956 CapsuleCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/4/Enemy4V2.prefab b/Assets/Resources/Enemies/4/Enemy4V2.prefab index 68e5843..18f135d 100644 --- a/Assets/Resources/Enemies/4/Enemy4V2.prefab +++ b/Assets/Resources/Enemies/4/Enemy4V2.prefab @@ -119,6 +119,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} m_Name: m_EditorClassIdentifier: + healthBar: {fileID: 0} --- !u!1 &3503255070657254113 GameObject: m_ObjectHideFlags: 0 @@ -256,7 +257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 160 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -327,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &5189432348483020584 MonoBehaviour: m_ObjectHideFlags: 0 @@ -340,7 +341,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c66441ada081b6c4c841000e83cc2b7a, type: 3} m_Name: m_EditorClassIdentifier: - invert: 1 + flipTrans: {fileID: 3920219362688286786} + body: {fileID: 4819874625761020595} --- !u!70 &6992716262122209801 CapsuleCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/4/Enemy4V3.prefab b/Assets/Resources/Enemies/4/Enemy4V3.prefab index 0dba20c..b54454c 100644 --- a/Assets/Resources/Enemies/4/Enemy4V3.prefab +++ b/Assets/Resources/Enemies/4/Enemy4V3.prefab @@ -119,6 +119,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} m_Name: m_EditorClassIdentifier: + healthBar: {fileID: 0} --- !u!1 &6550912095123086306 GameObject: m_ObjectHideFlags: 0 @@ -256,7 +257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 160 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -327,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &8229201628275188815 MonoBehaviour: m_ObjectHideFlags: 0 @@ -340,7 +341,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c66441ada081b6c4c841000e83cc2b7a, type: 3} m_Name: m_EditorClassIdentifier: - invert: 1 + flipTrans: {fileID: 3920219362688286786} + body: {fileID: 3466740024957840811} --- !u!70 &5275513863136233879 CapsuleCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/5/Enemy5V1.prefab b/Assets/Resources/Enemies/5/Enemy5V1.prefab index 97fbd0e..c00abe1 100644 --- a/Assets/Resources/Enemies/5/Enemy5V1.prefab +++ b/Assets/Resources/Enemies/5/Enemy5V1.prefab @@ -119,6 +119,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} m_Name: m_EditorClassIdentifier: + healthBar: {fileID: 0} --- !u!1 &4734876489558749316 GameObject: m_ObjectHideFlags: 0 @@ -256,7 +257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 250 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -327,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &17691115352120009 MonoBehaviour: m_ObjectHideFlags: 0 @@ -340,7 +341,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c66441ada081b6c4c841000e83cc2b7a, type: 3} m_Name: m_EditorClassIdentifier: - invert: 1 + flipTrans: {fileID: 3920219362688286786} + body: {fileID: 2397480649246164426} --- !u!70 &853766927484383816 CapsuleCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/5/Enemy5V2.prefab b/Assets/Resources/Enemies/5/Enemy5V2.prefab index 9b917cc..81cad3c 100644 --- a/Assets/Resources/Enemies/5/Enemy5V2.prefab +++ b/Assets/Resources/Enemies/5/Enemy5V2.prefab @@ -119,6 +119,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} m_Name: m_EditorClassIdentifier: + healthBar: {fileID: 0} --- !u!1 &6538858291398231023 GameObject: m_ObjectHideFlags: 0 @@ -256,7 +257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 250 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -327,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &893626435943606516 MonoBehaviour: m_ObjectHideFlags: 0 @@ -340,7 +341,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c66441ada081b6c4c841000e83cc2b7a, type: 3} m_Name: m_EditorClassIdentifier: - invert: 1 + flipTrans: {fileID: 3920219362688286786} + body: {fileID: 1166639589295390852} --- !u!70 &1353826037353208613 CapsuleCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/5/Enemy5V3.prefab b/Assets/Resources/Enemies/5/Enemy5V3.prefab index 47109e5..1d65ee5 100644 --- a/Assets/Resources/Enemies/5/Enemy5V3.prefab +++ b/Assets/Resources/Enemies/5/Enemy5V3.prefab @@ -119,6 +119,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} m_Name: m_EditorClassIdentifier: + healthBar: {fileID: 0} --- !u!1 &2232121724853526948 GameObject: m_ObjectHideFlags: 0 @@ -256,7 +257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 250 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -327,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &2019234432969631736 MonoBehaviour: m_ObjectHideFlags: 0 @@ -340,7 +341,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c66441ada081b6c4c841000e83cc2b7a, type: 3} m_Name: m_EditorClassIdentifier: - invert: 1 + flipTrans: {fileID: 3920219362688286786} + body: {fileID: 6053117177104604418} --- !u!70 &1104779658182803384 CapsuleCollider2D: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/6/Enemy6V1.prefab b/Assets/Resources/Enemies/6/Enemy6V1.prefab index 3037daa..ca22077 100644 --- a/Assets/Resources/Enemies/6/Enemy6V1.prefab +++ b/Assets/Resources/Enemies/6/Enemy6V1.prefab @@ -119,6 +119,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} m_Name: m_EditorClassIdentifier: + healthBar: {fileID: 0} --- !u!1 &1533843569211901549 GameObject: m_ObjectHideFlags: 0 @@ -256,7 +257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 180 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -327,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &4552190225719755244 MonoBehaviour: m_ObjectHideFlags: 0 @@ -340,7 +341,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c66441ada081b6c4c841000e83cc2b7a, type: 3} m_Name: m_EditorClassIdentifier: - invert: 1 + flipTrans: {fileID: 3920219362688286786} + body: {fileID: 2639723550158062772} --- !u!70 &7675421169139995944 CapsuleCollider2D: m_ObjectHideFlags: 0 @@ -373,8 +375,8 @@ CapsuleCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: -0.09, y: -0.17} - m_Size: {x: 1.66, y: 2.62} + m_Offset: {x: -0.09, y: -0.37} + m_Size: {x: 1.66, y: 2.09} m_Direction: 0 --- !u!50 &2639723550158062772 Rigidbody2D: diff --git a/Assets/Resources/Enemies/6/Enemy6V2.prefab b/Assets/Resources/Enemies/6/Enemy6V2.prefab index 59bb5c2..ba364e6 100644 --- a/Assets/Resources/Enemies/6/Enemy6V2.prefab +++ b/Assets/Resources/Enemies/6/Enemy6V2.prefab @@ -119,6 +119,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} m_Name: m_EditorClassIdentifier: + healthBar: {fileID: 0} --- !u!1 &6191794988166842775 GameObject: m_ObjectHideFlags: 0 @@ -256,7 +257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 180 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -327,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &7803025104266690665 MonoBehaviour: m_ObjectHideFlags: 0 @@ -340,7 +341,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c66441ada081b6c4c841000e83cc2b7a, type: 3} m_Name: m_EditorClassIdentifier: - invert: 1 + flipTrans: {fileID: 3920219362688286786} + body: {fileID: 9140022268088615716} --- !u!70 &4435590555684305438 CapsuleCollider2D: m_ObjectHideFlags: 0 @@ -373,8 +375,8 @@ CapsuleCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: -0.09, y: -0.17} - m_Size: {x: 1.66, y: 2.62} + m_Offset: {x: -0.09, y: -0.37} + m_Size: {x: 1.66, y: 2.09} m_Direction: 0 --- !u!50 &9140022268088615716 Rigidbody2D: diff --git a/Assets/Resources/Enemies/6/Enemy6V3.prefab b/Assets/Resources/Enemies/6/Enemy6V3.prefab index e88ee35..9bf2013 100644 --- a/Assets/Resources/Enemies/6/Enemy6V3.prefab +++ b/Assets/Resources/Enemies/6/Enemy6V3.prefab @@ -119,6 +119,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9fa05ebd2f063df4a8079e013369f78b, type: 3} m_Name: m_EditorClassIdentifier: + healthBar: {fileID: 0} --- !u!1 &1602580555763979504 GameObject: m_ObjectHideFlags: 0 @@ -256,7 +257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 180 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -327,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &316906110964971930 MonoBehaviour: m_ObjectHideFlags: 0 @@ -340,7 +341,8 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c66441ada081b6c4c841000e83cc2b7a, type: 3} m_Name: m_EditorClassIdentifier: - invert: 1 + flipTrans: {fileID: 3920219362688286786} + body: {fileID: 1721532817145052869} --- !u!70 &3935275739920240744 CapsuleCollider2D: m_ObjectHideFlags: 0 @@ -373,8 +375,8 @@ CapsuleCollider2D: m_IsTrigger: 0 m_UsedByEffector: 0 m_UsedByComposite: 0 - m_Offset: {x: -0.09, y: -0.17} - m_Size: {x: 1.66, y: 2.62} + m_Offset: {x: -0.09, y: -0.37} + m_Size: {x: 1.66, y: 2.09} m_Direction: 0 --- !u!50 &1721532817145052869 Rigidbody2D: diff --git a/Assets/Resources/Player1.prefab b/Assets/Resources/Player1.prefab index 7b17070..2b80da7 100644 --- a/Assets/Resources/Player1.prefab +++ b/Assets/Resources/Player1.prefab @@ -274,6 +274,9 @@ GameObject: - component: {fileID: 1749848915408613053} - component: {fileID: 1949941092232239315} - component: {fileID: 1449424410418603396} + - component: {fileID: 3389629528887116870} + - component: {fileID: 1160419468000791564} + - component: {fileID: 1691493459240420355} m_Layer: 7 m_Name: Player1 m_TagString: Player @@ -313,9 +316,6 @@ MonoBehaviour: m_EditorClassIdentifier: animationHandler: {fileID: 3878447480781341932} moveSpeed: 70 - stepCooldown: 0.2 - stepVibrationTime: 0.05 - rumble: {fileID: 0} whipAttack: {fileID: 1749848915408613053} whipMoveSpeed: 25 maxWhipMoveSpeed: 30 @@ -331,7 +331,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3} m_Name: m_EditorClassIdentifier: + onlyCallZeroHealthOnce: 1 maxHealth: 100 + damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: m_Calls: [] @@ -383,6 +385,7 @@ MonoBehaviour: body: {fileID: 1508323898269695585} locked: 0 playerInput: {fileID: 1949941092232239315} + playerAnimationHandler: {fileID: 3878447480781341932} --- !u!114 &3878447480781341932 MonoBehaviour: m_ObjectHideFlags: 0 @@ -395,6 +398,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9c2ddf673a65d3d49bc9470e1a4572e4, type: 3} m_Name: m_EditorClassIdentifier: + animator: {fileID: 0} --- !u!114 &1749848915408613053 MonoBehaviour: m_ObjectHideFlags: 0 @@ -407,6 +411,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b69b92d72c7244443854899c4b700d9c, type: 3} m_Name: m_EditorClassIdentifier: + animationHandler: {fileID: 3878447480781341932} playerInput: {fileID: 1949941092232239315} otherPlayerAttack: {fileID: 0} playerMovement: {fileID: 651446758998956252} @@ -441,6 +446,49 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b097a132c072b72fbc7808ebf263e52, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &3389629528887116870 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3120938410244321186} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 20d294d88e5bc8a42afb1f72751fb61f, type: 3} + m_Name: + m_EditorClassIdentifier: + RopeRubleTolerance: 0.25 + MaxVibration: 0.5 + rope: {fileID: 0} +--- !u!114 &1160419468000791564 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3120938410244321186} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c66441ada081b6c4c841000e83cc2b7a, type: 3} + m_Name: + m_EditorClassIdentifier: + flipTrans: {fileID: 320690117028550720} + body: {fileID: 1508323898269695585} +--- !u!114 &1691493459240420355 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3120938410244321186} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d4d58ce9310f45c42af5d8003f1a832c, type: 3} + m_Name: + m_EditorClassIdentifier: + StepInterval: 0.8 + Volume: 0.25 --- !u!1001 &6225877037457186740 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Player2.prefab b/Assets/Resources/Player2.prefab index 889c005..7c1c916 100644 --- a/Assets/Resources/Player2.prefab +++ b/Assets/Resources/Player2.prefab @@ -190,6 +190,9 @@ GameObject: - component: {fileID: 7071433868121438663} - component: {fileID: 1949941092232239315} - component: {fileID: 7729933180365677331} + - component: {fileID: 5108819328747686001} + - component: {fileID: 8956099385762146752} + - component: {fileID: 5150961666696654592} m_Layer: 7 m_Name: Player2 m_TagString: Player @@ -229,9 +232,6 @@ MonoBehaviour: m_EditorClassIdentifier: animationHandler: {fileID: 3878447480781341932} moveSpeed: 65 - stepCooldown: 0.2 - stepVibrationTime: 0.05 - rumble: {fileID: 0} whipAttack: {fileID: 7071433868121438663} whipMoveSpeed: 25 maxWhipMoveSpeed: 30 @@ -247,7 +247,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1fdfc885f1a69704b893825cf9e616ba, type: 3} m_Name: m_EditorClassIdentifier: + onlyCallZeroHealthOnce: 1 maxHealth: 100 + damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: m_Calls: [] @@ -299,6 +301,7 @@ MonoBehaviour: body: {fileID: 1508323898269695585} locked: 0 playerInput: {fileID: 1949941092232239315} + playerAnimationHandler: {fileID: 3878447480781341932} --- !u!114 &3878447480781341932 MonoBehaviour: m_ObjectHideFlags: 0 @@ -311,6 +314,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9c2ddf673a65d3d49bc9470e1a4572e4, type: 3} m_Name: m_EditorClassIdentifier: + animator: {fileID: 0} --- !u!114 &7071433868121438663 MonoBehaviour: m_ObjectHideFlags: 0 @@ -323,6 +327,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: b69b92d72c7244443854899c4b700d9c, type: 3} m_Name: m_EditorClassIdentifier: + animationHandler: {fileID: 3878447480781341932} playerInput: {fileID: 1949941092232239315} otherPlayerAttack: {fileID: 0} playerMovement: {fileID: 651446758998956252} @@ -344,7 +349,7 @@ MonoBehaviour: movement: {x: 0, y: 0} look: {x: 0, y: 0} whipAttack: 0 - useArrowKeys: 0 + useArrowKeys: 1 --- !u!114 &7729933180365677331 MonoBehaviour: m_ObjectHideFlags: 0 @@ -357,6 +362,49 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 6b097a132c072b72fbc7808ebf263e52, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &5108819328747686001 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3120938410244321186} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 20d294d88e5bc8a42afb1f72751fb61f, type: 3} + m_Name: + m_EditorClassIdentifier: + RopeRubleTolerance: 0.25 + MaxVibration: 0.5 + rope: {fileID: 0} +--- !u!114 &8956099385762146752 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3120938410244321186} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c66441ada081b6c4c841000e83cc2b7a, type: 3} + m_Name: + m_EditorClassIdentifier: + flipTrans: {fileID: 320690117028550720} + body: {fileID: 1508323898269695585} +--- !u!114 &5150961666696654592 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3120938410244321186} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d4d58ce9310f45c42af5d8003f1a832c, type: 3} + m_Name: + m_EditorClassIdentifier: + StepInterval: 0.8 + Volume: 0.25 --- !u!1 &7787472247078384126 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/GameScene 1.unity b/Assets/Scenes/GameScene 1.unity index 2d71770..b246280 100644 --- a/Assets/Scenes/GameScene 1.unity +++ b/Assets/Scenes/GameScene 1.unity @@ -123,120 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &29432006 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} - propertyPath: m_LocalPosition.x - value: -11.734728 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} - propertyPath: m_LocalPosition.y - value: 19.568419 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} - propertyPath: m_Name - value: Enemy3V3 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} ---- !u!1001 &45309643 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} - propertyPath: m_LocalPosition.x - value: 15.233719 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} - propertyPath: m_LocalPosition.y - value: 16.981707 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} - propertyPath: m_Name - value: Enemy5V3 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} --- !u!1 &147729521 GameObject: m_ObjectHideFlags: 0 @@ -360,7 +246,7 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &288328697 +--- !u!1001 &340610726 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -368,55 +254,55 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} + - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} propertyPath: m_LocalPosition.x - value: -12.740581 + value: -17.30016 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} + - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} propertyPath: m_LocalPosition.y - value: -29.43488 + value: -9.757746 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} + - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} + - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} + - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} + - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} + - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} + - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} + - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} + - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} + - target: {fileID: 6905705041633878913, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} propertyPath: m_Name - value: Enemy1V1 + value: Enemy4V1 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8994050caaa5f2c45b56e985a0d0448a, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} --- !u!1 &362707003 GameObject: m_ObjectHideFlags: 0 @@ -619,7 +505,7 @@ Transform: - {fileID: 147729522} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &579830309 +--- !u!1001 &630240075 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -627,226 +513,55 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 3920219362688286786, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} + - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} propertyPath: m_LocalPosition.x - value: -17.530842 + value: -3.5504682 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} + - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} propertyPath: m_LocalPosition.y - value: 36.57346 + value: -6.554695 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} + - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} + - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} + - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} + - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} + - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} + - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} + - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} + - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} + - target: {fileID: 6905705041633878913, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} propertyPath: m_Name - value: Enemy4V2 + value: Enemy5V1 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} ---- !u!1001 &680467646 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: af739fea850caf944ac8c1932d2ec386, type: 3} - propertyPath: m_LocalPosition.x - value: 13.796644 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: af739fea850caf944ac8c1932d2ec386, type: 3} - propertyPath: m_LocalPosition.y - value: 5.4853296 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: af739fea850caf944ac8c1932d2ec386, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: af739fea850caf944ac8c1932d2ec386, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: af739fea850caf944ac8c1932d2ec386, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: af739fea850caf944ac8c1932d2ec386, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: af739fea850caf944ac8c1932d2ec386, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: af739fea850caf944ac8c1932d2ec386, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: af739fea850caf944ac8c1932d2ec386, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: af739fea850caf944ac8c1932d2ec386, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: af739fea850caf944ac8c1932d2ec386, type: 3} - propertyPath: m_Name - value: Enemy6V1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: af739fea850caf944ac8c1932d2ec386, type: 3} ---- !u!1001 &694992243 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} - propertyPath: m_LocalPosition.x - value: -16.86022 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} - propertyPath: m_LocalPosition.y - value: 27.903278 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} - propertyPath: m_Name - value: Enemy4V1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} ---- !u!1001 &764029194 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} - propertyPath: m_LocalPosition.x - value: -11.44732 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} - propertyPath: m_LocalPosition.y - value: 13.437017 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} - propertyPath: m_Name - value: Enemy3V2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} --- !u!1001 &869964773 PrefabInstance: m_ObjectHideFlags: 0 @@ -934,7 +649,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4aabce12c1341ff488ee4dc806fd80e8, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &906992645 +--- !u!1001 &1143774969 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -942,283 +657,55 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 3920219362688286786, guid: f48e8133073214446b0889b26d867b03, type: 3} + - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} propertyPath: m_LocalPosition.x - value: -11.782581 + value: -15.112709 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f48e8133073214446b0889b26d867b03, type: 3} + - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} propertyPath: m_LocalPosition.y - value: -3.8075562 + value: -1.3204403 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f48e8133073214446b0889b26d867b03, type: 3} + - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f48e8133073214446b0889b26d867b03, type: 3} + - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f48e8133073214446b0889b26d867b03, type: 3} + - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f48e8133073214446b0889b26d867b03, type: 3} + - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f48e8133073214446b0889b26d867b03, type: 3} + - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f48e8133073214446b0889b26d867b03, type: 3} + - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f48e8133073214446b0889b26d867b03, type: 3} + - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f48e8133073214446b0889b26d867b03, type: 3} + - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: f48e8133073214446b0889b26d867b03, type: 3} + - target: {fileID: 6905705041633878913, guid: f808ad67f6a747241a310437e433c828, type: 3} propertyPath: m_Name - value: Enemy2V2 + value: Enemy2V1 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f48e8133073214446b0889b26d867b03, type: 3} ---- !u!1001 &986896050 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} - propertyPath: m_LocalPosition.x - value: -17.291334 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} - propertyPath: m_LocalPosition.y - value: 42.944366 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} - propertyPath: m_Name - value: Enemy4V3 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} ---- !u!1001 &1022813124 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} - propertyPath: m_LocalPosition.x - value: 13.748831 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} - propertyPath: m_LocalPosition.y - value: 39.303852 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} - propertyPath: m_Name - value: Enemy5V2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} ---- !u!1001 &1065460763 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} - propertyPath: m_LocalPosition.x - value: -11.734695 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} - propertyPath: m_LocalPosition.y - value: 2.0364237 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} - propertyPath: m_Name - value: Enemy2V3 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} ---- !u!1001 &1125101199 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} - propertyPath: m_LocalPosition.x - value: 13.030218 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} - propertyPath: m_LocalPosition.y - value: -9.603667 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} - propertyPath: m_Name - value: Enemy6V3 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: f808ad67f6a747241a310437e433c828, type: 3} --- !u!1001 &1229295200 PrefabInstance: m_ObjectHideFlags: 0 @@ -1368,63 +855,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4aabce12c1341ff488ee4dc806fd80e8, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1001 &1244733879 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} - propertyPath: m_LocalPosition.x - value: -11.399368 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} - propertyPath: m_LocalPosition.y - value: -9.795253 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: f808ad67f6a747241a310437e433c828, type: 3} - propertyPath: m_Name - value: Enemy2V1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f808ad67f6a747241a310437e433c828, type: 3} --- !u!1 &1377274208 GameObject: m_ObjectHideFlags: 0 @@ -1526,120 +956,6 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!1001 &1421889814 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: ad94da4dcc3c6204494b1b223e3ad6bd, type: 3} - propertyPath: m_LocalPosition.x - value: 13.509233 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ad94da4dcc3c6204494b1b223e3ad6bd, type: 3} - propertyPath: m_LocalPosition.y - value: -1.0292852 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ad94da4dcc3c6204494b1b223e3ad6bd, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ad94da4dcc3c6204494b1b223e3ad6bd, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ad94da4dcc3c6204494b1b223e3ad6bd, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ad94da4dcc3c6204494b1b223e3ad6bd, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ad94da4dcc3c6204494b1b223e3ad6bd, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ad94da4dcc3c6204494b1b223e3ad6bd, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ad94da4dcc3c6204494b1b223e3ad6bd, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ad94da4dcc3c6204494b1b223e3ad6bd, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: ad94da4dcc3c6204494b1b223e3ad6bd, type: 3} - propertyPath: m_Name - value: Enemy6V2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ad94da4dcc3c6204494b1b223e3ad6bd, type: 3} ---- !u!1001 &1535826745 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} - propertyPath: m_LocalPosition.x - value: -12.501073 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} - propertyPath: m_LocalPosition.y - value: -23.68669 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} - propertyPath: m_Name - value: Enemy1V2 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ee739a33f1762c142bc1ef49e6e95fa4, type: 3} --- !u!1 &1600052931 GameObject: m_ObjectHideFlags: 0 @@ -1708,120 +1024,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1771641709 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} - propertyPath: m_LocalPosition.x - value: -11.590942 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} - propertyPath: m_LocalPosition.y - value: -15.687125 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} - propertyPath: m_Name - value: Enemy1V3 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cd2055c0dcd26e4448309266b8c6f03e, type: 3} ---- !u!1001 &1785224621 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} - propertyPath: m_LocalPosition.x - value: 14.515253 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} - propertyPath: m_LocalPosition.y - value: 25.939312 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} - propertyPath: m_Name - value: Enemy5V1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} --- !u!1 &1920006246 GameObject: m_ObjectHideFlags: 0 @@ -1991,63 +1193,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1942620212 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 3920219362688286786, guid: 40512b69b08d56d498aa78823087362c, type: 3} - propertyPath: m_LocalPosition.x - value: -11.734695 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 40512b69b08d56d498aa78823087362c, type: 3} - propertyPath: m_LocalPosition.y - value: 7.68881 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 40512b69b08d56d498aa78823087362c, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 40512b69b08d56d498aa78823087362c, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 40512b69b08d56d498aa78823087362c, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 40512b69b08d56d498aa78823087362c, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 40512b69b08d56d498aa78823087362c, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 40512b69b08d56d498aa78823087362c, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 40512b69b08d56d498aa78823087362c, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 3920219362688286786, guid: 40512b69b08d56d498aa78823087362c, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6905705041633878913, guid: 40512b69b08d56d498aa78823087362c, type: 3} - propertyPath: m_Name - value: Enemy3V1 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 40512b69b08d56d498aa78823087362c, type: 3} --- !u!4 &2041669625 stripped Transform: m_CorrespondingSourceObject: {fileID: 6564855475370468539, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} @@ -2123,21 +1268,6 @@ SceneRoots: - {fileID: 869964773} - {fileID: 483723115} - {fileID: 1920006249} - - {fileID: 288328697} - - {fileID: 1535826745} - - {fileID: 1771641709} - - {fileID: 1244733879} - - {fileID: 906992645} - - {fileID: 1065460763} - - {fileID: 1942620212} - - {fileID: 764029194} - - {fileID: 29432006} - - {fileID: 694992243} - - {fileID: 579830309} - - {fileID: 986896050} - - {fileID: 1785224621} - - {fileID: 1022813124} - - {fileID: 45309643} - - {fileID: 680467646} - - {fileID: 1421889814} - - {fileID: 1125101199} + - {fileID: 1143774969} + - {fileID: 630240075} + - {fileID: 340610726} diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 260bc94..b79d296 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -123,156 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &98547638 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 98547639} - - component: {fileID: 98547641} - - component: {fileID: 98547640} - m_Layer: 5 - m_Name: Player1 Cursor - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &98547639 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 98547638} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1029071972} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &98547640 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 98547638} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: dbfcdfb387a761a92804bee52849f89d, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &98547641 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 98547638} - m_CullTransparentMesh: 1 ---- !u!1 &131339057 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 131339058} - - component: {fileID: 131339060} - - component: {fileID: 131339059} - m_Layer: 5 - m_Name: Upgrade6 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &131339058 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 131339057} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1029071972} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 44, y: 44} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &131339059 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 131339057} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &131339060 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 131339057} - m_CullTransparentMesh: 1 --- !u!1 &147729521 GameObject: m_ObjectHideFlags: 0 @@ -396,290 +246,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &248416271 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 248416272} - - component: {fileID: 248416274} - - component: {fileID: 248416273} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &248416272 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 248416271} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1411561451} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &248416273 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 248416271} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 460eb439e506a884899dec7f7d98a082, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &248416274 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 248416271} - m_CullTransparentMesh: 1 ---- !u!1 &268158548 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 268158549} - - component: {fileID: 268158551} - - component: {fileID: 268158550} - m_Layer: 5 - m_Name: Player2 Cursor - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &268158549 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 268158548} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1029071972} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &268158550 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 268158548} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: e8a488ad26ec5db1588b96ef7816283d, type: 3} - m_Type: 0 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &268158551 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 268158548} - m_CullTransparentMesh: 1 ---- !u!1 &353363865 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 353363866} - - component: {fileID: 353363868} - - component: {fileID: 353363867} - m_Layer: 5 - m_Name: TimerText - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &353363866 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 353363865} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 2051104236} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 660, y: 390} - m_SizeDelta: {x: 500, y: 200} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &353363867 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 353363865} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: 00:00 - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: c0b8103094a9f3440aa4c34a7256e147, type: 2} - m_sharedMaterial: {fileID: -2157513429875108333, guid: c0b8103094a9f3440aa4c34a7256e147, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 4 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &353363868 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 353363865} - m_CullTransparentMesh: 1 --- !u!1 &438029675 GameObject: m_ObjectHideFlags: 0 @@ -963,156 +529,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 3862814901187971034, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3} m_PrefabInstance: {fileID: 7693964683212020007} m_PrefabAsset: {fileID: 0} ---- !u!1 &740048888 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 740048889} - - component: {fileID: 740048891} - - component: {fileID: 740048890} - m_Layer: 5 - m_Name: Upgrade4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &740048889 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 740048888} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1029071972} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0} - m_AnchorMax: {x: 1, y: 0} - m_AnchoredPosition: {x: -44, y: 44} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &740048890 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 740048888} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &740048891 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 740048888} - m_CullTransparentMesh: 1 ---- !u!1 &750311647 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 750311648} - - component: {fileID: 750311650} - - component: {fileID: 750311649} - m_Layer: 5 - m_Name: Upgrade8 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &750311648 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 750311647} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1029071972} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 1} - m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 44, y: -44} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &750311649 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 750311647} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &750311650 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 750311647} - m_CullTransparentMesh: 1 --- !u!1001 &869964773 PrefabInstance: m_ObjectHideFlags: 0 @@ -1161,14 +577,18 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 651446758998956252, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3} - propertyPath: rumble - value: - objectReference: {fileID: 147729521} - target: {fileID: 3120938410244321186, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3} propertyPath: m_Name value: Player2 objectReference: {fileID: 0} + - target: {fileID: 5108819328747686001, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3} + propertyPath: rope + value: + objectReference: {fileID: 1920006248} + - target: {fileID: 5108819328747686001, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3} + propertyPath: MaxVibration + value: 0.5 + objectReference: {fileID: 0} - target: {fileID: 7071433868121438663, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3} propertyPath: otherPlayerAttack value: @@ -1176,13 +596,7 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 3120938410244321186, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3} - insertIndex: -1 - addedObject: {fileID: 1579580571} - - targetCorrespondingSourceObject: {fileID: 3120938410244321186, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3} - insertIndex: -1 - addedObject: {fileID: 1579580572} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3} --- !u!114 &869964774 stripped MonoBehaviour: @@ -1206,217 +620,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4aabce12c1341ff488ee4dc806fd80e8, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1029071971 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1029071972} - - component: {fileID: 1029071976} - - component: {fileID: 1029071975} - - component: {fileID: 1029071974} - - component: {fileID: 1029071973} - m_Layer: 5 - m_Name: MenuForUpgrades - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1029071972 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1029071971} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1.9407643, y: 1.9407643, z: 1.9407643} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1895331452} - - {fileID: 1975248708} - - {fileID: 1389439924} - - {fileID: 740048889} - - {fileID: 1174960583} - - {fileID: 131339058} - - {fileID: 2107662971} - - {fileID: 750311648} - - {fileID: 1411561451} - - {fileID: 268158549} - - {fileID: 98547639} - - {fileID: 1677146149} - m_Father: {fileID: 1377274212} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 291.11456, y: 291.1147} - m_SizeDelta: {x: 250, y: 250} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!95 &1029071973 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1029071971} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 7866120a2d012ae3db02cdb779b1ea00, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 ---- !u!114 &1029071974 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1029071971} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 723cbd9d3229f69d79e38cebc5eabf45, type: 3} - m_Name: - m_EditorClassIdentifier: - player1: {fileID: 1254139629} - player2: {fileID: 1579580564} - bloodManager: {fileID: 640312359} - rope: {fileID: 1920006248} - mopSizeIncrease: 1.1 - speedIncrease: 1.1 - ropeIncrease: 2 - healthIncrease: 1.1 - damageIncrease: 1.1 - bloodIncrease: 1.1 - reelIncrease: 1.1 - upgradeCost: 100000 - BloodMeter: {fileID: 1411561452} - description: {fileID: 1677146150} ---- !u!114 &1029071975 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1029071971} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 511830d939da6620a9dfbaba9ceb7938, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1029071976 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1029071971} - m_CullTransparentMesh: 1 ---- !u!1 &1174960582 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1174960583} - - component: {fileID: 1174960585} - - component: {fileID: 1174960584} - m_Layer: 5 - m_Name: Upgrade5 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1174960583 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1174960582} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1029071972} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0} - m_AnchorMax: {x: 0.5, y: 0} - m_AnchoredPosition: {x: 0, y: 12} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1174960584 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1174960582} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1174960585 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1174960582} - m_CullTransparentMesh: 1 --- !u!4 &1194834060 stripped Transform: m_CorrespondingSourceObject: {fileID: 320690117028550720, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3} @@ -1470,10 +673,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 651446758998956252, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3} - propertyPath: rumble - value: - objectReference: {fileID: 147729521} - target: {fileID: 1749848915408613053, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3} propertyPath: otherPlayerAttack value: @@ -1482,16 +681,18 @@ PrefabInstance: propertyPath: m_Name value: Player1 objectReference: {fileID: 0} + - target: {fileID: 3389629528887116870, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3} + propertyPath: rope + value: + objectReference: {fileID: 1920006248} + - target: {fileID: 3389629528887116870, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3} + propertyPath: MaxVibration + value: 0.5 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 3120938410244321186, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3} - insertIndex: -1 - addedObject: {fileID: 1254139636} - - targetCorrespondingSourceObject: {fileID: 3120938410244321186, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3} - insertIndex: -1 - addedObject: {fileID: 1254139637} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3} --- !u!114 &1232208433 stripped MonoBehaviour: @@ -1525,287 +726,6 @@ GameObject: m_CorrespondingSourceObject: {fileID: 3120938410244321186, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3} m_PrefabInstance: {fileID: 1232208432} m_PrefabAsset: {fileID: 0} ---- !u!114 &1254139636 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1254139629} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c66441ada081b6c4c841000e83cc2b7a, type: 3} - m_Name: - m_EditorClassIdentifier: - invert: 0 ---- !u!114 &1254139637 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1254139629} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d4d58ce9310f45c42af5d8003f1a832c, type: 3} - m_Name: - m_EditorClassIdentifier: - StepInterval: 0.8 - Volume: 0.25 ---- !u!1 &1377274208 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1377274212} - - component: {fileID: 1377274211} - - component: {fileID: 1377274210} - - component: {fileID: 1377274209} - m_Layer: 5 - m_Name: UI - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1377274209 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1377274208} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1377274210 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1377274208} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0.5 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &1377274211 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1377274208} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_VertexColorAlwaysGammaSpace: 0 - m_AdditionalShaderChannelsFlag: 25 - m_UpdateRectTransformForStandalone: 0 - m_SortingLayerID: 0 - m_SortingOrder: 0 - m_TargetDisplay: 0 ---- !u!224 &1377274212 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1377274208} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1029071972} - - {fileID: 2051104236} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} ---- !u!1 &1389439923 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1389439924} - - component: {fileID: 1389439926} - - component: {fileID: 1389439925} - m_Layer: 5 - m_Name: Upgrade3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1389439924 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1389439923} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1029071972} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 0.5} - m_AnchorMax: {x: 1, y: 0.5} - m_AnchoredPosition: {x: -12, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1389439925 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1389439923} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1389439926 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1389439923} - m_CullTransparentMesh: 1 ---- !u!1 &1411561450 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1411561451} - - component: {fileID: 1411561453} - - component: {fileID: 1411561452} - m_Layer: 5 - m_Name: DiabloBlood - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1411561451 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1411561450} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 248416272} - m_Father: {fileID: 1029071972} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 150, y: 150} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1411561452 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1411561450} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 92b791df6229fa882ab01fc4ec5e82d2, type: 3} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 1 - m_FillAmount: 0 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1411561453 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1411561450} - m_CullTransparentMesh: 1 --- !u!1001 &1452965467 PrefabInstance: m_ObjectHideFlags: 0 @@ -3194,38 +2114,62 @@ Transform: m_CorrespondingSourceObject: {fileID: 7963277203851359012, guid: 4272a1edbb0783e4c9af0d318ea4e861, type: 3} m_PrefabInstance: {fileID: 1452965467} m_PrefabAsset: {fileID: 0} +--- !u!1 &1481267922 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1481267923} + m_Layer: 0 + m_Name: damageTexts + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1481267923 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1481267922} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -11.037183, y: -2.1713283, z: -10.039575} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1566837117 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 809911508645467208, guid: ec5007446d8bbca48bf02b3a7e752da1, type: 3} + m_PrefabInstance: {fileID: 1683288374126251321} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1566837120 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1566837117} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: aab27275f26e5e244856836f6d17b909, type: 3} + m_Name: + m_EditorClassIdentifier: + textParent: {fileID: 1481267923} + damageTextPrefab: {fileID: 8357464303304312906, guid: 25c9a2db8fc5b7c4f8feebba5c73e7a3, type: 3} + lifeTime: 3 --- !u!1 &1579580564 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3120938410244321186, guid: 30e0cc55a67f02d4f92b2677ec4b1511, type: 3} m_PrefabInstance: {fileID: 869964773} m_PrefabAsset: {fileID: 0} ---- !u!114 &1579580571 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1579580564} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: c66441ada081b6c4c841000e83cc2b7a, type: 3} - m_Name: - m_EditorClassIdentifier: - invert: 0 ---- !u!114 &1579580572 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1579580564} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d4d58ce9310f45c42af5d8003f1a832c, type: 3} - m_Name: - m_EditorClassIdentifier: - StepInterval: 0.8 - Volume: 0.25 --- !u!1 &1600052931 GameObject: m_ObjectHideFlags: 0 @@ -3294,140 +2238,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1677146148 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1677146149} - - component: {fileID: 1677146151} - - component: {fileID: 1677146150} - m_Layer: 5 - m_Name: Description - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1677146149 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1677146148} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1029071972} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: 25} - m_SizeDelta: {x: 200, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1677146150 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1677146148} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_text: - m_isRightToLeft: 0 - m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} - m_fontSharedMaterials: [] - m_fontMaterial: {fileID: 0} - m_fontMaterials: [] - m_fontColor32: - serializedVersion: 2 - rgba: 4294967295 - m_fontColor: {r: 1, g: 1, b: 1, a: 1} - m_enableVertexGradient: 0 - m_colorMode: 3 - m_fontColorGradient: - topLeft: {r: 1, g: 1, b: 1, a: 1} - topRight: {r: 1, g: 1, b: 1, a: 1} - bottomLeft: {r: 1, g: 1, b: 1, a: 1} - bottomRight: {r: 1, g: 1, b: 1, a: 1} - m_fontColorGradientPreset: {fileID: 0} - m_spriteAsset: {fileID: 0} - m_tintAllSprites: 0 - m_StyleSheet: {fileID: 0} - m_TextStyleHashCode: -1183493901 - m_overrideHtmlColors: 0 - m_faceColor: - serializedVersion: 2 - rgba: 4294967295 - m_fontSize: 36 - m_fontSizeBase: 36 - m_fontWeight: 400 - m_enableAutoSizing: 0 - m_fontSizeMin: 18 - m_fontSizeMax: 72 - m_fontStyle: 0 - m_HorizontalAlignment: 2 - m_VerticalAlignment: 256 - m_textAlignment: 65535 - m_characterSpacing: 0 - m_wordSpacing: 0 - m_lineSpacing: 0 - m_lineSpacingMax: 0 - m_paragraphSpacing: 0 - m_charWidthMaxAdj: 0 - m_enableWordWrapping: 1 - m_wordWrappingRatios: 0.4 - m_overflowMode: 0 - m_linkedTextComponent: {fileID: 0} - parentLinkedComponent: {fileID: 0} - m_enableKerning: 1 - m_enableExtraPadding: 0 - checkPaddingRequired: 0 - m_isRichText: 1 - m_parseCtrlCharacters: 1 - m_isOrthographic: 1 - m_isCullingEnabled: 0 - m_horizontalMapping: 0 - m_verticalMapping: 0 - m_uvLineOffset: 0 - m_geometrySortingOrder: 0 - m_IsTextObjectScaleStatic: 0 - m_VertexBufferAutoSizeReduction: 0 - m_useMaxVisibleDescender: 1 - m_pageToDisplay: 1 - m_margin: {x: 0, y: 0, z: 0, w: 0} - m_isUsingLegacyAnimationComponent: 0 - m_isVolumetricText: 0 - m_hasFontAssetChanged: 0 - m_baseMaterial: {fileID: 0} - m_maskOffset: {x: 0, y: 0, z: 0, w: 0} ---- !u!222 &1677146151 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1677146148} - m_CullTransparentMesh: 1 --- !u!1 &1872712129 GameObject: m_ObjectHideFlags: 0 @@ -3477,81 +2287,6 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1895331451 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1895331452} - - component: {fileID: 1895331454} - - component: {fileID: 1895331453} - m_Layer: 5 - m_Name: Upgrade1 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1895331452 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1895331451} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1029071972} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 1} - m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 0, y: -12} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1895331453 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1895331451} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1895331454 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1895331451} - m_CullTransparentMesh: 1 --- !u!114 &1920006248 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 7717684785049474632, guid: 0248db69242a3dd47898c6742b6c9f60, type: 3} @@ -3563,192 +2298,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 27ac133d9e10e544ba603e07122e3359, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &1975248707 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1975248708} - - component: {fileID: 1975248710} - - component: {fileID: 1975248709} - m_Layer: 5 - m_Name: Upgrade2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1975248708 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1975248707} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1029071972} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 1, y: 1} - m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: -44, y: -44} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &1975248709 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1975248707} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &1975248710 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1975248707} - m_CullTransparentMesh: 1 ---- !u!1 &2051104235 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2051104236} - m_Layer: 5 - m_Name: TimerUI - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2051104236 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2051104235} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 353363866} - m_Father: {fileID: 1377274212} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 100, y: 100} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &2107662970 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2107662971} - - component: {fileID: 2107662973} - - component: {fileID: 2107662972} - m_Layer: 5 - m_Name: Upgrade7 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2107662971 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2107662970} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1029071972} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0.5} - m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 12, y: 0} - m_SizeDelta: {x: 50, y: 50} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!114 &2107662972 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2107662970} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Material: {fileID: 0} - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 3 - m_PreserveAspect: 0 - m_FillCenter: 1 - m_FillMethod: 4 - m_FillAmount: 1 - m_FillClockwise: 1 - m_FillOrigin: 0 - m_UseSpriteMesh: 0 - m_PixelsPerUnitMultiplier: 1 ---- !u!222 &2107662973 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2107662970} - m_CullTransparentMesh: 1 --- !u!1001 &1683288374126251321 PrefabInstance: m_ObjectHideFlags: 0 @@ -3801,15 +2350,127 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 6372697238776542044, guid: ec5007446d8bbca48bf02b3a7e752da1, type: 3} - propertyPath: audioLibrary + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 809911508645467208, guid: ec5007446d8bbca48bf02b3a7e752da1, type: 3} + insertIndex: -1 + addedObject: {fileID: 1566837120} + m_SourcePrefab: {fileID: 100100000, guid: ec5007446d8bbca48bf02b3a7e752da1, type: 3} +--- !u!1001 &4158834148864819266 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 2458716502903188221, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: rope value: - objectReference: {fileID: 11400000, guid: 90a0ccefc407688499165286d0638124, type: 2} + objectReference: {fileID: 1920006248} + - target: {fileID: 2458716502903188221, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: player1 + value: + objectReference: {fileID: 1254139629} + - target: {fileID: 2458716502903188221, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: player2 + value: + objectReference: {fileID: 1579580564} + - target: {fileID: 2458716502903188221, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: bloodManager + value: + objectReference: {fileID: 640312359} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_Pivot.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_Pivot.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_AnchorMax.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_AnchorMax.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_AnchorMin.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_AnchorMin.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_SizeDelta.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_SizeDelta.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_AnchoredPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_AnchoredPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 2603779566095873902, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7301411897347746173, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} + propertyPath: m_Name + value: UI + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: ec5007446d8bbca48bf02b3a7e752da1, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 48e0e53445d42474895d37a321c39d1c, type: 3} --- !u!1001 &4910321061857220295 PrefabInstance: m_ObjectHideFlags: 0 @@ -3899,14 +2560,6 @@ PrefabInstance: propertyPath: players.Array.data[1] value: objectReference: {fileID: 1579580564} - - target: {fileID: 3603265075407754381, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} - propertyPath: difficultyIncreasePerWave - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 5510899577631708383, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} - propertyPath: m_RenderPostProcessing - value: 1 - objectReference: {fileID: 0} - target: {fileID: 5959206239141280122, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -3954,81 +2607,8 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: - - targetCorrespondingSourceObject: {fileID: 2173372557174057003, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} - insertIndex: -1 - addedObject: {fileID: 5796191506433166636} + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} ---- !u!4 &5796191506433166634 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 8946450710138871461, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} - m_PrefabInstance: {fileID: 5796191506433166633} - m_PrefabAsset: {fileID: 0} ---- !u!1 &5796191506433166635 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2173372557174057003, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} - m_PrefabInstance: {fileID: 5796191506433166633} - m_PrefabAsset: {fileID: 0} ---- !u!114 &5796191506433166636 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5796191506433166635} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 948f4100a11a5c24981795d21301da5c, type: 3} - m_Name: - m_EditorClassIdentifier: - volumeTrigger: {fileID: 5796191506433166634} - volumeLayer: - serializedVersion: 2 - m_Bits: 257 - stopNaNPropagation: 1 - finalBlitToCameraTarget: 0 - antialiasingMode: 0 - temporalAntialiasing: - jitterSpread: 0.75 - sharpness: 0.25 - stationaryBlending: 0.95 - motionBlending: 0.85 - subpixelMorphologicalAntialiasing: - quality: 2 - fastApproximateAntialiasing: - fastMode: 0 - keepAlpha: 0 - fog: - enabled: 1 - excludeSkybox: 1 - debugLayer: - lightMeter: - width: 512 - height: 256 - showCurves: 1 - histogram: - width: 512 - height: 256 - channel: 3 - waveform: - exposure: 0.12 - height: 256 - vectorscope: - size: 256 - exposure: 0.12 - overlaySettings: - linearDepth: 0 - motionColorIntensity: 4 - motionGridSize: 64 - colorBlindnessType: 0 - colorBlindnessStrength: 1 - m_Resources: {fileID: 11400000, guid: d82512f9c8e5d4a4d938b575d47f88d4, type: 2} - m_ShowToolkit: 0 - m_ShowCustomSorter: 0 - breakBeforeColorGrading: 0 - m_BeforeTransparentBundles: [] - m_BeforeStackBundles: [] - m_AfterStackBundles: [] --- !u!1001 &7693964683212020007 PrefabInstance: m_ObjectHideFlags: 0 @@ -4098,6 +2678,10 @@ PrefabInstance: propertyPath: m_Name value: Blood objectReference: {fileID: 0} + - target: {fileID: 4056614590725156132, guid: a99c6b890ab711f4faebdfd6335c5f16, type: 3} + propertyPath: RumbleAmount + value: 100 + objectReference: {fileID: 0} - target: {fileID: 6363525508243884259, guid: a99c6b890ab711f4faebdfd6335c5f16, type: 3} propertyPath: m_LocalPosition.x value: 0 @@ -4148,7 +2732,7 @@ SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 1683288374126251321} - - {fileID: 1377274212} + - {fileID: 4158834148864819266} - {fileID: 1600052934} - {fileID: 480860136} - {fileID: 150061137} @@ -4159,3 +2743,4 @@ SceneRoots: - {fileID: 8530121857647845872} - {fileID: 5796191506433166633} - {fileID: 1872712131} + - {fileID: 1481267923} diff --git a/Assets/Scenes/MainMenu.unity b/Assets/Scenes/MainMenu.unity index e21514d..b588516 100644 --- a/Assets/Scenes/MainMenu.unity +++ b/Assets/Scenes/MainMenu.unity @@ -954,6 +954,50 @@ Animation: m_PlayAutomatically: 1 m_AnimatePhysics: 0 m_CullingType: 0 +--- !u!1 &576358554 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 576358556} + - component: {fileID: 576358555} + m_Layer: 0 + m_Name: Sounds + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &576358555 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 576358554} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 040287643b9fdae4095a418d31927fde, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!4 &576358556 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 576358554} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: -14.201913, y: -13.266354, z: 10.06106} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &595937125 GameObject: m_ObjectHideFlags: 0 @@ -2141,3 +2185,4 @@ SceneRoots: - {fileID: 2132464283} - {fileID: 1304688535} - {fileID: 2057478380} + - {fileID: 576358556} diff --git a/Assets/Scenes/PrefabTest.unity b/Assets/Scenes/PrefabTest.unity index 11a4a1f..46b8c1d 100644 --- a/Assets/Scenes/PrefabTest.unity +++ b/Assets/Scenes/PrefabTest.unity @@ -131,10 +131,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2938081276856164938, guid: ad94da4dcc3c6204494b1b223e3ad6bd, type: 3} - propertyPath: maxHealth - value: 180 - objectReference: {fileID: 0} - target: {fileID: 3920219362688286786, guid: ad94da4dcc3c6204494b1b223e3ad6bd, type: 3} propertyPath: m_LocalPosition.x value: 5.060853 @@ -192,10 +188,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2938081276856164938, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} - propertyPath: maxHealth - value: 180 - objectReference: {fileID: 0} - target: {fileID: 3920219362688286786, guid: 39cfda8bd2b0ae8438cdc0c54355b57a, type: 3} propertyPath: m_LocalPosition.x value: 8.718343 @@ -253,10 +245,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2938081276856164938, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} - propertyPath: maxHealth - value: 250 - objectReference: {fileID: 0} - target: {fileID: 3920219362688286786, guid: 8def55d0ae3630644b661b55945b88ab, type: 3} propertyPath: m_LocalPosition.x value: -11.131151 @@ -314,10 +302,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2938081276856164938, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} - propertyPath: maxHealth - value: 160 - objectReference: {fileID: 0} - target: {fileID: 3920219362688286786, guid: 8e3efe9ba9a961e4883e6d4b3bede1b3, type: 3} propertyPath: m_LocalPosition.x value: 2.8130238 @@ -375,10 +359,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2938081276856164938, guid: af739fea850caf944ac8c1932d2ec386, type: 3} - propertyPath: maxHealth - value: 180 - objectReference: {fileID: 0} - target: {fileID: 3920219362688286786, guid: af739fea850caf944ac8c1932d2ec386, type: 3} propertyPath: m_LocalPosition.x value: 6.8515005 @@ -573,10 +553,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2938081276856164938, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} - propertyPath: maxHealth - value: 160 - objectReference: {fileID: 0} - target: {fileID: 3920219362688286786, guid: 29618f067a17cd94eb329fa634e06f5a, type: 3} propertyPath: m_LocalPosition.x value: -4.2352614 @@ -634,10 +610,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2938081276856164938, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} - propertyPath: maxHealth - value: 130 - objectReference: {fileID: 0} - target: {fileID: 3920219362688286786, guid: 363f3bb5d515d994ea8bfb37232263b0, type: 3} propertyPath: m_LocalPosition.x value: -3.7018778 @@ -695,10 +667,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2938081276856164938, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} - propertyPath: maxHealth - value: 160 - objectReference: {fileID: 0} - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} propertyPath: m_LocalPosition.x value: -11.016855 @@ -756,10 +724,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2938081276856164938, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} - propertyPath: maxHealth - value: 130 - objectReference: {fileID: 0} - target: {fileID: 3920219362688286786, guid: 23e5e0951502e6d49bc400d919073d4b, type: 3} propertyPath: m_LocalPosition.x value: -0.9206641 @@ -817,10 +781,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2938081276856164938, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} - propertyPath: maxHealth - value: 250 - objectReference: {fileID: 0} - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} propertyPath: m_LocalPosition.x value: -14.902936 @@ -878,10 +838,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2938081276856164938, guid: f808ad67f6a747241a310437e433c828, type: 3} - propertyPath: maxHealth - value: 110 - objectReference: {fileID: 0} - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} propertyPath: m_LocalPosition.x value: -2.4065187 @@ -996,10 +952,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2938081276856164938, guid: 40512b69b08d56d498aa78823087362c, type: 3} - propertyPath: maxHealth - value: 130 - objectReference: {fileID: 0} - target: {fileID: 3920219362688286786, guid: 40512b69b08d56d498aa78823087362c, type: 3} propertyPath: m_LocalPosition.x value: -7.5879583 @@ -1239,10 +1191,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2938081276856164938, guid: f48e8133073214446b0889b26d867b03, type: 3} - propertyPath: maxHealth - value: 110 - objectReference: {fileID: 0} - target: {fileID: 3920219362688286786, guid: f48e8133073214446b0889b26d867b03, type: 3} propertyPath: m_LocalPosition.x value: 0.18420205 @@ -1300,10 +1248,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2938081276856164938, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} - propertyPath: maxHealth - value: 250 - objectReference: {fileID: 0} - target: {fileID: 3920219362688286786, guid: fa674b5c4ab900d439c6188142bfd1b5, type: 3} propertyPath: m_LocalPosition.x value: -15.0934305 @@ -1361,10 +1305,6 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2938081276856164938, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} - propertyPath: maxHealth - value: 110 - objectReference: {fileID: 0} - target: {fileID: 3920219362688286786, guid: 8c660e9fc6ef07843a373f99149d1849, type: 3} propertyPath: m_LocalPosition.x value: 2.8892193 diff --git a/Assets/Scripts/BloodComputeShader.cs b/Assets/Scripts/BloodComputeShader.cs index 73bfad3..d4d0946 100644 --- a/Assets/Scripts/BloodComputeShader.cs +++ b/Assets/Scripts/BloodComputeShader.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using ComputeShaderUtility; @@ -33,6 +34,8 @@ public class BloodComputeShader : MonoBehaviour public float splatterVolume = 0.0f; public AudioSource splatterPlayer; + public float RumbleAmount = 100; + ComputeBuffer particleBuffer; ComputeBuffer positionBuffer; ComputeBuffer numParticlesConsumedBuffer; @@ -158,6 +161,9 @@ public class BloodComputeShader : MonoBehaviour score += bufferData[0]; + float mappedRumble = Convert.ToSingle(bufferData[0]).Remap(0, RumbleAmount, 0, 0.1f); + //RumbleManager.StartRumble(-1, 0, mappedRumble, 0.1f); + squeakVolume += 0.1f; // Reset counter @@ -264,7 +270,7 @@ public class BloodComputeShader : MonoBehaviour bloodCompute.SetVector("particleInitPos", loc); bloodCompute.SetInt("particlesToInitialize", found); - Vector3 pow = Random.insideUnitSphere * power; + Vector3 pow = UnityEngine.Random.insideUnitSphere * power; pow.z = Mathf.Abs(pow.z); bloodCompute.SetVector("initialVelocity",pow); diff --git a/Assets/Scripts/Controller/EnemySpawner/EnemySpawner.cs b/Assets/Scripts/Controller/EnemySpawner/EnemySpawner.cs index ba19bdb..af02df7 100644 --- a/Assets/Scripts/Controller/EnemySpawner/EnemySpawner.cs +++ b/Assets/Scripts/Controller/EnemySpawner/EnemySpawner.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Threading; using System.Threading.Tasks; +using Unity.Mathematics; using Unity.VisualScripting; using UnityEngine; using UnityEngine.AI; @@ -16,8 +17,7 @@ public class EnemySpawner : MonoBehaviour public float difficulty = 1f; // Inspector - [SerializeField] private float difficultyIncreasePerWave = 0.1f; - [SerializeField] private float difficultyMultiplyDecreasePerWave = 0.1f; + [SerializeField] private float difficultyIncreasePerWave = 1f; [SerializeField] private float WaveTime = 20f; [SerializeField] private List enemyDifficulties; [SerializeField] private float SpawnRadius = 10; @@ -61,11 +61,7 @@ public class EnemySpawner : MonoBehaviour SpawnWave(difficulty); Wave++; - if (difficultyIncreasePerWave > 1f) - { - difficultyIncreasePerWave -= difficultyMultiplyDecreasePerWave; - difficulty *= difficultyIncreasePerWave + 1; - } + difficulty *= MathF.Cbrt(difficultyIncreasePerWave); nextWaveRequested = false; timer = 0; } diff --git a/Assets/Scripts/Controller/PS5Controller.cs b/Assets/Scripts/Controller/PS5Controller.cs index 19d3d5e..d94ad6e 100644 --- a/Assets/Scripts/Controller/PS5Controller.cs +++ b/Assets/Scripts/Controller/PS5Controller.cs @@ -17,6 +17,6 @@ public class PS5Controller : MonoBehaviour // Update is called once per frame void Update() { - + Gamepad.all[0].SetMotorSpeeds(100, 100); } } diff --git a/Assets/Scripts/Controller/RumbleManager.cs b/Assets/Scripts/Controller/RumbleManager.cs deleted file mode 100644 index f801e27..0000000 --- a/Assets/Scripts/Controller/RumbleManager.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.InputSystem; - -public class RumbleManager : MonoBehaviour -{ - private Gamepad pad; - - private Coroutine stopRumbleAfterTimeCorutine; - - - public void RumblePulse(float lowFrequency, float highFrequency, float duration, int player) - { - pad = Gamepad.all[player]; - if (pad != null) - { - pad.SetMotorSpeeds(lowFrequency, highFrequency); - - stopRumbleAfterTimeCorutine = StartCoroutine(stopRumble(duration, pad)); - } - } - - private IEnumerator stopRumble(float duration, Gamepad pad) - { - float elapsedTime = 0f; - while (elapsedTime < duration) - { - elapsedTime += Time.deltaTime; - yield return null; - } - - pad.SetMotorSpeeds(0f, 0f); - } -} diff --git a/Assets/Scripts/Enemy/EnemyAnimationHandler.cs b/Assets/Scripts/Enemy/EnemyAnimationHandler.cs index 3c902f3..6622649 100644 --- a/Assets/Scripts/Enemy/EnemyAnimationHandler.cs +++ b/Assets/Scripts/Enemy/EnemyAnimationHandler.cs @@ -7,6 +7,8 @@ public class EnemyAnimationHandler : MonoBehaviour { Animator animator; bool isDying = false; + + public GameObject healthBar; void Start() { animator = GetComponent(); @@ -17,8 +19,9 @@ public class EnemyAnimationHandler : MonoBehaviour } void EnemyDie() { - //GetComponent().enabled = false; - //GetComponent().enabled = false; + GetComponentInParent().enabled = false; + GetComponentInParent().enabled = false; + if (!isDying) StartCoroutine(AnimationDie()); isDying = true; @@ -27,7 +30,7 @@ public class EnemyAnimationHandler : MonoBehaviour IEnumerator AnimationDie() { Strangle(); - Debug.Log("Strangle"); + //Debug.Log("Strangle"); yield return new WaitForSecondsRealtime(0.1f); Die(); } @@ -39,6 +42,7 @@ public class EnemyAnimationHandler : MonoBehaviour public void Die() { animator.SetTrigger("Die"); + AudioManager.PlaySound("Slice_Enemy_SFX", transform.position).volume = 0.65f; } public void DestroyGameobject() { diff --git a/Assets/Scripts/Enemy/EnemyPathFinding.cs b/Assets/Scripts/Enemy/EnemyPathFinding.cs index e521546..af8b395 100644 --- a/Assets/Scripts/Enemy/EnemyPathFinding.cs +++ b/Assets/Scripts/Enemy/EnemyPathFinding.cs @@ -1,3 +1,4 @@ +using System; using System.Collections; using System.Collections.Generic; using System.Linq; @@ -11,13 +12,24 @@ public class EnemyPathFinding : MonoBehaviour [SerializeField] private float ropeDistCheck = 1f; [SerializeField] private LayerMask ropeCheckMask; + private HealthComponent healthComponent; + NavMeshAgent agent; private void Start() { agent = GetComponent(); agent.updateRotation = false; agent.updateUpAxis = false; + + healthComponent = GetComponent(); + healthComponent.OnHealthZero.AddListener(Rumble); } + + private void Rumble() + { + RumbleManager.StartRumble(-1, 1f, 1f, 0.5f); + } + private void Update() { if (targets.Length == 0) return; @@ -30,7 +42,7 @@ public class EnemyPathFinding : MonoBehaviour if (Physics2D.Raycast(transform.position, dir.normalized, ropeDistCheck, ropeCheckMask)) return; - agent.SetDestination(closestTarget.position); + try { agent.SetDestination(closestTarget.position); } catch { }// Fuck this error. } private Transform GetClosestTarget() diff --git a/Assets/Scripts/Extensions/FloatExtensions.cs b/Assets/Scripts/Extensions/FloatExtensions.cs new file mode 100644 index 0000000..111d506 --- /dev/null +++ b/Assets/Scripts/Extensions/FloatExtensions.cs @@ -0,0 +1,29 @@ +using System.Collections; +using System.Collections.Generic; +using Unity.Mathematics; + +public static class FloatExtensions +{ + /// + /// Refrence link: https://forum.unity.com/attachments/upload_2021-1-14_13-8-33-png.773578/ + /// + public static float Remap(this float from, float fromMin, float fromMax, float toMin, float toMax) + { + var fromAbs = from - fromMin; + var fromMaxAbs = fromMax - fromMin; + + var normal = fromAbs / fromMaxAbs; + + var toMaxAbs = toMax - toMin; + var toAbs = toMaxAbs * normal; + + var to = toAbs + toMin; + + return to; + } + + /// + /// Just clamps the value between two numbers (Easier to write) + /// + public static float Clamp(this float input, float min, float max) => math.clamp(input, min, max); +} diff --git a/Assets/Scripts/Extensions/FloatExtensions.cs.meta b/Assets/Scripts/Extensions/FloatExtensions.cs.meta new file mode 100644 index 0000000..0f5a4a8 --- /dev/null +++ b/Assets/Scripts/Extensions/FloatExtensions.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: f285fcef3bcd16648a7d1bc02576bad3 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Extensions/Vector3Extensions.cs b/Assets/Scripts/Extensions/Vector3Extensions.cs index b5c3fe0..e7d108f 100644 --- a/Assets/Scripts/Extensions/Vector3Extensions.cs +++ b/Assets/Scripts/Extensions/Vector3Extensions.cs @@ -1,3 +1,5 @@ +using System.Collections.Generic; +using System; using UnityEngine; namespace UnityUtils @@ -56,5 +58,22 @@ namespace UnityUtils v1.y != 0 ? v0.y / v1.y : v0.y, v1.z != 0 ? v0.z / v1.z : v0.z); } + public static Vector3 Mean(this List vectors) + { + if (vectors == null || vectors.Count == 0) + { + throw new ArgumentException("The input list of vectors is empty or null."); + } + + Vector3 sum = Vector3.zero; + + foreach (var vector in vectors) + { + sum += vector; + } + + return sum / vectors.Count; + } } + } diff --git a/Assets/Scripts/Managers/AudioManager/AudioManager.cs b/Assets/Scripts/Managers/AudioManager/AudioManager.cs index 6194e8d..4c4a798 100644 --- a/Assets/Scripts/Managers/AudioManager/AudioManager.cs +++ b/Assets/Scripts/Managers/AudioManager/AudioManager.cs @@ -36,7 +36,7 @@ public class AudioManager : MonoBehaviour return Instance.audioLibrary.Clips.First(x => x.name == nameOfClip); } - public static AudioSource PlaySound(string nameOfClip, Vector3 sourcePos, bool is3D = true, bool loop = false, bool fadeIn = false) + public static AudioSource PlaySound(string nameOfClip, Vector3 sourcePos, bool manuallyHandle = false, bool is3D = true, bool loop = false, bool fadeIn = false) { if (Instance == null) { @@ -57,7 +57,8 @@ public class AudioManager : MonoBehaviour audioSource.spatialBlend = 1f; } - Instance.StartCoroutine(Instance.StartSound(audioSource, fadeIn)); + if (!manuallyHandle) + Instance.StartCoroutine(Instance.StartSound(audioSource, fadeIn)); return audioSource; } diff --git a/Assets/Scripts/Misc/HealthBar.cs b/Assets/Scripts/Misc/HealthBar.cs index be05978..8a1a18f 100644 --- a/Assets/Scripts/Misc/HealthBar.cs +++ b/Assets/Scripts/Misc/HealthBar.cs @@ -14,17 +14,27 @@ public class HealthBar : MonoBehaviour private void OnEnable() { - attachedHealth.OnHealthChange.AddListener(UpdateHealthBar); + if (healthBarImg != null) + attachedHealth.OnHealthChange.AddListener(UpdateHealthBar); } private void OnDisable() { - attachedHealth.OnHealthChange.RemoveListener(UpdateHealthBar); + if (healthBarImg != null) + attachedHealth.OnHealthChange.RemoveListener(UpdateHealthBar); } private void UpdateHealthBar(float prevHealth, float newHealth) { float percent = newHealth / attachedHealth.getMaxHealth(); healthBarImg.fillAmount = percent; + if (percent <= 0) + { + for (int i = 0; i < transform.childCount; i++) + { + transform.GetChild(i).gameObject.SetActive(false); + + } + } } } diff --git a/Assets/Scripts/Misc/MainMenuMusic.cs b/Assets/Scripts/Misc/MainMenuMusic.cs new file mode 100644 index 0000000..0655f09 --- /dev/null +++ b/Assets/Scripts/Misc/MainMenuMusic.cs @@ -0,0 +1,11 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class MainMenuMusic : MonoBehaviour +{ + void Start() + { + AudioManager.PlaySound("", new Vector3(0f, 0f, 0f)).volume = 1f; + } +} diff --git a/Assets/Scripts/Misc/MainMenuMusic.cs.meta b/Assets/Scripts/Misc/MainMenuMusic.cs.meta new file mode 100644 index 0000000..4662991 --- /dev/null +++ b/Assets/Scripts/Misc/MainMenuMusic.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 040287643b9fdae4095a418d31927fde +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Player/HealthComponent.cs b/Assets/Scripts/Player/HealthComponent.cs index dc4b7bb..25aedc0 100644 --- a/Assets/Scripts/Player/HealthComponent.cs +++ b/Assets/Scripts/Player/HealthComponent.cs @@ -74,10 +74,13 @@ public class HealthComponent : MonoBehaviour, ISquezeDamageReceiver OnHealthZero?.Invoke(); - int blood = (int)(maxHealth * 100.0f * BloodComputeShader.Instance.scoreMult); + if (BloodComputeShader.Instance != null) + { + int blood = (int)(maxHealth * 100.0f * BloodComputeShader.Instance.scoreMult); - BloodComputeShader.Instance.createBlood(transform.position, blood/2, maxHealth / 8.0f); - BloodComputeShader.Instance.createBlood(transform.position, blood / 2, maxHealth / 8.0f); + BloodComputeShader.Instance.createBlood(transform.position, blood / 2, maxHealth / 8.0f); + BloodComputeShader.Instance.createBlood(transform.position, blood / 2, maxHealth / 8.0f); + } } } diff --git a/Assets/Scripts/Player/PlayerAnimationHandler.cs b/Assets/Scripts/Player/PlayerAnimationHandler.cs index 02cc3e5..bf62282 100644 --- a/Assets/Scripts/Player/PlayerAnimationHandler.cs +++ b/Assets/Scripts/Player/PlayerAnimationHandler.cs @@ -4,7 +4,7 @@ using UnityEngine; public class PlayerAnimationHandler : MonoBehaviour { - Animator animator; + public Animator animator; void Start() { @@ -19,9 +19,9 @@ public class PlayerAnimationHandler : MonoBehaviour { animator.SetBool("IsRunning", state); } - public void Swing() + public void Swing(bool state) { - animator.SetTrigger("Swing"); + animator.SetBool("IsSwinging", state); } public void Mop() { diff --git a/Assets/Scripts/Player/PlayerMovement.cs b/Assets/Scripts/Player/PlayerMovement.cs index 27e8a5f..6e7e2bd 100644 --- a/Assets/Scripts/Player/PlayerMovement.cs +++ b/Assets/Scripts/Player/PlayerMovement.cs @@ -3,6 +3,8 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.InputSystem; using System.Linq; +using UnityEngine.Windows; +using UnityEngine.InputSystem.DualShock; [RequireComponent(typeof(PlayerInput))] public class PlayerMovement : MonoBehaviour @@ -13,11 +15,6 @@ public class PlayerMovement : MonoBehaviour private bool right = false; - private bool vibrate = false; - [SerializeField] private float stepCooldown = 0.05f; - [SerializeField] private float stepVibrationTime = 0.05f; - - [SerializeField] private GameObject rumble; [Header("Whipping")] [SerializeField] @@ -44,21 +41,24 @@ public class PlayerMovement : MonoBehaviour playerInput.useArrowKeys = true; } - StartCoroutine(ToggleWithDelay()); + if (playerInput.controller != null) + { + var pad = (DualShockGamepad)Gamepad.all.ElementAtOrDefault(playerInput.PlayerNum); + if (pad == null) return; + + if (playerInput.PlayerNum == 1) + pad.SetLightBarColor(Color.red); + } } - void Update() + private void Update() { if (playerInput.movement != Vector2.zero) - { - RumbleWalk(); animationHandler.Run(true); - } else - { animationHandler.Run(false); - } } + private void FixedUpdate() { if (whipAttack.IsBeingWhipped) @@ -81,37 +81,4 @@ public class PlayerMovement : MonoBehaviour } } - private void RumbleWalk() - { - if (vibrate && playerInput.controller != null) - { - if (right) - { - rumble.GetComponent().RumblePulse(0.0f, 0.004f, stepVibrationTime, playerInput.PlayerNum); - right = false; - } - else if (!right) - { - rumble.GetComponent().RumblePulse(0.004f, 0.0f, stepVibrationTime, playerInput.PlayerNum); - right = true; - } - vibrate = false; - } - } - private IEnumerator ToggleWithDelay() - { - while (true) - { - vibrate = !vibrate; - yield return new WaitForSeconds(stepCooldown); - } - } - - void OnCollisionStay2D(Collision2D collision) - { - if (collision.otherCollider.gameObject.CompareTag("Enemy")) - { // Other object is an enemy - hp.TakeDamage(1f); - } - } } diff --git a/Assets/Scripts/Player/RopeWhipAttack.cs b/Assets/Scripts/Player/RopeWhipAttack.cs index a3e1ef1..b1cd6e1 100644 --- a/Assets/Scripts/Player/RopeWhipAttack.cs +++ b/Assets/Scripts/Player/RopeWhipAttack.cs @@ -3,9 +3,11 @@ using System.Collections.Generic; using UnityEngine; using UnityEngine.InputSystem; using System.Linq; +using UnityUtils; public class RopeWhipAttack : MonoBehaviour { + [SerializeField] PlayerAnimationHandler animationHandler; [SerializeField] PlayerInput playerInput; public RopeWhipAttack otherPlayerAttack; @@ -28,13 +30,43 @@ public class RopeWhipAttack : MonoBehaviour if (playerInput.whipAttack) { + // reset local scale so rotations match up + transform.localScale = transform.localScale.With(x: 1f); + + animationHandler.Swing(true); + animationHandler.animator.speed = 0f; + float radianAngle = CalculateAngleBetwenRight(); + float sign = Mathf.Sign(radianAngle); + + //if (sign < 0) + // transform.localScale = transform.localScale.With(x: -1f); + //else + // transform.localScale = transform.localScale.With(x: 1f); + + float t = Mathf.Abs(radianAngle) / 360; + + if (sign > 0) + t -= (radianAngle - 180) / 180 * sign; + + //Debug.Log($"angle: {radianAngle}, t: {t}, sgn: {sign}"); + animationHandler.animator.Play("Swing", 0, t); joint.locked = true; otherPlayerAttack.joint.body.drag = 0f; } else { + animationHandler.Swing(false); + animationHandler.animator.speed = 1f; + animationHandler.animator.StopPlayback(); joint.locked = false; otherPlayerAttack.joint.body.drag = otherPlayerAttack.initialDrag; } } + + float CalculateAngleBetwenRight() + { + Vector2 ropeDir = (otherPlayerAttack.joint.anchor.position - joint.anchor.position).normalized; + float angle = Vector2.SignedAngle(Vector2.right, ropeDir); + return angle; + } } diff --git a/Assets/Scripts/Player/SpriteMovementFlipper.cs b/Assets/Scripts/Player/SpriteMovementFlipper.cs index 64b8105..c4e9b76 100644 --- a/Assets/Scripts/Player/SpriteMovementFlipper.cs +++ b/Assets/Scripts/Player/SpriteMovementFlipper.cs @@ -1,8 +1,10 @@ using UnityEngine; +using UnityUtils; public class SpriteMovementFlipper : MonoBehaviour { - [SerializeField] private bool invert = false; + [SerializeField] Transform flipTrans; + [SerializeField] Rigidbody2D body; SpriteRenderer sp; @@ -15,15 +17,13 @@ public class SpriteMovementFlipper : MonoBehaviour private void Update() { - if ((transform.position - prevPos).x > 0.05f) + if (body.velocity.x > 0.1f) { - sp.flipX = invert; + flipTrans.localScale = flipTrans.localScale.With(x: 1f); } - else if ((transform.position - prevPos).x < -0.05f) + else if (body.velocity.x < -0.1f) { - sp.flipX = !invert; + flipTrans.localScale = flipTrans.localScale.With(x: -1f); } - - prevPos = transform.position; } } \ No newline at end of file diff --git a/Assets/Scripts/Rope/RopeJoint.cs b/Assets/Scripts/Rope/RopeJoint.cs index 89be21e..655fe94 100644 --- a/Assets/Scripts/Rope/RopeJoint.cs +++ b/Assets/Scripts/Rope/RopeJoint.cs @@ -8,6 +8,7 @@ public class RopeJoint : MonoBehaviour public Rigidbody2D body; public bool locked = false; public PlayerInput playerInput; + public PlayerAnimationHandler playerAnimationHandler; public Vector3 position => anchor.position; } diff --git a/Assets/Scripts/Rope/RopeSimulator.cs b/Assets/Scripts/Rope/RopeSimulator.cs index 0750fd5..aec8193 100644 --- a/Assets/Scripts/Rope/RopeSimulator.cs +++ b/Assets/Scripts/Rope/RopeSimulator.cs @@ -54,6 +54,7 @@ public class RopeSimulator : MonoBehaviour public float ropeExtendSpeed, ropeShrinkSpeed; public float squezeDamage = 1f; + public AnimationCurve swingSpeedToDamageMultiplier; [SerializeField] public float ropeMaxLength, ropeMinLength; @@ -62,11 +63,15 @@ public class RopeSimulator : MonoBehaviour [Header("Rendering")] [SerializeField] LineRenderer lineRenderer; + [Header("Animaion")] + [SerializeField] float pullAnimationOvershootThreshold = 0.2f; + int[] order; public float Overshoot => rope.CalculateLengthOvershoot(); + public bool InSwingMode => start.locked || end.locked; - Rope rope; + public Rope rope; Dictionary colliderToSquezeForce = new(); @@ -127,7 +132,7 @@ public class RopeSimulator : MonoBehaviour if (prevSubDivision - (int) subDivision >= 0) return; - // Extend from start + // Max from start rope.points.Insert(1, new Point(rope.points[1].position)); rope.sticks.Clear(); @@ -237,6 +242,27 @@ public class RopeSimulator : MonoBehaviour float overshoot = rope.CalculateLengthOvershoot(); if (overshoot > 0) { + if (overshoot > pullAnimationOvershootThreshold) + { + float startDot = Vector2.Dot((start.position - rope.points[1].position).normalized, start.playerInput.movement); + if (startDot > 0.35f) + { + start.playerAnimationHandler.animator.SetBool("IsPulling", true); + } + + float endDot = Vector2.Dot((end.position - rope.points[rope.points.Count - 2].position).normalized, end.playerInput.movement); + if (endDot > 0.35f) + { + end.playerAnimationHandler.animator.SetBool("IsPulling", true); + } + + } + else + { + start.playerAnimationHandler.animator.SetBool("IsPulling", false); + end.playerAnimationHandler.animator.SetBool("IsPulling", false); + } + //start.position = prevStartPos; float divider = !start.locked && !end.locked ? 2f : 1f; @@ -271,7 +297,9 @@ public class RopeSimulator : MonoBehaviour if (squezeDamageReceiver == null) continue; - squezeDamageReceiver.TakeSquezeDamage(collider.Value * squezeDamage); + + float swingMultiplier = InSwingMode ? swingSpeedToDamageMultiplier.Evaluate((start.locked ? end : start).body.velocity.magnitude) : 1f; + squezeDamageReceiver.TakeSquezeDamage(collider.Value * squezeDamage * swingMultiplier); } // Update line renderer diff --git a/Assets/Scripts/Rumbling.meta b/Assets/Scripts/Rumbling.meta new file mode 100644 index 0000000..7cc883d --- /dev/null +++ b/Assets/Scripts/Rumbling.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4469770a8125fda4ea033ad0c3ba459b +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Rumbling/RopeRumbling.cs b/Assets/Scripts/Rumbling/RopeRumbling.cs new file mode 100644 index 0000000..c0115f9 --- /dev/null +++ b/Assets/Scripts/Rumbling/RopeRumbling.cs @@ -0,0 +1,48 @@ +using System.Collections; +using System.Linq; +using UnityEngine; +using UnityEngine.InputSystem; + +public class RopeRumbling : MonoBehaviour +{ + [SerializeField] private float RopeRubleTolerance = 0.5f; + [SerializeField] private float MaxVibration = 0.8f; + + private PlayerInput pInput; + private Gamepad pad; + + // Rope + [SerializeField] private RopeSimulator rope; + + private void Start() + { + Invoke("LateStart", 0.1f); + } + + void LateStart() + { + pInput = GetComponent(); + pad = Gamepad.all.ElementAtOrDefault(pInput.PlayerNum); + if (pad == null) + { + this.enabled = false; + } + else + { + + } + + hasInit = true; + } + + bool hasInit = false; + private void Update() + { + if (!hasInit) return; + + float ropeClamed = Mathf.Max(0, rope.Overshoot); + float sensitive_mapped = ropeClamed.Remap(0.2f, 1f, 0f, MaxVibration); + float mapped = ropeClamed.Remap(0.9f, 1f, 0f, MaxVibration); + RumbleManager.StartRumble(-1, 0, sensitive_mapped, 0.1f); + } +} diff --git a/Assets/Scripts/Rumbling/RopeRumbling.cs.meta b/Assets/Scripts/Rumbling/RopeRumbling.cs.meta new file mode 100644 index 0000000..19374db --- /dev/null +++ b/Assets/Scripts/Rumbling/RopeRumbling.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 20d294d88e5bc8a42afb1f72751fb61f +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Rumbling/RumbleManager.cs b/Assets/Scripts/Rumbling/RumbleManager.cs new file mode 100644 index 0000000..995dde0 --- /dev/null +++ b/Assets/Scripts/Rumbling/RumbleManager.cs @@ -0,0 +1,139 @@ +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.InputSystem; + +public class RumbleManager : MonoBehaviour +{ + public static RumbleManager Instance { get; private set; } + + public static Gamepad[] pads; + + private class RumbleEffect + { + public float duration; + public float startTime; + public float lowFreq; + public float highFreq; + + public RumbleEffect(float low, float high, float dur) + { + lowFreq = low; + highFreq = high; + duration = dur; + startTime = Time.time; + } + } + + private static Dictionary> playerRumbles = new Dictionary>(); + + private void Awake() + { + if (Instance == null) + { + Instance = this; + DontDestroyOnLoad(gameObject); + for (int i = 0; i < Gamepad.all.Count; i++) + { + playerRumbles[i] = new List(); // Initialize list for each connected controller + } + } + else + { + Destroy(gameObject); + } + + Invoke("LateStart", 0.1f); + } + + void LateStart() + { + pads = Gamepad.all.ToArray(); + initialized = true; + } + + bool initialized = false; + private void Update() + { + if (!initialized) return; + + foreach (var player in playerRumbles.Keys) + { + UpdateRumble(player); + } + } + + private static void UpdateRumble(int player) + { + if (!playerRumbles.ContainsKey(player) || playerRumbles[player].Count == 0) return; + + float maxLowFreq = 0f; + float maxHighFreq = 0f; + bool shouldRumble = false; + + for (int i = playerRumbles[player].Count - 1; i >= 0; i--) + { + RumbleEffect effect = playerRumbles[player][i]; + if (Time.time - effect.startTime >= effect.duration) + { + playerRumbles[player].RemoveAt(i); + } + else + { + shouldRumble = true; + maxLowFreq = Mathf.Max(maxLowFreq, effect.lowFreq); + maxHighFreq = Mathf.Max(maxHighFreq, effect.highFreq); + } + } + + if (shouldRumble) + { + SetMotorSpeeds(player, maxLowFreq, maxHighFreq); + } + else + { + SetMotorSpeeds(player, 0, 0); // Stop rumbling for this player + } + } + + // Now static, allowing it to be called without an instance + public static void StartRumble(int player, float lowFreq, float highFreq, float duration) + { + if (player == -1) // Target both players + { + foreach (var p in playerRumbles.Keys) + { + StartRumbleForPlayer(p, lowFreq, highFreq, duration); + } + } + else // Target a specific player + { + StartRumbleForPlayer(player, lowFreq, highFreq, duration); + } + } + + private static void StartRumbleForPlayer(int player, float lowFreq, float highFreq, float duration) + { + if (!playerRumbles.ContainsKey(player)) + { + playerRumbles[player] = new List(); + } + playerRumbles[player].Add(new RumbleEffect(lowFreq, highFreq, duration)); + } + + public static void StopAllRumbles(int player) + { + if (playerRumbles.ContainsKey(player)) + { + playerRumbles[player].Clear(); + SetMotorSpeeds(player, 0, 0); // Stop rumbling for this player + } + } + + private static void SetMotorSpeeds(int player, float lowFreq, float highFreq) + { + if (player >= 0 && player < pads.Length) + { + pads[player].SetMotorSpeeds(lowFreq, highFreq); + } + } +} diff --git a/Assets/Scripts/Controller/RumbleManager.cs.meta b/Assets/Scripts/Rumbling/RumbleManager.cs.meta similarity index 83% rename from Assets/Scripts/Controller/RumbleManager.cs.meta rename to Assets/Scripts/Rumbling/RumbleManager.cs.meta index 6c06e72..910ffec 100644 --- a/Assets/Scripts/Controller/RumbleManager.cs.meta +++ b/Assets/Scripts/Rumbling/RumbleManager.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 89c1239a77bb4cc43b1a1552d271ab99 +guid: 6cf314e58a8539a448e6ddeb3ad48149 MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Sounding.meta b/Assets/Sounding.meta new file mode 100644 index 0000000..cbf48ff --- /dev/null +++ b/Assets/Sounding.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 4d19feedeaa6e99458ae00d9141125be +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Sounding/RopeSounding.cs b/Assets/Sounding/RopeSounding.cs new file mode 100644 index 0000000..140c043 --- /dev/null +++ b/Assets/Sounding/RopeSounding.cs @@ -0,0 +1,47 @@ +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; +using UnityUtils; + +public class RopeSounding : MonoBehaviour +{ + [SerializeField] private float PlayTime = 1f; + + RopeSimulator rope; + + AudioSource AS; + float playTimeLeft = 0; + + // Update is called once per frame + void Update() + { + if (rope == null) + { + if (TryGetComponent(out rope)) + { + + } + } + + if (AS == null) + { + TryGetComponent(out AS); + AS.Play(); + AS.Pause(); + } + + + if (rope.Overshoot >= 0.5f) + { + Vector3 soundPos = rope.rope.points.Select(x => x.position).ToList().Mean(); + AS.transform.position = soundPos; + AS.UnPause(); + } + else + { + // Pause + AS.Pause(); + } + } +} \ No newline at end of file diff --git a/Assets/Sounding/RopeSounding.cs.meta b/Assets/Sounding/RopeSounding.cs.meta new file mode 100644 index 0000000..c68017e --- /dev/null +++ b/Assets/Sounding/RopeSounding.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 8766ad5393174fa488ef4a58b62181b4 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: