Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updated hdrp/vfx to 12.1.1 #17

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Updated hdrp/vfx to 12.1.1 #17

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
80cc500
HDRP/VFX-to-12.1.1
mrmacright Feb 7, 2023
5b9596a
Update README.md
mrmacright Feb 16, 2023
62430b5
Update README.md
mrmacright Feb 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,055 changes: 764 additions & 291 deletions Assets/Animation/Demo/BridgeTerminal/AlertModeTimeline.playable
View file
Open in desktop

Large diffs are not rendered by default.

515 changes: 360 additions & 155 deletions Assets/Animation/Demo/Core/CoreAttackTimeline.playable
View file
Open in desktop

Large diffs are not rendered by default.

119 changes: 84 additions & 35 deletions Assets/Animation/Demo/Core/CoreHitTimeline.playable
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ AnimationClip:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Recorded
serializedVersion: 6
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
Expand All @@ -17,7 +17,8 @@ AnimationClip:
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- curve:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
Expand Down Expand Up @@ -54,6 +55,7 @@ AnimationClip:
path:
classID: 2083052967
script: {fileID: 0}
flags: 16
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
Expand All @@ -69,6 +71,8 @@ AnimationClip:
typeID: 2083052967
customType: 38
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
Expand All @@ -91,7 +95,8 @@ AnimationClip:
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
Expand Down Expand Up @@ -128,29 +133,11 @@ AnimationClip:
path:
classID: 2083052967
script: {fileID: 0}
flags: 16
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
--- !u!114 &-8466588318192298320
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e0d1ad44666d1b64fb45664b4dbcbb8f, type: 3}
m_Name: VisualEffectActivationClip
m_EditorClassIdentifier:
activationBehavior:
onClipEnter:
m_Name: TakeHit
onClipExit:
m_Name: 0
clipEnterEventAttributes: []
clipExitEventAttributes: []
--- !u!114 &-8113972968606800907
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down Expand Up @@ -216,14 +203,14 @@ MonoBehaviour:
- m_Version: 1
m_Start: 0.016666666666666666
m_ClipIn: 0
m_Asset: {fileID: -8466588318192298320}
m_Asset: {fileID: 6129231879301018544}
m_Duration: 2.1999999999999997
m_TimeScale: 1
m_ParentTrack: {fileID: -7894395032639947818}
m_EaseInDuration: 0
m_EaseOutDuration: 0
m_BlendInDuration: 0
m_BlendOutDuration: 0
m_BlendInDuration: -1
m_BlendOutDuration: -1
m_MixInCurve:
serializedVersion: 2
m_Curve:
Expand Down Expand Up @@ -281,17 +268,19 @@ MonoBehaviour:
m_PreExtrapolationMode: 0
m_PostExtrapolationTime: 0
m_PreExtrapolationTime: 0
m_DisplayName: VisualEffectActivationClip
m_DisplayName: VisualEffectControlClip
m_Markers:
m_Objects: []
m_VFXVersion: 1
reinit: 0
--- !u!74 &-5579829588504845748
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Recorded (1)
serializedVersion: 6
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
Expand All @@ -301,7 +290,8 @@ AnimationClip:
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- curve:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
Expand Down Expand Up @@ -428,6 +418,7 @@ AnimationClip:
path:
classID: 2083052967
script: {fileID: 0}
flags: 16
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
Expand All @@ -443,6 +434,8 @@ AnimationClip:
typeID: 2083052967
customType: 38
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
Expand All @@ -465,7 +458,8 @@ AnimationClip:
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
Expand Down Expand Up @@ -592,6 +586,7 @@ AnimationClip:
path:
classID: 2083052967
script: {fileID: 0}
flags: 16
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
Expand Down Expand Up @@ -724,6 +719,7 @@ MonoBehaviour:
m_FixedDuration: 1.0333333333333334
m_EditorSettings:
m_Framerate: 60
m_ScenePreview: 1
m_DurationMode: 1
m_MarkerTrack: {fileID: -4267037021611207632}
--- !u!74 &293018618407092293
Expand All @@ -733,7 +729,7 @@ AnimationClip:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Recorded (3)
serializedVersion: 6
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
Expand All @@ -743,7 +739,8 @@ AnimationClip:
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- curve:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
Expand Down Expand Up @@ -780,6 +777,7 @@ AnimationClip:
path:
classID: 114
script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3}
flags: 16
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
Expand All @@ -795,6 +793,8 @@ AnimationClip:
typeID: 114
customType: 0
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
Expand All @@ -817,7 +817,8 @@ AnimationClip:
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
Expand Down Expand Up @@ -854,6 +855,7 @@ AnimationClip:
path:
classID: 114
script: {fileID: 11500000, guid: 7a68c43fe1f2a47cfa234b5eeaa98012, type: 3}
flags: 16
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
Expand All @@ -865,7 +867,7 @@ AnimationClip:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Recorded (2)
serializedVersion: 6
serializedVersion: 7
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
Expand All @@ -875,7 +877,8 @@ AnimationClip:
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves:
- curve:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
Expand Down Expand Up @@ -975,6 +978,7 @@ AnimationClip:
path:
classID: 2083052967
script: {fileID: 0}
flags: 16
m_PPtrCurves: []
m_SampleRate: 60
m_WrapMode: 0
Expand All @@ -990,6 +994,8 @@ AnimationClip:
typeID: 2083052967
customType: 38
isPPtrCurve: 0
isIntCurve: 0
isSerializeReferenceCurve: 0
pptrCurveMapping: []
m_AnimationClipSettings:
serializedVersion: 2
Expand All @@ -1012,7 +1018,8 @@ AnimationClip:
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves:
- curve:
- serializedVersion: 2
curve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
Expand Down Expand Up @@ -1112,6 +1119,7 @@ AnimationClip:
path:
classID: 2083052967
script: {fileID: 0}
flags: 16
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
Expand Down Expand Up @@ -1157,6 +1165,47 @@ MonoBehaviour:
m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
m_Rotation: {x: 0, y: 0, z: 0, w: 1}
m_ApplyOffsets: 0
--- !u!114 &6129231879301018544
MonoBehaviour:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 488c20dddec813547afc71a1f46c10dd, type: 3}
m_Name: VisualEffectControlClip
m_EditorClassIdentifier:
scrubbing: 0
startSeed: 0
reinit: 0
prewarm:
enable: 0
stepCount: 20
deltaTime: 0.05
eventName:
m_Name: OnPlay
clipEvents:
- editorColor: {r: 0.48235294, g: 0.61960787, b: 0.019607844, a: 1}
enter:
time: 0
timeSpace: 0
name:
m_Name: TakeHit
eventAttributes:
content: []
exit:
time: 0
timeSpace: 1
name:
m_Name: 0
eventAttributes:
content: []
singleEvents: []
references:
version: 2
RefIds: []
--- !u!114 &8906405099336455567
MonoBehaviour:
m_ObjectHideFlags: 1
Expand Down
Loading