From b26573ddb90d2490e15447bed8493a92354d7d63 Mon Sep 17 00:00:00 2001 From: taosuqi <2274240467@qq.com> Date: Mon, 7 Apr 2025 08:37:49 +0800 Subject: [PATCH] =?UTF-8?q?4.7=E4=B8=8A=E5=8D=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Models/Materials/Standard_122.mat | 2 +- Assets/Models/Materials/suliaomo.mat | 4 +- Assets/Models/Materials/杆件.mat | 2 +- Assets/Scenes/LiveScene.unity | 91 +++++++++++++++++++++--- 4 files changed, 84 insertions(+), 15 deletions(-) diff --git a/Assets/Models/Materials/Standard_122.mat b/Assets/Models/Materials/Standard_122.mat index 7411d0b..f806832 100644 --- a/Assets/Models/Materials/Standard_122.mat +++ b/Assets/Models/Materials/Standard_122.mat @@ -12,7 +12,7 @@ Material: m_ValidKeywords: - _EMISSION m_InvalidKeywords: [] - m_LightmapFlags: 5 + m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 diff --git a/Assets/Models/Materials/suliaomo.mat b/Assets/Models/Materials/suliaomo.mat index 267f75b..fd45ab5 100644 --- a/Assets/Models/Materials/suliaomo.mat +++ b/Assets/Models/Materials/suliaomo.mat @@ -13,7 +13,7 @@ Material: - _ALPHAPREMULTIPLY_ON - _EMISSION m_InvalidKeywords: [] - m_LightmapFlags: 5 + m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: 3000 @@ -82,6 +82,6 @@ Material: - _UVSec: 0 - _ZWrite: 0 m_Colors: - - _Color: {r: 0.2392157, g: 0.28627452, b: 0.32156864, a: 0.29999995} + - _Color: {r: 0.46391067, g: 0.6031315, b: 0.7075472, a: 0.7647059} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} m_BuildTextureStacks: [] diff --git a/Assets/Models/Materials/杆件.mat b/Assets/Models/Materials/杆件.mat index 05549c8..7379b53 100644 --- a/Assets/Models/Materials/杆件.mat +++ b/Assets/Models/Materials/杆件.mat @@ -12,7 +12,7 @@ Material: m_ValidKeywords: - _EMISSION m_InvalidKeywords: [] - m_LightmapFlags: 5 + m_LightmapFlags: 1 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: -1 diff --git a/Assets/Scenes/LiveScene.unity b/Assets/Scenes/LiveScene.unity index ea22e07..89e2202 100644 --- a/Assets/Scenes/LiveScene.unity +++ b/Assets/Scenes/LiveScene.unity @@ -165,7 +165,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 43.571, y: 180, z: 0} --- !u!65 &90721885 BoxCollider: @@ -556,7 +556,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 6 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 38.467, y: 180, z: 0} --- !u!114 &228833732 MonoBehaviour: @@ -1075,7 +1075,7 @@ Transform: m_ConstrainProportionsScale: 1 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 7 + m_RootOrder: 8 m_LocalEulerAnglesHint: {x: 22.765, y: 90, z: -90} --- !u!1 &393553461 GameObject: @@ -2413,7 +2413,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 8 + m_RootOrder: 9 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!1 &544144323 GameObject: @@ -2728,7 +2728,7 @@ Transform: - {fileID: 464471374} - {fileID: 176841265} m_Father: {fileID: 0} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &558427166 MonoBehaviour: @@ -3101,6 +3101,75 @@ MonoBehaviour: hitFxFadeOutDuration: 0.25 hitFxColor: {r: 1, g: 1, b: 1, a: 1} hitFxRadius: 0.5 +--- !u!1001 &589490383 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: -8679921383154817045, guid: 7551248e67d385b4086bc4a430f3b55d, type: 3} + propertyPath: m_RootOrder + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7551248e67d385b4086bc4a430f3b55d, type: 3} + propertyPath: m_LocalScale.x + value: 4.1422596 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7551248e67d385b4086bc4a430f3b55d, type: 3} + propertyPath: m_LocalScale.y + value: 3.5418022 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7551248e67d385b4086bc4a430f3b55d, type: 3} + propertyPath: m_LocalScale.z + value: 1.8205329 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7551248e67d385b4086bc4a430f3b55d, type: 3} + propertyPath: m_LocalPosition.x + value: 16 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7551248e67d385b4086bc4a430f3b55d, type: 3} + propertyPath: m_LocalPosition.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7551248e67d385b4086bc4a430f3b55d, type: 3} + propertyPath: m_LocalPosition.z + value: -18 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7551248e67d385b4086bc4a430f3b55d, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7551248e67d385b4086bc4a430f3b55d, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7551248e67d385b4086bc4a430f3b55d, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7551248e67d385b4086bc4a430f3b55d, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7551248e67d385b4086bc4a430f3b55d, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7551248e67d385b4086bc4a430f3b55d, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: -8679921383154817045, guid: 7551248e67d385b4086bc4a430f3b55d, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 919132149155446097, guid: 7551248e67d385b4086bc4a430f3b55d, type: 3} + propertyPath: m_Name + value: "\u5927\u68DA" + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 7551248e67d385b4086bc4a430f3b55d, type: 3} --- !u!1001 &666408816 PrefabInstance: m_ObjectHideFlags: 0 @@ -4045,7 +4114,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 9 + m_RootOrder: 10 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!4 &811020608 stripped Transform: @@ -4081,7 +4150,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 4 + m_RootOrder: 5 m_LocalEulerAnglesHint: {x: 70.288, y: 180, z: 0} --- !u!114 &825560677 MonoBehaviour: @@ -5622,7 +5691,7 @@ Transform: - {fileID: 672756066} - {fileID: 919038035} m_Father: {fileID: 0} - m_RootOrder: 1 + m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!65 &995305782 BoxCollider: @@ -7123,7 +7192,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0} --- !u!1 &1492561879 GameObject: @@ -8574,7 +8643,7 @@ Transform: m_ConstrainProportionsScale: 0 m_Children: [] m_Father: {fileID: 0} - m_RootOrder: 11 + m_RootOrder: 12 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1584651139 MonoBehaviour: @@ -9863,7 +9932,7 @@ Transform: - {fileID: 1285974577} - {fileID: 1861526680} m_Father: {fileID: 0} - m_RootOrder: 10 + m_RootOrder: 11 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1636558443 GameObject: