diff --git a/Assets/Scenes/Level01.unity b/Assets/Scenes/Level01.unity
index 149042f5258b4f943c903a41e1db8c0b47c9f545..9134de5718c22e2f8de754048c9deb0b024c53d3 100644
--- a/Assets/Scenes/Level01.unity
+++ b/Assets/Scenes/Level01.unity
@@ -138,7 +138,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &8301220
Transform:
@@ -228,7 +228,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &23611506
Transform:
@@ -281,7 +281,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &33603859
Transform:
@@ -637,7 +637,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &85931479
Transform:
@@ -1193,7 +1193,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 3
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &179260348
Transform:
@@ -1738,7 +1738,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &221163884
Transform:
@@ -1925,7 +1925,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &230531971
Transform:
@@ -1978,7 +1978,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &233776680
Transform:
@@ -2318,7 +2318,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &320585867
Transform:
@@ -3133,7 +3133,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &395807659
Transform:
@@ -3223,7 +3223,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &403409533
Transform:
@@ -3373,7 +3373,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
- m_AnchoredPosition: {x: 0, y: -1525564}
+ m_AnchoredPosition: {x: 0, y: -1537536}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 0}
--- !u!114 &435589487
@@ -3510,7 +3510,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &466807435
Transform:
@@ -3987,7 +3987,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &521434604
Transform:
@@ -4121,7 +4121,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &543183296
Transform:
@@ -4268,7 +4268,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &561969061
Transform:
@@ -4666,7 +4666,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &583587551
Transform:
@@ -4778,7 +4778,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &593653909
Transform:
@@ -4884,7 +4884,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &610195627
Transform:
@@ -4937,7 +4937,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &625150003
Transform:
@@ -5318,7 +5318,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &682336871
Transform:
@@ -5448,7 +5448,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &693521448
Transform:
@@ -5576,7 +5576,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &703827269
Transform:
@@ -6732,7 +6732,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &818136669
Transform:
@@ -6786,7 +6786,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &837799652
Transform:
@@ -7398,7 +7398,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &943920583
Transform:
@@ -8300,7 +8300,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1039700113
Transform:
@@ -8515,7 +8515,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1071234795
Transform:
@@ -8774,7 +8774,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1114460012
Transform:
@@ -8961,7 +8961,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1125536030
Transform:
@@ -9630,7 +9630,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1212966711
Transform:
@@ -10004,7 +10004,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1265858857
Transform:
@@ -10209,7 +10209,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1297588072
Transform:
@@ -10329,7 +10329,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1358361851
Transform:
@@ -10440,7 +10440,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 3
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1368760591
Transform:
@@ -10638,7 +10638,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1375507108
Transform:
@@ -10825,7 +10825,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1393175493
Transform:
@@ -11232,7 +11232,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1470087878
Transform:
@@ -11605,7 +11605,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1534050576
Transform:
@@ -11691,7 +11691,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1557367704
Transform:
@@ -11913,7 +11913,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1570746569
Transform:
@@ -11966,7 +11966,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1576606531
Transform:
@@ -12004,77 +12004,6 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 1.7346778, y: 1.3247411, z: 3.543157}
m_Center: {x: 0.2625594, y: 0.57711565, z: -0.97821546}
-<<<<<<< HEAD
---- !u!1001 &1589767388
-PrefabInstance:
- m_ObjectHideFlags: 0
- serializedVersion: 2
- m_Modification:
- serializedVersion: 3
- m_TransformParent: {fileID: 0}
- m_Modifications:
- - target: {fileID: 100004, guid: b77f122f451a2394898a24191c26107c, type: 3}
- propertyPath: m_Name
- value: Hellephant
- objectReference: {fileID: 0}
- - target: {fileID: 400004, guid: b77f122f451a2394898a24191c26107c, type: 3}
- propertyPath: m_LocalPosition.x
- value: -0.9549279
- objectReference: {fileID: 0}
- - target: {fileID: 400004, guid: b77f122f451a2394898a24191c26107c, type: 3}
- propertyPath: m_LocalPosition.y
- value: 0.00000023841858
- objectReference: {fileID: 0}
- - target: {fileID: 400004, guid: b77f122f451a2394898a24191c26107c, type: 3}
- propertyPath: m_LocalPosition.z
- value: -2.4052334
- objectReference: {fileID: 0}
- - target: {fileID: 400004, guid: b77f122f451a2394898a24191c26107c, type: 3}
- propertyPath: m_LocalRotation.w
- value: 1
- objectReference: {fileID: 0}
- - target: {fileID: 400004, guid: b77f122f451a2394898a24191c26107c, type: 3}
- propertyPath: m_LocalRotation.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 400004, guid: b77f122f451a2394898a24191c26107c, type: 3}
- propertyPath: m_LocalRotation.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 400004, guid: b77f122f451a2394898a24191c26107c, type: 3}
- propertyPath: m_LocalRotation.z
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 400004, guid: b77f122f451a2394898a24191c26107c, type: 3}
- propertyPath: m_LocalEulerAnglesHint.x
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 400004, guid: b77f122f451a2394898a24191c26107c, type: 3}
- propertyPath: m_LocalEulerAnglesHint.y
- value: 0
- objectReference: {fileID: 0}
- - target: {fileID: 400004, guid: b77f122f451a2394898a24191c26107c, type: 3}
- propertyPath: m_LocalEulerAnglesHint.z
- value: 0
- objectReference: {fileID: 0}
- m_RemovedComponents: []
- m_RemovedGameObjects: []
- m_AddedGameObjects: []
- m_AddedComponents:
- - targetCorrespondingSourceObject: {fileID: 100004, guid: b77f122f451a2394898a24191c26107c, type: 3}
- insertIndex: -1
- addedObject: {fileID: 1589767391}
- - targetCorrespondingSourceObject: {fileID: 100004, guid: b77f122f451a2394898a24191c26107c, type: 3}
- insertIndex: -1
- addedObject: {fileID: 1589767390}
- m_SourcePrefab: {fileID: 100100000, guid: b77f122f451a2394898a24191c26107c, type: 3}
---- !u!1 &1589767389 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 100004, guid: b77f122f451a2394898a24191c26107c, type: 3}
- m_PrefabInstance: {fileID: 1589767388}
- m_PrefabAsset: {fileID: 0}
---- !u!114 &1589767390
-=======
--- !u!1 &1589103964
GameObject:
m_ObjectHideFlags: 0
@@ -12113,22 +12042,11 @@ RectTransform:
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1589103966
->>>>>>> a2a8905d7ff486b212b84d4743a8056e99a29dda
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
-<<<<<<< HEAD
- m_GameObject: {fileID: 1589767389}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 6569ccc570d7b194c88b6e42863593da, type: 3}
- m_Name:
- m_EditorClassIdentifier:
---- !u!195 &1589767391
-NavMeshAgent:
-=======
m_GameObject: {fileID: 1589103964}
m_Enabled: 1
m_EditorHideFlags: 0
@@ -12214,32 +12132,12 @@ NavMeshAgent:
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!222 &1589103967
CanvasRenderer:
->>>>>>> a2a8905d7ff486b212b84d4743a8056e99a29dda
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
-<<<<<<< HEAD
- m_GameObject: {fileID: 1589767389}
- m_Enabled: 1
- m_AgentTypeID: 0
- m_Radius: 1.44
- m_Speed: 3.5
- m_Acceleration: 8
- avoidancePriority: 50
- m_AngularSpeed: 120
- m_StoppingDistance: 0
- m_AutoTraverseOffMeshLink: 1
- m_AutoBraking: 1
- m_AutoRepath: 1
- m_Height: 2
- m_BaseOffset: 0.94
- m_WalkableMask: 4294967295
- m_ObstacleAvoidanceType: 4
-=======
m_GameObject: {fileID: 1589103964}
m_CullTransparentMesh: 1
->>>>>>> a2a8905d7ff486b212b84d4743a8056e99a29dda
--- !u!1 &1591569080
GameObject:
m_ObjectHideFlags: 0
@@ -12486,7 +12384,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1605324595
Transform:
@@ -13208,7 +13106,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1724547737
Transform:
@@ -13533,7 +13431,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1754613884
Transform:
@@ -13986,7 +13884,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1762411324
Transform:
@@ -14070,7 +13968,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1792627269
Transform:
@@ -14125,7 +14023,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1805142385
Transform:
@@ -14344,7 +14242,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1836036864
Transform:
@@ -14629,7 +14527,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1879170045
Transform:
@@ -14734,7 +14632,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1882290308
Transform:
@@ -14919,7 +14817,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1906343028
Transform:
@@ -15039,7 +14937,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1941167243
Transform:
@@ -15093,7 +14991,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1965662092
Transform:
@@ -15265,7 +15163,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &1978917667
Transform:
@@ -15770,7 +15668,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!1 &2068631235
GameObject:
@@ -16116,7 +16014,7 @@ GameObject:
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
- m_StaticEditorFlags: 0
+ m_StaticEditorFlags: 4294967295
m_IsActive: 1
--- !u!4 &2135469468
Transform:
@@ -16300,10 +16198,6 @@ SceneRoots:
- {fileID: 1871034396}
- {fileID: 944601035}
- {fileID: 983902636}
-<<<<<<< HEAD
- - {fileID: 1589767388}
-=======
- {fileID: 706766591}
- {fileID: 307935225}
- {fileID: 840882477}
->>>>>>> a2a8905d7ff486b212b84d4743a8056e99a29dda