보스 아이스 골렘 스킬1, 평타 수정
This commit is contained in:
parent
414ae9cd74
commit
98694ca8cc
File diff suppressed because it is too large
Load Diff
|
|
@ -29,89 +29,77 @@ Transform:
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_ConstrainProportionsScale: 0
|
m_ConstrainProportionsScale: 0
|
||||||
m_Children:
|
m_Children:
|
||||||
- {fileID: 6375824511339138443}
|
- {fileID: 1928388234376554137}
|
||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &5389208046211158943
|
--- !u!1001 &1931060179145746787
|
||||||
GameObject:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
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
|
serializedVersion: 2
|
||||||
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
|
m_Modification:
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
serializedVersion: 3
|
||||||
m_LocalScale: {x: 8, y: 8, z: 1}
|
m_TransformParent: {fileID: 2201136656505196193}
|
||||||
m_ConstrainProportionsScale: 0
|
m_Modifications:
|
||||||
m_Children: []
|
- target: {fileID: 1173698457435006, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3}
|
||||||
m_Father: {fileID: 2201136656505196193}
|
propertyPath: m_Name
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
value: Marker 7 Danger zone
|
||||||
--- !u!33 &292154521008100957
|
objectReference: {fileID: 0}
|
||||||
MeshFilter:
|
- target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3}
|
||||||
m_ObjectHideFlags: 0
|
propertyPath: m_LocalScale.x
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
value: 1.7
|
||||||
m_PrefabInstance: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3}
|
||||||
|
propertyPath: m_LocalScale.z
|
||||||
|
value: 1.7
|
||||||
|
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}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_RemovedGameObjects: []
|
||||||
|
m_AddedGameObjects: []
|
||||||
|
m_AddedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3}
|
||||||
|
--- !u!4 &1928388234376554137 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 1931060179145746787}
|
||||||
m_PrefabAsset: {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}
|
|
||||||
|
|
|
||||||
|
|
@ -70,7 +70,7 @@ BoxCollider:
|
||||||
m_ProvidesContacts: 0
|
m_ProvidesContacts: 0
|
||||||
m_Enabled: 1
|
m_Enabled: 1
|
||||||
serializedVersion: 3
|
serializedVersion: 3
|
||||||
m_Size: {x: 7, y: 3, z: 7}
|
m_Size: {x: 9, y: 3, z: 9}
|
||||||
m_Center: {x: 0, y: 0, z: 0}
|
m_Center: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1001 &794108753345832315
|
--- !u!1001 &794108753345832315
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
|
|
|
||||||
|
|
@ -1697,7 +1697,7 @@ public class Actor : MyCoroutine
|
||||||
Coroutine m_CoStun;
|
Coroutine m_CoStun;
|
||||||
public void Stun(double time, bool showEffect = false)
|
public void Stun(double time, bool showEffect = false)
|
||||||
{
|
{
|
||||||
if (m_Stat.Get_Stat(eStat.CC_Immunity) > 0) return;
|
if (IsDead() || m_Stat.Get_Stat(eStat.CC_Immunity) > 0) return;
|
||||||
if (!DSUtil.CheckNull(m_CoStun)) { StopCoroutine(m_CoStun); m_CoStun = null; }
|
if (!DSUtil.CheckNull(m_CoStun)) { StopCoroutine(m_CoStun); m_CoStun = null; }
|
||||||
m_CoStun = StartCoroutine(Co_Stun(time, showEffect));
|
m_CoStun = StartCoroutine(Co_Stun(time, showEffect));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -49,6 +49,18 @@ public class BossMobActor : MobActor
|
||||||
{
|
{
|
||||||
Change_MobStatus(isTarget ? eMobStatus.Attack : eMobStatus.PatrolWait);
|
Change_MobStatus(isTarget ? eMobStatus.Attack : eMobStatus.PatrolWait);
|
||||||
UseSkillIndex = 0;
|
UseSkillIndex = 0;
|
||||||
|
|
||||||
|
// 다음 스킬 바로 못 쓰게
|
||||||
|
if (initSkill1CoolTime && CanUseSkill2)
|
||||||
|
{
|
||||||
|
CanUseSkill2 = false;
|
||||||
|
CoolTime_Skill2 = 0.5f;
|
||||||
|
}
|
||||||
|
else if (initSkill2CoolTime && CanUseSkill1)
|
||||||
|
{
|
||||||
|
CanUseSkill1 = false;
|
||||||
|
CoolTime_Skill1 = 0.5f;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
void InActiveAllIndicator()
|
void InActiveAllIndicator()
|
||||||
{
|
{
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue