diff --git a/Assets/Scenes/Procedural.unity b/Assets/Scenes/Procedural.unity index ecc1159..0f4659f 100644 --- a/Assets/Scenes/Procedural.unity +++ b/Assets/Scenes/Procedural.unity @@ -38,7 +38,8 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.000055046083, g: 0.00014094963, b: 0.0042733354, a: 1} + m_IndirectSpecularColor: {r: 0.000055046083, g: 0.00014094963, b: 0.0042733354, + a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -97,8 +98,10 @@ LightmapSettings: m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData m_LightProbeSampleCountMultiplier: 4 - m_LightingDataAsset: {fileID: 112000000, guid: d6e02588841a5c84993d1ffdabeaa5d2, type: 2} - m_LightingSettings: {fileID: 4890085278179872738, guid: 49cca1d38c3581042a44320df3b196f3, type: 2} + m_LightingDataAsset: {fileID: 112000000, guid: d6e02588841a5c84993d1ffdabeaa5d2, + type: 2} + m_LightingSettings: {fileID: 4890085278179872738, guid: 49cca1d38c3581042a44320df3b196f3, + type: 2} --- !u!196 &4 NavMeshSettings: serializedVersion: 2 @@ -109,9 +112,9 @@ NavMeshSettings: agentRadius: 0.08 agentHeight: 2 agentSlope: 45 - agentClimb: 0.4 - ledgeDropHeight: 0 - maxJumpAcrossDistance: 0 + agentClimb: 0.9 + ledgeDropHeight: 5 + maxJumpAcrossDistance: 2 minRegionArea: 2 manualCellSize: 0 cellSize: 0.026666665 @@ -165,9 +168,11 @@ MonoBehaviour: - {fileID: 7399163560736700540, guid: e8ebefe0d40887a4789f7f2f5b457ac1, type: 3} - {fileID: 1984261797555247763, guid: ede9b2918d7a5ab4d84e9e4db64a593d, type: 3} startingRoom: {fileID: 1061603555} - cubePrefab: {fileID: 2352355441573259686, guid: 07dfe65296154e14dbaf7036089cb26e, type: 3} + cubePrefab: {fileID: 2352355441573259686, guid: 07dfe65296154e14dbaf7036089cb26e, + type: 3} flattenSpawnedRooms: [] - enemyPrefab: {fileID: 5154438181429744987, guid: 862c71231d467e34a9f7eadb2d745413, type: 3} + enemyPrefab: {fileID: 5154438181429744987, guid: 862c71231d467e34a9f7eadb2d745413, + type: 3} enemyList: [] --- !u!4 &131571059 Transform: @@ -220,59 +225,73 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 1485085219} m_Modifications: - - target: {fileID: 13385339065999458, guid: 66df3c5eb0b75424582840a6f8405e9b, type: 3} + - target: {fileID: 13385339065999458, guid: 66df3c5eb0b75424582840a6f8405e9b, + type: 3} propertyPath: m_Name value: Radio objectReference: {fileID: 0} - - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, type: 3} + - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, + type: 3} propertyPath: m_RootOrder value: 30 objectReference: {fileID: 0} - - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, type: 3} + - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, + type: 3} propertyPath: m_LocalPosition.x value: 3.17 objectReference: {fileID: 0} - - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, type: 3} + - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, + type: 3} propertyPath: m_LocalPosition.y value: 5.11 objectReference: {fileID: 0} - - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, type: 3} + - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, + type: 3} propertyPath: m_LocalPosition.z value: 2.93 objectReference: {fileID: 0} - - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, type: 3} + - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, type: 3} + - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, + type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, type: 3} + - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, + type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, type: 3} + - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, + type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, type: 3} + - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, + type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, type: 3} + - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, + type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, type: 3} + - target: {fileID: 13385339066235970, guid: 66df3c5eb0b75424582840a6f8405e9b, + type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 179883344990739812, guid: 66df3c5eb0b75424582840a6f8405e9b, type: 3} + - target: {fileID: 179883344990739812, guid: 66df3c5eb0b75424582840a6f8405e9b, + type: 3} propertyPath: MaxDistance value: 8.940208 objectReference: {fileID: 0} - - target: {fileID: 179883344990739812, guid: 66df3c5eb0b75424582840a6f8405e9b, type: 3} + - target: {fileID: 179883344990739812, guid: 66df3c5eb0b75424582840a6f8405e9b, + type: 3} propertyPath: m_PlayOnAwake value: 1 objectReference: {fileID: 0} @@ -442,7 +461,8 @@ MonoBehaviour: m_EditorClassIdentifier: syncMode: 0 syncInterval: 0.1 - enemyPrefab: {fileID: 5154438181429744987, guid: 862c71231d467e34a9f7eadb2d745413, type: 3} + enemyPrefab: {fileID: 5154438181429744987, guid: 862c71231d467e34a9f7eadb2d745413, + type: 3} enemyList: [] winner: {fileID: 0} gameStart: 0 @@ -485,55 +505,68 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 1115504609363592116, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + - target: {fileID: 1115504609363592116, guid: 95026c01f0003f9459c443f53b1eb516, + type: 3} propertyPath: sceneId value: 303159910 objectReference: {fileID: 0} - - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, + type: 3} propertyPath: m_RootOrder value: 1 objectReference: {fileID: 0} - - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, + type: 3} propertyPath: m_LocalPosition.x value: 3 objectReference: {fileID: 0} - - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, + type: 3} propertyPath: m_LocalPosition.y value: -0.34 objectReference: {fileID: 0} - - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, + type: 3} propertyPath: m_LocalPosition.z value: 3 objectReference: {fileID: 0} - - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, + type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, + type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, + type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, + type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, + type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + - target: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, + type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 1115504609363592120, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + - target: {fileID: 1115504609363592120, guid: 95026c01f0003f9459c443f53b1eb516, + type: 3} propertyPath: m_Name value: CubeEater (1) objectReference: {fileID: 0} @@ -541,7 +574,8 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} --- !u!4 &725301203 stripped Transform: - m_CorrespondingSourceObject: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, type: 3} + m_CorrespondingSourceObject: {fileID: 1115504609363592119, guid: 95026c01f0003f9459c443f53b1eb516, + type: 3} m_PrefabInstance: {fileID: 725301202} m_PrefabAsset: {fileID: 0} --- !u!1001 &1061603554 @@ -551,67 +585,84 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 2398550976167478604, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + - target: {fileID: 2398550976167478604, guid: ef77c701b7af7b54a8b002554a3cea5d, + type: 3} propertyPath: m_NavMeshData value: - objectReference: {fileID: 23800000, guid: 93433280279bc27428713396c80a311d, type: 2} - - target: {fileID: 3642525324054568589, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + objectReference: {fileID: 23800000, guid: 93433280279bc27428713396c80a311d, + type: 2} + - target: {fileID: 3642525324054568589, guid: ef77c701b7af7b54a8b002554a3cea5d, + type: 3} propertyPath: m_Name value: Room1 objectReference: {fileID: 0} - - target: {fileID: 4822851902742051790, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + - target: {fileID: 4822851902742051790, guid: ef77c701b7af7b54a8b002554a3cea5d, + type: 3} propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} - - target: {fileID: 7005080718198834357, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + - target: {fileID: 7005080718198834357, guid: ef77c701b7af7b54a8b002554a3cea5d, + type: 3} propertyPath: m_Enabled value: 1 objectReference: {fileID: 0} - - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, + type: 3} propertyPath: m_RootOrder value: 2 objectReference: {fileID: 0} - - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, + type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, + type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, + type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, + type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, + type: 3} propertyPath: m_LocalRotation.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, + type: 3} propertyPath: m_LocalRotation.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, + type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, + type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, + type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + - target: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, + type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 8759162998728815380, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + - target: {fileID: 8759162998728815380, guid: ef77c701b7af7b54a8b002554a3cea5d, + type: 3} propertyPath: sceneId value: 2355651140 objectReference: {fileID: 0} @@ -619,7 +670,8 @@ PrefabInstance: m_SourcePrefab: {fileID: 100100000, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} --- !u!114 &1061603555 stripped MonoBehaviour: - m_CorrespondingSourceObject: {fileID: 6893948226853889078, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + m_CorrespondingSourceObject: {fileID: 6893948226853889078, guid: ef77c701b7af7b54a8b002554a3cea5d, + type: 3} m_PrefabInstance: {fileID: 1061603554} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 0} @@ -674,7 +726,8 @@ Transform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &1485085219 stripped Transform: - m_CorrespondingSourceObject: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, type: 3} + m_CorrespondingSourceObject: {fileID: 8105026293294623414, guid: ef77c701b7af7b54a8b002554a3cea5d, + type: 3} m_PrefabInstance: {fileID: 1061603554} m_PrefabAsset: {fileID: 0} --- !u!1 &1495591699 diff --git a/Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs b/Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs index 50c1bcd..f773105 100644 --- a/Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs +++ b/Assets/Scripts/Level/BuildModules/ProceduralPrefabs.cs @@ -32,6 +32,8 @@ namespace Level.BuildModules private List _enemySpawnPoses = new(); public List enemyList = new(); + private bool _nasral = false; + private IEnumerator Start() { if(!isServer) yield break; @@ -69,6 +71,10 @@ namespace Level.BuildModules private void OnPlayerSpawned() { + if (_nasral) return; + + _nasral = true; + print("OnPlayerSpawned"); if (enemyList.Count == networkManager.maxMonsters) return;