diff --git a/Assets/_Zombie/Scenes/Jiangsu_Xvzhou_Guolou_Oulebao.unity b/Assets/_Zombie/Scenes/Jiangsu_Xvzhou_Guolou_Oulebao.unity index ddc8b423..cabc36b5 100644 --- a/Assets/_Zombie/Scenes/Jiangsu_Xvzhou_Guolou_Oulebao.unity +++ b/Assets/_Zombie/Scenes/Jiangsu_Xvzhou_Guolou_Oulebao.unity @@ -2800,7 +2800,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &384658304 Transform: m_ObjectHideFlags: 0 @@ -3027,12 +3027,6 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!1 &397436655 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2408075564224852006, guid: e573aa91c2b58c643b9f5c810f105eb9, - type: 3} - m_PrefabInstance: {fileID: 1122554180} - m_PrefabAsset: {fileID: 0} --- !u!1 &433543778 GameObject: m_ObjectHideFlags: 0 @@ -6160,7 +6154,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!65 &639953101 BoxCollider: m_ObjectHideFlags: 0 @@ -6614,7 +6608,7 @@ MonoBehaviour: IncludeChildColliders: 0 RuntimeFollower: {fileID: 0} colliderMaxDistance: 100 - lastTimeMaxDistanceCalced: 638985577250186974 + lastTimeMaxDistanceCalced: 638986512699565214 --- !u!1 &679496949 GameObject: m_ObjectHideFlags: 0 @@ -6852,6 +6846,21 @@ PrefabInstance: propertyPath: m_Layer value: 3 objectReference: {fileID: 0} + - target: {fileID: 1284833194263080713, guid: ff62127ee95eace4c943a25192795ab7, + type: 3} + propertyPath: m_LocalPosition.x + value: -18.67 + objectReference: {fileID: 0} + - target: {fileID: 1284833194263080713, guid: ff62127ee95eace4c943a25192795ab7, + type: 3} + propertyPath: m_LocalPosition.z + value: 19.43 + objectReference: {fileID: 0} + - target: {fileID: 1309595997409389235, guid: ff62127ee95eace4c943a25192795ab7, + type: 3} + propertyPath: m_LocalPosition.z + value: 20.38 + objectReference: {fileID: 0} - target: {fileID: 1423197601506426981, guid: ff62127ee95eace4c943a25192795ab7, type: 3} propertyPath: m_Layer @@ -9357,7 +9366,7 @@ MonoBehaviour: m_EditorClassIdentifier: version: 1073741824 data: - dataString: UEsDBBQAAAgIAABAIezVfvYnxQIAAAIGAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVNtu4jAQ/RXk522VcGu7b7tA6T60RaWrPix9cO0JsTB25EuBVvz7jh2HpFRCSpiZM3POXPJJhLIVMKfN3Ah+rzmQnz0S3smPXuu8gz1da7UUH9DEvAjuyhBEY8wTdUKjPQ8wq7fgjGC/1FqG4AyNXolCm+2Mr2GirbNoLqi0gC6jXUArNH32yD4BDun5EZ69I74xUA5MJ+oyG477g+FVf3xzBuhfDseDfNQf5hHpFZN0WwEPCtoEo4QaxSCFypI/qGBaSmETLeIOVZQ9oZX1KAoDuKAoMxLKLocBUoJYly7+v+pmeCwKCy7RM/QwFQZbVqcmv3Xdxy21m5raO5U+FBv1a9112vtv/vEwugujt3dN5TwLNVwp2OaJHhi1rtPornnass9jh3ZUbuibhJcS1IOeG+0VR6czPkC9hf60k+qkbVIC27RxNdfG2ET76vts83a2xyh/v3RQnYRkre2vBbuUOg4glQmeZLkJkWBweH9QTlwkm/BoDRQR/0zX3Y1LjlthrENXYpOsIXaBAwIOikFq+0UIUIHcm/Ym5CKzyDT0wruJNgqiORGsQFHpDgvM6M434MzX4XXmuaXh+BK75Gtu6gwSzW18lp25Fnp3mrXBBbZxq5u3f69hBLbUu3uw5aN3UqhOt4PjARs80UrVi9ttZgNbelNQ1oE52DtvYEodjdWQDu4X70KxlxGhvJRhlaOAyAgFhN9r6G9Jsa6MZvKgVby+L89If+0F/3ogJL8ejK/peJTlPGMZvblgvODXGSsGIygG7G1E4gUJhe2mclH3K00Jt0u1WhReS/Np7M0NreLNckN3c/Gx1Z3JC1XoJTMA6rHOcBILBovgB4bPuECZS3BOqLiX5HNFpGYb4KtTolVs7GzvDF21WVakEu/aBcuKTOIHcUWC+XSQuLrvAnah+JdkIHF0wJ+FhC2tgis7kuN/UEsDBBQAAAgIAABAIezOMuSTbAAAAHcAAAAJACQAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0Bq1YqSy0qzszPU7JSMNUz1DPTUVBKL0osyCgGChiCOKWZKSB2tJKhhbGZRaKZqYFhikGyQaKlbnJKWoqFQXKasWlqmnFykqlSLFB9SWVBql9ibipET0BiSUZaZl5KZl66nntRZoo7yGil2FoAUEsBAi0AFAAACAgAAEAh7NV+9ifFAgAAAgYAAAsAJAAAAAAAAAAAAAAAAAAAAGdyYXBoMC5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsBAi0AFAAACAgAAEAh7M4y5JNsAAAAdwAAAAkAJAAAAAAAAAAAAAAAEgMAAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLBQYAAAAAAgACALgAAADJAwAAAAA= + dataString: UEsDBBQAAAgIAABAIeybFEKJxQIAAAMGAAALACQAZ3JhcGgwLmpzb24KACAAAAAAAAEAGAAAgD7V3rGdAQCAPtXesZ0BAIA+1d6xnQFlVF1v2jAU/SvIz2uVAGHt3jagdA9t0ejUh6UPrn1DLIwd2U6BVvz3XTsOCVRCSjj365z7kU8ilK2AOW0WRvAHzYH8GBD/Tr4NOuM97Olaq5X4gNbnRXBXeicafP5QJzTiqQ+zegvOCPZTraV3ThCslSi02c75GqbaOotwQaUFNBntfLRC6HNA9jHgEJ8f/jk44hsD5cD0vK6T8WQ4Gn8fTm4vAobX48kozYbjNETWikm6rYB7BV2CLEZlwUmhsmj3KpiWUthIi7hDFWRPaWVrFIUOXFCUGQgl1+MhIiWIdenC/+wsxVNRWHCRn6GHmTDYsyY3+aWbRm6p3TTc3qmsfbVs2Ahv8j58sU/GwVwYvb1vS6eJr+FKwTZ/6IFR63qd7sOzjn4aWrSjckPfJLyUoB71wuhacTQ6U/vQ2sJw1kt10jYtgW06v4ZrC7bedfV1uGk33GOQv185qE5Ckg77a8GupA4TiGW8JSK33hMMTu83ygmbZGM8op4ixj/TdX/louFOGOvQFNlE1PsucUDAQTGIbb/yDsqTe9O18bnIPDD1vajdVBsFAY4EK1BUusMSM7rLDbiw9XhdWO6ov77ILtrao7oICXDnnyQXpqXenWZtcINtWOv27d+rH4Et9e4BbPlUOylUr9ve8IgNnmqlmsXtN7MNW9WmoKwX5mDvagMz6miohnRwv3g/FHsZIlQtpV/lICAwQgH+9+r7W1KsKwNMHrUK53f2DPTXteDnB0LSm9Hkhk6yJOUJS+jtFeMFv0lYMcqgGLG3jIQLEgrbTeWy6VecEm6X6rQovJb22zhYGFqFm+WG7hbiY6t7kxeq0CtmANRTk+EkFgwWwS8Mn3OBMlfgnFBhL8lnTqRmG+D5KVEeGjvfO0PzLktOKvGunUdyMg1fxJx4+HSQuLrvAna++FkykDg64M9CwpZW3pQcyfE/UEsDBBQAAAgIAABAIezOMuSTbAAAAHcAAAAJACQAbWV0YS5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0Bq1YqSy0qzszPU7JSMNUz1DPTUVBKL0osyCgGChiCOKWZKSB2tJKhhbGZRaKZqYFhikGyQaKlbnJKWoqFQXKasWlqmnFykqlSLFB9SWVBql9ibipET0BiSUZaZl5KZl66nntRZoo7yGil2FoAUEsBAi0AFAAACAgAAEAh7JsUQonFAgAAAwYAAAsAJAAAAAAAAAAAAAAAAAAAAGdyYXBoMC5qc29uCgAgAAAAAAABABgAAIA+1d6xnQEAgD7V3rGdAQCAPtXesZ0BUEsBAi0AFAAACAgAAEAh7M4y5JNsAAAAdwAAAAkAJAAAAAAAAAAAAAAAEgMAAG1ldGEuanNvbgoAIAAAAAAAAQAYAACAPtXesZ0BAIA+1d6xnQEAgD7V3rGdAVBLBQYAAAAAAgACALgAAADJAwAAAAA= file_cachedStartup: {fileID: 0} cacheStartup: 0 showNavGraphs: 1 @@ -13246,18 +13255,12 @@ MonoBehaviour: place: 36 enemyStartPos: - {fileID: 1304609849} - - {fileID: 384658304} - - {fileID: 1580371163} - - {fileID: 1892161774} gunPropPos: - {fileID: 1134898388} - {fileID: 450657585} doorPos: {fileID: 1128989868} wu: - {fileID: 1577191284} - - {fileID: 2053588613} - - {fileID: 397436655} - - {fileID: 1710131521} --- !u!1 &1292553882 GameObject: m_ObjectHideFlags: 0 @@ -14604,7 +14607,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1580371163 Transform: m_ObjectHideFlags: 0 @@ -15852,12 +15855,6 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1689610350} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} ---- !u!1 &1710131521 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2408075564224852006, guid: e573aa91c2b58c643b9f5c810f105eb9, - type: 3} - m_PrefabInstance: {fileID: 513551276} - m_PrefabAsset: {fileID: 0} --- !u!4 &1710131522 stripped Transform: m_CorrespondingSourceObject: {fileID: 6340638600884704829, guid: e573aa91c2b58c643b9f5c810f105eb9, @@ -17475,7 +17472,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!4 &1892161774 Transform: m_ObjectHideFlags: 0 @@ -18827,12 +18824,6 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ---- !u!1 &2053588613 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: 2408075564224852006, guid: e573aa91c2b58c643b9f5c810f105eb9, - type: 3} - m_PrefabInstance: {fileID: 880393369} - m_PrefabAsset: {fileID: 0} --- !u!1 &2060455525 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/_Zombie/Scripts/GameManager.cs b/Assets/_Zombie/Scripts/GameManager.cs index fedeeec3..925b3982 100644 --- a/Assets/_Zombie/Scripts/GameManager.cs +++ b/Assets/_Zombie/Scripts/GameManager.cs @@ -116,7 +116,7 @@ public class GameManager : NetworkBehaviour [SyncVar] public long vistEnd = 0; // 总游玩时长 - private int vistAllTime = (int)(60*15); + private int vistAllTime = (int)(60*10); [SyncVar] public string settleData = ""; @@ -306,19 +306,31 @@ public class GameManager : NetworkBehaviour IEnumerator CreateEnemy(CombatUnitInfo info) { curRoundEnemyCount = info.EnemyTypeList.Length; + + if (GameLocal.Ins.enemyStartPos.Length == 0) + { + Debug.LogError("没有设置敌人出生点！"); + yield break; + } + for (int i = 0; i < info.EnemyTypeList.Length; i++) { GameObject enemy = Instantiate(EnemyPres[info.EnemyTypeList[i]]); NetworkServer.Spawn(enemy); - int posId = Random.Range(0, 4); - int posX=Random.Range(-1, 1); - int posZ=Random.Range(-1, 1); - enemy.transform.position = GameLocal.Ins.enemyStartPos[posId].position+new Vector3(posX,0,posZ); - enemy.transform.eulerAngles = new Vector3(0, 0, 0); + + // 循环使用出生点 + int posId = i % GameLocal.Ins.enemyStartPos.Length; + int posX = Random.Range(-1, 2); + int posZ = Random.Range(-1, 2); + + enemy.transform.position = GameLocal.Ins.enemyStartPos[posId].position + new Vector3(posX, 0, posZ); + enemy.transform.eulerAngles = Vector3.zero; enemyIndex++; + Enemy enemyScript = enemy.GetComponent(); enemyScript.OnSpawn(enemyIndex, (EnemyType)info.EnemyTypeList[i], 1); EnemyList.Add(enemyIndex, enemyScript); + yield return new WaitForSeconds(info.BornTime); } diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index f3c456e4..dd16fa33 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -142,7 +142,9 @@ PlayerSettings: visionOSBundleVersion: 1.0 tvOSBundleVersion: 1.0 bundleVersion: 1.0.0 - preloadedAssets: [] + preloadedAssets: + - {fileID: 1814176829808956018, guid: 58f40b12bbc864f3c96c6505a9a1e1e3, type: 2} + - {fileID: 11400000, guid: d0f8149c48842b4488cf6fb974cff9a2, type: 2} metroInputSource: 0 wsaTransparentSwapchain: 0 m_HolographicPauseOnTrackingLoss: 1