From e55c26f5493d5e321a706a2dae7744535408f4c8 Mon Sep 17 00:00:00 2001 From: szczuras4 Date: Fri, 17 Jan 2025 04:23:45 +0100 Subject: [PATCH] temple poprawki --- .../Rocks_Bushes_Tree/Decals/Decal1.mat | 4 + .../Big_Fence_01Destructable.prefab | 208 ++++++++++++-- .../Prefabs/Destructable/Bone_destroy.prefab | 259 ++++++++++++++++-- Assets/Prefabs/Destructable/Branch.prefab | 4 +- .../Destructable/Destructable_Fance.prefab | 4 +- Assets/Prefabs/Destructable/Waza_01.prefab | 208 ++++++++++++-- Assets/Prefabs/Destructable/Waza_02.prefab | 206 ++++++++++++-- .../Scripts/Characters/Skills/MagicAttacks.cs | 2 +- 8 files changed, 783 insertions(+), 112 deletions(-) diff --git a/Assets/Meshes/Enviroment/Rocks_Bushes_Tree/Decals/Decal1.mat b/Assets/Meshes/Enviroment/Rocks_Bushes_Tree/Decals/Decal1.mat index bcd978d17..41a734214 100644 --- a/Assets/Meshes/Enviroment/Rocks_Bushes_Tree/Decals/Decal1.mat +++ b/Assets/Meshes/Enviroment/Rocks_Bushes_Tree/Decals/Decal1.mat @@ -9,6 +9,8 @@ Material: m_PrefabAsset: {fileID: 0} m_Name: Decal1 m_Shader: {fileID: 4800000, guid: 32ed75d04da1d2348baeac9738ccd729, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 m_ValidKeywords: - USE_ALPHA_POW - _BLENDMODE_BLEND @@ -19,6 +21,7 @@ Material: m_CustomRenderQueue: -1 stringTagMap: {} disabledShaderPasses: [] + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -117,3 +120,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _TintColor: {r: 0.38679248, g: 0.38679248, b: 0.38679248, a: 1} m_BuildTextureStacks: [] + m_AllowLocking: 1 diff --git a/Assets/Prefabs/Destructable/Big_Fence_01Destructable.prefab b/Assets/Prefabs/Destructable/Big_Fence_01Destructable.prefab index 8f23baab6..3711ff035 100644 --- a/Assets/Prefabs/Destructable/Big_Fence_01Destructable.prefab +++ b/Assets/Prefabs/Destructable/Big_Fence_01Destructable.prefab @@ -29,6 +29,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3447784579007228631} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 82.701, y: 31.191557, z: -133.12698} m_LocalScale: {x: 1, y: 1, z: 1} @@ -37,7 +38,6 @@ Transform: - {fileID: 1288687555657753451} - {fileID: 4779862128612594982} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!205 &1286467319166532512 LODGroup: @@ -108,6 +108,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -218,9 +219,12 @@ MonoBehaviour: m_onDestroy: m_PersistentCalls: m_Calls: [] - m_prefabToSpawn: [] + m_objectsToSpawn: [] + m_minObjectsToSpawn: 1 + m_maxObjectsToSpawn: 2 m_spawnPoint: {fileID: 0} explosiveDamage: 0 + randomPositionOffset: 0.2 points: 20 --- !u!65 &1189356011075214756 BoxCollider: @@ -230,9 +234,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3447784579007228631} 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.32, y: 3.17, z: 0.24} m_Center: {x: 0, y: 1.66, z: 0} --- !u!114 &8104047519574044133 @@ -307,8 +319,8 @@ MonoBehaviour: m_outlineable: {fileID: 0} m_useFresnel: 1 m_fresnelColor: {r: 1, g: 0.08701121, b: 0, a: 1} - m_fresnelPower: 4.5 - m_fresnelIntensity: 0.96 + m_fresnelPower: 5 + m_fresnelIntensity: 0.8 --- !u!1 &3678491003220926235 GameObject: m_ObjectHideFlags: 0 @@ -337,13 +349,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3678491003220926235} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.00827673, y: -0.010184841, z: -0.5169782} m_LocalScale: {x: 0.88509, y: 0.88509, z: 0.88509} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4779862128612594982} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6775212608834818321 MeshFilter: @@ -370,6 +382,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -403,9 +418,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3678491003220926235} 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: 9186633843763367028, guid: 52f74eea725e7754aab933f591b72b8e, type: 3} @@ -416,10 +439,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3678491003220926235} - 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 @@ -466,13 +500,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3841345617680238497} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.004641199, y: 0.00725597, z: 1.1076744} m_LocalScale: {x: 0.88509, y: 0.88509, z: 0.88509} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4779862128612594982} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3983624060826095413 MeshFilter: @@ -499,6 +533,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -532,9 +569,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3841345617680238497} 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: -3292925553009838691, guid: 52f74eea725e7754aab933f591b72b8e, type: 3} @@ -545,10 +590,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3841345617680238497} - 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 @@ -595,13 +651,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6230641745315577334} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.0016607809, y: -0.0014857327, z: -1.1196187} m_LocalScale: {x: 0.88509, y: 0.88509, z: 0.88509} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4779862128612594982} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5362906563065656190 MeshFilter: @@ -628,6 +684,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -661,9 +720,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6230641745315577334} 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: 6056129483990473523, guid: 52f74eea725e7754aab933f591b72b8e, type: 3} @@ -674,10 +741,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6230641745315577334} - 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 @@ -724,13 +802,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6573502705769884789} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.0054853484, y: -0.01071002, z: -0.038855284} m_LocalScale: {x: 0.88509, y: 0.88509, z: 0.88509} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4779862128612594982} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6567012661371950235 MeshFilter: @@ -757,6 +835,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -790,9 +871,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6573502705769884789} 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: -3531946766418785785, guid: 52f74eea725e7754aab933f591b72b8e, type: 3} @@ -803,10 +892,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6573502705769884789} - 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 @@ -853,13 +953,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7074506023643562532} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.0037089873, y: -0.0034187017, z: 0.5009216} m_LocalScale: {x: 0.88509, y: 0.88509, z: 0.88509} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4779862128612594982} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1782177361954382768 MeshFilter: @@ -886,6 +986,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -919,9 +1022,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7074506023643562532} 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: -3996760141626369306, guid: 52f74eea725e7754aab933f591b72b8e, type: 3} @@ -932,10 +1043,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7074506023643562532} - 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 @@ -982,13 +1104,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8358866367211046515} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.077739924, y: -0.023740543, z: -0.029974364} m_LocalScale: {x: 0.88509, y: 0.88509, z: 0.88509} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 4779862128612594982} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &6741489674541734952 MeshFilter: @@ -1015,6 +1137,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1048,9 +1173,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8358866367211046515} 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: -8113768720884857512, guid: 52f74eea725e7754aab933f591b72b8e, type: 3} @@ -1061,10 +1194,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8358866367211046515} - 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 @@ -1106,6 +1250,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8795885458619755977} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068} m_LocalPosition: {x: 0.0218651, y: 1.532132, z: 0.0067819366} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1121,13 +1266,13 @@ Transform: - {fileID: 3960981495808518962} - {fileID: 2046396641068263311} m_Father: {fileID: 2635500106668568685} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &5355780014532826863 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4779862128612594982} m_Modifications: - target: {fileID: 663261415891005056, guid: b58328ce2e62fb04c94660492ce6881e, @@ -1231,6 +1376,9 @@ PrefabInstance: value: 30 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b58328ce2e62fb04c94660492ce6881e, type: 3} --- !u!4 &54319177893059541 stripped Transform: @@ -1243,6 +1391,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4779862128612594982} m_Modifications: - target: {fileID: 663261415891005056, guid: b58328ce2e62fb04c94660492ce6881e, @@ -1346,6 +1495,9 @@ PrefabInstance: value: 30 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b58328ce2e62fb04c94660492ce6881e, type: 3} --- !u!4 &2046396641068263311 stripped Transform: @@ -1358,6 +1510,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 2635500106668568685} m_Modifications: - target: {fileID: 7747793013743060622, guid: 88c34e0edc2eda24aaaf429a02447136, @@ -1426,6 +1579,9 @@ PrefabInstance: value: 30 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 88c34e0edc2eda24aaaf429a02447136, type: 3} --- !u!4 &1288687555657753451 stripped Transform: @@ -1444,6 +1600,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 4779862128612594982} m_Modifications: - target: {fileID: 663261415891005056, guid: b58328ce2e62fb04c94660492ce6881e, @@ -1547,6 +1704,9 @@ PrefabInstance: value: 30 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b58328ce2e62fb04c94660492ce6881e, type: 3} --- !u!4 &3960981495808518962 stripped Transform: diff --git a/Assets/Prefabs/Destructable/Bone_destroy.prefab b/Assets/Prefabs/Destructable/Bone_destroy.prefab index 71915c4b6..11382eb4e 100644 --- a/Assets/Prefabs/Destructable/Bone_destroy.prefab +++ b/Assets/Prefabs/Destructable/Bone_destroy.prefab @@ -31,6 +31,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 113995345928922439} + serializedVersion: 2 m_LocalRotation: {x: -0.18033546, y: -0, z: -0, w: 0.9836052} m_LocalPosition: {x: 64.53246, y: 32.31353, z: -131.85886} m_LocalScale: {x: 1.9002898, y: 1.9002899, z: 1.9002899} @@ -38,7 +39,6 @@ Transform: m_Children: - {fileID: 5695595536692416485} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2880627746867192896 MeshFilter: @@ -65,6 +65,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -140,6 +143,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -250,9 +254,12 @@ MonoBehaviour: m_onDestroy: m_PersistentCalls: m_Calls: [] - m_prefabToSpawn: [] + m_objectsToSpawn: [] + m_minObjectsToSpawn: 1 + m_maxObjectsToSpawn: 2 m_spawnPoint: {fileID: 0} explosiveDamage: 0 + randomPositionOffset: 0.2 points: 20 --- !u!114 &1210636750136179656 MonoBehaviour: @@ -326,8 +333,8 @@ MonoBehaviour: m_outlineable: {fileID: 0} m_useFresnel: 1 m_fresnelColor: {r: 1, g: 0.08701121, b: 0, a: 1} - m_fresnelPower: 4.5 - m_fresnelIntensity: 0.96 + m_fresnelPower: 5 + m_fresnelIntensity: 0.8 --- !u!205 &2332118799455905830 LODGroup: m_ObjectHideFlags: 0 @@ -355,9 +362,17 @@ BoxCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 113995345928922439} 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.2197693, y: 1.3671484, z: 0.24} m_Center: {x: 0.040753786, y: 0.004492164, z: 0.008383632} --- !u!1 &610647371170377173 @@ -387,13 +402,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 610647371170377173} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0.03935492, y: 0.015794253, z: -0.0020013428} m_LocalScale: {x: 0.91161, y: 0.91161, z: 0.91161} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5695595536692416485} - m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7789875638856714430 MeshFilter: @@ -420,6 +435,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -453,9 +471,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 610647371170377173} 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: 7733717212360752527, guid: 414ba09b2e40fda4cb6949da12a6a3b9, type: 3} @@ -466,10 +492,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 610647371170377173} - 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 @@ -502,13 +539,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1034985964556712504} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0.03935492, y: 0.015794259, z: 0.022749461} m_LocalScale: {x: 0.91161, y: 0.91161, z: 0.91161} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5695595536692416485} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &7417179592978445935 MeshFilter: @@ -535,6 +572,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -568,9 +608,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1034985964556712504} 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: -3531946766418785785, guid: 414ba09b2e40fda4cb6949da12a6a3b9, type: 3} @@ -581,10 +629,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1034985964556712504} - 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 @@ -617,13 +676,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1568434344245111620} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0.03935492, y: 0.015794259, z: 0.022749461} m_LocalScale: {x: 0.91161, y: 0.91161, z: 0.91161} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5695595536692416485} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &236543725994258761 MeshFilter: @@ -650,6 +709,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -683,9 +745,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1568434344245111620} 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: -8113768720884857512, guid: 414ba09b2e40fda4cb6949da12a6a3b9, type: 3} @@ -696,10 +766,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1568434344245111620} - 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 @@ -728,6 +809,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2332271367536538805} + serializedVersion: 2 m_LocalRotation: {x: 0.7071069, y: -0, z: -0, w: 0.70710677} m_LocalPosition: {x: 0.039352972, y: 0.022750273, z: -0.015795667} m_LocalScale: {x: 1, y: 1, z: 1} @@ -744,7 +826,6 @@ Transform: - {fileID: 4645656744714393166} - {fileID: 7101736942091961812} m_Father: {fileID: 849785742542621573} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3315875387358500014 GameObject: @@ -773,13 +854,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3315875387358500014} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0.03935492, y: 0.015794259, z: 0.022749461} m_LocalScale: {x: 0.91161, y: 0.91161, z: 0.91161} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5695595536692416485} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2010286005715543735 MeshFilter: @@ -806,6 +887,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -839,9 +923,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3315875387358500014} 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: 9186633843763367028, guid: 414ba09b2e40fda4cb6949da12a6a3b9, type: 3} @@ -852,10 +944,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3315875387358500014} - 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 @@ -888,13 +991,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3921097021315202351} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0.03935492, y: 0.015794259, z: 0.025829276} m_LocalScale: {x: 0.91161, y: 0.91161, z: 0.91161} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5695595536692416485} - m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3413656194279407646 MeshFilter: @@ -921,6 +1024,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -954,9 +1060,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3921097021315202351} 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: -7233672229889999445, guid: 414ba09b2e40fda4cb6949da12a6a3b9, type: 3} @@ -967,10 +1081,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3921097021315202351} - 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 @@ -1003,13 +1128,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5842150382476211665} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0.03935492, y: 0.015794259, z: 0.022749461} m_LocalScale: {x: 0.91161, y: 0.91161, z: 0.91161} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5695595536692416485} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &1986067721456243939 MeshFilter: @@ -1036,6 +1161,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1069,9 +1197,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5842150382476211665} 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: -3996760141626369306, guid: 414ba09b2e40fda4cb6949da12a6a3b9, type: 3} @@ -1082,10 +1218,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5842150382476211665} - 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 @@ -1118,13 +1265,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7199264577886986589} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0.03935492, y: 0.015794247, z: -0.043014906} m_LocalScale: {x: 0.91161, y: 0.91161, z: 0.91161} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5695595536692416485} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8943956770959178776 MeshFilter: @@ -1151,6 +1298,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1184,9 +1334,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7199264577886986589} 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: -3292925553009838691, guid: 414ba09b2e40fda4cb6949da12a6a3b9, type: 3} @@ -1197,10 +1355,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7199264577886986589} - 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 @@ -1233,13 +1402,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8539761407947681962} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071067} m_LocalPosition: {x: -0.03935492, y: 0.015794259, z: 0.022749461} m_LocalScale: {x: 0.91161, y: 0.91161, z: 0.91161} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 5695595536692416485} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &5183725737337257305 MeshFilter: @@ -1266,6 +1435,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1299,9 +1471,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8539761407947681962} 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: -2639241166356525208, guid: 414ba09b2e40fda4cb6949da12a6a3b9, type: 3} @@ -1312,10 +1492,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8539761407947681962} - 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 @@ -1326,6 +1517,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5695595536692416485} m_Modifications: - target: {fileID: 663261415891005056, guid: b58328ce2e62fb04c94660492ce6881e, @@ -1429,6 +1621,9 @@ PrefabInstance: value: 30 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b58328ce2e62fb04c94660492ce6881e, type: 3} --- !u!4 &4645656744714393166 stripped Transform: @@ -1441,6 +1636,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 5695595536692416485} m_Modifications: - target: {fileID: 663261415891005056, guid: b58328ce2e62fb04c94660492ce6881e, @@ -1544,6 +1740,9 @@ PrefabInstance: value: 30 objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b58328ce2e62fb04c94660492ce6881e, type: 3} --- !u!4 &7101736942091961812 stripped Transform: diff --git a/Assets/Prefabs/Destructable/Branch.prefab b/Assets/Prefabs/Destructable/Branch.prefab index 568c77178..3736b4f41 100644 --- a/Assets/Prefabs/Destructable/Branch.prefab +++ b/Assets/Prefabs/Destructable/Branch.prefab @@ -1260,8 +1260,8 @@ MonoBehaviour: m_outlineable: {fileID: 0} m_useFresnel: 1 m_fresnelColor: {r: 1, g: 0.08701121, b: 0, a: 1} - m_fresnelPower: 4.5 - m_fresnelIntensity: 0.96 + m_fresnelPower: 5 + m_fresnelIntensity: 0.8 --- !u!1 &4956436598580466722 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Destructable/Destructable_Fance.prefab b/Assets/Prefabs/Destructable/Destructable_Fance.prefab index 5662a3b80..a0e850784 100644 --- a/Assets/Prefabs/Destructable/Destructable_Fance.prefab +++ b/Assets/Prefabs/Destructable/Destructable_Fance.prefab @@ -1293,8 +1293,8 @@ MonoBehaviour: m_outlineable: {fileID: 0} m_useFresnel: 1 m_fresnelColor: {r: 1, g: 0.12787402, b: 0, a: 1} - m_fresnelPower: 3.36 - m_fresnelIntensity: 4.41 + m_fresnelPower: 9 + m_fresnelIntensity: 0.8 --- !u!1 &5146103812877952212 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Destructable/Waza_01.prefab b/Assets/Prefabs/Destructable/Waza_01.prefab index 58542c9eb..82c2fb14d 100644 --- a/Assets/Prefabs/Destructable/Waza_01.prefab +++ b/Assets/Prefabs/Destructable/Waza_01.prefab @@ -27,13 +27,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 220094718683552219} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.00085783354, y: 0.01045, z: 0.00059} m_LocalScale: {x: 0.82297415, y: 0.82297415, z: 0.82297415} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 798281847712412660} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3510786272130610023 MeshFilter: @@ -60,6 +60,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -92,10 +95,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 220094718683552219} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 15 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 @@ -109,9 +123,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 220094718683552219} 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: -3531946766418785785, guid: e7a084e2d885c6349a551cf2134674c5, type: 3} @@ -140,13 +162,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 355146642654708966} + 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: 2262596716444377170} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2849675381177224704 MeshFilter: @@ -173,6 +195,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -221,13 +246,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1100818988036480366} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.00396, z: -0.00033} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2262596716444377170} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1423440822974256767 GameObject: @@ -256,13 +281,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1423440822974256767} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.00085783354, y: 0.01051, z: 0.00093} m_LocalScale: {x: 0.90277, y: 0.90277, z: 0.90277} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 798281847712412660} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4426440339928754652 MeshFilter: @@ -289,6 +314,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -321,10 +349,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1423440822974256767} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 15 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 @@ -338,9 +377,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1423440822974256767} 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: -2639241166356525208, guid: e7a084e2d885c6349a551cf2134674c5, type: 3} @@ -371,13 +418,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2176900995886641230} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.00075, y: 0.01063, z: 0.00107} m_LocalScale: {x: 0.8469156, y: 0.8469156, z: 0.8469156} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 798281847712412660} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8046073958838331792 MeshFilter: @@ -404,6 +451,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -436,10 +486,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2176900995886641230} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 15 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 @@ -453,9 +514,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2176900995886641230} 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: -8113768720884857512, guid: e7a084e2d885c6349a551cf2134674c5, type: 3} @@ -482,13 +551,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2954032740982582652} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: -0.00739, z: 0.00044} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 2262596716444377170} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &3820391303596961394 GameObject: @@ -521,6 +590,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3820391303596961394} + serializedVersion: 2 m_LocalRotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} m_LocalPosition: {x: 0.085783355, y: 1.0899345, z: 0.10740161} m_LocalScale: {x: 100, y: 100, z: 100} @@ -531,7 +601,6 @@ Transform: - {fileID: 1796112534854960273} - {fileID: 371585142213583375} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8254761279621271860 MeshFilter: @@ -558,6 +627,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -633,6 +705,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -743,10 +816,12 @@ MonoBehaviour: m_onDestroy: m_PersistentCalls: m_Calls: [] - m_prefabToSpawn: - - {fileID: 0} + m_objectsToSpawn: [] + m_minObjectsToSpawn: 1 + m_maxObjectsToSpawn: 2 m_spawnPoint: {fileID: 0} explosiveDamage: 0 + randomPositionOffset: 0.2 points: 20 --- !u!205 &7408155521873121981 LODGroup: @@ -779,8 +854,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3820391303596961394} 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.005545454 m_Height: 0.02 m_Direction: 1 @@ -857,8 +941,8 @@ MonoBehaviour: m_outlineable: {fileID: 0} m_useFresnel: 1 m_fresnelColor: {r: 1, g: 0.08701121, b: 0, a: 1} - m_fresnelPower: 4.5 - m_fresnelIntensity: 0.96 + m_fresnelPower: 6 + m_fresnelIntensity: 0.7 --- !u!1 &4492985104737527274 GameObject: m_ObjectHideFlags: 0 @@ -886,13 +970,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4492985104737527274} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.00085783354, y: 0.01099, z: 0.00173} m_LocalScale: {x: 0.8469156, y: 0.8469156, z: 0.8469156} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 798281847712412660} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3432279532323349536 MeshFilter: @@ -919,6 +1003,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -951,10 +1038,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4492985104737527274} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 20 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 @@ -968,9 +1066,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4492985104737527274} 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: -3996760141626369306, guid: e7a084e2d885c6349a551cf2134674c5, type: 3} @@ -1001,13 +1107,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4795187164313046671} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.00085783354, y: 0.010899344, z: 0.0010740142} m_LocalScale: {x: 0.8469156, y: 0.8469156, z: 0.8469156} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 798281847712412660} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3533976247363904992 MeshFilter: @@ -1034,6 +1140,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1066,10 +1175,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4795187164313046671} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 25 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 @@ -1083,9 +1203,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4795187164313046671} 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: -3292925553009838691, guid: e7a084e2d885c6349a551cf2134674c5, type: 3} @@ -1113,6 +1241,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6606927156276975810} + serializedVersion: 2 m_LocalRotation: {x: 0.000000059604645, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.00085783354, y: -0.010899344, z: -0.0010740156} m_LocalScale: {x: 1, y: 1, z: 1} @@ -1126,7 +1255,6 @@ Transform: - {fileID: 9077010856036387792} - {fileID: 6127424812556836174} m_Father: {fileID: 2262596716444377170} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &852956575460951 MonoBehaviour: @@ -1168,13 +1296,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8467206101601175998} + serializedVersion: 2 m_LocalRotation: {x: 0, y: -0, z: -0, w: 1} m_LocalPosition: {x: 0.00085783354, y: 0.01004, z: 0.00169} m_LocalScale: {x: 0.7112654, y: 0.7112654, z: 0.7112654} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 798281847712412660} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8858201840784732138 MeshFilter: @@ -1201,6 +1329,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1233,10 +1364,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8467206101601175998} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 15 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 @@ -1250,9 +1392,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 8467206101601175998} 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: 9186633843763367028, guid: e7a084e2d885c6349a551cf2134674c5, type: 3} @@ -1261,6 +1411,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 798281847712412660} m_Modifications: - target: {fileID: 8003189668629253066, guid: dc9826035382b8b48895ff1f6b217970, @@ -1324,6 +1475,9 @@ PrefabInstance: value: Vase_Hit objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dc9826035382b8b48895ff1f6b217970, type: 3} --- !u!4 &6127424812556836174 stripped Transform: diff --git a/Assets/Prefabs/Destructable/Waza_02.prefab b/Assets/Prefabs/Destructable/Waza_02.prefab index f7bf9dce4..b2aef0505 100644 --- a/Assets/Prefabs/Destructable/Waza_02.prefab +++ b/Assets/Prefabs/Destructable/Waza_02.prefab @@ -27,13 +27,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1551377069079257951} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.0008, y: 0.00816, z: 0.00035} m_LocalScale: {x: 0.6347583, y: 0.6347583, z: 0.6347583} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 645663268883639595} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &2208736632239985401 MeshFilter: @@ -60,6 +60,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -92,10 +95,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1551377069079257951} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 20 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 @@ -109,9 +123,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1551377069079257951} 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: 7733717212360752527, guid: 3606261d170581d4685b3a412216c0ac, type: 3} @@ -142,13 +164,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1946820341044187413} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: -0.0004, y: 0.00327, z: -0.00324} m_LocalScale: {x: 0.8716385, y: 0.8716385, z: 0.8716385} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 645663268883639595} - m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &3650945586847996792 MeshFilter: @@ -175,6 +197,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -207,10 +232,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1946820341044187413} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 20 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 @@ -224,9 +260,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1946820341044187413} 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: 7643229109163234770, guid: 3606261d170581d4685b3a412216c0ac, type: 3} @@ -257,13 +301,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2148385792599906729} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.00193, y: 0.00227, z: 0.00077} m_LocalScale: {x: 0.7460892, y: 0.7460892, z: 0.7460892} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 645663268883639595} - m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4517430649159070273 MeshFilter: @@ -290,6 +334,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -322,10 +369,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2148385792599906729} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 20 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 @@ -339,9 +397,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2148385792599906729} 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: -1141464603633071787, guid: 3606261d170581d4685b3a412216c0ac, type: 3} @@ -369,6 +435,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 3508835368572392900} + serializedVersion: 2 m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} m_LocalPosition: {x: -0.0002035999, y: -0.00011133795, z: 0.00041836262} m_LocalScale: {x: 1, y: 1, z: 1} @@ -382,7 +449,6 @@ Transform: - {fileID: 5241637593182441952} - {fileID: 4831588593538309069} m_Father: {fileID: 3812514311365945268} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &807050271720412338 MonoBehaviour: @@ -424,13 +490,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4391810172289339403} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: 0.00042817503, y: 0.0052586, z: -0.0008923781} m_LocalScale: {x: 0.94697, y: 0.94697, z: 0.94697} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 645663268883639595} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &4780107964385834837 MeshFilter: @@ -457,6 +523,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -489,10 +558,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4391810172289339403} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 20 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 @@ -506,9 +586,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4391810172289339403} 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: 4944557015945844418, guid: 3606261d170581d4685b3a412216c0ac, type: 3} @@ -537,13 +625,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 4689490090087324493} + 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: 3812514311365945268} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8059227499980393873 MeshFilter: @@ -570,6 +658,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -626,6 +717,7 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5254009056838689948} + serializedVersion: 2 m_LocalRotation: {x: 0.000000021855694, y: 0, z: -0, w: 1} m_LocalPosition: {x: 0.0071499995, y: 0.011133797, z: -0.00648} m_LocalScale: {x: 100, y: 100, z: 100} @@ -635,7 +727,6 @@ Transform: - {fileID: 645663268883639595} - {fileID: 7084448433959302782} m_Father: {fileID: 0} - m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &89737987090276760 MeshFilter: @@ -662,6 +753,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -737,6 +831,7 @@ AudioSource: serializedVersion: 4 OutputAudioMixerGroup: {fileID: 0} m_audioClip: {fileID: 0} + m_Resource: {fileID: 0} m_PlayOnAwake: 1 m_Volume: 1 m_Pitch: 1 @@ -847,10 +942,12 @@ MonoBehaviour: m_onDestroy: m_PersistentCalls: m_Calls: [] - m_prefabToSpawn: - - {fileID: 0} + m_objectsToSpawn: [] + m_minObjectsToSpawn: 1 + m_maxObjectsToSpawn: 2 m_spawnPoint: {fileID: 0} explosiveDamage: 0 + randomPositionOffset: 0.2 points: 20 --- !u!136 &4938635724793255131 CapsuleCollider: @@ -860,8 +957,17 @@ CapsuleCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 5254009056838689948} 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.004103983 m_Height: 0.010498463 m_Direction: 1 @@ -961,8 +1067,8 @@ MonoBehaviour: m_outlineable: {fileID: 0} m_useFresnel: 1 m_fresnelColor: {r: 1, g: 0.08701121, b: 0, a: 1} - m_fresnelPower: 4.5 - m_fresnelIntensity: 0.96 + m_fresnelPower: 6 + m_fresnelIntensity: 0.7 --- !u!1 &6339015204979323206 GameObject: m_ObjectHideFlags: 0 @@ -990,13 +1096,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6339015204979323206} + serializedVersion: 2 m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068} m_LocalPosition: {x: -0.00079, y: -0.00005, z: -0.00014} m_LocalScale: {x: 0.8022996, y: 0.8022996, z: 0.8022996} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 645663268883639595} - m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!33 &8196561728293409777 MeshFilter: @@ -1023,6 +1129,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1055,10 +1164,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6339015204979323206} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 20 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 @@ -1072,9 +1192,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6339015204979323206} 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: -3243264717552843444, guid: 3606261d170581d4685b3a412216c0ac, type: 3} @@ -1101,13 +1229,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6426150571428665918} + serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0.00274, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 3812514311365945268} - m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7126712245566398749 GameObject: @@ -1136,13 +1264,13 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7126712245566398749} + serializedVersion: 2 m_LocalRotation: {x: -0.72643656, y: -0.101996526, z: -0.024758168, w: 0.6791714} m_LocalPosition: {x: 0.00039, y: 0.00805, z: -0.0035} m_LocalScale: {x: 0.7126044, y: 0.7126044, z: 0.7126044} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 645663268883639595} - m_RootOrder: 1 m_LocalEulerAnglesHint: {x: -97.342, y: 53.383003, z: -63.688995} --- !u!33 &1527010277194416425 MeshFilter: @@ -1169,6 +1297,9 @@ MeshRenderer: m_ReflectionProbeUsage: 1 m_RayTracingMode: 2 m_RayTraceProcedural: 0 + m_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -1201,10 +1332,21 @@ Rigidbody: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7126712245566398749} - serializedVersion: 2 + serializedVersion: 4 m_Mass: 20 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 @@ -1218,9 +1360,17 @@ MeshCollider: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 7126712245566398749} 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: -7647463442239531939, guid: 3606261d170581d4685b3a412216c0ac, type: 3} @@ -1229,6 +1379,7 @@ PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 m_Modification: + serializedVersion: 3 m_TransformParent: {fileID: 645663268883639595} m_Modifications: - target: {fileID: 8003189668629253066, guid: dc9826035382b8b48895ff1f6b217970, @@ -1292,6 +1443,9 @@ PrefabInstance: value: Vase_Hit objectReference: {fileID: 0} m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: dc9826035382b8b48895ff1f6b217970, type: 3} --- !u!4 &4831588593538309069 stripped Transform: diff --git a/Assets/Scripts/Characters/Skills/MagicAttacks.cs b/Assets/Scripts/Characters/Skills/MagicAttacks.cs index 78c6c947d..8f8657e4b 100644 --- a/Assets/Scripts/Characters/Skills/MagicAttacks.cs +++ b/Assets/Scripts/Characters/Skills/MagicAttacks.cs @@ -131,7 +131,7 @@ namespace Beyond canPlayNoFaithClip = true; canPlayCantDoClip = true; } - + [Button] private void OnSilentPeek() { StopCoroutine(SilentPeekCoroutine());