Merge branch 'Art01' into feature/newWork

# Conflicts: # UserSettings/Layouts/default-2022.dwlt
2026-04-22 16:32:00 +08:00
parent 7589e654c2 3e2a6f3a81
commit 2fd8747949
72 changed files with 1262329 additions and 52550 deletions
@@ -418,7 +418,7 @@ public class CreateFishManager : MonoSingleton<CreateFishManager>
                //list[Random.Range(0, c.Count)].isCreate = 2;
                foreach (var item in list)
                {
-                    if (item.fishNumber == 13029.ToString())
+                    if (item.fishNumber == 13033.ToString())
                    {
                        item.isCreate = 2;
                    }