This commit is contained in:
2026-04-29 23:53:55 +08:00
parent 143f51d35d
commit 0055207c24
786 changed files with 24840 additions and 47796 deletions
@@ -26,6 +26,7 @@ using TMPro;
using Unity.Collections;
using Unity.Jobs;
using UnityEngine;
using static UnityEditor.FilePathAttribute;
using Random = UnityEngine.Random;
/// <summary>
@@ -542,6 +543,10 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
public void CloseSpawnSystem()
{
spawnList = null;
spawnDic = null;
yz_FishConfig_Line_Dic = null;
yz_FishConfig_Line = null;
yz_FishConfig_Line_Dic1 = null;
if (fishRoot == null) return;
for (int i = fishRoot.childCount - 1; i >= 0; i--)
@@ -648,8 +653,9 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
return false;
}
var prefab = FishResourcesData.GetFishPrefab(int.Parse(fishType.fishNumber));
var fish = Instantiate(prefab, new Vector3(9999, 9999, 0), prefab.transform.rotation, fishRoot);
//var prefab = FishResourcesData.GetFishPrefab(int.Parse(fishType.fishNumber));
//var fish = Instantiate(prefab, new Vector3(9999, 9999, 0), prefab.transform.rotation, fishRoot);
var fish = Pool.Instance.Get(int.Parse(createFishData.fishNumber), new Vector3(9999, 9999, 0), Quaternion.identity,fishRoot);
var mc = fish.GetComponent<MonsterContral>() ?? fish.AddComponent<MonsterContral>();
mc.monsterData.fishTypeConfig = FishDatas[createFishData.fishNumber];
@@ -775,7 +781,8 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
var rotation = Quaternion.Euler(
prefab.transform.eulerAngles + Vector3.forward * angle);
var fish = Instantiate(prefab, pos, rotation, fishRoot);
//var fish = Instantiate(prefab, pos, rotation, fishRoot);
var fish = Pool.Instance.Get(int.Parse(yz.fishNumber), pos, rotation, fishRoot);
var mc = fish.GetComponent<MonsterContral>();
mc.monsterData.fishTypeConfig = FishDatas[yz.fishNumber];
@@ -804,7 +811,9 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
var rotation = Quaternion.Euler(
prefab.transform.eulerAngles + Vector3.forward * angle);
var fish = Instantiate(prefab, pos, rotation, fishRoot);
//var fish = Instantiate(prefab, pos, rotation, fishRoot);
var fish = Pool.Instance.Get(int.Parse(yz.fishNumber), pos, rotation, fishRoot);
var mc = fish.GetComponent<MonsterContral>();
mc.monsterData.fishTypeConfig = FishDatas[yz.fishNumber];
@@ -828,7 +837,9 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
for (int i = 0; i < count; i++)
{
var fish = Instantiate(prefab, pos, prefab.transform.rotation, fishRoot);
//var fish = Instantiate(prefab, pos, prefab.transform.rotation, fishRoot);
var fish = Pool.Instance.Get(int.Parse(yz.fishNumber), pos, Quaternion.identity, fishRoot);
var mc = fish.GetComponent<MonsterContral>() ?? fish.AddComponent<MonsterContral>();
mc.monsterData.fishTypeConfig = FishDatas[yz.fishNumber];