Merge branch 'master' into LouDi_Pig

Assets/Scenes/Main.unity

@@ -261,7 +261,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

Assets/Scripts/Conditions/UIClickCondition.cs

@@ -62,6 +62,7 @@ namespace QFramework
             {
                 Deinited = true;
                 mCondition = null;
+                obj = null;
                 mSimpleObjectPool.Recycle(this);
             }
         }

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)
             {

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>();

Doc/Xml配置文档.xml

@@ -7,13 +7,13 @@
 	<Action type="Any"></Action>
 	<!--打印日志-->
 	<Action type="Log" value="进入初始状态"></Action>
-	<!--显示UI-->
+	<!--显示UI  value是UI的名字 isShow 是显示还是隐藏-->
-	<Action type="UIShow" value="UIOperationList"></Action>
+	<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>
@@ -43,11 +43,11 @@
 	<!--锁定镜头 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-->
+	<Action type="Show" value="SM_QvanChangJing/sence/pPlane1" isShow="false"></Action>
 
 
 

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