...
 
Commits (2)
......@@ -3,5 +3,5 @@ guid: e21fdd4a378c6884098637b6037bc5a0
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleName: metrostation
assetBundleVariant:
fileFormatVersion: 2
guid: b3b08c8c0645fbd4581e6169cc8f50f5
timeCreated: 1448900598
licenseType: Store
ModelImporter:
serializedVersion: 18
serializedVersion: 23
fileIDToRecycleName:
100000: //RootNode
400000: //RootNode
2300000: //RootNode
3300000: //RootNode
4300000: DS16
externalObjects:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: 'Material #39'
second: {fileID: 2100000, guid: a44b7eefd639c804c8f65855cb6fcdb1, type: 2}
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
name: body
second: {fileID: 2100000, guid: c57d29cd1c01d4344ac59a3f2c9a43f0, type: 2}
materials:
importMaterials: 1
materialName: 0
materialSearch: 1
materialLocation: 0
animations:
legacyGenerateAnimations: 4
bakeSimulation: 0
resampleCurves: 1
optimizeGameObjects: 0
motionNodeName:
rigImportErrors:
rigImportWarnings:
animationImportErrors:
animationImportWarnings:
animationRetargetingWarnings:
animationDoRetargetingWarnings: 0
importAnimatedCustomProperties: 0
importConstraints: 0
animationCompression: 1
animationRotationError: .5
animationPositionError: .5
animationScaleError: .5
animationRotationError: 0.5
animationPositionError: 0.5
animationScaleError: 0.5
animationWrapMode: 0
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
isReadable: 1
meshes:
......@@ -36,37 +52,51 @@ ModelImporter:
globalScale: 1
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
importVisibility: 0
importBlendShapes: 1
importCameras: 0
importLights: 0
swapUVChannels: 0
generateSecondaryUV: 0
generateSecondaryUV: 1
useFileUnits: 1
optimizeMeshForGPU: 1
keepQuads: 0
weldVertices: 1
preserveHierarchy: 0
indexFormat: 1
secondaryUVAngleDistortion: 8
secondaryUVAreaDistortion: 15.000001
secondaryUVHardAngle: 88
secondaryUVPackMargin: 4
useFileScale: 1
previousCalculatedGlobalScale: 1
hasPreviousCalculatedGlobalScale: 0
tangentSpace:
normalSmoothAngle: 60
splitTangentsAcrossUV: 1
normalImportMode: 0
tangentImportMode: 1
tangentImportMode: 4
normalCalculationMode: 0
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 1
blendShapeNormalImportMode: 1
normalSmoothingSource: 0
importAnimation: 1
copyAvatar: 0
humanDescription:
serializedVersion: 2
human: []
skeleton: []
armTwist: .5
foreArmTwist: .5
upperLegTwist: .5
legTwist: .5
armStretch: .0500000007
legStretch: .0500000007
armTwist: 0.5
foreArmTwist: 0.5
upperLegTwist: 0.5
legTwist: 0.5
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
skeletonHasParents: 0
lastHumanDescriptionAvatarSource: {instanceID: 0}
animationType: 0
humanoidOversampling: 1
......
fileFormatVersion: 2
guid: 70c3f2ed34806724a903b2a5d2c84c6b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
......@@ -52,7 +52,7 @@ public class MenuManager : MonoBehaviour
menu = GameObject.FindGameObjectWithTag("Menu");
obstReader = new ObstaclesReader();
string dataPath = defaultScenarioPath();
string dataPath = getDefaultScenarioPath();
inputConfigPath = menu.GetComponentInChildren<InputField>();
inputConfigPath.text = dataPath;
......@@ -67,7 +67,7 @@ public class MenuManager : MonoBehaviour
/// Build the default scenarios folder path from the application path
/// </summary>
/// <returns>default scenarios folder path</returns>
public string defaultScenarioPath()
string getDefaultScenarioPath()
{
string pathPlayer = Application.dataPath;
int lastIndex = pathPlayer.LastIndexOf('/');
......@@ -94,11 +94,8 @@ public class MenuManager : MonoBehaviour
if (Directory.Exists(inputConfigPath.text))
dir = new DirectoryInfo(inputConfigPath.text);
else
{
string dataPath = defaultScenarioPath();
dir = new DirectoryInfo(getDefaultScenarioPath());
dir = new DirectoryInfo(dataPath);
}
FileInfo[] infos = dir.GetFiles("*.xml");
configFilesMenu.options.Clear();
configFilesMenu.options.Add(new Dropdown.OptionData("NONE"));
......@@ -145,19 +142,10 @@ public class MenuManager : MonoBehaviour
// determine whether to use RocketBox characters
bool useRocketBox = GameObject.Find("RocketBox").GetComponent<Toggle>().isOn;
// determine whether to add the metro station model
bool useMetro = GameObject.Find("MetroStation").GetComponent<Toggle>().isOn;
LoadEnv env = gameObject.GetComponent<LoadEnv>();
env.loadScenario(ConfigReader.trajectoriesDir, useRocketBox);
menu.SetActive(false);
if (useMetro)
{
var metroObject = Instantiate(Resources.Load<GameObject>("MetroPrefab"));
metroObject.name = "Metro Station Model";
metroObject.tag = "Metro";
}
}
/// <summary>
......
ManifestFileVersion: 0
CRC: 845905551
Hashes:
AssetFileHash:
serializedVersion: 2
Hash: b7e5cc7502e493f11b7e4b2cf0c61782
TypeTreeHash:
serializedVersion: 2
Hash: 7692eb6866bf99b54ffd8bc53be6163b
HashAppended: 0
ClassTypes:
- Class: 1
Script: {instanceID: 0}
- Class: 4
Script: {instanceID: 0}
- Class: 21
Script: {instanceID: 0}
- Class: 23
Script: {instanceID: 0}
- Class: 28
Script: {instanceID: 0}
- Class: 33
Script: {instanceID: 0}
- Class: 43
Script: {instanceID: 0}
- Class: 48
Script: {instanceID: 0}
- Class: 64
Script: {instanceID: 0}
- Class: 108
Script: {instanceID: 0}
- Class: 215
Script: {instanceID: 0}
Assets:
- Assets/Resources/MetroStation.prefab
Dependencies: []