bugfix: 공격이 벽을 관통하지 않도록 메커니즘 변경 & 붕대 애니메이션 적용 & Alien 좌우 이동 애니메이션 수정본…

… 적용 (#123) * bugfix: 공격이 벽을 관통하지 않도록 메커니즘 변경 * feat: 붕대 애니메이션 적용 & Alien 좌우 이동 애니메이션 수정본 적용
kookmin-sw · May 8, 2024 · ef5559b · ef5559b
1 parent e1dd4a5
commit ef5559b
Show file tree

Hide file tree

Showing 28 changed files with 155,366 additions and 155,156 deletions.
diff --git a/Client/Assets/Resources/Animations/Alien/Walk_Left.anim b/Client/Assets/Resources/Animations/Alien/Walk_Left.anim
diff --git a/Client/Assets/Resources/Animations/Alien/Walk_Right.anim b/Client/Assets/Resources/Animations/Alien/Walk_Right.anim
diff --git a/Client/Assets/Resources/Animators/Alien.controller b/Client/Assets/Resources/Animators/Alien.controller
@@ -661,18 +661,18 @@ BlendTree:
     m_DirectBlendParameter: Speed
     m_Mirror: 0
   - serializedVersion: 2
-    m_Motion: {fileID: 7400000, guid: 8f2c33ac8138e2046ae95ea0bf261f0c, type: 2}
+    m_Motion: {fileID: 7400000, guid: 5d517d2db67e5fd419b678633d165bba, type: 2}
     m_Threshold: 0.6666667
     m_Position: {x: 1, y: 0}
-    m_TimeScale: 1.3
+    m_TimeScale: 1
     m_CycleOffset: 0
     m_DirectBlendParameter: Speed
     m_Mirror: 0
   - serializedVersion: 2
-    m_Motion: {fileID: 7400000, guid: 5d517d2db67e5fd419b678633d165bba, type: 2}
+    m_Motion: {fileID: 7400000, guid: 8f2c33ac8138e2046ae95ea0bf261f0c, type: 2}
     m_Threshold: 1
     m_Position: {x: -1, y: 0}
-    m_TimeScale: 1.3
+    m_TimeScale: 1
     m_CycleOffset: 0
     m_DirectBlendParameter: Speed
     m_Mirror: 0

diff --git a/Client/Assets/Resources/Animators/Crew.controller b/Client/Assets/Resources/Animators/Crew.controller
@@ -158,6 +158,31 @@ BlendTree:
   m_UseAutomaticThresholds: 1
   m_NormalizedBlendValues: 0
   m_BlendType: 0
+--- !u!1101 &-5644717712409803382
+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: Bandage
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 4804901228276704616}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.86966825
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1101 &-5117124462139058949
 AnimatorStateTransition:
   m_ObjectHideFlags: 1
@@ -281,6 +306,31 @@ BlendTree:
   m_UseAutomaticThresholds: 1
   m_NormalizedBlendValues: 0
   m_BlendType: 0
+--- !u!1101 &-2862084034132151315
+AnimatorStateTransition:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: 
+  m_Conditions:
+  - m_ConditionMode: 2
+    m_ConditionEvent: Bandage
+    m_EventTreshold: 0
+  m_DstStateMachine: {fileID: 0}
+  m_DstState: {fileID: 4300114749108503531}
+  m_Solo: 0
+  m_Mute: 0
+  m_IsExit: 0
+  serializedVersion: 3
+  m_TransitionDuration: 0.25
+  m_TransitionOffset: 0
+  m_ExitTime: 0.9166667
+  m_HasExitTime: 0
+  m_HasFixedDuration: 1
+  m_InterruptionSource: 0
+  m_OrderedInterruption: 1
+  m_CanTransitionToSelf: 1
 --- !u!1107 &-2282469117838254470
 AnimatorStateMachine:
   serializedVersion: 6
@@ -314,6 +364,9 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: 4675313039096812247}
     m_Position: {x: 400, y: 400, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: 4804901228276704616}
+    m_Position: {x: 400, y: 500, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions:
   - {fileID: -5117124462139058949}
@@ -472,67 +525,73 @@ AnimatorController:
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: Speed
     m_Type: 1
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: X
     m_Type: 1
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: Z
     m_Type: 1
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: IsDead
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: Damaged
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: OpenDoor
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: KeypadUse
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: ChargeBattery
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: OpenItemKit
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
   - m_Name: Throw
     m_Type: 4
     m_DefaultFloat: 0
     m_DefaultInt: 0
     m_DefaultBool: 0
-    m_Controller: {fileID: 9100000}
+    m_Controller: {fileID: 0}
+  - m_Name: Bandage
+    m_Type: 4
+    m_DefaultFloat: 0
+    m_DefaultInt: 0
+    m_DefaultBool: 0
+    m_Controller: {fileID: 0}
   m_AnimatorLayers:
   - serializedVersion: 5
     m_Name: Base Layer
@@ -884,6 +943,7 @@ AnimatorState:
   - {fileID: 986018815045940253}
   - {fileID: 113280034927606382}
   - {fileID: -903668887124347036}
+  - {fileID: -5644717712409803382}
   m_StateMachineBehaviours: []
   m_Position: {x: 50, y: 50, z: 0}
   m_IKOnFeet: 1
@@ -957,6 +1017,33 @@ AnimatorState:
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
+--- !u!1102 &4804901228276704616
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Bandage
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions:
+  - {fileID: -2862084034132151315}
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: 9631ba49b2886414883a965227a8a13a, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!206 &5031844251231195572
 BlendTree:
   m_ObjectHideFlags: 1

diff --git a/Client/Assets/Resources/Datas/ExcelData/AlienData.csv b/Client/Assets/Resources/Datas/ExcelData/AlienData.csv
@@ -1,2 +1,2 @@
 DataId,Name,WalkSpeed,RunSpeed,WorkSpeed
-102000,Stalker,125,125,10
+102000,Stalker,100,125,10
diff --git a/Client/Assets/Resources/Datas/ExcelData/CrewData.csv b/Client/Assets/Resources/Datas/ExcelData/CrewData.csv
@@ -1,2 +1,3 @@
 DataId,Name,WalkSpeed,RunSpeed,WorkSpeed,MaxHp,MaxStamina,MaxSanity,SitSpeed
-101000,CrewA,75,125,10,3,100,100,30
+101000,CrewA,60,100,10,3,100,100,30
+,,,,
diff --git a/Client/Assets/Resources/Datas/ExcelData/SkillData.csv b/Client/Assets/Resources/Datas/ExcelData/SkillData.csv
@@ -1,5 +1,6 @@
 DataId,Name,CoolTime,Range,Damage,SanityDamage,TotalSkillAmount,TotalReadySkillAmount
 301000,Basic Attack,2,1.5,1,20,1.2,-1
-301001,Roar,4,3,-1,30,2.5,1
+301001,Roar,4,10,-1,30,2.5,1
 301002,Cursed Howl,4,-1,-1,-1,2.5,1
 301003,Leap Attack,4,1.5,1,20,2,0.7
+,,,,,
diff --git a/Client/Assets/Resources/Datas/JsonData/CrewData.json b/Client/Assets/Resources/Datas/JsonData/CrewData.json
@@ -7,8 +7,8 @@
       "SitSpeed": 30.0,
       "DataId": 101000,
       "Name": "CrewA",
-      "WalkSpeed": 75.0,
-      "RunSpeed": 125.0,
+      "WalkSpeed": 60.0,
+      "RunSpeed": 100.0,
       "WorkSpeed": 10.0
     }
   ]

diff --git a/Client/Assets/Resources/Datas/JsonData/SkillData.json b/Client/Assets/Resources/Datas/JsonData/SkillData.json
@@ -14,7 +14,7 @@
       "DataId": 301001,
       "Name": "Roar",
       "CoolTime": 4.0,
-      "Range": 3.0,
+      "Range": 10.0,
       "Damage": -1,
       "SanityDamage": 30.0,
       "TotalSkillAmount": 2.5,
@@ -26,7 +26,7 @@
       "CoolTime": 4.0,
       "Range": -1.0,
       "Damage": -1,
-      "SanityDamage": 20.0,
+      "SanityDamage": -1.0,
       "TotalSkillAmount": 2.5,
       "TotalReadySkillAmount": 1.0
     },