summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Assets/Bundle/Unit/PC/Erika/AnimationData/Frank_RPG_Assassin_Combo02_2.asset2
-rw-r--r--Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab4
-rw-r--r--Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot_AfterImage.prefab2
-rw-r--r--Assets/Scripts/Effects/FxClear.cs1
4 files changed, 4 insertions, 5 deletions
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 877f0c2b..403af42b 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,7 +10,7 @@ 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
diff --git a/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab b/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab
index 702cbba3..eab46532 100644
--- a/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab
+++ b/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot.prefab
@@ -58,7 +58,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1357685695}
m_LocalRotation: {x: -0.20345572, y: -0.07620924, z: 0.29289585, w: -0.93113375}
- m_LocalPosition: {x: -0.05, y: -0.09, z: 0.312}
+ m_LocalPosition: {x: -0.049, y: -0.11, z: 0.356}
m_LocalScale: {x: 0.01006957, y: 0.014763792, z: 0.9952188}
m_Children:
- {fileID: 2135912540}
@@ -609,7 +609,7 @@ Transform:
m_GameObject: {fileID: 6928033330946439154}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 3.54, y: 3.34, z: -12.52}
- m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
+ m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
m_Children:
- {fileID: 6930312115733728132}
- {fileID: 6930190073550922930}
diff --git a/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot_AfterImage.prefab b/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot_AfterImage.prefab
index 508a3826..b3787c3a 100644
--- a/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot_AfterImage.prefab
+++ b/Assets/Bundle/Unit/PC/Erika/Prefabs/Erika_Robot_AfterImage.prefab
@@ -433,7 +433,7 @@ Transform:
m_GameObject: {fileID: 6928033330946439154}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 3.54, y: 3.34, z: -12.52}
- m_LocalScale: {x: 0.7, y: 0.7, z: 0.7}
+ m_LocalScale: {x: 0.75, y: 0.75, z: 0.75}
m_Children:
- {fileID: 6930312115733728132}
- {fileID: 6930221487356679114}
diff --git a/Assets/Scripts/Effects/FxClear.cs b/Assets/Scripts/Effects/FxClear.cs
index 507da824..1edf2b97 100644
--- a/Assets/Scripts/Effects/FxClear.cs
+++ b/Assets/Scripts/Effects/FxClear.cs
@@ -5,7 +5,6 @@ using System.Collections.Generic;
public enum EffectPlayTypes
{
- //None 이펙트의 경우는 이펙트 관리 대상에서 제외.
None = 0,
Oneshot,
Loop,