Merge branch 'main' into Jake
This commit is contained in:
StudentJW
@@ -334,6 +334,16 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1013965729963872153, guid: 2b0bfd2786fee6740a799a99023f5000,
|
||||
type: 3}
|
||||
propertyPath: ExternalCamera
|
||||
value:
|
||||
objectReference: {fileID: 782229190}
|
||||
- target: {fileID: 1013965729963872153, guid: 2b0bfd2786fee6740a799a99023f5000,
|
||||
type: 3}
|
||||
propertyPath: FrontLayerImage
|
||||
value:
|
||||
objectReference: {fileID: 1484681361}
|
||||
- target: {fileID: 1013965729963872153, guid: 2b0bfd2786fee6740a799a99023f5000,
|
||||
type: 3}
|
||||
propertyPath: ActiveWindowSpawner
|
||||
@@ -362,17 +372,17 @@ PrefabInstance:
|
||||
- target: {fileID: 1807660236798938897, guid: 2b0bfd2786fee6740a799a99023f5000,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1807660236798938897, guid: 2b0bfd2786fee6740a799a99023f5000,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1807660236798938897, guid: 2b0bfd2786fee6740a799a99023f5000,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1807660236798938897, guid: 2b0bfd2786fee6740a799a99023f5000,
|
||||
type: 3}
|
||||
@@ -399,6 +409,239 @@ PrefabInstance:
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 2b0bfd2786fee6740a799a99023f5000, type: 3}
|
||||
--- !u!1001 &739366992
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 782229191}
|
||||
m_Modifications:
|
||||
- target: {fileID: 228621501325938318, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: ShieldBar
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 582498797338587669, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||
type: 3}
|
||||
propertyPath: Spawner
|
||||
value:
|
||||
objectReference: {fileID: 447617108}
|
||||
- target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 9
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5539847617648870874, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 80
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5539847617648870874, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||
type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 80
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: c0a03ce6c4f39224299267b83719ceb7, type: 3}
|
||||
--- !u!1 &782229187
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 782229191}
|
||||
- component: {fileID: 782229190}
|
||||
- component: {fileID: 782229189}
|
||||
- component: {fileID: 782229188}
|
||||
m_Layer: 0
|
||||
m_Name: ExternalCamera
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!114 &782229188
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 782229187}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: a79441f348de89743a2939f4d699eac1, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_RenderShadows: 1
|
||||
m_RequiresDepthTextureOption: 2
|
||||
m_RequiresOpaqueTextureOption: 2
|
||||
m_CameraType: 0
|
||||
m_Cameras: []
|
||||
m_RendererIndex: -1
|
||||
m_VolumeLayerMask:
|
||||
serializedVersion: 2
|
||||
m_Bits: 23
|
||||
m_VolumeTrigger: {fileID: 0}
|
||||
m_VolumeFrameworkUpdateModeOption: 0
|
||||
m_RenderPostProcessing: 0
|
||||
m_Antialiasing: 0
|
||||
m_AntialiasingQuality: 2
|
||||
m_StopNaN: 0
|
||||
m_Dithering: 0
|
||||
m_ClearDepth: 1
|
||||
m_AllowXRRendering: 1
|
||||
m_AllowHDROutput: 1
|
||||
m_UseScreenCoordOverride: 0
|
||||
m_ScreenSizeOverride: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_ScreenCoordScaleBias: {x: 0, y: 0, z: 0, w: 0}
|
||||
m_RequiresDepthTexture: 0
|
||||
m_RequiresColorTexture: 0
|
||||
m_Version: 2
|
||||
m_TaaSettings:
|
||||
m_Quality: 3
|
||||
m_FrameInfluence: 0.1
|
||||
m_JitterScale: 1
|
||||
m_MipBias: 0
|
||||
m_VarianceClampScale: 0.9
|
||||
m_ContrastAdaptiveSharpening: 0
|
||||
--- !u!20 &782229189
|
||||
Camera:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 782229187}
|
||||
m_Enabled: 1
|
||||
serializedVersion: 2
|
||||
m_ClearFlags: 2
|
||||
m_BackGroundColor: {r: 0, g: 0, b: 0, a: 1}
|
||||
m_projectionMatrixMode: 1
|
||||
m_GateFitMode: 2
|
||||
m_FOVAxisMode: 0
|
||||
m_Iso: 200
|
||||
m_ShutterSpeed: 0.005
|
||||
m_Aperture: 16
|
||||
m_FocusDistance: 10
|
||||
m_FocalLength: 50
|
||||
m_BladeCount: 5
|
||||
m_Curvature: {x: 2, y: 11}
|
||||
m_BarrelClipping: 0.25
|
||||
m_Anamorphism: 0
|
||||
m_SensorSize: {x: 36, y: 24}
|
||||
m_LensShift: {x: 0, y: 0}
|
||||
m_NormalizedViewPortRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1
|
||||
height: 1
|
||||
near clip plane: 0.3
|
||||
far clip plane: 1000
|
||||
field of view: 60
|
||||
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: 1
|
||||
m_AllowMSAA: 1
|
||||
m_AllowDynamicResolution: 0
|
||||
m_ForceIntoRT: 0
|
||||
m_OcclusionCulling: 1
|
||||
m_StereoConvergence: 10
|
||||
m_StereoSeparation: 0.022
|
||||
--- !u!114 &782229190
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 782229187}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: cfd8d92b06194cf98ee7011df76811cc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
ExternalCam: {fileID: 782229189}
|
||||
--- !u!4 &782229191
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 782229187}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 100, y: 0, z: 100}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1003288350}
|
||||
- {fileID: 1557857216}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!4 &1003288350 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4417313079524746681, guid: c0a03ce6c4f39224299267b83719ceb7,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 739366992}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!4 &1004516925 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4872202698225962268, guid: ffc439d5d7c92f14aa90c763e1cde8d2,
|
||||
@@ -941,6 +1184,97 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 42603e4f95b24efa85355a04450c20e2, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!114 &1484681361 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 833602854707986350, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1758685209}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1001 &1557857215
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 782229191}
|
||||
m_Modifications:
|
||||
- target: {fileID: 3265567963809100238, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
||||
type: 3}
|
||||
propertyPath: AttachedCamera
|
||||
value:
|
||||
objectReference: {fileID: 782229189}
|
||||
- target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 8
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: -90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7563216493506774349, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Cursor
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 15c9da29f34c88d4c82acf24cc874e3b, type: 3}
|
||||
--- !u!4 &1557857216 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 6997620146033860791, guid: 15c9da29f34c88d4c82acf24cc874e3b,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1557857215}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &1758685209
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -949,6 +1283,11 @@ PrefabInstance:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1912500691838987139, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
propertyPath: m_IsActive
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2020022267469913571, guid: e29ce1fe47a855c4e907d4312c9e9d6e,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
@@ -1688,3 +2027,4 @@ SceneRoots:
|
||||
- {fileID: 1909908770}
|
||||
- {fileID: 1758685209}
|
||||
- {fileID: 193820555}
|
||||
- {fileID: 782229191}
|
||||
|
||||
Reference in New Issue
Block a user