diff --git a/Assets/ResWork/Table/Export/Projectile.json b/Assets/ResWork/Table/Export/Projectile.json index 9ebbdb8..64a6d45 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.5","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":"Effect/ArrowHit","f_ProjectileSpeed":"2.6","f_AttackBounceLimit":"1","f_ProjectileDistance":"-1","n_ProjectileLife":"2","f_KnockbackDistance":"0.5"},{"n_ProjectileID":"3002","s_ProjectilePrefabs":"Explosion","s_HitEffect":"","f_ProjectileSpeed":"0","f_AttackBounceLimit":"0","f_ProjectileDistance":"0","n_ProjectileLife":"1","f_KnockbackDistance":"1"},{"n_ProjectileID":"3101","s_ProjectilePrefabs":"Projectile_MobMelee","s_HitEffect":"","f_ProjectileSpeed":"3","f_AttackBounceLimit":"0","f_ProjectileDistance":"-1","n_ProjectileLife":"5","f_KnockbackDistance":"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"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/Local/BattleLevelUp.json b/Assets/ResWork/Table/Local/BattleLevelUp.json new file mode 100644 index 0000000..aa7db86 --- /dev/null +++ b/Assets/ResWork/Table/Local/BattleLevelUp.json @@ -0,0 +1 @@ +[{"n_Lv":"1","n_NextRequireExp":"3","n_TotalExp":"3"},{"n_Lv":"2","n_NextRequireExp":"7","n_TotalExp":"10"},{"n_Lv":"3","n_NextRequireExp":"14","n_TotalExp":"24"},{"n_Lv":"4","n_NextRequireExp":"22","n_TotalExp":"46"},{"n_Lv":"5","n_NextRequireExp":"32","n_TotalExp":"78"},{"n_Lv":"6","n_NextRequireExp":"43","n_TotalExp":"121"},{"n_Lv":"7","n_NextRequireExp":"55","n_TotalExp":"176"},{"n_Lv":"8","n_NextRequireExp":"68","n_TotalExp":"244"},{"n_Lv":"9","n_NextRequireExp":"82","n_TotalExp":"326"},{"n_Lv":"10","n_NextRequireExp":"97","n_TotalExp":"423"},{"n_Lv":"11","n_NextRequireExp":"114","n_TotalExp":"537"},{"n_Lv":"12","n_NextRequireExp":"132","n_TotalExp":"669"},{"n_Lv":"13","n_NextRequireExp":"151","n_TotalExp":"820"},{"n_Lv":"14","n_NextRequireExp":"172","n_TotalExp":"992"},{"n_Lv":"15","n_NextRequireExp":"194","n_TotalExp":"1186"},{"n_Lv":"16","n_NextRequireExp":"219","n_TotalExp":"1405"},{"n_Lv":"17","n_NextRequireExp":"245","n_TotalExp":"1650"},{"n_Lv":"18","n_NextRequireExp":"272","n_TotalExp":"1922"},{"n_Lv":"19","n_NextRequireExp":"300","n_TotalExp":"2222"},{"n_Lv":"20","n_NextRequireExp":"0","n_TotalExp":"2222"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/Local/BattleLevelUp.json.meta b/Assets/ResWork/Table/Local/BattleLevelUp.json.meta new file mode 100644 index 0000000..32670c7 --- /dev/null +++ b/Assets/ResWork/Table/Local/BattleLevelUp.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: fbbf1821a15b82c46b7050ee32bf8560 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Table/Local/Monster.json b/Assets/ResWork/Table/Local/Monster.json index e4aecee..ffcba20 100644 --- a/Assets/ResWork/Table/Local/Monster.json +++ b/Assets/ResWork/Table/Local/Monster.json @@ -1 +1 @@ -[{"n_MonsterTypeID":"2001","e_MonsterType":"Monster","f_DefaultAttack":"10","f_DefaultHp":"40","n_DropExp":"1","e_UnityType":"Melee","f_AttackRange":"1.2","f_AttackDelay":"1.1","f_MoveSpeed":"1","e_MoveType":"Static","n_ProjectileID":"3101","s_MonsterPrefabPath":"2001","f_Scale":"0.15","e_ShieldType":"None","n_NormalShieldCount":"0","n_InvinityShieldCount":"0"},{"n_MonsterTypeID":"2002","e_MonsterType":"Monster","f_DefaultAttack":"20","f_DefaultHp":"60","n_DropExp":"1","e_UnityType":"Range","f_AttackRange":"5","f_AttackDelay":"2","f_MoveSpeed":"1.2","e_MoveType":"Static","n_ProjectileID":"3102","s_MonsterPrefabPath":"2002","f_Scale":"0.15","e_ShieldType":"Static","n_NormalShieldCount":"1","n_InvinityShieldCount":"0"},{"n_MonsterTypeID":"2003","e_MonsterType":"Boss","f_DefaultAttack":"30","f_DefaultHp":"60","n_DropExp":"3","e_UnityType":"Melee","f_AttackRange":"2","f_AttackDelay":"1.5","f_MoveSpeed":"1.2","e_MoveType":"Random","n_ProjectileID":"3101","s_MonsterPrefabPath":"2003","f_Scale":"0.3","e_ShieldType":"Rotation","n_NormalShieldCount":"1","n_InvinityShieldCount":"1"},{"n_MonsterTypeID":"2004","e_MonsterType":"Monster","f_DefaultAttack":"10","f_DefaultHp":"40","n_DropExp":"1","e_UnityType":"Melee","f_AttackRange":"1.2","f_AttackDelay":"1.1","f_MoveSpeed":"1","e_MoveType":"Static","n_ProjectileID":"3101","s_MonsterPrefabPath":"2004","f_Scale":"0.15","e_ShieldType":"None","n_NormalShieldCount":"0","n_InvinityShieldCount":"0"},{"n_MonsterTypeID":"2005","e_MonsterType":"Monster","f_DefaultAttack":"20","f_DefaultHp":"60","n_DropExp":"1","e_UnityType":"Range","f_AttackRange":"5","f_AttackDelay":"2","f_MoveSpeed":"1.2","e_MoveType":"Static","n_ProjectileID":"3102","s_MonsterPrefabPath":"2005","f_Scale":"0.15","e_ShieldType":"Static","n_NormalShieldCount":"1","n_InvinityShieldCount":"0"},{"n_MonsterTypeID":"2006","e_MonsterType":"Boss","f_DefaultAttack":"30","f_DefaultHp":"60","n_DropExp":"3","e_UnityType":"Range","f_AttackRange":"4.5","f_AttackDelay":"1.5","f_MoveSpeed":"1.2","e_MoveType":"Random","n_ProjectileID":"3102","s_MonsterPrefabPath":"2006","f_Scale":"0.3","e_ShieldType":"Rotation","n_NormalShieldCount":"1","n_InvinityShieldCount":"1"}] \ No newline at end of file +[{"n_MonsterTypeID":"2001","e_MonsterType":"Monster","n_DefaultAttack":"10","n_DefaultHp":"40","n_DropExp":"1","e_UnityType":"Melee","f_AttackRange":"1.2","f_AttackDelay":"1.1","f_MoveSpeed":"0.5","e_MoveType":"Static","n_ProjectileID":"3101","s_MonsterPrefabPath":"2001","f_Scale":"0.15","e_ShieldType":"None","n_NormalShieldCount":"2","n_InvinityShieldCount":"2"},{"n_MonsterTypeID":"2002","e_MonsterType":"Monster","n_DefaultAttack":"20","n_DefaultHp":"60","n_DropExp":"1","e_UnityType":"Range","f_AttackRange":"5","f_AttackDelay":"2","f_MoveSpeed":"0.5","e_MoveType":"Static","n_ProjectileID":"3102","s_MonsterPrefabPath":"2002","f_Scale":"0.15","e_ShieldType":"None","n_NormalShieldCount":"2","n_InvinityShieldCount":"2"},{"n_MonsterTypeID":"2003","e_MonsterType":"Boss","n_DefaultAttack":"30","n_DefaultHp":"60","n_DropExp":"3","e_UnityType":"Melee","f_AttackRange":"2","f_AttackDelay":"1.5","f_MoveSpeed":"1","e_MoveType":"Random","n_ProjectileID":"3101","s_MonsterPrefabPath":"2003","f_Scale":"0.3","e_ShieldType":"Rotation","n_NormalShieldCount":"1","n_InvinityShieldCount":"1"},{"n_MonsterTypeID":"2004","e_MonsterType":"Monster","n_DefaultAttack":"10","n_DefaultHp":"40","n_DropExp":"1","e_UnityType":"Melee","f_AttackRange":"1.2","f_AttackDelay":"1.1","f_MoveSpeed":"0.5","e_MoveType":"Static","n_ProjectileID":"3101","s_MonsterPrefabPath":"2004","f_Scale":"0.15","e_ShieldType":"None","n_NormalShieldCount":"2","n_InvinityShieldCount":"2"},{"n_MonsterTypeID":"2005","e_MonsterType":"Monster","n_DefaultAttack":"20","n_DefaultHp":"60","n_DropExp":"1","e_UnityType":"Range","f_AttackRange":"5","f_AttackDelay":"2","f_MoveSpeed":"0.5","e_MoveType":"Static","n_ProjectileID":"3102","s_MonsterPrefabPath":"2005","f_Scale":"0.15","e_ShieldType":"None","n_NormalShieldCount":"2","n_InvinityShieldCount":"2"},{"n_MonsterTypeID":"2006","e_MonsterType":"Boss","n_DefaultAttack":"30","n_DefaultHp":"60","n_DropExp":"3","e_UnityType":"Range","f_AttackRange":"4.5","f_AttackDelay":"1.5","f_MoveSpeed":"1","e_MoveType":"Random","n_ProjectileID":"3102","s_MonsterPrefabPath":"2006","f_Scale":"0.3","e_ShieldType":"Rotation","n_NormalShieldCount":"1","n_InvinityShieldCount":"1"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/Local/Projectile.json b/Assets/ResWork/Table/Local/Projectile.json index 8adcd1a..f4e968a 100644 --- a/Assets/ResWork/Table/Local/Projectile.json +++ b/Assets/ResWork/Table/Local/Projectile.json @@ -1 +1 @@ -[{"n_ProjectileID":"3001","s_ProjectilePrefabs":"Projectile_Arrow","s_HitEffect":"","s_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":"","s_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":"","s_ProjectileSpeed":"3","f_AttackBounceLimit":"0","f_ProjectileDistance":"-1","n_ProjectileLife":"5","f_KnockbackDistance":"0","f_StunTime":"","f_ExplosionRange":"","f_ExplosionDamage":""}] \ No newline at end of file +[{"n_ProjectileID":"3001","s_ProjectilePrefabs":"Projectile_Arrow","s_HitEffect":"Effect/ArrowHit","f_ProjectileSpeed":"2.6","f_AttackBounceLimit":"1","f_ProjectileDistance":"-1","n_ProjectileLife":"2","f_KnockbackDistance":"0.5"},{"n_ProjectileID":"3002","s_ProjectilePrefabs":"Explosion","s_HitEffect":"","f_ProjectileSpeed":"0","f_AttackBounceLimit":"0","f_ProjectileDistance":"0","n_ProjectileLife":"0","f_KnockbackDistance":"1"},{"n_ProjectileID":"3101","s_ProjectilePrefabs":"Projectile_MobMelee","s_HitEffect":"","f_ProjectileSpeed":"3","f_AttackBounceLimit":"0","f_ProjectileDistance":"-1","n_ProjectileLife":"5","f_KnockbackDistance":"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"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/Local/Skill.json b/Assets/ResWork/Table/Local/Skill.json new file mode 100644 index 0000000..602dfe1 --- /dev/null +++ b/Assets/ResWork/Table/Local/Skill.json @@ -0,0 +1 @@ +[{"e_SkillType":"HpUp","n_ImageIndex":"0","s_Name":"생명력 증가+1","s_Desc":"적에게 버틸 수 있는 성벽의 생명력이 증가합니다.","s_Value":"100","s_ExplosionData":"0"},{"e_SkillType":"AttackUp","n_ImageIndex":"1","s_Name":"공격력 증가+1","s_Desc":"공격력이 +1 증가합니다.","s_Value":"1","s_ExplosionData":"0"},{"e_SkillType":"PreviousArrow","n_ImageIndex":"2","s_Name":"직전 화살+1","s_Desc":"투사체 타격 횟수가 +1 증가합니다.","s_Value":"1","s_ExplosionData":"0"},{"e_SkillType":"DiagonalArrow","n_ImageIndex":"3","s_Name":"사선 화살+1","s_Desc":"발사 된 투사체 방향으로 사선 방향의 투사체 1개가 추가됩니다.","s_Value":"1","s_ExplosionData":"0"},{"e_SkillType":"ProjectilePierce","n_ImageIndex":"4","s_Name":"투사체 관통+1","s_Desc":"투사체가 적을 관통하는 횟수가 증가합니다.","s_Value":"1","s_ExplosionData":"0"},{"e_SkillType":"Reflect","n_ImageIndex":"5","s_Name":"반사+1","s_Desc":"투사체 반사 횟수가 +1 증가합니다.","s_Value":"1","s_ExplosionData":"0"},{"e_SkillType":"Knockback","n_ImageIndex":"6","s_Name":"넉백+1","s_Desc":"타격 된 적을 일정 거리 만큼 밀쳐냅니다.","s_Value":"0.5","s_ExplosionData":"0"},{"e_SkillType":"DoubleShot","n_ImageIndex":"7","s_Name":"더블샷+1","s_Desc":"같은 방향으로 발사되는 투사체의 수량이 증가합니다. (※연속 발사)","s_Value":"1","s_ExplosionData":"0"},{"e_SkillType":"Explosion","n_ImageIndex":"8","s_Name":"폭파+1","s_Desc":"피격 된 대상을 처치하면 일정 범위에 피해를 입힙니다. (중첩 시 피해량과 범위가 증가)","s_Value":"1","s_ExplosionData":"100^25^50%^25%"},{"e_SkillType":"Stun","n_ImageIndex":"9","s_Name":"기절+1","s_Desc":"피해를 입힌 적을 일정 시간(=0.5초) 기절 시킵니다. (※보스 몬스터에게는 적용 안됨)","s_Value":"0.5s","s_ExplosionData":"0"},{"e_SkillType":"Bounce","n_ImageIndex":"10","s_Name":"튕김+1","s_Desc":"피격 된 대상이 있을 경우, 일정 범위 내 적에게 투사체 1개가 추가로 발사됩니다.","s_Value":"1","s_ExplosionData":"0"},{"e_SkillType":"ArrowUpDown","n_ImageIndex":"11","s_Name":"상/하 화살","s_Desc":"투사체에 적이 명중할 경우 상/하 방향으로 투사체가 1개씩 발사됩니다.","s_Value":"1","s_ExplosionData":"0"},{"e_SkillType":"ArrowLeftRight","n_ImageIndex":"12","s_Name":"좌/우 화살","s_Desc":"투사체에 적이 명중할 경우 좌/우 방향으로 투사체가 1개씩 발사됩니다.","s_Value":"1","s_ExplosionData":"0"},{"e_SkillType":"ImpactArrow","n_ImageIndex":"13","s_Name":"충격 화살+1","s_Desc":"투사체가 적의 방어막에 막혀도 +1의 피해를 고정으로 입힙니다.","s_Value":"1","s_ExplosionData":"0"},{"e_SkillType":"AttackSpeedUp","n_ImageIndex":"14","s_Name":"공격 속도+1","s_Desc":"공격 속도가 0.1초 감소합니다.","s_Value":"0.1s","s_ExplosionData":"0"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/Local/Skill.json.meta b/Assets/ResWork/Table/Local/Skill.json.meta new file mode 100644 index 0000000..ad77378 --- /dev/null +++ b/Assets/ResWork/Table/Local/Skill.json.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 65d861624c544af48aa9648ceee429e1 +TextScriptImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ResWork/Table/Local/Unit.json b/Assets/ResWork/Table/Local/Unit.json index e40a3a3..e52a0ba 100644 --- a/Assets/ResWork/Table/Local/Unit.json +++ b/Assets/ResWork/Table/Local/Unit.json @@ -1 +1 @@ -[{"n_UnitID":"1000","f_DefaultAttack":"100","n_DefaultHp":"500","f_AttackSpeed":"1.25","n_DefaultProjectileCount":"1","n_ProjectileID":"3001","s_UnitPrefabPath":"DefaultUnit"}] \ No newline at end of file +[{"n_UnitID":"1001","n_DefaultAttack":"25","n_DefaultHp":"999999","f_AttackSpeed":"1.25","n_DefaultProjectileCount":"1","n_ProjectileID":"3001","s_UnitPrefabPath":"DefaultUnit"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/Local/WavePattern.json b/Assets/ResWork/Table/Local/WavePattern.json index 67c3c65..87aa703 100644 --- a/Assets/ResWork/Table/Local/WavePattern.json +++ b/Assets/ResWork/Table/Local/WavePattern.json @@ -1 +1 @@ -[{"n_PatternID":"1001","n_AppearWave":"1","n_AppearMeleeMonster":"10","n_AppearRangeMonster":"0","f_AppearDelay":"0.5","n_OverlapUnitCount":"1","f_NextWaveDelay":"3.5"},{"n_PatternID":"1001","n_AppearWave":"2","n_AppearMeleeMonster":"27","n_AppearRangeMonster":"4","f_AppearDelay":"0.35","n_OverlapUnitCount":"1","f_NextWaveDelay":"2.5"},{"n_PatternID":"1001","n_AppearWave":"3","n_AppearMeleeMonster":"40","n_AppearRangeMonster":"10","f_AppearDelay":"0.2","n_OverlapUnitCount":"2","f_NextWaveDelay":"2.5"},{"n_PatternID":"1002","n_AppearWave":"1","n_AppearMeleeMonster":"10","n_AppearRangeMonster":"0","f_AppearDelay":"0.5","n_OverlapUnitCount":"2","f_NextWaveDelay":"3"},{"n_PatternID":"1002","n_AppearWave":"2","n_AppearMeleeMonster":"27","n_AppearRangeMonster":"4","f_AppearDelay":"0.35","n_OverlapUnitCount":"2","f_NextWaveDelay":"3"},{"n_PatternID":"1002","n_AppearWave":"3","n_AppearMeleeMonster":"40","n_AppearRangeMonster":"10","f_AppearDelay":"0.2","n_OverlapUnitCount":"3","f_NextWaveDelay":"3"},{"n_PatternID":"1003","n_AppearWave":"1","n_AppearMeleeMonster":"10","n_AppearRangeMonster":"0","f_AppearDelay":"0.5","n_OverlapUnitCount":"2","f_NextWaveDelay":"3"},{"n_PatternID":"1003","n_AppearWave":"2","n_AppearMeleeMonster":"27","n_AppearRangeMonster":"4","f_AppearDelay":"0.35","n_OverlapUnitCount":"2","f_NextWaveDelay":"3"},{"n_PatternID":"1003","n_AppearWave":"3","n_AppearMeleeMonster":"40","n_AppearRangeMonster":"10","f_AppearDelay":"0.2","n_OverlapUnitCount":"3","f_NextWaveDelay":"3"}] \ No newline at end of file +[{"n_PatternID":"1001","n_AppearWave":"1","n_AppearMeleeMonster":"14","n_AppearRangeMonster":"0","f_AppearDelay":"2","n_OverlapUnitCount":"1","f_NextWaveDelay":"3.5"},{"n_PatternID":"1001","n_AppearWave":"2","n_AppearMeleeMonster":"20","n_AppearRangeMonster":"5","f_AppearDelay":"2","n_OverlapUnitCount":"1","f_NextWaveDelay":"2.5"},{"n_PatternID":"1001","n_AppearWave":"3","n_AppearMeleeMonster":"30","n_AppearRangeMonster":"10","f_AppearDelay":"2","n_OverlapUnitCount":"2","f_NextWaveDelay":"2.5"},{"n_PatternID":"1002","n_AppearWave":"1","n_AppearMeleeMonster":"10","n_AppearRangeMonster":"0","f_AppearDelay":"0.5","n_OverlapUnitCount":"2","f_NextWaveDelay":"3"},{"n_PatternID":"1002","n_AppearWave":"2","n_AppearMeleeMonster":"27","n_AppearRangeMonster":"4","f_AppearDelay":"0.35","n_OverlapUnitCount":"2","f_NextWaveDelay":"3"},{"n_PatternID":"1002","n_AppearWave":"3","n_AppearMeleeMonster":"40","n_AppearRangeMonster":"10","f_AppearDelay":"0.2","n_OverlapUnitCount":"3","f_NextWaveDelay":"3"},{"n_PatternID":"1003","n_AppearWave":"1","n_AppearMeleeMonster":"10","n_AppearRangeMonster":"0","f_AppearDelay":"0.5","n_OverlapUnitCount":"2","f_NextWaveDelay":"3"},{"n_PatternID":"1003","n_AppearWave":"2","n_AppearMeleeMonster":"27","n_AppearRangeMonster":"4","f_AppearDelay":"0.35","n_OverlapUnitCount":"2","f_NextWaveDelay":"3"},{"n_PatternID":"1003","n_AppearWave":"3","n_AppearMeleeMonster":"40","n_AppearRangeMonster":"10","f_AppearDelay":"0.2","n_OverlapUnitCount":"3","f_NextWaveDelay":"3"}] \ No newline at end of file diff --git a/Assets/ResWork/Table/OneShotOneKill.xlsm b/Assets/ResWork/Table/OneShotOneKill.xlsm index dd8f00a..2ac0946 100644 Binary files a/Assets/ResWork/Table/OneShotOneKill.xlsm and b/Assets/ResWork/Table/OneShotOneKill.xlsm differ diff --git a/Assets/Script/InGame/Actor/MobActor.cs b/Assets/Script/InGame/Actor/MobActor.cs index a9f5eab..1ee4f22 100644 --- a/Assets/Script/InGame/Actor/MobActor.cs +++ b/Assets/Script/InGame/Actor/MobActor.cs @@ -167,6 +167,24 @@ public class MobActor : MonoBehaviour m_State = eMobState.Die; IngameMgr.Ins.Add_MobKill(m_Data.n_DropExp); gameObject.SetActive(false); + + var explosionlv = IngameMgr.Ins.Get_SkillLv(eSkillType.Explosion); + if (explosionlv > 0) + { + var tdata = table_skill.Ins.Get_Data(eSkillType.Explosion); + var unit = IngameMgr.Ins.Get_CurUnitTData(); + var dmg = unit.n_DefaultAttack + (int)IngameMgr.Ins.Get_SkillValue(eSkillType.AttackUp); + var totaldmg = dmg = (int)(dmg * tdata.f_ExplosionDmg); + totaldmg += (int)(dmg * (tdata.f_ExplosionDmgPerLv * (explosionlv - 1))); + + ProjectileMgr.Ins.Shoot_Projectile(new ProjectileData + { + IsPC = true, + Dmg = totaldmg, + m_Data = table_projectile.Ins.Get_Data(3002), + tf_Start = transform, + }); + } } else if (!bBoss) { diff --git a/Assets/Script/InGame/IngameMgr.cs b/Assets/Script/InGame/IngameMgr.cs index 9414c06..80e59ac 100644 --- a/Assets/Script/InGame/IngameMgr.cs +++ b/Assets/Script/InGame/IngameMgr.cs @@ -267,6 +267,7 @@ public class IngameMgr : MonoBehaviourSingletonTemplate public UnitTableData Get_CurUnitTData() { return CurUnitData; } #region 스킬 + public float Get_SkillLv(eSkillType skillType) { return dic_Skill.ContainsKey(skillType) ? dic_Skill[skillType] : 0; } public float Get_SkillValue(eSkillType skillType) { if (dic_Skill.ContainsKey(skillType)) diff --git a/Assets/Script/InGame/Projectile/Projectile.cs b/Assets/Script/InGame/Projectile/Projectile.cs index 28f9593..7076310 100644 --- a/Assets/Script/InGame/Projectile/Projectile.cs +++ b/Assets/Script/InGame/Projectile/Projectile.cs @@ -10,6 +10,7 @@ public class Projectile : MonoBehaviour Vector2 dir; Vector2 prevPos; ObscuredInt m_bounceCount; + float m_LifeTime; ProjectileData m_ProjectileData; @@ -36,6 +37,7 @@ public class Projectile : MonoBehaviour { m_ProjectileData = pd; + m_LifeTime = m_ProjectileData.m_Data.n_ProjectileLife; Vector3 pos = pd.tf_Start.position; Quaternion rot = pd.tf_Start.rotation; @@ -81,11 +83,32 @@ public class Projectile : MonoBehaviour if (pd.IsPC) m_bounceCount += (int)IngameMgr.Ins.Get_SkillValue(eSkillType.Reflect); + if (m_ProjectileData.m_Data.n_ProjectileID == 3002) + { + transform.eulerAngles = Vector3.zero; + var lv = IngameMgr.Ins.Get_SkillLv(eSkillType.Explosion); + var skillTdata = table_skill.Ins.Get_Data(eSkillType.Explosion); + var scale = skillTdata.f_ExplosionScale + (skillTdata.f_ExplosionScalePerLv * (lv - 1)); + transform.localScale = Vector3.one * scale; + m_bounceCount = 0; + } m_bounceCount.RandomizeCryptoKey(); } void Update() { + if (m_LifeTime > 0) + { + m_LifeTime -= Time.deltaTime; + if (m_LifeTime <= 0f) + { + Kill(); + return; + } + } + + if (m_ProjectileData.m_Data.n_ProjectileID == 3002) return; + prevPos = transform.position; float moveDist = m_Speed * Time.deltaTime; @@ -98,6 +121,8 @@ public class Projectile : MonoBehaviour Check_Hit(collision); + if (m_ProjectileData.m_Data.n_ProjectileID == 3002) return; + if (m_ProjectileData.Pierce > 0) { --m_ProjectileData.Pierce; @@ -170,7 +195,8 @@ public class Projectile : MonoBehaviour void Check_Hit(Collider2D collision) { - EffectMgr.Ins.Show_Effect("Effect/ArrowHit", transform.position); + if (!string.IsNullOrEmpty(m_ProjectileData.m_Data.s_HitEffect)) + EffectMgr.Ins.Show_Effect(m_ProjectileData.m_Data.s_HitEffect, transform.position); if (m_ProjectileData.IsPC) { diff --git a/Assets/Script/Table/Tables/table_projectile.cs b/Assets/Script/Table/Tables/table_projectile.cs index 54a4e22..da7ebb5 100644 --- a/Assets/Script/Table/Tables/table_projectile.cs +++ b/Assets/Script/Table/Tables/table_projectile.cs @@ -11,9 +11,6 @@ public class ProjectileTableData : TableDataBase ObscuredFloat _ProjectileSpeed; public float f_ProjectileSpeed { get { return _ProjectileSpeed; } set { _ProjectileSpeed = value; _ProjectileSpeed.RandomizeCryptoKey(); } } ObscuredInt _ProjectileLife; public int n_ProjectileLife { get { return _ProjectileLife; } set { _ProjectileLife = value; _ProjectileLife.RandomizeCryptoKey(); } } ObscuredFloat _KnockbackDistance; public float f_KnockbackDistance { get { return _KnockbackDistance; } set { _KnockbackDistance = value; _KnockbackDistance.RandomizeCryptoKey(); } } - ObscuredFloat _StunTime; public float f_StunTime { get { return _StunTime; } set { _StunTime = value; _StunTime.RandomizeCryptoKey(); } } - ObscuredFloat _ExplosionRange; public float f_ExplosionRange { get { return _ExplosionRange; } set { _ExplosionRange = value; _ExplosionRange.RandomizeCryptoKey(); } } - ObscuredFloat _ExplosionDamage; public float f_ExplosionDamage { get { return _ExplosionDamage; } set { _ExplosionDamage = value; _ExplosionDamage.RandomizeCryptoKey(); } } } public class table_projectile : table_base