diff --git a/models/objects/Fun_animations_21-9.fbx b/models/objects/Fun_animations_21-9.fbx new file mode 100644 index 0000000..c46c5e0 Binary files /dev/null and b/models/objects/Fun_animations_21-9.fbx differ diff --git a/unity_Project/Assets/0bjects/obj_crane.fbx b/unity_Project/Assets/0bjects/obj_crane.fbx new file mode 100644 index 0000000..db43f53 Binary files /dev/null and b/unity_Project/Assets/0bjects/obj_crane.fbx differ diff --git a/unity_Project/Assets/0bjects/obj_crane.fbx.meta b/unity_Project/Assets/0bjects/obj_crane.fbx.meta new file mode 100644 index 0000000..ebbab40 --- /dev/null +++ b/unity_Project/Assets/0bjects/obj_crane.fbx.meta @@ -0,0 +1,103 @@ +fileFormatVersion: 2 +guid: e7e1802aaa8db5941bcefea6d39ed530 +timeCreated: 1442761764 +licenseType: Free +ModelImporter: + serializedVersion: 18 + fileIDToRecycleName: + 100000: //RootNode + 100002: pCube5 + 100004: pCube6 + 100006: pCube7 + 100008: pCylinder6 + 100010: polySurface1 + 100012: polySurface3 + 100014: transform1 + 100016: transform2 + 100018: transform3 + 100020: transform4 + 100022: transform5 + 400000: //RootNode + 400002: pCube5 + 400004: pCube6 + 400006: pCube7 + 400008: pCylinder6 + 400010: polySurface1 + 400012: polySurface3 + 400014: transform1 + 400016: transform2 + 400018: transform3 + 400020: transform4 + 400022: transform5 + 2300000: pCube7 + 2300002: pCylinder6 + 3300000: pCube7 + 3300002: pCylinder6 + 4300000: pCylinder6 + 4300002: pCube7 + 7400000: Take 001 + 9500000: //RootNode + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: .5 + animationPositionError: .5 + animationScaleError: .5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importBlendShapes: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + splitTangentsAcrossUV: 1 + normalImportMode: 0 + tangentImportMode: 1 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + human: [] + skeleton: [] + armTwist: .5 + foreArmTwist: .5 + upperLegTwist: .5 + legTwist: .5 + armStretch: .0500000007 + legStretch: .0500000007 + feetSpacing: 0 + rootMotionBoneName: + hasTranslationDoF: 0 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 2 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/0bjects/obj_track_Forward.fbx b/unity_Project/Assets/0bjects/obj_track_Forward.fbx new file mode 100644 index 0000000..3cfb502 Binary files /dev/null and b/unity_Project/Assets/0bjects/obj_track_Forward.fbx differ diff --git a/unity_Project/Assets/0bjects/obj_track_Forward.fbx.meta b/unity_Project/Assets/0bjects/obj_track_Forward.fbx.meta new file mode 100644 index 0000000..604a38c --- /dev/null +++ b/unity_Project/Assets/0bjects/obj_track_Forward.fbx.meta @@ -0,0 +1,124 @@ +fileFormatVersion: 2 +guid: e21a930b87f69224dbbb5231898a887c +timeCreated: 1442761764 +licenseType: Free +ModelImporter: + serializedVersion: 18 + fileIDToRecycleName: + 100000: //RootNode + 100002: pCube1 + 100004: pCube2 + 100006: pCube3 + 100008: pCube4 + 100010: pCube5 + 100012: pCube6 + 100014: pCube7 + 100016: polySurface1 + 100018: polySurface2 + 100020: polySurface3 + 100022: polySurface4 + 100024: polySurface5 + 100026: transform1 + 100028: transform10 + 100030: transform2 + 100032: transform3 + 100034: transform4 + 100036: transform5 + 100038: transform6 + 100040: transform7 + 100042: transform8 + 100044: transform9 + 400000: //RootNode + 400002: pCube1 + 400004: pCube2 + 400006: pCube3 + 400008: pCube4 + 400010: pCube5 + 400012: pCube6 + 400014: pCube7 + 400016: polySurface1 + 400018: polySurface2 + 400020: polySurface3 + 400022: polySurface4 + 400024: polySurface5 + 400026: transform1 + 400028: transform10 + 400030: transform2 + 400032: transform3 + 400034: transform4 + 400036: transform5 + 400038: transform6 + 400040: transform7 + 400042: transform8 + 400044: transform9 + 2300000: polySurface4 + 2300002: polySurface5 + 3300000: polySurface4 + 3300002: polySurface5 + 4300000: polySurface4 + 4300002: polySurface5 + 9500000: //RootNode + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: .5 + animationPositionError: .5 + animationScaleError: .5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importBlendShapes: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + splitTangentsAcrossUV: 1 + normalImportMode: 0 + tangentImportMode: 1 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + human: [] + skeleton: [] + armTwist: .5 + foreArmTwist: .5 + upperLegTwist: .5 + legTwist: .5 + armStretch: .0500000007 + legStretch: .0500000007 + feetSpacing: 0 + rootMotionBoneName: + hasTranslationDoF: 0 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 2 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/0bjects/obj_track_Left.fbx b/unity_Project/Assets/0bjects/obj_track_Left.fbx new file mode 100644 index 0000000..c649d73 Binary files /dev/null and b/unity_Project/Assets/0bjects/obj_track_Left.fbx differ diff --git a/unity_Project/Assets/0bjects/obj_track_Left.fbx.meta b/unity_Project/Assets/0bjects/obj_track_Left.fbx.meta new file mode 100644 index 0000000..705ebb0 --- /dev/null +++ b/unity_Project/Assets/0bjects/obj_track_Left.fbx.meta @@ -0,0 +1,104 @@ +fileFormatVersion: 2 +guid: e8f2d5f9780d75e42b301cd437c81283 +timeCreated: 1442761764 +licenseType: Free +ModelImporter: + serializedVersion: 18 + fileIDToRecycleName: + 100000: //RootNode + 100002: polySurface17 + 100004: polySurface18 + 100006: polySurface19 + 100008: polySurface20 + 100010: polySurface21 + 100012: polySurface22 + 400000: //RootNode + 400002: polySurface17 + 400004: polySurface18 + 400006: polySurface19 + 400008: polySurface20 + 400010: polySurface21 + 400012: polySurface22 + 2300000: polySurface17 + 2300002: polySurface18 + 2300004: polySurface19 + 2300006: polySurface20 + 2300008: polySurface21 + 2300010: polySurface22 + 3300000: polySurface17 + 3300002: polySurface18 + 3300004: polySurface19 + 3300006: polySurface20 + 3300008: polySurface21 + 3300010: polySurface22 + 4300000: polySurface17 + 4300002: polySurface18 + 4300004: polySurface19 + 4300006: polySurface20 + 4300008: polySurface21 + 4300010: polySurface22 + 9500000: //RootNode + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: .5 + animationPositionError: .5 + animationScaleError: .5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importBlendShapes: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + splitTangentsAcrossUV: 1 + normalImportMode: 0 + tangentImportMode: 1 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + human: [] + skeleton: [] + armTwist: .5 + foreArmTwist: .5 + upperLegTwist: .5 + legTwist: .5 + armStretch: .0500000007 + legStretch: .0500000007 + feetSpacing: 0 + rootMotionBoneName: + hasTranslationDoF: 0 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 2 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/0bjects/obj_track_Right.fbx b/unity_Project/Assets/0bjects/obj_track_Right.fbx new file mode 100644 index 0000000..a670aba Binary files /dev/null and b/unity_Project/Assets/0bjects/obj_track_Right.fbx differ diff --git a/unity_Project/Assets/0bjects/obj_track_Right.fbx.meta b/unity_Project/Assets/0bjects/obj_track_Right.fbx.meta new file mode 100644 index 0000000..b2d1d85 --- /dev/null +++ b/unity_Project/Assets/0bjects/obj_track_Right.fbx.meta @@ -0,0 +1,116 @@ +fileFormatVersion: 2 +guid: 846e13609dee98b4db744c5fca1ece36 +timeCreated: 1442761764 +licenseType: Free +ModelImporter: + serializedVersion: 18 + fileIDToRecycleName: + 100000: //RootNode + 100002: polySurface10 + 100004: polySurface12 + 100006: polySurface13 + 100008: polySurface14 + 100010: polySurface15 + 100012: polySurface16 + 100014: polySurface6 + 100016: polySurface7 + 100018: polySurface8 + 100020: polySurface9 + 100022: transform11 + 100024: transform12 + 400000: //RootNode + 400002: polySurface10 + 400004: polySurface12 + 400006: polySurface13 + 400008: polySurface14 + 400010: polySurface15 + 400012: polySurface16 + 400014: polySurface6 + 400016: polySurface7 + 400018: polySurface8 + 400020: polySurface9 + 400022: transform11 + 400024: transform12 + 2300000: polySurface10 + 2300002: polySurface12 + 2300004: polySurface13 + 2300006: polySurface14 + 2300008: polySurface15 + 2300010: polySurface16 + 3300000: polySurface10 + 3300002: polySurface12 + 3300004: polySurface13 + 3300006: polySurface14 + 3300008: polySurface15 + 3300010: polySurface16 + 4300000: polySurface10 + 4300002: polySurface12 + 4300004: polySurface13 + 4300006: polySurface14 + 4300008: polySurface15 + 4300010: polySurface16 + 9500000: //RootNode + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: .5 + animationPositionError: .5 + animationScaleError: .5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importBlendShapes: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + splitTangentsAcrossUV: 1 + normalImportMode: 0 + tangentImportMode: 1 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + human: [] + skeleton: [] + armTwist: .5 + foreArmTwist: .5 + upperLegTwist: .5 + legTwist: .5 + armStretch: .0500000007 + legStretch: .0500000007 + feetSpacing: 0 + rootMotionBoneName: + hasTranslationDoF: 0 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 2 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/0bjects/objtrack_end.fbx b/unity_Project/Assets/0bjects/objtrack_end.fbx new file mode 100644 index 0000000..bd26b53 Binary files /dev/null and b/unity_Project/Assets/0bjects/objtrack_end.fbx differ diff --git a/unity_Project/Assets/0bjects/objtrack_end.fbx.meta b/unity_Project/Assets/0bjects/objtrack_end.fbx.meta new file mode 100644 index 0000000..6ba5705 --- /dev/null +++ b/unity_Project/Assets/0bjects/objtrack_end.fbx.meta @@ -0,0 +1,87 @@ +fileFormatVersion: 2 +guid: 50b68bb7c51db0544976802be1d29223 +timeCreated: 1442761764 +licenseType: Free +ModelImporter: + serializedVersion: 18 + fileIDToRecycleName: + 100000: //RootNode + 100002: polySurface12 + 100004: polySurface23 + 100006: polySurface24 + 100008: transform14 + 100010: transform15 + 400000: //RootNode + 400002: polySurface12 + 400004: polySurface23 + 400006: polySurface24 + 400008: transform14 + 400010: transform15 + 2300000: polySurface24 + 3300000: polySurface24 + 4300000: polySurface24 + 9500000: //RootNode + materials: + importMaterials: 1 + materialName: 0 + materialSearch: 1 + animations: + legacyGenerateAnimations: 4 + bakeSimulation: 0 + optimizeGameObjects: 0 + motionNodeName: + animationImportErrors: + animationImportWarnings: + animationRetargetingWarnings: + animationDoRetargetingWarnings: 0 + animationCompression: 1 + animationRotationError: .5 + animationPositionError: .5 + animationScaleError: .5 + animationWrapMode: 0 + extraExposedTransformPaths: [] + clipAnimations: [] + isReadable: 1 + meshes: + lODScreenPercentages: [] + globalScale: 1 + meshCompression: 0 + addColliders: 0 + importBlendShapes: 1 + swapUVChannels: 0 + generateSecondaryUV: 0 + useFileUnits: 1 + optimizeMeshForGPU: 1 + keepQuads: 0 + weldVertices: 1 + secondaryUVAngleDistortion: 8 + secondaryUVAreaDistortion: 15.000001 + secondaryUVHardAngle: 88 + secondaryUVPackMargin: 4 + useFileScale: 1 + tangentSpace: + normalSmoothAngle: 60 + splitTangentsAcrossUV: 1 + normalImportMode: 0 + tangentImportMode: 1 + importAnimation: 1 + copyAvatar: 0 + humanDescription: + human: [] + skeleton: [] + armTwist: .5 + foreArmTwist: .5 + upperLegTwist: .5 + legTwist: .5 + armStretch: .0500000007 + legStretch: .0500000007 + feetSpacing: 0 + rootMotionBoneName: + hasTranslationDoF: 0 + lastHumanDescriptionAvatarSource: {instanceID: 0} + animationType: 2 + humanoidOversampling: 1 + additionalBone: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/unity_Project/Assets/_Scenes/MainLevel.unity b/unity_Project/Assets/_Scenes/MainLevel.unity index 7e907e4..5ba5aac 100644 Binary files a/unity_Project/Assets/_Scenes/MainLevel.unity and b/unity_Project/Assets/_Scenes/MainLevel.unity differ diff --git a/unity_Project/ProjectSettings/ProjectSettings.asset b/unity_Project/ProjectSettings/ProjectSettings.asset index 0b29a4f..6773321 100644 Binary files a/unity_Project/ProjectSettings/ProjectSettings.asset and b/unity_Project/ProjectSettings/ProjectSettings.asset differ diff --git a/unity_Project/ProjectSettings/ProjectVersion.txt b/unity_Project/ProjectSettings/ProjectVersion.txt index e91ffe2..e040c5c 100644 --- a/unity_Project/ProjectSettings/ProjectVersion.txt +++ b/unity_Project/ProjectSettings/ProjectVersion.txt @@ -1,6 +1,2 @@ -<<<<<<< HEAD -m_EditorVersion: 5.1.3f1 -======= m_EditorVersion: 5.2.0f3 ->>>>>>> c85d23b96e9c647da9374d868cbb9e8fe3c15aed m_StandardAssetsVersion: 0