diff --git a/Assets/ResWork/Table/Export/Skill.json b/Assets/ResWork/Table/Export/Skill.json index 3b1a30b..602dfe1 100644 --- a/Assets/ResWork/Table/Export/Skill.json +++ b/Assets/ResWork/Table/Export/Skill.json @@ -1 +1 @@ -[{"e_SkillType":"HpUp ","n_ImageIndex":"0","s_Name":"생명력 증가+1","s_Desc":"적에게 버틸 수 있는 성벽의 생명력이 증가합니다.","s_Value":"100"},{"e_SkillType":"AttackUp ","n_ImageIndex":"1","s_Name":"공격력 증가+1","s_Desc":"공격력이 +1 증가합니다.","s_Value":"1"},{"e_SkillType":"PreviousArrow ","n_ImageIndex":"2","s_Name":"직전 화살+1","s_Desc":"투사체 타격 횟수가 +1 증가합니다.","s_Value":"1"},{"e_SkillType":"DiagonalArrow ","n_ImageIndex":"3","s_Name":"사선 화살+1","s_Desc":"발사 된 투사체 방향으로 사선 방향의 투사체 1개가 추가됩니다.","s_Value":"1"},{"e_SkillType":"ProjectilePierce","n_ImageIndex":"4","s_Name":"투사체 관통+1","s_Desc":"투사체가 적을 관통하는 횟수가 증가합니다.","s_Value":"1"},{"e_SkillType":"Reflect ","n_ImageIndex":"5","s_Name":"반사+1","s_Desc":"투사체 반사 횟수가 +1 증가합니다.","s_Value":"1"},{"e_SkillType":"Knockback ","n_ImageIndex":"6","s_Name":"넉백+1","s_Desc":"타격 된 적을 일정 거리 만큼 밀쳐냅니다.","s_Value":"0.5"},{"e_SkillType":"DoubleShot ","n_ImageIndex":"7","s_Name":"더블샷+1","s_Desc":"같은 방향으로 발사되는 투사체의 수량이 증가합니다. (※연속 발사)","s_Value":"1"},{"e_SkillType":"Explosion ","n_ImageIndex":"8","s_Name":"폭파+1","s_Desc":"피격 된 대상을 처치하면 일정 범위에 피해를 입힙니다. (중첩 시 피해량과 범위가 증가)","s_Value":"1"},{"e_SkillType":"Stun ","n_ImageIndex":"9","s_Name":"기절+1","s_Desc":"피해를 입힌 적을 일정 시간(=0.5초) 기절 시킵니다. (※보스 몬스터에게는 적용 안됨)","s_Value":"0.5s"},{"e_SkillType":"Bounce ","n_ImageIndex":"10","s_Name":"튕김+1","s_Desc":"피격 된 대상이 있을 경우, 일정 범위 내 적에게 투사체 1개가 추가로 발사됩니다.","s_Value":"1"},{"e_SkillType":"ArrowUpDown ","n_ImageIndex":"11","s_Name":"상/하 화살","s_Desc":"투사체에 적이 명중할 경우 상/하 방향으로 투사체가 1개씩 발사됩니다.","s_Value":"1"},{"e_SkillType":"ArrowLeftRight ","n_ImageIndex":"12","s_Name":"좌/우 화살","s_Desc":"투사체에 적이 명중할 경우 좌/우 방향으로 투사체가 1개씩 발사됩니다.","s_Value":"1"},{"e_SkillType":"ImpactArrow ","n_ImageIndex":"13","s_Name":"충격 화살+1","s_Desc":"투사체가 적의 방어막에 막혀도 +1의 피해를 고정으로 입힙니다.","s_Value":"1"},{"e_SkillType":"AttackSpeedUp ","n_ImageIndex":"14","s_Name":"공격 속도+1","s_Desc":"공격 속도가 0.1초 감소합니다.","s_Value":"0.1s"}] \ No newline at end of file +[{"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/OneShotOneKill.xlsm b/Assets/ResWork/Table/OneShotOneKill.xlsm index 6514b4b..dd8f00a 100644 Binary files a/Assets/ResWork/Table/OneShotOneKill.xlsm and b/Assets/ResWork/Table/OneShotOneKill.xlsm differ diff --git a/Assets/Resources/Effect/Explosion.prefab b/Assets/Resources/Projectile/Explosion.prefab similarity index 99% rename from Assets/Resources/Effect/Explosion.prefab rename to Assets/Resources/Projectile/Explosion.prefab index e79547f..5bd1e8f 100644 --- a/Assets/Resources/Effect/Explosion.prefab +++ b/Assets/Resources/Projectile/Explosion.prefab @@ -9671,8 +9671,10 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 1835174905073365005} - - component: {fileID: 1835174905073365011} + - component: {fileID: 4312842208028919753} - component: {fileID: 1835174905073365004} + - component: {fileID: 1835174905073365011} + - component: {fileID: 1873350950464425252} m_Layer: 0 m_Name: Explosion m_TagString: Untagged @@ -9701,6 +9703,97 @@ Transform: - {fileID: 8397910373599020374} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &4312842208028919753 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1835174905073365006} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: ccfe1723f3c6dc74787642c082b79437, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Speed: 12 + radius: 0.1 +--- !u!199 &1835174905073365004 +ParticleSystemRenderer: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1835174905073365006} + m_Enabled: 0 + m_CastShadows: 0 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 0 + m_ReflectionProbeUsage: 0 + m_RayTracingMode: 0 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 0 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_RenderMode: 0 + m_MeshDistribution: 0 + m_SortMode: 0 + m_MinParticleSize: 0 + m_MaxParticleSize: 1000 + m_CameraVelocityScale: 0 + m_VelocityScale: 0 + m_LengthScale: 3 + m_SortingFudge: 0 + m_NormalDirection: 1 + m_ShadowBias: 0 + m_RenderAlignment: 2 + m_Pivot: {x: 0, y: 0, z: 0} + m_Flip: {x: 0, y: 0, z: 0} + m_EnableGPUInstancing: 0 + m_ApplyActiveColorSpace: 1 + m_AllowRoll: 1 + m_FreeformStretching: 0 + m_RotateWithStretchDirection: 1 + m_UseCustomVertexStreams: 0 + m_VertexStreams: 0001030405 + m_UseCustomTrailVertexStreams: 0 + m_TrailVertexStreams: 00010304 + m_Mesh: {fileID: 4300000, guid: a98fc6255fba6aa4f9629b8b2fe76a25, type: 3} + m_Mesh1: {fileID: 0} + m_Mesh2: {fileID: 0} + m_Mesh3: {fileID: 0} + m_MeshWeighting: 1 + m_MeshWeighting1: 1 + m_MeshWeighting2: 1 + m_MeshWeighting3: 1 + m_MaskInteraction: 0 --- !u!198 &1835174905073365011 ParticleSystem: m_ObjectHideFlags: 0 @@ -14422,83 +14515,42 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ---- !u!199 &1835174905073365004 -ParticleSystemRenderer: - serializedVersion: 6 +--- !u!58 &1873350950464425252 +CircleCollider2D: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1835174905073365006} - m_Enabled: 0 - m_CastShadows: 0 - m_ReceiveShadows: 1 - m_DynamicOccludee: 1 - m_StaticShadowCaster: 0 - m_MotionVectors: 1 - m_LightProbeUsage: 0 - m_ReflectionProbeUsage: 0 - m_RayTracingMode: 0 - m_RayTraceProcedural: 0 - m_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 0} - m_StaticBatchInfo: - firstSubMesh: 0 - subMeshCount: 0 - m_StaticBatchRoot: {fileID: 0} - m_ProbeAnchor: {fileID: 0} - m_LightProbeVolumeOverride: {fileID: 0} - m_ScaleInLightmap: 1 - m_ReceiveGI: 1 - m_PreserveUVs: 0 - m_IgnoreNormalsForChartDetection: 0 - m_ImportantGI: 0 - m_StitchLightmapSeams: 0 - m_SelectedEditorRenderState: 3 - m_MinimumChartSize: 4 - m_AutoUVMaxDistance: 0.5 - m_AutoUVMaxAngle: 89 - m_LightmapParameters: {fileID: 0} - m_SortingLayerID: 0 - m_SortingLayer: 0 - m_SortingOrder: 0 - m_RenderMode: 0 - m_MeshDistribution: 0 - m_SortMode: 0 - m_MinParticleSize: 0 - m_MaxParticleSize: 1000 - m_CameraVelocityScale: 0 - m_VelocityScale: 0 - m_LengthScale: 3 - m_SortingFudge: 0 - m_NormalDirection: 1 - m_ShadowBias: 0 - m_RenderAlignment: 2 - m_Pivot: {x: 0, y: 0, z: 0} - m_Flip: {x: 0, y: 0, z: 0} - m_EnableGPUInstancing: 0 - m_ApplyActiveColorSpace: 1 - m_AllowRoll: 1 - m_FreeformStretching: 0 - m_RotateWithStretchDirection: 1 - m_UseCustomVertexStreams: 0 - m_VertexStreams: 0001030405 - m_UseCustomTrailVertexStreams: 0 - m_TrailVertexStreams: 00010304 - m_Mesh: {fileID: 4300000, guid: a98fc6255fba6aa4f9629b8b2fe76a25, type: 3} - m_Mesh1: {fileID: 0} - m_Mesh2: {fileID: 0} - m_Mesh3: {fileID: 0} - m_MeshWeighting: 1 - m_MeshWeighting1: 1 - m_MeshWeighting2: 1 - m_MeshWeighting3: 1 - m_MaskInteraction: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Density: 1 + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_ForceSendLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ForceReceiveLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_ContactCaptureLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_CallbackLayers: + serializedVersion: 2 + m_Bits: 4294967295 + m_IsTrigger: 1 + m_UsedByEffector: 0 + m_CompositeOperation: 0 + m_CompositeOrder: 0 + m_Offset: {x: 0, y: 0} + m_Radius: 1 --- !u!1 &1835174905422497835 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Resources/Effect/Explosion.prefab.meta b/Assets/Resources/Projectile/Explosion.prefab.meta similarity index 100% rename from Assets/Resources/Effect/Explosion.prefab.meta rename to Assets/Resources/Projectile/Explosion.prefab.meta diff --git a/Assets/Script/Table/Tables/table_skill.cs b/Assets/Script/Table/Tables/table_skill.cs index 7bdb8d7..5400760 100644 --- a/Assets/Script/Table/Tables/table_skill.cs +++ b/Assets/Script/Table/Tables/table_skill.cs @@ -27,9 +27,10 @@ public enum eSkillType public class SkillTableData : TableDataBase { public eSkillType e_SkillType; - public string s_Name, s_Desc, s_Value; + public string s_Name, s_Desc, s_Value, s_ExplosionData; public int n_ImageIndex; ObscuredFloat _Value; public float f_Value { get { return _Value; } set { _Value = value; _Value.RandomizeCryptoKey(); } } + public float f_ExplosionScale, f_ExplosionScalePerLv, f_ExplosionDmg, f_ExplosionDmgPerLv; } public class table_skill : table_base @@ -51,6 +52,14 @@ public class table_skill : table_base { var temp = tableDatas[i]; temp.f_Value = Get_Value(temp.s_Value); + if (temp.s_ExplosionData.Contains('^')) + { + var split = temp.s_ExplosionData.Split('^'); + temp.f_ExplosionScale = Get_Value(split[0]); + temp.f_ExplosionScalePerLv = Get_Value(split[1]); + temp.f_ExplosionDmg = Get_Value(split[2]); + temp.f_ExplosionDmgPerLv = Get_Value(split[3]); + } } base.Start(); }