diff --git a/BlueWater/Assets/01.Scenes/99.Combat 1.unity b/BlueWater/Assets/01.Scenes/99.Combat 1.unity index 33822c2e9..2aa4d0824 100644 --- a/BlueWater/Assets/01.Scenes/99.Combat 1.unity +++ b/BlueWater/Assets/01.Scenes/99.Combat 1.unity @@ -104658,91 +104658,12 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 404768292} m_Mesh: {fileID: -8777729219171558242, guid: b225c68b5babe134ca8800ee66a1d34d, type: 3} ---- !u!1 &404806149 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 404806150} - - component: {fileID: 404806152} - - component: {fileID: 404806151} - m_Layer: 0 - m_Name: grass01combat (51) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &404806150 +--- !u!4 &404806150 stripped Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 3686956693335950422, guid: ca573c7500c548245b02e0be78d0161e, + type: 3} + m_PrefabInstance: {fileID: 3907472181421312478} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 404806149} - serializedVersion: 2 - m_LocalRotation: {x: 0.42261827, y: 0, z: 0, w: 0.9063079} - m_LocalPosition: {x: 147.77, y: 0.26, z: -19.47} - m_LocalScale: {x: 1.3242574, y: 1.3242574, z: 1.3242574} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 289528781} - m_LocalEulerAnglesHint: {x: 50, y: 0, z: 0} ---- !u!23 &404806151 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 404806149} - m_Enabled: 1 - m_CastShadows: 2 - 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_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: ae59b5d081c68cc4f99c523379d09480, type: 2} - 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!33 &404806152 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 404806149} - m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &405345820 GameObject: m_ObjectHideFlags: 0 @@ -269264,6 +269185,7 @@ MonoBehaviour: m_EditorClassIdentifier: autoInit: 1 k__BackingField: {fileID: 1033584369} + k__BackingField: {fileID: 0} k__BackingField: {fileID: 0} k__BackingField: {fileID: 0} --- !u!114 &1033584366 @@ -565856,6 +565778,74 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 9100839479795134332} m_Mesh: {fileID: -4703140083492605113, guid: f9b087f7b30ab154e88281ae9356c75f, type: 3} +--- !u!1001 &3907472181421312478 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 289528781} + m_Modifications: + - target: {fileID: 90215774437655549, guid: ca573c7500c548245b02e0be78d0161e, + type: 3} + propertyPath: m_Name + value: grass01combat (51) + objectReference: {fileID: 0} + - target: {fileID: 3686956693335950422, guid: ca573c7500c548245b02e0be78d0161e, + type: 3} + propertyPath: m_LocalPosition.x + value: 147.77 + objectReference: {fileID: 0} + - target: {fileID: 3686956693335950422, guid: ca573c7500c548245b02e0be78d0161e, + type: 3} + propertyPath: m_LocalPosition.y + value: 0.26 + objectReference: {fileID: 0} + - target: {fileID: 3686956693335950422, guid: ca573c7500c548245b02e0be78d0161e, + type: 3} + propertyPath: m_LocalPosition.z + value: -19.47 + objectReference: {fileID: 0} + - target: {fileID: 3686956693335950422, guid: ca573c7500c548245b02e0be78d0161e, + type: 3} + propertyPath: m_LocalRotation.w + value: 0.9063079 + objectReference: {fileID: 0} + - target: {fileID: 3686956693335950422, guid: ca573c7500c548245b02e0be78d0161e, + type: 3} + propertyPath: m_LocalRotation.x + value: 0.42261827 + objectReference: {fileID: 0} + - target: {fileID: 3686956693335950422, guid: ca573c7500c548245b02e0be78d0161e, + type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3686956693335950422, guid: ca573c7500c548245b02e0be78d0161e, + type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3686956693335950422, guid: ca573c7500c548245b02e0be78d0161e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 50 + objectReference: {fileID: 0} + - target: {fileID: 3686956693335950422, guid: ca573c7500c548245b02e0be78d0161e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3686956693335950422, guid: ca573c7500c548245b02e0be78d0161e, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: ca573c7500c548245b02e0be78d0161e, type: 3} --- !u!33 &3984785304303468150 MeshFilter: m_ObjectHideFlags: 0 diff --git a/BlueWater/Assets/05.Prefabs/Props/DestructibleObjects/grass01combat (51).prefab b/BlueWater/Assets/05.Prefabs/Props/DestructibleObjects/grass01combat (51).prefab new file mode 100644 index 000000000..3de83b50c --- /dev/null +++ b/BlueWater/Assets/05.Prefabs/Props/DestructibleObjects/grass01combat (51).prefab @@ -0,0 +1,87 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &90215774437655549 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3686956693335950422} + - component: {fileID: 962135491071568604} + - component: {fileID: 5570207510886911155} + m_Layer: 0 + m_Name: grass01combat (51) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3686956693335950422 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 90215774437655549} + serializedVersion: 2 + m_LocalRotation: {x: 0.42261827, y: 0, z: 0, w: 0.9063079} + m_LocalPosition: {x: 147.77, y: 0.26, z: -19.47} + m_LocalScale: {x: 1.3242574, y: 1.3242574, z: 1.3242574} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 50, y: 0, z: 0} +--- !u!33 &962135491071568604 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 90215774437655549} + m_Mesh: {fileID: 10210, guid: 0000000000000000e000000000000000, type: 0} +--- !u!23 &5570207510886911155 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 90215774437655549} + m_Enabled: 1 + m_CastShadows: 2 + 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_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: ae59b5d081c68cc4f99c523379d09480, type: 2} + 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} diff --git a/BlueWater/Assets/05.Prefabs/Props/DestructibleObjects/grass01combat (51).prefab.meta b/BlueWater/Assets/05.Prefabs/Props/DestructibleObjects/grass01combat (51).prefab.meta new file mode 100644 index 000000000..17c66479b --- /dev/null +++ b/BlueWater/Assets/05.Prefabs/Props/DestructibleObjects/grass01combat (51).prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: ca573c7500c548245b02e0be78d0161e +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: