From a9a01f6020c45f13bcb313f9a74ded7c125a0011 Mon Sep 17 00:00:00 2001 From: Lihao7788 <2470304407@qq.com> Date: Mon, 10 Mar 2025 09:08:12 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85=EF=BC=8C?= =?UTF-8?q?=E5=BC=95=E7=94=A8=E9=97=AE=E9=A2=98=EF=BC=8C=E6=89=93AB?= =?UTF-8?q?=E5=8C=85=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=B8=B2=E6=9F=93=E5=9B=BE?= =?UTF-8?q?=E5=9C=BA=E6=99=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/QFrameworkData/QAssets.cs | 15 +++ .../所有工具集合的渲染场景/渲染图场景.unity | 92 +++++++++++++++++++ Assets/Scripts/Actions/TextWindowAction.cs | 1 - Data/Xml/BaoShiZhuoMoJiaGong.xml | 6 +- 4 files changed, 110 insertions(+), 4 deletions(-) diff --git a/Assets/QFrameworkData/QAssets.cs b/Assets/QFrameworkData/QAssets.cs index ed10d92d..2c9ddcb1 100644 --- a/Assets/QFrameworkData/QAssets.cs +++ b/Assets/QFrameworkData/QAssets.cs @@ -36,6 +36,11 @@ namespace QAssetBundle public const string BundleName = "ui3dobjshow_prefab"; public const string UI3DOBJSHOW = "UI3DObjShow"; } + public class Uibackpack_prefab + { + public const string BundleName = "uibackpack_prefab"; + public const string UIBACKPACK = "UIBackPack"; + } public class Uibody3d_prefab { public const string BundleName = "uibody3d_prefab"; @@ -71,6 +76,11 @@ namespace QAssetBundle public const string BundleName = "uidraw_prefab"; public const string UIDRAW = "UIDraw"; } + public class Uifengguangjingbskpanel_prefab + { + public const string BundleName = "uifengguangjingbskpanel_prefab"; + public const string UIFENGGUANGJINGBSKPANEL = "UIFengGuangJingBSKPanel"; + } public class Uihint_prefab { public const string BundleName = "uihint_prefab"; @@ -156,6 +166,11 @@ namespace QAssetBundle public const string BundleName = "uitexttip_prefab"; public const string UITEXTTIP = "UITextTip"; } + public class Uitextwindow_prefab + { + public const string BundleName = "uitextwindow_prefab"; + public const string UITEXTWINDOW = "UITextWindow"; + } public class Uitimetip_prefab { public const string BundleName = "uitimetip_prefab"; diff --git a/Assets/Scenes/所有工具集合的渲染场景/渲染图场景.unity b/Assets/Scenes/所有工具集合的渲染场景/渲染图场景.unity index 12b864ef..52636892 100644 --- a/Assets/Scenes/所有工具集合的渲染场景/渲染图场景.unity +++ b/Assets/Scenes/所有工具集合的渲染场景/渲染图场景.unity @@ -7532,6 +7532,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -4519707515475234804, guid: 60440d4dab8453f4598114f7f4c7a3d3, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 60440d4dab8453f4598114f7f4c7a3d3, type: 3} propertyPath: m_Name value: SM_MuJu @@ -22400,6 +22404,89 @@ Transform: - {fileID: 1104367058} m_Father: {fileID: 1700791042} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} +--- !u!1 &1010479305 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1010479308} + - component: {fileID: 1010479307} + - component: {fileID: 1010479306} + m_Layer: 0 + m_Name: SM_HanWa1 (2) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!23 &1010479306 +MeshRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1010479305} + m_Enabled: 1 + m_CastShadows: 1 + m_ReceiveShadows: 1 + m_DynamicOccludee: 1 + m_StaticShadowCaster: 0 + m_MotionVectors: 1 + m_LightProbeUsage: 1 + m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 + m_RayTraceProcedural: 0 + m_RenderingLayerMask: 1 + m_RendererPriority: 0 + m_Materials: + - {fileID: 2100000, guid: 5245ccbfbc2d519468164def03678352, type: 2} + m_StaticBatchInfo: + firstSubMesh: 0 + subMeshCount: 0 + m_StaticBatchRoot: {fileID: 0} + m_ProbeAnchor: {fileID: 0} + m_LightProbeVolumeOverride: {fileID: 0} + m_ScaleInLightmap: 1 + m_ReceiveGI: 1 + m_PreserveUVs: 0 + m_IgnoreNormalsForChartDetection: 0 + m_ImportantGI: 0 + m_StitchLightmapSeams: 1 + m_SelectedEditorRenderState: 3 + m_MinimumChartSize: 4 + m_AutoUVMaxDistance: 0.5 + m_AutoUVMaxAngle: 89 + m_LightmapParameters: {fileID: 0} + m_SortingLayerID: 0 + m_SortingLayer: 0 + m_SortingOrder: 0 + m_AdditionalVertexStreams: {fileID: 0} +--- !u!33 &1010479307 +MeshFilter: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1010479305} + m_Mesh: {fileID: 5079998113765278230, guid: ca8d7b8b3fb0698468901debdbb7d9db, type: 3} +--- !u!4 &1010479308 +Transform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 1010479305} + serializedVersion: 2 + m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068} + m_LocalPosition: {x: 2.277, y: 1.22, z: -3.272} + m_LocalScale: {x: 0.393422, y: 0.39342213, z: 0.39342213} + m_ConstrainProportionsScale: 0 + m_Children: [] + m_Father: {fileID: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1 &1012067429 GameObject: m_ObjectHideFlags: 0 @@ -45169,6 +45256,10 @@ PrefabInstance: propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} + - target: {fileID: -2070901158121195736, guid: 57c28da14f2fa3942aa1ebef0ac0b937, type: 3} + propertyPath: m_IsActive + value: 0 + objectReference: {fileID: 0} - target: {fileID: 919132149155446097, guid: 57c28da14f2fa3942aa1ebef0ac0b937, type: 3} propertyPath: m_Name value: SM_GanGuo @@ -49965,6 +50056,7 @@ SceneRoots: - {fileID: 2011425428} - {fileID: 1640303727} - {fileID: 718806232} + - {fileID: 1010479308} - {fileID: 1828191939} - {fileID: 1735958525} - {fileID: 237590928} diff --git a/Assets/Scripts/Actions/TextWindowAction.cs b/Assets/Scripts/Actions/TextWindowAction.cs index 984f2a07..50a12bbf 100644 --- a/Assets/Scripts/Actions/TextWindowAction.cs +++ b/Assets/Scripts/Actions/TextWindowAction.cs @@ -5,7 +5,6 @@ using QFramework; using System; using QFramework.Example; using System.Linq; -using TreeEditor; public class TextWindowAction : IAction { public ulong ActionID { get; set; } diff --git a/Data/Xml/BaoShiZhuoMoJiaGong.xml b/Data/Xml/BaoShiZhuoMoJiaGong.xml index fb6fcf48..f1c61616 100644 --- a/Data/Xml/BaoShiZhuoMoJiaGong.xml +++ b/Data/Xml/BaoShiZhuoMoJiaGong.xml @@ -100,8 +100,8 @@ - - + + @@ -1210,7 +1210,7 @@ - +