beeto a,b,c

This commit is contained in:
Ino 2025-02-11 16:09:38 +09:00
parent a2207a2e43
commit db4ee22ca4
26 changed files with 722 additions and 385 deletions

View File

@ -1,7 +1,7 @@
fileFormatVersion: 2
guid: 7d408358e364dbb47a2ddbce623dec47
ModelImporter:
serializedVersion: 20300
serializedVersion: 22200
internalIDToNameTable: []
externalObjects: {}
materials:
@ -14,6 +14,7 @@ ModelImporter:
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
removeConstantScaleCurves: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
@ -55,7 +56,14 @@ ModelImporter:
mirror: 0
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
curves: []
events: []
events:
- time: 0.24824563
functionName: Projectile
data:
objectReferenceParameter: {instanceID: 0}
floatParameter: 0
intParameter: 0
messageOptions: 0
transformMask: []
maskType: 3
maskSource: {instanceID: 0}
@ -68,10 +76,12 @@ ModelImporter:
addColliders: 0
useSRGBMaterialColor: 1
sortHierarchyByName: 1
importPhysicalCameras: 1
importVisibility: 1
importBlendShapes: 1
importCameras: 1
importLights: 1
nodeNameCollisionStrategy: 0
fileIdsGeneration: 2
swapUVChannels: 0
generateSecondaryUV: 0
@ -83,6 +93,7 @@ ModelImporter:
skinWeightsMode: 0
maxBonesPerVertex: 4
minBoneWeight: 0.001
optimizeBones: 1
meshOptimizationFlags: -1
indexFormat: 0
secondaryUVAngleDistortion: 8
@ -93,6 +104,7 @@ ModelImporter:
secondaryUVMinObjectScale: 1
secondaryUVPackMargin: 4
useFileScale: 1
strictVertexDataChecks: 0
tangentSpace:
normalSmoothAngle: 60
normalImportMode: 0
@ -125,6 +137,7 @@ ModelImporter:
humanoidOversampling: 1
avatarSetup: 0
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
importBlendShapeDeformPercent: 0
remapMaterialsIfMaterialImportModeIsNone: 0
additionalBone: 0
userData:

View File

@ -1,5 +1,49 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-4359506876871868020
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.5
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1101 &-3804246998536389777
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.33333373
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@ -28,81 +72,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 +97,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 +104,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 +117,8 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -5582505740081617059, guid: 4a02485e4491416408bed3a3d97113dd, type: 3}
m_Motion: {fileID: -5582505740081617059, guid: 4a02485e4491416408bed3a3d97113dd,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@ -337,11 +131,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: -3804246998536389777}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@ -351,38 +145,8 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -533208171676939663, guid: b883952b06fc50f4b9403750ba346efa, 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: -533208171676939663, guid: b883952b06fc50f4b9403750ba346efa,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@ -395,11 +159,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 +172,8 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7357744750695382972, guid: 2532a6906c30bcb419b10842f23ea27f, type: 3}
m_Motion: {fileID: 7357744750695382972, guid: 2532a6906c30bcb419b10842f23ea27f,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@ -422,11 +186,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: -4359506876871868020}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
@ -436,7 +200,8 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: -5909830909382066040, guid: 7d408358e364dbb47a2ddbce623dec47, type: 3}
m_Motion: {fileID: -5909830909382066040, guid: 7d408358e364dbb47a2ddbce623dec47,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@ -449,11 +214,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 +227,8 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7700630284416599789, guid: e1b29e9065b0a8c47af959c6344d9775, type: 3}
m_Motion: {fileID: 7700630284416599789, guid: e1b29e9065b0a8c47af959c6344d9775,
type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
@ -480,22 +245,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: 370, y: -240, z: 0}
- serializedVersion: 1
m_State: {fileID: 110209958}
m_Position: {x: 756, y: -264, z: 0}
m_Position: {x: 370, y: -300, z: 0}
- serializedVersion: 1
m_State: {fileID: 110274110}
m_Position: {x: 756, y: -144, z: 0}
m_Position: {x: 370, y: -180, z: 0}
- serializedVersion: 1
m_State: {fileID: 110210968}
m_Position: {x: 756, y: -72, z: 0}
m_Position: {x: 370, y: -100, z: 0}
- serializedVersion: 1
m_State: {fileID: 110293690}
m_Position: {x: 756, y: 0, z: 0}
m_Position: {x: 370, y: -30, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
@ -503,9 +265,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: -60, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 110212928}
m_DefaultState: {fileID: 110209958}
--- !u!1107 &1107958162325579712
AnimatorStateMachine:
serializedVersion: 6

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

@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5651139983522548258
--- !u!1 &4708284525878814272
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -8,39 +8,39 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5727954859799927972}
- component: {fileID: 3472932267455694471}
- component: {fileID: 6049237586658601680}
- component: {fileID: -3833113278617957665}
- component: {fileID: 6522152014378253330}
- component: {fileID: 8956686361727891621}
- component: {fileID: 6599624706167851384}
- component: {fileID: 3351821237817569165}
m_Layer: 0
m_Name: Effect_DefenceDecrease
m_Name: effect
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5727954859799927972
--- !u!4 &6522152014378253330
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5651139983522548258}
m_GameObject: {fileID: 4708284525878814272}
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_LocalScale: {x: 1, y: 1, z: 1}
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_Father: {fileID: 5727954859799927972}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &3472932267455694471
--- !u!198 &8956686361727891621
ParticleSystem:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5651139983522548258}
m_GameObject: {fileID: 4708284525878814272}
serializedVersion: 8
lengthInSec: 4
simulationSpeed: 1
@ -4639,14 +4639,14 @@ ParticleSystem:
m_PostInfinity: 2
m_RotationOrder: 4
vectorLabel1_3: W
--- !u!199 &6049237586658601680
--- !u!199 &6599624706167851384
ParticleSystemRenderer:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5651139983522548258}
m_GameObject: {fileID: 4708284525878814272}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
@ -4713,6 +4713,54 @@ ParticleSystemRenderer:
m_MeshWeighting2: 1
m_MeshWeighting3: 1
m_MaskInteraction: 0
--- !u!114 &3351821237817569165
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4708284525878814272}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 456d2bd1c5c2e5e4b8b948836c4975a4, type: 3}
m_Name:
m_EditorClassIdentifier:
NoUseParticleTime: 0
OffTime: 5
e_EffectLocation: 0
--- !u!1 &5651139983522548258
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5727954859799927972}
- component: {fileID: -3833113278617957665}
m_Layer: 0
m_Name: Effect_DefenceDecrease
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5727954859799927972
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5651139983522548258}
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: 6522152014378253330}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &-3833113278617957665
MonoBehaviour:
m_ObjectHideFlags: 0
@ -4727,5 +4775,4 @@ MonoBehaviour:
m_EditorClassIdentifier:
NoUseParticleTime: 0
OffTime: 5
add_offset: {x: 0, y: 0, z: 0}
tf_Target: {fileID: 0}
e_EffectLocation: 0

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_Beeto_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}

View File

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

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_Beeto_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}

View File

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

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_Beeto_C
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}

View File

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

View File

@ -96,7 +96,8 @@ LightmapSettings:
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_LightingDataAsset: {fileID: 112000000, guid: ea4bf9de58325ca4d81c30d9d625d3a1,
type: 2}
m_LightingSettings: {fileID: 0}
--- !u!196 &4
NavMeshSettings:

View File

@ -159,7 +159,6 @@ public class Actor : MyCoroutine
Update_ETC();
}
protected virtual void FixedUpdate() { }
protected void Update_ETC()
{
foreach (var item in dic_ccData)
@ -654,9 +653,9 @@ public class Actor : MyCoroutine
public virtual void Heal(float _rate, bool showhud = true)
{
if (IsDead()) return;
if (IsDead() || Get_HP() >= Get_MaxHP()) return;
var heal_hp = m_Stat.Get_Stat(eStat.MaxHP) * _rate;
var heal_hp = Math.Max(m_Stat.Get_Stat(eStat.MaxHP) * _rate, 1d);
m_Stat.Set_Stat(true, eStat.HP, heal_hp);
if (showhud)
{
@ -667,7 +666,7 @@ public class Actor : MyCoroutine
}
public virtual void Heal(double _hp, bool showhud = true)
{
if (IsDead()) return;
if (IsDead() || Get_HP() >= Get_MaxHP()) return;
_hp = Math.Max(1, _hp);
m_Stat.Set_Stat(true, eStat.HP, _hp);

View File

@ -1,4 +1,5 @@
using System;
using System.Collections;
using UnityEngine;
using UnityEngine.SceneManagement;
@ -12,7 +13,7 @@ public class MobActor : Actor
protected int m_SpawnerId;
protected eMobStatus MobStatus;
Vector3 OriginalPos, TargetPatrolPos;
float m_PatrolDelay, m_DieTime, f_BaseChaseRange;
float m_PatrolDelay, m_DieTime, f_BaseChaseRange, HealPerSec, HPRegenPerSec;
bool b_IsFirstAttack, NoUpdate_byTool;
protected MonsterAppearData m_MonsterAppearData;
protected MonsterTableData m_MonsterTableData;
@ -82,6 +83,9 @@ public class MobActor : Actor
m_NavSpeed = m_NavMeshAgent.speed = (float)m_Stat.Get_Stat(eStat.FinalMoveSpeed);
m_NavMeshAgent.avoidancePriority = 51 + order;
HealPerSec = 0f;
HPRegenPerSec = (float)m_Stat.Get_Stat(eStat.HP_REGEN_Per1Sec);
#if UNITY_EDITOR
if (SceneManager.GetActiveScene().name == "StatTest")
{
@ -115,7 +119,9 @@ public class MobActor : Actor
protected override void Update()
{
if (NoUpdate_byTool || IsStop || IsDead() || IsCC()) return;
if (IsDead()) return;
Update_HealPerSec();
if (NoUpdate_byTool || IsStop || IsCC()) return;
if (isNSLDMob && m_NoSeeLongDMob.IsNoSeeMob()) return;
base.Update();
if (IsSubRole(eSubRol.Mimic)) Del_Target();
@ -220,6 +226,20 @@ public class MobActor : Actor
}
}
void Update_HealPerSec()
{
if (HPRegenPerSec > 0f)
{
HealPerSec += Time.deltaTime;
if (HealPerSec >= 1f)
{
HealPerSec = 0f;
if (m_Stat.Get_Stat(eStat.HP_REGEN_Per1Sec) > 0)
Heal(HPRegenPerSec);
}
}
}
virtual protected void Change_MobStatus(eMobStatus mobStatus)
{
#if UNITY_EDITOR

View File

@ -32,16 +32,16 @@ public class HUDBase : MyCoroutine
{
Init();
m_Target = _target;
isTarget = !DSUtil.CheckNull(m_Target);
}
void Update()
{
if (isTarget && isCanvasRect && isMainCam)
if (!DSUtil.CheckNull(m_Target) && isCanvasRect && isMainCam)
{
RectTransform CanvasRect = m_CanvasRect;
Vector2 ViewportPosition = m_Camera.WorldToViewportPoint(m_Target.position);
Vector2 WorldObject_ScreenPosition = new Vector2((ViewportPosition.x * CanvasRect.sizeDelta.x) - (CanvasRect.sizeDelta.x * 0.5f), (ViewportPosition.y * CanvasRect.sizeDelta.y) - (CanvasRect.sizeDelta.y * 0.5f) - 15f);
Vector2 WorldObject_ScreenPosition = new Vector2(
(ViewportPosition.x * m_CanvasRect.sizeDelta.x) - (m_CanvasRect.sizeDelta.x * 0.5f),
(ViewportPosition.y * m_CanvasRect.sizeDelta.y) - (m_CanvasRect.sizeDelta.y * 0.5f) - 15f);
m_RectTransform.anchoredPosition = WorldObject_ScreenPosition;
}
}

View File

@ -178,7 +178,7 @@ public enum eStat
Reduction_in_Immediate_Harvest_Cost,
Reclaim_Used_Resources,
DMG_TO_HP, SkillDmg_DECREASE, BaseDmg_DECREASE,
DMG_TO_HP, SkillDmg_DECREASE, BaseDmg_DECREASE, HP_REGEN_Per1Sec,
None
}
@ -228,9 +228,9 @@ 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, SkillDmg_DECREASE, BaseDmg_DECREASE,
Dmg_Decrease, Dmg_Up, CRI_Up, SkillCoolTime, PetStat_Up,
DMG_TO_HP,
DMG_TO_HP, SkillDmg_DECREASE, BaseDmg_DECREASE, HP_REGEN_Per1Sec,
Newbie,
}

View File

@ -781,6 +781,7 @@ public class ActorStatInfo
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;
case eSkillEnhance.HP_REGEN_Per1Sec: Set_Stat(true, eStat.HP_REGEN_Per1Sec, skilldata.f_ExtraValue1); break;
}
}
}

View File

@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using UnityEngine;
public class TurnOff_GO : MyCoroutine
@ -8,42 +9,56 @@ public class TurnOff_GO : MyCoroutine
public eEffectLocation e_EffectLocation;
public Action act_End;
Actor m_target, m_target2;
ProjectileData m_ProjectileData;
bool followTarget, isTarget = false, isTarget2 = false;
private Actor m_target;
private ProjectileData m_ProjectileData;
private bool followTarget;
public void Set() { gameObject.SetActive(false); gameObject.SetActive(true); }
public void Set(Actor target, ProjectileData pd, float LifeTime)
private static readonly Dictionary<eEffectLocation, Func<Actor, Vector3>> EffectLocationMap = new()
{
{ eEffectLocation.Top, target => target.Get_Top_postion() },
{ eEffectLocation.Mid, target => target.Get_Center_position() },
{ eEffectLocation.Bottom, target => target.Get_position() }
};
public void Set() => ToggleActive(true);
public void Set(Actor target, ProjectileData pd, float lifeTime)
{
followTarget = true;
m_target = target;
isTarget = true;
m_ProjectileData = pd;
NoUseParticleTime = true;
OffTime = LifeTime;
transform.position = m_ProjectileData.Get_EffectPos(target);
OffTime = lifeTime;
gameObject.SetActive(true);
Set_Off();
transform.position = pd.Get_EffectPos(target);
ToggleActive(true);
}
public void Set(Actor target, eEffectLocation loca, float lifetime)
public void Set(Actor target, eEffectLocation loca, float lifeTime)
{
m_target2 = target;
isTarget2 = true;
e_EffectLocation = loca;
OffTime = lifetime;
OffTime = lifeTime;
m_target = target;
gameObject.SetActive(true);
Set_Off();
ToggleActive(true);
}
public void Set_PrefabInfo(Actor target)
{
Set_Location(target);
gameObject.SetActive(true);
Set_Off();
m_target = target;
UpdateLocation();
ToggleActive(true);
}
void Set_Off()
private void ToggleActive(bool state)
{
gameObject.SetActive(false);
gameObject.SetActive(state);
}
private void OnEnable() => Set_Off();
private void Set_Off()
{
Set_Coroutine_withCancel(() =>
{
@ -52,38 +67,31 @@ public class TurnOff_GO : MyCoroutine
}, NoUseParticleTime ? OffTime : GetComponent<ParticleSystem>().main.duration);
}
private void OnEnable()
{
Set_Off();
}
void Update()
private void Update()
{
if (followTarget)
{
if (!isTarget)
if (m_target == null)
{
transform.position = Vector3.right * 1000000f;
gameObject.SetActive(false);
}
else
{
var pos = m_ProjectileData.Get_EffectPos(m_target);
transform.position = pos;
transform.position = m_ProjectileData.Get_EffectPos(m_target);
}
}
else if (isTarget2)
Set_Location(m_target2);
}
void Set_Location(Actor target)
{
Vector3 effectPos;
switch (e_EffectLocation)
else
{
case eEffectLocation.Top: effectPos = target.Get_Top_postion(); break;
default: effectPos = target.Get_Center_position(); break;
case eEffectLocation.Bottom: effectPos = target.Get_position(); break;
UpdateLocation();
}
}
private void UpdateLocation()
{
if (m_target != null && EffectLocationMap.TryGetValue(e_EffectLocation, out var positionFunc))
{
transform.position = positionFunc(m_target);
}
transform.position = effectPos;
}
}