제멋대로 화살 버그 수정 및 속박의 화살 작업 중...
This commit is contained in:
parent
755327f9ac
commit
14b7c32b97
File diff suppressed because one or more lines are too long
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
|
@ -49,6 +49,32 @@ AnimatorStateTransition:
|
||||||
m_InterruptionSource: 0
|
m_InterruptionSource: 0
|
||||||
m_OrderedInterruption: 1
|
m_OrderedInterruption: 1
|
||||||
m_CanTransitionToSelf: 1
|
m_CanTransitionToSelf: 1
|
||||||
|
--- !u!1102 &-4358623751382604999
|
||||||
|
AnimatorState:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: Bow_Attack_Loop
|
||||||
|
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: 7400002, guid: 311706e3dfe2f9a4a9cae9eac8c8a9d7, type: 3}
|
||||||
|
m_Tag:
|
||||||
|
m_SpeedParameter:
|
||||||
|
m_MirrorParameter:
|
||||||
|
m_CycleOffsetParameter:
|
||||||
|
m_TimeParameter:
|
||||||
--- !u!1102 &-4177302407337328582
|
--- !u!1102 &-4177302407337328582
|
||||||
AnimatorState:
|
AnimatorState:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
|
|
@ -102,6 +128,32 @@ AnimatorState:
|
||||||
m_MirrorParameter:
|
m_MirrorParameter:
|
||||||
m_CycleOffsetParameter:
|
m_CycleOffsetParameter:
|
||||||
m_TimeParameter:
|
m_TimeParameter:
|
||||||
|
--- !u!1102 &-3154760625805364510
|
||||||
|
AnimatorState:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: Bow_Attack
|
||||||
|
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: 7400008, guid: 311706e3dfe2f9a4a9cae9eac8c8a9d7, type: 3}
|
||||||
|
m_Tag:
|
||||||
|
m_SpeedParameter:
|
||||||
|
m_MirrorParameter:
|
||||||
|
m_CycleOffsetParameter:
|
||||||
|
m_TimeParameter:
|
||||||
--- !u!1101 &-2242026176269797008
|
--- !u!1101 &-2242026176269797008
|
||||||
AnimatorStateTransition:
|
AnimatorStateTransition:
|
||||||
m_ObjectHideFlags: 1
|
m_ObjectHideFlags: 1
|
||||||
|
|
@ -124,6 +176,28 @@ AnimatorStateTransition:
|
||||||
m_InterruptionSource: 0
|
m_InterruptionSource: 0
|
||||||
m_OrderedInterruption: 1
|
m_OrderedInterruption: 1
|
||||||
m_CanTransitionToSelf: 1
|
m_CanTransitionToSelf: 1
|
||||||
|
--- !u!1101 &-2233724561026363992
|
||||||
|
AnimatorStateTransition:
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name:
|
||||||
|
m_Conditions: []
|
||||||
|
m_DstStateMachine: {fileID: 0}
|
||||||
|
m_DstState: {fileID: -4358623751382604999}
|
||||||
|
m_Solo: 0
|
||||||
|
m_Mute: 0
|
||||||
|
m_IsExit: 0
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TransitionDuration: 0.25
|
||||||
|
m_TransitionOffset: 0
|
||||||
|
m_ExitTime: 0.5
|
||||||
|
m_HasExitTime: 1
|
||||||
|
m_HasFixedDuration: 1
|
||||||
|
m_InterruptionSource: 0
|
||||||
|
m_OrderedInterruption: 1
|
||||||
|
m_CanTransitionToSelf: 1
|
||||||
--- !u!91 &9100000
|
--- !u!91 &9100000
|
||||||
AnimatorController:
|
AnimatorController:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -1830,6 +1904,18 @@ AnimatorStateMachine:
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: -8866494684727614440}
|
m_State: {fileID: -8866494684727614440}
|
||||||
m_Position: {x: -20, y: -160, z: 0}
|
m_Position: {x: -20, y: -160, z: 0}
|
||||||
|
- serializedVersion: 1
|
||||||
|
m_State: {fileID: -3154760625805364510}
|
||||||
|
m_Position: {x: 210, y: -220, z: 0}
|
||||||
|
- serializedVersion: 1
|
||||||
|
m_State: {fileID: 6239217279682056452}
|
||||||
|
m_Position: {x: 100, y: -40, z: 0}
|
||||||
|
- serializedVersion: 1
|
||||||
|
m_State: {fileID: 6580758227409272676}
|
||||||
|
m_Position: {x: -30, y: -100, z: 0}
|
||||||
|
- serializedVersion: 1
|
||||||
|
m_State: {fileID: -4358623751382604999}
|
||||||
|
m_Position: {x: 230, y: -100, z: 0}
|
||||||
m_ChildStateMachines: []
|
m_ChildStateMachines: []
|
||||||
m_AnyStateTransitions: []
|
m_AnyStateTransitions: []
|
||||||
m_EntryTransitions: []
|
m_EntryTransitions: []
|
||||||
|
|
@ -2089,3 +2175,79 @@ AnimatorState:
|
||||||
m_MirrorParameter:
|
m_MirrorParameter:
|
||||||
m_CycleOffsetParameter:
|
m_CycleOffsetParameter:
|
||||||
m_TimeParameter:
|
m_TimeParameter:
|
||||||
|
--- !u!1102 &6239217279682056452
|
||||||
|
AnimatorState:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: ra_skill3_fire
|
||||||
|
m_Speed: 1
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_Transitions:
|
||||||
|
- {fileID: 6523561493952085720}
|
||||||
|
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: 7400006, guid: 311706e3dfe2f9a4a9cae9eac8c8a9d7, type: 3}
|
||||||
|
m_Tag:
|
||||||
|
m_SpeedParameter:
|
||||||
|
m_MirrorParameter:
|
||||||
|
m_CycleOffsetParameter:
|
||||||
|
m_TimeParameter:
|
||||||
|
--- !u!1101 &6523561493952085720
|
||||||
|
AnimatorStateTransition:
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name:
|
||||||
|
m_Conditions: []
|
||||||
|
m_DstStateMachine: {fileID: 0}
|
||||||
|
m_DstState: {fileID: 110222392}
|
||||||
|
m_Solo: 0
|
||||||
|
m_Mute: 0
|
||||||
|
m_IsExit: 0
|
||||||
|
serializedVersion: 3
|
||||||
|
m_TransitionDuration: 0.25
|
||||||
|
m_TransitionOffset: 0
|
||||||
|
m_ExitTime: 0.70000005
|
||||||
|
m_HasExitTime: 1
|
||||||
|
m_HasFixedDuration: 1
|
||||||
|
m_InterruptionSource: 0
|
||||||
|
m_OrderedInterruption: 1
|
||||||
|
m_CanTransitionToSelf: 1
|
||||||
|
--- !u!1102 &6580758227409272676
|
||||||
|
AnimatorState:
|
||||||
|
serializedVersion: 6
|
||||||
|
m_ObjectHideFlags: 1
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_Name: ra_skill3_charge
|
||||||
|
m_Speed: 1
|
||||||
|
m_CycleOffset: 0
|
||||||
|
m_Transitions:
|
||||||
|
- {fileID: -2233724561026363992}
|
||||||
|
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: 7400000, guid: 311706e3dfe2f9a4a9cae9eac8c8a9d7, type: 3}
|
||||||
|
m_Tag:
|
||||||
|
m_SpeedParameter:
|
||||||
|
m_MirrorParameter:
|
||||||
|
m_CycleOffsetParameter:
|
||||||
|
m_TimeParameter:
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,7 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: d7fd92375373f844590234c4d16c6759
|
||||||
|
PrefabImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,30 @@
|
||||||
|
using UnityEngine;
|
||||||
|
|
||||||
|
public class Skill_BindingArrow : ProjectileBase
|
||||||
|
{
|
||||||
|
public Projectile_Strait[] arr_arrows;
|
||||||
|
[Header("화살 속도")]
|
||||||
|
public float m_speed = 2f;
|
||||||
|
|
||||||
|
public override void Set(ProjectileData _data)
|
||||||
|
{
|
||||||
|
_data.LifeTime = 2f;
|
||||||
|
_data.Speed = m_speed;
|
||||||
|
_data.eStartPos = eProjectileStartPos.ShooterCenter;
|
||||||
|
base.Set(_data);
|
||||||
|
for (int i = 0; i < arr_arrows.Length; i++)
|
||||||
|
{
|
||||||
|
arr_arrows[i].gameObject.SetActive(true);
|
||||||
|
arr_arrows[i].Set(_data);
|
||||||
|
|
||||||
|
arr_arrows[i].transform.localPosition = Vector3.zero;
|
||||||
|
|
||||||
|
// -60 ~ 60 사이로 각도를 균등 분배
|
||||||
|
float angleStep = 120f / (arr_arrows.Length - 1); // 전체 각도(120도)를 화살 개수로 나누기
|
||||||
|
float angle = -60f + (angleStep * i); // 시작 각도 -60에서 각 화살의 각도 계산
|
||||||
|
arr_arrows[i].transform.localEulerAngles = new Vector2(0f, angle);
|
||||||
|
}
|
||||||
|
|
||||||
|
StartCoroutine(Co_Off(m_LifeTime * 2f));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: aa6f858b499bb0147b443922b81c0a6a
|
||||||
|
MonoImporter:
|
||||||
|
externalObjects: {}
|
||||||
|
serializedVersion: 2
|
||||||
|
defaultReferences: []
|
||||||
|
executionOrder: 0
|
||||||
|
icon: {instanceID: 0}
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
|
|
@ -1,4 +1,5 @@
|
||||||
using System.Collections;
|
using System.Collections;
|
||||||
|
using System.Collections.Generic;
|
||||||
using UnityEngine;
|
using UnityEngine;
|
||||||
|
|
||||||
public class Skill_UnpredictableArrow : ProjectileBase
|
public class Skill_UnpredictableArrow : ProjectileBase
|
||||||
|
|
@ -7,8 +8,14 @@ public class Skill_UnpredictableArrow : ProjectileBase
|
||||||
public string projectile_prefab = "Projectile_RookieArcherSkill1";
|
public string projectile_prefab = "Projectile_RookieArcherSkill1";
|
||||||
[Header("투사체 갯수")]
|
[Header("투사체 갯수")]
|
||||||
public int m_count = 10;
|
public int m_count = 10;
|
||||||
|
[Header("다음 투사체 발사 딜레이")]
|
||||||
|
public float m_delay = 0.15f;
|
||||||
[Header("투사체 속도")]
|
[Header("투사체 속도")]
|
||||||
public float m_speed = 1.5f;
|
public float m_speed = 1.5f;
|
||||||
|
[Header("최소 도달 거리")]
|
||||||
|
public float MinDistance = 5f;
|
||||||
|
[Header("최대 도달 거리")]
|
||||||
|
public float MaxDistance = 10f;
|
||||||
[Header("최소 좌우 진폭")]
|
[Header("최소 좌우 진폭")]
|
||||||
public float MinwaveAmplitude = 0f;
|
public float MinwaveAmplitude = 0f;
|
||||||
[Header("최대 좌우 진폭")]
|
[Header("최대 좌우 진폭")]
|
||||||
|
|
@ -18,8 +25,17 @@ public class Skill_UnpredictableArrow : ProjectileBase
|
||||||
[Header("최대 좌우 주파수")]
|
[Header("최대 좌우 주파수")]
|
||||||
public float MaxwaveFrequency = 3f;
|
public float MaxwaveFrequency = 3f;
|
||||||
|
|
||||||
|
List<ProjectileData> list_projectile = new List<ProjectileData>();
|
||||||
|
|
||||||
public override void Set(ProjectileData _data)
|
public override void Set(ProjectileData _data)
|
||||||
{
|
{
|
||||||
|
if (list_projectile.Count < m_count)
|
||||||
|
{
|
||||||
|
var addCount = m_count - list_projectile.Count;
|
||||||
|
for (int i = 0; i < addCount; ++i)
|
||||||
|
list_projectile.Add(new ProjectileData());
|
||||||
|
}
|
||||||
|
|
||||||
_data.eStartPos = eProjectileStartPos.ShooterCenter;
|
_data.eStartPos = eProjectileStartPos.ShooterCenter;
|
||||||
_data.Speed = m_speed;
|
_data.Speed = m_speed;
|
||||||
base.Set(_data);
|
base.Set(_data);
|
||||||
|
|
@ -28,19 +44,24 @@ public class Skill_UnpredictableArrow : ProjectileBase
|
||||||
|
|
||||||
IEnumerator Co_Update()
|
IEnumerator Co_Update()
|
||||||
{
|
{
|
||||||
|
for (int i = 0; i < list_projectile.Count; i++)
|
||||||
|
m_ProjectTileData.Copy(list_projectile[i]);
|
||||||
|
|
||||||
m_ProjectTileData.shooter.AnimationPlay("skill1_loop");
|
m_ProjectTileData.shooter.AnimationPlay("skill1_loop");
|
||||||
for (int i = 0; i < m_count; i++)
|
for (int i = 0; i < m_count; i++)
|
||||||
{
|
{
|
||||||
yield return new WaitForSeconds(0.25f);
|
yield return new WaitForSeconds(m_delay);
|
||||||
ProjectileInfo.Ins.Shoot_Projectile(projectile_prefab, m_ProjectTileData, pb =>
|
ProjectileInfo.Ins.Shoot_Projectile(projectile_prefab, list_projectile[i], pb =>
|
||||||
{
|
{
|
||||||
|
pb.m_Pierce = true;
|
||||||
pb.transform.localScale = Vector3.one * 0.5f;
|
pb.transform.localScale = Vector3.one * 0.5f;
|
||||||
var target = m_ProjectTileData.shooter.Get_CenterPositionFoward(Random.Range(3f, 6f));
|
var target = m_ProjectTileData.shooter.Get_CenterPositionFoward(Random.Range(MinDistance, MaxDistance));
|
||||||
var Amplitude = Random.Range(MinwaveAmplitude, MaxwaveAmplitude);
|
var Amplitude = Random.Range(MinwaveAmplitude, MaxwaveAmplitude);
|
||||||
var Frequency = Random.Range(MinwaveFrequency, MaxwaveFrequency);
|
var Frequency = Random.Range(MinwaveFrequency, MaxwaveFrequency);
|
||||||
pb.Launch(transform.position, target, Random.value > 0.5f ? 0f : Mathf.PI, Amplitude, Frequency);
|
pb.Launch(transform.position, target, Random.value > 0.5f ? 0f : Mathf.PI, Amplitude, Frequency);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
m_ProjectTileData.shooter.Play_Idle();
|
m_ProjectTileData.shooter.Play_Idle();
|
||||||
|
Off(true);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -206,7 +206,7 @@ public enum eEffect
|
||||||
Skill_Berserk, Skill_EarthSlam, Skill_Whirlwind,
|
Skill_Berserk, Skill_EarthSlam, Skill_Whirlwind,
|
||||||
Skill_SweepAttack, Skill_VitalStrike, Skill_DeathBlade,
|
Skill_SweepAttack, Skill_VitalStrike, Skill_DeathBlade,
|
||||||
Skill_ShadowSlash, Skill_DarkAmbush, Skill_PhantomFrenzy,
|
Skill_ShadowSlash, Skill_DarkAmbush, Skill_PhantomFrenzy,
|
||||||
Skill_UnpredictableArrow, Skill_TrapSetup,
|
Skill_UnpredictableArrow, Skill_TrapSetup, Skill_BindingArrow,
|
||||||
|
|
||||||
Skill_Poison,
|
Skill_Poison,
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue