NerdNavis_AiDev
/
Project_WL
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minotos 패시브

This commit is contained in:
Ino 2025-05-24 07:18:32 +09:00
parent 8b54a152ca
commit 76c26ec977
11 changed files with 78943 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/ResWork/Table/Export/SkillTypeConfig.json
View File

File diff suppressed because one or more lines are too long

BIN
Assets/ResWork/Table/butler.xlsm
View File

Binary file not shown.

19639
Assets/Res_Addr/Effect/Effect_Revive30Shield.prefab
View File

File diff suppressed because it is too large Load Diff

125
Assets/Res_Addr/Obj/Revive30_Indicator.prefab Normal file
View File

@ -0,0 +1,125 @@
%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: Revive30_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: 1928388234376554137}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &1931060179145746787
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
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.7
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}
- target: {fileID: 198706515776294966, guid: a93b07a8595bb0145bc3af1e9911c409,
type: 3}
propertyPath: lengthInSec
value: 3
objectReference: {fileID: 0}
- target: {fileID: 198706515776294966, guid: a93b07a8595bb0145bc3af1e9911c409,
type: 3}
propertyPath: InitialModule.startLifetime.scalar
value: 3
objectReference: {fileID: 0}
- target: {fileID: 198980401682514854, guid: a93b07a8595bb0145bc3af1e9911c409,
type: 3}
propertyPath: lengthInSec
value: 3
objectReference: {fileID: 0}
- target: {fileID: 198980401682514854, guid: a93b07a8595bb0145bc3af1e9911c409,
type: 3}
propertyPath: InitialModule.startLifetime.scalar
value: 2.5
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}

7
Assets/Res_Addr/Obj/Revive30_Indicator.prefab.meta Normal file
View File

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

59378
Assets/Res_Addr/Projectile/Projectile_Revive30.prefab
View File

File diff suppressed because it is too large Load Diff

11
Assets/Script/Character/Actor.cs
View File

@ -182,6 +182,9 @@ public class Actor : MyCoroutine
protected virtual void OnDestroy()
{
Off_Common();
var enemies = ActorInfo.Ins.Get_EnemyActors(m_Enemy, Get_position(), 100f);
for (int i = 0; i < enemies.Count; i++)
enemies[i].ForceDel(this);
}
virtual protected void Update() { }
@ -951,6 +954,14 @@ public class Actor : MyCoroutine
m_Target = null;
isTarget = false;
}
public virtual void ForceDel(Actor target)
{
if (isTarget)
{
if (m_Target == target)
Del_Target(true);
}
}
public bool IsDead() { return DeadStatus || !gameObject.activeInHierarchy; }
public bool IsOnlyDead() { return DeadStatus; }
public bool IsMainPC() { return IsRole(eRole.PC) && !IsEnemy(); }

4
Assets/Script/Character/Mob/Boss/Boss_Minotos.cs
View File

@ -24,9 +24,13 @@ public class Boss_Minotos : BossMobActor
{
base.Set(isEnemy, owner, sdata, _id, _stop, _ui);
DSUtil.InActivateGameObjects(gos_attackeffect);
IndicatorInfo.Ins.Make_Indicator("Revive30_Indicator", null);
CoolTime_Skill1 = 1f;
CoolTime_Skill2 = 2f;
//CoolTime_Skill1 = 1000f;
//CoolTime_Skill2 = 2000f;
}
protected override void Init(bool initSkill1CoolTime, bool initSkill2CoolTime)

2
Assets/Script/Character/Mob/BossMobActor.cs
View File

@ -154,7 +154,7 @@ public class BossMobActor : MobActor
if (dic_indicator.ContainsKey(index))
dic_indicator[index].SetActive(false);
else
IndicatorInfo.Ins.Make_Indicator(prefab, go => { dic_indicator.Add(index, go); go.SetActive(false); });
IndicatorInfo.Ins.Make_Indicator(prefab, go => { dic_indicator.Add(index, go); });
}
protected void Load_Projectile(string prefab, float skilldmg, Vector3 pos, float lifetime, ProjectileBase _pb, Action<ProjectileBase> act_pb)
{

14
Assets/Script/Character/Mob/MobActor.cs
View File

@ -776,16 +776,22 @@ public class MobActor : Actor
DeadStatus = true;
Play_Die();
yield return new WaitForSeconds(revivetime);
var raisetime = 0.5f;
var showindigatetime = 0.5f;
yield return new WaitForSeconds(showindigatetime);
IndicatorInfo.Ins.Show_Indicator("Revive30_Indicator", Get_position(), revivetime - showindigatetime + raisetime);
NoDmgTime = nodmgtime;
yield return new WaitForSeconds(revivetime - showindigatetime);
// 무적 쉴드
NoDmgTime = nodmgtime + raisetime;
InGameInfo.Ins.Show_Effect(skilltype.e_SkillEffect, this, skilltype.e_EffectLocation, nodmgtime,
effect => { effect.Set_EffectwhenOff(skilltype.s_SkillEffectWhenOff); });
yield return new WaitForSeconds(0.5f);
yield return new WaitForSeconds(raisetime);
Play_Idle();
DeadStatus = false;
ProjectileInfo.Ins.Shoot_Projectile("Projectile_Revive30", this, null, dmg, Get_Center_position(), 2f);
ProjectileInfo.Ins.Shoot_Projectile("Projectile_Revive30", this, null, dmg, Get_position(), 2f);
}
void PerHPBuff(eCC skilltypecc, eCC buffcc1, eCC buffcc2, SkillListTableData temp, SkillTypeConfigTableData skilltype)

19
Assets/Script/Ingame/Obj/IndicatorInfo.cs
View File

@ -21,21 +21,32 @@ public class IndicatorInfo : MonoBehaviourSingletonTemplate<IndicatorInfo>
{
if (!dic_indicator[indicatorName][i].activeInHierarchy)
{
action(dic_indicator[indicatorName][i]);
break;
action?.Invoke(dic_indicator[indicatorName][i]);
return;
}
}
}
else
AddrResourceMgr.Ins.LoadObject<GameObject>($"Assets/Res_Addr/Obj/{indicatorName}.prefab", handle =>
{
var go = DSUtil.Get_Clone(handle.Result);
go.transform.parent = transform;
AddrResourceMgr.Ins.Set_AddressableReleaseSelf(go);
action(go);
go.SetActive(false);
action?.Invoke(go);
if (!dic_indicator.ContainsKey(indicatorName))
dic_indicator.Add(indicatorName, new List<GameObject>());
dic_indicator[indicatorName].Add(go);
});
}
public void Show_Indicator(string indicatorName, Vector3 pos, float showtime)
{
Make_Indicator(indicatorName, go =>
{
go.transform.position = pos;
go.SetActive(true);
CoroutineMgr.Ins.Set_Coroutine(() => { go.SetActive(false); }, showtime);
});
}
}