From 2cc60eac716e885df10fb83ac0d296e74c6beaca Mon Sep 17 00:00:00 2001 From: Robii Aragon <55045932+RobiiAragon@users.noreply.github.com> Date: Fri, 6 Mar 2026 21:51:37 -0800 Subject: [PATCH] Update crafting workbench prefab & settings Apply Unity serialization/property updates to the Crafting Workbench prefab and related scenes/settings. Changes include transform position/scale tweaks, added/updated serializedVersion fields, new MeshRenderer/Collider properties (ray tracing flags, static shadow caster, mask interaction, include/exclude layers, providesContacts, additional vertex streams, etc.), and many new default MonoBehaviour fields and event placeholders (playerTag, audio resource, assembly type name placeholders, various action/config flags). Also adds SampleSceneMAMADO.unity and updates SampleScene.unity, UniversalRenderPipelineGlobalSettings.asset, GraphicsSettings.asset, and ProjectSettings.asset to match the updated serialization/schema. --- .../Crafting System/Crafting Workbench.prefab | 673 +++++++++++++++--- Assets/Scenes/SampleScene.unity | 4 +- Assets/Scenes/SampleSceneMAMADO.unity | 3 + Assets/Scenes/SampleSceneMAMADO.unity.meta | 7 + ...niversalRenderPipelineGlobalSettings.asset | 4 +- ProjectSettings/GraphicsSettings.asset | 4 +- ProjectSettings/ProjectSettings.asset | 4 +- 7 files changed, 608 insertions(+), 91 deletions(-) create mode 100644 Assets/Scenes/SampleSceneMAMADO.unity create mode 100644 Assets/Scenes/SampleSceneMAMADO.unity.meta diff --git a/Assets/Game Kit Controller/Prefabs/Crafting System/Crafting Workbench.prefab b/Assets/Game Kit Controller/Prefabs/Crafting System/Crafting Workbench.prefab index 51458186..0c8ccd03 100644 --- a/Assets/Game Kit Controller/Prefabs/Crafting System/Crafting Workbench.prefab +++ b/Assets/Game Kit Controller/Prefabs/Crafting System/Crafting Workbench.prefab @@ -28,12 +28,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1027978764150916} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.2207, y: 1.2143999, z: 0.583} + m_LocalPosition: {x: 1.2207, y: 1.0434, z: 0.583} m_LocalScale: {x: 0.05599243, y: 0.82769847, z: 0.38938355} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4866140454729386} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33000576747128740 MeshFilter: @@ -54,10 +55,17 @@ 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -79,9 +87,12 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &114563320093689166 MonoBehaviour: m_ObjectHideFlags: 0 @@ -99,11 +110,14 @@ MonoBehaviour: killCharacterOnEmtpyHealthAmountOnSpot: 0 removeComponentOnEmptyHealth: 0 ignoreUseHealthAmountOnSpot: 0 + useCustomCharacterRadius: 0 + customCharacterRadius: 0 eventOnEmtpyHealthAmountOnSpot: m_PersistentCalls: m_Calls: [] healthAmountOnSpotEmpty: 0 damageMultiplier: 1 + applyForceOnThisObjectIfDetected: 0 character: {fileID: 1663168220468920} healthManager: {fileID: 114550132267047668} characterAssigned: 1 @@ -115,9 +129,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1027978764150916} 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!114 &114283684218721870 @@ -178,12 +200,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1037489415972246} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.2988, y: 0.4028, z: -0.23644} - m_LocalScale: {x: 0.14577, y: 0.8228471, z: 0.14577007} + m_LocalPosition: {x: 1.2988, y: 0.38, z: -0.23644} + m_LocalScale: {x: 0.14577, y: 0.55, z: 0.14577007} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4866140454729386} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33767207570651646 MeshFilter: @@ -204,10 +227,17 @@ 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -229,9 +259,12 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &114742432689844488 MonoBehaviour: m_ObjectHideFlags: 0 @@ -249,11 +282,14 @@ MonoBehaviour: killCharacterOnEmtpyHealthAmountOnSpot: 0 removeComponentOnEmptyHealth: 0 ignoreUseHealthAmountOnSpot: 0 + useCustomCharacterRadius: 0 + customCharacterRadius: 0 eventOnEmtpyHealthAmountOnSpot: m_PersistentCalls: m_Calls: [] healthAmountOnSpotEmpty: 0 damageMultiplier: 1 + applyForceOnThisObjectIfDetected: 0 character: {fileID: 1663168220468920} healthManager: {fileID: 114550132267047668} characterAssigned: 1 @@ -265,9 +301,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1037489415972246} 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!114 &114035001579217086 @@ -328,12 +372,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1056593655444992} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.2988, y: 0.4028, z: 0.7048397} - m_LocalScale: {x: 0.14577, y: 0.8228471, z: 0.14577007} + m_LocalPosition: {x: -1.2988, y: 0.38, z: 0.7048397} + m_LocalScale: {x: 0.14577, y: 0.55, z: 0.14577007} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4866140454729386} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33334843992594802 MeshFilter: @@ -354,10 +399,17 @@ 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -379,9 +431,12 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &114195868990368556 MonoBehaviour: m_ObjectHideFlags: 0 @@ -399,11 +454,14 @@ MonoBehaviour: killCharacterOnEmtpyHealthAmountOnSpot: 0 removeComponentOnEmptyHealth: 0 ignoreUseHealthAmountOnSpot: 0 + useCustomCharacterRadius: 0 + customCharacterRadius: 0 eventOnEmtpyHealthAmountOnSpot: m_PersistentCalls: m_Calls: [] healthAmountOnSpotEmpty: 0 damageMultiplier: 1 + applyForceOnThisObjectIfDetected: 0 character: {fileID: 1663168220468920} healthManager: {fileID: 114550132267047668} characterAssigned: 1 @@ -415,9 +473,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1056593655444992} 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!114 &114398478584198574 @@ -473,12 +539,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1089871431479260} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.233} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4098821557171210} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1141487765633326 GameObject: @@ -508,12 +575,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1141487765633326} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.00000047683716, y: 0.43499997, z: 0.73326015} + m_LocalPosition: {x: -0.00000047683716, y: 0.44, z: 0.73326015} m_LocalScale: {x: 2.4997628, y: 0.14019929, z: 0.08885} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4866140454729386} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33334016961861598 MeshFilter: @@ -534,10 +602,17 @@ 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -559,9 +634,12 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &114672263236418480 MonoBehaviour: m_ObjectHideFlags: 0 @@ -579,11 +657,14 @@ MonoBehaviour: killCharacterOnEmtpyHealthAmountOnSpot: 0 removeComponentOnEmptyHealth: 0 ignoreUseHealthAmountOnSpot: 0 + useCustomCharacterRadius: 0 + customCharacterRadius: 0 eventOnEmtpyHealthAmountOnSpot: m_PersistentCalls: m_Calls: [] healthAmountOnSpotEmpty: 0 damageMultiplier: 1 + applyForceOnThisObjectIfDetected: 0 character: {fileID: 1663168220468920} healthManager: {fileID: 114550132267047668} characterAssigned: 1 @@ -595,9 +676,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1141487765633326} 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.0000001, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &114864583573984572 @@ -653,12 +742,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1166361190214314} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.902, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4866140454729386} - m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1179961159851254 GameObject: @@ -688,12 +778,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1179961159851254} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.2988, y: 0.4028, z: 0.70484} - m_LocalScale: {x: 0.1457693, y: 0.8228488, z: 0.14576939} + m_LocalPosition: {x: 1.2988, y: 0.38, z: 0.70484} + m_LocalScale: {x: 0.1457693, y: 0.55, z: 0.14576939} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4866140454729386} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33904632190795994 MeshFilter: @@ -714,10 +805,17 @@ 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -739,9 +837,12 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &114162546012348758 MonoBehaviour: m_ObjectHideFlags: 0 @@ -759,11 +860,14 @@ MonoBehaviour: killCharacterOnEmtpyHealthAmountOnSpot: 0 removeComponentOnEmptyHealth: 0 ignoreUseHealthAmountOnSpot: 0 + useCustomCharacterRadius: 0 + customCharacterRadius: 0 eventOnEmtpyHealthAmountOnSpot: m_PersistentCalls: m_Calls: [] healthAmountOnSpotEmpty: 0 damageMultiplier: 1 + applyForceOnThisObjectIfDetected: 0 character: {fileID: 1663168220468920} healthManager: {fileID: 114550132267047668} characterAssigned: 1 @@ -775,9 +879,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1179961159851254} 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: 0.99999994} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &114904093614811128 @@ -842,15 +954,16 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1302588111543202} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0.7071068, z: 0, w: 0.7071068} m_LocalPosition: {x: 1.797, y: 0.167, z: 0.804} m_LocalScale: {x: 0.42383337, y: 0.42383337, z: 0.42383337} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4920989484375250} - {fileID: 4387897460985248} - {fileID: 4109044369408320} m_Father: {fileID: 4098821557171210} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!111 &111555805034727826 Animation: @@ -860,13 +973,14 @@ Animation: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1302588111543202} m_Enabled: 1 - serializedVersion: 3 + serializedVersion: 4 m_Animation: {fileID: 0} m_Animations: - {fileID: 7400000, guid: 00c9c61ee9b63fb448dd7465e38a0bf4, type: 2} m_WrapMode: 0 m_PlayAutomatically: 0 m_AnimatePhysics: 0 + m_UpdateMode: 0 m_CullingType: 0 --- !u!65 &65399979594218430 BoxCollider: @@ -876,9 +990,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1302588111543202} 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.2526995, z: 1.7655667} m_Center: {x: 1.6308637e-14, y: 0.12635043, z: -1.372784} --- !u!114 &114117192046931070 @@ -990,6 +1112,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: be8030885d591eb408518d093fad5d5b, type: 3} m_Name: m_EditorClassIdentifier: + playerTag: Player useOnlyForTrigger: 0 functionToSetPlayer: setCurrentPlayer activateDeviceOnTriggerEnter: 0 @@ -1006,6 +1129,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114117192046931070} + m_TargetAssemblyTypeName: m_MethodName: activateInventoryBank m_Mode: 1 m_Arguments: @@ -1054,6 +1178,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114117192046931070} + m_TargetAssemblyTypeName: m_MethodName: setCurrentPlayer m_Mode: 0 m_Arguments: @@ -1125,6 +1250,8 @@ MonoBehaviour: useCustomMinAngleToUse: 0 customMinAngleToUseDevice: 0 useRelativeDirectionBetweenPlayerAndObject: 0 + removeDeviceFromPlayerListOnMaxDistance: 0 + maxDistanceToRemoveDeviceFromPlayerList: 0 useCustomIconButtonInfo: 0 customIconButtonInfoName: ignoreUseOnlyDeviceIfVisibleOnCamera: 1 @@ -1141,6 +1268,8 @@ MonoBehaviour: objectAmount: 0 useHoldInteractionButton: 0 holdInteractionButtonDuration: 0 + useMaxDistanceToCameraCenter: 0 + maxDistanceToCameraCenter: 0 showGizmo: 0 gizmoLabelColor: {r: 0, g: 1, b: 0, a: 1} gizmoColor: {r: 1, g: 1, b: 1, a: 1} @@ -1298,6 +1427,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -1453,6 +1583,7 @@ MonoBehaviour: drawWeaponsIfPreviouslyCarrying: 0 keepOnlyIfPlayerIsOnFirstPerson: 0 disableWeaponsDirectlyOnStart: 0 + ignoreMeleeWeaponCheck: 0 carryWeaponOnLowerPositionActive: 0 setPlayerCameraRotationOnExit: 0 playerPivotTransformThirdPerson: {fileID: 0} @@ -1504,12 +1635,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1356114806659330} + serializedVersion: 2 m_LocalRotation: {x: -4.3297803e-17, y: 0.70710677, z: 0.7071069, w: -4.329781e-17} m_LocalPosition: {x: -1e-15, y: 0.075728, z: -0.035778} m_LocalScale: {x: 0.35234022, y: 0.5652831, z: 0.5652831} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4254039154812822} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33604262035359480 MeshFilter: @@ -1530,10 +1662,17 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1558,9 +1697,12 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &64507901368884274 MeshCollider: m_ObjectHideFlags: 0 @@ -1569,9 +1711,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1356114806659330} 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: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 4300002, guid: 74e094b93bd44254c806a74c7759c7b2, type: 3} @@ -1603,12 +1753,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1364871962878070} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.00000047684, y: 1.258, z: 0.73326} + m_LocalPosition: {x: -0.00000047684, y: 1.0870001, z: 0.73326} m_LocalScale: {x: 2.385354, y: 0.7405264, z: 0.0888486} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4866140454729386} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33452509328188344 MeshFilter: @@ -1629,10 +1780,17 @@ 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1654,9 +1812,12 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &114563911057929102 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1674,11 +1835,14 @@ MonoBehaviour: killCharacterOnEmtpyHealthAmountOnSpot: 0 removeComponentOnEmptyHealth: 0 ignoreUseHealthAmountOnSpot: 0 + useCustomCharacterRadius: 0 + customCharacterRadius: 0 eventOnEmtpyHealthAmountOnSpot: m_PersistentCalls: m_Calls: [] healthAmountOnSpotEmpty: 0 damageMultiplier: 1 + applyForceOnThisObjectIfDetected: 0 character: {fileID: 1663168220468920} healthManager: {fileID: 114550132267047668} characterAssigned: 1 @@ -1690,9 +1854,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1364871962878070} 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: 0.99999994} m_Center: {x: 0.00000023841858, y: 0, z: -0.000015258789} --- !u!114 &114908920322427792 @@ -1753,14 +1925,15 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1373077377082176} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: -1.4, y: 0.903, z: 1.052} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4276079626018654} - {fileID: 4381089855025076} m_Father: {fileID: 4098821557171210} - m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &114330205804773990 MonoBehaviour: @@ -1788,8 +1961,7 @@ MonoBehaviour: animationName: inventoryObjectNeededList: - Name: Wood - objectNeeded: {fileID: 1460633359450632, guid: 9e2eb7479e1a1ce4a96caa8ae9c2038e, - type: 3} + objectNeeded: {fileID: 1460633359450632, guid: 9e2eb7479e1a1ce4a96caa8ae9c2038e, type: 3} useObjectNeededName: 0 objectNeededName: useObjectAction: 0 @@ -1797,11 +1969,13 @@ MonoBehaviour: amountNeeded: 1 objectUsed: 0 amountOfObjectsUsed: 0 + allowToUseObjectsInfinitely: 0 objectUsedMessage: Wood Used. useEventOnObjectsPlaced: 0 eventOnObjectsPlaced: m_PersistentCalls: m_Calls: [] + useEventEachTimeObjectPlaced: 0 useObjectSound: 0 usedObjectSound: {fileID: 0} usedObjectAudioElement: @@ -1816,6 +1990,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114550132267047668} + m_TargetAssemblyTypeName: m_MethodName: getHealth m_Mode: 4 m_Arguments: @@ -1864,9 +2039,17 @@ SphereCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1373077377082176} 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_Radius: 0.39 m_Center: {x: 0, y: 0, z: 0} --- !u!114 &114068320520842560 @@ -1912,6 +2095,8 @@ MonoBehaviour: useCustomMinAngleToUse: 0 customMinAngleToUseDevice: 0 useRelativeDirectionBetweenPlayerAndObject: 0 + removeDeviceFromPlayerListOnMaxDistance: 0 + maxDistanceToRemoveDeviceFromPlayerList: 0 useCustomIconButtonInfo: 0 customIconButtonInfoName: ignoreUseOnlyDeviceIfVisibleOnCamera: 1 @@ -1928,6 +2113,8 @@ MonoBehaviour: objectAmount: 0 useHoldInteractionButton: 0 holdInteractionButtonDuration: 0 + useMaxDistanceToCameraCenter: 0 + maxDistanceToCameraCenter: 0 showGizmo: 0 gizmoLabelColor: {r: 0, g: 1, b: 0, a: 1} gizmoColor: {r: 1, g: 1, b: 1, a: 1} @@ -1943,6 +2130,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -2057,6 +2245,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114330205804773990} + m_TargetAssemblyTypeName: m_MethodName: solveThisInventoryObjectFromLoadingGame m_Mode: 1 m_Arguments: @@ -2113,9 +2302,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1432360830868040} + 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: 4069557586286390} - {fileID: 4512083133763550} @@ -2128,7 +2319,6 @@ Transform: - {fileID: 4712303940059216} - {fileID: 4938986132950740} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &65715360206581712 BoxCollider: @@ -2138,9 +2328,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1432360830868040} 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: 2, z: 1} m_Center: {x: 0, y: 0.59377426, z: 0} --- !u!114 &114420457368053832 @@ -2172,6 +2370,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114741117512105712} + m_TargetAssemblyTypeName: m_MethodName: setPlayerActionActive m_Mode: 0 m_Arguments: @@ -2183,6 +2382,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 114979822337516172} + m_TargetAssemblyTypeName: m_MethodName: activateWorkbench m_Mode: 0 m_Arguments: @@ -2217,6 +2417,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114741117512105712} + m_TargetAssemblyTypeName: m_MethodName: setPlayerActionDeactivate m_Mode: 0 m_Arguments: @@ -2228,6 +2429,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 114979822337516172} + m_TargetAssemblyTypeName: m_MethodName: deactivateWorkBench m_Mode: 0 m_Arguments: @@ -2334,6 +2536,7 @@ MonoBehaviour: useExtraFollowTransformPositionOffsetActiveFBA: 0 currentExtraFollowTransformPositionOffsetFBA: {x: 0, y: 0, z: 0} ignorePlayerRotationToCameraOnFBA: 0 + playerCameraTransformFollowsPlayerTransformRotationOnFBA: 0 ignoreHorizontalCameraRotationOnFBA: 0 ignoreVerticalCameraRotationOnFBA: 0 resetCameraRotationForwardOnFBA: 0 @@ -2349,13 +2552,14 @@ MonoBehaviour: ignoreSetLastTimeFallingOnActionEnd: 0 reloadMainColliderOnCharacterOnActionEnd: 0 changePlayerColliderScale: 0 - disableIKOnHands: 1 - disableIKOnFeet: 1 + disableIKOnHands: 0 + disableIKOnFeet: 0 pauseHeadTrack: 1 usCustomPauseHeadTrackOnFBA: 0 customPauseHeadTrackOnFBA: 0 setNoFrictionOnCollider: 1 forceRootMotionDuringAction: 1 + ignoreRootMotionDuringAction: 0 actionCanHappenOnAir: 0 jumpCanResumePlayer: 0 useMovementInput: 0 @@ -2376,6 +2580,7 @@ MonoBehaviour: positionToAdjustPlayer: {fileID: 4069557586286390} adjustPlayerPositionSpeed: 2 usePositionToAdjustPlayerOnlyOnFBA: 0 + userLerpToAdjustPosition: 0 movePlayerOnDirection: 0 movePlayerOnDirectionRaycastDistance: 0 movePlayerOnDirectionSpeed: 0 @@ -2431,12 +2636,14 @@ MonoBehaviour: resetObjectPositionAndParentAfterAction: 1 useEventInfoList: 1 useAccumulativeDelay: 0 + useAnimationSpeedOnDelay: 0 eventInfoList: - delayToActivate: 0 eventToUse: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114495194049438070} + m_TargetAssemblyTypeName: m_MethodName: moveCamera m_Mode: 6 m_Arguments: @@ -2449,6 +2656,8 @@ MonoBehaviour: m_CallState: 2 useRemoteEvent: 0 remoteEventName: + useRemoteEventNameList: 0 + remoteEventNameList: [] eventTriggered: 0 sendCurrentPlayerOnEvent: 0 eventToSendCurrentPlayer: @@ -2460,6 +2669,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114471934156660326} + m_TargetAssemblyTypeName: m_MethodName: removeDeviceFromListWithoutDisablingDevice m_Mode: 1 m_Arguments: @@ -2472,6 +2682,8 @@ MonoBehaviour: m_CallState: 2 useRemoteEvent: 0 remoteEventName: + useRemoteEventNameList: 0 + remoteEventNameList: [] eventTriggered: 0 sendCurrentPlayerOnEvent: 0 eventToSendCurrentPlayer: @@ -2483,6 +2695,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114326632073402640} + m_TargetAssemblyTypeName: m_MethodName: openMenu m_Mode: 1 m_Arguments: @@ -2495,6 +2708,8 @@ MonoBehaviour: m_CallState: 2 useRemoteEvent: 0 remoteEventName: + useRemoteEventNameList: 0 + remoteEventNameList: [] eventTriggered: 0 sendCurrentPlayerOnEvent: 0 eventToSendCurrentPlayer: @@ -2518,6 +2733,18 @@ MonoBehaviour: healthAmountToAdd: 0 removeHealthAmountOnAction: 0 healthAmountToRemove: 0 + setHealthOnActionEnd: 0 + killCharacter: 0 + delayToKillCharacter: 0 + activateCharacterRagdoll: 0 + delatyToActivateCharacterRagdoll: 0 + ragdollStateDuration: 0 + addForceToRagdoll: 0 + ragdollForce: 0 + useDirectionForRagdoll: 0 + directionForRagdollTransform: {fileID: 0} + useLocalCharacterRagdollForceDirection: 0 + localCharacterRagdollForceDirection: {x: 0, y: 0, z: 1} checkIfPlayerOnGround: 1 checkConditionsToStartActionOnUpdate: 0 playerMovingToStartAction: 0 @@ -2600,6 +2827,7 @@ MonoBehaviour: useExtraFollowTransformPositionOffsetActiveFBA: 0 currentExtraFollowTransformPositionOffsetFBA: {x: 0, y: 0, z: 0} ignorePlayerRotationToCameraOnFBA: 0 + playerCameraTransformFollowsPlayerTransformRotationOnFBA: 0 ignoreHorizontalCameraRotationOnFBA: 0 ignoreVerticalCameraRotationOnFBA: 0 resetCameraRotationForwardOnFBA: 0 @@ -2622,6 +2850,7 @@ MonoBehaviour: customPauseHeadTrackOnFBA: 0 setNoFrictionOnCollider: 1 forceRootMotionDuringAction: 1 + ignoreRootMotionDuringAction: 0 actionCanHappenOnAir: 0 jumpCanResumePlayer: 0 useMovementInput: 0 @@ -2642,6 +2871,7 @@ MonoBehaviour: positionToAdjustPlayer: {fileID: 0} adjustPlayerPositionSpeed: 0 usePositionToAdjustPlayerOnlyOnFBA: 0 + userLerpToAdjustPosition: 0 movePlayerOnDirection: 0 movePlayerOnDirectionRaycastDistance: 0 movePlayerOnDirectionSpeed: 0 @@ -2697,12 +2927,14 @@ MonoBehaviour: resetObjectPositionAndParentAfterAction: 1 useEventInfoList: 1 useAccumulativeDelay: 0 + useAnimationSpeedOnDelay: 0 eventInfoList: - delayToActivate: 1 eventToUse: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114212580679714698} + m_TargetAssemblyTypeName: m_MethodName: setDeviceAction m_Mode: 5 m_Arguments: @@ -2714,6 +2946,7 @@ MonoBehaviour: m_BoolArgument: 1 m_CallState: 2 - m_Target: {fileID: 114471934156660326} + m_TargetAssemblyTypeName: m_MethodName: addDeviceToList m_Mode: 1 m_Arguments: @@ -2726,6 +2959,8 @@ MonoBehaviour: m_CallState: 2 useRemoteEvent: 0 remoteEventName: + useRemoteEventNameList: 0 + remoteEventNameList: [] eventTriggered: 0 sendCurrentPlayerOnEvent: 0 eventToSendCurrentPlayer: @@ -2749,6 +2984,18 @@ MonoBehaviour: healthAmountToAdd: 0 removeHealthAmountOnAction: 0 healthAmountToRemove: 0 + setHealthOnActionEnd: 0 + killCharacter: 0 + delayToKillCharacter: 0 + activateCharacterRagdoll: 0 + delatyToActivateCharacterRagdoll: 0 + ragdollStateDuration: 0 + addForceToRagdoll: 0 + ragdollForce: 0 + useDirectionForRagdoll: 0 + directionForRagdollTransform: {fileID: 0} + useLocalCharacterRagdollForceDirection: 0 + localCharacterRagdollForceDirection: {x: 0, y: 0, z: 1} checkIfPlayerOnGround: 1 checkConditionsToStartActionOnUpdate: 0 playerMovingToStartAction: 0 @@ -2831,6 +3078,7 @@ MonoBehaviour: useExtraFollowTransformPositionOffsetActiveFBA: 0 currentExtraFollowTransformPositionOffsetFBA: {x: 0, y: 0, z: 0} ignorePlayerRotationToCameraOnFBA: 0 + playerCameraTransformFollowsPlayerTransformRotationOnFBA: 0 ignoreHorizontalCameraRotationOnFBA: 0 ignoreVerticalCameraRotationOnFBA: 0 resetCameraRotationForwardOnFBA: 0 @@ -2853,6 +3101,7 @@ MonoBehaviour: customPauseHeadTrackOnFBA: 0 setNoFrictionOnCollider: 1 forceRootMotionDuringAction: 1 + ignoreRootMotionDuringAction: 0 actionCanHappenOnAir: 0 jumpCanResumePlayer: 0 useMovementInput: 0 @@ -2873,6 +3122,7 @@ MonoBehaviour: positionToAdjustPlayer: {fileID: 0} adjustPlayerPositionSpeed: 0 usePositionToAdjustPlayerOnlyOnFBA: 0 + userLerpToAdjustPosition: 0 movePlayerOnDirection: 0 movePlayerOnDirectionRaycastDistance: 0 movePlayerOnDirectionSpeed: 0 @@ -2928,12 +3178,14 @@ MonoBehaviour: resetObjectPositionAndParentAfterAction: 1 useEventInfoList: 1 useAccumulativeDelay: 0 + useAnimationSpeedOnDelay: 0 eventInfoList: - delayToActivate: 0 eventToUse: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114326632073402640} + m_TargetAssemblyTypeName: m_MethodName: closeMenu m_Mode: 1 m_Arguments: @@ -2945,6 +3197,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 114495194049438070} + m_TargetAssemblyTypeName: m_MethodName: moveCamera m_Mode: 6 m_Arguments: @@ -2957,6 +3210,8 @@ MonoBehaviour: m_CallState: 2 useRemoteEvent: 0 remoteEventName: + useRemoteEventNameList: 0 + remoteEventNameList: [] eventTriggered: 0 sendCurrentPlayerOnEvent: 0 eventToSendCurrentPlayer: @@ -2968,6 +3223,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: m_MethodName: setEffectActiveState m_Mode: 6 m_Arguments: @@ -2979,6 +3235,7 @@ MonoBehaviour: m_BoolArgument: 1 m_CallState: 2 - m_Target: {fileID: 0} + m_TargetAssemblyTypeName: m_MethodName: setEffectActiveState m_Mode: 6 m_Arguments: @@ -2991,6 +3248,8 @@ MonoBehaviour: m_CallState: 2 useRemoteEvent: 0 remoteEventName: + useRemoteEventNameList: 0 + remoteEventNameList: [] eventTriggered: 0 sendCurrentPlayerOnEvent: 0 eventToSendCurrentPlayer: @@ -3002,6 +3261,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114212580679714698} + m_TargetAssemblyTypeName: m_MethodName: setDeviceAction m_Mode: 5 m_Arguments: @@ -3013,6 +3273,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 114471934156660326} + m_TargetAssemblyTypeName: m_MethodName: reloadDeviceStringActionOnPlayer m_Mode: 1 m_Arguments: @@ -3025,6 +3286,8 @@ MonoBehaviour: m_CallState: 2 useRemoteEvent: 0 remoteEventName: + useRemoteEventNameList: 0 + remoteEventNameList: [] eventTriggered: 0 sendCurrentPlayerOnEvent: 0 eventToSendCurrentPlayer: @@ -3048,6 +3311,18 @@ MonoBehaviour: healthAmountToAdd: 0 removeHealthAmountOnAction: 0 healthAmountToRemove: 0 + setHealthOnActionEnd: 0 + killCharacter: 0 + delayToKillCharacter: 0 + activateCharacterRagdoll: 0 + delatyToActivateCharacterRagdoll: 0 + ragdollStateDuration: 0 + addForceToRagdoll: 0 + ragdollForce: 0 + useDirectionForRagdoll: 0 + directionForRagdollTransform: {fileID: 0} + useLocalCharacterRagdollForceDirection: 0 + localCharacterRagdollForceDirection: {x: 0, y: 0, z: 1} checkIfPlayerOnGround: 1 checkConditionsToStartActionOnUpdate: 0 playerMovingToStartAction: 0 @@ -3120,6 +3395,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114326632073402640} + m_TargetAssemblyTypeName: m_MethodName: setCurrentPlayer m_Mode: 0 m_Arguments: @@ -3131,6 +3407,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 114495194049438070} + m_TargetAssemblyTypeName: m_MethodName: setCurrentPlayer m_Mode: 0 m_Arguments: @@ -3207,6 +3484,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: be8030885d591eb408518d093fad5d5b, type: 3} m_Name: m_EditorClassIdentifier: + playerTag: Player useOnlyForTrigger: 1 functionToSetPlayer: activateDeviceOnTriggerEnter: 0 @@ -3260,6 +3538,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114009770413537174} + m_TargetAssemblyTypeName: m_MethodName: setCurrentPlayer m_Mode: 0 m_Arguments: @@ -3331,6 +3610,8 @@ MonoBehaviour: useCustomMinAngleToUse: 0 customMinAngleToUseDevice: 60 useRelativeDirectionBetweenPlayerAndObject: 0 + removeDeviceFromPlayerListOnMaxDistance: 0 + maxDistanceToRemoveDeviceFromPlayerList: 0 useCustomIconButtonInfo: 1 customIconButtonInfoName: Big ignoreUseOnlyDeviceIfVisibleOnCamera: 1 @@ -3347,6 +3628,8 @@ MonoBehaviour: objectAmount: 0 useHoldInteractionButton: 0 holdInteractionButtonDuration: 0 + useMaxDistanceToCameraCenter: 0 + maxDistanceToCameraCenter: 0 showGizmo: 0 gizmoLabelColor: {r: 0, g: 1, b: 0, a: 1} gizmoColor: {r: 1, g: 1, b: 1, a: 1} @@ -3404,12 +3687,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1444832399611764} + 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: 4098821557171210} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &114326632073402640 MonoBehaviour: @@ -3459,13 +3743,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1504616619478290} + 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: 4679137694127650} m_Father: {fileID: 4098821557171210} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &114495194049438070 MonoBehaviour: @@ -3514,13 +3799,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1512439688493260} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.584, z: 0.763} m_LocalScale: {x: 0.6232987, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4164423834053694} m_Father: {fileID: 4254039154812822} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 5.574876, y: 0, z: 0} --- !u!1 &1532310689036366 GameObject: @@ -3550,12 +3836,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1532310689036366} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.2988, y: 0.4028, z: -0.2364397} - m_LocalScale: {x: 0.14577, y: 0.8228471, z: 0.14577007} + m_LocalPosition: {x: -1.2988, y: 0.38, z: -0.2364397} + m_LocalScale: {x: 0.14577, y: 0.55, z: 0.14577007} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4866140454729386} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33781998354960840 MeshFilter: @@ -3576,10 +3863,17 @@ 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3601,9 +3895,12 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &114533671955478866 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3621,11 +3918,14 @@ MonoBehaviour: killCharacterOnEmtpyHealthAmountOnSpot: 0 removeComponentOnEmptyHealth: 0 ignoreUseHealthAmountOnSpot: 0 + useCustomCharacterRadius: 0 + customCharacterRadius: 0 eventOnEmtpyHealthAmountOnSpot: m_PersistentCalls: m_Calls: [] healthAmountOnSpotEmpty: 0 damageMultiplier: 1 + applyForceOnThisObjectIfDetected: 0 character: {fileID: 1663168220468920} healthManager: {fileID: 114550132267047668} characterAssigned: 1 @@ -3637,9 +3937,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1532310689036366} 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.0000076293945} --- !u!114 &114084159066747856 @@ -3700,12 +4008,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1624526049183530} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.85099995, z: 0.2342} + m_LocalPosition: {x: 0, y: 0.68, z: 0.2342} m_LocalScale: {x: 2.7433796, y: 0.07345979, z: 1.0870454} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4866140454729386} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33729300215686674 MeshFilter: @@ -3726,10 +4035,17 @@ 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -3751,9 +4067,12 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &114383358077063298 MonoBehaviour: m_ObjectHideFlags: 0 @@ -3771,11 +4090,14 @@ MonoBehaviour: killCharacterOnEmtpyHealthAmountOnSpot: 0 removeComponentOnEmptyHealth: 0 ignoreUseHealthAmountOnSpot: 0 + useCustomCharacterRadius: 0 + customCharacterRadius: 0 eventOnEmtpyHealthAmountOnSpot: m_PersistentCalls: m_Calls: [] healthAmountOnSpotEmpty: 0 damageMultiplier: 1 + applyForceOnThisObjectIfDetected: 0 character: {fileID: 1663168220468920} healthManager: {fileID: 114550132267047668} characterAssigned: 1 @@ -3787,9 +4109,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1624526049183530} 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!114 &114390877824570894 @@ -3851,9 +4181,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1663168220468920} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0.57} + m_LocalPosition: {x: 0, y: -0.1, z: 0.57} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4131066757751852} - {fileID: 4072100696530188} @@ -3869,7 +4201,6 @@ Transform: - {fileID: 4163020812899960} - {fileID: 4325813057456868} m_Father: {fileID: 4098821557171210} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &114550132267047668 MonoBehaviour: @@ -3888,6 +4219,8 @@ MonoBehaviour: killCharacterOnEmtpyHealthAmountOnSpot: 0 removeComponentOnEmptyHealth: 0 ignoreUseHealthAmountOnSpot: 0 + useCustomCharacterRadius: 0 + customCharacterRadius: 0 eventOnEmtpyHealthAmountOnSpot: m_PersistentCalls: m_Calls: [] @@ -3951,6 +4284,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114049832647524112} + m_TargetAssemblyTypeName: m_MethodName: destroyObject m_Mode: 1 m_Arguments: @@ -4041,13 +4375,16 @@ MonoBehaviour: showSettings: 1 showAdvancedSettings: 0 showDamageDeadSettings: 0 + showDebugSettings: 0 resurrectAfterDelayEnabled: 0 resurrectDelay: 0 eventToResurrectAfterDelay: m_PersistentCalls: m_Calls: [] showDamageReceivedDebugInfo: 0 + damageReceiverList: [] customDamageReceiverList: [] + damageReceiverGameObjectList: [] useEventOnHealthValueList: 0 eventOnHealthValueList: [] useDamageTypeCheck: 0 @@ -4068,6 +4405,13 @@ MonoBehaviour: objectIsCharacter: 1 sendInfoToCharacterCustomizationOnDamageEnabled: 0 mainInventoryCharacterCustomizationSystem: {fileID: 0} + useEventOnDamageWithWeakSpotTransform: 0 + eventOnDamageWithWeakSpotTransform: + m_PersistentCalls: + m_Calls: [] + eventDamageTargetOverTimeDuration: + m_PersistentCalls: + m_Calls: [] mainDecalManagerName: Decal Manager impactDecalList: - Default Regular Shoot @@ -4093,6 +4437,7 @@ MonoBehaviour: currentID: 0 currentSedateDuration: 0 receiveDamageEvenDead: 0 + ignoreWeakSpotsActive: 0 damageTypeExplanation: 'Damage Resistance as 0 means the damage received doesn''t change, and value between 0 and 1 will decrease damage received, being 1 equal to total resistance, receiving 0 damage. @@ -4120,8 +4465,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: explosionEnabled: 1 - destroyedParticles: {fileID: 1103827689150644, guid: 3d4bde7b651aca042917975a0ef0ed61, - type: 3} + destroyedParticles: {fileID: 1103827689150644, guid: 3d4bde7b651aca042917975a0ef0ed61, type: 3} destroyedSound: {fileID: 8300000, guid: c676240cfaace5444beaba642f10397f, type: 3} destroyedAudioElement: audioPlayMethod: 1 @@ -4174,6 +4518,7 @@ MonoBehaviour: m_PersistentCalls: m_Calls: - m_Target: {fileID: 114741117512105712} + m_TargetAssemblyTypeName: m_MethodName: inputPlayCurrentAnimationWithoutCheckingIfExistsOnaDeviceList m_Mode: 1 m_Arguments: @@ -4185,6 +4530,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 65715360206581712} + m_TargetAssemblyTypeName: m_MethodName: set_enabled m_Mode: 6 m_Arguments: @@ -4196,6 +4542,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 65399979594218430} + m_TargetAssemblyTypeName: m_MethodName: set_enabled m_Mode: 6 m_Arguments: @@ -4207,6 +4554,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 114471934156660326} + m_TargetAssemblyTypeName: m_MethodName: removeDeviceFromListExternalCall m_Mode: 1 m_Arguments: @@ -4218,6 +4566,7 @@ MonoBehaviour: m_BoolArgument: 0 m_CallState: 2 - m_Target: {fileID: 135665531641970658} + m_TargetAssemblyTypeName: m_MethodName: set_enabled m_Mode: 6 m_Arguments: @@ -4249,6 +4598,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -4341,10 +4691,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1663168220468920} - serializedVersion: 2 + serializedVersion: 5 m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 + m_LinearDamping: 0 + m_AngularDamping: 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: 1 m_Interpolate: 0 @@ -4358,9 +4719,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1663168220468920} 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.2, y: 0.13329315, z: 1} m_Center: {x: 1.1368698e-15, y: 0.89121974, z: 0.33000004} --- !u!114 &114120249888279410 @@ -4392,7 +4761,16 @@ MonoBehaviour: - Pedestrian factionManager: {fileID: 0} factionManagerAssigned: 1 + ignoreCharacterFactionEnabled: 0 + removeAsTargetIfIgnoreCharacterFactionIsActivated: 0 mainManagerName: Faction System + useEventsOnIgnoreCharacterFactionStateChange: 0 + eventOnIgnoreCharacterFactionEnabled: + m_PersistentCalls: + m_Calls: [] + eventOnIgnoreCharacterFactionDisabled: + m_PersistentCalls: + m_Calls: [] --- !u!1 &1672090828168776 GameObject: m_ObjectHideFlags: 0 @@ -4421,12 +4799,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1672090828168776} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.2207, y: 1.2143999, z: 0.5830002} + m_LocalPosition: {x: -1.2207, y: 1.0434, z: 0.5830002} m_LocalScale: {x: 0.05599, y: 0.82769996, z: 0.38937998} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4866140454729386} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33166667689274834 MeshFilter: @@ -4447,10 +4826,17 @@ 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4472,9 +4858,12 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &114991430644534064 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4492,11 +4881,14 @@ MonoBehaviour: killCharacterOnEmtpyHealthAmountOnSpot: 0 removeComponentOnEmptyHealth: 0 ignoreUseHealthAmountOnSpot: 0 + useCustomCharacterRadius: 0 + customCharacterRadius: 0 eventOnEmtpyHealthAmountOnSpot: m_PersistentCalls: m_Calls: [] healthAmountOnSpotEmpty: 0 damageMultiplier: 1 + applyForceOnThisObjectIfDetected: 0 character: {fileID: 1663168220468920} healthManager: {fileID: 114550132267047668} characterAssigned: 1 @@ -4508,9 +4900,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1672090828168776} 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.9999999, y: 0.99999994, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &114447267884370452 @@ -4566,12 +4966,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1702339407045450} + serializedVersion: 2 m_LocalRotation: {x: 0.43048227, y: -0.2316134, z: 0.0775986, w: 0.8689181} - m_LocalPosition: {x: -0.088, y: 1.02, z: 0.713} + m_LocalPosition: {x: -0.088, y: 0.75, z: 0.713} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4098821557171210} - m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 51.633003, y: -32.741, z: -5.9700003} --- !u!1 &1707076235834574 GameObject: @@ -4596,12 +4997,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1707076235834574} + serializedVersion: 2 m_LocalRotation: {x: 0.24967813, y: -0.35942894, z: 0.10043556, w: 0.8935236} m_LocalPosition: {x: 1.36, y: 2.02, z: -0.406} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4748099726287100} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 31.224, y: -43.826, z: 0} --- !u!1 &1724954790485622 GameObject: @@ -4631,12 +5033,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1724954790485622} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -1.292, y: 0.41299996, z: 0.23099995} + m_LocalPosition: {x: -1.292, y: 0.44, z: 0.23099995} m_LocalScale: {x: 0.05599, y: 0.12732999, z: 0.81599} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4866140454729386} - m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33122780217368360 MeshFilter: @@ -4657,10 +5060,17 @@ 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4682,9 +5092,12 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &114830971439092790 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4702,11 +5115,14 @@ MonoBehaviour: killCharacterOnEmtpyHealthAmountOnSpot: 0 removeComponentOnEmptyHealth: 0 ignoreUseHealthAmountOnSpot: 0 + useCustomCharacterRadius: 0 + customCharacterRadius: 0 eventOnEmtpyHealthAmountOnSpot: m_PersistentCalls: m_Calls: [] healthAmountOnSpotEmpty: 0 damageMultiplier: 1 + applyForceOnThisObjectIfDetected: 0 character: {fileID: 1663168220468920} healthManager: {fileID: 114550132267047668} characterAssigned: 1 @@ -4718,9 +5134,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1724954790485622} 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.9999999, y: 0.99999994, z: 1} m_Center: {x: 0, y: 0, z: 0} --- !u!114 &114493286285142150 @@ -4776,12 +5200,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1726131195133674} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.199, z: -0.17} + m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4098821557171210} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1887247672176110 GameObject: @@ -4806,12 +5231,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1887247672176110} + 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: 4938986132950740} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1894776311737726 GameObject: @@ -4841,12 +5267,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1894776311737726} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1.5915, z: 0.5313} + m_LocalPosition: {x: 0, y: 1.4205, z: 0.5313} m_LocalScale: {x: 2.3999112, y: 0.073460005, z: 0.31501174} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4866140454729386} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33709547249320756 MeshFilter: @@ -4867,10 +5294,17 @@ 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -4892,9 +5326,12 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &114893853742104246 MonoBehaviour: m_ObjectHideFlags: 0 @@ -4912,11 +5349,14 @@ MonoBehaviour: killCharacterOnEmtpyHealthAmountOnSpot: 0 removeComponentOnEmptyHealth: 0 ignoreUseHealthAmountOnSpot: 0 + useCustomCharacterRadius: 0 + customCharacterRadius: 0 eventOnEmtpyHealthAmountOnSpot: m_PersistentCalls: m_Calls: [] healthAmountOnSpotEmpty: 0 damageMultiplier: 1 + applyForceOnThisObjectIfDetected: 0 character: {fileID: 1663168220468920} healthManager: {fileID: 114550132267047668} characterAssigned: 1 @@ -4928,9 +5368,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1894776311737726} 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!114 &114652511607039240 @@ -4987,13 +5435,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1902825213918366} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0.1, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: - {fileID: 4271392226803994} m_Father: {fileID: 4098821557171210} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &114009770413537174 MonoBehaviour: @@ -5031,10 +5480,22 @@ MonoBehaviour: setIgnoreCheckInputActiveState: 0 ignoreCheckInputActiveState: 0 multiAxesInputNameList: [] + setPauseAllInputActionsState: 0 + pauseAllInputActionState: 0 + setPauseMovementAxisInputState: 0 + pauseMovementAxisInputState: 0 + setPauseCameraAxisInputState: 0 + pauseCameraAxisInputState: 0 + setActionActiveState: 0 + actionActiveState: 0 + actionId: -1 + enableAnimatorLayerOnAction: 0 + animatorLayerToEnableName: drawWeapon: 0 drawCurrentWeapon: 0 drawCertainWeapon: 0 weaponNameToDraw: + isFireWeapon: 0 keepWeapon: 0 setCarryWeaponOnLowerPositionState: 0 carryWeaponOnLowerPositionState: 0 @@ -5103,6 +5564,7 @@ MonoBehaviour: currentPowerName: setCompassEnableValue: 0 compassEnabledValue: 0 + showDebugPrint: 0 useRemoteEventOnObjectsFound: 0 removeEventNameList: [] useEventOnTrigger: 0 @@ -5145,12 +5607,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1904349430303470} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.292, y: 0.41299996, z: 0.231} + m_LocalPosition: {x: 1.292, y: 0.44, z: 0.231} m_LocalScale: {x: 0.05599, y: 0.1273339, z: 0.81598526} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4866140454729386} - m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33523000888040222 MeshFilter: @@ -5171,10 +5634,17 @@ 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5196,9 +5666,12 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!114 &114767687912193240 MonoBehaviour: m_ObjectHideFlags: 0 @@ -5216,11 +5689,14 @@ MonoBehaviour: killCharacterOnEmtpyHealthAmountOnSpot: 0 removeComponentOnEmptyHealth: 0 ignoreUseHealthAmountOnSpot: 0 + useCustomCharacterRadius: 0 + customCharacterRadius: 0 eventOnEmtpyHealthAmountOnSpot: m_PersistentCalls: m_Calls: [] healthAmountOnSpotEmpty: 0 damageMultiplier: 1 + applyForceOnThisObjectIfDetected: 0 character: {fileID: 1663168220468920} healthManager: {fileID: 114550132267047668} characterAssigned: 1 @@ -5232,9 +5708,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1904349430303470} 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.9999999, y: 0.99999994, z: 1} m_Center: {x: -0.000015258789, y: 0, z: 0} --- !u!114 &114524852559128692 @@ -5290,12 +5774,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1909564164759388} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 1.78, z: 0} + m_LocalPosition: {x: 0, y: 1.905, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4052449020686904} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1921676266918464 GameObject: @@ -5320,12 +5805,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1921676266918464} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0, y: 0.80400085, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4938986132950740} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1927570437205666 GameObject: @@ -5350,12 +5836,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1927570437205666} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.41, z: -0.99} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4254039154812822} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1995164900387218 GameObject: @@ -5383,12 +5870,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1995164900387218} + serializedVersion: 2 m_LocalRotation: {x: -4.3297803e-17, y: 0.70710677, z: 0.7071069, w: -4.329781e-17} m_LocalPosition: {x: 0, y: -0, z: -0.7989993} m_LocalScale: {x: 0.5652831, y: 0.5652831, z: 0.5652831} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4387897460985248} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &33353901811806768 MeshFilter: @@ -5409,10 +5897,17 @@ MeshRenderer: m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_ForceMeshLod: -1 + m_MeshLodSelectionBias: 0 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -5437,9 +5932,12 @@ MeshRenderer: m_AutoUVMaxDistance: 0.5 m_AutoUVMaxAngle: 89 m_LightmapParameters: {fileID: 0} + m_GlobalIlluminationMeshLod: 0 m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 + m_MaskInteraction: 0 + m_AdditionalVertexStreams: {fileID: 0} --- !u!64 &64387118357827030 MeshCollider: m_ObjectHideFlags: 0 @@ -5448,9 +5946,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1995164900387218} 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: 4 + serializedVersion: 5 m_Convex: 1 m_CookingOptions: 30 m_Mesh: {fileID: 4300000, guid: 74e094b93bd44254c806a74c7759c7b2, type: 3} @@ -5477,10 +5983,11 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1999173668450866} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0.859, z: -0.036999702} + m_LocalPosition: {x: 0, y: 1, z: -0.036999702} m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4098821557171210} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity index 3bcd3bae..570358a5 100644 --- a/Assets/Scenes/SampleScene.unity +++ b/Assets/Scenes/SampleScene.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:4ebf4970b0251765f9bdfc2ac9eb9fbf0c1189faf3c7c4704de40349564792f7 -size 43403200 +oid sha256:e2e2ba4c3e81e5a0614568e37712497dff43ad0c82ea50aa0ffd84a962796768 +size 43402298 diff --git a/Assets/Scenes/SampleSceneMAMADO.unity b/Assets/Scenes/SampleSceneMAMADO.unity new file mode 100644 index 00000000..c2dd6c6c --- /dev/null +++ b/Assets/Scenes/SampleSceneMAMADO.unity @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:df18d4945b7866f09890c4f7bcc0208aecd7149bffc06514b3a7629f309cfec6 +size 43464711 diff --git a/Assets/Scenes/SampleSceneMAMADO.unity.meta b/Assets/Scenes/SampleSceneMAMADO.unity.meta new file mode 100644 index 00000000..f6addf64 --- /dev/null +++ b/Assets/Scenes/SampleSceneMAMADO.unity.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: e14cece0ceaaa4b46b49e0e5b0982463 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index 7435a007..50a2963b 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:bb00ab1890fbca45e950c24e2859979deb967cf055dac1644fb28109b85378e2 -size 22871 +oid sha256:83fab211e5c6eba77f66602401c5a2d0865f7bd3dbcea02e05c3d2a1a9e708fb +size 22937 diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset index 85b514c1..e1b67fb0 100644 --- a/ProjectSettings/GraphicsSettings.asset +++ b/ProjectSettings/GraphicsSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9c1bb28a2aac0fee9d3cfd844f6f345fe573f18d35a5c9fd3048b9e9a066c4df -size 2568 +oid sha256:6736f33dc62c35b0e7a88e275242080bc7a1d94c91154d18fceb332b661a6bce +size 2615 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 8f65470d..daec98ed 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:9d4de97e18d5ecb2fb76575e645581bc580fb70ed25094fad241dfc88f51ab80 -size 25375 +oid sha256:cfca63444f2acf76562eb93bd248a869072a229b68033bcadec7492dd84c62d6 +size 25448