Merge branch '1.0' of http://49.4.92.112:3000/root/ZHXY into 1.0

Former-commit-id: 4e4c3383a97ef92651afc5d247253ebb6fff2f1c

labs/EasyARDemo/Assembly-CSharp-Editor.csproj

@@ -45,7 +45,6 @@
     <ImplicitlyExpandDesignTimeFacades>false</ImplicitlyExpandDesignTimeFacades>
   </PropertyGroup>
   <ItemGroup>
-     <Compile Include="Assets\CSUE\UniFBX\Lib\Editor\UniFBXLoaderEditor.cs" />
      <Compile Include="Assets\EasyAR\Scripts\Editor\ARSessionEditor.cs" />
      <Compile Include="Assets\EasyAR\Scripts\Editor\CloudRecognizerFrameFilterEditor.cs" />
      <Compile Include="Assets\EasyAR\Scripts\Editor\EasyARSettingsEditor.cs" />
@@ -287,9 +286,6 @@
  <Reference Include="UnityEditor.iOS.Extensions">
  <HintPath>D:/ProgramFiles/Unity/2019.2.21f1/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.dll</HintPath>
  </Reference>
- <Reference Include="SyntaxTree.VisualStudio.Unity.Bridge">
- <HintPath>C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/16.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll</HintPath>
- </Reference>
  <Reference Include="nunit.framework">
  <HintPath>D:/1.0/ZHXY/labs/EasyARDemo/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll</HintPath>
  </Reference>

labs/EasyARDemo/Assembly-CSharp.csproj

@@ -45,28 +45,6 @@
     <ImplicitlyExpandDesignTimeFacades>false</ImplicitlyExpandDesignTimeFacades>
   </PropertyGroup>
   <ItemGroup>
-     <Compile Include="Assets\CSUE\UniFBX\Lib\UniFBX.cs" />
-     <Compile Include="Assets\CSUE\UniFBX\Lib\UniFBXAnimation.cs" />
-     <Compile Include="Assets\CSUE\UniFBX\Lib\UniFBXCameras.cs" />
-     <Compile Include="Assets\CSUE\UniFBX\Lib\UniFBXEnumerations.cs" />
-     <Compile Include="Assets\CSUE\UniFBX\Lib\UniFBXExtensions.cs" />
-     <Compile Include="Assets\CSUE\UniFBX\Lib\UniFBXGeometries.cs" />
-     <Compile Include="Assets\CSUE\UniFBX\Lib\UniFBXGeometry.cs" />
-     <Compile Include="Assets\CSUE\UniFBX\Lib\UniFBXImport.cs" />
-     <Compile Include="Assets\CSUE\UniFBX\Lib\UniFBXInfo.cs" />
-     <Compile Include="Assets\CSUE\UniFBX\Lib\UniFBXLayeredTextures.cs" />
-     <Compile Include="Assets\CSUE\UniFBX\Lib\UniFBXLights.cs" />
-     <Compile Include="Assets\CSUE\UniFBX\Lib\UniFBXMaterials.cs" />
-     <Compile Include="Assets\CSUE\UniFBX\Lib\UniFBXModel.cs" />
-     <Compile Include="Assets\CSUE\UniFBX\Lib\UniFBXSettings.cs" />
-     <Compile Include="Assets\CSUE\UniFBX\Lib\UniFBXStads.cs" />
-     <Compile Include="Assets\CSUE\UniFBX\Lib\UniFBXTexture2D.cs" />
-     <Compile Include="Assets\CSUE\UniFBX\Lib\UniFBXTextures.cs" />
-     <Compile Include="Assets\CSUE\UniFBX\Lib\UniFBXThread.cs" />
-     <Compile Include="Assets\CSUE\UniFBX\Scripts\UniFBXLoader.cs" />
-     <Compile Include="Assets\CSUE\UniFBX\Tutorial\0000\Scripts\CameraManager0000.cs" />
-     <Compile Include="Assets\CSUE\UniFBX\Tutorial\0000\Scripts\UniFBXFilePath.cs" />
-     <Compile Include="Assets\CSUE\UniFBX\Tutorial\0000\Scripts\UniFBXUIManager0000.cs" />
      <Compile Include="Assets\EasyAR\Scripts\ARAssembly.cs" />
      <Compile Include="Assets\EasyAR\Scripts\ARSession.cs" />
      <Compile Include="Assets\EasyAR\Scripts\CameraImageRenderer.cs" />
@@ -127,7 +105,6 @@
      <None Include="Assets\Samples\Assets\ObjectSensing\ImageTracking_Coloring3D\Shaders\Coloring3D.shader" />
      <None Include="Assets\Samples\Assets\ObjectSensing\MultiTarget_SingleTracker\Duck\README.txt" />
      <None Include="Assets\EasyAR\Shaders\CameraImage_BGR.shader" />
-     <None Include="Assets\CSUE\UniFBX\Lib\References\Web\fctrl.txt" />
      <None Include="Assets\EasyAR\doc\Sense\changelog.cn.txt" />
      <None Include="Assets\Samples\Assets\ObjectSensing\ImageTracking_Video\Shaders\TransparentVideo.shader" />
      <None Include="Assets\EasyAR\Shaders\CameraImage_YUV_NV12.shader" />

labs/EasyARDemo/Assets/ImageTargetManager.cs

@@ -12,7 +12,6 @@ public class ImageTargetManager : MonoBehaviour
         imageTarget.name="ImageTarget-idback";
         imageTarget.transform.position = new Vector3(0.1f,0,0.3f);
         imageTarget.transform.localScale=new Vector3(0.0856f,0.0856f,0.0856f);
-        //imageTarget.gameObject.AddComponent<
         ImageTargetController controller = imageTarget.GetComponent<ImageTargetController>();
         controller.ActiveControl= easyar.TargetController.ActiveControlStrategy.HideWhenNotTracking;
         //controller.SourceType
@@ -23,10 +22,4 @@ public class ImageTargetManager : MonoBehaviour
         controller.Tracker=Tracker;
         Instantiate(imageTarget);
     }
-
-    // Update is called once per frame
-    void Update()
-    {
-        
-    }
 }

labs/EasyARDemo/ProjectSettings/EditorBuildSettings.asset

@@ -4,5 +4,8 @@
 EditorBuildSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
-  m_Scenes: []
+  m_Scenes:
+  - enabled: 1
+    path: Assets/Samples/Scenes/ObjectSensing/MultiTarget_SingleTracker.unity
+    guid: ae163b03555ac5647a3057d750f54d9d
   m_configObjects: {}

labs/EasyARDemo/ProjectSettings/GraphicsSettings.asset

@@ -35,6 +35,10 @@ GraphicsSettings:
   - {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
+  - {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
   m_PreloadedShaders: []
   m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
     type: 0}
@@ -59,3 +63,4 @@ GraphicsSettings:
   m_AlbedoSwatchInfos: []
   m_LightsUseLinearIntensity: 0
   m_LightsUseColorTemperature: 0
+  m_LogWhenShaderIsCompiled: 0

labs/EasyARDemo/ProjectSettings/ProjectSettings.asset

@@ -276,7 +276,99 @@ PlayerSettings:
   AndroidAppBundleSizeToValidate: 150
   resolutionDialogBanner: {fileID: 0}
   m_BuildTargetIcons: []
-  m_BuildTargetPlatformIcons: []
+  m_BuildTargetPlatformIcons:
+  - m_BuildTarget: Android
+    m_Icons:
+    - m_Textures: []
+      m_Width: 432
+      m_Height: 432
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 324
+      m_Height: 324
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 216
+      m_Height: 216
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 162
+      m_Height: 162
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 108
+      m_Height: 108
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 81
+      m_Height: 81
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 1
+      m_SubKind: 
   m_BuildTargetBatching:
   - m_BuildTarget: Standalone
     m_StaticBatching: 1

labs/EasyARDemo/ProjectSettings/UnityConnectSettings.asset

@@ -4,7 +4,7 @@
 UnityConnectSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 1
-  m_Enabled: 0
+  m_Enabled: 1
   m_TestMode: 0
   m_EventOldUrl: https://api.uca.cloud.unity3d.com/v1/events
   m_EventUrl: https://cdp.cloud.unity3d.com/v1/events