Bug Fixes from v1.0

- Fix lighting on desert
- Move dialogue radius to correct spot
- Disable movement while talking to NPCs
- Move desert spawn point a little bit
This commit is contained in:
2022-08-31 22:56:09 -07:00
parent c73a2e918c
commit b907cdcd9b
20 changed files with 828 additions and 52 deletions

View File

@@ -97,7 +97,7 @@ LightmapSettings:
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_LightingDataAsset: {fileID: 112000000, guid: 6864b4eb1e1acbf40a57a1a506e1e3ee, type: 2}
m_LightingSettings: {fileID: 0}
--- !u!196 &4
NavMeshSettings:
@@ -226,6 +226,11 @@ Transform:
m_Father: {fileID: 178155227}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &138018146 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
m_PrefabInstance: {fileID: 1361982760}
m_PrefabAsset: {fileID: 0}
--- !u!1 &148242351
GameObject:
m_ObjectHideFlags: 0
@@ -832,7 +837,7 @@ MonoBehaviour:
m_PrefabInstance: {fileID: 338826489}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 0
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
@@ -1102,6 +1107,103 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 382428140}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &400394926
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 400394927}
- component: {fileID: 400394930}
- component: {fileID: 400394929}
- component: {fileID: 400394928}
m_Layer: 0
m_Name: Cube (2)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &400394927
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 400394926}
m_LocalRotation: {x: -0, y: 0.49368256, z: -0, w: 0.86964214}
m_LocalPosition: {x: -66.2, y: 5.3, z: -244}
m_LocalScale: {x: 13.314615, y: 26.726276, z: 164.55}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 1378396660}
m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 59.166, z: 0}
--- !u!65 &400394928
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 400394926}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &400394929
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 400394926}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &400394930
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 400394926}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &418943754
GameObject:
m_ObjectHideFlags: 0
@@ -2147,6 +2249,103 @@ MonoBehaviour:
_scene: WorldMap
_promptToEnter: 0
_promptText: {fileID: 0}
--- !u!1 &1007946222
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1007946223}
- component: {fileID: 1007946226}
- component: {fileID: 1007946225}
- component: {fileID: 1007946224}
m_Layer: 0
m_Name: Cube
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1007946223
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1007946222}
m_LocalRotation: {x: -0, y: -0.25153917, z: -0, w: 0.96784717}
m_LocalPosition: {x: -106.2, y: -11, z: -202.8}
m_LocalScale: {x: 13.314615, y: 26.726276, z: 164.55}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 1378396660}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: -29.137, z: 0}
--- !u!65 &1007946224
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1007946222}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &1007946225
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1007946222}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1007946226
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1007946222}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!20 &1051381684 stripped
Camera:
m_CorrespondingSourceObject: {fileID: -1853094968961178454, guid: 2aea073605c49c44183ba251f4d708b3, type: 3}
@@ -2252,7 +2451,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1075144244}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 702.3, y: 256.52673, z: 2627.1}
m_LocalPosition: {x: 687.3, y: 256.52673, z: 2638.7}
m_LocalScale: {x: 34.02, y: 7.38, z: 34.02}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -2603,7 +2802,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1163178682}
m_LocalRotation: {x: 0, y: 0.5, z: 0, w: 0.8660254}
m_LocalPosition: {x: 3.2516403, y: 26.956305, z: -27.744102}
m_LocalPosition: {x: 3.2516403, y: -129, z: -27.744102}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -2613,6 +2812,7 @@ Transform:
- {fileID: 183386901}
- {fileID: 1458446960}
- {fileID: 1075144245}
- {fileID: 138018146}
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 60, z: 0}
@@ -2761,6 +2961,127 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: -1550514412580984892, guid: 150291eb022c5b24cae3bc1f64f43aae, type: 3}
--- !u!1001 &1361982760
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1163178683}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_LocalScale.x
value: 6.2178373
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_LocalScale.y
value: 6.2178383
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_LocalScale.z
value: 6.2178373
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_LocalPosition.x
value: 729
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_LocalPosition.y
value: 243.9
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_LocalPosition.z
value: 2641.8
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_LocalRotation.w
value: 0.45041186
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_LocalRotation.x
value: 0.050598767
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_LocalRotation.y
value: -0.8735228
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_LocalRotation.z
value: 0.17755802
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 20.841
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -124.638
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 4.391
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_ConstrainProportionsScale
value: 1
objectReference: {fileID: 0}
- target: {fileID: -5824510187379060028, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: -3215555783603854218, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: -1018664272722485354, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: -391268320553695201, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_Name
value: desert
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 919132149155446097, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_TagString
value: MainCamera
objectReference: {fileID: 0}
- target: {fileID: 1365132098506396400, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 3735102090226358198, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 4424396828587804706, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 6809363509681133152, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 7861854473326295642, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8208229975827745842, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
propertyPath: m_Layer
value: 3
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d62a7f0512e7ac142b6c3fad1d2a1ed7, type: 3}
--- !u!1 &1378396659
GameObject:
m_ObjectHideFlags: 0
@@ -2794,6 +3115,9 @@ Transform:
- {fileID: 200011757}
- {fileID: 1430509576}
- {fileID: 427392945}
- {fileID: 1007946223}
- {fileID: 1815534398}
- {fileID: 400394927}
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 45, z: 0}
@@ -2848,6 +3172,10 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -1853094968961178454, guid: c6aa81c7b978a9641944a93cf80b7b52, type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: -1853094968961178454, guid: c6aa81c7b978a9641944a93cf80b7b52, type: 3}
propertyPath: m_ClearFlags
value: 3
@@ -3635,6 +3963,103 @@ MeshCollider:
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 3447038591770236762, guid: c6aa81c7b978a9641944a93cf80b7b52, type: 3}
--- !u!1 &1815534397
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1815534398}
- component: {fileID: 1815534401}
- component: {fileID: 1815534400}
- component: {fileID: 1815534399}
m_Layer: 0
m_Name: Cube (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1815534398
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1815534397}
m_LocalRotation: {x: -0, y: -0.49486074, z: -0, w: 0.8689723}
m_LocalPosition: {x: -91.5, y: -11, z: -178}
m_LocalScale: {x: 13.314615, y: 26.726276, z: 164.55}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 1378396660}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: -59.321, z: 0}
--- !u!65 &1815534399
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1815534397}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!23 &1815534400
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1815534397}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!33 &1815534401
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1815534397}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &1863585018
GameObject:
m_ObjectHideFlags: 0
@@ -4427,15 +4852,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4102339165664243601, guid: f9a0ded25c3cfb34ba4a1da1528edaa4, type: 3}
propertyPath: m_LocalPosition.x
value: -9.8
value: -13.61
objectReference: {fileID: 0}
- target: {fileID: 4102339165664243601, guid: f9a0ded25c3cfb34ba4a1da1528edaa4, type: 3}
propertyPath: m_LocalPosition.y
value: 2.6
value: 1.27
objectReference: {fileID: 0}
- target: {fileID: 4102339165664243601, guid: f9a0ded25c3cfb34ba4a1da1528edaa4, type: 3}
propertyPath: m_LocalPosition.z
value: 39.9
value: 40.47
objectReference: {fileID: 0}
- target: {fileID: 4102339165664243601, guid: f9a0ded25c3cfb34ba4a1da1528edaa4, type: 3}
propertyPath: m_LocalRotation.w