puptet 까지

This commit is contained in:
Ino 2025-03-01 12:21:02 +09:00
parent 8bf87dfcb3
commit c4d0f7a460
24 changed files with 1186 additions and 200 deletions

View File

@ -80,6 +80,8 @@ messageinfo 엄청 느린 버그
- 엘리트몹 (크기 설정, stun) - 엘리트몹 (크기 설정, stun)
- 일반몹 (크기 설정, stun) - 일반몹 (크기 설정, stun)
버프 이펙트 안 사라짐
펫 stun, casting, casting_end(idle로 화살표, 이벤트 : SkillEvent), idle 이벤트 : Event_Idle 펫 stun, casting, casting_end(idle로 화살표, 이벤트 : SkillEvent), idle 이벤트 : Event_Idle
stun은 idle 2배, casting은 idle 3배 stun은 idle 2배, casting은 idle 3배

View File

@ -1,23 +1,47 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 2ad950d6b5c2e5447b7a51a1083620de guid: 2ad950d6b5c2e5447b7a51a1083620de
ModelImporter: ModelImporter:
serializedVersion: 23 serializedVersion: 22200
fileIDToRecycleName: internalIDToNameTable:
100000: //RootNode - first:
100002: center 1: 100000
100004: head second: //RootNode
100006: root - first:
100008: tail 1: 100002
400000: //RootNode second: center
400002: center - first:
400004: head 1: 100004
400006: root second: head
400008: tail - first:
7400000: Idle 1: 100006
9500000: //RootNode second: root
- first:
1: 100008
second: tail
- first:
4: 400000
second: //RootNode
- first:
4: 400002
second: center
- first:
4: 400004
second: head
- first:
4: 400006
second: root
- first:
4: 400008
second: tail
- first:
74: 7400000
second: Idle
- first:
95: 9500000
second: //RootNode
externalObjects: {} externalObjects: {}
materials: materials:
importMaterials: 1 materialImportMode: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
materialLocation: 1 materialLocation: 1
@ -26,6 +50,7 @@ ModelImporter:
bakeSimulation: 0 bakeSimulation: 0
resampleCurves: 1 resampleCurves: 1
optimizeGameObjects: 0 optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName: motionNodeName:
rigImportErrors: rigImportErrors:
rigImportWarnings: rigImportWarnings:
@ -46,6 +71,7 @@ ModelImporter:
- serializedVersion: 16 - serializedVersion: 16
name: Idle name: Idle
takeName: Anim_Whispa@Idle takeName: Anim_Whispa@Idle
internalID: 0
firstFrame: 1 firstFrame: 1
lastFrame: 40 lastFrame: 40
wrapMode: 0 wrapMode: 0
@ -66,11 +92,18 @@ ModelImporter:
mirror: 0 mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: [] curves: []
events: [] events:
- time: 0
functionName: Event_Idle
data:
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
transformMask: [] transformMask: []
maskType: 3 maskType: 3
maskSource: {instanceID: 0} maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0 additiveReferencePoseFrame: 1
isReadable: 1 isReadable: 1
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []
@ -78,25 +111,36 @@ ModelImporter:
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1 importVisibility: 1
importBlendShapes: 1 importBlendShapes: 1
importCameras: 1 importCameras: 1
importLights: 1 importLights: 1
nodeNameCollisionStrategy: 0
fileIdsGeneration: 1
swapUVChannels: 0 swapUVChannels: 0
generateSecondaryUV: 0 generateSecondaryUV: 0
useFileUnits: 1 useFileUnits: 1
optimizeMeshForGPU: 1
keepQuads: 0 keepQuads: 0
weldVertices: 1 weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0 preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0 indexFormat: 0
secondaryUVAngleDistortion: 8 secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001 secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88 secondaryUVHardAngle: 88
secondaryUVMarginMethod: 0
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4 secondaryUVPackMargin: 4
useFileScale: 1 useFileScale: 1
previousCalculatedGlobalScale: 0.01 strictVertexDataChecks: 0
hasPreviousCalculatedGlobalScale: 1
tangentSpace: tangentSpace:
normalSmoothAngle: 60 normalSmoothAngle: 60
normalImportMode: 0 normalImportMode: 0
@ -105,10 +149,10 @@ ModelImporter:
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
normalSmoothingSource: 0 normalSmoothingSource: 0
referencedClips: []
importAnimation: 1 importAnimation: 1
copyAvatar: 0
humanDescription: humanDescription:
serializedVersion: 2 serializedVersion: 3
human: [] human: []
skeleton: [] skeleton: []
armTwist: 0.5 armTwist: 0.5
@ -118,13 +162,19 @@ ModelImporter:
armStretch: 0.05 armStretch: 0.05
legStretch: 0.05 legStretch: 0.05
feetSpacing: 0 feetSpacing: 0
globalScale: 1
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 1 skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1
avatarSetup: 1
addHumanoidExtraRootOnlyWhenUsingAvatar: 0
importBlendShapeDeformPercent: 0
remapMaterialsIfMaterialImportModeIsNone: 1
additionalBone: 0 additionalBone: 0
userData: userData:
assetBundleName: assetBundleName:

View File

@ -1,7 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: cf3366f39ad6e3e458395fad30f3e26c guid: cf3366f39ad6e3e458395fad30f3e26c
ModelImporter: ModelImporter:
serializedVersion: 20200 serializedVersion: 22200
internalIDToNameTable: internalIDToNameTable:
- first: - first:
74: -3264621649207200049 74: -3264621649207200049
@ -17,6 +17,7 @@ ModelImporter:
bakeSimulation: 0 bakeSimulation: 0
resampleCurves: 1 resampleCurves: 1
optimizeGameObjects: 0 optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName: motionNodeName:
rigImportErrors: rigImportErrors:
rigImportWarnings: rigImportWarnings:
@ -58,7 +59,14 @@ ModelImporter:
mirror: 0 mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: [] curves: []
events: [] events:
- time: 0
functionName: Event_Idle
data:
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
transformMask: [] transformMask: []
maskType: 3 maskType: 3
maskSource: {instanceID: 0} maskSource: {instanceID: 0}
@ -71,10 +79,12 @@ ModelImporter:
addColliders: 0 addColliders: 0
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
sortHierarchyByName: 1 sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1 importVisibility: 1
importBlendShapes: 1 importBlendShapes: 1
importCameras: 1 importCameras: 1
importLights: 1 importLights: 1
nodeNameCollisionStrategy: 0
fileIdsGeneration: 2 fileIdsGeneration: 2
swapUVChannels: 0 swapUVChannels: 0
generateSecondaryUV: 0 generateSecondaryUV: 0
@ -86,6 +96,7 @@ ModelImporter:
skinWeightsMode: 0 skinWeightsMode: 0
maxBonesPerVertex: 4 maxBonesPerVertex: 4
minBoneWeight: 0.001 minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1 meshOptimizationFlags: -1
indexFormat: 0 indexFormat: 0
secondaryUVAngleDistortion: 8 secondaryUVAngleDistortion: 8
@ -96,6 +107,7 @@ ModelImporter:
secondaryUVMinObjectScale: 1 secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4 secondaryUVPackMargin: 4
useFileScale: 1 useFileScale: 1
strictVertexDataChecks: 0
tangentSpace: tangentSpace:
normalSmoothAngle: 60 normalSmoothAngle: 60
normalImportMode: 0 normalImportMode: 0
@ -128,6 +140,8 @@ ModelImporter:
humanoidOversampling: 1 humanoidOversampling: 1
avatarSetup: 0 avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1 addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 0
remapMaterialsIfMaterialImportModeIsNone: 1
additionalBone: 0 additionalBone: 0
userData: userData:
assetBundleName: assetBundleName:

View File

@ -1,7 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: b12383145ed9c674b8051d0ef78bc2d2 guid: b12383145ed9c674b8051d0ef78bc2d2
ModelImporter: ModelImporter:
serializedVersion: 21300 serializedVersion: 22200
internalIDToNameTable: [] internalIDToNameTable: []
externalObjects: {} externalObjects: {}
materials: materials:
@ -56,7 +56,14 @@ ModelImporter:
mirror: 0 mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: [] curves: []
events: [] events:
- time: 0
functionName: Event_Idle
data:
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
transformMask: [] transformMask: []
maskType: 3 maskType: 3
maskSource: {instanceID: 0} maskSource: {instanceID: 0}
@ -69,6 +76,7 @@ ModelImporter:
addColliders: 0 addColliders: 0
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
sortHierarchyByName: 1 sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1 importVisibility: 1
importBlendShapes: 1 importBlendShapes: 1
importCameras: 1 importCameras: 1
@ -96,6 +104,7 @@ ModelImporter:
secondaryUVMinObjectScale: 1 secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4 secondaryUVPackMargin: 4
useFileScale: 1 useFileScale: 1
strictVertexDataChecks: 0
tangentSpace: tangentSpace:
normalSmoothAngle: 60 normalSmoothAngle: 60
normalImportMode: 0 normalImportMode: 0
@ -128,6 +137,7 @@ ModelImporter:
humanoidOversampling: 1 humanoidOversampling: 1
avatarSetup: 0 avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1 addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 0
remapMaterialsIfMaterialImportModeIsNone: 0 remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0 additionalBone: 0
userData: userData:

View File

@ -1,7 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 439ba0c64e4045844b18cddf5b078309 guid: 439ba0c64e4045844b18cddf5b078309
ModelImporter: ModelImporter:
serializedVersion: 19301 serializedVersion: 22200
internalIDToNameTable: internalIDToNameTable:
- first: - first:
74: 8686408565658398033 74: 8686408565658398033
@ -17,6 +17,7 @@ ModelImporter:
bakeSimulation: 0 bakeSimulation: 0
resampleCurves: 1 resampleCurves: 1
optimizeGameObjects: 0 optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName: motionNodeName:
rigImportErrors: rigImportErrors:
rigImportWarnings: rigImportWarnings:
@ -58,7 +59,14 @@ ModelImporter:
mirror: 0 mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: [] curves: []
events: [] events:
- time: 0
functionName: Event_Idle
data:
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
transformMask: [] transformMask: []
maskType: 3 maskType: 3
maskSource: {instanceID: 0} maskSource: {instanceID: 0}
@ -71,27 +79,35 @@ ModelImporter:
addColliders: 0 addColliders: 0
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
sortHierarchyByName: 1 sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1 importVisibility: 1
importBlendShapes: 1 importBlendShapes: 1
importCameras: 1 importCameras: 1
importLights: 1 importLights: 1
nodeNameCollisionStrategy: 0
fileIdsGeneration: 2 fileIdsGeneration: 2
swapUVChannels: 0 swapUVChannels: 0
generateSecondaryUV: 0 generateSecondaryUV: 0
useFileUnits: 1 useFileUnits: 1
keepQuads: 0 keepQuads: 0
weldVertices: 1 weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0 preserveHierarchy: 0
skinWeightsMode: 0 skinWeightsMode: 0
maxBonesPerVertex: 4 maxBonesPerVertex: 4
minBoneWeight: 0.001 minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1 meshOptimizationFlags: -1
indexFormat: 0 indexFormat: 0
secondaryUVAngleDistortion: 8 secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001 secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88 secondaryUVHardAngle: 88
secondaryUVMarginMethod: 0
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4 secondaryUVPackMargin: 4
useFileScale: 1 useFileScale: 1
strictVertexDataChecks: 0
tangentSpace: tangentSpace:
normalSmoothAngle: 60 normalSmoothAngle: 60
normalImportMode: 0 normalImportMode: 0
@ -123,6 +139,9 @@ ModelImporter:
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1
avatarSetup: 0 avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 0
importBlendShapeDeformPercent: 0
remapMaterialsIfMaterialImportModeIsNone: 1
additionalBone: 0 additionalBone: 0
userData: userData:
assetBundleName: assetBundleName:

View File

@ -1,7 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: dd2082478fc62fa418e62113afe98626 guid: dd2082478fc62fa418e62113afe98626
ModelImporter: ModelImporter:
serializedVersion: 19301 serializedVersion: 22200
internalIDToNameTable: internalIDToNameTable:
- first: - first:
74: 3019932618851734533 74: 3019932618851734533
@ -17,6 +17,7 @@ ModelImporter:
bakeSimulation: 0 bakeSimulation: 0
resampleCurves: 1 resampleCurves: 1
optimizeGameObjects: 0 optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName: motionNodeName:
rigImportErrors: rigImportErrors:
rigImportWarnings: rigImportWarnings:
@ -58,7 +59,14 @@ ModelImporter:
mirror: 0 mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: [] curves: []
events: [] events:
- time: 0
functionName: Event_Idle
data:
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
transformMask: [] transformMask: []
maskType: 3 maskType: 3
maskSource: {instanceID: 0} maskSource: {instanceID: 0}
@ -71,27 +79,35 @@ ModelImporter:
addColliders: 0 addColliders: 0
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
sortHierarchyByName: 1 sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1 importVisibility: 1
importBlendShapes: 1 importBlendShapes: 1
importCameras: 1 importCameras: 1
importLights: 1 importLights: 1
nodeNameCollisionStrategy: 0
fileIdsGeneration: 2 fileIdsGeneration: 2
swapUVChannels: 0 swapUVChannels: 0
generateSecondaryUV: 0 generateSecondaryUV: 0
useFileUnits: 1 useFileUnits: 1
keepQuads: 0 keepQuads: 0
weldVertices: 1 weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0 preserveHierarchy: 0
skinWeightsMode: 0 skinWeightsMode: 0
maxBonesPerVertex: 4 maxBonesPerVertex: 4
minBoneWeight: 0.001 minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1 meshOptimizationFlags: -1
indexFormat: 0 indexFormat: 0
secondaryUVAngleDistortion: 8 secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001 secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88 secondaryUVHardAngle: 88
secondaryUVMarginMethod: 0
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4 secondaryUVPackMargin: 4
useFileScale: 1 useFileScale: 1
strictVertexDataChecks: 0
tangentSpace: tangentSpace:
normalSmoothAngle: 60 normalSmoothAngle: 60
normalImportMode: 0 normalImportMode: 0
@ -123,6 +139,9 @@ ModelImporter:
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1
avatarSetup: 0 avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 0
importBlendShapeDeformPercent: 0
remapMaterialsIfMaterialImportModeIsNone: 1
additionalBone: 0 additionalBone: 0
userData: userData:
assetBundleName: assetBundleName:

View File

@ -1,49 +1,125 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: d349fa7d8296b804d8eb1a53b798f6a0 guid: d349fa7d8296b804d8eb1a53b798f6a0
ModelImporter: ModelImporter:
serializedVersion: 23 serializedVersion: 22200
fileIDToRecycleName: internalIDToNameTable:
100000: //RootNode - first:
100002: center 1: 100000
100004: head second: //RootNode
100006: joint1 - first:
100008: leaf_r1 1: 100002
100010: leaf_r2 second: center
100012: leaf_r3 - first:
100014: leaf_r4 1: 100004
100016: leaf_r5 second: head
100018: leaf_r6 - first:
100020: leaf_r7 1: 100006
100022: leaf_r8 second: joint1
100024: Root - first:
100026: leaf_l1 1: 100008
100028: leaf_l2 second: leaf_r1
100030: leaf_l3 - first:
100032: leaf_l4 1: 100010
100034: spine second: leaf_r2
400000: //RootNode - first:
400002: center 1: 100012
400004: head second: leaf_r3
400006: joint1 - first:
400008: leaf_r1 1: 100014
400010: leaf_r2 second: leaf_r4
400012: leaf_r3 - first:
400014: leaf_r4 1: 100016
400016: leaf_r5 second: leaf_r5
400018: leaf_r6 - first:
400020: leaf_r7 1: 100018
400022: leaf_r8 second: leaf_r6
400024: Root - first:
400026: leaf_l1 1: 100020
400028: leaf_l2 second: leaf_r7
400030: leaf_l3 - first:
400032: leaf_l4 1: 100022
400034: spine second: leaf_r8
7400000: Anim_Turnipa_Idle - first:
9500000: //RootNode 1: 100024
second: Root
- first:
1: 100026
second: leaf_l1
- first:
1: 100028
second: leaf_l2
- first:
1: 100030
second: leaf_l3
- first:
1: 100032
second: leaf_l4
- first:
1: 100034
second: spine
- first:
4: 400000
second: //RootNode
- first:
4: 400002
second: center
- first:
4: 400004
second: head
- first:
4: 400006
second: joint1
- first:
4: 400008
second: leaf_r1
- first:
4: 400010
second: leaf_r2
- first:
4: 400012
second: leaf_r3
- first:
4: 400014
second: leaf_r4
- first:
4: 400016
second: leaf_r5
- first:
4: 400018
second: leaf_r6
- first:
4: 400020
second: leaf_r7
- first:
4: 400022
second: leaf_r8
- first:
4: 400024
second: Root
- first:
4: 400026
second: leaf_l1
- first:
4: 400028
second: leaf_l2
- first:
4: 400030
second: leaf_l3
- first:
4: 400032
second: leaf_l4
- first:
4: 400034
second: spine
- first:
74: 7400000
second: Anim_Turnipa_Idle
- first:
95: 9500000
second: //RootNode
externalObjects: {} externalObjects: {}
materials: materials:
importMaterials: 1 materialImportMode: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
materialLocation: 1 materialLocation: 1
@ -52,6 +128,7 @@ ModelImporter:
bakeSimulation: 0 bakeSimulation: 0
resampleCurves: 1 resampleCurves: 1
optimizeGameObjects: 0 optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName: motionNodeName:
rigImportErrors: rigImportErrors:
rigImportWarnings: rigImportWarnings:
@ -72,6 +149,7 @@ ModelImporter:
- serializedVersion: 16 - serializedVersion: 16
name: Anim_Turnipa_Idle name: Anim_Turnipa_Idle
takeName: Anim_Turnipa_Idle takeName: Anim_Turnipa_Idle
internalID: 0
firstFrame: 1 firstFrame: 1
lastFrame: 24 lastFrame: 24
wrapMode: 0 wrapMode: 0
@ -92,11 +170,18 @@ ModelImporter:
mirror: 0 mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: [] curves: []
events: [] events:
- time: 0
functionName: Event_Idle
data:
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
transformMask: [] transformMask: []
maskType: 3 maskType: 3
maskSource: {instanceID: 0} maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0 additiveReferencePoseFrame: 1
isReadable: 1 isReadable: 1
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []
@ -104,25 +189,36 @@ ModelImporter:
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1 importVisibility: 1
importBlendShapes: 1 importBlendShapes: 1
importCameras: 1 importCameras: 1
importLights: 1 importLights: 1
nodeNameCollisionStrategy: 0
fileIdsGeneration: 1
swapUVChannels: 0 swapUVChannels: 0
generateSecondaryUV: 0 generateSecondaryUV: 0
useFileUnits: 1 useFileUnits: 1
optimizeMeshForGPU: 1
keepQuads: 0 keepQuads: 0
weldVertices: 1 weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0 preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0 indexFormat: 0
secondaryUVAngleDistortion: 8 secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001 secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88 secondaryUVHardAngle: 88
secondaryUVMarginMethod: 0
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4 secondaryUVPackMargin: 4
useFileScale: 1 useFileScale: 1
previousCalculatedGlobalScale: 0.01 strictVertexDataChecks: 0
hasPreviousCalculatedGlobalScale: 1
tangentSpace: tangentSpace:
normalSmoothAngle: 60 normalSmoothAngle: 60
normalImportMode: 0 normalImportMode: 0
@ -131,10 +227,10 @@ ModelImporter:
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
normalSmoothingSource: 0 normalSmoothingSource: 0
referencedClips: []
importAnimation: 1 importAnimation: 1
copyAvatar: 0
humanDescription: humanDescription:
serializedVersion: 2 serializedVersion: 3
human: [] human: []
skeleton: [] skeleton: []
armTwist: 0.5 armTwist: 0.5
@ -144,13 +240,19 @@ ModelImporter:
armStretch: 0.05 armStretch: 0.05
legStretch: 0.05 legStretch: 0.05
feetSpacing: 0 feetSpacing: 0
globalScale: 1
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 1 skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1
avatarSetup: 1
addHumanoidExtraRootOnlyWhenUsingAvatar: 0
importBlendShapeDeformPercent: 0
remapMaterialsIfMaterialImportModeIsNone: 1
additionalBone: 0 additionalBone: 0
userData: userData:
assetBundleName: assetBundleName:

View File

@ -0,0 +1,148 @@
fileFormatVersion: 2
guid: 6ff09f5dec916cf43a216d3f45d04e24
ModelImporter:
serializedVersion: 22200
internalIDToNameTable:
- first:
74: 5489255043326076178
second: idle
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations:
- serializedVersion: 16
name: idle
takeName: Anim_Brother_Penguin@Idle
internalID: 0
firstFrame: 1
lastFrame: 24
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events:
- time: 0
functionName: Event_Idle
data:
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 0
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 0
remapMaterialsIfMaterialImportModeIsNone: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,141 @@
fileFormatVersion: 2
guid: e485c730f325e984da53d389b691b21e
ModelImporter:
serializedVersion: 22200
internalIDToNameTable:
- first:
74: 5489255043326076178
second: casting
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations:
- serializedVersion: 16
name: casting
takeName: Anim_Brother_Penguin@Idle
internalID: 0
firstFrame: 1
lastFrame: 24
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 0
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 0
remapMaterialsIfMaterialImportModeIsNone: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,148 @@
fileFormatVersion: 2
guid: f29bc9122d93e26458184027a89add32
ModelImporter:
serializedVersion: 22200
internalIDToNameTable:
- first:
74: 7735016008245977959
second: casting_end
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations:
- serializedVersion: 16
name: casting_end
takeName: Anim_Brother_Penguin@Attack
internalID: 0
firstFrame: 81
lastFrame: 95
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events:
- time: 0.19821826
functionName: SkillEvent
data:
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 81
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 0
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 0
remapMaterialsIfMaterialImportModeIsNone: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,141 @@
fileFormatVersion: 2
guid: 659d2b2ff84a9e24882092a6c1799440
ModelImporter:
serializedVersion: 22200
internalIDToNameTable:
- first:
74: 5489255043326076178
second: stun
externalObjects: {}
materials:
materialImportMode: 2
materialName: 0
materialSearch: 1
materialLocation: 1
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations:
- serializedVersion: 16
name: stun
takeName: Anim_Brother_Penguin@Idle
internalID: 0
firstFrame: 1
lastFrame: 24
wrapMode: 0
orientationOffsetY: 0
level: 0
cycleOffset: 0
loop: 0
hasAdditiveReferencePose: 0
loopTime: 1
loopBlend: 0
loopBlendOrientation: 0
loopBlendPositionY: 0
loopBlendPositionXZ: 0
keepOriginalOrientation: 0
keepOriginalPositionY: 1
keepOriginalPositionXZ: 0
heightFromFeet: 0
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
additiveReferencePoseFrame: 1
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 0
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
useFileUnits: 1
keepQuads: 0
weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVMarginMethod: 1
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
tangentImportMode: 3
normalCalculationMode: 4
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
referencedClips: []
importAnimation: 1
humanDescription:
serializedVersion: 3
human: []
skeleton: []
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 0
remapMaterialsIfMaterialImportModeIsNone: 1
additionalBone: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,6 +1,34 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-2394900857822568002 --- !u!1102 &-8755639561307713148
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: casting_end
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -6910274155765617665}
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: 7735016008245977959, guid: f29bc9122d93e26458184027a89add32,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &-6910274155765617665
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -9,7 +37,7 @@ AnimatorStateTransition:
m_Name: m_Name:
m_Conditions: [] m_Conditions: []
m_DstStateMachine: {fileID: 0} m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 110209958} m_DstState: {fileID: 2101183195973841974}
m_Solo: 0 m_Solo: 0
m_Mute: 0 m_Mute: 0
m_IsExit: 0 m_IsExit: 0
@ -22,7 +50,7 @@ AnimatorStateTransition:
m_InterruptionSource: 0 m_InterruptionSource: 0
m_OrderedInterruption: 1 m_OrderedInterruption: 1
m_CanTransitionToSelf: 1 m_CanTransitionToSelf: 1
--- !u!1101 &-1176651538627850613 --- !u!1101 &-3694919467395104073
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
@ -31,19 +59,46 @@ AnimatorStateTransition:
m_Name: m_Name:
m_Conditions: [] m_Conditions: []
m_DstStateMachine: {fileID: 0} m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 110209958} m_DstState: {fileID: 2101183195973841974}
m_Solo: 0 m_Solo: 0
m_Mute: 0 m_Mute: 0
m_IsExit: 0 m_IsExit: 0
serializedVersion: 3 serializedVersion: 3
m_TransitionDuration: 0.25 m_TransitionDuration: 0.25
m_TransitionOffset: 0 m_TransitionOffset: 0
m_ExitTime: 0.3333342 m_ExitTime: 0.57142866
m_HasExitTime: 1 m_HasExitTime: 1
m_HasFixedDuration: 1 m_HasFixedDuration: 1
m_InterruptionSource: 0 m_InterruptionSource: 0
m_OrderedInterruption: 1 m_OrderedInterruption: 1
m_CanTransitionToSelf: 1 m_CanTransitionToSelf: 1
--- !u!1102 &-2703870388702802394
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: casting
m_Speed: 3
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: 5489255043326076178, guid: e485c730f325e984da53d389b691b21e,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000 --- !u!91 &9100000
AnimatorController: AnimatorController:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -97,33 +152,6 @@ AnimatorStateTransition:
m_InterruptionSource: 2 m_InterruptionSource: 2
m_OrderedInterruption: 1 m_OrderedInterruption: 1
m_CanTransitionToSelf: 1 m_CanTransitionToSelf: 1
--- !u!1102 &110209958
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: idle
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: 5489255043326076178, guid: 048cce9ceb4341e4cb0ac61177836594,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &110210968 --- !u!1102 &110210968
AnimatorState: AnimatorState:
serializedVersion: 6 serializedVersion: 6
@ -135,7 +163,7 @@ AnimatorState:
m_Speed: 1 m_Speed: 1
m_CycleOffset: 0 m_CycleOffset: 0
m_Transitions: m_Transitions:
- {fileID: -1176651538627850613} - {fileID: 7244829094584994562}
m_StateMachineBehaviours: [] m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0} m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0 m_IKOnFeet: 0
@ -190,7 +218,7 @@ AnimatorState:
m_Speed: 1 m_Speed: 1
m_CycleOffset: 0 m_CycleOffset: 0
m_Transitions: m_Transitions:
- {fileID: -2394900857822568002} - {fileID: -3694919467395104073}
m_StateMachineBehaviours: [] m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0} m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0 m_IKOnFeet: 0
@ -246,9 +274,6 @@ AnimatorStateMachine:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 110259014} m_State: {fileID: 110259014}
m_Position: {x: 440, y: -210, z: 0} m_Position: {x: 440, y: -210, z: 0}
- serializedVersion: 1
m_State: {fileID: 110209958}
m_Position: {x: 100, y: -140, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 110274110} m_State: {fileID: 110274110}
m_Position: {x: 440, y: -150, z: 0} m_Position: {x: 440, y: -150, z: 0}
@ -258,16 +283,28 @@ AnimatorStateMachine:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 110293690} m_State: {fileID: 110293690}
m_Position: {x: 450, y: -10, z: 0} m_Position: {x: 450, y: -10, z: 0}
- serializedVersion: 1
m_State: {fileID: 4185117199080106135}
m_Position: {x: 130, y: -160, z: 0}
- serializedVersion: 1
m_State: {fileID: -2703870388702802394}
m_Position: {x: 130, y: -100, z: 0}
- serializedVersion: 1
m_State: {fileID: -8755639561307713148}
m_Position: {x: 130, y: -40, z: 0}
- serializedVersion: 1
m_State: {fileID: 2101183195973841974}
m_Position: {x: 440, y: -280, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions: []
m_StateMachineTransitions: {} m_StateMachineTransitions: {}
m_StateMachineBehaviours: [] m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 120, y: -40, z: 0} m_AnyStatePosition: {x: 120, y: -240, z: 0}
m_EntryPosition: {x: 120, y: -276, z: 0} m_EntryPosition: {x: 120, y: -276, z: 0}
m_ExitPosition: {x: 120, y: 40, z: 0} m_ExitPosition: {x: 120, y: -200, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 110209958} m_DefaultState: {fileID: 2101183195973841974}
--- !u!1107 &1107958162325579712 --- !u!1107 &1107958162325579712
AnimatorStateMachine: AnimatorStateMachine:
serializedVersion: 6 serializedVersion: 6
@ -287,3 +324,79 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0} m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 0} m_DefaultState: {fileID: 0}
--- !u!1102 &2101183195973841974
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: idle
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: 5489255043326076178, guid: 6ff09f5dec916cf43a216d3f45d04e24,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &4185117199080106135
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: stun
m_Speed: 2
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: 5489255043326076178, guid: 659d2b2ff84a9e24882092a6c1799440,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &7244829094584994562
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: 2101183195973841974}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.3333342
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1

View File

@ -99,6 +99,33 @@ AnimatorStateTransition:
m_InterruptionSource: 0 m_InterruptionSource: 0
m_OrderedInterruption: 1 m_OrderedInterruption: 1
m_CanTransitionToSelf: 1 m_CanTransitionToSelf: 1
--- !u!1102 &-508676212917486138
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: stun
m_Speed: 2
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: 5489255043326076178, guid: 659d2b2ff84a9e24882092a6c1799440,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000 --- !u!91 &9100000
AnimatorController: AnimatorController:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -291,6 +318,9 @@ AnimatorStateMachine:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 7386440917468860179} m_State: {fileID: 7386440917468860179}
m_Position: {x: 120, y: -20, z: 0} m_Position: {x: 120, y: -20, z: 0}
- serializedVersion: 1
m_State: {fileID: -508676212917486138}
m_Position: {x: 430, y: -20, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions: []

View File

@ -1,7 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 4a2bc35749f82a8428707c96373b70f8 guid: 4a2bc35749f82a8428707c96373b70f8
ModelImporter: ModelImporter:
serializedVersion: 21300 serializedVersion: 22200
internalIDToNameTable: [] internalIDToNameTable: []
externalObjects: {} externalObjects: {}
materials: materials:
@ -56,7 +56,14 @@ ModelImporter:
mirror: 0 mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: [] curves: []
events: [] events:
- time: 0
functionName: Event_Idle
data:
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
transformMask: [] transformMask: []
maskType: 3 maskType: 3
maskSource: {instanceID: 0} maskSource: {instanceID: 0}
@ -69,6 +76,7 @@ ModelImporter:
addColliders: 0 addColliders: 0
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
sortHierarchyByName: 1 sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1 importVisibility: 1
importBlendShapes: 1 importBlendShapes: 1
importCameras: 1 importCameras: 1
@ -96,6 +104,7 @@ ModelImporter:
secondaryUVMinObjectScale: 1 secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4 secondaryUVPackMargin: 4
useFileScale: 1 useFileScale: 1
strictVertexDataChecks: 0
tangentSpace: tangentSpace:
normalSmoothAngle: 60 normalSmoothAngle: 60
normalImportMode: 0 normalImportMode: 0
@ -128,6 +137,7 @@ ModelImporter:
humanoidOversampling: 1 humanoidOversampling: 1
avatarSetup: 0 avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1 addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 0
remapMaterialsIfMaterialImportModeIsNone: 0 remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0 additionalBone: 0
userData: userData:

View File

@ -1,31 +1,71 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: fb2d5d69d993ab04684bd35dc10ab91e guid: fb2d5d69d993ab04684bd35dc10ab91e
ModelImporter: ModelImporter:
serializedVersion: 23 serializedVersion: 22200
fileIDToRecycleName: internalIDToNameTable:
100000: //RootNode - first:
100002: center 1: 100000
100004: line1 second: //RootNode
100006: line2 - first:
100008: line3 1: 100002
100010: line4 second: center
100012: root - first:
100014: spine 1: 100004
100016: tial second: line1
400000: //RootNode - first:
400002: center 1: 100006
400004: line1 second: line2
400006: line2 - first:
400008: line3 1: 100008
400010: line4 second: line3
400012: root - first:
400014: spine 1: 100010
400016: tial second: line4
7400000: Idle - first:
9500000: //RootNode 1: 100012
second: root
- first:
1: 100014
second: spine
- first:
1: 100016
second: tial
- first:
4: 400000
second: //RootNode
- first:
4: 400002
second: center
- first:
4: 400004
second: line1
- first:
4: 400006
second: line2
- first:
4: 400008
second: line3
- first:
4: 400010
second: line4
- first:
4: 400012
second: root
- first:
4: 400014
second: spine
- first:
4: 400016
second: tial
- first:
74: 7400000
second: Idle
- first:
95: 9500000
second: //RootNode
externalObjects: {} externalObjects: {}
materials: materials:
importMaterials: 1 materialImportMode: 1
materialName: 0 materialName: 0
materialSearch: 1 materialSearch: 1
materialLocation: 1 materialLocation: 1
@ -34,6 +74,7 @@ ModelImporter:
bakeSimulation: 0 bakeSimulation: 0
resampleCurves: 1 resampleCurves: 1
optimizeGameObjects: 0 optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName: motionNodeName:
rigImportErrors: rigImportErrors:
rigImportWarnings: rigImportWarnings:
@ -54,6 +95,7 @@ ModelImporter:
- serializedVersion: 16 - serializedVersion: 16
name: Idle name: Idle
takeName: Anim_Puffe@Idle takeName: Anim_Puffe@Idle
internalID: 0
firstFrame: 1 firstFrame: 1
lastFrame: 24 lastFrame: 24
wrapMode: 0 wrapMode: 0
@ -74,11 +116,18 @@ ModelImporter:
mirror: 0 mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: [] curves: []
events: [] events:
- time: 0
functionName: Event_Idle
data:
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
transformMask: [] transformMask: []
maskType: 3 maskType: 3
maskSource: {instanceID: 0} maskSource: {instanceID: 0}
additiveReferencePoseFrame: 0 additiveReferencePoseFrame: 1
isReadable: 1 isReadable: 1
meshes: meshes:
lODScreenPercentages: [] lODScreenPercentages: []
@ -86,25 +135,36 @@ ModelImporter:
meshCompression: 0 meshCompression: 0
addColliders: 0 addColliders: 0
useSRGBMaterialColor: 1 useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1 importVisibility: 1
importBlendShapes: 1 importBlendShapes: 1
importCameras: 1 importCameras: 1
importLights: 1 importLights: 1
nodeNameCollisionStrategy: 0
fileIdsGeneration: 1
swapUVChannels: 0 swapUVChannels: 0
generateSecondaryUV: 0 generateSecondaryUV: 0
useFileUnits: 1 useFileUnits: 1
optimizeMeshForGPU: 1
keepQuads: 0 keepQuads: 0
weldVertices: 1 weldVertices: 1
bakeAxisConversion: 0
preserveHierarchy: 0 preserveHierarchy: 0
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0 indexFormat: 0
secondaryUVAngleDistortion: 8 secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001 secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88 secondaryUVHardAngle: 88
secondaryUVMarginMethod: 0
secondaryUVMinLightmapResolution: 40
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4 secondaryUVPackMargin: 4
useFileScale: 1 useFileScale: 1
previousCalculatedGlobalScale: 0.01 strictVertexDataChecks: 0
hasPreviousCalculatedGlobalScale: 1
tangentSpace: tangentSpace:
normalSmoothAngle: 60 normalSmoothAngle: 60
normalImportMode: 0 normalImportMode: 0
@ -113,10 +173,10 @@ ModelImporter:
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0 legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
blendShapeNormalImportMode: 1 blendShapeNormalImportMode: 1
normalSmoothingSource: 0 normalSmoothingSource: 0
referencedClips: []
importAnimation: 1 importAnimation: 1
copyAvatar: 0
humanDescription: humanDescription:
serializedVersion: 2 serializedVersion: 3
human: [] human: []
skeleton: [] skeleton: []
armTwist: 0.5 armTwist: 0.5
@ -126,13 +186,19 @@ ModelImporter:
armStretch: 0.05 armStretch: 0.05
legStretch: 0.05 legStretch: 0.05
feetSpacing: 0 feetSpacing: 0
globalScale: 1
rootMotionBoneName: rootMotionBoneName:
hasTranslationDoF: 0 hasTranslationDoF: 0
hasExtraRoot: 0 hasExtraRoot: 0
skeletonHasParents: 1 skeletonHasParents: 1
lastHumanDescriptionAvatarSource: {instanceID: 0} lastHumanDescriptionAvatarSource: {instanceID: 0}
autoGenerateAvatarMappingIfUnspecified: 1
animationType: 2 animationType: 2
humanoidOversampling: 1 humanoidOversampling: 1
avatarSetup: 1
addHumanoidExtraRootOnlyWhenUsingAvatar: 0
importBlendShapeDeformPercent: 0
remapMaterialsIfMaterialImportModeIsNone: 1
additionalBone: 0 additionalBone: 0
userData: userData:
assetBundleName: assetBundleName:

Binary file not shown.

View File

@ -518,6 +518,7 @@ public class Actor : MyCoroutine
BossRaidCard_HP(); BossRaidCard_HP();
var pd = _dinfo.Beater_pd; var pd = _dinfo.Beater_pd;
bool ispd = !DSUtil.CheckNull(pd);
if (m_Stat.Get_Stat(eStat.HP) <= 0d) if (m_Stat.Get_Stat(eStat.HP) <= 0d)
{ {
Check_Drain_byKill(_dinfo); Check_Drain_byKill(_dinfo);
@ -526,12 +527,12 @@ public class Actor : MyCoroutine
if (_dinfo.Beater.IsRole(eRole.BattleNPC)) if (_dinfo.Beater.IsRole(eRole.BattleNPC))
ServerInfo.Ins.m_ServerData.Add_TitleCondition(72, 73); // 칭호 : 승차감 좋은 버스, 택시 ServerInfo.Ins.m_ServerData.Add_TitleCondition(72, 73); // 칭호 : 승차감 좋은 버스, 택시
if (!DSUtil.CheckNull(pd) && pd.IsSkill(eEffect.Skill_Ignited) && pd.CC_AddVal2 > 0) if (ispd && pd.IsSkill(eEffect.Skill_Ignited) && pd.CC_AddVal2 > 0)
{ // 버닝효과 체크, 버닝 효과 발동 { // 버닝효과 체크, 버닝 효과 발동
var ccData = Get_CCData(eCC.Burn); var ccData = Get_CCData(eCC.Burn);
if (ccData.CCTime > 0f) if (ccData.CCTime > 0f)
{ {
var other = ActorInfo.Ins.Get_NearstAllyActor(IsEnemy(), Get_position(), 5f); var other = ActorInfo.Ins.Get_Nearest_AllyActor(IsEnemy(), Get_position(), 5f);
if (!DSUtil.CheckNull(other)) if (!DSUtil.CheckNull(other))
{ {
other.DotDamage(eCC.Burn, pd.shooter.Get_DamageInfo(pd), ccData.CCTime, other.DotDamage(eCC.Burn, pd.shooter.Get_DamageInfo(pd), ccData.CCTime,
@ -543,8 +544,7 @@ public class Actor : MyCoroutine
} }
else else
{ {
if (DSUtil.CheckNull(pd) || if (!ispd || ispd && !pd.IsSkill(eEffect.Skill_Ignited) && !pd.IsSkill(eEffect.Select_BodyonFire))
!DSUtil.CheckNull(pd) && !pd.IsSkill(eEffect.Skill_Ignited) && !pd.IsSkill(eEffect.Select_BodyonFire))
Play_Hit(); Play_Hit();
} }
@ -655,7 +655,7 @@ public class Actor : MyCoroutine
Del_Magic(); Del_Magic();
return false; return false;
} }
else if (Vector3.Distance(m_Target.Get_position(), Get_position()) > skilldata.f_SkillRange) else if (!DSUtil.WithInDistance(m_Target.Get_position(), Get_position(), skilldata.f_SkillRange))
{ // 마법 사용 사정거리보다 멀리 있다. 마법 쏘러 가자. { // 마법 사용 사정거리보다 멀리 있다. 마법 쏘러 가자.
return false; return false;
} }
@ -1733,7 +1733,7 @@ public class Actor : MyCoroutine
{ {
m_animation.speed = 1f; m_animation.speed = 1f;
CurAnim = eAnim.Skill; CurAnim = eAnim.Skill;
AnimationPlay(motion); AnimationPlay(IsRole(eRole.Pet) ? "casting" : motion);
if (isTarget) transform.LookAt(m_Target.transform); if (isTarget) transform.LookAt(m_Target.transform);
@ -1741,7 +1741,7 @@ public class Actor : MyCoroutine
if (!DSUtil.CheckNull(m_Magic)) if (!DSUtil.CheckNull(m_Magic))
{ {
if (!string.IsNullOrEmpty(m_Magic.m_SkillTableData.s_NextAnimation)) if (IsRole(eRole.Pet) || !string.IsNullOrEmpty(m_Magic.m_SkillTableData.s_NextAnimation))
{ {
co_casting = StartCoroutine(Co_Casting(m_Magic.m_SkillTableData.f_CastingTime)); co_casting = StartCoroutine(Co_Casting(m_Magic.m_SkillTableData.f_CastingTime));
if (m_NavMeshAgent.isOnNavMesh) m_NavMeshAgent.ResetPath(); if (m_NavMeshAgent.isOnNavMesh) m_NavMeshAgent.ResetPath();
@ -1763,7 +1763,7 @@ public class Actor : MyCoroutine
{ {
yield return new WaitForSeconds(castTime); yield return new WaitForSeconds(castTime);
if (!DSUtil.CheckNull(m_Magic)) if (!DSUtil.CheckNull(m_Magic))
AnimationPlay(m_Magic.m_SkillTableData.s_NextAnimation); AnimationPlay(IsRole(eRole.Pet) ? "casting_end" : m_Magic.m_SkillTableData.s_NextAnimation);
else else
AnimationPlay("casting_end"); AnimationPlay("casting_end");
} }

View File

@ -168,7 +168,7 @@ public class MobActor : Actor
case eMobStatus.Battle: case eMobStatus.Battle:
if (isTarget) if (isTarget)
{ {
if (CurAnim < eAnim.Attack && Vector3.Distance(Get_position(), m_Target.Get_position()) > m_NavMeshAgent.stoppingDistance) if (CurAnim < eAnim.Attack && !DSUtil.WithInDistance(Get_position(), m_Target.Get_position(), m_NavMeshAgent.stoppingDistance))
{ {
if (!isPlaying(eAnim.Attack, eAnim.Attack2, eAnim.Attack3)) if (!isPlaying(eAnim.Attack, eAnim.Attack2, eAnim.Attack3))
Change_MobStatus(eMobStatus.Chase); Change_MobStatus(eMobStatus.Chase);
@ -191,7 +191,7 @@ public class MobActor : Actor
} }
else else
{ {
if (!isPlaying(eAnim.Attack, eAnim.Attack2, eAnim.Attack3) && Vector3.Distance(m_Target.Get_position(), Get_position()) > m_NavStopDistance) if (!isPlaying(eAnim.Attack, eAnim.Attack2, eAnim.Attack3) && !DSUtil.WithInDistance(m_Target.Get_position(), Get_position(), m_NavStopDistance))
Change_MobStatus(eMobStatus.Chase); Change_MobStatus(eMobStatus.Chase);
else if (m_attackCoolTime <= 0f) else if (m_attackCoolTime <= 0f)
{ {
@ -207,7 +207,7 @@ public class MobActor : Actor
if (isTarget) if (isTarget)
{ {
Set_Path(m_Target.Get_position()); Set_Path(m_Target.Get_position());
if (Vector3.Distance(Get_position(), m_Target.Get_position()) <= m_NavMeshAgent.stoppingDistance) if (DSUtil.WithInDistance(Get_position(), m_Target.Get_position(), m_NavMeshAgent.stoppingDistance))
Change_MobStatus(eMobStatus.Attack); Change_MobStatus(eMobStatus.Attack);
} }
Check_Patrol(); Check_Patrol();
@ -308,7 +308,7 @@ public class MobActor : Actor
{ {
// 플레이어가 추적 범위 밖으로 나가면 순찰 상태로 전환 // 플레이어가 추적 범위 밖으로 나가면 순찰 상태로 전환
if (MobStatus != eMobStatus.PatrolRot && !isPlaying(eAnim.Attack, eAnim.Skill) && if (MobStatus != eMobStatus.PatrolRot && !isPlaying(eAnim.Attack, eAnim.Skill) &&
(!isTarget || Vector3.Distance(OriginalPos, Get_position()) > m_MonsterTableData.f_BaseChaseRange)) (!isTarget || !DSUtil.WithInDistance(OriginalPos, Get_position(), m_MonsterTableData.f_BaseChaseRange)))
Change_MobStatus(eMobStatus.BattleStop); Change_MobStatus(eMobStatus.BattleStop);
} }

View File

@ -24,7 +24,7 @@ public class PetActor : MyActor
} }
base.Update(); base.Update();
if (!IsStop && (!isTarget || m_Target.IsDead()) && Vector3.Distance(OwnerActor.Get_position(), Get_position()) > 2) if (!IsStop && (!isTarget || m_Target.IsDead()) && !DSUtil.WithInDistance(OwnerActor.Get_position(), Get_position(), 2))
{ // 마녀 따라다니기 { // 마녀 따라다니기
Follow_PC(); Follow_PC();
} }

View File

@ -199,14 +199,14 @@ public class ActorInfo : MonoBehaviour
{ {
var actors = Get_EnemyActors(isEnemy, pos, dist); var actors = Get_EnemyActors(isEnemy, pos, dist);
Actor nearest = null; Actor nearest = null;
float minDistance = float.MaxValue; float minDistanceSqr = float.MaxValue;
foreach (var actor in actors) foreach (var actor in actors)
{ {
float distance = Vector3.Distance(pos, actor.Get_position()); float distanceSqr = (pos - actor.Get_position()).sqrMagnitude;
if (distance < minDistance) if (distanceSqr < minDistanceSqr)
{ {
minDistance = distance; minDistanceSqr = distanceSqr;
nearest = actor; nearest = actor;
} }
} }
@ -244,18 +244,18 @@ public class ActorInfo : MonoBehaviour
/// <summary> /// <summary>
/// 가장 가까운 동맹 하나를 찾는다. /// 가장 가까운 동맹 하나를 찾는다.
/// </summary> /// </summary>
public Actor Get_NearstAllyActor(bool isEnemy, Vector3 pos, float dist = 0f) public Actor Get_Nearest_AllyActor(bool isEnemy, Vector3 pos, float dist = 0f)
{ {
var actors = Get_AlliesActors(isEnemy, pos, dist); var actors = Get_AlliesActors(isEnemy, pos, dist);
Actor nearest = null; Actor nearest = null;
float minDistance = float.MaxValue; float minDistanceSqr = float.MaxValue;
foreach (var actor in actors) foreach (var actor in actors)
{ {
float distance = Vector3.Distance(pos, actor.Get_position()); float distanceSqr = (pos - actor.Get_position()).sqrMagnitude;
if (distance < minDistance) if (distanceSqr < minDistanceSqr)
{ {
minDistance = distance; minDistanceSqr = distanceSqr;
nearest = actor; nearest = actor;
} }
} }
@ -264,7 +264,6 @@ public class ActorInfo : MonoBehaviour
return nearest; return nearest;
} }
/// <summary> /// <summary>
/// dist 가 0 초과면 범위 내의 적들만 찾는다. /// dist 가 0 초과면 범위 내의 적들만 찾는다.
/// attackType 가 Max가 아닌 경우면 같은 공격 타입의 적들만 찾는다. /// attackType 가 Max가 아닌 경우면 같은 공격 타입의 적들만 찾는다.
@ -308,32 +307,6 @@ public class ActorInfo : MonoBehaviour
return actors; return actors;
} }
//public List<Actor> Get_EnemyActors(bool isEnemy, Vector3 pos, float dist = 0f, eAttackType attackType = eAttackType.Max)
//{
// var actors = listPool.Get();
// foreach (var item in dic_actor)
// {
// foreach (var groupEntry in item.Value)
// {
// foreach (var prefabEntry in groupEntry.Value)
// {
// foreach (var actor in prefabEntry.Value)
// {
// if (!DSUtil.CheckNull(actor) && actor.IsEnemy() != isEnemy && !actor.IsDead() && !actor.Is_Immortal() &&
// (dist <= 0f || Vector3.Distance(pos, actor.Get_position()) <= dist))
// {
// // 공격 타입 조건을 만족하는지 확인
// if (attackType == eAttackType.Max || attackType == actor.m_AttackType)
// actors.Add(actor);
// }
// }
// }
// }
// }
// return actors;
//}
/// <summary> /// <summary>
/// dist 가 0 초과면 범위 내의 동맹들만 찾는다. /// dist 가 0 초과면 범위 내의 동맹들만 찾는다.
@ -351,7 +324,7 @@ public class ActorInfo : MonoBehaviour
foreach (var actor in prefabEntry.Value) foreach (var actor in prefabEntry.Value)
{ {
if (!DSUtil.CheckNull(actor) && actor.IsEnemy() == isEnemy && !actor.IsDead() && !actor.Is_Immortal() && if (!DSUtil.CheckNull(actor) && actor.IsEnemy() == isEnemy && !actor.IsDead() && !actor.Is_Immortal() &&
(dist <= 0f || Vector3.Distance(pos, actor.Get_position()) <= dist)) (dist <= 0f || DSUtil.WithInDistance(pos, actor.Get_position(), dist)))
{ {
actors.Add(actor); actors.Add(actor);
} }