diff --git a/Assets/Scenes/TestScene.unity b/Assets/Scenes/TestScene.unity index 65d966e..c952721 100644 --- a/Assets/Scenes/TestScene.unity +++ b/Assets/Scenes/TestScene.unity @@ -225,10 +225,10 @@ MonoBehaviour: m_GameObject: {fileID: 154033017} m_Enabled: 1 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 21edae6d584d6527bbb87c3393c1274f, type: 3} + m_Script: {fileID: 11500000, guid: c37c1b94acdd7be698608e78ad857060, type: 3} m_Name: m_EditorClassIdentifier: - tilePrefab: {fileID: 7573435787306895624, guid: a3113b7ce76b2d5c1998c0dadca2acdd, type: 3} + tile: {fileID: 7573435787306895624, guid: a3113b7ce76b2d5c1998c0dadca2acdd, type: 3} --- !u!1 &1664013424 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/ContentGenerator.cs b/Assets/Scripts/ContentGenerator.cs index 980ea14..a48debd 100644 --- a/Assets/Scripts/ContentGenerator.cs +++ b/Assets/Scripts/ContentGenerator.cs @@ -22,19 +22,19 @@ public class ContentGenerator : MonoBehaviour public GameObject generateContent(string tiletype) { - switch (tiletype) + switch (tiletype.ToLower()) { - case "Plane": + case "plane": return generateTileContent(); - case "Mountain": + case "mountains": return generateStoneTileContent(); - case "Forest": + case "forest": return generateTreeTileContent(); - case "River": + case "river": return generateRiverTileContent(); - case "Lake": + case "lake": return generateLakeTileContent(); - case "City": + case "city": return generateCityTileContent(); } return null; diff --git a/Assets/Scripts/Handler/SteamWorksHandler.cs b/Assets/Scripts/Handler/SteamWorksHandler.cs index ea19b5b..6aa214d 100644 --- a/Assets/Scripts/Handler/SteamWorksHandler.cs +++ b/Assets/Scripts/Handler/SteamWorksHandler.cs @@ -20,7 +20,7 @@ public class SteamWorksHandler : MonoBehaviour { if (counterForest != -1 && !isGodMode()) { - if (tiletype == "Forest") + if (tiletype.ToLower() == "forest") { counterForest++; } diff --git a/Assets/Scripts/Handler/UIHandler.cs b/Assets/Scripts/Handler/UIHandler.cs index 65300a5..4d5f405 100644 --- a/Assets/Scripts/Handler/UIHandler.cs +++ b/Assets/Scripts/Handler/UIHandler.cs @@ -53,7 +53,7 @@ namespace Assets.Scripts { GameObject coordinates = GameObject.Find("txtCoordinates"); Vector3 position = GameObject.Find("Player").transform.position; - string tiletype = GameObject.Find("WorldGenerator").GetComponent().getCurrentTile().GetComponent().getTileType(); + string tiletype = GameObject.Find("WorldGenerator").GetComponent().getCurrentTile().GetComponent().getTileType().ToString(); if (tiletype != null) { tiletype = tiletype.Replace("Tile", ""); diff --git a/Assets/Scripts/NoiseGenerator.cs b/Assets/Scripts/NoiseGenerator.cs index 8a51577..77ef8b1 100644 --- a/Assets/Scripts/NoiseGenerator.cs +++ b/Assets/Scripts/NoiseGenerator.cs @@ -9,44 +9,7 @@ using System.Linq; public class NoiseGenerator { System.Random rand = new System.Random(); - public void applyNoise(GameObject tile, string name, Dictionary map) - { - /*if(name.Length > 0){ - applyCityNoise(tile); - } - else{ - applyNormalNoise(tile, map); - }*/ - applyNewNoise(tile, map); - - } - - private void applyCityNoise(GameObject tile) - { - //resetMesh(tile); - Mesh mesh = tile.GetComponent().mesh; - Vector3[] vertices = mesh.vertices; - float[] samples; - Color32[] colors; - int chance = rand.Next(1, 101); - samples = calculateSamplesCity(tile); - string tiletype = "City"; - - colors = new Color32[samples.Length]; - for (int i = 0; i < samples.Length; i++) - { - colors[i] = new Color32(0, 185, 0, 255); - } - - for (int i = 0; i < samples.Length; i++) - { - vertices[i].y = samples[i] * 3; - } - applyMesh(tile, vertices, mesh, colors); - tile.GetComponent().setType(tiletype); - } - - private void applyNewNoise(GameObject tile, Dictionary map) + public void applyNoise(GameObject tile, Dictionary map, Vector3 index) { //resetMesh(tile); Mesh mesh = tile.GetComponent().mesh; @@ -55,90 +18,44 @@ public class NoiseGenerator Color32[] colors; Color32 low; Color32 high; - string tiletype = ""; - samples = calculateBasicSamples(tile); - - low = new Color32(0, 150, 0, 255); - high = new Color32(0, 110, 20, 255); - - float lowestValue = 10; - float highestValue = 0; - - for (int i = 0; i < samples.Length; i++) - { - if (lowestValue > samples[i]) - { - lowestValue = samples[i]; - } - if (highestValue < samples[i]) - { - highestValue = samples[i]; - } - } - - float modifier = highestValue - lowestValue; - - colors = new Color32[samples.Length]; - for (int i = 0; i < samples.Length; i++) - { - colors[i] = Color32.Lerp(low, high, (1 / modifier) * (samples[i] - lowestValue)); - } - - for (int i = 0; i < samples.Length; i++) - { - vertices[i].y = samples[i] * 3; - } - applyMesh(tile, vertices, mesh, colors); - tile.GetComponent().setType(tiletype); - } - - private void applyNormalNoise(GameObject tile, Dictionary map) - { - //resetMesh(tile); - Mesh mesh = tile.GetComponent().mesh; - Vector3[] vertices = mesh.vertices; - float[] samples; - Color32[] colors; - Color32 low; - Color32 high; - int chance = rand.Next(1, 101); - string tiletype = ""; - if (chance > 85 && chance <= 100) - { - samples = calculateSamplesForest(tile); - low = new Color32(0, 150, 0, 255); - high = new Color32(0, 110, 20, 255); - tiletype = "Forest"; - } - else if (chance > 70 && chance <= 85) - { - samples = calculateSamplesMountain(tile); - low = new Color32(0, 150, 0, 255); - high = new Color32(140, 140, 140, 255); - tiletype = "Mountain"; - } - else if (chance > 55 && chance <= 70) - { - samples = calculateSamplesLake(tile); - low = new Color32(30, 110, 190, 255); - high = new Color32(0, 150, 0, 255); - tiletype = "Lake"; - } - else if (chance > 40 && chance <= 55) - { - samples = calculateSamplesRiver(tile); - low = new Color32(30, 160, 190, 255); - high = new Color32(0, 150, 0, 255); - tiletype = "River"; + List availableTypes = checkAvailability(map, index); + TileType tiletype = TileType.NULL; + if (index == new Vector3(0, 0, 0)) + { //IS SPAWN + tiletype = (TileType)rand.Next(0, TileTypeMethods.getHighest() + 1); } else { - samples = calculateSamplesPlane(tile); - low = new Color32(0, 150, 0, 255); - high = new Color32(0, 185, 0, 255); - tiletype = "Plane"; + if (availableTypes.Count == 0) + { + Debug.Log("NO MATCH FOUND"); + } + else + { + if (availableTypes.Contains(TileType.CITY)) + { + if (rand.Next(0, 101) < 10) + { + tiletype = TileType.CITY; + SteamWorksHandler.getStandardAchievement("CityAchievement"); + } + else + { + availableTypes.Remove(TileType.CITY); + tiletype = availableTypes[rand.Next(0, availableTypes.Count)]; + } + } + else + { + tiletype = availableTypes[rand.Next(0, availableTypes.Count)]; + } + } } + tile.name = tiletype.ToString() + "_" + map.Count; + low = TileTypeMethods.getLowestColor(tiletype); + high = TileTypeMethods.getHighestColor(tiletype); + samples = TileTypeMethods.generateSamples(tiletype, vertices, rand); float lowestValue = 10; float highestValue = 0; @@ -163,14 +80,156 @@ public class NoiseGenerator colors[i] = Color32.Lerp(low, high, (1 / modifier) * (samples[i] - lowestValue)); } + //Connect samples to neighbours + samples = connectNeighbourSamples(samples, map, index); + colors = connectNeighbourColors(colors, map, index); + for (int i = 0; i < samples.Length; i++) { vertices[i].y = samples[i] * 3; } - applyMesh(tile, vertices, mesh, colors); - tile.GetComponent().setType(tiletype); + + applyMesh(tile, mesh, vertices, colors); } + private List checkAvailability(Dictionary tiles, Vector3 index) + { + List> toCheck = new List>(); + List result = new List(); + for (int i = 0; i < TileTypeMethods.getHighest() + 1; i++) + { + result.Add((TileType)i); + } + + if (tiles.ContainsKey(index - new Vector3(1, 0, 0))) + { + toCheck.Add(tiles[index - new Vector3(1, 0, 0)].GetComponent().getPossibleNeighbours()); + } + if (tiles.ContainsKey(index - new Vector3(-1, 0, 0))) + { + toCheck.Add(tiles[index - new Vector3(-1, 0, 0)].GetComponent().getPossibleNeighbours()); + } + if (tiles.ContainsKey(index - new Vector3(0, 0, 1))) + { + toCheck.Add(tiles[index - new Vector3(0, 0, 1)].GetComponent().getPossibleNeighbours()); + } + if (tiles.ContainsKey(index - new Vector3(0, 0, -1))) + { + toCheck.Add(tiles[index - new Vector3(0, 0, -1)].GetComponent().getPossibleNeighbours()); + } + + for (int i = 0; i < toCheck.Count; i++) + { + result = result.Intersect(toCheck[i]).ToList(); + } + + return result; + } + + private float[] connectNeighbourSamples(float[] basis, Dictionary tiles, Vector3 index) + { + float[] result = basis; + Mesh mesh; + Vector3[] vertices; + int sidelength = (int)Mathf.Sqrt(result.Length); + + if (tiles.ContainsKey(index - new Vector3(1, 0, 0))) //Links + { + mesh = tiles[index - new Vector3(1, 0, 0)].GetComponent().mesh; + vertices = mesh.vertices; + for (int i = 0; i < sidelength; i++) + { + result[sidelength - 1 + i * sidelength] = vertices[0 + i * sidelength].y / 3; + result[sidelength - 2 + i * sidelength] = (result[sidelength - 1 + i * sidelength] + result[sidelength - 3 + i * sidelength]) / 2; + } + } + if (tiles.ContainsKey(index - new Vector3(-1, 0, 0))) //Rechts + { + mesh = tiles[index - new Vector3(-1, 0, 0)].GetComponent().mesh; + vertices = mesh.vertices; + for (int i = 0; i < sidelength; i++) + { + result[0 + i * sidelength] = vertices[sidelength - 1 + i * sidelength].y / 3; + result[1 + i * sidelength] = (result[0 + i * sidelength] + result[2 + i * sidelength]) / 2; + } + + } + if (tiles.ContainsKey(index - new Vector3(0, 0, 1))) //Unten + { + mesh = tiles[index - new Vector3(0, 0, 1)].GetComponent().mesh; + vertices = mesh.vertices; + for (int i = 0; i < sidelength; i++) + { + result[sidelength * sidelength - (sidelength - i)] = vertices[i].y / 3; + result[sidelength * (sidelength - 1) - (sidelength - i)] = (result[sidelength * sidelength - (sidelength - i)] + result[sidelength * (sidelength - 2) - (sidelength - i)]) / 2; + } + + } + if (tiles.ContainsKey(index - new Vector3(0, 0, -1))) //Oben + { + mesh = tiles[index - new Vector3(0, 0, -1)].GetComponent().mesh; + vertices = mesh.vertices; + for (int i = 0; i < sidelength; i++) + { + result[i] = vertices[sidelength * sidelength - (sidelength - i)].y / 3; + result[i + sidelength] = (result[i] + result[i + sidelength * 2]) / 2; + } + } + return result; + } + + private Color32[] connectNeighbourColors(Color32[] basis, Dictionary tiles, Vector3 index) + { + Color32[] result = basis; + Mesh mesh; + Color32[] colors; + int sidelength = (int)Mathf.Sqrt(result.Length); + + if (tiles.ContainsKey(index - new Vector3(1, 0, 0))) //Links + { + mesh = tiles[index - new Vector3(1, 0, 0)].GetComponent().mesh; + colors = mesh.colors32; + for (int i = 0; i < sidelength; i++) + { + result[sidelength - 1 + i * sidelength] = colors[0 + i * sidelength]; + result[sidelength - 2 + i * sidelength] = Color32.Lerp(result[sidelength - 1 + i * sidelength], result[sidelength - 3 + i * sidelength], 0.5f); + } + } + if (tiles.ContainsKey(index - new Vector3(-1, 0, 0))) //Rechts + { + mesh = tiles[index - new Vector3(-1, 0, 0)].GetComponent().mesh; + colors = mesh.colors32; + for (int i = 0; i < sidelength; i++) + { + result[0 + i * sidelength] = colors[sidelength - 1 + i * sidelength]; + result[1 + i * sidelength] = Color32.Lerp(result[0 + i * sidelength], result[2 + i * sidelength], 0.5f); + } + + } + if (tiles.ContainsKey(index - new Vector3(0, 0, 1))) //Unten + { + mesh = tiles[index - new Vector3(0, 0, 1)].GetComponent().mesh; + colors = mesh.colors32; + for (int i = 0; i < sidelength; i++) + { + result[sidelength * sidelength - (sidelength - i)] = colors[i]; + result[sidelength * (sidelength - 1) - (sidelength - i)] = Color32.Lerp(result[sidelength * sidelength - (sidelength - i)], result[sidelength * (sidelength - 2) - (sidelength - i)], 0.5f); + } + } + if (tiles.ContainsKey(index - new Vector3(0, 0, -1))) //Oben + { + mesh = tiles[index - new Vector3(0, 0, -1)].GetComponent().mesh; + colors = mesh.colors32; + for (int i = 0; i < sidelength; i++) + { + result[i] = colors[sidelength * sidelength - (sidelength - i)]; + result[i + sidelength] = Color32.Lerp(result[i], result[i + sidelength * 2], 0.5f); + } + } + return result; + } + + private void resetMesh(GameObject tile) { Mesh mesh = tile.GetComponent().sharedMesh; @@ -185,144 +244,15 @@ public class NoiseGenerator tile.GetComponent().sharedMesh = mesh; } - private float[] calculateBasicSamples(GameObject tile) - { - Mesh mesh = tile.GetComponent().mesh; - Vector3[] vertices = mesh.vertices; - float[] samples = new float[vertices.Length]; - for (int i = 0; i < vertices.Length; i++) - { - float xCord = tile.GetComponent().getPosition().x + vertices[i].x / (vertices.Length - 1) * 10; - float yCord = tile.GetComponent().getPosition().z + vertices[i].z / (vertices.Length - 1) * 10; - float sample = Mathf.PerlinNoise(xCord, yCord) - 0.1f * rand.Next(0, 6); - samples[i] = sample; - } - return samples; - } - private float[] calculateSamplesCity(GameObject tile) - { - Mesh mesh = tile.GetComponent().mesh; - Vector3[] vertices = mesh.vertices; - float[] samples = new float[vertices.Length]; - for (int i = 0; i < vertices.Length; i++) - { - samples[i] = 0; - } - return samples; - } - - private float[] calculateSamplesPlane(GameObject tile) - { - float[] samples = calculateBasicSamples(tile); - return samples; - } - - private float[] calculateSamplesForest(GameObject tile) - { - float[] samples = calculateBasicSamples(tile); - return samples; - } - - private float[] calculateSamplesMountain(GameObject tile) - { - Mesh mesh = tile.GetComponent().mesh; - Vector3[] vertices = mesh.vertices; - float[] samples = calculateBasicSamples(tile); - - int amount = rand.Next(1, 5); - int index = 0; - for (int i = 0; i < amount; i++) - { - do - { - index = rand.Next(0, samples.Length); - if (vertices[index].x != 5 && vertices[index].z != 5 && vertices[index].x != -5 && vertices[index].z != -5) - { - samples[index] = 3; - break; - } - } while (true); - } - return samples; - } - - private float[] calculateSamplesRiver(GameObject tile) - { - Mesh mesh = tile.GetComponent().mesh; - Vector3[] vertices = mesh.vertices; - float[] samples = calculateBasicSamples(tile); - - bool isVertical = (rand.Next(0, 2) == 0 ? true : false); - int startX = 0; - int startZ = 0; - - if (isVertical) - { - startZ = (rand.Next(0, 2) == 0 ? 4 : -4); - startX = rand.Next(-4, 5); - } - else - { - startZ = rand.Next(-4, 5); - startX = (rand.Next(0, 2) == 0 ? 4 : -4); - } - - for (int k = 0; k < vertices.Length; k++) - { - if (isVertical) - { - if (Mathf.Round(vertices[k].x) == startX && Mathf.Round(vertices[k].z) != 5 && Mathf.Round(vertices[k].z) != -5) - { - samples[k] = samples[k] - rand.Next(2, 4) + 0.5f; - } - } - else - { - if (Mathf.Round(vertices[k].x) != 5 && Mathf.Round(vertices[k].x) != -5 && Mathf.Round(vertices[k].z) == startZ) - { - samples[k] = samples[k] - rand.Next(2, 4) + 0.5f; - } - } - } - - return samples; - } - - private float[] calculateSamplesLake(GameObject tile) - { - Mesh mesh = tile.GetComponent().mesh; - Vector3[] vertices = mesh.vertices; - float[] samples = calculateBasicSamples(tile); - - int randX = rand.Next(-3, 4); - int randZ = rand.Next(-3, 4); - - for (int i = -1; i < 2; i++) - { - for (int j = -1; j < 2; j++) - { - for (int k = 0; k < vertices.Length; k++) - { - if (Mathf.Round(vertices[k].x) == randX + i && Mathf.Round(vertices[k].z) == randZ + j) - { - samples[k] = samples[k] - rand.Next(1, 3) - 0.25f * rand.Next(0, 4); - break; - } - } - } - } - return samples; - } - - - private void applyMesh(GameObject tile, Vector3[] vertices, Mesh mesh, Color32[] colors) + public void applyMesh(GameObject tile, Mesh mesh, Vector3[] vertices, Color32[] colors) { mesh.vertices = vertices; + mesh.colors32 = colors; mesh.RecalculateBounds(); mesh.RecalculateNormals(); - mesh.colors32 = colors; tile.GetComponent().sharedMesh = mesh; + tile.GetComponent().sharedMesh = mesh; } public void saveTile(GameObject tile, string path) @@ -374,6 +304,6 @@ public class NoiseGenerator parts = current.Value().Split('/'); vertices[i] = new Vector3(float.Parse(parts[0]), float.Parse(parts[1]), float.Parse(parts[2])); } - applyMesh(tile, vertices, tile.GetComponent().mesh, colors); + applyMesh(tile, tile.GetComponent().mesh, vertices, colors); } } diff --git a/Assets/Scripts/Quests/FindQuest.cs b/Assets/Scripts/Quests/FindQuest.cs index 85fd4f9..8133738 100644 --- a/Assets/Scripts/Quests/FindQuest.cs +++ b/Assets/Scripts/Quests/FindQuest.cs @@ -52,7 +52,7 @@ namespace Assets.Scripts public void update(object obj, int amount) { GameObject tile = (GameObject)obj; - string tilename = tile.GetComponent().getTileType(); + string tilename = tile.GetComponent().getTileType().ToString(); if (keyword == "Forest" && tilename.ToLower().Contains("forest")) { current++; diff --git a/Assets/Scripts/Testing/NoiseTesting.cs b/Assets/Scripts/Testing/NoiseTesting.cs deleted file mode 100644 index 00e63a4..0000000 --- a/Assets/Scripts/Testing/NoiseTesting.cs +++ /dev/null @@ -1,204 +0,0 @@ -using System; -using System.Collections; -using System.Collections.Generic; -using System.Linq; -using UnityEngine; -using UnityEngine.InputSystem; - -public class NoiseTesting : MonoBehaviour -{ - System.Random rand = new System.Random(); - Dictionary mapGen; - Vector3 current; - Vector3 next; - public GameObject tilePrefab; - // Start is called before the first frame update - void Start() - { - mapGen = new Dictionary(); - current = new Vector3(0, 0, 0); - mapGen.Add(current, Instantiate(tilePrefab, current, Quaternion.identity)); - applyNormalNoise(mapGen[current], mapGen); - } - - // Update is called once per frame - void Update() - { - if (Input.GetKeyDown(KeyCode.Space)) - { - applyNormalNoise(mapGen[new Vector3(0, 0, 0)], mapGen); - } - - if (Input.GetKeyDown(KeyCode.A)) - { - next = current - new Vector3(100, 0, 0); - } - if (Input.GetKeyDown(KeyCode.W)) - { - next = current - new Vector3(0, 0, -100); - } - if (Input.GetKeyDown(KeyCode.D)) - { - next = current - new Vector3(-100, 0, 0); - } - if (Input.GetKeyDown(KeyCode.S)) - { - next = current - new Vector3(0, 0, 100); - } - - if (next != current) - { - current = next; - if (!mapGen.ContainsKey(current)) - { - mapGen.Add(current, Instantiate(tilePrefab, current, Quaternion.identity)); - applyNormalNoise(mapGen[current], mapGen); - } - - } - } - - private void applyNormalNoise(GameObject tile, Dictionary map) - { - //resetMesh(tile); - Mesh mesh = tile.GetComponent().mesh; - Vector3[] vertices = mesh.vertices; - //float[] samples = calculateBasicSamples(tile); - float[] samples = calculateConnectedSamples(tile); - - Color32[] colors; - Color32 low = new Color32(0, 150, 0, 255); - Color32 high = new Color32(0, 110, 20, 255); - string tiletype = ""; - - float lowestValue = 10; - float highestValue = 0; - - for (int i = 0; i < samples.Length; i++) - { - if (lowestValue > samples[i]) - { - lowestValue = samples[i]; - } - if (highestValue < samples[i]) - { - highestValue = samples[i]; - } - } - - float modifier = highestValue - lowestValue; - - colors = new Color32[samples.Length]; - for (int i = 0; i < samples.Length; i++) - { - colors[i] = Color32.Lerp(low, high, (1 / modifier) * (samples[i] - lowestValue)); - } - - for (int i = 0; i < samples.Length; i++) - { - vertices[i].y = samples[i];// * 3; - } - applyMesh(tile, vertices, mesh, colors); - //tile.GetComponent().setType(tiletype); - } - - private void resetMesh(GameObject tile) - { - Mesh mesh = tile.GetComponent().sharedMesh; - Vector3[] vertices = mesh.vertices; - for (int i = 0; i < vertices.Length; i++) - { - vertices[i].y = 0; - } - mesh.vertices = vertices; - mesh.RecalculateBounds(); - mesh.RecalculateNormals(); - tile.GetComponent().sharedMesh = mesh; - } - - private float[] calculateBasicSamples(GameObject tile) - { - Mesh mesh = tile.GetComponent().mesh; - Vector3[] vertices = mesh.vertices; - float[] samples = new float[vertices.Length]; - for (int i = 0; i < vertices.Length; i++) - { - float xCord = vertices[i].x / (vertices.Length - 1) * 10; - float zCord = vertices[i].z / (vertices.Length - 1) * 10; - float sample = Mathf.PerlinNoise(xCord, zCord) - 0.5f * rand.Next(0, 6); - samples[i] = sample; - } - return samples; - } - - private float[] calculateConnectedSamples(GameObject tile) - { - //Working with "next" as index for tile to be generated - //Working with "mapGen" as map Placeholder to check against neighbours - Mesh mesh = tile.GetComponent().mesh; - Vector3[] vertices = mesh.vertices; - float[] samples = Enumerable.Repeat(-100f, vertices.Length).ToArray(); - int sideLength = Mathf.RoundToInt(Mathf.Sqrt(vertices.Length)); - samples = connectSamples(samples, sideLength); - - for (int i = 0; i < vertices.Length; i++) - { - if (samples[i] == -100) - { - float xCord = vertices[i].x / (vertices.Length - 1) * 10; - float zCord = vertices[i].z / (vertices.Length - 1) * 10; - float sample = Mathf.PerlinNoise(xCord, zCord) - 1f * rand.Next(0, 6); - samples[i] = sample; - } - } - return samples; - } - - private void applyMesh(GameObject tile, Vector3[] vertices, Mesh mesh, Color32[] colors) - { - mesh.vertices = vertices; - mesh.RecalculateBounds(); - mesh.RecalculateNormals(); - mesh.colors32 = colors; - tile.GetComponent().sharedMesh = mesh; - } - - private float[] connectSamples(float[] samples, int sideLength) - { - Mesh mesh; - Vector3[] vertices; - - for (int i = 0; i < sideLength; i++) - { - if (mapGen.ContainsKey(next - new Vector3(100, 0, 0))) - { //LINKS - mesh = mapGen[next - new Vector3(100, 0, 0)].GetComponent().mesh; - vertices = mesh.vertices; - samples[sideLength - 1 + sideLength * i] = vertices[sideLength * i].y; - } - - if (mapGen.ContainsKey(next - new Vector3(-100, 0, 0))) - { //RECHTS - mesh = mapGen[next - new Vector3(-100, 0, 0)].GetComponent().mesh; - vertices = mesh.vertices; - samples[sideLength * i] = vertices[sideLength - 1 + sideLength * i].y; - } - - if (mapGen.ContainsKey(next - new Vector3(0, 0, -100))) - { //OBEN - mesh = mapGen[next - new Vector3(0, 0, -100)].GetComponent().mesh; - vertices = mesh.vertices; - samples[i] = vertices[(sideLength * sideLength) - (sideLength-i)].y; - } - - if (mapGen.ContainsKey(next - new Vector3(0, 0, 100))) - { //UNTEN - mesh = mapGen[next - new Vector3(0, 0, 100)].GetComponent().mesh; - vertices = mesh.vertices; - samples[(sideLength * sideLength) - (sideLength-i)] = vertices[i].y; - } - } - - return samples; - } -} diff --git a/Assets/Scripts/Testing/Tile.prefab b/Assets/Scripts/Testing/Tile.prefab index 52d84d6..f8f949c 100644 --- a/Assets/Scripts/Testing/Tile.prefab +++ b/Assets/Scripts/Testing/Tile.prefab @@ -131,6 +131,7 @@ GameObject: - component: {fileID: 7573435787306895637} - component: {fileID: 7573435787306895626} - component: {fileID: 7602326841346784209} + - component: {fileID: 6053739292490587254} m_Layer: 0 m_Name: Tile m_TagString: Tile @@ -226,3 +227,15 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!114 &6053739292490587254 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7573435787306895624} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 82f0b9ba1d91bf9148eb63b088e12979, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Scripts/Tile.cs b/Assets/Scripts/Tile.cs index 3b8bd8b..174579c 100644 --- a/Assets/Scripts/Tile.cs +++ b/Assets/Scripts/Tile.cs @@ -1,5 +1,6 @@ using Assets.Scripts; using Newtonsoft.Json.Linq; +using System; using System.Collections; using System.Collections.Generic; using System.Linq; @@ -13,18 +14,15 @@ public class Tile : MonoBehaviour float borderSouth; float borderWest; System.Random rand = new System.Random(); - string tiletype; + TileType tiletype; GameObject contentGenerator; List aliveEnemies = new List(); - public void generateTile(Vector3 pos, string type) + public void generateTile(Vector3 pos, TileType type) { - if (tiletype == null) - { - tiletype = type; - } - SteamWorksHandler.getForestAchievement(type); + tiletype = type; + SteamWorksHandler.getForestAchievement(type.ToString()); contentGenerator = GameObject.Find("ContentGenerator"); setPosition(pos); setBorders(); @@ -58,7 +56,7 @@ public class Tile : MonoBehaviour int xChange = 0; int zChange = 0; int sideLimiter = 0; - if(tiletype == "City"){ + if(tiletype == TileType.CITY){ sideLimiter = 20; } else{ @@ -70,7 +68,7 @@ public class Tile : MonoBehaviour { xChange = rand.Next(-2, +2); zChange = rand.Next(-2, +2); - if(tiletype == "City"){ + if(tiletype == TileType.CITY){ list.Add(new Vector3(j + xChange, 0, i + zChange)); } else{ @@ -87,10 +85,10 @@ public class Tile : MonoBehaviour int chance = rand.Next(1, 101); if (chance >= 25) { - GameObject content = contentGenerator.GetComponent().generateContent(tiletype); + GameObject content = contentGenerator.GetComponent().generateContent(tiletype.ToString()); if (content != null) { - if(tiletype == "City" && (content.tag.ToLower().Contains("npc") || content.tag.ToLower().Contains("tree") || content.tag.ToLower().Contains("stone") || content.tag.ToLower().Contains("ore"))){ + if(tiletype == TileType.CITY && (content.tag.ToLower().Contains("npc") || content.tag.ToLower().Contains("tree") || content.tag.ToLower().Contains("stone") || content.tag.ToLower().Contains("ore"))){ position.y = 5; } GameObject obj = Instantiate(content, position, Quaternion.identity); @@ -113,7 +111,7 @@ public class Tile : MonoBehaviour return position; } - public void setType(string tiletype) + public void setType(TileType tiletype) { this.tiletype = tiletype; } @@ -199,7 +197,7 @@ public class Tile : MonoBehaviour Destroy(enemy); } - public string getTileType() + public TileType getTileType() { return tiletype; } @@ -291,8 +289,12 @@ public class Tile : MonoBehaviour } } } - tiletype = json["tiletype"].ToString(); + tiletype = (TileType)Enum.Parse(typeof(TileType), json["tiletype"].ToString()); setPosition(pos); setBorders(); } + + public List getPossibleNeighbours(){ + return TileTypeMethods.getPossibleNeighbours(tiletype); + } } \ No newline at end of file diff --git a/Assets/Scripts/TileType.cs b/Assets/Scripts/TileType.cs new file mode 100644 index 0000000..6cb38a0 --- /dev/null +++ b/Assets/Scripts/TileType.cs @@ -0,0 +1,220 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using UnityEngine; + +namespace Assets.Scripts +{ + public enum TileType + { + PLAIN, + HILLS, + FOREST, + MOUNTAINS, + LAKE, + CITY, + DESERT, + NULL + } + + static class TileTypeMethods + { + public static TileType getRandomType(int index) + { + return (TileType)index; + } + + public static int getHighest() + { + return (int)TileType.DESERT; + } + + public static List getPossibleNeighbours(TileType toCheck) + { + List result = new List(); + switch (toCheck) + { + case TileType.PLAIN: + result.Add(TileType.PLAIN); + result.Add(TileType.FOREST); + result.Add(TileType.LAKE); + result.Add(TileType.MOUNTAINS); + result.Add(TileType.DESERT); + result.Add(TileType.HILLS); + break; + case TileType.FOREST: + result.Add(TileType.PLAIN); + result.Add(TileType.FOREST); + break; + case TileType.MOUNTAINS: + result.Add(TileType.PLAIN); + result.Add(TileType.MOUNTAINS); + break; + case TileType.LAKE: + result.Add(TileType.PLAIN); + result.Add(TileType.LAKE); + result.Add(TileType.DESERT); + result.Add(TileType.CITY); + break; + case TileType.DESERT: + result.Add(TileType.PLAIN); + result.Add(TileType.LAKE); + result.Add(TileType.DESERT); + break; + case TileType.HILLS: + result.Add(TileType.PLAIN); + result.Add(TileType.HILLS); + break; + case TileType.CITY: + result.Add(TileType.LAKE); + break; + } + return result; + } + + public static Color getLowestColor(TileType type) + { + Color32 result; + switch (type) + { + case TileType.PLAIN: + result = new Color32(0, 150, 0, 255); + break; + case TileType.HILLS: + result = new Color32(0, 150, 0, 255); + break; + case TileType.FOREST: + result = new Color32(0, 150, 0, 255); + break; + case TileType.MOUNTAINS: + result = new Color32(0, 150, 0, 255); + break; + case TileType.LAKE: + result = new Color32(30, 110, 190, 255); + break; + case TileType.DESERT: + result = new Color32(219, 186, 162, 255); + break; + default: + result = new Color32(0, 150, 0, 255); + break; + } + return result; + } + + public static Color32 getHighestColor(TileType type) + { + Color32 result; + switch (type) + { + case TileType.PLAIN: + result = new Color32(0, 185, 0, 255); + break; + case TileType.HILLS: + result = new Color32(0, 185, 0, 255); + break; + case TileType.FOREST: + result = new Color32(0, 110, 20, 255); + break; + case TileType.MOUNTAINS: + result = new Color32(140, 140, 140, 255); + break; + case TileType.LAKE: + result = new Color32(0, 150, 0, 255); + break; + case TileType.DESERT: + result = new Color32(237, 201, 175, 255); + break; + default: + result = new Color32(0, 185, 0, 255); + break; + } + return result; + } + + public static float[] generateSamples(TileType type, Vector3[] vertices, System.Random rand) + { + float[] result = new float[vertices.Length]; + float part1; + float part2; + float[] lowModifier = new float[2]; + float[] highModifier = new float[2]; + switch (type) + { + case TileType.PLAIN: + lowModifier[0] = 0.2f; + lowModifier[1] = 0.1f; + highModifier[0] = 0.2f; + highModifier[1] = 0.1f; + break; + case TileType.HILLS: + lowModifier[0] = 0.2f; + lowModifier[1] = 0.1f; + highModifier[0] = 0.5f; + highModifier[1] = 0.1f; + break; + case TileType.FOREST: + lowModifier[0] = 0.15f; + lowModifier[1] = 0.1f; + highModifier[0] = 0.3f; + highModifier[1] = 0.1f; + break; + case TileType.MOUNTAINS: + lowModifier[0] = 0.2f; + lowModifier[1] = 0.3f; + highModifier[0] = 1.25f; + highModifier[1] = 0.2f; + break; + case TileType.LAKE: + lowModifier[0] = 0.2f; + lowModifier[1] = 0.1f; + highModifier[0] = 0.3f; + highModifier[1] = 0.1f; + break; + case TileType.DESERT: + lowModifier[0] = 0.2f; + lowModifier[1] = 0.1f; + highModifier[0] = 0.5f; + highModifier[1] = 0.1f; + break; + case TileType.CITY: + lowModifier[0] = 0.1f; + lowModifier[1] = 0.1f; + highModifier[0] = 0.1f; + highModifier[1] = 0.1f; + break; + } + for (int i = 0; i < result.Length; i++) + { + part1 = Mathf.PerlinNoise(vertices[i].x, vertices[i].z) - lowModifier[0] * rand.Next(0, 6); + part2 = Mathf.PerlinNoise(vertices[i].x, vertices[i].z) + highModifier[0] * rand.Next(0, 6); + + result[i] = part1 * lowModifier[1] + part2 * highModifier[0]; + } + + result = adaptType(type, result); + return result; + } + + private static float[] adaptType(TileType type, float[] basis) + { + float[] result = basis; + for (int i = 0; i < result.Length; i++) + { + switch (type) + { + case TileType.LAKE: + result[i] = basis[i] - 3; + break; + case TileType.MOUNTAINS: + result[i] = basis[i] + 3; + break; + } + } + + return result; + } + } +} diff --git a/Assets/Scripts/Testing/NoiseTesting.cs.meta b/Assets/Scripts/TileType.cs.meta similarity index 83% rename from Assets/Scripts/Testing/NoiseTesting.cs.meta rename to Assets/Scripts/TileType.cs.meta index 2639d67..c619cad 100644 --- a/Assets/Scripts/Testing/NoiseTesting.cs.meta +++ b/Assets/Scripts/TileType.cs.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: 21edae6d584d6527bbb87c3393c1274f +guid: 6ff18c0c54befd41f991b73e3835539c MonoImporter: externalObjects: {} serializedVersion: 2 diff --git a/Assets/Scripts/WorldGenerator.cs b/Assets/Scripts/WorldGenerator.cs index 51f30d2..ccf6435 100644 --- a/Assets/Scripts/WorldGenerator.cs +++ b/Assets/Scripts/WorldGenerator.cs @@ -78,22 +78,11 @@ public class WorldGenerator : MonoBehaviour public void createSpawn() { Vector3 pos = new Vector3(0, 0, 0); - string name = ""; Vector3 mapPos = new Vector3(pos.x * 100, 0, pos.z * 100); GameObject newTile = Instantiate(tile, mapPos, Quaternion.identity); - noise.applyNoise(newTile, name, tiles); - if (name.Length <= 0) - { - name = tile.name; - } - if (name.Contains("_")) - { - name = name.Split('_')[0]; - } - newTile.name = name + "_" + tiles.Count; - newTile.GetComponent().generateTile(pos, name); + noise.applyNoise(newTile, tiles, pos); + newTile.GetComponent().generateTile(pos, (TileType)Enum.Parse(typeof(TileType), newTile.name.Split("_")[0])); tiles.Add(pos, newTile); - renderedTiles.Add(newTile); currentTile = newTile; } @@ -106,41 +95,13 @@ public class WorldGenerator : MonoBehaviour int chance = rand.Next(1, 11); Vector3 mapPos = new Vector3(pos.x * 100, 0, pos.z * 100); GameObject newTile = Instantiate(tile, mapPos, Quaternion.identity); - if (chance == 1) - { - if (cityAmount > 0) - { - name = "City"; - cityAmount--; - SteamWorksHandler.getStandardAchievement("CityAchievement"); - } - } - noise.applyNoise(newTile, name, tiles); - if (name.Length <= 0) - { - name = tile.name; - } - if (name.Contains("_")) - { - name = name.Split('_')[0]; - } - newTile.name = name + "_" + tiles.Count; - newTile.GetComponent().generateTile(pos, name); + + noise.applyNoise(newTile, tiles, pos); + newTile.GetComponent().generateTile(pos, (TileType)Enum.Parse(typeof(TileType), newTile.name.Split("_")[0])); tiles.Add(pos, newTile); - renderedTiles.Add(newTile); + currentTile = newTile; GameObject.Find("QuestLog").GetComponent().updateQuests("find", newTile, 1); } - else - { - if (tiles.ContainsKey(pos) && pos.y == 0) - { - if (!tiles[pos].GetComponent().enabled) - { - tiles[pos].GetComponent().changeRenderer(); - renderedTiles.Add(tiles[pos]); - } - } - } } public void changeCurrentTile(float playerX, float playerZ) @@ -178,7 +139,7 @@ public class WorldGenerator : MonoBehaviour savePath = "./save/tile" + counter + ".json"; result = result + "\"tile" + counter + "\": \"" + savePath + "\""; tile.GetComponent().saveTile(savePath); - if (tile.GetComponent().getTileType() == "CityTile") + if (tile.GetComponent().getTileType() == TileType.CITY) { FileHandler.saveNoise("\r\n}", savePath); } diff --git a/Assets/Standard Assets/Environment/Water (Basic)/Materials/WaterBasicDaytime.mat b/Assets/Standard Assets/Environment/Water (Basic)/Materials/WaterBasicDaytime.mat index 2fd465a..dcdc5c8 100644 --- a/Assets/Standard Assets/Environment/Water (Basic)/Materials/WaterBasicDaytime.mat +++ b/Assets/Standard Assets/Environment/Water (Basic)/Materials/WaterBasicDaytime.mat @@ -2,187 +2,97 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 3 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: WaterBasicDaytime m_Shader: {fileID: 4800000, guid: 9dccc8e8f0da4494991c26ef59019551, type: 3} - m_ShaderKeywords: [] + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: - serializedVersion: 2 + serializedVersion: 3 m_TexEnvs: - data: - first: - name: _MainTex - second: - m_Texture: {fileID: 2800000, guid: c2ef94ff9d11915d1100a04b44295342, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _BumpMap - second: - m_Texture: {fileID: 2800000, guid: a53cf5449d11a15d1100a04b44295342, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _ReflectionTex - second: - m_Texture: {fileID: 8400000, guid: 21bb33409d118354d000dcabe39e7c39, type: 2} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _ColorControlCube - second: - m_Texture: {fileID: 8900000, guid: 98c330f39d11745ad0004adb8d76c639, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _ColorControl - second: - m_Texture: {fileID: 2800000, guid: 047330f39d11745ad0004adb8d76c639, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _WavesTex - second: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _BumpMap2 - second: - m_Texture: {fileID: 2800000, guid: 279fb0a19d11d4a6d00051fa8d76c639, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - data: - first: - name: _ColorGradient - second: - m_Texture: {fileID: 2800000, guid: 8403d3349d112ba4d000be1be39e7c39, type: 3} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 2800000, guid: a53cf5449d11a15d1100a04b44295342, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap2: + m_Texture: {fileID: 2800000, guid: 279fb0a19d11d4a6d00051fa8d76c639, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ColorControl: + m_Texture: {fileID: 2800000, guid: 047330f39d11745ad0004adb8d76c639, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ColorControlCube: + m_Texture: {fileID: 8900000, guid: 98c330f39d11745ad0004adb8d76c639, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ColorControlLava: + m_Texture: {fileID: 2800000, guid: e02cef1dae209d020bb6dc8c8b80fef4, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ColorGradient: + m_Texture: {fileID: 2800000, guid: 8403d3349d112ba4d000be1be39e7c39, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: c2ef94ff9d11915d1100a04b44295342, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ReflectionTex: + m_Texture: {fileID: 8400000, guid: 21bb33409d118354d000dcabe39e7c39, type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _WavesTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - data: - first: - name: _Shininess - second: 1 - data: - first: - name: _WaveScale - second: .0702830181 - data: - first: - name: _Highlight - second: 33.2075462 - data: - first: - name: _bScale - second: .0700000003 - data: - first: - name: _BumpPeturb - second: 82.07547 - data: - first: - name: _BumpPeturb2 - second: .745283008 - data: - first: - name: _bTwirl - second: .0500000007 - data: - first: - name: _distort - second: .100000001 + - _BumpPeturb: 82.07547 + - _BumpPeturb2: 0.745283 + - _Highlight: 33.207546 + - _Shininess: 1 + - _WaveScale: 0.07028302 + - _bScale: 0.07 + - _bTwirl: 0.05 + - _distort: 0.1 + - _isLava: 0 m_Colors: - data: - first: - name: _Color - second: {r: 0, g: 0, b: 0, a: 1} - data: - first: - name: _MainTex_ST - second: {r: 1, g: 1, b: 0, a: 0} - data: - first: - name: _SpecColor - second: {r: 0, g: 0, b: 0, a: .400000006} - data: - first: - name: _BumpMap_ST - second: {r: 1, g: 1, b: 0, a: 0} - data: - first: - name: WaveSpeed - second: {r: 9, g: 4.5, b: -8, a: -3.5} - data: - first: - name: _horizonColor - second: {r: 0, g: .125133663, b: .191176474, a: 0} - data: - first: - name: _ColorControl_ST - second: {r: 1, g: 1, b: 0, a: 0} - data: - first: - name: _ColorControlCube_ST - second: {r: 1, g: 1, b: 0, a: 0} - data: - first: - name: BumpParm - second: {r: 1, g: 1, b: 1, a: 1} - data: - first: - name: _EdgeColor - second: {r: 0, g: .100000001, b: 0, a: .100000001} - data: - first: - name: _RefTex_0 - second: {r: -1517.37024, g: -23.9408531, b: -3154.91675, a: 2715.94165} - data: - first: - name: _RefTex_1 - second: {r: 356.584351, g: -313.125671, b: -962.84906, a: 2791.50659} - data: - first: - name: _RefTex_2 - second: {r: 4.95644999, g: -.187056601, b: -13.3834057, a: 20.1233597} - data: - first: - name: _RefTex_3 - second: {r: 4.95595503, g: -.18703793, b: -13.3820696, a: 20.2213535} - data: - first: - name: horizonColor - second: {r: .61500001, g: .796000004, b: .875999987, a: 1} - data: - first: - name: uvParams - second: {r: 10, g: .0199999996, b: .0299999993, a: 0} - data: - first: - name: waveDirX - second: {r: -2.5, g: 0, b: 7, a: 8} - data: - first: - name: waveDirY - second: {r: 0, g: 1.5, b: -7, a: 1} - data: - first: - name: waveHeights - second: {r: .800000012, g: 1, b: .100000001, a: .0500000007} - data: - first: - name: _WaveSpeed - second: {r: 1, g: -1, b: -1, a: 1} + - BumpParm: {r: 1, g: 1, b: 1, a: 1} + - WaveSpeed: {r: 9, g: 4.5, b: -8, a: -3.5} + - _BumpMap_ST: {r: 1, g: 1, b: 0, a: 0} + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _ColorControlCube_ST: {r: 1, g: 1, b: 0, a: 0} + - _ColorControl_ST: {r: 1, g: 1, b: 0, a: 0} + - _EdgeColor: {r: 0, g: 0.1, b: 0, a: 0.1} + - _MainTex_ST: {r: 1, g: 1, b: 0, a: 0} + - _RefTex_0: {r: -1517.3702, g: -23.940853, b: -3154.9167, a: 2715.9417} + - _RefTex_1: {r: 356.58435, g: -313.12567, b: -962.84906, a: 2791.5066} + - _RefTex_2: {r: 4.95645, g: -0.1870566, b: -13.383406, a: 20.12336} + - _RefTex_3: {r: 4.955955, g: -0.18703793, b: -13.38207, a: 20.221354} + - _SpecColor: {r: 0, g: 0, b: 0, a: 0.4} + - _WaveSpeed: {r: 1, g: -1, b: -1, a: 1} + - _horizonColor: {r: 0, g: 0.12513366, b: 0.19117647, a: 0} + - _horizonColorLava: {r: 0.36217052, g: 0, b: 0, a: 1} + - horizonColor: {r: 0.615, g: 0.796, b: 0.876, a: 1} + - uvParams: {r: 10, g: 0.02, b: 0.03, a: 0} + - waveDirX: {r: -2.5, g: 0, b: 7, a: 8} + - waveDirY: {r: 0, g: 1.5, b: -7, a: 1} + - waveHeights: {r: 0.8, g: 1, b: 0.1, a: 0.05} + m_BuildTextureStacks: [] --- !u!1002 &2100001 EditorExtensionImpl: serializedVersion: 6 diff --git a/Assets/Standard Assets/Environment/Water (Basic)/Textures/LavaBasicDaytimeGradient 1.psd b/Assets/Standard Assets/Environment/Water (Basic)/Textures/LavaBasicDaytimeGradient 1.psd new file mode 100644 index 0000000..45b2069 Binary files /dev/null and b/Assets/Standard Assets/Environment/Water (Basic)/Textures/LavaBasicDaytimeGradient 1.psd differ diff --git a/Assets/Standard Assets/Environment/Water (Basic)/Textures/LavaBasicDaytimeGradient 1.psd.meta b/Assets/Standard Assets/Environment/Water (Basic)/Textures/LavaBasicDaytimeGradient 1.psd.meta new file mode 100644 index 0000000..7b2d836 --- /dev/null +++ b/Assets/Standard Assets/Environment/Water (Basic)/Textures/LavaBasicDaytimeGradient 1.psd.meta @@ -0,0 +1,127 @@ +fileFormatVersion: 2 +guid: e02cef1dae209d020bb6dc8c8b80fef4 +TextureImporter: + internalIDToNameTable: [] + externalObjects: {} + serializedVersion: 12 + mipmaps: + mipMapMode: 0 + enableMipMap: 1 + sRGBTexture: 1 + linearTexture: 0 + fadeOut: 0 + borderMipMap: 0 + mipMapsPreserveCoverage: 0 + alphaTestReferenceValue: 0.5 + mipMapFadeDistanceStart: 1 + mipMapFadeDistanceEnd: 3 + bumpmap: + convertToNormalMap: 0 + externalNormalMap: 0 + heightScale: 0.25 + normalMapFilter: 0 + flipGreenChannel: 0 + isReadable: 0 + streamingMipmaps: 0 + streamingMipmapsPriority: 0 + vTOnly: 0 + ignoreMipmapLimit: 0 + grayScaleToAlpha: 0 + generateCubemap: 6 + cubemapConvolution: 0 + seamlessCubemap: 0 + textureFormat: 1 + maxTextureSize: 2048 + textureSettings: + serializedVersion: 2 + filterMode: 1 + aniso: 1 + mipBias: 0 + wrapU: 1 + wrapV: 1 + wrapW: 1 + nPOTScale: 1 + lightmap: 0 + compressionQuality: 50 + spriteMode: 0 + spriteExtrude: 1 + spriteMeshType: 1 + alignment: 0 + spritePivot: {x: 0.5, y: 0.5} + spritePixelsToUnits: 100 + spriteBorder: {x: 0, y: 0, z: 0, w: 0} + spriteGenerateFallbackPhysicsShape: 1 + alphaUsage: 1 + alphaIsTransparency: 0 + spriteTessellationDetail: -1 + textureType: 0 + textureShape: 1 + singleChannelComponent: 0 + flipbookRows: 1 + flipbookColumns: 1 + maxTextureSizeSet: 0 + compressionQualitySet: 0 + textureFormatSet: 0 + ignorePngGamma: 0 + applyGammaDecoding: 0 + swizzle: 50462976 + cookieLightType: 0 + platformSettings: + - serializedVersion: 3 + buildTarget: DefaultTexturePlatform + maxTextureSize: 32 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Standalone + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + - serializedVersion: 3 + buildTarget: Server + maxTextureSize: 2048 + resizeAlgorithm: 0 + textureFormat: -1 + textureCompression: 1 + compressionQuality: 50 + crunchedCompression: 0 + allowsAlphaSplitting: 0 + overridden: 0 + ignorePlatformSupport: 0 + androidETC2FallbackOverride: 0 + forceMaximumCompressionQuality_BC6H_BC7: 0 + spriteSheet: + serializedVersion: 2 + sprites: [] + outline: [] + physicsShape: [] + bones: [] + spriteID: + internalID: 0 + vertices: [] + indices: + edges: [] + weights: [] + secondaryTextures: [] + nameFileIdTable: {} + mipmapLimitGroupName: + pSDRemoveMatte: 1 + userData: + assetBundleName: + assetBundleVariant: diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 70bb098..fe8017b 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -12,10 +12,10 @@ EditorUserSettings: value: 05550c040100590e5c0c097446220f164e164d732a7072682c2a1f31b7b7666c flags: 0 RecentlyUsedSceneGuid-2: - value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a + value: 065551555651080c54570d2741715e1541154a79752925322f2c4965b7b0646d flags: 0 RecentlyUsedSceneGuid-3: - value: 065551555651080c54570d2741715e1541154a79752925322f2c4965b7b0646d + value: 5a5757560101590a5d0c0e24427b5d44434e4c7a7b7a23677f2b4565b7b5353a flags: 0 RecentlyUsedScenePath-0: value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d diff --git a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt index 780aecf..f88ff47 100644 --- a/UserSettings/Layouts/CurrentMaximizeLayout.dwlt +++ b/UserSettings/Layouts/CurrentMaximizeLayout.dwlt @@ -20,11 +20,11 @@ MonoBehaviour: x: 0 y: 30 width: 1920 - height: 942 + height: 970 m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 21 + controlID: 1758 --- !u!114 &2 MonoBehaviour: m_ObjectHideFlags: 52 @@ -45,10 +45,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 306 - y: 118 - width: 1210 - height: 643 + x: 4146 + y: 90 + width: 1212 + height: 664 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -137,11 +137,11 @@ MonoBehaviour: size: {x: 0, y: 0} sizeOverriden: 0 - dockPosition: 0 - containerId: overlay-container--right - floating: 0 + containerId: Floating + floating: 1 collapsed: 0 displayed: 1 - snapOffset: {x: -111, y: 26} + snapOffset: {x: -111, y: 2.3769531} snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 id: Orientation @@ -368,9 +368,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 568.5542, y: -513.7946, z: -341.42746} + m_Target: {x: 206.67807, y: -451.11212, z: -567.9854} speed: 2 - m_Value: {x: -109.399994, y: -0.75, z: 0} + m_Value: {x: 206.67807, y: -451.11212, z: -567.9854} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -416,13 +416,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.15613088, y: -0.8254589, z: 0.2760914, w: -0.46662202} + m_Target: {x: 0.050080683, y: 0.9467634, z: -0.26468253, w: 0.17416053} speed: 2 - m_Value: {x: -0.1561526, y: -0.82557374, z: 0.2761298, w: -0.46668693} + m_Value: {x: 0.050099276, y: 0.94711494, z: -0.26478082, w: 0.1742252} m_Size: m_Target: 458.9204 speed: 2 - m_Value: 70.71465 + m_Value: 458.9204 m_Ortho: m_Target: 0 speed: 2 @@ -466,12 +466,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1518 - height: 942 + width: 1520 + height: 970 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 22 + controlID: 1759 --- !u!114 &4 MonoBehaviour: m_ObjectHideFlags: 52 @@ -491,12 +491,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1518 - height: 664 + width: 1520 + height: 685 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 23 + controlID: 1760 --- !u!114 &5 MonoBehaviour: m_ObjectHideFlags: 52 @@ -515,9 +515,9 @@ MonoBehaviour: x: 0 y: 0 width: 306 - height: 664 - m_MinSize: {x: 200, y: 200} - m_MaxSize: {x: 4000, y: 4000} + height: 685 + m_MinSize: {x: 201, y: 221} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 6} m_Panes: - {fileID: 6} @@ -543,10 +543,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 118 + x: 3840 + y: 90 width: 305 - height: 643 + height: 664 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -562,7 +562,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: f873ffff6cb8ffffe4f4ffff2cfbffff3461000008640000a2810100b0890100288a0100a28b0100 + m_ExpandedIDs: 2cfbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -578,7 +578,7 @@ MonoBehaviour: m_IsRenaming: 0 m_OriginalEventType: 11 m_IsRenamingFilename: 0 - m_ClientGUIView: {fileID: 0} + m_ClientGUIView: {fileID: 5} m_SearchString: m_ExpandedScenes: [] m_CurrenRootInstanceID: 0 @@ -603,8 +603,8 @@ MonoBehaviour: serializedVersion: 2 x: 306 y: 0 - width: 1212 - height: 664 + width: 1214 + height: 685 m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 2} @@ -636,10 +636,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 306 - y: 118 - width: 1210 - height: 643 + x: 4146 + y: 90 + width: 1212 + height: 664 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -692,23 +692,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1210 - height: 622 - m_Scale: {x: 0.57592595, y: 0.57592595} - m_Translation: {x: 605, y: 311} + width: 1212 + height: 643 + m_Scale: {x: 0.59537035, y: 0.59537035} + m_Translation: {x: 606, y: 321.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1050.4823 + x: -1017.8538 y: -540 - width: 2100.9646 + width: 2035.7076 height: 1080 m_MinimalGUI: 1 - m_defaultScale: 0.57592595 - m_LastWindowPixelSize: {x: 1210, y: 643} + m_defaultScale: 0.59537035 + m_LastWindowPixelSize: {x: 1212, y: 664} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -734,10 +734,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2226 - y: 90 + x: 306 + y: 118 width: 1210 - height: 661 + height: 643 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1386,23 +1386,23 @@ MonoBehaviour: m_Enabled: 1 m_EditorHideFlags: 1 m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0} - m_Name: ProjectBrowser + m_Name: ConsoleWindow m_EditorClassIdentifier: m_Children: [] m_Position: serializedVersion: 2 x: 0 - y: 664 - width: 1518 - height: 278 - m_MinSize: {x: 231, y: 271} - m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 13} + y: 685 + width: 1520 + height: 285 + m_MinSize: {x: 101, y: 121} + m_MaxSize: {x: 4001, y: 4021} + m_ActualView: {fileID: 14} m_Panes: - {fileID: 13} - {fileID: 14} - m_Selected: 0 - m_LastSelected: 1 + m_Selected: 1 + m_LastSelected: 0 --- !u!114 &13 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1423,10 +1423,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 782 - width: 1517 - height: 257 + x: 3840 + y: 775 + width: 1519 + height: 264 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1448,7 +1448,7 @@ MonoBehaviour: m_SkipHidden: 0 m_SearchArea: 1 m_Folders: - - Assets/Scripts/Testing + - Assets/Scripts m_Globs: [] m_OriginalText: m_ImportLogFlags: 0 @@ -1456,16 +1456,16 @@ MonoBehaviour: m_ViewMode: 1 m_StartGridSize: 64 m_LastFolders: - - Assets/Scripts/Testing + - Assets/Scripts m_LastFoldersGridSize: -1 m_LastProjectPath: /home/nicola/Schreibtisch/TalesOfNovariel m_LockTracker: m_IsLocked: 0 m_FolderTreeState: - scrollPos: {x: 0, y: 295} - m_SelectedIDs: da6c0000 - m_LastClickedID: 27866 - m_ExpandedIDs: 00000000ba6b0000bc6b0000b66c0000bc6c000000ca9a3b + scrollPos: {x: 0, y: 128} + m_SelectedIDs: 765b0000 + m_LastClickedID: 23414 + m_ExpandedIDs: 000000007c5a00007e5a000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1493,7 +1493,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000ba6b0000bc6b0000 + m_ExpandedIDs: 000000007c5a00007e5a000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -1518,8 +1518,8 @@ MonoBehaviour: m_Icon: {fileID: 0} m_ResourceFile: m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 + m_SelectedInstanceIDs: 765b0000 + m_LastClickedInstanceID: 23414 m_HadKeyboardFocusLastEvent: 1 m_ExpandedInstanceIDs: c6230000d81c070080fe0000287f0100b25b0000005d000000000000 m_RenameOverlay: @@ -1569,10 +1569,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 0 - y: 782 - width: 1517 - height: 257 + x: 3840 + y: 775 + width: 1519 + height: 264 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1600,14 +1600,14 @@ MonoBehaviour: - {fileID: 18} m_Position: serializedVersion: 2 - x: 1518 + x: 1520 y: 0 - width: 402 - height: 942 + width: 400 + height: 970 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 122 + controlID: 1810 --- !u!114 &16 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1625,8 +1625,8 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 402 - height: 132 + width: 400 + height: 136 m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 17} @@ -1654,10 +1654,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1518 - y: 118 - width: 401 - height: 111 + x: 5360 + y: 90 + width: 399 + height: 115 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1684,9 +1684,9 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 132 - width: 402 - height: 810 + y: 136 + width: 400 + height: 834 m_MinSize: {x: 275, y: 50} m_MaxSize: {x: 4000, y: 4000} m_ActualView: {fileID: 19} @@ -1714,10 +1714,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1518 - y: 250 - width: 401 - height: 789 + x: 5360 + y: 226 + width: 399 + height: 813 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 diff --git a/UserSettings/Layouts/default-2022.dwlt b/UserSettings/Layouts/default-2022.dwlt index dff6ba4..d8d161b 100644 --- a/UserSettings/Layouts/default-2022.dwlt +++ b/UserSettings/Layouts/default-2022.dwlt @@ -14,12 +14,12 @@ MonoBehaviour: m_EditorClassIdentifier: m_PixelRect: serializedVersion: 2 - x: 1920 + x: 0 y: 32 width: 1920 height: 1020 m_ShowMode: 4 - m_Title: Scene + m_Title: Project m_RootView: {fileID: 2} m_MinSize: {x: 875, y: 300} m_MaxSize: {x: 10000, y: 10000} @@ -116,10 +116,10 @@ MonoBehaviour: y: 30 width: 1920 height: 970 - m_MinSize: {x: 300, y: 200} + m_MinSize: {x: 300, y: 100} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 21 + controlID: 754 --- !u!114 &6 MonoBehaviour: m_ObjectHideFlags: 52 @@ -139,12 +139,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1518 + width: 1520 height: 970 m_MinSize: {x: 200, y: 100} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 22 + controlID: 755 --- !u!114 &7 MonoBehaviour: m_ObjectHideFlags: 52 @@ -164,12 +164,12 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 1518 - height: 683 + width: 1520 + height: 685 m_MinSize: {x: 200, y: 50} m_MaxSize: {x: 16192, y: 8096} vertical: 0 - controlID: 23 + controlID: 41 --- !u!114 &8 MonoBehaviour: m_ObjectHideFlags: 52 @@ -188,7 +188,7 @@ MonoBehaviour: x: 0 y: 0 width: 306 - height: 683 + height: 685 m_MinSize: {x: 201, y: 221} m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 15} @@ -213,8 +213,8 @@ MonoBehaviour: serializedVersion: 2 x: 306 y: 0 - width: 1212 - height: 683 + width: 1214 + height: 685 m_MinSize: {x: 202, y: 221} m_MaxSize: {x: 4002, y: 4021} m_ActualView: {fileID: 16} @@ -242,15 +242,15 @@ MonoBehaviour: m_Position: serializedVersion: 2 x: 0 - y: 683 - width: 1518 - height: 287 + y: 685 + width: 1520 + height: 285 m_MinSize: {x: 231, y: 271} m_MaxSize: {x: 10001, y: 10021} - m_ActualView: {fileID: 14} + m_ActualView: {fileID: 21} m_Panes: - - {fileID: 14} - {fileID: 21} + - {fileID: 14} m_Selected: 0 m_LastSelected: 1 --- !u!114 &11 @@ -270,14 +270,14 @@ MonoBehaviour: - {fileID: 13} m_Position: serializedVersion: 2 - x: 1518 + x: 1520 y: 0 - width: 402 + width: 400 height: 970 - m_MinSize: {x: 100, y: 200} + m_MinSize: {x: 100, y: 100} m_MaxSize: {x: 8096, y: 16192} vertical: 1 - controlID: 112 + controlID: 109 --- !u!114 &12 MonoBehaviour: m_ObjectHideFlags: 52 @@ -295,7 +295,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 0 - width: 402 + width: 400 height: 136 m_MinSize: {x: 101, y: 121} m_MaxSize: {x: 4001, y: 4021} @@ -321,7 +321,7 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 136 - width: 402 + width: 400 height: 834 m_MinSize: {x: 276, y: 71} m_MaxSize: {x: 4001, y: 4021} @@ -339,21 +339,21 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 230, y: 250} - m_MaxSize: {x: 10000, y: 10000} + m_MinSize: {x: 100, y: 100} + m_MaxSize: {x: 4000, y: 4000} m_TitleContent: - m_Text: Project - m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Console + m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1920 - y: 773 - width: 1517 - height: 266 + x: 0 + y: 775 + width: 1519 + height: 264 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -364,118 +364,6 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 - m_SearchFilter: - m_NameFilter: - m_ClassNames: [] - m_AssetLabels: [] - m_AssetBundleNames: [] - m_ReferencingInstanceIDs: - m_SceneHandles: - m_ShowAllHits: 0 - m_SkipHidden: 0 - m_SearchArea: 1 - m_Folders: - - Assets/Scenes - m_Globs: [] - m_OriginalText: - m_ImportLogFlags: 0 - m_FilterByTypeIntersection: 0 - m_ViewMode: 1 - m_StartGridSize: 64 - m_LastFolders: - - Assets/Scenes - m_LastFoldersGridSize: -1 - m_LastProjectPath: /home/nicola/Schreibtisch/TalesOfNovariel - m_LockTracker: - m_IsLocked: 0 - m_FolderTreeState: - scrollPos: {x: 0, y: 186} - m_SelectedIDs: ee5b0000 - m_LastClickedID: 23534 - m_ExpandedIDs: 00000000e65a0000e85a0000f05b000000ca9a3b - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_AssetTreeState: - scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 00000000e65a0000e85a0000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_SearchString: - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_ListAreaState: - m_SelectedInstanceIDs: - m_LastClickedInstanceID: 0 - m_HadKeyboardFocusLastEvent: 1 - m_ExpandedInstanceIDs: c6230000d81c070080fe0000287f010000000000b25b0000005d0000 - m_RenameOverlay: - m_UserAcceptedRename: 0 - m_Name: - m_OriginalName: - m_EditFieldRect: - serializedVersion: 2 - x: 0 - y: 0 - width: 0 - height: 0 - m_UserData: 0 - m_IsWaitingForDelay: 0 - m_IsRenaming: 0 - m_OriginalEventType: 11 - m_IsRenamingFilename: 1 - m_ClientGUIView: {fileID: 0} - m_CreateAssetUtility: - m_EndAction: {fileID: 0} - m_InstanceID: 0 - m_Path: - m_Icon: {fileID: 0} - m_ResourceFile: - m_NewAssetIndexInList: -1 - m_ScrollPosition: {x: 0, y: 0} - m_GridSize: 64 - m_SkipHiddenPackages: 0 - m_DirectoriesAreaWidth: 335 --- !u!114 &15 MonoBehaviour: m_ObjectHideFlags: 52 @@ -496,10 +384,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 1920 + x: 0 y: 90 width: 305 - height: 662 + height: 664 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -513,9 +401,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: + m_SelectedIDs: 625e0000 m_LastClickedID: 0 - m_ExpandedIDs: e421ffff2cfbffff + m_ExpandedIDs: c684ffff20fbffff m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -559,10 +447,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2226 + x: 306 y: 90 - width: 1210 - height: 662 + width: 1212 + height: 664 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -651,11 +539,11 @@ MonoBehaviour: size: {x: 0, y: 0} sizeOverriden: 0 - dockPosition: 0 - containerId: overlay-container--right - floating: 0 + containerId: Floating + floating: 1 collapsed: 0 displayed: 1 - snapOffset: {x: -111, y: 26} + snapOffset: {x: -111, y: 2.3769531} snapOffsetDelta: {x: 0, y: 0} snapCorner: 1 id: Orientation @@ -882,9 +770,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 405.34402, y: -462.42728, z: 289.2377} + m_Target: {x: -611.9158, y: -195.30804, z: 1023.07135} speed: 2 - m_Value: {x: 405.34402, y: -462.42728, z: 289.2377} + m_Value: {x: -611.9158, y: -195.30804, z: 1023.07135} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -930,13 +818,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.32193258, y: -0.4240753, z: 0.16436398, w: -0.83021617} + m_Target: {x: -0.29342666, y: 0.046855267, z: -0.015906507, w: -0.9542193} speed: 2 - m_Value: {x: -0.32175294, y: -0.42523223, z: 0.16481258, w: -0.8297526} + m_Value: {x: -0.29499307, y: 0.046852905, z: -0.01598398, w: -0.95421606} m_Size: - m_Target: 377.3288 + m_Target: 458.9204 speed: 2 - m_Value: 377.3288 + m_Value: 458.9204 m_Ortho: m_Target: 0 speed: 2 @@ -981,10 +869,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2226 + x: 306 y: 90 - width: 1210 - height: 662 + width: 1212 + height: 664 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1005,7 +893,7 @@ MonoBehaviour: m_TextureFilterMode: 0 m_TextureHideFlags: 61 m_RenderIMGUI: 1 - m_EnterPlayModeBehavior: 0 + m_EnterPlayModeBehavior: 2 m_UseMipMap: 0 m_VSyncEnabled: 0 m_Gizmos: 1 @@ -1037,23 +925,23 @@ MonoBehaviour: serializedVersion: 2 x: 0 y: 21 - width: 1210 - height: 641 - m_Scale: {x: 0.5935185, y: 0.5935185} - m_Translation: {x: 605, y: 320.5} + width: 1212 + height: 643 + m_Scale: {x: 0.59537035, y: 0.59537035} + m_Translation: {x: 606, y: 321.5} m_MarginLeft: 0 m_MarginRight: 0 m_MarginTop: 0 m_MarginBottom: 0 m_LastShownAreaInsideMargins: serializedVersion: 2 - x: -1019.3448 + x: -1017.8538 y: -540 - width: 2038.6896 + width: 2035.7076 height: 1080 m_MinimalGUI: 1 - m_defaultScale: 0.5935185 - m_LastWindowPixelSize: {x: 1210, y: 662} + m_defaultScale: 0.59537035 + m_LastWindowPixelSize: {x: 1212, y: 664} m_ClearInEditMode: 1 m_NoCameraWarning: 1 m_LowResolutionForAspectRatios: 01000000000000000000 @@ -1079,10 +967,10 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 2226 - y: 90 + x: 306 + y: 118 width: 1210 - height: 661 + height: 643 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1730,21 +1618,21 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 1 m_EditorHideFlags: 1 - m_Script: {fileID: 12003, guid: 0000000000000000e000000000000000, type: 0} + m_Script: {fileID: 12014, guid: 0000000000000000e000000000000000, type: 0} m_Name: m_EditorClassIdentifier: - m_MinSize: {x: 100, y: 100} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 230, y: 250} + m_MaxSize: {x: 10000, y: 10000} m_TitleContent: - m_Text: Console - m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0} + m_Text: Project + m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0} m_Tooltip: m_Pos: serializedVersion: 2 - x: 1920 - y: 773 - width: 1517 - height: 266 + x: 0 + y: 775 + width: 1519 + height: 264 m_SerializedDataModeController: m_DataMode: 0 m_PreferredDataMode: 0 @@ -1755,6 +1643,118 @@ MonoBehaviour: m_LastAppliedPresetName: Default m_SaveData: [] m_OverlaysVisible: 1 + m_SearchFilter: + m_NameFilter: + m_ClassNames: [] + m_AssetLabels: [] + m_AssetBundleNames: [] + m_ReferencingInstanceIDs: + m_SceneHandles: + m_ShowAllHits: 0 + m_SkipHidden: 0 + m_SearchArea: 1 + m_Folders: + - Assets/Scripts + m_Globs: [] + m_OriginalText: + m_ImportLogFlags: 0 + m_FilterByTypeIntersection: 0 + m_ViewMode: 1 + m_StartGridSize: 64 + m_LastFolders: + - Assets/Scripts + m_LastFoldersGridSize: -1 + m_LastProjectPath: /home/nicola/Schreibtisch/TalesOfNovariel + m_LockTracker: + m_IsLocked: 0 + m_FolderTreeState: + scrollPos: {x: 0, y: 188} + m_SelectedIDs: be5d0000 + m_LastClickedID: 23998 + m_ExpandedIDs: 000000007e5a0000805a0000be5d000000ca9a3b + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_AssetTreeState: + scrollPos: {x: 0, y: 0} + m_SelectedIDs: + m_LastClickedID: 0 + m_ExpandedIDs: 000000007e5a0000805a0000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_SearchString: + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_ListAreaState: + m_SelectedInstanceIDs: + m_LastClickedInstanceID: 0 + m_HadKeyboardFocusLastEvent: 1 + m_ExpandedInstanceIDs: c6230000d81c070080fe0000287f0100b25b0000005d000000000000 + m_RenameOverlay: + m_UserAcceptedRename: 0 + m_Name: + m_OriginalName: + m_EditFieldRect: + serializedVersion: 2 + x: 0 + y: 0 + width: 0 + height: 0 + m_UserData: 0 + m_IsWaitingForDelay: 0 + m_IsRenaming: 0 + m_OriginalEventType: 11 + m_IsRenamingFilename: 1 + m_ClientGUIView: {fileID: 0} + m_CreateAssetUtility: + m_EndAction: {fileID: 0} + m_InstanceID: 0 + m_Path: + m_Icon: {fileID: 0} + m_ResourceFile: + m_NewAssetIndexInList: -1 + m_ScrollPosition: {x: 0, y: 0} + m_GridSize: 64 + m_SkipHiddenPackages: 0 + m_DirectoriesAreaWidth: 335 --- !u!114 &22 MonoBehaviour: m_ObjectHideFlags: 52 @@ -1775,9 +1775,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 3438 + x: 1520 y: 90 - width: 401 + width: 399 height: 115 m_SerializedDataModeController: m_DataMode: 0 @@ -1809,9 +1809,9 @@ MonoBehaviour: m_Tooltip: m_Pos: serializedVersion: 2 - x: 3438 + x: 1520 y: 226 - width: 401 + width: 399 height: 813 m_SerializedDataModeController: m_DataMode: 0 diff --git a/mono_crash.mem.15968.1.blob b/mono_crash.mem.15968.1.blob new file mode 100644 index 0000000..b4452d0 Binary files /dev/null and b/mono_crash.mem.15968.1.blob differ diff --git a/settings.txt b/settings.txt index caa6cfb..ffe0945 100644 --- a/settings.txt +++ b/settings.txt @@ -1,7 +1,7 @@ Resolution:1 Mode:0 Language:de -Music:0.2077923 -Effects:0.7093654 +Music:0 +Effects:0 SensitivityMouse:1 SensitivityController:2 \ No newline at end of file