Kaynağa Gözat

1.自动识别部分注释代码打开
2.修改自动速度问题

slambb 1 yıl önce
ebeveyn
işleme
6d6c6c22c4

+ 6 - 6
Assets/BowArrow/Scenes/Game.unity

@@ -6165,7 +6165,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 29.692308, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &589339043
@@ -7713,9 +7713,9 @@ RectTransform:
   m_Father: {fileID: 1349314726}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 29.692308, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 29.692308, y: -16.5}
   m_SizeDelta: {x: 0, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &694545845
@@ -13370,7 +13370,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 29.692308, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 33}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1218454288
@@ -21174,7 +21174,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 79.38461, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 40}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1845023679

+ 2 - 1
Assets/BowArrow/Scripts/Game/Arrow.cs

@@ -59,7 +59,8 @@ public class Arrow : MonoBehaviour
         mySpeed = speed;
 
         Billboard.ins?.SetArrowSpeed(speed);
-        if (GameAssistUI.ins)
+        //Debug.Log("speed:"+ speed);
+        if (GameAssistUI.ins && GlobalData.MyDeviceMode == DeviceMode.Archery)
         {
             mySpeed *= GameAssistUI.ins.shootScaleValue;
             Billboard.ins?.SetArrowSpeedScale(GameAssistUI.ins.shootScaleValue);

+ 53 - 53
Assets/DuckHunter/Scenes/DuckHunter.unity

@@ -156,10 +156,10 @@ RectTransform:
   m_Father: {fileID: 433602508}
   m_RootOrder: 3
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 324.44968, y: -67}
-  m_SizeDelta: {x: 53.873375, y: 45}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8255550
 MonoBehaviour:
@@ -723,10 +723,10 @@ RectTransform:
   m_Father: {fileID: 433602508}
   m_RootOrder: 7
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 559.94324, y: -67}
-  m_SizeDelta: {x: 53.873375, y: 45}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &195083055
 MonoBehaviour:
@@ -1521,10 +1521,10 @@ RectTransform:
   m_Father: {fileID: 433602508}
   m_RootOrder: 5
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 442.19644, y: -67}
-  m_SizeDelta: {x: 53.873375, y: 45}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &375182103
 MonoBehaviour:
@@ -1598,10 +1598,10 @@ RectTransform:
   m_Father: {fileID: 1870892486}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 77.69231, y: -36.76923}
-  m_SizeDelta: {x: 115.38461, y: 53.53846}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &383075945
 MonoBehaviour:
@@ -2104,7 +2104,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &537447197
 RectTransform:
   m_ObjectHideFlags: 0
@@ -2520,10 +2520,10 @@ RectTransform:
   m_Father: {fileID: 433602508}
   m_RootOrder: 10
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 736.5633, y: -67}
-  m_SizeDelta: {x: 53.873375, y: 45}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &619573016
 MonoBehaviour:
@@ -2922,10 +2922,10 @@ RectTransform:
   m_Father: {fileID: 433602508}
   m_RootOrder: 9
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 677.68994, y: -67}
-  m_SizeDelta: {x: 53.873375, y: 45}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &711804451
 MonoBehaviour:
@@ -3074,10 +3074,10 @@ RectTransform:
   m_Father: {fileID: 433602508}
   m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 206.70294, y: -67}
-  m_SizeDelta: {x: 53.873375, y: 45}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &792593345
 MonoBehaviour:
@@ -3382,10 +3382,10 @@ RectTransform:
   m_Father: {fileID: 433602508}
   m_RootOrder: 4
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 383.32306, y: -67}
-  m_SizeDelta: {x: 53.873375, y: 45}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &871807299
 MonoBehaviour:
@@ -3621,10 +3621,10 @@ RectTransform:
   m_Father: {fileID: 433602508}
   m_RootOrder: 6
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 501.06982, y: -67}
-  m_SizeDelta: {x: 53.873375, y: 45}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &909695382
 MonoBehaviour:
@@ -4079,9 +4079,9 @@ RectTransform:
   m_Father: {fileID: 212105003}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 199.5, y: -66.5}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 330, y: 54}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1022851687
@@ -4574,10 +4574,10 @@ RectTransform:
   m_Father: {fileID: 433602508}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 107.383125, y: -67}
-  m_SizeDelta: {x: 134.76625, y: 53.53846}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1158871796
 MonoBehaviour:
@@ -5352,10 +5352,10 @@ RectTransform:
   m_Father: {fileID: 433602508}
   m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 265.5763, y: -67}
-  m_SizeDelta: {x: 53.873375, y: 45}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1417795436
 MonoBehaviour:
@@ -6016,10 +6016,10 @@ RectTransform:
   m_Father: {fileID: 433602508}
   m_RootOrder: 8
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 618.8166, y: -67}
-  m_SizeDelta: {x: 53.873375, y: 45}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &1644947641
 MonoBehaviour:
@@ -6605,7 +6605,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
   m_AnchoredPosition: {x: 0, y: 100}
-  m_SizeDelta: {x: 155.38461, y: 73.53846}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!114 &1870892487
 MonoBehaviour:

+ 1 - 1
Assets/FruitMaster/Scripts/GamingManager.cs

@@ -588,7 +588,7 @@ public class GamingManager : MonoBehaviour
             }
             else {
                 //目前只有gun类型
-                arrow.GetComponent<ArrowBehavior>().Init(speed*2.0f, dir, true,false);
+                arrow.GetComponent<ArrowBehavior>().Init(20, dir, true,false);
                 BowFireAudio.clip = audioManager.GetRandomSound(SoundCategory.GunFire);
                 BowFireAudio.Play();
             }

+ 11 - 11
Assets/InfraredProject/WebCamera/Script/ZIM/ScreenLocate.cs

@@ -80,7 +80,7 @@ public partial class ScreenLocate : MonoBehaviour
     public RectTransform ScreenQuad;
     public Toggle SaveToggle;
 
-    //public Vector2 ScreenLocateCameraSize;       // 屏幕识别需要的目标分辨率,摄像机分辨率变化时该分辨率也会跟着调整
+    public Vector2 ScreenLocateCameraSize;       // 屏幕识别需要的目标分辨率,摄像机分辨率变化时该分辨率也会跟着调整
 
     public bool ShowScreenQuad = false;
 
@@ -333,8 +333,8 @@ public partial class ScreenLocate : MonoBehaviour
         if (screenIdentification == null)
         {
             screenIdentification = new o0.Project.ScreenIdentification();
-            //screenIdentification.OnLocateScreenEnter += OnLocateScreenEnter;
-            //screenIdentification.OnLocateScreenEnd += OnLocateScreenEnd;
+            screenIdentification.OnLocateScreenEnter += OnLocateScreenEnter;
+            screenIdentification.OnLocateScreenEnd += OnLocateScreenEnd;
         }
         if (infraredLocate == null)
         {
@@ -393,11 +393,11 @@ public partial class ScreenLocate : MonoBehaviour
                     return;
                 }
 
-                //if (mUVCCameraInfo.Size != ScreenLocateCameraSize)   // 摄像机分辨率发生改变时执行
-                //{
-                //    RefreshScreenQuad(mUVCCameraInfo.Size);
-                //    return;
-                //}
+                if (mUVCCameraInfo.Size != ScreenLocateCameraSize)   // 摄像机分辨率发生改变时执行
+                {
+                    //RefreshScreenQuad(mUVCCameraInfo.Size);
+                    return;
+                }
 
                 if (mode == Mode.InfraredLocate)
                 {
@@ -640,13 +640,13 @@ public partial class ScreenLocate : MonoBehaviour
     {
         DefaultResolutionIndex = InfraredDemoMain?.ResolutionIndex ?? 0;        // 记录一下进入前的分辨率(游戏场景的分辨率,比识别时更低)
         InfraredDemoMain?.SetResolutionNew(HighScreenLocateResolutionIndex);
-        //CreateUVCTexture2DIfNeeded();
+        CreateUVCTexture2DIfNeeded();
     }
 
     public void OnLocateScreenEnd()
     {
         Debug.Log("结束捕获,当前摄像机分辨率为: " + mUVCCameraInfo.Size);
-        //ScreenLocateCameraSize = mUVCCameraInfo.Size;       // 记录本次屏幕识别的分辨率(目前采用高分辨率做识别,识别结束后调回低分辨率)
+        ScreenLocateCameraSize = mUVCCameraInfo.Size;       // 记录本次屏幕识别的分辨率(目前采用高分辨率做识别,识别结束后调回低分辨率)
         InfraredDemoMain?.SetResolutionNew(DefaultResolutionIndex);
     }
 
@@ -681,7 +681,7 @@ public partial class ScreenLocate : MonoBehaviour
         }
 
         ReSizeTexture(width, height);
-        //mUVCCameraInfo.SetSize(width, height);      // 手动记录分辨率,这里可能会有问题 width和height是期望的分辨率而不是当前摄像机实际分辨率
+        mUVCCameraInfo.SetSize(width, height);      // 手动记录分辨率,这里可能会有问题 width和height是期望的分辨率而不是当前摄像机实际分辨率
     }
     #endregion
     public void BtnScreenMap()