diff --git a/FlufflParty/Assets/BlenderFiles/ItemShop.blend1 b/FlufflParty/Assets/BlenderFiles/ItemShop.blend1 deleted file mode 100644 index 41c1954..0000000 Binary files a/FlufflParty/Assets/BlenderFiles/ItemShop.blend1 and /dev/null differ diff --git a/FlufflParty/Assets/BlenderFiles/Wheel.blend1 b/FlufflParty/Assets/BlenderFiles/Wheel.blend1 deleted file mode 100644 index 78799b7..0000000 Binary files a/FlufflParty/Assets/BlenderFiles/Wheel.blend1 and /dev/null differ diff --git a/FlufflParty/Assets/Prefabs/Cactus_2_Var.prefab b/FlufflParty/Assets/Prefabs/Cactus_2_Var.prefab index 3c0f3d6..d5b4238 100644 --- a/FlufflParty/Assets/Prefabs/Cactus_2_Var.prefab +++ b/FlufflParty/Assets/Prefabs/Cactus_2_Var.prefab @@ -62,7 +62,7 @@ MeshRenderer: m_RendererPriority: 0 m_Materials: - {fileID: -8751555780163154282, guid: 0b3024a7408a8ff49a1cd409f255ea20, type: 3} - - {fileID: 6976859009215677814, guid: 0b3024a7408a8ff49a1cd409f255ea20, type: 3} + - {fileID: 2100000, guid: d3270dff332dec049ba137a752c1d23a, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/FlufflParty/Assets/Prefabs/Cactus_Var.prefab b/FlufflParty/Assets/Prefabs/Cactus_Var.prefab index 1b4c369..b60faef 100644 --- a/FlufflParty/Assets/Prefabs/Cactus_Var.prefab +++ b/FlufflParty/Assets/Prefabs/Cactus_Var.prefab @@ -62,7 +62,7 @@ MeshRenderer: m_RendererPriority: 0 m_Materials: - {fileID: -8751555780163154282, guid: 0a8b93d858c79b647bdb0a5bbeafa95b, type: 3} - - {fileID: 6976859009215677814, guid: 0a8b93d858c79b647bdb0a5bbeafa95b, type: 3} + - {fileID: 2100000, guid: 5c867c5199f9bf9498882e8cdb3ac9e5, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 diff --git a/FlufflParty/Assets/Prefabs/ItemShop.prefab b/FlufflParty/Assets/Prefabs/ItemShop.prefab new file mode 100644 index 0000000..03a9eae --- /dev/null +++ b/FlufflParty/Assets/Prefabs/ItemShop.prefab @@ -0,0 +1,87 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &2334377743296605406 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3111618577064916580} + - component: {fileID: 2054040593008097729} + - component: {fileID: 4279998822637767947} + m_Layer: 0 + m_Name: ItemShop + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &3111618577064916580 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2334377743296605406} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: 81.73033, y: -0.0000009536743, z: 93.598305} + m_LocalScale: {x: 0.5678226, y: 0.5678226, z: 0.5678226} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &2054040593008097729 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2334377743296605406} + m_Mesh: {fileID: -2124705421725058983, guid: 0288a70ce1a541d439971a352b0562d4, type: 3} +--- !u!23 &4279998822637767947 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2334377743296605406} + 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: -6478536213147159724, guid: 0288a70ce1a541d439971a352b0562d4, type: 3} + - {fileID: 4874126678125670354, guid: 0288a70ce1a541d439971a352b0562d4, type: 3} + - {fileID: -3846018093981099296, guid: 0288a70ce1a541d439971a352b0562d4, type: 3} + 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/BlenderFiles/ItemShop.blend1.meta b/FlufflParty/Assets/Prefabs/ItemShop.prefab.meta similarity index 63% rename from FlufflParty/Assets/BlenderFiles/ItemShop.blend1.meta rename to FlufflParty/Assets/Prefabs/ItemShop.prefab.meta index 0617c0a..e0df2ba 100644 --- a/FlufflParty/Assets/BlenderFiles/ItemShop.blend1.meta +++ b/FlufflParty/Assets/Prefabs/ItemShop.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 29d45a732c36fc747b792ad46319aa7f -DefaultImporter: +guid: 616c4d7a7df3216439e209b540a24966 +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/FlufflParty/Assets/Prefabs/Wheel.prefab b/FlufflParty/Assets/Prefabs/Wheel.prefab new file mode 100644 index 0000000..c232d97 --- /dev/null +++ b/FlufflParty/Assets/Prefabs/Wheel.prefab @@ -0,0 +1,86 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!1 &1150923422769072615 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 338674242174554973} + - component: {fileID: 3683080247062600952} + - component: {fileID: 1510987024230541362} + m_Layer: 0 + m_Name: Wheel + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &338674242174554973 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1150923422769072615} + m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071067} + m_LocalPosition: {x: 84.068245, y: -0.037, z: 94.656746} + m_LocalScale: {x: 0.5519277, y: 0.5519277, z: 0.5519277} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!33 &3683080247062600952 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1150923422769072615} + m_Mesh: {fileID: -2124705421725058983, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} +--- !u!23 &1510987024230541362 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1150923422769072615} + 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: 64cc093c1ce7db34da5385b3a1313b18, type: 2} + - {fileID: 2100000, guid: 726cdcd398ce6cb459dc589edfc170ba, 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/BlenderFiles/Wheel.blend1.meta b/FlufflParty/Assets/Prefabs/Wheel.prefab.meta similarity index 63% rename from FlufflParty/Assets/BlenderFiles/Wheel.blend1.meta rename to FlufflParty/Assets/Prefabs/Wheel.prefab.meta index d98bf91..a24d7ee 100644 --- a/FlufflParty/Assets/BlenderFiles/Wheel.blend1.meta +++ b/FlufflParty/Assets/Prefabs/Wheel.prefab.meta @@ -1,6 +1,6 @@ fileFormatVersion: 2 -guid: 7a7836e126053bf4680abcc2aba3ed06 -DefaultImporter: +guid: cdb1bd7ab88d1434e844c9dc45e1d63b +PrefabImporter: externalObjects: {} userData: assetBundleName: diff --git a/FlufflParty/Assets/Scenes/Test.unity b/FlufflParty/Assets/Scenes/Test.unity index 40e0b9f..53c81e1 100644 --- a/FlufflParty/Assets/Scenes/Test.unity +++ b/FlufflParty/Assets/Scenes/Test.unity @@ -229,8 +229,10 @@ Transform: - {fileID: 144725374} - {fileID: 543450651594602143} - {fileID: 1645278604} + - {fileID: 543450653509960921} + - {fileID: 543450652124513334} m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &705507993 GameObject: @@ -326,71 +328,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 30.973, y: 49.515, z: 103.288} ---- !u!1001 &1584096221 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: -8679921383154817045, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} - propertyPath: m_RootOrder - value: 1 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} - propertyPath: m_LocalPosition.x - value: 84.068245 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} - propertyPath: m_LocalPosition.y - value: -0.037 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} - propertyPath: m_LocalPosition.z - value: 94.656746 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071067 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} - propertyPath: m_LocalRotation.x - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: -7511558181221131132, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} - propertyPath: m_Materials.Array.data[0] - value: - objectReference: {fileID: 2100000, guid: 64cc093c1ce7db34da5385b3a1313b18, type: 2} - - target: {fileID: -7511558181221131132, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} - propertyPath: m_Materials.Array.data[1] - value: - objectReference: {fileID: 2100000, guid: 726cdcd398ce6cb459dc589edfc170ba, type: 2} - - target: {fileID: 919132149155446097, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} - propertyPath: m_Name - value: Wheel - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 02bdfdc88d4cfc04fa3afceeb7102737, type: 3} --- !u!1 &1607968977 GameObject: m_ObjectHideFlags: 0 @@ -473,7 +410,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 24.531, y: 0, z: 0} --- !u!1001 &1645278603 PrefabInstance: @@ -621,8 +558,73 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &232374158623086443 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 523664306} + m_Modifications: + - target: {fileID: 338674242174554973, guid: cdb1bd7ab88d1434e844c9dc45e1d63b, type: 3} + propertyPath: m_RootOrder + value: 13 + objectReference: {fileID: 0} + - target: {fileID: 338674242174554973, guid: cdb1bd7ab88d1434e844c9dc45e1d63b, type: 3} + propertyPath: m_LocalScale.y + value: 0.5519276 + objectReference: {fileID: 0} + - target: {fileID: 338674242174554973, guid: cdb1bd7ab88d1434e844c9dc45e1d63b, type: 3} + propertyPath: m_LocalScale.z + value: 0.5519276 + objectReference: {fileID: 0} + - target: {fileID: 338674242174554973, guid: cdb1bd7ab88d1434e844c9dc45e1d63b, type: 3} + propertyPath: m_LocalPosition.x + value: -48.907417 + objectReference: {fileID: 0} + - target: {fileID: 338674242174554973, guid: cdb1bd7ab88d1434e844c9dc45e1d63b, type: 3} + propertyPath: m_LocalPosition.y + value: 38.670918 + objectReference: {fileID: 0} + - target: {fileID: 338674242174554973, guid: cdb1bd7ab88d1434e844c9dc45e1d63b, type: 3} + propertyPath: m_LocalPosition.z + value: -3.3322144 + objectReference: {fileID: 0} + - target: {fileID: 338674242174554973, guid: cdb1bd7ab88d1434e844c9dc45e1d63b, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 338674242174554973, guid: cdb1bd7ab88d1434e844c9dc45e1d63b, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 338674242174554973, guid: cdb1bd7ab88d1434e844c9dc45e1d63b, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 338674242174554973, guid: cdb1bd7ab88d1434e844c9dc45e1d63b, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 338674242174554973, guid: cdb1bd7ab88d1434e844c9dc45e1d63b, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 338674242174554973, guid: cdb1bd7ab88d1434e844c9dc45e1d63b, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 338674242174554973, guid: cdb1bd7ab88d1434e844c9dc45e1d63b, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 1150923422769072615, guid: cdb1bd7ab88d1434e844c9dc45e1d63b, type: 3} + propertyPath: m_Name + value: Wheel + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: cdb1bd7ab88d1434e844c9dc45e1d63b, type: 3} --- !u!4 &543450651594602143 stripped Transform: m_CorrespondingSourceObject: {fileID: 7635430510950912929, guid: ff33ff758a2a9d745a29cb2d5fe7997d, type: 3} @@ -633,6 +635,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 3874665622684011115, guid: 4a69090c4b066974fb1913af75df14f5, type: 3} m_PrefabInstance: {fileID: 3625163125301297472} m_PrefabAsset: {fileID: 0} +--- !u!4 &543450652124513334 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 338674242174554973, guid: cdb1bd7ab88d1434e844c9dc45e1d63b, type: 3} + m_PrefabInstance: {fileID: 232374158623086443} + m_PrefabAsset: {fileID: 0} --- !u!4 &543450652221036485 stripped Transform: m_CorrespondingSourceObject: {fileID: 6696708220561039824, guid: 42ff4322cd19e9f428c4bb2b9d6d3bb7, type: 3} @@ -663,6 +670,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 1113718259632185729, guid: c7195edea34806f49ad72cced51e8dcf, type: 3} m_PrefabInstance: {fileID: 647957210169731913} m_PrefabAsset: {fileID: 0} +--- !u!4 &543450653509960921 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 3111618577064916580, guid: 616c4d7a7df3216439e209b540a24966, type: 3} + m_PrefabInstance: {fileID: 3216706897585353405} + m_PrefabAsset: {fileID: 0} --- !u!4 &543450653540455475 stripped Transform: m_CorrespondingSourceObject: {fileID: 6433572416547286283, guid: 3f1eb075e61755841a31d96d099168cf, type: 3} @@ -787,6 +799,71 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 9df1281bec48f1c40a35dfa77c718b77, type: 3} +--- !u!1001 &3216706897585353405 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 523664306} + m_Modifications: + - target: {fileID: 2334377743296605406, guid: 616c4d7a7df3216439e209b540a24966, type: 3} + propertyPath: m_Name + value: ItemShop + objectReference: {fileID: 0} + - target: {fileID: 3111618577064916580, guid: 616c4d7a7df3216439e209b540a24966, type: 3} + propertyPath: m_RootOrder + value: 12 + objectReference: {fileID: 0} + - target: {fileID: 3111618577064916580, guid: 616c4d7a7df3216439e209b540a24966, type: 3} + propertyPath: m_LocalScale.y + value: 0.5678225 + objectReference: {fileID: 0} + - target: {fileID: 3111618577064916580, guid: 616c4d7a7df3216439e209b540a24966, type: 3} + propertyPath: m_LocalScale.z + value: 0.5678225 + objectReference: {fileID: 0} + - target: {fileID: 3111618577064916580, guid: 616c4d7a7df3216439e209b540a24966, type: 3} + propertyPath: m_LocalPosition.x + value: -51.24533 + objectReference: {fileID: 0} + - target: {fileID: 3111618577064916580, guid: 616c4d7a7df3216439e209b540a24966, type: 3} + propertyPath: m_LocalPosition.y + value: 38.707916 + objectReference: {fileID: 0} + - target: {fileID: 3111618577064916580, guid: 616c4d7a7df3216439e209b540a24966, type: 3} + propertyPath: m_LocalPosition.z + value: -4.3906555 + objectReference: {fileID: 0} + - target: {fileID: 3111618577064916580, guid: 616c4d7a7df3216439e209b540a24966, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071067 + objectReference: {fileID: 0} + - target: {fileID: 3111618577064916580, guid: 616c4d7a7df3216439e209b540a24966, type: 3} + propertyPath: m_LocalRotation.x + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 3111618577064916580, guid: 616c4d7a7df3216439e209b540a24966, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3111618577064916580, guid: 616c4d7a7df3216439e209b540a24966, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 3111618577064916580, guid: 616c4d7a7df3216439e209b540a24966, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3111618577064916580, guid: 616c4d7a7df3216439e209b540a24966, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3111618577064916580, guid: 616c4d7a7df3216439e209b540a24966, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 616c4d7a7df3216439e209b540a24966, type: 3} --- !u!1001 &3365779519713737095 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/FlufflParty/UserSettings/Layouts/default-2021.dwlt b/FlufflParty/UserSettings/Layouts/default-2021.dwlt index 6ae024e..54ce548 100644 --- a/FlufflParty/UserSettings/Layouts/default-2021.dwlt +++ b/FlufflParty/UserSettings/Layouts/default-2021.dwlt @@ -48,7 +48,7 @@ MonoBehaviour: m_MinSize: {x: 300, y: 200} m_MaxSize: {x: 24288, y: 16192} vertical: 0 - controlID: 16 + controlID: 27 --- !u!114 &3 MonoBehaviour: m_ObjectHideFlags: 52 @@ -68,8 +68,8 @@ MonoBehaviour: y: 0 width: 464 height: 1059 - m_MinSize: {x: 275, y: 50} - m_MaxSize: {x: 4000, y: 4000} + m_MinSize: {x: 276, y: 71} + m_MaxSize: {x: 4001, y: 4021} m_ActualView: {fileID: 13} m_Panes: - {fileID: 13} @@ -223,7 +223,7 @@ MonoBehaviour: m_MinSize: {x: 200, y: 200} m_MaxSize: {x: 16192, y: 16192} vertical: 1 - controlID: 17 + controlID: 37 --- !u!114 &10 MonoBehaviour: m_ObjectHideFlags: 52 @@ -330,9 +330,9 @@ MonoBehaviour: m_IsLocked: 0 m_FolderTreeState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: c25b0000 - m_LastClickedID: 23490 - m_ExpandedIDs: 00000000ba5b0000bc5b000000ca9a3b + m_SelectedIDs: 1a5c0000 + m_LastClickedID: 23578 + m_ExpandedIDs: 00000000005c0000025c000000ca9a3b m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -360,7 +360,7 @@ MonoBehaviour: scrollPos: {x: 0, y: 0} m_SelectedIDs: m_LastClickedID: 0 - m_ExpandedIDs: 00000000ba5b0000bc5b0000 + m_ExpandedIDs: 00000000005c0000025c0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -488,9 +488,9 @@ MonoBehaviour: m_SceneHierarchy: m_TreeViewState: scrollPos: {x: 0, y: 0} - m_SelectedIDs: - m_LastClickedID: 0 - m_ExpandedIDs: 46ecffff32fbffff + m_SelectedIDs: d25a0000 + m_LastClickedID: 23250 + m_ExpandedIDs: 32fbffffb85a0000 m_RenameOverlay: m_UserAcceptedRename: 0 m_Name: @@ -739,9 +739,9 @@ MonoBehaviour: m_PlayAudio: 0 m_AudioPlay: 0 m_Position: - m_Target: {x: 90.59447, y: -1.7509544, z: 90.56099} + m_Target: {x: 85.31597, y: 2.0516162, z: 94.13227} speed: 2 - m_Value: {x: 90.59447, y: -1.7509544, z: 90.56099} + m_Value: {x: 85.31597, y: 2.0516162, z: 94.13227} m_RenderMode: 0 m_CameraMode: drawMode: 0 @@ -788,13 +788,13 @@ MonoBehaviour: m_GridAxis: 1 m_gridOpacity: 0.5 m_Rotation: - m_Target: {x: -0.046976782, y: -0.94740623, z: 0.16390747, w: -0.2716144} + m_Target: {x: -0.21582803, y: -0.77175695, z: 0.33665645, w: -0.4949052} speed: 2 - m_Value: {x: -0.047373757, y: -0.9469579, z: 0.16529334, w: -0.27148595} + m_Value: {x: -0.21628313, y: -0.7708368, z: 0.3362551, w: -0.4959484} m_Size: - m_Target: 6.779281 + m_Target: 2.6568031 speed: 2 - m_Value: 6.4873505 + m_Value: 2.5423954 m_Ortho: m_Target: 0 speed: 2