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

maga golem a,b

This commit is contained in:
Ino 2025-02-11 09:15:02 +09:00
parent 26dc9d64b0
commit a2207a2e43
23 changed files with 1499 additions and 341 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/ResWork/Suriyun/Monster Pack Desert/Animations/Mega Golem/Anim_Mega Golem@Attack.fbx.meta
View File

@ -62,7 +62,7 @@ ModelImporter:
events:
- time: 0.6724511
functionName: Projectile
data: MeleeAttack
data:
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 0

380
Assets/ResWork/Suriyun/Monster Pack Desert/Animations/Mega Golem/Mega Golem_Animations_Check.controller
View File

@ -1,5 +1,27 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-6225412054138201639
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.571429
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@ -28,81 +50,6 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
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: 0
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: 0
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
AnimatorStateTransition:
m_ObjectHideFlags: 1
@ -128,181 +75,6 @@ AnimatorStateTransition:
m_InterruptionSource: 2
m_OrderedInterruption: 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.4530812
m_TransitionOffset: 0.032492988
m_ExitTime: 0.48138115
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.07034698
m_TransitionOffset: 0
m_ExitTime: 0.82092535
m_HasExitTime: 0
m_HasFixedDuration: 1
m_InterruptionSource: 2
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &110209958
AnimatorState:
serializedVersion: 6
@ -310,11 +82,10 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Idle
m_Name: idle
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 110163238}
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@ -324,7 +95,8 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -4165463316885468178, guid: 05ac25d8fa5794f4db21ba46130d25dc, type: 3}
m_Motion: {fileID: -4165463316885468178, guid: 05ac25d8fa5794f4db21ba46130d25dc,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@ -337,11 +109,11 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Damage
m_Name: hit
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 110176010}
- {fileID: -6225412054138201639}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@ -351,38 +123,8 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 1854593164380556222, guid: b396186ccd0b192418cefba993e47e33, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &110212928
AnimatorState:
serializedVersion: 6
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_Motion: {fileID: 1854593164380556222, guid: b396186ccd0b192418cefba993e47e33,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@ -395,11 +137,10 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Move
m_Name: run
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 110193646}
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@ -409,7 +150,8 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -4542553262401549784, guid: 1fc050c1682de6548b8e069f730c559e, type: 3}
m_Motion: {fileID: -4542553262401549784, guid: 1fc050c1682de6548b8e069f730c559e,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@ -422,11 +164,11 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Attack
m_Name: attack
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 110180560}
- {fileID: 3780040522156525719}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@ -436,7 +178,8 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 1905944193896961103, guid: a14259c7aea7b0047922da833fe080c4, type: 3}
m_Motion: {fileID: 1905944193896961103, guid: a14259c7aea7b0047922da833fe080c4,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@ -449,11 +192,10 @@ AnimatorState:
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Die
m_Name: die
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 110185958}
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@ -463,7 +205,8 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 1732030057074036490, guid: cb1b4496855c8024eb64d9d2b0089359, type: 3}
m_Motion: {fileID: 1732030057074036490, guid: cb1b4496855c8024eb64d9d2b0089359,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@ -480,22 +223,19 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 110259014}
m_Position: {x: 756, y: -204, z: 0}
- serializedVersion: 1
m_State: {fileID: 110212928}
m_Position: {x: 108, y: -132, z: 0}
m_Position: {x: 340, y: -240, z: 0}
- serializedVersion: 1
m_State: {fileID: 110209958}
m_Position: {x: 756, y: -264, z: 0}
m_Position: {x: 340, y: -300, z: 0}
- serializedVersion: 1
m_State: {fileID: 110274110}
m_Position: {x: 756, y: -144, z: 0}
m_Position: {x: 340, y: -180, z: 0}
- serializedVersion: 1
m_State: {fileID: 110210968}
m_Position: {x: 756, y: -72, z: 0}
m_Position: {x: 340, y: -110, z: 0}
- serializedVersion: 1
m_State: {fileID: 110293690}
m_Position: {x: 756, y: 0, z: 0}
m_Position: {x: 340, y: -40, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -503,9 +243,9 @@ AnimatorStateMachine:
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 120, y: -240, z: 0}
m_EntryPosition: {x: 120, y: -276, z: 0}
m_ExitPosition: {x: 756, y: 696, z: 0}
m_ExitPosition: {x: 120, y: -50, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 110212928}
m_DefaultState: {fileID: 110209958}
--- !u!1107 &1107958162325579712
AnimatorStateMachine:
serializedVersion: 6
@ -525,3 +265,25 @@ AnimatorStateMachine:
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 0}
--- !u!1101 &3780040522156525719
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.5714283
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

File diff suppressed because one or more lines are too long

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

Binary file not shown.

1041
Assets/Res_Addr/Mobs/Elite/Maga_Golem_A.prefab Normal file
View File

File diff suppressed because it is too large Load Diff

7
Assets/Res_Addr/Mobs/Elite/Maga_Golem_A.prefab.meta Normal file
View File

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

2
Assets/Res_Addr/Mobs/Mob/Mega_Golem_B.prefab → Assets/Res_Addr/Mobs/Elite/Maga_Golem_B.prefab
View File

@ -751,7 +751,7 @@ GameObject:
- component: {fileID: 1627627973711336377}
- component: {fileID: 883254449881191025}
m_Layer: 3
m_Name: Mega_Golem_B
m_Name: Maga_Golem_B
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0

0
Assets/Res_Addr/Mobs/Mob/Mega_Golem_B.prefab.meta → Assets/Res_Addr/Mobs/Elite/Maga_Golem_B.prefab.meta
View File

155
Assets/Res_Addr/Projectile/Elite/P_Maga_Golem_A.prefab Normal file
View File

@ -0,0 +1,155 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &359492963229537179
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3212436743952790601}
- component: {fileID: 2864512912963179641}
- component: {fileID: 5611405915983910845}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &3212436743952790601
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 3, y: 3, z: 3}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 223961062764596305}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2864512912963179641
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &5611405915983910845
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &907428178798376589
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 223961062764596305}
- component: {fileID: 6311613290837446200}
- component: {fileID: 6782093134866277011}
m_Layer: 0
m_Name: P_Maga_Golem_A
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &223961062764596305
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 907428178798376589}
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: 3212436743952790601}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6311613290837446200
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 907428178798376589}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e5d2fd9d460da6a4d87b4be83a4cdc32, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Pierce: 0
str_HitEffect: PoisonHit
m_ShowTimeOverEffect: 0
--- !u!65 &6782093134866277011
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 907428178798376589}
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: 3, z: 3}
m_Center: {x: 0, y: 0, z: 0}

7
Assets/Res_Addr/Projectile/Elite/P_Maga_Golem_A.prefab.meta Normal file
View File

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

155
Assets/Res_Addr/Projectile/Elite/P_Maga_Golem_B.prefab Normal file
View File

@ -0,0 +1,155 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &359492963229537179
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3212436743952790601}
- component: {fileID: 2864512912963179641}
- component: {fileID: 5611405915983910845}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &3212436743952790601
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 3, y: 3, z: 3}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 223961062764596305}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2864512912963179641
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &5611405915983910845
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 359492963229537179}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &907428178798376589
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 223961062764596305}
- component: {fileID: 6311613290837446200}
- component: {fileID: 6782093134866277011}
m_Layer: 0
m_Name: P_Maga_Golem_B
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &223961062764596305
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 907428178798376589}
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: 3212436743952790601}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &6311613290837446200
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 907428178798376589}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e5d2fd9d460da6a4d87b4be83a4cdc32, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Pierce: 0
str_HitEffect: PoisonHit
m_ShowTimeOverEffect: 0
--- !u!65 &6782093134866277011
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 907428178798376589}
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: 3, z: 3}
m_Center: {x: 0, y: 0, z: 0}

7
Assets/Res_Addr/Projectile/Elite/P_Maga_Golem_B.prefab.meta Normal file
View File

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

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

@ -400,6 +400,10 @@ public class Actor : MyCoroutine
// 데미지 감소 적용
_dinfo.Damage -= _dinfo.Damage * m_Stat.Get_Stat(eStat.DMG_DECREASE);
if (_dinfo.Beater_pd.IsSkill())
_dinfo.Damage -= _dinfo.Damage * m_Stat.Get_Stat(eStat.SkillDmg_DECREASE);
else
_dinfo.Damage -= _dinfo.Damage * m_Stat.Get_Stat(eStat.BaseDmg_DECREASE);
if (dic_ccData[eCC.ManaShield].CCTime > 0d)
{ // 마나 실드
@ -866,10 +870,11 @@ public class Actor : MyCoroutine
#endregion
public bool IsCC()
{
foreach (var item in dic_ccData)
{
if (item.Key >= eCC.Freeze && item.Value.CCTime > 0) return true;
}
if (dic_ccData[eCC.Freeze].CCTime > 0f) return true;
if (dic_ccData[eCC.Attract].CCTime > 0f) return true;
if (dic_ccData[eCC.KnockedAirborne].CCTime > 0f) return true;
if (dic_ccData[eCC.KnockBack].CCTime > 0f) return true;
if (dic_ccData[eCC.Stun].CCTime > 0f) return true;
return false;
}
protected virtual void Check_CC_byAttack(DamageInfo _dinfo)
@ -1452,22 +1457,28 @@ public class Actor : MyCoroutine
}
#endregion
#region 상태이상 : 스턴(기절)
public void Stun(double time, bool showEffect = false) { StartCoroutine(Co_Stun(time, showEffect)); }
Coroutine m_CoStun;
public void Stun(double time, bool showEffect = false)
{
if (!DSUtil.CheckNull(m_CoStun)) { StopCoroutine(m_CoStun); m_CoStun = null; }
m_CoStun = StartCoroutine(Co_Stun(time, showEffect));
}
IEnumerator Co_Stun(double _time, bool showEffect = false)
{
if (IsSubRole(eSubRol.Elite)) _time -= _time * 0.2f;
else if (IsSubRole(eSubRol.Boss)) _time -= _time * 0.5f;
float stunTime = (float)_time;
if (IsSubRole(eSubRol.Elite)) stunTime -= stunTime * 0.2f;
else if (IsSubRole(eSubRol.Boss)) stunTime -= stunTime * 0.5f;
if (showEffect) InGameInfo.Ins.Show_Effect("Effect_Stun", this, eEffectLocation.Top, stunTime);
m_animation.speed = 1f;
//AnimationPlay("stun");
AnimationPlay("stun");
var cc = eCC.Stun;
dic_ccData[cc].CCTime = _time;
StopMove_Imm(true);
yield return new WaitForSeconds((float)_time);
yield return new WaitForSeconds(stunTime);
dic_ccData[cc].CCTime = 0f;
On_NavMeshAgent();
if (showEffect) InGameInfo.Ins.Show_Effect("Effect_Stun", this, eEffectLocation.Top, (float)_time);
}
#endregion
#region 이동속도
@ -1828,7 +1839,7 @@ public class Actor : MyCoroutine
}
#endregion
public bool CanMove() { return !IsCC() && m_NavMeshAgent.isOnNavMesh && !m_NavMeshAgent.isStopped; }
public bool CanMove() { return m_NavMeshAgent.isOnNavMesh && !m_NavMeshAgent.isStopped && !IsCC(); }
protected virtual bool IsAvoidCoolTime() { return false; }
protected virtual void Set_AvoidCoolTime() { }
public virtual void On_Is10_4() { }

2
Assets/Script/Character/MyActor.cs
View File

@ -82,7 +82,7 @@ public class MyActor : Actor
}
}
}
else if (CurAnim < eAnim.Dodge)
else if (CurAnim != eAnim.Run && CurAnim < eAnim.Dodge)
Play_Idle();
}
protected virtual void Update_Move()

10
Assets/Script/Character/PCActor.cs
View File

@ -26,6 +26,12 @@ public class PCActor : MyActor
tag = "Player";
}
protected override void OnDestroy()
{
base.OnDestroy();
if (!m_Enemy) MyValue.MyPC = null;
}
protected override void Update()
{
if (!DSUtil.CheckNull(arr_PCSkillCard) && arr_PCSkillCard.Length > 0)
@ -374,7 +380,7 @@ public class PCActor : MyActor
else
{
//if (IsDead() || CurAnim >= eAnim.Skill1 || IsCC())
if (IsDead() || IsCC() || CurAnim == eAnim.Dodge)
if (CurAnim == eAnim.Dodge || IsDead() || IsCC())
return;
if (JoystickStatus != 2)
@ -406,7 +412,7 @@ public class PCActor : MyActor
public override void Set_AutoBraking(bool _active)
{
if (IsDead() || IsCC() || CurAnim == eAnim.Dodge) return;
if (CurAnim == eAnim.Dodge || IsDead() || IsCC()) return;
if (_active)
{

2
Assets/Script/Info/InGameInfo.cs
View File

@ -170,7 +170,7 @@ public partial class InGameInfo : MyCoroutine
public void StartCam() { StartCoroutine(Co_StartCam()); }
IEnumerator Co_StartCam()
{
while (DSUtil.CheckNull(MyValue.MyPC)) yield return null;
while (!MyValue.bMyPC) yield return null;
MyValue.MyPC.StartCam();
}

6
Assets/Script/UI/Ingame/BattleUI.cs
View File

@ -64,7 +64,7 @@ public class BattleUI : MonoBehaviour
public void OnClick_Auto()
{
if (!DSUtil.CheckNull(MyValue.MyPC))
if (MyValue.bMyPC)
{
MyValue.MyPC.Set_Auto();
Set_Auto();
@ -79,7 +79,7 @@ public class BattleUI : MonoBehaviour
public void OnClick_Attack()
{
var pc = MyValue.MyPC;
if (!DSUtil.CheckNull(pc))
if (MyValue.bMyPC)
{
if (DSUtil.CheckNull(pc.Get_Target()) || pc.Get_Target().IsDead())
pc.Set_Target();
@ -89,7 +89,7 @@ public class BattleUI : MonoBehaviour
public void OnClick_Avoid()
{
if (!DSUtil.CheckNull(MyValue.MyPC))
if (MyValue.bMyPC)
MyValue.MyPC.Play_Dodge();
}

4
Assets/Script/Util/MyEnum.cs
View File

@ -178,7 +178,7 @@ public enum eStat
Reduction_in_Immediate_Harvest_Cost,
Reclaim_Used_Resources,
DMG_TO_HP,
DMG_TO_HP, SkillDmg_DECREASE, BaseDmg_DECREASE,
None
}
@ -228,7 +228,7 @@ public enum eSkillEnhance
None,
CRI_Dmg, BuffTime_Up, Blooding, HP_Drain, ATK_Up, HP_Up, MP_Up, Skill_Dmg, Stun, MP_Drain, DEF_Down, M_DEF_Down,
STR_Up, DEX_Up, INT_Up, LUCK_Up, ATK_SPD_Up, MOV_SPD_Up, PIERCING, Boss_Dmg, Monster_Dmg, GoldHunter, MP_Down, AttackRange_Up,
Dmg_Decrease, Dmg_Up, CRI_Up, SkillCoolTime, PetStat_Up,
Dmg_Decrease, Dmg_Up, CRI_Up, SkillCoolTime, PetStat_Up, SkillDmg_DECREASE, BaseDmg_DECREASE,
DMG_TO_HP,

5
Assets/Script/Util/MyValue.cs
View File

@ -76,7 +76,8 @@ public static class MyValue
};
public static string Get_AnimName(eAnim _animtype) { return dic_animNames[_animtype]; }
static PCActor _mypc;
public static PCActor MyPC { get { return _mypc; } set { _mypc = value; } }
public static PCActor MyPC { get { return _mypc; } set { _mypc = value; bMyPC = value; } }
public static bool bMyPC;
public static int ChatLimitLV = 1, PotionAddMin = 15;
public static int[] arr_NeedMixCount = new int[] { 0, 10, 10, 10, 10, 10, 10, 0 }; // 등급에 따른 합성에 필요 갯수
@ -778,6 +779,8 @@ public class ActorStatInfo
case eSkillEnhance.ATK_SPD_Up: Set_Stat(true, eStat.HERO_ATK_SPD, skilldata.f_ExtraValue1); break;
case eSkillEnhance.CRI_Up: Set_Stat(true, eStat.CRI, skilldata.f_ExtraValue1); break;
case eSkillEnhance.DMG_TO_HP: Set_Stat(true, eStat.DMG_TO_HP, skilldata.f_ExtraValue1); break;
case eSkillEnhance.SkillDmg_DECREASE: Set_Stat(true, eStat.SkillDmg_DECREASE, skilldata.f_ExtraValue1); break;
case eSkillEnhance.BaseDmg_DECREASE: Set_Stat(true, eStat.BaseDmg_DECREASE, skilldata.f_ExtraValue1); break;
}
}
}

6
Assets/ThirdParty/Joystick Pack/Scripts/Joysticks/FloatingJoystick.cs vendored
View File

@ -11,7 +11,7 @@ public class FloatingJoystick : Joystick
private void Update()
{
if (!DSUtil.CheckNull(MyValue.MyPC) && MyValue.MyPC.CanMove())
if (MyValue.bMyPC && MyValue.MyPC.CanMove())
{
// Cursor.lockState를 None으로 설정하여 마우스 고정 해제
if (Cursor.lockState == CursorLockMode.Locked)
@ -44,7 +44,7 @@ public class FloatingJoystick : Joystick
{
background.anchoredPosition = ScreenPointToAnchoredPosition(eventData.position);
background.gameObject.SetActive(true);
if (!DSUtil.CheckNull(MyValue.MyPC) && MyValue.MyPC.CanMove())
if (MyValue.bMyPC && MyValue.MyPC.CanMove())
{
MyValue.MyPC.Set_AutoBraking(false);
MyValue.MyPC.Set_JoystickStatus(1);
@ -56,7 +56,7 @@ public class FloatingJoystick : Joystick
{
background.gameObject.SetActive(false);
base.OnPointerUp(eventData);
if (!DSUtil.CheckNull(MyValue.MyPC) && MyValue.MyPC.CanMove())
if (MyValue.bMyPC && MyValue.MyPC.CanMove())
{
MyValue.MyPC.Set_JoystickStatus(0);
MyValue.MyPC.Set_AutoBraking(true);

8
ProjectSettings/TagManager.asset
View File

@ -3,12 +3,16 @@
--- !u!78 &1
TagManager:
serializedVersion: 2
tags: []
tags:
- Projectile
- Mob
- Pet
- Summon
layers:
- Default
- TransparentFX
- Ignore Raycast
-
- Actor
- Water
- UI
-