From 17ee2c590fc22acebab0b3c9a04fadc29cc6119a Mon Sep 17 00:00:00 2001 From: Lihao7788 <2470304407@qq.com> Date: Wed, 5 Mar 2025 15:06:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=8C=E7=8F=A0=E5=AE=9D?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ExameScene/ZhuBaoGongZuoTaiDeRenZhi.unity | 58 +++++++++++++++++++ Assets/Scenes/Main.unity | 52 ----------------- Assets/Scripts/Item/DeviceItem.cs | 3 +- Data/Xml/ZhuBaoGongZuoTaiDeRenZhi.xml | 8 +-- 4 files changed, 64 insertions(+), 57 deletions(-) diff --git a/Assets/Scenes/ExameScene/ZhuBaoGongZuoTaiDeRenZhi.unity b/Assets/Scenes/ExameScene/ZhuBaoGongZuoTaiDeRenZhi.unity index bfb27c74..62dc0ef7 100644 --- a/Assets/Scenes/ExameScene/ZhuBaoGongZuoTaiDeRenZhi.unity +++ b/Assets/Scenes/ExameScene/ZhuBaoGongZuoTaiDeRenZhi.unity @@ -1398,6 +1398,63 @@ MeshFilter: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 157261967} m_Mesh: {fileID: -1116444134294172880, guid: d0c30c207e9c8194098972abe75857f5, type: 3} +--- !u!1001 &173769651 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 0} + m_Modifications: + - target: {fileID: 6844553167586844115, guid: 5d3fef3a471ba2c429773b3bad221723, type: 3} + propertyPath: m_Name + value: Light2 + objectReference: {fileID: 0} + - target: {fileID: 8788038460598143613, guid: 5d3fef3a471ba2c429773b3bad221723, type: 3} + propertyPath: m_LocalPosition.x + value: -12.719273 + objectReference: {fileID: 0} + - target: {fileID: 8788038460598143613, guid: 5d3fef3a471ba2c429773b3bad221723, type: 3} + propertyPath: m_LocalPosition.y + value: 1.594 + objectReference: {fileID: 0} + - target: {fileID: 8788038460598143613, guid: 5d3fef3a471ba2c429773b3bad221723, type: 3} + propertyPath: m_LocalPosition.z + value: 11.21 + objectReference: {fileID: 0} + - target: {fileID: 8788038460598143613, guid: 5d3fef3a471ba2c429773b3bad221723, type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 8788038460598143613, guid: 5d3fef3a471ba2c429773b3bad221723, type: 3} + propertyPath: m_LocalRotation.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8788038460598143613, guid: 5d3fef3a471ba2c429773b3bad221723, type: 3} + propertyPath: m_LocalRotation.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8788038460598143613, guid: 5d3fef3a471ba2c429773b3bad221723, type: 3} + propertyPath: m_LocalRotation.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8788038460598143613, guid: 5d3fef3a471ba2c429773b3bad221723, type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8788038460598143613, guid: 5d3fef3a471ba2c429773b3bad221723, type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 8788038460598143613, guid: 5d3fef3a471ba2c429773b3bad221723, type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 5d3fef3a471ba2c429773b3bad221723, type: 3} --- !u!1 &179428777 GameObject: m_ObjectHideFlags: 0 @@ -19632,3 +19689,4 @@ SceneRoots: m_Roots: - {fileID: 1342862306} - {fileID: 179428778} + - {fileID: 173769651} diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity index 80a6a8ac..d67076e0 100644 --- a/Assets/Scenes/Main.unity +++ b/Assets/Scenes/Main.unity @@ -136,8 +136,6 @@ GameObject: - component: {fileID: 547432241} - component: {fileID: 547432240} - component: {fileID: 547432239} - - component: {fileID: 547432238} - - component: {fileID: 547432237} - component: {fileID: 547432236} - component: {fileID: 547432244} - component: {fileID: 547432245} @@ -166,56 +164,6 @@ MonoBehaviour: enableCollision: 1 isMov: 1 isRot: 1 ---- !u!54 &547432237 -Rigidbody: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 547432235} - serializedVersion: 4 - m_Mass: 1 - m_Drag: 0 - m_AngularDrag: 0.05 - m_CenterOfMass: {x: 0, y: 0, z: 0} - m_InertiaTensor: {x: 1, y: 1, z: 1} - m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ImplicitCom: 1 - m_ImplicitTensor: 1 - m_UseGravity: 0 - m_IsKinematic: 0 - m_Interpolate: 0 - m_Constraints: 0 - m_CollisionDetection: 0 ---- !u!136 &547432238 -CapsuleCollider: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 547432235} - m_Material: {fileID: 0} - m_IncludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_ExcludeLayers: - serializedVersion: 2 - m_Bits: 0 - m_LayerOverridePriority: 0 - m_IsTrigger: 0 - m_ProvidesContacts: 0 - m_Enabled: 1 - serializedVersion: 2 - m_Radius: 1.0228593 - m_Height: 2.045719 - m_Direction: 1 - m_Center: {x: 0, y: 0, z: 0} --- !u!114 &547432239 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/Item/DeviceItem.cs b/Assets/Scripts/Item/DeviceItem.cs index 13dff345..144067df 100644 --- a/Assets/Scripts/Item/DeviceItem.cs +++ b/Assets/Scripts/Item/DeviceItem.cs @@ -18,7 +18,8 @@ public class DeviceItem : MonoBehaviour { var effect = gameObject.GetOrAddComponent(); gameObject.GetOrAddComponent(); - effect.outlineColor = Color.green; + //读取xml颜色并转化 + effect.outlineColor = Utility.ToColor(device.HighColor); StringEventSystem.Global.Register(Global.HighLightTrigger, OnHighLightTriggerEvent); TypeEventSystem.Global.Register(OnStepChanged); } diff --git a/Data/Xml/ZhuBaoGongZuoTaiDeRenZhi.xml b/Data/Xml/ZhuBaoGongZuoTaiDeRenZhi.xml index 83f7339b..01e10ff7 100644 --- a/Data/Xml/ZhuBaoGongZuoTaiDeRenZhi.xml +++ b/Data/Xml/ZhuBaoGongZuoTaiDeRenZhi.xml @@ -33,13 +33,13 @@ - + @@ -290,7 +290,7 @@ - +