From 0aea021b7c21fe1ac93e7c2df0f010c4cbb1193c Mon Sep 17 00:00:00 2001
From: shenjianxing <”315615051@qq.com“>
Date: Tue, 21 Jan 2025 09:23:57 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E5=88=A0=E6=8E=89=E4=B9=8B=E5=89=8D?=
=?UTF-8?q?=E7=9A=84=E9=95=9C=E5=A4=B4=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Data/Xml/Exam.xml | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/Data/Xml/Exam.xml b/Data/Xml/Exam.xml
index a78d36c9..4a694f51 100644
--- a/Data/Xml/Exam.xml
+++ b/Data/Xml/Exam.xml
@@ -917,9 +917,8 @@
-
-
-
+
+
@@ -966,10 +965,7 @@
-
-
-
-
+
@@ -1062,8 +1058,6 @@
-
-
From bf0b0cdd0e6c43e855a3ed37d5f52c9635add172 Mon Sep 17 00:00:00 2001
From: shenjianxing <”315615051@qq.com“>
Date: Tue, 21 Jan 2025 10:00:19 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=83=E6=AF=9B?=
=?UTF-8?q?=E5=8A=A8=E7=94=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Data/Xml/Exam.xml | 1 +
1 file changed, 1 insertion(+)
diff --git a/Data/Xml/Exam.xml b/Data/Xml/Exam.xml
index 4a694f51..a180a18d 100644
--- a/Data/Xml/Exam.xml
+++ b/Data/Xml/Exam.xml
@@ -1359,6 +1359,7 @@
+
From fb2461d0d533ca7feddd5084d6cadf92c57ff294 Mon Sep 17 00:00:00 2001
From: shenjianxing <”315615051@qq.com“>
Date: Tue, 21 Jan 2025 10:06:52 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=95=9C=E5=A4=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Data/Xml/Exam.xml | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Data/Xml/Exam.xml b/Data/Xml/Exam.xml
index a180a18d..5e7eb0cf 100644
--- a/Data/Xml/Exam.xml
+++ b/Data/Xml/Exam.xml
@@ -1902,7 +1902,7 @@
-
+
@@ -2156,7 +2156,6 @@
-
From 6c5aa4b7bee8b16932ff522b6c2eae77dbc118b8 Mon Sep 17 00:00:00 2001
From: shenjianxing <”315615051@qq.com“>
Date: Tue, 21 Jan 2025 10:08:13 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E9=81=BF=E5=85=8D=E6=B2=A1=E6=9C=89?=
=?UTF-8?q?=E5=8F=82=E6=95=B0=E6=97=B6=20=E7=9B=B8=E6=9C=BA=E7=A7=BB?=
=?UTF-8?q?=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Assets/Scripts/UI/UICameraSwitch.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Assets/Scripts/UI/UICameraSwitch.cs b/Assets/Scripts/UI/UICameraSwitch.cs
index 1f3d5451..e63756f0 100644
--- a/Assets/Scripts/UI/UICameraSwitch.cs
+++ b/Assets/Scripts/UI/UICameraSwitch.cs
@@ -66,11 +66,11 @@ namespace QFramework.Example
if (string.IsNullOrEmpty(mData.isOn))
{
- if (Near.isOn)
+ if (Near.isOn && Near.gameObject.activeSelf)
{
SetNear();
}
- if (Far.isOn)
+ if (Far.isOn && Far.gameObject.activeSelf)
{
SetNormal();
}
From c4c23acfe6140d0299f04372af113f7dfbdd1a2e Mon Sep 17 00:00:00 2001
From: shenjianxing <”315615051@qq.com“>
Date: Tue, 21 Jan 2025 10:33:45 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=86=E8=A7=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
Data/Xml/Exam.xml | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
diff --git a/Data/Xml/Exam.xml b/Data/Xml/Exam.xml
index 5e7eb0cf..c2a8ac1b 100644
--- a/Data/Xml/Exam.xml
+++ b/Data/Xml/Exam.xml
@@ -1290,6 +1290,9 @@
+
+
+
@@ -1307,9 +1310,14 @@
+
+
+
+
+
@@ -1326,7 +1334,7 @@
-
+
@@ -1369,7 +1377,7 @@
-
+
@@ -1474,7 +1482,7 @@
-
+
@@ -1702,7 +1710,7 @@
-
+
@@ -2061,7 +2069,7 @@
-
+
@@ -2464,6 +2472,7 @@
+