From 797802dfd39043e48536cf8c58954555ffd08d1f Mon Sep 17 00:00:00 2001
From: shenjianxing <”315615051@qq.com“>
Date: Wed, 18 Dec 2024 09:12:49 +0800
Subject: [PATCH 1/8] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=9B=B8=E6=9C=BA?=
 =?UTF-8?q?=E8=A7=86=E8=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scenes/Main.unity | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Assets/Scenes/Main.unity b/Assets/Scenes/Main.unity
index b95b17c8..f550e046 100644
--- a/Assets/Scenes/Main.unity
+++ b/Assets/Scenes/Main.unity
@@ -289,7 +289,7 @@ Camera:
     height: 1
   near clip plane: 0.3
   far clip plane: 1000
-  field of view: 50
+  field of view: 25
   orthographic: 0
   orthographic size: 5
   m_Depth: -1

From 16f262b80e60d97656c9c0142935a7c2eba7307f Mon Sep 17 00:00:00 2001
From: shenjianxing <”315615051@qq.com“>
Date: Wed, 18 Dec 2024 09:13:10 +0800
Subject: [PATCH 2/8] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E8=B4=A8=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ProjectSettings/QualitySettings.asset | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/ProjectSettings/QualitySettings.asset b/ProjectSettings/QualitySettings.asset
index 284d51f3..c5866091 100644
--- a/ProjectSettings/QualitySettings.asset
+++ b/ProjectSettings/QualitySettings.asset
@@ -120,7 +120,7 @@ QualitySettings:
     globalTextureMipmapLimit: 0
     textureMipmapLimitSettings: []
     anisotropicTextures: 1
-    antiAliasing: 2
+    antiAliasing: 8
     softParticles: 0
     softVegetation: 1
     realtimeReflectionProbes: 1
@@ -162,9 +162,10 @@ QualitySettings:
     Nintendo Switch: 2
     PS4: 2
     PS5: 2
+    Server: 2
     Stadia: 2
     Standalone: 2
-    WebGL: 1
+    WebGL: 2
     Windows Store Apps: 2
     XboxOne: 2
     iPhone: 1

From 4e8a0eff02cd4fafeba01aa241e0efaad250c1c9 Mon Sep 17 00:00:00 2001
From: shenjianxing <”315615051@qq.com“>
Date: Wed, 18 Dec 2024 09:23:35 +0800
Subject: [PATCH 3/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=81=93=E5=85=B7?=
 =?UTF-8?q?=E6=A0=8F=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=9B=BE=E7=89=87=E7=9A=84?=
 =?UTF-8?q?bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scripts/UI/UITools.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Assets/Scripts/UI/UITools.cs b/Assets/Scripts/UI/UITools.cs
index f829a955..ff0635ce 100644
--- a/Assets/Scripts/UI/UITools.cs
+++ b/Assets/Scripts/UI/UITools.cs
@@ -58,7 +58,7 @@ namespace QFramework.Example
                     {
                         if (success)
                         {
-                            var texture2D = Utility.GetSprite(res.Asset as Texture2D);
+                            icon.sprite = Utility.GetSprite(res.Asset as Texture2D);
                         }
                     });
                 Button btn = obj.GetComponent<Button>();

From 90bb9d43acd4e505b5b41480f39a7e9f8fe894f9 Mon Sep 17 00:00:00 2001
From: shenjianxing <”315615051@qq.com“>
Date: Wed, 18 Dec 2024 09:38:57 +0800
Subject: [PATCH 4/8] =?UTF-8?q?=E8=A1=A5=E5=85=85=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E6=A1=A3=20=E7=89=A9=E4=BD=93=E6=98=BE=E5=BD=B1?=
 =?UTF-8?q?=E7=9A=84Action?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Doc/Xml配置文档.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Doc/Xml配置文档.xml b/Doc/Xml配置文档.xml
index f744e5f2..1046ec0a 100644
--- a/Doc/Xml配置文档.xml
+++ b/Doc/Xml配置文档.xml
@@ -47,7 +47,8 @@
 	-->
 	<Action type="Video" value="test.mp4" size="500,500" offset="10,10" finishedEvent="finished" closeEvent="close"/>
 
-
+	<!--物体显隐 用于3D物体 isShow=true为显示 false为隐藏  UI的显隐使用UIShow-->
+	<Action type="Show" value="SM_QvanChangJing/sence/pPlane1" isShow="false"></Action>
 
 
 

From a08d48cb964f8227b8109182e3d8a2a27532cc0e Mon Sep 17 00:00:00 2001
From: shenjianxing <”315615051@qq.com“>
Date: Wed, 18 Dec 2024 09:41:34 +0800
Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Doc/Xml配置文档.xml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Doc/Xml配置文档.xml b/Doc/Xml配置文档.xml
index 1046ec0a..355c5c7c 100644
--- a/Doc/Xml配置文档.xml
+++ b/Doc/Xml配置文档.xml
@@ -43,8 +43,7 @@
 	<!--锁定镜头 value为是否锁定-->
 	<Action type="LockCamera" value="true" />
 	<!--播放视频 size为视频窗口大小 offset为窗口中心点偏移 播放完成事件和关闭事件 通常使用关闭事件即可
-	宽度不要小于500 否则进度条看不太清楚
-	-->
+	宽度不要小于500 否则进度条看不太清楚-->
 	<Action type="Video" value="test.mp4" size="500,500" offset="10,10" finishedEvent="finished" closeEvent="close"/>
 
 	<!--物体显隐 用于3D物体 isShow=true为显示 false为隐藏  UI的显隐使用UIShow-->

From 4a060ea867d190d59f619e0b21702e0b71ef5f91 Mon Sep 17 00:00:00 2001
From: shenjianxing <”315615051@qq.com“>
Date: Wed, 18 Dec 2024 09:48:53 +0800
Subject: [PATCH 6/8] =?UTF-8?q?=E6=96=87=E5=AD=97=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scripts/UI/UITextTip.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Assets/Scripts/UI/UITextTip.cs b/Assets/Scripts/UI/UITextTip.cs
index f679bc37..b7738738 100644
--- a/Assets/Scripts/UI/UITextTip.cs
+++ b/Assets/Scripts/UI/UITextTip.cs
@@ -3,6 +3,7 @@ using UnityEngine.UI;
 using QFramework;
 using System.Collections.Generic;
 using TMPro;
+using System.Text.RegularExpressions;
 
 namespace QFramework.Example
 {
@@ -25,7 +26,7 @@ namespace QFramework.Example
         protected override void OnOpen(IUIData uiData = null)
         {
             mData = uiData as UITextTipData ?? new UITextTipData();
-            Des.text = mData.text;
+            Des.text = Regex.Replace(mData.text, @"\\n", "\n");
             BtnContent.RemoveAllChildren();
             foreach (var item in mData.btns)
             {

From 112cdbfc363cfb644121c586bb2bfb12a358ac70 Mon Sep 17 00:00:00 2001
From: shenjianxing <”315615051@qq.com“>
Date: Wed, 18 Dec 2024 10:20:37 +0800
Subject: [PATCH 7/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=87=E5=AD=97?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Doc/Xml配置文档.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/Doc/Xml配置文档.xml b/Doc/Xml配置文档.xml
index 355c5c7c..1d08b8b7 100644
--- a/Doc/Xml配置文档.xml
+++ b/Doc/Xml配置文档.xml
@@ -7,13 +7,13 @@
 	<Action type="Any"></Action>
 	<!--打印日志-->
 	<Action type="Log" value="进入初始状态"></Action>
-	<!--显示UI-->
-	<Action type="UIShow" value="UIOperationList"></Action>
-	<!--移动物体-->
+	<!--显示UI  value是UI的名字 isShow 是显示还是隐藏-->
+	<Action type="UIShow" value="UIOperationList" isShow="false"></Action>
+	<!--移动物体 time是多长时间移动到目标位置 0是瞬间完成-->
 	<Action type="Move" value="Main Camera" to="18.162,2.113,3.22" time="0"></Action>
-	<!--旋转物体-->
+	<!--旋转物体 time是多长时间旋转到目标位置 0是瞬间完成-->
 	<Action type="Rotate" value="Main Camera" to="0,180,0" time="0"></Action>
-	<!--执行下一步左侧步骤列表-->
+	<!--执行下一步左侧步骤列表 默认开始的时候为-1步 要主动调用一次才到第1步-->
 	<Action type="NextOperation"></Action>
 	<!--播放动画-->
 	<Action type="Anim" value="物体路径" animName="动画名字"></Action>
@@ -26,7 +26,7 @@
 			wrongLabel="提示：器械选择错误，\r\n当前模块中，不需要该物品。"
 			rightEvent=""
 			wrongEvent=""/>
-	<!--物体点位选择-->
+	<!--物体点位选择 物体的中心点-->
 	<Action type="PointQuestion" value="路径1,路径2"></Action>
 	<!--文字选择题-->
 	<Action type="TextQuestion" title="这里是标题" options="A.111|B.222|C.333|D.4444" answers="2" btns="确定,取消" wait="1" showAnswer="true"></Action>

From 10a16efdf54db1667ab83b8f44ce9116dae8a0ea Mon Sep 17 00:00:00 2001
From: shenjianxing <”315615051@qq.com“>
Date: Wed, 18 Dec 2024 10:58:52 +0800
Subject: [PATCH 8/8] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=8C=89=E9=92=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Assets/Scripts/Conditions/UIClickCondition.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Assets/Scripts/Conditions/UIClickCondition.cs b/Assets/Scripts/Conditions/UIClickCondition.cs
index bdfc53f5..2f705764 100644
--- a/Assets/Scripts/Conditions/UIClickCondition.cs
+++ b/Assets/Scripts/Conditions/UIClickCondition.cs
@@ -62,6 +62,7 @@ namespace QFramework
             {
                 Deinited = true;
                 mCondition = null;
+                obj = null;
                 mSimpleObjectPool.Recycle(this);
             }
         }