This commit is contained in:
Ino 2025-05-22 14:44:55 +09:00
parent 9e7e95f2ca
commit 414ae9cd74
8 changed files with 108 additions and 88 deletions

View File

@ -2085,7 +2085,7 @@ Transform:
m_GameObject: {fileID: 2942893997039299710}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0.75}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []

View File

@ -29,89 +29,81 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 6375824511339138443}
- {fileID: 8394758448045062328}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5389208046211158943
GameObject:
--- !u!1001 &8399125023671170882
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: 7, y: 7, 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: 1.5
objectReference: {fileID: 0}
- target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409, type: 3}
propertyPath: m_LocalScale.z
value: 1.5
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 &8394758448045062328 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4367129774968826, guid: a93b07a8595bb0145bc3af1e9911c409,
type: 3}
m_PrefabInstance: {fileID: 8399125023671170882}
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}

View File

@ -102,6 +102,21 @@ PrefabInstance:
propertyPath: m_Name
value: FX_splash_thorn_02_floor
objectReference: {fileID: 0}
- target: {fileID: 1769051784159778426, guid: 98562a1415248b94a93ec861efc50ee8,
type: 3}
propertyPath: m_LocalScale.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1769051784159778426, guid: 98562a1415248b94a93ec861efc50ee8,
type: 3}
propertyPath: m_LocalScale.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1769051784159778426, guid: 98562a1415248b94a93ec861efc50ee8,
type: 3}
propertyPath: m_LocalScale.z
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1769051784159778426, guid: 98562a1415248b94a93ec861efc50ee8,
type: 3}
propertyPath: m_LocalPosition.x

View File

@ -32,7 +32,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 18
value: 9
inSlope: 0
outSlope: 0
tangentMode: 136
@ -92,7 +92,7 @@ AnimationClip:
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 18
value: 9
inSlope: 0
outSlope: 0
tangentMode: 136

View File

@ -83,6 +83,7 @@ public class Actor : MyCoroutine
}
protected int n_SummonCount;
protected float NoDmgTime = 0f;
protected Action<ProjectileBase> action_pb;
protected void Init_CC()
{
@ -2206,7 +2207,7 @@ public class Actor : MyCoroutine
}
else
{
ProjectileInfo.Ins.Shoot_Projectile(proj, this, m_Target, 1f, startpos, lifetime);
ProjectileInfo.Ins.Shoot_Projectile(proj, this, m_Target, 1f, startpos, lifetime, action_pb);
}
}
}

View File

@ -29,6 +29,11 @@ public class Boss_LusifActor : BossMobActor
CoolTime_Skill1 = 1f;
CoolTime_Skill2 = 2f;
action_pb = pb =>
{
pb.transform.eulerAngles = transform.eulerAngles;
};
}
protected override void Init(bool initSkill1CoolTime, bool initSkill2CoolTime)
@ -61,7 +66,7 @@ public class Boss_LusifActor : BossMobActor
dic_indicator[0].transform.position = Get_PositionFoward(2.5f);
dic_indicator[0].transform.eulerAngles = transform.eulerAngles;
yield return new WaitForSeconds(0.5f);
yield return new WaitForSeconds(1.0f);
AnimationPlay("boss_skill1");
dic_indicator[0].SetActive(false);

View File

@ -414,6 +414,9 @@ public class MobActor : Actor
var sdata = ServerInfo.Ins.m_ServerData;
if (n_Reincarnation <= 0)
{
StartCoroutine(Co_Dissolve());
MonsterSimpleInfo.Ins.DeadTarget(this);
// 골드 드랍
DropItemInfo.Ins.Drop_DropItem(2, m_MonsterAppearData.n_DropGold, Get_position());
@ -445,8 +448,6 @@ public class MobActor : Actor
sdata.Add_MissionCount(ePurpose.KILL_MONSTER_ACC);
}
base.Set_Die();
StartCoroutine(Co_Dissolve());
}
IEnumerator Co_Dissolve()
{

View File

@ -33,6 +33,12 @@ public class MonsterSimpleInfo : MonoBehaviourSingletonTemplate<MonsterSimpleInf
slider_hp.value = (float)(m_Actor.Get_HP() / m_Actor.Get_MaxHP());
}
public void DeadTarget(Actor actor)
{
if (isActor && actor == m_Actor)
Off();
}
public bool IsMe(Actor actor) { return actor == m_Actor; }
private void Update()