Skip to content

Commit 9d26864

Browse files
jilfranco-unityjilfranco-unity
authored
Feature: Pickup Action Art and Sound Polish [MTT-4615] [MTT-4304] (#729)
* Replaced place holder pick up and drop icons with new versions * Implemented a little poof of smoke that pops up when a player places a pot on the ground, and modified the animation controller so that the dropping animation can be played as soon as the pot is dropped, rather than having to play through the whole pick up and idle animations * fixed up some broken material refs in scene, added audio to the pick up and put down * Edited entrance door light to affect the pick up pots so that they cast shadow * renamed the ClientPickUpPotVisualizer script to ClientPickUpPotEffects and turned down the volume of the audio effects so that they're not louder than the attack audio effects * readme update! * Un tabbed the bullet point for this PR in the changelog * reformatted the ClienPickUpPotEffects script after failed formatting check
1 parent 3aa0c41 commit 9d26864

22 files changed

Lines changed: 10669 additions & 42 deletions

‎Assets/GameData/Action/General/Drop.asset‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:94d22a36ac1576c723bcf1f8ce4dfd9c7ca66676416072524571360c1f1a1c86
2+
oid sha256:46f9a98acaad8c1c8971a4368ec05d3b4df0aa0ba82315ed4b75a696ffef4370
33
size 1048

‎Assets/GameData/Action/General/Pick Up.asset‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:dc422e457ae74acecdd4a5a7b42ef3097c57164d54f4faadb77285d301d8c0a4
2+
oid sha256:170b97ed4fe9995d89adf4855ca0f8e1726ac108d513f44f88f0ae95cc6f1511
33
size 1134

‎Assets/Models/Animation Controllers/CharacterSetController.controller‎

Lines changed: 58 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1291,6 +1291,31 @@ AnimatorStateTransition:
12911291
m_InterruptionSource: 0
12921292
m_OrderedInterruption: 1
12931293
m_CanTransitionToSelf: 1
1294+
--- !u!1101 &-3602266013466716997
1295+
AnimatorStateTransition:
1296+
m_ObjectHideFlags: 1
1297+
m_CorrespondingSourceObject: {fileID: 0}
1298+
m_PrefabInstance: {fileID: 0}
1299+
m_PrefabAsset: {fileID: 0}
1300+
m_Name:
1301+
m_Conditions:
1302+
- m_ConditionMode: 1
1303+
m_ConditionEvent: Drop
1304+
m_EventTreshold: 0
1305+
m_DstStateMachine: {fileID: 0}
1306+
m_DstState: {fileID: 3549229726248803640}
1307+
m_Solo: 0
1308+
m_Mute: 0
1309+
m_IsExit: 0
1310+
serializedVersion: 3
1311+
m_TransitionDuration: 0.25
1312+
m_TransitionOffset: 0
1313+
m_ExitTime: 0.81250036
1314+
m_HasExitTime: 0
1315+
m_HasFixedDuration: 1
1316+
m_InterruptionSource: 0
1317+
m_OrderedInterruption: 1
1318+
m_CanTransitionToSelf: 1
12941319
--- !u!1101 &-3576141394984483750
12951320
AnimatorStateTransition:
12961321
m_ObjectHideFlags: 1
@@ -1920,6 +1945,7 @@ AnimatorState:
19201945
m_Transitions:
19211946
- {fileID: -6281463566434378762}
19221947
- {fileID: -1808439016716612775}
1948+
- {fileID: -3602266013466716997}
19231949
m_StateMachineBehaviours: []
19241950
m_Position: {x: 50, y: 50, z: 0}
19251951
m_IKOnFeet: 0
@@ -2045,193 +2071,193 @@ AnimatorController:
20452071
m_DefaultFloat: 0
20462072
m_DefaultInt: 0
20472073
m_DefaultBool: 0
2048-
m_Controller: {fileID: 0}
2074+
m_Controller: {fileID: 9100000}
20492075
- m_Name: Attack1
20502076
m_Type: 9
20512077
m_DefaultFloat: 0
20522078
m_DefaultInt: 0
20532079
m_DefaultBool: 0
2054-
m_Controller: {fileID: 0}
2080+
m_Controller: {fileID: 9100000}
20552081
- m_Name: HitReact1
20562082
m_Type: 9
20572083
m_DefaultFloat: 0
20582084
m_DefaultInt: 0
20592085
m_DefaultBool: 0
2060-
m_Controller: {fileID: 0}
2086+
m_Controller: {fileID: 9100000}
20612087
- m_Name: FallDown
20622088
m_Type: 9
20632089
m_DefaultFloat: 0
20642090
m_DefaultInt: 0
20652091
m_DefaultBool: 0
2066-
m_Controller: {fileID: 0}
2092+
m_Controller: {fileID: 9100000}
20672093
- m_Name: StandUp
20682094
m_Type: 9
20692095
m_DefaultFloat: 0
20702096
m_DefaultInt: 0
20712097
m_DefaultBool: 0
2072-
m_Controller: {fileID: 0}
2098+
m_Controller: {fileID: 9100000}
20732099
- m_Name: BeginRevive
20742100
m_Type: 9
20752101
m_DefaultFloat: 0
20762102
m_DefaultInt: 0
20772103
m_DefaultBool: 0
2078-
m_Controller: {fileID: 0}
2104+
m_Controller: {fileID: 9100000}
20792105
- m_Name: Dead
20802106
m_Type: 9
20812107
m_DefaultFloat: 0
20822108
m_DefaultInt: 0
20832109
m_DefaultBool: 0
2084-
m_Controller: {fileID: 0}
2110+
m_Controller: {fileID: 9100000}
20852111
- m_Name: Attack2
20862112
m_Type: 9
20872113
m_DefaultFloat: 0
20882114
m_DefaultInt: 0
20892115
m_DefaultBool: 0
2090-
m_Controller: {fileID: 0}
2116+
m_Controller: {fileID: 9100000}
20912117
- m_Name: Emote1
20922118
m_Type: 9
20932119
m_DefaultFloat: 0
20942120
m_DefaultInt: 0
20952121
m_DefaultBool: 0
2096-
m_Controller: {fileID: 0}
2122+
m_Controller: {fileID: 9100000}
20972123
- m_Name: Emote2
20982124
m_Type: 9
20992125
m_DefaultFloat: 0
21002126
m_DefaultInt: 0
21012127
m_DefaultBool: 0
2102-
m_Controller: {fileID: 0}
2128+
m_Controller: {fileID: 9100000}
21032129
- m_Name: Emote3
21042130
m_Type: 9
21052131
m_DefaultFloat: 0
21062132
m_DefaultInt: 0
21072133
m_DefaultBool: 0
2108-
m_Controller: {fileID: 0}
2134+
m_Controller: {fileID: 9100000}
21092135
- m_Name: Emote4
21102136
m_Type: 9
21112137
m_DefaultFloat: 0
21122138
m_DefaultInt: 0
21132139
m_DefaultBool: 0
2114-
m_Controller: {fileID: 0}
2140+
m_Controller: {fileID: 9100000}
21152141
- m_Name: Trample
21162142
m_Type: 9
21172143
m_DefaultFloat: 0
21182144
m_DefaultInt: 0
21192145
m_DefaultBool: 0
2120-
m_Controller: {fileID: 0}
2146+
m_Controller: {fileID: 9100000}
21212147
- m_Name: SkillHeal
21222148
m_Type: 9
21232149
m_DefaultFloat: 0
21242150
m_DefaultInt: 0
21252151
m_DefaultBool: 0
2126-
m_Controller: {fileID: 0}
2152+
m_Controller: {fileID: 9100000}
21272153
- m_Name: Stunned
21282154
m_Type: 9
21292155
m_DefaultFloat: 0
21302156
m_DefaultInt: 0
21312157
m_DefaultBool: 0
2132-
m_Controller: {fileID: 0}
2158+
m_Controller: {fileID: 9100000}
21332159
- m_Name: Unstunned
21342160
m_Type: 9
21352161
m_DefaultFloat: 0
21362162
m_DefaultInt: 0
21372163
m_DefaultBool: 0
2138-
m_Controller: {fileID: 0}
2164+
m_Controller: {fileID: 9100000}
21392165
- m_Name: ShieldBuffStart
21402166
m_Type: 9
21412167
m_DefaultFloat: 0
21422168
m_DefaultInt: 0
21432169
m_DefaultBool: 0
2144-
m_Controller: {fileID: 0}
2170+
m_Controller: {fileID: 9100000}
21452171
- m_Name: ShieldBuffEnd
21462172
m_Type: 9
21472173
m_DefaultFloat: 0
21482174
m_DefaultInt: 0
21492175
m_DefaultBool: 0
2150-
m_Controller: {fileID: 0}
2176+
m_Controller: {fileID: 9100000}
21512177
- m_Name: ChargedShotStart
21522178
m_Type: 9
21532179
m_DefaultFloat: 0
21542180
m_DefaultInt: 0
21552181
m_DefaultBool: 0
2156-
m_Controller: {fileID: 0}
2182+
m_Controller: {fileID: 9100000}
21572183
- m_Name: ChargedShotEnd
21582184
m_Type: 9
21592185
m_DefaultFloat: 0
21602186
m_DefaultInt: 0
21612187
m_DefaultBool: 0
2162-
m_Controller: {fileID: 0}
2188+
m_Controller: {fileID: 9100000}
21632189
- m_Name: EntryFainted
21642190
m_Type: 9
21652191
m_DefaultFloat: 0
21662192
m_DefaultInt: 0
21672193
m_DefaultBool: 0
2168-
m_Controller: {fileID: 0}
2194+
m_Controller: {fileID: 9100000}
21692195
- m_Name: EntryDead
21702196
m_Type: 9
21712197
m_DefaultFloat: 0
21722198
m_DefaultInt: 0
21732199
m_DefaultBool: 0
2174-
m_Controller: {fileID: 0}
2200+
m_Controller: {fileID: 9100000}
21752201
- m_Name: Buff1
21762202
m_Type: 9
21772203
m_DefaultFloat: 0
21782204
m_DefaultInt: 0
21792205
m_DefaultBool: 0
2180-
m_Controller: {fileID: 0}
2206+
m_Controller: {fileID: 9100000}
21812207
- m_Name: AnticipateMove
21822208
m_Type: 9
21832209
m_DefaultFloat: 0
21842210
m_DefaultInt: 0
21852211
m_DefaultBool: 0
2186-
m_Controller: {fileID: 0}
2212+
m_Controller: {fileID: 9100000}
21872213
- m_Name: Invincible
21882214
m_Type: 3
21892215
m_DefaultFloat: 0
21902216
m_DefaultInt: 0
21912217
m_DefaultBool: 0
2192-
m_Controller: {fileID: 0}
2218+
m_Controller: {fileID: 9100000}
21932219
- m_Name: TrampleStop
21942220
m_Type: 9
21952221
m_DefaultFloat: 0
21962222
m_DefaultInt: 0
21972223
m_DefaultBool: 0
2198-
m_Controller: {fileID: 0}
2224+
m_Controller: {fileID: 9100000}
21992225
- m_Name: DashAttackStart
22002226
m_Type: 9
22012227
m_DefaultFloat: 0
22022228
m_DefaultInt: 0
22032229
m_DefaultBool: 0
2204-
m_Controller: {fileID: 0}
2230+
m_Controller: {fileID: 9100000}
22052231
- m_Name: DashAttackEnd
22062232
m_Type: 9
22072233
m_DefaultFloat: 0
22082234
m_DefaultInt: 0
22092235
m_DefaultBool: 0
2210-
m_Controller: {fileID: 0}
2236+
m_Controller: {fileID: 9100000}
22112237
- m_Name: DashAttackCanceled
22122238
m_Type: 9
22132239
m_DefaultFloat: 0
22142240
m_DefaultInt: 0
22152241
m_DefaultBool: 0
2216-
m_Controller: {fileID: 0}
2242+
m_Controller: {fileID: 9100000}
22172243
- m_Name: PickUp
22182244
m_Type: 9
22192245
m_DefaultFloat: 0
22202246
m_DefaultInt: 0
22212247
m_DefaultBool: 0
2222-
m_Controller: {fileID: 0}
2248+
m_Controller: {fileID: 9100000}
22232249
- m_Name: Drop
22242250
m_Type: 9
22252251
m_DefaultFloat: 0
22262252
m_DefaultInt: 0
22272253
m_DefaultBool: 0
2228-
m_Controller: {fileID: 0}
2254+
m_Controller: {fileID: 9100000}
22292255
- m_Name: PickUpFailed
22302256
m_Type: 9
22312257
m_DefaultFloat: 0
22322258
m_DefaultInt: 0
22332259
m_DefaultBool: 0
2234-
m_Controller: {fileID: 0}
2260+
m_Controller: {fileID: 9100000}
22352261
m_AnimatorLayers:
22362262
- serializedVersion: 5
22372263
m_Name: Base Layer

‎Assets/Prefabs/Dungeon/Dungeon Pieces/pots/env_pot_heavy.prefab‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -184,7 +184,7 @@ MeshRenderer:
184184
m_RenderingLayerMask: 1
185185
m_RendererPriority: 0
186186
m_Materials:
187-
- {fileID: 2100000, guid: 08a6ed3e19879c844a1bb6d8f07e2653, type: 2}
187+
- {fileID: 2100000, guid: 86655247656508045be3d53c1611c865, type: 2}
188188
m_StaticBatchInfo:
189189
firstSubMesh: 0
190190
subMeshCount: 0

‎Assets/Prefabs/Dungeon/EnvLighting_Realtime.prefab‎

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ Transform:
2828
m_LocalRotation: {x: 0.81108785, y: -0.18585822, z: 0.35118234, w: 0.42926013}
2929
m_LocalPosition: {x: 85.69, y: 22.12, z: 58}
3030
m_LocalScale: {x: 1, y: 1, z: 1}
31+
m_ConstrainProportionsScale: 0
3132
m_Children: []
3233
m_Father: {fileID: 2345875387662447015}
3334
m_RootOrder: 4
@@ -106,7 +107,14 @@ MonoBehaviour:
106107
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
107108
m_Name:
108109
m_EditorClassIdentifier:
110+
m_Version: 1
109111
m_UsePipelineSettings: 1
112+
m_AdditionalLightsShadowResolutionTier: 2
113+
m_LightLayerMask: 1
114+
m_CustomShadowLayers: 0
115+
m_ShadowLayerMask: 1
116+
m_LightCookieSize: {x: 1, y: 1}
117+
m_LightCookieOffset: {x: 0, y: 0}
110118
--- !u!1 &4120743145451824075
111119
GameObject:
112120
m_ObjectHideFlags: 0
@@ -134,6 +142,7 @@ Transform:
134142
m_LocalRotation: {x: -0, y: -0, z: 0.0000000074505797, w: 1}
135143
m_LocalPosition: {x: 4.2179117, y: 3, z: 7.2377605}
136144
m_LocalScale: {x: 1, y: 1, z: 1}
145+
m_ConstrainProportionsScale: 0
137146
m_Children: []
138147
m_Father: {fileID: 2345875387662447015}
139148
m_RootOrder: 1
@@ -228,6 +237,7 @@ Transform:
228237
m_LocalRotation: {x: 0.95784193, y: -0, z: -0, w: 0.2872957}
229238
m_LocalPosition: {x: 3.9300022, y: 8.73, z: 14.42}
230239
m_LocalScale: {x: 1, y: 1, z: 1}
240+
m_ConstrainProportionsScale: 0
231241
m_Children: []
232242
m_Father: {fileID: 2345875387662447015}
233243
m_RootOrder: 0
@@ -281,7 +291,7 @@ Light:
281291
m_RenderMode: 1
282292
m_CullingMask:
283293
serializedVersion: 2
284-
m_Bits: 321
294+
m_Bits: 1345
285295
m_RenderingLayerMask: 1
286296
m_Lightmapping: 4
287297
m_LightShadowCasterMode: 0
@@ -306,7 +316,14 @@ MonoBehaviour:
306316
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
307317
m_Name:
308318
m_EditorClassIdentifier:
319+
m_Version: 1
309320
m_UsePipelineSettings: 1
321+
m_AdditionalLightsShadowResolutionTier: 2
322+
m_LightLayerMask: 1
323+
m_CustomShadowLayers: 0
324+
m_ShadowLayerMask: 1
325+
m_LightCookieSize: {x: 1, y: 1}
326+
m_LightCookieOffset: {x: 0, y: 0}
310327
--- !u!1 &5714540223158245146
311328
GameObject:
312329
m_ObjectHideFlags: 0
@@ -333,6 +350,7 @@ Transform:
333350
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
334351
m_LocalPosition: {x: 0, y: 0, z: 0}
335352
m_LocalScale: {x: 1, y: 1, z: 1}
353+
m_ConstrainProportionsScale: 0
336354
m_Children:
337355
- {fileID: 9063507186799076179}
338356
- {fileID: 8437740688137792944}
@@ -370,6 +388,7 @@ Transform:
370388
m_LocalRotation: {x: -0.62597513, y: 0.29568666, z: -0.67815936, w: -0.24662624}
371389
m_LocalPosition: {x: 114.24, y: 21.18, z: 36.75}
372390
m_LocalScale: {x: 1, y: 1, z: 1}
391+
m_ConstrainProportionsScale: 0
373392
m_Children: []
374393
m_Father: {fileID: 2345875387662447015}
375394
m_RootOrder: 5
@@ -463,6 +482,7 @@ Transform:
463482
m_LocalRotation: {x: 0.4522047, y: 0.0093468055, z: 0.0058525437, w: -0.89184606}
464483
m_LocalPosition: {x: 34.61, y: -7.25, z: 0.40999985}
465484
m_LocalScale: {x: 1, y: 1, z: 1}
485+
m_ConstrainProportionsScale: 0
466486
m_Children: []
467487
m_Father: {fileID: 2345875387662447015}
468488
m_RootOrder: 2
@@ -557,6 +577,7 @@ Transform:
557577
m_LocalRotation: {x: -0.29004472, y: -0.44186503, z: 0.8349052, w: -0.15350159}
558578
m_LocalPosition: {x: 115.49, y: 22.12, z: 18.72}
559579
m_LocalScale: {x: 1, y: 1, z: 1}
580+
m_ConstrainProportionsScale: 0
560581
m_Children: []
561582
m_Father: {fileID: 2345875387662447015}
562583
m_RootOrder: 3
@@ -635,4 +656,11 @@ MonoBehaviour:
635656
m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3}
636657
m_Name:
637658
m_EditorClassIdentifier:
659+
m_Version: 1
638660
m_UsePipelineSettings: 1
661+
m_AdditionalLightsShadowResolutionTier: 2
662+
m_LightLayerMask: 1
663+
m_CustomShadowLayers: 0
664+
m_ShadowLayerMask: 1
665+
m_LightCookieSize: {x: 1, y: 1}
666+
m_LightCookieOffset: {x: 0, y: 0}

0 commit comments

Comments
 (0)