From 6c52e2a2dbce49d93a3785d4bc41dbc987754490 Mon Sep 17 00:00:00 2001 From: Lihao7788 <2470304407@qq.com> Date: Thu, 20 Feb 2025 14:01:48 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=8C=E6=8A=98=E5=B0=84?= =?UTF-8?q?=E4=BB=AA=E5=9C=BA=E6=99=AF=EF=BC=8C=E4=BF=AE=E6=94=B9=E3=80=82?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=20=E7=8F=A0=E5=AE=9D=E9=89=B4=E5=AE=9A?= =?UTF-8?q?=E5=8A=A0=E5=B7=A5=E4=BB=BF=E7=9C=9F=E7=A8=8B=E5=BA=8Fxml?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Projects/AnHui/ZheSheYi/Material.meta | 8 + .../AnHui/ZheSheYi/Material/ZheSheYou.mat | 133 ++++++++ .../ZheSheYi/Material/ZheSheYou.mat.meta | 8 + .../TimeLine/CaBaoShiLengJing.playable | 168 +++++----- Assets/Scenes/ExameScene/ZheSheYiScene.unity | 224 +++---------- Data/Xml/ZheSheYi.xml | 4 +- Data/Xml/ZhuBaoJianDingGuangXueYiQi.xml | 311 ------------------ 7 files changed, 274 insertions(+), 582 deletions(-) create mode 100644 Assets/Projects/AnHui/ZheSheYi/Material.meta create mode 100644 Assets/Projects/AnHui/ZheSheYi/Material/ZheSheYou.mat create mode 100644 Assets/Projects/AnHui/ZheSheYi/Material/ZheSheYou.mat.meta diff --git a/Assets/Projects/AnHui/ZheSheYi/Material.meta b/Assets/Projects/AnHui/ZheSheYi/Material.meta new file mode 100644 index 00000000..34757e93 --- /dev/null +++ b/Assets/Projects/AnHui/ZheSheYi/Material.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 3d01476b05f57df4384f8f97c4acface +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Projects/AnHui/ZheSheYi/Material/ZheSheYou.mat b/Assets/Projects/AnHui/ZheSheYi/Material/ZheSheYou.mat new file mode 100644 index 00000000..9e667985 --- /dev/null +++ b/Assets/Projects/AnHui/ZheSheYi/Material/ZheSheYou.mat @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-5972886957519887063 +MonoBehaviour: + m_ObjectHideFlags: 11 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} + m_Name: + m_EditorClassIdentifier: + version: 7 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ZheSheYou + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, 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: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.941 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 0, g: 0, b: 0, a: 1} + - _Color: {r: 0, g: 0, b: 0, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} + - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} + m_BuildTextureStacks: [] diff --git a/Assets/Projects/AnHui/ZheSheYi/Material/ZheSheYou.mat.meta b/Assets/Projects/AnHui/ZheSheYi/Material/ZheSheYou.mat.meta new file mode 100644 index 00000000..2f6859be --- /dev/null +++ b/Assets/Projects/AnHui/ZheSheYi/Material/ZheSheYou.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ab25936ae87ad934da51b4e45ec42d77 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Projects/AnHui/ZheSheYi/TimeLine/CaBaoShiLengJing.playable b/Assets/Projects/AnHui/ZheSheYi/TimeLine/CaBaoShiLengJing.playable index b67a20e8..0eb5f31b 100644 --- a/Assets/Projects/AnHui/ZheSheYi/TimeLine/CaBaoShiLengJing.playable +++ b/Assets/Projects/AnHui/ZheSheYi/TimeLine/CaBaoShiLengJing.playable @@ -610,23 +610,23 @@ AnimationClip: - serializedVersion: 3 time: 3.65 value: {x: 0.06309995, y: -0.041099787, z: -0.045402646} - inSlope: {x: 0, y: 0, z: 0.012706309} - outSlope: {x: 0, y: 0, z: 0.012706309} + inSlope: {x: 0, y: 0, z: 0.012000403} + outSlope: {x: 0, y: 0, z: 0.012000403} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 3.7666667 + time: 3.7833333 value: {x: 0.062999934, y: -0.041099787, z: -0.039702654} - inSlope: {x: -0.0016002656, y: 0, z: 0.0032005303} - outSlope: {x: -0.0016002656, y: 0, z: 0.0032005303} + inSlope: {x: -0.0014119992, y: 0, z: 0.0028239978} + outSlope: {x: -0.0014119992, y: 0, z: 0.0028239978} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 3.9 + time: 3.9333334 value: {x: 0.062299967, y: -0.013799906, z: -0.03950262} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -635,7 +635,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 4 + time: 4.05 value: {x: 0.062999934, y: -0.041099787, z: -0.039702654} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -644,7 +644,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 4.116667 + time: 4.1833334 value: {x: 0.062999934, y: -0.041099787, z: -0.039702654} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -653,7 +653,7 @@ AnimationClip: inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 4.2166667 + time: 4.3 value: {x: 0.062299967, y: -0.013799906, z: -0.03950262} inSlope: {x: 0, y: 0, z: 0} outSlope: {x: 0, y: 0, z: 0} @@ -661,29 +661,29 @@ AnimationClip: weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - - serializedVersion: 3 - time: 4.35 - value: {x: 0.062999934, y: -0.041099787, z: -0.039702654} - inSlope: {x: 0.0017145717, y: 0, z: -0.0034291437} - outSlope: {x: 0.0017145717, y: 0, z: -0.0034291437} - tangentMode: 0 - weightedMode: 0 - inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 time: 4.45 - value: {x: 0.06309995, y: -0.041099787, z: -0.045402646} - inSlope: {x: 0, y: 0, z: -0.018000577} - outSlope: {x: 0, y: 0, z: -0.018000577} + value: {x: 0.062999934, y: -0.041099787, z: -0.039702654} + inSlope: {x: 0.0015002502, y: 0, z: -0.0030005006} + outSlope: {x: 0.0015002502, y: 0, z: -0.0030005006} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} - serializedVersion: 3 - time: 4.55 + time: 4.5666666 + value: {x: 0.06309995, y: -0.041099787, z: -0.045402646} + inSlope: {x: 0, y: 0, z: -0.015429071} + outSlope: {x: 0, y: 0, z: -0.015429071} + tangentMode: 0 + weightedMode: 0 + inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + outWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} + - serializedVersion: 3 + time: 4.6833334 value: {x: 0.0015999377, y: -0.04279995, z: -0.046302676} - inSlope: {x: -0.021332487, y: 0, z: 0} - outSlope: {x: -0.021332487, y: 0, z: 0} + inSlope: {x: -0.034907717, y: 0, z: 0} + outSlope: {x: -0.034907717, y: 0, z: 0} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -691,8 +691,8 @@ AnimationClip: - serializedVersion: 3 time: 4.75 value: {x: 0, y: 0, z: -0.011392593} - inSlope: {x: 0, y: 0, z: 0.10126754} - outSlope: {x: 0, y: 0, z: 0.10126754} + inSlope: {x: 0, y: 0, z: 0.14390646} + outSlope: {x: 0, y: 0, z: 0.14390646} tangentMode: 0 weightedMode: 0 inWeight: {x: 0.33333334, y: 0.33333334, z: 0.33333334} @@ -972,16 +972,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.7666667 + time: 3.7833333 value: 0.062999934 - inSlope: -0.0016002656 - outSlope: -0.0016002656 + inSlope: -0.0014119992 + outSlope: -0.0014119992 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.9 + time: 3.9333334 value: 0.062299967 inSlope: 0 outSlope: 0 @@ -990,7 +990,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 4 + time: 4.05 value: 0.062999934 inSlope: 0 outSlope: 0 @@ -999,7 +999,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 4.116667 + time: 4.1833334 value: 0.062999934 inSlope: 0 outSlope: 0 @@ -1008,7 +1008,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 4.2166667 + time: 4.3 value: 0.062299967 inSlope: 0 outSlope: 0 @@ -1016,17 +1016,17 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 4.35 - value: 0.062999934 - inSlope: 0.0017145717 - outSlope: 0.0017145717 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 4.45 + value: 0.062999934 + inSlope: 0.0015002502 + outSlope: 0.0015002502 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4.5666666 value: 0.06309995 inSlope: 0 outSlope: 0 @@ -1035,10 +1035,10 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 4.55 + time: 4.6833334 value: 0.0015999377 - inSlope: -0.021332487 - outSlope: -0.021332487 + inSlope: -0.034907717 + outSlope: -0.034907717 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 @@ -1281,7 +1281,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.7666667 + time: 3.7833333 value: -0.041099787 inSlope: 0 outSlope: 0 @@ -1290,7 +1290,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.9 + time: 3.9333334 value: -0.013799906 inSlope: 0 outSlope: 0 @@ -1299,7 +1299,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 4 + time: 4.05 value: -0.041099787 inSlope: 0 outSlope: 0 @@ -1308,7 +1308,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 4.116667 + time: 4.1833334 value: -0.041099787 inSlope: 0 outSlope: 0 @@ -1317,7 +1317,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 4.2166667 + time: 4.3 value: -0.013799906 inSlope: 0 outSlope: 0 @@ -1325,15 +1325,6 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 4.35 - value: -0.041099787 - inSlope: 0 - outSlope: 0 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 4.45 value: -0.041099787 @@ -1344,7 +1335,16 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 4.55 + time: 4.5666666 + value: -0.041099787 + inSlope: 0 + outSlope: 0 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4.6833334 value: -0.04279995 inSlope: 0 outSlope: 0 @@ -1583,23 +1583,23 @@ AnimationClip: - serializedVersion: 3 time: 3.65 value: -0.045402646 - inSlope: 0.012706309 - outSlope: 0.012706309 + inSlope: 0.012000403 + outSlope: 0.012000403 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.7666667 + time: 3.7833333 value: -0.039702654 - inSlope: 0.0032005303 - outSlope: 0.0032005303 + inSlope: 0.0028239978 + outSlope: 0.0028239978 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 3.9 + time: 3.9333334 value: -0.03950262 inSlope: 0 outSlope: 0 @@ -1608,7 +1608,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 4 + time: 4.05 value: -0.039702654 inSlope: 0 outSlope: 0 @@ -1617,7 +1617,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 4.116667 + time: 4.1833334 value: -0.039702654 inSlope: 0 outSlope: 0 @@ -1626,7 +1626,7 @@ AnimationClip: inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 4.2166667 + time: 4.3 value: -0.03950262 inSlope: 0 outSlope: 0 @@ -1634,26 +1634,26 @@ AnimationClip: weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - - serializedVersion: 3 - time: 4.35 - value: -0.039702654 - inSlope: -0.0034291437 - outSlope: -0.0034291437 - tangentMode: 136 - weightedMode: 0 - inWeight: 0.33333334 - outWeight: 0.33333334 - serializedVersion: 3 time: 4.45 - value: -0.045402646 - inSlope: -0.018000577 - outSlope: -0.018000577 + value: -0.039702654 + inSlope: -0.0030005006 + outSlope: -0.0030005006 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 outWeight: 0.33333334 - serializedVersion: 3 - time: 4.55 + time: 4.5666666 + value: -0.045402646 + inSlope: -0.015429071 + outSlope: -0.015429071 + tangentMode: 136 + weightedMode: 0 + inWeight: 0.33333334 + outWeight: 0.33333334 + - serializedVersion: 3 + time: 4.6833334 value: -0.046302676 inSlope: 0 outSlope: 0 @@ -1664,8 +1664,8 @@ AnimationClip: - serializedVersion: 3 time: 4.75 value: -0.011392593 - inSlope: 0.10126754 - outSlope: 0.10126754 + inSlope: 0.14390646 + outSlope: 0.14390646 tangentMode: 136 weightedMode: 0 inWeight: 0.33333334 diff --git a/Assets/Scenes/ExameScene/ZheSheYiScene.unity b/Assets/Scenes/ExameScene/ZheSheYiScene.unity index 68b6faee..9a94a2cb 100644 --- a/Assets/Scenes/ExameScene/ZheSheYiScene.unity +++ b/Assets/Scenes/ExameScene/ZheSheYiScene.unity @@ -219,7 +219,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &77596692 Transform: m_ObjectHideFlags: 0 @@ -230,7 +230,7 @@ Transform: serializedVersion: 2 m_LocalRotation: {x: 0.5, y: 0.5, z: 0.5, w: 0.5} m_LocalPosition: {x: 0, y: -0.01576, z: 0.01206} - m_LocalScale: {x: 0.000451373, y: 0.000022749198, z: 0.000451373} + m_LocalScale: {x: 0.0007737436, y: 0.000038996677, z: 0.0007737436} m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 1495653726} @@ -255,7 +255,7 @@ MeshRenderer: m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 31321ba15b8f8eb4c954353edc038b1d, type: 2} + - {fileID: 2100000, guid: ab25936ae87ad934da51b4e45ec42d77, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -1444,16 +1444,16 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 597540855} - m_Enabled: 1 + m_Enabled: 0 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_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 + m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -2449,6 +2449,10 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 5440780362238071977, guid: 75cc1181e6f88364f90836557303434a, type: 3} + propertyPath: m_Intensity + value: 0.6 + objectReference: {fileID: 0} - target: {fileID: 6322162075940023093, guid: 75cc1181e6f88364f90836557303434a, type: 3} propertyPath: m_LocalPosition.x value: -12.719273 @@ -3080,7 +3084,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!224 &953164476 RectTransform: m_ObjectHideFlags: 0 @@ -3996,124 +4000,6 @@ Animator: m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorStateOnDisable: 0 m_WriteDefaultValuesOnDisable: 0 ---- !u!1 &1143335191 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1143335194} - - component: {fileID: 1143335193} - - component: {fileID: 1143335192} - m_Layer: 0 - m_Name: Directional Light - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!114 &1143335192 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1143335191} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 474bcb49853aa07438625e644c072ee6, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Version: 3 - m_UsePipelineSettings: 1 - m_AdditionalLightsShadowResolutionTier: 2 - m_LightLayerMask: 1 - m_RenderingLayers: 1 - m_CustomShadowLayers: 0 - m_ShadowLayerMask: 1 - m_ShadowRenderingLayers: 1 - m_LightCookieSize: {x: 1, y: 1} - m_LightCookieOffset: {x: 0, y: 0} - m_SoftShadowQuality: 0 ---- !u!108 &1143335193 -Light: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1143335191} - m_Enabled: 1 - serializedVersion: 10 - m_Type: 1 - m_Shape: 0 - m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 0.4 - m_Range: 10 - m_SpotAngle: 30 - m_InnerSpotAngle: 21.80208 - m_CookieSize: 10 - m_Shadows: - m_Type: 2 - m_Resolution: -1 - m_CustomResolution: -1 - m_Strength: 0.9 - m_Bias: 0.02 - m_NormalBias: 0.1 - m_NearPlane: 0.1 - m_CullingMatrixOverride: - e00: 1 - e01: 0 - e02: 0 - e03: 0 - e10: 0 - e11: 1 - e12: 0 - e13: 0 - e20: 0 - e21: 0 - e22: 1 - e23: 0 - e30: 0 - e31: 0 - e32: 0 - e33: 1 - m_UseCullingMatrixOverride: 0 - m_Cookie: {fileID: 0} - m_DrawHalo: 0 - m_Flare: {fileID: 0} - m_RenderMode: 0 - m_CullingMask: - serializedVersion: 2 - m_Bits: 4294967295 - m_RenderingLayerMask: 1 - m_Lightmapping: 4 - m_LightShadowCasterMode: 0 - m_AreaSize: {x: 1, y: 1} - m_BounceIntensity: 1 - m_ColorTemperature: 6570 - m_UseColorTemperature: 0 - m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0} - m_UseBoundingSphereOverride: 0 - m_UseViewFrustumForShadowCasterCull: 1 - m_ShadowRadius: 0 - m_ShadowAngle: 0 ---- !u!4 &1143335194 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1143335191} - serializedVersion: 2 - m_LocalRotation: {x: 0.46984634, y: -0.17101005, z: 0.2961981, w: 0.8137977} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 - m_Children: [] - m_Father: {fileID: 1562416270} - m_LocalEulerAnglesHint: {x: 60, y: 0, z: 40} --- !u!1 &1165157766 GameObject: m_ObjectHideFlags: 0 @@ -4303,7 +4189,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3} m_Name: m_EditorClassIdentifier: - m_IgnoreReversedGraphics: 1 + m_IgnoreReversedGraphics: 0 m_BlockingObjects: 0 m_BlockingMask: serializedVersion: 2 @@ -4399,16 +4285,16 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1272924931} - m_Enabled: 1 + m_Enabled: 0 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_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 + m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -4742,8 +4628,8 @@ GameObject: m_CorrespondingSourceObject: {fileID: 6270407496669726079, guid: 5a491c682770cf44fa7894d9d74a5f1b, type: 3} m_PrefabInstance: {fileID: 1495653725} m_PrefabAsset: {fileID: 0} ---- !u!65 &1495653731 -BoxCollider: +--- !u!64 &1495653731 +MeshCollider: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} @@ -4760,9 +4646,10 @@ BoxCollider: m_IsTrigger: 0 m_ProvidesContacts: 0 m_Enabled: 1 - serializedVersion: 3 - m_Size: {x: 0.020318463, y: 0.020024288, z: 0.0047564604} - m_Center: {x: -0.0000000023283064, y: 0.00000014994298, z: -0.00000038719742} + serializedVersion: 5 + m_Convex: 1 + m_CookingOptions: 30 + m_Mesh: {fileID: -8973083661710635950, guid: 5a491c682770cf44fa7894d9d74a5f1b, type: 3} --- !u!1 &1499802498 GameObject: m_ObjectHideFlags: 0 @@ -4842,38 +4729,6 @@ CanvasRenderer: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1499802498} m_CullTransparentMesh: 1 ---- !u!1 &1562416269 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 1562416270} - m_Layer: 0 - m_Name: Lights - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 0 ---- !u!4 &1562416270 -Transform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1562416269} - 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: 1143335194} - m_Father: {fileID: 0} - m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1627615992 GameObject: m_ObjectHideFlags: 0 @@ -5071,16 +4926,16 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1840808683} - m_Enabled: 1 + m_Enabled: 0 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_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 + m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -5226,16 +5081,16 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1848006084} - m_Enabled: 1 + m_Enabled: 0 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_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 + m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -5750,16 +5605,16 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2119595011} - m_Enabled: 1 + m_Enabled: 0 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_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 + m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -5826,16 +5681,16 @@ MonoBehaviour: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2122967656} - m_Enabled: 1 + m_Enabled: 0 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_Color: {r: 1, g: 1, b: 1, a: 0} + m_RaycastTarget: 0 m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0} - m_Maskable: 1 + m_Maskable: 0 m_OnCullStateChanged: m_PersistentCalls: m_Calls: [] @@ -6085,7 +5940,6 @@ GameObject: SceneRoots: m_ObjectHideFlags: 0 m_Roots: - - {fileID: 1562416270} - {fileID: 105583407} - {fileID: 1111279767} - {fileID: 2024174324} diff --git a/Data/Xml/ZheSheYi.xml b/Data/Xml/ZheSheYi.xml index 90dd4cb4..42f290ba 100644 --- a/Data/Xml/ZheSheYi.xml +++ b/Data/Xml/ZheSheYi.xml @@ -89,8 +89,8 @@ - - + + diff --git a/Data/Xml/ZhuBaoJianDingGuangXueYiQi.xml b/Data/Xml/ZhuBaoJianDingGuangXueYiQi.xml index 19e61ba5..08a7136c 100644 --- a/Data/Xml/ZhuBaoJianDingGuangXueYiQi.xml +++ b/Data/Xml/ZhuBaoJianDingGuangXueYiQi.xml @@ -9,63 +9,6 @@ - - - - - - - - - - - - - - - - - - - 珠宝工作台，又称功夫台，是针对珠宝首饰加工设计的操作台，具备承载工具，回收金属粉末等功能，多采用不锈钢、实木或高密度板等材质，全木材质抗击打、稳固性高。桌面有个凹圆，中间有个台塞。下方有接金属屑的抽屉。此外还配有台灯照明、测量、切割、锉修、抛光、焊接工具等。 - - - - 玉滴石 - - Main/SM_FGJ_ShiYong/yudishi - 玉滴石 - - - - 塑料袋 - - Main/SM_FGJ_ShiYong/SM_DiaZi004 - 塑料袋 - - - - - 紫外荧光灯 - - Main/SM_ZiWaiYingGuangDeng (1)/SM_DengDi - 紫外荧光灯 - - - - 长波开关 - - Main/SM_ZiWaiYingGuangDeng (1)/DuanBoKaiGuan - 长波开关 - - - - 短波开关 - - Main/SM_ZiWaiYingGuangDeng (1)/ChangBoKaiGuan - 短波开关 - - @@ -76,260 +19,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -