diff --git a/Assets/Materials/image.mat b/Assets/Materials/image.mat index 8ccb8eb..67f9726 100644 --- a/Assets/Materials/image.mat +++ b/Assets/Materials/image.mat @@ -133,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/Scenes/happywheelminigamescene.unity b/Assets/Scenes/happywheelminigamescene.unity index 8202a0a..5f627b9 100644 --- a/Assets/Scenes/happywheelminigamescene.unity +++ b/Assets/Scenes/happywheelminigamescene.unity @@ -119,120 +119,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!1001 &160966038 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 2378716723376299896, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} - propertyPath: m_LocalPosition.x - value: 4.806 - objectReference: {fileID: 0} - - target: {fileID: 2378716723376299896, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} - propertyPath: m_LocalPosition.y - value: -1.69 - objectReference: {fileID: 0} - - target: {fileID: 2378716723376299896, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} - propertyPath: m_LocalPosition.z - value: 1.82 - objectReference: {fileID: 0} - - target: {fileID: 2378716723376299896, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} - propertyPath: m_LocalRotation.w - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2378716723376299896, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} - propertyPath: m_LocalRotation.x - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 2378716723376299896, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} - propertyPath: m_LocalRotation.y - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 2378716723376299896, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2378716723376299896, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 2378716723376299896, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 180 - objectReference: {fileID: 0} - - target: {fileID: 2378716723376299896, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 90 - objectReference: {fileID: 0} - - target: {fileID: 3047027015980959170, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} - propertyPath: m_Name - value: gambler (1) - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} ---- !u!1001 &257246420 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 6173018518798556669, guid: 464a76193925759499ed527e8ec357f0, type: 3} - propertyPath: m_Name - value: TENKOLECKOVYBULLSHIT - objectReference: {fileID: 0} - - target: {fileID: 6836788657359488839, guid: 464a76193925759499ed527e8ec357f0, type: 3} - propertyPath: m_LocalPosition.x - value: 0.11 - objectReference: {fileID: 0} - - target: {fileID: 6836788657359488839, guid: 464a76193925759499ed527e8ec357f0, type: 3} - propertyPath: m_LocalPosition.y - value: 2.82 - objectReference: {fileID: 0} - - target: {fileID: 6836788657359488839, guid: 464a76193925759499ed527e8ec357f0, type: 3} - propertyPath: m_LocalPosition.z - value: 1.88 - objectReference: {fileID: 0} - - target: {fileID: 6836788657359488839, guid: 464a76193925759499ed527e8ec357f0, type: 3} - propertyPath: m_LocalRotation.w - value: 0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 6836788657359488839, guid: 464a76193925759499ed527e8ec357f0, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6836788657359488839, guid: 464a76193925759499ed527e8ec357f0, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6836788657359488839, guid: 464a76193925759499ed527e8ec357f0, type: 3} - propertyPath: m_LocalRotation.z - value: -0.7071068 - objectReference: {fileID: 0} - - target: {fileID: 6836788657359488839, guid: 464a76193925759499ed527e8ec357f0, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6836788657359488839, guid: 464a76193925759499ed527e8ec357f0, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 6836788657359488839, guid: 464a76193925759499ed527e8ec357f0, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: -90 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 464a76193925759499ed527e8ec357f0, type: 3} --- !u!1 &330585543 GameObject: m_ObjectHideFlags: 0 @@ -537,7 +423,8 @@ Transform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 - m_Children: [] + m_Children: + - {fileID: 1436747118} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1393829062 @@ -648,63 +535,11 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &1439077009 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - serializedVersion: 3 - m_TransformParent: {fileID: 0} - m_Modifications: - - target: {fileID: 399103528724687923, guid: 97b988f8779cbe74c979a77cb6198c15, type: 3} - propertyPath: m_LocalPosition.x - value: 1.970891 - objectReference: {fileID: 0} - - target: {fileID: 399103528724687923, guid: 97b988f8779cbe74c979a77cb6198c15, type: 3} - propertyPath: m_LocalPosition.y - value: -0.95 - objectReference: {fileID: 0} - - target: {fileID: 399103528724687923, guid: 97b988f8779cbe74c979a77cb6198c15, type: 3} - propertyPath: m_LocalPosition.z - value: 1.86 - objectReference: {fileID: 0} - - target: {fileID: 399103528724687923, guid: 97b988f8779cbe74c979a77cb6198c15, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 399103528724687923, guid: 97b988f8779cbe74c979a77cb6198c15, type: 3} - propertyPath: m_LocalRotation.x - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 399103528724687923, guid: 97b988f8779cbe74c979a77cb6198c15, type: 3} - propertyPath: m_LocalRotation.y - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 399103528724687923, guid: 97b988f8779cbe74c979a77cb6198c15, type: 3} - propertyPath: m_LocalRotation.z - value: -0 - objectReference: {fileID: 0} - - target: {fileID: 399103528724687923, guid: 97b988f8779cbe74c979a77cb6198c15, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 399103528724687923, guid: 97b988f8779cbe74c979a77cb6198c15, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 399103528724687923, guid: 97b988f8779cbe74c979a77cb6198c15, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 1063472006911833737, guid: 97b988f8779cbe74c979a77cb6198c15, type: 3} - propertyPath: m_Name - value: brambora - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_RemovedGameObjects: [] - m_AddedGameObjects: [] - m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 97b988f8779cbe74c979a77cb6198c15, type: 3} +--- !u!4 &1436747118 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 7803772661950461160, guid: feb01f0a52f63ae4fb7910a755f96b65, type: 3} + m_PrefabInstance: {fileID: 5687103364951197591} + m_PrefabAsset: {fileID: 0} --- !u!1 &1720783012 GameObject: m_ObjectHideFlags: 0 @@ -768,14 +603,14 @@ MonoBehaviour: taskName: Break the Ring taskType: 0 taskLocation: {x: 0, y: 0} - rotatingWheel: {fileID: 0} + rotatingWheel: {fileID: 7932075924902204677} defaultAngle: 90 sweepAngle: 90 wheelSpeed: 200 - potatoPrefab: {fileID: 0} - projectileSpawn: {fileID: 0} - aimPoint: {fileID: 0} - ring: {fileID: 0} + potatoPrefab: {fileID: 3583038051345854173, guid: feb01f0a52f63ae4fb7910a755f96b65, type: 3} + projectileSpawn: {fileID: 5337312757118336117} + aimPoint: {fileID: 269101883992104437} + ring: {fileID: 3012695456267620000} baseLaunchSpeed: 2 audioSource: {fileID: 1720783016} startClip: {fileID: 8300000, guid: 44745bf1e6f9f9b438672045bdc8ca44, type: 3} @@ -922,7 +757,345 @@ VideoPlayer: m_WaitForFirstFrame: 1 m_FrameReadyEventEnabled: 0 m_VideoShaders: [] ---- !u!1001 &1770550948 +--- !u!4 &269101883992104437 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6170015741279274503} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 2.032, y: -0.23, z: 1.87} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4553638128140480573} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &578274106025831409 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6009846694604302377} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071067} + m_LocalPosition: {x: 2.03, y: -0.089999914, z: 1.9} + m_LocalScale: {x: 0.5, y: 0.5, z: 0.5} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4218152692186174445} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!64 &2486926331112818736 +MeshCollider: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6009846694604302377} + 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: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: 5687779609372477813, guid: 8ee80b1e2cfa1c747877549e20403fd3, type: 3} +--- !u!1 &2670073892133274330 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4553638128140480573} + m_Layer: 0 + m_Name: ArenaRoot + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!114 &3012695456267620000 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 5996877745188424058, guid: 464a76193925759499ed527e8ec357f0, type: 3} + m_PrefabInstance: {fileID: 8860284741805737946} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: beb8ef83a611a554b927d57c300f626a, type: 3} + m_Name: + m_EditorClassIdentifier: +--- !u!114 &3131559617365385162 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6009846694604302377} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 20fa9c796cd377047ba2c43230717531, type: 3} + m_Name: + m_EditorClassIdentifier: + rotationSpeed: 90 +--- !u!4 &4218152692186174445 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6854534057947505069} + 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: + - {fileID: 578274106025831409} + m_Father: {fileID: 4553638128140480573} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &4553638128140480573 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 2670073892133274330} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 3, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: + - {fileID: 269101883992104437} + - {fileID: 5337312757118336117} + - {fileID: 4218152692186174445} + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!4 &5337312757118336117 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6573449374943950629} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 2.1, y: -2.86, z: 1.87} + m_LocalScale: {x: 1, y: 1, z: 1} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 4553638128140480573} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1001 &5687103364951197591 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 832575519} + m_Modifications: + - target: {fileID: 7423974319740841554, guid: feb01f0a52f63ae4fb7910a755f96b65, type: 3} + propertyPath: m_Name + value: brambora + objectReference: {fileID: 0} + - target: {fileID: 7803772661950461160, guid: feb01f0a52f63ae4fb7910a755f96b65, type: 3} + propertyPath: m_LocalPosition.x + value: 1.9531343 + objectReference: {fileID: 0} + - target: {fileID: 7803772661950461160, guid: feb01f0a52f63ae4fb7910a755f96b65, type: 3} + propertyPath: m_LocalPosition.y + value: -0.95 + objectReference: {fileID: 0} + - target: {fileID: 7803772661950461160, guid: feb01f0a52f63ae4fb7910a755f96b65, type: 3} + propertyPath: m_LocalPosition.z + value: 1.8600526 + objectReference: {fileID: 0} + - target: {fileID: 7803772661950461160, guid: feb01f0a52f63ae4fb7910a755f96b65, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 7803772661950461160, guid: feb01f0a52f63ae4fb7910a755f96b65, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7803772661950461160, guid: feb01f0a52f63ae4fb7910a755f96b65, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7803772661950461160, guid: feb01f0a52f63ae4fb7910a755f96b65, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 7803772661950461160, guid: feb01f0a52f63ae4fb7910a755f96b65, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7803772661950461160, guid: feb01f0a52f63ae4fb7910a755f96b65, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7803772661950461160, guid: feb01f0a52f63ae4fb7910a755f96b65, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: feb01f0a52f63ae4fb7910a755f96b65, type: 3} +--- !u!23 &5694429351805895482 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6009846694604302377} + 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_RayTracingAccelStructBuildFlagsOverride: 0 + m_RayTracingAccelStructBuildFlags: 1 + m_SmallMeshCulling: 1 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: d88c7dcf650af2c4e812eaa19f43e2e4, 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!1 &6009846694604302377 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 578274106025831409} + - component: {fileID: 7961751548456172932} + - component: {fileID: 5694429351805895482} + - component: {fileID: 8002597374298080458} + - component: {fileID: 2486926331112818736} + - component: {fileID: 3131559617365385162} + m_Layer: 0 + m_Name: CenterButtonTarget + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &6170015741279274503 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 269101883992104437} + m_Layer: 0 + m_Name: AimPoint + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &6573449374943950629 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5337312757118336117} + m_Layer: 0 + m_Name: ProjectileSpawn + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!1 &6854534057947505069 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4218152692186174445} + m_Layer: 0 + m_Name: ButtonTarget + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!4 &7932075924902204677 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 1471725278548269652, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} + m_PrefabInstance: {fileID: 8825079795041455953} + m_PrefabAsset: {fileID: 0} +--- !u!33 &7961751548456172932 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6009846694604302377} + m_Mesh: {fileID: 5687779609372477813, guid: 8ee80b1e2cfa1c747877549e20403fd3, type: 3} +--- !u!114 &8002597374298080458 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6009846694604302377} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 9d8029baff330b94d836a23c421021a8, type: 3} + m_Name: + m_EditorClassIdentifier: + owner: {fileID: 0} +--- !u!1001 &8825079795041455953 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -930,65 +1103,121 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: - - target: {fileID: 5695491794479763492, guid: 761c687c70cd0c04493f60d0e48c0fc8, type: 3} + - target: {fileID: 2378716723376299896, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} propertyPath: m_LocalPosition.x - value: 0 + value: 4.8057914 objectReference: {fileID: 0} - - target: {fileID: 5695491794479763492, guid: 761c687c70cd0c04493f60d0e48c0fc8, type: 3} + - target: {fileID: 2378716723376299896, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} propertyPath: m_LocalPosition.y - value: 3 + value: -1.69 objectReference: {fileID: 0} - - target: {fileID: 5695491794479763492, guid: 761c687c70cd0c04493f60d0e48c0fc8, type: 3} + - target: {fileID: 2378716723376299896, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} propertyPath: m_LocalPosition.z - value: 0 + value: 1.8194828 objectReference: {fileID: 0} - - target: {fileID: 5695491794479763492, guid: 761c687c70cd0c04493f60d0e48c0fc8, type: 3} + - target: {fileID: 2378716723376299896, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} propertyPath: m_LocalRotation.w - value: 1 + value: 0 objectReference: {fileID: 0} - - target: {fileID: 5695491794479763492, guid: 761c687c70cd0c04493f60d0e48c0fc8, type: 3} + - target: {fileID: 2378716723376299896, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} propertyPath: m_LocalRotation.x - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - - target: {fileID: 5695491794479763492, guid: 761c687c70cd0c04493f60d0e48c0fc8, type: 3} + - target: {fileID: 2378716723376299896, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} propertyPath: m_LocalRotation.y - value: 0 + value: 0.7071068 objectReference: {fileID: 0} - - target: {fileID: 5695491794479763492, guid: 761c687c70cd0c04493f60d0e48c0fc8, type: 3} + - target: {fileID: 2378716723376299896, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} propertyPath: m_LocalRotation.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 5695491794479763492, guid: 761c687c70cd0c04493f60d0e48c0fc8, type: 3} + - target: {fileID: 2378716723376299896, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: 5695491794479763492, guid: 761c687c70cd0c04493f60d0e48c0fc8, type: 3} + - target: {fileID: 2378716723376299896, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} propertyPath: m_LocalEulerAnglesHint.y - value: 0 + value: 180 objectReference: {fileID: 0} - - target: {fileID: 5695491794479763492, guid: 761c687c70cd0c04493f60d0e48c0fc8, type: 3} + - target: {fileID: 2378716723376299896, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} propertyPath: m_LocalEulerAnglesHint.z - value: 0 + value: 90 objectReference: {fileID: 0} - - target: {fileID: 7955123296618431154, guid: 761c687c70cd0c04493f60d0e48c0fc8, type: 3} + - target: {fileID: 3047027015980959170, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} propertyPath: m_Name - value: ArenaRoot + value: gambler (1) objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 761c687c70cd0c04493f60d0e48c0fc8, type: 3} + m_SourcePrefab: {fileID: 100100000, guid: 6e58a520817cb224f921c4c329dfdb29, type: 3} +--- !u!1001 &8860284741805737946 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6173018518798556669, guid: 464a76193925759499ed527e8ec357f0, type: 3} + propertyPath: m_Name + value: TENKOLECKOVYBULLSHIT + objectReference: {fileID: 0} + - target: {fileID: 6836788657359488839, guid: 464a76193925759499ed527e8ec357f0, type: 3} + propertyPath: m_LocalPosition.x + value: 0.11 + objectReference: {fileID: 0} + - target: {fileID: 6836788657359488839, guid: 464a76193925759499ed527e8ec357f0, type: 3} + propertyPath: m_LocalPosition.y + value: 2.82 + objectReference: {fileID: 0} + - target: {fileID: 6836788657359488839, guid: 464a76193925759499ed527e8ec357f0, type: 3} + propertyPath: m_LocalPosition.z + value: 1.88 + objectReference: {fileID: 0} + - target: {fileID: 6836788657359488839, guid: 464a76193925759499ed527e8ec357f0, type: 3} + propertyPath: m_LocalRotation.w + value: 0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6836788657359488839, guid: 464a76193925759499ed527e8ec357f0, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6836788657359488839, guid: 464a76193925759499ed527e8ec357f0, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6836788657359488839, guid: 464a76193925759499ed527e8ec357f0, type: 3} + propertyPath: m_LocalRotation.z + value: -0.7071068 + objectReference: {fileID: 0} + - target: {fileID: 6836788657359488839, guid: 464a76193925759499ed527e8ec357f0, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6836788657359488839, guid: 464a76193925759499ed527e8ec357f0, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6836788657359488839, guid: 464a76193925759499ed527e8ec357f0, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: -90 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 464a76193925759499ed527e8ec357f0, type: 3} --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 m_Roots: - {fileID: 1720783014} - {fileID: 330585546} + - {fileID: 4553638128140480573} - {fileID: 410087041} - {fileID: 832575519} - {fileID: 1393829066} - - {fileID: 1770550948} - - {fileID: 1439077009} - - {fileID: 160966038} - - {fileID: 257246420} + - {fileID: 8825079795041455953} + - {fileID: 8860284741805737946} diff --git a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset index c0e6112..5649f5b 100644 --- a/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset +++ b/Assets/Settings/UniversalRenderPipelineGlobalSettings.asset @@ -55,6 +55,13 @@ MonoBehaviour: - rid: 8712630790384254976 - rid: 3958521235517472768 - rid: 4718407462159908864 + - rid: 586807553405222912 + - rid: 586807553405222913 + - rid: 586807553405222914 + - rid: 586807553405222915 + - rid: 586807553405222916 + - rid: 586807553405222917 + - rid: 586807553405222918 m_RuntimeSettings: m_List: [] m_AssetVersion: 8 @@ -87,6 +94,129 @@ MonoBehaviour: references: version: 2 RefIds: + - rid: 586807553405222912 + type: {class: PostProcessData/ShaderResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + stopNanPS: {fileID: 4800000, guid: 1121bb4e615ca3c48b214e79e841e823, type: 3} + subpixelMorphologicalAntialiasingPS: {fileID: 4800000, guid: 63eaba0ebfb82cc43bde059b4a8c65f6, type: 3} + gaussianDepthOfFieldPS: {fileID: 4800000, guid: 5e7134d6e63e0bc47a1dd2669cedb379, type: 3} + bokehDepthOfFieldPS: {fileID: 4800000, guid: 2aed67ad60045d54ba3a00c91e2d2631, type: 3} + cameraMotionBlurPS: {fileID: 4800000, guid: 1edcd131364091c46a17cbff0b1de97a, type: 3} + paniniProjectionPS: {fileID: 4800000, guid: a15b78cf8ca26ca4fb2090293153c62c, type: 3} + lutBuilderLdrPS: {fileID: 4800000, guid: 65df88701913c224d95fc554db28381a, type: 3} + lutBuilderHdrPS: {fileID: 4800000, guid: ec9fec698a3456d4fb18cf8bacb7a2bc, type: 3} + bloomPS: {fileID: 4800000, guid: 5f1864addb451f54bae8c86d230f736e, type: 3} + temporalAntialiasingPS: {fileID: 4800000, guid: 9c70c1a35ff15f340b38ea84842358bf, type: 3} + LensFlareDataDrivenPS: {fileID: 4800000, guid: 6cda457ac28612740adb23da5d39ea92, type: 3} + LensFlareScreenSpacePS: {fileID: 4800000, guid: 701880fecb344ea4c9cd0db3407ab287, type: 3} + scalingSetupPS: {fileID: 4800000, guid: e8ee25143a34b8c4388709ea947055d1, type: 3} + easuPS: {fileID: 4800000, guid: 562b7ae4f629f144aa97780546fce7c6, type: 3} + uberPostPS: {fileID: 4800000, guid: e7857e9d0c934dc4f83f270f8447b006, type: 3} + finalPostPassPS: {fileID: 4800000, guid: c49e63ed1bbcb334780a3bd19dfed403, type: 3} + m_ShaderResourcesVersion: 0 + - rid: 586807553405222913 + type: {class: ScreenSpaceAmbientOcclusionPersistentResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_Shader: {fileID: 4800000, guid: 0849e84e3d62649e8882e9d6f056a017, type: 3} + m_Version: 0 + - rid: 586807553405222914 + type: {class: ScreenSpaceAmbientOcclusionDynamicResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + m_BlueNoise256Textures: + - {fileID: 2800000, guid: 36f118343fc974119bee3d09e2111500, type: 3} + - {fileID: 2800000, guid: 4b7b083e6b6734e8bb2838b0b50a0bc8, type: 3} + - {fileID: 2800000, guid: c06cc21c692f94f5fb5206247191eeee, type: 3} + - {fileID: 2800000, guid: cb76dd40fa7654f9587f6a344f125c9a, type: 3} + - {fileID: 2800000, guid: e32226222ff144b24bf3a5a451de54bc, type: 3} + - {fileID: 2800000, guid: 3302065f671a8450b82c9ddf07426f3a, type: 3} + - {fileID: 2800000, guid: 56a77a3e8d64f47b6afe9e3c95cb57d5, type: 3} + m_Version: 0 + - rid: 586807553405222915 + type: {class: PostProcessData/TextureResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} + data: + blueNoise16LTex: + - {fileID: 2800000, guid: 81200413a40918d4d8702e94db29911c, type: 3} + - {fileID: 2800000, guid: d50c5e07c9911a74982bddf7f3075e7b, type: 3} + - {fileID: 2800000, guid: 1134690bf9216164dbc75050e35b7900, type: 3} + - {fileID: 2800000, guid: 7ce2118f74614a94aa8a0cdf2e6062c3, type: 3} + - {fileID: 2800000, guid: 2ca97df9d1801e84a8a8f2c53cb744f0, type: 3} + - {fileID: 2800000, guid: e63eef8f54aa9dc4da9a5ac094b503b5, type: 3} + - {fileID: 2800000, guid: 39451254daebd6d40b52899c1f1c0c1b, type: 3} + - {fileID: 2800000, guid: c94ad916058dff743b0f1c969ddbe660, type: 3} + - {fileID: 2800000, guid: ed5ea7ce59ca8ec4f9f14bf470a30f35, type: 3} + - {fileID: 2800000, guid: 071e954febf155243a6c81e48f452644, type: 3} + - {fileID: 2800000, guid: 96aaab9cc247d0b4c98132159688c1af, type: 3} + - {fileID: 2800000, guid: fc3fa8f108657e14486697c9a84ccfc5, type: 3} + - {fileID: 2800000, guid: bfed3e498947fcb4890b7f40f54d85b9, type: 3} + - {fileID: 2800000, guid: d512512f4af60a442ab3458489412954, type: 3} + - {fileID: 2800000, guid: 47a45908f6db0cb44a0d5e961143afec, type: 3} + - {fileID: 2800000, guid: 4dcc0502f8586f941b5c4a66717205e8, type: 3} + - {fileID: 2800000, guid: 9d92991794bb5864c8085468b97aa067, type: 3} + - {fileID: 2800000, guid: 14381521ff11cb74abe3fe65401c23be, type: 3} + - {fileID: 2800000, guid: d36f0fe53425e08499a2333cf423634c, type: 3} + - {fileID: 2800000, guid: d4044ea2490d63b43aa1765f8efbf8a9, type: 3} + - {fileID: 2800000, guid: c9bd74624d8070f429e3f46d161f9204, type: 3} + - {fileID: 2800000, guid: d5c9b274310e5524ebe32a4e4da3df1f, type: 3} + - {fileID: 2800000, guid: f69770e54f2823f43badf77916acad83, type: 3} + - {fileID: 2800000, guid: 10b6c6d22e73dea46a8ab36b6eebd629, type: 3} + - {fileID: 2800000, guid: a2ec5cbf5a9b64345ad3fab0912ddf7b, type: 3} + - {fileID: 2800000, guid: 1c3c6d69a645b804fa232004b96b7ad3, type: 3} + - {fileID: 2800000, guid: d18a24d7b4ed50f4387993566d9d3ae2, type: 3} + - {fileID: 2800000, guid: c989e1ed85cf7154caa922fec53e6af6, type: 3} + - {fileID: 2800000, guid: ff47e5a0f105eb34883b973e51f4db62, type: 3} + - {fileID: 2800000, guid: fa042edbfc40fbd4bad0ab9d505b1223, type: 3} + - {fileID: 2800000, guid: 896d9004736809c4fb5973b7c12eb8b9, type: 3} + - {fileID: 2800000, guid: 179f794063d2a66478e6e726f84a65bc, type: 3} + filmGrainTex: + - {fileID: 2800000, guid: 654c582f7f8a5a14dbd7d119cbde215d, type: 3} + - {fileID: 2800000, guid: dd77ffd079630404e879388999033049, type: 3} + - {fileID: 2800000, guid: 1097e90e1306e26439701489f391a6c0, type: 3} + - {fileID: 2800000, guid: f0b67500f7fad3b4c9f2b13e8f41ba6e, type: 3} + - {fileID: 2800000, guid: 9930fb4528622b34687b00bbe6883de7, type: 3} + - {fileID: 2800000, guid: bd9e8c758250ef449a4b4bfaad7a2133, type: 3} + - {fileID: 2800000, guid: 510a2f57334933e4a8dbabe4c30204e4, type: 3} + - {fileID: 2800000, guid: b4db8180660810945bf8d55ab44352ad, type: 3} + - {fileID: 2800000, guid: fd2fd78b392986e42a12df2177d3b89c, type: 3} + - {fileID: 2800000, guid: 5cdee82a77d13994f83b8fdabed7c301, type: 3} + smaaAreaTex: {fileID: 2800000, guid: d1f1048909d55cd4fa1126ab998f617e, type: 3} + smaaSearchTex: {fileID: 2800000, guid: 51eee22c2a633ef4aada830eed57c3fd, type: 3} + m_TexturesResourcesVersion: 0 + - rid: 586807553405222916 + type: {class: RenderingDebuggerRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_version: 0 + - rid: 586807553405222917 + type: {class: VrsRenderPipelineRuntimeResources, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_TextureComputeShader: {fileID: 7200000, guid: cacb30de6c40c7444bbc78cb0a81fd2a, type: 3} + m_VisualizationShader: {fileID: 4800000, guid: 620b55b8040a88d468e94abe55bed5ba, type: 3} + m_VisualizationLookupTable: + m_Data: + - {r: 1, g: 0, b: 0, a: 1} + - {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + - {r: 1, g: 1, b: 1, a: 1} + - {r: 0, g: 1, b: 0, a: 1} + - {r: 0.75, g: 0.75, b: 0, a: 1} + - {r: 0, g: 0.75, b: 0.55, a: 1} + - {r: 0.5, g: 0, b: 0.5, a: 1} + - {r: 0.5, g: 0.5, b: 0.5, a: 1} + - {r: 0, g: 0, b: 1, a: 1} + m_ConversionLookupTable: + m_Data: + - {r: 1, g: 0, b: 0, a: 1} + - {r: 1, g: 0.92156863, b: 0.015686275, a: 1} + - {r: 1, g: 1, b: 1, a: 1} + - {r: 0, g: 1, b: 0, a: 1} + - {r: 0.75, g: 0.75, b: 0, a: 1} + - {r: 0, g: 0.75, b: 0.55, a: 1} + - {r: 0.5, g: 0, b: 0.5, a: 1} + - {r: 0.5, g: 0.5, b: 0.5, a: 1} + - {r: 0, g: 0, b: 1, a: 1} + - rid: 586807553405222918 + type: {class: LightmapSamplingSettings, ns: UnityEngine.Rendering, asm: Unity.RenderPipelines.Core.Runtime} + data: + m_Version: 1 + m_UseBicubicLightmapSampling: 0 - rid: 3958521235517472768 type: {class: UniversalRenderPipelineRuntimeXRResources, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} data: @@ -110,9 +240,6 @@ MonoBehaviour: m_AutodeskInteractive: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3} m_AutodeskInteractiveTransparent: {fileID: 4800000, guid: 5c81372d981403744adbdda4433c9c11, type: 3} m_AutodeskInteractiveMasked: {fileID: 4800000, guid: 80aa867ac363ac043847b06ad71604cd, type: 3} - m_TerrainDetailLit: {fileID: 4800000, guid: f6783ab646d374f94b199774402a5144, type: 3} - m_TerrainDetailGrassBillboard: {fileID: 4800000, guid: 29868e73b638e48ca99a19ea58c48d90, type: 3} - m_TerrainDetailGrass: {fileID: 4800000, guid: e507fdfead5ca47e8b9a768b51c291a1, type: 3} m_DefaultSpeedTree7Shader: {fileID: 4800000, guid: 0f4122b9a743b744abe2fb6a0a88868b, type: 3} m_DefaultSpeedTree8Shader: {fileID: -6465566751694194690, guid: 9920c1f1781549a46ba081a2a15a16ec, type: 3} m_DefaultSpeedTree9Shader: {fileID: -6465566751694194690, guid: cbd3e1cc4ae141c42a30e33b4d666a61, type: 3} @@ -123,6 +250,8 @@ MonoBehaviour: m_CopyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3} m_CameraMotionVector: {fileID: 4800000, guid: c56b7e0d4c7cb484e959caeeedae9bbf, type: 3} m_StencilDeferredPS: {fileID: 4800000, guid: e9155b26e1bc55942a41e518703fe304, type: 3} + m_ClusterDeferred: {fileID: 4800000, guid: 222cce62363a44a380c36bf03b392608, type: 3} + m_StencilDitherMaskSeedPS: {fileID: 4800000, guid: 8c3ee818f2efa514c889881ccb2e95a2, type: 3} m_DBufferClear: {fileID: 4800000, guid: f056d8bd2a1c7e44e9729144b4c70395, type: 3} - rid: 6852985685364965379 type: {class: UniversalRenderPipelineDebugShaders, ns: UnityEngine.Rendering.Universal, asm: Unity.RenderPipelines.Universal.Runtime} diff --git a/Assets/bramboracolor1.mat b/Assets/bramboracolor1.mat index 3047f85..8d1b71e 100644 --- a/Assets/bramboracolor1.mat +++ b/Assets/bramboracolor1.mat @@ -133,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/bramboracolor2.mat b/Assets/bramboracolor2.mat index ae200a8..cec0a74 100644 --- a/Assets/bramboracolor2.mat +++ b/Assets/bramboracolor2.mat @@ -133,4 +133,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 diff --git a/Assets/diamant.mat b/Assets/diamant.mat index 95f2735..2c91f57 100644 --- a/Assets/diamant.mat +++ b/Assets/diamant.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/prefabs/brambora.prefab b/Assets/prefabs/brambora.prefab index e799014..92aa55e 100644 --- a/Assets/prefabs/brambora.prefab +++ b/Assets/prefabs/brambora.prefab @@ -1,246 +1,99 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: ---- !u!1 &576271350890556220 -GameObject: +--- !u!1001 &145065123248081880 +PrefabInstance: m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4358185977559683698} - - component: {fileID: 4500499071685588545} - - component: {fileID: 2307141907931810636} - m_Layer: 0 - m_Name: Object_2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &4358185977559683698 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 576271350890556220} serializedVersion: 2 - m_LocalRotation: {x: 6.617445e-24, y: 3.3087225e-24, 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: 7506914170791315226} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &4500499071685588545 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 576271350890556220} - m_Mesh: {fileID: 4787136918717088048, guid: 4228a4997a7cb8c40890bb8004517c41, type: 3} ---- !u!23 &2307141907931810636 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 576271350890556220} - 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_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: 8e305402eced6f14e9a5cca5e2af6438, 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!1 &640337675363126027 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 4228a4997a7cb8c40890bb8004517c41, type: 3} + propertyPath: m_LocalScale.x + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4228a4997a7cb8c40890bb8004517c41, type: 3} + propertyPath: m_LocalScale.y + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4228a4997a7cb8c40890bb8004517c41, type: 3} + propertyPath: m_LocalScale.z + value: 1.5 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4228a4997a7cb8c40890bb8004517c41, type: 3} + propertyPath: m_LocalPosition.x + value: 1.9531343 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4228a4997a7cb8c40890bb8004517c41, type: 3} + propertyPath: m_LocalPosition.y + value: -0.95 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4228a4997a7cb8c40890bb8004517c41, type: 3} + propertyPath: m_LocalPosition.z + value: 1.8600526 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4228a4997a7cb8c40890bb8004517c41, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4228a4997a7cb8c40890bb8004517c41, type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4228a4997a7cb8c40890bb8004517c41, type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4228a4997a7cb8c40890bb8004517c41, type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4228a4997a7cb8c40890bb8004517c41, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4228a4997a7cb8c40890bb8004517c41, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 4228a4997a7cb8c40890bb8004517c41, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 4228a4997a7cb8c40890bb8004517c41, type: 3} + propertyPath: m_Name + value: brambora + objectReference: {fileID: 0} + - target: {fileID: 2452142520620105876, guid: 4228a4997a7cb8c40890bb8004517c41, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: 8e305402eced6f14e9a5cca5e2af6438, type: 2} + - target: {fileID: 6444345493051546968, guid: 4228a4997a7cb8c40890bb8004517c41, type: 3} + propertyPath: 'm_Materials.Array.data[0]' + value: + objectReference: {fileID: 2100000, guid: ba964f48671546a4c86ddcae881e5496, type: 2} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 4228a4997a7cb8c40890bb8004517c41, type: 3} + insertIndex: -1 + addedObject: {fileID: 6376241064141272582} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 4228a4997a7cb8c40890bb8004517c41, type: 3} + insertIndex: -1 + addedObject: {fileID: 3635582062262842653} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 4228a4997a7cb8c40890bb8004517c41, type: 3} + insertIndex: -1 + addedObject: {fileID: 2566485234647574730} + - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: 4228a4997a7cb8c40890bb8004517c41, type: 3} + insertIndex: -1 + addedObject: {fileID: 1110134066386910305} + m_SourcePrefab: {fileID: 100100000, guid: 4228a4997a7cb8c40890bb8004517c41, type: 3} +--- !u!1 &1063472006911833737 stripped GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: 4228a4997a7cb8c40890bb8004517c41, type: 3} + m_PrefabInstance: {fileID: 145065123248081880} m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6373276122078560582} - - component: {fileID: 54530330679872046} - - component: {fileID: 6588121816873178752} - m_Layer: 0 - m_Name: Object_3 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &6373276122078560582 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 640337675363126027} - serializedVersion: 2 - m_LocalRotation: {x: 6.617445e-24, y: 3.3087225e-24, 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: 7506914170791315226} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!33 &54530330679872046 -MeshFilter: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 640337675363126027} - m_Mesh: {fileID: -3335442511603561631, guid: 4228a4997a7cb8c40890bb8004517c41, type: 3} ---- !u!23 &6588121816873178752 -MeshRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 640337675363126027} - 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_RayTracingAccelStructBuildFlagsOverride: 0 - m_RayTracingAccelStructBuildFlags: 1 - m_SmallMeshCulling: 1 - m_RenderingLayerMask: 1 - m_RendererPriority: 0 - m_Materials: - - {fileID: 2100000, guid: ba964f48671546a4c86ddcae881e5496, 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!1 &797207250759319258 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 7506914170791315226} - m_Layer: 0 - m_Name: yourMesh (15).stl.cleaner.materialmerger.gles - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &7506914170791315226 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 797207250759319258} - serializedVersion: 2 - m_LocalRotation: {x: 6.617445e-24, y: 3.3087225e-24, 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: - - {fileID: 4358185977559683698} - - {fileID: 6373276122078560582} - m_Father: {fileID: 399103528724687923} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1 &1063472006911833737 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 399103528724687923} - - component: {fileID: 6376241064141272582} - - component: {fileID: 3635582062262842653} - - component: {fileID: 2566485234647574730} - - component: {fileID: 1110134066386910305} - m_Layer: 0 - m_Name: brambora - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!4 &399103528724687923 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1063472006911833737} - serializedVersion: 2 - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 1.9531343, y: -0.95, z: 1.8600526} - m_LocalScale: {x: 1.5, y: 1.5, z: 1.5} - m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 7506914170791315226} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &6376241064141272582 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/sklo.mat b/Assets/sklo.mat index d550f4f..9af6285 100644 --- a/Assets/sklo.mat +++ b/Assets/sklo.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/Assets/smple.mat b/Assets/smple.mat index c2fe004..4d2e756 100644 --- a/Assets/smple.mat +++ b/Assets/smple.mat @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Name: m_EditorClassIdentifier: - version: 9 + version: 10 --- !u!21 &2100000 Material: serializedVersion: 8 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index c9b08fc..7a061a5 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -70,6 +70,7 @@ PlayerSettings: androidStartInFullscreen: 1 androidRenderOutsideSafeArea: 1 androidUseSwappy: 1 + androidDisplayOptions: 1 androidBlitType: 2 androidResizeableActivity: 1 androidDefaultWindowWidth: 1920 @@ -86,6 +87,7 @@ PlayerSettings: muteOtherAudioSources: 0 Prepare IOS For Recording: 0 Force IOS Speakers When Recording: 0 + audioSpatialExperience: 0 deferSystemGesturesMode: 0 hideHomeButton: 0 submitAnalytics: 1 @@ -132,6 +134,7 @@ PlayerSettings: switchNVNMaxPublicSamplerIDCount: 0 switchMaxWorkerMultiple: 8 switchNVNGraphicsFirmwareMemory: 32 + switchGraphicsJobsSyncAfterKick: 1 vulkanNumSwapchainBuffers: 3 vulkanEnableSetSRGBWrite: 0 vulkanEnablePreTransform: 0 @@ -276,6 +279,9 @@ PlayerSettings: AndroidBuildApkPerCpuArchitecture: 0 AndroidTVCompatibility: 0 AndroidIsGame: 1 + androidAppCategory: 3 + useAndroidAppCategory: 1 + androidAppCategoryOther: AndroidEnableTango: 0 androidEnableBanner: 1 androidUseLowAccuracyLocation: 0 @@ -530,6 +536,9 @@ PlayerSettings: - m_BuildTarget: AndroidPlayer m_APIs: 150000000b000000 m_Automatic: 0 + - m_BuildTarget: WindowsStandaloneSupport + m_APIs: 0200000012000000 + m_Automatic: 0 m_BuildTargetVRSettings: [] m_DefaultShaderChunkSizeInMB: 16 m_DefaultShaderChunkCount: 0 @@ -545,6 +554,7 @@ PlayerSettings: - serializedVersion: 2 m_BuildTarget: Android m_EncodingQuality: 1 + m_BuildTargetGroupHDRCubemapEncodingQuality: [] m_BuildTargetGroupLightmapSettings: [] m_BuildTargetGroupLoadStoreDebugModeSettings: [] m_BuildTargetNormalMapEncoding: @@ -813,12 +823,12 @@ PlayerSettings: webGLMemoryLinearGrowthStep: 16 webGLMemoryGeometricGrowthStep: 0.2 webGLMemoryGeometricGrowthCap: 96 - webGLEnableWebGPU: 0 webGLPowerPreference: 2 webGLWebAssemblyTable: 0 webGLWebAssemblyBigInt: 0 webGLCloseOnQuit: 0 webWasm2023: 0 + webEnableSubmoduleStrippingCompatibility: 0 scriptingDefineSymbols: {} additionalCompilerArguments: {} platformArchitecture: {} @@ -932,3 +942,5 @@ PlayerSettings: insecureHttpOption: 0 androidVulkanDenyFilterList: [] androidVulkanAllowFilterList: [] + androidVulkanDeviceFilterListAsset: {fileID: 0} + d3d12DeviceFilterListAsset: {fileID: 0} diff --git a/ProjectSettings/ProjectVersion.txt b/ProjectSettings/ProjectVersion.txt index 6a73247..a9844fe 100644 --- a/ProjectSettings/ProjectVersion.txt +++ b/ProjectSettings/ProjectVersion.txt @@ -1,2 +1,2 @@ -m_EditorVersion: 6000.0.44f1 -m_EditorVersionWithRevision: 6000.0.44f1 (101c91f3a8fb) +m_EditorVersion: 6000.2.8f1 +m_EditorVersionWithRevision: 6000.2.8f1 (c9992ac36c34) diff --git a/ProjectSettings/ShaderGraphSettings.asset b/ProjectSettings/ShaderGraphSettings.asset index e66042a..ce8c243 100644 --- a/ProjectSettings/ShaderGraphSettings.asset +++ b/ProjectSettings/ShaderGraphSettings.asset @@ -13,6 +13,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: shaderVariantLimit: 128 + overrideShaderVariantLimit: 0 customInterpolatorErrorThreshold: 32 customInterpolatorWarningThreshold: 16 customHeatmapValues: {fileID: 0} diff --git a/ProjectSettings/URPProjectSettings.asset b/ProjectSettings/URPProjectSettings.asset index 08faf03..64a8674 100644 --- a/ProjectSettings/URPProjectSettings.asset +++ b/ProjectSettings/URPProjectSettings.asset @@ -12,4 +12,4 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 247994e1f5a72c2419c26a37e9334c01, type: 3} m_Name: m_EditorClassIdentifier: - m_LastMaterialVersion: 9 + m_LastMaterialVersion: 10