송곳 바위

Assets/ResWork/Suriyun/Monster Pack Desert/Animations/Golem Child/Golem_Child_Animations_Check.controller

@@ -1,5 +1,32 @@
 %YAML 1.1
 %TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-4482103004631351622
+AnimatorState:
+  serializedVersion: 6
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: boss_skill2
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: -1955119643447719550, guid: 5f787332cb17e194a996c5270ea910e7,
+    type: 3}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 
 --- !u!1102 &-2760819304386891353
 AnimatorState:
   serializedVersion: 6
@@ -217,6 +244,9 @@ AnimatorStateMachine:
   - serializedVersion: 1
     m_State: {fileID: -2760819304386891353}
     m_Position: {x: 130, y: -90, z: 0}
+  - serializedVersion: 1
+    m_State: {fileID: -4482103004631351622}
+    m_Position: {x: 360, y: -80, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []

Assets/Res_Addr/Effect/Effect_GolemChildSkill2.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 4ec290eaa69e7bf4d9638e313dab3f6c
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res_Addr/Obj/Golem_Child_Skill2_Indicator.prefab

@@ -0,0 +1,117 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &821061129531636761
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2201136656505196193}
+  m_Layer: 3
+  m_Name: Golem_Child_Skill2_Indicator
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2201136656505196193
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 821061129531636761}
+  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: 6375824511339138443}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &5389208046211158943
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 6375824511339138443}
+  - component: {fileID: 292154521008100957}
+  - component: {fileID: 3775451288762826441}
+  m_Layer: 3
+  m_Name: Indicator
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6375824511339138443
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5389208046211158943}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 3, y: 3, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 2201136656505196193}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &292154521008100957
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5389208046211158943}
+  m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0}
+--- !u!23 &3775451288762826441
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5389208046211158943}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 3e1c80888ebc582469572ddac13cc967, type: 2}
+  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: 1
+  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_AdditionalVertexStreams: {fileID: 0}

Assets/Res_Addr/Obj/Golem_Child_Skill2_Indicator.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 8769569652447de42a204db14b292e9a
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Res_Addr/Projectile/FieldBoss/Golem_Child_Skill2.prefab

@@ -0,0 +1,147 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &4365863600087615352
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 2041519526365624679}
+  - component: {fileID: 3584743580748486036}
+  - component: {fileID: 5485071435884941762}
+  m_Layer: 0
+  m_Name: Golem_Child_Skill2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2041519526365624679
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4365863600087615352}
+  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: 1577851031520465871}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3584743580748486036
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4365863600087615352}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e5d2fd9d460da6a4d87b4be83a4cdc32, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  ColliderLayer: Actor
+  m_Pierce: 1
+  str_HitEffect: 
+  m_ShowTimeOverEffect: 1
+--- !u!65 &5485071435884941762
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4365863600087615352}
+  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: 3, y: 3, z: 3}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!1001 &5391783699963936329
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 2041519526365624679}
+    m_Modifications:
+    - target: {fileID: 3507146902299718551, guid: 5eb649ddc4489a449bc8dceb03e0b999,
+        type: 3}
+      propertyPath: m_Name
+      value: FX_Venom_Spray
+      objectReference: {fileID: 0}
+    - target: {fileID: 6860901507547901318, guid: 5eb649ddc4489a449bc8dceb03e0b999,
+        type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6860901507547901318, guid: 5eb649ddc4489a449bc8dceb03e0b999,
+        type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6860901507547901318, guid: 5eb649ddc4489a449bc8dceb03e0b999,
+        type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6860901507547901318, guid: 5eb649ddc4489a449bc8dceb03e0b999,
+        type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 6860901507547901318, guid: 5eb649ddc4489a449bc8dceb03e0b999,
+        type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.7071068
+      objectReference: {fileID: 0}
+    - target: {fileID: 6860901507547901318, guid: 5eb649ddc4489a449bc8dceb03e0b999,
+        type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6860901507547901318, guid: 5eb649ddc4489a449bc8dceb03e0b999,
+        type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6860901507547901318, guid: 5eb649ddc4489a449bc8dceb03e0b999,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6860901507547901318, guid: 5eb649ddc4489a449bc8dceb03e0b999,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6860901507547901318, guid: 5eb649ddc4489a449bc8dceb03e0b999,
+        type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 5eb649ddc4489a449bc8dceb03e0b999, type: 3}
+--- !u!4 &1577851031520465871 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 6860901507547901318, guid: 5eb649ddc4489a449bc8dceb03e0b999,
+    type: 3}
+  m_PrefabInstance: {fileID: 5391783699963936329}
+  m_PrefabAsset: {fileID: 0}

Assets/Res_Addr/Projectile/FieldBoss/Golem_Child_Skill2.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 853ede9a882b6124193e1cfdb698f610
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/Script/Character/Mob/Boss/Boss_GolemChild.cs

@@ -18,24 +18,27 @@ public class Boss_GolemChild : BossMobActor
     public float Skill2CoolTime = 8f;
     [Header("스킬2 차징시간")]
     public float Skill2ChargingTime = 1f;
-    [Header("스킬2 지속시간")]
-    public float Skill2LifeTime = 15f;
     [Header("스킬2 데미지")]
     public float Skill2Dmg = 3f;
+    [Header("스킬2 인디케이터")]
+    public string Skill12ndicator = "Golem_Child_Skill2_Indicator";
 
     Projectile_Curved pc_Lock;
-    ProjectileBase pb_LockExp;
+    ProjectileBase pb_LockExp, pb_Skill2;
 
     public override void Set(bool isEnemy, Actor owner, ServerData sdata, int _id, bool _stop, bool _ui = false)
     {
         base.Set(isEnemy, owner, sdata, _id, _stop, _ui);
 
         if (DSUtil.CheckNull(go_indicator1)) IndicatorInfo.Ins.Make_Indicator(Skill1Indicator, go => { go_indicator1 = go; });
+        if (DSUtil.CheckNull(go_indicator2)) IndicatorInfo.Ins.Make_Indicator(Skill12ndicator, go => { go_indicator2 = go; });
 
         ProjectileInfo.Ins.Shoot_Projectile("FieldBoss/Golem_Child_Lock", this, m_Target, Skill1Dmg, tf_Skill1Pos.position, 10f,
             pb => { pc_Lock = pb as Projectile_Curved; pc_Lock.gameObject.SetActive(false); });
-        ProjectileInfo.Ins.Shoot_Projectile("FieldBoss/Golem_Child_LockExp", this, m_Target, Skill1AreaDmg, tf_Skill1Pos.position, 10f,
+        ProjectileInfo.Ins.Shoot_Projectile("FieldBoss/Golem_Child_LockExp", this, m_Target, Skill1AreaDmg, Vector3.zero, 10f,
             pb => { pb_LockExp = pb; pb_LockExp.gameObject.SetActive(false); });
+        ProjectileInfo.Ins.Shoot_Projectile("FieldBoss/Golem_Child_Skill2", this, m_Target, Skill2Dmg, Vector3.zero, 10f,
+            pb => { pb_Skill2 = pb; pb_Skill2.gameObject.SetActive(false); });
 
         CoolTime_Skill1 = 1f;
         CoolTime_Skill2 = 2f;
@@ -55,8 +58,8 @@ public class Boss_GolemChild : BossMobActor
 
         if (UseSkillIndex == 1 && MobStatus != eMobStatus.Skill)
             StartCoroutine(Co_Skill1());
-        //else if (UseSkillIndex == 2 && MobStatus != eMobStatus.Skill)
+        else if (UseSkillIndex == 2 && MobStatus != eMobStatus.Skill)
-        //    StartCoroutine(Co_Skill2());
+            StartCoroutine(Co_Skill2());
     }
 
     IEnumerator Co_Skill1()
@@ -90,8 +93,24 @@ public class Boss_GolemChild : BossMobActor
     {
         Change_MobStatus(eMobStatus.Skill);
         AnimationPlay("boss_skill2");
-        InGameInfo.Ins.Show_Effect("Effect_MinotosSkill2", this, eEffectLocation.Bottom, Skill2LifeTime);
+        InGameInfo.Ins.Show_Effect("Effect_GolemChildSkill2", this, eEffectLocation.Bottom, Skill2ChargingTime);
-        yield return new WaitForSeconds(0.5f);
+
+        go_indicator2.SetActive(true);
+
+        // 투척 지점(타겟 위치)에 인디케이터 생성, 타겟이 없으면 앞으로 5m
+        var targetPos = isTarget ? m_Target.Get_position() : Get_PositionFoward(5f);
+        go_indicator2.transform.position = targetPos;
+
+        yield return new WaitForSeconds(Skill2ChargingTime);
+        go_indicator2.SetActive(false);
+
+        var pd = pb_Skill2.Get_ProjectTileData();
+        pd.LifeTime = 1f;
+        pb_Skill2.Set(pd);
+        pb_Skill2.transform.position = targetPos;
+
+        yield return null;
+
         Check_Battle();
         Init(false, true);
     }