-
Notifications
You must be signed in to change notification settings - Fork 109
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
* update clientdriven sample to 2021.3.12f1 * third person controller assets added * dependencies updated * First pass of art level art updates and URP port * Added carrying animation to project * Environment Art Pass * Animation import setting edits * More environment art pass, specifically on drop zones and stoves * Dropzone ingredient animation * Animated ingredient materials * More overall theme changes, as well as some small bug fixes * Updated shadow biases to remove banding * New GUIDs for these assets * Turned off cast shadows on some object * Updated shadow bias again to fix cracks in shadows * deleted unused animations from this branch, will be restored in another branch * Fixed NGO version to be 1.1.0 * Updated ingredient materials (most notably making the purple material a lot more white to increase contrast from the purple background) * Color adjustments * Updated 3rd person model materials to URP ones * Removed this unused directive * Added these split nodes to remove errors about implicit truncation of vectors * Updated these materials to URP shaders Co-authored-by: Fernando Cortez <fernando.cortez@unity3d.com> Co-authored-by: jilfranco--unity <jilfranco--unity@bitbucket.org>
- Loading branch information
3 people
committed
Dec 1, 2022
1 parent
fbdac60
commit e98f7fb
Showing
116 changed files
with
28,983 additions
and
3,501 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
78 changes: 78 additions & 0 deletions
78
Basic/ClientDriven/Assets/Animations/Ingredient.controller
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,78 @@ | ||
| %YAML 1.1 | ||
| %TAG !u! tag:unity3d.com,2011: | ||
| --- !u!91 &9100000 | ||
| AnimatorController: | ||
| m_ObjectHideFlags: 0 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_Name: Ingredient | ||
| serializedVersion: 5 | ||
| m_AnimatorParameters: | ||
| - m_Name: Offset | ||
| m_Type: 1 | ||
| m_DefaultFloat: 0 | ||
| m_DefaultInt: 0 | ||
| m_DefaultBool: 0 | ||
| m_Controller: {fileID: 0} | ||
| m_AnimatorLayers: | ||
| - serializedVersion: 5 | ||
| m_Name: Base Layer | ||
| m_StateMachine: {fileID: 6647156463675509044} | ||
| 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!1102 &1928269946285757961 | ||
| AnimatorState: | ||
| serializedVersion: 6 | ||
| m_ObjectHideFlags: 1 | ||
| m_CorrespondingSourceObject: {fileID: 0} | ||
| m_PrefabInstance: {fileID: 0} | ||
| m_PrefabAsset: {fileID: 0} | ||
| m_Name: IngredientBounce | ||
| m_Speed: 1 | ||
| m_CycleOffset: 0 | ||
| m_Transitions: [] | ||
| 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: 1 | ||
| m_TimeParameterActive: 0 | ||
| m_Motion: {fileID: 7400000, guid: b6d107b7a8609304b8f24c535ed61f2b, type: 2} | ||
| m_Tag: | ||
| m_SpeedParameter: | ||
| m_MirrorParameter: | ||
| m_CycleOffsetParameter: Offset | ||
| m_TimeParameter: | ||
| --- !u!1107 &6647156463675509044 | ||
| AnimatorStateMachine: | ||
| serializedVersion: 6 | ||
| 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: 1928269946285757961} | ||
| m_Position: {x: 370, y: 90, z: 0} | ||
| m_ChildStateMachines: [] | ||
| m_AnyStateTransitions: [] | ||
| m_EntryTransitions: [] | ||
| m_StateMachineTransitions: {} | ||
| m_StateMachineBehaviours: [] | ||
| m_AnyStatePosition: {x: 50, y: 20, z: 0} | ||
| m_EntryPosition: {x: 50, y: 120, z: 0} | ||
| m_ExitPosition: {x: 800, y: 120, z: 0} | ||
| m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} | ||
| m_DefaultState: {fileID: 1928269946285757961} |
8 changes: 8 additions & 0 deletions
8
Basic/ClientDriven/Assets/Animations/Ingredient.controller.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
113 changes: 113 additions & 0 deletions
113
Basic/ClientDriven/Assets/Animations/IngredientBounce.anim
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,113 @@ | ||
| %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: IngredientBounce | ||
| serializedVersion: 6 | ||
| m_Legacy: 0 | ||
| m_Compressed: 0 | ||
| m_UseHighQualityCurve: 1 | ||
| m_RotationCurves: [] | ||
| m_CompressedRotationCurves: [] | ||
| m_EulerCurves: [] | ||
| m_PositionCurves: | ||
| - curve: | ||
| serializedVersion: 2 | ||
| m_Curve: | ||
| - serializedVersion: 3 | ||
| time: 0 | ||
| value: {x: 0, y: 0.9876049, z: 0} | ||
| inSlope: {x: 0, y: -0.22737719, z: 0} | ||
| outSlope: {x: 0, y: -0.22737719, z: 0} | ||
| tangentMode: 0 | ||
| weightedMode: 0 | ||
| inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} | ||
| outWeight: {x: 0.33333334, y: 0.0768852, z: 0.33333334} | ||
| - serializedVersion: 3 | ||
| time: 3.5 | ||
| value: {x: 0, y: 0.9876049, z: 0} | ||
| inSlope: {x: 0, y: -0.46597734, z: 0} | ||
| outSlope: {x: 0, y: -0.46597734, z: 0} | ||
| tangentMode: 0 | ||
| weightedMode: 3 | ||
| inWeight: {x: 0.33333334, y: 0.4153824, z: 0.33333334} | ||
| outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} | ||
| m_PreInfinity: 2 | ||
| m_PostInfinity: 2 | ||
| m_RotationOrder: 4 | ||
| path: | ||
| m_ScaleCurves: [] | ||
| m_FloatCurves: [] | ||
| m_PPtrCurves: [] | ||
| m_SampleRate: 60 | ||
| 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: 1 | ||
| script: {fileID: 0} | ||
| typeID: 4 | ||
| customType: 0 | ||
| isPPtrCurve: 0 | ||
| pptrCurveMapping: [] | ||
| m_AnimationClipSettings: | ||
| serializedVersion: 2 | ||
| m_AdditiveReferencePoseClip: {fileID: 0} | ||
| m_AdditiveReferencePoseTime: 0 | ||
| m_StartTime: 0 | ||
| m_StopTime: 3.5 | ||
| 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: | ||
| - curve: | ||
| serializedVersion: 2 | ||
| m_Curve: | ||
| - serializedVersion: 3 | ||
| time: 0 | ||
| value: 0.9876049 | ||
| inSlope: -0.22737719 | ||
| outSlope: -0.22737719 | ||
| tangentMode: 0 | ||
| weightedMode: 0 | ||
| inWeight: 0.33333334 | ||
| outWeight: 0.0768852 | ||
| - serializedVersion: 3 | ||
| time: 3.5 | ||
| value: 0.9876049 | ||
| inSlope: -0.46597734 | ||
| outSlope: -0.46597734 | ||
| tangentMode: 0 | ||
| weightedMode: 3 | ||
| inWeight: 0.4153824 | ||
| outWeight: 0.33333334 | ||
| m_PreInfinity: 2 | ||
| m_PostInfinity: 2 | ||
| m_RotationOrder: 4 | ||
| attribute: m_LocalPosition.y | ||
| path: | ||
| classID: 4 | ||
| script: {fileID: 0} | ||
| m_EulerEditorCurves: [] | ||
| m_HasGenericRootTransform: 1 | ||
| m_HasMotionFloatCurves: 0 | ||
| m_Events: [] |
8 changes: 8 additions & 0 deletions
8
Basic/ClientDriven/Assets/Animations/IngredientBounce.anim.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
Oops, something went wrong.