diff --git a/Assets/Projects/~$(数学)立体几何体认知与计算脚本(2).xlsx.meta b/Assets/Projects/~$(数学)立体几何体认知与计算脚本(2).xlsx.meta new file mode 100644 index 00000000..e459ec1d --- /dev/null +++ b/Assets/Projects/~$(数学)立体几何体认知与计算脚本(2).xlsx.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 05b7496d94e7d684a8bf1c3320f42908 +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Projects/(数学)立体几何体认知与计算脚本(2).xlsx b/Assets/Projects/(数学)立体几何体认知与计算脚本(2).xlsx index 6e434ab8..d1751bcd 100644 Binary files a/Assets/Projects/(数学)立体几何体认知与计算脚本(2).xlsx and b/Assets/Projects/(数学)立体几何体认知与计算脚本(2).xlsx differ diff --git a/Assets/Scenes/ExamScenes/01_JiaoXue.unity b/Assets/Scenes/ExamScenes/01_JiaoXue.unity index a34dba67..94911787 100644 --- a/Assets/Scenes/ExamScenes/01_JiaoXue.unity +++ b/Assets/Scenes/ExamScenes/01_JiaoXue.unity @@ -318,7 +318,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 132836837} - m_Enabled: 0 + m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -1146,6 +1146,89 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0, y: 0} +--- !u!1 &591329623 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 591329624} + - component: {fileID: 591329626} + - component: {fileID: 591329625} + m_Layer: 0 + m_Name: "\u68F1\u9525\u9876\u70B9" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 69 + m_IsActive: 1 +--- !u!4 &591329624 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 591329623} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0.0005403124, y: 0.29608, z: 0.0013} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1048193406} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &591329625 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 591329623} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &591329626 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 591329623} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &608014127 GameObject: m_ObjectHideFlags: 0 @@ -1745,7 +1828,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 6047383785361520804, guid: 377e2d7235d2ffd4684c67b1127d172f, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 6047383785361520804, guid: 377e2d7235d2ffd4684c67b1127d172f, type: 3} propertyPath: m_StaticEditorFlags @@ -1772,34 +1855,46 @@ PrefabInstance: m_AddedGameObjects: - targetCorrespondingSourceObject: {fileID: -6943949648764382350, guid: 377e2d7235d2ffd4684c67b1127d172f, type: 3} insertIndex: -1 - addedObject: {fileID: 1822372372} + addedObject: {fileID: 1434451488} + - targetCorrespondingSourceObject: {fileID: -6943949648764382350, guid: 377e2d7235d2ffd4684c67b1127d172f, type: 3} + insertIndex: -1 + addedObject: {fileID: 1032994695} - targetCorrespondingSourceObject: {fileID: -6943949648764382350, guid: 377e2d7235d2ffd4684c67b1127d172f, type: 3} insertIndex: -1 addedObject: {fileID: 240304287} - targetCorrespondingSourceObject: {fileID: -6943949648764382350, guid: 377e2d7235d2ffd4684c67b1127d172f, type: 3} insertIndex: -1 - addedObject: {fileID: 248517711} + addedObject: {fileID: 1822372372} - targetCorrespondingSourceObject: {fileID: -6943949648764382350, guid: 377e2d7235d2ffd4684c67b1127d172f, type: 3} insertIndex: -1 addedObject: {fileID: 261523059} - targetCorrespondingSourceObject: {fileID: -6943949648764382350, guid: 377e2d7235d2ffd4684c67b1127d172f, type: 3} insertIndex: -1 - addedObject: {fileID: 1434451488} + addedObject: {fileID: 1910722537} + - targetCorrespondingSourceObject: {fileID: -6943949648764382350, guid: 377e2d7235d2ffd4684c67b1127d172f, type: 3} + insertIndex: -1 + addedObject: {fileID: 248517711} - targetCorrespondingSourceObject: {fileID: -6943949648764382350, guid: 377e2d7235d2ffd4684c67b1127d172f, type: 3} insertIndex: -1 addedObject: {fileID: 1020759835} - - targetCorrespondingSourceObject: {fileID: -6943949648764382350, guid: 377e2d7235d2ffd4684c67b1127d172f, type: 3} - insertIndex: -1 - addedObject: {fileID: 1032994695} - targetCorrespondingSourceObject: {fileID: -7112315291603071433, guid: 377e2d7235d2ffd4684c67b1127d172f, type: 3} insertIndex: -1 - addedObject: {fileID: 930037432} + addedObject: {fileID: 1100002567} + - targetCorrespondingSourceObject: {fileID: -7112315291603071433, guid: 377e2d7235d2ffd4684c67b1127d172f, type: 3} + insertIndex: -1 + addedObject: {fileID: 1662921218} - targetCorrespondingSourceObject: {fileID: -7112315291603071433, guid: 377e2d7235d2ffd4684c67b1127d172f, type: 3} insertIndex: -1 addedObject: {fileID: 132836838} - targetCorrespondingSourceObject: {fileID: -7112315291603071433, guid: 377e2d7235d2ffd4684c67b1127d172f, type: 3} insertIndex: -1 - addedObject: {fileID: 1100002567} + addedObject: {fileID: 1821902538} + - targetCorrespondingSourceObject: {fileID: -7112315291603071433, guid: 377e2d7235d2ffd4684c67b1127d172f, type: 3} + insertIndex: -1 + addedObject: {fileID: 930037432} + - targetCorrespondingSourceObject: {fileID: -7112315291603071433, guid: 377e2d7235d2ffd4684c67b1127d172f, type: 3} + insertIndex: -1 + addedObject: {fileID: 591329624} - targetCorrespondingSourceObject: {fileID: -5599792340804466602, guid: 377e2d7235d2ffd4684c67b1127d172f, type: 3} insertIndex: -1 addedObject: {fileID: 151912020} @@ -1808,7 +1903,10 @@ PrefabInstance: addedObject: {fileID: 1587023698} - targetCorrespondingSourceObject: {fileID: 7107738202878917103, guid: 377e2d7235d2ffd4684c67b1127d172f, type: 3} insertIndex: -1 - addedObject: {fileID: 1029838799} + addedObject: {fileID: 1635669064} + - targetCorrespondingSourceObject: {fileID: 7107738202878917103, guid: 377e2d7235d2ffd4684c67b1127d172f, type: 3} + insertIndex: -1 + addedObject: {fileID: 632777751} - targetCorrespondingSourceObject: {fileID: 7107738202878917103, guid: 377e2d7235d2ffd4684c67b1127d172f, type: 3} insertIndex: -1 addedObject: {fileID: 1254165908} @@ -1817,7 +1915,7 @@ PrefabInstance: addedObject: {fileID: 383927640} - targetCorrespondingSourceObject: {fileID: 7107738202878917103, guid: 377e2d7235d2ffd4684c67b1127d172f, type: 3} insertIndex: -1 - addedObject: {fileID: 632777751} + addedObject: {fileID: 1029838799} - targetCorrespondingSourceObject: {fileID: 6454615014408105641, guid: 377e2d7235d2ffd4684c67b1127d172f, type: 3} insertIndex: -1 addedObject: {fileID: 1302946914} @@ -2365,7 +2463,7 @@ GameObject: - component: {fileID: 930037434} - component: {fileID: 930037433} m_Layer: 0 - m_Name: "\u68F1\u9525\u9AD8" + m_Name: "\u68F1\u9525\u68F1\u9AD8" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2393,7 +2491,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 930037431} - m_Enabled: 0 + m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -2978,7 +3076,7 @@ GameObject: - component: {fileID: 1029838802} - component: {fileID: 1029838801} m_Layer: 0 - m_Name: "\u5706\u67F1\u4E0A\u5E95\u9762" + m_Name: "\u5706\u67F1\u9AD8" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -2993,7 +3091,7 @@ Transform: m_GameObject: {fileID: 1029838798} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.586, z: 0} + m_LocalPosition: {x: 0, y: 0.339, z: -0.111} m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} m_ConstrainProportionsScale: 0 m_Children: [] @@ -3061,7 +3159,7 @@ GameObject: - component: {fileID: 1032994697} - component: {fileID: 1032994696} m_Layer: 0 - m_Name: "\u4E0A\u5E95\u9762\u8FB9\u957F" + m_Name: "\u68F1\u67F1\u4E0A\u5E95\u9762\u8FB9\u957F" m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 @@ -3492,7 +3590,7 @@ MeshRenderer: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1100002566} - m_Enabled: 0 + m_Enabled: 1 m_CastShadows: 1 m_ReceiveShadows: 1 m_DynamicOccludee: 1 @@ -5106,6 +5204,89 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1628051443} m_CullTransparentMesh: 1 +--- !u!1 &1635669063 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1635669064} + - component: {fileID: 1635669066} + - component: {fileID: 1635669065} + m_Layer: 0 + m_Name: "\u5706\u67F1\u8F74" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 69 + m_IsActive: 1 +--- !u!4 &1635669064 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1635669063} + serializedVersion: 2 + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.487, z: 0} + m_LocalScale: {x: 0.05, y: 0.05, z: 0.05} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 414085418} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1635669065 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1635669063} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1635669066 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1635669063} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1662479002 GameObject: m_ObjectHideFlags: 0 @@ -5142,6 +5323,89 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1662921217 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1662921218} + - component: {fileID: 1662921220} + - component: {fileID: 1662921219} + m_Layer: 0 + m_Name: "\u68F1\u9525\u5E95\u9762\u8FB9\u957F" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 69 + m_IsActive: 1 +--- !u!4 &1662921218 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1662921217} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0, y: -0.2976, z: -0.0983} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1048193406} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1662921219 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1662921217} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1662921220 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1662921217} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1723362957 GameObject: m_ObjectHideFlags: 0 @@ -5328,6 +5592,89 @@ RectTransform: m_AnchoredPosition: {x: -4.9999695, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1821902537 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1821902538} + - component: {fileID: 1821902540} + - component: {fileID: 1821902539} + m_Layer: 0 + m_Name: "\u68F1\u9525\u4FA7\u68F1" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 69 + m_IsActive: 1 +--- !u!4 &1821902538 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1821902537} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0.081974596, w: 0.9966345} + m_LocalPosition: {x: -0.037, y: 0.054, z: 0.038} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 1048193406} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: -9.404} +--- !u!23 &1821902539 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1821902537} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1821902540 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1821902537} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1822372371 GameObject: m_ObjectHideFlags: 0 @@ -5537,6 +5884,89 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: -20, y: 0} m_Pivot: {x: 0.5, y: 0.5} +--- !u!1 &1910722536 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1910722537} + - component: {fileID: 1910722539} + - component: {fileID: 1910722538} + m_Layer: 0 + m_Name: "\u4FA7\u68F1" + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 69 + m_IsActive: 1 +--- !u!4 &1910722537 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1910722536} + serializedVersion: 2 + m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} + m_LocalPosition: {x: 0.007, y: 0.32, z: 0.205} + m_LocalScale: {x: 0.01, y: 0.01, z: 0.01} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 35937780} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!23 &1910722538 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1910722536} + m_Enabled: 0 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1910722539 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1910722536} + m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} --- !u!1 &1924845557 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/UIGuidTip/UIGuideTip.cs b/Assets/Scripts/UIGuidTip/UIGuideTip.cs index 96f2a6ea..edc25de9 100644 --- a/Assets/Scripts/UIGuidTip/UIGuideTip.cs +++ b/Assets/Scripts/UIGuidTip/UIGuideTip.cs @@ -76,7 +76,7 @@ namespace QFramework.Example Debug.Log(mData); List Objs = mData.targets.Split(',')?.ToList(); List ShowTexts = mData.showName.Split(',')?.ToList(); - + List textTip =mData.tiptextAudio.Split(',')?.ToList(); if (String.IsNullOrEmpty(mData.offestPos) == false) { diff --git a/Assets/Scripts/Xml/XmlParser.cs b/Assets/Scripts/Xml/XmlParser.cs index 3feebfbe..97f4fa14 100644 --- a/Assets/Scripts/Xml/XmlParser.cs +++ b/Assets/Scripts/Xml/XmlParser.cs @@ -1769,6 +1769,16 @@ namespace XMLTool act.args.Add("offSet", offSet.Value); } + XAttribute tiptextAudio = action.Attribute("tiptextAudio"); + if (offSet != null) + { + act.args.Add("tiptextAudio", tiptextAudio.Value); + + } + else + { + Debug.Log("ʱΪ"); + } newAction = act; } diff --git a/Data/Xml/01_JiaoXue.xml b/Data/Xml/01_JiaoXue.xml index 2bccfbe1..9fd58e79 100644 --- a/Data/Xml/01_JiaoXue.xml +++ b/Data/Xml/01_JiaoXue.xml @@ -12,9 +12,9 @@ JiHeTi/LengZhu.png - - - + + + 棱锥 @@ -22,10 +22,10 @@ JiHeTi/LengZhui.png - - - - + + + + 球体 @@ -33,7 +33,7 @@ JiHeTi/QiuTi.png - + 圆柱 @@ -60,7 +60,7 @@ - + - - - - @@ -113,7 +121,7 @@ - + @@ -125,7 +133,20 @@ - + - + - - + + @@ -161,7 +182,21 @@ - + - + - - + + @@ -196,25 +231,33 @@ - + - +体叫作球体,简称球。" position="right" scrollSpeed="25"/>--> - + - - + + - - + + @@ -233,11 +276,21 @@ 平行于轴的边旋转形成的曲面叫作圆柱的侧面 无论旋转到什么位置,这条边都叫作侧面的母线 两个底面间的距离叫作圆柱的高 " position="right" scrollSpeed="25"/> - - - - + + + + @@ -248,12 +301,12 @@ - - + + - + @@ -275,7 +328,21 @@ 顶点到底面的距离叫作圆锥的高. " position="right" scrollSpeed="25"/> - + @@ -284,15 +351,15 @@ - - + + - + - - + +