diff --git a/Assets/Models/Materials/MT_PM_V38_Sorghum_bicolor_Leaf_01_albedo.mat b/Assets/Models/Materials/MT_PM_V38_Sorghum_bicolor_Leaf_01_albedo.mat index fa05578..c5c08ff 100644 --- a/Assets/Models/Materials/MT_PM_V38_Sorghum_bicolor_Leaf_01_albedo.mat +++ b/Assets/Models/Materials/MT_PM_V38_Sorghum_bicolor_Leaf_01_albedo.mat @@ -8,19 +8,19 @@ Material: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_Name: MT_PM_V38_Sorghum_bicolor_Leaf_01_albedo - m_Shader: {fileID: 10511, guid: 0000000000000000f000000000000000, type: 0} + m_Shader: {fileID: 47, guid: 0000000000000000f000000000000000, type: 0} m_ValidKeywords: - - _EMISSION - m_InvalidKeywords: - _ALPHABLEND_ON - _NORMALMAP + m_InvalidKeywords: - _REQUIRE_UV2 - _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A - m_LightmapFlags: 0 + m_LightmapFlags: 4 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 - m_CustomRenderQueue: -1 - stringTagMap: {} + m_CustomRenderQueue: 3000 + stringTagMap: + RenderType: Transparent disabledShaderPasses: - GRABPASS m_SavedProperties: @@ -169,7 +169,7 @@ Material: - __dirty: 1 m_Colors: - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0} - - _Color: {r: 0.44871262, g: 0.764151, b: 0.378471, a: 1} + - _Color: {r: 0.4487126, g: 0.764151, b: 0.37847084, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _FarmSoilCol: {r: 0.34117648, g: 0.19607836, b: 0.13333327, a: 0} - _JieGanCol: {r: 0.7058823, g: 0.68627447, b: 0.5254902, a: 0} diff --git a/Assets/Models/播种.fbx b/Assets/Models/播种.fbx index 50a242b..4905944 100644 Binary files a/Assets/Models/播种.fbx and b/Assets/Models/播种.fbx differ diff --git a/Assets/Scenes/LiveScene_Test.unity b/Assets/Scenes/LiveScene_Test.unity index 979aa5b..2968660 100644 --- a/Assets/Scenes/LiveScene_Test.unity +++ b/Assets/Scenes/LiveScene_Test.unity @@ -469,7 +469,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 14 + m_RootOrder: 15 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &508035433 PrefabInstance: @@ -941,7 +941,7 @@ Light: m_Type: 1 m_Shape: 0 m_Color: {r: 1, g: 1, b: 1, a: 1} - m_Intensity: 1.2 + m_Intensity: 1.25 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208 @@ -1004,7 +1004,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0} --- !u!1 &800882077 GameObject: @@ -1074,7 +1074,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: c266fd07b67dfc944914d8a82203ee6c, type: 3} propertyPath: m_RootOrder - value: 6 + value: 7 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: c266fd07b67dfc944914d8a82203ee6c, type: 3} propertyPath: m_LocalPosition.x @@ -1318,7 +1318,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: cb1edd9d450e6a9479c7096118230f92, type: 3} propertyPath: m_RootOrder - value: 12 + value: 13 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: cb1edd9d450e6a9479c7096118230f92, type: 3} propertyPath: m_LocalPosition.x @@ -1364,6 +1364,10 @@ PrefabInstance: propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -7962676051228110082, guid: cb1edd9d450e6a9479c7096118230f92, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 466dd39efaf6cef47951fd7e03172c48, type: 2} - target: {fileID: -7515094844170857450, guid: cb1edd9d450e6a9479c7096118230f92, type: 3} propertyPath: m_IsActive value: 1 @@ -1372,13 +1376,21 @@ PrefabInstance: propertyPath: m_Materials.Array.data[0] value: objectReference: {fileID: 2100000, guid: b0fbb12c63b41ca46b5fb0a1da07ee31, type: 2} + - target: {fileID: -4557535612498441388, guid: cb1edd9d450e6a9479c7096118230f92, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 466dd39efaf6cef47951fd7e03172c48, type: 2} - target: {fileID: -2096436544394969888, guid: cb1edd9d450e6a9479c7096118230f92, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: -1590027806851775195, guid: cb1edd9d450e6a9479c7096118230f92, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 466dd39efaf6cef47951fd7e03172c48, type: 2} - target: {fileID: -1110285421095624631, guid: cb1edd9d450e6a9479c7096118230f92, type: 3} propertyPath: m_IsActive - value: 1 + value: 0 objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: cb1edd9d450e6a9479c7096118230f92, type: 3} propertyPath: m_Name @@ -1440,33 +1452,20 @@ PrefabInstance: propertyPath: m_ConstrainProportionsScale value: 0 objectReference: {fileID: 0} + - target: {fileID: 6748001672919644973, guid: cb1edd9d450e6a9479c7096118230f92, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: 466dd39efaf6cef47951fd7e03172c48, type: 2} - target: {fileID: 7088326151561230686, guid: cb1edd9d450e6a9479c7096118230f92, type: 3} propertyPath: m_IsActive value: 1 objectReference: {fileID: 0} + - target: {fileID: 7870549426110319540, guid: cb1edd9d450e6a9479c7096118230f92, type: 3} + propertyPath: m_Materials.Array.data[1] + value: + objectReference: {fileID: 2100000, guid: ba19f87343b4bf5479bb1bc3b59eaf19, type: 2} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: cb1edd9d450e6a9479c7096118230f92, type: 3} ---- !u!1 &1125211178 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -6405275212543804897, guid: cb1edd9d450e6a9479c7096118230f92, type: 3} - m_PrefabInstance: {fileID: 1061460484} - m_PrefabAsset: {fileID: 0} ---- !u!111 &1125211180 -Animation: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1125211178} - m_Enabled: 1 - serializedVersion: 3 - m_Animation: {fileID: 0} - m_Animations: - - {fileID: 7400000, guid: dca65ed35a301ae48ad167e4c81d41d1, type: 2} - m_WrapMode: 0 - m_PlayAutomatically: 1 - m_AnimatePhysics: 0 - m_CullingType: 0 --- !u!1 &1150649725 GameObject: m_ObjectHideFlags: 0 @@ -1630,12 +1629,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1272526427} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: -0.5510254, y: 0.08700013, z: -0.14100075} + m_LocalPosition: {x: 396.649, y: 3.867, z: 16.949} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 1943249830} - m_RootOrder: 3 + m_Father: {fileID: 0} + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!108 &1272526429 Light: @@ -2038,32 +2037,6 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: 6c7cbc6b210e1c7419bfdf5bcfb65606, type: 3} ---- !u!1 &1651511568 stripped -GameObject: - m_CorrespondingSourceObject: {fileID: -1110285421095624631, guid: cb1edd9d450e6a9479c7096118230f92, type: 3} - m_PrefabInstance: {fileID: 1061460484} - m_PrefabAsset: {fileID: 0} ---- !u!95 &1651511573 -Animator: - serializedVersion: 5 - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1651511568} - m_Enabled: 1 - m_Avatar: {fileID: 0} - m_Controller: {fileID: 9100000, guid: 9b6537c0d8acea548b1d82dd445e1b9b, type: 2} - m_CullingMode: 0 - m_UpdateMode: 0 - m_ApplyRootMotion: 0 - m_LinearVelocityBlending: 0 - m_StabilizeFeet: 0 - m_WarningMessage: - m_HasTransformHierarchy: 1 - m_AllowConstantClipSamplingOptimization: 1 - m_KeepAnimatorStateOnDisable: 0 - m_WriteDefaultValuesOnDisable: 0 --- !u!1001 &1820247687 PrefabInstance: m_ObjectHideFlags: 0 @@ -2205,11 +2178,6 @@ Transform: m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!4 &1943249830 stripped -Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: cb1edd9d450e6a9479c7096118230f92, type: 3} - m_PrefabInstance: {fileID: 1061460484} - m_PrefabAsset: {fileID: 0} --- !u!1 &1975548202 GameObject: m_ObjectHideFlags: 0 @@ -2225,7 +2193,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 0 + m_IsActive: 1 --- !u!4 &1975548203 Transform: m_ObjectHideFlags: 0 @@ -2242,7 +2210,7 @@ Transform: - {fileID: 231418614} - {fileID: 800882078} m_Father: {fileID: 0} - m_RootOrder: 13 + m_RootOrder: 14 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &2008614459 PrefabInstance: @@ -2253,7 +2221,7 @@ PrefabInstance: m_Modifications: - target: {fileID: -8679921383154817045, guid: 8f0e34bddc76ebe45b7955ad8b4cf4fb, type: 3} propertyPath: m_RootOrder - value: 7 + value: 8 objectReference: {fileID: 0} - target: {fileID: -8679921383154817045, guid: 8f0e34bddc76ebe45b7955ad8b4cf4fb, type: 3} propertyPath: m_LocalPosition.x