Commit 6efb375c by alsunj

Added pickupable key

parent afe90c11
Showing with 673 additions and 24 deletions
......@@ -24,3 +24,8 @@ MonoBehaviour:
SourcePrefabToOverride: {fileID: 0}
SourceHashToOverride: 0
OverridingTargetPrefab: {fileID: 0}
- Override: 0
Prefab: {fileID: 8050255731901760503, guid: 1d9ae894a89fd38449f1ce889f52d1ad, type: 3}
SourcePrefabToOverride: {fileID: 0}
SourceHashToOverride: 0
OverridingTargetPrefab: {fileID: 0}
......@@ -3,6 +3,4 @@ using UnityEngine;
public interface IInteractable
{
public void Interact();
public void Interacted();
}
\ No newline at end of file
using UnityEngine;
public class Interactable : MonoBehaviour, IInteractable
{
public virtual void Interact()
{
}
public virtual void Interacted()
{
}
}
\ No newline at end of file
fileFormatVersion: 2
guid: c681408cbae9cd94f8db5c53ee68c9ca
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
using UnityEngine;
public interface IPickupable
{
public void Pickup(GameObject targetobject);
public void PutDown(Vector3 position);
}
\ No newline at end of file
fileFormatVersion: 2
guid: 97321d643d29cd1409a9b03428480cb3
\ No newline at end of file
guid: d3d965f3f22bffb40b666a6182dd5d26
\ No newline at end of file
fileFormatVersion: 2
guid: 9c3cdcf9b81b85546addcc12de39db01
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
using System;
using Unity.Netcode;
using UnityEngine;
public class Key : Pickupable, IPickupable
{
private Quaternion _startingRotation;
private FollowTransform _followTransform;
private BoxCollider _boxCollider;
private void Awake()
{
_followTransform = GetComponent<FollowTransform>();
_boxCollider = GetComponent<BoxCollider>();
}
private void Start()
{
_startingRotation = gameObject.transform.rotation;
}
public override void Pickup(GameObject pickupingTarget)
{
GameObject placeHolder = pickupingTarget.GetComponent<PlayerPlacements>().playerRightHand;
_followTransform.SetTargetTransform(placeHolder.transform);
_boxCollider.isTrigger = true;
}
public override void PutDown(Vector3 position)
{
_followTransform.SetTargetTransform(null);
_boxCollider.isTrigger = false;
transform.position = position;
transform.rotation = _startingRotation;
}
}
\ No newline at end of file
fileFormatVersion: 2
guid: 8410e35c8da056f4397782d36fa4d6e0
\ No newline at end of file
using Unity.Netcode;
using UnityEngine;
public abstract class Pickupable : NetworkBehaviour
{
private NetworkVariable<bool> isObjectPickedup = new NetworkVariable<bool>();
public void RequestPutDownObject(Vector3 position)
{
RequestPutDownObjectServerRpc(position);
}
[ServerRpc(RequireOwnership = false)]
private void RequestPutDownObjectServerRpc(Vector3 position)
{
if (isObjectPickedup.Value)
{
isObjectPickedup.Value = false;
PutDownObjectClientRpc(position);
}
}
[ClientRpc]
private void PutDownObjectClientRpc(Vector3 position)
{
PutDown(position);
}
public void RequestPickupObject(NetworkObjectReference pickupingTarget)
{
RequestPickupObjectServerRpc(pickupingTarget);
}
[ServerRpc(RequireOwnership = false)]
private void RequestPickupObjectServerRpc(NetworkObjectReference pickupingTarget)
{
if (!isObjectPickedup.Value)
{
isObjectPickedup.Value = true;
PickupObjectClientRpc(pickupingTarget);
}
}
[ClientRpc]
private void PickupObjectClientRpc(NetworkObjectReference pickupingTarget)
{
if (pickupingTarget.TryGet(out NetworkObject target))
{
Pickup(target.gameObject);
}
}
public abstract void PutDown(Vector3 position);
public abstract void Pickup(GameObject pickupingTarget);
}
\ No newline at end of file
fileFormatVersion: 2
guid: 780f856474d1b374e97e10c5386c5e30
\ No newline at end of file
using System;
using UnityEngine;
public class FollowTransform : MonoBehaviour
{
private Transform targetTransform;
[SerializeField] private FollowTransformSettings _followTransformSettings;
public void SetTargetTransform(Transform targetTransform)
{
this.targetTransform = targetTransform;
}
private void LateUpdate()
{
if (targetTransform == null)
{
return;
}
transform.position = targetTransform.position;
Vector3 targetEulerAngles = targetTransform.rotation.eulerAngles + _followTransformSettings.keyRotation;
transform.rotation = Quaternion.Euler(targetEulerAngles);
}
}
\ No newline at end of file
fileFormatVersion: 2
guid: 357ddf00dbde76441827eb57fd190bf8
\ No newline at end of file
......@@ -70,6 +70,11 @@ public class PlayerController : NetworkBehaviour
#endregion
#region PickupPropertios
private bool isRightHandFull;
#endregion
private void OnEnable()
{
......@@ -118,7 +123,6 @@ public class PlayerController : NetworkBehaviour
_playerAnimator.InitializeEvents(_playerManager.playerEvents);
}
_camera = FindFirstObjectByType<Camera>();
if (_camera == null)
{
......@@ -159,7 +163,7 @@ public class PlayerController : NetworkBehaviour
private void OnInteract()
{
CheckForInteractableCollision();
CheckForPickupableAndInteractableCollision();
}
private void Update()
......@@ -318,6 +322,12 @@ public class PlayerController : NetworkBehaviour
_camera.transform.position = offset + gameObject.transform.position;
}
private void CheckForPickupableAndInteractableCollision()
{
CheckForInteractableCollision();
CheckForPickupables();
}
private void CheckForInteractableCollision()
{
Collider[] hitColliders = Physics.OverlapSphere(transform.position,
......@@ -331,7 +341,6 @@ public class PlayerController : NetworkBehaviour
RotatePlayerTowardsTarget(hitCollider);
_playerManager.playerEvents.PlayerInteract();
chest.Interact();
break;
case Door door:
RotatePlayerTowardsTarget(hitCollider);
......@@ -342,6 +351,34 @@ public class PlayerController : NetworkBehaviour
}
}
private void CheckForPickupables()
{
Collider[] hitColliders = Physics.OverlapSphere(transform.position,
playerInteractionSettings.interactableRadius,
playerInteractionSettings.pickupableLayer);
foreach (var hitCollider in hitColliders)
{
switch (hitCollider.GetComponent<IPickupable>())
{
case Key key:
if (!isRightHandFull)
{
//Attempt to pick up the key.
key.RequestPickupObject(
new NetworkObjectReference(gameObject.GetComponent<NetworkObject>()));
isRightHandFull = !isRightHandFull;
}
else
{
key.RequestPutDownObject(transform.position + transform.forward);
isRightHandFull = !isRightHandFull;
}
break;
}
}
}
private void HitObject()
{
Collider[] hitColliders = Physics.OverlapSphere(transform.position,
......
using UnityEngine;
public class PlayerPlacements : MonoBehaviour
{
public GameObject playerRightHand;
public GameObject playerLeftHand;
void Start()
{
playerRightHand = transform.Find("PlayerVisual/Skeleton_Minion/Rig/root/handIK.r/EquippedItemR")
?.gameObject;
if (playerRightHand == null)
{
Debug.LogError("EquippedItemR not found in player rig");
}
playerLeftHand = transform.Find("PlayerVisual/Skeleton_Minion/Rig/root/handIK.l/EquippedItemL")
?.gameObject;
if (playerLeftHand == null)
{
Debug.LogError("EquippedItemL not found in player rig");
}
}
}
\ No newline at end of file
fileFormatVersion: 2
guid: 5dee285952d3d7f43936f433ec54e262
\ No newline at end of file
fileFormatVersion: 2
guid: 38b26342a4fcdf84888e963352bddb73
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
using UnityEngine;
[CreateAssetMenu(fileName = "FollowTransformSettings", menuName = "Scriptable Objects/FollowTransformSettings")]
public class FollowTransformSettings : ScriptableObject
{
public Vector3 keyRotation = new Vector3(180, 180, 0);
}
\ No newline at end of file
fileFormatVersion: 2
guid: ab7df33a53f46df4e9ecdcf785116f66
\ No newline at end of file
......@@ -5,5 +5,6 @@ public class PlayerInteractionSettings : ScriptableObject
{
public LayerMask interactableLayer;
public LayerMask destructableLayer;
public LayerMask pickupableLayer;
public float interactableRadius = 0.2f;
}
\ No newline at end of file
fileFormatVersion: 2
guid: b7d6c4332ebedd44689d6d7b6e099a68
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8050255731901760503
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1667863745995374288}
- component: {fileID: 3196686290097198713}
- component: {fileID: 5155192956440818289}
- component: {fileID: 9087763765203173466}
- component: {fileID: 3668773499323874180}
m_Layer: 8
m_Name: Key
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1667863745995374288
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8050255731901760503}
serializedVersion: 2
m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalPosition: {x: -2.182, y: 0.5, z: 5.667}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 7749746802626306604}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
--- !u!114 &3196686290097198713
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8050255731901760503}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8410e35c8da056f4397782d36fa4d6e0, type: 3}
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
--- !u!65 &5155192956440818289
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8050255731901760503}
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.91, y: 0.31, z: 0.19}
m_Center: {x: -0.27, y: 0, z: 0}
--- !u!114 &9087763765203173466
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8050255731901760503}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 357ddf00dbde76441827eb57fd190bf8, type: 3}
m_Name:
m_EditorClassIdentifier:
_followTransformSettings: {fileID: 11400000, guid: 5f3f18b211ea1704fbb884929d9cf33d, type: 2}
--- !u!114 &3668773499323874180
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8050255731901760503}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 2868596387
InScenePlacedSourceGlobalObjectIdHash: 2284586459
DeferredDespawnTick: 0
Ownership: 1
AlwaysReplicateAsRoot: 0
SynchronizeTransform: 1
ActiveSceneSynchronization: 0
SceneMigrationSynchronization: 1
SpawnWithObservers: 1
DontDestroyWithOwner: 0
AutoObjectParentSync: 1
SyncOwnerTransformWhenParented: 1
AllowOwnerToParent: 0
--- !u!1001 &7783936310330246599
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 1667863745995374288}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 806652650686d0e49b2f99074343315f, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 806652650686d0e49b2f99074343315f, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 806652650686d0e49b2f99074343315f, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 806652650686d0e49b2f99074343315f, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 806652650686d0e49b2f99074343315f, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 806652650686d0e49b2f99074343315f, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 806652650686d0e49b2f99074343315f, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 806652650686d0e49b2f99074343315f, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 806652650686d0e49b2f99074343315f, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 806652650686d0e49b2f99074343315f, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -5754084199372789682, guid: 806652650686d0e49b2f99074343315f, type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: 7265974592398154989, guid: 806652650686d0e49b2f99074343315f, type: 3}
- target: {fileID: 919132149155446097, guid: 806652650686d0e49b2f99074343315f, type: 3}
propertyPath: m_Name
value: key
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 806652650686d0e49b2f99074343315f, type: 3}
--- !u!4 &7749746802626306604 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 806652650686d0e49b2f99074343315f, type: 3}
m_PrefabInstance: {fileID: 7783936310330246599}
m_PrefabAsset: {fileID: 0}
fileFormatVersion: 2
guid: 1d9ae894a89fd38449f1ce889f52d1ad
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -138,6 +138,7 @@ GameObject:
- component: {fileID: -5431455483652452085}
- component: {fileID: 6323309021802201727}
- component: {fileID: 911307299827299822}
- component: {fileID: -7974492635611840169}
m_Layer: 0
m_Name: Player
m_TagString: Untagged
......@@ -201,7 +202,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d5a57f767e5e46a458fc5d3c628d0cbb, type: 3}
m_Name:
m_EditorClassIdentifier:
GlobalObjectIdHash: 3775582031
GlobalObjectIdHash: 425717663
InScenePlacedSourceGlobalObjectIdHash: 425717663
DeferredDespawnTick: 0
Ownership: 1
......@@ -346,6 +347,80 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
ShowTopMostFoldoutHeaderGroup: 1
--- !u!114 &-7974492635611840169
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7039287367920326276}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5dee285952d3d7f43936f433ec54e262, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8839871738369281743
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 519076570400475094}
m_Layer: 0
m_Name: EquippedItemL
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &519076570400475094
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8839871738369281743}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.17, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 7293214330416234456}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &8981085374916285117
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3438130319492008112}
m_Layer: 0
m_Name: EquippedItemR
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3438130319492008112
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8981085374916285117}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.17, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4974693260815384807}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &9074470363064250575
GameObject:
m_ObjectHideFlags: 0
......@@ -432,7 +507,13 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedGameObjects:
- targetCorrespondingSourceObject: {fileID: -5332268007662105775, guid: 239fd912fdc786a4cb361c17f68877d9, type: 3}
insertIndex: -1
addedObject: {fileID: 519076570400475094}
- targetCorrespondingSourceObject: {fileID: -7655872403321392018, guid: 239fd912fdc786a4cb361c17f68877d9, type: 3}
insertIndex: -1
addedObject: {fileID: 3438130319492008112}
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 239fd912fdc786a4cb361c17f68877d9, type: 3}
insertIndex: -1
......@@ -444,6 +525,11 @@ PrefabInstance:
insertIndex: -1
addedObject: {fileID: 3606536086790041357}
m_SourcePrefab: {fileID: 100100000, guid: 239fd912fdc786a4cb361c17f68877d9, type: 3}
--- !u!4 &4974693260815384807 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -7655872403321392018, guid: 239fd912fdc786a4cb361c17f68877d9, type: 3}
m_PrefabInstance: {fileID: 5821265037223900297}
m_PrefabAsset: {fileID: 0}
--- !u!4 &6288134246550524770 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 239fd912fdc786a4cb361c17f68877d9, type: 3}
......@@ -518,3 +604,8 @@ MonoBehaviour:
TriggerNameHash: 1080829965
TransitionIndex: 2
m_Animator: {fileID: 6949535474896224677}
--- !u!4 &7293214330416234456 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -5332268007662105775, guid: 239fd912fdc786a4cb361c17f68877d9, type: 3}
m_PrefabInstance: {fileID: 5821265037223900297}
m_PrefabAsset: {fileID: 0}
......@@ -1095,6 +1095,38 @@ PrefabInstance:
insertIndex: -1
addedObject: {fileID: 1977768985}
m_SourcePrefab: {fileID: 100100000, guid: 2abc46d65f2e2d7439c7689b3c2142c4, type: 3}
--- !u!1 &473138432
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 473138433}
m_Layer: 0
m_Name: Pickupables
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &473138433
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 473138432}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 548463843}
m_Father: {fileID: 1591624653}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &475358688 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 2abc46d65f2e2d7439c7689b3c2142c4, type: 3}
......@@ -1285,6 +1317,11 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 4040528778396390922, guid: 2abc46d65f2e2d7439c7689b3c2142c4, type: 3}
--- !u!4 &548463843 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1667863745995374288, guid: 1d9ae894a89fd38449f1ce889f52d1ad, type: 3}
m_PrefabInstance: {fileID: 2257826592388196585}
m_PrefabAsset: {fileID: 0}
--- !u!1 &549995641
GameObject:
m_ObjectHideFlags: 0
......@@ -2996,6 +3033,7 @@ Transform:
- {fileID: 1623128584}
- {fileID: 549995642}
- {fileID: 1132077849}
- {fileID: 473138433}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1605121339 stripped
......@@ -4592,6 +4630,67 @@ Transform:
m_CorrespondingSourceObject: {fileID: 8681228075763733043, guid: 525df842114a50742b87e2282140ad02, type: 3}
m_PrefabInstance: {fileID: 365097653882966823}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &2257826592388196585
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 473138433}
m_Modifications:
- target: {fileID: 1667863745995374288, guid: 1d9ae894a89fd38449f1ce889f52d1ad, type: 3}
propertyPath: m_LocalPosition.x
value: -2.182
objectReference: {fileID: 0}
- target: {fileID: 1667863745995374288, guid: 1d9ae894a89fd38449f1ce889f52d1ad, type: 3}
propertyPath: m_LocalPosition.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 1667863745995374288, guid: 1d9ae894a89fd38449f1ce889f52d1ad, type: 3}
propertyPath: m_LocalPosition.z
value: 5.667
objectReference: {fileID: 0}
- target: {fileID: 1667863745995374288, guid: 1d9ae894a89fd38449f1ce889f52d1ad, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 1667863745995374288, guid: 1d9ae894a89fd38449f1ce889f52d1ad, type: 3}
propertyPath: m_LocalRotation.x
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 1667863745995374288, guid: 1d9ae894a89fd38449f1ce889f52d1ad, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1667863745995374288, guid: 1d9ae894a89fd38449f1ce889f52d1ad, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1667863745995374288, guid: 1d9ae894a89fd38449f1ce889f52d1ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 90
objectReference: {fileID: 0}
- target: {fileID: 1667863745995374288, guid: 1d9ae894a89fd38449f1ce889f52d1ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1667863745995374288, guid: 1d9ae894a89fd38449f1ce889f52d1ad, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3668773499323874180, guid: 1d9ae894a89fd38449f1ce889f52d1ad, type: 3}
propertyPath: GlobalObjectIdHash
value: 2868596387
objectReference: {fileID: 0}
- target: {fileID: 8050255731901760503, guid: 1d9ae894a89fd38449f1ce889f52d1ad, type: 3}
propertyPath: m_Name
value: Key
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1d9ae894a89fd38449f1ce889f52d1ad, type: 3}
--- !u!1001 &4064953436029850948
PrefabInstance:
m_ObjectHideFlags: 0
......
fileFormatVersion: 2
guid: 984d27b81b45be84a98990280253381a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ab7df33a53f46df4e9ecdcf785116f66, type: 3}
m_Name: KeyTransformSettings
m_EditorClassIdentifier:
keyRotation: {x: 180, y: 180, z: 0}
fileFormatVersion: 2
guid: 5f3f18b211ea1704fbb884929d9cf33d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
......@@ -18,4 +18,7 @@ MonoBehaviour:
destructableLayer:
serializedVersion: 2
m_Bits: 128
pickupableLayer:
serializedVersion: 2
m_Bits: 256
interactableRadius: 2
......@@ -13,7 +13,7 @@ TagManager:
- UI
- Interactable
- Destructable
-
- Pickupable
-
-
-
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment