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

player can enter the door

Browse Source
This commit is contained in:
Vladimir Koshevarov
2023-03-06 18:54:13 +02:00
parent 667c9901b6
commit ac5dce3507
35 changed files with 29063 additions and 1193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/Startup.unity → Assets/Scenes/City.unity
+263 -66
View File
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.1727681, g: 0.21589208, b: 0.29782575, a: 1}
m_IndirectSpecularColor: {r: 0.172768, g: 0.21589169, b: 0.29782546, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -391,7 +391,7 @@ MonoBehaviour:
m_ChildAlignment: 0
m_Spacing: 0
m_ChildForceExpandWidth: 1
m_ChildForceExpandHeight: 1
m_ChildForceExpandHeight: 0
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
@@ -466,7 +466,7 @@ Transform:
- {fileID: 963194228}
- {fileID: 2110938952}
- {fileID: 1930563420}
m_Father: {fileID: 497435768}
m_Father: {fileID: 1488006971}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &307039698
@@ -887,6 +887,12 @@ MonoBehaviour:
m_BiasX: 0
m_BiasY: 0
m_CenterOnActivate: 1
--- !u!4 &417112451 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 7611985148226597463, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
m_PrefabInstance: {fileID: 488999707}
m_PrefabAsset: {fileID: 0}
--- !u!1 &441502264
GameObject:
m_ObjectHideFlags: 0
@@ -963,12 +969,114 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 441502264}
m_CullTransparentMesh: 1
--- !u!4 &497435768 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 9142730712074959070, guid: 7532f144834b4d24ab75d734dfdaf51d,
type: 3}
m_PrefabInstance: {fileID: 9142730712035523750}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &488999707
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3459758009917044464, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
propertyPath: m_Name
value: Door
objectReference: {fileID: 0}
- target: {fileID: 6415229415882937303, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
propertyPath: _selectedObject
value:
objectReference: {fileID: 1743694016}
- target: {fileID: 7611985148226597463, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
propertyPath: m_LocalPosition.x
value: -0.087
objectReference: {fileID: 0}
- target: {fileID: 7611985148226597463, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.561
objectReference: {fileID: 0}
- target: {fileID: 7611985148226597463, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7611985148226597463, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7611985148226597463, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7930254397719162301, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7930254397719162301, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
propertyPath: m_LocalPosition.x
value: 0.007954182
objectReference: {fileID: 0}
- target: {fileID: 7930254397719162301, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.00000023841858
objectReference: {fileID: 0}
- target: {fileID: 7930254397719162301, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
propertyPath: m_LocalPosition.z
value: 1.9667404
objectReference: {fileID: 0}
- target: {fileID: 7930254397719162301, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7930254397719162301, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7930254397719162301, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7930254397719162301, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7930254397719162301, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7930254397719162301, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7930254397719162301, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 1084771118991758529, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 3459758009917044464, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
insertIndex: -1
addedObject: {fileID: 1743694016}
m_SourcePrefab: {fileID: 100100000, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f, type: 3}
--- !u!1 &509373481
GameObject:
m_ObjectHideFlags: 0
@@ -1133,50 +1241,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &566992308
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 566992310}
- component: {fileID: 566992309}
m_Layer: 0
m_Name: Startup
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &566992309
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 566992308}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 32bb24701f5677f4a9ebb408a9b3cd9a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &566992310
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 566992308}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &603449532
PrefabInstance:
m_ObjectHideFlags: 0
@@ -1250,10 +1314,60 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
- target: {fileID: 3284961431740112562, guid: c0021857f236ae341a3c917b9da4dfaf,
type: 3}
propertyPath: _characterControlelr
value:
objectReference: {fileID: 1189180336}
- target: {fileID: 3284961431740112563, guid: c0021857f236ae341a3c917b9da4dfaf,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3284961431740112564, guid: c0021857f236ae341a3c917b9da4dfaf,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3284961431740112566, guid: c0021857f236ae341a3c917b9da4dfaf,
type: 3}
propertyPath: m_IsKinematic
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3284961431740112573, guid: c0021857f236ae341a3c917b9da4dfaf,
type: 3}
propertyPath: m_Enabled
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3284961433283168241, guid: c0021857f236ae341a3c917b9da4dfaf,
type: 3}
propertyPath: m_Avatar
value:
objectReference: {fileID: 9000000, guid: 32790d47acc86814982f18993097a759, type: 3}
- target: {fileID: 3284961433283168241, guid: c0021857f236ae341a3c917b9da4dfaf,
type: 3}
propertyPath: m_Enabled
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3284961433283168241, guid: c0021857f236ae341a3c917b9da4dfaf,
type: 3}
propertyPath: m_ApplyRootMotion
value: 0
objectReference: {fileID: 0}
m_RemovedComponents:
- {fileID: 3284961431740112564, guid: c0021857f236ae341a3c917b9da4dfaf, type: 3}
- {fileID: 3284961431740112566, guid: c0021857f236ae341a3c917b9da4dfaf, type: 3}
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 3284961431740112554, guid: c0021857f236ae341a3c917b9da4dfaf,
type: 3}
insertIndex: -1
addedObject: {fileID: 1189180339}
- targetCorrespondingSourceObject: {fileID: 2402651526520908900, guid: c0021857f236ae341a3c917b9da4dfaf,
type: 3}
insertIndex: -1
addedObject: {fileID: 1568871091}
m_SourcePrefab: {fileID: 100100000, guid: c0021857f236ae341a3c917b9da4dfaf, type: 3}
--- !u!1 &651263565
GameObject:
@@ -1867,7 +1981,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 963194225}
m_LocalRotation: {x: 0.54491353, y: 0.00000002885484, z: -0.000000018751987, w: 0.8384923}
m_LocalRotation: {x: 0.54491353, y: -0.00000002885483, z: 0.00000001875198, w: 0.8384923}
m_LocalPosition: {x: 0, y: 9, z: -4}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -1984,7 +2098,7 @@ Transform:
- {fileID: 1550470211}
- {fileID: 1689632238}
- {fileID: 343793322}
m_Father: {fileID: 497435768}
m_Father: {fileID: 1488006971}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &989266189
@@ -2022,7 +2136,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 250, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 480, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &989266191
@@ -2065,6 +2179,12 @@ MonoBehaviour:
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!1 &1030235745 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3284961431740112554, guid: c0021857f236ae341a3c917b9da4dfaf,
type: 3}
m_PrefabInstance: {fileID: 603449532}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1183172156
GameObject:
m_ObjectHideFlags: 0
@@ -2095,7 +2215,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1359374191}
m_Father: {fileID: 497435768}
m_Father: {fileID: 1488006971}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1183172158
@@ -2110,9 +2230,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ae5ecbfd9a3637247b4cd539f9a57316, type: 3}
m_Name:
m_EditorClassIdentifier:
_playerArrivePoint: {fileID: 1359374191}
_interactionPoint: {fileID: 1183172157}
_particleSystem: {fileID: 1359374190}
_wayPoint: {fileID: 1183172157}
--- !u!1 &1184343256
GameObject:
m_ObjectHideFlags: 0
@@ -2195,6 +2314,33 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 603449532}
m_PrefabAsset: {fileID: 0}
--- !u!143 &1189180336 stripped
CharacterController:
m_CorrespondingSourceObject: {fileID: 3284961431740112573, guid: c0021857f236ae341a3c917b9da4dfaf,
type: 3}
m_PrefabInstance: {fileID: 603449532}
m_PrefabAsset: {fileID: 0}
--- !u!95 &1189180339
Animator:
serializedVersion: 5
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1030235745}
m_Enabled: 0
m_Avatar: {fileID: 9000000, guid: 32790d47acc86814982f18993097a759, type: 3}
m_Controller: {fileID: 9100000, guid: 6abd17ae3669e8d448186fd24a2aadb7, type: 2}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorStateOnDisable: 0
m_WriteDefaultValuesOnDisable: 0
--- !u!1 &1283825646
GameObject:
m_ObjectHideFlags: 0
@@ -7301,6 +7447,12 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1476241863}
m_CullTransparentMesh: 1
--- !u!4 &1488006971 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 9142730712074959070, guid: 7532f144834b4d24ab75d734dfdaf51d,
type: 3}
m_PrefabInstance: {fileID: 9142730712035523750}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1503626358
GameObject:
m_ObjectHideFlags: 0
@@ -7549,7 +7701,7 @@ RectTransform:
- {fileID: 223732183}
- {fileID: 1810395771}
- {fileID: 8533735}
m_Father: {fileID: 497435768}
m_Father: {fileID: 1488006971}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
@@ -7625,6 +7777,24 @@ Transform:
m_Father: {fileID: 971260931}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1568871088 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 2402651526520908900, guid: c0021857f236ae341a3c917b9da4dfaf,
type: 3}
m_PrefabInstance: {fileID: 603449532}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1568871091
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1568871088}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cf9ddd6d77ff9a7479edaeb2c8ae1078, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1596553705
GameObject:
m_ObjectHideFlags: 0
@@ -7930,6 +8100,28 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1743694012 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 3459758009917044464, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
m_PrefabInstance: {fileID: 488999707}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1743694016
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1743694012}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 024987a58bcb1394a97473f1d70d0c47, type: 3}
m_Name:
m_EditorClassIdentifier:
_interactionPoint: {fileID: 417112451}
_scene: House
_exitName: house
_enterName: house
--- !u!1 &1750970806
GameObject:
m_ObjectHideFlags: 0
@@ -9034,7 +9226,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2110938951}
m_LocalRotation: {x: 0.54491353, y: 0.00000002885484, z: -0.000000018751987, w: 0.8384923}
m_LocalRotation: {x: 0.54491353, y: -0.00000002885483, z: 0.00000001875198, w: 0.8384923}
m_LocalPosition: {x: 0, y: 9, z: -4}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -9060,7 +9252,7 @@ MonoBehaviour:
m_LockStageInInspector:
m_StreamingVersion: 20170927
m_Priority: 10
m_StandbyUpdate: 0
m_StandbyUpdate: 2
m_LookAt: {fileID: 1189180335}
m_Follow: {fileID: 1189180335}
m_Lens:
@@ -9261,6 +9453,11 @@ PrefabInstance:
propertyPath: m_Name
value: SpawnManager
objectReference: {fileID: 0}
- target: {fileID: 9142730712074959057, guid: 7532f144834b4d24ab75d734dfdaf51d,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9142730712074959070, guid: 7532f144834b4d24ab75d734dfdaf51d,
type: 3}
propertyPath: m_RootOrder
@@ -9336,10 +9533,10 @@ PrefabInstance:
- targetCorrespondingSourceObject: {fileID: 9142730712074959070, guid: 7532f144834b4d24ab75d734dfdaf51d,
type: 3}
insertIndex: -1
addedObject: {fileID: 1543573162}
addedObject: {fileID: 287262745}
- targetCorrespondingSourceObject: {fileID: 9142730712074959070, guid: 7532f144834b4d24ab75d734dfdaf51d,
type: 3}
insertIndex: -1
addedObject: {fileID: 287262745}
addedObject: {fileID: 1543573162}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 7532f144834b4d24ab75d734dfdaf51d, type: 3}
Assets/Scenes/Startup.unity.meta → Assets/Scenes/City.unity.meta
View File
Assets/Scenes/TestRoom.meta → Assets/Scenes/House.meta
View File
Assets/Scenes/House.unity
+26293
View File
File diff suppressed because it is too large Load Diff
Assets/Scenes/TestRoom.unity.meta → Assets/Scenes/House.unity.meta
View File
Assets/Scenes/TestRoom/NavMesh-Floor.asset → Assets/Scenes/House/NavMesh-Floor.asset
View File
Assets/Scenes/TestRoom/NavMesh-Floor.asset.meta → Assets/Scenes/House/NavMesh-Floor.asset.meta
View File
Assets/Scenes/Startup.meta → Assets/Scenes/Shop.meta
View File
Assets/Scenes/TestRoom.unity → Assets/Scenes/Shop.unity
View File
Assets/Scenes/Shop.unity.meta
+7
View File
@@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: c62496298062c0545bcd71ff37f4cf79
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scenes/Startup/NavMesh-NavMesh Surface.asset → Assets/Scenes/Shop/NavMesh-NavMesh Surface.asset
View File
Assets/Scenes/Startup/NavMesh-NavMesh Surface.asset.meta → Assets/Scenes/Shop/NavMesh-NavMesh Surface.asset.meta
View File