diff --git a/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1DeathAni.anim b/Assets/Animations/EnemyAnimations/3/v1/Enemy3v1DeathAni.anim index 2b324e0..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: 1, 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: 1, 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: 1 + value: -1.1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -121,7 +121,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.23333333 - value: 1 + 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 73f152b..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: 1, 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: 1 + 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 aa377b7..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: 1, 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: 1, 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: 1 + value: -1.1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -121,7 +121,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.23333333 - value: 1 + 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 4c44704..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: 1, 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: 1 + 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 be0dd9d..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: 1, 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: 1, 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: 1 + value: -1.1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -121,7 +130,16 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.23333333 - value: 1 + 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 2a322e1..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: 1, 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: 1 + 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 fa47064..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: 1, 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: 1, 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: 1 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -124,7 +124,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.3 - value: 1 + 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 8dfdb78..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: 1, 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: 1 + 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 860a52c..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: 1, 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: 1, 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: 1 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -124,7 +124,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.3 - value: 1 + 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 7091ff0..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: 1, 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: 1 + 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 538d0a4..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: 1, 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: 1, 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: 1 + value: -1 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -124,7 +124,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.3 - value: 1 + 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 9cdb2ca..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: 1, 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: 1 + 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 4122b07..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: 1, 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: 1, 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: 1 + value: -2.2 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -124,7 +124,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.3 - value: 1 + 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 6c27f74..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: 1, 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: 1 + 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 9a13f25..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: 1, 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: 1, 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: 1 + value: -2.2 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -124,7 +124,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.3 - value: 1 + 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 7c61b23..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: 1, 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: 1 + 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 d556e56..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: 1, 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: 1, 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: 1 + value: -2.2 inSlope: 0 outSlope: 0 tangentMode: 136 @@ -124,7 +124,7 @@ AnimationClip: outWeight: 0.33333334 - serializedVersion: 3 time: 0.3 - value: 1 + 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 0464a30..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: 1, 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: 1 + 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/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/Resources/Enemies/1/Enemy1V1.prefab b/Assets/Resources/Enemies/1/Enemy1V1.prefab index b83b5ef..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 @@ -218,6 +219,7 @@ GameObject: - component: {fileID: -1793628155013383594} - component: {fileID: 3477818934881411113} - component: {fileID: 58401337460216238} + - component: {fileID: 8428770856484636299} m_Layer: 0 m_Name: Enemy1V1 m_TagString: Enemy @@ -326,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &3477818934881411113 MonoBehaviour: m_ObjectHideFlags: 0 @@ -339,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 @@ -375,6 +378,33 @@ CapsuleCollider2D: m_Offset: {x: 0, y: 0} m_Size: {x: 1, y: 2} m_Direction: 0 +--- !u!50 &8428770856484636299 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1001 &8030114481966789124 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/1/Enemy1V2.prefab b/Assets/Resources/Enemies/1/Enemy1V2.prefab index 94ff752..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 @@ -133,6 +134,7 @@ GameObject: - component: {fileID: -7368324163293952402} - component: {fileID: 1203571175389907979} - component: {fileID: 4546369442828517320} + - component: {fileID: 8111329671581128041} m_Layer: 0 m_Name: Enemy1V2 m_TagString: Enemy @@ -218,7 +220,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &1203571175389907979 MonoBehaviour: m_ObjectHideFlags: 0 @@ -231,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 @@ -267,6 +270,33 @@ CapsuleCollider2D: m_Offset: {x: 0, y: 0} m_Size: {x: 1, y: 2} m_Direction: 0 +--- !u!50 &8111329671581128041 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1 &7260092502815078262 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/1/Enemy1V3.prefab b/Assets/Resources/Enemies/1/Enemy1V3.prefab index d5882c5..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 @@ -217,6 +218,7 @@ GameObject: - component: {fileID: -99408799291400877} - component: {fileID: 7065122129502476799} - component: {fileID: 1757117162005437690} + - component: {fileID: 7639895946029500357} m_Layer: 0 m_Name: Enemy1V3 m_TagString: Enemy @@ -302,7 +304,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &7065122129502476799 MonoBehaviour: m_ObjectHideFlags: 0 @@ -315,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 @@ -351,6 +354,33 @@ CapsuleCollider2D: m_Offset: {x: 0, y: 0} m_Size: {x: 1, y: 2} m_Direction: 0 +--- !u!50 &7639895946029500357 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1001 &316838467825944121 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/2/Enemy2V1.prefab b/Assets/Resources/Enemies/2/Enemy2V1.prefab index 1842387..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 @@ -134,6 +135,7 @@ GameObject: - component: {fileID: -1793628155013383594} - component: {fileID: 8407687426537136098} - component: {fileID: 5347138904714296145} + - component: {fileID: 8131507713407366277} m_Layer: 0 m_Name: Enemy2V1 m_TagString: Enemy @@ -171,7 +173,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 110 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -242,7 +244,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &8407687426537136098 MonoBehaviour: m_ObjectHideFlags: 0 @@ -255,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 @@ -291,6 +294,33 @@ CapsuleCollider2D: m_Offset: {x: 0.15, y: 0} m_Size: {x: 1.25, y: 2.25} m_Direction: 0 +--- !u!50 &8131507713407366277 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1 &7184157512170153992 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/2/Enemy2V2.prefab b/Assets/Resources/Enemies/2/Enemy2V2.prefab index 18bac40..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 @@ -218,6 +219,7 @@ GameObject: - component: {fileID: -1793628155013383594} - component: {fileID: 2239829156743597080} - component: {fileID: 9116721273772261298} + - component: {fileID: 833665078815953586} m_Layer: 0 m_Name: Enemy2V2 m_TagString: Enemy @@ -255,7 +257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 110 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -326,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &2239829156743597080 MonoBehaviour: m_ObjectHideFlags: 0 @@ -339,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 @@ -375,6 +378,33 @@ CapsuleCollider2D: m_Offset: {x: 0.15, y: 0} m_Size: {x: 1.25, y: 2.25} m_Direction: 0 +--- !u!50 &833665078815953586 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1001 &861944024263757089 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/2/Enemy2V3.prefab b/Assets/Resources/Enemies/2/Enemy2V3.prefab index 6169969..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 @@ -218,6 +219,7 @@ GameObject: - component: {fileID: -1793628155013383594} - component: {fileID: 2593167518683313509} - component: {fileID: 1597969697045467354} + - component: {fileID: 7183425510269105097} m_Layer: 0 m_Name: Enemy2V3 m_TagString: Enemy @@ -255,7 +257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 110 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -326,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &2593167518683313509 MonoBehaviour: m_ObjectHideFlags: 0 @@ -339,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 @@ -375,6 +378,33 @@ CapsuleCollider2D: m_Offset: {x: 0.15, y: 0} m_Size: {x: 1.25, y: 2.25} m_Direction: 0 +--- !u!50 &7183425510269105097 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1001 &2911733727042986953 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/3/Enemy3V1.prefab b/Assets/Resources/Enemies/3/Enemy3V1.prefab index 9350562..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,11 +130,11 @@ GameObject: m_Component: - component: {fileID: 3920219362688286786} - component: {fileID: 2938081276856164938} - - component: {fileID: 944314729512195366} - component: {fileID: 8373694659570615877} - component: {fileID: -1793628155013383594} - component: {fileID: 5601190281078907372} - component: {fileID: 5775148875117303771} + - component: {fileID: 1792220776575088205} m_Layer: 0 m_Name: Enemy3V1 m_TagString: Enemy @@ -171,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: @@ -242,7 +220,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &5601190281078907372 MonoBehaviour: m_ObjectHideFlags: 0 @@ -255,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 @@ -291,6 +270,33 @@ CapsuleCollider2D: m_Offset: {x: 0, y: -0.25} m_Size: {x: 2.03, y: 3.01} m_Direction: 0 +--- !u!50 &1792220776575088205 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1 &8726065711573869828 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/3/Enemy3V2.prefab b/Assets/Resources/Enemies/3/Enemy3V2.prefab index 21a24d6..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 @@ -218,6 +219,7 @@ GameObject: - component: {fileID: -1793628155013383594} - component: {fileID: 5537633588480359369} - component: {fileID: 629574706924414947} + - component: {fileID: 799119378079257124} m_Layer: 0 m_Name: Enemy3V2 m_TagString: Enemy @@ -255,7 +257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 130 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -326,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &5537633588480359369 MonoBehaviour: m_ObjectHideFlags: 0 @@ -339,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 @@ -375,6 +378,33 @@ CapsuleCollider2D: m_Offset: {x: 0, y: -0.25} m_Size: {x: 2.03, y: 3.01} m_Direction: 0 +--- !u!50 &799119378079257124 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1001 &4591666118570224065 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/3/Enemy3V3.prefab b/Assets/Resources/Enemies/3/Enemy3V3.prefab index 49dfeb3..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 @@ -218,6 +219,7 @@ GameObject: - component: {fileID: -1793628155013383594} - component: {fileID: 5342177024833758816} - component: {fileID: 9180341162620792323} + - component: {fileID: 8845322091694779043} m_Layer: 0 m_Name: Enemy3V3 m_TagString: Enemy @@ -255,7 +257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 130 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -326,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &5342177024833758816 MonoBehaviour: m_ObjectHideFlags: 0 @@ -339,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 @@ -375,6 +378,33 @@ CapsuleCollider2D: m_Offset: {x: 0, y: -0.25} m_Size: {x: 2.03, y: 3.01} m_Direction: 0 +--- !u!50 &8845322091694779043 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1001 &4814295387499624289 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/4/Enemy4V1.prefab b/Assets/Resources/Enemies/4/Enemy4V1.prefab index d98430f..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 @@ -134,6 +135,7 @@ GameObject: - component: {fileID: -1793628155013383594} - component: {fileID: 6703538002322560484} - component: {fileID: 1593837753105570956} + - component: {fileID: 6845376844323151706} m_Layer: 0 m_Name: Enemy4V1 m_TagString: Enemy @@ -171,7 +173,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 160 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -242,7 +244,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &6703538002322560484 MonoBehaviour: m_ObjectHideFlags: 0 @@ -255,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 @@ -291,6 +294,33 @@ CapsuleCollider2D: m_Offset: {x: -0.5, y: 0} m_Size: {x: 2.65, y: 3} m_Direction: 0 +--- !u!50 &6845376844323151706 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1 &8107784507586138233 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/4/Enemy4V2.prefab b/Assets/Resources/Enemies/4/Enemy4V2.prefab index 6a0fd2a..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 @@ -218,6 +219,7 @@ GameObject: - component: {fileID: -1793628155013383594} - component: {fileID: 5189432348483020584} - component: {fileID: 6992716262122209801} + - component: {fileID: 4819874625761020595} m_Layer: 0 m_Name: Enemy4V2 m_TagString: Enemy @@ -255,7 +257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 160 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -326,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &5189432348483020584 MonoBehaviour: m_ObjectHideFlags: 0 @@ -339,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 @@ -375,6 +378,33 @@ CapsuleCollider2D: m_Offset: {x: -0.5, y: 0} m_Size: {x: 2.65, y: 3} m_Direction: 0 +--- !u!50 &4819874625761020595 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1001 &5086109831227315773 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/4/Enemy4V3.prefab b/Assets/Resources/Enemies/4/Enemy4V3.prefab index b8feba6..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 @@ -218,6 +219,7 @@ GameObject: - component: {fileID: -1793628155013383594} - component: {fileID: 8229201628275188815} - component: {fileID: 5275513863136233879} + - component: {fileID: 3466740024957840811} m_Layer: 0 m_Name: Enemy4V3 m_TagString: Enemy @@ -255,7 +257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 160 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -326,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &8229201628275188815 MonoBehaviour: m_ObjectHideFlags: 0 @@ -339,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 @@ -375,6 +378,33 @@ CapsuleCollider2D: m_Offset: {x: -0.5, y: 0} m_Size: {x: 2.65, y: 3} m_Direction: 0 +--- !u!50 &3466740024957840811 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1001 &4352670561598918136 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/5/Enemy5V1.prefab b/Assets/Resources/Enemies/5/Enemy5V1.prefab index d264f49..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 @@ -218,6 +219,7 @@ GameObject: - component: {fileID: -1793628155013383594} - component: {fileID: 17691115352120009} - component: {fileID: 853766927484383816} + - component: {fileID: 2397480649246164426} m_Layer: 0 m_Name: Enemy5V1 m_TagString: Enemy @@ -255,7 +257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 250 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -326,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &17691115352120009 MonoBehaviour: m_ObjectHideFlags: 0 @@ -339,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 @@ -375,6 +378,33 @@ CapsuleCollider2D: m_Offset: {x: 0, y: 0} m_Size: {x: 2.5, y: 5.75} m_Direction: 0 +--- !u!50 &2397480649246164426 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1001 &1544961106352958877 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/5/Enemy5V2.prefab b/Assets/Resources/Enemies/5/Enemy5V2.prefab index 523ef49..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 @@ -218,6 +219,7 @@ GameObject: - component: {fileID: -1793628155013383594} - component: {fileID: 893626435943606516} - component: {fileID: 1353826037353208613} + - component: {fileID: 1166639589295390852} m_Layer: 0 m_Name: Enemy5V2 m_TagString: Enemy @@ -255,7 +257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 250 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -326,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &893626435943606516 MonoBehaviour: m_ObjectHideFlags: 0 @@ -339,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 @@ -375,6 +378,33 @@ CapsuleCollider2D: m_Offset: {x: 0, y: 0} m_Size: {x: 2.5, y: 5.75} m_Direction: 0 +--- !u!50 &1166639589295390852 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1001 &5603902875862274868 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/5/Enemy5V3.prefab b/Assets/Resources/Enemies/5/Enemy5V3.prefab index 0da2f25..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 @@ -218,6 +219,7 @@ GameObject: - component: {fileID: -1793628155013383594} - component: {fileID: 2019234432969631736} - component: {fileID: 1104779658182803384} + - component: {fileID: 6053117177104604418} m_Layer: 0 m_Name: Enemy5V3 m_TagString: Enemy @@ -255,7 +257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 250 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -326,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &2019234432969631736 MonoBehaviour: m_ObjectHideFlags: 0 @@ -339,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 @@ -375,6 +378,33 @@ CapsuleCollider2D: m_Offset: {x: 0, y: 0} m_Size: {x: 2.5, y: 5.75} m_Direction: 0 +--- !u!50 &6053117177104604418 +Rigidbody2D: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1001 &2018686273432440032 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/6/Enemy6V1.prefab b/Assets/Resources/Enemies/6/Enemy6V1.prefab index 7711f0e..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 @@ -218,6 +219,7 @@ GameObject: - component: {fileID: -1793628155013383594} - component: {fileID: 4552190225719755244} - component: {fileID: 7675421169139995944} + - component: {fileID: 2639723550158062772} m_Layer: 0 m_Name: Enemy6V1 m_TagString: Enemy @@ -255,7 +257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 180 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -326,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &4552190225719755244 MonoBehaviour: m_ObjectHideFlags: 0 @@ -339,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 @@ -372,9 +375,36 @@ 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: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1001 &412850958765099122 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/6/Enemy6V2.prefab b/Assets/Resources/Enemies/6/Enemy6V2.prefab index 3284ee6..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 @@ -218,6 +219,7 @@ GameObject: - component: {fileID: -1793628155013383594} - component: {fileID: 7803025104266690665} - component: {fileID: 4435590555684305438} + - component: {fileID: 9140022268088615716} m_Layer: 0 m_Name: Enemy6V2 m_TagString: Enemy @@ -255,7 +257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 180 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -326,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &7803025104266690665 MonoBehaviour: m_ObjectHideFlags: 0 @@ -339,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 @@ -372,9 +375,36 @@ 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: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1001 &8420911966130886246 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Enemies/6/Enemy6V3.prefab b/Assets/Resources/Enemies/6/Enemy6V3.prefab index 7fb48df..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 @@ -218,6 +219,7 @@ GameObject: - component: {fileID: -1793628155013383594} - component: {fileID: 316906110964971930} - component: {fileID: 3935275739920240744} + - component: {fileID: 1721532817145052869} m_Layer: 0 m_Name: Enemy6V3 m_TagString: Enemy @@ -255,7 +257,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: onlyCallZeroHealthOnce: 1 - maxHealth: 100 + maxHealth: 180 damageTickDelay: 0.25 OnHealthZero: m_PersistentCalls: @@ -326,7 +328,7 @@ MonoBehaviour: ropeDistCheck: 1 ropeCheckMask: serializedVersion: 2 - m_Bits: 0 + m_Bits: 64 --- !u!114 &316906110964971930 MonoBehaviour: m_ObjectHideFlags: 0 @@ -339,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 @@ -372,9 +375,36 @@ 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: + serializedVersion: 4 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6905705041633878913} + m_BodyType: 1 + m_Simulated: 1 + m_UseFullKinematicContacts: 0 + m_UseAutoMass: 0 + m_Mass: 1 + m_LinearDrag: 0 + m_AngularDrag: 0.05 + m_GravityScale: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_Interpolate: 0 + m_SleepingMode: 1 + m_CollisionDetection: 0 + m_Constraints: 0 --- !u!1001 &7644200986374021475 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Bloody Mary.unity b/Assets/Scenes/Bloody Mary.unity index 18426db..c4dbd0e 100644 --- a/Assets/Scenes/Bloody Mary.unity +++ b/Assets/Scenes/Bloody Mary.unity @@ -1102,6 +1102,140 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 538127010} m_CullTransparentMesh: 1 +--- !u!1 &557837175 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 557837176} + - component: {fileID: 557837178} + - component: {fileID: 557837177} + m_Layer: 5 + m_Name: Description + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &557837176 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 557837175} + 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: 1197965563} + 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 &557837177 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 557837175} + 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 &557837178 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 557837175} + m_CullTransparentMesh: 1 --- !u!1 &761043861 GameObject: m_ObjectHideFlags: 0 @@ -1466,6 +1600,7 @@ RectTransform: - {fileID: 268970235} - {fileID: 1208295405} - {fileID: 761043862} + - {fileID: 557837176} m_Father: {fileID: 185592112} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -1536,6 +1671,7 @@ MonoBehaviour: reelIncrease: 1.1 upgradeCost: 100000 BloodMeter: {fileID: 268970236} + description: {fileID: 0} --- !u!95 &1197965567 Animator: serializedVersion: 5 diff --git a/Assets/Scenes/GameScene 1.unity b/Assets/Scenes/GameScene 1.unity index e715681..b246280 100644 --- a/Assets/Scenes/GameScene 1.unity +++ b/Assets/Scenes/GameScene 1.unity @@ -246,6 +246,63 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &340610726 +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: -17.30016 + objectReference: {fileID: 0} + - target: {fileID: 3920219362688286786, guid: 0dc1cd5eb961eb049b13867a3bff4396, type: 3} + propertyPath: m_LocalPosition.y + value: -9.757746 + 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!1 &362707003 GameObject: m_ObjectHideFlags: 0 @@ -448,6 +505,63 @@ Transform: - {fileID: 147729522} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &630240075 +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: -3.5504682 + objectReference: {fileID: 0} + - target: {fileID: 3920219362688286786, guid: cc70504ee89b0b74fac0167fd3c76bdd, type: 3} + propertyPath: m_LocalPosition.y + value: -6.554695 + 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!1001 &869964773 PrefabInstance: m_ObjectHideFlags: 0 @@ -535,6 +649,63 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4aabce12c1341ff488ee4dc806fd80e8, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!1001 &1143774969 +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: -15.112709 + objectReference: {fileID: 0} + - target: {fileID: 3920219362688286786, guid: f808ad67f6a747241a310437e433c828, type: 3} + propertyPath: m_LocalPosition.y + value: -1.3204403 + 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!1001 &1229295200 PrefabInstance: m_ObjectHideFlags: 0 @@ -1097,3 +1268,6 @@ SceneRoots: - {fileID: 869964773} - {fileID: 483723115} - {fileID: 1920006249} + - {fileID: 1143774969} + - {fileID: 630240075} + - {fileID: 340610726} diff --git a/Assets/Scenes/GameScene.unity b/Assets/Scenes/GameScene.unity index 9b8ceca..e73aae4 100644 --- a/Assets/Scenes/GameScene.unity +++ b/Assets/Scenes/GameScene.unity @@ -123,7 +123,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1 &56640884 +--- !u!1 &98547638 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -131,101 +131,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 56640885} - - component: {fileID: 56640889} - - component: {fileID: 56640888} - - component: {fileID: 56640887} - - component: {fileID: 56640886} + - component: {fileID: 98547639} + - component: {fileID: 98547641} + - component: {fileID: 98547640} m_Layer: 5 - m_Name: MenuForUpgrades + m_Name: Player1 Cursor m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &56640885 +--- !u!224 &98547639 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 56640884} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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: - - {fileID: 246350006} - - {fileID: 1246539229} - - {fileID: 2133226120} - - {fileID: 435328531} - - {fileID: 880679716} - - {fileID: 622993313} - - {fileID: 790177151} - - {fileID: 569481733} - - {fileID: 623283579} - - {fileID: 2051970330} - - {fileID: 475205659} - m_Father: {fileID: 1377274212} + 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: 150, y: 150} - m_SizeDelta: {x: 250, y: 250} + 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!95 &56640886 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 56640884} - 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 &56640887 +--- !u!114 &98547640 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 56640884} - 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: 623283580} ---- !u!114 &56640888 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 56640884} + m_GameObject: {fileID: 98547638} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -239,7 +180,82 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 21300000, guid: 511830d939da6620a9dfbaba9ceb7938, type: 3} + 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 @@ -249,13 +265,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &56640889 +--- !u!222 &131339060 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 56640884} + m_GameObject: {fileID: 131339057} m_CullTransparentMesh: 1 --- !u!1 &147729521 GameObject: @@ -380,7 +396,7 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &246350005 +--- !u!1 &248416271 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -388,42 +404,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 246350006} - - component: {fileID: 246350008} - - component: {fileID: 246350007} + - component: {fileID: 248416272} + - component: {fileID: 248416274} + - component: {fileID: 248416273} m_Layer: 5 - m_Name: Upgrade1 + m_Name: Image m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &246350006 +--- !u!224 &248416272 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 246350005} + 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: 56640885} + m_Father: {fileID: 1411561451} 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_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 &246350007 +--- !u!114 &248416273 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 246350005} + m_GameObject: {fileID: 248416271} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -437,8 +453,8 @@ MonoBehaviour: m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] - m_Sprite: {fileID: 10913, guid: 0000000000000000f000000000000000, type: 0} - m_Type: 3 + m_Sprite: {fileID: 21300000, guid: 460eb439e506a884899dec7f7d98a082, type: 3} + m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 m_FillMethod: 4 @@ -447,13 +463,88 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &246350008 +--- !u!222 &248416274 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 246350005} + 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: @@ -589,81 +680,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 353363865} m_CullTransparentMesh: 1 ---- !u!1 &435328530 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 435328531} - - component: {fileID: 435328533} - - component: {fileID: 435328532} - m_Layer: 5 - m_Name: Upgrade4 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &435328531 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 435328530} - 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: 56640885} - 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 &435328532 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 435328530} - 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 &435328533 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 435328530} - m_CullTransparentMesh: 1 --- !u!1 &438029675 GameObject: m_ObjectHideFlags: 0 @@ -765,81 +781,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &475205658 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 475205659} - - component: {fileID: 475205661} - - component: {fileID: 475205660} - 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 &475205659 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 475205658} - 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: 56640885} - 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 &475205660 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 475205658} - 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 &475205661 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 475205658} - m_CullTransparentMesh: 1 --- !u!1 &480860135 GameObject: m_ObjectHideFlags: 0 @@ -1006,232 +947,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &569481732 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 569481733} - - component: {fileID: 569481735} - - component: {fileID: 569481734} - m_Layer: 5 - m_Name: Upgrade8 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &569481733 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 569481732} - 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: 56640885} - 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 &569481734 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 569481732} - 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 &569481735 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 569481732} - m_CullTransparentMesh: 1 ---- !u!1 &622993312 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 622993313} - - component: {fileID: 622993315} - - component: {fileID: 622993314} - m_Layer: 5 - m_Name: Upgrade6 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &622993313 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 622993312} - 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: 56640885} - 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 &622993314 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 622993312} - 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 &622993315 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 622993312} - m_CullTransparentMesh: 1 ---- !u!1 &623283578 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 623283579} - - component: {fileID: 623283581} - - component: {fileID: 623283580} - m_Layer: 5 - m_Name: DiabloBlood - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &623283579 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 623283578} - 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: 704911028} - m_Father: {fileID: 56640885} - 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 &623283580 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 623283578} - 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 &623283581 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 623283578} - m_CullTransparentMesh: 1 --- !u!114 &640312359 stripped MonoBehaviour: m_CorrespondingSourceObject: {fileID: 4056614590725156132, guid: a99c6b890ab711f4faebdfd6335c5f16, type: 3} @@ -1248,7 +963,7 @@ Transform: m_CorrespondingSourceObject: {fileID: 3862814901187971034, guid: 5846f4d0fc6a1a44ba388893e7ff9373, type: 3} m_PrefabInstance: {fileID: 7693964683212020007} m_PrefabAsset: {fileID: 0} ---- !u!1 &704911027 +--- !u!1 &740048888 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1256,117 +971,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 704911028} - - component: {fileID: 704911030} - - component: {fileID: 704911029} + - component: {fileID: 740048889} + - component: {fileID: 740048891} + - component: {fileID: 740048890} m_Layer: 5 - m_Name: Image + m_Name: Upgrade4 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &704911028 +--- !u!224 &740048889 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 704911027} + 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: 623283579} + m_Father: {fileID: 1029071972} 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 &704911029 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 704911027} - 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 &704911030 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 704911027} - m_CullTransparentMesh: 1 ---- !u!1 &790177150 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 790177151} - - component: {fileID: 790177153} - - component: {fileID: 790177152} - m_Layer: 5 - m_Name: Upgrade7 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &790177151 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 790177150} - 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: 56640885} - 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_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 &790177152 +--- !u!114 &740048890 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 790177150} + m_GameObject: {fileID: 740048888} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -1390,13 +1030,88 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &790177153 +--- !u!222 &740048891 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 790177150} + 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: @@ -1446,10 +1161,6 @@ 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 @@ -1485,7 +1196,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 4aabce12c1341ff488ee4dc806fd80e8, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!1 &880679715 +--- !u!1 &1029071971 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1493,9 +1204,145 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 880679716} - - component: {fileID: 880679718} - - component: {fileID: 880679717} + - 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 @@ -1503,32 +1350,32 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &880679716 +--- !u!224 &1174960583 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 880679715} + 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: 56640885} + 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 &880679717 +--- !u!114 &1174960584 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 880679715} + m_GameObject: {fileID: 1174960582} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -1552,13 +1399,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &880679718 +--- !u!222 &1174960585 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 880679715} + m_GameObject: {fileID: 1174960582} m_CullTransparentMesh: 1 --- !u!4 &1194834060 stripped Transform: @@ -1613,10 +1460,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: @@ -1657,81 +1500,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 320690117028550720, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3} m_PrefabInstance: {fileID: 1232208432} m_PrefabAsset: {fileID: 0} ---- !u!1 &1246539228 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1246539229} - - component: {fileID: 1246539231} - - component: {fileID: 1246539230} - m_Layer: 5 - m_Name: Upgrade2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &1246539229 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1246539228} - 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: 56640885} - 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 &1246539230 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1246539228} - 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 &1246539231 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1246539228} - m_CullTransparentMesh: 1 --- !u!1 &1254139629 stripped GameObject: m_CorrespondingSourceObject: {fileID: 3120938410244321186, guid: 99a6ff8b9591949439b620b13bd249a4, type: 3} @@ -1831,7 +1599,7 @@ RectTransform: m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 56640885} + - {fileID: 1029071972} - {fileID: 2051104236} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1840,6 +1608,157 @@ RectTransform: 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 @@ -3228,6 +3147,57 @@ 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} @@ -3301,6 +3271,140 @@ 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 @@ -3350,17 +3454,167 @@ 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} m_PrefabInstance: {fileID: 4910321061857220295} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 4910321061857220296} m_Enabled: 1 m_EditorHideFlags: 0 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 @@ -3397,7 +3651,7 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &2051970329 +--- !u!1 &2107662970 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -3405,117 +3659,42 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 2051970330} - - component: {fileID: 2051970332} - - component: {fileID: 2051970331} + - component: {fileID: 2107662971} + - component: {fileID: 2107662973} + - component: {fileID: 2107662972} m_Layer: 5 - m_Name: Player2 Cursor + m_Name: Upgrade7 m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &2051970330 +--- !u!224 &2107662971 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2051970329} - 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: 56640885} - 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 &2051970331 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2051970329} - 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 &2051970332 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2051970329} - m_CullTransparentMesh: 1 ---- !u!1 &2133226119 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2133226120} - - component: {fileID: 2133226122} - - component: {fileID: 2133226121} - m_Layer: 5 - m_Name: Upgrade3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2133226120 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2133226119} + 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: 56640885} + 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_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 &2133226121 +--- !u!114 &2107662972 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2133226119} + m_GameObject: {fileID: 2107662970} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} @@ -3539,13 +3718,13 @@ MonoBehaviour: m_FillOrigin: 0 m_UseSpriteMesh: 0 m_PixelsPerUnitMultiplier: 1 ---- !u!222 &2133226122 +--- !u!222 &2107662973 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2133226119} + m_GameObject: {fileID: 2107662970} m_CullTransparentMesh: 1 --- !u!1001 &1683288374126251321 PrefabInstance: @@ -3606,7 +3785,10 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 809911508645467208, guid: ec5007446d8bbca48bf02b3a7e752da1, type: 3} + insertIndex: -1 + addedObject: {fileID: 1566837120} m_SourcePrefab: {fileID: 100100000, guid: ec5007446d8bbca48bf02b3a7e752da1, type: 3} --- !u!1001 &4910321061857220295 PrefabInstance: @@ -3671,8 +3853,128 @@ PrefabInstance: m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] - m_AddedComponents: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 5991265243222894942, guid: 0248db69242a3dd47898c6742b6c9f60, type: 3} + insertIndex: -1 + addedObject: {fileID: 4910321061857220297} + - targetCorrespondingSourceObject: {fileID: 5991265243222894942, guid: 0248db69242a3dd47898c6742b6c9f60, type: 3} + insertIndex: -1 + addedObject: {fileID: 4910321061857220300} m_SourcePrefab: {fileID: 100100000, guid: 0248db69242a3dd47898c6742b6c9f60, type: 3} +--- !u!1 &4910321061857220296 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5991265243222894942, guid: 0248db69242a3dd47898c6742b6c9f60, type: 3} + m_PrefabInstance: {fileID: 4910321061857220295} + m_PrefabAsset: {fileID: 0} +--- !u!114 &4910321061857220297 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4910321061857220296} + m_Enabled: 0 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 8766ad5393174fa488ef4a58b62181b4, type: 3} + m_Name: + m_EditorClassIdentifier: + PlayTime: 1 +--- !u!82 &4910321061857220300 +AudioSource: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4910321061857220296} + 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 --- !u!1001 &5796191506433166633 PrefabInstance: m_ObjectHideFlags: 0 @@ -3689,10 +3991,6 @@ PrefabInstance: propertyPath: m_Targets.Array.data[1].target value: objectReference: {fileID: 1194834060} - - target: {fileID: 3603265075407754381, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} - propertyPath: m_Enabled - value: 0 - objectReference: {fileID: 0} - target: {fileID: 3603265075407754381, guid: c53e6971c95afb1429cd82616a7b6737, type: 3} propertyPath: players.Array.data[0] value: @@ -3961,3 +4259,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/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/Enemy/EnemyAnimationHandler.cs b/Assets/Scripts/Enemy/EnemyAnimationHandler.cs index 3c902f3..583e8bf 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; @@ -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/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/PlayerMovement.cs b/Assets/Scripts/Player/PlayerMovement.cs index 3055fed..aa294fa 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] @@ -31,29 +28,26 @@ public class PlayerMovement : MonoBehaviour private PlayerInput playerInput; + private HealthComponent hp; + private void Start() { rb = GetComponent(); playerInput = GetComponent(); + hp = GetComponent(); if (gameObject.name == "Player2") { playerInput.useArrowKeys = true; } - StartCoroutine(ToggleWithDelay()); - } + if (playerInput.controller != null) + { + var pad = (DualShockGamepad)Gamepad.all.ElementAtOrDefault(playerInput.PlayerNum); + if (pad == null) return; - void Update() - { - if (playerInput.movement != Vector2.zero) - { - RumbleWalk(); - animationHandler.Run(true); - } - else - { - animationHandler.Run(false); + if (playerInput.PlayerNum == 1) + pad.SetLightBarColor(Color.red); } } private void FixedUpdate() @@ -78,29 +72,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); - } - } } diff --git a/Assets/Scripts/Rope/RopeSimulator.cs b/Assets/Scripts/Rope/RopeSimulator.cs index 0750fd5..4e3a2eb 100644 --- a/Assets/Scripts/Rope/RopeSimulator.cs +++ b/Assets/Scripts/Rope/RopeSimulator.cs @@ -66,7 +66,7 @@ public class RopeSimulator : MonoBehaviour public float Overshoot => rope.CalculateLengthOvershoot(); - Rope rope; + public Rope rope; Dictionary colliderToSquezeForce = new(); @@ -127,7 +127,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(); 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/PlayerRumbling.cs b/Assets/Scripts/Rumbling/PlayerRumbling.cs new file mode 100644 index 0000000..d876942 --- /dev/null +++ b/Assets/Scripts/Rumbling/PlayerRumbling.cs @@ -0,0 +1,84 @@ +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using UnityEngine; +using UnityEngine.InputSystem; + +public class PlayerRumbling : MonoBehaviour +{ + [SerializeField] private float RopeRubleTolerance = 0.5f; + + 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; + } + + hasInit = true; + } + + bool hasInit = false; + private void Update() + { + if (!hasInit) return; + + var rumble = new RumbleData(); + + float ropeClamed = Mathf.Max(0, rope.Overshoot); + if (ropeClamed > RopeRubleTolerance) + { + float mapped = ropeClamed.Remap(0.5f, 1f, 0f, 1f); + rumble.Max(mapped, mapped); + } + + rumble.Commit(pad); + } +} + +public class RumbleData +{ + private bool modified = false; + private float lowFreq = 0; + private float highFreq = 0; + + public void Max(float low, float high) + { + modified = true; + lowFreq = Mathf.Max(lowFreq, low); + highFreq = Mathf.Max(highFreq, high); + } + + public void Min(float low, float high) + { + modified = true; + lowFreq = Mathf.Min(lowFreq, low); + highFreq = Mathf.Min(highFreq, high); + } + + public void Add(float low, float high) + { + modified = true; + lowFreq += low; + highFreq += high; + } + + public void Commit(Gamepad target) + { + modified = false; + target.SetMotorSpeeds(lowFreq, highFreq); + } +} diff --git a/Assets/Scripts/Rumbling/PlayerRumbling.cs.meta b/Assets/Scripts/Rumbling/PlayerRumbling.cs.meta new file mode 100644 index 0000000..19374db --- /dev/null +++ b/Assets/Scripts/Rumbling/PlayerRumbling.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/Upgrader.cs b/Assets/Scripts/Upgrader.cs index 5d30aad..bd71db7 100644 --- a/Assets/Scripts/Upgrader.cs +++ b/Assets/Scripts/Upgrader.cs @@ -1,4 +1,5 @@ using System.Collections; +using TMPro; using System.Collections.Generic; using UnityEngine.UI; using UnityEngine; @@ -59,6 +60,7 @@ public class Upgrader : MonoBehaviour private bool prevCouldUpgrade = true; public Image BloodMeter; + public TMPro.TextMeshProUGUI description; // Start is called before the first frame update void Start() @@ -179,6 +181,8 @@ public class Upgrader : MonoBehaviour } else { + description.text = ""; + if (acceptTime > 0f) { foreach (Image i in upgradeImages) @@ -194,14 +198,18 @@ public class Upgrader : MonoBehaviour } else if (prevCouldUpgrade) { - background.color = Color.gray; - foreach (Image i in upgradeImages) - { - i.color = Color.gray; - } + // TODO: PLAY SOUND HERE!! - Player1Cursor.gameObject.SetActive(false); - Player2Cursor.gameObject.SetActive(false); + description.text = ""; + background.color = Color.gray; + foreach (Image i in upgradeImages) + { + i.color = Color.gray; + i.gameObject.transform.localScale = Vector3.one; + } + + Player1Cursor.gameObject.SetActive(false); + Player2Cursor.gameObject.SetActive(false); } Player1Cursor.localPosition = Player1Input.look.normalized * (125 - 12); @@ -213,6 +221,7 @@ public class Upgrader : MonoBehaviour /// Increases mop radius by 10% public void UpgradeMopSize() { + description.text = upgrades.mopUpgrade.name; bloodManager.CleanRadius *= mopSizeIncrease; upgrades.mopUpgrade.amount++; } @@ -220,6 +229,7 @@ public class Upgrader : MonoBehaviour /// Increases move speed by 10% public void UpgradeSpeed() { + description.text = upgrades.speedUpgrade.name; player1.GetComponent().moveSpeed *= speedIncrease; player2.GetComponent().moveSpeed *= speedIncrease; upgrades.speedUpgrade.amount++; @@ -228,12 +238,15 @@ public class Upgrader : MonoBehaviour public void RopeUpgrade() { // todo: public methods + description.text = upgrades.ropeUpgrade.name; rope.ropeMaxLength *= ropeIncrease; upgrades.ropeUpgrade.amount++; } public void HealthUpgrade() { + description.text = upgrades.healthUpgrade.name; + var comp1 = player1.GetComponent(); comp1.setMaxHealth((int)(comp1.getMaxHealth() * healthIncrease)); @@ -244,6 +257,7 @@ public class Upgrader : MonoBehaviour public void DamageUpgrade() { + description.text = upgrades.damageUpgrade.name; // todo: public rope methods // rope.da upgrades.damageUpgrade.amount++; @@ -251,6 +265,7 @@ public class Upgrader : MonoBehaviour public void BloodUpgrade() { + description.text = upgrades.bloodUpgrade.name; bloodManager.scoreMult *= bloodIncrease; upgrades.bloodUpgrade.amount++; } @@ -258,17 +273,20 @@ public class Upgrader : MonoBehaviour public void ReelUpgrade() { // todo rope methods + description.text = upgrades.reelUpgrade.name; rope.ropeExtendSpeed *= reelIncrease; upgrades.reelUpgrade.amount++; } - IEnumerator updateBloodMeter() { - while (true) { + IEnumerator updateBloodMeter() + { + while (true) + { yield return new WaitForSeconds(0.5f); - BloodMeter.fillAmount = ((float)bloodManager.score)/((float)upgradeCost); + BloodMeter.fillAmount = ((float)bloodManager.score) / ((float)upgradeCost); } - + // dont care yield return null; } 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: