불사의 몹 작업 중...

This commit is contained in:
Ino 2025-02-21 10:07:35 +09:00
parent 45e4a60b4d
commit 75c5ca2b00
21 changed files with 571 additions and 589 deletions

View File

@ -1,133 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Map_C01_Atlas-mat-_MainTex-atlas-0
m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap:
RenderType: Opaque
disabledShaderPasses: []
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 0
- _GlossyReflections: 0
- _Metallic: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []
--- !u!114 &977942118703106511
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 7

View File

@ -1,69 +1,185 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: e4fa53dc0649ecb4bb73237d443cd95e guid: e4fa53dc0649ecb4bb73237d443cd95e
ModelImporter: ModelImporter:
serializedVersion: 23 serializedVersion: 22200
fileIDToRecycleName: internalIDToNameTable:
100000: //RootNode - first:
100002: center 1: 100000
100004: claw_l1 second: //RootNode
100006: claw_l2 - first:
100008: claw_l3 1: 100002
100010: claw_l4 second: center
100012: claw_l5 - first:
100014: claw_l6 1: 100004
100016: claw_r1 second: claw_l1
100018: claw_r2 - first:
100020: claw_r3 1: 100006
100022: claw_r4 second: claw_l2
100024: claw_r5 - first:
100026: claw_r6 1: 100008
100028: finger_l1 second: claw_l3
100030: finger_l2 - first:
100032: finger_l3 1: 100010
100034: finger_r1 second: claw_l4
100036: finger_r2 - first:
100038: finger_r3 1: 100012
100040: hand_l second: claw_l5
100042: hand_r - first:
100044: head 1: 100014
100046: head_end second: claw_l6
100048: root - first:
100050: spine1 1: 100016
100052: spine2 second: claw_r1
100054: spine3 - first:
400000: //RootNode 1: 100018
400002: center second: claw_r2
400004: claw_l1 - first:
400006: claw_l2 1: 100020
400008: claw_l3 second: claw_r3
400010: claw_l4 - first:
400012: claw_l5 1: 100022
400014: claw_l6 second: claw_r4
400016: claw_r1 - first:
400018: claw_r2 1: 100024
400020: claw_r3 second: claw_r5
400022: claw_r4 - first:
400024: claw_r5 1: 100026
400026: claw_r6 second: claw_r6
400028: finger_l1 - first:
400030: finger_l2 1: 100028
400032: finger_l3 second: finger_l1
400034: finger_r1 - first:
400036: finger_r2 1: 100030
400038: finger_r3 second: finger_l2
400040: hand_l - first:
400042: hand_r 1: 100032
400044: head second: finger_l3
400046: head_end - first:
400048: root 1: 100034
400050: spine1 second: finger_r1
400052: spine2 - first:
400054: spine3 1: 100036
7400000: Attack second: finger_r2
9500000: //RootNode - first:
1: 100038
second: finger_r3
- first:
1: 100040
second: hand_l
- first:
1: 100042
second: hand_r
- first:
1: 100044
second: head
- first:
1: 100046
second: head_end
- first:
1: 100048
second: root
- first:
1: 100050
second: spine1
- first:
1: 100052
second: spine2
- first:
1: 100054
second: spine3
- first:
4: 400000
second: //RootNode
- first:
4: 400002
second: center
- first:
4: 400004
second: claw_l1
- first:
4: 400006
second: claw_l2
- first:
4: 400008
second: claw_l3
- first:
4: 400010
second: claw_l4
- first:
4: 400012
second: claw_l5
- first:
4: 400014
second: claw_l6
- first:
4: 400016
second: claw_r1
- first:
4: 400018
second: claw_r2
- first:
4: 400020
second: claw_r3
- first:
4: 400022
second: claw_r4
- first:
4: 400024
second: claw_r5
- first:
4: 400026
second: claw_r6
- first:
4: 400028
second: finger_l1
- first:
4: 400030
second: finger_l2
- first:
4: 400032
second: finger_l3
- first:
4: 400034
second: finger_r1
- first:
4: 400036
second: finger_r2
- first:
4: 400038
second: finger_r3
- first:
4: 400040
second: hand_l
- first:
4: 400042
second: hand_r
- first:
4: 400044
second: head
- first:
4: 400046
second: head_end
- first:
4: 400048
second: root
- first:
4: 400050
second: spine1
- first:
4: 400052
second: spine2
- first:
4: 400054
second: spine3
- first:
74: 7400000
second: Attack
- 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
@ -72,6 +188,7 @@ ModelImporter:
bakeSimulation: 0 bakeSimulation: 0
resampleCurves: 1 resampleCurves: 1
optimizeGameObjects: 0 optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName: motionNodeName:
rigImportErrors: rigImportErrors:
rigImportWarnings: rigImportWarnings:
@ -92,6 +209,7 @@ ModelImporter:
- serializedVersion: 16 - serializedVersion: 16
name: Attack name: Attack
takeName: Anim_Minotos@Attack takeName: Anim_Minotos@Attack
internalID: 0
firstFrame: 161 firstFrame: 161
lastFrame: 180 lastFrame: 180
wrapMode: 0 wrapMode: 0
@ -112,7 +230,14 @@ ModelImporter:
mirror: 0 mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: [] curves: []
events: [] events:
- time: 0.2
functionName: Projectile
data:
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
transformMask: [] transformMask: []
maskType: 3 maskType: 3
maskSource: {instanceID: 0} maskSource: {instanceID: 0}
@ -124,25 +249,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
@ -151,10 +287,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
@ -164,13 +300,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,5 +1,27 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-7024161768954648885
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: 110209958}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.6842104
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
@ -28,84 +50,9 @@ AnimatorController:
m_IKPass: 0 m_IKPass: 0
m_SyncedLayerAffectsTiming: 0 m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 9100000}
--- !u!1101 &110123642
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 6
m_ConditionEvent: animation
m_EventTreshold: 1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 110209958}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.18123245
m_TransitionOffset: 0
m_ExitTime: 0.77285355
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 2
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &110123864
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 6
m_ConditionEvent: animation
m_EventTreshold: 2
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 110259014}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0.9
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 2
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &110136286
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 6
m_ConditionEvent: animation
m_EventTreshold: 4
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 110210968}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0.9
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &110142034 --- !u!1101 &110142034
AnimatorStateTransition: AnimatorStateTransition:
m_ObjectHideFlags: 3 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
@ -128,193 +75,17 @@ AnimatorStateTransition:
m_InterruptionSource: 2 m_InterruptionSource: 2
m_OrderedInterruption: 1 m_OrderedInterruption: 1
m_CanTransitionToSelf: 1 m_CanTransitionToSelf: 1
--- !u!1101 &110163238
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 7
m_ConditionEvent: animation
m_EventTreshold: 1
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 110212928}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.48473692
m_TransitionOffset: 0
m_ExitTime: 0.9053422
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 2
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &110176010
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 7
m_ConditionEvent: animation
m_EventTreshold: 4
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 110212928}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.6842104
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 2
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &110180560
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 7
m_ConditionEvent: animation
m_EventTreshold: 3
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 110212928}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.6842103
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 2
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &110183690
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 6
m_ConditionEvent: animation
m_EventTreshold: 3
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 110274110}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0.9
m_HasExitTime: 0
m_HasFixedDuration: 0
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &110185958
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 7
m_ConditionEvent: animation
m_EventTreshold: 5
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 110212928}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.68421066
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 2
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &110191178
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 6
m_ConditionEvent: animation
m_EventTreshold: 5
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 110293690}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.1
m_TransitionOffset: 0
m_ExitTime: 0.9
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &110193646
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 7
m_ConditionEvent: animation
m_EventTreshold: 2
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 110212928}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25001493
m_TransitionOffset: 0.022605367
m_ExitTime: 0.4159544
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 2
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &110209958 --- !u!1102 &110209958
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Idle m_Name: idle
m_Speed: 1 m_Speed: 1
m_CycleOffset: 0 m_CycleOffset: 0
m_Transitions: m_Transitions: []
- {fileID: 110163238}
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
@ -330,76 +101,17 @@ AnimatorState:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &110210968
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Damage
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 110176010}
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: 8dc03e5d4ddea0745a4437dd5f5619f8, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &110212928
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: New State
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 110123864}
- {fileID: 110123642}
- {fileID: 110183690}
- {fileID: 110136286}
- {fileID: 110191178}
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: 0}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &110259014 --- !u!1102 &110259014
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Move m_Name: run
m_Speed: 1 m_Speed: 1
m_CycleOffset: 0 m_CycleOffset: 0
m_Transitions: m_Transitions: []
- {fileID: 110193646}
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
@ -417,16 +129,16 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &110274110 --- !u!1102 &110274110
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Attack m_Name: attack
m_Speed: 1 m_Speed: 1
m_CycleOffset: 0 m_CycleOffset: 0
m_Transitions: m_Transitions:
- {fileID: 110180560} - {fileID: -7024161768954648885}
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
@ -444,16 +156,15 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &110293690 --- !u!1102 &110293690
AnimatorState: AnimatorState:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Die m_Name: die
m_Speed: 1 m_Speed: 1
m_CycleOffset: 0 m_CycleOffset: 0
m_Transitions: m_Transitions: []
- {fileID: 110185958}
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
@ -471,7 +182,7 @@ AnimatorState:
m_TimeParameter: m_TimeParameter:
--- !u!1107 &110710218 --- !u!1107 &110710218
AnimatorStateMachine: AnimatorStateMachine:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
@ -480,22 +191,16 @@ AnimatorStateMachine:
m_ChildStates: m_ChildStates:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 110259014} m_State: {fileID: 110259014}
m_Position: {x: 756, y: -204, z: 0} m_Position: {x: 410, y: -210, z: 0}
- serializedVersion: 1
m_State: {fileID: 110212928}
m_Position: {x: 108, y: -132, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 110209958} m_State: {fileID: 110209958}
m_Position: {x: 756, y: -264, z: 0} m_Position: {x: 410, y: -270, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 110274110} m_State: {fileID: 110274110}
m_Position: {x: 756, y: -144, z: 0} m_Position: {x: 410, y: -150, z: 0}
- serializedVersion: 1
m_State: {fileID: 110210968}
m_Position: {x: 756, y: -72, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 110293690} m_State: {fileID: 110293690}
m_Position: {x: 756, y: 0, z: 0} m_Position: {x: 410, y: -90, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions: []
@ -503,12 +208,12 @@ AnimatorStateMachine:
m_StateMachineBehaviours: [] m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 120, y: -240, 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: 756, y: 696, 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: 110212928} m_DefaultState: {fileID: 110209958}
--- !u!1107 &1107958162325579712 --- !u!1107 &1107958162325579712
AnimatorStateMachine: AnimatorStateMachine:
serializedVersion: 5 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}

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

File diff suppressed because one or more lines are too long

Binary file not shown.

View File

@ -0,0 +1,139 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3930211096818210724
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8879829914547031212}
- component: {fileID: -4986863589594497723}
m_Layer: 0
m_Name: Effect_Revive30Shield
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8879829914547031212
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3930211096818210724}
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: 8589803751101775554}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &-4986863589594497723
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3930211096818210724}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 456d2bd1c5c2e5e4b8b948836c4975a4, type: 3}
m_Name:
m_EditorClassIdentifier:
NoUseParticleTime: 0
OffTime: 5
e_EffectLocation: 1
--- !u!1001 &7731823469870224961
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 8879829914547031212}
m_Modifications:
- target: {fileID: 2051927820289550467, guid: 0d4dba4071585814d9242f7b671bbd6c,
type: 3}
propertyPath: m_LocalScale.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2051927820289550467, guid: 0d4dba4071585814d9242f7b671bbd6c,
type: 3}
propertyPath: m_LocalScale.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2051927820289550467, guid: 0d4dba4071585814d9242f7b671bbd6c,
type: 3}
propertyPath: m_LocalScale.z
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 2051927820289550467, guid: 0d4dba4071585814d9242f7b671bbd6c,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2051927820289550467, guid: 0d4dba4071585814d9242f7b671bbd6c,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2051927820289550467, guid: 0d4dba4071585814d9242f7b671bbd6c,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2051927820289550467, guid: 0d4dba4071585814d9242f7b671bbd6c,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2051927820289550467, guid: 0d4dba4071585814d9242f7b671bbd6c,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2051927820289550467, guid: 0d4dba4071585814d9242f7b671bbd6c,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2051927820289550467, guid: 0d4dba4071585814d9242f7b671bbd6c,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2051927820289550467, guid: 0d4dba4071585814d9242f7b671bbd6c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2051927820289550467, guid: 0d4dba4071585814d9242f7b671bbd6c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2051927820289550467, guid: 0d4dba4071585814d9242f7b671bbd6c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5794822055945782266, guid: 0d4dba4071585814d9242f7b671bbd6c,
type: 3}
propertyPath: m_Name
value: FX_Shield_Ring
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0d4dba4071585814d9242f7b671bbd6c, type: 3}
--- !u!4 &8589803751101775554 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 2051927820289550467, guid: 0d4dba4071585814d9242f7b671bbd6c,
type: 3}
m_PrefabInstance: {fileID: 7731823469870224961}
m_PrefabAsset: {fileID: 0}

View File

@ -1,7 +1,6 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 6a35dc37343a3fa42bd2d7d06e7610bb guid: 97fa975daab7b3349b57f2a02ce31c5e
folderAsset: yes PrefabImporter:
DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: assetBundleName:

View File

@ -2477,7 +2477,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 935c913087b349141aa632be4f8c2689, type: 3} m_Script: {fileID: 11500000, guid: 935c913087b349141aa632be4f8c2689, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
n_MonsterID: 10003 n_MonsterID: 10004
n_SpawnerId: 1 n_SpawnerId: 1
--- !u!1 &2246745228298233982 --- !u!1 &2246745228298233982
GameObject: GameObject:
@ -7243,7 +7243,7 @@ GameObject:
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 2147483647 m_StaticEditorFlags: 2147483647
m_IsActive: 0 m_IsActive: 1
--- !u!4 &8543470032144370301 --- !u!4 &8543470032144370301
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -4789,7 +4789,7 @@ ParticleSystemRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 2100000, guid: e9e932d740ced6e43a6253542a11dacf, type: 2} - {fileID: 2100000, guid: 2867f93c072fa2c478ef25d83fc61ec1, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0
@ -9631,7 +9631,7 @@ ParticleSystemRenderer:
m_RenderingLayerMask: 1 m_RenderingLayerMask: 1
m_RendererPriority: 0 m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 2100000, guid: e9e932d740ced6e43a6253542a11dacf, type: 2} - {fileID: 2100000, guid: 2867f93c072fa2c478ef25d83fc61ec1, type: 2}
m_StaticBatchInfo: m_StaticBatchInfo:
firstSubMesh: 0 firstSubMesh: 0
subMeshCount: 0 subMeshCount: 0
@ -9890,8 +9890,8 @@ GameObject:
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 7444803107816255597} - component: {fileID: 7444803107816255597}
- component: {fileID: 3816214297771665647}
- component: {fileID: 7444803107823443875} - component: {fileID: 7444803107823443875}
- component: {fileID: 6359705616507258822}
- component: {fileID: -3567065910704887870} - component: {fileID: -3567065910704887870}
- component: {fileID: 6263374708138625017} - component: {fileID: 6263374708138625017}
- component: {fileID: -1818315483074967680} - component: {fileID: -1818315483074967680}
@ -9912,13 +9912,35 @@ Transform:
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 3, y: 3, z: 3}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 7444803107816255603} - {fileID: 7444803107816255603}
- {fileID: 7444803107816255601} - {fileID: 7444803107816255601}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3816214297771665647
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7444803107816156173}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b30eb42969f0c8341b464c9f98f85125, type: 3}
m_Name:
m_EditorClassIdentifier:
gos_Effect: []
m_Role: 0
m_SubRole: 0
m_AttackType: 0
m_animation: {fileID: 0}
_target: {fileID: 0}
isTarget: 0
MagicID: 0
HealCount: 0
HealRate: 0.1
--- !u!95 &7444803107823443875 --- !u!95 &7444803107823443875
Animator: Animator:
serializedVersion: 5 serializedVersion: 5
@ -9940,28 +9962,6 @@ Animator:
m_AllowConstantClipSamplingOptimization: 1 m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0 m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0 m_WriteDefaultValuesOnDisable: 0
--- !u!114 &6359705616507258822
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7444803107816156173}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f985004e8ad29cf428f80c433e48ab9c, type: 3}
m_Name:
m_EditorClassIdentifier:
gos_Effect: []
m_Role: 0
m_SubRole: 0
m_AttackType: 0
m_animation: {fileID: 0}
_target: {fileID: 0}
isTarget: 0
MagicID: 0
HealCount: 0
HealRate: 0.1
--- !u!65 &-3567065910704887870 --- !u!65 &-3567065910704887870
BoxCollider: BoxCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -9981,7 +9981,7 @@ BoxCollider:
m_ProvidesContacts: 0 m_ProvidesContacts: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 3 serializedVersion: 3
m_Size: {x: 1.2790182, y: 1.0529177, z: 1.0884862} m_Size: {x: 1, y: 1.0529177, z: 0.5}
m_Center: {x: -0.03156948, y: 0.43169808, z: 0.00053426996} m_Center: {x: -0.03156948, y: 0.43169808, z: 0.00053426996}
--- !u!195 &6263374708138625017 --- !u!195 &6263374708138625017
NavMeshAgent: NavMeshAgent:

View File

@ -0,0 +1,71 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1175524540571020502
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8021888228437686570}
- component: {fileID: 3392373663720083392}
- component: {fileID: 8240083998892309707}
m_Layer: 0
m_Name: Minotos_Attack
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8021888228437686570
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1175524540571020502}
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: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &3392373663720083392
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1175524540571020502}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e5d2fd9d460da6a4d87b4be83a4cdc32, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Pierce: 0
str_HitEffect:
m_ShowTimeOverEffect: 1
--- !u!65 &8240083998892309707
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1175524540571020502}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 1
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 3, y: 2, z: 3}
m_Center: {x: 0, y: 0, z: 0}

View File

@ -1,8 +1,7 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: a520ab56ffb794e49a2c38dc494dcbd2 guid: e603669dec375f448af957bb846d404b
NativeFormatImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
mainObjectFileID: 2100000
userData: userData:
assetBundleName: assetBundleName:
assetBundleVariant: assetBundleVariant:

View File

@ -73,9 +73,13 @@ public class Actor : MyCoroutine
public int n_Reincarnation public int n_Reincarnation
{ {
get { return _Reincarnation; } get { return _Reincarnation; }
set { _Reincarnation = value; _Reincarnation.RandomizeCryptoKey(); } set
{
_Reincarnation = value;
_Reincarnation.RandomizeCryptoKey();
}
} }
protected float NoDmgTime = 0f;
protected void Init_CC() protected void Init_CC()
{ {
@ -91,6 +95,7 @@ public class Actor : MyCoroutine
dic_skillextra[key] = false; dic_skillextra[key] = false;
foreach (var key in dic_CCEffect.Keys.ToList()) foreach (var key in dic_CCEffect.Keys.ToList())
dic_CCEffect[key].Off_Imm(); dic_CCEffect[key].Off_Imm();
NoDmgTime = 0f;
} }
protected void Check_CCAddRate(eCC cc, Actor actor, double v = 0) protected void Check_CCAddRate(eCC cc, Actor actor, double v = 0)
{ {
@ -140,6 +145,7 @@ public class Actor : MyCoroutine
maxY = rendererMaxY; maxY = rendererMaxY;
} }
} }
maxY = Mathf.Min(0.5f, maxY);
var hud_hp = new GameObject("HUD_HP"); var hud_hp = new GameObject("HUD_HP");
tf_HUD_HP = hud_hp.transform; tf_HUD_HP = hud_hp.transform;
@ -177,6 +183,8 @@ public class Actor : MyCoroutine
{ {
yield return null; yield return null;
if (NoDmgTime > 0f) NoDmgTime -= Time.deltaTime;
foreach (var item in dic_ccData) foreach (var item in dic_ccData)
{ {
if (item.Value.CCReduceTime > 0f) if (item.Value.CCReduceTime > 0f)
@ -472,6 +480,7 @@ public class Actor : MyCoroutine
public virtual void Cal_Damage(DamageInfo _dinfo) public virtual void Cal_Damage(DamageInfo _dinfo)
{ {
if (IsDead()) return; if (IsDead()) return;
if (NoDmgTime > 0f) _dinfo.Damage = 0d;
if (MyValue.MyChoiceMapData.Get_MapData().e_Dungeon == eDungeon.d3_Nightmare && IsSubRole(eSubRol.Boss)) if (MyValue.MyChoiceMapData.Get_MapData().e_Dungeon == eDungeon.d3_Nightmare && IsSubRole(eSubRol.Boss))
{ {
@ -564,7 +573,7 @@ public class Actor : MyCoroutine
} }
protected virtual void After_Die() protected virtual void After_Die()
{ {
Check_Extra(eSkillExtraTiming.AfterDie); Check_Extra(eSkillExtraTiming.AfterDie); // 부활 체크 (Reincarnation 은 여기서 처리)
if (!IsDead()) return; // 부활한 경우 if (!IsDead()) return; // 부활한 경우
#if UNITY_EDITOR #if UNITY_EDITOR

View File

@ -1,4 +1,3 @@
using System;
using System.Collections; using System.Collections;
using UnityEngine; using UnityEngine;

View File

@ -0,0 +1,8 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Boss_Minotos : BossMobActor
{
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: b30eb42969f0c8341b464c9f98f85125
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,4 +1,5 @@
using System; using System;
using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using UnityEngine; using UnityEngine;
using UnityEngine.SceneManagement; using UnityEngine.SceneManagement;
@ -598,11 +599,47 @@ public class MobActor : Actor
case eSkillExtraType.PerHPBuff_AASPD: case eSkillExtraType.PerHPBuff_AASPD:
PerHPBuff(eCC.PerHPBuff_AMDEF, eCC.ATK_Mul, eCC.ATKSPD_Up, temp, skilltype); PerHPBuff(eCC.PerHPBuff_AMDEF, eCC.ATK_Mul, eCC.ATKSPD_Up, temp, skilltype);
break; break;
case eSkillExtraType.Revive30:
if (!IsDead())
{
bool revive = false;
if (n_Reincarnation == 3 && Get_hpLostPercentage() >= temp.f_ExtraValue1)
revive = true;
else if (n_Reincarnation == 2 && Get_hpLostPercentage() >= temp.f_ExtraValue1 * 2f)
revive = true;
else if (n_Reincarnation == 1 && Get_hpLostPercentage() >= temp.f_ExtraValue1 * 3f)
revive = true;
if (revive)
{
if (!DSUtil.CheckNull(revive_co)) StopCoroutine(revive_co);
revive_co = StartCoroutine(Co_Revive(3f, temp.f_ExtraValue2, skilltype));
}
}
else
n_Reincarnation = 0;
break;
} }
} }
} }
} }
Coroutine revive_co;
IEnumerator Co_Revive(float revivetime, float nodmgtime, SkillTypeConfigTableData skilltype)
{
--n_Reincarnation;
DeadStatus = true;
Play_Die();
yield return new WaitForSeconds(revivetime);
Play_Idle();
DeadStatus = false;
NoDmgTime = nodmgtime;
InGameInfo.Ins.Show_Effect(skilltype.e_SkillEffect, this, skilltype.e_EffectLocation, nodmgtime);
}
void PerHPBuff(eCC skilltypecc, eCC buffcc1, eCC buffcc2, SkillListTableData temp, SkillTypeConfigTableData skilltype) void PerHPBuff(eCC skilltypecc, eCC buffcc1, eCC buffcc2, SkillListTableData temp, SkillTypeConfigTableData skilltype)
{ {
if (!dic_ccValue.ContainsKey(buffcc1)) dic_ccValue.Add(buffcc1, 0f); if (!dic_ccValue.ContainsKey(buffcc1)) dic_ccValue.Add(buffcc1, 0f);
@ -672,10 +709,12 @@ public class MobActor : Actor
case eSkillExtraType.Reincarnation: case eSkillExtraType.Reincarnation:
n_Reincarnation = (int)pSkill.f_ExtraValue1; // 부활 횟수 n_Reincarnation = (int)pSkill.f_ExtraValue1; // 부활 횟수
break; break;
case eSkillExtraType.Revive30:
n_Reincarnation = 3;
break;
} }
} }
public void Set_NoUpdate_byTool(MonsterTableData mobdata) public void Set_NoUpdate_byTool(MonsterTableData mobdata)
{ {
NoUpdate_byTool = true; NoUpdate_byTool = true;

View File

@ -54,10 +54,4 @@ public class WitchEnemyActor : MobActor
centerpos = new Vector3(centerpos.x, y, centerpos.z); centerpos = new Vector3(centerpos.x, y, centerpos.z);
ProjectileInfo.Ins.Shoot_Projectile("MagicMissile", this, m_Target, 1f, centerpos, 10f); ProjectileInfo.Ins.Shoot_Projectile("MagicMissile", this, m_Target, 1f, centerpos, 10f);
} }
protected override void Set_Die()
{
base.Set_Die();
//GameUI.Ins.IngameUI.m_MemoryWitchResult.Add_ClearID(m_SpawnerId);
}
} }

View File

@ -8,7 +8,7 @@ public enum eSkillTarget { Enemy, Self, SelfEnemy, Team, Pet }
public enum eSkillExtraType { None, Frost, Cure, Freezing, Blood, Poison, Burn, Stun, Slow, StatUp, ManaShield, SwordShield, public enum eSkillExtraType { None, Frost, Cure, Freezing, Blood, Poison, Burn, Stun, Slow, StatUp, ManaShield, SwordShield,
SpeedUp, DefenceDecrease, Aggro, VampirHeal, Knockback, Airborne, Curse, ManaBurn, HPBurn, SpeedUp, DefenceDecrease, Aggro, VampirHeal, Knockback, Airborne, Curse, ManaBurn, HPBurn,
SilenceCurse, Barrier, Reincarnation, Blind, PerHPBuff_SPD, PerHPBuff_ADEF, PerHPBuff_AMDEF, SilenceCurse, Barrier, Reincarnation, Blind, PerHPBuff_SPD, PerHPBuff_ADEF, PerHPBuff_AMDEF,
PerHPBuff_AASPD, KnockbackStun, } PerHPBuff_AASPD, KnockbackStun, Revive30 }
public class SkillListTableData : TableDataBase public class SkillListTableData : TableDataBase
{ {