From fcae5688809b8cca8b13cf42f4df1a68a4fb8c9b Mon Sep 17 00:00:00 2001 From: Nabiddinov Date: Mon, 18 Mar 2024 09:44:02 +0500 Subject: [PATCH 1/2] update --- Subjects/Assets/Prefabs/Options.prefab | 2 +- Subjects/Assets/Scenes/Anatomiya/Human.unity | 519 +++++++++--------- Subjects/Assets/Scenes/Anatomiya/Liver.unity | 279 ++++++++-- Subjects/Assets/Scenes/Anatomiya/Lung.unity | 209 ++++++- .../Assets/Scenes/Anatomiya/MuscleSim.unity | 285 ++++++++-- 5 files changed, 941 insertions(+), 353 deletions(-) diff --git a/Subjects/Assets/Prefabs/Options.prefab b/Subjects/Assets/Prefabs/Options.prefab index 20a1a903..d3a42685 100644 --- a/Subjects/Assets/Prefabs/Options.prefab +++ b/Subjects/Assets/Prefabs/Options.prefab @@ -1438,7 +1438,7 @@ MonoBehaviour: m_Calls: - m_Target: {fileID: 5647246953743182225} m_TargetAssemblyTypeName: ResertCamera, Assembly-CSharp - m_MethodName: ResetCameraPosition + m_MethodName: ResetObjectTransform m_Mode: 1 m_Arguments: m_ObjectArgument: {fileID: 0} diff --git a/Subjects/Assets/Scenes/Anatomiya/Human.unity b/Subjects/Assets/Scenes/Anatomiya/Human.unity index 61b439c3..29dc4054 100644 --- a/Subjects/Assets/Scenes/Anatomiya/Human.unity +++ b/Subjects/Assets/Scenes/Anatomiya/Human.unity @@ -123,88 +123,6 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!21 &21166814 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 80, g: 15, b: 0, a: 0} - - _r: {r: 10, g: 10, b: 10, a: 10} - - _rect2props: {r: 0.0000076293945, g: 0, b: 60.10408, a: 60.10408} - m_BuildTextureStacks: [] ---- !u!21 &39297491 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 200, g: 221.21014, b: 0, a: 0} - - _r: {r: 40, g: 40, b: 40, a: 40} - - _rect2props: {r: 0.000015258789, g: -0.000061035156, b: 269.5563, a: 269.5563} - m_BuildTextureStacks: [] --- !u!1 &171040342 GameObject: m_ObjectHideFlags: 0 @@ -295,47 +213,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 171040342} m_CullTransparentMesh: 1 ---- !u!21 &297079841 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 109.0761, g: 18.1581, b: 0, a: 0} - - _r: {r: 10, g: 10, b: 10, a: 10} - - _rect2props: {r: 0.000015258789, g: 0.0000076293945, b: 82.8971, a: 82.8971} - m_BuildTextureStacks: [] --- !u!1 &370260194 GameObject: m_ObjectHideFlags: 0 @@ -470,6 +347,47 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 370260194} m_CullTransparentMesh: 1 +--- !u!21 &473118772 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 80, g: 15, b: 0, a: 0} + - _r: {r: 10, g: 10, b: 10, a: 10} + - _rect2props: {r: 0.0000076293945, g: 0, b: 60.10408, a: 60.10408} + m_BuildTextureStacks: [] --- !u!1 &483337181 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5613062188405781854, guid: 87dc58db2298a72439c844c2e2412e3a, @@ -482,6 +400,47 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 2138949035} m_PrefabAsset: {fileID: 0} +--- !u!21 &493932964 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 185.11465, g: 85.80825, b: 0, a: 0} + - _r: {r: 10, g: 10, b: 10, a: 10} + - _rect2props: {r: 0.000030517578, g: 0, b: 184.50037, a: 184.50037} + m_BuildTextureStacks: [] --- !u!1 &515031422 GameObject: m_ObjectHideFlags: 0 @@ -904,7 +863,7 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 619571144} m_CullTransparentMesh: 1 ---- !u!21 &676985682 +--- !u!21 &654329118 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -941,9 +900,9 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 80, g: 15, b: 0, a: 0} - - _r: {r: 10, g: 10, b: 10, a: 10} - - _rect2props: {r: 0.0000076293945, g: 0, b: 60.10408, a: 60.10408} + - _halfSize: {r: 200, g: 221.21014, b: 0, a: 0} + - _r: {r: 40, g: 40, b: 40, a: 40} + - _rect2props: {r: 0.000015258789, g: -0.000061035156, b: 269.5563, a: 269.5563} m_BuildTextureStacks: [] --- !u!1 &879785808 GameObject: @@ -1079,88 +1038,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 879785808} m_CullTransparentMesh: 1 ---- !u!21 &946860747 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 80, g: 15, b: 0, a: 0} - - _r: {r: 10, g: 10, b: 10, a: 10} - - _rect2props: {r: 0.0000076293945, g: 0, b: 60.10408, a: 60.10408} - m_BuildTextureStacks: [] ---- !u!21 &1050971616 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 80, g: 15, b: 0, a: 0} - - _r: {r: 10, g: 10, b: 10, a: 10} - - _rect2props: {r: 0.0000076293945, g: 0, b: 60.10408, a: 60.10408} - m_BuildTextureStacks: [] --- !u!1 &1074077471 GameObject: m_ObjectHideFlags: 0 @@ -1362,6 +1239,88 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!21 &1269731099 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 80, g: 15, b: 0, a: 0} + - _r: {r: 10, g: 10, b: 10, a: 10} + - _rect2props: {r: 0.0000076293945, g: 0, b: 60.10408, a: 60.10408} + m_BuildTextureStacks: [] +--- !u!21 &1355319639 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 80, g: 15, b: 0, a: 0} + - _r: {r: 10, g: 10, b: 10, a: 10} + - _rect2props: {r: 0.0000076293945, g: 0, b: 60.10408, a: 60.10408} + m_BuildTextureStacks: [] --- !u!1 &1425442563 GameObject: m_ObjectHideFlags: 0 @@ -1923,7 +1882,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 39297491} + m_Material: {fileID: 654329118} m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -2189,47 +2148,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!21 &1726877857 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 185.11465, g: 85.80825, b: 0, a: 0} - - _r: {r: 10, g: 10, b: 10, a: 10} - - _rect2props: {r: 0.000030517578, g: 0, b: 184.50037, a: 184.50037} - m_BuildTextureStacks: [] --- !u!1 &1820473055 GameObject: m_ObjectHideFlags: 0 @@ -2363,6 +2281,47 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1820473055} m_CullTransparentMesh: 1 +--- !u!21 &1856179141 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 80, g: 15, b: 0, a: 0} + - _r: {r: 10, g: 10, b: 10, a: 10} + - _rect2props: {r: 0.0000076293945, g: 0, b: 60.10408, a: 60.10408} + m_BuildTextureStacks: [] --- !u!1 &1883577852 GameObject: m_ObjectHideFlags: 0 @@ -2578,7 +2537,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1726877857} + m_Material: {fileID: 493932964} m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -2942,6 +2901,47 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 +--- !u!21 &2051081321 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 109.0761, g: 18.1581, b: 0, a: 0} + - _r: {r: 10, g: 10, b: 10, a: 10} + - _rect2props: {r: 0.000015258789, g: 0.0000076293945, b: 82.8971, a: 82.8971} + m_BuildTextureStacks: [] --- !u!1001 &2072692755 PrefabInstance: m_ObjectHideFlags: 0 @@ -3221,6 +3221,11 @@ PrefabInstance: propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName value: HumanSplitController, Assembly-CSharp objectReference: {fileID: 0} + - target: {fileID: 3897561154429848108, guid: 5b8e304252e4a2e4b9fd07763589702b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -70 + objectReference: {fileID: 0} - target: {fileID: 4241188861210903515, guid: 5b8e304252e4a2e4b9fd07763589702b, type: 3} propertyPath: GameObject @@ -3311,6 +3316,16 @@ PrefabInstance: propertyPath: m_Color.r value: 0 objectReference: {fileID: 0} + - target: {fileID: 5647246953743182225, guid: 5b8e304252e4a2e4b9fd07763589702b, + type: 3} + propertyPath: Camer2 + value: + objectReference: {fileID: 2072692757} + - target: {fileID: 5647246953743182225, guid: 5b8e304252e4a2e4b9fd07763589702b, + type: 3} + propertyPath: Camera1 + value: + objectReference: {fileID: 2072692758} - target: {fileID: 5841866061830938747, guid: 5b8e304252e4a2e4b9fd07763589702b, type: 3} propertyPath: backgroundImage diff --git a/Subjects/Assets/Scenes/Anatomiya/Liver.unity b/Subjects/Assets/Scenes/Anatomiya/Liver.unity index 75e48bd4..8f73b770 100644 --- a/Subjects/Assets/Scenes/Anatomiya/Liver.unity +++ b/Subjects/Assets/Scenes/Anatomiya/Liver.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -123,48 +123,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!21 &348867251 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 200, g: 221.21014, b: 0, a: 0} - - _r: {r: 40, g: 40, b: 40, a: 40} - - _rect2props: {r: 0.000015258789, g: -0.000061035156, b: 269.5563, a: 269.5563} - m_BuildTextureStacks: [] ---- !u!21 &532085270 +--- !u!21 &160753403 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -402,6 +361,59 @@ Camera: type: 3} m_PrefabInstance: {fileID: 835218304} m_PrefabAsset: {fileID: 0} +--- !u!1 &835218306 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4575459509747329933, guid: 56177e65d305e5149a0e0159957d437f, + type: 3} + m_PrefabInstance: {fileID: 835218304} + m_PrefabAsset: {fileID: 0} +--- !u!1 &835218307 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6772827042187989566, guid: 56177e65d305e5149a0e0159957d437f, + type: 3} + m_PrefabInstance: {fileID: 835218304} + m_PrefabAsset: {fileID: 0} +--- !u!21 &1029938508 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 80, g: 15, b: 0, a: 0} + - _r: {r: 10, g: 10, b: 10, a: 10} + - _rect2props: {r: 0.0000076293945, g: 0, b: 60.10408, a: 60.10408} + m_BuildTextureStacks: [] --- !u!1 &1105877407 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5613062188405781854, guid: 87dc58db2298a72439c844c2e2412e3a, @@ -1313,7 +1325,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 348867251} + m_Material: {fileID: 1770318536} m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -1443,6 +1455,88 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!21 &1529110551 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 80, g: 15, b: 0, a: 0} + - _r: {r: 10, g: 10, b: 10, a: 10} + - _rect2props: {r: 0.0000076293945, g: 0, b: 60.10408, a: 60.10408} + m_BuildTextureStacks: [] +--- !u!21 &1576165672 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 80, g: 15, b: 0, a: 0} + - _r: {r: 10, g: 10, b: 10, a: 10} + - _rect2props: {r: 0.0000076293945, g: 0, b: 60.10408, a: 60.10408} + m_BuildTextureStacks: [] --- !u!1001 &1689781435 PrefabInstance: m_ObjectHideFlags: 0 @@ -1846,6 +1940,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -74 objectReference: {fileID: 0} + - target: {fileID: 2539118851412356162, guid: 5b8e304252e4a2e4b9fd07763589702b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -170 + objectReference: {fileID: 0} - target: {fileID: 3096113286053366570, guid: 5b8e304252e4a2e4b9fd07763589702b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size @@ -1921,6 +2020,16 @@ PrefabInstance: propertyPath: m_Color.r value: 0 objectReference: {fileID: 0} + - target: {fileID: 5647246953743182225, guid: 5b8e304252e4a2e4b9fd07763589702b, + type: 3} + propertyPath: Camer2 + value: + objectReference: {fileID: 835218307} + - target: {fileID: 5647246953743182225, guid: 5b8e304252e4a2e4b9fd07763589702b, + type: 3} + propertyPath: Camera1 + value: + objectReference: {fileID: 835218306} - target: {fileID: 5841866061830938747, guid: 5b8e304252e4a2e4b9fd07763589702b, type: 3} propertyPath: backgroundImage @@ -1958,6 +2067,47 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1769597988} m_PrefabAsset: {fileID: 0} +--- !u!21 &1770318536 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 200, g: 221.21014, b: 0, a: 0} + - _r: {r: 40, g: 40, b: 40, a: 40} + - _rect2props: {r: 0.000015258789, g: -0.000061035156, b: 269.5563, a: 269.5563} + m_BuildTextureStacks: [] --- !u!1 &1804491725 GameObject: m_ObjectHideFlags: 0 @@ -2136,6 +2286,47 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1804491725} m_CullTransparentMesh: 1 +--- !u!21 &1937760898 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 80, g: 15, b: 0, a: 0} + - _r: {r: 10, g: 10, b: 10, a: 10} + - _rect2props: {r: 0.0000076293945, g: 0, b: 60.10408, a: 60.10408} + m_BuildTextureStacks: [] --- !u!1 &1994888521 GameObject: m_ObjectHideFlags: 0 diff --git a/Subjects/Assets/Scenes/Anatomiya/Lung.unity b/Subjects/Assets/Scenes/Anatomiya/Lung.unity index b79edfdc..de1682ea 100644 --- a/Subjects/Assets/Scenes/Anatomiya/Lung.unity +++ b/Subjects/Assets/Scenes/Anatomiya/Lung.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -123,7 +123,7 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} ---- !u!21 &195341496 +--- !u!21 &71060215 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -160,11 +160,11 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 109.0761, g: 18.1581, b: 0, a: 0} + - _halfSize: {r: 80, g: 15, b: 0, a: 0} - _r: {r: 10, g: 10, b: 10, a: 10} - - _rect2props: {r: 0.000015258789, g: 0.0000076293945, b: 82.8971, a: 82.8971} + - _rect2props: {r: 0.0000076293945, g: 0, b: 60.10408, a: 60.10408} m_BuildTextureStacks: [] ---- !u!21 &286539968 +--- !u!21 &174463028 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -201,9 +201,9 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 200, g: 221.21014, b: 0, a: 0} - - _r: {r: 40, g: 40, b: 40, a: 40} - - _rect2props: {r: 0.000015258789, g: -0.000061035156, b: 269.5563, a: 269.5563} + - _halfSize: {r: 109.0761, g: 18.1581, b: 0, a: 0} + - _r: {r: 10, g: 10, b: 10, a: 10} + - _rect2props: {r: 0.000015258789, g: 0.0000076293945, b: 82.8971, a: 82.8971} m_BuildTextureStacks: [] --- !u!1001 &531205010 PrefabInstance: @@ -422,6 +422,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -66 objectReference: {fileID: 0} + - target: {fileID: 2539118851412356162, guid: 5b8e304252e4a2e4b9fd07763589702b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -170 + objectReference: {fileID: 0} - target: {fileID: 3096113286053366570, guid: 5b8e304252e4a2e4b9fd07763589702b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size @@ -497,6 +502,16 @@ PrefabInstance: propertyPath: m_Color.r value: 0.06415099 objectReference: {fileID: 0} + - target: {fileID: 5647246953743182225, guid: 5b8e304252e4a2e4b9fd07763589702b, + type: 3} + propertyPath: Camer2 + value: + objectReference: {fileID: 1661998070} + - target: {fileID: 5647246953743182225, guid: 5b8e304252e4a2e4b9fd07763589702b, + type: 3} + propertyPath: Camera1 + value: + objectReference: {fileID: 1661998071} - target: {fileID: 5841866061830938747, guid: 5b8e304252e4a2e4b9fd07763589702b, type: 3} propertyPath: backgroundImage @@ -636,7 +651,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 286539968} + m_Material: {fileID: 1377992956} m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -1749,6 +1764,47 @@ RectTransform: type: 3} m_PrefabInstance: {fileID: 1100382596} m_PrefabAsset: {fileID: 0} +--- !u!21 &1113526252 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 80, g: 15, b: 0, a: 0} + - _r: {r: 10, g: 10, b: 10, a: 10} + - _rect2props: {r: 0.0000076293945, g: 0, b: 60.10408, a: 60.10408} + m_BuildTextureStacks: [] --- !u!1 &1372713090 GameObject: m_ObjectHideFlags: 0 @@ -1854,6 +1910,47 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1372713090} m_CullTransparentMesh: 1 +--- !u!21 &1377992956 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 200, g: 221.21014, b: 0, a: 0} + - _r: {r: 40, g: 40, b: 40, a: 40} + - _rect2props: {r: 0.000015258789, g: -0.000061035156, b: 269.5563, a: 269.5563} + m_BuildTextureStacks: [] --- !u!1 &1385476097 GameObject: m_ObjectHideFlags: 0 @@ -1941,6 +2038,47 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1385476097} m_CullTransparentMesh: 1 +--- !u!21 &1656723587 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 80, g: 15, b: 0, a: 0} + - _r: {r: 10, g: 10, b: 10, a: 10} + - _rect2props: {r: 0.0000076293945, g: 0, b: 60.10408, a: 60.10408} + m_BuildTextureStacks: [] --- !u!1001 &1661998068 PrefabInstance: m_ObjectHideFlags: 0 @@ -2020,6 +2158,59 @@ Camera: type: 3} m_PrefabInstance: {fileID: 1661998068} m_PrefabAsset: {fileID: 0} +--- !u!1 &1661998070 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6772827042187989566, guid: 56177e65d305e5149a0e0159957d437f, + type: 3} + m_PrefabInstance: {fileID: 1661998068} + m_PrefabAsset: {fileID: 0} +--- !u!1 &1661998071 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4575459509747329933, guid: 56177e65d305e5149a0e0159957d437f, + type: 3} + m_PrefabInstance: {fileID: 1661998068} + m_PrefabAsset: {fileID: 0} +--- !u!21 &2025986091 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 80, g: 15, b: 0, a: 0} + - _r: {r: 10, g: 10, b: 10, a: 10} + - _rect2props: {r: 0.0000076293945, g: 0, b: 60.10408, a: 60.10408} + m_BuildTextureStacks: [] --- !u!1660057539 &9223372036854775807 SceneRoots: m_ObjectHideFlags: 0 diff --git a/Subjects/Assets/Scenes/Anatomiya/MuscleSim.unity b/Subjects/Assets/Scenes/Anatomiya/MuscleSim.unity index 79073dbd..e94a8434 100644 --- a/Subjects/Assets/Scenes/Anatomiya/MuscleSim.unity +++ b/Subjects/Assets/Scenes/Anatomiya/MuscleSim.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.18028352, g: 0.22571376, b: 0.30692244, a: 1} + m_IndirectSpecularColor: {r: 0.18028378, g: 0.22571412, b: 0.30692285, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -220,7 +220,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} m_Name: m_EditorClassIdentifier: - m_Material: {fileID: 1484098860} + m_Material: {fileID: 775174292} m_Color: {r: 1, g: 1, b: 1, a: 0.392} m_RaycastTarget: 1 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} @@ -246,47 +246,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 496512285} m_CullTransparentMesh: 1 ---- !u!21 &554776448 -Material: - serializedVersion: 8 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_Name: UI/RoundedCorners/IndependentRoundedCorners - m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} - m_Parent: {fileID: 0} - m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] - m_InvalidKeywords: [] - m_LightmapFlags: 4 - m_EnableInstancingVariants: 0 - m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} - disabledShaderPasses: [] - m_LockedProperties: - m_SavedProperties: - serializedVersion: 3 - m_TexEnvs: - - _MainTex: - m_Texture: {fileID: 0} - m_Scale: {x: 1, y: 1} - m_Offset: {x: 0, y: 0} - m_Ints: [] - m_Floats: - - _ColorMask: 15 - - _Stencil: 0 - - _StencilComp: 8 - - _StencilOp: 0 - - _StencilReadMask: 255 - - _StencilWriteMask: 255 - - _UseUIAlphaClip: 0 - m_Colors: - - _halfSize: {r: 109.0761, g: 18.1581, b: 0, a: 0} - - _r: {r: 10, g: 10, b: 10, a: 10} - - _rect2props: {r: 0.000015258789, g: 0.0000076293945, b: 82.8971, a: 82.8971} - m_BuildTextureStacks: [] --- !u!1 &733633646 GameObject: m_ObjectHideFlags: 0 @@ -424,6 +383,47 @@ MonoBehaviour: mipBias: 0 varianceClampScale: 0.9 contrastAdaptiveSharpening: 0 +--- !u!21 &775174292 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 200, g: 221.21014, b: 0, a: 0} + - _r: {r: 40, g: 40, b: 40, a: 40} + - _rect2props: {r: 0.000015258789, g: -0.000061035156, b: 269.5563, a: 269.5563} + m_BuildTextureStacks: [] --- !u!1001 &873895182 PrefabInstance: m_ObjectHideFlags: 0 @@ -503,6 +503,18 @@ Camera: type: 3} m_PrefabInstance: {fileID: 873895182} m_PrefabAsset: {fileID: 0} +--- !u!1 &873895184 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 4575459509747329933, guid: 56177e65d305e5149a0e0159957d437f, + type: 3} + m_PrefabInstance: {fileID: 873895182} + m_PrefabAsset: {fileID: 0} +--- !u!1 &873895185 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 6772827042187989566, guid: 56177e65d305e5149a0e0159957d437f, + type: 3} + m_PrefabInstance: {fileID: 873895182} + m_PrefabAsset: {fileID: 0} --- !u!1 &914418448 stripped GameObject: m_CorrespondingSourceObject: {fileID: 5374990366386766025, guid: 63acef25434404946b480bea2c1ff467, @@ -564,6 +576,47 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: material: {fileID: 2100000, guid: 7fac4de3f9b01ba428ac55179ac7043b, type: 2} +--- !u!21 &1103952367 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 80, g: 15, b: 0, a: 0} + - _r: {r: 10, g: 10, b: 10, a: 10} + - _rect2props: {r: 0.0000076293945, g: 0, b: 60.10408, a: 60.10408} + m_BuildTextureStacks: [] --- !u!1001 &1214519167 PrefabInstance: m_ObjectHideFlags: 0 @@ -786,6 +839,47 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1239998619} m_CullTransparentMesh: 1 +--- !u!21 &1292393414 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 109.0761, g: 18.1581, b: 0, a: 0} + - _r: {r: 10, g: 10, b: 10, a: 10} + - _rect2props: {r: 0.000015258789, g: 0.0000076293945, b: 82.8971, a: 82.8971} + m_BuildTextureStacks: [] --- !u!1 &1293607535 GameObject: m_ObjectHideFlags: 0 @@ -1065,6 +1159,88 @@ MonoBehaviour: m_LightCookieSize: {x: 1, y: 1} m_LightCookieOffset: {x: 0, y: 0} m_SoftShadowQuality: 0 +--- !u!21 &1310022779 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 80, g: 15, b: 0, a: 0} + - _r: {r: 10, g: 10, b: 10, a: 10} + - _rect2props: {r: 0.0000076293945, g: 0, b: 60.10408, a: 60.10408} + m_BuildTextureStacks: [] +--- !u!21 &1312000037 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: UI/RoundedCorners/IndependentRoundedCorners + m_Shader: {fileID: 4800000, guid: d3beb88e61f88ca4393acdefb005fa70, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _ColorMask: 15 + - _Stencil: 0 + - _StencilComp: 8 + - _StencilOp: 0 + - _StencilReadMask: 255 + - _StencilWriteMask: 255 + - _UseUIAlphaClip: 0 + m_Colors: + - _halfSize: {r: 80, g: 15, b: 0, a: 0} + - _r: {r: 10, g: 10, b: 10, a: 10} + - _rect2props: {r: 0.0000076293945, g: 0, b: 60.10408, a: 60.10408} + m_BuildTextureStacks: [] --- !u!1001 &1472474431 PrefabInstance: m_ObjectHideFlags: 0 @@ -1237,7 +1413,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ce574497a10495d4cb44bd9fe5e58193, type: 3} m_Name: m_EditorClassIdentifier: ---- !u!21 &1484098860 +--- !u!21 &1502653575 Material: serializedVersion: 8 m_ObjectHideFlags: 0 @@ -1274,9 +1450,9 @@ Material: - _StencilWriteMask: 255 - _UseUIAlphaClip: 0 m_Colors: - - _halfSize: {r: 200, g: 221.21014, b: 0, a: 0} - - _r: {r: 40, g: 40, b: 40, a: 40} - - _rect2props: {r: 0.000015258789, g: -0.000061035156, b: 269.5563, a: 269.5563} + - _halfSize: {r: 80, g: 15, b: 0, a: 0} + - _r: {r: 10, g: 10, b: 10, a: 10} + - _rect2props: {r: 0.0000076293945, g: 0, b: 60.10408, a: 60.10408} m_BuildTextureStacks: [] --- !u!1 &1654811972 GameObject: @@ -1506,6 +1682,11 @@ PrefabInstance: propertyPath: m_AnchoredPosition.y value: -70 objectReference: {fileID: 0} + - target: {fileID: 2539118851412356162, guid: 5b8e304252e4a2e4b9fd07763589702b, + type: 3} + propertyPath: m_AnchoredPosition.y + value: -170 + objectReference: {fileID: 0} - target: {fileID: 3096113286053366570, guid: 5b8e304252e4a2e4b9fd07763589702b, type: 3} propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.size @@ -1581,6 +1762,16 @@ PrefabInstance: propertyPath: m_Color.r value: 0 objectReference: {fileID: 0} + - target: {fileID: 5647246953743182225, guid: 5b8e304252e4a2e4b9fd07763589702b, + type: 3} + propertyPath: Camer2 + value: + objectReference: {fileID: 873895185} + - target: {fileID: 5647246953743182225, guid: 5b8e304252e4a2e4b9fd07763589702b, + type: 3} + propertyPath: Camera1 + value: + objectReference: {fileID: 873895184} - target: {fileID: 5841866061830938747, guid: 5b8e304252e4a2e4b9fd07763589702b, type: 3} propertyPath: backgroundImage From fd3c35cb439d42e7d731aef10cee6169036203de Mon Sep 17 00:00:00 2001 From: Nabiddinov Date: Mon, 18 Mar 2024 12:06:30 +0500 Subject: [PATCH 2/2] update --- Subjects/Assets/Scenes/Test.unity | 424 +++++++++++++++++++++- Subjects/Assets/Scripts/TestController.cs | 106 +++--- 2 files changed, 472 insertions(+), 58 deletions(-) diff --git a/Subjects/Assets/Scenes/Test.unity b/Subjects/Assets/Scenes/Test.unity index c04d5b9e..49caad02 100644 --- a/Subjects/Assets/Scenes/Test.unity +++ b/Subjects/Assets/Scenes/Test.unity @@ -123,6 +123,140 @@ NavMeshSettings: debug: m_Flags: 0 m_NavMeshData: {fileID: 0} +--- !u!1 &219590266 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 219590267} + - component: {fileID: 219590269} + - component: {fileID: 219590268} + m_Layer: 5 + m_Name: Text (TMP) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &219590267 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 219590266} + 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: [] + m_Father: {fileID: 662095649} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 0, y: 0} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &219590268 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 219590266} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: Restart + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 40 + m_fontSizeBase: 40 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &219590269 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 219590266} + m_CullTransparentMesh: 1 --- !u!1 &308344924 GameObject: m_ObjectHideFlags: 0 @@ -412,8 +546,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 395.17944, y: -175} - m_SizeDelta: {x: 327.6543, y: 65.21} + m_AnchoredPosition: {x: 395.17944, y: -184.13159} + m_SizeDelta: {x: 327.6543, y: 114.5771} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &484756712 MonoBehaviour: @@ -497,6 +631,139 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 484756710} m_CullTransparentMesh: 1 +--- !u!1 &662095648 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 662095649} + - component: {fileID: 662095652} + - component: {fileID: 662095651} + - component: {fileID: 662095650} + m_Layer: 5 + m_Name: Restart + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 0 +--- !u!224 &662095649 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 662095648} + 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: 219590267} + m_Father: {fileID: 1602381536} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -26.082916, y: -177} + m_SizeDelta: {x: 327.6543, y: 65.21} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &662095650 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 662095648} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_WrapAround: 0 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_SelectedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_SelectedTrigger: Selected + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 662095651} + m_OnClick: + m_PersistentCalls: + m_Calls: + - m_Target: {fileID: 1632911283} + m_TargetAssemblyTypeName: TestController, Assembly-CSharp + m_MethodName: RestartQuiz + m_Mode: 1 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 +--- !u!114 &662095651 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 662095648} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!222 &662095652 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 662095648} + m_CullTransparentMesh: 1 --- !u!1 &737826090 GameObject: m_ObjectHideFlags: 0 @@ -667,8 +934,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -416.41333, y: -175} - m_SizeDelta: {x: 327.6543, y: 65.21} + m_AnchoredPosition: {x: -416.41333, y: -184.13159} + m_SizeDelta: {x: 327.6543, y: 114.5771} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &945487826 MonoBehaviour: @@ -943,6 +1210,141 @@ Transform: m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1512810839 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1512810840} + - component: {fileID: 1512810842} + - component: {fileID: 1512810841} + m_Layer: 5 + m_Name: To'g'ri javoblar soni + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &1512810840 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1512810839} + 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: [] + m_Father: {fileID: 1602381536} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -3, y: -4} + m_SizeDelta: {x: 1353.5544, y: 123} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!114 &1512810841 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1512810839} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} + m_Maskable: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 1a0556eac6b5c0643a8ab4ef10b65656, type: 2} + m_sharedMaterial: {fileID: -2341785531274235038, guid: 1a0556eac6b5c0643a8ab4ef10b65656, + type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4278190080 + m_fontColor: {r: 0, g: 0, b: 0, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_StyleSheet: {fileID: 0} + m_TextStyleHashCode: -1183493901 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_fontSize: 40 + m_fontSizeBase: 40 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 1 + m_HorizontalAlignment: 2 + m_VerticalAlignment: 512 + m_textAlignment: 65535 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_linkedTextComponent: {fileID: 0} + parentLinkedComponent: {fileID: 0} + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_IsTextObjectScaleStatic: 0 + m_VertexBufferAutoSizeReduction: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_hasFontAssetChanged: 0 + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!222 &1512810842 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1512810839} + m_CullTransparentMesh: 1 --- !u!1 &1519765253 GameObject: m_ObjectHideFlags: 0 @@ -1175,8 +1577,10 @@ RectTransform: m_ConstrainProportionsScale: 0 m_Children: - {fileID: 422503536} + - {fileID: 1512810840} - {fileID: 945487825} - {fileID: 2054922501} + - {fileID: 662095649} - {fileID: 484756711} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1216,9 +1620,11 @@ MonoBehaviour: m_EditorClassIdentifier: questionText: {fileID: 422503537} answerButtons: - - {fileID: 1671362235} - - {fileID: 737826092} - - {fileID: 1701705369} + - {fileID: 945487826} + - {fileID: 2054922502} + - {fileID: 484756712} + resultText: {fileID: 1512810841} + restartButton: {fileID: 662095650} --- !u!4 &1632911284 Transform: m_ObjectHideFlags: 0 @@ -1538,8 +1944,8 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -26.082916, y: -175} - m_SizeDelta: {x: 327.6543, y: 65.21} + m_AnchoredPosition: {x: -26.082916, y: -184.13159} + m_SizeDelta: {x: 327.6543, y: 114.5771} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &2054922502 MonoBehaviour: diff --git a/Subjects/Assets/Scripts/TestController.cs b/Subjects/Assets/Scripts/TestController.cs index 943df6ce..2d4e411f 100644 --- a/Subjects/Assets/Scripts/TestController.cs +++ b/Subjects/Assets/Scripts/TestController.cs @@ -1,84 +1,92 @@ -using System; -using System.Collections.Generic; using TMPro; using UnityEngine; +using UnityEngine.UI; public class TestController : MonoBehaviour { - public TMP_Text questionText; - public TMP_Text[] answerButtons; + public TextMeshProUGUI questionText; + public Button[] answerButtons; + public TextMeshProUGUI resultText; + public Button restartButton; - private List> questionAnswerPairs = new List>(); + private string[] questions = { + "What is the capital of Japan?", + "Who painted the Mona Lisa?", + "What is the chemical symbol for water?" + }; + + private string[][] answers = { + new string[]{"Tokyo", "Seoul", "Beijing"}, + new string[]{"Leonardo da Vinci", "Vincent van Gogh", "Pablo Picasso"}, + new string[]{"H2O", "CO2", "NaCl"} + }; + + private int[] correctAnswersIndex = { 0, 0, 0 }; private int currentQuestionIndex = 0; private int correctAnswersCount = 0; void Start() { - InitializeQuestions(); - SetQuestion(currentQuestionIndex); - } - - void InitializeQuestions() - { - // Populate the list with questions and their answers - questionAnswerPairs.Add(new Tuple("What is the capital of France?", new string[] { "Paris", "Berlin", "London" })); - questionAnswerPairs.Add(new Tuple("Who painted the Mona Lisa?", new string[] { "Leonardo da Vinci", "Pablo Picasso", "Vincent van Gogh" })); - questionAnswerPairs.Add(new Tuple("What is the tallest mountain in the world?", new string[] { "Mount Everest", "K2", "Kangchenjunga" })); - - // Shuffle the list of questions and answers - ShuffleQuestions(); + LoadQuestion(currentQuestionIndex); } - void ShuffleQuestions() + void LoadQuestion(int questionIndex) { - System.Random rng = new System.Random(); - int n = questionAnswerPairs.Count; - while (n > 1) + questionText.text = questions[questionIndex]; + for (int i = 0; i < answerButtons.Length; i++) { - n--; - int k = rng.Next(n + 1); - var value = questionAnswerPairs[k]; - questionAnswerPairs[k] = questionAnswerPairs[n]; - questionAnswerPairs[n] = value; + answerButtons[i].GetComponentInChildren().text = answers[questionIndex][i]; + int answerIndex = i; + answerButtons[i].onClick.RemoveAllListeners(); + answerButtons[i].onClick.AddListener(() => CheckAnswer(answerIndex)); } } - void SetQuestion(int index) + void CheckAnswer(int selectedAnswerIndex) { - if (index < questionAnswerPairs.Count) + if (selectedAnswerIndex == correctAnswersIndex[currentQuestionIndex]) { - questionText.text = questionAnswerPairs[index].Item1; - - for (int i = 0; i < answerButtons.Length; i++) - { - answerButtons[i].text = questionAnswerPairs[index].Item2[i]; - } + Debug.Log("Correct answer!"); + correctAnswersCount++; } else { - Debug.Log("Quiz finished! Correct Answers: " + correctAnswersCount); + Debug.Log("Incorrect answer!"); } - } - - public void CheckAnswer(string selectedAnswer) - { - string correctAnswer = questionAnswerPairs[currentQuestionIndex].Item2[0]; - if (selectedAnswer == correctAnswer) + currentQuestionIndex++; + if (currentQuestionIndex < questions.Length) { - Debug.Log("Correct!"); - correctAnswersCount++; + LoadQuestion(currentQuestionIndex); } else { - Debug.Log("Incorrect!"); + ShowResult(); } + } - // Move to the next question - currentQuestionIndex++; - if (currentQuestionIndex < questionAnswerPairs.Count) + void ShowResult() + { + resultText.text = "You answered " + correctAnswersCount + " out of " + questions.Length + " questions correctly."; + questionText.gameObject.SetActive(false); + foreach (Button button in answerButtons) + { + button.gameObject.SetActive(false); + } + restartButton.gameObject.SetActive(true); + } + + public void RestartQuiz() + { + currentQuestionIndex = 0; + correctAnswersCount = 0; + questionText.gameObject.SetActive(true); + foreach (Button button in answerButtons) { - SetQuestion(currentQuestionIndex); + button.gameObject.SetActive(true); } + resultText.text = ""; + restartButton.gameObject.SetActive(false); + LoadQuestion(currentQuestionIndex); } }