diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/41/dao.fbx b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/41/dao.fbx
index b920a137..169f3786 100644
Binary files a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/41/dao.fbx and b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/41/dao.fbx differ
diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/41/zhudao.fbx b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/41/zhudao.fbx
index 3cf99d54..24a40727 100644
Binary files a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/41/zhudao.fbx and b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/41/zhudao.fbx differ
diff --git a/Assets/Art/Models/LouDi/XiShowRoom/SM_daopian.FBX b/Assets/Art/Models/LouDi/XiShowRoom/SM_daopian.FBX
deleted file mode 100644
index 990d138f..00000000
Binary files a/Assets/Art/Models/LouDi/XiShowRoom/SM_daopian.FBX and /dev/null differ
diff --git a/Assets/Art/Models/LouDi/XiShowRoom/shoushudaobaozhuang.fbx b/Assets/Art/Models/LouDi/XiShowRoom/shoushudaobaozhuang.fbx
new file mode 100644
index 00000000..49b4b24c
Binary files /dev/null and b/Assets/Art/Models/LouDi/XiShowRoom/shoushudaobaozhuang.fbx differ
diff --git a/Assets/Art/Models/LouDi/XiShowRoom/SM_daopian.FBX.meta b/Assets/Art/Models/LouDi/XiShowRoom/shoushudaobaozhuang.fbx.meta
similarity index 89%
rename from Assets/Art/Models/LouDi/XiShowRoom/SM_daopian.FBX.meta
rename to Assets/Art/Models/LouDi/XiShowRoom/shoushudaobaozhuang.fbx.meta
index fa434705..3e008bcb 100644
--- a/Assets/Art/Models/LouDi/XiShowRoom/SM_daopian.FBX.meta
+++ b/Assets/Art/Models/LouDi/XiShowRoom/shoushudaobaozhuang.fbx.meta
@@ -1,5 +1,5 @@
fileFormatVersion: 2
-guid: 62723bd983b569f4680b6e1e6ffc864b
+guid: eeaf1ffae3424a04088e10bb0a5ecbd4
ModelImporter:
serializedVersion: 22200
internalIDToNameTable: []
@@ -7,8 +7,13 @@ ModelImporter:
- first:
type: UnityEngine:Material
assembly: UnityEngine.CoreModule
- name: M_daopian
- second: {fileID: 2100000, guid: c70b66b39f19fd74ab7c5e965ae53c3b, type: 2}
+ name: shoushudao
+ second: {fileID: 2100000, guid: aadfc22aa0735a14483b120d5029a486, type: 2}
+ - first:
+ type: UnityEngine:Texture2D
+ assembly: UnityEngine.CoreModule
+ name: 02
+ second: {fileID: 2800000, guid: 7edc1037f05812e48aeac7a97913a3eb, type: 3}
materials:
materialImportMode: 2
materialName: 0
@@ -37,7 +42,7 @@ ModelImporter:
extraExposedTransformPaths: []
extraUserProperties: []
clipAnimations: []
- isReadable: 1
+ isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
diff --git a/Assets/Art/Models/LouDi/XiShowRoom/shoushudaobaozhuang.meta b/Assets/Art/Models/LouDi/XiShowRoom/shoushudaobaozhuang.meta
new file mode 100644
index 00000000..1f61153f
--- /dev/null
+++ b/Assets/Art/Models/LouDi/XiShowRoom/shoushudaobaozhuang.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 5595ddb04dd2c7e4a937b8c4a27a38b7
+folderAsset: yes
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Art/Models/LouDi/XiShowRoom/shoushudaobaozhuang/02.png b/Assets/Art/Models/LouDi/XiShowRoom/shoushudaobaozhuang/02.png
new file mode 100644
index 00000000..e6ba407d
Binary files /dev/null and b/Assets/Art/Models/LouDi/XiShowRoom/shoushudaobaozhuang/02.png differ
diff --git a/Assets/Art/Models/LouDi/XiShowRoom/shoushudaobaozhuang/02.png.meta b/Assets/Art/Models/LouDi/XiShowRoom/shoushudaobaozhuang/02.png.meta
new file mode 100644
index 00000000..acbf0797
--- /dev/null
+++ b/Assets/Art/Models/LouDi/XiShowRoom/shoushudaobaozhuang/02.png.meta
@@ -0,0 +1,179 @@
+fileFormatVersion: 2
+guid: 7edc1037f05812e48aeac7a97913a3eb
+TextureImporter:
+ internalIDToNameTable: []
+ externalObjects: {}
+ serializedVersion: 12
+ mipmaps:
+ mipMapMode: 0
+ enableMipMap: 1
+ sRGBTexture: 1
+ linearTexture: 0
+ fadeOut: 0
+ borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
+ mipMapFadeDistanceStart: 1
+ mipMapFadeDistanceEnd: 3
+ bumpmap:
+ convertToNormalMap: 0
+ externalNormalMap: 0
+ heightScale: 0.25
+ normalMapFilter: 0
+ flipGreenChannel: 0
+ isReadable: 0
+ streamingMipmaps: 0
+ streamingMipmapsPriority: 0
+ vTOnly: 0
+ ignoreMipmapLimit: 0
+ grayScaleToAlpha: 0
+ generateCubemap: 6
+ cubemapConvolution: 0
+ seamlessCubemap: 0
+ textureFormat: 1
+ maxTextureSize: 2048
+ textureSettings:
+ serializedVersion: 2
+ filterMode: 1
+ aniso: 2
+ mipBias: 0
+ wrapU: 0
+ wrapV: 0
+ wrapW: 0
+ nPOTScale: 1
+ lightmap: 0
+ compressionQuality: 50
+ spriteMode: 0
+ spriteExtrude: 1
+ spriteMeshType: 1
+ alignment: 0
+ spritePivot: {x: 0.5, y: 0.5}
+ spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
+ alphaUsage: 1
+ alphaIsTransparency: 0
+ spriteTessellationDetail: -1
+ textureType: 0
+ textureShape: 1
+ singleChannelComponent: 0
+ flipbookRows: 1
+ flipbookColumns: 1
+ maxTextureSizeSet: 0
+ compressionQualitySet: 0
+ textureFormatSet: 0
+ ignorePngGamma: 0
+ applyGammaDecoding: 0
+ swizzle: 50462976
+ cookieLightType: 0
+ platformSettings:
+ - serializedVersion: 3
+ buildTarget: DefaultTexturePlatform
+ maxTextureSize: 8192
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Standalone
+ maxTextureSize: 8192
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: iPhone
+ maxTextureSize: 8192
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Android
+ maxTextureSize: 8192
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Windows Store Apps
+ maxTextureSize: 8192
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: WebGL
+ maxTextureSize: 8192
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ - serializedVersion: 3
+ buildTarget: Server
+ maxTextureSize: 8192
+ resizeAlgorithm: 0
+ textureFormat: -1
+ textureCompression: 1
+ compressionQuality: 50
+ crunchedCompression: 0
+ allowsAlphaSplitting: 0
+ overridden: 0
+ ignorePlatformSupport: 0
+ androidETC2FallbackOverride: 0
+ forceMaximumCompressionQuality_BC6H_BC7: 0
+ spriteSheet:
+ serializedVersion: 2
+ sprites: []
+ outline: []
+ physicsShape: []
+ bones: []
+ spriteID:
+ internalID: 0
+ vertices: []
+ indices:
+ edges: []
+ weights: []
+ secondaryTextures: []
+ nameFileIdTable: {}
+ mipmapLimitGroupName:
+ pSDRemoveMatte: 0
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Art/Models/LouDi/XiShowRoom/shoushudaobaozhuang/shoushudao.mat b/Assets/Art/Models/LouDi/XiShowRoom/shoushudaobaozhuang/shoushudao.mat
new file mode 100644
index 00000000..86b68002
--- /dev/null
+++ b/Assets/Art/Models/LouDi/XiShowRoom/shoushudaobaozhuang/shoushudao.mat
@@ -0,0 +1,135 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &-2425653212611413171
+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: shoushudao
+ 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: 2800000, guid: 7edc1037f05812e48aeac7a97913a3eb, type: 3}
+ 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: 2800000, guid: 7edc1037f05812e48aeac7a97913a3eb, type: 3}
+ 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: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _QueueOffset: 0
+ - _ReceiveShadows: 1
+ - _Smoothness: 0.5
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _SrcBlendAlpha: 1
+ - _Surface: 0
+ - _UVSec: 0
+ - _WorkflowMode: 1
+ - _ZWrite: 1
+ m_Colors:
+ - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+ - _Color: {r: 1, g: 1, b: 1, 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/Art/Models/LouDi/XiShowRoom/shoushudaobaozhuang/shoushudao.mat.meta b/Assets/Art/Models/LouDi/XiShowRoom/shoushudaobaozhuang/shoushudao.mat.meta
new file mode 100644
index 00000000..b44ac699
--- /dev/null
+++ b/Assets/Art/Models/LouDi/XiShowRoom/shoushudaobaozhuang/shoushudao.mat.meta
@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: aadfc22aa0735a14483b120d5029a486
+NativeFormatImporter:
+ externalObjects: {}
+ mainObjectFileID: 2100000
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/LouDiXuMuQvan.unity b/Assets/Scenes/LouDiXuMuQvan.unity
index 47776e8a..3e51c493 100644
--- a/Assets/Scenes/LouDiXuMuQvan.unity
+++ b/Assets/Scenes/LouDiXuMuQvan.unity
@@ -1997,6 +1997,68 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 135671156}
m_Mesh: {fileID: 4068373912626513877, guid: 6d0303911f413ab4391ab98ee2c2f263, type: 3}
+--- !u!1001 &148249148
+PrefabInstance:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_Modification:
+ serializedVersion: 3
+ m_TransformParent: {fileID: 670699915}
+ m_Modifications:
+ - target: {fileID: -8679921383154817045, guid: eeaf1ffae3424a04088e10bb0a5ecbd4, type: 3}
+ propertyPath: m_LocalPosition.x
+ value: -3.3898
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: eeaf1ffae3424a04088e10bb0a5ecbd4, type: 3}
+ propertyPath: m_LocalPosition.y
+ value: 1.2184
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: eeaf1ffae3424a04088e10bb0a5ecbd4, type: 3}
+ propertyPath: m_LocalPosition.z
+ value: -3.108
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: eeaf1ffae3424a04088e10bb0a5ecbd4, type: 3}
+ propertyPath: m_LocalRotation.w
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: eeaf1ffae3424a04088e10bb0a5ecbd4, type: 3}
+ propertyPath: m_LocalRotation.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: eeaf1ffae3424a04088e10bb0a5ecbd4, type: 3}
+ propertyPath: m_LocalRotation.y
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: eeaf1ffae3424a04088e10bb0a5ecbd4, type: 3}
+ propertyPath: m_LocalRotation.z
+ value: -0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: eeaf1ffae3424a04088e10bb0a5ecbd4, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.x
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: eeaf1ffae3424a04088e10bb0a5ecbd4, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.y
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: -8679921383154817045, guid: eeaf1ffae3424a04088e10bb0a5ecbd4, type: 3}
+ propertyPath: m_LocalEulerAnglesHint.z
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 919132149155446097, guid: eeaf1ffae3424a04088e10bb0a5ecbd4, type: 3}
+ propertyPath: m_Name
+ value: shoushudaobaozhuang
+ objectReference: {fileID: 0}
+ m_RemovedComponents: []
+ m_RemovedGameObjects: []
+ m_AddedGameObjects: []
+ m_AddedComponents: []
+ m_SourcePrefab: {fileID: 100100000, guid: eeaf1ffae3424a04088e10bb0a5ecbd4, type: 3}
+--- !u!4 &148249149 stripped
+Transform:
+ m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: eeaf1ffae3424a04088e10bb0a5ecbd4, type: 3}
+ m_PrefabInstance: {fileID: 148249148}
+ m_PrefabAsset: {fileID: 0}
--- !u!1 &162568225 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8470481287469146784, guid: 58fd369e5a44fdd4d9e958c15f1564e0, type: 3}
@@ -21541,7 +21603,10 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
- m_AddedGameObjects: []
+ m_AddedGameObjects:
+ - targetCorrespondingSourceObject: {fileID: -8679921383154817045, guid: e7a91a7be44e48e4c92ed033f514c4bf, type: 3}
+ insertIndex: -1
+ addedObject: {fileID: 148249149}
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e7a91a7be44e48e4c92ed033f514c4bf, type: 3}
--- !u!4 &670699915 stripped
diff --git a/Data/Xml/Exam.xml b/Data/Xml/Exam.xml
index 5656016a..6afcf51c 100644
--- a/Data/Xml/Exam.xml
+++ b/Data/Xml/Exam.xml
@@ -541,6 +541,15 @@
+
+ 刀片
+
+ Environment/隐藏物体/SM_BuLiaoLei/shoushudaobaozhuang
+ 刀片
+
+
+
+
+
@@ -2517,23 +2527,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/Data/Xml/Study.xml b/Data/Xml/Study.xml
index ac4170d8..d7ba2e2b 100644
--- a/Data/Xml/Study.xml
+++ b/Data/Xml/Study.xml
@@ -322,7 +322,6 @@
haocai/gl.png
-
医用外科罩
@@ -522,6 +521,17 @@
+
+ 刀片
+
+ Environment/隐藏物体/SM_BuLiaoLei/shoushudaobaozhuang
+ 刀片
+
+
+
+
+
+