diff --git a/Assets/AlwaysFaceTowardsCamera.cs b/Assets/AlwaysFaceTowardsCamera.cs deleted file mode 100644 index 4c1a9d6..0000000 --- a/Assets/AlwaysFaceTowardsCamera.cs +++ /dev/null @@ -1,12 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -[ExecuteInEditMode] -public class AlwaysFaceTowardsCamera : MonoBehaviour { - - - void Update () { - transform.LookAt(Camera.main.transform, Vector3.up); - } -} diff --git a/Assets/ChangeColorOnHover.cs b/Assets/ChangeColorOnHover.cs deleted file mode 100644 index 6651513..0000000 --- a/Assets/ChangeColorOnHover.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ChangeColorOnHover : MonoBehaviour { - - Color startColor; - public Color toColor; - Color lerpToColor; - - // Use this for initialization - void Start () { - GetComponent().material = new Material(GetComponent().material); - startColor = GetComponent().material.GetColor("_Color"); - } - - // Update is called once per frame - void Update () { - RaycastHit hit; - Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); - - if (Physics.Raycast(ray, out hit)) - { - if (hit.transform.gameObject.GetInstanceID() == gameObject.GetInstanceID()) - { - lerpToColor = toColor; - } - else - { - lerpToColor = startColor; - } - } else - { - lerpToColor = startColor; - } - - GetComponent().material.SetColor("_Color", Color.Lerp(GetComponent().material.color, lerpToColor, Time.deltaTime * 15)); - } -} diff --git a/Assets/CutOnClick.cs b/Assets/CutOnClick.cs deleted file mode 100644 index a74998b..0000000 --- a/Assets/CutOnClick.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class CutOnClick : MonoBehaviour { - - public VoxelMover cube; - public bool forward = true; - - void Start() - { - cube = FindObjectOfType(); - } - - void Update() - { - RaycastHit hit; - Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); - - if (Physics.Raycast(ray, out hit)) - { - if (hit.transform.gameObject.GetInstanceID() == gameObject.GetInstanceID() && Input.GetMouseButtonDown(0)) - { - if (forward) - { - GameObject[] nodules = GameObject.FindGameObjectsWithTag("Nodule"); - for (int n = 0; n < nodules.Length; n++) - { - if (nodules[n].GetInstanceID() != transform.parent.parent.gameObject.GetInstanceID()) - { - nodules[n].SetActive(false); - } - } - - cube.CutForward(cube.transform.InverseTransformDirection(transform.forward)); - } else - { - cube.CutBackward(cube.transform.InverseTransformDirection(-transform.forward), true); - } - } - } - } -} diff --git a/Assets/DisableTextOnInvisible.cs b/Assets/DisableTextOnInvisible.cs deleted file mode 100644 index e8d5de4..0000000 --- a/Assets/DisableTextOnInvisible.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class DisableTextOnInvisible : MonoBehaviour { - - VoxelSpawner cube; - - void Start() - { - cube = FindObjectOfType(); - } - - void Update () { - - Vector3 realPos = transform.parent.parent.localPosition - new Vector3(-(cube.cubeSize / 2f) + 0.5f, -(cube.cubeSize / 2f) + 0.5f, -(cube.cubeSize / 2f) + 0.5f); - if (realPos.x * realPos.y * realPos.z == 0) - { - GetComponent().enabled = true; - } else - { - GetComponent().enabled = false; - } - } -} diff --git a/Assets/LerpToPos.cs b/Assets/LerpToPos.cs deleted file mode 100644 index 43ef643..0000000 --- a/Assets/LerpToPos.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class LerpToPos : MonoBehaviour { - - bool lerping = false; - Vector3 newPos; - float lerpSpeed; - - void Update() - { - if (lerping) - { - transform.localPosition = Vector3.Lerp(transform.localPosition, newPos, Time.deltaTime * lerpSpeed); - } - if (Mathf.Abs(transform.localPosition.magnitude - newPos.magnitude) < 0.1f) - { - lerping = false; - transform.localPosition = newPos; - } - } - - public void MoveToPos(Vector3 pos, float speed) - { - lerpSpeed = speed; - newPos = pos; - lerping = true; - } - -} diff --git a/Assets/Materials.meta b/Assets/Materials.meta new file mode 100644 index 0000000..8a52343 --- /dev/null +++ b/Assets/Materials.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3286b103be89c3a44a9dcd3e2a2aae2e +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3DText.mat b/Assets/Materials/3DText.mat similarity index 100% rename from Assets/3DText.mat rename to Assets/Materials/3DText.mat diff --git a/Assets/3DText.mat.meta b/Assets/Materials/3DText.mat.meta similarity index 100% rename from Assets/3DText.mat.meta rename to Assets/Materials/3DText.mat.meta diff --git a/Assets/HighlighterPointersOutline.mat b/Assets/Materials/HighlighterPointersOutline.mat similarity index 100% rename from Assets/HighlighterPointersOutline.mat rename to Assets/Materials/HighlighterPointersOutline.mat diff --git a/Assets/HighlighterPointersOutline.mat.meta b/Assets/Materials/HighlighterPointersOutline.mat.meta similarity index 100% rename from Assets/HighlighterPointersOutline.mat.meta rename to Assets/Materials/HighlighterPointersOutline.mat.meta diff --git a/Assets/NoduleMat.mat b/Assets/Materials/NoduleMat.mat similarity index 100% rename from Assets/NoduleMat.mat rename to Assets/Materials/NoduleMat.mat diff --git a/Assets/NoduleMat.mat.meta b/Assets/Materials/NoduleMat.mat.meta similarity index 100% rename from Assets/NoduleMat.mat.meta rename to Assets/Materials/NoduleMat.mat.meta diff --git a/Assets/VoxelHighlighterMat.mat b/Assets/Materials/VoxelHighlighterMat.mat similarity index 100% rename from Assets/VoxelHighlighterMat.mat rename to Assets/Materials/VoxelHighlighterMat.mat diff --git a/Assets/VoxelHighlighterMat.mat.meta b/Assets/Materials/VoxelHighlighterMat.mat.meta similarity index 100% rename from Assets/VoxelHighlighterMat.mat.meta rename to Assets/Materials/VoxelHighlighterMat.mat.meta diff --git a/Assets/VoxelPrefabMat.mat b/Assets/Materials/VoxelPrefabMat.mat similarity index 100% rename from Assets/VoxelPrefabMat.mat rename to Assets/Materials/VoxelPrefabMat.mat diff --git a/Assets/VoxelPrefabMat.mat.meta b/Assets/Materials/VoxelPrefabMat.mat.meta similarity index 100% rename from Assets/VoxelPrefabMat.mat.meta rename to Assets/Materials/VoxelPrefabMat.mat.meta diff --git a/Assets/unnamed.mat b/Assets/Materials/unnamed.mat similarity index 100% rename from Assets/unnamed.mat rename to Assets/Materials/unnamed.mat diff --git a/Assets/unnamed.mat.meta b/Assets/Materials/unnamed.mat.meta similarity index 100% rename from Assets/unnamed.mat.meta rename to Assets/Materials/unnamed.mat.meta diff --git a/Assets/Meshes.meta b/Assets/Meshes.meta new file mode 100644 index 0000000..a9d16d2 --- /dev/null +++ b/Assets/Meshes.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: b8a460bfb31036c4daa33873ba872227 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Nodule.blend b/Assets/Meshes/Nodule.blend similarity index 100% rename from Assets/Nodule.blend rename to Assets/Meshes/Nodule.blend diff --git a/Assets/Nodule.blend.meta b/Assets/Meshes/Nodule.blend.meta similarity index 100% rename from Assets/Nodule.blend.meta rename to Assets/Meshes/Nodule.blend.meta diff --git a/Assets/Voxel.blend b/Assets/Meshes/Voxel.blend similarity index 100% rename from Assets/Voxel.blend rename to Assets/Meshes/Voxel.blend diff --git a/Assets/Voxel.blend.meta b/Assets/Meshes/Voxel.blend.meta similarity index 100% rename from Assets/Voxel.blend.meta rename to Assets/Meshes/Voxel.blend.meta diff --git a/Assets/Voxel.blend1 b/Assets/Meshes/Voxel.blend1 similarity index 100% rename from Assets/Voxel.blend1 rename to Assets/Meshes/Voxel.blend1 diff --git a/Assets/Voxel.blend1.meta b/Assets/Meshes/Voxel.blend1.meta similarity index 100% rename from Assets/Voxel.blend1.meta rename to Assets/Meshes/Voxel.blend1.meta diff --git a/Assets/VoxelHighlighter.blend b/Assets/Meshes/VoxelHighlighter.blend similarity index 100% rename from Assets/VoxelHighlighter.blend rename to Assets/Meshes/VoxelHighlighter.blend diff --git a/Assets/VoxelHighlighter.blend.meta b/Assets/Meshes/VoxelHighlighter.blend.meta similarity index 100% rename from Assets/VoxelHighlighter.blend.meta rename to Assets/Meshes/VoxelHighlighter.blend.meta diff --git a/Assets/NumberToggle.cs b/Assets/NumberToggle.cs deleted file mode 100644 index 9b7cfcf..0000000 --- a/Assets/NumberToggle.cs +++ /dev/null @@ -1,34 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; - -public class NumberToggle : MonoBehaviour -{ - - public bool numberEnabled = true; - - public void ToggleNumbers() - { - numberEnabled = !numberEnabled; - if (numberEnabled) - { - SetVoxelProperties[] voxels = FindObjectsOfType(); - new List(voxels).ForEach((v) => - { - v.showNumber = true; - v.Redraw(); - }); - } - else - { - SetVoxelProperties[] voxels = FindObjectsOfType(); - new List(voxels).ForEach((v) => - { - v.showNumber = false; - v.Redraw(); - }); - } - } - -} diff --git a/Assets/OutlineToggle.cs b/Assets/OutlineToggle.cs deleted file mode 100644 index b3d84fc..0000000 --- a/Assets/OutlineToggle.cs +++ /dev/null @@ -1,22 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; - -public class OutlineToggle : MonoBehaviour { - - bool outlineEnabled = true; - - public void ToggleOutlines() - { - outlineEnabled = !outlineEnabled; - if (outlineEnabled) - { - FindObjectOfType().GetComponent().sharedMaterial.SetFloat("_FirstOutlineWidth", 0.02f); - } else - { - FindObjectOfType().GetComponent().sharedMaterial.SetFloat("_FirstOutlineWidth", 0f); - } - } - -} diff --git a/Assets/Prefabs.meta b/Assets/Prefabs.meta new file mode 100644 index 0000000..4b7f96e --- /dev/null +++ b/Assets/Prefabs.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 77c5f1d0fa1bcb4449e33e760edd9e78 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/NodulePrefab.prefab b/Assets/Prefabs/NodulePrefab.prefab similarity index 100% rename from Assets/NodulePrefab.prefab rename to Assets/Prefabs/NodulePrefab.prefab diff --git a/Assets/NodulePrefab.prefab.meta b/Assets/Prefabs/NodulePrefab.prefab.meta similarity index 100% rename from Assets/NodulePrefab.prefab.meta rename to Assets/Prefabs/NodulePrefab.prefab.meta diff --git a/Assets/VoxelPrefab.prefab b/Assets/Prefabs/VoxelPrefab.prefab similarity index 100% rename from Assets/VoxelPrefab.prefab rename to Assets/Prefabs/VoxelPrefab.prefab diff --git a/Assets/VoxelPrefab.prefab.meta b/Assets/Prefabs/VoxelPrefab.prefab.meta similarity index 100% rename from Assets/VoxelPrefab.prefab.meta rename to Assets/Prefabs/VoxelPrefab.prefab.meta diff --git a/Assets/RotateCube.cs b/Assets/RotateCube.cs deleted file mode 100644 index b9629ae..0000000 --- a/Assets/RotateCube.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class RotateCube : MonoBehaviour { - - void Start () { - - } - - public float mouseSensitivity = 1f; - public float scrollWheelSensitivity = 1f; - - Vector3 lastPos = Vector3.zero; - - void Update () { - if (Input.GetMouseButtonDown(1)) - { - lastPos = Input.mousePosition; - } - if (Input.GetMouseButton(1)) - { - Vector3 mouseOffset = Input.mousePosition - lastPos; - transform.RotateAround(Vector3.zero, Vector3.right, mouseOffset.y * mouseSensitivity); - transform.RotateAround(Vector3.zero, Vector3.up, -mouseOffset.x * mouseSensitivity); - } - if (Input.GetAxis("Mouse ScrollWheel") != 0) - { - transform.RotateAround(Vector3.zero, Vector3.forward, Input.GetAxis("Mouse ScrollWheel") * scrollWheelSensitivity); - } - lastPos = Input.mousePosition; - } -} diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 333b703..16b8506 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -50,7 +50,6 @@ LightmapSettings: m_BounceScale: 1 m_IndirectOutputScale: 1 m_AlbedoBoost: 1 - m_TemporalCoherenceThreshold: 1 m_EnvironmentLightingMode: 0 m_EnableBakedLightmaps: 0 m_EnableRealtimeLightmaps: 0 @@ -114,7 +113,7 @@ NavMeshSettings: m_Flags: 0 m_NavMeshData: {fileID: 0} --- !u!1001 &12804087 -Prefab: +PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: @@ -165,18 +164,20 @@ Prefab: value: 0.75 objectReference: {fileID: 0} m_RemovedComponents: [] - m_ParentPrefab: {fileID: 100100000, guid: c98514e0c536df142ad9e62b1ad457a4, type: 3} - m_IsPrefabParent: 0 + m_SourcePrefab: {fileID: 100100000, guid: c98514e0c536df142ad9e62b1ad457a4, type: 3} --- !u!4 &12804088 stripped Transform: - m_PrefabParentObject: {fileID: 400000, guid: c98514e0c536df142ad9e62b1ad457a4, type: 3} - m_PrefabInternal: {fileID: 12804087} + m_CorrespondingSourceObject: {fileID: 400000, guid: c98514e0c536df142ad9e62b1ad457a4, + type: 3} + m_PrefabInstance: {fileID: 12804087} + m_PrefabAsset: {fileID: 0} --- !u!1 &59373408 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 59373409} - component: {fileID: 59373411} @@ -191,8 +192,9 @@ GameObject: --- !u!224 &59373409 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 59373408} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -211,8 +213,9 @@ RectTransform: --- !u!114 &59373410 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 59373408} m_Enabled: 1 m_EditorHideFlags: 0 @@ -244,15 +247,18 @@ MonoBehaviour: --- !u!222 &59373411 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 59373408} + m_CullTransparentMesh: 0 --- !u!1 &81369165 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 81369166} - component: {fileID: 81369168} @@ -267,8 +273,9 @@ GameObject: --- !u!224 &81369166 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 81369165} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -285,8 +292,9 @@ RectTransform: --- !u!114 &81369167 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 81369165} m_Enabled: 1 m_EditorHideFlags: 0 @@ -318,15 +326,18 @@ MonoBehaviour: --- !u!222 &81369168 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 81369165} + m_CullTransparentMesh: 0 --- !u!1 &99743792 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 99743793} - component: {fileID: 99743795} @@ -341,8 +352,9 @@ GameObject: --- !u!224 &99743793 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 99743792} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -359,8 +371,9 @@ RectTransform: --- !u!114 &99743794 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 99743792} m_Enabled: 1 m_EditorHideFlags: 0 @@ -383,18 +396,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &99743795 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 99743792} + m_CullTransparentMesh: 0 --- !u!1 &154530391 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 154530395} - component: {fileID: 154530394} @@ -410,8 +427,9 @@ GameObject: --- !u!114 &154530392 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 154530391} m_Enabled: 1 m_EditorHideFlags: 0 @@ -426,8 +444,9 @@ MonoBehaviour: --- !u!114 &154530393 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 154530391} m_Enabled: 1 m_EditorHideFlags: 0 @@ -447,8 +466,9 @@ MonoBehaviour: --- !u!223 &154530394 Canvas: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 154530391} m_Enabled: 1 serializedVersion: 3 @@ -467,8 +487,9 @@ Canvas: --- !u!224 &154530395 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 154530391} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -499,9 +520,10 @@ RectTransform: --- !u!1 &268802747 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 268802748} - component: {fileID: 268802750} @@ -516,8 +538,9 @@ GameObject: --- !u!224 &268802748 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 268802747} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -534,8 +557,9 @@ RectTransform: --- !u!114 &268802749 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 268802747} m_Enabled: 1 m_EditorHideFlags: 0 @@ -567,15 +591,18 @@ MonoBehaviour: --- !u!222 &268802750 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 268802747} + m_CullTransparentMesh: 0 --- !u!1 &282840810 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 282840814} - component: {fileID: 282840813} @@ -590,20 +617,27 @@ GameObject: --- !u!81 &282840811 AudioListener: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 282840810} m_Enabled: 1 --- !u!20 &282840813 Camera: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 282840810} m_Enabled: 1 serializedVersion: 2 m_ClearFlags: 2 m_BackGroundColor: {r: 0.0627451, g: 0.1254902, b: 0.15294118, a: 0} + m_projectionMatrixMode: 1 + m_SensorSize: {x: 36, y: 24} + m_LensShift: {x: 0, y: 0} + m_GateFitMode: 2 + m_FocalLength: 50 m_NormalizedViewPortRect: serializedVersion: 2 x: 0 @@ -633,8 +667,9 @@ Camera: --- !u!4 &282840814 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 282840810} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: -5} @@ -646,9 +681,10 @@ Transform: --- !u!1 &347405215 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 347405216} m_Layer: 0 @@ -661,8 +697,9 @@ GameObject: --- !u!4 &347405216 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 347405215} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -676,9 +713,10 @@ Transform: --- !u!1 &350318796 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 350318797} - component: {fileID: 350318800} @@ -694,8 +732,9 @@ GameObject: --- !u!224 &350318797 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 350318796} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -713,8 +752,9 @@ RectTransform: --- !u!114 &350318798 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 350318796} m_Enabled: 1 m_EditorHideFlags: 0 @@ -765,8 +805,9 @@ MonoBehaviour: --- !u!114 &350318799 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 350318796} m_Enabled: 1 m_EditorHideFlags: 0 @@ -789,18 +830,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &350318800 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 350318796} + m_CullTransparentMesh: 0 --- !u!1 &390043173 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 390043174} - component: {fileID: 390043176} @@ -815,8 +860,9 @@ GameObject: --- !u!224 &390043174 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 390043173} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -827,14 +873,15 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 1} m_AnchorMax: {x: 0.5, y: 1} - m_AnchoredPosition: {x: 104.1, y: -37.9} + m_AnchoredPosition: {x: 104.1, y: -37.899902} m_SizeDelta: {x: 79.77, y: 41.3} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &390043175 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 390043173} m_Enabled: 1 m_EditorHideFlags: 0 @@ -866,15 +913,18 @@ MonoBehaviour: --- !u!222 &390043176 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 390043173} + m_CullTransparentMesh: 0 --- !u!1 &428167310 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 428167311} - component: {fileID: 428167313} @@ -889,8 +939,9 @@ GameObject: --- !u!224 &428167311 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 428167310} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -907,8 +958,9 @@ RectTransform: --- !u!114 &428167312 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 428167310} m_Enabled: 1 m_EditorHideFlags: 0 @@ -934,7 +986,7 @@ MonoBehaviour: m_AlignByGeometry: 0 m_RichText: 1 m_HorizontalOverflow: 0 - m_VerticalOverflow: 0 + m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: 'Right Click + Drag: @@ -958,19 +1010,27 @@ MonoBehaviour: R (In Slice Push Mode): - Alternate slice direction' + Alternate slice direction + + + Number Keys: + + Rotate Cube to Face' --- !u!222 &428167313 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 428167310} + m_CullTransparentMesh: 0 --- !u!1 &449400619 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 449400620} - component: {fileID: 449400622} @@ -985,8 +1045,9 @@ GameObject: --- !u!224 &449400620 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 449400619} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1003,8 +1064,9 @@ RectTransform: --- !u!114 &449400621 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 449400619} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1036,15 +1098,18 @@ MonoBehaviour: --- !u!222 &449400622 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 449400619} + m_CullTransparentMesh: 0 --- !u!1 &537953202 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 537953203} - component: {fileID: 537953205} @@ -1059,8 +1124,9 @@ GameObject: --- !u!224 &537953203 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 537953202} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1077,8 +1143,9 @@ RectTransform: --- !u!114 &537953204 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 537953202} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1110,15 +1177,18 @@ MonoBehaviour: --- !u!222 &537953205 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 537953202} + m_CullTransparentMesh: 0 --- !u!1 &554361993 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 554361994} - component: {fileID: 554361996} @@ -1133,8 +1203,9 @@ GameObject: --- !u!224 &554361994 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 554361993} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1152,8 +1223,9 @@ RectTransform: --- !u!114 &554361995 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 554361993} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1176,18 +1248,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &554361996 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 554361993} + m_CullTransparentMesh: 0 --- !u!1 &657444041 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 657444042} m_Layer: 0 @@ -1200,8 +1276,9 @@ GameObject: --- !u!4 &657444042 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 657444041} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1215,9 +1292,10 @@ Transform: --- !u!1 &809175372 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 809175373} - component: {fileID: 809175375} @@ -1232,8 +1310,9 @@ GameObject: --- !u!224 &809175373 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 809175372} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1244,14 +1323,15 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 1} m_AnchorMax: {x: 0, y: 1} - m_AnchoredPosition: {x: 97.6001, y: -126.600006} + m_AnchoredPosition: {x: 97.6001, y: -126.6001} m_SizeDelta: {x: 152.9, y: 30} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &809175374 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 809175372} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1283,15 +1363,18 @@ MonoBehaviour: --- !u!222 &809175375 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 809175372} + m_CullTransparentMesh: 0 --- !u!1 &833310158 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 833310159} - component: {fileID: 833310161} @@ -1306,8 +1389,9 @@ GameObject: --- !u!224 &833310159 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 833310158} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1324,8 +1408,9 @@ RectTransform: --- !u!114 &833310160 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 833310158} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1357,15 +1442,18 @@ MonoBehaviour: --- !u!222 &833310161 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 833310158} + m_CullTransparentMesh: 0 --- !u!1 &970895259 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 970895260} - component: {fileID: 970895262} @@ -1380,8 +1468,9 @@ GameObject: --- !u!224 &970895260 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 970895259} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1398,8 +1487,9 @@ RectTransform: --- !u!114 &970895261 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 970895259} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1431,15 +1521,18 @@ MonoBehaviour: --- !u!222 &970895262 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 970895259} + m_CullTransparentMesh: 0 --- !u!1 &1019371023 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1019371024} - component: {fileID: 1019371027} @@ -1455,8 +1548,9 @@ GameObject: --- !u!224 &1019371024 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1019371023} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1475,8 +1569,9 @@ RectTransform: --- !u!114 &1019371025 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1019371023} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1538,8 +1633,9 @@ MonoBehaviour: --- !u!114 &1019371026 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1019371023} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1562,18 +1658,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1019371027 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1019371023} + m_CullTransparentMesh: 0 --- !u!1 &1042185950 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1042185951} - component: {fileID: 1042185953} @@ -1588,8 +1688,9 @@ GameObject: --- !u!224 &1042185951 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1042185950} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1607,8 +1708,9 @@ RectTransform: --- !u!114 &1042185952 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1042185950} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1631,18 +1733,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1042185953 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1042185950} + m_CullTransparentMesh: 0 --- !u!1 &1045097593 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1045097594} - component: {fileID: 1045097597} @@ -1658,8 +1764,9 @@ GameObject: --- !u!224 &1045097594 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1045097593} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1677,8 +1784,9 @@ RectTransform: --- !u!114 &1045097595 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1045097593} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1729,8 +1837,9 @@ MonoBehaviour: --- !u!114 &1045097596 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1045097593} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1753,18 +1862,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1045097597 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1045097593} + m_CullTransparentMesh: 0 --- !u!1 &1070507235 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1070507236} - component: {fileID: 1070507239} @@ -1780,8 +1893,9 @@ GameObject: --- !u!224 &1070507236 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1070507235} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1799,8 +1913,9 @@ RectTransform: --- !u!114 &1070507237 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1070507235} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1851,8 +1966,9 @@ MonoBehaviour: --- !u!114 &1070507238 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1070507235} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1875,18 +1991,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1070507239 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1070507235} + m_CullTransparentMesh: 0 --- !u!1 &1098131446 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1098131449} - component: {fileID: 1098131448} @@ -1901,8 +2021,9 @@ GameObject: --- !u!114 &1098131447 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1098131446} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1919,8 +2040,9 @@ MonoBehaviour: --- !u!114 &1098131448 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1098131446} m_Enabled: 1 m_EditorHideFlags: 0 @@ -1933,8 +2055,9 @@ MonoBehaviour: --- !u!4 &1098131449 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1098131446} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1946,9 +2069,10 @@ Transform: --- !u!1 &1113746190 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1113746191} - component: {fileID: 1113746193} @@ -1963,8 +2087,9 @@ GameObject: --- !u!224 &1113746191 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1113746190} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -1981,8 +2106,9 @@ RectTransform: --- !u!114 &1113746192 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1113746190} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2014,15 +2140,18 @@ MonoBehaviour: --- !u!222 &1113746193 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1113746190} + m_CullTransparentMesh: 0 --- !u!1 &1114387945 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1114387946} - component: {fileID: 1114387950} @@ -2038,8 +2167,9 @@ GameObject: --- !u!4 &1114387946 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1114387945} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2052,61 +2182,65 @@ Transform: --- !u!114 &1114387947 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1114387945} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 24d6d028a115b63498e516387b034068, type: 3} m_Name: m_EditorClassIdentifier: - voxelPrefab: {fileID: 1858495366900724, guid: 1b47cf94056d9d14f918731a659eff9b, - type: 2} - nodulePrefab: {fileID: 1447001498371202, guid: 73ff7c8e463a803468b53d92149b5eed, - type: 2} - cubeSizeInput: {fileID: 1019371025} - noduleOffset: 0.2 - cubeSize: 4 - nodules: [] - textures: [] + _cubeSizeInput: {fileID: 1019371025} + _noduleOffset: 0.2 + _nodulePrefab: {fileID: 1447001498371202, guid: 73ff7c8e463a803468b53d92149b5eed, + type: 3} + _textures: [] + _voxelPrefab: {fileID: 1858495366900724, guid: 1b47cf94056d9d14f918731a659eff9b, + type: 3} + CubeSize: 0 + Nodules: [] --- !u!114 &1114387948 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1114387945} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 987bf3435e12e7f4b8cf9460e2c733a6, type: 3} m_Name: m_EditorClassIdentifier: - VoxelHighlighter: {fileID: 347405215} - timeDisplay: {fileID: 1833866638} - movesDisplay: {fileID: 2052951257} - MPSDisplay: {fileID: 1113746192} - timerButtonText: {fileID: 449400621} - sliceToggle: {fileID: 1896405177} - amountCut: 0 - base64MoveEncode: + _sliceToggle: {fileID: 1896405177} + _timerButtonText: {fileID: 449400621} + _voxelHighlighter: {fileID: 347405215} + AmountCut: 0 + Base64MoveEncode: + MovesDisplay: {fileID: 2052951257} + MpsDisplay: {fileID: 1113746192} + TimeDisplay: {fileID: 1833866638} --- !u!114 &1114387950 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1114387945} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 52b53a205b9f51a43be8088bacd0ee59, type: 3} m_Name: m_EditorClassIdentifier: - mouseSensitivity: 1 - scrollWheelSensitivity: 50 + _mouseSensitivity: 1 + _scrollWheelSensitivity: 50 --- !u!1 &1120225737 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1120225738} - component: {fileID: 1120225741} @@ -2122,8 +2256,9 @@ GameObject: --- !u!4 &1120225738 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1120225737} m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: 0.8, y: 0.5, z: 0} @@ -2135,8 +2270,9 @@ Transform: --- !u!136 &1120225739 CapsuleCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1120225737} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -2148,8 +2284,9 @@ CapsuleCollider: --- !u!23 &1120225740 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1120225737} m_Enabled: 1 m_CastShadows: 1 @@ -2159,6 +2296,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: be6fce174d4a8a7448f01196b7bb93df, type: 2} m_StaticBatchInfo: @@ -2183,16 +2321,18 @@ MeshRenderer: --- !u!33 &1120225741 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1120225737} m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1166394406 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1166394407} - component: {fileID: 1166394409} @@ -2207,8 +2347,9 @@ GameObject: --- !u!224 &1166394407 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1166394406} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2225,8 +2366,9 @@ RectTransform: --- !u!114 &1166394408 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1166394406} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2249,18 +2391,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1166394409 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1166394406} + m_CullTransparentMesh: 0 --- !u!1 &1195483096 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1195483097} - component: {fileID: 1195483099} @@ -2275,8 +2421,9 @@ GameObject: --- !u!224 &1195483097 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1195483096} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2295,20 +2442,22 @@ RectTransform: --- !u!114 &1195483098 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1195483096} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: ae14794e4b9cdd941bf620b017ba389a, type: 3} m_Name: m_EditorClassIdentifier: - numberEnabled: 1 + NumberEnabled: 1 --- !u!114 &1195483099 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1195483096} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2363,9 +2512,10 @@ MonoBehaviour: --- !u!1 &1373506339 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1373506340} - component: {fileID: 1373506342} @@ -2380,8 +2530,9 @@ GameObject: --- !u!224 &1373506340 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1373506339} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2398,8 +2549,9 @@ RectTransform: --- !u!114 &1373506341 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1373506339} m_Enabled: 0 m_EditorHideFlags: 0 @@ -2431,15 +2583,18 @@ MonoBehaviour: --- !u!222 &1373506342 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1373506339} + m_CullTransparentMesh: 0 --- !u!1 &1382206521 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1382206522} - component: {fileID: 1382206524} @@ -2454,8 +2609,9 @@ GameObject: --- !u!224 &1382206522 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1382206521} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2475,8 +2631,9 @@ RectTransform: --- !u!114 &1382206523 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1382206521} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2499,18 +2656,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1382206524 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1382206521} + m_CullTransparentMesh: 0 --- !u!1 &1483598027 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1483598028} - component: {fileID: 1483598030} @@ -2525,8 +2686,9 @@ GameObject: --- !u!224 &1483598028 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1483598027} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2543,8 +2705,9 @@ RectTransform: --- !u!114 &1483598029 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1483598027} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2576,15 +2739,18 @@ MonoBehaviour: --- !u!222 &1483598030 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1483598027} + m_CullTransparentMesh: 0 --- !u!1 &1551487403 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1551487404} - component: {fileID: 1551487405} @@ -2599,8 +2765,9 @@ GameObject: --- !u!224 &1551487404 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1551487403} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2619,8 +2786,9 @@ RectTransform: --- !u!114 &1551487405 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1551487403} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2675,8 +2843,9 @@ MonoBehaviour: --- !u!114 &1551487406 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1551487403} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2686,9 +2855,10 @@ MonoBehaviour: --- !u!1 &1563078044 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1563078045} - component: {fileID: 1563078047} @@ -2703,8 +2873,9 @@ GameObject: --- !u!224 &1563078045 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1563078044} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2721,8 +2892,9 @@ RectTransform: --- !u!114 &1563078046 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1563078044} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2754,15 +2926,18 @@ MonoBehaviour: --- !u!222 &1563078047 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1563078044} + m_CullTransparentMesh: 0 --- !u!1 &1576558608 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1576558609} - component: {fileID: 1576558611} @@ -2777,8 +2952,9 @@ GameObject: --- !u!224 &1576558609 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1576558608} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2795,8 +2971,9 @@ RectTransform: --- !u!114 &1576558610 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1576558608} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2828,15 +3005,18 @@ MonoBehaviour: --- !u!222 &1576558611 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1576558608} + m_CullTransparentMesh: 0 --- !u!1 &1703125874 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1703125875} - component: {fileID: 1703125878} @@ -2852,8 +3032,9 @@ GameObject: --- !u!4 &1703125875 Transform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1703125874} m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} m_LocalPosition: {x: -0.8, y: 0.5, z: 0} @@ -2865,8 +3046,9 @@ Transform: --- !u!136 &1703125876 CapsuleCollider: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1703125874} m_Material: {fileID: 0} m_IsTrigger: 0 @@ -2878,8 +3060,9 @@ CapsuleCollider: --- !u!23 &1703125877 MeshRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1703125874} m_Enabled: 1 m_CastShadows: 1 @@ -2889,6 +3072,7 @@ MeshRenderer: m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 m_RenderingLayerMask: 4294967295 + m_RendererPriority: 0 m_Materials: - {fileID: 2100000, guid: be6fce174d4a8a7448f01196b7bb93df, type: 2} m_StaticBatchInfo: @@ -2913,16 +3097,18 @@ MeshRenderer: --- !u!33 &1703125878 MeshFilter: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1703125874} m_Mesh: {fileID: 10206, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1730922578 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1730922579} - component: {fileID: 1730922581} @@ -2937,8 +3123,9 @@ GameObject: --- !u!224 &1730922579 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1730922578} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -2955,8 +3142,9 @@ RectTransform: --- !u!114 &1730922580 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1730922578} m_Enabled: 1 m_EditorHideFlags: 0 @@ -2988,15 +3176,18 @@ MonoBehaviour: --- !u!222 &1730922581 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1730922578} + m_CullTransparentMesh: 0 --- !u!1 &1734698203 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1734698204} - component: {fileID: 1734698206} @@ -3011,8 +3202,9 @@ GameObject: --- !u!224 &1734698204 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1734698203} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3030,8 +3222,9 @@ RectTransform: --- !u!114 &1734698205 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1734698203} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3054,18 +3247,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1734698206 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1734698203} + m_CullTransparentMesh: 0 --- !u!1 &1747178639 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1747178640} - component: {fileID: 1747178642} @@ -3080,8 +3277,9 @@ GameObject: --- !u!224 &1747178640 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1747178639} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3098,8 +3296,9 @@ RectTransform: --- !u!114 &1747178641 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1747178639} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3122,18 +3321,22 @@ MonoBehaviour: m_FillAmount: 1 m_FillClockwise: 1 m_FillOrigin: 0 + m_UseSpriteMesh: 0 --- !u!222 &1747178642 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1747178639} + m_CullTransparentMesh: 0 --- !u!1 &1833866636 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1833866637} - component: {fileID: 1833866639} @@ -3148,8 +3351,9 @@ GameObject: --- !u!224 &1833866637 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1833866636} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3166,8 +3370,9 @@ RectTransform: --- !u!114 &1833866638 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1833866636} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3199,15 +3404,18 @@ MonoBehaviour: --- !u!222 &1833866639 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1833866636} + m_CullTransparentMesh: 0 --- !u!1 &1896405174 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 1896405175} - component: {fileID: 1896405177} @@ -3222,8 +3430,9 @@ GameObject: --- !u!224 &1896405175 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1896405174} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3242,20 +3451,22 @@ RectTransform: --- !u!114 &1896405176 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1896405174} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: ae14794e4b9cdd941bf620b017ba389a, type: 3} m_Name: m_EditorClassIdentifier: - numberEnabled: 1 + NumberEnabled: 1 --- !u!114 &1896405177 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1896405174} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3310,9 +3521,10 @@ MonoBehaviour: --- !u!1 &2052951255 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2052951256} - component: {fileID: 2052951258} @@ -3327,8 +3539,9 @@ GameObject: --- !u!224 &2052951256 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2052951255} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3345,8 +3558,9 @@ RectTransform: --- !u!114 &2052951257 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2052951255} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3378,15 +3592,18 @@ MonoBehaviour: --- !u!222 &2052951258 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2052951255} + m_CullTransparentMesh: 0 --- !u!1 &2099384730 GameObject: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} - serializedVersion: 5 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 m_Component: - component: {fileID: 2099384731} - component: {fileID: 2099384733} @@ -3401,8 +3618,9 @@ GameObject: --- !u!224 &2099384731 RectTransform: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2099384730} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} @@ -3419,8 +3637,9 @@ RectTransform: --- !u!114 &2099384732 MonoBehaviour: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2099384730} m_Enabled: 1 m_EditorHideFlags: 0 @@ -3452,6 +3671,8 @@ MonoBehaviour: --- !u!222 &2099384733 CanvasRenderer: m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2099384730} + m_CullTransparentMesh: 0 diff --git a/Assets/Scripts.meta b/Assets/Scripts.meta new file mode 100644 index 0000000..a50691b --- /dev/null +++ b/Assets/Scripts.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3acef111cc7f9ce4798487d29b7aa997 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/AlwaysFaceTowardsCamera.cs b/Assets/Scripts/AlwaysFaceTowardsCamera.cs new file mode 100644 index 0000000..865fd9f --- /dev/null +++ b/Assets/Scripts/AlwaysFaceTowardsCamera.cs @@ -0,0 +1,10 @@ +using UnityEngine; + +[ExecuteInEditMode] +public class AlwaysFaceTowardsCamera : MonoBehaviour +{ + private void Update() + { + transform.LookAt(Camera.main.transform, Vector3.up); + } +} \ No newline at end of file diff --git a/Assets/AlwaysFaceTowardsCamera.cs.meta b/Assets/Scripts/AlwaysFaceTowardsCamera.cs.meta similarity index 100% rename from Assets/AlwaysFaceTowardsCamera.cs.meta rename to Assets/Scripts/AlwaysFaceTowardsCamera.cs.meta diff --git a/Assets/Scripts/ChangeColorOnHover.cs b/Assets/Scripts/ChangeColorOnHover.cs new file mode 100644 index 0000000..75b4352 --- /dev/null +++ b/Assets/Scripts/ChangeColorOnHover.cs @@ -0,0 +1,45 @@ +using UnityEngine; + +public class ChangeColorOnHover : MonoBehaviour +{ + private Color _lerpToColor; + private Color _startColor; + public Color ToColor; + + // Use this for initialization + private void Start() + { + GetComponent().material = + new Material(GetComponent().material); + _startColor = GetComponent().material.GetColor("_Color"); + } + + // Update is called once per frame + private void Update() + { + RaycastHit hit; + var ray = Camera.main.ScreenPointToRay(Input.mousePosition); + + if (Physics.Raycast(ray, out hit)) + { + var hitId = hit.transform.gameObject.GetInstanceID(); + _lerpToColor = hitId == gameObject.GetInstanceID() + ? ToColor + : _startColor; + } + else + { + _lerpToColor = _startColor; + } + + GetComponent() + .material.SetColor( + "_Color", + Color.Lerp( + GetComponent().material.color, + _lerpToColor, + Time.deltaTime * 15 + ) + ); + } +} \ No newline at end of file diff --git a/Assets/ChangeColorOnHover.cs.meta b/Assets/Scripts/ChangeColorOnHover.cs.meta similarity index 100% rename from Assets/ChangeColorOnHover.cs.meta rename to Assets/Scripts/ChangeColorOnHover.cs.meta diff --git a/Assets/Scripts/CutOnClick.cs b/Assets/Scripts/CutOnClick.cs new file mode 100644 index 0000000..0da38ce --- /dev/null +++ b/Assets/Scripts/CutOnClick.cs @@ -0,0 +1,53 @@ +using UnityEngine; +using UnityEngine.Serialization; + +public class CutOnClick : MonoBehaviour +{ + [SerializeField] [FormerlySerializedAs("forward")] + // ReSharper disable once FieldCanBeMadeReadOnly.Local + private bool _forward = true; + + private VoxelMover _cube; + + private void Start() + { + _cube = FindObjectOfType(); + } + + private void Update() + { + RaycastHit hit; + var ray = Camera.main.ScreenPointToRay(Input.mousePosition); + + if (Physics.Raycast(ray, out hit)) + if (hit.transform.gameObject.GetInstanceID() == + gameObject.GetInstanceID() && + Input.GetMouseButtonDown(0)) + { + if (_forward) + { + var nodules = + GameObject.FindGameObjectsWithTag("Nodule"); + for (var n = 0; n < nodules.Length; n++) + if (nodules[n].GetInstanceID() != + transform.parent.parent.gameObject.GetInstanceID()) + nodules[n].SetActive(false); + + _cube.CutForward( + _cube.transform.InverseTransformDirection( + transform.forward + ) + ); + } + else + { + _cube.CutBackward( + _cube.transform.InverseTransformDirection( + -transform.forward + ), + true + ); + } + } + } +} \ No newline at end of file diff --git a/Assets/CutOnClick.cs.meta b/Assets/Scripts/CutOnClick.cs.meta similarity index 100% rename from Assets/CutOnClick.cs.meta rename to Assets/Scripts/CutOnClick.cs.meta diff --git a/Assets/Scripts/DisableTextOnInvisible.cs b/Assets/Scripts/DisableTextOnInvisible.cs new file mode 100644 index 0000000..d25f0d4 --- /dev/null +++ b/Assets/Scripts/DisableTextOnInvisible.cs @@ -0,0 +1,25 @@ +using UnityEngine; + +public class DisableTextOnInvisible : MonoBehaviour +{ + private VoxelSpawner _cube; + + private void Start() + { + _cube = FindObjectOfType(); + } + + private void Update() + { + var realPos = transform.parent.parent.localPosition - + new Vector3( + -(_cube.CubeSize / 2f) + 0.5f, + -(_cube.CubeSize / 2f) + 0.5f, + -(_cube.CubeSize / 2f) + 0.5f + ); + if (realPos.x * realPos.y * realPos.z == 0) + GetComponent().enabled = true; + else + GetComponent().enabled = false; + } +} \ No newline at end of file diff --git a/Assets/DisableTextOnInvisible.cs.meta b/Assets/Scripts/DisableTextOnInvisible.cs.meta similarity index 100% rename from Assets/DisableTextOnInvisible.cs.meta rename to Assets/Scripts/DisableTextOnInvisible.cs.meta diff --git a/Assets/Scripts/LerpToPos.cs b/Assets/Scripts/LerpToPos.cs new file mode 100644 index 0000000..301c331 --- /dev/null +++ b/Assets/Scripts/LerpToPos.cs @@ -0,0 +1,32 @@ +using UnityEngine; + +public class LerpToPos : MonoBehaviour +{ + private bool _lerping; + private float _lerpSpeed; + private Vector3 _newPos; + + private void Update() + { + if (_lerping) + transform.localPosition = Vector3.Lerp( + transform.localPosition, + _newPos, + Time.deltaTime * _lerpSpeed + ); + + if (Mathf.Abs(transform.localPosition.magnitude - _newPos.magnitude) < + 0.1f) + { + _lerping = false; + transform.localPosition = _newPos; + } + } + + public void MoveToPos(Vector3 pos, float speed) + { + _lerpSpeed = speed; + _newPos = pos; + _lerping = true; + } +} \ No newline at end of file diff --git a/Assets/LerpToPos.cs.meta b/Assets/Scripts/LerpToPos.cs.meta similarity index 100% rename from Assets/LerpToPos.cs.meta rename to Assets/Scripts/LerpToPos.cs.meta diff --git a/Assets/Scripts/NumberToggle.cs b/Assets/Scripts/NumberToggle.cs new file mode 100644 index 0000000..83c3e65 --- /dev/null +++ b/Assets/Scripts/NumberToggle.cs @@ -0,0 +1,34 @@ +using System.Collections.Generic; +using UnityEngine; + +public class NumberToggle : MonoBehaviour +{ + public bool NumberEnabled = true; + + public void ToggleNumbers() + { + NumberEnabled = !NumberEnabled; + if (NumberEnabled) + { + var voxels = FindObjectsOfType(); + new List(voxels).ForEach( + v => + { + v.ShowNumber = true; + v.Redraw(); + } + ); + } + else + { + var voxels = FindObjectsOfType(); + new List(voxels).ForEach( + v => + { + v.ShowNumber = false; + v.Redraw(); + } + ); + } + } +} \ No newline at end of file diff --git a/Assets/NumberToggle.cs.meta b/Assets/Scripts/NumberToggle.cs.meta similarity index 100% rename from Assets/NumberToggle.cs.meta rename to Assets/Scripts/NumberToggle.cs.meta diff --git a/Assets/Scripts/OutlineToggle.cs b/Assets/Scripts/OutlineToggle.cs new file mode 100644 index 0000000..258c8fd --- /dev/null +++ b/Assets/Scripts/OutlineToggle.cs @@ -0,0 +1,17 @@ +using UnityEngine; + +public class OutlineToggle : MonoBehaviour +{ + private bool _outlineEnabled = true; + + public void ToggleOutlines() + { + _outlineEnabled = !_outlineEnabled; + FindObjectOfType() + .GetComponent() + .sharedMaterial.SetFloat( + "_FirstOutlineWidth", + _outlineEnabled ? 0.02f : 0f + ); + } +} \ No newline at end of file diff --git a/Assets/OutlineToggle.cs.meta b/Assets/Scripts/OutlineToggle.cs.meta similarity index 100% rename from Assets/OutlineToggle.cs.meta rename to Assets/Scripts/OutlineToggle.cs.meta diff --git a/Assets/Scripts/RotateCube.cs b/Assets/Scripts/RotateCube.cs new file mode 100644 index 0000000..b52eb9f --- /dev/null +++ b/Assets/Scripts/RotateCube.cs @@ -0,0 +1,65 @@ +using UnityEngine; +using UnityEngine.Serialization; + +public class RotateCube : MonoBehaviour +{ + [SerializeField] + [FormerlySerializedAs("mouseSensitivity")] + // ReSharper disable once FieldCanBeMadeReadOnly.Local + private float _mouseSensitivity = 1f; + + [SerializeField] + [FormerlySerializedAs("scrollWheelSensitivity")] + // ReSharper disable once FieldCanBeMadeReadOnly.Local + private float _scrollWheelSensitivity = 1f; + + private VoxelSpawner _voxelSpawner; + private Vector3 _lastPos = Vector3.zero; + + private void Start() + { + _voxelSpawner = GetComponent(); + } + + + private void Update() + { + if (Input.GetMouseButtonDown(1)) _lastPos = Input.mousePosition; + + if (Input.GetMouseButton(1)) + { + var mouseOffset = Input.mousePosition - _lastPos; + transform.RotateAround( + Vector3.zero, + Vector3.right, + mouseOffset.y * _mouseSensitivity + ); + transform.RotateAround( + Vector3.zero, + Vector3.up, + -mouseOffset.x * _mouseSensitivity + ); + } + + if (Input.GetAxis("Mouse ScrollWheel") != 0) + transform.RotateAround( + Vector3.zero, + Vector3.forward, + Input.GetAxis("Mouse ScrollWheel") * _scrollWheelSensitivity + ); + + _lastPos = Input.mousePosition; + + for (int i = 0; i < 6; i++) + { + if (Input.GetKeyDown(KeyCode.Alpha1 + i)) + { + Vector3 vector = Vector3.zero; + vector[(i + 2) % 3] = i < 3 ? 1 : -1; + transform.forward = vector; + transform.position = Vector3.zero; + _voxelSpawner.CenterCube(); + } + } + } +} \ No newline at end of file diff --git a/Assets/RotateCube.cs.meta b/Assets/Scripts/RotateCube.cs.meta similarity index 100% rename from Assets/RotateCube.cs.meta rename to Assets/Scripts/RotateCube.cs.meta diff --git a/Assets/Scripts/SetVoxelProperties.cs b/Assets/Scripts/SetVoxelProperties.cs new file mode 100644 index 0000000..b402ab5 --- /dev/null +++ b/Assets/Scripts/SetVoxelProperties.cs @@ -0,0 +1,109 @@ +using UnityEngine; +using UnityEngine.Serialization; + +public class SetVoxelProperties : MonoBehaviour +{ + private Color _color = Color.black; + + [SerializeField] [FormerlySerializedAs("colorBrightness")] + // ReSharper disable once FieldCanBeMadeReadOnly.Local + private float _colorBrightness = 0.1f; + + private VoxelSpawner _cube; + private MaterialPropertyBlock _propBlock; + private Renderer _renderer; + + [HideInInspector] public int Number = 1; + [HideInInspector] public bool ShowNumber = true; + [HideInInspector] public bool Transparent = false; + + private void Awake() + { + ShowNumber = FindObjectOfType().NumberEnabled; + _cube = FindObjectOfType(); + _renderer = GetComponent(); + _propBlock = new MaterialPropertyBlock(); + } + + public void SetColor(Color newColor) + { + _color = newColor; + _propBlock.SetColor("_Color", _color); + _propBlock.SetColor("_EmissionColor", NumberToColor(Number)); + _propBlock.SetTexture( + "_MainTex", + Resources.Load(Number.ToString()) + ); + _renderer.SetPropertyBlock(_propBlock); + } + + public void SetNumber(int newNumber, bool doRedraw) + { + Number = newNumber; + if (!doRedraw) return; + _propBlock.SetColor("_Color", NumberToColor(newNumber)); + _propBlock.SetColor("_EmissionColor", NumberToColor(newNumber)); + _propBlock.SetColor("_FirstOutlineColor", OutlineColor()); + _propBlock.SetTexture( + "_MainTex", + ShowNumber + ? Resources.Load(Number.ToString()) + : Resources.Load("blank") + ); + + _renderer.SetPropertyBlock(_propBlock); + } + + public void DisplayNumber(int displayNumber) + { + _propBlock.SetColor("_Color", NumberToColor(Number)); + _propBlock.SetColor("_EmissionColor", NumberToColor(Number)); + _propBlock.SetColor("_FirstOutlineColor", OutlineColor()); + _propBlock.SetTexture( + "_MainTex", + Resources.Load(displayNumber.ToString()) + ); + _renderer.SetPropertyBlock(_propBlock); + } + + public void Redraw() + { + SetNumber(Number, true); + } + + private Color NumberToColor(int num) + { + var numVoxel = 0; + for (float xi = 0; xi < _cube.CubeSize; xi++) + for (float yi = 0; yi < _cube.CubeSize; yi++) + for (float zi = 0; zi < _cube.CubeSize; zi++) + { + numVoxel += 1; + if (num == numVoxel) + { + if (!Transparent) + return new Color( + xi / _cube.CubeSize + _colorBrightness, + yi / _cube.CubeSize + _colorBrightness, + zi / _cube.CubeSize + _colorBrightness, + 1f + ); + return new Color( + xi / _cube.CubeSize + _colorBrightness, + yi / _cube.CubeSize + _colorBrightness, + zi / _cube.CubeSize + _colorBrightness, + 0.025f + ); + } + } + + return Color.black; + } + + private Color OutlineColor() + { + return Transparent + ? new Color(0, 0, 0, 0) + : new Color(0, 0, 0, 1); + } +} \ No newline at end of file diff --git a/Assets/SetVoxelProperties.cs.meta b/Assets/Scripts/SetVoxelProperties.cs.meta similarity index 100% rename from Assets/SetVoxelProperties.cs.meta rename to Assets/Scripts/SetVoxelProperties.cs.meta diff --git a/Assets/Scripts/ShowCorrectNumber.cs b/Assets/Scripts/ShowCorrectNumber.cs new file mode 100644 index 0000000..9a322f1 --- /dev/null +++ b/Assets/Scripts/ShowCorrectNumber.cs @@ -0,0 +1,25 @@ +using UnityEngine; + +public class ShowCorrectNumber : MonoBehaviour +{ + private bool _showingNumber; + public int CorrectNumber; + + private void Update() + { + if (Input.GetKeyDown(KeyCode.E) && !Input.GetMouseButton(2) || + Input.GetMouseButtonDown(2) && + !Input.GetKey(KeyCode.E) && + !_showingNumber) + { + _showingNumber = true; + GetComponent().DisplayNumber(CorrectNumber); + } + + if (Input.GetKeyUp(KeyCode.E) || Input.GetMouseButtonUp(2)) + { + _showingNumber = false; + GetComponent().Redraw(); + } + } +} \ No newline at end of file diff --git a/Assets/ShowCorrectNumber.cs.meta b/Assets/Scripts/ShowCorrectNumber.cs.meta similarity index 100% rename from Assets/ShowCorrectNumber.cs.meta rename to Assets/Scripts/ShowCorrectNumber.cs.meta diff --git a/Assets/Scripts/VoxelMover.cs b/Assets/Scripts/VoxelMover.cs new file mode 100644 index 0000000..c983583 --- /dev/null +++ b/Assets/Scripts/VoxelMover.cs @@ -0,0 +1,479 @@ +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Serialization; +using UnityEngine.UI; + +public class VoxelMover : MonoBehaviour +{ + private readonly Vector3[] _directionArray = + { + new Vector3(1, 0, 0), + new Vector3(-1, 0, 0), + new Vector3(0, 1, 0), + new Vector3(0, -1, 0), + new Vector3(0, 0, 1), + new Vector3(0, 0, -1) + }; + + private bool _alternateSliceDir; + + private float _cubeSize; + + private bool _doTiming; + private Vector3 _highlightedVoxel; + private int _moves; + private Vector3 _newNorm; + + private Vector3 _newPos; + + [SerializeField] [FormerlySerializedAs("sliceToggle")] + // ReSharper disable once FieldCanBeMadeReadOnly.Local + private Toggle _sliceToggle = default(Toggle); + + private float _startTime; + + [SerializeField] [FormerlySerializedAs("timerButtonText")] + // ReSharper disable once FieldCanBeMadeReadOnly.Local + private Text _timerButtonText = default(Text); + + [SerializeField] [FormerlySerializedAs("VoxelHighlighter")] + // ReSharper disable once FieldCanBeMadeReadOnly.Local + private GameObject _voxelHighlighter = default(GameObject); + + private VoxelSpawner _vs; + + public int AmountCut; + + public string Base64MoveEncode = ""; + + [FormerlySerializedAs("movesDisplay")] + public Text MovesDisplay; + [FormerlySerializedAs("MPSDisplay")] + public Text MpsDisplay; + [FormerlySerializedAs("timeDisplay")] + public Text TimeDisplay; + + private void Start() + { + _vs = FindObjectOfType(); + } + + private void Update() + { + if (_doTiming) + { + TimeDisplay.text = "Time: " + (Time.time - _startTime); + MovesDisplay.text = "Moves: " + _moves; + MpsDisplay.text = + "MPS: " + _moves / (Time.time - _startTime); + } + + RaycastHit hit; + var ray = Camera.main.ScreenPointToRay(Input.mousePosition); + + if (Physics.Raycast(ray, out hit)) + { + if (hit.transform.tag == "Voxel") + { + _newPos = hit.transform.position; + _newNorm = hit.normal; + _highlightedVoxel = hit.transform.localPosition; + _voxelHighlighter.SetActive(true); + } + else + { + _voxelHighlighter.SetActive(false); + } + } + else + { + _voxelHighlighter.SetActive(false); + } + + if (Input.GetKeyDown(KeyCode.R)) + _alternateSliceDir = !_alternateSliceDir; + + if (_voxelHighlighter.activeSelf && Input.GetMouseButtonDown(0)) + { + _cubeSize = _vs.CubeSize; + for (var c = 0; c < transform.childCount; c++) + if (transform.GetChild(c).tag == "Moved") + { + Debug.Log("BREAK AVERTED"); + return; + } + + if (_doTiming == false) + { + Base64MoveEncode = Base64Encode((int) _cubeSize); + _timerButtonText.text = "Stop Timer"; + _startTime = Time.time; + _doTiming = true; + _moves = 0; + } + + var localNorm = transform.InverseTransformDirection(_newNorm); + _moves += 1; + + var tempReturn = true; + for (var d = 0; d < _directionArray.Length; d++) + if (-localNorm == _directionArray[d]) + tempReturn = false; + + if (tempReturn) + { + Debug.Log("WEIRD DIRECTION: " + -localNorm); + return; + } + + if (!_sliceToggle.isOn) + PushRow(_highlightedVoxel, -localNorm, true); + else + PushSlice(_highlightedVoxel, -localNorm); + + //Base64MoveEncoder + Base64MoveEncode += Base64Encode((int) _highlightedVoxel.x) + + Base64Encode((int) _highlightedVoxel.y) + + Base64Encode((int) _highlightedVoxel.z); + for (var i = 0; i < _directionArray.Length; i++) + if (_directionArray[i] == -localNorm) + Base64MoveEncode += Base64Encode(i); + + + var stopTimer = true; + for (var xi = 0; xi < _cubeSize; xi++) + for (var yi = 0; yi < _cubeSize; yi++) + for (var zi = 0; zi < _cubeSize; zi++) + if (_vs.VoxelArray[xi, yi, zi].Number != + _vs.CorrectNumberArray[xi, yi, zi]) + stopTimer = false; + + if (stopTimer) + { + Restart(); + _timerButtonText.text = "Cube Solved!"; + } + } + + //Hardcoded values uwu + if (!_sliceToggle.isOn) + { + _voxelHighlighter.transform.position = Vector3.Lerp( + _voxelHighlighter.transform.position, + _newPos, + Time.deltaTime * 30 + ); + _voxelHighlighter.transform.up = Vector3.Lerp( + _voxelHighlighter.transform.up, + _newNorm, + Time.deltaTime * 50 + ); + } + else + { + _voxelHighlighter.transform.position = Vector3.Lerp( + _voxelHighlighter.transform.position, + _newPos, + Time.deltaTime * 30 + ); + //VoxelHighlighter.transform.up = Vector3.Lerp(VoxelHighlighter.transform.up, newNorm, Time.deltaTime * 50); + + var localNorm = transform.InverseTransformDirection(_newNorm); + var highlightUp = Vector3.zero; + var highlightRight = Vector3.zero; + if (Mathf.RoundToInt(Vec3Abs(localNorm).x) == 1) + { + highlightUp = new Vector3(0, 1, 0); + highlightRight = new Vector3(0, 0, 1); + } + else if (Mathf.RoundToInt(Vec3Abs(localNorm).y) == 1) + { + highlightUp = new Vector3(0, 0, 1); + highlightRight = new Vector3(1, 0, 0); + } + else if (Mathf.RoundToInt(Vec3Abs(localNorm).z) == 1) + { + highlightUp = new Vector3(0, 1, 0); + highlightRight = new Vector3(1, 0, 0); + } + + if (!_alternateSliceDir) + _voxelHighlighter.transform.rotation = Quaternion.LookRotation( + Vector3.Lerp( + _voxelHighlighter.transform.forward, + transform.TransformDirection(highlightRight), + Time.deltaTime * 50 + ), + Vector3.Lerp( + _voxelHighlighter.transform.up, + _newNorm, + Time.deltaTime * 50 + ) + ); + else + _voxelHighlighter.transform.rotation = Quaternion.LookRotation( + Vector3.Lerp( + _voxelHighlighter.transform.forward, + transform.TransformDirection(highlightUp), + Time.deltaTime * 50 + ), + Vector3.Lerp( + _voxelHighlighter.transform.up, + _newNorm, + Time.deltaTime * 50 + ) + ); + } + } + + public void Restart() + { + _doTiming = false; + _moves = 0; + _timerButtonText.text = "Timer Stopped"; + } + + public void ToggleSliceMarkers() + { + _voxelHighlighter.transform.Find("SliceMarkers") + .gameObject.SetActive(_sliceToggle.isOn); + } + + public void CutForward(Vector3 dir) + { + _cubeSize = _vs.CubeSize; + if (AmountCut == (int) _cubeSize - 1) return; + + var objectsToDeactivate = + new List(); + for (var xi = 0; xi < _cubeSize; xi++) + for (var yi = 0; yi < _cubeSize; yi++) + for (var zi = 0; zi < _cubeSize; zi++) + { + SetVoxelProperties beforeVoxel; + try + { + beforeVoxel = _vs.VoxelArray[ + xi - Mathf.RoundToInt(dir.x), + yi - Mathf.RoundToInt(dir.y), + zi - Mathf.RoundToInt(dir.z)]; + } + catch + { + objectsToDeactivate.Add(_vs.VoxelArray[xi, yi, zi]); + continue; + } + + if (beforeVoxel.Transparent) + objectsToDeactivate.Add(_vs.VoxelArray[xi, yi, zi]); + } + + objectsToDeactivate.ForEach( + obj => + { + obj.transform.parent.GetComponent().enabled = false; + obj.Transparent = true; + obj.Redraw(); + } + ); + + AmountCut += 1; + } + + public void CutBackward(Vector3 dir, bool resetNodulesOnZero) + { + if (AmountCut == 0) return; + + + var objectsToActivate = new List(); + for (var xi = 0; xi < _cubeSize; xi++) + for (var yi = 0; yi < _cubeSize; yi++) + for (var zi = 0; zi < _cubeSize; zi++) + { + SetVoxelProperties beforeVoxel = null; + try + { + beforeVoxel = _vs.VoxelArray[xi + Mathf.RoundToInt(dir.x), + yi + Mathf.RoundToInt(dir.y), + zi + Mathf.RoundToInt(dir.z)]; + } + catch + { + continue; + } + + if (!beforeVoxel.Transparent) + objectsToActivate.Add(_vs.VoxelArray[xi, yi, zi]); + } + + objectsToActivate.ForEach( + obj => + { + obj.transform.parent.GetComponent().enabled = true; + obj.Transparent = false; + obj.Redraw(); + } + ); + + AmountCut -= 1; + + if (AmountCut == 0 && resetNodulesOnZero) + GetComponent() + .Nodules.ForEach(n => { n.SetActive(true); }); + } + + private void PushRow(Vector3 touched, Vector3 dir, bool fancy) + { + _cubeSize = _vs.CubeSize; + + for (var i = 0; i < _cubeSize + 1; i++) + if (FindVoxelByPos(touched - dir * i) == null) + { + touched = touched - dir * (i - 1); + break; + } + + var tempNumArray = new List(); + for (var i = 0; i < _cubeSize; i++) + { + var pos = touched + dir * i; + tempNumArray.Add( + _vs.VoxelArray[Mathf.RoundToInt(pos.x), + Mathf.RoundToInt(pos.y), + Mathf.RoundToInt(pos.z)] + .Number + ); + //Debug.Log(tempNumArray[tempNumArray.Count - 1]); + } + + for (var i = 0; i < _cubeSize; i++) + { + var pos = touched + dir * i; + if (i == 0) + _vs.VoxelArray[Mathf.RoundToInt(pos.x), + Mathf.RoundToInt(pos.y), + Mathf.RoundToInt(pos.z)] + .SetNumber(tempNumArray[tempNumArray.Count - 1], fancy); + else + _vs.VoxelArray[Mathf.RoundToInt(pos.x), + Mathf.RoundToInt(pos.y), + Mathf.RoundToInt(pos.z)] + .SetNumber(tempNumArray[i - 1], fancy); + } + + for (var c = 0; c < transform.childCount; c++) + if (transform.GetChild(c).tag == "Moved") + transform.GetChild(c).tag = "Voxel"; + } + + private void PushSlice(Vector3 touched, Vector3 dir) + { + //HACKY + var highlightUp = Vector3.zero; + var highlightRight = Vector3.zero; + if (Mathf.RoundToInt(Vec3Abs(dir).x) == 1) + { + highlightUp = new Vector3(0, 1, 0); + highlightRight = new Vector3(0, 0, 1); + } + else if (Mathf.RoundToInt(Vec3Abs(dir).y) == 1) + { + highlightUp = new Vector3(0, 0, 1); + highlightRight = new Vector3(1, 0, 0); + } + else if (Mathf.RoundToInt(Vec3Abs(dir).z) == 1) + { + highlightUp = new Vector3(0, 1, 0); + highlightRight = new Vector3(1, 0, 0); + } + + var sliceDir = Vector3.zero; + + if (!_alternateSliceDir) + sliceDir = highlightUp; + else + sliceDir = highlightRight; + + _cubeSize = _vs.CubeSize; + + for (var i = 0; i < _cubeSize + 1; i++) + if (FindVoxelByPos(_highlightedVoxel - sliceDir * i) == null) + { + _highlightedVoxel = _highlightedVoxel - sliceDir * (i - 1); + break; + } + + for (var i = 0; i < _cubeSize; i++) + PushRow(_highlightedVoxel + sliceDir * i, dir, true); + } + + private Vector3 FloorVec3ToInt(Vector3 inVec) + { + return new Vector3( + Mathf.FloorToInt(inVec.x), + Mathf.FloorToInt(inVec.y), + Mathf.FloorToInt(inVec.z) + ); + } + + private Vector3 Vec3Abs(Vector3 inVec) + { + return new Vector3( + Mathf.Abs(inVec.x), + Mathf.Abs(inVec.y), + Mathf.Abs(inVec.z) + ); + } + + private Transform FindVoxelByPos(Vector3 pos) + { + /*for (int c = 0; c < transform.childCount; c++) + { + if (transform.GetChild(c).transform.localPosition == pos && transform.GetChild(c).tag == "Voxel") + { + return transform.GetChild(c); + } + } + return null;*/ + + try + { + return _vs.VoxelArray[Mathf.RoundToInt(pos.x), + Mathf.RoundToInt(pos.y), + Mathf.RoundToInt(pos.z)] + .transform; + } + catch + { + return null; + } + } + + public void Scramble() + { + if (AmountCut != 0) return; + + for (var i = 0; i < 1000; i++) ScrambleOne(true); + } + + private void ScrambleOne(bool end) + { + var randVoxel = Random.Range(0, transform.childCount); + if (transform.GetChild(randVoxel).tag == "Voxel") + PushRow( + transform.GetChild(randVoxel).localPosition, + _directionArray[Random.Range( + 0, + _directionArray.Length - 1 + )], + end + ); + } + + public string Base64Encode(int num) + { + var base64Table = + "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; + return base64Table[num].ToString(); + } +} \ No newline at end of file diff --git a/Assets/VoxelMover.cs.meta b/Assets/Scripts/VoxelMover.cs.meta similarity index 100% rename from Assets/VoxelMover.cs.meta rename to Assets/Scripts/VoxelMover.cs.meta diff --git a/Assets/Scripts/VoxelSpawner.cs b/Assets/Scripts/VoxelSpawner.cs new file mode 100644 index 0000000..bd7196a --- /dev/null +++ b/Assets/Scripts/VoxelSpawner.cs @@ -0,0 +1,174 @@ +using System.Collections.Generic; +using UnityEngine; +using UnityEngine.Serialization; +using UnityEngine.UI; + +public class VoxelSpawner : MonoBehaviour +{ + [SerializeField] [FormerlySerializedAs("cubeSizeInput")] + // ReSharper disable once FieldCanBeMadeReadOnly.Local + private InputField _cubeSizeInput = null; + + [SerializeField] [FormerlySerializedAs("noduleOffset")] + // ReSharper disable once FieldCanBeMadeReadOnly.Local + private float _noduleOffset = 0.2f; + + [SerializeField] [FormerlySerializedAs("nodulePrefab")] + // ReSharper disable once FieldCanBeMadeReadOnly.Local + private GameObject _nodulePrefab = null; + + [SerializeField] [FormerlySerializedAs("textures")] + // ReSharper disable once FieldCanBeMadeReadOnly.Local + private Texture2D[] _textures; + + [SerializeField] [FormerlySerializedAs("voxelPrefab")] + // ReSharper disable once FieldCanBeMadeReadOnly.Local + private GameObject _voxelPrefab = null; + + public int CubeSize; + + public List Nodules; + + public SetVoxelProperties[,,] VoxelArray; + public int[,,] CorrectNumberArray { get; private set; } + + private void Start() + { + CubeSize = int.Parse(_cubeSizeInput.text); + + VoxelArray = new SetVoxelProperties[CubeSize, CubeSize, CubeSize]; + CorrectNumberArray = new int[CubeSize, CubeSize, CubeSize]; + + var numVoxel = 0; + for (var xi = 0; xi < CubeSize; xi++) + for (var yi = 0; yi < CubeSize; yi++) + for (var zi = 0; zi < CubeSize; zi++) + { + numVoxel += 1; + var tempVoxel = Instantiate( + _voxelPrefab, + new Vector3(xi, yi, zi), + Quaternion.identity, + transform + ); + tempVoxel.transform.localPosition = + tempVoxel.transform.localPosition; + VoxelArray[xi, yi, zi] = + tempVoxel.GetComponentInChildren(); + CorrectNumberArray[xi, yi, zi] = numVoxel; + + //Instanced colors + if (numVoxel <= 999) + { + tempVoxel.GetComponentInChildren() + .SetNumber(numVoxel, true); + tempVoxel.GetComponentInChildren() + .CorrectNumber = numVoxel; + } + } + + Nodules = new List(); + + Nodules.Add( + Instantiate( + _nodulePrefab, + new Vector3(0, -1 - _noduleOffset, 0), + Quaternion.identity, + transform + ) + ); + Nodules.Add( + Instantiate( + _nodulePrefab, + new Vector3(-1 - _noduleOffset, 0, 0), + Quaternion.Euler(0, 0, -90), + transform + ) + ); + Nodules.Add( + Instantiate( + _nodulePrefab, + new Vector3(0, 0, -1 - _noduleOffset), + Quaternion.Euler(90, 0, 0), + transform + ) + ); + + Nodules.Add( + Instantiate( + _nodulePrefab, + new Vector3( + CubeSize - 1, + CubeSize + _noduleOffset, + CubeSize - 1 + ), + Quaternion.Euler(180, 0, 0), + transform + ) + ); + Nodules.Add( + Instantiate( + _nodulePrefab, + new Vector3( + CubeSize + _noduleOffset, + CubeSize - 1, + CubeSize - 1 + ), + Quaternion.Euler(0, 0, 90), + transform + ) + ); + Nodules.Add( + Instantiate( + _nodulePrefab, + new Vector3( + CubeSize - 1, + CubeSize - 1, + CubeSize + _noduleOffset + ), + Quaternion.Euler(-90, 0, 0), + transform + ) + ); + + transform.localScale = new Vector3( + 1f / CubeSize * 2.5f, + 1f / CubeSize * 2.5f, + 1f / CubeSize * 2.5f + ); + CenterCube(); + GetComponent().Base64MoveEncode = ""; + } + + public void CenterCube() + { + var center = new GameObject(); + center.transform.parent = transform; + center.transform.localPosition = new Vector3( + CubeSize / 2f - 0.5f, + CubeSize / 2f - 0.5f, + CubeSize / 2f - 0.5f + ); + center.transform.parent = null; + transform.position = -center.transform.position; + Destroy(center); + } + + public void ResetCube() + { + GetComponent().TimeDisplay.text = "Time: 0"; + GetComponent().MovesDisplay.text = "Moves: 0"; + GetComponent().MpsDisplay.text = "MPS: 0"; + GetComponent().Restart(); + transform.localScale = Vector3.one; + transform.position = Vector3.zero; + transform.rotation = Quaternion.identity; + for (var c = 0; c < transform.childCount; c++) + if (transform.GetChild(c).tag == "Voxel" || + transform.GetChild(c).tag == "Nodule") + Destroy(transform.GetChild(c).gameObject); + + GetComponent().AmountCut = 0; + Start(); + } +} \ No newline at end of file diff --git a/Assets/VoxelSpawner.cs.meta b/Assets/Scripts/VoxelSpawner.cs.meta similarity index 100% rename from Assets/VoxelSpawner.cs.meta rename to Assets/Scripts/VoxelSpawner.cs.meta diff --git a/Assets/SetVoxelProperties.cs b/Assets/SetVoxelProperties.cs deleted file mode 100644 index 9ba8793..0000000 --- a/Assets/SetVoxelProperties.cs +++ /dev/null @@ -1,102 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class SetVoxelProperties : MonoBehaviour { - - VoxelSpawner cube; - MaterialPropertyBlock propBlock; - Renderer renderer; - public Color color = Color.black; - public int number = 1; - public bool transparent = false; - float colorBrightness = 0.1f; - public bool showNumber = true; - - void Awake() - { - showNumber = FindObjectOfType().numberEnabled; - cube = FindObjectOfType(); - renderer = GetComponent(); - propBlock = new MaterialPropertyBlock(); - } - - public void SetColor(Color newColor) - { - color = newColor; - propBlock.SetColor("_Color", color); - propBlock.SetColor("_EmissionColor", NumberToColor(number)); - propBlock.SetTexture("_MainTex", Resources.Load(number.ToString())); - renderer.SetPropertyBlock(propBlock); - } - - public void SetNumber(int newNumber, bool doRedraw) - { - number = newNumber; - if (doRedraw) - { - propBlock.SetColor("_Color", NumberToColor(newNumber)); - propBlock.SetColor("_EmissionColor", NumberToColor(newNumber)); - propBlock.SetColor("_FirstOutlineColor", OutlineColor()); - if (showNumber) - { - propBlock.SetTexture("_MainTex", Resources.Load(number.ToString())); - } else - { - propBlock.SetTexture("_MainTex", Resources.Load("blank")); - } - renderer.SetPropertyBlock(propBlock); - } - } - - public void ShowNumber(int displayNumber) - { - propBlock.SetColor("_Color", NumberToColor(number)); - propBlock.SetColor("_EmissionColor", NumberToColor(number)); - propBlock.SetColor("_FirstOutlineColor", OutlineColor()); - propBlock.SetTexture("_MainTex", Resources.Load(displayNumber.ToString())); - renderer.SetPropertyBlock(propBlock); - } - - public void Redraw() - { - SetNumber(number, true); - } - - Color NumberToColor(int num) - { - int numVoxel = 0; - for (float xi = 0; xi < cube.cubeSize; xi++) - { - for (float yi = 0; yi < cube.cubeSize; yi++) - { - for (float zi = 0; zi < cube.cubeSize; zi++) - { - numVoxel += 1; - if (num == numVoxel) - { - if (!transparent) - { - return new Color(xi / cube.cubeSize + colorBrightness, yi / cube.cubeSize + colorBrightness, zi / cube.cubeSize + colorBrightness, 1f); - } else - { - return new Color(xi / cube.cubeSize + colorBrightness, yi / cube.cubeSize + colorBrightness, zi / cube.cubeSize + colorBrightness, 0.025f); - } - } - } - } - } - return Color.black; - } - - Color OutlineColor() - { - if (transparent) - { - return new Color(0, 0, 0, 0); - } else - { - return new Color(0, 0, 0, 1); - } - } -} diff --git a/Assets/Shaders.meta b/Assets/Shaders.meta new file mode 100644 index 0000000..881c17a --- /dev/null +++ b/Assets/Shaders.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 50b04d7e31fb36b42bd35720cc6e54ec +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/3DText.shader b/Assets/Shaders/3DText.shader similarity index 100% rename from Assets/3DText.shader rename to Assets/Shaders/3DText.shader diff --git a/Assets/3DText.shader.meta b/Assets/Shaders/3DText.shader.meta similarity index 100% rename from Assets/3DText.shader.meta rename to Assets/Shaders/3DText.shader.meta diff --git a/Assets/UltimateOutline.shader b/Assets/Shaders/UltimateOutline.shader similarity index 100% rename from Assets/UltimateOutline.shader rename to Assets/Shaders/UltimateOutline.shader diff --git a/Assets/UltimateOutline.shader.meta b/Assets/Shaders/UltimateOutline.shader.meta similarity index 100% rename from Assets/UltimateOutline.shader.meta rename to Assets/Shaders/UltimateOutline.shader.meta diff --git a/Assets/UniformOutline.shader b/Assets/Shaders/UniformOutline.shader similarity index 100% rename from Assets/UniformOutline.shader rename to Assets/Shaders/UniformOutline.shader diff --git a/Assets/UniformOutline.shader.meta b/Assets/Shaders/UniformOutline.shader.meta similarity index 100% rename from Assets/UniformOutline.shader.meta rename to Assets/Shaders/UniformOutline.shader.meta diff --git a/Assets/VoxelShader.shader b/Assets/Shaders/VoxelShader.shader similarity index 100% rename from Assets/VoxelShader.shader rename to Assets/Shaders/VoxelShader.shader diff --git a/Assets/VoxelShader.shader.meta b/Assets/Shaders/VoxelShader.shader.meta similarity index 100% rename from Assets/VoxelShader.shader.meta rename to Assets/Shaders/VoxelShader.shader.meta diff --git a/Assets/ShowCorrectNumber.cs b/Assets/ShowCorrectNumber.cs deleted file mode 100644 index 2a90be6..0000000 --- a/Assets/ShowCorrectNumber.cs +++ /dev/null @@ -1,28 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; - -public class ShowCorrectNumber : MonoBehaviour { - - VoxelSpawner cube; - public int correctNumber; - bool showingNumber = false; - - void Start() - { - cube = FindObjectOfType(); - } - - void Update () { - if ((Input.GetKeyDown(KeyCode.E) && !Input.GetMouseButton(2)) || (Input.GetMouseButtonDown(2) && !Input.GetKey(KeyCode.E)) && !showingNumber) - { - showingNumber = true; - GetComponent().ShowNumber(correctNumber); - } - if (Input.GetKeyUp(KeyCode.E) || Input.GetMouseButtonUp(2)) - { - showingNumber = false; - GetComponent().Redraw(); - } - } -} diff --git a/Assets/VoxelMover.cs b/Assets/VoxelMover.cs deleted file mode 100644 index 7e5c536..0000000 --- a/Assets/VoxelMover.cs +++ /dev/null @@ -1,466 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; -using System; - -public class VoxelMover : MonoBehaviour { - - public GameObject VoxelHighlighter; - public Text timeDisplay; - public Text movesDisplay; - public Text MPSDisplay; - public Text timerButtonText; - float cubeSize; - - public Toggle sliceToggle; - bool alternateSliceDir = false; - - Vector3 newPos; - Vector3 newNorm; - Vector3 highlightedVoxel; - - bool doTiming = false; - float startTime = 0; - int moves = 0; - - public int amountCut = 0; - Vector3 currentCutDir = Vector3.zero; - - VoxelSpawner vs; - Vector3[] directionArray = new[] - { - new Vector3(1, 0, 0), - new Vector3(-1, 0, 0), - new Vector3(0, 1, 0), - new Vector3(0, -1, 0), - new Vector3(0, 0, 1), - new Vector3(0, 0, -1) - }; - - public string base64MoveEncode = ""; - - void Start() - { - vs = FindObjectOfType(); - } - - void Update () { - if (doTiming) - { - timeDisplay.text = "Time: " + (Time.time - startTime).ToString(); - movesDisplay.text = "Moves: " + (moves).ToString(); - MPSDisplay.text = "MPS: " + (moves/ (Time.time - startTime)).ToString(); - } - - RaycastHit hit; - Ray ray = Camera.main.ScreenPointToRay(Input.mousePosition); - - if (Physics.Raycast(ray, out hit)) { - if (hit.transform.tag == "Voxel") - { - newPos = hit.transform.position; - newNorm = hit.normal; - highlightedVoxel = hit.transform.localPosition; - VoxelHighlighter.SetActive(true); - } else - { - VoxelHighlighter.SetActive(false); - } - } else - { - VoxelHighlighter.SetActive(false); - } - - if (Input.GetKeyDown(KeyCode.R)) - { - alternateSliceDir = !alternateSliceDir; - } - - if (VoxelHighlighter.activeSelf && Input.GetMouseButtonDown(0)) - { - cubeSize = vs.cubeSize; - for (int c = 0; c < transform.childCount; c++) - { - if (transform.GetChild(c).tag == "Moved") - { - Debug.Log("BREAK AVERTED"); - return; - } - } - - if (doTiming == false) - { - base64MoveEncode = Base64Encode((int)cubeSize); - timerButtonText.text = "Stop Timer"; - startTime = Time.time; - doTiming = true; - moves = 0; - } - - Vector3 localNorm = transform.InverseTransformDirection(newNorm); - moves += 1; - - bool tempReturn = true; - for (int d = 0; d < directionArray.Length; d++) - { - if (-localNorm == directionArray[d]) - { - tempReturn = false; - } - } - if (tempReturn) - { - Debug.Log("WEIRD DIRECTION: " + -localNorm); - return; - } - - if (!sliceToggle.isOn) - { - PushRow(highlightedVoxel, -localNorm, true); - } else - { - PushSlice(highlightedVoxel, -localNorm); - } - - //Base64MoveEncoder - base64MoveEncode += Base64Encode((int)highlightedVoxel.x) + Base64Encode((int)highlightedVoxel.y) + Base64Encode((int)highlightedVoxel.z); - for (int i = 0; i < directionArray.Length; i++) - { - if (directionArray[i] == -localNorm) - { - base64MoveEncode += Base64Encode(i); - } - } - - - bool stopTimer = true; - for (int xi = 0; xi < cubeSize; xi++) - { - for (int yi = 0; yi < cubeSize; yi++) - { - for (int zi = 0; zi < cubeSize; zi++) - { - if (vs.voxelArray[xi, yi, zi].number != vs.correctNumberArray[xi, yi, zi]) - { - stopTimer = false; - } - } - } - } - if (stopTimer) - { - Restart(); - timerButtonText.text = "Cube Solved!"; - } - } - - //Hardcoded values uwu - if (!sliceToggle.isOn) - { - VoxelHighlighter.transform.position = Vector3.Lerp(VoxelHighlighter.transform.position, newPos, Time.deltaTime * 30); - VoxelHighlighter.transform.up = Vector3.Lerp(VoxelHighlighter.transform.up, newNorm, Time.deltaTime * 50); - } else - { - VoxelHighlighter.transform.position = Vector3.Lerp(VoxelHighlighter.transform.position, newPos, Time.deltaTime * 30); - //VoxelHighlighter.transform.up = Vector3.Lerp(VoxelHighlighter.transform.up, newNorm, Time.deltaTime * 50); - - Vector3 localNorm = transform.InverseTransformDirection(newNorm); - Vector3 highlightUp = Vector3.zero; - Vector3 highlightRight = Vector3.zero; - if (Mathf.RoundToInt(vec3Abs(localNorm).x) == 1) - { - highlightUp = new Vector3(0, 1, 0); - highlightRight = new Vector3(0, 0, 1); - } - else if (Mathf.RoundToInt(vec3Abs(localNorm).y) == 1) - { - highlightUp = new Vector3(0, 0, 1); - highlightRight = new Vector3(1, 0, 0); - } - else if (Mathf.RoundToInt(vec3Abs(localNorm).z) == 1) - { - highlightUp = new Vector3(0, 1, 0); - highlightRight = new Vector3(1, 0, 0); - } - - if (!alternateSliceDir) - { - VoxelHighlighter.transform.rotation = Quaternion.LookRotation( - Vector3.Lerp(VoxelHighlighter.transform.forward, transform.TransformDirection(highlightRight), Time.deltaTime * 50), - Vector3.Lerp(VoxelHighlighter.transform.up, newNorm, Time.deltaTime * 50)); - } else - { - VoxelHighlighter.transform.rotation = Quaternion.LookRotation( - Vector3.Lerp(VoxelHighlighter.transform.forward, transform.TransformDirection(highlightUp), Time.deltaTime * 50), - Vector3.Lerp(VoxelHighlighter.transform.up, newNorm, Time.deltaTime * 50)); - } - - } - } - - public void Restart() - { - doTiming = false; - moves = 0; - timerButtonText.text = "Timer Stopped"; - } - - public void ToggleSliceMarkers() - { - if (sliceToggle.isOn) - { - VoxelHighlighter.transform.Find("SliceMarkers").gameObject.SetActive(true); - } else - { - VoxelHighlighter.transform.Find("SliceMarkers").gameObject.SetActive(false); - } - } - - public void CutForward(Vector3 dir) - { - currentCutDir = dir; - cubeSize = vs.cubeSize; - if (amountCut == ((int)cubeSize - 1)) - { - return; - } - - List objectsToDeactivate = new List(); - for (int xi = 0; xi < cubeSize; xi++) - { - for (int yi = 0; yi < cubeSize; yi++) - { - for (int zi = 0; zi < cubeSize; zi++) - { - SetVoxelProperties beforeVoxel = null; - try - { - beforeVoxel = vs.voxelArray[xi - Mathf.RoundToInt(dir.x), yi - Mathf.RoundToInt(dir.y), zi - Mathf.RoundToInt(dir.z)]; - } - catch - { - objectsToDeactivate.Add(vs.voxelArray[xi, yi, zi]); - continue; - } - - if (beforeVoxel.transparent) - { - objectsToDeactivate.Add(vs.voxelArray[xi, yi, zi]); - } - } - } - } - objectsToDeactivate.ForEach((Obj) => - { - Obj.transform.parent.GetComponent().enabled = false; - Obj.transparent = true; - Obj.Redraw(); - }); - - amountCut += 1; - } - - public void CutBackward(Vector3 dir, bool resetNodulesOnZero) - { - if (amountCut == 0) - { - return; - } - - - List objectsToActivate = new List(); - for (int xi = 0; xi < cubeSize; xi++) - { - for (int yi = 0; yi < cubeSize; yi++) - { - for (int zi = 0; zi < cubeSize; zi++) - { - SetVoxelProperties beforeVoxel = null; - try - { - beforeVoxel = vs.voxelArray[xi + Mathf.RoundToInt(dir.x), yi + Mathf.RoundToInt(dir.y), zi + Mathf.RoundToInt(dir.z)]; - } catch - { - continue; - } - - if (!beforeVoxel.transparent) - { - objectsToActivate.Add(vs.voxelArray[xi, yi, zi]); - } - } - } - } - objectsToActivate.ForEach((Obj) => - { - Obj.transform.parent.GetComponent().enabled = true; - Obj.transparent = false; - Obj.Redraw(); - }); - - amountCut -= 1; - - if (amountCut == 0 && resetNodulesOnZero) - { - GetComponent().nodules.ForEach((n) => - { - n.SetActive(true); - }); - } - } - - void PushRow(Vector3 touched, Vector3 dir, bool fancy) - { - cubeSize = vs.cubeSize; - - for (int i = 0; i < cubeSize + 1; i++) - { - if (FindVoxelByPos(touched - (dir * i)) == null) - { - touched = touched - (dir * (i - 1)); - break; - } - } - - List tempNumArray = new List(); - for (int i = 0; i < cubeSize; i++) - { - Vector3 pos = (touched + (dir * i)); - tempNumArray.Add(vs.voxelArray[Mathf.RoundToInt(pos.x), Mathf.RoundToInt(pos.y), Mathf.RoundToInt(pos.z)].number); - //Debug.Log(tempNumArray[tempNumArray.Count - 1]); - } - for (int i = 0; i < cubeSize; i++) - { - Vector3 pos = (touched + (dir * i)); - if (i == 0) - { - vs.voxelArray[Mathf.RoundToInt(pos.x), Mathf.RoundToInt(pos.y), Mathf.RoundToInt(pos.z)].SetNumber(tempNumArray[tempNumArray.Count-1], fancy); - } else - { - vs.voxelArray[Mathf.RoundToInt(pos.x), Mathf.RoundToInt(pos.y), Mathf.RoundToInt(pos.z)].SetNumber(tempNumArray[i-1], fancy); - } - } - - for (int c = 0; c < transform.childCount; c++) - { - if (transform.GetChild(c).tag == "Moved") - { - transform.GetChild(c).tag = "Voxel"; - } - } - } - - void PushSlice(Vector3 touched, Vector3 dir) - { - //HACKY - Vector3 highlightUp = Vector3.zero; - Vector3 highlightRight = Vector3.zero; - if (Mathf.RoundToInt(vec3Abs(dir).x) == 1) - { - highlightUp = new Vector3(0, 1, 0); - highlightRight = new Vector3(0, 0, 1); - } - else if (Mathf.RoundToInt(vec3Abs(dir).y) == 1) - { - highlightUp = new Vector3(0, 0, 1); - highlightRight = new Vector3(1, 0, 0); - } - else if (Mathf.RoundToInt(vec3Abs(dir).z) == 1) - { - highlightUp = new Vector3(0, 1, 0); - highlightRight = new Vector3(1, 0, 0); - } - - Vector3 sliceDir = Vector3.zero; - - if (!alternateSliceDir) - { - sliceDir = highlightUp; - } - else - { - sliceDir = highlightRight; - } - - cubeSize = vs.cubeSize; - - for (int i = 0; i < cubeSize + 1; i++) - { - if (FindVoxelByPos(highlightedVoxel - (sliceDir * i)) == null) - { - highlightedVoxel = highlightedVoxel - (sliceDir * (i - 1)); - break; - } - } - - for (int i = 0; i < cubeSize; i++) - { - PushRow(highlightedVoxel + sliceDir * i, dir, true); - } - } - - Vector3 floorVec3ToInt(Vector3 in_vec) - { - return new Vector3(Mathf.FloorToInt(in_vec.x), Mathf.FloorToInt(in_vec.y), Mathf.FloorToInt(in_vec.z)); - } - - Vector3 vec3Abs(Vector3 in_vec) - { - return new Vector3(Mathf.Abs(in_vec.x), Mathf.Abs(in_vec.y), Mathf.Abs(in_vec.z)); - } - - Transform FindVoxelByPos(Vector3 pos) - { - /*for (int c = 0; c < transform.childCount; c++) - { - if (transform.GetChild(c).transform.localPosition == pos && transform.GetChild(c).tag == "Voxel") - { - return transform.GetChild(c); - } - } - return null;*/ - - try - { - return vs.voxelArray[Mathf.RoundToInt(pos.x), Mathf.RoundToInt(pos.y), Mathf.RoundToInt(pos.z)].transform; - } catch - { - return null; - } - } - - public void Scramble() - { - if (amountCut != 0) - { - return; - } - - for (int i = 0; i < 1000; i++) - { - ScrambleOne(true); - } - } - - void ScrambleOne(bool end) - { - int randVoxel = UnityEngine.Random.Range(0, transform.childCount); - if (transform.GetChild(randVoxel).tag == "Voxel") - { - //if (!sliceToggle.isOn) - //{ - PushRow(transform.GetChild(randVoxel).localPosition, directionArray[UnityEngine.Random.Range(0, directionArray.Length - 1)], end); - //} else - //{ - // PushSlice(transform.GetChild(randVoxel).localPosition, directionArray[UnityEngine.Random.Range(0, directionArray.Length - 1)]); - //} - } - } - - public string Base64Encode(int num) - { - string base64Table = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/"; - return base64Table[num].ToString(); - } -} diff --git a/Assets/VoxelSpawner.cs b/Assets/VoxelSpawner.cs deleted file mode 100644 index 0e1f5be..0000000 --- a/Assets/VoxelSpawner.cs +++ /dev/null @@ -1,109 +0,0 @@ -using System.Collections; -using System.Collections.Generic; -using UnityEngine; -using UnityEngine.UI; - -public class VoxelSpawner : MonoBehaviour { - - public GameObject voxelPrefab; - public GameObject nodulePrefab; - public InputField cubeSizeInput; - - public float noduleOffset = 0.2f; - - //Why is this a float ??? - public float cubeSize; - - public List nodules; - - public Texture2D[] textures; - - public SetVoxelProperties[,,] voxelArray; - public int[,,] correctNumberArray; - - void Start () - { - //QualitySettings.vSyncCount = 0; // VSync must be disabled - //Application.targetFrameRate = 20; - - cubeSize = int.Parse(cubeSizeInput.text); - - voxelArray = new SetVoxelProperties[(int)cubeSize, (int)cubeSize, (int)cubeSize]; - correctNumberArray = new int[(int)cubeSize, (int)cubeSize, (int)cubeSize]; - - int numVoxel = 0; - for (float xi = 0; xi < cubeSize; xi++) - { - for (float yi = 0; yi < cubeSize; yi++) - { - for (float zi = 0; zi < cubeSize; zi++) - { - numVoxel += 1; - GameObject tempVoxel = Instantiate(voxelPrefab, new Vector3(xi, yi, zi), Quaternion.identity, transform); - tempVoxel.transform.localPosition = tempVoxel.transform.localPosition; - voxelArray[(int)xi, (int)yi, (int)zi] = tempVoxel.GetComponentInChildren(); - correctNumberArray[(int)xi, (int)yi, (int)zi] = numVoxel; - - //Instanced colors - if (numVoxel <= 999) - { - tempVoxel.GetComponentInChildren().SetNumber(numVoxel, true); - tempVoxel.GetComponentInChildren().correctNumber = numVoxel; - } - //tempVoxel.GetComponentInChildren().SetColor(new Color(xi / cubeSize + 0.1f, yi / cubeSize + 0.1f, zi / cubeSize + 0.1f, 1f)); - //renderer.material = new Material(renderer.material); - //renderer.material.color = new Color(xi / cubeSize, yi / cubeSize, zi / cubeSize); - - //tempVoxel.GetComponentInChildren().actualNumber = numVoxel; - //tempVoxel.GetComponentInChildren().actualColor = new Color(xi / cubeSize + 0.1f, yi / cubeSize + 0.1f, zi / cubeSize + 0.1f); - } - } - } - - nodules = new List(); - - nodules.Add((GameObject)Instantiate(nodulePrefab, new Vector3(0, -1 - noduleOffset, 0), Quaternion.identity, transform)); - nodules.Add((GameObject)Instantiate(nodulePrefab, new Vector3(-1 - noduleOffset, 0, 0), Quaternion.Euler(0,0,-90), transform)); - nodules.Add((GameObject)Instantiate(nodulePrefab, new Vector3(0, 0, -1 - noduleOffset), Quaternion.Euler(90, 0, 0), transform)); - - nodules.Add((GameObject)Instantiate(nodulePrefab, new Vector3(cubeSize - 1, cubeSize + noduleOffset, cubeSize - 1), Quaternion.Euler(180, 0, 0), transform)); - nodules.Add((GameObject)Instantiate(nodulePrefab, new Vector3(cubeSize + noduleOffset, cubeSize - 1, cubeSize - 1), Quaternion.Euler(0, 0, 90), transform)); - nodules.Add((GameObject)Instantiate(nodulePrefab, new Vector3(cubeSize - 1, cubeSize - 1, cubeSize + noduleOffset), Quaternion.Euler(-90, 0, 0), transform)); - - //transform.position = new Vector3(-1f, -1f, -1f); - transform.localScale = new Vector3((1 / cubeSize) * 2.5f, (1 / cubeSize) * 2.5f, (1 / cubeSize) * 2.5f); - GameObject center = new GameObject(); - center.transform.parent = transform; - center.transform.localPosition = new Vector3(cubeSize / 2 - 0.5f, cubeSize / 2 - 0.5f, cubeSize / 2 - 0.5f); - center.transform.parent = null; - transform.position = -center.transform.position; - Destroy(center); - //transform.parent = center.transform; - //center.transform.position = Vector3.zero; - //transform.parent = null; - //Destroy(center); - - GetComponent().base64MoveEncode = ""; - } - - public void ResetCube() - { - GetComponent().timeDisplay.text = "Time: 0"; - GetComponent().movesDisplay.text = "Moves: 0"; - GetComponent().MPSDisplay.text = "MPS: 0"; - GetComponent().Restart(); - transform.localScale = Vector3.one; - transform.position = Vector3.zero; - transform.rotation = Quaternion.identity; - for (int c = 0; c < transform.childCount; c++) - { - if (transform.GetChild(c).tag == "Voxel" || transform.GetChild(c).tag == "Nodule") - { - Destroy(transform.GetChild(c).gameObject); - } - } - GetComponent().amountCut = 0; - Start(); - } - -} diff --git a/Packages/manifest.json b/Packages/manifest.json index 526aca6..16819bf 100644 --- a/Packages/manifest.json +++ b/Packages/manifest.json @@ -1,4 +1,40 @@ { - "dependencies": { - } + "dependencies": { + "com.unity.ads": "2.3.1", + "com.unity.analytics": "3.2.2", + "com.unity.collab-proxy": "1.2.15", + "com.unity.package-manager-ui": "2.0.3", + "com.unity.purchasing": "2.0.3", + "com.unity.textmeshpro": "1.3.0", + "com.unity.modules.ai": "1.0.0", + "com.unity.modules.animation": "1.0.0", + "com.unity.modules.assetbundle": "1.0.0", + "com.unity.modules.audio": "1.0.0", + "com.unity.modules.cloth": "1.0.0", + "com.unity.modules.director": "1.0.0", + "com.unity.modules.imageconversion": "1.0.0", + "com.unity.modules.imgui": "1.0.0", + "com.unity.modules.jsonserialize": "1.0.0", + "com.unity.modules.particlesystem": "1.0.0", + "com.unity.modules.physics": "1.0.0", + "com.unity.modules.physics2d": "1.0.0", + "com.unity.modules.screencapture": "1.0.0", + "com.unity.modules.terrain": "1.0.0", + "com.unity.modules.terrainphysics": "1.0.0", + "com.unity.modules.tilemap": "1.0.0", + "com.unity.modules.ui": "1.0.0", + "com.unity.modules.uielements": "1.0.0", + "com.unity.modules.umbra": "1.0.0", + "com.unity.modules.unityanalytics": "1.0.0", + "com.unity.modules.unitywebrequest": "1.0.0", + "com.unity.modules.unitywebrequestassetbundle": "1.0.0", + "com.unity.modules.unitywebrequestaudio": "1.0.0", + "com.unity.modules.unitywebrequesttexture": "1.0.0", + "com.unity.modules.unitywebrequestwww": "1.0.0", + "com.unity.modules.vehicles": "1.0.0", + "com.unity.modules.video": "1.0.0", + "com.unity.modules.vr": "1.0.0", + "com.unity.modules.wind": "1.0.0", + "com.unity.modules.xr": "1.0.0" + } } diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 454c57f..ca32b1e 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1 +1 @@ -m_EditorVersion: 2018.1.5f1 +m_EditorVersion: 2018.3.0f2 diff --git a/ProjectSettings/VFXManager.asset b/ProjectSettings/VFXManager.asset new file mode 100644 index 0000000..6e0eaca --- /dev/null +++ b/ProjectSettings/VFXManager.asset @@ -0,0 +1,11 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!937362698 &1 +VFXManager: + m_ObjectHideFlags: 0 + m_IndirectShader: {fileID: 0} + m_CopyBufferShader: {fileID: 0} + m_SortShader: {fileID: 0} + m_RenderPipeSettingsPath: + m_FixedTimeStep: 0.016666668 + m_MaxDeltaTime: 0.05