Skip to content

Commit ef8bbab

Browse files
jdepuyjdepuy
authored
Art Update: First Pass at FX/Sound Hookup, file cleanup, bug fixes. (#173)
* Art Update: First Pass at FX/Sound Hookup, file cleanup, bug fixes. Added FX for hitreact minor, stunned, Imp death, run/walk smoke trails, death smoke, adjustment to arrow AOE fx, click effect more responsive. Cleanup -Renamed, removed, and moved assets so it's cleaner and easier to follow. Fixed some art bugs. Added new version of Tank Skill 2 icon.
1 parent 08a7fb0 commit ef8bbab

File tree

97 files changed

+11068
-299
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+11068
-299
lines changed

‎Assets/BossRoom/Prefabs/Actions/ClientAoeInput.prefab‎

Lines changed: 8 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,6 @@ GameObject:
5858
- component: {fileID: 519043390440476}
5959
- component: {fileID: 2938808106645325272}
6060
- component: {fileID: 427162388993190056}
61-
- component: {fileID: 1445103948864770558}
6261
m_Layer: 0
6362
m_Name: OutOfRange
6463
m_TagString: Untagged
@@ -74,8 +73,8 @@ Transform:
7473
m_PrefabAsset: {fileID: 0}
7574
m_GameObject: {fileID: 3023808054957408081}
7675
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
77-
m_LocalPosition: {x: 0, y: 0, z: 0}
78-
m_LocalScale: {x: 1, y: 1, z: 1}
76+
m_LocalPosition: {x: 0, y: 0.025, z: 0}
77+
m_LocalScale: {x: 0.125, y: 0.125, z: 0.125}
7978
m_Children: []
8079
m_Father: {fileID: 6459207307567452869}
8180
m_RootOrder: 0
@@ -87,7 +86,7 @@ MeshFilter:
8786
m_PrefabInstance: {fileID: 0}
8887
m_PrefabAsset: {fileID: 0}
8988
m_GameObject: {fileID: 3023808054957408081}
90-
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
89+
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
9190
--- !u!23 &427162388993190056
9291
MeshRenderer:
9392
m_ObjectHideFlags: 0
@@ -96,7 +95,7 @@ MeshRenderer:
9695
m_PrefabAsset: {fileID: 0}
9796
m_GameObject: {fileID: 3023808054957408081}
9897
m_Enabled: 1
99-
m_CastShadows: 1
98+
m_CastShadows: 0
10099
m_ReceiveShadows: 1
101100
m_DynamicOccludee: 1
102101
m_MotionVectors: 1
@@ -129,19 +128,6 @@ MeshRenderer:
129128
m_SortingLayer: 0
130129
m_SortingOrder: 0
131130
m_AdditionalVertexStreams: {fileID: 0}
132-
--- !u!135 &1445103948864770558
133-
SphereCollider:
134-
m_ObjectHideFlags: 0
135-
m_CorrespondingSourceObject: {fileID: 0}
136-
m_PrefabInstance: {fileID: 0}
137-
m_PrefabAsset: {fileID: 0}
138-
m_GameObject: {fileID: 3023808054957408081}
139-
m_Material: {fileID: 0}
140-
m_IsTrigger: 0
141-
m_Enabled: 1
142-
serializedVersion: 2
143-
m_Radius: 0.5
144-
m_Center: {x: 0, y: 0, z: 0}
145131
--- !u!1 &4372974839826446078
146132
GameObject:
147133
m_ObjectHideFlags: 0
@@ -153,7 +139,6 @@ GameObject:
153139
- component: {fileID: 7786310081837396287}
154140
- component: {fileID: 5292373250812076600}
155141
- component: {fileID: 7585886372521509736}
156-
- component: {fileID: 1692538361283364185}
157142
m_Layer: 0
158143
m_Name: InRange
159144
m_TagString: Untagged
@@ -169,8 +154,8 @@ Transform:
169154
m_PrefabAsset: {fileID: 0}
170155
m_GameObject: {fileID: 4372974839826446078}
171156
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
172-
m_LocalPosition: {x: 0, y: 0, z: 0}
173-
m_LocalScale: {x: 1, y: 1, z: 1}
157+
m_LocalPosition: {x: 0, y: 0.025, z: 0}
158+
m_LocalScale: {x: 0.125, y: 0.125, z: 0.125}
174159
m_Children: []
175160
m_Father: {fileID: 6459207307567452869}
176161
m_RootOrder: 1
@@ -182,7 +167,7 @@ MeshFilter:
182167
m_PrefabInstance: {fileID: 0}
183168
m_PrefabAsset: {fileID: 0}
184169
m_GameObject: {fileID: 4372974839826446078}
185-
m_Mesh: {fileID: 10207, guid: 0000000000000000e000000000000000, type: 0}
170+
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
186171
--- !u!23 &7585886372521509736
187172
MeshRenderer:
188173
m_ObjectHideFlags: 0
@@ -191,7 +176,7 @@ MeshRenderer:
191176
m_PrefabAsset: {fileID: 0}
192177
m_GameObject: {fileID: 4372974839826446078}
193178
m_Enabled: 1
194-
m_CastShadows: 1
179+
m_CastShadows: 0
195180
m_ReceiveShadows: 1
196181
m_DynamicOccludee: 1
197182
m_MotionVectors: 1
@@ -224,16 +209,3 @@ MeshRenderer:
224209
m_SortingLayer: 0
225210
m_SortingOrder: 0
226211
m_AdditionalVertexStreams: {fileID: 0}
227-
--- !u!135 &1692538361283364185
228-
SphereCollider:
229-
m_ObjectHideFlags: 0
230-
m_CorrespondingSourceObject: {fileID: 0}
231-
m_PrefabInstance: {fileID: 0}
232-
m_PrefabAsset: {fileID: 0}
233-
m_GameObject: {fileID: 4372974839826446078}
234-
m_Material: {fileID: 0}
235-
m_IsTrigger: 0
236-
m_Enabled: 1
237-
serializedVersion: 2
238-
m_Radius: 0.5
239-
m_Center: {x: 0, y: 0, z: 0}

‎Assets/BossRoom/Prefabs/CharGFX/BossGraphics.prefab‎

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2002,9 +2002,6 @@ MonoBehaviour:
20022002
TargetReticule: {fileID: 0}
20032003
ReticuleFriendlyMat: {fileID: 0}
20042004
ReticuleHostileMat: {fileID: 0}
2005-
MinZoomDistance: 3
2006-
MaxZoomDistance: 30
2007-
ZoomSpeed: 3
20082005
--- !u!114 &4538447335436592133
20092006
MonoBehaviour:
20102007
m_ObjectHideFlags: 0
@@ -2021,7 +2018,7 @@ MonoBehaviour:
20212018
m_EventsOnNodeEntry:
20222019
- m_AnimatorNodeName: Action - Boss Trample
20232020
m_AnimatorNodeNameHash: -1491039896
2024-
m_Prefab: {fileID: 0}
2021+
m_Prefab: {fileID: -1433333703484781611, guid: 1333b84cd80da3e4a820009415068d44, type: 3}
20252022
m_PrefabSpawnDelaySeconds: 0
20262023
m_PrefabCanBeAbortedUntilSecs: 0
20272024
m_SoundEffect: {fileID: 8300000, guid: a3d48c8599f0d584abc8ea603587d496, type: 3}
@@ -2046,6 +2043,24 @@ MonoBehaviour:
20462043
m_SoundStartDelaySeconds: 0
20472044
m_VolumeMultiplier: 1
20482045
m_LoopSound: 1
2046+
- m_AnimatorNodeName: Stunned
2047+
m_AnimatorNodeNameHash: -449490811
2048+
m_Prefab: {fileID: -7841978760598146115, guid: 1fab07feb34d8c94c96944f0124d92e3, type: 3}
2049+
m_PrefabSpawnDelaySeconds: 0
2050+
m_PrefabCanBeAbortedUntilSecs: 0
2051+
m_SoundEffect: {fileID: 8300000, guid: 3d6f2e33acb1e8f4b9d829e245c62e16, type: 3}
2052+
m_SoundStartDelaySeconds: 0
2053+
m_VolumeMultiplier: 1
2054+
m_LoopSound: 0
2055+
- m_AnimatorNodeName: HitReact1
2056+
m_AnimatorNodeNameHash: -1747783153
2057+
m_Prefab: {fileID: -2843690008440830094, guid: de5b665e7f32274419072e7bf4c3eff8, type: 3}
2058+
m_PrefabSpawnDelaySeconds: 0
2059+
m_PrefabCanBeAbortedUntilSecs: 0
2060+
m_SoundEffect: {fileID: 8300000, guid: 5ef809d665d13b245b559cd6170f5794, type: 3}
2061+
m_SoundStartDelaySeconds: 0
2062+
m_VolumeMultiplier: 1
2063+
m_LoopSound: 0
20492064
m_EventsOnNodeExit: []
20502065
m_AudioSources:
20512066
- {fileID: 6900827550167648780}
@@ -2262,6 +2277,8 @@ MonoBehaviour:
22622277
m_WalkFootstepVolume: 1
22632278
m_RunFootstepAudioClip: {fileID: 8300000, guid: 81079ef149d08774ab3eadab80944fa0, type: 3}
22642279
m_RunFootstepVolume: 1
2280+
m_WalkingPoint: 0.6
2281+
m_SilentPoint: 0.3
22652282
--- !u!82 &-2129752889114835779
22662283
AudioSource:
22672284
m_ObjectHideFlags: 0

‎Assets/BossRoom/Prefabs/CharGFX/ImpGraphics.prefab‎

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1136,9 +1136,6 @@ MonoBehaviour:
11361136
TargetReticule: {fileID: 0}
11371137
ReticuleFriendlyMat: {fileID: 0}
11381138
ReticuleHostileMat: {fileID: 0}
1139-
MinZoomDistance: 3
1140-
MaxZoomDistance: 30
1141-
ZoomSpeed: 3
11421139
--- !u!114 &8005647249789065143
11431140
MonoBehaviour:
11441141
m_ObjectHideFlags: 0
@@ -1162,6 +1159,24 @@ MonoBehaviour:
11621159
m_SoundStartDelaySeconds: 0
11631160
m_VolumeMultiplier: 1
11641161
m_LoopSound: 0
1162+
- m_AnimatorNodeName: Dead
1163+
m_AnimatorNodeNameHash: 1293411866
1164+
m_Prefab: {fileID: -1487195197790481162, guid: 9537f4739c7bc2f4e8d6b2d49bfcc97e, type: 3}
1165+
m_PrefabSpawnDelaySeconds: 1.8
1166+
m_PrefabCanBeAbortedUntilSecs: 0
1167+
m_SoundEffect: {fileID: 8300000, guid: 7fbc6b32425f98840b339a705b4a28cb, type: 3}
1168+
m_SoundStartDelaySeconds: 0
1169+
m_VolumeMultiplier: 1
1170+
m_LoopSound: 0
1171+
- m_AnimatorNodeName: HitReact1
1172+
m_AnimatorNodeNameHash: -1747783153
1173+
m_Prefab: {fileID: -2843690008440830094, guid: de5b665e7f32274419072e7bf4c3eff8, type: 3}
1174+
m_PrefabSpawnDelaySeconds: 0
1175+
m_PrefabCanBeAbortedUntilSecs: 0
1176+
m_SoundEffect: {fileID: 8300000, guid: 5ef809d665d13b245b559cd6170f5794, type: 3}
1177+
m_SoundStartDelaySeconds: 0
1178+
m_VolumeMultiplier: 1
1179+
m_LoopSound: 0
11651180
m_EventsOnNodeExit: []
11661181
m_AudioSources:
11671182
- {fileID: -8069025211240352543}
@@ -1378,6 +1393,8 @@ MonoBehaviour:
13781393
m_WalkFootstepVolume: 0.8
13791394
m_RunFootstepAudioClip: {fileID: 8300000, guid: 6ad4d1d63bc70494bbc9172ae70bcdd0, type: 3}
13801395
m_RunFootstepVolume: 0.8
1396+
m_WalkingPoint: 0.6
1397+
m_SilentPoint: 0.3
13811398
--- !u!82 &-8995571906845300287
13821399
AudioSource:
13831400
m_ObjectHideFlags: 0

0 commit comments

Comments
 (0)