diff --git a/FlufflParty/Assets/Prefabs/Stone3.prefab b/FlufflParty/Assets/Prefabs/Stone3.prefab new file mode 100644 index 0000000..afb0c78 --- /dev/null +++ b/FlufflParty/Assets/Prefabs/Stone3.prefab @@ -0,0 +1,85 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &7411630815264020247 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 7895010642910170541} + - component: {fileID: 6503037113688769032} + - component: {fileID: 9069012170805163714} + m_Layer: 0 + m_Name: Stone3 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7895010642910170541 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411630815264020247} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: 94.53672, y: -0.0000014305115, z: 98.64293} + m_LocalScale: {x: 2.7014074, y: 2.7014074, z: 2.7014074} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &6503037113688769032 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411630815264020247} + m_Mesh: {fileID: -5495902117074765545, guid: 2b79c81f6391f4287910e23f7a14fdfe, type: 3} +--- !u!23 &9069012170805163714 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7411630815264020247} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: e1f6f330ee5f749b3a6e73d41dc26b7e, 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/FlufflParty/Assets/Prefabs/Stone3.prefab.meta b/FlufflParty/Assets/Prefabs/Stone3.prefab.meta new file mode 100644 index 0000000..467638d --- /dev/null +++ b/FlufflParty/Assets/Prefabs/Stone3.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: da217b56c2d1ccf49807bbc0665d9cd6 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/FlufflParty/Assets/Scenes/Test.unity b/FlufflParty/Assets/Scenes/Test.unity index 711a81e..faf693b 100644 --- a/FlufflParty/Assets/Scenes/Test.unity +++ b/FlufflParty/Assets/Scenes/Test.unity @@ -234,6 +234,7 @@ Transform: - {fileID: 543450652356607697} - {fileID: 543450652542075647} - {fileID: 543450652401790489} + - {fileID: 543450652783907598} m_Father: {fileID: 0} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -663,6 +664,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 3718633661091795347, guid: 32834830c53dc024995f18a65060a2ce, type: 3} m_PrefabInstance: {fileID: 3751926070414562156} m_PrefabAsset: {fileID: 0} +--- !u!4 &543450652783907598 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7895010642910170541, guid: da217b56c2d1ccf49807bbc0665d9cd6, type: 3} + m_PrefabInstance: {fileID: 7645439968679386787} + m_PrefabAsset: {fileID: 0} --- !u!4 &543450652832208303 stripped Transform: m_CorrespondingSourceObject: {fileID: 4742520771331737143, guid: 376dfca8331131d4fb95f51b8e1b24d3, type: 3} @@ -1395,6 +1401,71 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 0cef3a16626a60b4dacfd9d0c8311962, type: 3} +--- !u!1001 &7645439968679386787 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 523664306} + m_Modifications: + - target: {fileID: 7411630815264020247, guid: da217b56c2d1ccf49807bbc0665d9cd6, type: 3} + propertyPath: m_Name + value: Stone3 + objectReference: {fileID: 0} + - target: {fileID: 7895010642910170541, guid: da217b56c2d1ccf49807bbc0665d9cd6, type: 3} + propertyPath: m_RootOrder + value: 17 + objectReference: {fileID: 0} + - target: {fileID: 7895010642910170541, guid: da217b56c2d1ccf49807bbc0665d9cd6, type: 3} + propertyPath: m_LocalScale.y + value: 2.7014072 + objectReference: {fileID: 0} + - target: {fileID: 7895010642910170541, guid: da217b56c2d1ccf49807bbc0665d9cd6, type: 3} + propertyPath: m_LocalScale.z + value: 2.7014072 + objectReference: {fileID: 0} + - target: {fileID: 7895010642910170541, guid: da217b56c2d1ccf49807bbc0665d9cd6, type: 3} + propertyPath: m_LocalPosition.x + value: -38.438942 + objectReference: {fileID: 0} + - target: {fileID: 7895010642910170541, guid: da217b56c2d1ccf49807bbc0665d9cd6, type: 3} + propertyPath: m_LocalPosition.y + value: 38.707916 + objectReference: {fileID: 0} + - target: {fileID: 7895010642910170541, guid: da217b56c2d1ccf49807bbc0665d9cd6, type: 3} + propertyPath: m_LocalPosition.z + value: 0.6539688 + objectReference: {fileID: 0} + - target: {fileID: 7895010642910170541, guid: da217b56c2d1ccf49807bbc0665d9cd6, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 7895010642910170541, guid: da217b56c2d1ccf49807bbc0665d9cd6, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 7895010642910170541, guid: da217b56c2d1ccf49807bbc0665d9cd6, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7895010642910170541, guid: da217b56c2d1ccf49807bbc0665d9cd6, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7895010642910170541, guid: da217b56c2d1ccf49807bbc0665d9cd6, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7895010642910170541, guid: da217b56c2d1ccf49807bbc0665d9cd6, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7895010642910170541, guid: da217b56c2d1ccf49807bbc0665d9cd6, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: da217b56c2d1ccf49807bbc0665d9cd6, type: 3} --- !u!1001 &7961456930032493886 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/FlufflParty/Packages/packages-lock.json b/FlufflParty/Packages/packages-lock.json index 5d1bd63..4c1c4b3 100644 --- a/FlufflParty/Packages/packages-lock.json +++ b/FlufflParty/Packages/packages-lock.json @@ -29,7 +29,7 @@ "source": "builtin", "dependencies": { "com.unity.ide.visualstudio": "2.0.16", - "com.unity.ide.rider": "3.0.16", + "com.unity.ide.rider": "3.0.15", "com.unity.ide.vscode": "1.2.5", "com.unity.editorcoroutines": "1.0.0", "com.unity.performance.profile-analyzer": "1.1.1", @@ -77,7 +77,7 @@ "url": "https://packages.unity.com" }, "com.unity.services.core": { - "version": "1.6.0", + "version": "1.4.2", "depth": 1, "source": "registry", "dependencies": {