finished the frog and made the heart script utalize the new health script

2 years ago · ecc00cf7f1
parent 8f52d3bcd0
commit ecc00cf7f1
22 changed files with 883 additions and 520 deletions
--- a/Assets/AnimatorsAnims/Frog/Frog_Idle.anim
+++ b/Assets/AnimatorsAnims/Frog/Frog_Idle.anim
@ -0,0 +1,71 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!74 &7400000
+AnimationClip:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Frog_Idle
+  serializedVersion: 6
+  m_Legacy: 0
+  m_Compressed: 0
+  m_UseHighQualityCurve: 1
+  m_RotationCurves: []
+  m_CompressedRotationCurves: []
+  m_EulerCurves: []
+  m_PositionCurves: []
+  m_ScaleCurves: []
+  m_FloatCurves: []
+  m_PPtrCurves:
+  - curve:
+    - time: 0
+      value: {fileID: -83726721, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3}
+    - time: 1
+      value: {fileID: -83726721, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3}
+    attribute: m_Sprite
+    path: 
+    classID: 212
+    script: {fileID: 0}
+  m_SampleRate: 60
+  m_WrapMode: 0
+  m_Bounds:
+    m_Center: {x: 0, y: 0, z: 0}
+    m_Extent: {x: 0, y: 0, z: 0}
+  m_ClipBindingConstant:
+    genericBindings:
+    - serializedVersion: 2
+      path: 0
+      attribute: 0
+      script: {fileID: 0}
+      typeID: 212
+      customType: 23
+      isPPtrCurve: 1
+    pptrCurveMapping:
+    - {fileID: -83726721, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3}
+    - {fileID: -83726721, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3}
+  m_AnimationClipSettings:
+    serializedVersion: 2
+    m_AdditiveReferencePoseClip: {fileID: 0}
+    m_AdditiveReferencePoseTime: 0
+    m_StartTime: 0
+    m_StopTime: 1.0166667
+    m_OrientationOffsetY: 0
+    m_Level: 0
+    m_CycleOffset: 0
+    m_HasAdditiveReferencePose: 0
+    m_LoopTime: 0
+    m_LoopBlend: 0
+    m_LoopBlendOrientation: 0
+    m_LoopBlendPositionY: 0
+    m_LoopBlendPositionXZ: 0
+    m_KeepOriginalOrientation: 0
+    m_KeepOriginalPositionY: 1
+    m_KeepOriginalPositionXZ: 0
+    m_HeightFromFeet: 0
+    m_Mirror: 0
+  m_EditorCurves: []
+  m_EulerEditorCurves: []
+  m_HasGenericRootTransform: 0
+  m_HasMotionFloatCurves: 0
+  m_Events: []
--- a/Assets/AnimatorsAnims/Frog/Frog_Idle.anim.meta
+++ b/Assets/AnimatorsAnims/Frog/Frog_Idle.anim.meta
@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 3570de7b2b6d3704a942312d540463e3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 7400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/AnimatorsAnims/Frog/Frog_Run.anim
+++ b/Assets/AnimatorsAnims/Frog/Frog_Run.anim
@ -20,22 +20,18 @@ AnimationClip:
  m_PPtrCurves:
  - curve:
    - time: 0
-      value: {fileID: -83726721, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3}
-    - time: 0.125
-      value: {fileID: -864377333, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3}
-    - time: 0.25
      value: {fileID: -933593245, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3}
-    - time: 0.375
+    - time: 0.125
      value: {fileID: -1756990778, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3}
-    - time: 0.5
+    - time: 0.25
      value: {fileID: 1196033650, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3}
-    - time: 0.625
+    - time: 0.375
      value: {fileID: 1402453657, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3}
-    - time: 0.75
+    - time: 0.5
      value: {fileID: -201846207, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3}
-    - time: 0.875
+    - time: 0.625
      value: {fileID: 1601616289, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3}
-    - time: 1
+    - time: 0.75
      value: {fileID: -584477188, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3}
    attribute: m_Sprite
    path: 
@ -56,8 +52,6 @@ AnimationClip:
      customType: 23
      isPPtrCurve: 1
    pptrCurveMapping:
-    - {fileID: -83726721, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3}
-    - {fileID: -864377333, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3}
    - {fileID: -933593245, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3}
    - {fileID: -1756990778, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3}
    - {fileID: 1196033650, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3}
@ -70,7 +64,7 @@ AnimationClip:
    m_AdditiveReferencePoseClip: {fileID: 0}
    m_AdditiveReferencePoseTime: 0
    m_StartTime: 0
-    m_StopTime: 1.125
+    m_StopTime: 0.875
    m_OrientationOffsetY: 0
    m_Level: 0
    m_CycleOffset: 0
--- a/Assets/AnimatorsAnims/FrogCont.controller
+++ b/Assets/AnimatorsAnims/FrogCont.controller
@ -1,5 +1,30 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1101 &-7172262509271475503
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 1
+    m_ConditionEvent: exit
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 5631977286367760529}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 0
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1107 &-5831013718810815287
 AnimatorStateMachine:
  serializedVersion: 6
@ -17,14 +42,15 @@ AnimatorStateMachine:
    m_Position: {x: 235, y: 65, z: 0}
  - serializedVersion: 1
    m_State: {fileID: 5631977286367760529}
-    m_Position: {x: 149.5835, y: 201.70917, z: 0}
+    m_Position: {x: 160, y: 210, z: 0}
  m_ChildStateMachines: []
-  m_AnyStateTransitions: []
+  m_AnyStateTransitions:
+  - {fileID: -7172262509271475503}
  m_EntryTransitions: []
  m_StateMachineTransitions: {}
  m_StateMachineBehaviours: []
  m_AnyStatePosition: {x: 50, y: 20, z: 0}
-  m_EntryPosition: {x: 0, y: 90, z: 0}
+  m_EntryPosition: {x: -60, y: 150, z: 0}
  m_ExitPosition: {x: 800, y: 120, z: 0}
  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
  m_DefaultState: {fileID: 5631977286367760529}
@ -50,7 +76,8 @@ AnimatorState:
  m_Name: Frog_Run
  m_Speed: 1
  m_CycleOffset: 0
-  m_Transitions: []
+  m_Transitions:
+  - {fileID: 4965559509361210057}
  m_StateMachineBehaviours:
  - {fileID: -2027374196755022861}
  m_Position: {x: 50, y: 50, z: 0}
@ -75,7 +102,13 @@ AnimatorController:
  m_PrefabAsset: {fileID: 0}
  m_Name: FrogCont
  serializedVersion: 5
-  m_AnimatorParameters: []
+  m_AnimatorParameters:
+  - m_Name: exit
+    m_Type: 9
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
  m_AnimatorLayers:
  - serializedVersion: 5
    m_Name: Base Layer
@ -128,6 +161,28 @@ MonoBehaviour:
  m_Script: {fileID: 11500000, guid: c729237c60a81bf47946977fcbf61152, type: 3}
  m_Name: 
  m_EditorClassIdentifier: 
+--- !u!1101 &4965559509361210057
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions: []
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 5631977286367760529}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0
+  m_TransitionOffset: 0
+  m_ExitTime: 1
+  m_HasExitTime: 1
+  m_HasFixedDuration: 0
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1102 &5631977286367760529
 AnimatorState:
  serializedVersion: 6
@ -135,7 +190,7 @@ AnimatorState:
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
  m_PrefabAsset: {fileID: 0}
-  m_Name: New State
+  m_Name: Idle
  m_Speed: 1
  m_CycleOffset: 0
  m_Transitions: []
@ -148,7 +203,7 @@ AnimatorState:
  m_MirrorParameterActive: 0
  m_CycleOffsetParameterActive: 0
  m_TimeParameterActive: 0
-  m_Motion: {fileID: 0}
+  m_Motion: {fileID: 7400000, guid: 3570de7b2b6d3704a942312d540463e3, type: 2}
  m_Tag: 
  m_SpeedParameter: 
  m_MirrorParameter: 
--- a/Assets/Prefabs/Bullet.prefab
+++ b/Assets/Prefabs/Bullet.prefab
@ -15,7 +15,7 @@ GameObject:
  - component: {fileID: 8107388911180569255}
  m_Layer: 0
  m_Name: Bullet
-  m_TagString: Untagged
+  m_TagString: Bullet
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
@ -136,8 +136,8 @@ BoxCollider2D:
  m_UsedByComposite: 0
  m_Offset: {x: 0, y: 0.21133333}
  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0.5, y: 0.5}
+    border: {x: 0, y: 0.25, z: 0, w: 0}
+    pivot: {x: 0, y: 0.625}
    oldSize: {x: 1, y: 1}
    newSize: {x: 1, y: 1}
    adaptiveTilingThreshold: 0.5
--- a/Assets/Prefabs/Frog.prefab
+++ b/Assets/Prefabs/Frog.prefab
@ -0,0 +1,480 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8398073822777672481
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8398073822777672509}
+  - component: {fileID: 8398073822777672508}
+  - component: {fileID: 8398073822777672483}
+  - component: {fileID: 8398073822777672482}
+  - component: {fileID: 8398073822777672510}
+  - component: {fileID: 8398073822777672511}
+  - component: {fileID: 8398073822777672504}
+  - component: {fileID: 8398073822777672505}
+  m_Layer: 0
+  m_Name: Frog
+  m_TagString: Enemy
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8398073822777672509
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8398073822777672481}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -131.5, y: -0.8, z: -3.8798656}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1883560288370434389}
+  - {fileID: 8398073823003597188}
+  m_Father: {fileID: 0}
+  m_RootOrder: 0
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!212 &8398073822777672508
+SpriteRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8398073822777672481}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 0
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_Sprite: {fileID: -83726721, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_FlipX: 0
+  m_FlipY: 0
+  m_DrawMode: 0
+  m_Size: {x: 16, y: 16}
+  m_AdaptiveModeThreshold: 0.5
+  m_SpriteTileMode: 0
+  m_WasSpriteAssigned: 1
+  m_MaskInteraction: 0
+  m_SpriteSortPoint: 0
+--- !u!61 &8398073822777672483
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8398073822777672481}
+  m_Enabled: 1
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0.625, y: 0.875}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0.5, y: 0.5}
+    oldSize: {x: 16, y: 16}
+    newSize: {x: 16, y: 16}
+    adaptiveTilingThreshold: 0.5
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 13.25, y: 8.25}
+  m_EdgeRadius: 0
+--- !u!50 &8398073822777672482
+Rigidbody2D:
+  serializedVersion: 4
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8398073822777672481}
+  m_BodyType: 0
+  m_Simulated: 1
+  m_UseFullKinematicContacts: 0
+  m_UseAutoMass: 0
+  m_Mass: 1
+  m_LinearDrag: 0
+  m_AngularDrag: 0.05
+  m_GravityScale: 8
+  m_Material: {fileID: 0}
+  m_Interpolate: 0
+  m_SleepingMode: 1
+  m_CollisionDetection: 0
+  m_Constraints: 4
+--- !u!114 &8398073822777672510
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8398073822777672481}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e128d9abd8ec5d429909167b9586bc7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  PreHP: 100
+--- !u!95 &8398073822777672511
+Animator:
+  serializedVersion: 4
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8398073822777672481}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 9100000, guid: f3eb707538699a142941bb606d702711, type: 2}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorControllerStateOnDisable: 0
+--- !u!114 &8398073822777672504
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8398073822777672481}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2d0a1d5fce928c34abc678c238b9c874, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  canMove: 0
+  G:
+    serializedVersion: 2
+    m_Bits: 8
+  Tung: {fileID: 3749780568748605735, guid: 29e949bbcf1e543428691a48ca243c9c, type: 3}
+  wait: 0
+  ShootPoint: {fileID: 8398073823003597188}
+--- !u!120 &8398073822777672505
+LineRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8398073822777672481}
+  m_Enabled: 1
+  m_CastShadows: 0
+  m_ReceiveShadows: 0
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 0
+  m_LightProbeUsage: 0
+  m_ReflectionProbeUsage: 0
+  m_RayTracingMode: 0
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 0e6e564677cac492f853c25544c809d4, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: -10
+  m_Positions: []
+  m_Parameters:
+    serializedVersion: 3
+    widthMultiplier: 1
+    widthCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0.33333334
+        outWeight: 0.33333334
+      - serializedVersion: 3
+        time: 0.46341464
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    colorGradient:
+      serializedVersion: 2
+      key0: {r: 0.8431373, g: 0.48235297, b: 0.7294118, a: 1}
+      key1: {r: 0.8431373, g: 0.48235297, b: 0.7294118, a: 1}
+      key2: {r: 0, g: 0, b: 0, a: 0}
+      key3: {r: 0, g: 0, b: 0, a: 0}
+      key4: {r: 0, g: 0, b: 0, a: 0}
+      key5: {r: 0, g: 0, b: 0, a: 0}
+      key6: {r: 0, g: 0, b: 0, a: 0}
+      key7: {r: 0, g: 0, b: 0, a: 0}
+      ctime0: 0
+      ctime1: 65535
+      ctime2: 0
+      ctime3: 0
+      ctime4: 0
+      ctime5: 0
+      ctime6: 0
+      ctime7: 0
+      atime0: 0
+      atime1: 65535
+      atime2: 0
+      atime3: 0
+      atime4: 0
+      atime5: 0
+      atime6: 0
+      atime7: 0
+      m_Mode: 0
+      m_NumColorKeys: 2
+      m_NumAlphaKeys: 2
+    numCornerVertices: 0
+    numCapVertices: 1
+    alignment: 0
+    textureMode: 0
+    shadowBias: 0.5
+    generateLightingData: 0
+  m_UseWorldSpace: 1
+  m_Loop: 0
+--- !u!1 &8398073823003597195
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 8398073823003597188}
+  m_Layer: 0
+  m_Name: ShootPoint
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8398073823003597188
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8398073823003597195}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -4.75, y: 2.53, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8398073822777672509}
+  m_RootOrder: 1
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &8227292604794923263
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 8398073822777672509}
+    m_Modifications:
+    - target: {fileID: 1953327889506219238, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 1953327889506219238, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4001005944836979600, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_Name
+      value: HPBar
+      objectReference: {fileID: 0}
+    - target: {fileID: 6646647549313009679, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_PresetInfoIsWorld
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7071451226688460606, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_Value
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7071451226688460606, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_Interactable
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7071451226688460606, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_Colors.m_ColorMultiplier
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7071451226688460606, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_Colors.m_DisabledColor.a
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7071451226688460606, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.size
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7071451226688460606, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7071451226688460606, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_Pivot.x
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_Pivot.y
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_AnchorMax.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_AnchorMin.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 10
+      objectReference: {fileID: 0}
+    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 3.8798656
+      objectReference: {fileID: 0}
+    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 6.54
+      objectReference: {fileID: 0}
+    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8111642542773480519, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: HP
+      value: 
+      objectReference: {fileID: 8398073822777672510}
+    - target: {fileID: 8848157160217275324, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+      propertyPath: m_Camera
+      value: 
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+--- !u!224 &1883560288370434389 stripped
+RectTransform:
+  m_CorrespondingSourceObject: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+  m_PrefabInstance: {fileID: 8227292604794923263}
+  m_PrefabAsset: {fileID: 0}
--- a/Assets/Prefabs/Frog.prefab.meta
+++ b/Assets/Prefabs/Frog.prefab.meta
@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 1c836e7409cac464dba44061d11519ff
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Prefabs/HPBar.prefab
+++ b/Assets/Prefabs/HPBar.prefab
@ -236,7 +236,7 @@ MonoBehaviour:
  m_FallbackScreenDPI: 96
  m_DefaultSpriteDPI: 96
  m_DynamicPixelsPerUnit: 4
-  m_PresetInfoIsWorld: 0
+  m_PresetInfoIsWorld: 1
 --- !u!114 &2387553255586204954
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -355,7 +355,7 @@ MonoBehaviour:
  m_MinValue: 0
  m_MaxValue: 1
  m_WholeNumbers: 0
-  m_Value: 0
+  m_Value: 0.72
  m_OnValueChanged:
    m_PersistentCalls:
      m_Calls: []
--- a/Assets/Prefabs/Player.prefab
+++ b/Assets/Prefabs/Player.prefab
@ -148,7 +148,6 @@ MonoBehaviour:
  PL_Script: {fileID: 8349803369667653188}
  PL_Trans: {fileID: 8349803369667653187}
  GR: {fileID: 8349803369875076366}
-  Cam: {fileID: 0}
  rot: 0
 --- !u!1 &8349803368041049117
 GameObject:
@ -5008,6 +5007,7 @@ GameObject:
  - component: {fileID: 8349803369667653188}
  - component: {fileID: 8349803369667653189}
  - component: {fileID: 8349803369667653198}
+  - component: {fileID: 2675006606080146260}
  m_Layer: 0
  m_Name: Player
  m_TagString: Player
@ -5186,6 +5186,19 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  interactImage: {fileID: 0}
+--- !u!114 &2675006606080146260
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8349803369667653199}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e128d9abd8ec5d429909167b9586bc7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  PreHP: 14
 --- !u!1 &8349803369875076365
 GameObject:
  m_ObjectHideFlags: 0
--- a/Assets/Prefabs/Tunge.prefab
+++ b/Assets/Prefabs/Tunge.prefab
@ -10,12 +10,12 @@ GameObject:
  m_Component:
  - component: {fileID: 3749780568748605755}
  - component: {fileID: 3749780568748605752}
-  - component: {fileID: 3749780568748605753}
  - component: {fileID: 3749780568748605734}
  - component: {fileID: -4025114051717284109}
+  - component: {fileID: -5694580453807944406}
  m_Layer: 0
  m_Name: Tunge
-  m_TagString: Untagged
+  m_TagString: Bullet
  m_Icon: {fileID: 0}
  m_NavMeshLayer: 0
  m_StaticEditorFlags: 0
@ -87,19 +87,6 @@ SpriteRenderer:
  m_WasSpriteAssigned: 1
  m_MaskInteraction: 0
  m_SpriteSortPoint: 0
--- !u!114 &3749780568748605753
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3749780568748605735}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cfba024dcfb32ae49b5d7587a88bb214, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  rb: {fileID: 3749780568748605734}
 --- !u!50 &3749780568748605734
 Rigidbody2D:
  serializedVersion: 4
@ -147,3 +134,16 @@ BoxCollider2D:
  serializedVersion: 2
  m_Size: {x: 2, y: 2}
  m_EdgeRadius: 0
+--- !u!114 &-5694580453807944406
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3749780568748605735}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 965024e47cb5cfc479c87e558d5f432f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  rb: {fileID: 3749780568748605734}
--- a/Assets/Scenes/Main_Game.unity
+++ b/Assets/Scenes/Main_Game.unity
@ -381,11 +381,17 @@ Transform:
  m_CorrespondingSourceObject: {fileID: 8349803369667653187, guid: ce6cce55512aa6a4ca90d2a65b2d7064, type: 3}
  m_PrefabInstance: {fileID: 908584568}
  m_PrefabAsset: {fileID: 0}
--- !u!224 &581312650 stripped
-RectTransform:
-  m_CorrespondingSourceObject: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
-  m_PrefabInstance: {fileID: 479286658757003219}
+--- !u!114 &571884061 stripped
+MonoBehaviour:
+  m_CorrespondingSourceObject: {fileID: 2675006606080146260, guid: ce6cce55512aa6a4ca90d2a65b2d7064, type: 3}
+  m_PrefabInstance: {fileID: 908584568}
  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 7e128d9abd8ec5d429909167b9586bc7, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
 --- !u!1 &609125414
 GameObject:
  m_ObjectHideFlags: 0
@ -489,6 +495,10 @@ PrefabInstance:
      propertyPath: m_Layer
      value: 3
      objectReference: {fileID: 0}
+    - target: {fileID: 8349803369667653185, guid: ce6cce55512aa6a4ca90d2a65b2d7064, type: 3}
+      propertyPath: m_Material
+      value: 
+      objectReference: {fileID: 6200000, guid: 352a265faa8faa434b812090e73f4ceb, type: 2}
    - target: {fileID: 8349803369667653187, guid: ce6cce55512aa6a4ca90d2a65b2d7064, type: 3}
      propertyPath: m_RootOrder
      value: 1
@ -625,6 +635,7 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  HeartPrefab: {fileID: 3814295357292333890, guid: 48bd85a18b466444d828523869e4a40b, type: 3}
+  PL_Health: {fileID: 571884061}
 --- !u!114 &1433719853
 MonoBehaviour:
  m_ObjectHideFlags: 0
@ -1197,300 +1208,6 @@ CanvasRenderer:
  m_PrefabAsset: {fileID: 0}
  m_GameObject: {fileID: 1641033686}
  m_CullTransparentMesh: 1
--- !u!1 &1864363021
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 1864363025}
-  - component: {fileID: 1864363024}
-  - component: {fileID: 1864363023}
-  - component: {fileID: 1864363022}
-  - component: {fileID: 1864363026}
-  - component: {fileID: 1864363027}
-  - component: {fileID: 1864363028}
-  - component: {fileID: 1864363029}
-  m_Layer: 0
-  m_Name: Frog
-  m_TagString: Enemy
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
--- !u!50 &1864363022
-Rigidbody2D:
-  serializedVersion: 4
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1864363021}
-  m_BodyType: 0
-  m_Simulated: 1
-  m_UseFullKinematicContacts: 0
-  m_UseAutoMass: 0
-  m_Mass: 1
-  m_LinearDrag: 0
-  m_AngularDrag: 0.05
-  m_GravityScale: 8
-  m_Material: {fileID: 0}
-  m_Interpolate: 0
-  m_SleepingMode: 1
-  m_CollisionDetection: 0
-  m_Constraints: 4
--- !u!61 &1864363023
-BoxCollider2D:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1864363021}
-  m_Enabled: 1
-  m_Density: 1
-  m_Material: {fileID: 0}
-  m_IsTrigger: 0
-  m_UsedByEffector: 0
-  m_UsedByComposite: 0
-  m_Offset: {x: 0.625, y: 0.875}
-  m_SpriteTilingProperty:
-    border: {x: 0, y: 0, z: 0, w: 0}
-    pivot: {x: 0.5, y: 0.5}
-    oldSize: {x: 16, y: 16}
-    newSize: {x: 16, y: 16}
-    adaptiveTilingThreshold: 0.5
-    drawMode: 0
-    adaptiveTiling: 0
-  m_AutoTiling: 0
-  serializedVersion: 2
-  m_Size: {x: 13.25, y: 8.25}
-  m_EdgeRadius: 0
--- !u!212 &1864363024
-SpriteRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1864363021}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 0
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 0
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_Sprite: {fileID: -83726721, guid: b944bfcaa9d9bbb4cad064349eec9267, type: 3}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_FlipX: 0
-  m_FlipY: 0
-  m_DrawMode: 0
-  m_Size: {x: 16, y: 16}
-  m_AdaptiveModeThreshold: 0.5
-  m_SpriteTileMode: 0
-  m_WasSpriteAssigned: 1
-  m_MaskInteraction: 0
-  m_SpriteSortPoint: 0
--- !u!4 &1864363025
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1864363021}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -131.5, y: -0.8, z: -3.8798656}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 581312650}
-  m_Father: {fileID: 0}
-  m_RootOrder: 7
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1864363026
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1864363021}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 7e128d9abd8ec5d429909167b9586bc7, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  PreHP: 100
--- !u!95 &1864363027
-Animator:
-  serializedVersion: 4
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1864363021}
-  m_Enabled: 1
-  m_Avatar: {fileID: 0}
-  m_Controller: {fileID: 9100000, guid: f3eb707538699a142941bb606d702711, type: 2}
-  m_CullingMode: 0
-  m_UpdateMode: 0
-  m_ApplyRootMotion: 0
-  m_LinearVelocityBlending: 0
-  m_StabilizeFeet: 0
-  m_WarningMessage: 
-  m_HasTransformHierarchy: 1
-  m_AllowConstantClipSamplingOptimization: 1
-  m_KeepAnimatorControllerStateOnDisable: 0
--- !u!114 &1864363028
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1864363021}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 2d0a1d5fce928c34abc678c238b9c874, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  canMove: 0
-  G:
-    serializedVersion: 2
-    m_Bits: 8
-  Tung: {fileID: 3749780568748605735, guid: 29e949bbcf1e543428691a48ca243c9c, type: 3}
--- !u!120 &1864363029
-LineRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1864363021}
-  m_Enabled: 1
-  m_CastShadows: 0
-  m_ReceiveShadows: 0
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 0
-  m_LightProbeUsage: 0
-  m_ReflectionProbeUsage: 0
-  m_RayTracingMode: 0
-  m_RayTraceProcedural: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 0e6e564677cac492f853c25544c809d4, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: -10
-  m_Positions: []
-  m_Parameters:
-    serializedVersion: 3
-    widthMultiplier: 1
-    widthCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0.33333334
-        outWeight: 0.33333334
-      - serializedVersion: 3
-        time: 0.46341464
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    colorGradient:
-      serializedVersion: 2
-      key0: {r: 0.8431373, g: 0.48235297, b: 0.7294118, a: 1}
-      key1: {r: 0.8431373, g: 0.48235297, b: 0.7294118, a: 1}
-      key2: {r: 0, g: 0, b: 0, a: 0}
-      key3: {r: 0, g: 0, b: 0, a: 0}
-      key4: {r: 0, g: 0, b: 0, a: 0}
-      key5: {r: 0, g: 0, b: 0, a: 0}
-      key6: {r: 0, g: 0, b: 0, a: 0}
-      key7: {r: 0, g: 0, b: 0, a: 0}
-      ctime0: 0
-      ctime1: 65535
-      ctime2: 0
-      ctime3: 0
-      ctime4: 0
-      ctime5: 0
-      ctime6: 0
-      ctime7: 0
-      atime0: 0
-      atime1: 65535
-      atime2: 0
-      atime3: 0
-      atime4: 0
-      atime5: 0
-      atime6: 0
-      atime7: 0
-      m_Mode: 0
-      m_NumColorKeys: 2
-      m_NumAlphaKeys: 2
-    numCornerVertices: 0
-    numCapVertices: 1
-    alignment: 0
-    textureMode: 0
-    shadowBias: 0.5
-    generateLightingData: 0
-  m_UseWorldSpace: 1
-  m_Loop: 0
 --- !u!1 &2076995894
 GameObject:
  m_ObjectHideFlags: 0
@ -1637,148 +1354,68 @@ MonoBehaviour:
  m_Name: 
  m_EditorClassIdentifier: 
  trapAnimator: {fileID: 2076995898}
--- !u!1001 &479286658757003219
+--- !u!1001 &8398073824237874988
 PrefabInstance:
  m_ObjectHideFlags: 0
  serializedVersion: 2
  m_Modification:
-    m_TransformParent: {fileID: 1864363025}
+    m_TransformParent: {fileID: 0}
    m_Modifications:
-    - target: {fileID: 1953327889506219238, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1953327889506219238, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+    - target: {fileID: 641709098486432579, guid: 1c836e7409cac464dba44061d11519ff, type: 3}
+      propertyPath: m_Camera
+      value: 
+      objectReference: {fileID: 96465039}
+    - target: {fileID: 7581434306721897497, guid: 1c836e7409cac464dba44061d11519ff, type: 3}
      propertyPath: m_AnchorMax.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 4001005944836979600, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+    - target: {fileID: 8398073822777672481, guid: 1c836e7409cac464dba44061d11519ff, type: 3}
      propertyPath: m_Name
-      value: HPBar
-      objectReference: {fileID: 0}
-    - target: {fileID: 6646647549313009679, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
-      propertyPath: m_PresetInfoIsWorld
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7071451226688460606, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
-      propertyPath: m_Value
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7071451226688460606, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
-      propertyPath: m_Interactable
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7071451226688460606, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
-      propertyPath: m_Colors.m_ColorMultiplier
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7071451226688460606, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
-      propertyPath: m_Colors.m_DisabledColor.a
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7071451226688460606, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
-      propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.size
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7071451226688460606, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
-      propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_Mode
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 7071451226688460606, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
-      propertyPath: m_OnValueChanged.m_PersistentCalls.m_Calls.Array.data[0].m_CallState
-      value: 2
+      value: Frog
      objectReference: {fileID: 0}
-    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
-      propertyPath: m_Pivot.x
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
-      propertyPath: m_Pivot.y
-      value: 0.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+    - target: {fileID: 8398073822777672509, guid: 1c836e7409cac464dba44061d11519ff, type: 3}
      propertyPath: m_RootOrder
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
-      propertyPath: m_AnchorMin.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
-      propertyPath: m_SizeDelta.x
-      value: 10
-      objectReference: {fileID: 0}
-    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
-      propertyPath: m_SizeDelta.y
-      value: 10
+      value: 7
      objectReference: {fileID: 0}
-    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+    - target: {fileID: 8398073822777672509, guid: 1c836e7409cac464dba44061d11519ff, type: 3}
      propertyPath: m_LocalPosition.x
-      value: 0
+      value: -131.5
      objectReference: {fileID: 0}
-    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+    - target: {fileID: 8398073822777672509, guid: 1c836e7409cac464dba44061d11519ff, type: 3}
      propertyPath: m_LocalPosition.y
-      value: 0
+      value: -0.8
      objectReference: {fileID: 0}
-    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+    - target: {fileID: 8398073822777672509, guid: 1c836e7409cac464dba44061d11519ff, type: 3}
      propertyPath: m_LocalPosition.z
-      value: 3.8798656
+      value: -3.8798656
      objectReference: {fileID: 0}
-    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+    - target: {fileID: 8398073822777672509, guid: 1c836e7409cac464dba44061d11519ff, type: 3}
      propertyPath: m_LocalRotation.w
      value: 1
      objectReference: {fileID: 0}
-    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+    - target: {fileID: 8398073822777672509, guid: 1c836e7409cac464dba44061d11519ff, type: 3}
      propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+    - target: {fileID: 8398073822777672509, guid: 1c836e7409cac464dba44061d11519ff, type: 3}
      propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+    - target: {fileID: 8398073822777672509, guid: 1c836e7409cac464dba44061d11519ff, type: 3}
      propertyPath: m_LocalRotation.z
-      value: -0
-      objectReference: {fileID: 0}
-    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
-      propertyPath: m_AnchoredPosition.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 6.54
-      objectReference: {fileID: 0}
-    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+    - target: {fileID: 8398073822777672509, guid: 1c836e7409cac464dba44061d11519ff, type: 3}
      propertyPath: m_LocalEulerAnglesHint.x
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+    - target: {fileID: 8398073822777672509, guid: 1c836e7409cac464dba44061d11519ff, type: 3}
      propertyPath: m_LocalEulerAnglesHint.y
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 7498202090572204458, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+    - target: {fileID: 8398073822777672509, guid: 1c836e7409cac464dba44061d11519ff, type: 3}
      propertyPath: m_LocalEulerAnglesHint.z
      value: 0
      objectReference: {fileID: 0}
-    - target: {fileID: 8111642542773480519, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
-      propertyPath: HP
-      value: 
-      objectReference: {fileID: 1864363026}
-    - target: {fileID: 8848157160217275324, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
-      propertyPath: m_Camera
-      value: 
-      objectReference: {fileID: 96465039}
    m_RemovedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 4073c57aacc64484e81291f66e3caa9a, type: 3}
+  m_SourcePrefab: {fileID: 100100000, guid: 1c836e7409cac464dba44061d11519ff, type: 3}
--- a/Assets/Scripts/Bullet.cs
+++ b/Assets/Scripts/Bullet.cs
@ -19,6 +19,10 @@ public class Bullet : MonoBehaviour
        {
            return;
        }
+        if(other.CompareTag("Bullet"))
+        {
+            return;
+        }
        if(other.TryGetComponent<Health>(out Health health))
        {
            health.RemoveHP(Damage);
--- a/Assets/Scripts/Enemy_Frog.cs
+++ b/Assets/Scripts/Enemy_Frog.cs
@ -5,32 +5,39 @@ using UnityEngine;
 public class Enemy_Frog : MonoBehaviour
 {
    public bool canMove;
-    Transform PL;
+    BoxCollider2D PL;
    Rigidbody2D RB;
    Animator Ani;
    public LayerMask G;
    public GameObject Tung;
    GameObject Tunge;
    LineRenderer LR;
+    public float wait;
+    public Transform ShootPoint;
    private void Start()
    {
        RB = transform.GetComponent<Rigidbody2D>();
        Ani = transform.GetComponent<Animator>();
        LR = transform.GetComponent<LineRenderer>();
        canMove = true;
+        wait = -2;
    }
    private void Update()
    {
        if(Tunge != null)
        {
            LR.positionCount = 2;
-            LR.SetPosition(0, transform.position);
+            LR.SetPosition(0, ShootPoint.position);
            LR.SetPosition(1, Tunge.transform.position);
        }
        else
        {
            LR.positionCount = 0;
        }
+        if(wait > 0)
+        {
+            wait -= Time.deltaTime;
+        }
        if (!canMove)
        {
            return;
@ -46,24 +53,28 @@ public class Enemy_Frog : MonoBehaviour
    }
    private void FindPlayer()
    {
-        if(Physics2D.OverlapCircle(transform.position, 50f, G))
+        if(Physics2D.OverlapCircle(transform.position, 100f, G))
        {
-            PL = Physics2D.OverlapCircle(transform.position, 50f, G).transform;
+            PL = Physics2D.OverlapCircle(transform.position, 100f, G).transform.GetComponent<BoxCollider2D>();
        }
    }
    private void GotPlayer()
    {
-        if (!Physics2D.OverlapCircle(transform.position, 50f, G))
+        if (!Physics2D.OverlapCircle(transform.position, 100f, G))
        {
            PL = null;
            return;
        }
-        if (Vector2.Distance(transform.position, PL.position) >= 20)
+        if (Vector2.Distance(transform.position, PL.bounds.center) >= 60f)
        {
            JumpToPlayer();
            return;
        }
+        if(wait < 0 && wait != -1)
+        {
            Attack();
+            wait = -1;
+        }
    }
    private void Attack()
    {
@ -72,14 +83,22 @@ public class Enemy_Frog : MonoBehaviour
    }
    private void JumpToPlayer()
    {
-        RB.AddForce(new Vector2((PL.position - transform.position).normalized.x * 10, 10));
-        Ani.Play("Frog_Shoot");
+        if((PL.bounds.center - transform.position).normalized.x > 0)
+        {
+            transform.rotation = new Quaternion(0, 180, 0, 0);
+        }
+        else
+        {
+            transform.rotation = new Quaternion(0, 0, 0, 0);
+        }
+        RB.AddForce(new Vector2((PL.bounds.center - transform.position).normalized.x * 10, 30), ForceMode2D.Impulse);
+        Ani.Play("Frog_Run");
        canMove = false;
    }
    public void shoot()
    {
-        Tunge = GameObject.Instantiate(Tung, transform.position, Quaternion.AngleAxis((Mathf.Atan2((transform.position.y - PL.position.y), (transform.position.x - PL.position.x)) * Mathf.Rad2Deg) + 180, Vector3.forward));
-        Tunge.GetComponent<Bullet>().setDmg = 5;
-        Tunge.GetComponent<Bullet>().OwnTag = transform.tag;
+        Tunge = GameObject.Instantiate(Tung, ShootPoint.position, Quaternion.AngleAxis((Mathf.Atan2((ShootPoint.position.y - PL.bounds.center.y), (ShootPoint.position.x - PL.bounds.center.x)) * Mathf.Rad2Deg) + 180, Vector3.forward));
+        Tunge.GetComponent<Frog_Tung>().setDmg = 5;
+        Tunge.GetComponent<Frog_Tung>().OwnTag = transform.tag;
    }
 }
--- a/Assets/Scripts/Enemy_stat2.cs
+++ b/Assets/Scripts/Enemy_stat2.cs
@ -6,6 +6,11 @@ public class Enemy_stat2 : StateMachineBehaviour
 {
    private bool no;
    private float wait;
+    override public void OnStateEnter(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
+    {
+        wait = 0;
+        no = false;
+    }
    override public void OnStateUpdate(Animator animator, AnimatorStateInfo stateInfo, int layerIndex)
    {
        if(no)
--- a/Assets/Scripts/Frog_Tung.cs
+++ b/Assets/Scripts/Frog_Tung.cs
@ -0,0 +1,42 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class Frog_Tung : MonoBehaviour
+{
+    public Rigidbody2D rb;
+    [System.NonSerialized]public int setDmg;
+    private int Damage;
+    [System.NonSerialized]public string OwnTag;
+    private bool ret;
+    private void Start()
+    {
+        Damage = setDmg;
+        rb.AddForce((Vector2)(Quaternion.Euler(0,0,rb.rotation) * Vector2.right) * 50, ForceMode2D.Impulse);
+    }
+    private void OnTriggerEnter2D(Collider2D other)
+    {
+        if(other.CompareTag(OwnTag))
+        {
+            if(ret)
+            {
+                other.GetComponent<Enemy_Frog>().canMove = true;
+                other.GetComponent<Enemy_Frog>().wait = 5;
+                other.GetComponent<Animator>().SetTrigger("exit");
+                GameObject.Destroy(this.gameObject);
+            }
+            return;
+        }
+        if(other.CompareTag("Bullet") || ret)
+        {
+            return;
+        }
+        if(other.TryGetComponent<Health>(out Health health))
+        {
+            health.RemoveHP(Damage);
+        }
+        rb.velocity = new Vector2(0, 0);
+        rb.AddForce((Vector2)(Quaternion.Euler(0,0,rb.rotation) * Vector2.left) * 50, ForceMode2D.Impulse);
+        ret = true;
+    }
+}
--- a/Assets/Scripts/Frog_Tung.cs.meta
+++ b/Assets/Scripts/Frog_Tung.cs.meta
@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: 965024e47cb5cfc479c87e558d5f432f
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
--- a/Assets/Scripts/HeartScript.cs
+++ b/Assets/Scripts/HeartScript.cs
@ -8,6 +8,7 @@ public class HeartScript : MonoBehaviour
    private Sprite[] HeartImages;
    private List<GameObject> Hearts = new List<GameObject>();
    public GameObject HeartPrefab;
+    public Health PL_Health;
    private void Start()
    {
        HeartImages = Resources.LoadAll<Sprite>("Player Heart");
@ -15,7 +16,7 @@ public class HeartScript : MonoBehaviour
    }
    private void FixedUpdate()
    {
-        int tempHP = Heart.HeartStrength;
+        int tempHP = PL_Health.Hp;
        foreach(var item in Hearts)
        {
            item.GetComponent<Image>().sprite = HeartImages[Math.Clamp(tempHP, 0, 13)];
@ -27,13 +28,9 @@ public class HeartScript : MonoBehaviour
        Hearts.Add(GameObject.Instantiate(HeartPrefab, this.transform));
        Hearts[Hearts.Count-1].GetComponent<Image>().sprite = HeartImages[13];
        Hearts[Hearts.Count-1].GetComponent<RectTransform>().anchoredPosition3D = new Vector3(5 + ((Hearts.Count-1) * 53), -5, 0);
-        Heart.HeartStrength += 13;
+        //.HeartStrength += 13;
    }
 }
-public static class Heart
-{
-    public static int HeartStrength = 0;
-}
    
    

--- a/Assets/Scripts/RatTrap.cs
+++ b/Assets/Scripts/RatTrap.cs
@ -5,12 +5,14 @@ using UnityEngine;
 public class RatTrap : MonoBehaviour
 {
    public Animator trapAnimator;
+    private bool trigged;

    private void OnTriggerEnter2D(Collider2D other)
    {
-        if (other.CompareTag("Player"))
+        if (other.CompareTag("Player") && !trigged)
        {
-            Heart.HeartStrength -= 10;
+            trigged = true;
+            other.GetComponent<Health>().RemoveHP(10);
            // Play the snap animation
            trapAnimator.SetTrigger("Snap");

--- a/Assets/~UnityDirMonSyncFile~25f8580c8a10a9d46be2f274436edcc6~
+++ b/Assets/~UnityDirMonSyncFile~25f8580c8a10a9d46be2f274436edcc6~
--- a/Assets/~UnityDirMonSyncFile~5fc9c5094537c1f4ab68c074206e1b08~
+++ b/Assets/~UnityDirMonSyncFile~5fc9c5094537c1f4ab68c074206e1b08~
--- a/ProjectSettings/TagManager.asset
+++ b/ProjectSettings/TagManager.asset
@ -6,6 +6,7 @@ TagManager:
  tags:
  - Interactable
  - Enemy
+  - Bullet
  layers:
  - Default
  - TransparentFX
--- a/UserSettings/Layouts/default-2021.dwlt
+++ b/UserSettings/Layouts/default-2021.dwlt
@ -19,9 +19,9 @@ MonoBehaviour:
    width: 1920
    height: 997
  m_ShowMode: 4
-  m_Title: Project
+  m_Title: Console
  m_RootView: {fileID: 2}
-  m_MinSize: {x: 875, y: 350}
+  m_MinSize: {x: 875, y: 421}
  m_MaxSize: {x: 10000, y: 10000}
  m_Maximized: 1
 --- !u!114 &2
@ -120,7 +120,7 @@ MonoBehaviour:
  m_MinSize: {x: 300, y: 200}
  m_MaxSize: {x: 24288, y: 16192}
  vertical: 0
-  controlID: 97
+  controlID: 25
 --- !u!114 &6
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -166,12 +166,12 @@ MonoBehaviour:
    serializedVersion: 2
    x: 304
    y: 0
-    width: 1110
+    width: 1109
    height: 947
  m_MinSize: {x: 100, y: 200}
  m_MaxSize: {x: 8096, y: 16192}
  vertical: 1
-  controlID: 98
+  controlID: 26
 --- !u!114 &8
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -189,7 +189,7 @@ MonoBehaviour:
    serializedVersion: 2
    x: 0
    y: 0
-    width: 1110
+    width: 1109
    height: 661
  m_MinSize: {x: 202, y: 221}
  m_MaxSize: {x: 4002, y: 4021}
@ -210,24 +210,24 @@ MonoBehaviour:
  m_Enabled: 1
  m_EditorHideFlags: 0
  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: ProjectBrowser
+  m_Name: ConsoleWindow
  m_EditorClassIdentifier: 
  m_Children: []
  m_Position:
    serializedVersion: 2
    x: 0
    y: 661
-    width: 1110
+    width: 1109
    height: 286
-  m_MinSize: {x: 232, y: 271}
-  m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 15}
+  m_MinSize: {x: 102, y: 121}
+  m_MaxSize: {x: 4002, y: 4021}
+  m_ActualView: {fileID: 11}
  m_Panes:
  - {fileID: 11}
  - {fileID: 15}
  - {fileID: 16}
-  m_Selected: 1
-  m_LastSelected: 0
+  m_Selected: 0
+  m_LastSelected: 1
 --- !u!114 &10
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -243,9 +243,9 @@ MonoBehaviour:
  m_Children: []
  m_Position:
    serializedVersion: 2
-    x: 1414
+    x: 1413
    y: 0
-    width: 506
+    width: 507
    height: 947
  m_MinSize: {x: 276, y: 71}
  m_MaxSize: {x: 4001, y: 4021}
@ -277,7 +277,7 @@ MonoBehaviour:
    serializedVersion: 2
    x: 304
    y: 734
-    width: 1108
+    width: 1107
    height: 265
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
@ -316,21 +316,21 @@ MonoBehaviour:
      scrollPos: {x: 0, y: 0}
      m_SelectedIDs: 
      m_LastClickedID: 0
-      m_ExpandedIDs: 28fbffffcc620000
+      m_ExpandedIDs: 28fbffff
      m_RenameOverlay:
        m_UserAcceptedRename: 0
-        m_Name: Tunge
-        m_OriginalName: Tunge
+        m_Name: 
+        m_OriginalName: 
        m_EditFieldRect:
          serializedVersion: 2
          x: 0
          y: 0
          width: 0
          height: 0
-        m_UserData: -38224
+        m_UserData: 0
        m_IsWaitingForDelay: 0
        m_IsRenaming: 0
-        m_OriginalEventType: 0
+        m_OriginalEventType: 11
        m_IsRenamingFilename: 0
        m_ClientGUIView: {fileID: 6}
      m_SearchString: 
@ -362,7 +362,7 @@ MonoBehaviour:
    serializedVersion: 2
    x: 304
    y: 73
-    width: 1108
+    width: 1107
    height: 640
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas:
@ -560,7 +560,7 @@ MonoBehaviour:
      floating: 0
      collapsed: 0
      displayed: 0
-      snapOffset: {x: 0, y: 0}
+      snapOffset: {x: 0, y: 25}
      snapOffsetDelta: {x: 0, y: 0}
      snapCorner: 0
      id: Scene View/Particles
@ -620,9 +620,9 @@ MonoBehaviour:
  m_PlayAudio: 0
  m_AudioPlay: 0
  m_Position:
-    m_Target: {x: -34.55073, y: 7.391551, z: -0.45383865}
+    m_Target: {x: -9.385566, y: 32.871357, z: -0.7299505}
    speed: 2
-    m_Value: {x: -34.55073, y: 7.391551, z: -0.45383865}
+    m_Value: {x: -9.385566, y: 32.871357, z: -0.7299505}
  m_RenderMode: 0
  m_CameraMode:
    drawMode: 0
@ -673,9 +673,9 @@ MonoBehaviour:
    speed: 2
    m_Value: {x: 0, y: 0, z: 0, w: 1}
  m_Size:
-    m_Target: 55.383934
+    m_Target: 82.99505
    speed: 2
-    m_Value: 55.383934
+    m_Value: 82.99505
  m_Ortho:
    m_Target: 1
    speed: 2
@ -774,18 +774,18 @@ MonoBehaviour:
      y: 21
      width: 1108
      height: 619
-    m_Scale: {x: 1, y: 1}
-    m_Translation: {x: 640, y: 344.5157}
+    m_Scale: {x: 0.8597222, y: 0.8597222}
+    m_Translation: {x: 554, y: 309.5}
    m_MarginLeft: 0
    m_MarginRight: 0
    m_MarginTop: 0
    m_MarginBottom: 0
    m_LastShownAreaInsideMargins:
      serializedVersion: 2
-      x: -640
-      y: -344.5157
-      width: 1108
-      height: 619
+      x: -644.3942
+      y: -360
+      width: 1288.7885
+      height: 720
    m_MinimalGUI: 1
  m_defaultScale: 0.8597222
  m_LastWindowPixelSize: {x: 1108, y: 640}
@ -847,10 +847,10 @@ MonoBehaviour:
  m_LockTracker:
    m_IsLocked: 0
  m_FolderTreeState:
-    scrollPos: {x: 0, y: 159}
-    m_SelectedIDs: 96650000
-    m_LastClickedID: 26006
-    m_ExpandedIDs: 000000006465000066650000686500006a6500006c6500006e65000070650000726500007465000076650000786500007a6500008265000000ca9a3b
+    scrollPos: {x: 0, y: 111}
+    m_SelectedIDs: 8a680000
+    m_LastClickedID: 26762
+    m_ExpandedIDs: 00000000c0650000c2650000c4650000c6650000c8650000ca650000cc650000ce650000d0650000d2650000d4650000d6650000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -878,7 +878,7 @@ MonoBehaviour:
    scrollPos: {x: 0, y: 0}
    m_SelectedIDs: 
    m_LastClickedID: 0
-    m_ExpandedIDs: 000000006465000066650000686500006a6500006c6500006e65000070650000726500007465000076650000786500007a650000
+    m_ExpandedIDs: 00000000c0650000c2650000c4650000c6650000c8650000ca650000cc650000ce650000d0650000d2650000d4650000d6650000
    m_RenameOverlay:
      m_UserAcceptedRename: 0
      m_Name: 
@ -903,8 +903,8 @@ MonoBehaviour:
      m_Icon: {fileID: 0}
      m_ResourceFile: 
  m_ListAreaState:
-    m_SelectedInstanceIDs: 
-    m_LastClickedInstanceID: 0
+    m_SelectedInstanceIDs: ea620000
+    m_LastClickedInstanceID: 25322
    m_HadKeyboardFocusLastEvent: 1
    m_ExpandedInstanceIDs: c623000092720000386300001a6300009a660000d49e0000000000002a640000cc800000
    m_RenameOverlay:
@ -964,7 +964,7 @@ MonoBehaviour:
    m_SaveData: []
  m_LockTracker:
    m_IsLocked: 0
-  m_LastSelectedObjectID: 25292
+  m_LastSelectedObjectID: 25322
 --- !u!114 &17
 MonoBehaviour:
  m_ObjectHideFlags: 52
@ -998,15 +998,16 @@ MonoBehaviour:
    - {fileID: -9079914194315318268, guid: 6b0aac9c28934ea58a29403562054c6a, type: 2}
    - {fileID: 1861266083243068592, guid: b8df2c9ce7bfeff4ca2bc9f380a52794, type: 2}
    - {fileID: -5831013718810815287, guid: f3eb707538699a142941bb606d702711, type: 2}
+    - {fileID: 103221287831212599, guid: 2dce173fef6995a458463a1e28ddf27e, type: 2}
    m_ValueSerializationHelper:
-    - e00: 1.4325904
+    - e00: 0.1
      e01: 0
      e02: 0
-      e03: 139.91762
+      e03: 238.40709
      e10: 0
-      e11: 1.4325904
+      e11: 0.1
      e12: 0
-      e13: -15.943386
+      e13: 328.75238
      e20: 0
      e21: 0
      e22: 1
@ -1031,14 +1032,30 @@ MonoBehaviour:
      e31: 0
      e32: 0
      e33: 1
-    - e00: 0.71666664
+    - e00: 0.7469974
+      e01: 0
+      e02: 0
+      e03: 133.48491
+      e10: 0
+      e11: 0.7469974
+      e12: 0
+      e13: 240.26524
+      e20: 0
+      e21: 0
+      e22: 1
+      e23: 0
+      e30: 0
+      e31: 0
+      e32: 0
+      e33: 1
+    - e00: 1
      e01: 0
      e02: 0
-      e03: 15
+      e03: 0
      e10: 0
-      e11: 0.71666664
+      e11: 1
      e12: 0
-      e13: 207.07922
+      e13: 0
      e20: 0
      e21: 0
      e22: 1
@ -1048,15 +1065,15 @@ MonoBehaviour:
      e32: 0
      e33: 1
  m_PreviewAnimator: {fileID: 0}
-  m_AnimatorController: {fileID: 9100000, guid: f3eb707538699a142941bb606d702711, type: 2}
+  m_AnimatorController: {fileID: 9100000, guid: 2dce173fef6995a458463a1e28ddf27e, type: 2}
  m_BreadCrumbs:
-  - m_Target: {fileID: -5831013718810815287, guid: f3eb707538699a142941bb606d702711, type: 2}
+  - m_Target: {fileID: 103221287831212599, guid: 2dce173fef6995a458463a1e28ddf27e, type: 2}
    m_ScrollPosition: {x: 0, y: 0}
  stateMachineGraph: {fileID: 0}
  stateMachineGraphGUI: {fileID: 0}
  blendTreeGraph: {fileID: 0}
  blendTreeGraphGUI: {fileID: 0}
-  m_AutoLiveLink: 1
+  m_AutoLiveLink: 0
  m_MiniTool: 0
  m_LockTracker:
    m_IsLocked: 0
@ -1083,9 +1100,9 @@ MonoBehaviour:
    m_Tooltip: 
  m_Pos:
    serializedVersion: 2
-    x: 1414
+    x: 1413
    y: 73
-    width: 505
+    width: 506
    height: 926
  m_ViewDataDictionary: {fileID: 0}
  m_OverlayCanvas: