Browse Source

1.添加uvc 调试参数等修改

slambb 1 year ago
parent
commit
70f0dd748a
100 changed files with 2022 additions and 476 deletions
  1. 350 45
      Assets/BowArrow/InfraredCamera/InfraredDemo.cs
  2. 86 0
      Assets/BowArrow/InfraredCamera/MaintainAspectRatio.cs
  3. 11 0
      Assets/BowArrow/InfraredCamera/MaintainAspectRatio.cs.meta
  4. 409 291
      Assets/BowArrow/InfraredCamera/Resources/InfraredDemo.prefab
  5. 1 1
      Assets/BowArrow/Modules/InfraredGuider/InfraredLightGuider.cs
  6. 1 1
      Assets/BowArrow/Scenes/Test.unity
  7. BIN
      Assets/BowArrow/Scripts/Bluetooth/o0Lib/System.Runtime.CompilerServices.Unsafe.dll
  8. 1 1
      Assets/BowArrow/Scripts/CommonConfig.cs
  9. 46 46
      Assets/BowArrow/Shader/Outlight.shader
  10. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-0_comp_dir.png.meta
  11. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-0_comp_light.exr.meta
  12. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-10_comp_dir.png.meta
  13. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-10_comp_light.exr.meta
  14. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-11_comp_dir.png.meta
  15. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-11_comp_light.exr.meta
  16. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-12_comp_dir.png.meta
  17. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-12_comp_light.exr.meta
  18. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-13_comp_dir.png.meta
  19. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-13_comp_light.exr.meta
  20. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-14_comp_dir.png.meta
  21. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-14_comp_light.exr.meta
  22. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-15_comp_dir.png.meta
  23. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-15_comp_light.exr.meta
  24. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-16_comp_dir.png.meta
  25. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-16_comp_light.exr.meta
  26. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-17_comp_dir.png.meta
  27. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-17_comp_light.exr.meta
  28. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-18_comp_dir.png.meta
  29. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-18_comp_light.exr.meta
  30. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-19_comp_dir.png.meta
  31. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-19_comp_light.exr.meta
  32. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-1_comp_dir.png.meta
  33. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-1_comp_light.exr.meta
  34. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-20_comp_dir.png.meta
  35. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-20_comp_light.exr.meta
  36. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-21_comp_dir.png.meta
  37. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-21_comp_light.exr.meta
  38. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-22_comp_dir.png.meta
  39. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-22_comp_light.exr.meta
  40. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-23_comp_dir.png.meta
  41. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-23_comp_light.exr.meta
  42. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-24_comp_dir.png.meta
  43. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-24_comp_light.exr.meta
  44. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-25_comp_dir.png.meta
  45. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-25_comp_light.exr.meta
  46. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-26_comp_dir.png.meta
  47. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-26_comp_light.exr.meta
  48. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-27_comp_dir.png.meta
  49. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-27_comp_light.exr.meta
  50. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-28_comp_dir.png.meta
  51. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-28_comp_light.exr.meta
  52. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-29_comp_dir.png.meta
  53. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-29_comp_light.exr.meta
  54. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-2_comp_dir.png.meta
  55. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-2_comp_light.exr.meta
  56. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-30_comp_dir.png.meta
  57. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-30_comp_light.exr.meta
  58. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-31_comp_dir.png.meta
  59. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-31_comp_light.exr.meta
  60. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-32_comp_dir.png.meta
  61. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-32_comp_light.exr.meta
  62. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-33_comp_dir.png.meta
  63. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-33_comp_light.exr.meta
  64. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-34_comp_dir.png.meta
  65. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-34_comp_light.exr.meta
  66. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-35_comp_dir.png.meta
  67. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-35_comp_light.exr.meta
  68. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-36_comp_dir.png.meta
  69. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-36_comp_light.exr.meta
  70. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-37_comp_dir.png.meta
  71. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-37_comp_light.exr.meta
  72. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-38_comp_dir.png.meta
  73. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-38_comp_light.exr.meta
  74. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-39_comp_dir.png.meta
  75. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-39_comp_light.exr.meta
  76. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-3_comp_dir.png.meta
  77. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-3_comp_light.exr.meta
  78. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-40_comp_dir.png.meta
  79. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-40_comp_light.exr.meta
  80. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-41_comp_dir.png.meta
  81. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-41_comp_light.exr.meta
  82. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-42_comp_dir.png.meta
  83. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-42_comp_light.exr.meta
  84. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-4_comp_dir.png.meta
  85. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-4_comp_light.exr.meta
  86. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-5_comp_dir.png.meta
  87. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-5_comp_light.exr.meta
  88. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-6_comp_dir.png.meta
  89. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-6_comp_light.exr.meta
  90. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-7_comp_dir.png.meta
  91. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-7_comp_light.exr.meta
  92. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-8_comp_dir.png.meta
  93. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-8_comp_light.exr.meta
  94. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-9_comp_dir.png.meta
  95. 12 0
      Assets/FruitMaster/Scenes/FruitMaster/Lightmap-9_comp_light.exr.meta
  96. 68 2
      Assets/InfraredProject/InfraredCamera/Scripts/InfraredCameraHelper.cs
  97. 17 1
      Assets/InfraredProject/InfraredCamera/Scripts/ScreenLocate.cs
  98. 0 88
      Assets/InfraredProject/Packages/Microsoft.Bcl.AsyncInterfaces.5.0.0/Icon.png.meta
  99. BIN
      Assets/InfraredProject/Packages/Microsoft.Bcl.AsyncInterfaces.5.0.0/Microsoft.Bcl.AsyncInterfaces.5.0.0.nupkg
  100. BIN
      Assets/InfraredProject/Packages/Microsoft.Bcl.AsyncInterfaces.5.0.0/lib/netstandard2.0/Microsoft.Bcl.AsyncInterfaces.dll

+ 350 - 45
Assets/BowArrow/InfraredCamera/InfraredDemo.cs

@@ -4,17 +4,26 @@ using UnityEngine;
 using UnityEngine.UI;
 using InfraredManager;
 using ZIM;
+using System.Linq;
+using Serenegiant.UVC;
+using System;
 
 public class InfraredDemo : MonoBehaviour
 {
     public static bool DebugInEditor = true;
     public static InfraredDemo _ins;
+
+    [SerializeField]
+    RectTransform canvasRectTransform;
     public static void Create()
     {
         if (_ins) return;
         GameObject o = Instantiate(Resources.Load<GameObject>("InfraredDemo"));
         DontDestroyOnLoad(o);
         _ins = o.GetComponent<InfraredDemo>();
+
+        //直接初始化一次
+        _ins.InitInfraredCamera();
     }
 
     void Start()
@@ -26,6 +35,8 @@ public class InfraredDemo : MonoBehaviour
 
         //直接初始化一次
         InitInfraredCamera();
+        //如果本地有记录,初始化一次
+        initScreenLocateManual();
     }
 
     void Update()
@@ -46,7 +57,7 @@ public class InfraredDemo : MonoBehaviour
         transform.Find("Background").gameObject.SetActive(value);
         transform.Find("InfraredCamera").gameObject.SetActive(value);
         transform.Find("BtnSee").GetComponentInChildren<Text>().text = value ? "隐藏界面" : "调试红外";
-        if (value) InitInfraredCamera();
+        //if (value) InitInfraredCamera();
     }
 
     Text _spText;
@@ -73,32 +84,261 @@ public class InfraredDemo : MonoBehaviour
 
 #region 红外摄像
     [SerializeField] RawImage _cameraRender;
+    [SerializeField] MaintainAspectRatio _MaintainAspectRatio;
     [SerializeField] List<RectTransform> _crosshairsInCamera;
 
-    [SerializeField] Slider _sliderBrightness;
-    [SerializeField] Slider _sliderSaturation;
-    [SerializeField] Slider _sliderContrast;
+    //[SerializeField] Slider _sliderBrightness;
+    //[SerializeField] Slider _sliderSaturation;
+    //[SerializeField] Slider _sliderContrast;
     [SerializeField] Slider _sliderShakeFilter;
 
     [SerializeField] Button _btnReset;
     [SerializeField] Button _btnScreenLocateManual;
+    [SerializeField] Button _btnScreenLocateManualAuto;
+    [SerializeField] Slider _sliderCapture;
+    [SerializeField] Slider _sliderDelay;
 
     [SerializeField] Dropdown _dropdownResolution;
 
 
     [SerializeField] Slider _sliderLineWidth;
 
-    public ParamFloatValue brightness = new ParamFloatValue("ic_brightness", 1.0f);
-    public ParamFloatValue saturation = new ParamFloatValue("ic_saturation", 1.0f);
-    public ParamFloatValue contrast = new ParamFloatValue("ic_contrast", 1.0f);
+    //调试UVC参数
+    [SerializeField] GameObject _cameraParameterPanel;
+    //Dictionary<string, ParamFloatValue> dUVCParameters = new Dictionary<string, ParamFloatValue>();
+
+    //public ParamFloatValue brightness = new ParamFloatValue("ic_brightness", 1.0f);
+    //public ParamFloatValue saturation = new ParamFloatValue("ic_saturation", 1.0f);
+    //public ParamFloatValue contrast = new ParamFloatValue("ic_contrast", 1.0f);
+
     public ParamFloatValue shakeFilterValue = new ParamFloatValue("ic_shakeFilterValue2", 6.0f);
     public ParamFloatValue resoution = new ParamFloatValue("ic_resoution2", 2);
 
     public ParamFloatValue lineWidth = new ParamFloatValue("ic_lineWidth", 20.0f);
 
+    public ParamFloatValue captureValue = new ParamFloatValue("ic_captureValue", 30.0f);
+    public ParamFloatValue delayValue = new ParamFloatValue("ic_delayValue", 30.0f);
+
     public static InfraredCameraHelper infraredCameraHelper;
     public static bool running { get => infraredCameraHelper != null; }
     private bool _inited;
+
+
+    #region 参数控制
+
+
+    public GameObject togglePrefab; // 拖入一个Toggle预设体
+    public GameObject sliderPrefab; // 拖入一个Slider预设体
+    public GameObject spawnPoint;
+    //自动曝光
+    bool bAutoAE = false;
+    Toggle CTRLAEToggle;
+    Slider CTRLAEABSSlider;
+    string[] sliderNameArray = new string[]{
+        "自动曝光模式",
+        "曝光时间(绝对)",
+
+        "亮度", //
+        "对比度",
+        "色调",
+        "饱和度",
+        "锐度",
+        "伽玛",
+        //"白平衡温度",
+        //"白平衡分量",
+        "背光补偿",
+        "增益" };
+
+    string[] sliderStrArray = new string[]{
+        "CTRL_AE",
+        "CTRL_AE_ABS",
+
+        "PU_BRIGHTNESS",
+        "PU_CONTRAST",
+        "PU_HUE",
+        "PU_SATURATION",
+        "PU_SHARPNESS",
+        "PU_GAMMA",
+        //"PU_WB_TEMP",
+        //"PU_WB_COMPO",
+        "PU_BACKLIGHT",
+        "PU_GAIN" };
+
+    UVCManager.CameraInfo currentCameraInfo;
+    //初始化相机参数
+    public void initSlider(UVCManager.CameraInfo cameraInfo)
+    {
+        if (currentCameraInfo != null) return;
+        currentCameraInfo = cameraInfo;
+
+        for (int i = 0; i < sliderStrArray.Length; i++)
+        {
+            string typeStr = sliderStrArray[i];
+            UInt64 _VALUE = cameraInfo.GetTypeByName(typeStr);
+            //不支持的,跳过
+            bool bContains = cameraInfo.ContainsKey(_VALUE);
+            if (!bContains) continue;
+
+           
+            if (typeStr == "CTRL_AE")
+            {
+                //曝光Toggle
+                GameObject toggleObject = Instantiate(togglePrefab, spawnPoint.transform);
+                toggleObject.SetActive(true);
+                toggleObject.name = typeStr;
+
+                Text labelObj = toggleObject.transform.Find("Label").GetComponent<Text>();
+                labelObj.text = sliderNameArray[i];
+                Toggle toggle = toggleObject.GetComponent<Toggle>();
+                CTRLAEToggle = toggle;
+
+                UVCCtrlInfo _AEInfo = cameraInfo.GetInfo(_VALUE);
+                Debug.Log("UVCCtrlInfo:"+_AEInfo.ToString());
+           
+                int _currentValue = cameraInfo.GetValue(_VALUE);
+                bAutoAE = _currentValue == 8? true:false; //如果当前值是 8,则当前摄像机是自动曝光模式
+                toggle.isOn = bAutoAE;
+                //cameraInfo.SetValue(_VALUE, _currentValue!=8? 8:1);
+
+                toggle.onValueChanged.AddListener((bool bValue) =>
+                {
+                    //Debug.Log("Toggle value changed to: " + bValue + " from " + _VALUE);
+                    if (typeStr == "CTRL_AE")
+                    {
+                        //开关控制是否自动曝光
+                        bAutoAE = bValue;
+                        if (CTRLAEABSSlider) CTRLAEABSSlider.interactable = !bAutoAE;
+                        int _value = bValue ? 8 : 1;
+                        //Debug.Log("_value " + _value);
+                        cameraInfo.SetValue(_VALUE, _value);
+                    }
+
+                });
+            }
+            else
+            {
+                //其余使用slider
+                GameObject sliderObject = Instantiate(sliderPrefab, spawnPoint.transform);
+                sliderObject.SetActive(true);
+                sliderObject.name = typeStr;
+
+                Slider slider = sliderObject.GetComponent<Slider>();
+
+             
+
+                Text textObj = sliderObject.transform.Find("text").GetComponent<Text>();
+                Text titleTextObj = sliderObject.transform.Find("title").GetComponent<Text>();
+                titleTextObj.text = sliderNameArray[i];//类型名字
+                if (slider != null)
+                {
+
+                    UVCCtrlInfo _UVCCtrlInfo = cameraInfo.GetInfo(_VALUE);
+                    slider.minValue = _UVCCtrlInfo.min;
+                    slider.maxValue = _UVCCtrlInfo.max;
+                    slider.wholeNumbers = true;
+  
+
+                    //记录一个typeStr类型的数据存储操作对象
+                    ParamFloatValue paramFloatValue = new ParamFloatValue("ic_uvc_" + typeStr, _UVCCtrlInfo.def);
+                    //dUVCParameters.Add(typeStr, paramFloatValue);
+                    //获取当前值
+                    int _currentValue = cameraInfo.GetValue(_VALUE);
+                    //int _saveValue = (int)dUVCParameters.GetValueOrDefault(typeStr).Get();
+
+                    slider.value = _currentValue;
+                    textObj.text = _currentValue + "";
+
+                    //存储初始值,设置一次到UVC参数
+                    Debug.Log(_UVCCtrlInfo.ToString());
+                    Debug.Log("dUVCParameters2:" + _currentValue + " == " + _UVCCtrlInfo.def);
+
+                    //如果是曝光slider
+                    if (typeStr == "CTRL_AE_ABS") 
+                    {
+                        CTRLAEABSSlider = slider;
+                        slider.interactable = !bAutoAE;
+                        //if (!bAutoAE) {
+                        //    cameraInfo.SetValue(_VALUE, (int)paramFloatValue.Get());
+                        //}
+                    }
+                    //else{
+                    //    if (_currentValue != _saveValue) cameraInfo.SetValue(_VALUE, (int)paramFloatValue.Get());
+                    //}
+                 
+
+                    slider.onValueChanged.AddListener((newValue) =>
+                    {
+                        var _value = Mathf.FloorToInt(newValue);
+                        textObj.text = _value + "";
+                        //Debug.Log("Slider value changed to: " + newValue + " from " + _VALUE);
+                        cameraInfo.SetValue(_VALUE, _value);
+                        //存储值
+                        //dUVCParameters.GetValueOrDefault(typeStr).Set(_value);
+
+                    });
+                }
+            }
+
+        }
+
+    }
+
+    public void OpenUVCPanel() {
+        _cameraParameterPanel.SetActive(true);
+    }
+
+    public void CloseUVCPanel() {
+        _cameraParameterPanel.SetActive(false);
+    }
+
+    public void onResetUVCData() {
+
+        if(currentCameraInfo == null) return;
+
+        for (int i = 0; i < sliderStrArray.Length; i++)
+        {
+            string typeStr = sliderStrArray[i];
+            UInt64 _VALUE = currentCameraInfo.GetTypeByName(typeStr);
+            bool bContains = currentCameraInfo.ContainsKey(_VALUE);
+            if (!bContains) continue;
+
+            if (typeStr == "CTRL_AE")
+            {
+                //toggle值不进行重置
+                Debug.Log("CTRL_AE 不需要重置");
+            }
+            else if (typeStr == "CTRL_AE_ABS" ) {
+                if (!bAutoAE) {
+                    //如果是手动曝光,重置值
+                    Transform trans = _cameraParameterPanel.transform.Find(typeStr);
+                    Slider slider = trans.GetComponent<Slider>();
+                    Text textObj = trans.Find("text").GetComponent<Text>();
+                    UVCCtrlInfo _AEInfo = currentCameraInfo.GetInfo(_VALUE);
+                    //获取当前值
+                    int _currentValue = currentCameraInfo.GetValue(_VALUE);
+                    Debug.Log("CTRL_AE_ABS:" + _currentValue + " = " + _AEInfo.def + " = " + ",bAutoAE:" + bAutoAE);
+                    textObj.text = _AEInfo.def + "";
+                    slider.value = _AEInfo.def;
+                    if (_AEInfo.def != _currentValue) currentCameraInfo.SetValue(_VALUE, _AEInfo.def);
+                }
+            } else {
+                Transform trans = _cameraParameterPanel.transform.Find(typeStr);
+                Slider slider = trans.GetComponent<Slider>();
+                Text textObj = trans.Find("text").GetComponent<Text>();
+                UVCCtrlInfo _UVCCtrlInfo = currentCameraInfo.GetInfo(_VALUE);
+                textObj.text = _UVCCtrlInfo.def + "";
+                slider.value = _UVCCtrlInfo.def;
+                //获取当前值
+                int _currentValue = currentCameraInfo.GetValue(_VALUE);
+                //重置存储值
+                //dUVCParameters.GetValueOrDefault(typeStr).Set(_UVCCtrlInfo.def);
+                //存储初始值,设置一次到UVC参数
+                if (_UVCCtrlInfo.def != _currentValue) currentCameraInfo.SetValue(_VALUE, _UVCCtrlInfo.def);
+            }
+        }
+    }
+
+    #endregion
     void InitInfraredCamera()
     {
         if (_inited) return;
@@ -110,6 +350,7 @@ public class InfraredDemo : MonoBehaviour
             infraredCameraHelper.Create();
             infraredCameraHelper.OnPositionUpdate += (Vector2 point) =>
             {
+                if (Camera.main == null) return;
                 Ray ray = Camera.main.ScreenPointToRay(point);
                 Vector3 rayEndPoint = ray.GetPoint(200);
                 Quaternion quat = Quaternion.LookRotation(rayEndPoint - Camera.main.transform.position);
@@ -121,19 +362,30 @@ public class InfraredDemo : MonoBehaviour
                 if (CameraToLook.ins != null) CameraToLook.ins.localRotation = quat;
                 if (SB_EventSystem.ins) SB_EventSystem.ins.MoveSimulateMouseByInfrared(point);
             };
+            infraredCameraHelper.OnUVCIsReady += (UVCManager.CameraInfo camera) =>
+            {
+                //生成控制摄像机的参数滑条
+                Debug.Log("初始化摄像机!");
+                initSlider(camera);
+                //_cameraRender.texture =  ScreenLocate.Main.getUVCTexture; //infraredCameraHelper.GetCameraTexture(); 
+                //_cameraRender.SetNativeSize();
+            };
+            //InfraredCameraHelper.InfraredCameraHelperRawImageList.Add(_cameraRender);
+         
         }
         //参数面板
-        SetBrightness(brightness.Get());
-        SetSaturation(saturation.Get());
-        SetContrast(contrast.Get());
         SetShakeFilterValue(shakeFilterValue.Get());
-        _sliderBrightness.onValueChanged.AddListener(SetBrightness);
-        _sliderSaturation.onValueChanged.AddListener(SetSaturation);
-        _sliderContrast.onValueChanged.AddListener(SetContrast);
         _sliderShakeFilter.onValueChanged.AddListener(SetShakeFilterValue);
         //功能按钮
         _btnReset.onClick.AddListener(OnClick_Reset);
         _btnScreenLocateManual.onClick.AddListener(OnClick_ScreenLocateManual);
+        _btnScreenLocateManualAuto.onClick.AddListener(OnClick_ScreenLocateManualAuto);
+
+        SetCaptureValue(captureValue.Get());
+        _sliderCapture.onValueChanged.AddListener(SetCaptureValue);
+        SetDelayValue(delayValue.Get());
+        _sliderDelay.onValueChanged.AddListener(SetDelayValue);
+
         //分辨率
         SetResolution((int)resoution.Get());
         _dropdownResolution.onValueChanged.AddListener(v =>
@@ -145,7 +397,30 @@ public class InfraredDemo : MonoBehaviour
         //绘制线段
         SetLineWidth(lineWidth.Get());
         _sliderLineWidth.onValueChanged.AddListener(SetLineWidth);
+
+   
+
+
     }
+
+    public void onStartPreview() {
+        infraredCameraHelper.onStartPreview();
+    }
+    public void onStopPreview()
+    {
+        infraredCameraHelper.onStopPreview();
+    }
+    //获取并且初始化一次数据
+    void initScreenLocateManual()
+    {
+        ScreenLocate.GetScreenLocateVectorList();
+
+        infraredCameraHelper.QuitScreenLocateManual(ScreenLocate.quadUnityVectorList);
+
+        ScreenLocate.Main.SyncInfraredDemo();
+
+    }
+
     IEnumerator RestartOrKillApp()
     {
         yield return new WaitForSeconds(0.3f);
@@ -169,21 +444,20 @@ public class InfraredDemo : MonoBehaviour
         }
         else Application.Quit();
     }
-    public void SetBrightness(float v)
-    {
-        brightness.Set(v);
-        _sliderBrightness.SetValueWithoutNotify(brightness.Get());
-        _sliderBrightness.transform.Find("Value").GetComponent<Text>().text = brightness.Get().ToString("f1");
-        infraredCameraHelper.SetBrightness(brightness.Get());
-    }
+
     void UpdateInfraredCamera()
     {
         if (!_visiable) return;
         if (!_inited) return;
         if (infraredCameraHelper == null) return;
         //渲染相机画面
-        _cameraRender.texture = infraredCameraHelper.GetCameraTexture();
-        _cameraRender.material = infraredCameraHelper.GetCameraMaterial();
+        //_cameraRender.texture = infraredCameraHelper.GetCameraTexture();
+        //_cameraRender.material = infraredCameraHelper.GetCameraMaterial();
+        if (ScreenLocate.Main.getUVCTexture) {
+            _cameraRender.texture = ScreenLocate.Main.getUVCTexture;
+            _cameraRender.SetNativeSize();
+            _MaintainAspectRatio.AdjustSize();
+        }
         //在相机画面显示准心
         if (ScreenLocate.Main)
         {
@@ -207,9 +481,11 @@ public class InfraredDemo : MonoBehaviour
             }
         }
     }
+
     public void SetLocatePointsToCameraRender(List<Vector2> points, float w, float h)
     {
         Transform pointsTF2 = _cameraRender.transform.Find("Points");
+         
         if (pointsTF2.childCount == points.Count)
         {
             Vector2 texSize = new Vector2(w, h);
@@ -222,20 +498,7 @@ public class InfraredDemo : MonoBehaviour
             }
         }
     }
-    void SetSaturation(float v)
-    {
-        saturation.Set(v);
-        _sliderSaturation.SetValueWithoutNotify(saturation.Get());
-        _sliderSaturation.transform.Find("Value").GetComponent<Text>().text = saturation.Get().ToString("f1");
-        infraredCameraHelper.SetSaturation(saturation.Get());
-    }
-    void SetContrast(float v)
-    {
-        contrast.Set(v);
-        _sliderContrast.SetValueWithoutNotify(contrast.Get());
-        _sliderContrast.transform.Find("Value").GetComponent<Text>().text = contrast.Get().ToString("f1");
-        infraredCameraHelper.SetContrast(contrast.Get());
-    }
+  
     void SetShakeFilterValue(float v)
     {
         shakeFilterValue.Set(v);
@@ -284,18 +547,38 @@ public class InfraredDemo : MonoBehaviour
     }
     void OnClick_Reset()
     {
-        SetBrightness(1);
-        SetSaturation(1);
-        SetContrast(1);
+        //SetBrightness(1);
+        //SetSaturation(1);
+        //SetContrast(1);
+
         SetShakeFilterValue(6);
 
-        SetLineWidth(20);
+        SetLineWidth(10);
     }
     void OnClick_ScreenLocateManual()
     {
         ViewManager2.ShowView(ViewManager2.Path_InfraredScreenPositioningView);
         FindObjectOfType<InfraredScreenPositioningView>().enterFromInfraredDemo = true;
     }
+
+    void OnClick_ScreenLocateManualAuto() {
+        infraredCameraHelper.EnterScreenLocateManualAuto();
+    }
+
+    void SetCaptureValue(float v)
+    {
+        captureValue.Set(v);
+        _sliderCapture.SetValueWithoutNotify(captureValue.Get());
+        _sliderCapture.transform.Find("Value").GetComponent<Text>().text = captureValue.Get().ToString("f1");
+        infraredCameraHelper.SetCapture( (int)captureValue.Get());
+    }
+    void SetDelayValue(float v)
+    {
+        delayValue.Set(v);
+        _sliderDelay.SetValueWithoutNotify(delayValue.Get());
+        _sliderDelay.transform.Find("Value").GetComponent<Text>().text = delayValue.Get().ToString("f1");
+        infraredCameraHelper.SetDelay((int)delayValue.Get());
+    }
     #endregion
 
 
@@ -304,8 +587,13 @@ public class InfraredDemo : MonoBehaviour
     {
         if (running)
         {
-            float v = infraredCameraHelper.GetBrightness();
-            _slider.SetValueWithoutNotify(v);
+            string typeStr = "PU_BRIGHTNESS";
+            UInt64 _VALUE = currentCameraInfo.GetTypeByName(typeStr);
+            UVCCtrlInfo _UVCCtrlInfo = currentCameraInfo.GetInfo(_VALUE);
+            float v = currentCameraInfo.GetValue(_VALUE); // infraredCameraHelper.GetBrightness();
+            float v2 = (v / _UVCCtrlInfo.max) * 10;
+            Debug.Log("获取相机的感光度:" + _VALUE + " = " + v + " = " + v2);
+            _slider.SetValueWithoutNotify(v2);
         }
         else _slider.SetValueWithoutNotify(5);
     }
@@ -315,9 +603,26 @@ public class InfraredDemo : MonoBehaviour
         //修改亮度时,调试界面的亮度也应该一起修改
         if (running)
         {
-            Slider slider = transform.Find("InfraredCamera/Layout/SliderBrightness")
-                .GetComponent<Slider>();
-            slider.value = value;
+            //Slider slider = transform.Find("InfraredCamera/Layout/SliderBrightness")
+            //    .GetComponent<Slider>();
+   
+            string typeStr = "PU_BRIGHTNESS";
+            UInt64 _VALUE = currentCameraInfo.GetTypeByName(typeStr);
+            Transform trans = _cameraParameterPanel.transform.Find(typeStr);
+            Slider slider = trans.GetComponent<Slider>();
+           
+            Text textObj = trans.Find("text").GetComponent<Text>();
+            UVCCtrlInfo _UVCCtrlInfo = currentCameraInfo.GetInfo(_VALUE);
+            int _currentUVCValue = currentCameraInfo.GetValue(_VALUE);
+            //value 0 ~ 10
+            int _current = (int)(_UVCCtrlInfo.max * value / 10);
+            Debug.Log("_current:" + value);
+            textObj.text = _current + "";
+            slider.value = _current;
+            //dUVCParameters.GetValueOrDefault(typeStr).Set(_current);
+            //存储初始值,设置一次到UVC参数
+            if(_currentUVCValue != _current) currentCameraInfo.SetValue(_VALUE, _current);
+         
         }
     }
     #endregion

+ 86 - 0
Assets/BowArrow/InfraredCamera/MaintainAspectRatio.cs

@@ -0,0 +1,86 @@
+using UnityEngine;
+using UnityEngine.UI;
+
+[RequireComponent(typeof(RawImage))]
+public class MaintainAspectRatio : MonoBehaviour
+{
+    //None: 不调整图片大小,使用原始大小。
+    //FitInParent: 按比例缩放图片以适应固定尺寸的框。
+    //EnvelopeParent: 按比例缩放图片以覆盖固定尺寸的框。
+    public enum AspectMode
+    {
+        None,
+        FitInParent,
+        EnvelopeParent
+    }
+
+    public AspectMode aspectMode = AspectMode.None;
+    private RawImage rawImage;
+    private RectTransform parentRectTransform;
+
+    void Start()
+    {
+        rawImage = GetComponent<RawImage>();
+        parentRectTransform = transform.parent.GetComponent<RectTransform>();
+        //AdjustSize();
+    }
+
+    void Update()
+    {
+        // 在每帧更新时检查并调整大小
+        //AdjustSize();
+    }
+
+    public void AdjustSize()
+    {
+        if (parentRectTransform == null) return;
+
+        if (rawImage.texture == null) return;
+
+        Vector2 fixedSize = parentRectTransform.rect.size;
+        float imageAspect = (float)rawImage.texture.width / rawImage.texture.height;
+        float targetAspect = fixedSize.x / fixedSize.y;
+
+        RectTransform rt = rawImage.GetComponent<RectTransform>();
+
+        switch (aspectMode)
+        {
+            case AspectMode.FitInParent:
+                if (imageAspect > targetAspect)
+                {
+                    // 图片更宽
+                    rt.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, fixedSize.x);
+                    rt.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, fixedSize.x / imageAspect);
+                }
+                else
+                {
+                    // 图片更高
+                    rt.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, fixedSize.y);
+                    rt.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, fixedSize.y * imageAspect);
+                }
+                break;
+
+            case AspectMode.EnvelopeParent:
+                if (imageAspect > targetAspect)
+                {
+                    // 图片更宽
+                    rt.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, fixedSize.y);
+                    rt.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, fixedSize.y * imageAspect);
+                }
+                else
+                {
+                    // 图片更高
+                    rt.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, fixedSize.x);
+                    rt.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, fixedSize.x / imageAspect);
+                }
+                break;
+
+            case AspectMode.None:
+            default:
+                // 原始图片大小
+                rt.SetSizeWithCurrentAnchors(RectTransform.Axis.Horizontal, rawImage.texture.width);
+                rt.SetSizeWithCurrentAnchors(RectTransform.Axis.Vertical, rawImage.texture.height);
+                break;
+        }
+    }
+}

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

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

File diff suppressed because it is too large
+ 409 - 291
Assets/BowArrow/InfraredCamera/Resources/InfraredDemo.prefab


+ 1 - 1
Assets/BowArrow/Modules/InfraredGuider/InfraredLightGuider.cs

@@ -31,7 +31,7 @@ public class InfraredLightGuider : MonoBehaviour
         {
             //渲染相机画面
             rawImage.texture = InfraredDemo.infraredCameraHelper.GetCameraTexture();
-            rawImage.material = InfraredDemo.infraredCameraHelper.GetCameraMaterial();
+            //rawImage.material = InfraredDemo.infraredCameraHelper.GetCameraMaterial();
         }
     }
 

+ 1 - 1
Assets/BowArrow/Scenes/Test.unity

@@ -301,7 +301,7 @@ Transform:
   m_Father: {fileID: 0}
   m_RootOrder: 0
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &1063506210314950288
+--- !u!1001 &1119416687
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2

BIN
Assets/BowArrow/Scripts/Bluetooth/o0Lib/System.Runtime.CompilerServices.Unsafe.dll


+ 1 - 1
Assets/BowArrow/Scripts/CommonConfig.cs

@@ -66,7 +66,7 @@ public class CommonConfig
             if (serverType == ServerType.Produce) 
             {
                 if (serverIndex == 0) 
-                    return "http://118.195.187.121/SmartBowBusinessServer";//"http://118.195.187.121/SmartBowBusinessServer";等备案再使用域名
+                    return "https://www.xmjssvr.com/SmartBowBusinessServer";//"http://118.195.187.121/SmartBowBusinessServer";等备案再使用域名
                 else if (serverIndex == 1) 
                     return "https://www.wonderfittervr.com/SmartBowBusinessServer";//"http://54.165.56.200/SmartBowBusinessServer";
             } 

+ 46 - 46
Assets/BowArrow/Shader/Outlight.shader

@@ -2,64 +2,64 @@ Shader "Custom/Outlight"
 {
     Properties
     {
-        _MainTex ("Texture", 2D) = "white" {}
-        _LightColor ("Light Color", Color) = (1.0, 1.0, 1.0, 1.0)
-        _Size ("Size", Int) = 1 
+        _MainTex("Texture", 2D) = "white" {}
+        _LightColor("Light Color", Color) = (1.0, 1.0, 1.0, 1.0)
+        _Size("Size", Float) = 1
     }
 
-    SubShader {
+        SubShader{
 
-        Blend SrcAlpha OneMinusSrcAlpha
+            Blend SrcAlpha OneMinusSrcAlpha
 
-        CGINCLUDE
-        #include "UnityCG.cginc"
+            CGINCLUDE
+            #include "UnityCG.cginc"
 
-        struct v2f {
-            float4 pos : SV_POSITION;
-            float2 uv: TEXCOORD0;
-        };
+            struct v2f {
+                float4 pos : SV_POSITION;
+                float2 uv: TEXCOORD0;
+            };
 
-        sampler2D _MainTex;
-        float4 _MainTex_ST;
-        half4 _MainTex_TexelSize;
-        float4 _LightColor;
-        int _Size;
+            sampler2D _MainTex;
+            float4 _MainTex_ST;
+            half4 _MainTex_TexelSize;
+            float4 _LightColor;
+            float _Size;
 
-        ENDCG
+            ENDCG
 
-        Pass {
+            Pass {
 
-            CGPROGRAM
-            #pragma vertex vert
-            #pragma fragment frag
-            #include "UnityCG.cginc"
-
-            v2f vert(appdata_img IN)
-            {
-                v2f OUT;
-                OUT.pos = UnityObjectToClipPos(IN.vertex);
-                OUT.uv = TRANSFORM_TEX(IN.texcoord, _MainTex);
-                return OUT;
-            }
+                CGPROGRAM
+                #pragma vertex vert
+                #pragma fragment frag
+                #include "UnityCG.cginc"
 
-            fixed4 frag(v2f IN) : SV_Target
-            {
-                fixed4 color = tex2D(_MainTex, IN.uv);
-                fixed4 c = _LightColor;
-                float sum = tex2D(_MainTex, IN.uv).a;
-                for (int i = 1; i <= _Size; i ++) {
-                    sum += tex2D(_MainTex, IN.uv + _MainTex_TexelSize.xy * half2(i, 0)).a;
-                    sum += tex2D(_MainTex, IN.uv + _MainTex_TexelSize.xy * half2(-1 * i, 0)).a;
-                    sum += tex2D(_MainTex, IN.uv + _MainTex_TexelSize.xy * half2(0, 1 * i)).a;
-                    sum += tex2D(_MainTex, IN.uv + _MainTex_TexelSize.xy * half2(0, -1 * i)).a;
+                v2f vert(appdata_img IN)
+                {
+                    v2f OUT;
+                    OUT.pos = UnityObjectToClipPos(IN.vertex);
+                    OUT.uv = TRANSFORM_TEX(IN.texcoord, _MainTex);
+                    return OUT;
                 }
 
-                c.a = sum / (4 * _Size + 1);
+                fixed4 frag(v2f IN) : SV_Target
+                {
+                    fixed4 color = tex2D(_MainTex, IN.uv);
+                    fixed4 c = _LightColor;
+                    float sum = tex2D(_MainTex, IN.uv).a;
+                    for (float i = 1.0; i <= _Size; i += 1.0) {
+                        sum += tex2D(_MainTex, IN.uv + _MainTex_TexelSize.xy * half2(i, 0)).a;
+                        sum += tex2D(_MainTex, IN.uv + _MainTex_TexelSize.xy * half2(-1.0 * i, 0)).a;
+                        sum += tex2D(_MainTex, IN.uv + _MainTex_TexelSize.xy * half2(0, 1.0 * i)).a;
+                        sum += tex2D(_MainTex, IN.uv + _MainTex_TexelSize.xy * half2(0, -1.0 * i)).a;
+                    }
 
-                return step(0.1, color.a) * color + step(0.1, 1-color.a) * c;
-            }
+                    c.a = sum / (4.0 * _Size + 1.0);
 
-            ENDCG
+                    return step(0.1, color.a) * color + step(0.1, 1.0 - color.a) * c;
+                }
+
+                ENDCG
+            }
         }
-    } 
-}
+}

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-0_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-0_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-10_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-10_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-11_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-11_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-12_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-12_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-13_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-13_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-14_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-14_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-15_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-15_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-16_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-16_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-17_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-17_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-18_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-18_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-19_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-19_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-1_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-1_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-20_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-20_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-21_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-21_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-22_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-22_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-23_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-23_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-24_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-24_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-25_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-25_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-26_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-26_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-27_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-27_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-28_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-28_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-29_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-29_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-2_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-2_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-30_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-30_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-31_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-31_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-32_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-32_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-33_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-33_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-34_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-34_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-35_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-35_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-36_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-36_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-37_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-37_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-38_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-38_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-39_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-39_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-3_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-3_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-40_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-40_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-41_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-41_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-42_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-42_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-4_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-4_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-5_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-5_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-6_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-6_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-7_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-7_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-8_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-8_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-9_comp_dir.png.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 12 - 0
Assets/FruitMaster/Scenes/FruitMaster/Lightmap-9_comp_light.exr.meta

@@ -113,6 +113,18 @@ TextureImporter:
     overridden: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: iPhone
+    maxTextureSize: 2048
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 2
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []

+ 68 - 2
Assets/InfraredProject/InfraredCamera/Scripts/InfraredCameraHelper.cs

@@ -2,6 +2,8 @@
 using System.Collections.Generic;
 using UnityEngine;
 using System;
+using Serenegiant.UVC;
+using UnityEngine.UI;
 
 namespace InfraredManager
 {
@@ -19,6 +21,8 @@ namespace InfraredManager
         #region 创建销毁
         private GameObject _managerObject;
         private ScreenLocate _screenLocate;
+
+        public static List<RawImage> InfraredCameraHelperRawImageList = new();
         public void Create()
         {
             if (_managerObject) return;
@@ -30,7 +34,15 @@ namespace InfraredManager
             _screenLocate.InfraredCameraHelper = this;
             _managerObject = o;
             if (Application.platform == RuntimePlatform.Android) Application.targetFrameRate = 60;
+
+            //for (int i = 0; i < InfraredCameraHelperRawImageList.Count; i++)
+            //{
+            //    //添加目标
+            //    _screenLocate.mUVCDrawer.RenderTargets.Add(InfraredCameraHelperRawImageList[i].gameObject);
+            //}
+
         }
+     
         public void Dispose()
         {
             if (_managerObject) UnityEngine.Object.DestroyImmediate(_managerObject);
@@ -39,19 +51,34 @@ namespace InfraredManager
         #endregion
 
         #region 画面接口
+        public void onStartPreview() {
+            Debug.Log("onStartPreview_screenLocate.mUVCCameraInfo.device:" + _screenLocate.mUVCCameraInfo.device);
+            _screenLocate.mUVCManager.onStartPreview(_screenLocate.mUVCCameraInfo.device);
+        }
+        public void onStopPreview()
+        {
+            Debug.Log("onStopPreview_screenLocate.mUVCCameraInfo.device:" + _screenLocate.mUVCCameraInfo.device);
+            _screenLocate.mUVCManager.onStopPreview(_screenLocate.mUVCCameraInfo.device);
+        }
+        /// <summary>
+        /// 获取摄像机对象CameraInfo
+        /// </summary>
+        public UVCManager.CameraInfo GetUVCCameraInfo() {
+            return _screenLocate.mUVCCameraInfo;
+        }
         /// <summary>
         /// 获取相机画面贴图
         /// </summary>
         public Texture GetCameraTexture()
         {
-            return _screenLocate.rawImage.texture;
+            return _screenLocate.getUVCTexture; //_screenLocate.rawImage.texture;
         }
         /// <summary>
         /// 获取相机画面材质
         /// </summary>
         public Material GetCameraMaterial()
         {
-            return _screenLocate.rawImage.material;
+            return null;//_screenLocate.rawImage.material;
         }
         /// <summary>
         /// 设置亮度(0~10)
@@ -100,10 +127,12 @@ namespace InfraredManager
         /// </summary>
         public void SetCameraResolution(int width, int height)
         {
+         
             _screenLocate.mUVCManager.DefaultWidth = width;
             _screenLocate.mUVCManager.DefaultHeight = height;
             _screenLocate.mUVCDrawer.DefaultWidth = width;
             _screenLocate.mUVCDrawer.DefaultHeight = height;
+            Debug.Log("设置分辨率,width:" + width + " ,height:" + height);
         }
         /// <summary>
         /// 获取相机画面分辨率
@@ -115,6 +144,7 @@ namespace InfraredManager
                 _screenLocate.mUVCDrawer.DefaultHeight
             );
         }
+
         #endregion
 
         #region 操作接口
@@ -176,9 +206,45 @@ namespace InfraredManager
         {
             _screenLocate.QuitScreenLocateManual(points);
         }
+        /// <summary>
+        /// 进入自动定位
+        /// </summary>
+        public void EnterScreenLocateManualAuto() {
+            _screenLocate.EnterScreenLocateManualAuto();
+        }
+        /// <summary>
+        /// 修改 Capture ,建议值30
+        /// </summary>
+        public void SetCapture(int value)
+        {
+            _screenLocate.SetCapture(value);
+        }
+        /// <summary>
+        /// 修改delay,建议值30
+        /// </summary>
+        public void SetDelay(int value)
+        {
+            _screenLocate.SetDelay(value);
+        }
         #endregion
 
         #region 监听事件
+        /// <summary>
+        /// UVC 相机准备事件
+        /// </summary>
+        public OnUVCIsReadyEvent OnUVCIsReady;
+        public delegate void OnUVCIsReadyEvent(UVCManager.CameraInfo camera);
+        public void InvokeOnUVCIsReady(UVCManager.CameraInfo camera) {
+            try
+            {
+                OnUVCIsReady?.Invoke(camera);
+            }
+            catch (Exception e)
+            {
+                Debug.LogError(e);
+            }
+        }
+
         /// <summary>
         /// 单点更新事件
         /// </summary>

+ 17 - 1
Assets/InfraredProject/InfraredCamera/Scripts/ScreenLocate.cs

@@ -1,5 +1,6 @@
 using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using UnityEngine;
 using ZIM;
 
@@ -25,11 +26,12 @@ public partial class ScreenLocate : MonoBehaviour
         mode = Mode.ScreenLocateManual;
         return texture;
     }
+
     public void QuitScreenLocateManual(List<Vector2> points)
     {
         if (points != null && points.Count == 4)
         {
-            screenIdentification.LocateScreenManual(
+            screenIdentification?.LocateScreenManual(
                 new OrdinalQuadrilateral(
                     points[0].o0Vector(),
                     points[1].o0Vector(),
@@ -40,4 +42,18 @@ public partial class ScreenLocate : MonoBehaviour
         }
         ToMode(Mode.InfraredLocate);
     }
+
+    public void EnterScreenLocateManualAuto()
+    {
+        BtnScreenLocate();
+    }
+
+    public void SetCapture(int value)
+    {
+        Capture = value;
+    }
+    public void SetDelay(int value)
+    {
+        Delay = value;
+    }
 }

+ 0 - 88
Assets/InfraredProject/Packages/Microsoft.Bcl.AsyncInterfaces.5.0.0/Icon.png.meta

@@ -1,88 +0,0 @@
-fileFormatVersion: 2
-guid: fc5455468b28e834f9058e393a482498
-TextureImporter:
-  fileIDToRecycleName: {}
-  externalObjects: {}
-  serializedVersion: 9
-  mipmaps:
-    mipMapMode: 0
-    enableMipMap: 1
-    sRGBTexture: 1
-    linearTexture: 0
-    fadeOut: 0
-    borderMipMap: 0
-    mipMapsPreserveCoverage: 0
-    alphaTestReferenceValue: 0.5
-    mipMapFadeDistanceStart: 1
-    mipMapFadeDistanceEnd: 3
-  bumpmap:
-    convertToNormalMap: 0
-    externalNormalMap: 0
-    heightScale: 0.25
-    normalMapFilter: 0
-  isReadable: 0
-  streamingMipmaps: 0
-  streamingMipmapsPriority: 0
-  grayScaleToAlpha: 0
-  generateCubemap: 6
-  cubemapConvolution: 0
-  seamlessCubemap: 0
-  textureFormat: 1
-  maxTextureSize: 2048
-  textureSettings:
-    serializedVersion: 2
-    filterMode: -1
-    aniso: -1
-    mipBias: -100
-    wrapU: -1
-    wrapV: -1
-    wrapW: -1
-  nPOTScale: 1
-  lightmap: 0
-  compressionQuality: 50
-  spriteMode: 0
-  spriteExtrude: 1
-  spriteMeshType: 1
-  alignment: 0
-  spritePivot: {x: 0.5, y: 0.5}
-  spritePixelsToUnits: 100
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
-  spriteGenerateFallbackPhysicsShape: 1
-  alphaUsage: 1
-  alphaIsTransparency: 0
-  spriteTessellationDetail: -1
-  textureType: 0
-  textureShape: 1
-  singleChannelComponent: 0
-  maxTextureSizeSet: 0
-  compressionQualitySet: 0
-  textureFormatSet: 0
-  platformSettings:
-  - serializedVersion: 2
-    buildTarget: DefaultTexturePlatform
-    maxTextureSize: 2048
-    resizeAlgorithm: 0
-    textureFormat: -1
-    textureCompression: 1
-    compressionQuality: 50
-    crunchedCompression: 0
-    allowsAlphaSplitting: 0
-    overridden: 0
-    androidETC2FallbackOverride: 0
-  spriteSheet:
-    serializedVersion: 2
-    sprites: []
-    outline: []
-    physicsShape: []
-    bones: []
-    spriteID: 
-    vertices: []
-    indices: 
-    edges: []
-    weights: []
-  spritePackingTag: 
-  pSDRemoveMatte: 0
-  pSDShowRemoveMatteOption: 0
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/InfraredProject/Packages/Microsoft.Bcl.AsyncInterfaces.5.0.0/Microsoft.Bcl.AsyncInterfaces.5.0.0.nupkg


BIN
Assets/InfraredProject/Packages/Microsoft.Bcl.AsyncInterfaces.5.0.0/lib/netstandard2.0/Microsoft.Bcl.AsyncInterfaces.dll


Some files were not shown because too many files changed in this diff