Add SFX to dialogue, revamp control scheme (broken world map camera)

This commit is contained in:
2022-08-17 22:12:53 -07:00
parent 294b113598
commit bc8092d454
29 changed files with 1413 additions and 485 deletions

View File

@@ -538,6 +538,7 @@ Transform:
m_Children:
- {fileID: 1203386767}
- {fileID: 455432348}
- {fileID: 1619189084}
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -841,6 +842,119 @@ Transform:
m_Father: {fileID: 590975485}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1619189083
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1619189084}
- component: {fileID: 1619189087}
- component: {fileID: 1619189086}
- component: {fileID: 1619189085}
- component: {fileID: 1619189088}
m_Layer: 0
m_Name: To World Map
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1619189084
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1619189083}
m_LocalRotation: {x: -0.35355335, y: 0.61237246, z: 0.61237246, w: 0.35355335}
m_LocalPosition: {x: -76.6, y: 10.7, z: 42.1}
m_LocalScale: {x: 3.92, y: 3.92, z: 3.92}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 823462478}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: -90, y: 120, z: 0}
--- !u!64 &1619189085
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1619189083}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &1619189086
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1619189083}
m_Enabled: 0
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 &1619189087
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1619189083}
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!114 &1619189088
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1619189083}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2f7cf3b0e87656149a3acee1198cb0e0, type: 3}
m_Name:
m_EditorClassIdentifier:
scene: WorldMap
_spawnPoint: {fileID: 6871527874556698278, guid: 0ca0511f2f28a4b438abd5c1f711bfbc, type: 3}
--- !u!1 &1700758058
GameObject:
m_ObjectHideFlags: 0

View File

@@ -438,7 +438,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 345081431}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 131.5, y: 39.58772, z: -4.348844}
m_LocalPosition: {x: 84.2, y: 39.58772, z: -4.348844}
m_LocalScale: {x: 1.92, y: 26.13, z: 109.8}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -899,6 +899,53 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!1 &646713386
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 646713388}
- component: {fileID: 646713387}
m_Layer: 0
m_Name: PlayerSpawnController
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &646713387
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 646713386}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 743cce483f727904a87ef002d24ec8d6, type: 3}
m_Name:
m_EditorClassIdentifier:
_player: {fileID: 0}
_playerPrefab: {fileID: 6949365541298368387, guid: 6ebbe09c2673d744faf84db54d3d12ed, type: 3}
_spawnLocation: {fileID: 703092381372093637}
--- !u!4 &646713388
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 646713386}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -34.246365, y: 16.896793, z: -8.326412}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &722506480 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 703092380918023732, guid: 0d6c1ac9700602148a462e278924a013, type: 3}
@@ -1906,6 +1953,11 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0d6c1ac9700602148a462e278924a013, type: 3}
--- !u!1 &703092381372093637 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 703092380918023723, guid: 0d6c1ac9700602148a462e278924a013, type: 3}
m_PrefabInstance: {fileID: 703092381372093636}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1954930442906947558
PrefabInstance:
m_ObjectHideFlags: 0

View File

@@ -1055,6 +1055,53 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!1 &454921174
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 454921176}
- component: {fileID: 454921175}
m_Layer: 0
m_Name: PlayerSpawnController
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &454921175
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 454921174}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 743cce483f727904a87ef002d24ec8d6, type: 3}
m_Name:
m_EditorClassIdentifier:
_player: {fileID: 0}
_playerPrefab: {fileID: 6949365541298368387, guid: 6ebbe09c2673d744faf84db54d3d12ed, type: 3}
_spawnLocation: {fileID: 6570613107773777493}
--- !u!4 &454921176
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 454921174}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -34.246365, y: 16.896793, z: -8.326412}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!64 &461312212
MeshCollider:
m_ObjectHideFlags: 0
@@ -1447,7 +1494,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 588098426}
m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068}
m_LocalPosition: {x: 81.5, y: 52.2, z: -0.19677734}
m_LocalPosition: {x: 115.8, y: 52.2, z: -0.19677734}
m_LocalScale: {x: 12.390004, y: 12.390004, z: 12.39}
m_ConstrainProportionsScale: 1
m_Children: []
@@ -1521,8 +1568,8 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 633364550}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 164.93494, y: 0, z: 221.75128}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -1530,7 +1577,7 @@ Transform:
- {fileID: 2116092872}
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!64 &662919915
MeshCollider:
m_ObjectHideFlags: 0
@@ -3009,7 +3056,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 969fedacf27ca8244a6fb6adb8ce3487, type: 3}
propertyPath: m_LocalPosition.x
value: 0
value: 164.93494
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 969fedacf27ca8244a6fb6adb8ce3487, type: 3}
propertyPath: m_LocalPosition.y
@@ -3017,11 +3064,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 969fedacf27ca8244a6fb6adb8ce3487, type: 3}
propertyPath: m_LocalPosition.z
value: 0
value: 221.75128
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 969fedacf27ca8244a6fb6adb8ce3487, type: 3}
propertyPath: m_LocalRotation.w
value: 1
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 969fedacf27ca8244a6fb6adb8ce3487, type: 3}
propertyPath: m_LocalRotation.x
@@ -3029,7 +3076,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 969fedacf27ca8244a6fb6adb8ce3487, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 969fedacf27ca8244a6fb6adb8ce3487, type: 3}
propertyPath: m_LocalRotation.z
@@ -3041,7 +3088,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 969fedacf27ca8244a6fb6adb8ce3487, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
value: 90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 969fedacf27ca8244a6fb6adb8ce3487, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
@@ -4458,8 +4505,8 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1574193083}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 164.93494, y: 0, z: 221.75128}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@@ -4467,7 +4514,7 @@ Transform:
- {fileID: 1293428375}
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!64 &1587204562
MeshCollider:
m_ObjectHideFlags: 0
@@ -5615,15 +5662,15 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 6570613107468663802, guid: 180f999a58cde114c86448512d4f71fe, type: 3}
propertyPath: m_LocalPosition.x
value: 110.5
value: 131.8
objectReference: {fileID: 0}
- target: {fileID: 6570613107468663802, guid: 180f999a58cde114c86448512d4f71fe, type: 3}
propertyPath: m_LocalPosition.y
value: 45
value: 44.1
objectReference: {fileID: 0}
- target: {fileID: 6570613107468663802, guid: 180f999a58cde114c86448512d4f71fe, type: 3}
propertyPath: m_LocalPosition.z
value: 18.3
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6570613107468663802, guid: 180f999a58cde114c86448512d4f71fe, type: 3}
propertyPath: m_LocalRotation.w
@@ -5655,3 +5702,8 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 180f999a58cde114c86448512d4f71fe, type: 3}
--- !u!1 &6570613107773777493 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6570613107468663801, guid: 180f999a58cde114c86448512d4f71fe, type: 3}
m_PrefabInstance: {fileID: 6570613107773777492}
m_PrefabAsset: {fileID: 0}

View File

@@ -195,7 +195,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 8854e21a3403ff44cbcaf57ed29d74eb, type: 3}
propertyPath: m_LocalRotation.w
value: 1
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 8854e21a3403ff44cbcaf57ed29d74eb, type: 3}
propertyPath: m_LocalRotation.x
@@ -203,7 +203,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 8854e21a3403ff44cbcaf57ed29d74eb, type: 3}
propertyPath: m_LocalRotation.y
value: 0
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 8854e21a3403ff44cbcaf57ed29d74eb, type: 3}
propertyPath: m_LocalRotation.z
@@ -215,7 +215,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 8854e21a3403ff44cbcaf57ed29d74eb, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
value: -90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 8854e21a3403ff44cbcaf57ed29d74eb, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
@@ -522,7 +522,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 633364550}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -530,7 +530,7 @@ Transform:
- {fileID: 485268838}
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
--- !u!4 &945994610 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 4724078000224732770, guid: b94dae2c147375d42a76d58aeeff11f7, type: 3}
@@ -691,7 +691,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1038909033}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -699,7 +699,7 @@ Transform:
- {fileID: 945994610}
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
--- !u!1001 &1173422330
PrefabInstance:
m_ObjectHideFlags: 0
@@ -725,7 +725,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3}
propertyPath: m_LocalPosition.x
value: -35
value: 21.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3}
propertyPath: m_LocalPosition.y
@@ -733,23 +733,23 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3}
propertyPath: m_LocalPosition.z
value: -19.7
value: -36.7
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3}
propertyPath: m_LocalRotation.w
value: 0.7292402
value: 1
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3}
propertyPath: m_LocalRotation.x
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3}
propertyPath: m_LocalRotation.y
value: 0.6842579
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3}
propertyPath: m_LocalRotation.z
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -757,7 +757,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 86.355
value: 0
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0dd40620db2ca0642af7f5f5762d9486, type: 3}
propertyPath: m_LocalEulerAnglesHint.z