diff --git a/Blender/World/1d/d-base.blend b/Blender/World/1d/d-base.blend index af66b92..c0cea2c 100644 --- a/Blender/World/1d/d-base.blend +++ b/Blender/World/1d/d-base.blend @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1fac948ad909b1e5b165a8c2867d29fdc9098654c8579b20800665b5000570db -size 465120 +oid sha256:338f86c761a714081cde65f1355e3b3fcac4be334d1887304a3488127b0b8c4f +size 465088 diff --git a/Blender/World/1d/d-base.blend1 b/Blender/World/1d/d-base.blend1 index d741068..7f1358d 100644 Binary files a/Blender/World/1d/d-base.blend1 and b/Blender/World/1d/d-base.blend1 differ diff --git a/twinStickCrawler/Assets/Models/World/Base/1D/d-base.fbx.meta b/twinStickCrawler/Assets/Models/World/Base/1D/d-base.fbx.meta index e2c7496..b8b011e 100644 --- a/twinStickCrawler/Assets/Models/World/Base/1D/d-base.fbx.meta +++ b/twinStickCrawler/Assets/Models/World/Base/1D/d-base.fbx.meta @@ -33,7 +33,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 2 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -88,7 +88,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.02 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/twinStickCrawler/Assets/Models/World/Base/1D/l-base.fbx.meta b/twinStickCrawler/Assets/Models/World/Base/1D/l-base.fbx.meta index 6c7b54f..7fb3500 100644 --- a/twinStickCrawler/Assets/Models/World/Base/1D/l-base.fbx.meta +++ b/twinStickCrawler/Assets/Models/World/Base/1D/l-base.fbx.meta @@ -33,7 +33,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 2 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -88,7 +88,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.02 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/twinStickCrawler/Assets/Models/World/Base/1D/r-base.fbx.meta b/twinStickCrawler/Assets/Models/World/Base/1D/r-base.fbx.meta index 2d64cb7..59616f4 100644 --- a/twinStickCrawler/Assets/Models/World/Base/1D/r-base.fbx.meta +++ b/twinStickCrawler/Assets/Models/World/Base/1D/r-base.fbx.meta @@ -33,7 +33,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 2 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -88,7 +88,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.02 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/twinStickCrawler/Assets/Models/World/Base/1D/u-base.fbx.meta b/twinStickCrawler/Assets/Models/World/Base/1D/u-base.fbx.meta index 41e59fc..62aaf4f 100644 --- a/twinStickCrawler/Assets/Models/World/Base/1D/u-base.fbx.meta +++ b/twinStickCrawler/Assets/Models/World/Base/1D/u-base.fbx.meta @@ -33,7 +33,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 2 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -88,7 +88,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.02 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/twinStickCrawler/Assets/Models/World/Base/2D/dl-base.fbx.meta b/twinStickCrawler/Assets/Models/World/Base/2D/dl-base.fbx.meta index ae4dbdf..802cfe5 100644 --- a/twinStickCrawler/Assets/Models/World/Base/2D/dl-base.fbx.meta +++ b/twinStickCrawler/Assets/Models/World/Base/2D/dl-base.fbx.meta @@ -33,7 +33,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 2 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -88,7 +88,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.02 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/twinStickCrawler/Assets/Models/World/Base/2D/dr-base.fbx.meta b/twinStickCrawler/Assets/Models/World/Base/2D/dr-base.fbx.meta index 38342bd..91d0830 100644 --- a/twinStickCrawler/Assets/Models/World/Base/2D/dr-base.fbx.meta +++ b/twinStickCrawler/Assets/Models/World/Base/2D/dr-base.fbx.meta @@ -33,7 +33,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 2 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -88,7 +88,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.02 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/twinStickCrawler/Assets/Models/World/Base/2D/lr-base.fbx.meta b/twinStickCrawler/Assets/Models/World/Base/2D/lr-base.fbx.meta index a6a69ca..0110466 100644 --- a/twinStickCrawler/Assets/Models/World/Base/2D/lr-base.fbx.meta +++ b/twinStickCrawler/Assets/Models/World/Base/2D/lr-base.fbx.meta @@ -33,7 +33,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 2 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -88,7 +88,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.02 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/twinStickCrawler/Assets/Models/World/Base/2D/ud-base.fbx.meta b/twinStickCrawler/Assets/Models/World/Base/2D/ud-base.fbx.meta index 3b0ce1f..143956d 100644 --- a/twinStickCrawler/Assets/Models/World/Base/2D/ud-base.fbx.meta +++ b/twinStickCrawler/Assets/Models/World/Base/2D/ud-base.fbx.meta @@ -33,7 +33,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 2 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -88,7 +88,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.02 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/twinStickCrawler/Assets/Models/World/Base/2D/ul-base.fbx.meta b/twinStickCrawler/Assets/Models/World/Base/2D/ul-base.fbx.meta index 8de719c..d8414ab 100644 --- a/twinStickCrawler/Assets/Models/World/Base/2D/ul-base.fbx.meta +++ b/twinStickCrawler/Assets/Models/World/Base/2D/ul-base.fbx.meta @@ -33,7 +33,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 2 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -88,7 +88,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.02 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/twinStickCrawler/Assets/Models/World/Base/2D/ur-base.fbx.meta b/twinStickCrawler/Assets/Models/World/Base/2D/ur-base.fbx.meta index f9f53e6..74328e2 100644 --- a/twinStickCrawler/Assets/Models/World/Base/2D/ur-base.fbx.meta +++ b/twinStickCrawler/Assets/Models/World/Base/2D/ur-base.fbx.meta @@ -33,7 +33,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 2 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -88,7 +88,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.02 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/twinStickCrawler/Assets/Models/World/Base/3D/dlr-base.fbx.meta b/twinStickCrawler/Assets/Models/World/Base/3D/dlr-base.fbx.meta index e3f8d0b..8288a7e 100644 --- a/twinStickCrawler/Assets/Models/World/Base/3D/dlr-base.fbx.meta +++ b/twinStickCrawler/Assets/Models/World/Base/3D/dlr-base.fbx.meta @@ -33,7 +33,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 2 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -88,7 +88,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.02 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/twinStickCrawler/Assets/Models/World/Base/3D/udl-base.fbx.meta b/twinStickCrawler/Assets/Models/World/Base/3D/udl-base.fbx.meta index 79a1c78..3266736 100644 --- a/twinStickCrawler/Assets/Models/World/Base/3D/udl-base.fbx.meta +++ b/twinStickCrawler/Assets/Models/World/Base/3D/udl-base.fbx.meta @@ -33,7 +33,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 2 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -88,7 +88,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.02 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/twinStickCrawler/Assets/Models/World/Base/3D/udr-base.fbx.meta b/twinStickCrawler/Assets/Models/World/Base/3D/udr-base.fbx.meta index 9c4e3fd..5dfd5e1 100644 --- a/twinStickCrawler/Assets/Models/World/Base/3D/udr-base.fbx.meta +++ b/twinStickCrawler/Assets/Models/World/Base/3D/udr-base.fbx.meta @@ -33,7 +33,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 2 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -88,7 +88,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.02 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/twinStickCrawler/Assets/Models/World/Base/3D/ulr-base.fbx.meta b/twinStickCrawler/Assets/Models/World/Base/3D/ulr-base.fbx.meta index 67f80ba..8c59025 100644 --- a/twinStickCrawler/Assets/Models/World/Base/3D/ulr-base.fbx.meta +++ b/twinStickCrawler/Assets/Models/World/Base/3D/ulr-base.fbx.meta @@ -33,7 +33,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 2 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -88,7 +88,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.02 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/twinStickCrawler/Assets/Models/World/Base/4D/udlr-base.fbx.meta b/twinStickCrawler/Assets/Models/World/Base/4D/udlr-base.fbx.meta index 8176f31..74cdcd2 100644 --- a/twinStickCrawler/Assets/Models/World/Base/4D/udlr-base.fbx.meta +++ b/twinStickCrawler/Assets/Models/World/Base/4D/udlr-base.fbx.meta @@ -33,7 +33,7 @@ ModelImporter: isReadable: 0 meshes: lODScreenPercentages: [] - globalScale: 1 + globalScale: 2 meshCompression: 0 addColliders: 0 useSRGBMaterialColor: 1 @@ -88,7 +88,7 @@ ModelImporter: armStretch: 0.05 legStretch: 0.05 feetSpacing: 0 - globalScale: 1 + globalScale: 0.02 rootMotionBoneName: hasTranslationDoF: 0 hasExtraRoot: 0 diff --git a/twinStickCrawler/Assets/Scenes/LevelCreationTest.unity b/twinStickCrawler/Assets/Scenes/LevelCreationTest.unity index 0fa2e8a..357c3e4 100644 --- a/twinStickCrawler/Assets/Scenes/LevelCreationTest.unity +++ b/twinStickCrawler/Assets/Scenes/LevelCreationTest.unity @@ -259,9 +259,7 @@ MonoBehaviour: m_EditorClassIdentifier: width: 20 height: 20 - maxRooms: 15 - floorPrefab: {fileID: 0} - wallPrefab: {fileID: 1192638862} + maxRooms: 7 room1DPrefabs: - {fileID: 919132149155446097, guid: c7a21429b5432184bb062b9790dce88a, type: 3} - {fileID: 919132149155446097, guid: a90edcd3828d0044581a3aa1743360a7, type: 3} diff --git a/twinStickCrawler/Assets/Scripts/LevelCreation/LevelManager.cs b/twinStickCrawler/Assets/Scripts/LevelCreation/LevelManager.cs index 76d4a77..09bb090 100644 --- a/twinStickCrawler/Assets/Scripts/LevelCreation/LevelManager.cs +++ b/twinStickCrawler/Assets/Scripts/LevelCreation/LevelManager.cs @@ -10,8 +10,6 @@ public class LevelManager : MonoBehaviour public int width = 20; public int height = 20; public int maxRooms = 15; // Maximum number of rooms to generate - public GameObject floorPrefab; - public GameObject wallPrefab; public List room1DPrefabs; public List room2DPrefabs; public List room3DPrefabs; @@ -123,11 +121,11 @@ void RenderDungeon() { room += "d"; } - if ((x - 1 >= 0) && (grid[x-1, y] == 1)) + if ((x + 1 < grid.GetLength(0)) && (grid[x+1, y] == 1)) { room += "l"; } - if ((x + 1 < grid.GetLength(0)) && (grid[x+1, y] == 1)) + if ((x - 1 >= 0) && (grid[x-1, y] == 1)) { room += "r"; } @@ -161,7 +159,7 @@ void AddRoom(string roomName, int roomDimension, Vector2 roomPosition) default: return; } - + for (int i = 0; i < roomPrefabs.Count; i++) { if (roomPrefabs[i].name == roomName+"-base") diff --git a/twinStickCrawler/Assets/Scripts/Wind.cs b/twinStickCrawler/Assets/Scripts/Wind.cs index 6ce9164..4ec2b35 100644 --- a/twinStickCrawler/Assets/Scripts/Wind.cs +++ b/twinStickCrawler/Assets/Scripts/Wind.cs @@ -38,13 +38,6 @@ private IEnumerator PlayWindSounds() // Start crossfade StartCoroutine(Crossfade(activeSource, nextSource, crossfadeDuration)); - - // Wait until near the end of the active clip - print("--------"); - print(nextSource.clip.name); - print(nextSource.clip.length); - print(crossfadeDuration); - print("--------"); yield return new WaitForSeconds(nextSource.clip.length - crossfadeDuration);