Browse Source

prefab updates

main
cailean 7 months ago
parent
commit
f7e7531ffa
  1. 221
      Assets/15_Prefabs/Environment.prefab
  2. 922
      Assets/15_Prefabs/Waypoints.prefab
  3. 6
      Assets/2_Chair/Chair.prefab
  4. 1700
      Assets/6_Scenes/Beep.unity

221
Assets/15_Prefabs/Environment.prefab

@ -1376,8 +1376,8 @@ Transform:
m_GameObject: {fileID: 1367851115378043998} m_GameObject: {fileID: 1367851115378043998}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: -0.20502329, w: 0.9787571} m_LocalRotation: {x: 0, y: 0, z: -0.20502329, w: 0.9787571}
m_LocalPosition: {x: -1.3429086, y: 12.137382, z: 1.2575617} m_LocalPosition: {x: -1.3429086, y: 12.137, z: 1.265}
m_LocalScale: {x: 0.7220509, y: 0.7220509, z: 0.72205096} m_LocalScale: {x: 0.8816241, y: 0.8816241, z: 0.8816242}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 3654837400929340511} m_Father: {fileID: 3654837400929340511}
@ -5769,7 +5769,7 @@ GameObject:
- component: {fileID: 5754514290528301443} - component: {fileID: 5754514290528301443}
m_Layer: 0 m_Layer: 0
m_Name: Ground Collider m_Name: Ground Collider
m_TagString: Untagged m_TagString: ground
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
m_NavMeshLayer: 0 m_NavMeshLayer: 0
m_StaticEditorFlags: 0 m_StaticEditorFlags: 0
@ -5796,7 +5796,7 @@ BoxCollider:
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4715742614173344721} m_GameObject: {fileID: 4715742614173344721}
m_Material: {fileID: 13400000, guid: 52a249eaa894e35488a1519221a56769, type: 2} m_Material: {fileID: 13400000, guid: 8469b79ec75744f11835796a17d174dd, type: 2}
m_IncludeLayers: m_IncludeLayers:
serializedVersion: 2 serializedVersion: 2
m_Bits: 0 m_Bits: 0
@ -12620,7 +12620,7 @@ PrefabInstance:
- target: {fileID: 1060334084377479343, guid: 4853d1f55d3aa3f4b9e207002deada10, - target: {fileID: 1060334084377479343, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0.053 value: 0.096
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1888014958816391119, guid: 4853d1f55d3aa3f4b9e207002deada10, - target: {fileID: 1888014958816391119, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3} type: 3}
@ -12630,12 +12630,12 @@ PrefabInstance:
- target: {fileID: 1888014958816391119, guid: 4853d1f55d3aa3f4b9e207002deada10, - target: {fileID: 1888014958816391119, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 2.4384408 value: 2.438
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 1888014958816391119, guid: 4853d1f55d3aa3f4b9e207002deada10, - target: {fileID: 1888014958816391119, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0.01797316 value: 0.03489989
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2568189177871766882, guid: 4853d1f55d3aa3f4b9e207002deada10, - target: {fileID: 2568189177871766882, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3} type: 3}
@ -12650,7 +12650,7 @@ PrefabInstance:
- target: {fileID: 2568189177871766882, guid: 4853d1f55d3aa3f4b9e207002deada10, - target: {fileID: 2568189177871766882, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: -0 value: 0.018
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2568189177871766882, guid: 4853d1f55d3aa3f4b9e207002deada10, - target: {fileID: 2568189177871766882, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3} type: 3}
@ -12687,6 +12687,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3137489168000597738, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3}
propertyPath: m_TagString
value: ground
objectReference: {fileID: 0}
- target: {fileID: 4283754562604421533, guid: 4853d1f55d3aa3f4b9e207002deada10, - target: {fileID: 4283754562604421533, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
@ -12695,12 +12700,12 @@ PrefabInstance:
- target: {fileID: 4283754562604421533, guid: 4853d1f55d3aa3f4b9e207002deada10, - target: {fileID: 4283754562604421533, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 2.620678 value: 2.621
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4283754562604421533, guid: 4853d1f55d3aa3f4b9e207002deada10, - target: {fileID: 4283754562604421533, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: 0.08365334 value: 0.118
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 4976165892030850332, guid: 4853d1f55d3aa3f4b9e207002deada10, - target: {fileID: 4976165892030850332, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3} type: 3}
@ -12732,22 +12737,122 @@ PrefabInstance:
propertyPath: m_CollisionEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName propertyPath: m_CollisionEvent.m_PersistentCalls.m_Calls.Array.data[0].m_Arguments.m_ObjectArgumentAssemblyTypeName
value: UnityEngine.Object, UnityEngine value: UnityEngine.Object, UnityEngine
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 5288517889105351542, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3}
propertyPath: m_Size.x
value: 0.6009801
objectReference: {fileID: 0}
- target: {fileID: 5288517889105351542, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3}
propertyPath: m_Size.y
value: 0.45956475
objectReference: {fileID: 0}
- target: {fileID: 5288517889105351542, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3}
propertyPath: m_Size.z
value: 0.052751847
objectReference: {fileID: 0}
- target: {fileID: 5288517889105351542, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3}
propertyPath: m_Center.x
value: -0.0015682
objectReference: {fileID: 0}
- target: {fileID: 5288517889105351542, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3}
propertyPath: m_Center.y
value: 0.00053906534
objectReference: {fileID: 0}
- target: {fileID: 5288517889105351542, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3}
propertyPath: m_Center.z
value: -0.017375931
objectReference: {fileID: 0}
- target: {fileID: 5288517889105351542, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 13400000, guid: 71fe46a17b76949b8afeae23a29f44b1,
type: 2}
- target: {fileID: 6414684785569884419, guid: 4853d1f55d3aa3f4b9e207002deada10, - target: {fileID: 6414684785569884419, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Ikea Tray value: Ikea Tray
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents:
- {fileID: 9015080547300217183, guid: 4853d1f55d3aa3f4b9e207002deada10, type: 3}
- {fileID: 6588512615427730898, guid: 4853d1f55d3aa3f4b9e207002deada10, type: 3}
m_RemovedGameObjects: [] m_RemovedGameObjects: []
m_AddedGameObjects: [] m_AddedGameObjects: []
m_AddedComponents: [] m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 4193632188597962485, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3}
insertIndex: -1
addedObject: {fileID: 7934581183647820419}
- targetCorrespondingSourceObject: {fileID: 6238344267427657588, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3}
insertIndex: -1
addedObject: {fileID: 8203167998437510020}
m_SourcePrefab: {fileID: 100100000, guid: 4853d1f55d3aa3f4b9e207002deada10, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 4853d1f55d3aa3f4b9e207002deada10, type: 3}
--- !u!1 &3282135612778010942 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4193632188597962485, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3}
m_PrefabInstance: {fileID: 1711010186145849291}
m_PrefabAsset: {fileID: 0}
--- !u!65 &7934581183647820419
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3282135612778010942}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.18489853, y: 0.15691361, z: 0.15091242}
m_Center: {x: 0.002403283, y: 0.005637576, z: -0.0044443775}
--- !u!4 &3754507585550600873 stripped --- !u!4 &3754507585550600873 stripped
Transform: Transform:
m_CorrespondingSourceObject: {fileID: 2568189177871766882, guid: 4853d1f55d3aa3f4b9e207002deada10, m_CorrespondingSourceObject: {fileID: 2568189177871766882, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3} type: 3}
m_PrefabInstance: {fileID: 1711010186145849291} m_PrefabInstance: {fileID: 1711010186145849291}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &4696612012800796863 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6238344267427657588, guid: 4853d1f55d3aa3f4b9e207002deada10,
type: 3}
m_PrefabInstance: {fileID: 1711010186145849291}
m_PrefabAsset: {fileID: 0}
--- !u!65 &8203167998437510020
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4696612012800796863}
m_Material: {fileID: 0}
m_IncludeLayers:
serializedVersion: 2
m_Bits: 0
m_ExcludeLayers:
serializedVersion: 2
m_Bits: 0
m_LayerOverridePriority: 0
m_IsTrigger: 0
m_ProvidesContacts: 0
m_Enabled: 1
serializedVersion: 3
m_Size: {x: 0.19282301, y: 0.12901592, z: 0.40628543}
m_Center: {x: -0.032046385, y: 0.00019456641, z: 0.15389557}
--- !u!1001 &1718021283197412215 --- !u!1001 &1718021283197412215
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -12998,11 +13103,79 @@ PrefabInstance:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 3654837400929340511} m_TransformParent: {fileID: 3654837400929340511}
m_Modifications: m_Modifications:
- target: {fileID: 415083114066874404, guid: 81d58eef7a7513d48ac8443035206887,
type: 3}
propertyPath: m_TagString
value: ground
objectReference: {fileID: 0}
- target: {fileID: 420270027085301401, guid: 81d58eef7a7513d48ac8443035206887,
type: 3}
propertyPath: m_TagString
value: ground
objectReference: {fileID: 0}
- target: {fileID: 421238386683556520, guid: 81d58eef7a7513d48ac8443035206887,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 13400000, guid: 55fa6736a2a0f42ae9e0418644d109e6,
type: 2}
- target: {fileID: 1265028163992222820, guid: 81d58eef7a7513d48ac8443035206887,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 13400000, guid: 55fa6736a2a0f42ae9e0418644d109e6,
type: 2}
- target: {fileID: 1435504003586929599, guid: 81d58eef7a7513d48ac8443035206887,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 13400000, guid: 55fa6736a2a0f42ae9e0418644d109e6,
type: 2}
- target: {fileID: 1596301229114532120, guid: 81d58eef7a7513d48ac8443035206887,
type: 3}
propertyPath: m_LocalPosition.x
value: -4.845
objectReference: {fileID: 0}
- target: {fileID: 1596301229114532120, guid: 81d58eef7a7513d48ac8443035206887,
type: 3}
propertyPath: m_LocalPosition.y
value: -0.545
objectReference: {fileID: 0}
- target: {fileID: 2965664101514240553, guid: 81d58eef7a7513d48ac8443035206887, - target: {fileID: 2965664101514240553, guid: 81d58eef7a7513d48ac8443035206887,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name
value: Outside Chair value: Outside Chair
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 3269563604113191928, guid: 81d58eef7a7513d48ac8443035206887,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 13400000, guid: 55fa6736a2a0f42ae9e0418644d109e6,
type: 2}
- target: {fileID: 4423052021416175321, guid: 81d58eef7a7513d48ac8443035206887,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 13400000, guid: 52a249eaa894e35488a1519221a56769,
type: 2}
- target: {fileID: 4688922324099886311, guid: 81d58eef7a7513d48ac8443035206887,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 13400000, guid: 55fa6736a2a0f42ae9e0418644d109e6,
type: 2}
- target: {fileID: 5841518506727024128, guid: 81d58eef7a7513d48ac8443035206887,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 13400000, guid: 52a249eaa894e35488a1519221a56769,
type: 2}
- target: {fileID: 6321932677239816687, guid: 81d58eef7a7513d48ac8443035206887,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 13400000, guid: 52a249eaa894e35488a1519221a56769,
type: 2}
- target: {fileID: 6969825119924348164, guid: 81d58eef7a7513d48ac8443035206887, - target: {fileID: 6969825119924348164, guid: 81d58eef7a7513d48ac8443035206887,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
@ -13053,6 +13226,12 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z propertyPath: m_LocalEulerAnglesHint.z
value: 0 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 7243037649040523943, guid: 81d58eef7a7513d48ac8443035206887,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 13400000, guid: 52a249eaa894e35488a1519221a56769,
type: 2}
m_RemovedComponents: [] m_RemovedComponents: []
m_RemovedGameObjects: [] m_RemovedGameObjects: []
m_AddedGameObjects: [] m_AddedGameObjects: []
@ -13762,6 +13941,24 @@ PrefabInstance:
serializedVersion: 3 serializedVersion: 3
m_TransformParent: {fileID: 7218488545040351178} m_TransformParent: {fileID: 7218488545040351178}
m_Modifications: m_Modifications:
- target: {fileID: 393493426903303988, guid: dfe894080cb62b2439801ea34d282ec1,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 13400000, guid: 52a249eaa894e35488a1519221a56769,
type: 2}
- target: {fileID: 2778451583002780363, guid: dfe894080cb62b2439801ea34d282ec1,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 13400000, guid: 52a249eaa894e35488a1519221a56769,
type: 2}
- target: {fileID: 4203625174362743718, guid: dfe894080cb62b2439801ea34d282ec1,
type: 3}
propertyPath: m_Material
value:
objectReference: {fileID: 13400000, guid: 52a249eaa894e35488a1519221a56769,
type: 2}
- target: {fileID: 5652744251581871707, guid: dfe894080cb62b2439801ea34d282ec1, - target: {fileID: 5652744251581871707, guid: dfe894080cb62b2439801ea34d282ec1,
type: 3} type: 3}
propertyPath: m_Name propertyPath: m_Name

922
Assets/15_Prefabs/Waypoints.prefab

File diff suppressed because it is too large

6
Assets/2_Chair/Chair.prefab

@ -2045,7 +2045,7 @@ MonoBehaviour:
VectorActionDescriptions: [] VectorActionDescriptions: []
VectorActionSpaceType: 1 VectorActionSpaceType: 1
hasUpgradedBrainParametersWithActionSpec: 1 hasUpgradedBrainParametersWithActionSpec: 1
m_Model: {fileID: 5022602860645237092, guid: b9c79f9e7b4a9794b8f05f8467777884, type: 3} m_Model: {fileID: 5022602860645237092, guid: 1dc2dd8bd62c1ce47b13f1740b15e522, type: 3}
m_InferenceDevice: 1 m_InferenceDevice: 1
m_BehaviorType: 2 m_BehaviorType: 2
m_BehaviorName: c_Walker m_BehaviorName: c_Walker
@ -2070,7 +2070,7 @@ MonoBehaviour:
maxStep: 0 maxStep: 0
hasUpgradedFromAgentParameters: 1 hasUpgradedFromAgentParameters: 1
MaxStep: 0 MaxStep: 0
m_SelectedBrain: 6 m_SelectedBrain: 0
m_TargetWalkingSpeed: 30 m_TargetWalkingSpeed: 30
rWalkSpeedEachEpisode: 0 rWalkSpeedEachEpisode: 0
m_RandomiseYRotation: 0 m_RandomiseYRotation: 0
@ -2599,7 +2599,7 @@ Transform:
m_GameObject: {fileID: 6794064008694923825} m_GameObject: {fileID: 6794064008694923825}
serializedVersion: 2 serializedVersion: 2
m_LocalRotation: {x: 0, y: -0.4407226, z: 0, w: 0.8976434} m_LocalRotation: {x: 0, y: -0.4407226, z: 0, w: 0.8976434}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: -30.195412, y: -1.1399994, z: 16.027393}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:

1700
Assets/6_Scenes/Beep.unity

File diff suppressed because it is too large
Loading…
Cancel
Save