bug fix: a bunch of shit
All checks were successful
Build project / Build for (StandaloneLinux64, 6000.0.37f1) (push) Successful in 5m7s
Build project / Build for (StandaloneWindows64, 6000.0.37f1) (push) Successful in 5m15s
Build project / Publish to itch.io (StandaloneLinux64) (push) Successful in 10s
Build project / Publish to itch.io (StandaloneWindows64) (push) Successful in 10s
All checks were successful
Build project / Build for (StandaloneLinux64, 6000.0.37f1) (push) Successful in 5m7s
Build project / Build for (StandaloneWindows64, 6000.0.37f1) (push) Successful in 5m15s
Build project / Publish to itch.io (StandaloneLinux64) (push) Successful in 10s
Build project / Publish to itch.io (StandaloneWindows64) (push) Successful in 10s
This commit is contained in:
parent
aab3fbc574
commit
013f1dcd1d
@ -1277,162 +1277,6 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 44136912}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!1001 &54317557
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1236261788099784, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: MediumPipe1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4832176326394370, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -1.53
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4832176326394370, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.783
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4832176326394370, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -32.29
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4832176326394370, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.965926
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4832176326394370, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.000000021110983
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4832176326394370, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.25881857
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4832176326394370, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.00000000565666
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4832176326394370, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4832176326394370, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: -30
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4832176326394370, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 1236261788099784, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 54317559}
|
||||
- targetCorrespondingSourceObject: {fileID: 1236261788099784, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 54317564}
|
||||
- targetCorrespondingSourceObject: {fileID: 1236261788099784, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 54317563}
|
||||
- targetCorrespondingSourceObject: {fileID: 1236261788099784, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 54317565}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
--- !u!1 &54317558 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1236261788099784, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
m_PrefabInstance: {fileID: 54317557}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &54317559
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 54317558}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 207aef9a0b351ba42a0551e2783bd236, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
interactionPrompt: {fileID: 986598827}
|
||||
objectAnimator: {fileID: 4101423678642060579}
|
||||
animationName: PickupAnimation
|
||||
pickupSound: {fileID: 8300000, guid: ed409be746b135887b4c63e3aa055282, type: 3}
|
||||
keyCardName: pipe
|
||||
keyCardPlayer: {fileID: 7685886779921947557}
|
||||
interactionDistance: 5
|
||||
keyCardItem: {fileID: 11400000, guid: e9aab4c8483312542a20f40fe0bca6f7, type: 2}
|
||||
playerInventory: {fileID: 7685886779921947558}
|
||||
--- !u!95 &54317563
|
||||
Animator:
|
||||
serializedVersion: 7
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 54317558}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: b1d17488fd8ca5d36a535e9f1770c2eb, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_StabilizeFeet: 0
|
||||
m_AnimatePhysics: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorStateOnDisable: 0
|
||||
m_WriteDefaultValuesOnDisable: 0
|
||||
--- !u!65 &54317564
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 54317558}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 0
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Size: {x: 0.46076894, y: 0.46076894, z: 1.410619}
|
||||
m_Center: {x: 0.000000029802322, y: -0.00000011920929, z: 0.0006054044}
|
||||
--- !u!114 &54317565
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 54317558}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5fea29bb7c508c244a1f805a5fd3fc4d, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
outlineMode: 1
|
||||
outlineColor: {r: 1, g: 0.9538996, b: 0, a: 1}
|
||||
outlineWidth: 2
|
||||
precomputeOutline: 0
|
||||
bakeKeys: []
|
||||
bakeValues: []
|
||||
--- !u!1 &56435542
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2663,14 +2507,15 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 147039425}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 207aef9a0b351ba42a0551e2783bd236, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: b855179e643dd8f4792c67c5c6f9f3c5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
isKeyCard: 0
|
||||
keyCardName: pipe
|
||||
interactionPrompt: {fileID: 986598827}
|
||||
objectAnimator: {fileID: 4101423678642060579}
|
||||
animationName: PickupAnimation
|
||||
pickupSound: {fileID: 8300000, guid: ed409be746b135887b4c63e3aa055282, type: 3}
|
||||
keyCardName: pipe
|
||||
keyCardPlayer: {fileID: 7685886779921947557}
|
||||
interactionDistance: 5
|
||||
keyCardItem: {fileID: 11400000, guid: e9aab4c8483312542a20f40fe0bca6f7, type: 2}
|
||||
@ -7237,6 +7082,163 @@ MonoBehaviour:
|
||||
precomputeOutline: 0
|
||||
bakeKeys: []
|
||||
bakeValues: []
|
||||
--- !u!1001 &417224915
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1236261788099784, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: MediumPipe1 (2)
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4832176326394370, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -3.19
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4832176326394370, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.783
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4832176326394370, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -31.77
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4832176326394370, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.965926
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4832176326394370, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0.000000021110983
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4832176326394370, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.25881857
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4832176326394370, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0.00000000565666
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4832176326394370, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4832176326394370, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: -30
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4832176326394370, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 1236261788099784, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 417224920}
|
||||
- targetCorrespondingSourceObject: {fileID: 1236261788099784, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 417224919}
|
||||
- targetCorrespondingSourceObject: {fileID: 1236261788099784, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 417224918}
|
||||
- targetCorrespondingSourceObject: {fileID: 1236261788099784, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 417224917}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
--- !u!1 &417224916 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1236261788099784, guid: 27879f38628a5a84ba8c478897f4ac7e, type: 3}
|
||||
m_PrefabInstance: {fileID: 417224915}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &417224917
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 417224916}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5fea29bb7c508c244a1f805a5fd3fc4d, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
outlineMode: 1
|
||||
outlineColor: {r: 1, g: 0.9538996, b: 0, a: 1}
|
||||
outlineWidth: 2
|
||||
precomputeOutline: 0
|
||||
bakeKeys: []
|
||||
bakeValues: []
|
||||
--- !u!95 &417224918
|
||||
Animator:
|
||||
serializedVersion: 7
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 417224916}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: b1d17488fd8ca5d36a535e9f1770c2eb, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_StabilizeFeet: 0
|
||||
m_AnimatePhysics: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorStateOnDisable: 0
|
||||
m_WriteDefaultValuesOnDisable: 0
|
||||
--- !u!65 &417224919
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 417224916}
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_IsTrigger: 0
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Size: {x: 0.46076894, y: 0.46076894, z: 1.410619}
|
||||
m_Center: {x: 0.000000029802322, y: -0.00000011920929, z: 0.0006054044}
|
||||
--- !u!114 &417224920
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 417224916}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: b855179e643dd8f4792c67c5c6f9f3c5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
isKeyCard: 0
|
||||
keyCardName: pipe
|
||||
interactionPrompt: {fileID: 986598827}
|
||||
objectAnimator: {fileID: 4101423678642060579}
|
||||
animationName: PickupAnimation
|
||||
pickupSound: {fileID: 8300000, guid: ed409be746b135887b4c63e3aa055282, type: 3}
|
||||
keyCardPlayer: {fileID: 7685886779921947557}
|
||||
interactionDistance: 5
|
||||
keyCardItem: {fileID: 11400000, guid: e9aab4c8483312542a20f40fe0bca6f7, type: 2}
|
||||
playerInventory: {fileID: 7685886779921947558}
|
||||
--- !u!1 &422019283
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -7874,11 +7876,42 @@ PrefabInstance:
|
||||
propertyPath: m_Name
|
||||
value: Card_model_red (2)
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedComponents:
|
||||
- {fileID: 6970733140935288315, guid: 9978c9c43cf7bfb4ba426c30b5c569b2, type: 3}
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 8924941041106658507, guid: 9978c9c43cf7bfb4ba426c30b5c569b2, type: 3}
|
||||
insertIndex: 1
|
||||
addedObject: {fileID: 466121131}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 9978c9c43cf7bfb4ba426c30b5c569b2, type: 3}
|
||||
--- !u!1 &466121130 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 8924941041106658507, guid: 9978c9c43cf7bfb4ba426c30b5c569b2, type: 3}
|
||||
m_PrefabInstance: {fileID: 466121129}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &466121131
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 466121130}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: b855179e643dd8f4792c67c5c6f9f3c5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
isKeyCard: 1
|
||||
keyCardName: Deck D key card
|
||||
interactionPrompt: {fileID: 885099544}
|
||||
objectAnimator: {fileID: 4101423678642060579}
|
||||
animationName: PickupAnimation
|
||||
pickupSound: {fileID: 8300000, guid: ed409be746b135887b4c63e3aa055282, type: 3}
|
||||
keyCardPlayer: {fileID: 7685886779921947557}
|
||||
interactionDistance: 5
|
||||
keyCardItem: {fileID: 11400000, guid: b3e36ada447d99a498479618aeda7650, type: 2}
|
||||
playerInventory: {fileID: 7685886779921947558}
|
||||
--- !u!1 &471788236
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -8072,11 +8105,6 @@ PrefabInstance:
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 9978c9c43cf7bfb4ba426c30b5c569b2, type: 3}
|
||||
--- !u!95 &495187869 stripped
|
||||
Animator:
|
||||
m_CorrespondingSourceObject: {fileID: 8402379286112444004, guid: 9978c9c43cf7bfb4ba426c30b5c569b2, type: 3}
|
||||
m_PrefabInstance: {fileID: 495187868}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &503947855
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -14349,31 +14377,31 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1987814901560157203, guid: 3028bdafdc13c1c4a911990395bbbce8, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -3.539
|
||||
value: 0.376
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1987814901560157203, guid: 3028bdafdc13c1c4a911990395bbbce8, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0.54046893
|
||||
value: 1.501
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1987814901560157203, guid: 3028bdafdc13c1c4a911990395bbbce8, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: -31.273
|
||||
value: -35.271
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1987814901560157203, guid: 3028bdafdc13c1c4a911990395bbbce8, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
value: 0.95743483
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1987814901560157203, guid: 3028bdafdc13c1c4a911990395bbbce8, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1987814901560157203, guid: 3028bdafdc13c1c4a911990395bbbce8, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
value: -0.28864953
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1987814901560157203, guid: 3028bdafdc13c1c4a911990395bbbce8, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1987814901560157203, guid: 3028bdafdc13c1c4a911990395bbbce8, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@ -14381,7 +14409,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1987814901560157203, guid: 3028bdafdc13c1c4a911990395bbbce8, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
value: -33.554
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1987814901560157203, guid: 3028bdafdc13c1c4a911990395bbbce8, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
@ -14393,7 +14421,7 @@ PrefabInstance:
|
||||
m_AddedComponents:
|
||||
- targetCorrespondingSourceObject: {fileID: 1215395421967941289, guid: 3028bdafdc13c1c4a911990395bbbce8, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 782352710}
|
||||
addedObject: {fileID: 782352717}
|
||||
- targetCorrespondingSourceObject: {fileID: 1215395421967941289, guid: 3028bdafdc13c1c4a911990395bbbce8, type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 782352711}
|
||||
@ -14406,27 +14434,6 @@ GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 1215395421967941289, guid: 3028bdafdc13c1c4a911990395bbbce8, type: 3}
|
||||
m_PrefabInstance: {fileID: 782352708}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &782352710
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 782352709}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 207aef9a0b351ba42a0551e2783bd236, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
interactionPrompt: {fileID: 986598827}
|
||||
objectAnimator: {fileID: 4101423678642060579}
|
||||
animationName: PickupAnimation
|
||||
pickupSound: {fileID: 8300000, guid: ed409be746b135887b4c63e3aa055282, type: 3}
|
||||
keyCardName: Deck D key card
|
||||
keyCardPlayer: {fileID: 7685886779921947557}
|
||||
interactionDistance: 5
|
||||
keyCardItem: {fileID: 11400000, guid: aeced1edeb17f0a4d9f59be908c77273, type: 2}
|
||||
playerInventory: {fileID: 7685886779921947558}
|
||||
--- !u!95 &782352711
|
||||
Animator:
|
||||
serializedVersion: 7
|
||||
@ -14467,6 +14474,28 @@ MonoBehaviour:
|
||||
precomputeOutline: 0
|
||||
bakeKeys: []
|
||||
bakeValues: []
|
||||
--- !u!114 &782352717
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 782352709}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: b855179e643dd8f4792c67c5c6f9f3c5, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
isKeyCard: 0
|
||||
keyCardName: gas canister
|
||||
interactionPrompt: {fileID: 986598827}
|
||||
objectAnimator: {fileID: 4101423678642060579}
|
||||
animationName: PickupAnimation
|
||||
pickupSound: {fileID: 8300000, guid: ed409be746b135887b4c63e3aa055282, type: 3}
|
||||
keyCardPlayer: {fileID: 7685886779921947557}
|
||||
interactionDistance: 5
|
||||
keyCardItem: {fileID: 11400000, guid: aeced1edeb17f0a4d9f59be908c77273, type: 2}
|
||||
playerInventory: {fileID: 7685886779921947558}
|
||||
--- !u!1 &788353086
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -37849,15 +37878,6 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 207aef9a0b351ba42a0551e2783bd236, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
interactionPrompt: {fileID: 0}
|
||||
objectAnimator: {fileID: 495187869}
|
||||
animationName: PickupAnimation
|
||||
pickupSound: {fileID: 8300000, guid: ed409be746b135887b4c63e3aa055282, type: 3}
|
||||
keyCardName: Deck D key card
|
||||
keyCardPlayer: {fileID: 7685886779921947557}
|
||||
interactionDistance: 5
|
||||
keyCardItem: {fileID: 11400000, guid: a6b0d7faf8636114d8124eb4c966589b, type: 2}
|
||||
playerInventory: {fileID: 7685886779921947558}
|
||||
--- !u!65 &2493640308042884745
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -38586,15 +38606,6 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 207aef9a0b351ba42a0551e2783bd236, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
interactionPrompt: {fileID: 986598827}
|
||||
objectAnimator: {fileID: 4101423678642060579}
|
||||
animationName: PickUpAnimation
|
||||
pickupSound: {fileID: 8300000, guid: ed409be746b135887b4c63e3aa055282, type: 3}
|
||||
keyCardName: Deck D key card
|
||||
keyCardPlayer: {fileID: 7685886779921947557}
|
||||
interactionDistance: 5
|
||||
keyCardItem: {fileID: 11400000, guid: b3e36ada447d99a498479618aeda7650, type: 2}
|
||||
playerInventory: {fileID: 7685886779921947558}
|
||||
--- !u!114 &4244626406387182888
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -39357,7 +39368,7 @@ Transform:
|
||||
m_GameObject: {fileID: 7094977339719025836}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0.6649941, z: -0, w: 0.7468486}
|
||||
m_LocalPosition: {x: -41.327, y: -9.26, z: -15.012}
|
||||
m_LocalPosition: {x: -42.07, y: -9.26, z: -15.45}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
@ -40736,7 +40747,7 @@ SceneRoots:
|
||||
- {fileID: 2493640308042884742}
|
||||
- {fileID: 466121129}
|
||||
- {fileID: 2005980733}
|
||||
- {fileID: 54317557}
|
||||
- {fileID: 417224915}
|
||||
- {fileID: 147039424}
|
||||
- {fileID: 923637988}
|
||||
- {fileID: 1672602531}
|
||||
|
||||
@ -6,5 +6,6 @@ public class Item : ScriptableObject
|
||||
public string itemName;
|
||||
public Sprite itemIcon;
|
||||
[SerializeField] public Object itemPrefab;
|
||||
public bool isKeyCard = false;
|
||||
public GameObject GetPrefab() => itemPrefab as GameObject;
|
||||
}
|
||||
|
||||
@ -3,107 +3,79 @@ using TMPro;
|
||||
|
||||
public class PickUpKeyCard : MonoBehaviour
|
||||
{
|
||||
public TMP_Text interactionPrompt;
|
||||
private Outline outline;
|
||||
|
||||
[SerializeField] private Animator objectAnimator;
|
||||
[SerializeField] private string animationName = "PickupAnimation";
|
||||
[SerializeField] private AudioClip pickupSound = null;
|
||||
[Header("Per‑Object Settings")]
|
||||
[SerializeField] private bool isKeyCard = false;
|
||||
[SerializeField] private string keyCardName = "Deck D key card";
|
||||
|
||||
[SerializeField] private KeyCardPlayer keyCardPlayer = null;
|
||||
[SerializeField] private float interactionDistance = 5.0f;
|
||||
|
||||
[Header("Refs & Settings")]
|
||||
public TMP_Text interactionPrompt;
|
||||
private Outline outline;
|
||||
[SerializeField] private Animator objectAnimator;
|
||||
[SerializeField] private string animationName = "PickupAnimation";
|
||||
[SerializeField] private AudioClip pickupSound;
|
||||
[SerializeField] private KeyCardPlayer keyCardPlayer;
|
||||
[SerializeField] private float interactionDistance = 5f;
|
||||
[SerializeField] private Item keyCardItem;
|
||||
[SerializeField] private Inventory playerInventory;
|
||||
|
||||
private bool isPickedUp = false;
|
||||
private bool isPickedUp;
|
||||
|
||||
void Awake()
|
||||
{
|
||||
outline = GetComponent<Outline>();
|
||||
if (outline != null)
|
||||
outline.enabled = true;
|
||||
|
||||
if (interactionPrompt != null)
|
||||
interactionPrompt.enabled = false;
|
||||
if (outline) outline.enabled = true;
|
||||
if (interactionPrompt) interactionPrompt.enabled = false;
|
||||
}
|
||||
|
||||
void Update()
|
||||
{
|
||||
if (!isPickedUp)
|
||||
if (isPickedUp) return;
|
||||
|
||||
var ray = Camera.main.ScreenPointToRay(new Vector3(Screen.width/2, Screen.height/2));
|
||||
if (!Physics.Raycast(ray, out var hit, interactionDistance))
|
||||
{
|
||||
Ray ray = Camera.main.ScreenPointToRay(new Vector3(Screen.width / 2, Screen.height / 2, 0));
|
||||
if (Physics.Raycast(ray, out RaycastHit hit, interactionDistance))
|
||||
{
|
||||
if (hit.collider.gameObject == gameObject)
|
||||
{
|
||||
if (interactionPrompt != null)
|
||||
{
|
||||
interactionPrompt.text = "Left click to pick up " + keyCardName;
|
||||
interactionPrompt.enabled = true;
|
||||
}
|
||||
|
||||
if (Input.GetMouseButtonDown(0))
|
||||
{
|
||||
bool hasSpace = false;
|
||||
foreach (var slot in playerInventory.slots)
|
||||
{
|
||||
if (slot == null)
|
||||
{
|
||||
hasSpace = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
if (!hasSpace)
|
||||
{
|
||||
Debug.Log("Inventory is full!");
|
||||
if (interactionPrompt != null)
|
||||
interactionPrompt.text = "Inventory full!";
|
||||
return;
|
||||
}
|
||||
|
||||
isPickedUp = true;
|
||||
|
||||
if (keyCardPlayer != null)
|
||||
keyCardPlayer.hasKeyCard = true;
|
||||
|
||||
if (playerInventory != null && keyCardItem != null)
|
||||
{
|
||||
playerInventory.AddItem(keyCardItem);
|
||||
|
||||
InventoryUI inventoryUI = FindObjectOfType<InventoryUI>();
|
||||
if (inventoryUI != null)
|
||||
inventoryUI.RefreshUI();
|
||||
|
||||
Destroy(gameObject);
|
||||
}
|
||||
|
||||
if (outline != null)
|
||||
outline.enabled = false;
|
||||
|
||||
if (interactionPrompt != null)
|
||||
interactionPrompt.enabled = false;
|
||||
|
||||
if (objectAnimator != null)
|
||||
objectAnimator.Play(animationName, 0, 0.0f);
|
||||
|
||||
if (pickupSound != null)
|
||||
SoundFXManager.instance.PlaySound(pickupSound, transform, 1.5f);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (interactionPrompt != null)
|
||||
interactionPrompt.enabled = false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if (interactionPrompt != null)
|
||||
interactionPrompt.enabled = false;
|
||||
}
|
||||
if (interactionPrompt) interactionPrompt.enabled = false;
|
||||
return;
|
||||
}
|
||||
|
||||
if (hit.collider.gameObject != gameObject)
|
||||
{
|
||||
if (interactionPrompt) interactionPrompt.enabled = false;
|
||||
return;
|
||||
}
|
||||
|
||||
if (interactionPrompt)
|
||||
{
|
||||
interactionPrompt.text = isKeyCard
|
||||
? $"Left click to pick up {keyCardName}"
|
||||
: "Left click to pick up item";
|
||||
interactionPrompt.enabled = true;
|
||||
}
|
||||
|
||||
if (!Input.GetMouseButtonDown(0)) return;
|
||||
|
||||
bool hasSpace = false;
|
||||
foreach (var slot in playerInventory.slots)
|
||||
if (slot == null) { hasSpace = true; break; }
|
||||
|
||||
if (!hasSpace)
|
||||
{
|
||||
Debug.Log("Inventory is full!");
|
||||
if (interactionPrompt) interactionPrompt.text = "Inventory full!";
|
||||
return;
|
||||
}
|
||||
|
||||
isPickedUp = true;
|
||||
if (isKeyCard && keyCardPlayer != null)
|
||||
keyCardPlayer.hasKeyCard = true;
|
||||
|
||||
playerInventory.AddItem(keyCardItem);
|
||||
FindObjectOfType<InventoryUI>()?.RefreshUI();
|
||||
Destroy(gameObject);
|
||||
|
||||
outline.enabled = false;
|
||||
interactionPrompt.enabled = false;
|
||||
objectAnimator?.Play(animationName, 0, 0);
|
||||
if (pickupSound) SoundFXManager.instance.PlaySound(pickupSound, transform, 1.5f);
|
||||
}
|
||||
}
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 207aef9a0b351ba42a0551e2783bd236
|
||||
guid: b855179e643dd8f4792c67c5c6f9f3c5
|
||||
@ -20,18 +20,9 @@ public class PipeFixZone : MonoBehaviour
|
||||
Inventory inventory = FindObjectOfType<Inventory>();
|
||||
if (inventory == null) return;
|
||||
|
||||
bool hasPipe = false;
|
||||
for (int i = 0; i < inventory.slots.Length; i++)
|
||||
{
|
||||
var item = inventory.slots[i];
|
||||
if (item != null && item.itemName == requiredItemName)
|
||||
{
|
||||
hasPipe = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
var heldItem = inventory.slots[inventory.currentSlot];
|
||||
|
||||
if (hasPipe && Input.GetMouseButtonDown(0))
|
||||
if (heldItem != null && heldItem.itemName == requiredItemName && Input.GetMouseButtonDown(0))
|
||||
{
|
||||
Ray ray = new Ray(Camera.main.transform.position, Camera.main.transform.forward);
|
||||
int layerMask = ~LayerMask.GetMask("Player");
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user