*misc

11 files changed, 328 insertions, 22 deletions

diff --git a/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationClip/hit_air03.anim b/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationClip/hit_air03.anim
index 6a274559..5fb2094a 100644
--- a/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationClip/hit_air03.anim
+++ b/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationClip/hit_air03.anim
@@ -20495,7 +20495,7 @@ AnimationClip:
     m_StartTime: 0
     m_StopTime: 0.90000004
     m_OrientationOffsetY: 0
-    m_Level: 0
+    m_Level: 0.25
     m_CycleOffset: 0
     m_HasAdditiveReferencePose: 0
     m_LoopTime: 0
@@ -20503,7 +20503,7 @@ AnimationClip:
     m_LoopBlendOrientation: 1
     m_LoopBlendPositionY: 0
     m_LoopBlendPositionXZ: 0
-    m_KeepOriginalOrientation: 0
+    m_KeepOriginalOrientation: 1
     m_KeepOriginalPositionY: 0
     m_KeepOriginalPositionXZ: 0
     m_HeightFromFeet: 1
diff --git a/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationClip/rise_1.anim b/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationClip/rise_1.anim
index f2c7a771..dabddaab 100644
--- a/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationClip/rise_1.anim
+++ b/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationClip/rise_1.anim
@@ -21034,10 +21034,10 @@ AnimationClip:
     m_LoopBlendOrientation: 1
     m_LoopBlendPositionY: 0
     m_LoopBlendPositionXZ: 0
-    m_KeepOriginalOrientation: 0
-    m_KeepOriginalPositionY: 1
+    m_KeepOriginalOrientation: 1
+    m_KeepOriginalPositionY: 0
     m_KeepOriginalPositionXZ: 0
-    m_HeightFromFeet: 0
+    m_HeightFromFeet: 1
     m_Mirror: 0
   m_EditorCurves: []
   m_EulerEditorCurves: []
diff --git a/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationController/Robots_Prowler_AnimatorControllerCrossFade.controller b/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationController/Robots_Prowler_AnimatorControllerCrossFade.controller
index e5c8e593..cf6c732e 100644
--- a/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationController/Robots_Prowler_AnimatorControllerCrossFade.controller
+++ b/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationController/Robots_Prowler_AnimatorControllerCrossFade.controller
@@ -439,7 +439,7 @@ AnimatorState:
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
-  m_Motion: {fileID: 7400000, guid: c3547ad0b45d2f849a8c682ac5e4e2ba, type: 2}
+  m_Motion: {fileID: 7400000, guid: 72d895f8eb54de34fb75d9e9f4c5dc15, type: 2}
   m_Tag: 
   m_SpeedParameter: 
   m_MirrorParameter: 
@@ -618,13 +618,13 @@ AnimatorState:
   m_IKOnFeet: 0
   m_WriteDefaultValues: 1
   m_Mirror: 0
-  m_SpeedParameterActive: 0
+  m_SpeedParameterActive: 1
   m_MirrorParameterActive: 0
   m_CycleOffsetParameterActive: 0
   m_TimeParameterActive: 0
   m_Motion: {fileID: 7400000, guid: 8e480810593dff04783b7a5b06627a55, type: 2}
   m_Tag: 
-  m_SpeedParameter: 
+  m_SpeedParameter: PlaybackSpeed0
   m_MirrorParameter: 
   m_CycleOffsetParameter: 
   m_TimeParameter: 
diff --git a/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/hit_air03.asset b/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/hit_air03.asset
new file mode 100644
index 00000000..d01a9899
--- /dev/null
+++ b/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/hit_air03.asset
@@ -0,0 +1,55 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: cab6406109041434e890f22d6455172f, type: 3}
+  m_Name: hit_air03
+  m_EditorClassIdentifier: 
+  animationName: hit_air03
+  animationPath: Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationClip/hit_air03.anim
+  animationEvents: []
+  hurtBoxes: []
+  hitBoxes: []
+  throwBoxes: []
+  blockBoxes: []
+  defendBoxes: []
+  speedCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    - serializedVersion: 3
+      time: 1
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  curves:
+    m_keys: 
+    m_values: []
+  toggles:
+    m_keys: 
+    m_values: []
+  parameters:
+    m_keys: 
+    m_values: []
diff --git a/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/hit_air03.asset.meta b/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/hit_air03.asset.meta
new file mode 100644
index 00000000..fe3b8820
--- /dev/null
+++ b/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/hit_air03.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: e0d4adf753dff5847aad9a247e386b0e
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/rise_1.asset b/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/rise_1.asset
index cb1676a1..47790642 100644
--- a/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/rise_1.asset
+++ b/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/rise_1.asset
@@ -15,7 +15,49 @@ MonoBehaviour:
   animationName: rise_1
   animationPath: Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationClip/rise_1.anim
   animationEvents: []
-  hurtBoxes: []
+  hurtBoxes:
+  - collider:
+      type: 1
+      pivot: 0
+      multiHit: 0
+      hitResponse: 0
+      hitBack: {x: 0, y: 0, z: 0}
+      freezeFramesSelf: 0
+      freezeFramesOther: 0
+      sparkPath: 
+      sparkAnchor: 0
+      sparkOffset: {x: 0, y: 0, z: 0}
+      multiSparks: 0
+      spark2Path: 
+      spark2Anchor: 0
+      spark2Offset: {x: 0, y: 0, z: 0}
+      spark3Path: 
+      spark3Anchor: 0
+      spark3Offset: {x: 0, y: 0, z: 0}
+      selfEffect: 0
+      otherEffect: 0
+      zoomCamera: 0
+      shakeScreen: 0
+      shakeOffset: {x: 0, y: 0}
+      shakeStrength: 0
+      colorDrift: 0
+      blur: 0
+      soundPath: 
+      useGravity: 0
+      multiple: 0
+    frames:
+    - frame: 0
+      active: 1
+      position: {x: 0, y: 0, z: 0}
+      size: {x: 2.08, y: 0.59, z: 1}
+    - frame: 6
+      active: 1
+      position: {x: 0, y: 0, z: 0}
+      size: {x: 1.15, y: 1, z: 1}
+    - frame: 26
+      active: 1
+      position: {x: 0, y: 0, z: 0}
+      size: {x: 0.93, y: 1.83, z: 1}
   hitBoxes: []
   throwBoxes: []
   blockBoxes: []
diff --git a/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/rise_2.asset b/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/rise_2.asset
new file mode 100644
index 00000000..4fcc58be
--- /dev/null
+++ b/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/rise_2.asset
@@ -0,0 +1,55 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: cab6406109041434e890f22d6455172f, type: 3}
+  m_Name: rise_2
+  m_EditorClassIdentifier: 
+  animationName: rise_2
+  animationPath: Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationClip/rise_2.anim
+  animationEvents: []
+  hurtBoxes: []
+  hitBoxes: []
+  throwBoxes: []
+  blockBoxes: []
+  defendBoxes: []
+  speedCurve:
+    serializedVersion: 2
+    m_Curve:
+    - serializedVersion: 3
+      time: 0
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    - serializedVersion: 3
+      time: 1
+      value: 1
+      inSlope: 0
+      outSlope: 0
+      tangentMode: 0
+      weightedMode: 0
+      inWeight: 0
+      outWeight: 0
+    m_PreInfinity: 2
+    m_PostInfinity: 2
+    m_RotationOrder: 4
+  curves:
+    m_keys: 
+    m_values: []
+  toggles:
+    m_keys: 
+    m_values: []
+  parameters:
+    m_keys: 
+    m_values: []
diff --git a/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/rise_2.asset.meta b/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/rise_2.asset.meta
new file mode 100644
index 00000000..4d8fe9af
--- /dev/null
+++ b/Assets/Bundle/Unit/Monster/Robots_Prowler/AnimationData/rise_2.asset.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a963d6d36820cf24db8e0a76580abb49
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset
index f831dda6..8a96d3d8 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_1.asset
@@ -14,7 +14,9 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   animationName: Frank_RPG_Assassin_Combo02_1
   animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Frank_RPG_Assassin_Combo02_1.anim
-  animationEvents: []
+  animationEvents:
+  - {fileID: 114964882930719632}
+  - {fileID: 114533364586825402}
   hurtBoxes: []
   hitBoxes:
   - collider:
@@ -49,12 +51,12 @@ MonoBehaviour:
     frames:
     - frame: 7
       active: 1
-      position: {x: 0.89, y: 0.97, z: 0}
-      size: {x: 1.09, y: 1.69, z: 1}
+      position: {x: 1.37, y: 0.97, z: 0}
+      size: {x: 1.58, y: 1.69, z: 1}
     - frame: 9
       active: 1
-      position: {x: 1.02, y: 0.83, z: 0}
-      size: {x: 0.91, y: 1.4, z: 1}
+      position: {x: 1.22, y: 0.92, z: 0}
+      size: {x: 1.1, y: 1.56, z: 1}
   - collider:
       type: 0
       pivot: 1
@@ -87,12 +89,12 @@ MonoBehaviour:
     frames:
     - frame: 10
       active: 1
-      position: {x: 1.05, y: 0.82, z: 0}
-      size: {x: 0.9, y: 1.28, z: 1}
+      position: {x: 1.2, y: 0.91, z: 0}
+      size: {x: 1.11, y: 1.71, z: 1}
     - frame: 13
       active: 1
-      position: {x: 1.12, y: 0.78, z: 0}
-      size: {x: 0.91, y: 1.49, z: 1}
+      position: {x: 1.21, y: 0.83, z: 0}
+      size: {x: 0.91, y: 1.54, z: 1}
   throwBoxes: []
   blockBoxes: []
   defendBoxes: []
@@ -131,3 +133,41 @@ MonoBehaviour:
   parameters:
     m_keys: 
     m_values: []
+--- !u!114 &114533364586825402
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: 9fe45d0826fb033448a877f1d49199d6, type: 3}
+  m_Name: EventEffect
+  m_EditorClassIdentifier: 
+  startFrame: 11
+  effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab
+  attached: 0
+  bone: 
+  position: {x: 0, y: 0, z: 0}
+  rotation: {x: 9.041, y: 3.24, z: -13.587}
+  scale: {x: 0.8, y: 0.8, z: 0.8}
+--- !u!114 &114964882930719632
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: 9fe45d0826fb033448a877f1d49199d6, type: 3}
+  m_Name: EventEffect
+  m_EditorClassIdentifier: 
+  startFrame: 7
+  effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab
+  attached: 0
+  bone: 
+  position: {x: 0, y: 0, z: 0}
+  rotation: {x: 29.554, y: -2.357, z: -15.468}
+  scale: {x: 0.8, y: 0.8, z: 0.8}
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_2.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_2.asset
index bfd97bd1..7527688f 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_2.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_2.asset
@@ -10,11 +10,14 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: cab6406109041434e890f22d6455172f, type: 3}
-  m_Name: Frank_RPG_Assassin_Combo02_2(Clone)
+  m_Name: Frank_RPG_Assassin_Combo02_2
   m_EditorClassIdentifier: 
   animationName: Frank_RPG_Assassin_Combo02_2
   animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Frank_RPG_Assassin_Combo02_2.anim
-  animationEvents: []
+  animationEvents:
+  - {fileID: 114347121473010800}
+  - {fileID: 114766687553299966}
+  - {fileID: 114312737581800856}
   hurtBoxes: []
   hitBoxes:
   - collider:
@@ -165,7 +168,64 @@ MonoBehaviour:
     m_keys: 00000000
     m_values:
     - from: 0.57
-      to: 0.85
+      to: 1
   parameters:
     m_keys: 
     m_values: []
+--- !u!114 &114312737581800856
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: 9fe45d0826fb033448a877f1d49199d6, type: 3}
+  m_Name: EventEffect
+  m_EditorClassIdentifier: 
+  startFrame: 12
+  effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab
+  attached: 0
+  bone: 
+  position: {x: 0, y: -0.5, z: 0}
+  rotation: {x: 0, y: 0, z: -30}
+  scale: {x: 0.8, y: 0.8, z: 0.8}
+--- !u!114 &114347121473010800
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: 9fe45d0826fb033448a877f1d49199d6, type: 3}
+  m_Name: EventEffect
+  m_EditorClassIdentifier: 
+  startFrame: 2
+  effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab
+  attached: 0
+  bone: 
+  position: {x: 0, y: 0, z: 0}
+  rotation: {x: -20, y: 0, z: 0}
+  scale: {x: 0.8, y: 0.8, z: -0.8}
+--- !u!114 &114766687553299966
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  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: 9fe45d0826fb033448a877f1d49199d6, type: 3}
+  m_Name: EventEffect
+  m_EditorClassIdentifier: 
+  startFrame: 6
+  effectPath: Assets/Art/Vfx/Sword slash VFX/Prefabs/Sword Slash 9.prefab
+  attached: 0
+  bone: 
+  position: {x: 0, y: 0, z: 0}
+  rotation: {x: 0, y: 80, z: 0}
+  scale: {x: 0.8, y: 0.8, z: 0.8}
diff --git a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_3.asset b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_3.asset
index 54f82ad4..48ee18cd 100644
--- a/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_3.asset
+++ b/Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_3.asset
@@ -16,7 +16,45 @@ MonoBehaviour:
   animationPath: Assets/Bundle/Unit/PC/Erika/AnimationClip/Frank_RPG_Assassin_Combo02_3.anim
   animationEvents: []
   hurtBoxes: []
-  hitBoxes: []
+  hitBoxes:
+  - collider:
+      type: 0
+      pivot: 1
+      multiHit: 0
+      hitResponse: 2
+      hitBack: {x: 0, y: 0, z: 0}
+      freezeFramesSelf: 0
+      freezeFramesOther: 0
+      sparkPath: Assets/Art/Vfx/Hit & Slashes Vol.3/Prefabs/hit-blue-3.prefab
+      sparkAnchor: 1
+      sparkOffset: {x: 0, y: 0, z: 0}
+      multiSparks: 0
+      spark2Path: 
+      spark2Anchor: 0
+      spark2Offset: {x: 0, y: 0, z: 0}
+      spark3Path: 
+      spark3Anchor: 0
+      spark3Offset: {x: 0, y: 0, z: 0}
+      selfEffect: 0
+      otherEffect: 0
+      zoomCamera: 0
+      shakeScreen: 0
+      shakeOffset: {x: 0, y: 0}
+      shakeStrength: 0
+      colorDrift: 0
+      blur: 0
+      soundPath: 
+      useGravity: 0
+      multiple: 0
+    frames:
+    - frame: 6
+      active: 1
+      position: {x: 0.63, y: 0.48, z: 0}
+      size: {x: 3.06, y: 1, z: 1}
+    - frame: 10
+      active: 1
+      position: {x: 0, y: 0.52, z: 0}
+      size: {x: 2.48, y: 1, z: 1}
   throwBoxes: []
   blockBoxes: []
   defendBoxes: []