From 48306a8ab7a46996e0c1880a107ec817b20150b1 Mon Sep 17 00:00:00 2001 From: shenjianxing <”315615051@qq.com“> Date: Thu, 16 Jan 2025 18:26:02 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../13/hands_shoutao/hand_shoutao.fbx.meta | 147 +----------------- .../13/hands_shoutao/hand_shoutao.txt | 5 - .../22/戴手套/shoutao/shoutao_nan.fbx.meta | 87 ----------- .../22/戴手套/shoutao/shoutao_nan.txt | 4 - .../ZhuDao_chaunyifu/Materials/buyao.mat | 26 ++-- .../ZhuDao_chaunyifu/ZhuDao_chaunyifu.fbx.meta | 2 +- Assets/Scenes/LouDiXuMuQvan.unity | 38 +++-- Data/Xml/Exam.xml | 4 +- 8 files changed, 48 insertions(+), 265 deletions(-) diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/13/hands_shoutao/hand_shoutao.fbx.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/13/hands_shoutao/hand_shoutao.fbx.meta index 450694e5..59ae3b50 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/13/hands_shoutao/hand_shoutao.fbx.meta +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/13/hands_shoutao/hand_shoutao.fbx.meta @@ -37,155 +37,10 @@ ModelImporter: extraExposedTransformPaths: [] extraUserProperties: [] clipAnimations: - - serializedVersion: 16 - name: zuoshou1 - takeName: - internalID: 3060610079319413300 - firstFrame: 360 - lastFrame: 424 - wrapMode: 0 - orientationOffsetY: 0 - level: 0 - cycleOffset: 0 - loop: 0 - hasAdditiveReferencePose: 0 - loopTime: 0 - loopBlend: 0 - loopBlendOrientation: 0 - loopBlendPositionY: 0 - loopBlendPositionXZ: 0 - keepOriginalOrientation: 0 - keepOriginalPositionY: 0 - keepOriginalPositionXZ: 0 - heightFromFeet: 0 - mirror: 0 - bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 - curves: [] - events: [] - transformMask: [] - maskType: 3 - maskSource: {instanceID: 0} - additiveReferencePoseFrame: 0 - - serializedVersion: 16 - name: zuoshou2 - takeName: - internalID: -6004787696405322892 - firstFrame: 425 - lastFrame: 460 - wrapMode: 0 - orientationOffsetY: 0 - level: 0 - cycleOffset: 0 - loop: 0 - hasAdditiveReferencePose: 0 - loopTime: 0 - loopBlend: 0 - loopBlendOrientation: 0 - loopBlendPositionY: 0 - loopBlendPositionXZ: 0 - keepOriginalOrientation: 0 - keepOriginalPositionY: 0 - keepOriginalPositionXZ: 0 - heightFromFeet: 0 - mirror: 0 - bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 - curves: [] - events: [] - transformMask: [] - maskType: 3 - maskSource: {instanceID: 0} - additiveReferencePoseFrame: 0 - - serializedVersion: 16 - name: youshou1 - takeName: - internalID: -5880667880897408871 - firstFrame: 461 - lastFrame: 519 - wrapMode: 0 - orientationOffsetY: 0 - level: 0 - cycleOffset: 0 - loop: 0 - hasAdditiveReferencePose: 0 - loopTime: 0 - loopBlend: 0 - loopBlendOrientation: 0 - loopBlendPositionY: 0 - loopBlendPositionXZ: 0 - keepOriginalOrientation: 0 - keepOriginalPositionY: 0 - keepOriginalPositionXZ: 0 - heightFromFeet: 0 - mirror: 0 - bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 - curves: [] - events: [] - transformMask: [] - maskType: 3 - maskSource: {instanceID: 0} - additiveReferencePoseFrame: 0 - - serializedVersion: 16 - name: youshou2 - takeName: - internalID: -8025109807753351146 - firstFrame: 520 - lastFrame: 560 - wrapMode: 0 - orientationOffsetY: 0 - level: 0 - cycleOffset: 0 - loop: 0 - hasAdditiveReferencePose: 0 - loopTime: 0 - loopBlend: 0 - loopBlendOrientation: 0 - loopBlendPositionY: 0 - loopBlendPositionXZ: 0 - keepOriginalOrientation: 0 - keepOriginalPositionY: 0 - keepOriginalPositionXZ: 0 - heightFromFeet: 0 - mirror: 0 - bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 - curves: [] - events: [] - transformMask: [] - maskType: 3 - maskSource: {instanceID: 0} - additiveReferencePoseFrame: 0 - - serializedVersion: 16 - name: "\u6234\u624B\u5957" - takeName: - internalID: 7123401652408257758 - firstFrame: 561 - lastFrame: 670 - wrapMode: 0 - orientationOffsetY: 0 - level: 0 - cycleOffset: 0 - loop: 0 - hasAdditiveReferencePose: 0 - loopTime: 0 - loopBlend: 0 - loopBlendOrientation: 0 - loopBlendPositionY: 0 - loopBlendPositionXZ: 0 - keepOriginalOrientation: 0 - keepOriginalPositionY: 0 - keepOriginalPositionXZ: 0 - heightFromFeet: 0 - mirror: 0 - bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 - curves: [] - events: [] - transformMask: [] - maskType: 3 - maskSource: {instanceID: 0} - additiveReferencePoseFrame: 0 - serializedVersion: 16 name: 13daishoutao takeName: - internalID: 6563790008210349634 + internalID: 3060610079319413300 firstFrame: 360 lastFrame: 670 wrapMode: 0 diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/13/hands_shoutao/hand_shoutao.txt b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/13/hands_shoutao/hand_shoutao.txt index ab689f65..b998aa89 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/13/hands_shoutao/hand_shoutao.txt +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/13/hands_shoutao/hand_shoutao.txt @@ -1,6 +1 @@ -360-424 zuoshou1 -425-460 zuoshou2 -461-519 youshou1 -520-560 youshou2 -561-670 戴手套 360-670 13daishoutao \ No newline at end of file diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/戴手套/shoutao/shoutao_nan.fbx.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/戴手套/shoutao/shoutao_nan.fbx.meta index 9d1936df..1a976cb3 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/戴手套/shoutao/shoutao_nan.fbx.meta +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/戴手套/shoutao/shoutao_nan.fbx.meta @@ -95,93 +95,6 @@ ModelImporter: maskType: 3 maskSource: {instanceID: 0} additiveReferencePoseFrame: 0 - - serializedVersion: 16 - name: shoutao1 - takeName: - internalID: -5880667880897408871 - firstFrame: 360 - lastFrame: 424 - wrapMode: 0 - orientationOffsetY: 0 - level: 0 - cycleOffset: 0 - loop: 0 - hasAdditiveReferencePose: 0 - loopTime: 0 - loopBlend: 0 - loopBlendOrientation: 0 - loopBlendPositionY: 0 - loopBlendPositionXZ: 0 - keepOriginalOrientation: 0 - keepOriginalPositionY: 0 - keepOriginalPositionXZ: 0 - heightFromFeet: 0 - mirror: 0 - bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 - curves: [] - events: [] - transformMask: [] - maskType: 3 - maskSource: {instanceID: 0} - additiveReferencePoseFrame: 0 - - serializedVersion: 16 - name: shoutao2 - takeName: - internalID: -8025109807753351146 - firstFrame: 425 - lastFrame: 519 - wrapMode: 0 - orientationOffsetY: 0 - level: 0 - cycleOffset: 0 - loop: 0 - hasAdditiveReferencePose: 0 - loopTime: 0 - loopBlend: 0 - loopBlendOrientation: 0 - loopBlendPositionY: 0 - loopBlendPositionXZ: 0 - keepOriginalOrientation: 0 - keepOriginalPositionY: 0 - keepOriginalPositionXZ: 0 - heightFromFeet: 0 - mirror: 0 - bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 - curves: [] - events: [] - transformMask: [] - maskType: 3 - maskSource: {instanceID: 0} - additiveReferencePoseFrame: 0 - - serializedVersion: 16 - name: shoutao3 - takeName: - internalID: 7123401652408257758 - firstFrame: 519 - lastFrame: 670 - wrapMode: 0 - orientationOffsetY: 0 - level: 0 - cycleOffset: 0 - loop: 0 - hasAdditiveReferencePose: 0 - loopTime: 0 - loopBlend: 0 - loopBlendOrientation: 0 - loopBlendPositionY: 0 - loopBlendPositionXZ: 0 - keepOriginalOrientation: 0 - keepOriginalPositionY: 0 - keepOriginalPositionXZ: 0 - heightFromFeet: 0 - mirror: 0 - bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000 - curves: [] - events: [] - transformMask: [] - maskType: 3 - maskSource: {instanceID: 0} - additiveReferencePoseFrame: 0 isReadable: 1 meshes: lODScreenPercentages: [] diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/戴手套/shoutao/shoutao_nan.txt b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/戴手套/shoutao/shoutao_nan.txt index 789c73d8..354953ee 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/戴手套/shoutao/shoutao_nan.txt +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/戴手套/shoutao/shoutao_nan.txt @@ -1,6 +1,2 @@ 360-361 戴手套复原 360-530 戴手套 -360-424 shoutao1 -425-519 shoutao2 -519-670 shoutao3 - diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/穿衣服(含有主刀角色网格模型)/ZhuDao_chaunyifu/Materials/buyao.mat b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/穿衣服(含有主刀角色网格模型)/ZhuDao_chaunyifu/Materials/buyao.mat index d21bd1d9..0faaa1bd 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/穿衣服(含有主刀角色网格模型)/ZhuDao_chaunyifu/Materials/buyao.mat +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/穿衣服(含有主刀角色网格模型)/ZhuDao_chaunyifu/Materials/buyao.mat @@ -11,15 +11,19 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _ALPHAPREMULTIPLY_ON + - _SURFACE_TYPE_TRANSPARENT m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 + m_CustomRenderQueue: 3000 stringTagMap: - RenderType: Opaque - disabledShaderPasses: [] + RenderType: Transparent + disabledShaderPasses: + - DepthOnly + - SHADOWCASTER m_LockedProperties: m_SavedProperties: serializedVersion: 3 @@ -93,8 +97,8 @@ Material: - _Cutoff: 0.5 - _DetailAlbedoMapScale: 1 - _DetailNormalMapScale: 1 - - _DstBlend: 0 - - _DstBlendAlpha: 0 + - _DstBlend: 10 + - _DstBlendAlpha: 10 - _EnvironmentReflections: 1 - _GlossMapScale: 0 - _Glossiness: 0 @@ -104,17 +108,17 @@ Material: - _Parallax: 0.005 - _QueueOffset: 0 - _ReceiveShadows: 1 - - _Smoothness: 0.5 + - _Smoothness: 0 - _SmoothnessTextureChannel: 0 - _SpecularHighlights: 1 - _SrcBlend: 1 - _SrcBlendAlpha: 1 - - _Surface: 0 + - _Surface: 1 - _WorkflowMode: 1 - - _ZWrite: 1 + - _ZWrite: 0 m_Colors: - - _BaseColor: {r: 0.8, g: 0.8, b: 0.8, a: 1} - - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 1} + - _BaseColor: {r: 0.8, g: 0.8, b: 0.8, a: 0} + - _Color: {r: 0.8, g: 0.8, b: 0.8, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/穿衣服(含有主刀角色网格模型)/ZhuDao_chaunyifu/ZhuDao_chaunyifu.fbx.meta b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/穿衣服(含有主刀角色网格模型)/ZhuDao_chaunyifu/ZhuDao_chaunyifu.fbx.meta index 875ee736..0219ba6c 100644 --- a/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/穿衣服(含有主刀角色网格模型)/ZhuDao_chaunyifu/ZhuDao_chaunyifu.fbx.meta +++ b/Assets/Art/Models/LouDi/A_QvanChangJing/Animation/22/穿衣服(含有主刀角色网格模型)/ZhuDao_chaunyifu/ZhuDao_chaunyifu.fbx.meta @@ -293,7 +293,7 @@ ModelImporter: maskType: 3 maskSource: {instanceID: 0} additiveReferencePoseFrame: 0 - isReadable: 1 + isReadable: 0 meshes: lODScreenPercentages: [] globalScale: 1 diff --git a/Assets/Scenes/LouDiXuMuQvan.unity b/Assets/Scenes/LouDiXuMuQvan.unity index df9b6478..d2dff62c 100644 --- a/Assets/Scenes/LouDiXuMuQvan.unity +++ b/Assets/Scenes/LouDiXuMuQvan.unity @@ -19405,6 +19405,10 @@ PrefabInstance: propertyPath: m_Name value: SM_QvanChangJing objectReference: {fileID: 0} + - target: {fileID: 6442973779715884252, guid: 8889464cdda7d244ba7b9e4f5907bd4d, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: - {fileID: 3445139721741238312, guid: 8889464cdda7d244ba7b9e4f5907bd4d, type: 3} @@ -21386,7 +21390,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 2223639932434330405, guid: ee8540f1864b2e44d858716470022203, type: 3} propertyPath: m_Animations.Array.size - value: 4 + value: 1 objectReference: {fileID: 0} - target: {fileID: 2223639932434330405, guid: ee8540f1864b2e44d858716470022203, type: 3} propertyPath: m_Animations.Array.data[0] @@ -21395,11 +21399,11 @@ PrefabInstance: - target: {fileID: 2223639932434330405, guid: ee8540f1864b2e44d858716470022203, type: 3} propertyPath: m_Animations.Array.data[1] value: - objectReference: {fileID: 7123401652408257758, guid: ee8540f1864b2e44d858716470022203, type: 3} + objectReference: {fileID: -8025109807753351146, guid: ee8540f1864b2e44d858716470022203, type: 3} - target: {fileID: 2223639932434330405, guid: ee8540f1864b2e44d858716470022203, type: 3} propertyPath: m_Animations.Array.data[2] value: - objectReference: {fileID: -5880667880897408871, guid: ee8540f1864b2e44d858716470022203, type: 3} + objectReference: {fileID: -8025109807753351146, guid: ee8540f1864b2e44d858716470022203, type: 3} - target: {fileID: 2223639932434330405, guid: ee8540f1864b2e44d858716470022203, type: 3} propertyPath: m_Animations.Array.data[3] value: @@ -29243,6 +29247,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 5.731852 objectReference: {fileID: 0} + - target: {fileID: -6686518301317018174, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: -6616207267372729081, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 85.09695 @@ -29279,6 +29287,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0.00006449333 objectReference: {fileID: 0} + - target: {fileID: -6568363879452261150, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: -6558193206989376968, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0.0000027414137 @@ -31587,6 +31599,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -89.42959 objectReference: {fileID: 0} + - target: {fileID: -1461242666614159145, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: -1444022085657226828, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -0.000005389446 @@ -34835,6 +34851,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 8.816473 objectReference: {fileID: 0} + - target: {fileID: 6135384347301383384, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 6148969016219017777, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -37.68829 @@ -35511,6 +35531,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 2.6070352e-11 objectReference: {fileID: 0} + - target: {fileID: 7498500524086036043, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 7536414603698833039, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -9.12527 @@ -36379,14 +36403,10 @@ Animation: - {fileID: -6004787696405322892, guid: c2ddc27444f01e942b5504d171ddb5d3, type: 3} - {fileID: 3060610079319413300, guid: c2ddc27444f01e942b5504d171ddb5d3, type: 3} - {fileID: -5880667880897408871, guid: c2ddc27444f01e942b5504d171ddb5d3, type: 3} - - {fileID: -6004787696405322892, guid: a34cbdc8d2b3253449e2176a84e1681b, type: 3} - - {fileID: 3060610079319413300, guid: a34cbdc8d2b3253449e2176a84e1681b, type: 3} - - {fileID: -5880667880897408871, guid: a34cbdc8d2b3253449e2176a84e1681b, type: 3} - - {fileID: -6004787696405322892, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} - - {fileID: 3060610079319413300, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} - - {fileID: -8025109807753351146, guid: a34cbdc8d2b3253449e2176a84e1681b, type: 3} - {fileID: 7123401652408257758, guid: a34cbdc8d2b3253449e2176a84e1681b, type: 3} - {fileID: 6563790008210349634, guid: a34cbdc8d2b3253449e2176a84e1681b, type: 3} + - {fileID: 3060610079319413300, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} + - {fileID: -6004787696405322892, guid: 6669da75e54121749895f8a9990e5dcd, type: 3} m_WrapMode: 0 m_PlayAutomatically: 0 m_AnimatePhysics: 0 diff --git a/Data/Xml/Exam.xml b/Data/Xml/Exam.xml index 5a38e98d..590e4aa5 100644 --- a/Data/Xml/Exam.xml +++ b/Data/Xml/Exam.xml @@ -966,6 +966,8 @@ + + @@ -1160,7 +1162,6 @@ - @@ -1170,7 +1171,6 @@ -