Merge branch 'feature/SwordEnemyRework_NAOR-102' into develop

OTK-LAB · Jul 14, 2024 · cf21630 · cf21630
2 parents 9dc21b0 + 7763a67
commit cf21630
Show file tree

Hide file tree

Showing 10 changed files with 479 additions and 1,205 deletions.
diff --git 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/*
+/[Aa]ssets/[Ss]treamingAssets/aa/*
diff --git 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
@@ -79,7 +79,7 @@ AnimationClip:
   m_HasMotionFloatCurves: 0
   m_Events:
   - time: 0.625
-    functionName: setCoolDown
+    functionName: coolDown
     data: 
     objectReferenceParameter: {fileID: 0}
     floatParameter: 2