修改手动定位算法

Assets/AddressableAssetsData/link.xml

@@ -0,0 +1,10 @@
+<linker>
+  <assembly fullname="Unity.Addressables, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
+    <type fullname="UnityEngine.AddressableAssets.Addressables" preserve="all" />
+  </assembly>
+  <assembly fullname="Unity.ResourceManager, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null" preserve="all">
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.InstanceProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.LegacyResourcesProvider" preserve="all" />
+    <type fullname="UnityEngine.ResourceManagement.ResourceProviders.SceneProvider" preserve="all" />
+  </assembly>
+</linker>

Assets/AddressableAssetsData/link.xml.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: fb86857eab4e1a84c970183cad354354
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

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

@@ -769,7 +769,7 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
         //屏幕变化情况下。同步修改对应的line
         //设置两个线段
         QuadrilateralInCamera screenAuto = ScreenLocate.Main.ScreenIdentification.QuadAuto;
-        QuadrilateralInCamera screenSemiAuto = ScreenLocate.Main.ScreenIdentification.QuadSemiAuto;
+        QuadrilateralInCamera screenQuadManual = ScreenLocate.Main.ScreenIdentification.QuadManual; //QuadSemiAuto;
         if (screenAuto != null)
         {
             Debug.Log("[校准流程]Successful自动识别screenAuto信息  ------------ ");
@@ -780,10 +780,10 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
         //{
         //    Debug.LogError("screenAuto 不存在！");
         //}
-        if (screenSemiAuto != null)
+        if (screenQuadManual != null)
         {
-            Debug.Log("[校准流程]Successful半自动识别screenSemiAuto信息 ------------ ");
-            SecondUILineGenerator.Points = infraredDemo.ConvertQuadToPoints(screenSemiAuto, texSize);
+            Debug.Log("[校准流程]Successful手动识别screenQuadManual信息 ------------ ");
+            SecondUILineGenerator.Points = infraredDemo.ConvertQuadToPoints(screenQuadManual, texSize);
         }
         //else
         //{
@@ -1427,10 +1427,10 @@ public class InfraredScreenPositioningView : JCUnityLib.ViewBase
         onCompelete();
     }
 
-    //选择半自动结果
+    //选择半自动结果,临时改用手动
     void OnSecondResult()
     {
-        ScreenLocate.Main.SelectScreenAfterLocate(ScreenLocate.ScreenIdentificationTag.SemiAuto);
+        ScreenLocate.Main.SelectScreenAfterLocate(ScreenLocate.ScreenIdentificationTag.Manual);//SemiAuto
         UpdateQuadUnityVectorList();
 
         onCompelete();

ProjectSettings/ProjectSettings.asset

@@ -13,7 +13,7 @@ PlayerSettings:
   useOnDemandResources: 0
   accelerometerFrequency: 60
   companyName: JssF
-  productName: WONDER FITTER Pro
+  productName: "WONDERFITTER Pro \u8FD0\u52A8"
   defaultCursor: {fileID: 0}
   cursorHotspot: {x: 0, y: 0}
   m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
@@ -279,7 +279,7 @@ PlayerSettings:
   - m_BuildTarget: 
     m_Icons:
     - serializedVersion: 2
-      m_Icon: {fileID: 2800000, guid: a4b7ede0a933f4440bda406386f77c26, type: 3}
+      m_Icon: {fileID: 2800000, guid: e1485575cd9962247a6d7cc46fd6d6a9, type: 3}
       m_Width: 128
       m_Height: 128
       m_Kind: 0