Browse Source

Fixed map generation bug in build

master
Joshua Reason 5 years ago
parent
commit
fbb4da7234
13 changed files with 22 additions and 20 deletions
  1. +2
    -2
      Assets/Data/Networking/Server/Realtime/ClientList.asset
  2. +1
    -1
      Assets/Prefabs/Map Sections.meta
  3. +1
    -1
      Assets/Prefabs/Map Sections/Link Sections.meta
  4. +1
    -1
      Assets/Prefabs/Map Sections/Link Sections/Width 3.meta
  5. +1
    -1
      Assets/Prefabs/Map Sections/Link Sections/Width 3/Links Width 3.asset
  6. +1
    -1
      Assets/Prefabs/Map Sections/Link Sections/Width 5.meta
  7. +1
    -1
      Assets/Prefabs/Map Sections/Link Sections/Width 7.meta
  8. +1
    -1
      Assets/Prefabs/Map Sections/Width 3.meta
  9. +1
    -1
      Assets/Prefabs/Map Sections/Width 5.meta
  10. +1
    -1
      Assets/Prefabs/Map Sections/Width 7.meta
  11. +0
    -8
      Assets/Scripts/Components.meta
  12. +10
    -0
      Assets/Scripts/Map Generation/MapManager.cs
  13. +1
    -1
      ProjectSettings/EditorBuildSettings.asset

+ 2
- 2
Assets/Data/Networking/Server/Realtime/ClientList.asset View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:e3ee5388094941012a17d8eac09e9009610e3bcbcb69a307ce928fbc133b6d3c
size 834
oid sha256:b2d4e5d52fe4b9a4ff81ec251ae4b118ef7bdaca621d06b8a50e28ccbc3d58ec
size 1142

+ 1
- 1
Assets/Prefabs/Map Sections.meta View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 02cb3bc94f6ea564282cfab54ac02081
guid: 9ccca7fe12b66c748a5a5deb7b2f76a9
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

+ 1
- 1
Assets/Prefabs/Map Sections/Link Sections.meta View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: f3435feddeac6804d925665e946b7889
guid: d0e4fbe9f973dac48ae44482231ecb54
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

+ 1
- 1
Assets/Prefabs/Map Sections/Link Sections/Width 3.meta View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: e80d9da4ab4709349853d1d94ec2f5bc
guid: 8b4ac71416e88764698072d971a82ece
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

+ 1
- 1
Assets/Prefabs/Map Sections/Link Sections/Width 3/Links Width 3.asset View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:d65de061d4f63a78cf690a857a995ac935600a10d782b406291434338cbae97c
oid sha256:7a361758c9e8f7c8d71cc1785afe15dc83aeb817316d19d2314ab2b59e00649e
size 1247 size 1247

+ 1
- 1
Assets/Prefabs/Map Sections/Link Sections/Width 5.meta View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 3fae17509e7b2ad4095b67299bb42d54
guid: d1c1c068cb0915d43895246db8cc1255
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

+ 1
- 1
Assets/Prefabs/Map Sections/Link Sections/Width 7.meta View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 19edafca7bb8ad04c8ff800b7e327847
guid: e7a8a255c71b20043b26dbb38acdb9fd
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

+ 1
- 1
Assets/Prefabs/Map Sections/Width 3.meta View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: be25a323ad5fce04d9ff37db05f30f0c
guid: 8da6cd64c5d76294ba0e9eb4b900a7d0
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

+ 1
- 1
Assets/Prefabs/Map Sections/Width 5.meta View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 133135fd929067542b7d8569d59baffe
guid: f668f6cc52da363418a15103b96bef75
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

+ 1
- 1
Assets/Prefabs/Map Sections/Width 7.meta View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: c5c0eafef3eaaa546b62feb0d5339f09
guid: ad716d5d8c9d4e942a68cda4ac2a96cd
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}

+ 0
- 8
Assets/Scripts/Components.meta View File

@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 8d7394d70ec233849a60a26da5f23b75
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

+ 10
- 0
Assets/Scripts/Map Generation/MapManager.cs View File

@ -168,8 +168,18 @@ public class MapManager : ScriptableObject
updateCriteria(); //We update the section selection criteria for the current gamestate updateCriteria(); //We update the section selection criteria for the current gamestate
Debug.Log("Sections length:" + sections.Count);
int count = -1;
foreach (MapSection section in sections) foreach (MapSection section in sections)
{ {
count++;
if (section == null)
{
Debug.Log("Section is empty [" + count + "]");
continue;
}
if (section.weight > 0 && checkSegments(section)) if (section.weight > 0 && checkSegments(section))
{ {
//If a segment is a valid continuation of the current most-recent segment, add it to the list //If a segment is a valid continuation of the current most-recent segment, add it to the list

+ 1
- 1
ProjectSettings/EditorBuildSettings.asset View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:311b07fad584c7efab0db86403282740a1f83d1675bdef7d87fc1875870dc88a
oid sha256:89626e954c478d28ed17bbfc46452669c9cb4d5ced3c8e3e886ed6191cf54b15
size 1383 size 1383

Loading…
Cancel
Save