diff --git a/Assets/Prefabs/Camera/Camera.prefab b/Assets/Prefabs/Camera/Camera.prefab index 0f3d1e0..06d4cc3 100644 --- a/Assets/Prefabs/Camera/Camera.prefab +++ b/Assets/Prefabs/Camera/Camera.prefab @@ -424,3 +424,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ca616a2edfacfd54fb236cd92b9e2dea, type: 3} m_Name: m_EditorClassIdentifier: + FixedResolutionX: 426 + FixedResolutionY: 240 + FollowResolutionX: 384 + FollowResolutionY: 216 diff --git a/Assets/Resources/Levels/5.prefab b/Assets/Resources/Levels/5.prefab index e1a1dd6..c9bfdb3 100644 --- a/Assets/Resources/Levels/5.prefab +++ b/Assets/Resources/Levels/5.prefab @@ -96,9 +96,9 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 6511458277577207904} - {fileID: 5804701277391193572} - {fileID: 260941742519655006} + - {fileID: 9216009158560085957} m_Father: {fileID: 2291717156377201547} m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -87197,7 +87197,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 8290467297792330256, guid: 960b42e9705db604bb69d624b59e079a, type: 3} propertyPath: m_RootOrder - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 8290467297792330256, guid: 960b42e9705db604bb69d624b59e079a, type: 3} propertyPath: m_LocalPosition.x @@ -87688,96 +87688,6 @@ Transform: m_CorrespondingSourceObject: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} m_PrefabInstance: {fileID: 4120125444042117189} m_PrefabAsset: {fileID: 0} ---- !u!1001 &4944229099895688595 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4457886412851458638} - m_Modifications: - - target: {fileID: 950848689424125375, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} - propertyPath: m_LocalPosition.x - value: 28.3 - objectReference: {fileID: 0} - - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} - propertyPath: m_LocalPosition.y - value: 5.1 - objectReference: {fileID: 0} - - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} - propertyPath: m_LocalPosition.z - value: 1.2277431 - objectReference: {fileID: 0} - - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} - propertyPath: m_LocalRotation.w - value: 0.70710784 - objectReference: {fileID: 0} - - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} - propertyPath: m_LocalRotation.z - value: -0.70710576 - objectReference: {fileID: 0} - - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -90 - objectReference: {fileID: 0} - - target: {fileID: 3123945829947712471, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 6102515708334491356, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} - propertyPath: m_Name - value: Basic Shooting Patrolling Enemy Variant - objectReference: {fileID: 0} - - target: {fileID: 6102515708334491356, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 6696396628860433766, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 6866309606816672572, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 6991387122328249012, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - - target: {fileID: 7969067840941533599, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} - propertyPath: m_Layer - value: 10 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} ---- !u!4 &6511458277577207904 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 2215831379607469555, guid: 166a1e67df866c64990d98902fcbeb71, type: 3} - m_PrefabInstance: {fileID: 4944229099895688595} - m_PrefabAsset: {fileID: 0} --- !u!1001 &5186290382551966272 PrefabInstance: m_ObjectHideFlags: 0 @@ -87840,6 +87750,100 @@ Transform: m_CorrespondingSourceObject: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} m_PrefabInstance: {fileID: 5186290382551966272} m_PrefabAsset: {fileID: 0} +--- !u!1001 &5982591047284910834 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 4457886412851458638} + m_Modifications: + - target: {fileID: 1835766140300886803, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_RootOrder + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalScale.x + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.x + value: 28.3 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.y + value: 6.5 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalPosition.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalRotation.z + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90 + objectReference: {fileID: 0} + - target: {fileID: 4544581046616649083, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 5991452379241120368, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7391517555913877016, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_Name + value: Basic Patrolling Enemy + objectReference: {fileID: 0} + - target: {fileID: 7391517555913877016, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7883981671222168568, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 7984300476647789986, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: m_Layer + value: 10 + objectReference: {fileID: 0} + - target: {fileID: 8503951513957676288, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + propertyPath: isMovingRightInitially + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} +--- !u!4 &9216009158560085957 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3234632762428300599, guid: c0a2079a443363b4da73a0d425221f6c, type: 3} + m_PrefabInstance: {fileID: 5982591047284910834} + m_PrefabAsset: {fileID: 0} --- !u!1001 &6079849654118072263 PrefabInstance: m_ObjectHideFlags: 0 @@ -88363,7 +88367,7 @@ PrefabInstance: m_Modifications: - target: {fileID: 8290467297792330256, guid: 960b42e9705db604bb69d624b59e079a, type: 3} propertyPath: m_RootOrder - value: 2 + value: 1 objectReference: {fileID: 0} - target: {fileID: 8290467297792330256, guid: 960b42e9705db604bb69d624b59e079a, type: 3} propertyPath: m_LocalPosition.x diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 802d507..3cd8279 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -12,10 +12,13 @@ EditorUserSettings: value: 500707545356080f555c582343705c44474e1c7c7e7974672b7d4935e1e36561 flags: 0 RecentlyUsedSceneGuid-2: - value: 5002060403010b5f0f560e7a47260a444f4f1e2e2f2e27312f7f4536e0b6633d + value: 06550c57540350025c0b0f2747220a44174f4b73297070642b714465b0e6366e flags: 0 RecentlyUsedSceneGuid-3: - value: 06550c57540350025c0b0f2747220a44174f4b73297070642b714465b0e6366e + value: 5002060403010b5f0f560e7a47260a444f4f1e2e2f2e27312f7f4536e0b6633d + flags: 0 + RecentlyUsedSceneGuid-4: + value: 010302565256500e555f5a74127a0b444615402e7d7b2466787d4462b3b1353b flags: 0 vcSharedLogLevel: value: 0d5e400f0650