Prechádzať zdrojové kódy

demo也把椭圆框去掉

ZIM 1 rok pred
rodič
commit
a72656b93e

+ 6 - 6
Assets/InfraredProject/WebCamera/Script/ZIM/InfraredLocate/ScreenIdentification.cs

@@ -781,22 +781,22 @@ namespace o0.Project
             }
             #endregion
 
-            // 优先应用自动的结果(也可以在外部手动设置)
+            // 优先应用自动的结果(也可以在外部手动设置)
             if (QuadSemiAuto == null && QuadAuto == null && Screen.QuadInCamera != null)     // 如果可能,回退到上一个screen
             {
                 Debug.Log($"<color=yellow>[ScreenIdentification] 本次识别失败,回退到上次的识别结果: {Screen.QuadInCamera}</color>");
                 quadTemp.Add(Screen.QuadInCamera);
             }
-            else if (QuadSemiAuto != null)
-            {
-                Debug.Log($"<color=aqua>[ScreenIdentification] 识别到四边形(半自动): {QuadSemiAuto}</color>");
-                quadTemp.Add(QuadSemiAuto);
-            }
             else if (QuadAuto != null)
             {
                 Debug.Log($"<color=aqua>[ScreenIdentification] 识别到四边形(全自动): {QuadAuto}</color>");
                 quadTemp.Add(QuadAuto);
             }
+            else if (QuadSemiAuto != null)
+            {
+                Debug.Log($"<color=aqua>[ScreenIdentification] 识别到四边形(半自动): {QuadSemiAuto}</color>");
+                quadTemp.Add(QuadSemiAuto);
+            }
 
             #region 绘制 output texture
             // 绘制半自动

+ 10 - 2
Assets/InfraredProject/WebCamera/zimWebCamera.unity

@@ -4311,7 +4311,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1645986108}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
@@ -6257,7 +6257,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4444241363306702547}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
   m_Name: 
@@ -6341,6 +6341,14 @@ PrefabInstance:
       propertyPath: m_IsActive
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 7518895720434693105, guid: 742f117969807f147b562a0be2d52864, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 1.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7518895720434693105, guid: 742f117969807f147b562a0be2d52864, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 1.5
+      objectReference: {fileID: 0}
     - target: {fileID: 7518895720462305554, guid: 742f117969807f147b562a0be2d52864, type: 3}
       propertyPath: m_Name
       value: CameraMask