diff --git a/BlueProject/Assets/Prefabs/SpaceItemA.prefab b/BlueProject/Assets/Prefabs/SpaceItemA.prefab index 7d9f72d..2aac79e 100644 --- a/BlueProject/Assets/Prefabs/SpaceItemA.prefab +++ b/BlueProject/Assets/Prefabs/SpaceItemA.prefab @@ -112,7 +112,7 @@ CircleCollider2D: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4769528128065914491} - m_Enabled: 1 + m_Enabled: 0 m_Density: 1 m_Material: {fileID: 6200000, guid: 7d43485d2e4cb5b45a5f4ffe72b2c3f1, type: 2} m_IsTrigger: 0 diff --git a/BlueProject/Assets/Scenes/LevelTrial.unity b/BlueProject/Assets/Scenes/Level-1.unity similarity index 97% rename from BlueProject/Assets/Scenes/LevelTrial.unity rename to BlueProject/Assets/Scenes/Level-1.unity index 4db48ef..58e4d51 100644 --- a/BlueProject/Assets/Scenes/LevelTrial.unity +++ b/BlueProject/Assets/Scenes/Level-1.unity @@ -171,7 +171,7 @@ PrefabInstance: - target: {fileID: 2572951684259581624, guid: 2a6a083bb264016429f87613d81246a7, type: 3} propertyPath: m_RootOrder - value: 20 + value: 21 objectReference: {fileID: 0} - target: {fileID: 2572951684259581624, guid: 2a6a083bb264016429f87613d81246a7, type: 3} @@ -390,7 +390,7 @@ PrefabInstance: - target: {fileID: 2572951684259581624, guid: 2a6a083bb264016429f87613d81246a7, type: 3} propertyPath: m_RootOrder - value: 12 + value: 13 objectReference: {fileID: 0} - target: {fileID: 2572951684259581624, guid: 2a6a083bb264016429f87613d81246a7, type: 3} @@ -1348,7 +1348,7 @@ PrefabInstance: - target: {fileID: 2572951684259581624, guid: 2a6a083bb264016429f87613d81246a7, type: 3} propertyPath: m_RootOrder - value: 16 + value: 17 objectReference: {fileID: 0} - target: {fileID: 2572951684259581624, guid: 2a6a083bb264016429f87613d81246a7, type: 3} @@ -1604,7 +1604,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1035935654 MonoBehaviour: @@ -1718,7 +1718,7 @@ PrefabInstance: - target: {fileID: 2572951684259581624, guid: 2a6a083bb264016429f87613d81246a7, type: 3} propertyPath: m_RootOrder - value: 15 + value: 16 objectReference: {fileID: 0} - target: {fileID: 2572951684259581624, guid: 2a6a083bb264016429f87613d81246a7, type: 3} @@ -1855,7 +1855,7 @@ RectTransform: - {fileID: 1329468124} - {fileID: 109905698} m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -2345,7 +2345,7 @@ PrefabInstance: - target: {fileID: 2572951684259581624, guid: 2a6a083bb264016429f87613d81246a7, type: 3} propertyPath: m_RootOrder - value: 19 + value: 20 objectReference: {fileID: 0} - target: {fileID: 2572951684259581624, guid: 2a6a083bb264016429f87613d81246a7, type: 3} @@ -2530,7 +2530,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1329468123 GameObject: @@ -2711,7 +2711,7 @@ PrefabInstance: - target: {fileID: 2572951684259581624, guid: 2a6a083bb264016429f87613d81246a7, type: 3} propertyPath: m_RootOrder - value: 17 + value: 18 objectReference: {fileID: 0} - target: {fileID: 2572951684259581624, guid: 2a6a083bb264016429f87613d81246a7, type: 3} @@ -2805,6 +2805,110 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 2a6a083bb264016429f87613d81246a7, type: 3} +--- !u!1001 &1449493648 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 5246412285089308566, guid: 429dee1e540ab894ab56eb6081685fe5, + type: 3} + propertyPath: m_Name + value: Level-1 + objectReference: {fileID: 0} + - target: {fileID: 7056294548544119183, guid: 429dee1e540ab894ab56eb6081685fe5, + type: 3} + propertyPath: m_LocalPosition.x + value: 0.67 + objectReference: {fileID: 0} + - target: {fileID: 7056294548544119183, guid: 429dee1e540ab894ab56eb6081685fe5, + type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7056294548544119183, guid: 429dee1e540ab894ab56eb6081685fe5, + type: 3} + propertyPath: m_LocalPosition.z + value: -1.53 + objectReference: {fileID: 0} + - target: {fileID: 7056294548544119183, guid: 429dee1e540ab894ab56eb6081685fe5, + type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7056294548544119183, guid: 429dee1e540ab894ab56eb6081685fe5, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7056294548544119183, guid: 429dee1e540ab894ab56eb6081685fe5, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7056294548544119183, guid: 429dee1e540ab894ab56eb6081685fe5, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7056294548544119183, guid: 429dee1e540ab894ab56eb6081685fe5, + type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 7056294548544119183, guid: 429dee1e540ab894ab56eb6081685fe5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7056294548544119183, guid: 429dee1e540ab894ab56eb6081685fe5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7056294548544119183, guid: 429dee1e540ab894ab56eb6081685fe5, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7056294548544119183, guid: 429dee1e540ab894ab56eb6081685fe5, + type: 3} + propertyPath: m_LocalScale.x + value: 4.2446 + objectReference: {fileID: 0} + - target: {fileID: 7056294548544119183, guid: 429dee1e540ab894ab56eb6081685fe5, + type: 3} + propertyPath: m_LocalScale.y + value: 4.2446 + objectReference: {fileID: 0} + - target: {fileID: 7056294548544119183, guid: 429dee1e540ab894ab56eb6081685fe5, + type: 3} + propertyPath: m_LocalScale.z + value: 4.2446 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 429dee1e540ab894ab56eb6081685fe5, type: 3} +--- !u!1 &1449493649 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 5246412285089308566, guid: 429dee1e540ab894ab56eb6081685fe5, + type: 3} + m_PrefabInstance: {fileID: 1449493648} + m_PrefabAsset: {fileID: 0} +--- !u!114 &1449493650 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1449493649} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 66b084f2218a27d4aa15e22c461d89c3, type: 3} + m_Name: + m_EditorClassIdentifier: + scrollSpeed: 1 + tileSizeX: 1000 --- !u!1 &1472139548 GameObject: m_ObjectHideFlags: 0 @@ -2901,7 +3005,7 @@ RectTransform: - {fileID: 1226196454} - {fileID: 594368995} m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -3580,7 +3684,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1712633912 GameObject: @@ -3676,7 +3780,7 @@ RectTransform: - {fileID: 1861119885} - {fileID: 682083999} m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} m_AnchorMax: {x: 0, y: 0} @@ -4504,7 +4608,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &1893441551 PrefabInstance: @@ -4556,7 +4660,7 @@ PrefabInstance: - target: {fileID: 2572951684259581624, guid: 2a6a083bb264016429f87613d81246a7, type: 3} propertyPath: m_RootOrder - value: 18 + value: 19 objectReference: {fileID: 0} - target: {fileID: 2572951684259581624, guid: 2a6a083bb264016429f87613d81246a7, type: 3} @@ -4870,7 +4974,7 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2024927732 GameObject: @@ -4999,7 +5103,7 @@ PrefabInstance: - target: {fileID: 2572951684259581624, guid: 2a6a083bb264016429f87613d81246a7, type: 3} propertyPath: m_RootOrder - value: 14 + value: 15 objectReference: {fileID: 0} - target: {fileID: 2572951684259581624, guid: 2a6a083bb264016429f87613d81246a7, type: 3} @@ -5181,7 +5285,7 @@ PrefabInstance: - target: {fileID: 6939805325973547318, guid: d35fef751347b644e82e15e9d2a9427b, type: 3} propertyPath: m_RootOrder - value: 10 + value: 11 objectReference: {fileID: 0} - target: {fileID: 6939805325973547318, guid: d35fef751347b644e82e15e9d2a9427b, type: 3} @@ -5281,7 +5385,7 @@ PrefabInstance: - target: {fileID: 2572951684259581624, guid: 2a6a083bb264016429f87613d81246a7, type: 3} propertyPath: m_RootOrder - value: 13 + value: 14 objectReference: {fileID: 0} - target: {fileID: 2572951684259581624, guid: 2a6a083bb264016429f87613d81246a7, type: 3} @@ -5435,6 +5539,16 @@ PrefabInstance: propertyPath: m_Size.y value: 2.44 objectReference: {fileID: 0} + - target: {fileID: 8190294923146759321, guid: ee44a805f35cfdf439eb367fcb5cc506, + type: 3} + propertyPath: m_SortingLayerID + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8190294923146759321, guid: ee44a805f35cfdf439eb367fcb5cc506, + type: 3} + propertyPath: m_SortingLayer + value: 0 + objectReference: {fileID: 0} - target: {fileID: 8371540879761324924, guid: ee44a805f35cfdf439eb367fcb5cc506, type: 3} propertyPath: m_LocalPosition.x @@ -5473,7 +5587,7 @@ PrefabInstance: - target: {fileID: 8371540879761324924, guid: ee44a805f35cfdf439eb367fcb5cc506, type: 3} propertyPath: m_RootOrder - value: 11 + value: 12 objectReference: {fileID: 0} - target: {fileID: 8371540879761324924, guid: ee44a805f35cfdf439eb367fcb5cc506, type: 3} diff --git a/BlueProject/Assets/Scenes/Level-1.unity.meta b/BlueProject/Assets/Scenes/Level-1.unity.meta new file mode 100644 index 0000000..65d775a --- /dev/null +++ b/BlueProject/Assets/Scenes/Level-1.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 13af43b83044013419eeb3c8ddd280ab +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/BlueProject/Assets/Scenes/LevelTrial.unity.meta b/BlueProject/Assets/Scenes/Main.unity.meta similarity index 100% rename from BlueProject/Assets/Scenes/LevelTrial.unity.meta rename to BlueProject/Assets/Scenes/Main.unity.meta diff --git a/BlueProject/Assets/Scenes/StartMenu.unity b/BlueProject/Assets/Scenes/StartMenu.unity index 8a62ba2..5d43afa 100644 --- a/BlueProject/Assets/Scenes/StartMenu.unity +++ b/BlueProject/Assets/Scenes/StartMenu.unity @@ -157,7 +157,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -270.99997, y: 165.00005} + m_AnchoredPosition: {x: -589, y: -56.99994} m_SizeDelta: {x: 450, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &98370495 @@ -364,7 +364,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -270.99997, y: -134.99995} + m_AnchoredPosition: {x: -589, y: -356.99994} m_SizeDelta: {x: 450, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &531807198 @@ -703,7 +703,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 199, y: 131} + m_AnchoredPosition: {x: 121.2, y: 51.999985} m_SizeDelta: {x: 450, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &629107065 @@ -1489,7 +1489,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 199, y: 166} + m_AnchoredPosition: {x: 121.2, y: 86.999985} m_SizeDelta: {x: 450, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1505620248 @@ -1694,7 +1694,7 @@ Camera: m_GameObject: {fileID: 1563568628} m_Enabled: 1 serializedVersion: 2 - m_ClearFlags: 1 + m_ClearFlags: 2 m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0} m_projectionMatrixMode: 1 m_GateFitMode: 2 @@ -1778,7 +1778,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -270.99997, y: -34.999954} + m_AnchoredPosition: {x: -589, y: -256.99994} m_SizeDelta: {x: 450, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1569000457 @@ -1907,7 +1907,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -271, y: 65} + m_AnchoredPosition: {x: -589, y: -157} m_SizeDelta: {x: 450, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1714215807 @@ -2102,7 +2102,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 199, y: 201} + m_AnchoredPosition: {x: 121.2, y: 122} m_SizeDelta: {x: 450, y: 75} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2063440897 diff --git a/BlueProject/ProjectSettings/EditorBuildSettings.asset b/BlueProject/ProjectSettings/EditorBuildSettings.asset index 813a9ba..fa03540 100644 --- a/BlueProject/ProjectSettings/EditorBuildSettings.asset +++ b/BlueProject/ProjectSettings/EditorBuildSettings.asset @@ -9,6 +9,6 @@ EditorBuildSettings: path: Assets/Scenes/StartMenu.unity guid: 4f136baff67a7fa449480c46f34bef86 - enabled: 1 - path: Assets/Scenes/LevelTrial.unity - guid: 34bf9155a1e8f86478e2287ba7ff3d78 + path: Assets/Scenes/Level-1.unity + guid: 13af43b83044013419eeb3c8ddd280ab m_configObjects: {}