Skip to content

Commit 8ef7941

Browse files
Feature: Art and Sound Pass for Vandal Imp Tossed Attack [MTT-2732] (#689)
* Art and sound pass for vandal imp tossed attack, as well as cleaning up any old assets (cherry picked from commit baef02ba6280f7d48eba6e8305b5af24f7340361) * Renamed /cleand out any remaining old files * Fixed up some broken references introduced by renaming assets * Some last little tweaks to the visuals, mostly timing * Added changes to project changelog * Reformatting of code * Update CHANGELOG.md Co-authored-by: Sam Bellomo <[email protected]> * Fixed up some naming conventions and a bug with the destroy timer for the tossed attack explosion effect that made late join clients see explosion effects everywhere * Changed the materials on the explosion effect to not draw in front of all geometry and to instead be soft particles that blend into the ground to fix the look of them clipping into the ground * Moved the vandal imp to be closer to the boss door, also rearranged the surrounding imps a bit so that he fit in better Co-authored-by: Sam Bellomo <[email protected]>
1 parent cae91fa commit 8ef7941

File tree

67 files changed

+27095
-1365
lines changed

Some content is hidden

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

67 files changed

+27095
-1365
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:e00e1324dfeec11224fd0f99393c9c0b04e50932abeba8e408c135fc3d6aa79a
3-
size 1073
2+
oid sha256:2ddd66833c793d93eb956aa3ceb8b580db3ab92a46334b0e60bb7a99e5636005
3+
size 1153

Assets/Material/Characters/Toon/Head_Imp_Bomb.mat renamed to Assets/Material/Characters/Toon/Head_Imp_Vandal.mat

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Material:
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
10-
m_Name: Head_Imp_Bomb
10+
m_Name: Head_Imp_Vandal
1111
m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3}
1212
m_ValidKeywords: []
1313
m_InvalidKeywords:
@@ -82,6 +82,8 @@ Material:
8282
- _Mode: 0
8383
- _OcclusionStrength: 1
8484
- _Parallax: 0.02
85+
- _QueueControl: 0
86+
- _QueueOffset: 0
8587
- _RimAmount: 0.667
8688
- _RimThreshold: 0
8789
- _SmoothnessTextureChannel: 0

Assets/Material/Characters/Toon/Torso_Imp_Bomb.mat renamed to Assets/Material/Characters/Toon/Torso_Imp_Vandal.mat

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Material:
77
m_CorrespondingSourceObject: {fileID: 0}
88
m_PrefabInstance: {fileID: 0}
99
m_PrefabAsset: {fileID: 0}
10-
m_Name: Torso_Imp_Bomb
10+
m_Name: Torso_Imp_Vandal
1111
m_Shader: {fileID: -6465566751694194690, guid: 317f1cf71d2fc30458456d44f39763d2, type: 3}
1212
m_ValidKeywords: []
1313
m_InvalidKeywords:
@@ -82,6 +82,8 @@ Material:
8282
- _Mode: 0
8383
- _OcclusionStrength: 1
8484
- _Parallax: 0.02
85+
- _QueueControl: 0
86+
- _QueueOffset: 0
8587
- _RimAmount: 0.366
8688
- _RimThreshold: 0
8789
- _SmoothnessTextureChannel: 0

Assets/Models/Animation Controllers/CharacterSetController_VandalImp.overrideController

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,3 +23,11 @@ AnimatorOverrideController:
2323
m_OverrideClip: {fileID: -3770237558735227746, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
2424
- m_OriginalClip: {fileID: -5612658629409835226, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
2525
m_OverrideClip: {fileID: 8009636489596012282, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
26+
- m_OriginalClip: {fileID: -4852724403241161369, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
27+
m_OverrideClip: {fileID: -4852724403241161369, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
28+
- m_OriginalClip: {fileID: -1504929105726005784, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
29+
m_OverrideClip: {fileID: -4852724403241161369, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
30+
- m_OriginalClip: {fileID: -565464528270119969, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
31+
m_OverrideClip: {fileID: 7923818702227147186, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
32+
- m_OriginalClip: {fileID: 7291507243818066706, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}
33+
m_OverrideClip: {fileID: -4852724403241161369, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3}

Assets/Models/CharacterSet.fbx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:f1324c45a2ff9a17ad7db32c93dae3d4cf9469eef00db17878be315346fc3801
3-
size 8036416
2+
oid sha256:8a581198ea826f5ccad6a6a04045a5771381855629ef1a006711add744e50278
3+
size 8035376

Assets/Models/CharacterSet.fbx.meta

Lines changed: 6 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Prefabs/CharGFX/VandalImpGraphics.prefab

Lines changed: 21 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,6 +1245,7 @@ GameObject:
12451245
- component: {fileID: -559815779163765970}
12461246
- component: {fileID: -8995571906845300287}
12471247
- component: {fileID: 6030569013059244219}
1248+
- component: {fileID: -1890528778572688093}
12481249
m_Layer: 6
12491250
m_Name: VandalImpGraphics
12501251
m_TagString: Untagged
@@ -1322,12 +1323,12 @@ MonoBehaviour:
13221323
- m_AnimatorNodeName: Attack1
13231324
m_AnimatorNodeNameHash: -47317214
13241325
m_Prefab: {fileID: 0}
1325-
m_PrefabSpawnDelaySeconds: 0.8
1326+
m_PrefabSpawnDelaySeconds: 0
13261327
m_PrefabCanBeAbortedUntilSecs: 0
13271328
m_PrefabParent: {fileID: 0}
13281329
m_PrefabParentOffset: {x: 0, y: 0, z: 0}
13291330
m_DeParentPrefab: 0
1330-
m_SoundEffect: {fileID: 8300000, guid: a08cbad8bcaf8c345aa6ae1e7578eee9, type: 3}
1331+
m_SoundEffect: {fileID: 0}
13311332
m_SoundStartDelaySeconds: 0
13321333
m_VolumeMultiplier: 1
13331334
m_LoopSound: 0
@@ -1358,6 +1359,7 @@ MonoBehaviour:
13581359
m_AudioSources:
13591360
- {fileID: -8069025211240352543}
13601361
- {fileID: -4965377615854939036}
1362+
- {fileID: -4965377615854939036}
13611363
m_Animator: {fileID: 234724737205816310}
13621364
m_ClientCharacterVisualization: {fileID: 0}
13631365
--- !u!82 &-8069025211240352543
@@ -1765,6 +1767,22 @@ MonoBehaviour:
17651767
m_Name:
17661768
m_EditorClassIdentifier:
17671769
m_Animator: {fileID: 234724737205816310}
1770+
--- !u!114 &-1890528778572688093
1771+
MonoBehaviour:
1772+
m_ObjectHideFlags: 0
1773+
m_CorrespondingSourceObject: {fileID: 0}
1774+
m_PrefabInstance: {fileID: 0}
1775+
m_PrefabAsset: {fileID: 0}
1776+
m_GameObject: {fileID: 6839301660383890230}
1777+
m_Enabled: 1
1778+
m_EditorHideFlags: 0
1779+
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
1780+
m_Name:
1781+
m_EditorClassIdentifier:
1782+
GlobalObjectIdHash: 951099334
1783+
AlwaysReplicateAsRoot: 0
1784+
DontDestroyWithOwner: 0
1785+
AutoObjectParentSync: 1
17681786
--- !u!1 &7108127146651356877
17691787
GameObject:
17701788
m_ObjectHideFlags: 0
@@ -2071,7 +2089,7 @@ GameObject:
20712089
- component: {fileID: 8731501901720154717}
20722090
- component: {fileID: 4907214515068745264}
20732091
m_Layer: 6
2074-
m_Name: Imp_WeaponR
2092+
m_Name: Imp_TossedObject
20752093
m_TagString: Untagged
20762094
m_Icon: {fileID: 0}
20772095
m_NavMeshLayer: 0

Assets/Prefabs/Character/VandalImp.prefab

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@ PrefabInstance:
77
m_Modification:
88
m_TransformParent: {fileID: 176558388678216186}
99
m_Modifications:
10+
- target: {fileID: -1890528778572688093, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3}
11+
propertyPath: GlobalObjectIdHash
12+
value: 951099334
13+
objectReference: {fileID: 0}
1014
- target: {fileID: -823941263164167683, guid: 7c82a6f62673a3b4fb51d5c6d76f7a96, type: 3}
1115
propertyPath: GlobalObjectIdHash
1216
value: 951099334
@@ -168,6 +172,10 @@ PrefabInstance:
168172
propertyPath: m_ClientCharacterVisualization
169173
value:
170174
objectReference: {fileID: 3806176119258990995}
175+
- target: {fileID: 8398944656959553575, guid: 64cfd098f62285f42918875fef849e88, type: 3}
176+
propertyPath: m_KilledDestroyDelaySeconds
177+
value: 2
178+
objectReference: {fileID: 0}
171179
m_RemovedComponents: []
172180
m_SourcePrefab: {fileID: 100100000, guid: 64cfd098f62285f42918875fef849e88, type: 3}
173181
--- !u!1 &176558388678216176 stripped

0 commit comments

Comments
 (0)