From a257aacb36f9499d0d24490763b350fbb80982f6 Mon Sep 17 00:00:00 2001 From: MarcUs7i <96580944+MarcUs7i@users.noreply.github.com> Date: Wed, 9 Oct 2024 19:22:47 +0200 Subject: [PATCH] Removed a line of code and saving scene20 --- Assets/game/Scenes/level20.unity | 72 +++++++------------ .../enemy/BossAli/Animations/Ali.controller | 8 +-- Assets/game/enemy/BossAli/Scripts/Ali.cs | 1 - 3 files changed, 29 insertions(+), 52 deletions(-) diff --git a/Assets/game/Scenes/level20.unity b/Assets/game/Scenes/level20.unity index 0ca290c..83f2238 100644 --- a/Assets/game/Scenes/level20.unity +++ b/Assets/game/Scenes/level20.unity @@ -260,7 +260,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 40152486} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.0599995, y: 2.6100001, z: -10} + m_LocalPosition: {x: 1.0599992, y: 2.6100001, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -334,7 +334,7 @@ SpriteRenderer: m_Size: {x: 6.5625, y: 5.8125} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &45610586 @@ -1340,33 +1340,10 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: e4d790f502f90764bb3d4c02870b98a7, type: 3} m_Name: m_EditorClassIdentifier: - levelToLoad: Start - start: Start - levelselect: LevelSelect - levelTutorial: levelTutorial - level1: level1 - level2: level2 - level3: level3 - level4: level4 - level5: level5 - level6: level6 - level7: level7 - level8: level8 - level9: level9 - level10: level10 - level11: level11 - level12: level12 - level13: level13 - level14: level14 - level15: level15 - level16: level16 - level17: level17 - level18: level18 - level19: level19 - level20: level20 - bonus: bonus - about: About - sceneFader: {fileID: 301995584} + standardUI: [] + secondUI: [] + changeOnlyWhenEnabledUI: [] + changeOnlyWhenDisabledUI: [] --- !u!4 &263201670 Transform: m_ObjectHideFlags: 0 @@ -2226,7 +2203,7 @@ SpriteRenderer: m_Size: {x: 1.76, y: 3.68} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!1001 &646207452 @@ -3160,7 +3137,7 @@ MonoBehaviour: runSpeed: 40 --- !u!95 &820667358 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -3177,7 +3154,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &820667359 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3579,7 +3557,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: c9d8b8346cec25940a48fa7bd4c38854, type: 3} m_Name: m_EditorClassIdentifier: - door: {fileID: 862662940} speed: 5 --- !u!61 &862662942 BoxCollider2D: @@ -4022,10 +3999,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 5e0d4b501440e334183393b36d054f36, type: 3} m_Name: m_EditorClassIdentifier: - animator: {fileID: 956474836} --- !u!95 &956474836 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -4042,7 +4018,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &956474837 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4444,7 +4421,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1000398609} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 1.0599995, y: 2.6100001, z: -10} + m_LocalPosition: {x: 1.0599992, y: 2.6100001, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: @@ -4846,7 +4823,7 @@ SpriteRenderer: m_Size: {x: 1.76, y: 3.68} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &1094785914 @@ -6080,7 +6057,7 @@ GameObject: - component: {fileID: 1524014390} - component: {fileID: 1524014389} m_Layer: 0 - m_Name: 'Clouds Note: 15.841 space between' + m_Name: Clouds m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -6191,7 +6168,7 @@ SpriteRenderer: m_Size: {x: 5.4375, y: 6.75} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &1530690153 @@ -6406,7 +6383,6 @@ MonoBehaviour: m_EditorClassIdentifier: levelToLoad: bonus sceneFader: {fileID: 301995584} - SetLevel: 20 --- !u!61 &1587070610 BoxCollider2D: m_ObjectHideFlags: 0 @@ -6577,7 +6553,7 @@ RectTransform: m_Pivot: {x: 0.5, y: 0.5} --- !u!95 &1625478083 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -6594,7 +6570,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!114 &1625478084 MonoBehaviour: m_ObjectHideFlags: 0 @@ -6867,7 +6844,7 @@ SpriteRenderer: m_Size: {x: 1.76, y: 3.68} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &1628621310 @@ -7170,7 +7147,7 @@ SpriteRenderer: m_Size: {x: 2.875, y: 1.75} m_AdaptiveModeThreshold: 0.5 m_SpriteTileMode: 0 - m_WasSpriteAssigned: 1 + m_WasSpriteAssigned: 0 m_MaskInteraction: 0 m_SpriteSortPoint: 0 --- !u!4 &1650943673 @@ -7332,7 +7309,7 @@ CanvasRenderer: m_CullTransparentMesh: 1 --- !u!95 &1726973747 Animator: - serializedVersion: 4 + serializedVersion: 5 m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -7349,7 +7326,8 @@ Animator: m_WarningMessage: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorControllerStateOnDisable: 0 + m_KeepAnimatorStateOnDisable: 0 + m_WriteDefaultValuesOnDisable: 0 --- !u!1 &1752979597 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/game/enemy/BossAli/Animations/Ali.controller b/Assets/game/enemy/BossAli/Animations/Ali.controller index 76d794e..0a5c3bb 100644 --- a/Assets/game/enemy/BossAli/Animations/Ali.controller +++ b/Assets/game/enemy/BossAli/Animations/Ali.controller @@ -34,7 +34,7 @@ AnimatorState: m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_Name: Ali_encourage + m_Name: Ali_stage2 m_Speed: 1 m_CycleOffset: 0 m_Transitions: @@ -63,7 +63,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 2 - m_ConditionEvent: Encourage + m_ConditionEvent: EnterStage2 m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: 6625267458286179632} @@ -202,7 +202,7 @@ AnimatorController: m_DefaultInt: 0 m_DefaultBool: 0 m_Controller: {fileID: 0} - - m_Name: Encourage + - m_Name: EnterStage2 m_Type: 4 m_DefaultFloat: 0 m_DefaultInt: 0 @@ -427,7 +427,7 @@ AnimatorStateTransition: m_Name: m_Conditions: - m_ConditionMode: 1 - m_ConditionEvent: Encourage + m_ConditionEvent: EnterStage2 m_EventTreshold: 0 m_DstStateMachine: {fileID: 0} m_DstState: {fileID: -2875396674902553277} diff --git a/Assets/game/enemy/BossAli/Scripts/Ali.cs b/Assets/game/enemy/BossAli/Scripts/Ali.cs index 6cead38..319a43d 100644 --- a/Assets/game/enemy/BossAli/Scripts/Ali.cs +++ b/Assets/game/enemy/BossAli/Scripts/Ali.cs @@ -272,7 +272,6 @@ public class Ali : MonoBehaviour transitioningToStage2 = false; StopHurting = false; - DamageAnim = false; } IEnumerator BulletAttacked()