From 66e07c9bdc0bb570add930a6255cbcb4fb33b3cb Mon Sep 17 00:00:00 2001 From: Pascal Serrarens Date: Thu, 18 Jan 2024 16:55:05 +0100 Subject: [PATCH] Fixed prefabs --- .../Prefabs/Objects/FrontDoor.prefab | 83 ++-- .../Prefabs/Objects/Gun Clip.prefab | 416 +++++++++++++++++- .../GroceryStore/Prefabs/Objects/Gun.prefab | 103 ++++- .../GroceryStore/Prefabs/Objects/Sword.prefab | 59 ++- 4 files changed, 597 insertions(+), 64 deletions(-) diff --git a/Samples~/GroceryStore/Prefabs/Objects/FrontDoor.prefab b/Samples~/GroceryStore/Prefabs/Objects/FrontDoor.prefab index 9998ddf..7fe47a8 100644 --- a/Samples~/GroceryStore/Prefabs/Objects/FrontDoor.prefab +++ b/Samples~/GroceryStore/Prefabs/Objects/FrontDoor.prefab @@ -1,18 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!65 &3866825236529853122 -BoxCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 973431165102875429} - m_Material: {fileID: 0} - m_IsTrigger: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Size: {x: 1.3234, y: 2.9170082, z: 0.049999997} - m_Center: {x: -0.6417, y: 1.4585041, z: -0.015} --- !u!1 &7892756138826494427 GameObject: m_ObjectHideFlags: 0 @@ -38,13 +25,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7892756138826494427} + serializedVersion: 2 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: - {fileID: 973431165103374093} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &7892756138826494428 Rigidbody: @@ -53,10 +41,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7892756138826494427} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 0 m_Interpolate: 0 @@ -70,21 +69,25 @@ HingeJoint: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7892756138826494427} m_ConnectedBody: {fileID: 0} + m_ConnectedArticulationBody: {fileID: 0} m_Anchor: {x: 0, y: 0, z: 0} m_Axis: {x: 0, y: 1, z: 0} m_AutoConfigureConnectedAnchor: 1 m_ConnectedAnchor: {x: 0, y: 0, z: 0} - m_UseSpring: 0 + serializedVersion: 2 + m_UseSpring: 1 m_Spring: - spring: 0.2 - damper: 0.1 - targetPosition: 0 + spring: 1 + damper: 0.3 + targetPosition: -90 m_UseMotor: 0 m_Motor: targetVelocity: 0 force: 0 freeSpin: 0 m_UseLimits: 1 + m_ExtendedLimits: 0 + m_UseAcceleration: 0 m_Limits: min: 0 max: 90 @@ -102,6 +105,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 7892756138826494426} m_Modifications: - target: {fileID: 100000, guid: 1dfbc40e43d24cf48b6be677c0d37af3, type: 3} @@ -153,16 +157,41 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 100008, guid: 1dfbc40e43d24cf48b6be677c0d37af3, type: 3} + insertIndex: -1 + addedObject: {fileID: 3866825236529853122} m_SourcePrefab: {fileID: 100100000, guid: 1dfbc40e43d24cf48b6be677c0d37af3, type: 3} ---- !u!4 &973431165103374093 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 400000, guid: 1dfbc40e43d24cf48b6be677c0d37af3, - type: 3} - m_PrefabInstance: {fileID: 973431165102974349} - m_PrefabAsset: {fileID: 0} --- !u!1 &973431165102875429 stripped GameObject: - m_CorrespondingSourceObject: {fileID: 100008, guid: 1dfbc40e43d24cf48b6be677c0d37af3, - type: 3} + m_CorrespondingSourceObject: {fileID: 100008, guid: 1dfbc40e43d24cf48b6be677c0d37af3, type: 3} + m_PrefabInstance: {fileID: 973431165102974349} + m_PrefabAsset: {fileID: 0} +--- !u!65 &3866825236529853122 +BoxCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 973431165102875429} + 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: 1.3, y: 2.9, z: 0.03} + m_Center: {x: -0.6417, y: 1.4585041, z: -0.015} +--- !u!4 &973431165103374093 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 400000, guid: 1dfbc40e43d24cf48b6be677c0d37af3, type: 3} m_PrefabInstance: {fileID: 973431165102974349} m_PrefabAsset: {fileID: 0} diff --git a/Samples~/GroceryStore/Prefabs/Objects/Gun Clip.prefab b/Samples~/GroceryStore/Prefabs/Objects/Gun Clip.prefab index b9ed1db..b14d2fa 100644 --- a/Samples~/GroceryStore/Prefabs/Objects/Gun Clip.prefab +++ b/Samples~/GroceryStore/Prefabs/Objects/Gun Clip.prefab @@ -226,7 +226,37 @@ MonoBehaviour: - On Change - Continuous fromEventLabel: - events: [] + events: + - eventType: 0 + eventNetworking: 0 + functionCall: + targetGameObject: {fileID: 0} + methodName: + parameters: + - fromEvent: 1 + localProperty: From Event + type: 0 + floatConstant: 0 + intConstant: 0 + boolConstant: 0 + stringConstant: + vector3Constant: {x: 0, y: 0, z: 0} + gameObjectConstant: {fileID: 0} + rigidbodyConstant: {fileID: 0} + boolInverse: 0 + overrideMode: 0 + floatParameter: 0 + floatTriggerLow: 0.01 + floatTriggerHigh: 0.99 + multiplicationFactor: 1 + intTriggerLow: 0 + intTriggerHigh: 1 + label: + poseValue: {fileID: 0} + stringValue: + poseFloatEvent: + m_PersistentCalls: + m_Calls: [] defaultParameterProperty: - id: 1 label: Horizontal @@ -240,7 +270,37 @@ MonoBehaviour: - On Change - Continuous fromEventLabel: - events: [] + events: + - eventType: 0 + eventNetworking: 0 + functionCall: + targetGameObject: {fileID: 0} + methodName: + parameters: + - fromEvent: 1 + localProperty: From Event + type: 0 + floatConstant: 0 + intConstant: 0 + boolConstant: 0 + stringConstant: + vector3Constant: {x: 0, y: 0, z: 0} + gameObjectConstant: {fileID: 0} + rigidbodyConstant: {fileID: 0} + boolInverse: 0 + overrideMode: 0 + floatParameter: 0 + floatTriggerLow: 0.01 + floatTriggerHigh: 0.99 + multiplicationFactor: 1 + intTriggerLow: 0 + intTriggerHigh: 1 + label: + poseValue: {fileID: 0} + stringValue: + poseFloatEvent: + m_PersistentCalls: + m_Calls: [] defaultParameterProperty: - id: 2 label: Stick Button @@ -254,7 +314,37 @@ MonoBehaviour: - On Change - Continuous fromEventLabel: - events: [] + events: + - eventType: 0 + eventNetworking: 0 + functionCall: + targetGameObject: {fileID: 0} + methodName: + parameters: + - fromEvent: 1 + localProperty: From Event + type: 0 + floatConstant: 0 + intConstant: 0 + boolConstant: 0 + stringConstant: + vector3Constant: {x: 0, y: 0, z: 0} + gameObjectConstant: {fileID: 0} + rigidbodyConstant: {fileID: 0} + boolInverse: 0 + overrideMode: 0 + floatParameter: 0 + floatTriggerLow: 0.01 + floatTriggerHigh: 0.99 + multiplicationFactor: 1 + intTriggerLow: 0 + intTriggerHigh: 1 + label: + poseValue: {fileID: 0} + stringValue: + poseFloatEvent: + m_PersistentCalls: + m_Calls: [] defaultParameterProperty: - id: 3 label: Vertical @@ -268,7 +358,37 @@ MonoBehaviour: - On Change - Continuous fromEventLabel: - events: [] + events: + - eventType: 0 + eventNetworking: 0 + functionCall: + targetGameObject: {fileID: 0} + methodName: + parameters: + - fromEvent: 1 + localProperty: From Event + type: 0 + floatConstant: 0 + intConstant: 0 + boolConstant: 0 + stringConstant: + vector3Constant: {x: 0, y: 0, z: 0} + gameObjectConstant: {fileID: 0} + rigidbodyConstant: {fileID: 0} + boolInverse: 0 + overrideMode: 0 + floatParameter: 0 + floatTriggerLow: 0.01 + floatTriggerHigh: 0.99 + multiplicationFactor: 1 + intTriggerLow: 0 + intTriggerHigh: 1 + label: + poseValue: {fileID: 0} + stringValue: + poseFloatEvent: + m_PersistentCalls: + m_Calls: [] defaultParameterProperty: - id: 4 label: Horizontal @@ -282,7 +402,37 @@ MonoBehaviour: - On Change - Continuous fromEventLabel: - events: [] + events: + - eventType: 0 + eventNetworking: 0 + functionCall: + targetGameObject: {fileID: 0} + methodName: + parameters: + - fromEvent: 1 + localProperty: From Event + type: 0 + floatConstant: 0 + intConstant: 0 + boolConstant: 0 + stringConstant: + vector3Constant: {x: 0, y: 0, z: 0} + gameObjectConstant: {fileID: 0} + rigidbodyConstant: {fileID: 0} + boolInverse: 0 + overrideMode: 0 + floatParameter: 0 + floatTriggerLow: 0.01 + floatTriggerHigh: 0.99 + multiplicationFactor: 1 + intTriggerLow: 0 + intTriggerHigh: 1 + label: + poseValue: {fileID: 0} + stringValue: + poseFloatEvent: + m_PersistentCalls: + m_Calls: [] defaultParameterProperty: - id: 5 label: Stick Button @@ -296,7 +446,37 @@ MonoBehaviour: - On Change - Continuous fromEventLabel: - events: [] + events: + - eventType: 0 + eventNetworking: 0 + functionCall: + targetGameObject: {fileID: 0} + methodName: + parameters: + - fromEvent: 1 + localProperty: From Event + type: 0 + floatConstant: 0 + intConstant: 0 + boolConstant: 0 + stringConstant: + vector3Constant: {x: 0, y: 0, z: 0} + gameObjectConstant: {fileID: 0} + rigidbodyConstant: {fileID: 0} + boolInverse: 0 + overrideMode: 0 + floatParameter: 0 + floatTriggerLow: 0.01 + floatTriggerHigh: 0.99 + multiplicationFactor: 1 + intTriggerLow: 0 + intTriggerHigh: 1 + label: + poseValue: {fileID: 0} + stringValue: + poseFloatEvent: + m_PersistentCalls: + m_Calls: [] defaultParameterProperty: - id: 6 label: Button 1 @@ -310,7 +490,37 @@ MonoBehaviour: - On Change - Continuous fromEventLabel: - events: [] + events: + - eventType: 0 + eventNetworking: 0 + functionCall: + targetGameObject: {fileID: 0} + methodName: + parameters: + - fromEvent: 1 + localProperty: From Event + type: 0 + floatConstant: 0 + intConstant: 0 + boolConstant: 0 + stringConstant: + vector3Constant: {x: 0, y: 0, z: 0} + gameObjectConstant: {fileID: 0} + rigidbodyConstant: {fileID: 0} + boolInverse: 0 + overrideMode: 0 + floatParameter: 0 + floatTriggerLow: 0.01 + floatTriggerHigh: 0.99 + multiplicationFactor: 1 + intTriggerLow: 0 + intTriggerHigh: 1 + label: + poseValue: {fileID: 0} + stringValue: + poseFloatEvent: + m_PersistentCalls: + m_Calls: [] defaultParameterProperty: - id: 7 label: Button 2 @@ -324,7 +534,37 @@ MonoBehaviour: - On Change - Continuous fromEventLabel: - events: [] + events: + - eventType: 0 + eventNetworking: 0 + functionCall: + targetGameObject: {fileID: 0} + methodName: + parameters: + - fromEvent: 1 + localProperty: From Event + type: 0 + floatConstant: 0 + intConstant: 0 + boolConstant: 0 + stringConstant: + vector3Constant: {x: 0, y: 0, z: 0} + gameObjectConstant: {fileID: 0} + rigidbodyConstant: {fileID: 0} + boolInverse: 0 + overrideMode: 0 + floatParameter: 0 + floatTriggerLow: 0.01 + floatTriggerHigh: 0.99 + multiplicationFactor: 1 + intTriggerLow: 0 + intTriggerHigh: 1 + label: + poseValue: {fileID: 0} + stringValue: + poseFloatEvent: + m_PersistentCalls: + m_Calls: [] defaultParameterProperty: - id: 8 label: Button 3 @@ -338,7 +578,37 @@ MonoBehaviour: - On Change - Continuous fromEventLabel: - events: [] + events: + - eventType: 0 + eventNetworking: 0 + functionCall: + targetGameObject: {fileID: 0} + methodName: + parameters: + - fromEvent: 1 + localProperty: From Event + type: 0 + floatConstant: 0 + intConstant: 0 + boolConstant: 0 + stringConstant: + vector3Constant: {x: 0, y: 0, z: 0} + gameObjectConstant: {fileID: 0} + rigidbodyConstant: {fileID: 0} + boolInverse: 0 + overrideMode: 0 + floatParameter: 0 + floatTriggerLow: 0.01 + floatTriggerHigh: 0.99 + multiplicationFactor: 1 + intTriggerLow: 0 + intTriggerHigh: 1 + label: + poseValue: {fileID: 0} + stringValue: + poseFloatEvent: + m_PersistentCalls: + m_Calls: [] defaultParameterProperty: - id: 9 label: Button 4 @@ -352,7 +622,37 @@ MonoBehaviour: - On Change - Continuous fromEventLabel: - events: [] + events: + - eventType: 0 + eventNetworking: 0 + functionCall: + targetGameObject: {fileID: 0} + methodName: + parameters: + - fromEvent: 1 + localProperty: From Event + type: 0 + floatConstant: 0 + intConstant: 0 + boolConstant: 0 + stringConstant: + vector3Constant: {x: 0, y: 0, z: 0} + gameObjectConstant: {fileID: 0} + rigidbodyConstant: {fileID: 0} + boolInverse: 0 + overrideMode: 0 + floatParameter: 0 + floatTriggerLow: 0.01 + floatTriggerHigh: 0.99 + multiplicationFactor: 1 + intTriggerLow: 0 + intTriggerHigh: 1 + label: + poseValue: {fileID: 0} + stringValue: + poseFloatEvent: + m_PersistentCalls: + m_Calls: [] defaultParameterProperty: - id: 10 label: Trigger 1 @@ -366,7 +666,37 @@ MonoBehaviour: - On Change - Continuous fromEventLabel: - events: [] + events: + - eventType: 0 + eventNetworking: 0 + functionCall: + targetGameObject: {fileID: 0} + methodName: + parameters: + - fromEvent: 1 + localProperty: From Event + type: 0 + floatConstant: 0 + intConstant: 0 + boolConstant: 0 + stringConstant: + vector3Constant: {x: 0, y: 0, z: 0} + gameObjectConstant: {fileID: 0} + rigidbodyConstant: {fileID: 0} + boolInverse: 0 + overrideMode: 0 + floatParameter: 0 + floatTriggerLow: 0.01 + floatTriggerHigh: 0.99 + multiplicationFactor: 1 + intTriggerLow: 0 + intTriggerHigh: 1 + label: + poseValue: {fileID: 0} + stringValue: + poseFloatEvent: + m_PersistentCalls: + m_Calls: [] defaultParameterProperty: - id: 11 label: Trigger 2 @@ -380,7 +710,37 @@ MonoBehaviour: - On Change - Continuous fromEventLabel: - events: [] + events: + - eventType: 0 + eventNetworking: 0 + functionCall: + targetGameObject: {fileID: 0} + methodName: + parameters: + - fromEvent: 1 + localProperty: From Event + type: 0 + floatConstant: 0 + intConstant: 0 + boolConstant: 0 + stringConstant: + vector3Constant: {x: 0, y: 0, z: 0} + gameObjectConstant: {fileID: 0} + rigidbodyConstant: {fileID: 0} + boolInverse: 0 + overrideMode: 0 + floatParameter: 0 + floatTriggerLow: 0.01 + floatTriggerHigh: 0.99 + multiplicationFactor: 1 + intTriggerLow: 0 + intTriggerHigh: 1 + label: + poseValue: {fileID: 0} + stringValue: + poseFloatEvent: + m_PersistentCalls: + m_Calls: [] defaultParameterProperty: - id: 12 label: Option @@ -394,7 +754,37 @@ MonoBehaviour: - On Change - Continuous fromEventLabel: - events: [] + events: + - eventType: 0 + eventNetworking: 0 + functionCall: + targetGameObject: {fileID: 0} + methodName: + parameters: + - fromEvent: 1 + localProperty: From Event + type: 0 + floatConstant: 0 + intConstant: 0 + boolConstant: 0 + stringConstant: + vector3Constant: {x: 0, y: 0, z: 0} + gameObjectConstant: {fileID: 0} + rigidbodyConstant: {fileID: 0} + boolInverse: 0 + overrideMode: 0 + floatParameter: 0 + floatTriggerLow: 0.01 + floatTriggerHigh: 0.99 + multiplicationFactor: 1 + intTriggerLow: 0 + intTriggerHigh: 1 + label: + poseValue: {fileID: 0} + stringValue: + poseFloatEvent: + m_PersistentCalls: + m_Calls: [] defaultParameterProperty: socket: {fileID: 0} hand: 0 diff --git a/Samples~/GroceryStore/Prefabs/Objects/Gun.prefab b/Samples~/GroceryStore/Prefabs/Objects/Gun.prefab index de5997a..cf56cc5 100644 --- a/Samples~/GroceryStore/Prefabs/Objects/Gun.prefab +++ b/Samples~/GroceryStore/Prefabs/Objects/Gun.prefab @@ -24,13 +24,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1014415379911186} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.12} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4502298486734568} m_Father: {fileID: 4001617637216370} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &114434915744402832 MonoBehaviour: @@ -48,6 +49,7 @@ MonoBehaviour: timedClick: 0 focusPointObj: {fileID: 1607751933130066} objectInFocus: {fileID: 0} + focusDistance: 0 rayType: 0 maxDistance: 10 resolution: 0.2 @@ -160,12 +162,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1261922535975774} + serializedVersion: 2 m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258} m_LocalPosition: {x: 0, y: -0.05, z: -0.06} m_LocalScale: {x: 0.04, y: 0.12, z: 0.05} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4001617637216370} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0} --- !u!33 &33792706474391798 MeshFilter: @@ -183,9 +186,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1261922535975774} 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: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!23 &23246423044441728 @@ -199,10 +210,12 @@ MeshRenderer: 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: @@ -227,6 +240,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &1338508042946736 GameObject: m_ObjectHideFlags: 0 @@ -254,12 +268,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1338508042946736} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.04, y: 0.04, z: 0.2} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4001617637216370} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33991075976430308 MeshFilter: @@ -280,10 +295,12 @@ MeshRenderer: 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: @@ -308,6 +325,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!54 &54750522060933646 Rigidbody: m_ObjectHideFlags: 0 @@ -315,10 +333,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1338508042946736} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 0 m_IsKinematic: 1 m_Interpolate: 0 @@ -452,12 +481,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1436898006324960} + serializedVersion: 2 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: 4001617637216370} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!82 &82545431224417982 AudioSource: @@ -580,12 +610,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1523173821326922} + serializedVersion: 2 m_LocalRotation: {x: 0.2588191, y: -0, z: -0, w: 0.9659258} m_LocalPosition: {x: 0, y: -0.049999952, z: -0.06999999} m_LocalScale: {x: 0.05, y: 0.12, z: 0.06} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4001617637216370} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &114493821478521018 MonoBehaviour: @@ -638,9 +669,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1523173821326922} m_Material: {fileID: 0} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_LayerOverridePriority: 0 m_IsTrigger: 1 + m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 2 + serializedVersion: 3 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!1 &1607751933130066 @@ -667,13 +706,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1607751933130066} + serializedVersion: 2 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: - {fileID: 4532792015013658} m_Father: {fileID: 4658965113215178} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &212856850563888546 SpriteRenderer: @@ -686,10 +726,12 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -749,12 +791,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1623586009004810} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.01} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4502298486734568} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!212 &212587847783174698 SpriteRenderer: @@ -767,10 +810,12 @@ SpriteRenderer: m_CastShadows: 0 m_ReceiveShadows: 0 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 m_RayTracingMode: 0 + m_RayTraceProcedural: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -831,12 +876,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1733005783856408} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0.12} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4001617637216370} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!108 &108550437052421634 Light: @@ -897,6 +943,7 @@ Light: m_UseColorTemperature: 0 m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} m_UseBoundingSphereOverride: 0 + m_UseViewFrustumForShadowCasterCull: 1 m_ShadowRadius: 0 m_ShadowAngle: 0 --- !u!114 &114025439724628228 @@ -938,12 +985,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1836659987641172} + serializedVersion: 2 m_LocalRotation: {x: 0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0, y: 0, z: 0.015} m_LocalScale: {x: 0.024, y: 0.1, z: 0.024} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4001617637216370} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0} --- !u!33 &33195271805326392 MeshFilter: @@ -961,8 +1009,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1836659987641172} 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: 2 m_Radius: 0.5 m_Height: 2 m_Direction: 1 @@ -978,10 +1035,12 @@ MeshRenderer: 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: @@ -1006,6 +1065,7 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!1 &1882729648568646 GameObject: m_ObjectHideFlags: 0 @@ -1030,12 +1090,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1882729648568646} + serializedVersion: 2 m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258} m_LocalPosition: {x: 0, y: -0.05, z: -0.07} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4001617637216370} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0} --- !u!114 &114159929236210316 MonoBehaviour: @@ -1308,9 +1369,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1886339611299816} + serializedVersion: 2 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: - {fileID: 4159663301608934} - {fileID: 4846303205762852} @@ -1321,7 +1384,6 @@ Transform: - {fileID: 4724058278612682} - {fileID: 4199068789977424} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &54339493025480010 Rigidbody: @@ -1330,10 +1392,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1886339611299816} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 m_Interpolate: 0 diff --git a/Samples~/GroceryStore/Prefabs/Objects/Sword.prefab b/Samples~/GroceryStore/Prefabs/Objects/Sword.prefab index 8d1e973..91963a7 100644 --- a/Samples~/GroceryStore/Prefabs/Objects/Sword.prefab +++ b/Samples~/GroceryStore/Prefabs/Objects/Sword.prefab @@ -31,14 +31,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1637081267702634} + serializedVersion: 2 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: - {fileID: 1327642859812167675} - {fileID: 1825897792794241923} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &54046747442775926 Rigidbody: @@ -47,15 +48,26 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1637081267702634} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 1 m_Drag: 0 m_AngularDrag: 0.05 + m_CenterOfMass: {x: 0, y: 0, z: 0} + m_InertiaTensor: {x: 1, y: 1, z: 1} + m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} + m_IncludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ExcludeLayers: + serializedVersion: 2 + m_Bits: 0 + m_ImplicitCom: 1 + m_ImplicitTensor: 1 m_UseGravity: 1 m_IsKinematic: 0 - m_Interpolate: 0 + m_Interpolate: 1 m_Constraints: 0 - m_CollisionDetection: 0 + m_CollisionDetection: 1 --- !u!114 &114559312008520994 MonoBehaviour: m_ObjectHideFlags: 0 @@ -173,9 +185,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1637081267702634} 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: 2 + serializedVersion: 3 m_Size: {x: 0.05, y: 0.02, z: 0.54} m_Center: {x: 0, y: 0, z: 0.39} --- !u!65 &65239915906408070 @@ -186,9 +206,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1637081267702634} 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: 2 + serializedVersion: 3 m_Size: {x: 0.1799081, y: 0.04, z: 0.04} m_Center: {x: 0, y: 0, z: 0.1} --- !u!136 &136455234883199966 @@ -199,8 +227,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1637081267702634} 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: 2 m_Radius: 0.02 m_Height: 0.15 m_Direction: 2 @@ -278,12 +315,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4775405205646088714} + serializedVersion: 2 m_LocalRotation: {x: 0.5, y: -0.5, z: -0.5, w: 0.5} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4776878667147238} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: -90, z: -90} --- !u!114 &3673428933149702084 MonoBehaviour: @@ -510,6 +548,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4776878667147238} m_Modifications: - target: {fileID: 100008, guid: d2b6307262acf2143b2c42bd655c4e4f, type: 3} @@ -561,10 +600,12 @@ PrefabInstance: value: 0 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: d2b6307262acf2143b2c42bd655c4e4f, type: 3} --- !u!4 &1327642859812167675 stripped Transform: - m_CorrespondingSourceObject: {fileID: 400008, guid: d2b6307262acf2143b2c42bd655c4e4f, - type: 3} + m_CorrespondingSourceObject: {fileID: 400008, guid: d2b6307262acf2143b2c42bd655c4e4f, type: 3} m_PrefabInstance: {fileID: 1327642859812554099} m_PrefabAsset: {fileID: 0}