Skip to content

Feature/animation speed cleanup [GOMPS-86] #269

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

Merged
merged 10 commits into from
Apr 23, 2021
Merged

Feature/animation speed cleanup [GOMPS-86] #269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
8511275
Animation-speed cleanup
eheimburg Apr 12, 2021
c1e27e8
Animation-speed cleanup
eheimburg Apr 12, 2021
fa468a0
code cleanup to address PR concerns
eheimburg Apr 13, 2021
c55fbd4
comment fix
eheimburg Apr 13, 2021
40d9b77
variable renaming
eheimburg Apr 14, 2021
481eb83
Move speed values and animator variables out of ClientCharacterVisual…
eheimburg Apr 19, 2021
e7597e3
move some more variables out of ClientCharacterVisualization and into…
eheimburg Apr 19, 2021
184f982
more cleanup of ClientCharacterVisualization
eheimburg Apr 19, 2021
76e5093
fix variable naming convention, remove #if
eheimburg Apr 20, 2021
b7b7ddf
Merge remote-tracking branch 'origin/develop' into feature/animation_…
eheimburg Apr 23, 2021
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
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Character/Archer.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Character/Imp.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Character/ImpBoss.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Character/Mage.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Character/Rogue.asset
View file
Open in desktop
Git LFS file not shown
4 changes: 2 additions & 2 deletions Assets/BossRoom/GameData/Character/Tank.asset
View file
Open in desktop
Git LFS file not shown
8 changes: 8 additions & 0 deletions Assets/BossRoom/GameData/Shared.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions Assets/BossRoom/GameData/Shared/SharedVisualizationConfiguration.asset
View file
Open in desktop
Git LFS file not shown
8 changes: 8 additions & 0 deletions Assets/BossRoom/GameData/Shared/SharedVisualizationConfiguration.asset.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

18 changes: 17 additions & 1 deletion Assets/BossRoom/Models/Animation Controllers/CharacterSetController.controller
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,10 +82,26 @@ BlendTree:
m_CycleOffset: 0
m_DirectBlendParameter: Blend
m_Mirror: 0
- serializedVersion: 2
m_Motion: {fileID: 6200578666267062213, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
m_Threshold: 1.5
m_Position: {x: 0, y: 0}
m_TimeScale: 1.5
m_CycleOffset: 0
m_DirectBlendParameter: Speed
m_Mirror: 0
- serializedVersion: 2
m_Motion: {fileID: 6200578666267062213, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
m_Threshold: 2
m_Position: {x: 0, y: 0}
m_TimeScale: 2
m_CycleOffset: 0
m_DirectBlendParameter: Speed
m_Mirror: 0
m_BlendParameter: Speed
m_BlendParameterY: Blend
m_MinThreshold: 0
m_MaxThreshold: 1
m_MaxThreshold: 2
m_UseAutomaticThresholds: 1
m_NormalizedBlendValues: 0
m_BlendType: 0
Expand Down
48 changes: 26 additions & 22 deletions Assets/BossRoom/Prefabs/CharGFX/BossGraphics.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -634,8 +634,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2305735426247598617}
m_LocalRotation: {x: -0.000000066579034, y: -0.000000043711385, z: -0.00000011029043,
w: 1}
m_LocalRotation: {x: -0.000000066579034, y: -0.000000043711385, z: -0.00000011029043, w: 1}
m_LocalPosition: {x: -15.063482, y: -0.56256866, z: -0.0000076293945}
m_LocalScale: {x: 100, y: 99.999985, z: 100}
m_Children: []
Expand Down Expand Up @@ -2000,6 +1999,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_ClientVisualsAnimator: {fileID: 234724737205816310}
m_CharacterSwapper: {fileID: 0}
m_VisualizationConfiguration: {fileID: 11400000, guid: 9504973cdecd65749889771972fa0117, type: 2}
TargetReticule: {fileID: 0}
ReticuleFriendlyMat: {fileID: 0}
ReticuleHostileMat: {fileID: 0}
Expand All @@ -2019,10 +2019,11 @@ MonoBehaviour:
m_EventsOnNodeEntry:
- m_AnimatorNodeName: Action - Boss Trample
m_AnimatorNodeNameHash: -1491039896
m_Prefab: {fileID: -1433333703484781611, guid: 1333b84cd80da3e4a820009415068d44,
type: 3}
m_Prefab: {fileID: -1433333703484781611, guid: 1333b84cd80da3e4a820009415068d44, type: 3}
m_PrefabSpawnDelaySeconds: 0
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_SoundEffect: {fileID: 8300000, guid: a3d48c8599f0d584abc8ea603587d496, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -2032,6 +2033,8 @@ MonoBehaviour:
m_Prefab: {fileID: 0}
m_PrefabSpawnDelaySeconds: 0
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_SoundEffect: {fileID: 8300000, guid: 263888c6e986c944d80c59c3ac332ba1, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -2041,36 +2044,41 @@ MonoBehaviour:
m_Prefab: {fileID: 0}
m_PrefabSpawnDelaySeconds: 0
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_SoundEffect: {fileID: 8300000, guid: 87cdf94f9ac5ef541b45ebaa3d8bf7aa, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
m_LoopSound: 1
- m_AnimatorNodeName: Stunned
m_AnimatorNodeNameHash: -449490811
m_Prefab: {fileID: -7841978760598146115, guid: 1fab07feb34d8c94c96944f0124d92e3,
type: 3}
m_Prefab: {fileID: -7841978760598146115, guid: 1fab07feb34d8c94c96944f0124d92e3, type: 3}
m_PrefabSpawnDelaySeconds: 0
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_SoundEffect: {fileID: 8300000, guid: 3d6f2e33acb1e8f4b9d829e245c62e16, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
m_LoopSound: 0
- m_AnimatorNodeName: HitReact1
m_AnimatorNodeNameHash: -1747783153
m_Prefab: {fileID: -2843690008440830094, guid: de5b665e7f32274419072e7bf4c3eff8,
type: 3}
m_Prefab: {fileID: -2843690008440830094, guid: de5b665e7f32274419072e7bf4c3eff8, type: 3}
m_PrefabSpawnDelaySeconds: 0
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_SoundEffect: {fileID: 8300000, guid: 5ef809d665d13b245b559cd6170f5794, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
m_LoopSound: 0
- m_AnimatorNodeName: WalkRun
m_AnimatorNodeNameHash: -1624701500
m_Prefab: {fileID: -8608552164340512473, guid: 9336eb30e2a836544bfd5b5985fd0573,
type: 3}
m_Prefab: {fileID: -8608552164340512473, guid: 9336eb30e2a836544bfd5b5985fd0573, type: 3}
m_PrefabSpawnDelaySeconds: 0
m_PrefabCanBeAbortedUntilSecs: 0
m_PrefabParent: {fileID: 0}
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
m_SoundEffect: {fileID: 0}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
Expand All @@ -2088,8 +2096,7 @@ AudioSource:
m_GameObject: {fileID: 6839301660383890230}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: -6199682581367681880, guid: e39f39bfdfb22b541bbc115192fc2809,
type: 2}
OutputAudioMixerGroup: {fileID: -6199682581367681880, guid: e39f39bfdfb22b541bbc115192fc2809, type: 2}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 0
m_Volume: 1
Expand Down Expand Up @@ -2212,8 +2219,7 @@ AudioSource:
m_GameObject: {fileID: 6839301660383890230}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: -6199682581367681880, guid: e39f39bfdfb22b541bbc115192fc2809,
type: 2}
OutputAudioMixerGroup: {fileID: -6199682581367681880, guid: e39f39bfdfb22b541bbc115192fc2809, type: 2}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 0
m_Volume: 1
Expand Down Expand Up @@ -2343,14 +2349,13 @@ MonoBehaviour:
m_AnimatorVariable: Speed
m_AnimatorVariableHash: -823668238
m_AudioSource: {fileID: -2129752889114835779}
m_WalkFootstepAudioClip: {fileID: 8300000, guid: 58dfe905701797d4aa32f946d9c41be5,
type: 3}
m_WalkFootstepAudioClip: {fileID: 8300000, guid: 58dfe905701797d4aa32f946d9c41be5, type: 3}
m_WalkFootstepVolume: 1
m_RunFootstepAudioClip: {fileID: 8300000, guid: 81079ef149d08774ab3eadab80944fa0,
type: 3}
m_RunFootstepAudioClip: {fileID: 8300000, guid: 81079ef149d08774ab3eadab80944fa0, type: 3}
m_RunFootstepVolume: 1
m_WalkingPoint: 0.6
m_SilentPoint: 0.3
m_TooSlowThreshold: 0.3
m_WalkSpeedThreshold: 0.6
m_RunSpeedThreshold: 1.2
--- !u!82 &-2129752889114835779
AudioSource:
m_ObjectHideFlags: 0
Expand All @@ -2360,8 +2365,7 @@ AudioSource:
m_GameObject: {fileID: 6839301660383890230}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: -4341177700643628062, guid: e39f39bfdfb22b541bbc115192fc2809,
type: 2}
OutputAudioMixerGroup: {fileID: -4341177700643628062, guid: e39f39bfdfb22b541bbc115192fc2809, type: 2}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 0
m_Volume: 1
Expand Down
6 changes: 4 additions & 2 deletions Assets/BossRoom/Prefabs/CharGFX/ImpGraphics.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1133,6 +1133,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_ClientVisualsAnimator: {fileID: 234724737205816310}
m_CharacterSwapper: {fileID: 0}
m_VisualizationConfiguration: {fileID: 11400000, guid: 9504973cdecd65749889771972fa0117, type: 2}
TargetReticule: {fileID: 0}
ReticuleFriendlyMat: {fileID: 0}
ReticuleHostileMat: {fileID: 0}
Expand Down Expand Up @@ -1468,8 +1469,9 @@ MonoBehaviour:
m_WalkFootstepVolume: 0.8
m_RunFootstepAudioClip: {fileID: 8300000, guid: 6ad4d1d63bc70494bbc9172ae70bcdd0, type: 3}
m_RunFootstepVolume: 0.8
m_WalkingPoint: 0.6
m_SilentPoint: 0.3
m_TooSlowThreshold: 0.3
m_WalkSpeedThreshold: 0.6
m_RunSpeedThreshold: 1.2
--- !u!82 &-8995571906845300287
AudioSource:
m_ObjectHideFlags: 0
Expand Down
Loading