샤가

2025-06-17 16:37:27 +09:00 · 2025-06-17 16:37:27 +09:00 · f43b1ad55c
parent 41f8a3b499
commit f43b1ad55c
3 changed files with 98 additions and 92 deletions
--- a/Assets/Res_Addr/Obj/BossShaga_Skill1_Indicator.prefab
+++ b/Assets/Res_Addr/Obj/BossShaga_Skill1_Indicator.prefab
@ -29,89 +29,97 @@ Transform:
  m_LocalScale: {x: 1, y: 1, z: 1}
  m_ConstrainProportionsScale: 0
  m_Children:
-  - {fileID: 6375824511339138443}
+  - {fileID: 2364588056986540960}
  m_Father: {fileID: 0}
  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5389208046211158943
-GameObject:
+--- !u!1001 &2368673153413846106
+PrefabInstance:
  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_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 2201136656505196193}
+    m_Modifications:
+    - target: {fileID: 1173698457435006, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3}
+      propertyPath: m_Name
+      value: Marker 7 Danger zone
+      objectReference: {fileID: 0}
+    - target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.95
+      objectReference: {fileID: 0}
+    - target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.95
+      objectReference: {fileID: 0}
+    - target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 198706515776294966, guid: a93b07a8595bb0145bc3af1e9911c409,
+        type: 3}
+      propertyPath: lengthInSec
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 198706515776294966, guid: a93b07a8595bb0145bc3af1e9911c409,
+        type: 3}
+      propertyPath: InitialModule.startLifetime.scalar
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 198980401682514854, guid: a93b07a8595bb0145bc3af1e9911c409,
+        type: 3}
+      propertyPath: lengthInSec
+      value: 0.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 198980401682514854, guid: a93b07a8595bb0145bc3af1e9911c409,
+        type: 3}
+      propertyPath: InitialModule.startLifetime.scalar
+      value: 0.5
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3}
+--- !u!4 &2364588056986540960 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409,
+    type: 3}
+  m_PrefabInstance: {fileID: 2368673153413846106}
  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}
--- a/Assets/Res_Addr/Projectile/FieldBoss/Shaga_Skill1Ground.prefab
+++ b/Assets/Res_Addr/Projectile/FieldBoss/Shaga_Skill1Ground.prefab
@ -10,7 +10,7 @@ GameObject:
  m_Component:
  - component: {fileID: 5049026989288917698}
  - component: {fileID: -4152456888977005349}
-  - component: {fileID: 7742248077501836424}
+  - component: {fileID: 2008933125134846675}
  m_Layer: 0
  m_Name: Shaga_Skill1Ground
  m_TagString: Untagged
@ -50,8 +50,9 @@ MonoBehaviour:
  m_Pierce: 1
  str_HitEffect: 
  m_ShowTimeOverEffect: 1
--- !u!65 &7742248077501836424
-BoxCollider:
+  ShowTarget: 0
+--- !u!135 &2008933125134846675
+SphereCollider:
  m_ObjectHideFlags: 0
  m_CorrespondingSourceObject: {fileID: 0}
  m_PrefabInstance: {fileID: 0}
@ -69,7 +70,7 @@ BoxCollider:
  m_ProvidesContacts: 0
  m_Enabled: 1
  serializedVersion: 3
-  m_Size: {x: 3, y: 3, z: 3}
+  m_Radius: 2.3
  m_Center: {x: 0, y: 0, z: 0}
 --- !u!1001 &910241315895238427
 PrefabInstance:
@ -82,17 +83,17 @@ PrefabInstance:
    - target: {fileID: 1479561207183142876, guid: 90ab78afc862c6a4b8c334c9deff7efb,
        type: 3}
      propertyPath: m_LocalScale.x
-      value: 0.2
+      value: 0.3
      objectReference: {fileID: 0}
    - target: {fileID: 1479561207183142876, guid: 90ab78afc862c6a4b8c334c9deff7efb,
        type: 3}
      propertyPath: m_LocalScale.y
-      value: 0.2
+      value: 0.3
      objectReference: {fileID: 0}
    - target: {fileID: 1479561207183142876, guid: 90ab78afc862c6a4b8c334c9deff7efb,
        type: 3}
      propertyPath: m_LocalScale.z
-      value: 0.2
+      value: 0.3
      objectReference: {fileID: 0}
    - target: {fileID: 1479561207183142876, guid: 90ab78afc862c6a4b8c334c9deff7efb,
        type: 3}
--- a/Assets/Script/Character/Mob/Boss/Boss_BrotherPenguin.cs
+++ b/Assets/Script/Character/Mob/Boss/Boss_BrotherPenguin.cs
@ -52,9 +52,6 @@ public class Boss_BrotherPenguin : BossMobActor

        CoolTime_Skill1 = 1f;
        CoolTime_Skill2 = 2f;
-
-        CoolTime_Skill1 = 10000f;
-        //CoolTime_Skill2 = 20000f;
    }

    protected override void Init(bool initSkill1CoolTime, bool initSkill2CoolTime)
@ -131,7 +128,7 @@ public class Boss_BrotherPenguin : BossMobActor
        yield return new WaitForSeconds(battletime);
        Check_Battle();

-        CoolTime_Skill2 = 10000f; // 배리어 끝나기 전 까진 쿨타임 안 돌다는 뜻
+        CoolTime_Skill2 = 10000f; // 배리어 끝나기 전 까진 쿨타임 안 돈다는 뜻
        yield return new WaitForSeconds(Skill2LifeTime - battletime);
        Init(false, true);
    }