From 194d094fb25e8bb1f3175cd1b83c917dc59ddecc Mon Sep 17 00:00:00 2001 From: Lihao7788 <2470304407@qq.com> Date: Wed, 5 Mar 2025 15:12:57 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9flyCamera=20=E7=BB=84?= =?UTF-8?q?=E4=BB=B6=E4=B8=BA=E7=AC=AC=E4=B8=80=E4=BA=BA=E7=A7=B0=E6=8E=A7?= =?UTF-8?q?=E5=88=B6=E5=99=A8=EF=BC=8C=E5=8E=BB=E6=8E=89=E5=9C=86=E5=BD=A2?= =?UTF-8?q?=E7=A2=B0=E6=92=9E=E5=99=A8=E5=92=8C=E5=88=9A=E4=BD=93=E3=80=82?= =?UTF-8?q?=E6=8F=90=E4=BA=A4Devic=E4=BB=8Exml=E4=B8=AD=E8=AF=BB=E5=8F=96?= =?UTF-8?q?=E9=A2=9C=E8=89=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ghtPlus_Builtin_Pipeline.unitypackage.meta | 7 --- ...ghlightPlus_URP_Pipeline.unitypackage.meta | 7 --- .../Framework/Examples.unitypackage.meta | 7 --- ....FlappyBird.Unity2019.4+.unitypackage.meta | 7 --- ....CubeMaster.Unity2019.4+.unitypackage.meta | 7 --- .../AudioKit/Example.unitypackage.meta | 7 --- .../Toolkits/ResKit/Example.unitypackage.meta | 7 --- .../Toolkits/UIKit/Example.unitypackage.meta | 7 --- .../Toolkits/UIKit/Tests.unitypackage.meta | 7 --- .../ActionKit/Example.unitypackage.meta | 7 --- .../BindableKit/Example.unitypackage.meta | 7 --- .../CodeGenKit/Example.unitypackage.meta | 7 --- .../DeclareKit/Example.unitypackage.meta | 7 --- .../EventKit/Example.unitypackage.meta | 7 --- .../FSMKit/Examples.unitypackage.meta | 7 --- .../GridKit/Example.unitypackage.meta | 7 --- .../_CoreKit/IOCKit/Example.unitypackage.meta | 7 --- .../LocaleKit/Example.unitypackage.meta | 7 --- .../PoolKit/Example.unitypackage.meta | 7 --- .../SingletonKit/Example.unitypackage.meta | 7 --- .../TableKit/Example.unitypackage.meta | 7 --- Assets/Scenes/Main.unity | 52 ------------------- Assets/Scripts/Item/DeviceItem.cs | 3 +- 23 files changed, 2 insertions(+), 200 deletions(-) delete mode 100644 Assets/HighlightPlusBundle/Builtin/HighlightPlus_Builtin_Pipeline.unitypackage.meta delete mode 100644 Assets/HighlightPlusBundle/URP/HighlightPlus_URP_Pipeline.unitypackage.meta delete mode 100644 Assets/QFramework/Framework/Examples.unitypackage.meta delete mode 100644 Assets/QFramework/Framework/Examples/8.FlappyBird.Unity2019.4+.unitypackage.meta delete mode 100644 Assets/QFramework/Framework/Examples/9.CubeMaster.Unity2019.4+.unitypackage.meta delete mode 100644 Assets/QFramework/Toolkits/AudioKit/Example.unitypackage.meta delete mode 100644 Assets/QFramework/Toolkits/ResKit/Example.unitypackage.meta delete mode 100644 Assets/QFramework/Toolkits/UIKit/Example.unitypackage.meta delete mode 100644 Assets/QFramework/Toolkits/UIKit/Tests.unitypackage.meta delete mode 100644 Assets/QFramework/Toolkits/_CoreKit/ActionKit/Example.unitypackage.meta delete mode 100644 Assets/QFramework/Toolkits/_CoreKit/BindableKit/Example.unitypackage.meta delete mode 100644 Assets/QFramework/Toolkits/_CoreKit/CodeGenKit/Example.unitypackage.meta delete mode 100644 Assets/QFramework/Toolkits/_CoreKit/DeclareKit/Example.unitypackage.meta delete mode 100644 Assets/QFramework/Toolkits/_CoreKit/EventKit/Example.unitypackage.meta delete mode 100644 Assets/QFramework/Toolkits/_CoreKit/FSMKit/Examples.unitypackage.meta delete mode 100644 Assets/QFramework/Toolkits/_CoreKit/GridKit/Example.unitypackage.meta delete mode 100644 Assets/QFramework/Toolkits/_CoreKit/IOCKit/Example.unitypackage.meta delete mode 100644 Assets/QFramework/Toolkits/_CoreKit/LocaleKit/Example.unitypackage.meta delete mode 100644 Assets/QFramework/Toolkits/_CoreKit/PoolKit/Example.unitypackage.meta delete mode 100644 Assets/QFramework/Toolkits/_CoreKit/SingletonKit/Example.unitypackage.meta delete mode 100644 Assets/QFramework/Toolkits/_CoreKit/TableKit/Example.unitypackage.meta diff --git a/Assets/HighlightPlusBundle/Builtin/HighlightPlus_Builtin_Pipeline.unitypackage.meta b/Assets/HighlightPlusBundle/Builtin/HighlightPlus_Builtin_Pipeline.unitypackage.meta deleted file mode 100644 index 645dfac7..00000000 --- a/Assets/HighlightPlusBundle/Builtin/HighlightPlus_Builtin_Pipeline.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 4c87a0e1993f7439285693c04d6dab68 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/HighlightPlusBundle/URP/HighlightPlus_URP_Pipeline.unitypackage.meta b/Assets/HighlightPlusBundle/URP/HighlightPlus_URP_Pipeline.unitypackage.meta deleted file mode 100644 index 20bc5863..00000000 --- a/Assets/HighlightPlusBundle/URP/HighlightPlus_URP_Pipeline.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 52f45c84fa7e04a17922d3833762b05c -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/QFramework/Framework/Examples.unitypackage.meta b/Assets/QFramework/Framework/Examples.unitypackage.meta deleted file mode 100644 index b1674801..00000000 --- a/Assets/QFramework/Framework/Examples.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 51c6f3b897886a44991168f065c0a99d -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/QFramework/Framework/Examples/8.FlappyBird.Unity2019.4+.unitypackage.meta b/Assets/QFramework/Framework/Examples/8.FlappyBird.Unity2019.4+.unitypackage.meta deleted file mode 100644 index 80087a26..00000000 --- a/Assets/QFramework/Framework/Examples/8.FlappyBird.Unity2019.4+.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 2bf6cf57b414f194baf76e0a325b7964 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/QFramework/Framework/Examples/9.CubeMaster.Unity2019.4+.unitypackage.meta b/Assets/QFramework/Framework/Examples/9.CubeMaster.Unity2019.4+.unitypackage.meta deleted file mode 100644 index 9c21e330..00000000 --- a/Assets/QFramework/Framework/Examples/9.CubeMaster.Unity2019.4+.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: a84ca8d2ecd964e4688324f75f6f582a -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/AudioKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/AudioKit/Example.unitypackage.meta deleted file mode 100644 index 650fdeb0..00000000 --- a/Assets/QFramework/Toolkits/AudioKit/Example.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 1fae029c3eecbe44ea3ff0b493f20601 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/ResKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/ResKit/Example.unitypackage.meta deleted file mode 100644 index 46c7886f..00000000 --- a/Assets/QFramework/Toolkits/ResKit/Example.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d3f0c8e9f16a58243b803d5d47a79c03 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/UIKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/UIKit/Example.unitypackage.meta deleted file mode 100644 index 28fa79a2..00000000 --- a/Assets/QFramework/Toolkits/UIKit/Example.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 976cb377135fda24791255ebe76b2e57 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/UIKit/Tests.unitypackage.meta b/Assets/QFramework/Toolkits/UIKit/Tests.unitypackage.meta deleted file mode 100644 index c6cc42c5..00000000 --- a/Assets/QFramework/Toolkits/UIKit/Tests.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 5176cd918f52ea842b73948dd3bc26a8 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/ActionKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/_CoreKit/ActionKit/Example.unitypackage.meta deleted file mode 100644 index 5f92dd2d..00000000 --- a/Assets/QFramework/Toolkits/_CoreKit/ActionKit/Example.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 92ad6261b6f1d234e95b0d3d93ecb063 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/BindableKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/_CoreKit/BindableKit/Example.unitypackage.meta deleted file mode 100644 index 6ab466ab..00000000 --- a/Assets/QFramework/Toolkits/_CoreKit/BindableKit/Example.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 92073d73c00ba4745a1846e66e0d487e -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/CodeGenKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/_CoreKit/CodeGenKit/Example.unitypackage.meta deleted file mode 100644 index 969bcd8b..00000000 --- a/Assets/QFramework/Toolkits/_CoreKit/CodeGenKit/Example.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: c8cdbc6f43d08374d8ad57ba52c291e9 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/DeclareKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/_CoreKit/DeclareKit/Example.unitypackage.meta deleted file mode 100644 index 12a9b0a4..00000000 --- a/Assets/QFramework/Toolkits/_CoreKit/DeclareKit/Example.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 921cbf26409b3dc42bced514dfbc0294 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/EventKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/_CoreKit/EventKit/Example.unitypackage.meta deleted file mode 100644 index 39da17f3..00000000 --- a/Assets/QFramework/Toolkits/_CoreKit/EventKit/Example.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 260510f68d4501045937a08a041e9193 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/FSMKit/Examples.unitypackage.meta b/Assets/QFramework/Toolkits/_CoreKit/FSMKit/Examples.unitypackage.meta deleted file mode 100644 index c889b1c8..00000000 --- a/Assets/QFramework/Toolkits/_CoreKit/FSMKit/Examples.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 3ec7c95d917901144b2b4c87d6223452 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/GridKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/_CoreKit/GridKit/Example.unitypackage.meta deleted file mode 100644 index 1f2f24f5..00000000 --- a/Assets/QFramework/Toolkits/_CoreKit/GridKit/Example.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: d649e0c4be6794b47be815440ab085d3 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/IOCKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/_CoreKit/IOCKit/Example.unitypackage.meta deleted file mode 100644 index 769786cd..00000000 --- a/Assets/QFramework/Toolkits/_CoreKit/IOCKit/Example.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 84093f18d10915540be5035bf0bebf1c -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/LocaleKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/_CoreKit/LocaleKit/Example.unitypackage.meta deleted file mode 100644 index 82304f47..00000000 --- a/Assets/QFramework/Toolkits/_CoreKit/LocaleKit/Example.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 160fc31f922750444afec5e3d7280c07 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/PoolKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/_CoreKit/PoolKit/Example.unitypackage.meta deleted file mode 100644 index c2941e5e..00000000 --- a/Assets/QFramework/Toolkits/_CoreKit/PoolKit/Example.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 637404373c3be1b4abb149a6ec887955 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/SingletonKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/_CoreKit/SingletonKit/Example.unitypackage.meta deleted file mode 100644 index 2e8929b9..00000000 --- a/Assets/QFramework/Toolkits/_CoreKit/SingletonKit/Example.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 43709ae6df606fe4680b4f2cdb456ef2 -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/QFramework/Toolkits/_CoreKit/TableKit/Example.unitypackage.meta b/Assets/QFramework/Toolkits/_CoreKit/TableKit/Example.unitypackage.meta deleted file mode 100644 index 74ac4669..00000000 --- a/Assets/QFramework/Toolkits/_CoreKit/TableKit/Example.unitypackage.meta +++ /dev/null @@ -1,7 +0,0 @@ -fileFormatVersion: 2 -guid: 27a53bb609d45b240a6ae0f54e40ac3b -DefaultImporter: - externalObjects: {} - userData: - assetBundleName: - assetBundleVariant: 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); }