diff --git a/.gitignore b/.gitignore index 7a5cd83a..3d75b91c 100644 --- a/.gitignore +++ b/.gitignore @@ -26,6 +26,9 @@ # Visual Studio cache directory .vs/ +# Idea directory +.idea/ + # Gradle cache directory .gradle/ @@ -69,4 +72,4 @@ crashlytics-build.properties # Temporary auto-generated Android Assets /[Aa]ssets/[Ss]treamingAssets/aa.meta -/[Aa]ssets/[Ss]treamingAssets/aa/* \ No newline at end of file +/[Aa]ssets/[Ss]treamingAssets/aa/* diff --git a/Assets/Animations/ArcherAnim/ArcherEnemy 1.controller b/Assets/Animations/ArcherAnim/ArcherEnemy 1.controller index 7661925d..b777ef21 100644 --- a/Assets/Animations/ArcherAnim/ArcherEnemy 1.controller +++ b/Assets/Animations/ArcherAnim/ArcherEnemy 1.controller @@ -14,16 +14,16 @@ AnimatorStateMachine: m_Position: {x: 300, y: 80, z: 0} - serializedVersion: 1 m_State: {fileID: 4161529382795071272} - m_Position: {x: 300, y: 140, z: 0} + m_Position: {x: 370, y: 140, z: 0} - serializedVersion: 1 m_State: {fileID: -277780417650124062} - m_Position: {x: 305, y: 195, z: 0} + m_Position: {x: 470, y: 200, z: 0} - serializedVersion: 1 m_State: {fileID: -1639067078927365332} - m_Position: {x: 310, y: 250, z: 0} + m_Position: {x: 560, y: 260, z: 0} - serializedVersion: 1 m_State: {fileID: -7727284095081529948} - m_Position: {x: 310, y: 310, z: 0} + m_Position: {x: 650, y: 320, z: 0} m_ChildStateMachines: [] m_AnyStateTransitions: [] m_EntryTransitions: [] @@ -60,6 +60,18 @@ AnimatorState: m_MirrorParameter: m_CycleOffsetParameter: m_TimeParameter: +--- !u!114 &-7426733143636478462 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: a3c8e7ccc4b8d3b4cb7fad951045f81f, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1102 &-1639067078927365332 AnimatorState: serializedVersion: 6 diff --git a/Assets/Animations/ShieldAnim/shield.anim b/Assets/Animations/ShieldAnim/shield.anim index 5dd578ed..1c8c26a3 100644 --- a/Assets/Animations/ShieldAnim/shield.anim +++ b/Assets/Animations/ShieldAnim/shield.anim @@ -79,7 +79,7 @@ AnimationClip: m_HasMotionFloatCurves: 0 m_Events: - time: 0.625 - functionName: setCoolDown + functionName: coolDown data: objectReferenceParameter: {fileID: 0} floatParameter: 2 diff --git a/Assets/Scenes/TestScene/Test.unity b/Assets/Scenes/TestScene/Test.unity index 304a8535..3cf80ba1 100644 --- a/Assets/Scenes/TestScene/Test.unity +++ b/Assets/Scenes/TestScene/Test.unity @@ -291,6 +291,74 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!1 &39494002 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 39494003} + m_Layer: 0 + m_Name: "EKran \xE7ok dolu" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &39494003 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 39494002} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 12.2897415, y: 3.4661891, z: -0.22449027} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 696714401} + - {fileID: 292116072} + - {fileID: 2052325929} + - {fileID: 619394802} + - {fileID: 478535323} + - {fileID: 1441774458} + - {fileID: 651765461} + - {fileID: 572353769} + - {fileID: 783350862} + - {fileID: 1666378108} + - {fileID: 801308030} + - {fileID: 1838619133} + - {fileID: 1423085483} + - {fileID: 536109227} + - {fileID: 789240865} + - {fileID: 1471721231} + - {fileID: 934052523} + - {fileID: 1434250255} + - {fileID: 427532609} + - {fileID: 1370401914} + - {fileID: 118120625} + - {fileID: 1990805492} + - {fileID: 653644707} + - {fileID: 2140346267} + - {fileID: 1203169034} + - {fileID: 699174473} + - {fileID: 1414715166} + - {fileID: 1849145410} + - {fileID: 1248981375} + - {fileID: 962693010} + - {fileID: 1273952491} + - {fileID: 2060292861} + - {fileID: 1407454509} + - {fileID: 1588827522} + - {fileID: 857196963} + - {fileID: 449149893} + - {fileID: 1828889654} + m_Father: {fileID: 0} + m_RootOrder: 6 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &45379691 GameObject: m_ObjectHideFlags: 0 @@ -573,6 +641,11 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 1.594162, y: 21.498549} m_EdgeRadius: 0 +--- !u!4 &118120625 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5853798891148039934, guid: 22482e588c49ba049937e66d05fd93fc, type: 3} + m_PrefabInstance: {fileID: 1897682861} + m_PrefabAsset: {fileID: 0} --- !u!1 &167887270 GameObject: m_ObjectHideFlags: 0 @@ -662,7 +735,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 39494003} m_Modifications: - target: {fileID: 1230345730026293204, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_Name @@ -670,19 +743,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_RootOrder - value: 42 + value: 33 objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_LocalPosition.x - value: -6.61 + value: -18.899742 objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_LocalPosition.y - value: -8.083366 + value: -11.549556 objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.22449027 objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_LocalRotation.w @@ -690,15 +763,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -1445,79 +1518,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &285099739 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 285099741} - - component: {fileID: 285099740} - m_Layer: 0 - m_Name: AudioManager - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &285099740 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 285099739} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 45e6cdfe4466cb7469b16c092783ccda, type: 3} - m_Name: - m_EditorClassIdentifier: - mixerGroup: {fileID: 24300002, guid: 6c9354103c3802249b754094e0febe03, type: 2} - sounds: - - name: UIClick - clip: {fileID: 8300000, guid: ae2582513af7a27408574e9e048ac31d, type: 3} - volume: 1 - volumeVariance: 0 - pitch: 1 - pitchVariance: 0 - loop: 0 - mixerGroup: {fileID: 24300002, guid: 6c9354103c3802249b754094e0febe03, type: 2} - source: {fileID: 0} - - name: UIHover - clip: {fileID: 8300000, guid: 4029ce668b0f25e46837272b60e51942, type: 3} - volume: 1 - volumeVariance: 0 - pitch: 1 - pitchVariance: 0 - loop: 0 - mixerGroup: {fileID: 24300002, guid: 6c9354103c3802249b754094e0febe03, type: 2} - source: {fileID: 0} - - name: Whoosh - clip: {fileID: 8300000, guid: ee7f40567e1973647ad3772cdbf3f4b8, type: 3} - volume: 1 - volumeVariance: 0 - pitch: 1 - pitchVariance: 0 - loop: 0 - mixerGroup: {fileID: 24300002, guid: 6c9354103c3802249b754094e0febe03, type: 2} - source: {fileID: 0} ---- !u!4 &285099741 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 285099739} - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 50} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &292116071 GameObject: m_ObjectHideFlags: 0 @@ -1542,14 +1542,14 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 292116071} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -22.797289, y: 10.335377, z: -0.6259144} + m_LocalPosition: {x: -35.08703, y: 6.8691874, z: -0.4014241} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 116969398} - {fileID: 616347458} - m_Father: {fileID: 0} - m_RootOrder: 9 + m_Father: {fileID: 39494003} + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &294712693 GameObject: @@ -2080,15 +2080,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5902648875053040778, guid: d4cdc4b3873c84b43b9fbd475c443649, type: 3} propertyPath: m_RootOrder - value: 7 + value: 5 objectReference: {fileID: 0} - target: {fileID: 5902648875053040778, guid: d4cdc4b3873c84b43b9fbd475c443649, type: 3} propertyPath: m_LocalPosition.x - value: -6.81 + value: -54.8 objectReference: {fileID: 0} - target: {fileID: 5902648875053040778, guid: d4cdc4b3873c84b43b9fbd475c443649, type: 3} propertyPath: m_LocalPosition.y - value: -2.91 + value: -6.6 objectReference: {fileID: 0} - target: {fileID: 5902648875053040778, guid: d4cdc4b3873c84b43b9fbd475c443649, type: 3} propertyPath: m_LocalPosition.z @@ -2354,7 +2354,6 @@ GameObject: - component: {fileID: 420248616} - component: {fileID: 420248615} - component: {fileID: 420248614} - - component: {fileID: 420248617} m_Layer: 5 m_Name: Button m_TagString: Untagged @@ -2489,18 +2488,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 420248612} m_CullTransparentMesh: 1 ---- !u!114 &420248617 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 420248612} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7e33d9c15e2ac264f890e0badfc83b1d, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &427532606 GameObject: m_ObjectHideFlags: 0 @@ -2604,13 +2591,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 427532606} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 20.16, y: -5.33, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 7.8702583, y: -8.796189, z: 0.22449027} m_LocalScale: {x: 6, y: 8, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 27 + m_Father: {fileID: 39494003} + m_RootOrder: 18 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &429079162 GameObject: @@ -2719,13 +2706,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 449149892} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 12.2897415, y: 3.4661891, z: -0.22449027} + 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: 0} - m_RootOrder: 45 + m_Father: {fileID: 39494003} + m_RootOrder: 35 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &449231444 GameObject: @@ -2974,14 +2961,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 478535321} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -12.2897415, y: -3.4661891, z: 0.22449027} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1616084745} - m_Father: {fileID: 0} - m_RootOrder: 13 + m_Father: {fileID: 39494003} + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &479653387 GameObject: @@ -3739,7 +3726,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 519420028} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 46.459015, y: 5.1149697, z: -9.117128} + m_LocalPosition: {x: -1.530983, y: 5.1149697, z: -9.117128} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3896,13 +3883,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 536109224} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -12.2897415, y: -3.4661891, z: 0.22449027} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 22 + m_Father: {fileID: 39494003} + m_RootOrder: 13 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &536109228 MonoBehaviour: @@ -4260,8 +4247,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 572353768} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0.70209634, y: -3.5479927, z: -9.387645} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -11.587646, y: -7.014182, z: -9.163155} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -4271,582 +4258,9 @@ Transform: - {fileID: 1874118872} - {fileID: 647905503} - {fileID: 888044209} - m_Father: {fileID: 0} - m_RootOrder: 16 + m_Father: {fileID: 39494003} + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &573179739 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 143517202250317627, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Color.b - value: 0.16470589 - objectReference: {fileID: 0} - - target: {fileID: 143517202250317627, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Color.g - value: 0.21568629 - objectReference: {fileID: 0} - - target: {fileID: 143517202250317627, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Color.r - value: 0.30980393 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_NormalColor.b - value: 0.27450982 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_NormalColor.g - value: 0.47450984 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_NormalColor.r - value: 0.54901963 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_PressedColor.b - value: 0.2784314 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_PressedColor.g - value: 0.47450984 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_PressedColor.r - value: 0.5529412 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_DisabledColor.b - value: 0.29411766 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_DisabledColor.g - value: 0.4666667 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_DisabledColor.r - value: 0.6745098 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_SelectedColor.b - value: 0.28627452 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_SelectedColor.g - value: 0.45882356 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_SelectedColor.r - value: 0.67058825 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_HighlightedColor.b - value: 0.16470589 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_HighlightedColor.g - value: 0.21568628 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_HighlightedColor.r - value: 0.30980393 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Mode - value: 6 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Mode - value: 5 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Mode - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 1471721227} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Target - value: - objectReference: {fileID: 285099740} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Target - value: - objectReference: {fileID: 2052325930} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Target - value: - objectReference: {fileID: 2052325930} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_CallState - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: SetActive - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_MethodName - value: Play - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_MethodName - value: EnableInteraction - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_MethodName - value: Resume - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName - value: UnityEngine.GameObject, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_TargetAssemblyTypeName - value: AudioManager, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_TargetAssemblyTypeName - value: UIScript, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_TargetAssemblyTypeName - value: UIScript, Assembly-CSharp - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_BoolArgument - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_StringArgument - value: UIClick - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[3].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[4].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 143517203812294372, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[5].m_Arguments.m_ObjectArgumentAssemblyTypeName - value: UnityEngine.Object, UnityEngine - objectReference: {fileID: 0} - - target: {fileID: 143517203812294373, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_SizeDelta.x - value: 370.2183 - objectReference: {fileID: 0} - - target: {fileID: 143517203985900441, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_fontColor.b - value: 0.36862746 - objectReference: {fileID: 0} - - target: {fileID: 143517203985900441, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_fontColor.g - value: 0.5176471 - objectReference: {fileID: 0} - - target: {fileID: 143517203985900441, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_fontColor.r - value: 0.7058824 - objectReference: {fileID: 0} - - target: {fileID: 143517203985900441, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_fontColor32.rgba - value: 4284384436 - objectReference: {fileID: 0} - - target: {fileID: 319434701776774796, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Color.b - value: 0.60784316 - objectReference: {fileID: 0} - - target: {fileID: 319434701776774796, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Color.g - value: 0.7568628 - objectReference: {fileID: 0} - - target: {fileID: 319434701776774796, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Color.r - value: 0.882353 - objectReference: {fileID: 0} - - target: {fileID: 319434701825724920, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 319434701825724920, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 319434701825724920, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 319434701938602516, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_NormalColor.b - value: 0.3647059 - objectReference: {fileID: 0} - - target: {fileID: 319434701938602516, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_NormalColor.g - value: 0.5137255 - objectReference: {fileID: 0} - - target: {fileID: 319434701938602516, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_NormalColor.r - value: 0.7019608 - objectReference: {fileID: 0} - - target: {fileID: 319434701938602516, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_PressedColor.b - value: 0.14117648 - objectReference: {fileID: 0} - - target: {fileID: 319434701938602516, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_PressedColor.g - value: 0.19215688 - objectReference: {fileID: 0} - - target: {fileID: 319434701938602516, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_PressedColor.r - value: 0.2901961 - objectReference: {fileID: 0} - - target: {fileID: 319434701938602516, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_DisabledColor.b - value: 0.3647059 - objectReference: {fileID: 0} - - target: {fileID: 319434701938602516, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_DisabledColor.g - value: 0.5137255 - objectReference: {fileID: 0} - - target: {fileID: 319434701938602516, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_DisabledColor.r - value: 0.7019608 - objectReference: {fileID: 0} - - target: {fileID: 319434701938602516, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_SelectedColor.b - value: 0.3647059 - objectReference: {fileID: 0} - - target: {fileID: 319434701938602516, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_SelectedColor.g - value: 0.5137255 - objectReference: {fileID: 0} - - target: {fileID: 319434701938602516, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_SelectedColor.r - value: 0.7019608 - objectReference: {fileID: 0} - - target: {fileID: 319434701938602516, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_HighlightedColor.b - value: 0.14117648 - objectReference: {fileID: 0} - - target: {fileID: 319434701938602516, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_HighlightedColor.g - value: 0.19215688 - objectReference: {fileID: 0} - - target: {fileID: 319434701938602516, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_HighlightedColor.r - value: 0.2901961 - objectReference: {fileID: 0} - - target: {fileID: 319434702272858339, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 319434702272858339, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 319434702272858348, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Color.b - value: 0.29803923 - objectReference: {fileID: 0} - - target: {fileID: 319434702272858348, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Color.g - value: 0.4666667 - objectReference: {fileID: 0} - - target: {fileID: 319434702272858348, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Color.r - value: 0.6784314 - objectReference: {fileID: 0} - - target: {fileID: 1198663963676054483, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Sprite - value: - objectReference: {fileID: 21300000, guid: 86eb0141d81675b4ba47b617e62ce980, type: 3} - - target: {fileID: 1198663963676054486, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Pivot.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1198663963676054486, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Pivot.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1198663963676054486, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_RootOrder - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 1198663963676054486, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1198663963676054486, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1198663963676054486, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1198663963676054486, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_AnchorMin.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1198663963676054486, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_SizeDelta.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1198663963676054486, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_SizeDelta.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1198663963676054486, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1198663963676054486, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1198663963676054486, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1198663963676054486, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 1198663963676054486, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1198663963676054486, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1198663963676054486, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1198663963676054486, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_AnchoredPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1198663963676054486, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_AnchoredPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1198663963676054486, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1198663963676054486, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1198663963676054486, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1198663963676054487, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_SortingOrder - value: 3 - objectReference: {fileID: 0} - - target: {fileID: 1198663963676054492, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Name - value: PauseMenu - objectReference: {fileID: 0} - - target: {fileID: 1198663963676054492, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_IsActive - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4595699988412577431, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 285099740} - - target: {fileID: 4595699988412577431, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Play - objectReference: {fileID: 0} - - target: {fileID: 4720244379831770324, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 285099740} - - target: {fileID: 4720244379831770324, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Delegates.Array.data[0].callback.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Play - objectReference: {fileID: 0} - - target: {fileID: 5813130966773590257, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: Mixer - value: - objectReference: {fileID: 24100000, guid: 6c9354103c3802249b754094e0febe03, type: 2} - - target: {fileID: 6605291368439861724, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_fontColor.b - value: 0.078431375 - objectReference: {fileID: 0} - - target: {fileID: 6605291368439861724, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_fontColor.g - value: 0.1254902 - objectReference: {fileID: 0} - - target: {fileID: 6605291368439861724, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_fontColor.r - value: 0.24313727 - objectReference: {fileID: 0} - - target: {fileID: 6605291368439861724, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_fontColor32.rgba - value: 4279509054 - objectReference: {fileID: 0} - - target: {fileID: 7765730327562899650, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7765730327562899650, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7765730327562899650, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_AnchorMin.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7765730329065949657, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_AnchorMax.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 7765730329065949657, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_AnchorMax.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 9204084032463014362, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_fontColor.b - value: 0.36862746 - objectReference: {fileID: 0} - - target: {fileID: 9204084032463014362, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_fontColor.g - value: 0.5176471 - objectReference: {fileID: 0} - - target: {fileID: 9204084032463014362, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_fontColor.r - value: 0.7058824 - objectReference: {fileID: 0} - - target: {fileID: 9204084032463014362, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_fontColor32.rgba - value: 4284384436 - objectReference: {fileID: 0} - - target: {fileID: 9204084032618542246, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_SizeDelta.x - value: 370.22 - objectReference: {fileID: 0} - - target: {fileID: 9204084032618542247, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_NormalColor.b - value: 0.27450982 - objectReference: {fileID: 0} - - target: {fileID: 9204084032618542247, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_NormalColor.g - value: 0.4745098 - objectReference: {fileID: 0} - - target: {fileID: 9204084032618542247, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_NormalColor.r - value: 0.54901963 - objectReference: {fileID: 0} - - target: {fileID: 9204084032618542247, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_PressedColor.b - value: 0.27450982 - objectReference: {fileID: 0} - - target: {fileID: 9204084032618542247, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_PressedColor.g - value: 0.4745098 - objectReference: {fileID: 0} - - target: {fileID: 9204084032618542247, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_PressedColor.r - value: 0.54901963 - objectReference: {fileID: 0} - - target: {fileID: 9204084032618542247, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_DisabledColor.b - value: 0.27450982 - objectReference: {fileID: 0} - - target: {fileID: 9204084032618542247, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_DisabledColor.g - value: 0.4745098 - objectReference: {fileID: 0} - - target: {fileID: 9204084032618542247, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_DisabledColor.r - value: 0.54901963 - objectReference: {fileID: 0} - - target: {fileID: 9204084032618542247, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_SelectedColor.b - value: 0.27450982 - objectReference: {fileID: 0} - - target: {fileID: 9204084032618542247, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_SelectedColor.g - value: 0.4745098 - objectReference: {fileID: 0} - - target: {fileID: 9204084032618542247, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_SelectedColor.r - value: 0.54901963 - objectReference: {fileID: 0} - - target: {fileID: 9204084032618542247, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_HighlightedColor.b - value: 0.16470589 - objectReference: {fileID: 0} - - target: {fileID: 9204084032618542247, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_HighlightedColor.g - value: 0.21568628 - objectReference: {fileID: 0} - - target: {fileID: 9204084032618542247, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Colors.m_HighlightedColor.r - value: 0.30980393 - objectReference: {fileID: 0} - - target: {fileID: 9204084032618542247, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target - value: - objectReference: {fileID: 285099740} - - target: {fileID: 9204084032618542247, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_Target - value: - objectReference: {fileID: 2052325930} - - target: {fileID: 9204084032618542247, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName - value: Play - objectReference: {fileID: 0} - - target: {fileID: 9204084032618542247, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[2].m_MethodName - value: LoadScene - objectReference: {fileID: 0} - - target: {fileID: 9204084032618542247, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_StringArgument - value: Whoosh - objectReference: {fileID: 0} - - target: {fileID: 9204084034181305720, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Color.b - value: 0.16470589 - objectReference: {fileID: 0} - - target: {fileID: 9204084034181305720, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Color.g - value: 0.21568629 - objectReference: {fileID: 0} - - target: {fileID: 9204084034181305720, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - propertyPath: m_Color.r - value: 0.30980393 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} --- !u!1 &578785694 GameObject: m_ObjectHideFlags: 0 @@ -5344,13 +4758,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 619394800} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -12.2897415, y: -3.4661891, z: 0.22449027} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 12 + m_Father: {fileID: 39494003} + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &647905502 GameObject: @@ -5426,15 +4840,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 651765460} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.58990204, y: -1.5057185, z: -0.31725612} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -12.879643, y: -4.9719076, z: -0.09276585} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1647374834} - {fileID: 802750020} - m_Father: {fileID: 0} - m_RootOrder: 15 + m_Father: {fileID: 39494003} + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &653644702 GameObject: @@ -5487,7 +4901,7 @@ HingeJoint2D: m_BreakTorque: Infinity m_AutoConfigureConnectedAnchor: 1 m_Anchor: {x: 0, y: 0} - m_ConnectedAnchor: {x: -58.67, y: 0.09} + m_ConnectedAnchor: {x: -58.67, y: 0.089999914} m_UseMotor: 0 m_Motor: m_MotorSpeed: 0 @@ -5576,13 +4990,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 653644702} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -58.67, y: 0.09, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -70.95974, y: -3.3761892, z: 0.22449027} m_LocalScale: {x: 0.2, y: 0.2, z: 0.2} m_ConstrainProportionsScale: 1 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 31 + m_Father: {fileID: 39494003} + m_RootOrder: 22 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &664033876 GameObject: @@ -5939,18 +5353,23 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 696714399} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -82.08, y: -6.6700006, z: -0.6252738} - m_LocalScale: {x: 2, y: 5.000001, z: 1} + m_LocalPosition: {x: -94.36974, y: -10.136189, z: -0.40078354} + m_LocalScale: {x: 2, y: 5, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 8 + m_Father: {fileID: 39494003} + m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &697156468 stripped GameObject: m_CorrespondingSourceObject: {fileID: 660650116708454890, guid: 3526643a76591cb4c81ed8f0ff15f7b4, type: 3} m_PrefabInstance: {fileID: 1801798678} m_PrefabAsset: {fileID: 0} +--- !u!4 &699174473 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4734027960977103343, guid: 4f22cff1f5db3574699cf093514249ce, type: 3} + m_PrefabInstance: {fileID: 812507725} + m_PrefabAsset: {fileID: 0} --- !u!1 &707448857 GameObject: m_ObjectHideFlags: 0 @@ -7208,12 +6627,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 783350859} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 65.13, y: -8, z: 0} + m_LocalPosition: {x: 52.840256, y: -11.466189, z: 0.22449027} m_LocalScale: {x: 10, y: 2.5, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 17 + m_Father: {fileID: 39494003} + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &789240862 GameObject: @@ -7320,12 +6739,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 789240862} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -10.32, y: -5.61, z: 0} + m_LocalPosition: {x: -22.609741, y: -9.076189, z: 0.22449027} m_LocalScale: {x: 0, y: 1.4, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 23 + m_Father: {fileID: 39494003} + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!95 &789240866 Animator: @@ -7633,13 +7052,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 801308028} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -33.35711, y: -18.418663, z: 2.4758768} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -45.64685, y: -21.884851, z: 2.700367} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 19 + m_Father: {fileID: 39494003} + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &802750019 GameObject: @@ -7684,7 +7103,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 39494003} m_Modifications: - target: {fileID: 4734027960977103342, guid: 4f22cff1f5db3574699cf093514249ce, type: 3} propertyPath: m_Name @@ -7696,19 +7115,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4734027960977103343, guid: 4f22cff1f5db3574699cf093514249ce, type: 3} propertyPath: m_RootOrder - value: 34 + value: 25 objectReference: {fileID: 0} - target: {fileID: 4734027960977103343, guid: 4f22cff1f5db3574699cf093514249ce, type: 3} propertyPath: m_LocalPosition.x - value: 8.56 + value: -3.729741 objectReference: {fileID: 0} - target: {fileID: 4734027960977103343, guid: 4f22cff1f5db3574699cf093514249ce, type: 3} propertyPath: m_LocalPosition.y - value: 0.86 + value: -2.6061893 objectReference: {fileID: 0} - target: {fileID: 4734027960977103343, guid: 4f22cff1f5db3574699cf093514249ce, type: 3} propertyPath: m_LocalPosition.z - value: -0.63619107 + value: -0.4117008 objectReference: {fileID: 0} - target: {fileID: 4734027960977103343, guid: 4f22cff1f5db3574699cf093514249ce, type: 3} propertyPath: m_LocalRotation.w @@ -7940,7 +7359,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 39494003} m_Modifications: - target: {fileID: 6439077248140847073, guid: 28ee1266425b862458a16d3d9348dc03, type: 3} propertyPath: m_Name @@ -7948,19 +7367,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6439077248140847079, guid: 28ee1266425b862458a16d3d9348dc03, type: 3} propertyPath: m_RootOrder - value: 30 + value: 21 objectReference: {fileID: 0} - target: {fileID: 6439077248140847079, guid: 28ee1266425b862458a16d3d9348dc03, type: 3} propertyPath: m_LocalPosition.x - value: 15.14 + value: 2.8502588 objectReference: {fileID: 0} - target: {fileID: 6439077248140847079, guid: 28ee1266425b862458a16d3d9348dc03, type: 3} propertyPath: m_LocalPosition.y - value: -8.72 + value: -12.18619 objectReference: {fileID: 0} - target: {fileID: 6439077248140847079, guid: 28ee1266425b862458a16d3d9348dc03, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.22449027 objectReference: {fileID: 0} - target: {fileID: 6439077248140847079, guid: 28ee1266425b862458a16d3d9348dc03, type: 3} propertyPath: m_LocalRotation.w @@ -7968,15 +7387,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6439077248140847079, guid: 28ee1266425b862458a16d3d9348dc03, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6439077248140847079, guid: 28ee1266425b862458a16d3d9348dc03, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6439077248140847079, guid: 28ee1266425b862458a16d3d9348dc03, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6439077248140847079, guid: 28ee1266425b862458a16d3d9348dc03, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -8236,12 +7655,17 @@ Transform: m_Father: {fileID: 1728736117} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &857196963 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} + m_PrefabInstance: {fileID: 2022162087} + m_PrefabAsset: {fileID: 0} --- !u!1001 &857707475 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 39494003} m_Modifications: - target: {fileID: 6865415882687814547, guid: 98b8b39d20440ca46bc647f8484d8782, type: 3} propertyPath: m_LocalPosition.x @@ -8277,19 +7701,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6865415883022448149, guid: 98b8b39d20440ca46bc647f8484d8782, type: 3} propertyPath: m_RootOrder - value: 37 + value: 28 objectReference: {fileID: 0} - target: {fileID: 6865415883022448149, guid: 98b8b39d20440ca46bc647f8484d8782, type: 3} propertyPath: m_LocalPosition.x - value: 33.01 + value: 20.720257 objectReference: {fileID: 0} - target: {fileID: 6865415883022448149, guid: 98b8b39d20440ca46bc647f8484d8782, type: 3} propertyPath: m_LocalPosition.y - value: -0.8 + value: -4.266189 objectReference: {fileID: 0} - target: {fileID: 6865415883022448149, guid: 98b8b39d20440ca46bc647f8484d8782, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.22449027 objectReference: {fileID: 0} - target: {fileID: 6865415883022448149, guid: 98b8b39d20440ca46bc647f8484d8782, type: 3} propertyPath: m_LocalRotation.w @@ -8297,15 +7721,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6865415883022448149, guid: 98b8b39d20440ca46bc647f8484d8782, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6865415883022448149, guid: 98b8b39d20440ca46bc647f8484d8782, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6865415883022448149, guid: 98b8b39d20440ca46bc647f8484d8782, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6865415883022448149, guid: 98b8b39d20440ca46bc647f8484d8782, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -8743,13 +8167,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 934052521} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -26.6, y: -3.63, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -38.88974, y: -7.0961895, z: 0.22449027} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 25 + m_Father: {fileID: 39494003} + m_RootOrder: 16 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &939756894 GameObject: @@ -8970,6 +8394,11 @@ Transform: m_Father: {fileID: 647905503} m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &962693010 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6170958044719408295, guid: ab5ee76efee51a1499de74e8d13e28ca, type: 3} + m_PrefabInstance: {fileID: 6170958045633489239} + m_PrefabAsset: {fileID: 0} --- !u!1 &990967313 GameObject: m_ObjectHideFlags: 0 @@ -9169,7 +8598,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 39494003} m_Modifications: - target: {fileID: 697111467551760840, guid: 81878f782cbf91e4d8479b4d77ff091e, type: 3} propertyPath: m_Name @@ -9181,19 +8610,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 697111467551760853, guid: 81878f782cbf91e4d8479b4d77ff091e, type: 3} propertyPath: m_RootOrder - value: 28 + value: 19 objectReference: {fileID: 0} - target: {fileID: 697111467551760853, guid: 81878f782cbf91e4d8479b4d77ff091e, type: 3} propertyPath: m_LocalPosition.x - value: -38.51 + value: -50.79974 objectReference: {fileID: 0} - target: {fileID: 697111467551760853, guid: 81878f782cbf91e4d8479b4d77ff091e, type: 3} propertyPath: m_LocalPosition.y - value: -4.642 + value: -8.10819 objectReference: {fileID: 0} - target: {fileID: 697111467551760853, guid: 81878f782cbf91e4d8479b4d77ff091e, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.22449027 objectReference: {fileID: 0} - target: {fileID: 697111467551760853, guid: 81878f782cbf91e4d8479b4d77ff091e, type: 3} propertyPath: m_LocalRotation.w @@ -9201,15 +8630,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 697111467551760853, guid: 81878f782cbf91e4d8479b4d77ff091e, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 697111467551760853, guid: 81878f782cbf91e4d8479b4d77ff091e, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 697111467551760853, guid: 81878f782cbf91e4d8479b4d77ff091e, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 697111467551760853, guid: 81878f782cbf91e4d8479b4d77ff091e, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -10538,7 +9967,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 39494003} m_Modifications: - target: {fileID: 1230345730026293204, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_Name @@ -10546,19 +9975,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_RootOrder - value: 44 + value: 36 objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_LocalPosition.x - value: 11.16 + value: -1.1297417 objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_LocalPosition.y - value: -8.083366 + value: -11.549556 objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.22449027 objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_LocalRotation.w @@ -10566,15 +9995,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -10695,7 +10124,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6789813142486697875, guid: 15a931a353af7a3499d46505a033d657, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6789813142486697876, guid: 15a931a353af7a3499d46505a033d657, type: 3} propertyPath: wall @@ -10705,9 +10134,21 @@ PrefabInstance: propertyPath: wall2 value: objectReference: {fileID: 1935999063} + - target: {fileID: 6789813142486697877, guid: 15a931a353af7a3499d46505a033d657, type: 3} + propertyPath: maxHealth + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 6789813142486697877, guid: 15a931a353af7a3499d46505a033d657, type: 3} + propertyPath: currentHealth + value: 100 + objectReference: {fileID: 0} + - target: {fileID: 6789813142486697877, guid: 15a931a353af7a3499d46505a033d657, type: 3} + propertyPath: shieldProtection + value: 35 + objectReference: {fileID: 0} - target: {fileID: 6789813143233222933, guid: 15a931a353af7a3499d46505a033d657, type: 3} propertyPath: m_RootOrder - value: 3 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6789813143233222933, guid: 15a931a353af7a3499d46505a033d657, type: 3} propertyPath: m_LocalPosition.x @@ -10989,13 +10430,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1203169031} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -50.89, y: -2.32, z: 0} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -63.17974, y: -5.786189, z: 0.22449027} m_LocalScale: {x: 10.649893, y: 1.0000253, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 33 + m_Father: {fileID: 39494003} + m_RootOrder: 24 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1208619144 GameObject: @@ -11513,7 +10954,6 @@ GameObject: - component: {fileID: 1239587457} - component: {fileID: 1239587456} - component: {fileID: 1239587455} - - component: {fileID: 1239587458} m_Layer: 5 m_Name: Button m_TagString: Untagged @@ -11672,18 +11112,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1239587453} m_CullTransparentMesh: 1 ---- !u!114 &1239587458 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1239587453} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7e33d9c15e2ac264f890e0badfc83b1d, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1241353835 GameObject: m_ObjectHideFlags: 0 @@ -11760,6 +11188,11 @@ RectTransform: m_AnchoredPosition: {x: 145.32, y: 0} m_SizeDelta: {x: 143.061, y: 147.7929} m_Pivot: {x: 0.5, y: 0.5} +--- !u!4 &1248981375 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6865415883022448149, guid: 98b8b39d20440ca46bc647f8484d8782, type: 3} + m_PrefabInstance: {fileID: 857707475} + m_PrefabAsset: {fileID: 0} --- !u!1 &1254583649 GameObject: m_ObjectHideFlags: 0 @@ -11862,6 +11295,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1254583649} m_CullTransparentMesh: 1 +--- !u!4 &1273952491 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3137905319084310904, guid: ef6f69eb5c095384089846050f91c114, type: 3} + m_PrefabInstance: {fileID: 1826311412} + m_PrefabAsset: {fileID: 0} --- !u!1 &1281863153 GameObject: m_ObjectHideFlags: 0 @@ -12584,6 +12022,11 @@ Transform: m_Father: {fileID: 1728736117} m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0} +--- !u!4 &1370401914 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 697111467551760853, guid: 81878f782cbf91e4d8479b4d77ff091e, type: 3} + m_PrefabInstance: {fileID: 1004979870} + m_PrefabAsset: {fileID: 0} --- !u!1 &1375976369 GameObject: m_ObjectHideFlags: 0 @@ -12890,6 +12333,11 @@ Transform: m_Father: {fileID: 1647374834} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &1407454509 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 5643911553064321334, guid: 695ddbf0b7891fa478659905db4e2c9d, type: 3} + m_PrefabInstance: {fileID: 1878463703} + m_PrefabAsset: {fileID: 0} --- !u!1 &1408370371 GameObject: m_ObjectHideFlags: 0 @@ -13023,36 +12471,36 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1414715165} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 12.2897415, y: 3.4661891, z: -0.22449027} + 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: 0} - m_RootOrder: 35 + m_Father: {fileID: 39494003} + m_RootOrder: 26 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1423085481 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 39494003} m_Modifications: - target: {fileID: 3638194961284494932, guid: 68e4d0d09dd6a5647b5a0e4e6aa5749a, type: 3} propertyPath: m_RootOrder - value: 21 + value: 12 objectReference: {fileID: 0} - target: {fileID: 3638194961284494932, guid: 68e4d0d09dd6a5647b5a0e4e6aa5749a, type: 3} propertyPath: m_LocalPosition.x - value: -42.797226 + value: -55.086967 objectReference: {fileID: 0} - target: {fileID: 3638194961284494932, guid: 68e4d0d09dd6a5647b5a0e4e6aa5749a, type: 3} propertyPath: m_LocalPosition.y - value: -4.1747704 + value: -7.6409597 objectReference: {fileID: 0} - target: {fileID: 3638194961284494932, guid: 68e4d0d09dd6a5647b5a0e4e6aa5749a, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.22449027 objectReference: {fileID: 0} - target: {fileID: 3638194961284494932, guid: 68e4d0d09dd6a5647b5a0e4e6aa5749a, type: 3} propertyPath: m_LocalRotation.w @@ -13060,15 +12508,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3638194961284494932, guid: 68e4d0d09dd6a5647b5a0e4e6aa5749a, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3638194961284494932, guid: 68e4d0d09dd6a5647b5a0e4e6aa5749a, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3638194961284494932, guid: 68e4d0d09dd6a5647b5a0e4e6aa5749a, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3638194961284494932, guid: 68e4d0d09dd6a5647b5a0e4e6aa5749a, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -13097,6 +12545,11 @@ GameObject: m_CorrespondingSourceObject: {fileID: 3638194961284494935, guid: 68e4d0d09dd6a5647b5a0e4e6aa5749a, type: 3} m_PrefabInstance: {fileID: 1423085481} m_PrefabAsset: {fileID: 0} +--- !u!4 &1423085483 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3638194961284494932, guid: 68e4d0d09dd6a5647b5a0e4e6aa5749a, type: 3} + m_PrefabInstance: {fileID: 1423085481} + m_PrefabAsset: {fileID: 0} --- !u!1 &1434250254 GameObject: m_ObjectHideFlags: 0 @@ -13120,15 +12573,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1434250254} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 28.230167, y: -7.52668, z: 0.16834715} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 15.940426, y: -10.992869, z: 0.3928374} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - {fileID: 2135814639} - {fileID: 1804783593} - m_Father: {fileID: 0} - m_RootOrder: 26 + m_Father: {fileID: 39494003} + m_RootOrder: 17 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1441774456 GameObject: @@ -13180,13 +12633,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1441774456} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.07, y: -9.74, z: -0.11959445} + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: -12.359741, y: -13.206189, z: 0.10489582} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 14 + m_Father: {fileID: 39494003} + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1445095122 stripped GameObject: @@ -13205,7 +12658,6 @@ GameObject: - component: {fileID: 1452148347} - component: {fileID: 1452148346} - component: {fileID: 1452148345} - - component: {fileID: 1452148348} m_Layer: 5 m_Name: Button (1) m_TagString: Untagged @@ -13340,18 +12792,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1452148343} m_CullTransparentMesh: 1 ---- !u!114 &1452148348 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1452148343} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 7e33d9c15e2ac264f890e0badfc83b1d, type: 3} - m_Name: - m_EditorClassIdentifier: --- !u!1 &1471721227 GameObject: m_ObjectHideFlags: 0 @@ -13451,8 +12891,8 @@ RectTransform: - {fileID: 1232791485} - {fileID: 1720270744} - {fileID: 717191882} - m_Father: {fileID: 0} - m_RootOrder: 24 + m_Father: {fileID: 39494003} + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -13884,152 +13324,12 @@ RectTransform: m_AnchoredPosition: {x: 145.32, y: 0} m_SizeDelta: {x: 143.061, y: 147.7929} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &1519049532 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1519049538} - - component: {fileID: 1519049537} - - component: {fileID: 1519049536} - - component: {fileID: 1519049535} - - component: {fileID: 1519049534} - - component: {fileID: 1519049533} - m_Layer: 5 - m_Name: BlackScreen - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1519049533 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1519049532} - 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: 0, g: 0, b: 0, a: 0} - m_RaycastTarget: 0 - m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 - m_OnCullStateChanged: - m_PersistentCalls: - m_Calls: [] - m_Sprite: {fileID: 0} - 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 &1519049534 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1519049532} - m_CullTransparentMesh: 1 ---- !u!114 &1519049535 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1519049532} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} - m_Name: - m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 - m_BlockingObjects: 0 - m_BlockingMask: - serializedVersion: 2 - m_Bits: 4294967295 ---- !u!114 &1519049536 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1519049532} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3} - m_Name: - m_EditorClassIdentifier: - m_UiScaleMode: 1 - m_ReferencePixelsPerUnit: 100 - m_ScaleFactor: 1 - m_ReferenceResolution: {x: 1920, y: 1080} - m_ScreenMatchMode: 0 - m_MatchWidthOrHeight: 0 - m_PhysicalUnit: 3 - m_FallbackScreenDPI: 96 - m_DefaultSpriteDPI: 96 - m_DynamicPixelsPerUnit: 1 - m_PresetInfoIsWorld: 0 ---- !u!223 &1519049537 -Canvas: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1519049532} - m_Enabled: 1 - serializedVersion: 3 - m_RenderMode: 0 - m_Camera: {fileID: 0} - m_PlaneDistance: 100 - m_PixelPerfect: 0 - m_ReceivesEvents: 1 - m_OverrideSorting: 0 - m_OverridePixelPerfect: 0 - m_SortingBucketNormalizedSize: 0 - m_AdditionalShaderChannelsFlag: 0 - m_SortingLayerID: 0 - m_SortingOrder: 4 - m_TargetDisplay: 0 ---- !u!224 &1519049538 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1519049532} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0, y: 0, z: 0} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 11 - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} - m_AnchorMax: {x: 0, y: 0} - m_AnchoredPosition: {x: 0, y: 0} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0, y: 0} --- !u!1001 &1527787642 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 39494003} m_Modifications: - target: {fileID: 4875834879910941721, guid: bdebb95b797576d439b59d074eca24b6, type: 3} propertyPath: Player @@ -14049,19 +13349,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8203032906386281863, guid: bdebb95b797576d439b59d074eca24b6, type: 3} propertyPath: m_RootOrder - value: 20 + value: 11 objectReference: {fileID: 0} - target: {fileID: 8203032906386281863, guid: bdebb95b797576d439b59d074eca24b6, type: 3} propertyPath: m_LocalPosition.x - value: -35.27 + value: -47.559742 objectReference: {fileID: 0} - target: {fileID: 8203032906386281863, guid: bdebb95b797576d439b59d074eca24b6, type: 3} propertyPath: m_LocalPosition.y - value: -4.24 + value: -7.706189 objectReference: {fileID: 0} - target: {fileID: 8203032906386281863, guid: bdebb95b797576d439b59d074eca24b6, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.22449027 objectReference: {fileID: 0} - target: {fileID: 8203032906386281863, guid: bdebb95b797576d439b59d074eca24b6, type: 3} propertyPath: m_LocalRotation.w @@ -14069,15 +13369,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 8203032906386281863, guid: bdebb95b797576d439b59d074eca24b6, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8203032906386281863, guid: bdebb95b797576d439b59d074eca24b6, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8203032906386281863, guid: bdebb95b797576d439b59d074eca24b6, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 8203032906386281863, guid: bdebb95b797576d439b59d074eca24b6, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -14477,6 +13777,11 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1582185434} m_CullTransparentMesh: 1 +--- !u!4 &1588827522 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} + m_PrefabInstance: {fileID: 170502606} + m_PrefabAsset: {fileID: 0} --- !u!1 &1591667153 GameObject: m_ObjectHideFlags: 0 @@ -16256,12 +15561,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1666378105} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 79.19, y: -8, z: 0} + m_LocalPosition: {x: 66.90026, y: -11.466189, z: 0.22449027} m_LocalScale: {x: 10, y: 2.5, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 0} - m_RootOrder: 18 + m_Father: {fileID: 39494003} + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1684632765 GameObject: @@ -18054,23 +17359,23 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 39494003} m_Modifications: - target: {fileID: 3137905319084310904, guid: ef6f69eb5c095384089846050f91c114, type: 3} propertyPath: m_RootOrder - value: 39 + value: 30 objectReference: {fileID: 0} - target: {fileID: 3137905319084310904, guid: ef6f69eb5c095384089846050f91c114, type: 3} propertyPath: m_LocalPosition.x - value: 47.36 + value: 35.07026 objectReference: {fileID: 0} - target: {fileID: 3137905319084310904, guid: ef6f69eb5c095384089846050f91c114, type: 3} propertyPath: m_LocalPosition.y - value: -4.9 + value: -8.366189 objectReference: {fileID: 0} - target: {fileID: 3137905319084310904, guid: ef6f69eb5c095384089846050f91c114, type: 3} propertyPath: m_LocalPosition.z - value: -1.3242306 + value: -1.0997403 objectReference: {fileID: 0} - target: {fileID: 3137905319084310904, guid: ef6f69eb5c095384089846050f91c114, type: 3} propertyPath: m_LocalRotation.w @@ -18078,15 +17383,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3137905319084310904, guid: ef6f69eb5c095384089846050f91c114, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3137905319084310904, guid: ef6f69eb5c095384089846050f91c114, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3137905319084310904, guid: ef6f69eb5c095384089846050f91c114, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 3137905319084310904, guid: ef6f69eb5c095384089846050f91c114, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -18106,6 +17411,11 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: ef6f69eb5c095384089846050f91c114, type: 3} +--- !u!4 &1828889654 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} + m_PrefabInstance: {fileID: 1188175574} + m_PrefabAsset: {fileID: 0} --- !u!1 &1834457313 GameObject: m_ObjectHideFlags: 0 @@ -18190,6 +17500,16 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 +--- !u!4 &1838619133 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 8203032906386281863, guid: bdebb95b797576d439b59d074eca24b6, type: 3} + m_PrefabInstance: {fileID: 1527787642} + m_PrefabAsset: {fileID: 0} +--- !u!4 &1849145410 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7404710900616408872, guid: ce85be00d49842f4394b3d7f9dc4cf0b, type: 3} + m_PrefabInstance: {fileID: 7404710901989574998} + m_PrefabAsset: {fileID: 0} --- !u!1 &1851962680 GameObject: m_ObjectHideFlags: 0 @@ -18610,31 +17930,31 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 39494003} m_Modifications: - target: {fileID: 2074856879, guid: 695ddbf0b7891fa478659905db4e2c9d, type: 3} propertyPath: SpawnObject value: - objectReference: {fileID: 6684767046887524778, guid: 0f1a1fd408784584492502c980bc866c, type: 3} + objectReference: {fileID: 0} - target: {fileID: 2267912555896859874, guid: 695ddbf0b7891fa478659905db4e2c9d, type: 3} propertyPath: m_Name value: BreakableRock objectReference: {fileID: 0} - target: {fileID: 5643911553064321334, guid: 695ddbf0b7891fa478659905db4e2c9d, type: 3} propertyPath: m_RootOrder - value: 41 + value: 32 objectReference: {fileID: 0} - target: {fileID: 5643911553064321334, guid: 695ddbf0b7891fa478659905db4e2c9d, type: 3} propertyPath: m_LocalPosition.x - value: -65.00932 + value: -77.299065 objectReference: {fileID: 0} - target: {fileID: 5643911553064321334, guid: 695ddbf0b7891fa478659905db4e2c9d, type: 3} propertyPath: m_LocalPosition.y - value: -7.221057 + value: -10.687246 objectReference: {fileID: 0} - target: {fileID: 5643911553064321334, guid: 695ddbf0b7891fa478659905db4e2c9d, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.22449027 objectReference: {fileID: 0} - target: {fileID: 5643911553064321334, guid: 695ddbf0b7891fa478659905db4e2c9d, type: 3} propertyPath: m_LocalRotation.w @@ -18642,15 +17962,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5643911553064321334, guid: 695ddbf0b7891fa478659905db4e2c9d, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5643911553064321334, guid: 695ddbf0b7891fa478659905db4e2c9d, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5643911553064321334, guid: 695ddbf0b7891fa478659905db4e2c9d, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 5643911553064321334, guid: 695ddbf0b7891fa478659905db4e2c9d, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -18671,7 +17991,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 39494003} m_Modifications: - target: {fileID: 5853798891148039933, guid: 22482e588c49ba049937e66d05fd93fc, type: 3} propertyPath: m_Name @@ -18687,19 +18007,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5853798891148039934, guid: 22482e588c49ba049937e66d05fd93fc, type: 3} propertyPath: m_RootOrder - value: 29 + value: 20 objectReference: {fileID: 0} - target: {fileID: 5853798891148039934, guid: 22482e588c49ba049937e66d05fd93fc, type: 3} propertyPath: m_LocalPosition.x - value: -48.54 + value: -60.829742 objectReference: {fileID: 0} - target: {fileID: 5853798891148039934, guid: 22482e588c49ba049937e66d05fd93fc, type: 3} propertyPath: m_LocalPosition.y - value: -7.22 + value: -10.686189 objectReference: {fileID: 0} - target: {fileID: 5853798891148039934, guid: 22482e588c49ba049937e66d05fd93fc, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.22449027 objectReference: {fileID: 0} - target: {fileID: 5853798891148039934, guid: 22482e588c49ba049937e66d05fd93fc, type: 3} propertyPath: m_LocalRotation.w @@ -18967,23 +18287,23 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 39494003} m_Modifications: - target: {fileID: 4894150111351590006, guid: f24d8f208832e64498730b359dd22e6b, type: 3} propertyPath: m_RootOrder - value: 32 + value: 23 objectReference: {fileID: 0} - target: {fileID: 4894150111351590006, guid: f24d8f208832e64498730b359dd22e6b, type: 3} propertyPath: m_LocalPosition.x - value: -87.24 + value: -99.52974 objectReference: {fileID: 0} - target: {fileID: 4894150111351590006, guid: f24d8f208832e64498730b359dd22e6b, type: 3} propertyPath: m_LocalPosition.y - value: -7.67 + value: -11.136189 objectReference: {fileID: 0} - target: {fileID: 4894150111351590006, guid: f24d8f208832e64498730b359dd22e6b, type: 3} propertyPath: m_LocalPosition.z - value: 2.815477 + value: 3.039967 objectReference: {fileID: 0} - target: {fileID: 4894150111351590006, guid: f24d8f208832e64498730b359dd22e6b, type: 3} propertyPath: m_LocalRotation.w @@ -18991,15 +18311,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 4894150111351590006, guid: f24d8f208832e64498730b359dd22e6b, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4894150111351590006, guid: f24d8f208832e64498730b359dd22e6b, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4894150111351590006, guid: f24d8f208832e64498730b359dd22e6b, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 4894150111351590006, guid: f24d8f208832e64498730b359dd22e6b, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -19026,6 +18346,10 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 2135814639} m_Modifications: + - target: {fileID: 660650115634906808, guid: 3526643a76591cb4c81ed8f0ff15f7b4, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 660650115951852348, guid: 3526643a76591cb4c81ed8f0ff15f7b4, type: 3} propertyPath: m_RootOrder value: 2 @@ -19088,7 +18412,11 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 660650115951852351, guid: 3526643a76591cb4c81ed8f0ff15f7b4, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 660650116708454890, guid: 3526643a76591cb4c81ed8f0ff15f7b4, type: 3} + propertyPath: m_IsActive + value: 1 objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 3526643a76591cb4c81ed8f0ff15f7b4, type: 3} @@ -19565,6 +18893,11 @@ MonoBehaviour: m_NumAlphaKeys: 2 fill: {fileID: 2102647920} easingDuration: 0.5 +--- !u!4 &1990805492 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6439077248140847079, guid: 28ee1266425b862458a16d3d9348dc03, type: 3} + m_PrefabInstance: {fileID: 831277770} + m_PrefabAsset: {fileID: 0} --- !u!1 &1992811867 GameObject: m_ObjectHideFlags: 0 @@ -19704,7 +19037,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 39494003} m_Modifications: - target: {fileID: 1230345730026293204, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_Name @@ -19712,19 +19045,19 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_RootOrder - value: 43 + value: 34 objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_LocalPosition.x - value: 2.3100004 + value: -9.979741 objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_LocalPosition.y - value: -8.083366 + value: -11.549556 objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.22449027 objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_LocalRotation.w @@ -19732,15 +19065,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 1230345730026293206, guid: 8135d2cb4724a8a478756a0ae4999f0e, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -19987,7 +19320,7 @@ MonoBehaviour: ModeOverride: 0 LensShift: {x: 0, y: 0} GateFit: 2 - m_SensorSize: {x: 1.7777778, y: 1} + m_SensorSize: {x: 2.1461987, y: 1} m_Transitions: m_BlendHint: 0 m_InheritPosition: 0 @@ -20004,7 +19337,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2033894733} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 46.459, y: 4.9953594, z: -9.117128} + m_LocalPosition: {x: -1.5309982, y: 1.3053598, z: -9.117128} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -20149,7 +19482,6 @@ GameObject: - component: {fileID: 2052325928} - component: {fileID: 2052325927} - component: {fileID: 2052325926} - - component: {fileID: 2052325930} m_Layer: 5 m_Name: Canvas m_TagString: Untagged @@ -20234,31 +19566,19 @@ RectTransform: - {fileID: 1690769659} - {fileID: 1254583650} - {fileID: 1341954707} - m_Father: {fileID: 0} - m_RootOrder: 10 + m_Father: {fileID: 39494003} + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} ---- !u!114 &2052325930 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} +--- !u!4 &2060292861 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7671605491174206912, guid: f9c61c23ed91d6a4283e698f85a2a806, type: 3} + m_PrefabInstance: {fileID: 2111325402} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2052325925} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: d679b4ca9a0fe6442a45b69247834d77, type: 3} - m_Name: - m_EditorClassIdentifier: - pauseMenu: {fileID: 2125825367} - inGameUI: {fileID: 1471721227} - Player: {fileID: 501425333} - time: 2 - image: {fileID: 1519049533} --- !u!1 &2082052078 GameObject: m_ObjectHideFlags: 0 @@ -20778,23 +20098,23 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 39494003} m_Modifications: - target: {fileID: 7671605491174206912, guid: f9c61c23ed91d6a4283e698f85a2a806, type: 3} propertyPath: m_RootOrder - value: 40 + value: 31 objectReference: {fileID: 0} - target: {fileID: 7671605491174206912, guid: f9c61c23ed91d6a4283e698f85a2a806, type: 3} propertyPath: m_LocalPosition.x - value: 72.1 + value: 59.810257 objectReference: {fileID: 0} - target: {fileID: 7671605491174206912, guid: f9c61c23ed91d6a4283e698f85a2a806, type: 3} propertyPath: m_LocalPosition.y - value: -1.3611832 + value: -4.8273726 objectReference: {fileID: 0} - target: {fileID: 7671605491174206912, guid: f9c61c23ed91d6a4283e698f85a2a806, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.22449027 objectReference: {fileID: 0} - target: {fileID: 7671605491174206912, guid: f9c61c23ed91d6a4283e698f85a2a806, type: 3} propertyPath: m_LocalRotation.w @@ -20830,11 +20150,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: f9c61c23ed91d6a4283e698f85a2a806, type: 3} ---- !u!1 &2125825367 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 1198663963676054492, guid: 0778677b47a1b1f4184c3c70112400af, type: 3} - m_PrefabInstance: {fileID: 573179739} - m_PrefabAsset: {fileID: 0} --- !u!1 &2126699016 GameObject: m_ObjectHideFlags: 0 @@ -20953,6 +20268,11 @@ Transform: m_Father: {fileID: 1434250255} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &2140346267 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 4894150111351590006, guid: f24d8f208832e64498730b359dd22e6b, type: 3} + m_PrefabInstance: {fileID: 1930477164} + m_PrefabAsset: {fileID: 0} --- !u!61 &557026937587343015 BoxCollider2D: m_ObjectHideFlags: 0 @@ -21167,7 +20487,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 3632289972206299033, guid: b9e428a617a036049b5240a568340881, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 3632289972206299033, guid: b9e428a617a036049b5240a568340881, type: 3} propertyPath: m_TagString @@ -21183,7 +20503,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 3632289972206299038, guid: b9e428a617a036049b5240a568340881, type: 3} propertyPath: m_RootOrder - value: 6 + value: 4 objectReference: {fileID: 0} - target: {fileID: 3632289972206299038, guid: b9e428a617a036049b5240a568340881, type: 3} propertyPath: m_LocalPosition.x @@ -21203,15 +20523,15 @@ PrefabInstance: objectReference: {fileID: 371552640} - target: {fileID: 3632289972206299043, guid: b9e428a617a036049b5240a568340881, type: 3} propertyPath: distance - value: 7 + value: 10 objectReference: {fileID: 0} - target: {fileID: 3632289972206299043, guid: b9e428a617a036049b5240a568340881, type: 3} propertyPath: hitCoolDown - value: 0.7 + value: 0.3 objectReference: {fileID: 0} - target: {fileID: 3632289972206299043, guid: b9e428a617a036049b5240a568340881, type: 3} propertyPath: attackCoolDown - value: 0.3 + value: 0.5 objectReference: {fileID: 0} - target: {fileID: 3632289972206299043, guid: b9e428a617a036049b5240a568340881, type: 3} propertyPath: knockbackDistance @@ -21306,9 +20626,13 @@ PrefabInstance: propertyPath: wall2 value: objectReference: {fileID: 697156468} + - target: {fileID: 5997636777266006087, guid: 7d095cae7ecf1d042b44d6ac6ae611ad, type: 3} + propertyPath: m_Mass + value: 50 + objectReference: {fileID: 0} - target: {fileID: 5997636777266006136, guid: 7d095cae7ecf1d042b44d6ac6ae611ad, type: 3} propertyPath: m_RootOrder - value: 5 + value: 3 objectReference: {fileID: 0} - target: {fileID: 5997636777266006136, guid: 7d095cae7ecf1d042b44d6ac6ae611ad, type: 3} propertyPath: m_LocalPosition.x @@ -21357,23 +20681,23 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 39494003} m_Modifications: - target: {fileID: 6170958044719408295, guid: ab5ee76efee51a1499de74e8d13e28ca, type: 3} propertyPath: m_RootOrder - value: 38 + value: 29 objectReference: {fileID: 0} - target: {fileID: 6170958044719408295, guid: ab5ee76efee51a1499de74e8d13e28ca, type: 3} propertyPath: m_LocalPosition.x - value: -75.75 + value: -88.03974 objectReference: {fileID: 0} - target: {fileID: 6170958044719408295, guid: ab5ee76efee51a1499de74e8d13e28ca, type: 3} propertyPath: m_LocalPosition.y - value: -6.13 + value: -9.5961895 objectReference: {fileID: 0} - target: {fileID: 6170958044719408295, guid: ab5ee76efee51a1499de74e8d13e28ca, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.22449027 objectReference: {fileID: 0} - target: {fileID: 6170958044719408295, guid: ab5ee76efee51a1499de74e8d13e28ca, type: 3} propertyPath: m_LocalRotation.w @@ -21381,15 +20705,15 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6170958044719408295, guid: ab5ee76efee51a1499de74e8d13e28ca, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6170958044719408295, guid: ab5ee76efee51a1499de74e8d13e28ca, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6170958044719408295, guid: ab5ee76efee51a1499de74e8d13e28ca, type: 3} propertyPath: m_LocalRotation.z - value: 0 + value: -0 objectReference: {fileID: 0} - target: {fileID: 6170958044719408295, guid: ab5ee76efee51a1499de74e8d13e28ca, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -36013,7 +35337,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 180} --- !u!114 &7106734144652565462 MonoBehaviour: @@ -36033,23 +35357,23 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: - m_TransformParent: {fileID: 0} + m_TransformParent: {fileID: 39494003} m_Modifications: - target: {fileID: 7404710900616408872, guid: ce85be00d49842f4394b3d7f9dc4cf0b, type: 3} propertyPath: m_RootOrder - value: 36 + value: 27 objectReference: {fileID: 0} - target: {fileID: 7404710900616408872, guid: ce85be00d49842f4394b3d7f9dc4cf0b, type: 3} propertyPath: m_LocalPosition.x - value: -11.16 + value: -23.449741 objectReference: {fileID: 0} - target: {fileID: 7404710900616408872, guid: ce85be00d49842f4394b3d7f9dc4cf0b, type: 3} propertyPath: m_LocalPosition.y - value: -3.59 + value: -7.056189 objectReference: {fileID: 0} - target: {fileID: 7404710900616408872, guid: ce85be00d49842f4394b3d7f9dc4cf0b, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 0.22449027 objectReference: {fileID: 0} - target: {fileID: 7404710900616408872, guid: ce85be00d49842f4394b3d7f9dc4cf0b, type: 3} propertyPath: m_LocalRotation.w diff --git a/Assets/Scripts/BreakableRock.cs b/Assets/Scripts/BreakableRock.cs index 3769b97d..c0dfb710 100644 --- a/Assets/Scripts/BreakableRock.cs +++ b/Assets/Scripts/BreakableRock.cs @@ -16,7 +16,10 @@ private void OnCollisionEnter2D(Collision2D collision) } void OnHit() { - Instantiate(SpawnObject,new Vector3(transform.position.x, transform.position.y,0), Quaternion.identity); + if(SpawnObject != null) + { + Instantiate(SpawnObject,new Vector3(transform.position.x, transform.position.y,0), Quaternion.identity); + } Destroy(this.gameObject); } diff --git a/Assets/Scripts/Enemies/Archer Enemy/Archer.cs b/Assets/Scripts/Enemies/Archer Enemy/Archer.cs index b94bd9b4..f3e70406 100644 --- a/Assets/Scripts/Enemies/Archer Enemy/Archer.cs +++ b/Assets/Scripts/Enemies/Archer Enemy/Archer.cs @@ -12,7 +12,8 @@ enum State STATE_ATTACK, STATE_COOLDOWN, STATE_FROZEN, - STATE_HIT + STATE_HIT, + STATE_DEAD }; @@ -23,7 +24,7 @@ enum State const string cooldown = "cooldown"; const string hit = "hit"; const string attack = "attack"; - const string death = "death_"; + const string death = "death"; const string startingmove = "run"; public Material material; @@ -41,13 +42,10 @@ enum State bool attackable = true; bool IsDead = false; bool isHit = false; - bool isFrozen = false; public GameObject Arrow; public float LaunchForce; public GameObject attackPoint; - float verticalTolerance = 1.5f; //enemy alttayken player üstteyse onu algýlamasýn diye eklendi - public GameObject ice; - + float verticalTolerance = 1.5f; //enemy alttayken player �stteyse onu alg�lamas�n diye eklendi //Move bool Moveright = true; @@ -68,6 +66,7 @@ enum State LayerMask enemyLayers; EnemyHealthSystem _healthSystem; public float knockbackDistance; //geri sekmesi + private float hitTimer = 0.0f; public GameObject soul; @@ -79,7 +78,6 @@ void Awake() animator = GetComponent(); _healthSystem.OnHit += OnHit; _healthSystem.OnDead += OnDead; - _healthSystem.OnFreeze += OnFreeze; firstmoveSpeed = moveSpeed; slowSpeed = (firstmoveSpeed / 100) * (100 - slowRate); @@ -117,16 +115,18 @@ void checkState() break; case State.STATE_COOLDOWN: ChangeAnimationState(cooldown); - coolDown(2); + coolDown(1); break; case State.STATE_FROZEN: ChangeAnimationState(cooldown); rb.velocity = Vector2.zero; - FreezeCoolDown(5); + coolDown(1); break; case State.STATE_HIT: hitState(); break; + case State.STATE_DEAD: + break; } } void startingMove() @@ -135,10 +135,6 @@ void startingMove() float step = moveSpeed * moveDirectionX; rb.velocity = new Vector3(step, rb.velocity.y); } - public void setState() - { - state = State.STATE_STARTINGMOVE; - } public void slowTimer() { @@ -162,17 +158,11 @@ public void speedFix() } public void setFrozenState() { - isFrozen= true; state = State.STATE_FROZEN; } - public void breakFreeze() - { - isFrozen = false; - checkPlayer(); - } void checkPlayer() { - Vector2 enemyPosition = new Vector2(rb.position.x, rb.position.y); // Düþmanýn konumu + Vector2 enemyPosition = new Vector2(rb.position.x, rb.position.y); // D��man�n konumu Vector2 playerPosition = new Vector2(playerPos.position.x, playerPos.position.y); // Oyuncunun konumu float distanceToPlayer = Vector2.Distance(enemyPosition, playerPosition); @@ -185,7 +175,6 @@ void checkPlayer() { state = State.STATE_STARTINGMOVE; } - } public void ArrowMechanism() @@ -204,17 +193,6 @@ void coolDown(float i) checkPlayer(); } } - public void FreezeCoolDown(float i) - { - timer += Time.deltaTime; - if (timer >= i) - { - attackable = true; - timer = 0; - isFrozen = false; - checkPlayer(); - } - } void ChangeAnimationState(string newState) { if (currentState == newState) return; @@ -230,7 +208,6 @@ private void OnTriggerEnter2D(Collider2D trig) moveDirection *= -1; transform.Rotate(0f, 180f, 0f); } - } @@ -265,39 +242,36 @@ void hitState() ChangeAnimationState(hit); isHit = false; - isFrozen= false; attackable = true; + hitTimer = 0.0f; } - } - void OnHit(object sender, float knockdistance) - { - if (!IsDead) + hitTimer += Time.deltaTime; + if (hitTimer >= animator.GetCurrentAnimatorStateInfo(0).length) { - state = State.STATE_HIT; - isHit = true; + coolDown(1); } } - void OnFreeze(object sender, EventArgs e) + + void OnHit(object sender, float knockdistance) { - if (isFrozen) - { - gameObject.GetComponent().onFreeze = true; - Instantiate(ice, new Vector3(gameObject.transform.position.x - 3, gameObject.transform.position.y, gameObject.transform.position.z), Quaternion.identity); - } + if (IsDead) return; + + state = State.STATE_HIT; + isHit = true; } void OnDead(object sender, EventArgs e) { - if (!IsDead) - { - IsDead = true; - // StartCoroutine(SpawnSoul(0.8f)); - ChangeAnimationState(death); - GetComponent().bodyType = RigidbodyType2D.Kinematic; - GetComponent().enabled = false; - this.enabled = false; - GetComponent().sortingLayerName = "Foreground"; - } + if (IsDead) return; + + IsDead = true; + // StartCoroutine(SpawnSoul(0.8f)); + ChangeAnimationState(death); + GetComponent().bodyType = RigidbodyType2D.Kinematic; + GetComponent().enabled = false; + // this.enabled = false; + state = State.STATE_DEAD; + GetComponent().sortingLayerName = "Foreground"; } IEnumerator SpawnSoul(float wait) { diff --git a/Assets/Scripts/Enemies/Archer Enemy/ArchersArrow.cs b/Assets/Scripts/Enemies/Archer Enemy/ArchersArrow.cs index 4395bfd8..d9fc4287 100644 --- a/Assets/Scripts/Enemies/Archer Enemy/ArchersArrow.cs +++ b/Assets/Scripts/Enemies/Archer Enemy/ArchersArrow.cs @@ -24,8 +24,6 @@ public class ArchersArrow : MonoBehaviour private float gravity; [SerializeField] private float damageRadius; - [SerializeField] - private Transform damagePosition; private HealthSystem playerHealthSystem; @@ -70,7 +68,7 @@ public void OnTriggerEnter2D(Collider2D collision) } if (collision.gameObject.layer == 6) { - fire_loc = new Vector3(damagePosition.position.x, (transform.position.y + 1f), 0); + fire_loc = new Vector3(transform.position.x, (transform.position.y + 1f), 0); Instantiate(fire, fire_loc, Quaternion.LookRotation(Vector3.forward, fire_loc)); hasItGround = true; rb.gravityScale = 0.0f; @@ -85,8 +83,4 @@ public void Fire(float speed, float travelDistance, float damage) this.travelDistance = travelDistance; ArrowDamage = damage; } - private void OnDrawGizmos() - { - Gizmos.DrawWireSphere(damagePosition.position, damageRadius); - } } diff --git a/Assets/Scripts/Enemies/Archer Enemy/ArchersFire.cs b/Assets/Scripts/Enemies/Archer Enemy/ArchersFire.cs index 9cf6421c..f6ab41a1 100644 --- a/Assets/Scripts/Enemies/Archer Enemy/ArchersFire.cs +++ b/Assets/Scripts/Enemies/Archer Enemy/ArchersFire.cs @@ -29,7 +29,7 @@ private void Update() timer += Time.deltaTime; if (stay && timer > (fire_time/10)) { - player.GetComponent().Damage(damage); + player.GetComponent()?.Damage(damage); timer = 0; } } diff --git a/Assets/Scripts/Enemies/Shield Enemy/ShieldEnemy.cs b/Assets/Scripts/Enemies/Shield Enemy/ShieldEnemy.cs index 4a583b9b..9ccf0e5c 100644 --- a/Assets/Scripts/Enemies/Shield Enemy/ShieldEnemy.cs +++ b/Assets/Scripts/Enemies/Shield Enemy/ShieldEnemy.cs @@ -2,12 +2,9 @@ using System.Collections.Generic; using UnityEngine; using System; -using UnityEditor.Search; public class ShieldEnemy : MonoBehaviour { - - enum State { STATE_STARTINGMOVE, @@ -19,9 +16,7 @@ enum State STATE_FROZEN, STATE_BACKTOWALL }; - - - + //Animations private Animator animator; private string currentState; @@ -36,7 +31,6 @@ enum State private GameObject player; private Transform playerPos; float distanceToPlayer; - private Vector2 currentPlayerPos; [SerializeField] public float distance; [SerializeField] public float moveSpeed; @@ -66,10 +60,8 @@ enum State [SerializeField] public float attackRange; [SerializeField] public float damageamount; float timer; - public GameObject ice; bool IsDead = false; bool isHit = false; - bool isFrozen = false; bool attackable = true; // bool isShield = false; float verticalTolerance = 2f; @@ -90,9 +82,8 @@ void Awake() _healthSystem = GetComponent(); animator = GetComponent(); _healthSystem.OnHit += OnHit; - _healthSystem.OnDead += OnDead; - _healthSystem.OnShield += OnShield; - _healthSystem.OnFreeze+= OnFreeze; + _healthSystem.OnDead += OnDead; + _healthSystem.OnShield += OnShield; } @@ -132,18 +123,19 @@ void checkState() break; case State.STATE_COOLDOWN: ChangeAnimationState(cooldown); - coolDown(2); + coolDown(0.5f); break; case State.STATE_HIT: hitState(); break; case State.STATE_SHIELD: ChangeAnimationState(shield); + StartCoroutine(ChangeToNewState(2.0f, cooldown, State.STATE_COOLDOWN)); break; case State.STATE_FROZEN: ChangeAnimationState(cooldown); rb.velocity = Vector2.zero; - FreezeCoolDown(5); + coolDown(5); break; case State.STATE_BACKTOWALL: ChangeAnimationState(startingmove); @@ -155,7 +147,7 @@ void checkState() void startingMove() { if (!slow) - moveSpeed = firstmoveSpeed; // baþlangýç hareket hýzý + moveSpeed = firstmoveSpeed; // ba�lang�� hareket h�z� moveDirectionX = moveDirection; step = moveSpeed * moveDirectionX; rb.velocity = new Vector3(step, rb.velocity.y); @@ -163,7 +155,7 @@ void startingMove() void checkPlayer() { - enemyPosition = new Vector2(rb.position.x, rb.position.y); // Düþmanýn konumu + enemyPosition = new Vector2(rb.position.x, rb.position.y); // D��man�n konumu // Vector2 playerPosition = new Vector2(playerPos.position.x, playerPos.position.y); // Oyuncunun konumu distanceToPlayer = Vector2.Distance(enemyPosition, playerPos.position); isBetweenWalls = transform.position.x >= wall.transform.position.x && transform.position.x <= wall2.transform.position.x; @@ -180,10 +172,6 @@ void checkPlayer() else state = State.STATE_BACKTOWALL; } - public void setState() - { - state = State.STATE_STARTINGMOVE; - } void following() { @@ -207,7 +195,7 @@ void backtoWall() } rb.velocity = startDirection.normalized * moveSpeed; checkPlayer(); - // Baþlangýç konumuna ulaþtýðýnda, Walking state'ine geç + // Ba�lang�� konumuna ula�t���nda, Walking state'ine ge� if (Vector2.Distance(transform.position, startPoint) < 0.1f) { hasTurned = false; @@ -238,14 +226,8 @@ public void speedFix() } public void setFrozenState() { - isFrozen = true; state = State.STATE_FROZEN; } - public void breakFreeze() - { - isFrozen = false; - checkPlayer(); - } void hitState() { if (isHit) @@ -263,7 +245,6 @@ void hitState() ChangeAnimationState(hit); isHit = false; - isFrozen= false; attackable = true; } } @@ -304,17 +285,6 @@ public void coolDown(float i) checkPlayer(); } } - public void FreezeCoolDown(float i) - { - timer += Time.deltaTime; - if (timer >= i) - { - attackable = true; - timer = 0; - isFrozen = false; - checkPlayer(); - } - } void flip() { if (playerPos.position.x > (transform.position.x + 0.5f)) @@ -365,47 +335,34 @@ public void turn() void OnHit(object sender, float knockdistance) { - - if (!IsDead) - { - state = State.STATE_HIT; - isHit = true; - } + if (IsDead) return; + + state = State.STATE_HIT; + isHit = true; } void OnShield(object sender, EventArgs e ) { - if (!IsDead) - { - checkBehind(); - if (isBehind) - { - state = State.STATE_SHIELD; - // isShield = true; - gameObject.GetComponent().onShield = true; - } - - } - - } - void OnFreeze(object sender, EventArgs e) - { - if (isFrozen) + if (IsDead) return; + + checkBehind(); + if (isBehind) { - gameObject.GetComponent().onFreeze = true; - Instantiate(ice, new Vector3(gameObject.transform.position.x - 3, gameObject.transform.position.y, gameObject.transform.position.z), Quaternion.identity); + state = State.STATE_SHIELD; + // isShield = true; + gameObject.GetComponent().onShield = true; } } void OnDead(object sender, EventArgs e) { - if (!IsDead) - { - IsDead = true; - ChangeAnimationState(death); - GetComponent().bodyType = RigidbodyType2D.Kinematic; - GetComponent().enabled = false; - this.enabled = false; - GetComponent().sortingLayerName = "Foreground"; - } + if (IsDead) return; + + IsDead = true; + ChangeAnimationState(death); + GetComponent().bodyType = RigidbodyType2D.Kinematic; + GetComponent().enabled = false; + rb.velocity = Vector2.zero; + this.enabled = false; + GetComponent().sortingLayerName = "Foreground"; } private void OnDrawGizmosSelected() @@ -419,4 +376,12 @@ void ChangeAnimationState(string newState) animator.Play(newState); currentState = newState; } + + IEnumerator ChangeToNewState(float waitTime, string animationStateName, State state_) + { + yield return new WaitForSeconds(waitTime); + + ChangeAnimationState(animationStateName); + this.state = state_; + } } diff --git a/Assets/Scripts/Enemies/Sword Enemy/SwordEnemy.cs b/Assets/Scripts/Enemies/Sword Enemy/SwordEnemy.cs index 111e2479..58dfb7be 100644 --- a/Assets/Scripts/Enemies/Sword Enemy/SwordEnemy.cs +++ b/Assets/Scripts/Enemies/Sword Enemy/SwordEnemy.cs @@ -162,7 +162,7 @@ void checkState() break; case State.STATE_COOLDOWN: ChangeAnimationState(idle); - coolDown(2); + coolDown(0.5f); break; case State.STATE_HIT: hitState(); @@ -234,7 +234,7 @@ void checkPlayer() if (distanceToPlayer < distance && Mathf.Abs(enemyPosition.y - playerPos.position.y) < verticalTolerance && !obstacle) { hasTurned = false; - if (distanceToPlayer <= 1.8f) //+cooldown 0.5f + if (distanceToPlayer <= 3f) //+cooldown 0.5f state = State.STATE_WAIT; else state = State.STATE_FOLLOWING; @@ -262,11 +262,11 @@ void lookhim() { ChangeAnimationState(idle); rb.velocity = Vector2.zero; - check = WaitForSeconds(1f); + check = WaitForSeconds(0.6f); if (check) backtoWall(); } - void backtoWall() + void backtoWall() //idle { ChangeAnimationState(startingmove); moveSpeed = firstmoveSpeed; @@ -347,7 +347,6 @@ void coolDown(float i) } private bool WaitForSeconds(float i) { - Debug.Log(timer); timer += Time.deltaTime; if (timer >= i) {