diff --git a/labs/EasyARDemo/Assembly-CSharp-Editor.csproj b/labs/EasyARDemo/Assembly-CSharp-Editor.csproj
index 87322542..7cd098b7 100644
--- a/labs/EasyARDemo/Assembly-CSharp-Editor.csproj
+++ b/labs/EasyARDemo/Assembly-CSharp-Editor.csproj
@@ -45,7 +45,6 @@
false
-
@@ -287,9 +286,6 @@
D:/ProgramFiles/Unity/2019.2.21f1/Editor/Data/PlaybackEngines/iOSSupport/UnityEditor.iOS.Extensions.dll
-
- C:/Program Files (x86)/Microsoft Visual Studio Tools for Unity/16.0/Editor/SyntaxTree.VisualStudio.Unity.Bridge.dll
-
D:/1.0/ZHXY/labs/EasyARDemo/Library/PackageCache/com.unity.ext.nunit@1.0.0/net35/unity-custom/nunit.framework.dll
diff --git a/labs/EasyARDemo/Assembly-CSharp.csproj b/labs/EasyARDemo/Assembly-CSharp.csproj
index 0dc88410..21ddff71 100644
--- a/labs/EasyARDemo/Assembly-CSharp.csproj
+++ b/labs/EasyARDemo/Assembly-CSharp.csproj
@@ -45,28 +45,6 @@
false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -127,7 +105,6 @@
-
diff --git a/labs/EasyARDemo/Assets/ImageTargetManager.cs b/labs/EasyARDemo/Assets/ImageTargetManager.cs
index 40169d0e..c5f2c70a 100644
--- a/labs/EasyARDemo/Assets/ImageTargetManager.cs
+++ b/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();
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()
- {
-
- }
}
diff --git a/labs/EasyARDemo/ProjectSettings/EditorBuildSettings.asset b/labs/EasyARDemo/ProjectSettings/EditorBuildSettings.asset
index 0147887e..c3fac5ca 100644
--- a/labs/EasyARDemo/ProjectSettings/EditorBuildSettings.asset
+++ b/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: {}
diff --git a/labs/EasyARDemo/ProjectSettings/GraphicsSettings.asset b/labs/EasyARDemo/ProjectSettings/GraphicsSettings.asset
index 74d7b532..6cf8cd59 100644
--- a/labs/EasyARDemo/ProjectSettings/GraphicsSettings.asset
+++ b/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
diff --git a/labs/EasyARDemo/ProjectSettings/ProjectSettings.asset b/labs/EasyARDemo/ProjectSettings/ProjectSettings.asset
index 601246fd..b9f272d0 100644
--- a/labs/EasyARDemo/ProjectSettings/ProjectSettings.asset
+++ b/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
diff --git a/labs/EasyARDemo/ProjectSettings/UnityConnectSettings.asset b/labs/EasyARDemo/ProjectSettings/UnityConnectSettings.asset
index fa0b1465..c3ae9a02 100644
--- a/labs/EasyARDemo/ProjectSettings/UnityConnectSettings.asset
+++ b/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
diff --git a/labs/EasyARDemo/iot.apk b/labs/EasyARDemo/iot.apk
new file mode 100644
index 00000000..79e320de
Binary files /dev/null and b/labs/EasyARDemo/iot.apk differ