fix: sync the prototype
This commit is contained in:
@@ -55,7 +55,8 @@ public class ButtonSequenceDoorPuzzle : MonoBehaviour
|
||||
if (button == null)
|
||||
continue;
|
||||
|
||||
UnityAction action = () => OnButtonPressed(i);
|
||||
int buttonIndex = i;
|
||||
UnityAction action = () => OnButtonPressed(buttonIndex);
|
||||
m_cachedListeners[i] = action;
|
||||
button.OnInteract.AddListener(action);
|
||||
}
|
||||
|
||||
@@ -20,7 +20,6 @@ public class PressurePlateButton : MonoBehaviour
|
||||
public UnityEvent OnReleased;
|
||||
|
||||
private readonly HashSet<Collider> m_validCollidersOnPlate = new HashSet<Collider>();
|
||||
private readonly HashSet<Collider> m_stayedThisPhysicsFrame = new HashSet<Collider>();
|
||||
private bool m_isPressed;
|
||||
|
||||
private void Reset()
|
||||
@@ -43,16 +42,8 @@ public class PressurePlateButton : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
private void OnTriggerStay(Collider other)
|
||||
{
|
||||
if (IsValidActivator(other))
|
||||
m_stayedThisPhysicsFrame.Add(other);
|
||||
}
|
||||
|
||||
private void OnTriggerExit(Collider other)
|
||||
{
|
||||
m_stayedThisPhysicsFrame.Remove(other);
|
||||
|
||||
if (!m_validCollidersOnPlate.Remove(other))
|
||||
return;
|
||||
|
||||
@@ -63,26 +54,6 @@ public class PressurePlateButton : MonoBehaviour
|
||||
}
|
||||
}
|
||||
|
||||
private void FixedUpdate()
|
||||
{
|
||||
if (m_validCollidersOnPlate.Count == 0)
|
||||
{
|
||||
m_stayedThisPhysicsFrame.Clear();
|
||||
return;
|
||||
}
|
||||
|
||||
m_validCollidersOnPlate.RemoveWhere(c => c == null || !c.enabled || !c.gameObject.activeInHierarchy);
|
||||
|
||||
m_validCollidersOnPlate.IntersectWith(m_stayedThisPhysicsFrame);
|
||||
m_stayedThisPhysicsFrame.Clear();
|
||||
|
||||
if (m_validCollidersOnPlate.Count == 0 && m_isPressed)
|
||||
{
|
||||
m_isPressed = false;
|
||||
OnReleased?.Invoke();
|
||||
}
|
||||
}
|
||||
|
||||
private bool IsValidActivator(Collider other)
|
||||
{
|
||||
if (((1 << other.gameObject.layer) & detectionMask) == 0)
|
||||
|
||||
@@ -7,7 +7,7 @@ public class SlidingDoor : MonoBehaviour
|
||||
public enum SlideDirection { Positive = 1, Negative = -1 }
|
||||
|
||||
[Header("Slide Settings")]
|
||||
[Tooltip("Axis in parent space (or world space if no parent) the door slides along.")]
|
||||
[Tooltip("Local axis the door slides along.")]
|
||||
[SerializeField] private SlideAxis axis = SlideAxis.X;
|
||||
|
||||
[Tooltip("Which way along the axis the door opens.")]
|
||||
@@ -36,7 +36,7 @@ public class SlidingDoor : MonoBehaviour
|
||||
private void Awake()
|
||||
{
|
||||
m_closedPos = transform.localPosition;
|
||||
m_openPos = m_closedPos + GetParentSpaceSlideVector() * slideDistance;
|
||||
m_openPos = m_closedPos + GetSlideVector() * slideDistance;
|
||||
|
||||
if (startOpen)
|
||||
{
|
||||
@@ -86,7 +86,7 @@ public class SlidingDoor : MonoBehaviour
|
||||
Open();
|
||||
}
|
||||
|
||||
private Vector3 GetParentSpaceSlideVector()
|
||||
private Vector3 GetSlideVector()
|
||||
{
|
||||
float sign = (float)direction;
|
||||
return axis switch
|
||||
@@ -98,19 +98,14 @@ public class SlidingDoor : MonoBehaviour
|
||||
};
|
||||
}
|
||||
|
||||
private Vector3 GetWorldSpaceSlideVector()
|
||||
{
|
||||
return transform.parent != null
|
||||
? transform.parent.TransformDirection(GetParentSpaceSlideVector()).normalized
|
||||
: GetParentSpaceSlideVector().normalized;
|
||||
}
|
||||
|
||||
#if UNITY_EDITOR
|
||||
private void OnDrawGizmos()
|
||||
{
|
||||
Vector3 worldClosed = transform.position;
|
||||
Vector3 worldClosed = transform.parent != null
|
||||
? transform.parent.TransformPoint(transform.localPosition)
|
||||
: transform.position;
|
||||
|
||||
Vector3 slideVec = GetWorldSpaceSlideVector() * slideDistance;
|
||||
Vector3 slideVec = transform.TransformDirection(GetSlideVector()) * slideDistance;
|
||||
Gizmos.color = Color.cyan;
|
||||
Gizmos.DrawLine(worldClosed, worldClosed + slideVec);
|
||||
Gizmos.DrawWireSphere(worldClosed + slideVec, 0.08f);
|
||||
|
||||
@@ -144,13 +144,12 @@ public class SubtitleSequencePlayer : MonoBehaviour
|
||||
|
||||
float typeTime = 0f;
|
||||
int totalChars = line.text.Length;
|
||||
int visibleChars = 0;
|
||||
if (typewriterCharsPerSecond > 0f)
|
||||
{
|
||||
while (m_currentText.Length < totalChars)
|
||||
{
|
||||
typeTime += Time.deltaTime;
|
||||
visibleChars = Mathf.Clamp(Mathf.FloorToInt(typeTime * typewriterCharsPerSecond), 0, totalChars);
|
||||
int visibleChars = Mathf.Clamp(Mathf.FloorToInt(typeTime * typewriterCharsPerSecond), 0, totalChars);
|
||||
m_currentText = line.text.Substring(0, visibleChars);
|
||||
yield return null;
|
||||
}
|
||||
|
||||
354
Assets/Level/Prefabs/Dev/TestBlock.prefab
Normal file
354
Assets/Level/Prefabs/Dev/TestBlock.prefab
Normal file
@@ -0,0 +1,354 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &2408983304096713058
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 8088638068924982289}
|
||||
- component: {fileID: 876434215209821112}
|
||||
- component: {fileID: 489735366413190748}
|
||||
- component: {fileID: 6101101176935368636}
|
||||
- component: {fileID: 6700426716916120764}
|
||||
- component: {fileID: 7552511637356990312}
|
||||
m_Layer: 0
|
||||
m_Name: TestBlock
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &8088638068924982289
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2408983304096713058}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 7, y: 1.5, z: 1}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &876434215209821112
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2408983304096713058}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 8233d90336aea43098adf6dbabd606a2, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Unity.ProBuilder::UnityEngine.ProBuilder.ProBuilderMesh
|
||||
m_MeshFormatVersion: 2
|
||||
m_Faces:
|
||||
- m_Indexes: 000000000100000002000000010000000300000002000000
|
||||
m_SmoothingGroup: 0
|
||||
m_Uv:
|
||||
m_UseWorldSpace: 0
|
||||
m_FlipU: 0
|
||||
m_FlipV: 0
|
||||
m_SwapUV: 0
|
||||
m_Fill: 1
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Rotation: 0
|
||||
m_Anchor: 0
|
||||
m_Material: {fileID: 0}
|
||||
m_SubmeshIndex: 0
|
||||
m_ManualUV: 0
|
||||
elementGroup: -1
|
||||
m_TextureGroup: -1
|
||||
- m_Indexes: 040000000500000006000000050000000700000006000000
|
||||
m_SmoothingGroup: 0
|
||||
m_Uv:
|
||||
m_UseWorldSpace: 0
|
||||
m_FlipU: 0
|
||||
m_FlipV: 0
|
||||
m_SwapUV: 0
|
||||
m_Fill: 1
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Rotation: 0
|
||||
m_Anchor: 0
|
||||
m_Material: {fileID: 0}
|
||||
m_SubmeshIndex: 0
|
||||
m_ManualUV: 0
|
||||
elementGroup: -1
|
||||
m_TextureGroup: -1
|
||||
- m_Indexes: 08000000090000000a000000090000000b0000000a000000
|
||||
m_SmoothingGroup: 0
|
||||
m_Uv:
|
||||
m_UseWorldSpace: 0
|
||||
m_FlipU: 0
|
||||
m_FlipV: 0
|
||||
m_SwapUV: 0
|
||||
m_Fill: 1
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Rotation: 0
|
||||
m_Anchor: 0
|
||||
m_Material: {fileID: 0}
|
||||
m_SubmeshIndex: 0
|
||||
m_ManualUV: 0
|
||||
elementGroup: -1
|
||||
m_TextureGroup: -1
|
||||
- m_Indexes: 0c0000000d0000000e0000000d0000000f0000000e000000
|
||||
m_SmoothingGroup: 0
|
||||
m_Uv:
|
||||
m_UseWorldSpace: 0
|
||||
m_FlipU: 0
|
||||
m_FlipV: 0
|
||||
m_SwapUV: 0
|
||||
m_Fill: 1
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Rotation: 0
|
||||
m_Anchor: 0
|
||||
m_Material: {fileID: 0}
|
||||
m_SubmeshIndex: 0
|
||||
m_ManualUV: 0
|
||||
elementGroup: -1
|
||||
m_TextureGroup: -1
|
||||
- m_Indexes: 100000001100000012000000110000001300000012000000
|
||||
m_SmoothingGroup: 0
|
||||
m_Uv:
|
||||
m_UseWorldSpace: 0
|
||||
m_FlipU: 0
|
||||
m_FlipV: 0
|
||||
m_SwapUV: 0
|
||||
m_Fill: 1
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Rotation: 0
|
||||
m_Anchor: 0
|
||||
m_Material: {fileID: 0}
|
||||
m_SubmeshIndex: 0
|
||||
m_ManualUV: 0
|
||||
elementGroup: -1
|
||||
m_TextureGroup: -1
|
||||
- m_Indexes: 140000001500000016000000150000001700000016000000
|
||||
m_SmoothingGroup: 0
|
||||
m_Uv:
|
||||
m_UseWorldSpace: 0
|
||||
m_FlipU: 0
|
||||
m_FlipV: 0
|
||||
m_SwapUV: 0
|
||||
m_Fill: 1
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Offset: {x: 0, y: 0}
|
||||
m_Rotation: 0
|
||||
m_Anchor: 0
|
||||
m_Material: {fileID: 0}
|
||||
m_SubmeshIndex: 0
|
||||
m_ManualUV: 0
|
||||
elementGroup: -1
|
||||
m_TextureGroup: -1
|
||||
m_SharedVertices:
|
||||
- m_Vertices: 000000000d00000016000000
|
||||
- m_Vertices: 010000000400000017000000
|
||||
- m_Vertices: 020000000f00000010000000
|
||||
- m_Vertices: 030000000600000011000000
|
||||
- m_Vertices: 050000000800000015000000
|
||||
- m_Vertices: 070000000a00000013000000
|
||||
- m_Vertices: 090000000c00000014000000
|
||||
- m_Vertices: 0b0000000e00000012000000
|
||||
m_SharedTextures: []
|
||||
m_Positions:
|
||||
- {x: -0.25, y: -0.25, z: 0.25}
|
||||
- {x: 0.25, y: -0.25, z: 0.25}
|
||||
- {x: -0.25, y: 0.25, z: 0.25}
|
||||
- {x: 0.25, y: 0.25, z: 0.25}
|
||||
- {x: 0.25, y: -0.25, z: 0.25}
|
||||
- {x: 0.25, y: -0.25, z: -0.25}
|
||||
- {x: 0.25, y: 0.25, z: 0.25}
|
||||
- {x: 0.25, y: 0.25, z: -0.25}
|
||||
- {x: 0.25, y: -0.25, z: -0.25}
|
||||
- {x: -0.25, y: -0.25, z: -0.25}
|
||||
- {x: 0.25, y: 0.25, z: -0.25}
|
||||
- {x: -0.25, y: 0.25, z: -0.25}
|
||||
- {x: -0.25, y: -0.25, z: -0.25}
|
||||
- {x: -0.25, y: -0.25, z: 0.25}
|
||||
- {x: -0.25, y: 0.25, z: -0.25}
|
||||
- {x: -0.25, y: 0.25, z: 0.25}
|
||||
- {x: -0.25, y: 0.25, z: 0.25}
|
||||
- {x: 0.25, y: 0.25, z: 0.25}
|
||||
- {x: -0.25, y: 0.25, z: -0.25}
|
||||
- {x: 0.25, y: 0.25, z: -0.25}
|
||||
- {x: -0.25, y: -0.25, z: -0.25}
|
||||
- {x: 0.25, y: -0.25, z: -0.25}
|
||||
- {x: -0.25, y: -0.25, z: 0.25}
|
||||
- {x: 0.25, y: -0.25, z: 0.25}
|
||||
m_Textures0:
|
||||
- {x: 0.5, y: 0.5}
|
||||
- {x: 0, y: 0.5}
|
||||
- {x: 0.5, y: 1}
|
||||
- {x: 0, y: 1}
|
||||
- {x: 0.5, y: 0.5}
|
||||
- {x: 0, y: 0.5}
|
||||
- {x: 0.5, y: 1}
|
||||
- {x: 0, y: 1}
|
||||
- {x: 0.5, y: 0.5}
|
||||
- {x: 0, y: 0.5}
|
||||
- {x: 0.5, y: 1}
|
||||
- {x: 0, y: 1}
|
||||
- {x: 0.5, y: 0.5}
|
||||
- {x: 0, y: 0.5}
|
||||
- {x: 0.5, y: 1}
|
||||
- {x: 0, y: 1}
|
||||
- {x: 0, y: 1}
|
||||
- {x: 0.5, y: 1}
|
||||
- {x: 0, y: 0.5}
|
||||
- {x: 0.5, y: 0.5}
|
||||
- {x: 0.5, y: 0.5}
|
||||
- {x: 0, y: 0.5}
|
||||
- {x: 0.5, y: 1}
|
||||
- {x: 0, y: 1}
|
||||
m_Textures2: []
|
||||
m_Textures3: []
|
||||
m_Tangents:
|
||||
- {x: -1, y: 0, z: 0, w: -1}
|
||||
- {x: -1, y: 0, z: 0, w: -1}
|
||||
- {x: -1, y: 0, z: 0, w: -1}
|
||||
- {x: -1, y: 0, z: 0, w: -1}
|
||||
- {x: 0, y: 0, z: 1, w: -1}
|
||||
- {x: 0, y: 0, z: 1, w: -1}
|
||||
- {x: 0, y: 0, z: 1, w: -1}
|
||||
- {x: 0, y: 0, z: 1, w: -1}
|
||||
- {x: 1, y: 0, z: 0, w: -1}
|
||||
- {x: 1, y: 0, z: 0, w: -1}
|
||||
- {x: 1, y: 0, z: 0, w: -1}
|
||||
- {x: 1, y: 0, z: 0, w: -1}
|
||||
- {x: 0, y: 0, z: -1, w: -1}
|
||||
- {x: 0, y: 0, z: -1, w: -1}
|
||||
- {x: 0, y: 0, z: -1, w: -1}
|
||||
- {x: 0, y: 0, z: -1, w: -1}
|
||||
- {x: 1, y: 0, z: 0, w: -1}
|
||||
- {x: 1, y: 0, z: 0, w: -1}
|
||||
- {x: 1, y: 0, z: 0, w: -1}
|
||||
- {x: 1, y: 0, z: 0, w: -1}
|
||||
- {x: -1, y: 0, z: 0, w: -1}
|
||||
- {x: -1, y: 0, z: 0, w: -1}
|
||||
- {x: -1, y: 0, z: 0, w: -1}
|
||||
- {x: -1, y: 0, z: 0, w: -1}
|
||||
m_Colors: []
|
||||
m_UnwrapParameters:
|
||||
m_HardAngle: 88
|
||||
m_PackMargin: 20
|
||||
m_AngleError: 8
|
||||
m_AreaError: 15
|
||||
m_PreserveMeshAssetOnDestroy: 0
|
||||
assetGuid:
|
||||
m_Mesh: {fileID: 0}
|
||||
m_VersionIndex: 23
|
||||
m_IsSelectable: 1
|
||||
m_SelectedFaces:
|
||||
m_SelectedEdges: []
|
||||
m_SelectedVertices:
|
||||
--- !u!114 &489735366413190748
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2408983304096713058}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1ca002da428252441b92f28d83c8a65f, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Unity.ProBuilder::UnityEngine.ProBuilder.Shapes.ProBuilderShape
|
||||
m_Shape:
|
||||
rid: 1325630742307537158
|
||||
m_ShapeRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_UnmodifiedMeshVersion: 23
|
||||
m_Size: {x: 0.5, y: 0.5, z: 0.5}
|
||||
m_LocalCenter: {x: 0, y: 0, z: 0}
|
||||
references:
|
||||
version: 2
|
||||
RefIds:
|
||||
- rid: 1325630742307537158
|
||||
type: {class: Cube, ns: UnityEngine.ProBuilder.Shapes, asm: Unity.ProBuilder}
|
||||
data:
|
||||
--- !u!23 &6101101176935368636
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2408983304096713058}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RayTracingAccelStructBuildFlagsOverride: 0
|
||||
m_RayTracingAccelStructBuildFlags: 1
|
||||
m_SmallMeshCulling: 1
|
||||
m_ForceMeshLod: -1
|
||||
m_MeshLodSelectionBias: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: c22777d6e868e4f2fb421913386b154e, type: 2}
|
||||
m_StaticBatchInfo:
|
||||
firstSubMesh: 0
|
||||
subMeshCount: 0
|
||||
m_StaticBatchRoot: {fileID: 0}
|
||||
m_ProbeAnchor: {fileID: 0}
|
||||
m_LightProbeVolumeOverride: {fileID: 0}
|
||||
m_ScaleInLightmap: 1
|
||||
m_ReceiveGI: 1
|
||||
m_PreserveUVs: 0
|
||||
m_IgnoreNormalsForChartDetection: 0
|
||||
m_ImportantGI: 0
|
||||
m_StitchLightmapSeams: 1
|
||||
m_SelectedEditorRenderState: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_GlobalIlluminationMeshLod: 0
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_MaskInteraction: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!33 &6700426716916120764
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2408983304096713058}
|
||||
m_Mesh: {fileID: 0}
|
||||
--- !u!114 &7552511637356990312
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2408983304096713058}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: b93699191d7b58146b2c38540cbed40f, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::PressurePlateTestBlock
|
||||
targetRenderer: {fileID: 0}
|
||||
offColor: {r: 1, g: 0, b: 0, a: 1}
|
||||
onColor: {r: 0, g: 1, b: 0, a: 1}
|
||||
colorPropertyName: _BaseColor
|
||||
pressurePlates: []
|
||||
wallButtons: []
|
||||
7
Assets/Level/Prefabs/Dev/TestBlock.prefab.meta
Normal file
7
Assets/Level/Prefabs/Dev/TestBlock.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d6c9e1e9ff9b89d8b8b14b4853ea0d15
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -12,14 +12,11 @@ GameObject:
|
||||
- component: {fileID: 5140597600133624551}
|
||||
- component: {fileID: 3884605895522482221}
|
||||
- component: {fileID: 16871832050785725}
|
||||
- component: {fileID: 7987102888823411772}
|
||||
- component: {fileID: 8512140229507148937}
|
||||
- component: {fileID: 6921400718617286756}
|
||||
- component: {fileID: 7987102888823411772}
|
||||
m_Layer: 0
|
||||
<<<<<<<< HEAD:Assets/Level/Prefabs/World/MovingDoor.prefab
|
||||
m_Name: MovingDoor
|
||||
========
|
||||
m_Name: BigDoor
|
||||
>>>>>>>> feat/level/create-level-1:Assets/Level/Prefabs/Interactives/BigDoor.prefab
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@@ -157,84 +154,80 @@ MonoBehaviour:
|
||||
elementGroup: -1
|
||||
m_TextureGroup: -1
|
||||
m_SharedVertices:
|
||||
- m_Vertices: 000000000d00000016000000
|
||||
- m_Vertices: 010000000400000017000000
|
||||
- m_Vertices: 020000000f00000010000000
|
||||
- m_Vertices: 030000000600000011000000
|
||||
- m_Vertices: 050000000800000015000000
|
||||
- m_Vertices: 070000000a00000013000000
|
||||
- m_Vertices: 090000000c00000014000000
|
||||
- m_Vertices: 0b0000000e00000012000000
|
||||
- m_Vertices: 00000000020000000d000000000000000000000000000000
|
||||
- m_Vertices: 010000000300000004000000000000000000000000000000
|
||||
- m_Vertices: 050000000700000008000000000000000000000000000000
|
||||
- m_Vertices: 090000000b0000000c000000000000000000000000000000
|
||||
m_SharedTextures: []
|
||||
m_Positions:
|
||||
- {x: -0.05, y: -1, z: 0.5}
|
||||
- {x: 0.05, y: -1, z: 0.5}
|
||||
- {x: -0.05, y: 1, z: 0.5}
|
||||
- {x: 0.05, y: 1, z: 0.5}
|
||||
- {x: 0.05, y: -1, z: 0.5}
|
||||
- {x: 0.05, y: -1, z: -0.5}
|
||||
- {x: 0.05, y: 1, z: 0.5}
|
||||
- {x: 0.05, y: 1, z: -0.5}
|
||||
- {x: 0.05, y: -1, z: -0.5}
|
||||
- {x: -0.05, y: -1, z: -0.5}
|
||||
- {x: 0.05, y: 1, z: -0.5}
|
||||
- {x: -0.05, y: 1, z: -0.5}
|
||||
- {x: -0.05, y: -1, z: -0.5}
|
||||
- {x: -0.05, y: -1, z: 0.5}
|
||||
- {x: -0.05, y: 1, z: -0.5}
|
||||
- {x: -0.05, y: 1, z: 0.5}
|
||||
- {x: -0.05, y: 1, z: 0.5}
|
||||
- {x: 0.05, y: 1, z: 0.5}
|
||||
- {x: -0.05, y: 1, z: -0.5}
|
||||
- {x: 0.05, y: 1, z: -0.5}
|
||||
- {x: -0.05, y: -1, z: -0.5}
|
||||
- {x: 0.05, y: -1, z: -0.5}
|
||||
- {x: -0.05, y: -1, z: 0.5}
|
||||
- {x: 0.05, y: -1, z: 0.5}
|
||||
- {x: -0.05, y: -4, z: 4}
|
||||
- {x: 0.05, y: -4, z: 4}
|
||||
- {x: -0.05, y: 4, z: 4}
|
||||
- {x: 0.05, y: 4, z: 4}
|
||||
- {x: 0.05, y: -4, z: 4}
|
||||
- {x: 0.05, y: -4, z: -4}
|
||||
- {x: 0.05, y: 4, z: 4}
|
||||
- {x: 0.05, y: 4, z: -4}
|
||||
- {x: 0.05, y: -4, z: -4}
|
||||
- {x: -0.05, y: -4, z: -4}
|
||||
- {x: 0.05, y: 4, z: -4}
|
||||
- {x: -0.05, y: 4, z: -4}
|
||||
- {x: -0.05, y: -4, z: -4}
|
||||
- {x: -0.05, y: -4, z: 4}
|
||||
- {x: -0.05, y: 4, z: -4}
|
||||
- {x: -0.05, y: 4, z: 4}
|
||||
- {x: -0.05, y: 4, z: 4}
|
||||
- {x: 0.05, y: 4, z: 4}
|
||||
- {x: -0.05, y: 4, z: -4}
|
||||
- {x: 0.05, y: 4, z: -4}
|
||||
- {x: -0.05, y: -4, z: -4}
|
||||
- {x: 0.05, y: -4, z: -4}
|
||||
- {x: -0.05, y: -4, z: 4}
|
||||
- {x: 0.05, y: -4, z: 4}
|
||||
m_Textures0:
|
||||
- {x: 0.1, y: -1}
|
||||
- {x: 0, y: -1}
|
||||
- {x: 0.1, y: 1}
|
||||
- {x: 0, y: 1}
|
||||
- {x: 1, y: -1}
|
||||
- {x: 0, y: -1}
|
||||
- {x: 1, y: 1}
|
||||
- {x: 0, y: 1}
|
||||
- {x: 0.1, y: -1}
|
||||
- {x: 0, y: -1}
|
||||
- {x: 0.1, y: 1}
|
||||
- {x: 0, y: 1}
|
||||
- {x: 1, y: -1}
|
||||
- {x: 0, y: -1}
|
||||
- {x: 1, y: 1}
|
||||
- {x: 0, y: 1}
|
||||
- {x: 0, y: -7}
|
||||
- {x: 0.1, y: -7}
|
||||
- {x: 0, y: 1}
|
||||
- {x: 0.1, y: 1}
|
||||
- {x: 8, y: -7}
|
||||
- {x: 0, y: -7}
|
||||
- {x: 8, y: 1}
|
||||
- {x: 0, y: 0}
|
||||
- {x: 0.1, y: 0}
|
||||
- {x: 0.1, y: 0}
|
||||
- {x: 0, y: 0}
|
||||
- {x: 0.1, y: -7}
|
||||
- {x: 0, y: -7}
|
||||
- {x: 0.1, y: 1}
|
||||
- {x: 0, y: 1}
|
||||
- {x: 8, y: -7}
|
||||
- {x: 0, y: -7}
|
||||
- {x: 8, y: 0}
|
||||
- {x: 0, y: 1}
|
||||
- {x: 0, y: 1}
|
||||
- {x: 0.1, y: 1}
|
||||
- {x: 0, y: -7}
|
||||
- {x: 0.1, y: -7}
|
||||
- {x: 0.1, y: -7}
|
||||
- {x: 0, y: -7}
|
||||
- {x: 0.1, y: 1}
|
||||
- {x: 0, y: 1}
|
||||
m_Textures2: []
|
||||
m_Textures3: []
|
||||
m_Tangents:
|
||||
- {x: -1, y: 0, z: 0, w: -1}
|
||||
- {x: -1, y: 0, z: 0, w: -1}
|
||||
- {x: -1, y: 0, z: 0, w: -1}
|
||||
- {x: -1, y: 0, z: 0, w: -1}
|
||||
- {x: 0, y: 0, z: 1, w: -1}
|
||||
- {x: 0, y: 0, z: 1, w: -1}
|
||||
- {x: 0, y: 0, z: 1, w: -1}
|
||||
- {x: 0, y: 0, z: 1, w: -1}
|
||||
- {x: 1, y: 0, z: 0, w: -1}
|
||||
- {x: 1, y: 0, z: 0, w: -1}
|
||||
- {x: 1, y: 0, z: 0, w: -1}
|
||||
- {x: 1, y: 0, z: 0, w: -1}
|
||||
- {x: 0, y: 0, z: -1, w: -1}
|
||||
- {x: 0, y: 0, z: -1, w: -1}
|
||||
- {x: 0, y: 0, z: -1, w: -1}
|
||||
- {x: 0, y: 0, z: -1, w: -1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: -0, y: 1, z: 0, w: 1}
|
||||
- {x: 1, y: 0, z: 0, w: -1}
|
||||
- {x: 1, y: 0, z: 0, w: -1}
|
||||
- {x: 1, y: 0, z: 0, w: -1}
|
||||
@@ -252,7 +245,7 @@ MonoBehaviour:
|
||||
m_PreserveMeshAssetOnDestroy: 0
|
||||
assetGuid:
|
||||
m_Mesh: {fileID: 0}
|
||||
m_VersionIndex: 95
|
||||
m_VersionIndex: 59
|
||||
m_IsSelectable: 1
|
||||
m_SelectedFaces:
|
||||
m_SelectedEdges: []
|
||||
@@ -272,8 +265,8 @@ MonoBehaviour:
|
||||
m_Shape:
|
||||
rid: 1325630791375913023
|
||||
m_ShapeRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_UnmodifiedMeshVersion: 95
|
||||
m_Size: {x: 0.1, y: 2, z: 1}
|
||||
m_UnmodifiedMeshVersion: 59
|
||||
m_Size: {x: 0.1, y: 8, z: 8}
|
||||
m_LocalCenter: {x: 0, y: 0, z: 0}
|
||||
references:
|
||||
version: 2
|
||||
@@ -330,6 +323,37 @@ MeshRenderer:
|
||||
m_SortingOrder: 0
|
||||
m_MaskInteraction: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!33 &8512140229507148937
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6922175388650039756}
|
||||
m_Mesh: {fileID: 0}
|
||||
--- !u!114 &6921400718617286756
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6922175388650039756}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0cc6c36a261296f4c82e315da147ba93, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::SlidingDoor
|
||||
axis: 1
|
||||
direction: -1
|
||||
slideDistance: 10
|
||||
speed: 3
|
||||
startOpen: 0
|
||||
OnOpened:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
OnClosed:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
--- !u!65 &7987102888823411772
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -349,28 +373,5 @@ BoxCollider:
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Size: {x: 0.1, y: 2, z: 1}
|
||||
m_Size: {x: 0.1, y: 8, z: 8}
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &6921400718617286756
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 6922175388650039756}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0cc6c36a261296f4c82e315da147ba93, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier: Assembly-CSharp::SlidingDoor
|
||||
axis: 1
|
||||
direction: -1
|
||||
slideDistance: 2
|
||||
speed: 3
|
||||
startOpen: 0
|
||||
OnOpened:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
OnClosed:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: d6fdf4761aa22fdaca0e9d4470c7ee73
|
||||
guid: 0eece4d381450d440a0abcb205ba126e
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
||||
@@ -13,7 +13,7 @@ GameObject:
|
||||
- component: {fileID: 5853974941088398888}
|
||||
- component: {fileID: 5042967542353382394}
|
||||
- component: {fileID: 8480948550909164709}
|
||||
- component: {fileID: -6766998345617383126}
|
||||
- component: {fileID: 4852617768436622893}
|
||||
- component: {fileID: 590849425322242843}
|
||||
- component: {fileID: 8973796063000431307}
|
||||
m_Layer: 0
|
||||
@@ -336,8 +336,8 @@ MeshFilter:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1261067352547520725}
|
||||
m_Mesh: {fileID: 0}
|
||||
--- !u!65 &-6766998345617383126
|
||||
BoxCollider:
|
||||
--- !u!64 &4852617768436622893
|
||||
MeshCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
@@ -354,9 +354,10 @@ BoxCollider:
|
||||
m_IsTrigger: 0
|
||||
m_ProvidesContacts: 0
|
||||
m_Enabled: 1
|
||||
serializedVersion: 3
|
||||
m_Size: {x: 1.5, y: 0.1, z: 1.5}
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
serializedVersion: 5
|
||||
m_Convex: 0
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: 0}
|
||||
--- !u!65 &590849425322242843
|
||||
BoxCollider:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -9397,21 +9397,13 @@ PrefabInstance:
|
||||
propertyPath: m_Mesh
|
||||
value:
|
||||
objectReference: {fileID: 1732395164}
|
||||
- target: {fileID: 6013655646903888208, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3}
|
||||
propertyPath: resetOnWrongPress
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6013655646903888208, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3}
|
||||
propertyPath: 'puzzleBlocks.Array.data[0]'
|
||||
value:
|
||||
objectReference: {fileID: 1210153113}
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6013655646903888208, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3}
|
||||
propertyPath: 'puzzleBlocks.Array.data[2]'
|
||||
value:
|
||||
objectReference: {fileID: 1742811892}
|
||||
- target: {fileID: 6013655646903888208, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3}
|
||||
propertyPath: 'puzzleBlocks.Array.data[3]'
|
||||
value:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6296181247577080123, guid: 9ee323cece3dc49a8b49058b882a22f6, type: 3}
|
||||
propertyPath: m_Mesh
|
||||
|
||||
@@ -0,0 +1,15 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!134 &13400000
|
||||
PhysicsMaterial:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_Name: No_Frcition
|
||||
serializedVersion: 2
|
||||
m_DynamicFriction: 0
|
||||
m_StaticFriction: 0
|
||||
m_Bounciness: 0
|
||||
m_FrictionCombine: 0
|
||||
m_BounceCombine: 0
|
||||
@@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: f9ccf03e1da5f4a4683903447659b3d7
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 13400000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -1,5 +1,5 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 7c0881b5a8885c9f0a5954bd7ca490b4
|
||||
guid: f7ddf8204ae4327bb84e928c9ae561d4
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 13400000
|
||||
|
||||
9590
Assets/_Recovery/0 (1).unity
Normal file
9590
Assets/_Recovery/0 (1).unity
Normal file
File diff suppressed because one or more lines are too long
7
Assets/_Recovery/0 (1).unity.meta
Normal file
7
Assets/_Recovery/0 (1).unity.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: eb86304f354e34c7aba1feb6c9c165c7
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Reference in New Issue
Block a user