lionfish/SimUL
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

small fixes

Browse Source
This commit is contained in:
Vova
2024-01-02 16:24:40 +02:00
parent c372bec841
commit 40bf581501
4 changed files with 28 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Prefabs/Interior/OfficeWorkerTable.prefab
-165
View File
@@ -46,38 +46,6 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Weight: 1
m_Effectors: []
--- !u!1 &5280816860339018031
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 7952466374899613004}
m_Layer: 0
m_Name: Selected
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &7952466374899613004
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5280816860339018031}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.02, y: 1.012, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 8431406351439517098}
m_Father: {fileID: 662032107352504808}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5437460437420272161
GameObject:
m_ObjectHideFlags: 0
@@ -144,7 +112,6 @@ Transform:
- {fileID: 2849715539346458925}
- {fileID: 6549952688900983184}
- {fileID: 1365045524533965820}
- {fileID: 7952466374899613004}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &3329916335696048154
@@ -181,7 +148,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
_interactionPoint: {fileID: 2849715539346458925}
_dialogOptionsSO: {fileID: 0}
_dialogSO: {fileID: 11400000, guid: 8c330d22202c025408b0fcf250a57d15, type: 2}
--- !u!114 &113071787670326870
MonoBehaviour:
@@ -196,137 +162,6 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
color: {r: 1, g: 1, b: 1, a: 1}
--- !u!1001 &3187777146008072678
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 7952466374899613004}
m_Modifications:
- target: {fileID: 4327680794412319598, guid: 7699f5af06713974ba61777a8a830f6e,
type: 3}
propertyPath: m_Name
value: Table_Computer_01_Setup
objectReference: {fileID: 0}
- target: {fileID: 4327680794412319598, guid: 7699f5af06713974ba61777a8a830f6e,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4589591449138297630, guid: 7699f5af06713974ba61777a8a830f6e,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.013
objectReference: {fileID: 0}
- target: {fileID: 4589591449138297630, guid: 7699f5af06713974ba61777a8a830f6e,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.679
objectReference: {fileID: 0}
- target: {fileID: 4589591449138297630, guid: 7699f5af06713974ba61777a8a830f6e,
type: 3}
propertyPath: m_LocalRotation.w
value: -0.25881857
objectReference: {fileID: 0}
- target: {fileID: 4589591449138297630, guid: 7699f5af06713974ba61777a8a830f6e,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.96592593
objectReference: {fileID: 0}
- target: {fileID: 4589591449138297630, guid: 7699f5af06713974ba61777a8a830f6e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 210
objectReference: {fileID: 0}
- target: {fileID: 6430890726198682700, guid: 7699f5af06713974ba61777a8a830f6e,
type: 3}
propertyPath: m_RootOrder
value: -1
objectReference: {fileID: 0}
- target: {fileID: 6430890726198682700, guid: 7699f5af06713974ba61777a8a830f6e,
type: 3}
propertyPath: m_LocalScale.x
value: 0.71
objectReference: {fileID: 0}
- target: {fileID: 6430890726198682700, guid: 7699f5af06713974ba61777a8a830f6e,
type: 3}
propertyPath: m_LocalScale.y
value: 0.71
objectReference: {fileID: 0}
- target: {fileID: 6430890726198682700, guid: 7699f5af06713974ba61777a8a830f6e,
type: 3}
propertyPath: m_LocalScale.z
value: 0.71
objectReference: {fileID: 0}
- target: {fileID: 6430890726198682700, guid: 7699f5af06713974ba61777a8a830f6e,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6430890726198682700, guid: 7699f5af06713974ba61777a8a830f6e,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6430890726198682700, guid: 7699f5af06713974ba61777a8a830f6e,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6430890726198682700, guid: 7699f5af06713974ba61777a8a830f6e,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.7071068
objectReference: {fileID: 0}
- target: {fileID: 6430890726198682700, guid: 7699f5af06713974ba61777a8a830f6e,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6430890726198682700, guid: 7699f5af06713974ba61777a8a830f6e,
type: 3}
propertyPath: m_LocalRotation.y
value: -0.7071068
objectReference: {fileID: 0}
- target: {fileID: 6430890726198682700, guid: 7699f5af06713974ba61777a8a830f6e,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 6430890726198682700, guid: 7699f5af06713974ba61777a8a830f6e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6430890726198682700, guid: 7699f5af06713974ba61777a8a830f6e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: -90
objectReference: {fileID: 0}
- target: {fileID: 6430890726198682700, guid: 7699f5af06713974ba61777a8a830f6e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6673418334389223436, guid: 7699f5af06713974ba61777a8a830f6e,
type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 2100000, guid: 710613883f6dfb64889bf6134b4b15e3, type: 2}
m_RemovedComponents: []
m_RemovedGameObjects:
- {fileID: 8981537941408075520, guid: 7699f5af06713974ba61777a8a830f6e, type: 3}
- {fileID: 7693504978106454239, guid: 7699f5af06713974ba61777a8a830f6e, type: 3}
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7699f5af06713974ba61777a8a830f6e, type: 3}
--- !u!4 &8431406351439517098 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 6430890726198682700, guid: 7699f5af06713974ba61777a8a830f6e,
type: 3}
m_PrefabInstance: {fileID: 3187777146008072678}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5462444853138315184
PrefabInstance:
m_ObjectHideFlags: 0
Assets/Scenes/City.unity
+27 -7
View File
@@ -267,6 +267,10 @@ PrefabInstance:
type: 3}
insertIndex: -1
addedObject: {fileID: 531238453}
- targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: b0ee1e3722bb9474480ad9392cddebce,
type: 3}
insertIndex: -1
addedObject: {fileID: 531238456}
m_SourcePrefab: {fileID: 100100000, guid: b0ee1e3722bb9474480ad9392cddebce, type: 3}
--- !u!1 &9988969
GameObject:
@@ -1685,9 +1689,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 349281313}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 250, y: -90}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 250, y: 0}
m_SizeDelta: {x: 480, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &249161732
@@ -2764,6 +2768,22 @@ BoxCollider:
serializedVersion: 3
m_Size: {x: 0.2, y: 0.19, z: 0.23}
m_Center: {x: -0.06, y: -0.1, z: 0.06}
--- !u!208 &531238456
NavMeshObstacle:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 531238451}
m_Enabled: 1
serializedVersion: 3
m_Shape: 1
m_Extents: {x: 0.245, y: 0.23, z: 0.35}
m_MoveThreshold: 0.1
m_Carve: 0
m_CarveOnlyStationary: 1
m_Center: {x: -0.51, y: 0, z: -0.36}
m_TimeToStationary: 0.5
--- !u!1 &535029578
GameObject:
m_ObjectHideFlags: 0
@@ -4222,7 +4242,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 749553635}
serializedVersion: 2
m_LocalRotation: {x: 0.38268346, y: 0.000000022481224, z: -0.0000000093120285, w: 0.92387956}
m_LocalRotation: {x: 0.38268346, y: -0.000000022481213, z: 0.000000009312023, w: 0.92387956}
m_LocalPosition: {x: 29.11, y: 5, z: -5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -5537,7 +5557,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 835327588}
serializedVersion: 2
m_LocalRotation: {x: 0.38268346, y: 0.000000022481224, z: -0.0000000093120285, w: 0.92387956}
m_LocalRotation: {x: 0.38268346, y: -0.000000022481213, z: 0.000000009312023, w: 0.92387956}
m_LocalPosition: {x: 29.11, y: 5, z: -5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -8239,7 +8259,7 @@ Camera:
far clip plane: 1000
field of view: 60
orthographic: 1
orthographic size: 15
orthographic size: 25
m_Depth: 0
m_CullingMask:
serializedVersion: 2
@@ -8264,7 +8284,7 @@ Transform:
m_GameObject: {fileID: 1598414010}
serializedVersion: 2
m_LocalRotation: {x: 0.5, y: 0.5, z: -0.5, w: 0.5}
m_LocalPosition: {x: 148.4, y: 30, z: 243.6}
m_LocalPosition: {x: 148.4, y: 50, z: 243.6}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
Assets/Scenes/City/NavMesh-NavMesh Surface 1.asset
BIN
View File
Binary file not shown.
Assets/Scripts/Managers/CameraPlayerFollow.cs
+1 -1
View File
@@ -2,7 +2,7 @@ using UnityEngine;
public class CameraPlayerFollow : MonoBehaviour
{
private Vector3 _cameraOffset = new(0, 15, 0);
private Vector3 _cameraOffset = new(0, 40, 0);
void LateUpdate()
{