Răsfoiți Sursa

1.调整集成的UVCInfrared结构,之前兼容性有bug导致打包报错
2.调整android 时候隐藏水平垂直,默认。点击功能(因为android没实现这些操作)

slambb 2 săptămâni în urmă
părinte
comite
e6dde34b61

BIN
Assets/AddressableAssetsData/Android/addressables_content_state.bin


+ 1 - 1
Assets/AddressableAssetsData/link.xml.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a88ee68381defcf4abf0c135d2c5a5b5
+guid: c879a36998d15ae42a5b5d5c230ac287
 TextScriptImporter:
   externalObjects: {}
   userData: 

+ 23 - 0
Assets/BowArrow/InfraredCamera/InfraredFlipCtrl.cs

@@ -0,0 +1,23 @@
+using System.Collections;
+using System.Collections.Generic;
+using UnityEngine;
+
+public class InfraredFlipCtrl : MonoBehaviour
+{
+    [SerializeField] GameObject doubleFlipObj;
+    [SerializeField] GameObject defaultFlipObj;
+    // Start is called before the first frame update
+    void Start()
+    {
+#if UNITY_ANDROID
+        doubleFlipObj.SetActive(false);
+        defaultFlipObj.SetActive(false);
+#endif
+    }
+
+    // Update is called once per frame
+    //void Update()
+    //{
+        
+    //}
+}

+ 11 - 0
Assets/BowArrow/InfraredCamera/InfraredFlipCtrl.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: e9638a39d313ed749873225babc3c703
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 17 - 2
Assets/BowArrow/InfraredCamera/Resources/InfraredDemo.prefab

@@ -10461,7 +10461,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: 18.909973}
+  m_AnchoredPosition: {x: 0, y: 18.909912}
   m_SizeDelta: {x: 400, y: 60}
   m_Pivot: {x: 0.5, y: 0}
 --- !u!222 &523407382556651653
@@ -16774,7 +16774,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: 0, y: 126.37}
+  m_AnchoredPosition: {x: 0, y: 126.37012}
   m_SizeDelta: {x: 880, y: 66.86}
   m_Pivot: {x: 0, y: 0.5}
 --- !u!114 &6109234558477219354
@@ -18492,6 +18492,7 @@ GameObject:
   m_Component:
   - component: {fileID: 6922414329562286285}
   - component: {fileID: 7817582131418997244}
+  - component: {fileID: 6725220713144873783}
   m_Layer: 5
   m_Name: CameraCtrl
   m_TagString: Untagged
@@ -18547,6 +18548,20 @@ MonoBehaviour:
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
   m_ReverseArrangement: 0
+--- !u!114 &6725220713144873783
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8434266038621838906}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e9638a39d313ed749873225babc3c703, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  doubleFlipObj: {fileID: 146040845509251270}
+  defaultFlipObj: {fileID: 5705134852850466205}
 --- !u!1 &8451027022885895514
 GameObject:
   m_ObjectHideFlags: 0

+ 8 - 0
Assets/InfraredProject/uvc/Plugins.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 198bba28af91df542b0d539d7553a798
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/InfraredProject/uvc/Plugins/Android.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7dcef7764f04d4549b747d50952d01ac
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/InfraredProject/uvc/Plugins/Android/UVCInfrared.Android.dll


+ 12 - 12
Assets/InfraredProject/uvc/UVCInfrared.dll.meta → Assets/InfraredProject/uvc/Plugins/Android/UVCInfrared.Android.dll.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 8577533f96485a6478d6004691e751f3
+guid: 89e9f29f650caae488713755e58184fd
 PluginImporter:
   externalObjects: {}
   serializedVersion: 2
@@ -16,23 +16,23 @@ PluginImporter:
     second:
       enabled: 0
       settings:
-        Exclude Android: 1
+        Exclude Android: 0
         Exclude Editor: 0
-        Exclude Linux64: 1
-        Exclude OSXUniversal: 1
-        Exclude Win: 1
-        Exclude Win64: 1
+        Exclude Linux64: 0
+        Exclude OSXUniversal: 0
+        Exclude Win: 0
+        Exclude Win64: 0
         Exclude iOS: 0
   - first:
       Android: Android
     second:
-      enabled: 0
+      enabled: 1
       settings:
         CPU: ARMv7
   - first:
       Any: 
     second:
-      enabled: 0
+      enabled: 1
       settings: {}
   - first:
       Editor: Editor
@@ -45,25 +45,25 @@ PluginImporter:
   - first:
       Standalone: Linux64
     second:
-      enabled: 0
+      enabled: 1
       settings:
         CPU: None
   - first:
       Standalone: OSXUniversal
     second:
-      enabled: 0
+      enabled: 1
       settings:
         CPU: None
   - first:
       Standalone: Win
     second:
-      enabled: 0
+      enabled: 1
       settings:
         CPU: None
   - first:
       Standalone: Win64
     second:
-      enabled: 0
+      enabled: 1
       settings:
         CPU: None
   - first:

BIN
Assets/InfraredProject/uvc/Plugins/UVCInfrared.dll


+ 33 - 0
Assets/InfraredProject/uvc/Plugins/UVCInfrared.dll.meta

@@ -0,0 +1,33 @@
+fileFormatVersion: 2
+guid: 8577533f96485a6478d6004691e751f3
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 8 - 0
Assets/InfraredProject/uvc/Plugins/iOS.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 2c541fe2f58018f46b4bf805bba31575
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/InfraredProject/uvc/Plugins/iOS/UVCInfrared.iOS.dll


+ 86 - 0
Assets/InfraredProject/uvc/Plugins/iOS/UVCInfrared.iOS.dll.meta

@@ -0,0 +1,86 @@
+fileFormatVersion: 2
+guid: 9dab3876a1172bd4f926016cef4ed1cf
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      : Any
+    second:
+      enabled: 0
+      settings:
+        Exclude Android: 0
+        Exclude Editor: 0
+        Exclude Linux64: 0
+        Exclude OSXUniversal: 0
+        Exclude Win: 0
+        Exclude Win64: 0
+        Exclude iOS: 0
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings:
+        CPU: ARMv7
+  - first:
+      Any: 
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 1
+      settings:
+        CPU: AnyCPU
+        DefaultValueInitialized: true
+        OS: AnyOS
+  - first:
+      Standalone: Linux64
+    second:
+      enabled: 1
+      settings:
+        CPU: None
+  - first:
+      Standalone: OSXUniversal
+    second:
+      enabled: 1
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win
+    second:
+      enabled: 1
+      settings:
+        CPU: None
+  - first:
+      Standalone: Win64
+    second:
+      enabled: 1
+      settings:
+        CPU: None
+  - first:
+      Windows Store Apps: WindowsStoreApps
+    second:
+      enabled: 0
+      settings:
+        CPU: AnyCPU
+  - first:
+      iPhone: iOS
+    second:
+      enabled: 1
+      settings:
+        AddToEmbeddedBinaries: false
+        CPU: AnyCPU
+        CompileFlags: 
+        FrameworkDependencies: 
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/InfraredProject/uvc/UVCInfrared.dll