Update Event system + Add basic HardObstacle

This commit is contained in:
Antoine H 2021-01-22 17:34:44 +01:00
parent ca8790bb19
commit fd8306645b
39 changed files with 1248 additions and 69 deletions

View file

@ -0,0 +1,105 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: clientFight
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: -9087577266532155448, guid: 4253ee9838e8504419ade6abdae8ca57,
type: 3}
- time: 0.083333336
value: {fileID: -1106684591460216115, guid: 4253ee9838e8504419ade6abdae8ca57,
type: 3}
- time: 0.16666667
value: {fileID: -5983078005227543334, guid: 4253ee9838e8504419ade6abdae8ca57,
type: 3}
- time: 0.25
value: {fileID: 7818055727696256662, guid: 4253ee9838e8504419ade6abdae8ca57,
type: 3}
- time: 0.33333334
value: {fileID: 8013849657407384527, guid: 4253ee9838e8504419ade6abdae8ca57,
type: 3}
- time: 0.41666666
value: {fileID: -5181280606106272151, guid: 4253ee9838e8504419ade6abdae8ca57,
type: 3}
- time: 0.5
value: {fileID: -7197358887858680917, guid: 4253ee9838e8504419ade6abdae8ca57,
type: 3}
- time: 0.5833333
value: {fileID: 5016423947855932505, guid: 4253ee9838e8504419ade6abdae8ca57,
type: 3}
- time: 0.6666667
value: {fileID: 9222936549612893643, guid: 4253ee9838e8504419ade6abdae8ca57,
type: 3}
- time: 0.75
value: {fileID: -8405810056075184875, guid: 4253ee9838e8504419ade6abdae8ca57,
type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 12
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: -9087577266532155448, guid: 4253ee9838e8504419ade6abdae8ca57, type: 3}
- {fileID: -1106684591460216115, guid: 4253ee9838e8504419ade6abdae8ca57, type: 3}
- {fileID: -5983078005227543334, guid: 4253ee9838e8504419ade6abdae8ca57, type: 3}
- {fileID: 7818055727696256662, guid: 4253ee9838e8504419ade6abdae8ca57, type: 3}
- {fileID: 8013849657407384527, guid: 4253ee9838e8504419ade6abdae8ca57, type: 3}
- {fileID: -5181280606106272151, guid: 4253ee9838e8504419ade6abdae8ca57, type: 3}
- {fileID: -7197358887858680917, guid: 4253ee9838e8504419ade6abdae8ca57, type: 3}
- {fileID: 5016423947855932505, guid: 4253ee9838e8504419ade6abdae8ca57, type: 3}
- {fileID: 9222936549612893643, guid: 4253ee9838e8504419ade6abdae8ca57, type: 3}
- {fileID: -8405810056075184875, guid: 4253ee9838e8504419ade6abdae8ca57, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.8333333
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []

View file

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

View file

@ -0,0 +1,159 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1101 &-2207836258054923399
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 2
m_ConditionEvent: active fight
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 4800364795622535310}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.7
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &-476213691089259077
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: clientFight
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -2207836258054923399}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: b4a8d327ed204ff44b68b1c6df1c66eb, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: clientFight_animator
serializedVersion: 5
m_AnimatorParameters:
- m_Name: active fight
m_Type: 4
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 7885178700017951334}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &1878572531684579299
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 1
m_ConditionEvent: active fight
m_EventTreshold: 0
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: -476213691089259077}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0.75
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &4800364795622535310
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Wait
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 1878572531684579299}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 0}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &7885178700017951334
AnimatorStateMachine:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 4800364795622535310}
m_Position: {x: 419.1192, y: 250.46849, z: 0}
- serializedVersion: 1
m_State: {fileID: -476213691089259077}
m_Position: {x: 487.31512, y: 97.02763, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 140, y: 160, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 4800364795622535310}

View file

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 69f9597ecec38b842969d718306a8a66
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 52 KiB

View file

@ -0,0 +1,346 @@
fileFormatVersion: 2
guid: 4253ee9838e8504419ade6abdae8ca57
TextureImporter:
internalIDToNameTable:
- first:
213: -9087577266532155448
second: smoke_0
- first:
213: -1106684591460216115
second: smoke_1
- first:
213: -5983078005227543334
second: smoke_2
- first:
213: 7818055727696256662
second: smoke_3
- first:
213: 8013849657407384527
second: smoke_4
- first:
213: -5181280606106272151
second: smoke_5
- first:
213: -7197358887858680917
second: smoke_6
- first:
213: 5016423947855932505
second: smoke_7
- first:
213: 9222936549612893643
second: smoke_8
- first:
213: -8405810056075184875
second: smoke_9
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 2
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites:
- serializedVersion: 2
name: smoke_0
rect:
serializedVersion: 2
x: 0
y: 0
width: 128
height: 128
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 8cf7f67cf9072e180800000000000000
internalID: -9087577266532155448
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: smoke_1
rect:
serializedVersion: 2
x: 128
y: 0
width: 128
height: 128
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: dc29d9f3a3444a0f0800000000000000
internalID: -1106684591460216115
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: smoke_2
rect:
serializedVersion: 2
x: 256
y: 0
width: 128
height: 128
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: ad4a5f20146d7fca0800000000000000
internalID: -5983078005227543334
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: smoke_3
rect:
serializedVersion: 2
x: 384
y: 0
width: 128
height: 128
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 69e1b8333405f7c60800000000000000
internalID: 7818055727696256662
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: smoke_4
rect:
serializedVersion: 2
x: 512
y: 0
width: 128
height: 128
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: fcb2721edc9e63f60800000000000000
internalID: 8013849657407384527
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: smoke_5
rect:
serializedVersion: 2
x: 640
y: 0
width: 128
height: 128
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 96e3a678db46818b0800000000000000
internalID: -5181280606106272151
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: smoke_6
rect:
serializedVersion: 2
x: 768
y: 0
width: 128
height: 128
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: babce288938dd1c90800000000000000
internalID: -7197358887858680917
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: smoke_7
rect:
serializedVersion: 2
x: 896
y: 0
width: 128
height: 128
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 95c27be900bed9540800000000000000
internalID: 5016423947855932505
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: smoke_8
rect:
serializedVersion: 2
x: 1024
y: 0
width: 128
height: 128
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: bc5b4a93de37eff70800000000000000
internalID: 9222936549612893643
vertices: []
indices:
edges: []
weights: []
- serializedVersion: 2
name: smoke_9
rect:
serializedVersion: 2
x: 1152
y: 0
width: 128
height: 128
alignment: 0
pivot: {x: 0, y: 0}
border: {x: 0, y: 0, z: 0, w: 0}
outline: []
physicsShape: []
tessellationDetail: 0
bones: []
spriteID: 5157b363a40985b80800000000000000
internalID: -8405810056075184875
vertices: []
indices:
edges: []
weights: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant: