블댄 평타, 휩쓸기 공격
This commit is contained in:
parent
3e395e3dee
commit
861cb8daf0
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
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
|
|
@ -0,0 +1,124 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &1350445096495842306
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1350445096495842305}
|
||||
- component: {fileID: 2691850233177647995}
|
||||
m_Layer: 0
|
||||
m_Name: Effect_Hit_SweepAttack
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1350445096495842305
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1350445096495842306}
|
||||
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: 297729783482145418}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &2691850233177647995
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1350445096495842306}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 456d2bd1c5c2e5e4b8b948836c4975a4, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
NoUseParticleTime: 1
|
||||
OffTime: 1
|
||||
e_EffectLocation: 0
|
||||
--- !u!1001 &3478406994287125000
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1350445096495842305}
|
||||
m_Modifications:
|
||||
- target: {fileID: 3775273307930507393, guid: b8cbf0802f081c245853f60240f107cc,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Hit_magic
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3775273307930507394, guid: b8cbf0802f081c245853f60240f107cc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3775273307930507394, guid: b8cbf0802f081c245853f60240f107cc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3775273307930507394, guid: b8cbf0802f081c245853f60240f107cc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3775273307930507394, guid: b8cbf0802f081c245853f60240f107cc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3775273307930507394, guid: b8cbf0802f081c245853f60240f107cc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3775273307930507394, guid: b8cbf0802f081c245853f60240f107cc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3775273307930507394, guid: b8cbf0802f081c245853f60240f107cc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3775273307930507394, guid: b8cbf0802f081c245853f60240f107cc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3775273307930507394, guid: b8cbf0802f081c245853f60240f107cc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 3775273307930507394, guid: b8cbf0802f081c245853f60240f107cc,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: b8cbf0802f081c245853f60240f107cc, type: 3}
|
||||
--- !u!4 &297729783482145418 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 3775273307930507394, guid: b8cbf0802f081c245853f60240f107cc,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 3478406994287125000}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 7dfb5ac84450247408231a99e320ab55
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,139 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &5164807117813024258
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1025451156603284880}
|
||||
- component: {fileID: 8558499595176826072}
|
||||
m_Layer: 0
|
||||
m_Name: Effect_Slash_10102
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1025451156603284880
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5164807117813024258}
|
||||
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: 7779546774590818340}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &8558499595176826072
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5164807117813024258}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 456d2bd1c5c2e5e4b8b948836c4975a4, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
NoUseParticleTime: 1
|
||||
OffTime: 1
|
||||
e_EffectLocation: 0
|
||||
--- !u!1001 &6265987394935985210
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1025451156603284880}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 0.3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 0.3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 0.3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -0.055935934
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.65821254
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0.418879
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.53787255
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.034384165
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.4936551
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0.6825068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 134.69699
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: -136.505
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 455.385
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4437757428617080786, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Orange_Slash_1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 66d619abe0c84054a8ccb20b2911d643, type: 3}
|
||||
--- !u!4 &7779546774590818340 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6265987394935985210}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 9f80ee479d7e6e04a98f9f40fb0dfa8b
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,139 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &5164807117813024258
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1025451156603284880}
|
||||
- component: {fileID: 8558499595176826072}
|
||||
m_Layer: 0
|
||||
m_Name: Effect_Slash_10201
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1025451156603284880
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5164807117813024258}
|
||||
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: 2755464940596202143}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &8558499595176826072
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5164807117813024258}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 456d2bd1c5c2e5e4b8b948836c4975a4, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
NoUseParticleTime: 1
|
||||
OffTime: 1
|
||||
e_EffectLocation: 0
|
||||
--- !u!1001 &2914438673400357594
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 1025451156603284880}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1031124528240519237, guid: 9d013b43983b259419fd411b73b81585,
|
||||
type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1031124528240519237, guid: 9d013b43983b259419fd411b73b81585,
|
||||
type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1031124528240519237, guid: 9d013b43983b259419fd411b73b81585,
|
||||
type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1031124528240519237, guid: 9d013b43983b259419fd411b73b81585,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1031124528240519237, guid: 9d013b43983b259419fd411b73b81585,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.67
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1031124528240519237, guid: 9d013b43983b259419fd411b73b81585,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1031124528240519237, guid: 9d013b43983b259419fd411b73b81585,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.7933533
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1031124528240519237, guid: 9d013b43983b259419fd411b73b81585,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1031124528240519237, guid: 9d013b43983b259419fd411b73b81585,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.6087614
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1031124528240519237, guid: 9d013b43983b259419fd411b73b81585,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1031124528240519237, guid: 9d013b43983b259419fd411b73b81585,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1031124528240519237, guid: 9d013b43983b259419fd411b73b81585,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: -75.199
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1031124528240519237, guid: 9d013b43983b259419fd411b73b81585,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1887133516924678692, guid: 9d013b43983b259419fd411b73b81585,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: BlueSlash
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 9d013b43983b259419fd411b73b81585, type: 3}
|
||||
--- !u!4 &2755464940596202143 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1031124528240519237, guid: 9d013b43983b259419fd411b73b81585,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2914438673400357594}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 8b17a3f925782d949ab158564008b40b
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -7946,7 +7946,7 @@ Animator:
|
|||
m_GameObject: {fileID: 1996061924472238}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 9000000, guid: e5326b54f49cc50479cbf8508dc0e805, type: 3}
|
||||
m_Controller: {fileID: 9100000, guid: c89759bb9b16580449abc77bc1e7272d, type: 2}
|
||||
m_Controller: {fileID: 9100000, guid: 0ca4348990d16c64c9b7bd55b6e28b56, type: 2}
|
||||
m_CullingMode: 1
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
|
|
|
|||
|
|
@ -30,7 +30,7 @@ Transform:
|
|||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1801492406153892855}
|
||||
- {fileID: 7776123529191992692}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &4842588275246052740
|
||||
|
|
@ -45,10 +45,12 @@ MonoBehaviour:
|
|||
m_Script: {fileID: 11500000, guid: 88c718b14cefbfa4b98773a709bc4128, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
ColliderLayer: Actor
|
||||
m_Pierce: 1
|
||||
str_HitEffect:
|
||||
go_effect: {fileID: 1843654322638168123}
|
||||
--- !u!1001 &2595178432692506601
|
||||
str_HitEffect: Effect_Hit_SweepAttack
|
||||
m_ShowTimeOverEffect: 0
|
||||
go_effect: {fileID: 7776123529191992681}
|
||||
--- !u!1001 &8355908176529852873
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
|
|
@ -56,121 +58,101 @@ PrefabInstance:
|
|||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 3741531590692237040}
|
||||
m_Modifications:
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
- target: {fileID: 1737387875744588960, guid: b65542e2c1b9d344d8d4e3573cf120ba,
|
||||
type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 0.3
|
||||
propertyPath: m_Name
|
||||
value: Slash_magic_once
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: 0.3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 0.3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
- target: {fileID: 1737387875744588989, guid: b65542e2c1b9d344d8d4e3573cf120ba,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
- target: {fileID: 1737387875744588989, guid: b65542e2c1b9d344d8d4e3573cf120ba,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
- target: {fileID: 1737387875744588989, guid: b65542e2c1b9d344d8d4e3573cf120ba,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
- target: {fileID: 1737387875744588989, guid: b65542e2c1b9d344d8d4e3573cf120ba,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: -0.5
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
- target: {fileID: 1737387875744588989, guid: b65542e2c1b9d344d8d4e3573cf120ba,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
- target: {fileID: 1737387875744588989, guid: b65542e2c1b9d344d8d4e3573cf120ba,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
- target: {fileID: 1737387875744588989, guid: b65542e2c1b9d344d8d4e3573cf120ba,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
- target: {fileID: 1737387875744588989, guid: b65542e2c1b9d344d8d4e3573cf120ba,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: -90
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
- target: {fileID: 1737387875744588989, guid: b65542e2c1b9d344d8d4e3573cf120ba,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
- target: {fileID: 1737387875744588989, guid: b65542e2c1b9d344d8d4e3573cf120ba,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: -269.471
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4437757428617080786, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Orange_Slash_1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 4437757428617080786, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
- targetCorrespondingSourceObject: {fileID: 1737387875744588960, guid: b65542e2c1b9d344d8d4e3573cf120ba,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 2543402027844738714}
|
||||
- targetCorrespondingSourceObject: {fileID: 4437757428617080786, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
addedObject: {fileID: 9073885713670488555}
|
||||
- targetCorrespondingSourceObject: {fileID: 1737387875744588960, guid: b65542e2c1b9d344d8d4e3573cf120ba,
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 2583579744704581771}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 66d619abe0c84054a8ccb20b2911d643, type: 3}
|
||||
--- !u!4 &1801492406153892855 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4396571810850249758, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2595178432692506601}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1843654322638168123 stripped
|
||||
addedObject: {fileID: 5674448888584809587}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: b65542e2c1b9d344d8d4e3573cf120ba, type: 3}
|
||||
--- !u!1 &7776123529191992681 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 4437757428617080786, guid: 66d619abe0c84054a8ccb20b2911d643,
|
||||
m_CorrespondingSourceObject: {fileID: 1737387875744588960, guid: b65542e2c1b9d344d8d4e3573cf120ba,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 2595178432692506601}
|
||||
m_PrefabInstance: {fileID: 8355908176529852873}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &2543402027844738714
|
||||
--- !u!114 &9073885713670488555
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1843654322638168123}
|
||||
m_GameObject: {fileID: 7776123529191992681}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: a38a032bc645dd748bf40d9200bf783a, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
Off_OnlyThisObj_byHit: 0
|
||||
--- !u!65 &2583579744704581771
|
||||
NoDMG: 0
|
||||
--- !u!65 &5674448888584809587
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1843654322638168123}
|
||||
m_GameObject: {fileID: 7776123529191992681}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
|
|
@ -183,5 +165,11 @@ BoxCollider:
|
|||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Size: {x: 10, y: 10, z: 10}
|
||||
m_Size: {x: 3, y: 3, z: 3}
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!4 &7776123529191992692 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1737387875744588989, guid: b65542e2c1b9d344d8d4e3573cf120ba,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 8355908176529852873}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
|||
|
|
@ -493,7 +493,19 @@ public class Actor : MyCoroutine
|
|||
Check_CC_byAttack(_dinfo);
|
||||
Check_Extra(eSkillExtraTiming.GetHit);
|
||||
|
||||
if (IsRole(eRole.Mob)) MyValue.m_RealCamera.ShakeCamera(1); // 카메라 흔들림 추가
|
||||
//if (IsRole(eRole.Mob))
|
||||
//{ // 카메라 흔들림
|
||||
// bool camShake = true;
|
||||
// if (_dinfo.Beater_pd.IsSkill())
|
||||
// {
|
||||
// switch (_dinfo.Beater_pd.m_Skill)
|
||||
// {
|
||||
// case eEffect.Skill_SweepAttack: camShake = false; break;
|
||||
// }
|
||||
// }
|
||||
// if (camShake) MyValue.m_RealCamera.ShakeCamera(1);
|
||||
//}
|
||||
MyValue.m_RealCamera.ShakeCamera(1);
|
||||
|
||||
#if UNITY_EDITOR
|
||||
if (SceneManager.GetActiveScene().name == "StatTest")
|
||||
|
|
|
|||
|
|
@ -74,7 +74,10 @@ public class MyActor : Actor
|
|||
if (Vector3.Distance(Get_position(), m_Target.Get_position()) > m_NavMeshAgent.stoppingDistance + m_Target.Get_ScaleSizeDist())
|
||||
Play_Run();
|
||||
else if (!DSUtil.CheckNull(m_Magic))
|
||||
Use_Skill(m_Magic.m_SkillTableData, false, m_Magic.m_uiIndex);
|
||||
{
|
||||
if (!Use_Skill(m_Magic.m_SkillTableData, false, m_Magic.m_uiIndex))
|
||||
Play_Idle();
|
||||
}
|
||||
//else if (CurAnim != eAnim.Attack && m_attackCoolTime > 0f)
|
||||
// Play_Idle();
|
||||
else if (CurAnim != eAnim.Skill && CurAnim != eAnim.Dodge)
|
||||
|
|
|
|||
|
|
@ -430,8 +430,11 @@ public class PCActor : MyActor
|
|||
|
||||
public override void Set_JoystickStatus(int status)
|
||||
{
|
||||
if (JoystickStatus == 2 && status < 3) return;
|
||||
JoystickStatus = status == 3 ? 0 : status;
|
||||
if (IsMainPC())
|
||||
{
|
||||
if (JoystickStatus == 2 && status < 3) return;
|
||||
JoystickStatus = status == 3 ? 0 : status;
|
||||
}
|
||||
}
|
||||
|
||||
public bool Check_Path(Vector3 pos)
|
||||
|
|
|
|||
|
|
@ -12,26 +12,24 @@ public class Skill_SweepAttack : ProjectileBase
|
|||
StartCoroutine(Co_Update());
|
||||
}
|
||||
|
||||
private void Update()
|
||||
{
|
||||
transform.position = m_ProjecTileData.shooter.Get_Center_position();
|
||||
}
|
||||
|
||||
IEnumerator Co_Update()
|
||||
{
|
||||
var shooter = m_ProjecTileData.shooter;
|
||||
shooter.Set_JoystickStatus(2);
|
||||
go_effect.SetActive(false);
|
||||
yield return new WaitForSeconds(0.1f);
|
||||
if (!DSUtil.CheckNull(shooter))
|
||||
transform.position = m_ProjecTileData.shooter.Get_Center_position();
|
||||
go_effect.SetActive(true);
|
||||
yield return new WaitForSeconds(0.4f);
|
||||
if (!DSUtil.CheckNull(shooter))
|
||||
transform.position = m_ProjecTileData.shooter.Get_Center_position();
|
||||
go_effect.SetActive(false);
|
||||
go_effect.SetActive(true);
|
||||
yield return new WaitForSeconds(1f);
|
||||
Off(true);
|
||||
if (!DSUtil.CheckNull(shooter))
|
||||
{
|
||||
m_ProjecTileData.shooter.Set_JoystickStatus(3);
|
||||
m_ProjecTileData.shooter.Play_Idle();
|
||||
}
|
||||
shooter.Set_JoystickStatus(3);
|
||||
shooter.Play_Idle();
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,5 @@
|
|||
using System.Collections;
|
||||
using TrailsFX.Demos;
|
||||
using UnityEngine;
|
||||
|
||||
public class Skill_Whirlwind : ProjectileBase
|
||||
|
|
|
|||
|
|
@ -0,0 +1,25 @@
|
|||
using UnityEngine;
|
||||
|
||||
public class RotateYNegative360 : MonoBehaviour
|
||||
{
|
||||
public float duration = 2f; // 2초 동안 회전
|
||||
private float timer;
|
||||
|
||||
private void OnEnable()
|
||||
{
|
||||
timer = 0f;
|
||||
}
|
||||
|
||||
void Update()
|
||||
{
|
||||
timer += Time.deltaTime;
|
||||
float t = Mathf.Clamp01(timer / duration);
|
||||
transform.rotation = Quaternion.Euler(0f, -360f * t, 0f);
|
||||
|
||||
// 한 바퀴 돌면 멈춤
|
||||
if (t >= 1f)
|
||||
{
|
||||
gameObject.SetActive(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -0,0 +1,11 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 5b6a2795c2d16f144887dcd89d827c58
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -227,11 +227,7 @@ public class RealCamera : MyCoroutine
|
|||
|
||||
void Update_Cam()
|
||||
{
|
||||
if (m_shakeTimer > 0f)
|
||||
{
|
||||
Shaking();
|
||||
return;
|
||||
}
|
||||
Shaking();
|
||||
|
||||
Vector3 targetOffset = target.position;
|
||||
Quaternion rotation = Quaternion.Euler(cameraHeight, rotateAround, cameraPan);
|
||||
|
|
|
|||
Loading…
Reference in New Issue