fixed start scene
This commit is contained in:
parent
e552c3453d
commit
1872f09868
BIN
Assets/Models/Station/Hallways/NasapunkHallways/4WaySplitHallway.fbx
(Stored with Git LFS)
Normal file
BIN
Assets/Models/Station/Hallways/NasapunkHallways/4WaySplitHallway.fbx
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -0,0 +1,106 @@
|
||||
fileFormatVersion: 2
|
||||
guid: c286c6e36f2ee8249b0faade1bd09094
|
||||
ModelImporter:
|
||||
serializedVersion: 21300
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
materials:
|
||||
materialImportMode: 2
|
||||
materialName: 0
|
||||
materialSearch: 1
|
||||
materialLocation: 1
|
||||
animations:
|
||||
legacyGenerateAnimations: 4
|
||||
bakeSimulation: 0
|
||||
resampleCurves: 1
|
||||
optimizeGameObjects: 0
|
||||
removeConstantScaleCurves: 1
|
||||
motionNodeName:
|
||||
rigImportErrors:
|
||||
rigImportWarnings:
|
||||
animationImportErrors:
|
||||
animationImportWarnings:
|
||||
animationRetargetingWarnings:
|
||||
animationDoRetargetingWarnings: 0
|
||||
importAnimatedCustomProperties: 0
|
||||
importConstraints: 0
|
||||
animationCompression: 1
|
||||
animationRotationError: 0.5
|
||||
animationPositionError: 0.5
|
||||
animationScaleError: 0.5
|
||||
animationWrapMode: 0
|
||||
extraExposedTransformPaths: []
|
||||
extraUserProperties: []
|
||||
clipAnimations: []
|
||||
isReadable: 0
|
||||
meshes:
|
||||
lODScreenPercentages: []
|
||||
globalScale: 1
|
||||
meshCompression: 0
|
||||
addColliders: 0
|
||||
useSRGBMaterialColor: 1
|
||||
sortHierarchyByName: 1
|
||||
importVisibility: 1
|
||||
importBlendShapes: 1
|
||||
importCameras: 1
|
||||
importLights: 1
|
||||
nodeNameCollisionStrategy: 1
|
||||
fileIdsGeneration: 2
|
||||
swapUVChannels: 0
|
||||
generateSecondaryUV: 0
|
||||
useFileUnits: 1
|
||||
keepQuads: 0
|
||||
weldVertices: 1
|
||||
bakeAxisConversion: 0
|
||||
preserveHierarchy: 0
|
||||
skinWeightsMode: 0
|
||||
maxBonesPerVertex: 4
|
||||
minBoneWeight: 0.001
|
||||
optimizeBones: 1
|
||||
meshOptimizationFlags: -1
|
||||
indexFormat: 0
|
||||
secondaryUVAngleDistortion: 8
|
||||
secondaryUVAreaDistortion: 15.000001
|
||||
secondaryUVHardAngle: 88
|
||||
secondaryUVMarginMethod: 1
|
||||
secondaryUVMinLightmapResolution: 40
|
||||
secondaryUVMinObjectScale: 1
|
||||
secondaryUVPackMargin: 4
|
||||
useFileScale: 1
|
||||
tangentSpace:
|
||||
normalSmoothAngle: 60
|
||||
normalImportMode: 0
|
||||
tangentImportMode: 3
|
||||
normalCalculationMode: 4
|
||||
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
|
||||
blendShapeNormalImportMode: 1
|
||||
normalSmoothingSource: 0
|
||||
referencedClips: []
|
||||
importAnimation: 1
|
||||
humanDescription:
|
||||
serializedVersion: 3
|
||||
human: []
|
||||
skeleton: []
|
||||
armTwist: 0.5
|
||||
foreArmTwist: 0.5
|
||||
upperLegTwist: 0.5
|
||||
legTwist: 0.5
|
||||
armStretch: 0.05
|
||||
legStretch: 0.05
|
||||
feetSpacing: 0
|
||||
globalScale: 1
|
||||
rootMotionBoneName:
|
||||
hasTranslationDoF: 0
|
||||
hasExtraRoot: 0
|
||||
skeletonHasParents: 1
|
||||
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
||||
autoGenerateAvatarMappingIfUnspecified: 1
|
||||
animationType: 2
|
||||
humanoidOversampling: 1
|
||||
avatarSetup: 0
|
||||
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
|
||||
remapMaterialsIfMaterialImportModeIsNone: 0
|
||||
additionalBone: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/Models/Station/Hallways/NasapunkHallways/StatonHallway.fbx
(Stored with Git LFS)
Normal file
BIN
Assets/Models/Station/Hallways/NasapunkHallways/StatonHallway.fbx
(Stored with Git LFS)
Normal file
Binary file not shown.
@ -0,0 +1,106 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 45c12103d2029a5438cb85f892fb14b7
|
||||
ModelImporter:
|
||||
serializedVersion: 21300
|
||||
internalIDToNameTable: []
|
||||
externalObjects: {}
|
||||
materials:
|
||||
materialImportMode: 2
|
||||
materialName: 0
|
||||
materialSearch: 1
|
||||
materialLocation: 1
|
||||
animations:
|
||||
legacyGenerateAnimations: 4
|
||||
bakeSimulation: 0
|
||||
resampleCurves: 1
|
||||
optimizeGameObjects: 0
|
||||
removeConstantScaleCurves: 1
|
||||
motionNodeName:
|
||||
rigImportErrors:
|
||||
rigImportWarnings:
|
||||
animationImportErrors:
|
||||
animationImportWarnings:
|
||||
animationRetargetingWarnings:
|
||||
animationDoRetargetingWarnings: 0
|
||||
importAnimatedCustomProperties: 0
|
||||
importConstraints: 0
|
||||
animationCompression: 1
|
||||
animationRotationError: 0.5
|
||||
animationPositionError: 0.5
|
||||
animationScaleError: 0.5
|
||||
animationWrapMode: 0
|
||||
extraExposedTransformPaths: []
|
||||
extraUserProperties: []
|
||||
clipAnimations: []
|
||||
isReadable: 0
|
||||
meshes:
|
||||
lODScreenPercentages: []
|
||||
globalScale: 1
|
||||
meshCompression: 0
|
||||
addColliders: 0
|
||||
useSRGBMaterialColor: 1
|
||||
sortHierarchyByName: 1
|
||||
importVisibility: 1
|
||||
importBlendShapes: 1
|
||||
importCameras: 1
|
||||
importLights: 1
|
||||
nodeNameCollisionStrategy: 1
|
||||
fileIdsGeneration: 2
|
||||
swapUVChannels: 0
|
||||
generateSecondaryUV: 0
|
||||
useFileUnits: 1
|
||||
keepQuads: 0
|
||||
weldVertices: 1
|
||||
bakeAxisConversion: 0
|
||||
preserveHierarchy: 0
|
||||
skinWeightsMode: 0
|
||||
maxBonesPerVertex: 4
|
||||
minBoneWeight: 0.001
|
||||
optimizeBones: 1
|
||||
meshOptimizationFlags: -1
|
||||
indexFormat: 0
|
||||
secondaryUVAngleDistortion: 8
|
||||
secondaryUVAreaDistortion: 15.000001
|
||||
secondaryUVHardAngle: 88
|
||||
secondaryUVMarginMethod: 1
|
||||
secondaryUVMinLightmapResolution: 40
|
||||
secondaryUVMinObjectScale: 1
|
||||
secondaryUVPackMargin: 4
|
||||
useFileScale: 1
|
||||
tangentSpace:
|
||||
normalSmoothAngle: 60
|
||||
normalImportMode: 0
|
||||
tangentImportMode: 3
|
||||
normalCalculationMode: 4
|
||||
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
|
||||
blendShapeNormalImportMode: 1
|
||||
normalSmoothingSource: 0
|
||||
referencedClips: []
|
||||
importAnimation: 1
|
||||
humanDescription:
|
||||
serializedVersion: 3
|
||||
human: []
|
||||
skeleton: []
|
||||
armTwist: 0.5
|
||||
foreArmTwist: 0.5
|
||||
upperLegTwist: 0.5
|
||||
legTwist: 0.5
|
||||
armStretch: 0.05
|
||||
legStretch: 0.05
|
||||
feetSpacing: 0
|
||||
globalScale: 1
|
||||
rootMotionBoneName:
|
||||
hasTranslationDoF: 0
|
||||
hasExtraRoot: 0
|
||||
skeletonHasParents: 1
|
||||
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
||||
autoGenerateAvatarMappingIfUnspecified: 1
|
||||
animationType: 2
|
||||
humanoidOversampling: 1
|
||||
avatarSetup: 0
|
||||
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
|
||||
remapMaterialsIfMaterialImportModeIsNone: 0
|
||||
additionalBone: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -242,6 +242,48 @@ MonoBehaviour:
|
||||
- {fileID: -7116834154035175570}
|
||||
- {fileID: -6697039509728070763}
|
||||
- {fileID: 5684076176618343765}
|
||||
- {fileID: 5670475821068355932}
|
||||
- {fileID: 1080914553685901678}
|
||||
--- !u!114 &1080914553685901678
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 3
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 2c1be1b6c95cd2e41b27903b9270817f, type: 3}
|
||||
m_Name: Vignette
|
||||
m_EditorClassIdentifier:
|
||||
active: 1
|
||||
mode:
|
||||
m_OverrideState: 1
|
||||
m_Value: 0
|
||||
color:
|
||||
m_OverrideState: 1
|
||||
m_Value: {r: 0, g: 0, b: 0, a: 1}
|
||||
center:
|
||||
m_OverrideState: 0
|
||||
m_Value: {x: 0.5, y: 0.5}
|
||||
intensity:
|
||||
m_OverrideState: 1
|
||||
m_Value: 0.364
|
||||
smoothness:
|
||||
m_OverrideState: 0
|
||||
m_Value: 0.2
|
||||
roundness:
|
||||
m_OverrideState: 1
|
||||
m_Value: 1
|
||||
rounded:
|
||||
m_OverrideState: 0
|
||||
m_Value: 0
|
||||
mask:
|
||||
m_OverrideState: 0
|
||||
m_Value: {fileID: 0}
|
||||
opacity:
|
||||
m_OverrideState: 0
|
||||
m_Value: 1
|
||||
--- !u!114 &4218869269747539245
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 3
|
||||
@ -451,6 +493,31 @@ MonoBehaviour:
|
||||
m_ObsoleteScrollSpeed:
|
||||
m_OverrideState: 0
|
||||
m_Value: 1
|
||||
--- !u!114 &5670475821068355932
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 3
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 5a6b00fcf518bb94a90b408492e07b44, type: 3}
|
||||
m_Name: FilmGrain
|
||||
m_EditorClassIdentifier:
|
||||
active: 1
|
||||
type:
|
||||
m_OverrideState: 1
|
||||
m_Value: 5
|
||||
intensity:
|
||||
m_OverrideState: 1
|
||||
m_Value: 0.445
|
||||
response:
|
||||
m_OverrideState: 1
|
||||
m_Value: 0.841
|
||||
texture:
|
||||
m_OverrideState: 0
|
||||
m_Value: {fileID: 0}
|
||||
--- !u!114 &5684076176618343765
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 3
|
||||
@ -463,19 +530,19 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 4b8bcdf71d7fafa419fca1ed162f5fc9, type: 3}
|
||||
m_Name: ColorAdjustments
|
||||
m_EditorClassIdentifier:
|
||||
active: 0
|
||||
active: 1
|
||||
postExposure:
|
||||
m_OverrideState: 0
|
||||
m_Value: 0
|
||||
contrast:
|
||||
m_OverrideState: 0
|
||||
m_OverrideState: 1
|
||||
m_Value: 0
|
||||
colorFilter:
|
||||
m_OverrideState: 0
|
||||
m_Value: {r: 0.990566, g: 0.990566, b: 0.990566, a: 1}
|
||||
m_Value: {r: 0.94716984, g: 0.99101126, b: 1, a: 1}
|
||||
hueShift:
|
||||
m_OverrideState: 0
|
||||
m_Value: 0
|
||||
saturation:
|
||||
m_OverrideState: 0
|
||||
m_Value: 0
|
||||
m_OverrideState: 1
|
||||
m_Value: 47.2
|
||||
|
@ -1848,19 +1848,19 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7274624882445554639, guid: 3cbb87b9c7b0a01458108d45dc4eee05, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -3.9161743e-10
|
||||
value: -0.000000034718123
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7274624882445554639, guid: 3cbb87b9c7b0a01458108d45dc4eee05, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 5.6392228e-11
|
||||
value: 0.0000000049993236
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7274624883331524490, guid: 3cbb87b9c7b0a01458108d45dc4eee05, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.0000000344453
|
||||
value: -0.0000000344453
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7274624883331524490, guid: 3cbb87b9c7b0a01458108d45dc4eee05, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0.0000000015444355
|
||||
value: 0.0000000015444355
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 3cbb87b9c7b0a01458108d45dc4eee05, type: 3}
|
||||
|
8
Assets/Scenes/Levels/Level0V2.meta
Normal file
8
Assets/Scenes/Levels/Level0V2.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 54fb02ca2ca2027438f844f32551ea2d
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
20498
Assets/Scenes/Levels/Level0V2.unity
Normal file
20498
Assets/Scenes/Levels/Level0V2.unity
Normal file
File diff suppressed because it is too large
Load Diff
7
Assets/Scenes/Levels/Level0V2.unity.meta
Normal file
7
Assets/Scenes/Levels/Level0V2.unity.meta
Normal file
@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ce19f4b33fd6efc42bb716ec41fc58c2
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
BIN
Assets/Scenes/Levels/Level0V2/NavMesh.asset
Normal file
BIN
Assets/Scenes/Levels/Level0V2/NavMesh.asset
Normal file
Binary file not shown.
8
Assets/Scenes/Levels/Level0V2/NavMesh.asset.meta
Normal file
8
Assets/Scenes/Levels/Level0V2/NavMesh.asset.meta
Normal file
@ -0,0 +1,8 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 4bbdd4912d08cfb4d89b6cc77aa042b0
|
||||
NativeFormatImporter:
|
||||
externalObjects: {}
|
||||
mainObjectFileID: 23800000
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
@ -14606,6 +14606,12 @@ MonoBehaviour:
|
||||
firePower: 40
|
||||
maxProjectileDuration: 5
|
||||
maxTargetObjDistance: 15
|
||||
shootEffect: {fileID: 0}
|
||||
shootLight: {fileID: 0}
|
||||
shootLightDuration: 0.1
|
||||
ignoreLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
--- !u!4 &1726408795
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -109,6 +109,11 @@ public void SetSensitivity(float sensitivity)
|
||||
private void MovePlayer()
|
||||
{
|
||||
var movement = Vector3.zero;
|
||||
//Modified to a normal 1 vector to ensure speed is not greater when moving diagonally.
|
||||
Vector2 normalizedInput = new Vector2(x, y).normalized;
|
||||
x = normalizedInput.x;
|
||||
y = normalizedInput.y;
|
||||
|
||||
//movement += transform.forward * Mathf.Abs(y) * Time.deltaTime * speed;//+(transform.right*x*Time.deltaTime*speed);
|
||||
movement += cam.transform.forward * y * Time.deltaTime * speed;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user