major fixes, updated with vertical aiming, updated with menu to change sensitivity

This commit is contained in:
2023-05-11 20:14:49 -04:00
parent aafb240391
commit d0ea8b29ac
40 changed files with 6485 additions and 1137 deletions

View File

@ -102,6 +102,37 @@ MonoBehaviour:
m_BlockingMask:
serializedVersion: 2
m_Bits: 4294967295
--- !u!1 &1424249521
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1424249522}
m_Layer: 0
m_Name: SideCamPos
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1424249522
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1424249521}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 1, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 365318978543542555}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1506393995
GameObject:
m_ObjectHideFlags: 0
@ -389,6 +420,216 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &2031122444
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2031122445}
- component: {fileID: 2031122448}
- component: {fileID: 2031122447}
- component: {fileID: 2031122446}
m_Layer: 0
m_Name: TestCam2
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2031122445
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2031122444}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 1, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 365318978543542555}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &2031122448
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2031122444}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.1
far clip plane: 5000
field of view: 40
orthographic: 0
orthographic size: 5
m_Depth: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 0
m_AllowMSAA: 0
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!81 &2031122447
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2031122444}
m_Enabled: 1
--- !u!114 &2031122446
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2031122444}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 23c1ce4fb46143f46bc5cb5224c934f6, type: 3}
m_Name:
m_EditorClassIdentifier:
clearColorMode: 1
backgroundColorHDR: {r: 0, g: 0, b: 0, a: 0}
clearDepth: 1
volumeLayerMask:
serializedVersion: 2
m_Bits: 1
volumeAnchorOverride: {fileID: 0}
antialiasing: 0
SMAAQuality: 2
dithering: 0
stopNaNs: 0
taaSharpenStrength: 0.5
TAAQuality: 1
taaHistorySharpening: 0.35
taaAntiFlicker: 0.5
taaMotionVectorRejection: 0
taaAntiHistoryRinging: 0
taaBaseBlendFactor: 0.875
taaJitterScale: 1
physicalParameters:
m_Iso: 200
m_ShutterSpeed: 0.005
m_Aperture: 16
m_FocusDistance: 10
m_BladeCount: 5
m_Curvature: {x: 2, y: 11}
m_BarrelClipping: 0.25
m_Anamorphism: 0
flipYMode: 0
xrRendering: 1
fullscreenPassthrough: 0
allowDynamicResolution: 0
customRenderingSettings: 0
invertFaceCulling: 0
probeLayerMask:
serializedVersion: 2
m_Bits: 4294967295
hasPersistentHistory: 0
allowDeepLearningSuperSampling: 1
deepLearningSuperSamplingUseCustomQualitySettings: 0
deepLearningSuperSamplingQuality: 0
deepLearningSuperSamplingUseCustomAttributes: 0
deepLearningSuperSamplingUseOptimalSettings: 1
deepLearningSuperSamplingSharpening: 0
exposureTarget: {fileID: 0}
materialMipBias: 0
m_RenderingPathCustomFrameSettings:
bitDatas:
data1: 72198260625768269
data2: 13763000477350330392
lodBias: 1
lodBiasMode: 0
lodBiasQualityLevel: 0
maximumLODLevel: 0
maximumLODLevelMode: 0
maximumLODLevelQualityLevel: 0
sssQualityMode: 0
sssQualityLevel: 0
sssCustomSampleBudget: 20
msaaMode: 1
materialQuality: 0
renderingPathCustomFrameSettingsOverrideMask:
mask:
data1: 0
data2: 0
defaultFrameSettings: 0
m_Version: 8
m_ObsoleteRenderingPath: 0
m_ObsoleteFrameSettings:
overrides: 0
enableShadow: 0
enableContactShadows: 0
enableShadowMask: 0
enableSSR: 0
enableSSAO: 0
enableSubsurfaceScattering: 0
enableTransmission: 0
enableAtmosphericScattering: 0
enableVolumetrics: 0
enableReprojectionForVolumetrics: 0
enableLightLayers: 0
enableExposureControl: 1
diffuseGlobalDimmer: 0
specularGlobalDimmer: 0
shaderLitMode: 0
enableDepthPrepassWithDeferredRendering: 0
enableTransparentPrepass: 0
enableMotionVectors: 0
enableObjectMotionVectors: 0
enableDecals: 0
enableRoughRefraction: 0
enableTransparentPostpass: 0
enableDistortion: 0
enablePostprocess: 0
enableOpaqueObjects: 0
enableTransparentObjects: 0
enableRealtimePlanarReflection: 0
enableMSAA: 0
enableAsyncCompute: 0
runLightListAsync: 0
runSSRAsync: 0
runSSAOAsync: 0
runContactShadowsAsync: 0
runVolumeVoxelizationAsync: 0
lightLoopSettings:
overrides: 0
enableDeferredTileAndCluster: 0
enableComputeLightEvaluation: 0
enableComputeLightVariants: 0
enableComputeMaterialVariants: 0
enableFptlForForwardOpaque: 0
enableBigTilePrepass: 0
isFptlEnabled: 0
--- !u!1 &2073197276
GameObject:
m_ObjectHideFlags: 0
@ -514,7 +755,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 365318976786001977}
m_LocalRotation: {x: 0.03652379, y: -0.16085865, z: 0.0382509, w: 0.98555946}
m_LocalRotation: {x: -0.03520201, y: -0.00000001750598, z: 0.000000002846753, w: 0.99938023}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -669,7 +910,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_BindingMode: 0
m_FollowOffset: {x: 0, y: 2.5, z: -3}
m_FollowOffset: {x: 0, y: 2, z: -3}
m_XDamping: 1
m_YDamping: 1
m_ZDamping: 1
@ -763,7 +1004,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 365318977167042193}
m_LocalRotation: {x: 0.09804932, y: 0.000000017650475, z: -0.0000000017389965, w: 0.99518156}
m_LocalPosition: {x: 0, y: 1.32, z: -3}
m_LocalPosition: {x: 0, y: 0.82000005, z: -3}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -906,7 +1147,7 @@ MonoBehaviour:
m_Orbits:
- m_Height: 4.5
m_Radius: 1.75
- m_Height: 2.5
- m_Height: 2
m_Radius: 3
- m_Height: 0.4
m_Radius: 1.3
@ -974,7 +1215,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_BindingMode: 0
m_FollowOffset: {x: 0, y: 2.5, z: -3}
m_FollowOffset: {x: 0, y: 2, z: -3}
m_XDamping: 1
m_YDamping: 1
m_ZDamping: 1
@ -1066,7 +1307,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 365318977785173328}
m_LocalRotation: {x: 0.018712722, y: -0.117857, z: 0.025769861, w: 0.9925198}
m_LocalRotation: {x: -0.053374406, y: -0.000000034718123, z: 0.0000000049993236, w: 0.9985746}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -1187,7 +1428,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_BindingMode: 0
m_FollowOffset: {x: 0, y: 2.5, z: -3}
m_FollowOffset: {x: 0, y: 2, z: -3}
m_XDamping: 1
m_YDamping: 1
m_ZDamping: 1
@ -1246,7 +1487,7 @@ MonoBehaviour:
m_LookaheadIgnoreY: 0
m_HorizontalDamping: 0
m_VerticalDamping: 0
m_ScreenX: 0.43
m_ScreenX: 0.5
m_ScreenY: 0.55
m_DeadZoneWidth: 0
m_DeadZoneHeight: 0
@ -1296,7 +1537,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 365318978058098897}
m_LocalRotation: {x: 0.00069931155, y: -0.16214196, z: 0.032382485, w: 0.98623574}
m_LocalRotation: {x: -0.07148121, y: -0.000000017597836, z: 0.0000000022089703, w: 0.99744195}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -1371,9 +1612,10 @@ GameObject:
- component: {fileID: 365318978543542557}
- component: {fileID: 365318978543542552}
- component: {fileID: 6315715599012510120}
- component: {fileID: 2559662377923291013}
m_Layer: 0
m_Name: Camera
m_TagString: MainCamera
m_Name: CameraHidden
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 1
m_StaticEditorFlags: 0
@ -1385,11 +1627,13 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 365318978543542559}
m_LocalRotation: {x: 0.116552204, y: -0.063538514, z: 0.007471893, w: 0.9911219}
m_LocalPosition: {x: 0, y: 1.32, z: -3}
m_LocalRotation: {x: 0.04479234, y: -0.0000000344453, z: 0.0000000015444355, w: 0.9989963}
m_LocalPosition: {x: 0, y: 0.82000005, z: -3}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Children:
- {fileID: 2031122445}
- {fileID: 1424249522}
m_Father: {fileID: 365318977076093362}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 13.821, y: 0, z: 0}
@ -1427,7 +1671,7 @@ Camera:
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetDisplay: 1
m_TargetEye: 3
m_HDR: 0
m_AllowMSAA: 0
@ -1443,7 +1687,7 @@ AudioListener:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 365318978543542559}
m_Enabled: 1
m_Enabled: 0
--- !u!114 &365318978543542557
MonoBehaviour:
m_ObjectHideFlags: 0
@ -1621,6 +1865,22 @@ MonoBehaviour:
serializedVersion: 2
m_Bits: 64
range: 1
--- !u!114 &2559662377923291013
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 365318978543542559}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4d2cf1ca1f9d2e64e98d70fb574f0316, type: 3}
m_Name:
m_EditorClassIdentifier:
childCam: {fileID: 0}
offset: {fileID: 1424249522}
cameraSpeed: 5
freelook: {fileID: 0}
--- !u!1 &365318978817215852
GameObject:
m_ObjectHideFlags: 0
@ -1729,7 +1989,7 @@ PrefabInstance:
objectReference: {fileID: 365318978543542556}
- target: {fileID: 165371623, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3}
propertyPath: m_LocalPosition.x
value: -10.35
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1000589094, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3}
propertyPath: runNoiseDistance
@ -1743,6 +2003,18 @@ PrefabInstance:
propertyPath: cameraFreeLook
value:
objectReference: {fileID: 365318977167042205}
- target: {fileID: 506506833991321686, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3}
propertyPath: m_Size.z
value: 1.2584232
objectReference: {fileID: 0}
- target: {fileID: 506506833991321686, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3}
propertyPath: m_Center.z
value: -0.12921162
objectReference: {fileID: 0}
- target: {fileID: 1830643123924126821, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3}
propertyPath: shift
value:
objectReference: {fileID: 2559662377923291013}
- target: {fileID: 2821278824672803001, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3}
propertyPath: cam
value:
@ -1751,6 +2023,10 @@ PrefabInstance:
propertyPath: freelook
value:
objectReference: {fileID: 365318977167042205}
- target: {fileID: 2821278824672803001, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3}
propertyPath: animatedRotationSpeed
value: 25
objectReference: {fileID: 0}
- target: {fileID: 5307183109647314236, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3}
propertyPath: m_RootOrder
value: 0
@ -1807,6 +2083,14 @@ PrefabInstance:
propertyPath: selectedQuantityText
value:
objectReference: {fileID: 1867809577}
- target: {fileID: 6195543837284837351, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3}
propertyPath: movement
value:
objectReference: {fileID: 2465419015398460425}
- target: {fileID: 6195543837284837351, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3}
propertyPath: hiddenCam
value:
objectReference: {fileID: 365318978543542556}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3}
--- !u!4 &365318977280207447 stripped
@ -1836,6 +2120,17 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &2465419015398460425 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 2821278824672803001, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3}
m_PrefabInstance: {fileID: 365318977165309104}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 04d9fbdb37200704a9166659474a658a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &4643482723999724906 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4999322433309573594, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3}

View File

@ -0,0 +1,11 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!319 &31900000
AvatarMask:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: LowerBody
m_Mask: 01000000000000000000000001000000010000000000000000000000000000000000000001000000010000000000000000000000
m_Elements: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 4f38ba290857b7d4b922678d6afc210f
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 31900000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,11 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!319 &31900000
AvatarMask:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: UpperBody
m_Mask: 00000000010000000100000000000000000000000100000001000000010000000100000000000000000000000100000001000000
m_Elements: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1c5f7b1783738244dbde199156bf4d36
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 31900000
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff