diff --git a/Assets/Scenes/Game.unity b/Assets/Scenes/Game.unity index 49f22ff2..3ec9b476 100644 --- a/Assets/Scenes/Game.unity +++ b/Assets/Scenes/Game.unity @@ -292,10 +292,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1942660954} - - {fileID: 1639989116} - - {fileID: 422504721} - {fileID: 727392064} - - {fileID: 1408773127} m_Father: {fileID: 1855189907} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &18970963 @@ -453,7 +450,7 @@ Transform: m_GameObject: {fileID: 116991728} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -16.8, y: -17.5, z: 0} + m_LocalPosition: {x: -26.81, y: -15.55, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -788,7 +785,7 @@ Transform: m_GameObject: {fileID: 200018213} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 87.72, y: 41.67, z: 0} + m_LocalPosition: {x: 23.36, y: 2.25, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -980,37 +977,6 @@ Transform: m_Children: [] m_Father: {fileID: 1545152216} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &261840043 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 261840044} - m_Layer: 0 - m_Name: spawn (6) - m_TagString: Untagged - m_Icon: {fileID: -5442936267250999957, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &261840044 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 261840043} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 6.9, y: 121.9, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 803360951} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &264730817 GameObject: m_ObjectHideFlags: 0 @@ -1137,7 +1103,7 @@ Transform: m_GameObject: {fileID: 277746203} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -76.4, y: -0.1, z: 0} + m_LocalPosition: {x: -74.68, y: 1.48, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -1267,37 +1233,6 @@ Transform: m_Children: [] m_Father: {fileID: 2131209850} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &353145390 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 353145391} - m_Layer: 0 - m_Name: spawn1 - m_TagString: Untagged - m_Icon: {fileID: 2488908585195742037, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &353145391 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 353145390} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -45.51, y: 19.81, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1833145459} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &383124415 GameObject: m_ObjectHideFlags: 0 @@ -1641,37 +1576,6 @@ Transform: - {fileID: 1933120361} m_Father: {fileID: 264730818} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &422504720 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 422504721} - m_Layer: 0 - m_Name: spawn (2) - m_TagString: Untagged - m_Icon: {fileID: 3443629218296621865, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &422504721 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 422504720} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -100.05, y: 11.56, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 10218745} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &456202485 GameObject: m_ObjectHideFlags: 0 @@ -1880,37 +1784,6 @@ Transform: m_Children: [] m_Father: {fileID: 1545152216} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &519767410 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 519767411} - m_Layer: 0 - m_Name: spawn - m_TagString: Untagged - m_Icon: {fileID: -5442936267250999957, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &519767411 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 519767410} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -193.02, y: -20.63, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 803360951} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &520049265 GameObject: m_ObjectHideFlags: 0 @@ -2160,37 +2033,6 @@ Transform: m_Children: [] m_Father: {fileID: 1545152216} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &575262926 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 575262927} - m_Layer: 0 - m_Name: spawn (5) - m_TagString: Untagged - m_Icon: {fileID: -5442936267250999957, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &575262927 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 575262926} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -9.9, y: 105.1, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 803360951} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &598263572 GameObject: m_ObjectHideFlags: 0 @@ -2710,7 +2552,7 @@ Transform: m_GameObject: {fileID: 666582780} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -41.95, y: 21.53, z: 0} + m_LocalPosition: {x: -41, y: 21.3, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3371,11 +3213,8 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 519767411} - {fileID: 1263564472} - - {fileID: 575262927} - {fileID: 1864091254} - - {fileID: 261840044} - {fileID: 2003030643} - {fileID: 649950285} - {fileID: 306072535} @@ -3623,7 +3462,7 @@ Transform: m_GameObject: {fileID: 854248891} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -78.42, y: 5.58, z: 0} + m_LocalPosition: {x: -76.49, y: 6.58, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3914,37 +3753,6 @@ Transform: m_Children: [] m_Father: {fileID: 1348062637} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &979142696 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 979142697} - m_Layer: 0 - m_Name: spawn6 - m_TagString: Untagged - m_Icon: {fileID: 1206586993520771344, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &979142697 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 979142696} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -155.4, y: -38.7, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1481456791} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &981096316 GameObject: m_ObjectHideFlags: 0 @@ -4218,37 +4026,6 @@ Transform: m_Children: [] m_Father: {fileID: 1545152216} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1028395540 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1028395541} - m_Layer: 0 - m_Name: spawn6 - m_TagString: Untagged - m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1028395541 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1028395540} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -161.37, y: -29.01, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1679161857} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1036910294 GameObject: m_ObjectHideFlags: 0 @@ -4627,37 +4404,6 @@ Transform: m_Children: [] m_Father: {fileID: 981096317} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1144802034 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1144802035} - m_Layer: 0 - m_Name: spawn4 - m_TagString: Untagged - m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1144802035 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1144802034} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -128.78, y: -6.76, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1679161857} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1153344171 GameObject: m_ObjectHideFlags: 0 @@ -5175,37 +4921,6 @@ Transform: m_Children: [] m_Father: {fileID: 1545152216} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1339841802 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1339841803} - m_Layer: 0 - m_Name: spawn1 - m_TagString: Untagged - m_Icon: {fileID: -5397416234189338067, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1339841803 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1339841802} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 21.3, y: -10.2, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1926063132} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1345210111 GameObject: m_ObjectHideFlags: 0 @@ -5529,37 +5244,6 @@ Transform: m_Children: [] m_Father: {fileID: 1545152216} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1408773126 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1408773127} - m_Layer: 0 - m_Name: spawn (4) - m_TagString: Untagged - m_Icon: {fileID: 3443629218296621865, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1408773127 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1408773126} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 48.5, y: 46.56, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 10218745} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1414419748 GameObject: m_ObjectHideFlags: 0 @@ -6065,11 +5749,8 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 1153344172} - - {fileID: 2144728259} - {fileID: 563488017} - {fileID: 277746204} - - {fileID: 2031638811} - - {fileID: 979142697} m_Father: {fileID: 264730818} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1493919394 @@ -246678,37 +246359,6 @@ Transform: m_Children: [] m_Father: {fileID: 1545152216} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1639989115 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1639989116} - m_Layer: 0 - m_Name: spawn (1) - m_TagString: Untagged - m_Icon: {fileID: 3443629218296621865, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1639989116 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1639989115} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -61.63, y: 12.77, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 10218745} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1645281851 GameObject: m_ObjectHideFlags: 0 @@ -247097,9 +246747,6 @@ Transform: - {fileID: 4810462} - {fileID: 1622260841} - {fileID: 1565000659} - - {fileID: 1144802035} - - {fileID: 1772453570} - - {fileID: 1028395541} m_Father: {fileID: 264730818} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1739800983 @@ -269237,37 +268884,6 @@ Tilemap: e31: 0 e32: 0 e33: 1 ---- !u!1 &1772453569 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1772453570} - m_Layer: 0 - m_Name: spawn5 - m_TagString: Untagged - m_Icon: {fileID: -5487077368411116049, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1772453570 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1772453569} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -125.49, y: -46.52, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1679161857} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1788622447 GameObject: m_ObjectHideFlags: 0 @@ -286477,12 +286093,9 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 353145391} - - {fileID: 1911492286} - {fileID: 2041018994} - {fileID: 841565135} - {fileID: 854248892} - - {fileID: 2036212676} m_Father: {fileID: 264730818} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1838077089 @@ -287368,37 +286981,6 @@ Transform: m_Children: [] m_Father: {fileID: 1545152216} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1911492285 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1911492286} - m_Layer: 0 - m_Name: spawn2 - m_TagString: Untagged - m_Icon: {fileID: 2488908585195742037, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &1911492286 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1911492285} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 7.88, y: -16.17, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1833145459} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1915852518 GameObject: m_ObjectHideFlags: 0 @@ -287543,7 +287125,6 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 1339841803} - {fileID: 814519867} - {fileID: 116991729} - {fileID: 1154428023} @@ -303113,37 +302694,6 @@ Transform: m_Children: [] m_Father: {fileID: 1545152216} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2031638810 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2031638811} - m_Layer: 0 - m_Name: spawn5 - m_TagString: Untagged - m_Icon: {fileID: 1206586993520771344, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2031638811 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2031638810} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -146.46, y: -10.34, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1481456791} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2036062800 GameObject: m_ObjectHideFlags: 0 @@ -303228,37 +302778,6 @@ SpriteRenderer: m_WasSpriteAssigned: 1 m_MaskInteraction: 0 m_SpriteSortPoint: 0 ---- !u!1 &2036212675 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2036212676} - m_Layer: 0 - m_Name: spawn6 - m_TagString: Untagged - m_Icon: {fileID: 2488908585195742037, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &2036212676 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2036212675} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -96.96, y: -15.68, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1833145459} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &2041018993 GameObject: m_ObjectHideFlags: 0 @@ -303284,7 +302803,7 @@ Transform: m_GameObject: {fileID: 2041018993} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -64.9, y: 3.4, z: 0} + m_LocalPosition: {x: -64.57, y: 5.24, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -311671,37 +311190,6 @@ Transform: m_Children: [] m_Father: {fileID: 1545152216} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &2144728258 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2144728259} - m_Layer: 0 - m_Name: spawn2 - m_TagString: Untagged - m_Icon: {fileID: 1206586993520771344, guid: 0000000000000000d000000000000000, type: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &2144728259 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2144728258} - serializedVersion: 2 - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -62.44, y: -10.57, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1481456791} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &5992870399646459 MonoBehaviour: m_ObjectHideFlags: 0 @@ -689497,7 +688985,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 226 - m_TileSpriteIndex: 3 + m_TileSpriteIndex: 49 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -689667,7 +689155,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 228 - m_TileSpriteIndex: 4 + m_TileSpriteIndex: 48 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -689797,7 +689285,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 225 - m_TileSpriteIndex: 2 + m_TileSpriteIndex: 43 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -695137,7 +694625,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 5 - m_TileSpriteIndex: 40 + m_TileSpriteIndex: 42 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -695367,7 +694855,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 153 - m_TileSpriteIndex: 6 + m_TileSpriteIndex: 41 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -695617,7 +695105,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 152 - m_TileSpriteIndex: 5 + m_TileSpriteIndex: 40 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -699426,16 +698914,16 @@ Tilemap: m_Data: {fileID: 21300478, guid: 136fe9cd575049e4e83f4368f3ed8291, type: 3} - m_RefCount: 0 m_Data: {fileID: 0} - - m_RefCount: 1 - m_Data: {fileID: 21300418, guid: 136fe9cd575049e4e83f4368f3ed8291, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 21300416, guid: 136fe9cd575049e4e83f4368f3ed8291, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 21300448, guid: 136fe9cd575049e4e83f4368f3ed8291, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 21300306, guid: 136fe9cd575049e4e83f4368f3ed8291, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 21300342, guid: 136fe9cd575049e4e83f4368f3ed8291, type: 3} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} - m_RefCount: 0 @@ -699502,14 +698990,14 @@ Tilemap: m_Data: {fileID: 21300120, guid: 6ed82d251f009804fafb085ffb593c38, type: 3} - m_RefCount: 2 m_Data: {fileID: 21300118, guid: 6ed82d251f009804fafb085ffb593c38, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300306, guid: 136fe9cd575049e4e83f4368f3ed8291, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300342, guid: 136fe9cd575049e4e83f4368f3ed8291, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300142, guid: 136fe9cd575049e4e83f4368f3ed8291, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 21300418, guid: 136fe9cd575049e4e83f4368f3ed8291, type: 3} - m_RefCount: 2 m_Data: {fileID: 21300432, guid: 136fe9cd575049e4e83f4368f3ed8291, type: 3} - m_RefCount: 2 @@ -699518,10 +699006,10 @@ Tilemap: m_Data: {fileID: 21300436, guid: 6ed82d251f009804fafb085ffb593c38, type: 3} - m_RefCount: 2 m_Data: {fileID: 21300434, guid: 6ed82d251f009804fafb085ffb593c38, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 21300448, guid: 136fe9cd575049e4e83f4368f3ed8291, type: 3} + - m_RefCount: 1 + m_Data: {fileID: 21300416, guid: 136fe9cd575049e4e83f4368f3ed8291, type: 3} - m_RefCount: 1 m_Data: {fileID: 21300144, guid: 136fe9cd575049e4e83f4368f3ed8291, type: 3} - m_RefCount: 1 @@ -760884,7 +760372,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 43 - m_TileSpriteIndex: 43 + m_TileSpriteIndex: 46 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -760894,7 +760382,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 42 - m_TileSpriteIndex: 42 + m_TileSpriteIndex: 43 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -760944,7 +760432,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 40 - m_TileSpriteIndex: 40 + m_TileSpriteIndex: 42 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -760954,7 +760442,7 @@ Tilemap: second: serializedVersion: 2 m_TileIndex: 39 - m_TileSpriteIndex: 39 + m_TileSpriteIndex: 41 m_TileMatrixIndex: 0 m_TileColorIndex: 0 m_TileObjectToInstantiateIndex: 65535 @@ -761149,22 +760637,22 @@ Tilemap: m_Data: {fileID: 0} - m_RefCount: 0 m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} + - m_RefCount: 0 + m_Data: {fileID: 0} - m_RefCount: 1 m_Data: {fileID: 2479249049922426953, guid: 0c9f241a7c330ac4f9e0b79466bc718a, type: 3} - m_RefCount: 1 m_Data: {fileID: 1820521504570266116, guid: 0c9f241a7c330ac4f9e0b79466bc718a, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} - m_RefCount: 1 m_Data: {fileID: -3356003379380339892, guid: 0c9f241a7c330ac4f9e0b79466bc718a, type: 3} - - m_RefCount: 1 - m_Data: {fileID: 4020188111989550644, guid: 0c9f241a7c330ac4f9e0b79466bc718a, type: 3} - m_RefCount: 1 m_Data: {fileID: -5846857922630371809, guid: 3dd07772f5fbef9419ab2ce160538f68, type: 3} - m_RefCount: 1 m_Data: {fileID: -6817518981598858740, guid: 3dd07772f5fbef9419ab2ce160538f68, type: 3} - - m_RefCount: 0 - m_Data: {fileID: 0} + - m_RefCount: 1 + m_Data: {fileID: 4020188111989550644, guid: 0c9f241a7c330ac4f9e0b79466bc718a, type: 3} - m_RefCount: 2 m_Data: {fileID: 532879093869035423, guid: 3dd07772f5fbef9419ab2ce160538f68, type: 3} - m_RefCount: 1 diff --git a/Assets/Script/enemyScript.cs b/Assets/Script/enemyScript.cs index ace17b6a..f3b4d384 100644 --- a/Assets/Script/enemyScript.cs +++ b/Assets/Script/enemyScript.cs @@ -215,6 +215,8 @@ public class enemyScript : NetworkBehaviour float attackDuration = 1.4f; public float maxHealth; + + #if UNITY_SERVER [Server] private void FixedUpdate() { if (health <= 0 ){ @@ -248,6 +250,7 @@ public class enemyScript : NetworkBehaviour animationString = "Idle"; } } + #endif public void Attack(){