diff --git a/Assets/Art/Models/LouDi/Animation/第二次老师反馈/Materials/ShinShader_XiaoZhu.mat b/Assets/Art/Models/LouDi/Animation/第二次老师反馈/Materials/ShinShader_XiaoZhu.mat new file mode 100644 index 00000000..27d91a34 --- /dev/null +++ b/Assets/Art/Models/LouDi/Animation/第二次老师反馈/Materials/ShinShader_XiaoZhu.mat @@ -0,0 +1,52 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: ShinShader_XiaoZhu + m_Shader: {fileID: 4800000, guid: dd69ac06a5c2b3a438a4828c53623d51, type: 3} + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _DetailNormal: + m_Texture: {fileID: 2800000, guid: 5b4be7b0313519b4a8f7c4c85a93ab8c, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _KelemenLUT: + m_Texture: {fileID: 2800000, guid: a050a0ef3b2729e4e9b5eb76a4bed2e6, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 2800000, guid: 2a53cea1ea0fe474e9b3d4edc6c3d34c, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _Normal: + m_Texture: {fileID: 2800000, guid: f1bb6311fb29e034c8fa9993da329801, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _SSSLut: + m_Texture: {fileID: 2800000, guid: 49ff115e6de12f344bfc2eda7b889c31, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _DetailNormalScale: 30 + - _NormalBlend: 0.5 + - _NormalScale: 1 + - _Roughness0: 30 + - _Roughness1: 100 + - _SSSY: 1 + m_Colors: [] + m_BuildTextureStacks: [] diff --git a/Assets/Art/Models/LouDi/Animation/第二次老师反馈/Materials/ShinShader_XiaoZhu.mat.meta b/Assets/Art/Models/LouDi/Animation/第二次老师反馈/Materials/ShinShader_XiaoZhu.mat.meta new file mode 100644 index 00000000..ef78c1cf --- /dev/null +++ b/Assets/Art/Models/LouDi/Animation/第二次老师反馈/Materials/ShinShader_XiaoZhu.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 958a93b619842b145afdf885a548546a +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scenes/Scene.unity b/Assets/Scenes/Scene.unity index b64c47e0..81dfcc60 100644 --- a/Assets/Scenes/Scene.unity +++ b/Assets/Scenes/Scene.unity @@ -1538,7 +1538,7 @@ PrefabInstance: - target: {fileID: -332972652627944573, guid: 0539f97c8ea0cf14b8c30f3d876bfb46, type: 3} propertyPath: m_Materials.Array.data[0] value: - objectReference: {fileID: 2100000, guid: 2aaa214b4e43bd948921e763b2aeeb63, type: 2} + objectReference: {fileID: 2100000, guid: 75cf80115e4c1e74fac6f13d5bed2dc0, type: 2} - target: {fileID: -330210812664667052, guid: 0539f97c8ea0cf14b8c30f3d876bfb46, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -6.612014 @@ -1809,7 +1809,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 0539f97c8ea0cf14b8c30f3d876bfb46, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 1006628450200583063, guid: 0539f97c8ea0cf14b8c30f3d876bfb46, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -5295,6 +5295,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -82.21986 objectReference: {fileID: 0} + - target: {fileID: -332972652627944573, guid: 0ac970413d53bfa4aaf2a61922fa3306, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 75cf80115e4c1e74fac6f13d5bed2dc0, type: 2} - target: {fileID: -330210812664667052, guid: 0ac970413d53bfa4aaf2a61922fa3306, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -6.6120315 @@ -6083,6 +6087,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -63.676273 objectReference: {fileID: 0} + - target: {fileID: 4241993624889363472, guid: 0ac970413d53bfa4aaf2a61922fa3306, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 75cf80115e4c1e74fac6f13d5bed2dc0, type: 2} - target: {fileID: 4291282277922915536, guid: 0ac970413d53bfa4aaf2a61922fa3306, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0.24423733 @@ -6509,7 +6517,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 7214705651580981122, guid: 0ac970413d53bfa4aaf2a61922fa3306, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 7349125760563115670, guid: 0ac970413d53bfa4aaf2a61922fa3306, type: 3} propertyPath: m_LocalEulerAnglesHint.x @@ -7481,6 +7489,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -7319642765112936408, guid: 17a48e31f626a7647a60989364774f58, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 75cf80115e4c1e74fac6f13d5bed2dc0, type: 2} - target: {fileID: -7265803839260154866, guid: 17a48e31f626a7647a60989364774f58, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 3.6605264e-14 @@ -7665,6 +7677,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -4.340747 objectReference: {fileID: 0} + - target: {fileID: -6529005811956824739, guid: 17a48e31f626a7647a60989364774f58, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 75cf80115e4c1e74fac6f13d5bed2dc0, type: 2} - target: {fileID: -6441156676810190382, guid: 17a48e31f626a7647a60989364774f58, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -0.00014705292 @@ -8237,6 +8253,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -1.6513223e-12 objectReference: {fileID: 0} + - target: {fileID: -3504149905339958554, guid: 17a48e31f626a7647a60989364774f58, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: -3499040687446441120, guid: 17a48e31f626a7647a60989364774f58, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0.00006714366 @@ -8361,6 +8381,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0.000016481697 objectReference: {fileID: 0} + - target: {fileID: -2566647691377750293, guid: 17a48e31f626a7647a60989364774f58, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: -2525467244732453853, guid: 17a48e31f626a7647a60989364774f58, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -0.40735543 @@ -8717,6 +8741,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -6.8417687 objectReference: {fileID: 0} + - target: {fileID: -332972652627944573, guid: 17a48e31f626a7647a60989364774f58, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 75cf80115e4c1e74fac6f13d5bed2dc0, type: 2} - target: {fileID: -330210812664667052, guid: 17a48e31f626a7647a60989364774f58, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -6.8956704 @@ -9209,6 +9237,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.x value: 34.118748 objectReference: {fileID: 0} + - target: {fileID: 1811361748251607731, guid: 17a48e31f626a7647a60989364774f58, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 2048104353515982665, guid: 17a48e31f626a7647a60989364774f58, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 4.617842 @@ -9461,6 +9493,14 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 48.65445 objectReference: {fileID: 0} + - target: {fileID: 3664787521286428502, guid: 17a48e31f626a7647a60989364774f58, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 3813012418186871533, guid: 17a48e31f626a7647a60989364774f58, type: 3} + propertyPath: m_IsActive + value: 1 + objectReference: {fileID: 0} - target: {fileID: 3967145267381061613, guid: 17a48e31f626a7647a60989364774f58, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 9.706383e-20 @@ -12773,6 +12813,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -0.10728759 objectReference: {fileID: 0} + - target: {fileID: -7859237678289959861, guid: 0ac970413d53bfa4aaf2a61922fa3306, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 75cf80115e4c1e74fac6f13d5bed2dc0, type: 2} - target: {fileID: -7765157515065755174, guid: 0ac970413d53bfa4aaf2a61922fa3306, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0.83801913 @@ -13965,6 +14009,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: -71.89465 objectReference: {fileID: 0} + - target: {fileID: -332972652627944573, guid: 0ac970413d53bfa4aaf2a61922fa3306, type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 75cf80115e4c1e74fac6f13d5bed2dc0, type: 2} - target: {fileID: -330210812664667052, guid: 0ac970413d53bfa4aaf2a61922fa3306, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: -6.409321 diff --git a/Data/Xml/Pig1.xml b/Data/Xml/Pig1.xml index a0dbda97..e4f975bc 100644 --- a/Data/Xml/Pig1.xml +++ b/Data/Xml/Pig1.xml @@ -779,17 +779,18 @@ + + + - - - +