diff --git a/Assets/Ino_nerdnavis.txt b/Assets/Ino_nerdnavis.txt index 31d67c4e6..4d552a729 100644 --- a/Assets/Ino_nerdnavis.txt +++ b/Assets/Ino_nerdnavis.txt @@ -37,7 +37,12 @@ classconfig 에 의해 정해짐 몬스터 골드, 아이템 드랍 인게임 - 터레인 제외, 메시 베이커로 통째로 묶기 or 퍼펙트 컬링 +컬링 전 : Rotate Around 8.649351 배치 10017, 폴리곤 730만개 +컬링 후 : Rotate Around 8.649351 배치 9009, 폴리곤 700만개 +메시 베이커 : //로비 - 퍼펙트 컬링 다른 직업 스킬 구현 + - 제멋대로 화살 + - 그라운드 레이 diff --git a/Assets/ResWork/VFX/Hovl Studio/HSFiles/Materials/MagicCircle31bcg.mat b/Assets/ResWork/VFX/Hovl Studio/HSFiles/Materials/MagicCircle31bcg.mat index ba49bcd57..6e687a3a3 100644 --- a/Assets/ResWork/VFX/Hovl Studio/HSFiles/Materials/MagicCircle31bcg.mat +++ b/Assets/ResWork/VFX/Hovl Studio/HSFiles/Materials/MagicCircle31bcg.mat @@ -37,15 +37,16 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: MagicCircle31bcg - m_Shader: {fileID: -6465566751694194690, guid: 00191177e5fd5c4468ad546ce87ef329, type: 3} + m_Shader: {fileID: -6465566751694194690, guid: 00191177e5fd5c4468ad546ce87ef329, + type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 m_ValidKeywords: - _BUILTIN_SURFACE_TYPE_TRANSPARENT - - _ENABLE_FOG_ON_TRANSPARENT - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: - _DOUBLESIDED_ON + - _ENABLE_FOG_ON_TRANSPARENT m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 1 @@ -58,6 +59,8 @@ Material: - TransparentDepthPostpass - TransparentBackface - MOTIONVECTORS + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -179,12 +182,12 @@ Material: - _Opacity: 1 - _OpaqueCullMode: 2 - _Parallax: 0.02 - - _QueueControl: -1 + - _QueueControl: 0 - _QueueOffset: 0 - _RenderQueueType: 3 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - - _SrcBlend: 1 + - _SrcBlend: 5 - _StencilRef: 0 - _StencilRefDepth: 1 - _StencilRefDistortionVec: 4 diff --git a/Assets/Res_Addr/Skill/Skill_GroundRay.prefab b/Assets/Res_Addr/Skill/Skill_GroundRay.prefab new file mode 100644 index 000000000..defe5f763 --- /dev/null +++ b/Assets/Res_Addr/Skill/Skill_GroundRay.prefab @@ -0,0 +1,162 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &3715229711477702220 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3912303207099117174} + - component: {fileID: 3360091997957447737} + - component: {fileID: 7370159964123048736} + - component: {fileID: 7086006734455327439} + m_Layer: 0 + m_Name: Skill_GroundRay + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3912303207099117174 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3715229711477702220} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 2923491942605198045} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!114 &3360091997957447737 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3715229711477702220} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 7ef1902f00f49e0408935a8971075c9a, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &7370159964123048736 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3715229711477702220} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: c85446e2e4058a141922972c3cd2888c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Pierce: 0 + str_HitEffect: + m_Collider: {fileID: 7086006734455327439} + Loop: 10 + DelayTime: 0.1 + ColliderActiveFrame: 1 +--- !u!65 &7086006734455327439 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3715229711477702220} + m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 + m_IsTrigger: 1 + m_ProvidesContacts: 0 + m_Enabled: 1 + serializedVersion: 3 + m_Size: {x: 1.5, y: 1, z: 1.5} + m_Center: {x: 0, y: 0, z: 0} +--- !u!1001 &3074794295658491545 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 3912303207099117174} + m_Modifications: + - target: {fileID: 160310376962735172, guid: a5e65683df96fed4da1766232f0753ec, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 160310376962735172, guid: a5e65683df96fed4da1766232f0753ec, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 160310376962735172, guid: a5e65683df96fed4da1766232f0753ec, + type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 160310376962735172, guid: a5e65683df96fed4da1766232f0753ec, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 160310376962735172, guid: a5e65683df96fed4da1766232f0753ec, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 160310376962735172, guid: a5e65683df96fed4da1766232f0753ec, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 160310376962735172, guid: a5e65683df96fed4da1766232f0753ec, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 160310376962735172, guid: a5e65683df96fed4da1766232f0753ec, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 160310376962735172, guid: a5e65683df96fed4da1766232f0753ec, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 160310376962735172, guid: a5e65683df96fed4da1766232f0753ec, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 160310376962735225, guid: a5e65683df96fed4da1766232f0753ec, + type: 3} + propertyPath: m_Name + value: HCFX_Beam_01 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: a5e65683df96fed4da1766232f0753ec, type: 3} +--- !u!4 &2923491942605198045 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 160310376962735172, guid: a5e65683df96fed4da1766232f0753ec, + type: 3} + m_PrefabInstance: {fileID: 3074794295658491545} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Res_Addr/Skill/Skill_GroundRay.prefab.meta b/Assets/Res_Addr/Skill/Skill_GroundRay.prefab.meta new file mode 100644 index 000000000..b7eab5e9b --- /dev/null +++ b/Assets/Res_Addr/Skill/Skill_GroundRay.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ddc7da32a5e7c024ea1e9dacb7009b39 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Script/Character/Projectile/Projectile/ProjectileHitChecker.cs b/Assets/Script/Character/Projectile/Projectile/ProjectileHitChecker.cs index ffc27c25c..200515741 100644 --- a/Assets/Script/Character/Projectile/Projectile/ProjectileHitChecker.cs +++ b/Assets/Script/Character/Projectile/Projectile/ProjectileHitChecker.cs @@ -28,6 +28,10 @@ public class ProjectileHitChecker : MonoBehaviour void OnTriggerEnter(Collider other) { ProcessCollider(other); } void OnCollisionEnter(Collision collision) { ProcessCollider(collision.collider); } + private void OnParticleCollision(GameObject other) + { + ProcessCollider(other.GetComponent()); + } private void ProcessCollider(Collider other) { if (m_ProjectileBase.ProcessCollider(other, !Off_OnlyThisObj_byHit) && Off_OnlyThisObj_byHit) diff --git a/Assets/Script/Character/Projectile/Skill/Skill_GroundRay.cs b/Assets/Script/Character/Projectile/Skill/Skill_GroundRay.cs new file mode 100644 index 000000000..db38f19d8 --- /dev/null +++ b/Assets/Script/Character/Projectile/Skill/Skill_GroundRay.cs @@ -0,0 +1,19 @@ +using System.Collections; +using System.Collections.Generic; +using UnityEngine; + +public class Skill_GroundRay : ProjectileBase +{ + public override void Set(ProjectileData _data) + { + _data.eStartPos = eProjectileStartPos.Custom; + _data.v3_StartPos = _data.target.Get_position(); + base.Set(_data); + } + + private void Update() + { + if (!DSUtil.CheckNull(m_ProjectTileData.target)) + transform.position = m_ProjectTileData.target.Get_position(); + } +} \ No newline at end of file diff --git a/Assets/Script/Character/Projectile/Skill/Skill_GroundRay.cs.meta b/Assets/Script/Character/Projectile/Skill/Skill_GroundRay.cs.meta new file mode 100644 index 000000000..178ce1332 --- /dev/null +++ b/Assets/Script/Character/Projectile/Skill/Skill_GroundRay.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 7ef1902f00f49e0408935a8971075c9a +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: