修改线宽

Assets/InfraredProject/WebCamera/zimWebCamera.unity

@@ -305,7 +305,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1867793102}
-  m_RootOrder: 13
+  m_RootOrder: 14
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -1180,7 +1180,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1867793102}
-  m_RootOrder: 17
+  m_RootOrder: 18
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -1385,7 +1385,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1867793102}
-  m_RootOrder: 12
+  m_RootOrder: 13
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0.5}
   m_AnchorMax: {x: 0, y: 0.5}
@@ -1885,7 +1885,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1867793102}
-  m_RootOrder: 19
+  m_RootOrder: 20
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -2249,7 +2249,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1867793102}
-  m_RootOrder: 18
+  m_RootOrder: 19
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 0, y: 1}
@@ -2457,7 +2457,7 @@ RectTransform:
   - {fileID: 1092870242}
   - {fileID: 1728164016}
   m_Father: {fileID: 1867793102}
-  m_RootOrder: 15
+  m_RootOrder: 16
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -2499,6 +2499,79 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 922494662}
   m_CullTransparentMesh: 1
+--- !u!1 &941124382
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 6
+  m_Component:
+  - component: {fileID: 941124383}
+  - component: {fileID: 941124385}
+  - component: {fileID: 941124384}
+  m_Layer: 5
+  m_Name: CameraImage8
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &941124383
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 941124382}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1867793102}
+  m_RootOrder: 12
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -1649, y: -418}
+  m_SizeDelta: {x: 720, y: 420}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &941124384
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 941124382}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Texture: {fileID: 0}
+  m_UVRect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 1
+    height: 1
+--- !u!222 &941124385
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 941124382}
+  m_CullTransparentMesh: 1
 --- !u!1 &943874010
 GameObject:
   m_ObjectHideFlags: 0
@@ -4120,7 +4193,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1867793102}
-  m_RootOrder: 14
+  m_RootOrder: 15
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
@@ -4548,7 +4621,7 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1867793102}
-  m_RootOrder: 16
+  m_RootOrder: 17
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
@@ -5575,6 +5648,7 @@ RectTransform:
   - {fileID: 476763548}
   - {fileID: 1309947137}
   - {fileID: 3098480069149916812}
+  - {fileID: 941124383}
   - {fileID: 557727041}
   - {fileID: 142442726}
   - {fileID: 1438266374}
@@ -5605,8 +5679,8 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   cameraIndex: 0
-  width: 100
-  height: 100
+  width: 1920
+  height: 1080
   fps: 30
   rawImage: {fileID: 2101632897}
   rawImageSize: {fileID: 681002959}
@@ -6363,7 +6437,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7518895720462305555, guid: 742f117969807f147b562a0be2d52864, type: 3}
       propertyPath: m_RootOrder
-      value: 22
+      value: 21
       objectReference: {fileID: 0}
     - target: {fileID: 7518895720462305555, guid: 742f117969807f147b562a0be2d52864, type: 3}
       propertyPath: m_AnchorMax.x

Assets/SmartBow/Scripts/Views/InfraredViewParts/InfraredScreenPositioningView.cs

@@ -78,8 +78,14 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
     int DefaultResolutionIndex;
     private void Awake()
     {
-        offset = line.MyThickness;
-
+        if (ScreenLocate.Main.DebugOnZIMDemo)
+        {
+            offset = line.MyThickness = 3;
+        }
+        else
+        {
+            offset = line.MyThickness;
+        }
     }
 
     void Start()

Assets/SmartBow/Scripts/Views/InfraredViewParts/Line.cs

@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+锘縰sing System.Collections.Generic;
 using UnityEngine;
 using UnityEngine.UI;
 
@@ -16,9 +16,9 @@ namespace LineUI
         [SerializeField] private List<Vector2> screenPositions = new List<Vector2>();
 
         [SerializeField] private Color maskColor = Color.red;
-        //是否绘制内四边形
+        //鏄�惁缁樺埗鍐呭洓杈瑰舰
         [SerializeField] bool bDrawQuad = true;
-        //是否绘制外围蒙板
+        //鏄�惁缁樺埗澶栧洿钂欐澘
         [SerializeField] bool bDrawMask = false;
         //[SerializeField] private Color quadTextColor = Color.black;
         //[SerializeField] private int quadFontSize = 14;
@@ -38,7 +38,7 @@ namespace LineUI
             get => thickness;
             set
             {
-                if (value >= 10)
+                if (value >= 3)
                 {
                     thickness = value;
                 }
@@ -73,7 +73,7 @@ namespace LineUI
 
             if(bDrawQuad) SetQuadrilateralVertices(vh);
 
-            if(bDrawMask) DrawMask(vh); // 绘制蒙版
+            if(bDrawMask) DrawMask(vh); // 缁樺埗钂欑増
         }
 
         private void SetLineVertices(VertexHelper vh)
@@ -203,41 +203,41 @@ namespace LineUI
             UIVertex vert = UIVertex.simpleVert;
             vert.color = maskColor;
 
-            //// 屏幕四个角的坐标
+            //// 灞忓箷鍥涗釜瑙掔殑鍧愭爣
             //Vector2[] screenCorners = new Vector2[]
             //{
-            //    new Vector2(-Screen.width / 2, -Screen.height / 2), // 左下角
-            //    new Vector2(Screen.width / 2, -Screen.height / 2),  // 右下角
-            //    new Vector2(Screen.width / 2, Screen.height / 2),   // 右上角
-            //    new Vector2(-Screen.width / 2, Screen.height / 2),  // 左上角
+            //    new Vector2(-Screen.width / 2, -Screen.height / 2), // 宸︿笅瑙�
+            //    new Vector2(Screen.width / 2, -Screen.height / 2),  // 鍙充笅瑙�
+            //    new Vector2(Screen.width / 2, Screen.height / 2),   // 鍙充笂瑙�
+            //    new Vector2(-Screen.width / 2, Screen.height / 2),  // 宸︿笂瑙�
             //};
 
-            // 获取 RectTransform 的实际四个角坐标
+            // 鑾峰彇 RectTransform 鐨勫疄闄呭洓涓��鍧愭爣
             Rect rect = rectTransform.rect;
 
             Vector2[] screenCorners = new Vector2[]
             {
-                new Vector2(rect.xMin, rect.yMin), // 左下角
-                new Vector2(rect.xMax, rect.yMin), // 右下角
-                new Vector2(rect.xMax, rect.yMax), // 右上角
-                new Vector2(rect.xMin, rect.yMax), // 左上角
+                new Vector2(rect.xMin, rect.yMin), // 宸︿笅瑙�
+                new Vector2(rect.xMax, rect.yMin), // 鍙充笅瑙�
+                new Vector2(rect.xMax, rect.yMax), // 鍙充笂瑙�
+                new Vector2(rect.xMin, rect.yMax), // 宸︿笂瑙�
             };
 
-            // 添加四个点作为内框（中间区域的四个顶点）
+            // 娣诲姞鍥涗釜鐐逛綔涓哄唴妗嗭紙涓�棿鍖哄煙鐨勫洓涓�《鐐癸級
             Vector2[] innerCorners = screenPositions.ToArray();
 
-            // 分别绘制四个蒙版区域
+            // 鍒嗗埆缁樺埗鍥涗釜钂欑増鍖哄煙
 
-            // 1. 左上区域：围绕左上角和内框左上、右上
+            // 1. 宸︿笂鍖哄煙锛氬洿缁曞乏涓婅�鍜屽唴妗嗗乏涓娿€佸彸涓�
             AddQuad(vh, screenCorners[3], innerCorners[3], innerCorners[2], screenCorners[2]);
 
-            // 2. 右上区域：围绕右上角和内框右上、右下
+            // 2. 鍙充笂鍖哄煙锛氬洿缁曞彸涓婅�鍜屽唴妗嗗彸涓娿€佸彸涓�
             AddQuad(vh, innerCorners[2], screenCorners[2], screenCorners[1], innerCorners[1]);
 
-            // 3. 右下区域：围绕右下角和内框右下、左下
+            // 3. 鍙充笅鍖哄煙锛氬洿缁曞彸涓嬭�鍜屽唴妗嗗彸涓嬨€佸乏涓�
             AddQuad(vh, innerCorners[0], innerCorners[1], screenCorners[1], screenCorners[0]);
 
-            // 4. 左下区域：围绕左下角和内框左下、左上
+            // 4. 宸︿笅鍖哄煙锛氬洿缁曞乏涓嬭�鍜屽唴妗嗗乏涓嬨€佸乏涓�
             AddQuad(vh, screenCorners[3], screenCorners[0], innerCorners[0], innerCorners[3]);
 
         }

Packages/packages-lock.json

@@ -11,14 +11,14 @@
       "depth": 0,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.ext.nunit": {
       "version": "1.0.6",
       "depth": 1,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.ide.rider": {
       "version": "3.0.18",
@@ -27,7 +27,7 @@
       "dependencies": {
         "com.unity.ext.nunit": "1.0.6"
       },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.ide.visualstudio": {
       "version": "2.0.17",
@@ -36,14 +36,14 @@
       "dependencies": {
         "com.unity.test-framework": "1.1.9"
       },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.ide.vscode": {
       "version": "1.2.5",
       "depth": 0,
       "source": "registry",
       "dependencies": {},
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.test-framework": {
       "version": "1.1.31",
@@ -54,7 +54,7 @@
         "com.unity.modules.imgui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.textmeshpro": {
       "version": "3.0.6",
@@ -63,19 +63,19 @@
       "dependencies": {
         "com.unity.ugui": "1.0.0"
       },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.timeline": {
       "version": "1.6.4",
       "depth": 0,
       "source": "registry",
       "dependencies": {
-        "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.director": "1.0.0",
         "com.unity.modules.animation": "1.0.0",
+        "com.unity.modules.audio": "1.0.0",
         "com.unity.modules.particlesystem": "1.0.0"
       },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.ugui": {
       "version": "1.0.0",
@@ -94,7 +94,7 @@
         "com.unity.ugui": "1.0.0",
         "com.unity.modules.jsonserialize": "1.0.0"
       },
-      "url": "https://packages.unity.com"
+      "url": "https://packages.unity.cn"
     },
     "com.unity.modules.ai": {
       "version": "1.0.0",

ProjectSettings/EditorBuildSettings.asset

@@ -5,49 +5,49 @@ EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
   m_Scenes:
-  - enabled: 1
+  - enabled: 0
     path: Assets/BowArrow/Scenes/Entry.unity
     guid: 14a16d0455f1bf44a8cf4e02c0550a99
-  - enabled: 1
+  - enabled: 0
     path: Assets/BowArrow/Scenes/Login.unity
     guid: 200a793b1fc5aac438c87e1b342a939a
-  - enabled: 1
+  - enabled: 0
     path: Assets/BowArrow/Scenes/Home.unity
     guid: 8aa5affa1b256294a8c908dbab6122d0
-  - enabled: 1
+  - enabled: 0
     path: Assets/BowArrow/Scenes/Game.unity
     guid: 3ee64920a7ce6dd4782fcc656bb2b337
-  - enabled: 1
+  - enabled: 0
     path: Assets/BowArrow/Scenes/GameChallengeScene/GameChallenge.unity
     guid: 983e1d3256c7dbe49accee6b31bb6d07
-  - enabled: 1
+  - enabled: 0
     path: Assets/BowArrow/Scenes/GameChallengeScene/GameChallengeNightEnv.unity
     guid: eaefd9b800b58ce4dbb99498871991ca
-  - enabled: 1
+  - enabled: 0
     path: Assets/DuckHunter/Scenes/DuckHunter.unity
     guid: 9920b6e59e0690940a0130b75073a1ea
-  - enabled: 1
+  - enabled: 0
     path: Assets/WildAttack/Scenes/WildAttack.unity
     guid: 9fc0d4010bbf28b4594072e72b8655ab
-  - enabled: 1
+  - enabled: 0
     path: Assets/FruitMaster/Scenes/FruitMaster.unity
     guid: 5600e697996c4b64b8ca124f15f30a58
-  - enabled: 1
+  - enabled: 0
     path: Assets/BowArrow/Scenes/GameDouble.unity
     guid: ab9cb5f113d25ed4a9c69a584d2e5c01
   - enabled: 0
     path: Assets/BowArrow/Scenes/Test.unity
     guid: 14f136990a82f0042aae1edcec1f03a2
-  - enabled: 0
+  - enabled: 1
     path: Assets/InfraredProject/WebCamera/zimWebCamera.unity
     guid: 7561eb6cd780e5e4887e30791c911a9b
-  - enabled: 1
+  - enabled: 0
     path: Assets/Game_Hyperspace/Hyperspace FX/Demo/Scenes/Hyperspace01.unity
-    guid: 25835fb90fd26cd4ea4f76d43b699add
+    guid: 71b0c88d6e2b1c64d8b342dbcf9f18f1
   - enabled: 1
     path: Assets/Game_Hyperspace/Hyperspace FX/Demo/Scenes/Hyperspace02.unity
-    guid: a8f19bc110806934f963b49a6dcb0c70
+    guid: 4ba6583615767164daa6b32e3a52c677
   - enabled: 1
     path: Assets/Game_Hyperspace/Hyperspace FX/Demo/Scenes/Hyperspace03.unity
-    guid: e89fd004630b8c4429343aed55df58ab
+    guid: 7fcca2d15ab4ee64bad23e2fd61aa51a
   m_configObjects: {}

ProjectSettings/PackageManagerSettings.asset

@@ -21,7 +21,7 @@ MonoBehaviour:
   m_Registries:
   - m_Id: main
     m_Name: 
-    m_Url: https://packages.unity.com
+    m_Url: https://packages.unity.cn
     m_Scopes: []
     m_IsDefault: 1
     m_Capabilities: 7
@@ -31,6 +31,6 @@ MonoBehaviour:
   m_RegistryInfoDraft:
     m_Modified: 0
     m_ErrorMessage: 
-    m_UserModificationsInstanceId: -846
-    m_OriginalInstanceId: -848
+    m_UserModificationsInstanceId: -826
+    m_OriginalInstanceId: -828
   m_LoadAssets: 0

ProjectSettings/ProjectSettings.asset

@@ -42,8 +42,8 @@ PlayerSettings:
   m_SplashScreenLogos: []
   m_VirtualRealitySplashScreen: {fileID: 0}
   m_HolographicTrackingLossScreen: {fileID: 0}
-  defaultScreenWidth: 1024
-  defaultScreenHeight: 768
+  defaultScreenWidth: 1920
+  defaultScreenHeight: 1080
   defaultScreenWidthWeb: 960
   defaultScreenHeightWeb: 600
   m_StereoRenderingPath: 0
@@ -87,6 +87,11 @@ PlayerSettings:
   hideHomeButton: 0
   submitAnalytics: 1
   usePlayerLog: 1
+  autoStreaming: 0
+  useAnimationStreaming: 0
+  useFontStreaming: 0
+  autoStreamingId: 
+  instantGameAppId: 
   bakeCollisionMeshes: 0
   forceSingleInstance: 0
   useFlipModelSwapchain: 1
@@ -101,7 +106,7 @@ PlayerSettings:
   xboxEnableFitness: 0
   visibleInBackground: 1
   allowFullscreenSwitch: 1
-  fullscreenMode: 1
+  fullscreenMode: 3
   xboxSpeechDB: 0
   xboxEnableHeadOrientation: 0
   xboxEnableGuest: 0

ProjectSettings/ProjectVersion.txt

@@ -1,2 +1,2 @@
-m_EditorVersion: 2021.3.42f1
-m_EditorVersionWithRevision: 2021.3.42f1 (f1197811e8ce)
+m_EditorVersion: 2021.3.42f1c1
+m_EditorVersionWithRevision: 2021.3.42f1c1 (3d7b7240bc24)