diff --git a/Assets/AddressableAssetsData/AddressableAssetSettings.asset b/Assets/AddressableAssetsData/AddressableAssetSettings.asset index ba4ae5f3bf..dc5972c588 100644 --- a/Assets/AddressableAssetsData/AddressableAssetSettings.asset +++ b/Assets/AddressableAssetsData/AddressableAssetSettings.asset @@ -15,7 +15,7 @@ MonoBehaviour: m_DefaultGroup: 712e3991f28e549e7a56ee582a977810 m_currentHash: serializedVersion: 2 - Hash: 00000000000000000000000000000000 + Hash: 698660c3c48b589bc0c20b8b3d3ac808 m_OptimizeCatalogSize: 0 m_BuildRemoteCatalog: 0 m_CatalogRequestsTimeout: 0 diff --git a/Assets/ModelRenderer/Art/Models/litmodels/a69/1/litmodel_583.bmd.prefab b/Assets/ModelRenderer/Art/Models/litmodels/a69/1/litmodel_583.bmd.prefab index 9982fa5293..cfbcbd8707 100644 --- a/Assets/ModelRenderer/Art/Models/litmodels/a69/1/litmodel_583.bmd.prefab +++ b/Assets/ModelRenderer/Art/Models/litmodels/a69/1/litmodel_583.bmd.prefab @@ -233667,6 +233667,115 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 4300000, guid: 9fed79781664c6e469e935e043132946, type: 2} +--- !u!1 &6586940023321716763 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1210791429878766781} + - component: {fileID: 7270032709264720012} + - component: {fileID: 7584990625947292264} + - component: {fileID: 5341874281666882099} + m_Layer: 7 + m_Name: CDBrushCollider_manual + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &1210791429878766781 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6586940023321716763} + serializedVersion: 2 + m_LocalRotation: {x: 0.0006043525, y: 0.3921558, z: 0.0014176578, w: 0.9198976} + m_LocalPosition: {x: -34.7319, y: -0.4164, z: 8.2773} + m_LocalScale: {x: 0.6000385, y: 0.2, z: 0.5763422} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 3933275699089298967} + m_LocalEulerAnglesHint: {x: 0, y: 46.177, z: 0.177} +--- !u!33 &7270032709264720012 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6586940023321716763} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &7584990625947292264 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6586940023321716763} + m_Enabled: 0 + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &5341874281666882099 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6586940023321716763} + 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: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &6592305499762838772 GameObject: m_ObjectHideFlags: 0 @@ -260343,6 +260452,115 @@ MeshCollider: m_Convex: 0 m_CookingOptions: 30 m_Mesh: {fileID: 4300000, guid: 30f980bf38cdd4a4ba3aed39968a6285, type: 2} +--- !u!1 &7284856452043403912 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8170303164797302671} + - component: {fileID: 1826465331216551707} + - component: {fileID: 5280256036123453451} + - component: {fileID: 5945487842342404781} + m_Layer: 7 + m_Name: CDBrushCollider_manual + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &8170303164797302671 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7284856452043403912} + serializedVersion: 2 + m_LocalRotation: {x: 0.0006043525, y: 0.3921558, z: 0.0014176578, w: 0.9198976} + m_LocalPosition: {x: -43.4148, y: -0.2509, z: 16.965} + m_LocalScale: {x: 0.07737395, y: 0.2, z: 0.21483721} + m_ConstrainProportionsScale: 1 + m_Children: [] + m_Father: {fileID: 3933275699089298967} + m_LocalEulerAnglesHint: {x: 0, y: 46.177, z: 0.177} +--- !u!33 &1826465331216551707 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7284856452043403912} + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &5280256036123453451 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7284856452043403912} + m_Enabled: 0 + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 0} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!64 &5945487842342404781 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7284856452043403912} + 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: 5 + m_Convex: 0 + m_CookingOptions: 30 + m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &7292596470660697257 GameObject: m_ObjectHideFlags: 0 @@ -268009,6 +268227,8 @@ Transform: - {fileID: 7179973077962832035} - {fileID: 4258002181308756371} - {fileID: 2258272026985037979} + - {fileID: 8170303164797302671} + - {fileID: 1210791429878766781} m_Father: {fileID: 8970331013167171094} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &7410427085448345020 diff --git a/Assets/Scenes/a69.unity b/Assets/Scenes/a69.unity index 93224a0117..ab900e930e 100644 --- a/Assets/Scenes/a69.unity +++ b/Assets/Scenes/a69.unity @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2394b02b2b5e4c11d26aeff20e2feafd9dad25ca7c35af6ef2c779fcd9f9e98f -size 48539058 +oid sha256:61ee908f9be001ee1e4b477b887bd28593e393c0d918ecbff624f6c00a6e606a +size 48538698