firetree, fofo, 일부 스크립트 최적화

This commit is contained in:
Ino 2025-02-09 07:22:31 +09:00
parent 1036c3b083
commit 954a844c04
69 changed files with 31149 additions and 504 deletions

View File

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

View File

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

View File

@ -1,5 +1,27 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-2177448584287393875
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.53846157
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: -3151565555237890620, guid: c2a6037b7620ba94abc71c20a0970450, type: 3}
m_Motion: {fileID: -3151565555237890620, guid: c2a6037b7620ba94abc71c20a0970450,
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: 6762722196575099426}
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: -1978592971267190842, guid: 3631bcad34198ae4d8f57cb37bcd7e26, 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: -1978592971267190842, guid: 3631bcad34198ae4d8f57cb37bcd7e26,
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: 9093772097223845002, guid: c343f23f6b7bf7b478e3d2407c802d0e, type: 3}
m_Motion: {fileID: 9093772097223845002, guid: c343f23f6b7bf7b478e3d2407c802d0e,
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: -2177448584287393875}
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: -8690935883236062380, guid: 7b10789ed8aed194b92b8b21ae9a3d22, type: 3}
m_Motion: {fileID: -8690935883236062380, guid: 7b10789ed8aed194b92b8b21ae9a3d22,
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: 5274989643193016248, guid: 510b4d8127c222f40ab848f435666636, type: 3}
m_Motion: {fileID: 5274989643193016248, guid: 510b4d8127c222f40ab848f435666636,
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: 390, y: -230, z: 0}
- serializedVersion: 1
m_State: {fileID: 110209958}
m_Position: {x: 756, y: -264, z: 0}
m_Position: {x: 390, y: -290, z: 0}
- serializedVersion: 1
m_State: {fileID: 110274110}
m_Position: {x: 756, y: -144, z: 0}
m_Position: {x: 390, y: -170, z: 0}
- serializedVersion: 1
m_State: {fileID: 110210968}
m_Position: {x: 750, y: -70, z: 0}
m_Position: {x: 380, y: -100, z: 0}
- serializedVersion: 1
m_State: {fileID: 110293690}
m_Position: {x: 756, y: 0, z: 0}
m_Position: {x: 390, y: -30, 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: -40, 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 &6762722196575099426
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.66666687
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1

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

@ -2137,6 +2137,178 @@ MonoBehaviour:
SpawnerID: 11
MobGenRange: 10
text_lv: {fileID: 845045578108008547}
--- !u!1 &2463545537359538864
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9084166346480484822}
- component: {fileID: 2502770721531321275}
- component: {fileID: 8535159982000299105}
m_Layer: 3
m_Name: lv
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 119
m_IsActive: 1
--- !u!224 &9084166346480484822
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2463545537359538864}
m_LocalRotation: {x: 0, y: 0.7071068, z: -0.7071068, w: 0}
m_LocalPosition: {x: 0, y: 0, z: 3.14}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 930287813562031024}
m_LocalEulerAnglesHint: {x: 90, y: 180, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 5}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!23 &2502770721531321275
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2463545537359538864}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
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: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57, type: 2}
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!114 &8535159982000299105
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2463545537359538864}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9541d86e2fd84c1d9990edf0852d74ab, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: Lv.1
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: a387e325271126742ad15569dba1ac57, type: 2}
m_sharedMaterial: {fileID: -6459762427321423278, guid: a387e325271126742ad15569dba1ac57,
type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4294967295
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 0
m_HorizontalAlignment: 2
m_VerticalAlignment: 4096
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 0
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 0
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
_SortingLayer: 0
_SortingLayerID: 0
_SortingOrder: 0
m_hasFontAssetChanged: 0
m_renderer: {fileID: 2502770721531321275}
m_maskType: 0
--- !u!1 &2482112238511350406
GameObject:
m_ObjectHideFlags: 0
@ -3396,6 +3568,54 @@ MonoBehaviour:
m_hasFontAssetChanged: 0
m_renderer: {fileID: 5554810420581405749}
m_maskType: 0
--- !u!1 &3862945979315829057
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 930287813562031024}
- component: {fileID: 21263257377658152}
m_Layer: 3
m_Name: 35
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 2147483647
m_IsActive: 1
--- !u!4 &930287813562031024
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3862945979315829057}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 535.4, y: 0.01, z: 133.4}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 9084166346480484822}
m_Father: {fileID: 7786833865820079638}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &21263257377658152
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3862945979315829057}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 06269e6c1653db34090895cd16244df9, type: 3}
m_Name:
m_EditorClassIdentifier:
SpawnerID: 35
MobGenRange: 10
text_lv: {fileID: 8535159982000299105}
--- !u!1 &3913847835859887932
GameObject:
m_ObjectHideFlags: 0
@ -71224,6 +71444,7 @@ Transform:
- {fileID: 5888248550636579611}
- {fileID: 6741524882457970978}
- {fileID: 9179723709626358036}
- {fileID: 930287813562031024}
m_Father: {fileID: 6738690448854471834}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &8973930304619307241
@ -75148,7 +75369,7 @@ PrefabInstance:
- target: {fileID: 960630095900046633, guid: 73c6a05b987c3214f9d0c6ae8a803da6,
type: 3}
propertyPath: m_LocalPosition.x
value: 543.5
value: 486.4
objectReference: {fileID: 0}
- target: {fileID: 960630095900046633, guid: 73c6a05b987c3214f9d0c6ae8a803da6,
type: 3}
@ -75158,12 +75379,12 @@ PrefabInstance:
- target: {fileID: 960630095900046633, guid: 73c6a05b987c3214f9d0c6ae8a803da6,
type: 3}
propertyPath: m_LocalPosition.z
value: 61.1
value: 136.2
objectReference: {fileID: 0}
- target: {fileID: 960630095900046633, guid: 73c6a05b987c3214f9d0c6ae8a803da6,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
value: 0.6955367
objectReference: {fileID: 0}
- target: {fileID: 960630095900046633, guid: 73c6a05b987c3214f9d0c6ae8a803da6,
type: 3}
@ -75173,7 +75394,7 @@ PrefabInstance:
- target: {fileID: 960630095900046633, guid: 73c6a05b987c3214f9d0c6ae8a803da6,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: 0.7184906
objectReference: {fileID: 0}
- target: {fileID: 960630095900046633, guid: 73c6a05b987c3214f9d0c6ae8a803da6,
type: 3}

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 8571780b330ddcb4cb8e96b00e9140f7
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 507e5cebded01464eaba31b0f8f796a4
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 8feea71eed5d03e43ad1046f688ccac5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 100100000
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_Fofo_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: MagicMissileHit
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: 5986349b79c279c44a0a2dd2653b589f
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_Fofo_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: MagicMissileHit
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: 7815c3b7e3e90cc4394f9feeb317c2ff
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_Fofo_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: MagicMissileHit
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: 131d7a0e18032594f8d26234e16c4079
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_Fofo_D
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: MagicMissileHit
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: 8f8a7cded12c1d94ea5c6ab0899cd716
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_Fofo_E
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: MagicMissileHit
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: 9cbbf3baf1aec0d408b2c17fe03e7a49
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_Fofo_F
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: MagicMissileHit
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: 024f61c9d97d35e468a1a5e44b3e66df
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -5,6 +5,7 @@ using System.Linq;
using UnityEngine;
using UnityEngine.AI;
using UnityEngine.SceneManagement;
using static UnityEngine.GraphicsBuffer;
public class Actor : MyCoroutine
{
@ -31,11 +32,22 @@ public class Actor : MyCoroutine
protected Transform tf_HUD_HP, tf_HUD_Dmg;
protected Vector3 ObjSize;
[SerializeField]
protected Actor m_Target, m_MyPet;
Actor _target;
protected Actor m_Target
{
get { return _target; }
set
{
_target = value;
isTarget = value;
}
}
public bool isTarget = false;
protected Actor m_MyPet;
protected Dictionary<int, UseMagicInfo> dic_MagicData = new Dictionary<int, UseMagicInfo>();
protected UseMagicInfo m_Magic;
protected float m_NavSpeed, m_NavStopDistance, m_HitTime, FindOtherTargetTime = 7.5f, GoToTargetTime = 10f, OriginalAnimSpeed, m_fAttackMoveTime, m_DamageRate = 1f;
protected bool m_Enemy, IsPlaySkill, IsChargeAttack, m_Auto, DeadStatus, hasAppliedDamage;
protected bool m_Enemy, IsPlaySkill, m_Auto, DeadStatus, hasAppliedDamage;
protected bool _isstop;
protected bool IsStop
{
@ -143,26 +155,8 @@ public class Actor : MyCoroutine
if (m_HUDUI) m_HUDUI.Off();
}
protected override void Update()
virtual protected void Update()
{
if (IsChargeAttack)
{
if (IsStop || IsDead() || IsCC()) return;
if (DSUtil.CheckNull(m_Target) || m_Target.IsDead())
Set_Target();
if (DSUtil.CheckNull(m_Target))
{
Play_Idle();
return;
}
if (Vector3.Distance(Get_position(), m_Target.Get_position()) > m_NavMeshAgent.stoppingDistance)
Play_Run();
else if (CurAnim != eAnim.Attack)
Play_Attack(0, (float)m_Stat.Get_Stat(eStat.FinalAttackSpeed));
}
Update_ETC();
}
@ -590,8 +584,8 @@ public class Actor : MyCoroutine
if (skilldata.e_SkillTarget == eSkillTarget.Enemy)
{
if (DSUtil.CheckNull(m_Target)) Set_Target(true);
if (DSUtil.CheckNull(m_Target))
if (!isTarget) Set_Target(true);
if (!isTarget)
{
if (IsRole(eRole.PC)) ToastUI.Ins.Set(105);
Del_Magic();
@ -775,7 +769,7 @@ public class Actor : MyCoroutine
public Actor Get_Target() { return m_Target; }
public virtual void Del_Target(bool forcedel = false)
{
if (m_Target)
if (isTarget)
{
if (!forcedel && m_Target.m_IsLockTarget && !m_Target.IsDead()) return;
if (IsRole(eRole.PC) && !IsEnemy()) m_Target.Set_Outline(false);
@ -802,13 +796,13 @@ public class Actor : MyCoroutine
{
if (_ispc)
{
if (!DSUtil.CheckNull(MyValue.MyPC.m_Target))
if (MyValue.MyPC.isTarget)
MyValue.MyPC.m_Target.Set_Outline(false);
}
if (_ChangeTargetByHit)
{
if (DSUtil.CheckNull(m_Target) || m_Target.IsDead())
if (!isTarget || m_Target.IsDead())
{
m_Target = target;
FindOtherTargetTime = 7.5f;
@ -1590,7 +1584,7 @@ public class Actor : MyCoroutine
m_animation.speed -= m_animation.speed * (float)dic_ccData[eCC.ATKSPD_Down].CCDmg;
AnimationPlay(aniname);
if (m_Target != null) transform.LookAt(m_Target.transform);
if (isTarget) transform.LookAt(m_Target.transform);
if (gos_Effect != null && gos_Effect.Length > _attack)
{
gos_Effect[_attack].SetActive(false);
@ -1604,7 +1598,7 @@ public class Actor : MyCoroutine
CurAnim = eAnim.Skill;
AnimationPlay(motion);
if (!DSUtil.CheckNull(m_Target)) transform.LookAt(m_Target.transform);
if (isTarget) transform.LookAt(m_Target.transform);
StopMove_Imm(false);
@ -1682,26 +1676,26 @@ public class Actor : MyCoroutine
#endregion
#region
public virtual void HitEffect_Color()
{
if (!ProjectileInfo.Ins || IsInvoking(nameof(Off_HitEffect_Color))) return;
{ // 2025. 02. 09. 정인호 : GC Alloc을 2.3KB 발생으로 인해 사용 금지
//if (!ProjectileInfo.Ins || IsInvoking(nameof(Off_HitEffect_Color))) return;
for (int j = 0; j < arr_Renderer.Length; j++)
{
var materials = arr_Renderer[j].sharedMaterials.ToList();
materials.Add(ProjectileInfo.Ins.arr_materials[1]);
arr_Renderer[j].materials = materials.ToArray();
}
//for (int j = 0; j < arr_Renderer.Length; j++)
//{
// var materials = arr_Renderer[j].sharedMaterials.ToList();
// materials.Add(ProjectileInfo.Ins.arr_materials[1]);
// arr_Renderer[j].materials = materials.ToArray();
//}
Invoke(nameof(Off_HitEffect_Color), 0.1f);
//Invoke(nameof(Off_HitEffect_Color), 0.1f);
}
void Off_HitEffect_Color()
{
for (int j = 0; j < arr_Renderer.Length; j++)
{
var materials = arr_Renderer[j].sharedMaterials.ToList();
materials.Remove(ProjectileInfo.Ins.arr_materials[1]);
arr_Renderer[j].materials = materials.ToArray();
}
{ // 2025. 02. 09. 정인호 : GC Alloc을 2.3KB 발생으로 인해 사용 금지
//for (int j = 0; j < arr_Renderer.Length; j++)
//{
// var materials = arr_Renderer[j].sharedMaterials.ToList();
// materials.Remove(ProjectileInfo.Ins.arr_materials[1]);
// arr_Renderer[j].materials = materials.ToArray();
//}
}
#endregion
#region
@ -1846,6 +1840,7 @@ public class Actor : MyCoroutine
public virtual void On_Is10_4() { }
public virtual void Check_10_4() { }
public virtual MonsterAppearData Get_MonsterStatTableData() { return null; }
public virtual bool isNoseeMob() { return false; }
public virtual void On_Regen()
{
gameObject.SetActive(true);
@ -1870,7 +1865,7 @@ public class Actor : MyCoroutine
else
{
Del_Magic();
if (m_Target != null)
if (isTarget)
{
if (IsRole(eRole.PC))
{

View File

@ -23,14 +23,14 @@ public class BossMobActor : MobActor
public override void Del_Target(bool forcedel = false)
{
base.Del_Target(forcedel);
if (m_Target == null) Init();
if (!isTarget) Init();
}
public override void Play_Attack(int _attack, float _as)
{
if (m_maxAttackIndex == 0) m_maxAttackIndex = m_MonsterTableData.Get_MaxAttackIndex();
if (isPlaying(eAnim.Attack, eAnim.Attack2, eAnim.Attack3)) return;
if (m_Target) transform.LookAt(m_Target.transform);
if (isTarget) transform.LookAt(m_Target.transform);
CurAnim = eAnim.Attack + m_attackIndex;
var aniname = MyValue.Get_AnimName(eAnim.Attack + m_attackIndex);
AnimationPlay(aniname);

View File

@ -116,8 +116,9 @@ public class MobActor : Actor
protected override void Update()
{
if (NoUpdate_byTool || IsStop || IsDead() || IsCC()) return;
Update_ETC();
if (IsSubRole(eSubRol.Mimic)) m_Target = null;
if (isNSLDMob && m_NoSeeLongDMob.IsNoSeeMob()) return;
base.Update();
if (IsSubRole(eSubRol.Mimic)) Del_Target();
// 순찰 중
switch (MobStatus)
@ -127,8 +128,8 @@ public class MobActor : Actor
m_PatrolDelay -= Time.deltaTime;
else
Change_MobStatus(eMobStatus.PatrolRot);
if (!IsSubRole(eSubRol.Mimic))
Check_Battle();
//if (!IsSubRole(eSubRol.Mimic))
// Check_Battle();
break;
case eMobStatus.PatrolRot:
// TargetPatrolPos 위치를 바라봄
@ -136,14 +137,16 @@ public class MobActor : Actor
Quaternion lookRotation = Quaternion.LookRotation(new Vector3(directionToTarget.x, 0, directionToTarget.z));
transform.rotation = Quaternion.Slerp(transform.rotation, lookRotation, Time.deltaTime * 5f);
if (Quaternion.Angle(transform.rotation, lookRotation) < 5f)
{
Change_MobStatus(eMobStatus.Patroling);
//Check_Battle();
if (!IsSubRole(eSubRol.Mimic))
Check_Battle();
}
break;
case eMobStatus.Patroling:
// TargetPatrolPos 위치로 이동함
if (Complete_Destination())
Change_MobStatus(eMobStatus.PatrolWait);
//Check_Battle();
break;
case eMobStatus.BattleStop:
Change_MobStatus(eMobStatus.PatrolRot);
@ -151,7 +154,7 @@ public class MobActor : Actor
Heal(1f);
break;
case eMobStatus.Battle:
if (!DSUtil.CheckNull(m_Target))
if (isTarget)
{
if (CurAnim < eAnim.Attack && Vector3.Distance(Get_position(), m_Target.Get_position()) > m_NavMeshAgent.stoppingDistance)
{
@ -166,7 +169,7 @@ public class MobActor : Actor
Check_Patrol();
break;
case eMobStatus.Attack:
if (!DSUtil.CheckNull(m_Target))
if (isTarget)
{
if (m_Target.IsDead())
{
@ -189,7 +192,7 @@ public class MobActor : Actor
Change_MobStatus(eMobStatus.BattleStop);
break;
case eMobStatus.Chase:
if (!DSUtil.CheckNull(m_Target))
if (isTarget)
{
Set_Path(m_Target.Get_position());
if (Vector3.Distance(Get_position(), m_Target.Get_position()) <= m_NavMeshAgent.stoppingDistance)
@ -263,9 +266,6 @@ public class MobActor : Actor
}
void Check_Battle()
{
if (isNSLDMob && m_NoSeeLongDMob.IsNoSeeMob())
return;
if (b_IsFirstAttack)
{ // 선공이고, 플레이어가 추적 범위 안에 들어오면 전투 상태로 전환
var enemies = ActorInfo.Ins.Get_EnemyActors(IsEnemy(), Get_position(), f_BaseChaseRange);
@ -276,7 +276,7 @@ public class MobActor : Actor
void Check_Patrol()
{
// 플레이어가 추적 범위 밖으로 나가면 순찰 상태로 전환
if (!isPlaying(eAnim.Attack, eAnim.Attack2, eAnim.Attack3) && m_Target == null || Vector3.Distance(OriginalPos, Get_position()) > m_MonsterTableData.f_BaseChaseRange)
if (!isPlaying(eAnim.Attack, eAnim.Attack2, eAnim.Attack3) && !isTarget || Vector3.Distance(OriginalPos, Get_position()) > m_MonsterTableData.f_BaseChaseRange)
Change_MobStatus(eMobStatus.BattleStop);
}
@ -405,10 +405,9 @@ public class MobActor : Actor
base.Get_Damage(_dinfo);
// 멀리서 맞았으면 맞은 몹을 타겟으로 잡고 주변 몹들도 같이 간다.
if (DSUtil.CheckNull(m_Target))
if (!isTarget)
{
if (m_Target == null)
Change_Target(false, _dinfo.Beater, true);
Change_Target(false, _dinfo.Beater, true);
// TODO 정인호 : 몬스터 주변 몬스터 부르기
//var allies = ActorInfo.Ins.Get_EnemyActors(m_Role, transform, m_byHitDist);
@ -420,13 +419,13 @@ public class MobActor : Actor
public override void Change_Target(bool _ispc, Actor target, bool _ChangeTargetByHit = false)
{
base.Change_Target(_ispc, target, _ChangeTargetByHit);
if (m_Target != null) b_IsFirstAttack = true;
if (isTarget) b_IsFirstAttack = true;
if (b_IsFirstAttack) Change_MobStatus(eMobStatus.Battle);
}
protected override void Heal_To_Target()
{
base.Heal_To_Target();
if (m_Target != null) m_Target.Heal(HealRate);
if (isTarget) m_Target.Heal(HealRate);
if (HealCount > 0)
{
var allies = ActorInfo.Ins.Get_AlliesActors(IsEnemy(), Get_position());
@ -439,6 +438,7 @@ public class MobActor : Actor
}
}
public override MonsterAppearData Get_MonsterStatTableData() { return m_MonsterAppearData; }
public override bool isNoseeMob() { return isNSLDMob ? m_NoSeeLongDMob.IsNoSeeMob() : false; }
public override int Get_Group() { return m_SpawnerId; }
protected override void Set_MobMark(bool active)
{

View File

@ -7,7 +7,7 @@ public class MyActor : Actor
public override void Set_Target(bool forcefind = false)
{
if (!DSUtil.CheckNull(m_Target))
if (isTarget)
{
if (m_Target.m_IsLockTarget && !m_Target.IsDead()) return;
if (IsRole(eRole.PC)) m_Target.Set_Outline(false);
@ -15,7 +15,7 @@ public class MyActor : Actor
m_Target = ActorInfo.Ins.Get_Nearest_EnemyActor_orNull(IsEnemy(), Get_position(), forcefind ? float.MaxValue : f_FindEnemyRange);
if (!DSUtil.CheckNull(m_Target))
if (isTarget)
{
if (IsRole(eRole.PC))
{
@ -52,7 +52,7 @@ public class MyActor : Actor
Check_Target();
if (!DSUtil.CheckNull(m_Target))
if (isTarget)
{
if (m_Target.IsDead())
Del_Target();
@ -122,7 +122,7 @@ public class MyActor : Actor
public override void Get_Damage(DamageInfo _dinfo)
{
base.Get_Damage(_dinfo);
if (DSUtil.CheckNull(m_Target) || m_Target.IsDead())
if (!isTarget || m_Target.IsDead())
{
m_Target = _dinfo.Beater;
}
@ -131,8 +131,8 @@ public class MyActor : Actor
public override void Play_Run()
{
base.Play_Run();
if (!DSUtil.CheckNull(m_Target)) Set_Path(m_Target.Get_position());
//if (!DSUtil.CheckNull(m_Target))
if (isTarget) Set_Path(m_Target.Get_position());
//if (isTarget)
//{
// if (!Set_Path(m_Target.Get_position()))
// { // 적이 내비메시 위에 없다고 판단됨
@ -143,7 +143,7 @@ public class MyActor : Actor
public override void Play_Attack(int _attack, float _as)
{
base.Play_Attack(_attack, _as);
//if (!DSUtil.CheckNull(m_Target))
//if (isTarget)
//{
// if (!Set_Path(m_Target.Get_position())) // 때리려는 타겟쪽으로 보게 함
// { // 적이 내비메시 위에 없다고 판단됨
@ -155,7 +155,7 @@ public class MyActor : Actor
{
if (forcefind || m_Auto)
{
if (DSUtil.CheckNull(m_Target))
if (!isTarget)
Set_Target(forcefind);
else
{

View File

@ -35,8 +35,8 @@ public class BattleNPCActor : Actor
base.Update();
if (m_Target == null || m_Target.IsDead()) FindNextTarget();
if (m_Target == null) return;
if (!isTarget || m_Target.IsDead()) FindNextTarget();
if (!isTarget) return;
m_attackCoolTime -= Time.deltaTime;

View File

@ -23,7 +23,7 @@ public class WitchEnemyActor : MobActor
{
for (int i = 0; i < list_cooltime.Count; i++)
{
if (m_Target == null || m_Target.IsDead()) continue;
if (!isTarget || m_Target.IsDead()) continue;
if (list_cooltime[i] > 0f)
list_cooltime[i] -= Time.deltaTime;

View File

@ -47,7 +47,7 @@ public class StoneActor : Actor
protected override void Update()
{
Update_ETC();
base.Update();
if (BattleTime > 0f && !IsOnlyDead())
{

View File

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

View File

@ -42,7 +42,7 @@ public class PCActor : MyActor
arr_PCSkillCard[i].Set_CoolTime(arr_magicCoolTime[i], arr_magicMaxCoolTime[i], i);
if (m_Auto && !IsDead() && !DSUtil.CheckNull(arr_magicData[i]) && arr_magicCoolTime[i] <= 0f && t_autoskill <= 0f && !IsCC() && CurAnim < eAnim.Skill &&
!DSUtil.CheckNull(m_Target) && Vector3.Distance(Get_position(), m_Target.Get_position()) <= arr_magicData[i].f_SkillRange)
isTarget && Vector3.Distance(Get_position(), m_Target.Get_position()) <= arr_magicData[i].f_SkillRange)
{
if (Use_Skill(arr_magicData[i], m_Auto, i))
{

View File

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

View File

@ -6,22 +6,38 @@ public class HUDBase : MyCoroutine
protected Transform m_Target;
protected Camera m_Camera;
bool isRect = false;
bool isTarget = false, isCanvasRect = false, isMainCam = false;
void Init()
{
if (m_RectTransform == null) m_RectTransform = GetComponent<RectTransform>();
if (m_CanvasRect == null) m_CanvasRect = GetComponentInParent<Canvas>().GetComponent<RectTransform>();
if (m_Camera == null) m_Camera = Camera.main;
if (!isRect)
{
m_RectTransform = GetComponent<RectTransform>();
isRect = !DSUtil.CheckNull(m_RectTransform);
}
if (!isCanvasRect)
{
m_CanvasRect = GetComponentInParent<Canvas>().GetComponent<RectTransform>();
isCanvasRect = !DSUtil.CheckNull(m_CanvasRect);
}
if (!isMainCam)
{
m_Camera = Camera.main;
isMainCam = !DSUtil.CheckNull(m_Camera);
}
}
public void Set_Target(Transform _target)
{
Init();
m_Target = _target;
isTarget = !DSUtil.CheckNull(m_Target);
}
protected override void Update()
void Update()
{
if (m_Target && m_CanvasRect && m_Camera)
if (isTarget && isCanvasRect && isMainCam)
{
RectTransform CanvasRect = m_CanvasRect;
Vector2 ViewportPosition = m_Camera.WorldToViewportPoint(m_Target.position);

View File

@ -289,9 +289,10 @@ public class ActorInfo : MonoBehaviour
foreach (var actor in actorList)
{
// 조기 종료를 통해 조건을 빠르게 확인
if (actor == null) continue;
//if (actor == null) continue;
//if (DSUtil.CheckNull(actor)) continue;
if (actor.IsEnemy() == isEnemy) continue;
if (actor.isNoseeMob()) continue;
if (actor.IsDead() || actor.Is_Immortal()) continue;
// 거리 조건 확인

View File

@ -31,9 +31,9 @@ public class MessageInfo : MenuBase
//();
}
protected override void Update()
void Update()
{
if (ws == null)
if (DSUtil.CheckNull(ws))
{
ReconnectTime += Time.deltaTime;
if (ReconnectTime > 60f)
@ -90,7 +90,7 @@ public class MessageInfo : MenuBase
{
return; // TODO 정인호 : 현재 서버 off로 인해 꺼둠
if (ws != null && ws.IsAlive) return;
if (!DSUtil.CheckNull(ws) && ws.IsAlive) return;
ws = new WebSocket(ws_url);
@ -109,7 +109,7 @@ public class MessageInfo : MenuBase
void OnApplicationQuit()
{
Send_Msg(ChatType.DisConnect, "");
if (ws != null) ws.Close();
if (!DSUtil.CheckNull(ws)) ws.Close();
ws = null;
}

View File

@ -44,7 +44,7 @@ public class OptionInfo : MonoBehaviourSingletonTemplateBackKeyAdd<OptionInfo>
Screen.sleepTimeout = SleepTimeout.NeverSleep; // 게임 실행 중 화면 안 꺼지게
QualitySettings.SetQualityLevel(PlayerPrefs.GetInt("QualitySettings", 1)); // 퀄리티 중을 기본으로
Act_Repeat_for1sec = () =>
Set_Repeat_for1sec(() =>
{
if (SaveTime > 0)
{
@ -54,7 +54,7 @@ public class OptionInfo : MonoBehaviourSingletonTemplateBackKeyAdd<OptionInfo>
else
label_save.text = DSUtil.Format("{0}초 후 저장 가능", SaveTime);
}
};
});
}
private void Start()

View File

@ -89,10 +89,8 @@ public class TitleInfo : MyCoroutine
Login();
}
protected override void Update()
void Update()
{
base.Update();
if (this.appleAuthManager != null)
this.appleAuthManager.Update();

View File

@ -1,5 +1,3 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.AI;
@ -30,7 +28,7 @@ public class ControlSpecificContent : MyCoroutine
msgTime = 0f;
}
protected override void Update()
void Update()
{
if (!isOpen)
{

View File

@ -4,13 +4,13 @@ using UnityEngine;
public class NoSeeLongDMob : MyCoroutine
{
List<Renderer> list_Renderer = new List<Renderer>();
float dist = 80f;
float dist = 50f;
private void Start()
{
list_Renderer.AddRange(GetComponentsInChildren<Renderer>());
Act_Repeat_for1sec = () =>
Set_Repeat_for1sec(() =>
{
var pos = Camera.main.transform.position;
for (int i = 0; i < list_Renderer.Count; i++)
@ -20,7 +20,7 @@ public class NoSeeLongDMob : MyCoroutine
else if (!list_Renderer[i].enabled && Vector3.Distance(pos, list_Renderer[i].transform.position) <= dist)
list_Renderer[i].enabled = true;
}
};
});
}
public bool IsNoSeeMob()

View File

@ -43,10 +43,8 @@ public class ServerInfo : MyCoroutine
PlayFabSettings.TitleId = Server_Live_ID;
}
protected override void Update()
void Update()
{
base.Update();
// 인터넷 연결 체크
if (Application.internetReachability == NetworkReachability.NotReachable)
{

View File

@ -62,10 +62,10 @@ public class MissionCard_Daily : MissionCard
slider.value = (float)S_Data[1] / m_MissionTableData.n_PurposeCount;
if (m_MissionTableData.e_Purpose == ePurpose.PlayTime)
Act_Repeat_for1sec = () =>
Set_Repeat_for1sec(() =>
{
labels[2].text = DSUtil.Format("{0}/{1}", S_Data[1], m_MissionTableData.n_PurposeCount);
};
});
}
public override void OnClick_RewardInfo()

View File

@ -46,10 +46,10 @@ public class MissionCard_Repeat : MissionCard
}
if (m_MissionTableData.e_Purpose == ePurpose.PlayTime)
Act_Repeat_for1sec = () =>
Set_Repeat_for1sec(() =>
{
labels[2].text = DSUtil.Format("{0}/{1}", Get_CurCount(), m_MissionTableData.n_PurposeCount);
};
});
}
int Get_CurCount()

View File

@ -1,4 +1,3 @@
using System.Collections;
using System.Collections.Generic;
using TMPro;
using UnityEngine;
@ -15,7 +14,7 @@ public class BuffCard : CardBase
private void Awake()
{
Act_Repeat_for1sec = Set_Time;
Set_Repeat_for1sec(Set_Time);
}
public override void Set<T>(T _base)
@ -34,7 +33,11 @@ public class BuffCard : CardBase
if (sdata.Buff.isInfinity())
{
Act_Repeat_for1sec = null;
if (!DSUtil.CheckNull(m_Co_for1Sec))
{
StopCoroutine(m_Co_for1Sec);
m_Co_for1Sec = null;
}
label_time.text = "";
}
else

View File

@ -22,11 +22,6 @@ public class IngameObtainUI : ScrollViewArrMgr
Set_Skill();
}
protected override void Update()
{
//labels[3].text = DSUtil.Get_TimeText_MSms(InGameInfo.Ins.m_Time);
}
public void Set_Chapter()
{
labels[0].text = DSUtil.Format("{0} Map{1}", MyValue.MyChoiceMapData.n_Difficult, MyValue.MyChoiceMapData.n_MapID);

View File

@ -1,6 +1,3 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class SleepMode : MyCoroutine
@ -31,9 +28,8 @@ public class SleepMode : MyCoroutine
SoundInfo.Ins.Active_Sound(false);
}
protected override void Update()
void Update()
{
base.Update();
serversavetime -= Time.deltaTime;
if (serversavetime <= 0f)
{

View File

@ -13,7 +13,7 @@ public class FarmShopCard : CardBase
private void Start()
{
Act_Repeat_for1sec = Set_Time;
Set_Repeat_for1sec(Set_Time);
}
void Set_Time()

View File

@ -10,7 +10,7 @@ public class FarmShopUI : BotMenuBase
private void Start()
{
Ins = this;
Act_Repeat_for1sec = Set_NextTime;
Set_Repeat_for1sec(Set_NextTime);
}
public override void Set()

View File

@ -13,7 +13,7 @@ public class FarmSlotCard : CardBase
private void Awake()
{
Act_Repeat_for1sec = Set_Time;
Set_Repeat_for1sec(Set_Time);
m_Price.icon.sprite = UIAtlasMgr.Ins.Get_Sprite(1);
}

View File

@ -10,7 +10,7 @@ public class MainStatLvUpCard : CardBase
MainStatCardData m_Data;
private void Awake() { Act_Repeat_for1sec = Set_Price; }
private void Awake() { Set_Repeat_for1sec(Set_Price); }
public override void Set<T>(T _base)
{

View File

@ -11,7 +11,7 @@ public class CardInKettlePotion : CardBase
private void Awake()
{
Act_Repeat_for1sec = Set_RemainTime;
Set_Repeat_for1sec(Set_RemainTime);
}
public override void Set<T>(T _base)

View File

@ -5,7 +5,7 @@ public class Lobby_TopRightMoney : MyCoroutine
private void Start()
{
Set_Money();
Act_Repeat_for1sec = Set_Money;
Set_Repeat_for1sec(Set_Money);
}
void Set_Money()

View File

@ -1,5 +1,3 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class Menu_Chapter : MenuBase
@ -15,7 +13,7 @@ public class Menu_Chapter : MenuBase
{
base.Awake();
Act_Repeat_for1sec = () =>
Set_Repeat_for1sec(() =>
{
if (m_time > 0)
{
@ -27,7 +25,7 @@ public class Menu_Chapter : MenuBase
EnterChapter(false, 1); // TODO 정인호 : 이거 자체가 필요 없을 수도? 게임 개념이 달라져서
}
}
};
});
}
public override void Set()

View File

@ -78,9 +78,8 @@ public class IngamePetCard : CardCoolTimeBase
//sprites[3].sprite = UIAtlasMgr.Ins.Get_Sprite(m_PetTableData.AttackTypeIcon);
}
protected override void Update()
void Update()
{
base.Update();
if (m_CoolTime > 0f)
{
m_CoolTime -= Time.deltaTime;

View File

@ -12,7 +12,7 @@ public class RankingUI_Rank : uScrollViewMgr
protected override void Awake()
{
base.Awake();
Act_Repeat_for1sec = () =>
Set_Repeat_for1sec(() =>
{
var keys = dic_RefreshTime.Keys.ToArray();
for (int i = 0; i < keys.Length; i++)
@ -20,7 +20,7 @@ public class RankingUI_Rank : uScrollViewMgr
if (dic_RefreshTime[keys[i]] > 0f)
dic_RefreshTime[keys[i]] -= 1f;
}
};
});
}
public void Set(eDungeon dungeon)

View File

@ -8,7 +8,7 @@ public class Content_Shop_Clover : Content_Shop_Base
protected override void Awake()
{
base.Awake();
Act_Repeat_for1sec = () =>
Set_Repeat_for1sec(() =>
{
var time = ServerInfo.Ins.m_ServerData.Get_Common(eCommon.CloverShopResetTime);
labels[0].text = DSUtil.Format("[C6F185] 배송변경[-]\n[E08DFF]{0}", DSUtil.Get_TimeText_MS(time));
@ -17,7 +17,7 @@ public class Content_Shop_Clover : Content_Shop_Base
DataCheckMgr.Ins.Reset_CloverItems();
OnEnable();
}
};
});
}
public void OnClick_ResetItems()

View File

@ -1,5 +1,3 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class ShopCardBase : CardBase
@ -13,16 +11,20 @@ public class ShopCardBase : CardBase
protected virtual void Awake()
{
Act_Repeat_for1sec = Set_ADTime;
Set_Repeat_for1sec(Set_ADTime);
}
public override void Set<T>(T _base)
{
base.Set(_base);
if (go_guidearrow) go_guidearrow.SetActive(false);
if (_base == null)
if (DSUtil.CheckNull(_base))
{
Act_Repeat_for1sec = null;
if (!DSUtil.CheckNull(_base))
{
StopCoroutine(m_Co_for1Sec);
m_Co_for1Sec = null;
}
DSUtil.InActivateGameObjects(gos);
return;
}

View File

@ -8,7 +8,7 @@ public class ShopCloverCard : ShopCardBase
{
if (_base == null)
{
Act_Repeat_for1sec = null;
//Act_Repeat_for1sec = null;
DSUtil.InActivateGameObjects(gos);
return;
}

View File

@ -1,5 +1,4 @@
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using Random = UnityEngine.Random;
@ -13,7 +12,7 @@ public class SelectSkillUI : MyCoroutine
List<int> list_skillid = new List<int>();
float m_RemainTime = 10f;
protected override void Update()
void Update()
{
if (m_RemainTime > 0f)
{

View File

@ -53,7 +53,7 @@ public class BangchiUI : BackKeyAdd
//m_IngameObtainUI.Set_Skill();
}
protected override void Update()
void Update()
{
label_curTime.text = DSUtil.Get_TimeText_HMS(DateTime.Now);
}

View File

@ -1,5 +1,3 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class PauseUI : BackKeyAdd
@ -7,9 +5,8 @@ public class PauseUI : BackKeyAdd
public IngameObtainUI m_IngameObtainUI;
public GameObject[] gos; // 0 방치하기, 1 나가기
protected override void Update()
void Update()
{
base.Update();
Physics.SyncTransforms();
}

View File

@ -30,7 +30,7 @@ public class SmallItemGetCard : MyCoroutine
Set_Coroutine(() => { RunUpdate = true; }, AlphaDelay);
}
protected override void Update()
void Update()
{
if (RunUpdate)
m_Widget.alpha -= Time.deltaTime;

View File

@ -174,12 +174,6 @@ public class StageResult : BackKeyAdd
else if (index == 2) sdata.Add_MissionCount(MyValue.arr_Mission[1], 33);
}
protected override void Update()
{
base.Update();
ActorInfo.Ins.All_Stop(true);
}
public void LvUpMoveFinish() { gos[3].SetActive(true); }
public void Add_Gold(double _gold)

View File

@ -4,20 +4,18 @@ using UnityEngine;
public class MyCoroutine : MonoBehaviour
{
protected Action Act_Repeat_for1sec;
float t_for1sec = 0f;
Coroutine m_Co;
protected Coroutine m_Co_for1Sec, m_Co;
protected virtual void Update()
protected void Set_Repeat_for1sec(Action act)
{
if (Act_Repeat_for1sec != null)
m_Co_for1Sec = StartCoroutine(Co_1sec(act));
}
IEnumerator Co_1sec(Action act)
{
while (true)
{
t_for1sec -= Time.deltaTime;
if (t_for1sec <= 0f)
{
t_for1sec = 1f;
Act_Repeat_for1sec();
}
yield return new WaitForSeconds(1f);
act();
}
}
@ -33,7 +31,7 @@ public class MyCoroutine : MonoBehaviour
_act?.Invoke();
}
protected void Cancel_CurCoroutine() { if (m_Co != null) StopCoroutine(m_Co); }
protected void Cancel_CurCoroutine() { if (!DSUtil.CheckNull(m_Co)) StopCoroutine(m_Co); }
protected void Set_Coroutine_withCancel(Action _act, float _time)
{
if (gameObject.activeInHierarchy)

View File

@ -1,4 +1,3 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@ -15,10 +14,10 @@ public class NoSeeLongDistance : MyCoroutine
Transform baseTF = BaseOnPC ? MyValue.MyPC.transform : Camera.main.transform;
Act_Repeat_for1sec = () =>
Set_Repeat_for1sec(() =>
{
for (int i = 0; i < list.Count; i++)
list[i].SetActive(Vector3.Distance(list[i].transform.position, baseTF.position) < Dist);
};
});
}
}

View File

@ -5,20 +5,19 @@ public class TurnOff_GO : MyCoroutine
{
public bool NoUseParticleTime = false;
public float OffTime = 5f;
public Vector3 add_offset;
public eEffectLocation e_EffectLocation;
public Transform tf_Target;
public Action act_End;
Actor m_target, m_target2;
ProjectileData m_ProjectileData;
bool followTarget;
bool followTarget, isTarget = false, isTarget2 = false;
public void Set() { gameObject.SetActive(false); gameObject.SetActive(true); }
public void Set(Actor target, ProjectileData pd, float LifeTime)
{
followTarget = true;
m_target = target;
isTarget = true;
m_ProjectileData = pd;
NoUseParticleTime = true;
OffTime = LifeTime;
@ -30,6 +29,7 @@ public class TurnOff_GO : MyCoroutine
public void Set(Actor target, eEffectLocation loca, float lifetime)
{
m_target2 = target;
isTarget2 = true;
e_EffectLocation = loca;
OffTime = lifetime;
@ -57,11 +57,11 @@ public class TurnOff_GO : MyCoroutine
Set_Off();
}
protected override void Update()
void Update()
{
if (followTarget)
{
if (DSUtil.CheckNull(m_target))
if (!isTarget)
{
transform.position = Vector3.right * 1000000f;
gameObject.SetActive(false);
@ -72,9 +72,7 @@ public class TurnOff_GO : MyCoroutine
transform.position = pos;
}
}
else if (!DSUtil.CheckNull(tf_Target))
transform.position = tf_Target.position + add_offset;
else if (!DSUtil.CheckNull(m_target2))
else if (isTarget2)
Set_Location(m_target2);
}
void Set_Location(Actor target)
@ -82,8 +80,8 @@ public class TurnOff_GO : MyCoroutine
Vector3 effectPos;
switch (e_EffectLocation)
{
case eEffectLocation.Top: effectPos = target.Get_Top_postion(); break;
default: effectPos = target.Get_Center_position(); break;
case eEffectLocation.Top: effectPos = target.Get_Top_postion(); break;
default: effectPos = target.Get_Center_position(); break;
case eEffectLocation.Bottom: effectPos = target.Get_position(); break;
}
transform.position = effectPos;

View File

@ -1,5 +1,3 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class UISafeAreaRightController : MyCoroutine
@ -16,7 +14,7 @@ public class UISafeAreaRightController : MyCoroutine
Ori_x = transform.localPosition.x;
Act_Repeat_for1sec = ComputeSafeAreaOffest;
Set_Repeat_for1sec(ComputeSafeAreaOffest);
}
private void Start()