diff --git a/Assets/OneShotOneKill.txt b/Assets/OneShotOneKill.txt index a61ea86..bb95742 100644 --- a/Assets/OneShotOneKill.txt +++ b/Assets/OneShotOneKill.txt @@ -1,4 +1,3 @@ -몬스터 넉백 스킬 15종 @@ -8,5 +7,3 @@ - 랜덤 -고찰 - - 에임을 마우스 찍은 곳으로 lookat 하면 안되나? \ No newline at end of file diff --git a/Assets/ResWork/Table/Export/Projectile.json b/Assets/ResWork/Table/Export/Projectile.json index 2898ab9..7ce87e7 100644 --- a/Assets/ResWork/Table/Export/Projectile.json +++ b/Assets/ResWork/Table/Export/Projectile.json @@ -1 +1 @@ -[{"n_ProjectileID":"3001","s_ProjectilePrefabs":"Projectile_Arrow","s_HitEffect":"","f_ProjectileSpeed":"2.6","f_AttackBounceLimit":"1","f_ProjectileDistance":"-1","n_ProjectileLife":"2","f_KnockbackDistance":"0.1","f_StunTime":"0","f_ExplosionRange":"0.5","f_ExplosionDamage":"0"},{"n_ProjectileID":"3101","s_ProjectilePrefabs":"Projectile_MobMelee","s_HitEffect":"","f_ProjectileSpeed":"3","f_AttackBounceLimit":"0","f_ProjectileDistance":"-1","n_ProjectileLife":"5","f_KnockbackDistance":"0","f_StunTime":"0","f_ExplosionRange":"0.5","f_ExplosionDamage":"0"},{"n_ProjectileID":"3102","s_ProjectilePrefabs":"Projectile_MobRange","s_HitEffect":"","f_ProjectileSpeed":"3","f_AttackBounceLimit":"0","f_ProjectileDistance":"-1","n_ProjectileLife":"5","f_KnockbackDistance":"0","f_StunTime":"0","f_ExplosionRange":"0","f_ExplosionDamage":"0"}] \ No newline at end of file +[{"n_ProjectileID":"3001","s_ProjectilePrefabs":"Projectile_Arrow","s_HitEffect":"","f_ProjectileSpeed":"2.6","f_AttackBounceLimit":"1","f_ProjectileDistance":"-1","n_ProjectileLife":"2","f_KnockbackDistance":"1.1","f_StunTime":"0","f_ExplosionRange":"0.5","f_ExplosionDamage":"0"},{"n_ProjectileID":"3101","s_ProjectilePrefabs":"Projectile_MobMelee","s_HitEffect":"","f_ProjectileSpeed":"3","f_AttackBounceLimit":"0","f_ProjectileDistance":"-1","n_ProjectileLife":"5","f_KnockbackDistance":"0","f_StunTime":"0","f_ExplosionRange":"0.5","f_ExplosionDamage":"0"},{"n_ProjectileID":"3102","s_ProjectilePrefabs":"Projectile_MobRange","s_HitEffect":"","f_ProjectileSpeed":"3","f_AttackBounceLimit":"0","f_ProjectileDistance":"-1","n_ProjectileLife":"5","f_KnockbackDistance":"0","f_StunTime":"0","f_ExplosionRange":"0","f_ExplosionDamage":"0"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/OneShotOneKill.xlsm b/Assets/ResWork/Table/OneShotOneKill.xlsm index 479be7d..2ccc18b 100644 Binary files a/Assets/ResWork/Table/OneShotOneKill.xlsm and b/Assets/ResWork/Table/OneShotOneKill.xlsm differ diff --git a/Assets/SampleScene.unity b/Assets/SampleScene.unity index 4c85960..345e1b1 100644 --- a/Assets/SampleScene.unity +++ b/Assets/SampleScene.unity @@ -44976,142 +44976,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 425480584} m_Modifications: - - target: {fileID: 2463269072014234309, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072014234309, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072014234309, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 46.5 - objectReference: {fileID: 0} - - target: {fileID: 2463269072014234309, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -19 - objectReference: {fileID: 0} - - target: {fileID: 2463269072014531840, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072014531840, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072014531840, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 413.90503 - objectReference: {fileID: 0} - - target: {fileID: 2463269072014531840, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -52.426 - objectReference: {fileID: 0} - - target: {fileID: 2463269072085291180, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072085291180, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072085291180, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 14.5 - objectReference: {fileID: 0} - - target: {fileID: 2463269072085291180, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -19 - objectReference: {fileID: 0} - - target: {fileID: 2463269072144992888, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072144992888, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072144992888, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 413.04498 - objectReference: {fileID: 0} - - target: {fileID: 2463269072144992888, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -52.426 - objectReference: {fileID: 0} - - target: {fileID: 2463269072255876258, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072255876258, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072255876258, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 14.5 - objectReference: {fileID: 0} - - target: {fileID: 2463269072255876258, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -19 - objectReference: {fileID: 0} - - target: {fileID: 2463269072386375029, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072386375029, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072386375029, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 533.815 - objectReference: {fileID: 0} - - target: {fileID: 2463269072386375029, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -52.426 - objectReference: {fileID: 0} - - target: {fileID: 2463269072408026890, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072408026890, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072408026890, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 14.5 - objectReference: {fileID: 0} - - target: {fileID: 2463269072408026890, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -19 - objectReference: {fileID: 0} - - target: {fileID: 2463269072452071807, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072452071807, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072452071807, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 14.5 - objectReference: {fileID: 0} - - target: {fileID: 2463269072452071807, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -19 - objectReference: {fileID: 0} - target: {fileID: 2463269072748575536, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} propertyPath: m_Name value: Play_UI_ChoiceSkill objectReference: {fileID: 0} - - target: {fileID: 2463269072748575536, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_IsActive - value: 0 - objectReference: {fileID: 0} - target: {fileID: 2463269072748575537, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} propertyPath: m_Pivot.x value: 0.5 @@ -45192,454 +45060,6 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 2463269072748705713, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072748705713, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072748705713, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 293.995 - objectReference: {fileID: 0} - - target: {fileID: 2463269072748705713, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -52.426 - objectReference: {fileID: 0} - - target: {fileID: 2463269072766602080, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072766602080, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072766602080, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 653.72504 - objectReference: {fileID: 0} - - target: {fileID: 2463269072766602080, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -52.426 - objectReference: {fileID: 0} - - target: {fileID: 2463269072842978515, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072842978515, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072842978515, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 78.5 - objectReference: {fileID: 0} - - target: {fileID: 2463269072842978515, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -19 - objectReference: {fileID: 0} - - target: {fileID: 2463269072848823644, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072848823644, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072848823644, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 46.5 - objectReference: {fileID: 0} - - target: {fileID: 2463269072848823644, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -19 - objectReference: {fileID: 0} - - target: {fileID: 2463269072859635496, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072859635496, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072859635496, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 142.5 - objectReference: {fileID: 0} - - target: {fileID: 2463269072859635496, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -19 - objectReference: {fileID: 0} - - target: {fileID: 2463269072859976820, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072859976820, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072859976820, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 78.5 - objectReference: {fileID: 0} - - target: {fileID: 2463269072859976820, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -19 - objectReference: {fileID: 0} - - target: {fileID: 2463269072905819814, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072905819814, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072905819814, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 78.5 - objectReference: {fileID: 0} - - target: {fileID: 2463269072905819814, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -19 - objectReference: {fileID: 0} - - target: {fileID: 2463269072917730635, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072917730635, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072917730635, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 78.5 - objectReference: {fileID: 0} - - target: {fileID: 2463269072917730635, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -19 - objectReference: {fileID: 0} - - target: {fileID: 2463269072923573540, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072923573540, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072923573540, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 110.5 - objectReference: {fileID: 0} - - target: {fileID: 2463269072923573540, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -19 - objectReference: {fileID: 0} - - target: {fileID: 2463269072954160196, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072954160196, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269072954160196, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 46.5 - objectReference: {fileID: 0} - - target: {fileID: 2463269072954160196, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -19 - objectReference: {fileID: 0} - - target: {fileID: 2463269073107740779, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073107740779, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073107740779, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 652.86505 - objectReference: {fileID: 0} - - target: {fileID: 2463269073107740779, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -52.426 - objectReference: {fileID: 0} - - target: {fileID: 2463269073134047432, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073134047432, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073134047432, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 110.5 - objectReference: {fileID: 0} - - target: {fileID: 2463269073134047432, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -19 - objectReference: {fileID: 0} - - target: {fileID: 2463269073188574560, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073188574560, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073188574560, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 14.5 - objectReference: {fileID: 0} - - target: {fileID: 2463269073188574560, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -19 - objectReference: {fileID: 0} - - target: {fileID: 2463269073207956221, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073207956221, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073207956221, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 142.5 - objectReference: {fileID: 0} - - target: {fileID: 2463269073207956221, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -19 - objectReference: {fileID: 0} - - target: {fileID: 2463269073223023592, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073223023592, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073223023592, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 78.5 - objectReference: {fileID: 0} - - target: {fileID: 2463269073223023592, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -19 - objectReference: {fileID: 0} - - target: {fileID: 2463269073346114579, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073346114579, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073346114579, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 293.135 - objectReference: {fileID: 0} - - target: {fileID: 2463269073346114579, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -52.426 - objectReference: {fileID: 0} - - target: {fileID: 2463269073350809884, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073350809884, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073350809884, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 14.5 - objectReference: {fileID: 0} - - target: {fileID: 2463269073350809884, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -19 - objectReference: {fileID: 0} - - target: {fileID: 2463269073407796911, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073407796911, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073407796911, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 78.5 - objectReference: {fileID: 0} - - target: {fileID: 2463269073407796911, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -19 - objectReference: {fileID: 0} - - target: {fileID: 2463269073441027514, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073441027514, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073441027514, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 173.225 - objectReference: {fileID: 0} - - target: {fileID: 2463269073441027514, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -52.426 - objectReference: {fileID: 0} - - target: {fileID: 2463269073517079841, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073517079841, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073517079841, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 142.5 - objectReference: {fileID: 0} - - target: {fileID: 2463269073517079841, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -19 - objectReference: {fileID: 0} - - target: {fileID: 2463269073600182209, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073600182209, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073600182209, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 46.5 - objectReference: {fileID: 0} - - target: {fileID: 2463269073600182209, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -19 - objectReference: {fileID: 0} - - target: {fileID: 2463269073670827339, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073670827339, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073670827339, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 52.885 - objectReference: {fileID: 0} - - target: {fileID: 2463269073670827339, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -52.425 - objectReference: {fileID: 0} - - target: {fileID: 2463269073700613428, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073700613428, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073700613428, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 110.5 - objectReference: {fileID: 0} - - target: {fileID: 2463269073700613428, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -19 - objectReference: {fileID: 0} - - target: {fileID: 2463269073746742706, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073746742706, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073746742706, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 46.5 - objectReference: {fileID: 0} - - target: {fileID: 2463269073746742706, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -19 - objectReference: {fileID: 0} - - target: {fileID: 2463269073777306549, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073777306549, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073777306549, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 52.885 - objectReference: {fileID: 0} - - target: {fileID: 2463269073777306549, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -52.425 - objectReference: {fileID: 0} - - target: {fileID: 2463269073802975111, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073802975111, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073802975111, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 173.655 - objectReference: {fileID: 0} - - target: {fileID: 2463269073802975111, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -52.425 - objectReference: {fileID: 0} - - target: {fileID: 2463269073839968635, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073839968635, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269073839968635, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 532.955 - objectReference: {fileID: 0} - - target: {fileID: 2463269073839968635, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -52.426 - objectReference: {fileID: 0} - - target: {fileID: 2463269074032967573, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMax.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269074032967573, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchorMin.y - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 2463269074032967573, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.x - value: 46.5 - objectReference: {fileID: 0} - - target: {fileID: 2463269074032967573, guid: 6016da227815e804aa2b1bccf31839fa, type: 3} - propertyPath: m_AnchoredPosition.y - value: -19 - objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] diff --git a/Assets/Script/InGame/Actor/MobActor.cs b/Assets/Script/InGame/Actor/MobActor.cs index 0666954..13f815e 100644 --- a/Assets/Script/InGame/Actor/MobActor.cs +++ b/Assets/Script/InGame/Actor/MobActor.cs @@ -2,17 +2,20 @@ using CodeStage.AntiCheat.ObscuredTypes; using System.Collections; using UnityEngine; -public enum eMobState { Move, Attack } +public enum eMobState { Move, Attack, KnockBack, Die } public class MobActor : MonoBehaviour { public MobShields m_MobShields; + bool bBoss; MonsterTableData m_Data; float FenceY, m_attackTimer; eMobState m_State = eMobState.Move; Animator m_Animator; HUD_HP m_HUD_HP; + Vector3 v3_knockBack; + float t_knockback; private void OnValidate() { @@ -60,6 +63,13 @@ public class MobActor : MonoBehaviour Move(); break; + case eMobState.KnockBack: + t_knockback += Time.deltaTime; + transform.position = Vector3.Lerp(transform.position, v3_knockBack, t_knockback); + if (t_knockback >= 1f) + m_State = eMobState.Move; + break; + case eMobState.Attack: Attack(); break; @@ -77,9 +87,10 @@ public class MobActor : MonoBehaviour FenceY = fenceY; m_attackTimer = m_Data.f_AttackDelay; + bBoss = isboss; var curstagedata = IngameMgr.Ins.Get_CurStageTData(); - m_Attack = m_Data.n_DefaultAttack + (isboss ? curstagedata.n_DefaultBossAttack : curstagedata.n_DefaultEnemyAttack); - m_HP = m_Data.n_DefaultHp + (isboss ? curstagedata.n_DefaultBossHp : curstagedata.n_DefaultEnemyHp); + m_Attack = m_Data.n_DefaultAttack + (bBoss ? curstagedata.n_DefaultBossAttack : curstagedata.n_DefaultEnemyAttack); + m_HP = m_Data.n_DefaultHp + (bBoss ? curstagedata.n_DefaultBossHp : curstagedata.n_DefaultEnemyHp); (m_HUD_HP.transform as RectTransform).anchoredPosition = Vector2.one * 10000f; m_HUD_HP.Set(transform, m_HP); m_MobShields.Set(data); @@ -128,15 +139,22 @@ public class MobActor : MonoBehaviour }); } - public void Get_Dmg(int dmg) + public void Get_Dmg(ProjectileData data) { - m_HP -= dmg; + m_HP -= data.Dmg; m_HUD_HP.Set(m_HP); if (m_HP <= 0) { + m_State = eMobState.Die; IngameMgr.Ins.Add_MobKill(m_Data.n_DropExp); gameObject.SetActive(false); } + else if (!bBoss) + { + m_State = eMobState.KnockBack; + v3_knockBack = transform.position + new Vector3(0f, data.m_Data.f_KnockbackDistance); + t_knockback = 0f; + } } public void Off() diff --git a/Assets/Script/InGame/Projectile/Projectile.cs b/Assets/Script/InGame/Projectile/Projectile.cs index 6143d75..4ae91f4 100644 --- a/Assets/Script/InGame/Projectile/Projectile.cs +++ b/Assets/Script/InGame/Projectile/Projectile.cs @@ -129,7 +129,7 @@ public class Projectile : MonoBehaviour { switch(collision.tag) { - case "Mob": collision.GetComponent().Get_Dmg(m_ProjectileData.Dmg); break; + case "Mob": collision.GetComponent().Get_Dmg(m_ProjectileData); break; case "MobShield": collision.GetComponent().Get_Dmg(); break; } }