Skip to content

Art Update: First Pass at FX/Sound Hookup, file cleanup, bug fixes. #173

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 2 commits into from
Mar 16, 2021
Merged

Art Update: First Pass at FX/Sound Hookup, file cleanup, bug fixes. #173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
baa8488
interim art update
jdepuy Mar 15, 2021
44f4f10
Art Update: First Pass at FX/Sound Hookup, file cleanup, bug fixes.
jdepuy Mar 16, 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
44 changes: 8 additions & 36 deletions Assets/BossRoom/Prefabs/Actions/ClientAoeInput.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ GameObject:
- component: {fileID: 519043390440476}
- component: {fileID: 2938808106645325272}
- component: {fileID: 427162388993190056}
- component: {fileID: 1445103948864770558}
m_Layer: 0
m_Name: OutOfRange
m_TagString: Untagged
Expand All @@ -74,8 +73,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3023808054957408081}
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_LocalPosition: {x: 0, y: 0.025, z: 0}
m_LocalScale: {x: 0.125, y: 0.125, z: 0.125}
m_Children: []
m_Father: {fileID: 6459207307567452869}
m_RootOrder: 0
Expand All @@ -87,7 +86,7 @@ MeshFilter:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3023808054957408081}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &427162388993190056
MeshRenderer:
m_ObjectHideFlags: 0
Expand All @@ -96,7 +95,7 @@ MeshRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3023808054957408081}
m_Enabled: 1
m_CastShadows: 1
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
Expand Down Expand Up @@ -129,19 +128,6 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!135 &1445103948864770558
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3023808054957408081}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.5
m_Center: {x: 0, y: 0, z: 0}
--- !u!1 &4372974839826446078
GameObject:
m_ObjectHideFlags: 0
Expand All @@ -153,7 +139,6 @@ GameObject:
- component: {fileID: 7786310081837396287}
- component: {fileID: 5292373250812076600}
- component: {fileID: 7585886372521509736}
- component: {fileID: 1692538361283364185}
m_Layer: 0
m_Name: InRange
m_TagString: Untagged
Expand All @@ -169,8 +154,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4372974839826446078}
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_LocalPosition: {x: 0, y: 0.025, z: 0}
m_LocalScale: {x: 0.125, y: 0.125, z: 0.125}
m_Children: []
m_Father: {fileID: 6459207307567452869}
m_RootOrder: 1
Expand All @@ -182,7 +167,7 @@ MeshFilter:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4372974839826446078}
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &7585886372521509736
MeshRenderer:
m_ObjectHideFlags: 0
Expand All @@ -191,7 +176,7 @@ MeshRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4372974839826446078}
m_Enabled: 1
m_CastShadows: 1
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
Expand Down Expand Up @@ -224,16 +209,3 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!135 &1692538361283364185
SphereCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4372974839826446078}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Radius: 0.5
m_Center: {x: 0, y: 0, z: 0}
25 changes: 21 additions & 4 deletions Assets/BossRoom/Prefabs/CharGFX/BossGraphics.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2002,9 +2002,6 @@ MonoBehaviour:
TargetReticule: {fileID: 0}
ReticuleFriendlyMat: {fileID: 0}
ReticuleHostileMat: {fileID: 0}
MinZoomDistance: 3
MaxZoomDistance: 30
ZoomSpeed: 3
--- !u!114 &4538447335436592133
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -2021,7 +2018,7 @@ MonoBehaviour:
m_EventsOnNodeEntry:
- m_AnimatorNodeName: Action - Boss Trample
m_AnimatorNodeNameHash: -1491039896
m_Prefab: {fileID: 0}
m_Prefab: {fileID: -1433333703484781611, guid: 1333b84cd80da3e4a820009415068d44, type: 3}
m_PrefabSpawnDelaySeconds: 0
m_PrefabCanBeAbortedUntilSecs: 0
m_SoundEffect: {fileID: 8300000, guid: a3d48c8599f0d584abc8ea603587d496, type: 3}
Expand All @@ -2046,6 +2043,24 @@ MonoBehaviour:
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
m_LoopSound: 1
- m_AnimatorNodeName: Stunned
m_AnimatorNodeNameHash: -449490811
m_Prefab: {fileID: -7841978760598146115, guid: 1fab07feb34d8c94c96944f0124d92e3, type: 3}
m_PrefabSpawnDelaySeconds: 0
m_PrefabCanBeAbortedUntilSecs: 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_PrefabSpawnDelaySeconds: 0
m_PrefabCanBeAbortedUntilSecs: 0
m_SoundEffect: {fileID: 8300000, guid: 5ef809d665d13b245b559cd6170f5794, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
m_LoopSound: 0
m_EventsOnNodeExit: []
m_AudioSources:
- {fileID: 6900827550167648780}
Expand Down Expand Up @@ -2262,6 +2277,8 @@ MonoBehaviour:
m_WalkFootstepVolume: 1
m_RunFootstepAudioClip: {fileID: 8300000, guid: 81079ef149d08774ab3eadab80944fa0, type: 3}
m_RunFootstepVolume: 1
m_WalkingPoint: 0.6
m_SilentPoint: 0.3
--- !u!82 &-2129752889114835779
AudioSource:
m_ObjectHideFlags: 0
Expand Down
23 changes: 20 additions & 3 deletions Assets/BossRoom/Prefabs/CharGFX/ImpGraphics.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1136,9 +1136,6 @@ MonoBehaviour:
TargetReticule: {fileID: 0}
ReticuleFriendlyMat: {fileID: 0}
ReticuleHostileMat: {fileID: 0}
MinZoomDistance: 3
MaxZoomDistance: 30
ZoomSpeed: 3
--- !u!114 &8005647249789065143
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -1162,6 +1159,24 @@ MonoBehaviour:
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
m_LoopSound: 0
- m_AnimatorNodeName: Dead
m_AnimatorNodeNameHash: 1293411866
m_Prefab: {fileID: -1487195197790481162, guid: 9537f4739c7bc2f4e8d6b2d49bfcc97e, type: 3}
m_PrefabSpawnDelaySeconds: 1.8
m_PrefabCanBeAbortedUntilSecs: 0
m_SoundEffect: {fileID: 8300000, guid: 7fbc6b32425f98840b339a705b4a28cb, 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_PrefabSpawnDelaySeconds: 0
m_PrefabCanBeAbortedUntilSecs: 0
m_SoundEffect: {fileID: 8300000, guid: 5ef809d665d13b245b559cd6170f5794, type: 3}
m_SoundStartDelaySeconds: 0
m_VolumeMultiplier: 1
m_LoopSound: 0
m_EventsOnNodeExit: []
m_AudioSources:
- {fileID: -8069025211240352543}
Expand Down Expand Up @@ -1378,6 +1393,8 @@ 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
--- !u!82 &-8995571906845300287
AudioSource:
m_ObjectHideFlags: 0
Expand Down
Loading