Skip to content

Commit 5f7a928

Browse files
amel-unityamel-unity
committed
Fixed talk interaction enabled forever after cutscenes
1 parent 8421cbe commit 5f7a928

File tree

3 files changed

+74
-4
lines changed

3 files changed

+74
-4
lines changed

‎UOP1_Project/Assets/Prefabs/Cutscenes/BeachCandyCutscene.prefab‎

Lines changed: 62 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -391,14 +391,14 @@ Transform:
391391
m_PrefabInstance: {fileID: 0}
392392
m_PrefabAsset: {fileID: 0}
393393
m_GameObject: {fileID: 7958550132109617972}
394-
m_LocalRotation: {x: -0.12550046, y: -0.12587705, z: 0.023226, w: 0.9838015}
394+
m_LocalRotation: {x: -0.1242519, y: -0.07888081, z: 0.029176597, w: 0.98867995}
395395
m_LocalPosition: {x: -1.5700073, y: -1.51, z: 1.7099915}
396396
m_LocalScale: {x: 1, y: 1, z: 1}
397397
m_Children:
398398
- {fileID: 4400235147370161949}
399399
m_Father: {fileID: 5160289480314264884}
400400
m_RootOrder: 8
401-
m_LocalEulerAnglesHint: {x: -13.951, y: -15.142, z: 4.568}
401+
m_LocalEulerAnglesHint: {x: -13.951, y: -9.682, z: 4.568}
402402
--- !u!114 &7572499432353676161
403403
MonoBehaviour:
404404
m_ObjectHideFlags: 0
@@ -525,6 +525,34 @@ PrefabInstance:
525525
propertyPath: m_Lens.m_SensorSize.x
526526
value: 2.7445052
527527
objectReference: {fileID: 0}
528+
- target: {fileID: 206388950, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
529+
propertyPath: m_LocalPosition.y
530+
value: -1.29
531+
objectReference: {fileID: 0}
532+
- target: {fileID: 206388950, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
533+
propertyPath: m_LocalPosition.z
534+
value: 1.61
535+
objectReference: {fileID: 0}
536+
- target: {fileID: 206388950, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
537+
propertyPath: m_LocalRotation.w
538+
value: 0.9915711
539+
objectReference: {fileID: 0}
540+
- target: {fileID: 206388950, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
541+
propertyPath: m_LocalRotation.x
542+
value: -0.10356825
543+
objectReference: {fileID: 0}
544+
- target: {fileID: 206388950, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
545+
propertyPath: m_LocalRotation.y
546+
value: 0.07640077
547+
objectReference: {fileID: 0}
548+
- target: {fileID: 206388950, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
549+
propertyPath: m_LocalRotation.z
550+
value: 0.014942794
551+
objectReference: {fileID: 0}
552+
- target: {fileID: 206388950, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
553+
propertyPath: m_LocalEulerAnglesHint.y
554+
value: 8.727
555+
objectReference: {fileID: 0}
528556
- target: {fileID: 246703619, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
529557
propertyPath: m_Name
530558
value: CM vcam PhCFixedShotPot
@@ -559,7 +587,7 @@ PrefabInstance:
559587
objectReference: {fileID: 0}
560588
- target: {fileID: 1468852564, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
561589
propertyPath: m_Enabled
562-
value: 1
590+
value: 0
563591
objectReference: {fileID: 0}
564592
- target: {fileID: 1513022028, guid: 45f676b6d31fd8f47983557f12803a82, type: 3}
565593
propertyPath: m_Lens.m_SensorSize.x
@@ -1182,6 +1210,11 @@ PrefabInstance:
11821210
propertyPath: m_IsActive
11831211
value: 0
11841212
objectReference: {fileID: 0}
1213+
- target: {fileID: 309633228405838073, guid: 062b3805bf6784e4d9c599ee60eaa002,
1214+
type: 3}
1215+
propertyPath: m_TagString
1216+
value: Untagged
1217+
objectReference: {fileID: 0}
11851218
- target: {fileID: 1083073290189785667, guid: 062b3805bf6784e4d9c599ee60eaa002,
11861219
type: 3}
11871220
propertyPath: m_RootOrder
@@ -1242,6 +1275,11 @@ PrefabInstance:
12421275
propertyPath: m_IsActive
12431276
value: 0
12441277
objectReference: {fileID: 0}
1278+
- target: {fileID: 3978636366682026695, guid: 062b3805bf6784e4d9c599ee60eaa002,
1279+
type: 3}
1280+
propertyPath: m_Enabled
1281+
value: 0
1282+
objectReference: {fileID: 0}
12451283
- target: {fileID: 5557640735889932260, guid: 062b3805bf6784e4d9c599ee60eaa002,
12461284
type: 3}
12471285
propertyPath: m_Enabled
@@ -1260,13 +1298,18 @@ PrefabInstance:
12601298
- target: {fileID: 6224686476861024169, guid: 062b3805bf6784e4d9c599ee60eaa002,
12611299
type: 3}
12621300
propertyPath: m_BoundingSphereOverride.y
1263-
value: 1e-45
1301+
value: 2.3510647e-38
12641302
objectReference: {fileID: 0}
12651303
- target: {fileID: 6224686476861024169, guid: 062b3805bf6784e4d9c599ee60eaa002,
12661304
type: 3}
12671305
propertyPath: m_BoundingSphereOverride.z
12681306
value: 0
12691307
objectReference: {fileID: 0}
1308+
- target: {fileID: 7139847135753839646, guid: 062b3805bf6784e4d9c599ee60eaa002,
1309+
type: 3}
1310+
propertyPath: m_Enabled
1311+
value: 0
1312+
objectReference: {fileID: 0}
12701313
- target: {fileID: 8300318066946783926, guid: 062b3805bf6784e4d9c599ee60eaa002,
12711314
type: 3}
12721315
propertyPath: m_Enabled
@@ -1314,6 +1357,11 @@ PrefabInstance:
13141357
propertyPath: m_Name
13151358
value: CutScenePigChefToPot
13161359
objectReference: {fileID: 0}
1360+
- target: {fileID: 309633228405838073, guid: 062b3805bf6784e4d9c599ee60eaa002,
1361+
type: 3}
1362+
propertyPath: m_TagString
1363+
value: Untagged
1364+
objectReference: {fileID: 0}
13171365
- target: {fileID: 1083073290189785667, guid: 062b3805bf6784e4d9c599ee60eaa002,
13181366
type: 3}
13191367
propertyPath: m_RootOrder
@@ -1379,11 +1427,21 @@ PrefabInstance:
13791427
propertyPath: m_IsActive
13801428
value: 0
13811429
objectReference: {fileID: 0}
1430+
- target: {fileID: 3978636366682026695, guid: 062b3805bf6784e4d9c599ee60eaa002,
1431+
type: 3}
1432+
propertyPath: m_Enabled
1433+
value: 0
1434+
objectReference: {fileID: 0}
13821435
- target: {fileID: 5557640735889932260, guid: 062b3805bf6784e4d9c599ee60eaa002,
13831436
type: 3}
13841437
propertyPath: m_Enabled
13851438
value: 0
13861439
objectReference: {fileID: 0}
1440+
- target: {fileID: 7139847135753839646, guid: 062b3805bf6784e4d9c599ee60eaa002,
1441+
type: 3}
1442+
propertyPath: m_Enabled
1443+
value: 0
1444+
objectReference: {fileID: 0}
13871445
- target: {fileID: 8300318066946783926, guid: 062b3805bf6784e4d9c599ee60eaa002,
13881446
type: 3}
13891447
propertyPath: m_Enabled

‎UOP1_Project/Assets/Prefabs/Cutscenes/BeachIntroCutscene.prefab‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -473,6 +473,11 @@ PrefabInstance:
473473
propertyPath: m_IsActive
474474
value: 1
475475
objectReference: {fileID: 0}
476+
- target: {fileID: 309633228405838073, guid: 062b3805bf6784e4d9c599ee60eaa002,
477+
type: 3}
478+
propertyPath: m_TagString
479+
value: Untagged
480+
objectReference: {fileID: 0}
476481
- target: {fileID: 1083073290189785667, guid: 062b3805bf6784e4d9c599ee60eaa002,
477482
type: 3}
478483
propertyPath: m_RootOrder

‎UOP1_Project/Assets/Scripts/Interaction/InteractionManager.cs‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ private void OnDisable()
3131
{
3232
_inputReader.interactEvent -= OnInteractionButtonPress;
3333
_onInteractionEnded.OnEventRaised -= OnInteractionEnd;
34+
ResetPotentialInteractions();
3435
}
3536

3637
// Called mid-way through the AnimationClip of collecting
@@ -151,4 +152,10 @@ private void OnInteractionEnd()
151152

152153
_inputReader.EnableGameplayInput();
153154
}
155+
156+
private void ResetPotentialInteractions()
157+
{
158+
_potentialInteractions.Clear();
159+
RequestUpdateUI(_potentialInteractions.Count > 0);
160+
}
154161
}

0 commit comments

Comments
 (0)